Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 01/01: [ACPICA] Take the gcc code path for host configuration when compiling with clang. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=433d20f16e1636ba4758a… commit 433d20f16e1636ba4758a278e04ad33abe189a07 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 30 22:45:42 2017 +0100 [ACPICA] Take the gcc code path for host configuration when compiling with clang. CORE-11799 (#94) --- drivers/bus/acpi/acpica/include/platform/acenv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/acpi/acpica/include/platform/acenv.h b/drivers/bus/acpi/acpica/include/platform/acenv.h index 3ed6263426..a8cffa8bdf 100644 --- a/drivers/bus/acpi/acpica/include/platform/acenv.h +++ b/drivers/bus/acpi/acpica/include/platform/acenv.h @@ -171,7 +171,7 @@ * *****************************************************************************/ -#if defined(__GNUC__) && !defined(__INTEL_COMPILER) +#if (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER) #include "acgcc.h" #elif defined(_MSC_VER)

7 years, 1 month

[reactos] 01/01: [INCLUDE/REACTOS][LOCALMON][LOCALSPL][SPOOLSS] Add some missing VOIDs. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d56c9a8927e9f48831bf6… commit d56c9a8927e9f48831bf6e3e1f6337259de9f6f6 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 30 22:43:47 2017 +0100 [INCLUDE/REACTOS][LOCALMON][LOCALSPL][SPOOLSS] Add some missing VOIDs. CORE-11799 (#94) --- sdk/include/reactos/browseui_undoc.h | 2 +- win32ss/printing/base/spoolss/context.c | 2 +- win32ss/printing/base/spoolss/main.c | 4 ++-- win32ss/printing/monitors/localmon/precomp.h | 2 +- win32ss/printing/monitors/localmon/tools.c | 2 +- win32ss/printing/providers/localspl/precomp.h | 2 +- win32ss/printing/providers/localspl/printers.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/include/reactos/browseui_undoc.h b/sdk/include/reactos/browseui_undoc.h index 5478197e70..bd6d6fbc81 100644 --- a/sdk/include/reactos/browseui_undoc.h +++ b/sdk/include/reactos/browseui_undoc.h @@ -126,7 +126,7 @@ HRESULT WINAPI SHGetNavigateTarget(long param8, long paramC, long param10, long HRESULT WINAPI GetInfoTip(IUnknown *param8, long paramC, LPTSTR *param10, long cchMax); HRESULT WINAPI SHEnumClassesOfCategories(ULONG cImplemented, CATID *pImplemented, ULONG cRequired, CATID *pRequired, IEnumGUID **out); HRESULT WINAPI SHWriteClassesOfCategories(long param8, long paramC, long param10, long param14, long param18, long param1C, long param20); -BOOL WINAPI SHIsExplorerBrowser(); +BOOL WINAPI SHIsExplorerBrowser(void); HRESULT WINAPI SHOpenNewFrame(LPITEMIDLIST pidl, IUnknown *paramC, long param10, DWORD dwFlags); #ifdef __cplusplus diff --git a/win32ss/printing/base/spoolss/context.c b/win32ss/printing/base/spoolss/context.c index cf1f185c7f..52cca45569 100644 --- a/win32ss/printing/base/spoolss/context.c +++ b/win32ss/printing/base/spoolss/context.c @@ -61,7 +61,7 @@ Cleanup: * return to the SYSTEM context for specific tasks. */ HANDLE WINAPI -RevertToPrinterSelf() +RevertToPrinterSelf(VOID) { DWORD dwErrorCode; HANDLE hReturnValue = NULL; diff --git a/win32ss/printing/base/spoolss/main.c b/win32ss/printing/base/spoolss/main.c index dcbb447e4c..c7b3f63561 100644 --- a/win32ss/printing/base/spoolss/main.c +++ b/win32ss/printing/base/spoolss/main.c @@ -70,7 +70,7 @@ Cleanup: } static BOOL -_InitializePrintProviderList() +_InitializePrintProviderList(VOID) { DWORD cbFileName; DWORD cchMaxSubKey; @@ -234,7 +234,7 @@ SplInitializeWinSpoolDrv(PVOID* pTable) } BOOL WINAPI -SplIsUpgrade() +SplIsUpgrade(VOID) { return FALSE; } diff --git a/win32ss/printing/monitors/localmon/precomp.h b/win32ss/printing/monitors/localmon/precomp.h index ab1e620307..8b222e2ce8 100644 --- a/win32ss/printing/monitors/localmon/precomp.h +++ b/win32ss/printing/monitors/localmon/precomp.h @@ -98,7 +98,7 @@ BOOL WINAPI LocalmonWritePort(HANDLE hPort, PBYTE pBuffer, DWORD cbBuf, PDWORD p // tools.c BOOL DoesPortExist(PCWSTR pwszPortName); -DWORD GetLPTTransmissionRetryTimeout(); +DWORD GetLPTTransmissionRetryTimeout(VOID); DWORD GetPortNameWithoutColon(PCWSTR pwszPortName, PWSTR* ppwszPortNameWithoutColon); // xcv.c diff --git a/win32ss/printing/monitors/localmon/tools.c b/win32ss/printing/monitors/localmon/tools.c index 4818539eee..0a5a797838 100644 --- a/win32ss/printing/monitors/localmon/tools.c +++ b/win32ss/printing/monitors/localmon/tools.c @@ -82,7 +82,7 @@ Cleanup: } DWORD -GetLPTTransmissionRetryTimeout() +GetLPTTransmissionRetryTimeout(VOID) { DWORD cbBuffer; DWORD dwReturnValue = 90; // Use 90 seconds as default if we fail to read from registry. diff --git a/win32ss/printing/providers/localspl/precomp.h b/win32ss/printing/providers/localspl/precomp.h index c4855ebda0..0c97f22c85 100644 --- a/win32ss/printing/providers/localspl/precomp.h +++ b/win32ss/printing/providers/localspl/precomp.h @@ -246,7 +246,7 @@ extern SKIPLIST GlobalJobList; DWORD WINAPI CreateJob(PLOCAL_PRINTER_HANDLE pPrinterHandle); void FreeJob(PLOCAL_JOB pJob); DWORD GetJobFilePath(PCWSTR pwszExtension, DWORD dwJobID, PWSTR pwszOutput); -BOOL InitializeGlobalJobList(); +BOOL InitializeGlobalJobList(VOID); void InitializePrinterJobList(PLOCAL_PRINTER pPrinter); BOOL WINAPI LocalAddJob(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf, LPDWORD pcbNeeded); BOOL WINAPI LocalEnumJobs(HANDLE hPrinter, DWORD FirstJob, DWORD NoJobs, DWORD Level, PBYTE pStart, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); diff --git a/win32ss/printing/providers/localspl/printers.c b/win32ss/printing/providers/localspl/printers.c index 35125495ce..022fd39a3e 100644 --- a/win32ss/printing/providers/localspl/printers.c +++ b/win32ss/printing/providers/localspl/printers.c @@ -104,7 +104,7 @@ _PrinterListCompareRoutine(PVOID FirstStruct, PVOID SecondStruct) * During this process, the job queues are also initialized. */ BOOL -InitializePrinterList() +InitializePrinterList(VOID) { DWORD cbData; DWORD cchPrinterName;

7 years, 1 month

[reactos] 01/01: [LIBSAMPLERATE] Define exit() as __debugbreak(). CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80774a2fcafcde4c37928… commit 80774a2fcafcde4c37928b96cd06554df9700c15 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 30 22:38:29 2017 +0100 [LIBSAMPLERATE] Define exit() as __debugbreak(). CORE-11799 (#94) --- sdk/lib/3rdparty/libsamplerate/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/lib/3rdparty/libsamplerate/config.h b/sdk/lib/3rdparty/libsamplerate/config.h index c360c2b5e3..922fbc3805 100644 --- a/sdk/lib/3rdparty/libsamplerate/config.h +++ b/sdk/lib/3rdparty/libsamplerate/config.h @@ -197,9 +197,9 @@ #define inline __inline /* ReactOS hacks */ -void __stdcall DbgBreakPoint(void); +void __cdecl __debugbreak(void); unsigned long __cdecl DbgPrint(const char *Format, ...); -#define exit(n) DbgBreakPoint() +#define exit(n) __debugbreak() #define printf DbgPrint # ifdef _MSC_VER

7 years, 1 month

[reactos] 01/01: [NMIDEBUG] Do not take the msvc codepath in NmiClearFlag(). CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfe0f7f7141baf95aa0ac… commit cfe0f7f7141baf95aa0ac2b4c18aca3bf18149ac Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 30 21:54:54 2017 +0100 [NMIDEBUG] Do not take the msvc codepath in NmiClearFlag(). CORE-11799 (#94) --- drivers/base/nmidebug/nmidebug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/nmidebug/nmidebug.c b/drivers/base/nmidebug/nmidebug.c index 9400fd416f..ecbf58eb8d 100644 --- a/drivers/base/nmidebug/nmidebug.c +++ b/drivers/base/nmidebug/nmidebug.c @@ -22,7 +22,7 @@ NmiClearFlag(VOID) ((PCHAR)&KiBugCheckData[4])[0] -= (NmiBegin[3] | NmiBegin[7]); ((PCHAR)&KiBugCheckData[4])[3] |= 1; #ifdef _M_IX86 -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) __asm { rcr KiBugCheckData[4], 8

7 years, 1 month

[reactos] 01/01: [SHELL32] Properly set case -714 as TBN_DRAGOUT. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe6d46f86ee91e9e90629… commit fe6d46f86ee91e9e906295692c3eff7932ca89a5 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 30 21:53:00 2017 +0100 [SHELL32] Properly set case -714 as TBN_DRAGOUT. CORE-11799 (#94) --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 0b13432359..40dd12fc9a 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -105,8 +105,7 @@ HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM case NM_TOOLTIPSCREATED: break; - // Unknown - case -714: return S_FALSE; + case TBN_DRAGOUT: return S_FALSE; default: TRACE("WM_NOTIFY unknown code %d, %d\n", hdr->code, hdr->idFrom);

7 years, 1 month

[reactos] 01/01: [BOOT/ENVIRON] Define the INT8 type as signed char. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f56c4c5a292178367a23… commit 7f56c4c5a292178367a23cec86522426f2f1bf23 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 30 21:51:30 2017 +0100 [BOOT/ENVIRON] Define the INT8 type as signed char. CORE-11799 (#94) --- boot/environ/include/efi/ProcessorBind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/environ/include/efi/ProcessorBind.h b/boot/environ/include/efi/ProcessorBind.h index bab3e210cc..3f73c61d47 100644 --- a/boot/environ/include/efi/ProcessorBind.h +++ b/boot/environ/include/efi/ProcessorBind.h @@ -147,7 +147,7 @@ typedef char CHAR8; /// /// 1-byte signed value. /// -typedef char INT8; +typedef signed char INT8; #else /// /// 8-byte unsigned value.

7 years, 1 month

[reactos] 01/01: [SERIALUI] Set the stdcall calling convention for CommDlgProc() and make it return INT_PTR. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=830fc82afe6853f8d4e6c… commit 830fc82afe6853f8d4e6c5e54d6d813c5861fc34 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Oct 30 21:48:49 2017 +0100 [SERIALUI] Set the stdcall calling convention for CommDlgProc() and make it return INT_PTR. CORE-11799 (#94) --- dll/win32/serialui/serialui.c | 9 ++++----- dll/win32/serialui/serialui.h | 5 ++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dll/win32/serialui/serialui.c b/dll/win32/serialui/serialui.c index e4d4d50e17..1e85310440 100644 --- a/dll/win32/serialui/serialui.c +++ b/dll/win32/serialui/serialui.c @@ -113,7 +113,7 @@ DWORD WINAPI drvCommConfigDialogW(LPCWSTR lpszDevice, DialogInfo.lpCC = lpCommConfig; return DialogBoxParamW(hDllInstance, MAKEINTRESOURCEW(IDD_COMMDLG), - hWnd, (DLGPROC)CommDlgProc, (LPARAM)&DialogInfo); + hWnd, CommDlgProc, (LPARAM)&DialogInfo); } /* @@ -186,10 +186,9 @@ DWORD WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice, * ************************************/ -LRESULT CommDlgProc(HWND hDlg, - UINT Msg, - WPARAM wParam, - LPARAM lParam) +INT_PTR +CALLBACK +CommDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { LPDIALOG_INFO lpDlgInfo = NULL; HWND hBox; diff --git a/dll/win32/serialui/serialui.h b/dll/win32/serialui/serialui.h index f597eac5e1..121d11e281 100644 --- a/dll/win32/serialui/serialui.h +++ b/dll/win32/serialui/serialui.h @@ -82,7 +82,10 @@ DWORD WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice, * ************************************/ -LRESULT CommDlgProc(HWND hDlg, +INT_PTR +CALLBACK +CommDlgProc( + HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);

7 years, 1 month

[reactos] 01/01: [SHELL32][REGEDIT][MSCONFIG_NEW] Correctly check for presence of list view sort header.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba8f75557a062e09d5687… commit ba8f75557a062e09d5687376f2b2947234653a8a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Oct 27 12:32:26 2017 +0200 [SHELL32][REGEDIT][MSCONFIG_NEW] Correctly check for presence of list view sort header. --- base/applications/msconfig_new/comctl32ex/listview.c | 2 +- base/applications/regedit/listview.c | 2 +- dll/win32/shell32/CDefView.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/msconfig_new/comctl32ex/listview.c b/base/applications/msconfig_new/comctl32ex/listview.c index 0eab585b3d..9e5f533998 100644 --- a/base/applications/msconfig_new/comctl32ex/listview.c +++ b/base/applications/msconfig_new/comctl32ex/listview.c @@ -49,7 +49,7 @@ ListView_SortEx(HWND hListView, BOOL bSortAsc; Sort sort; - if ((GetWindowLongPtr(hListView, GWL_STYLE) & ~LVS_NOSORTHEADER) == 0) + if (GetWindowLongPtr(hListView, GWL_STYLE) & LVS_NOSORTHEADER) return TRUE; hHeader = ListView_GetHeader(hListView); diff --git a/base/applications/regedit/listview.c b/base/applications/regedit/listview.c index 4d99cd7814..687fb2234b 100644 --- a/base/applications/regedit/listview.c +++ b/base/applications/regedit/listview.c @@ -478,7 +478,7 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSor static BOOL ListView_Sort(HWND hListView, int iSortingColumn, int iSortedColumn) { - if ( (GetWindowLongPtr(hListView, GWL_STYLE) & ~LVS_NOSORTHEADER) && + if (!(GetWindowLongPtr(hListView, GWL_STYLE) & LVS_NOSORTHEADER) && (iSortingColumn >= 0) ) { BOOL bSortAscending; diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index f846cc1fd4..1492724e55 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -698,7 +698,7 @@ BOOL CDefView::_Sort() HWND hHeader; HDITEM hColumn; - if ((m_ListView.GetWindowLongPtr(GWL_STYLE) & ~LVS_NOSORTHEADER) == 0) + if (m_ListView.GetWindowLongPtr(GWL_STYLE) & LVS_NOSORTHEADER) return TRUE; hHeader = (HWND)m_ListView.SendMessage(LVM_GETHEADER, 0, 0);

7 years, 1 month

[reactos] 01/01: [NET] Add missing newlines to net utility output (#91)

by Marian Schubert

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3d000c30eb8015a79433… commit e3d000c30eb8015a794338bd73e4cac47905b276 Author: Marian Schubert <marian.schubert(a)gmail.com> AuthorDate: Sun Oct 29 21:38:05 2017 +0100 [NET] Add missing newlines to net utility output (#91) Password last set and Password changeable lines were missing newlines. --- base/applications/network/net/cmdUser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/applications/network/net/cmdUser.c b/base/applications/network/net/cmdUser.c index 2c65db0cc6..7267a553f4 100644 --- a/base/applications/network/net/cmdUser.c +++ b/base/applications/network/net/cmdUser.c @@ -214,6 +214,7 @@ DisplayUser(LPWSTR lpUserName) PrintPaddedResourceString(IDS_USER_PW_LAST_SET, nPaddedLength); dwLastSet = GetTimeInSeconds() - pUserInfo->usri4_password_age; PrintDateTime(dwLastSet); + ConPuts(StdOut, L"\n"); PrintPaddedResourceString(IDS_USER_PW_EXPIRES, nPaddedLength); if ((pUserInfo->usri4_flags & UF_DONT_EXPIRE_PASSWD) || pUserModals->usrmod0_max_passwd_age == TIMEQ_FOREVER) @@ -224,6 +225,7 @@ DisplayUser(LPWSTR lpUserName) PrintPaddedResourceString(IDS_USER_PW_CHANGEABLE, nPaddedLength); PrintDateTime(dwLastSet + pUserModals->usrmod0_min_passwd_age); + ConPuts(StdOut, L"\n"); PrintPaddedResourceString(IDS_USER_PW_REQUIRED, nPaddedLength); ConResPuts(StdOut, (pUserInfo->usri4_flags & UF_PASSWD_NOTREQD) ? IDS_GENERIC_NO : IDS_GENERIC_YES);

7 years, 1 month

[reactos] 01/01: [KERNEL32] Fix a FIXME in WaitNamedPipeW(): allow waiting on a remote pipe

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebe9735835301579952eb… commit ebe9735835301579952eb3cbef15f20a58076cd8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 29 20:34:49 2017 +0100 [KERNEL32] Fix a FIXME in WaitNamedPipeW(): allow waiting on a remote pipe --- dll/win32/kernel32/client/file/npipe.c | 45 +++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/file/npipe.c b/dll/win32/kernel32/client/file/npipe.c index a142cf4537..c99d600bcb 100644 --- a/dll/win32/kernel32/client/file/npipe.c +++ b/dll/win32/kernel32/client/file/npipe.c @@ -468,6 +468,7 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, HANDLE FileHandle; IO_STATUS_BLOCK IoStatusBlock; ULONG WaitPipeInfoSize; + PVOID DevicePathBuffer; PFILE_PIPE_WAIT_FOR_BUFFER WaitPipeInfo; /* Start by making a unicode string of the name */ @@ -486,6 +487,8 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, if (NamedPipeName.Buffer[i] == L'/') NamedPipeName.Buffer[i] = L'\\'; } + DevicePathBuffer = NULL; + /* Find the path type of the name we were given */ NewName = NamedPipeName; Type = RtlDetermineDosPathNameType_U(lpNamedPipeName); @@ -515,6 +518,8 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, } else if (Type == RtlPathTypeUncAbsolute) { + PWSTR PipeName; + /* The path is \\server\\pipe\name; find the pipename itself */ p = &NewName.Buffer[2]; @@ -543,7 +548,34 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, return FALSE; } - /* FIXME: Open \DosDevices\Unc\Server\Pipe\Name */ + /* Skip first backslash */ + NewName.Buffer++; + /* And skip pipe for copying name */ + PipeName = p + ((sizeof(L"pipe\\") - sizeof(UNICODE_NULL)) / sizeof(WCHAR)); + /* Update the string */ + NewName.Length = (USHORT)((ULONG_PTR)PipeName - (ULONG_PTR)NewName.Buffer); + NewName.MaximumLength = (USHORT)((ULONG_PTR)PipeName - (ULONG_PTR)NewName.Buffer); + + /* DevicePath will contain the pipename + the DosDevice prefix */ + DevicePath.MaximumLength = (USHORT)((ULONG_PTR)PipeName - (ULONG_PTR)NewName.Buffer) + sizeof(L"\\DosDevices\\UNC\\"); + + /* Allocate the buffer for DevicePath */ + DevicePathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, DevicePath.MaximumLength); + if (DevicePathBuffer == NULL) + { + RtlFreeUnicodeString(&NamedPipeName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Copy the prefix first */ + DevicePath.Buffer = DevicePathBuffer; + RtlCopyMemory(DevicePathBuffer, L"\\DosDevices\\UNC\\", sizeof(L"\\DosDevices\\UNC\\") - sizeof(UNICODE_NULL)); + DevicePath.Length = sizeof(L"\\DosDevices\\UNC\\") - sizeof(UNICODE_NULL); + /* And append the rest */ + RtlAppendUnicodeStringToString(&DevicePath, &NewName); + /* And fix pipe name without its prefix */ + RtlInitUnicodeString(&NewName, PipeName + 1); } else { @@ -559,6 +591,11 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, WaitPipeInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, WaitPipeInfoSize); if (WaitPipeInfo == NULL) { + if (DevicePathBuffer != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, DevicePathBuffer); + } + RtlFreeUnicodeString(&NamedPipeName); SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; @@ -579,6 +616,12 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT); + + if (DevicePathBuffer != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, DevicePathBuffer); + } + if (!NT_SUCCESS(Status)) { /* Fail; couldn't open */

7 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2017