From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 8A26E385803C; Fri, 3 Sep 2021 11:21:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A26E385803C Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: fix declaration of RtlInitEmptyUnicodeString X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 76c2c7a891062eae479f2a06f04ed8e51a90e9b9 X-Git-Newrev: eeeb5650cf706f4dde72ce8b8598aef41f88718a Message-Id: <20210903112134.8A26E385803C@sourceware.org> Date: Fri, 3 Sep 2021 11:21:34 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Sep 2021 11:21:34 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=eeeb5650cf706f4dde72ce8b8598aef41f88718a commit eeeb5650cf706f4dde72ce8b8598aef41f88718a Author: Corinna Vinschen Date: Fri Sep 3 13:16:48 2021 +0200 Cygwin: fix declaration of RtlInitEmptyUnicodeString This avoids "-Werror=maybe-uninitialized" errors due to using WCSTR accidentally. Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/ntdll.h | 5 +++-- winsup/cygwin/syscalls.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h index 7eee383dd..4504bdf6d 100644 --- a/winsup/cygwin/ntdll.h +++ b/winsup/cygwin/ntdll.h @@ -1638,13 +1638,14 @@ extern "C" /* RtlInitEmptyUnicodeString is defined as a macro in wdm.h, but that file is missing entirely in w32api. */ + inline - VOID NTAPI RtlInitEmptyUnicodeString(PUNICODE_STRING dest, PCWSTR buf, + VOID NTAPI RtlInitEmptyUnicodeString(PUNICODE_STRING dest, PWSTR buf, USHORT len) { dest->Length = 0; dest->MaximumLength = len; - dest->Buffer = (PWSTR) buf; + dest->Buffer = buf; } /* Like RtlInitEmptyUnicodeString, but initialize Length to len, too. This is for instance useful when creating a UNICODE_STRING from an diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 6f7efa928..c34de2929 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -561,7 +561,7 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags) { /* In the remote case we need the full path, but recycler is only a relative path. Convert to absolute path. */ - RtlInitEmptyUnicodeString (&fname, (PCWSTR) tp.w_get (), + RtlInitEmptyUnicodeString (&fname, tp.w_get (), (NT_MAX_PATH - 1) * sizeof (WCHAR)); RtlCopyUnicodeString (&fname, pc.get_nt_native_path ()); RtlSplitUnicodePath (&fname, &fname, NULL);