April 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : ntdll/tests: Some tests for NtQuerySystemInformationEx().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: c04b16d5e30ba3aaa9024d3c8f4275583b0e996a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c04b16d5e30ba3aaa9024d3c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 4 01:56:46 2016 +0300 ntdll/tests: Some tests for NtQuerySystemInformationEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c9c138f53fb1b673602502fb9bde861bb092e120) Conflicts: dlls/kernel32/tests/process.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/process.c | 36 +++++++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 53 ++++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 1 + 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 6dc1f5e..a6e731c 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -79,6 +79,7 @@ static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static BOOL (WINAPI *pProcessIdToSessionId)(DWORD,DWORD*); static DWORD (WINAPI *pWTSGetActiveConsoleSessionId)(void); +static BOOL (WINAPI *pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); /* ############################### */ static char base[MAX_PATH]; @@ -237,6 +238,8 @@ static BOOL init(void) pGetNumaProcessorNode = (void *)GetProcAddress(hkernel32, "GetNumaProcessorNode"); pProcessIdToSessionId = (void *)GetProcAddress(hkernel32, "ProcessIdToSessionId"); pWTSGetActiveConsoleSessionId = (void *)GetProcAddress(hkernel32, "WTSGetActiveConsoleSessionId"); + pGetLogicalProcessorInformationEx = (void *)GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); + return TRUE; } @@ -2966,6 +2969,37 @@ todo_wine CloseHandle(hproc); } +static void test_GetLogicalProcessorInformationEx(void) +{ + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; + DWORD len; + BOOL ret; + + if (!pGetLogicalProcessorInformationEx) + { + win_skip("GetLogicalProcessorInformationEx() is not supported\n"); + return; + } + + ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, NULL); + ok(!ret, "got %d, error %d\n", ret, GetLastError()); + + len = 0; + ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len); +todo_wine { + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError()); + ok(len > 0, "got %u\n", len); +} + +if (len) { + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + ret = pGetLogicalProcessorInformationEx(RelationAll, info, &len); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(info->Size > 0, "got %u\n", info->Size); + HeapFree(GetProcessHeap(), 0, info); +} +} + START_TEST(process) { HANDLE job; @@ -2995,6 +3029,7 @@ START_TEST(process) ok(0, "Unexpected command %s\n", myARGV[2]); return; } + test_process_info(); test_TerminateProcess(); test_Startup(); @@ -3018,6 +3053,7 @@ START_TEST(process) test_StartupNoConsole(); test_GetNumaProcessorNode(); test_session_info(); + test_GetLogicalProcessorInformationEx(); /* things that can be tested: * lookup: check the way program to be executed is searched diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 88d0417..4015ce2 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -23,6 +23,7 @@ #include <stdio.h> static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); +static NTSTATUS (WINAPI * pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*); static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtQueryInformationThread)(HANDLE, THREADINFOCLASS, PVOID, ULONG, PULONG); @@ -36,6 +37,7 @@ static NTSTATUS (WINAPI * pNtUnmapViewOfSection)(HANDLE,PVOID); static NTSTATUS (WINAPI * pNtClose)(HANDLE); static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI * pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); static BOOL is_wow64; @@ -56,6 +58,8 @@ static BOOL InitFunctionPtrs(void) { /* All needed functions are NT based, so using GetModuleHandle is a good check */ HMODULE hntdll = GetModuleHandleA("ntdll"); + HMODULE hkernel32 = GetModuleHandleA("kernel32"); + if (!hntdll) { win_skip("Not running on NT\n"); @@ -78,8 +82,16 @@ static BOOL InitFunctionPtrs(void) /* not present before XP */ pNtGetCurrentProcessorNumber = (void *) GetProcAddress(hntdll, "NtGetCurrentProcessorNumber"); - pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); + pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + + /* starting with Win7 */ + pNtQuerySystemInformationEx = (void *) GetProcAddress(hntdll, "NtQuerySystemInformationEx"); + if (!pNtQuerySystemInformationEx) + skip("NtQuerySystemInformationEx() is not supported, some tests will be skipped.\n"); + + pGetLogicalProcessorInformationEx = (void *) GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); + return TRUE; } @@ -664,6 +676,44 @@ static void test_query_logicalproc(void) HeapFree(GetProcessHeap(), 0, slpi); } +static void test_query_logicalprocex(void) +{ + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *infoex, *infoex2; + DWORD relationship, len2, len; + NTSTATUS status; + BOOL ret; + + if (!pNtQuerySystemInformationEx) + return; + + len = 0; + relationship = RelationAll; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); + ok(len > 0, "got %u\n", len); + + len2 = 0; + ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len2); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError()); + ok(len == len2, "got %u, expected %u\n", len2, len); + + if (len == len2) { + infoex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + infoex2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + ok(infoex->Size > 0, "got %u\n", infoex->Size); + + ret = pGetLogicalProcessorInformationEx(RelationAll, infoex2, &len2); + ok(ret, "got %d, error %d\n", ret, GetLastError()); + ok(!memcmp(infoex, infoex2, len), "returned info data mismatch\n"); + + HeapFree(GetProcessHeap(), 0, infoex); + HeapFree(GetProcessHeap(), 0, infoex2); + } +} + static void test_query_processor_power_info(void) { NTSTATUS status; @@ -1910,6 +1960,7 @@ START_TEST(info) /* 0x49 SystemLogicalProcessorInformation */ trace("Starting test_query_logicalproc()\n"); test_query_logicalproc(); + test_query_logicalprocex(); /* NtPowerInformation */ diff --git a/include/winternl.h b/include/winternl.h index ecd5791..788e15a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -842,6 +842,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { Unknown71, Unknown72, SystemLogicalProcessorInformation = 73, + SystemLogicalProcessorInformationEx = 107, SystemInformationClassMax } SYSTEM_INFORMATION_CLASS, *PSYSTEM_INFORMATION_CLASS;

1 0

Nikolay Sivov : ntdll: Add NtQuerySystemInformationEx() stub.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: bd3e94210bb2ec05ce1c5a11983cd74851e782ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3e94210bb2ec05ce1c5a119… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 4 01:56:47 2016 +0300 ntdll: Add NtQuerySystemInformationEx() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 114123370bb4b97e7a6880cba8f4a348ecfb1991) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/nt.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/tests/info.c | 8 +++++--- include/winternl.h | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8ea1ddd..1cdad89 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2139,6 +2139,18 @@ NTSTATUS WINAPI NtQuerySystemInformation( } /****************************************************************************** + * NtQuerySystemInformationEx [NTDLL.@] + * ZwQuerySystemInformationEx [NTDLL.@] + */ +NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS SystemInformationClass, + void *Query, ULONG QueryLength, void *SystemInformation, ULONG Length, ULONG *ResultLength) +{ + FIXME("(0x%08x,%p,%u,%p,%u,%p) stub\n", SystemInformationClass, Query, QueryLength, SystemInformation, + Length, ResultLength); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** * NtSetSystemInformation [NTDLL.@] * ZwSetSystemInformation [NTDLL.@] */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 524b5d0..04e9548 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -276,6 +276,7 @@ @ stdcall NtQuerySystemEnvironmentValue(ptr ptr long ptr) @ stdcall NtQuerySystemEnvironmentValueEx(ptr ptr ptr ptr ptr) @ stdcall NtQuerySystemInformation(long long long long) +@ stdcall NtQuerySystemInformationEx(long ptr long ptr long ptr) @ stdcall NtQuerySystemTime(ptr) @ stdcall NtQueryTimer(ptr long ptr long ptr) @ stdcall NtQueryTimerResolution(long long long) @@ -1196,6 +1197,7 @@ @ stdcall ZwQuerySystemEnvironmentValue(ptr ptr long ptr) NtQuerySystemEnvironmentValue @ stdcall ZwQuerySystemEnvironmentValueEx(ptr ptr ptr ptr ptr) NtQuerySystemEnvironmentValueEx @ stdcall ZwQuerySystemInformation(long long long long) NtQuerySystemInformation +@ stdcall ZwQuerySystemInformationEx(long ptr long ptr long ptr) NtQuerySystemInformationEx @ stdcall ZwQuerySystemTime(ptr) NtQuerySystemTime @ stdcall ZwQueryTimer(ptr long ptr long ptr) NtQueryTimer @ stdcall ZwQueryTimerResolution(long long long) NtQueryTimerResolution diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4015ce2..32355cb 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -88,7 +88,7 @@ static BOOL InitFunctionPtrs(void) /* starting with Win7 */ pNtQuerySystemInformationEx = (void *) GetProcAddress(hntdll, "NtQuerySystemInformationEx"); if (!pNtQuerySystemInformationEx) - skip("NtQuerySystemInformationEx() is not supported, some tests will be skipped.\n"); + win_skip("NtQuerySystemInformationEx() is not supported, some tests will be skipped.\n"); pGetLogicalProcessorInformationEx = (void *) GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); @@ -689,15 +689,17 @@ static void test_query_logicalprocex(void) len = 0; relationship = RelationAll; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len); +todo_wine { ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); ok(len > 0, "got %u\n", len); - +} len2 = 0; ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len2); +todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError()); ok(len == len2, "got %u, expected %u\n", len2, len); - if (len == len2) { + if (len && len == len2) { infoex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); infoex2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); diff --git a/include/winternl.h b/include/winternl.h index 788e15a..42ecb5b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2242,6 +2242,7 @@ NTSYSAPI NTSTATUS WINAPI NtQuerySemaphore(HANDLE,SEMAPHORE_INFORMATION_CLASS,PV NTSYSAPI NTSTATUS WINAPI NtQuerySymbolicLinkObject(HANDLE,PUNICODE_STRING,PULONG); NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValue(PUNICODE_STRING,PWCHAR,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS,void*,ULONG,void*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI NtQuerySystemTime(PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtQueryTimer(HANDLE,TIMER_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryTimerResolution(PULONG,PULONG,PULONG);

1 0

Nikolay Sivov : kernel32: Forward GetLogicalProcessorInformationEx() to ntdll.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: ebcc9c52517d5c19d2d0457f0ab784e642a4ada1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcc9c52517d5c19d2d0457f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 4 01:56:48 2016 +0300 kernel32: Forward GetLogicalProcessorInformationEx() to ntdll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae1fe69e3952e13e8361a25058d24e2d2ed6f79c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 23 +++++++++++++++++++---- dlls/kernel32/tests/process.c | 8 +++++++- dlls/ntdll/tests/info.c | 7 +++++++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 89ae5c4..7795b47 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3836,11 +3836,26 @@ BOOL WINAPI GetLogicalProcessorInformation(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION /*********************************************************************** * GetLogicalProcessorInformationEx (KERNEL32.@) */ -BOOL WINAPI GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP relationship, PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX buffer, PDWORD pBufLen) +BOOL WINAPI GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP relationship, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *buffer, DWORD *len) { - FIXME("(%u,%p,%p): stub\n", relationship, buffer, pBufLen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status; + + TRACE("(%u,%p,%p)\n", relationship, buffer, len); + + if (!len) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), + buffer, *len, len ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; } /*********************************************************************** diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a6e731c..1ef9530 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2982,9 +2982,15 @@ static void test_GetLogicalProcessorInformationEx(void) } ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, NULL); - ok(!ret, "got %d, error %d\n", ret, GetLastError()); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); len = 0; + ret = pGetLogicalProcessorInformationEx(RelationProcessorCore, NULL, &len); +todo_wine { + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError()); + ok(len > 0, "got %u\n", len); +} + len = 0; ret = pGetLogicalProcessorInformationEx(RelationAll, NULL, &len); todo_wine { ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d, error %d\n", ret, GetLastError()); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 32355cb..96c9c5e 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -687,6 +687,13 @@ static void test_query_logicalprocex(void) return; len = 0; + relationship = RelationProcessorCore; + status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len); +todo_wine { + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got 0x%08x\n", status); + ok(len > 0, "got %u\n", len); +} + len = 0; relationship = RelationAll; status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), NULL, 0, &len); todo_wine {

1 0

Andrew Eikum : ntdll: Implement SystemLogicalProcessorInformationEx.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: d16ff97e7a7bcba578f61f481213fb9810754463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16ff97e7a7bcba578f61f481… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 25 08:47:10 2016 -0600 ntdll: Implement SystemLogicalProcessorInformationEx. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a124064ce5e1c83fa453da5610712b303e65de30) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 5 + dlls/kernel32/tests/process.c | 7 +- dlls/ntdll/nt.c | 606 ++++++++++++++++++++++++++++-------------- dlls/ntdll/tests/info.c | 61 ++++- 4 files changed, 474 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d16ff97e7a7bcba578f61…

1 0

Huw Davies : ole32: The type of the size of IMalloc'ed blocks is SIZE_T.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 88dd534598190aa2fbb79ea508c3f4d0e98b837b URL: http://source.winehq.org/git/wine.git/?a=commit;h=88dd534598190aa2fbb79ea50… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 19 16:19:09 2016 +0000 ole32: The type of the size of IMalloc'ed blocks is SIZE_T. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bf5dca19763f31c6c5abc2d57db944e4549c5a0a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/mimeole.c | 6 +++--- dlls/mapi32/imalloc.c | 10 +++++----- dlls/ole32/ifs.c | 48 +++++++++++++++++++++++++----------------------- include/objbase.h | 4 ++-- include/objidl.idl | 18 +++++++++--------- 5 files changed, 44 insertions(+), 42 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 94fb558..d63da8c 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2821,7 +2821,7 @@ static ULONG WINAPI MimeAlloc_Release( static LPVOID WINAPI MimeAlloc_Alloc( IMimeAllocator* iface, - ULONG cb) + SIZE_T cb) { return CoTaskMemAlloc(cb); } @@ -2829,7 +2829,7 @@ static LPVOID WINAPI MimeAlloc_Alloc( static LPVOID WINAPI MimeAlloc_Realloc( IMimeAllocator* iface, LPVOID pv, - ULONG cb) + SIZE_T cb) { return CoTaskMemRealloc(pv, cb); } @@ -2841,7 +2841,7 @@ static void WINAPI MimeAlloc_Free( CoTaskMemFree(pv); } -static ULONG WINAPI MimeAlloc_GetSize( +static SIZE_T WINAPI MimeAlloc_GetSize( IMimeAllocator* iface, LPVOID pv) { diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index 90f29a1..3e95a6c 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -112,9 +112,9 @@ static ULONG WINAPI IMAPIMalloc_fnRelease(LPMALLOC iface) /************************************************************************** * IMAPIMalloc_Alloc */ -static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb) +static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, SIZE_T cb) { - TRACE("(%p)->(%d)\n", iface, cb); + TRACE("(%p)->(%ld)\n", iface, cb); return LocalAlloc(LMEM_FIXED, cb); } @@ -122,9 +122,9 @@ static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb) /************************************************************************** * IMAPIMalloc_Realloc */ -static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) +static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, SIZE_T cb) { - TRACE("(%p)->(%p, %d)\n", iface, pv, cb); + TRACE("(%p)->(%p, %ld)\n", iface, pv, cb); if (!pv) return LocalAlloc(LMEM_FIXED, cb); @@ -148,7 +148,7 @@ static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv) /************************************************************************** * IMAPIMalloc_GetSize */ -static DWORD WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) +static SIZE_T WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) { TRACE("(%p)->(%p)\n", iface, pv); return LocalSize(pv); diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 696a7b8..6c7a628 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -143,8 +143,8 @@ static BOOL RemoveMemoryLocation(LPCVOID pMem) /****************************************************************************** * IMalloc32_QueryInterface [VTABLE] */ -static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVOID *obj) { - +static HRESULT WINAPI IMalloc_fnQueryInterface(IMalloc *iface, REFIID refiid, void **obj) +{ TRACE("(%s,%p)\n",debugstr_guid(refiid),obj); if (IsEqualIID(&IID_IUnknown,refiid) || IsEqualIID(&IID_IMalloc,refiid)) { @@ -157,21 +157,22 @@ static HRESULT WINAPI IMalloc_fnQueryInterface(LPMALLOC iface,REFIID refiid,LPVO /****************************************************************************** * IMalloc32_AddRefRelease [VTABLE] */ -static ULONG WINAPI IMalloc_fnAddRefRelease (LPMALLOC iface) { +static ULONG WINAPI IMalloc_fnAddRefRelease(IMalloc *iface) +{ return 1; } /****************************************************************************** * IMalloc32_Alloc [VTABLE] */ -static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, DWORD cb) { - - LPVOID addr; +static void * WINAPI IMalloc_fnAlloc(IMalloc *iface, SIZE_T cb) +{ + void *addr; - TRACE("(%d)\n",cb); + TRACE("(%ld)\n",cb); if(Malloc32.pSpy) { - DWORD preAllocResult; + SIZE_T preAllocResult; EnterCriticalSection(&IMalloc32_SpyCS); preAllocResult = IMallocSpy_PreAlloc(Malloc32.pSpy, cb); @@ -198,14 +199,14 @@ static LPVOID WINAPI IMalloc_fnAlloc(LPMALLOC iface, DWORD cb) { /****************************************************************************** * IMalloc32_Realloc [VTABLE] */ -static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { - - LPVOID pNewMemory; +static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb) +{ + void *pNewMemory; - TRACE("(%p,%d)\n",pv,cb); + TRACE("(%p,%ld)\n",pv,cb); if(Malloc32.pSpy) { - LPVOID pRealMemory; + void *pRealMemory; BOOL fSpyed; EnterCriticalSection(&IMalloc32_SpyCS); @@ -250,8 +251,8 @@ static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { /****************************************************************************** * IMalloc32_Free [VTABLE] */ -static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) { - +static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) +{ BOOL fSpyed = FALSE; TRACE("(%p)\n",pv); @@ -286,9 +287,9 @@ static VOID WINAPI IMalloc_fnFree(LPMALLOC iface,LPVOID pv) { * win95: size allocated (4 byte boundarys) * win2k: size originally requested !!! (allocated on 8 byte boundarys) */ -static DWORD WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) { - - DWORD cb; +static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) +{ + SIZE_T cb; BOOL fSpyed = FALSE; TRACE("(%p)\n",pv); @@ -311,8 +312,8 @@ static DWORD WINAPI IMalloc_fnGetSize(LPMALLOC iface,LPVOID pv) { /****************************************************************************** * IMalloc32_DidAlloc [VTABLE] */ -static INT WINAPI IMalloc_fnDidAlloc(LPMALLOC iface,LPVOID pv) { - +static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *pv) +{ BOOL fSpyed = FALSE; int didAlloc; @@ -335,7 +336,8 @@ static INT WINAPI IMalloc_fnDidAlloc(LPMALLOC iface,LPVOID pv) { /****************************************************************************** * IMalloc32_HeapMinimize [VTABLE] */ -static VOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) { +static void WINAPI IMalloc_fnHeapMinimize(IMalloc *iface) +{ TRACE("()\n"); if(Malloc32.pSpy) { @@ -393,7 +395,7 @@ HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC *lpMalloc) * Success: Pointer to newly allocated memory block. * Failure: NULL. */ -LPVOID WINAPI CoTaskMemAlloc(ULONG size) +LPVOID WINAPI CoTaskMemAlloc(SIZE_T size) { return IMalloc_Alloc(&Malloc32.IMalloc_iface,size); } @@ -427,7 +429,7 @@ VOID WINAPI CoTaskMemFree(LPVOID ptr) * Success: Pointer to newly allocated memory block. * Failure: NULL. */ -LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size) +LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, SIZE_T size) { return IMalloc_Realloc(&Malloc32.IMalloc_iface, pvOld, size); } diff --git a/include/objbase.h b/include/objbase.h index 23594ac..d73f220 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -304,9 +304,9 @@ HRESULT WINAPI CoGetInstanceFromFile(COSERVERINFO* pServerInfo, CLSID* pClsid, I HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO* pServerInfo, CLSID* pClsid, IUnknown* punkOuter, DWORD dwClsCtx, IStorage* pstg, DWORD dwCount, MULTI_QI* pResults); HRESULT WINAPI CoGetMalloc(DWORD dwMemContext, LPMALLOC* lpMalloc); -LPVOID WINAPI CoTaskMemAlloc(ULONG size) __WINE_ALLOC_SIZE(1); +LPVOID WINAPI CoTaskMemAlloc(SIZE_T size) __WINE_ALLOC_SIZE(1); void WINAPI CoTaskMemFree(LPVOID ptr); -LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, ULONG size); +LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, SIZE_T size); HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy); HRESULT WINAPI CoRevokeMallocSpy(void); diff --git a/include/objidl.idl b/include/objidl.idl index c18442f..335282d 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -162,16 +162,16 @@ interface IMalloc : IUnknown typedef [unique] IMalloc *LPMALLOC; LPVOID Alloc( - [in] ULONG cb); + [in] SIZE_T cb); LPVOID Realloc( [in] LPVOID pv, - [in] ULONG cb); + [in] SIZE_T cb); void Free( [in] LPVOID pv); - ULONG GetSize( + SIZE_T GetSize( [in] LPVOID pv); int DidAlloc(LPVOID pv); @@ -188,8 +188,8 @@ interface IMallocSpy : IUnknown { typedef [unique] IMallocSpy *LPMALLOCSPY; - ULONG PreAlloc( - [in] ULONG cbRequest); + SIZE_T PreAlloc( + [in] SIZE_T cbRequest); LPVOID PostAlloc( [in] LPVOID pActual); @@ -201,9 +201,9 @@ interface IMallocSpy : IUnknown void PostFree( [in] BOOL fSpyed); - ULONG PreRealloc( + SIZE_T PreRealloc( [in] LPVOID pRequest, - [in] ULONG cbRequest, + [in] SIZE_T cbRequest, [out] LPVOID *ppNewRequest, [in] BOOL fSpyed); @@ -215,8 +215,8 @@ interface IMallocSpy : IUnknown [in] LPVOID pRequest, [in] BOOL fSpyed); - ULONG PostGetSize( - [in] ULONG cbActual, + SIZE_T PostGetSize( + [in] SIZE_T cbActual, [in] BOOL fSpyed); LPVOID PreDidAlloc(

1 0

Nikolay Sivov : ole32: Don't call spy on IMalloc::Free(NULL).
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 1280170c068d8bfae40aee4576bd275f73a32327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1280170c068d8bfae40aee457… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 11:24:30 2016 +0300 ole32: Don't call spy on IMalloc::Free(NULL). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 110665a3d88d68e0076a435c1e6a1522a964942c) Conflicts: dlls/ole32/tests/compobj.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/ifs.c | 3 + dlls/ole32/tests/compobj.c | 135 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 6c7a628..b2c264b 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -257,6 +257,9 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) TRACE("(%p)\n",pv); + if(!pv) + return; + if(Malloc32.pSpy) { EnterCriticalSection(&IMalloc32_SpyCS); fSpyed = RemoveMemoryLocation(pv); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 10eb2fa..bddb5b7 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2664,6 +2664,140 @@ todo_wine { IMalloc_Release(imalloc); } + +static HRESULT WINAPI testspy_QI(IMallocSpy *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMallocSpy) || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMallocSpy_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI testspy_AddRef(IMallocSpy *iface) +{ + return 2; +} + +static ULONG WINAPI testspy_Release(IMallocSpy *iface) +{ + return 1; +} + +static SIZE_T WINAPI testspy_PreAlloc(IMallocSpy *iface, SIZE_T cb) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void* WINAPI testspy_PostAlloc(IMallocSpy *iface, void *ptr) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static void* WINAPI testspy_PreFree(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static void WINAPI testspy_PostFree(IMallocSpy *iface, BOOL spyed) +{ + ok(0, "unexpected call\n"); +} + +static SIZE_T WINAPI testspy_PreRealloc(IMallocSpy *iface, void *ptr, SIZE_T cb, void **newptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void* WINAPI testspy_PostRealloc(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static void* WINAPI testspy_PreGetSize(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static SIZE_T WINAPI testspy_PostGetSize(IMallocSpy *iface, SIZE_T actual, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void* WINAPI testspy_PreDidAlloc(IMallocSpy *iface, void *ptr, BOOL spyed) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static int WINAPI testspy_PostDidAlloc(IMallocSpy *iface, void *ptr, BOOL spyed, int actual) +{ + ok(0, "unexpected call\n"); + return 0; +} + +static void WINAPI testspy_PreHeapMinimize(IMallocSpy *iface) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI testspy_PostHeapMinimize(IMallocSpy *iface) +{ + ok(0, "unexpected call\n"); +} + +static const IMallocSpyVtbl testspyvtbl = +{ + testspy_QI, + testspy_AddRef, + testspy_Release, + testspy_PreAlloc, + testspy_PostAlloc, + testspy_PreFree, + testspy_PostFree, + testspy_PreRealloc, + testspy_PostRealloc, + testspy_PreGetSize, + testspy_PostGetSize, + testspy_PreDidAlloc, + testspy_PostDidAlloc, + testspy_PreHeapMinimize, + testspy_PostHeapMinimize +}; + +static IMallocSpy testspy = { &testspyvtbl }; + +static void test_IMallocSpy(void) +{ + IMalloc *imalloc; + HRESULT hr; + + hr = CoRegisterMallocSpy(&testspy); + ok(hr == S_OK, "got 0x%08x\n", hr); + + imalloc = NULL; + hr = CoGetMalloc(MEMCTX_TASK, &imalloc); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(imalloc != NULL, "got %p\n", imalloc); + + IMalloc_Free(imalloc, NULL); + + IMalloc_Release(imalloc); + + hr = CoRevokeMallocSpy(); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + static void init_funcs(void) { HMODULE hOle32 = GetModuleHandleA("ole32"); @@ -2727,4 +2861,5 @@ START_TEST(compobj) test_CoCreateGuid(); test_CoWaitForMultipleHandles(); test_CoGetMalloc(); + test_IMallocSpy(); }

1 0

Alexandre Julliard : tools: Add a script to update the ANNOUNCE file at release time.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 66bef95ec11d4ac7aec4207eb44726152693eb90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66bef95ec11d4ac7aec4207eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 4 17:53:19 2016 +0900 tools: Add a script to update the ANNOUNCE file at release time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4bc2cbef09be64d719fe1f1bfb1bedbd645b7d77) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/tools/make_announce b/tools/make_announce new file mode 100755 index 0000000..fedbc37 --- /dev/null +++ b/tools/make_announce @@ -0,0 +1,172 @@ +#!/usr/bin/perl -w +# +# Update the ANNOUNCE file for a new release. +# +# Usage: make_announce [new_version] +# +# Copyright 2016 Alexandre Julliard +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +# + +use strict; +use locale; +use POSIX; +use Text::CSV::Encoded; +binmode STDOUT, ':utf8'; + +sub unescape($) +{ + my $str = shift; + $str =~ s/"/\"/g; + $str =~ s/'/\'/g; + $str =~ s/&/&/g; + $str =~ s/</</g; + $str =~ s/>/>/g; + $str =~ s/@/\@/g; + return $str; +} + +# update a file if changed +sub update_file($) +{ + my $file = shift; + if (!(-f $file) || system "cmp $file $file.new >/dev/null") + { + rename "$file.new", "$file"; + print "$file updated\n"; + } + else + { + unlink "$file.new"; + } +} + +# determine the current version number +sub get_current_version() +{ + my $version; + + open VERSION, "<VERSION" or die "cannot open VERSION"; + if (<VERSION> =~ /Wine version (\S+)/) { $version = $1; } + close VERSION; + die "failed to parse VERSION" unless $version; + return $version; +} + +# retrieve a list of bugs with the specified filter +sub get_bugs($) +{ + my $filter = shift; + my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); + my %bugs; + + open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + or die "cannot query bug list"; + <QUERY>; # skip header line + while (<QUERY>) + { + next unless $csv->parse($_); + my ($id, $descr) = $csv->fields(); + $bugs{$id} = $descr; + } + close QUERY; + return %bugs; +} + +# retrieve the current list of authors +sub get_authors() +{ + my %authors; + + open AUTHORS, "<AUTHORS" or die "cannot open AUTHORS"; + <AUTHORS>; # skip header line + while (<AUTHORS>) + { + chomp; + next if /^$/; + $authors{$_} = 1; + } + close AUTHORS; + return %authors; +} + +# determine the version number + +my $old = get_current_version(); +my $new = $ARGV[0]; +unless ($new) +{ + if ($old =~ /^([0-9]+)\.([0-9]+)$/) { $new = "$1.$2.1"; } + elsif ($old =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/) { $new = "$1.$2." . ($3 + 1); } + elsif ($old =~ /^([0-9]+)\.([0-9]+)-rc([0-9]+)$/) { $new = "$1.$2-rc" . ($3 + 1); } + else { die "unknown version format $old"; } +} + +print "Updating files for release $new\n"; + +(my $reldir = $new) =~ s/^([0-9]+\.[0-9]+).*/$1/; +my $is_stable = ($new =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/) && !($2 % 2); # stable releases have an even minor number +my $filter = "product=Wine&resolution=FIXED&" . ($is_stable ? "target_milestone=$reldir.x" : "bug_status=RESOLVED"); + +my %bugs = get_bugs( $filter ); +my %authors = get_authors(); + +# update the ANNOUNCE file + +open ANNOUNCE, "<ANNOUNCE" or die "cannot open ANNOUNCE"; +open NEW, ">ANNOUNCE.new" or die "cannot create ANNOUNCE.new"; +while (<ANNOUNCE>) +{ + last if /^------------------/; + s!http://mirrors.ibiblio.org/wine/source/.*!http://mirrors.ibiblio.org/wine…!; + s!http://dl.winehq.org/wine/source/.*!http://dl.winehq.org/wine/source/$rel…!; + print NEW $_; +} + +print NEW "----------------------------------------------------------------\n\n"; +printf NEW "Bugs fixed in %s (total %u):\n\n", $new, scalar( keys %bugs ); +foreach my $id (sort {$a <=> $b} keys %bugs) +{ + printf NEW " %6d %s\n", $id, unescape( $bugs{$id} ); +} + +print NEW "\n----------------------------------------------------------------\n\n"; +print NEW "Changes since $old:\n\n"; + +open LOG, "-|" or exec "git", "shortlog", "wine-$old..HEAD" or die "cannot run git shortlog"; +while (<LOG>) +{ + if (/^(\S.*)\s$\d+$:$/) { $authors{$1} = 1; } + print NEW $_; +} +close LOG; + +while (<ANNOUNCE>) { last if /^--$/; } +print NEW "--\n"; +while (<ANNOUNCE>) { print NEW $_; } + +close ANNOUNCE; +close NEW; +update_file( "ANNOUNCE" ); + +# update the AUTHORS file + +setlocale( LC_COLLATE, "en_US.UTF-8" ); + +open AUTHORS, ">AUTHORS.new" or die "cannot create AUTHORS.new"; +print AUTHORS "Wine is available thanks to the work of:\n\n", join( "\n", sort keys %authors ), "\n"; +close AUTHORS; +update_file( "AUTHORS" );

1 0

Marcus Meissner : ntdll: Cast left shifted 1 to be ulong wide (Coverity).
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 72828184f25de41376b707f137e971f2f20048e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72828184f25de41376b707f13… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Feb 6 15:30:59 2016 +0100 ntdll: Cast left shifted 1 to be ulong wide (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit de853e2b65e54593e247c1eeac50738078abd386) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/nt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index fba3393..a7c033f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1520,7 +1520,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** fclose(f); } else r = 0; - if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorPackage, r, 1 << i)) + if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorPackage, r, (ULONG_PTR)1 << i)) { fclose(fcpu_list); return STATUS_NO_MEMORY; @@ -1534,7 +1534,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** fclose(f); } else r = i; - if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, r, 1 << i)) + if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, r, (ULONG_PTR)1 << i)) { fclose(fcpu_list); return STATUS_NO_MEMORY;

1 0

Andrew Eikum : ntdll: Initialize variable (Coverity).
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: f9d79dcd73af8bb63b4285b6511372db5f9d6aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9d79dcd73af8bb63b4285b65… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:53:42 2016 -0600 ntdll: Initialize variable (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0df38064c2940275c110274c9880ec4e7b0e8e3d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a7c033f..0a96efe 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2307,7 +2307,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS SystemInformationClass, void *Query, ULONG QueryLength, void *SystemInformation, ULONG Length, ULONG *ResultLength) { - ULONG len; + ULONG len = 0; NTSTATUS ret = STATUS_NOT_IMPLEMENTED; TRACE("(0x%08x,%p,%u,%p,%u,%p) stub\n", SystemInformationClass, Query, QueryLength, SystemInformation,

1 0

Hans Leidekker : winhttp/tests: Fix test failures.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: stable Commit: 23bd4cc385ec2ce080184c693b84a33bdf2c8ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bd4cc385ec2ce080184c693… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 17 10:13:59 2016 +0100 winhttp/tests: Fix test failures. These were introduced with the web server upgrade. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 05a13fb1558f19687f2a22c6566ed81108f5a5e0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9442085..ec204b5 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1004,11 +1004,13 @@ static void test_secure_connection(void) ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); - ok(!ret || proxy_active(), "succeeded unexpectedly\n"); + ok(ret, "failed to receive response %u\n", GetLastError()); - size = 0; - ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); - ok(!ret, "succeeded unexpectedly\n"); + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "header query failed %u\n", GetLastError()); + ok(status == HTTP_STATUS_BAD_REQUEST, "got %u\n", status); WinHttpCloseHandle(req);

1 0