November 2018 - Wine-devel - list.winehq.org

[PATCH v2] kernel32: Implement GetMaximumProcessorCount
by Alex Henrie 12 Nov '18

12 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45961 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Remove accidentally included tests for GetActiveProcessorCount and implement GetMaximumProcessorCount in a hopefully more correct way by copying the current implementation of GetActiveProcessorCount --- dlls/kernel32/cpu.c | 15 +++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 1e99951993..89482a65e1 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -328,6 +328,21 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) return cpus; } +/*********************************************************************** + * GetMaximumProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetMaximumProcessorCount(WORD group) +{ + SYSTEM_INFO si; + DWORD cpus; + + GetSystemInfo( &si ); + cpus = si.dwNumberOfProcessors; + + FIXME("semi-stub, returning %u\n", cpus); + return cpus; +} + /*********************************************************************** * GetEnabledXStateFeatures (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 74af2a4570..c370a068c2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -718,7 +718,7 @@ # @ stub GetLongPathNameTransactedW @ stdcall GetLongPathNameW (wstr long long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) -# @ stub GetMaximumProcessorCount +@ stdcall GetMaximumProcessorCount(long) # @ stub GetMaximumProcessorGroupCount @ stdcall GetModuleFileNameA(long ptr long) @ stdcall GetModuleFileNameW(long ptr long) -- 2.19.1

1 0

[PATCH] kernel32: Implement GetMaximumProcessorCount
by Alex Henrie 12 Nov '18

12 Nov '18

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45961 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- https://github.com/wine-staging/wine-staging/blob/master/patches/kernel32-P… --- dlls/kernel32/cpu.c | 17 +++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/process.c | 23 +++++++++++++++++++++++ include/winnt.h | 2 ++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 1e99951993..452f3789c0 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -328,6 +328,23 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) return cpus; } +/*********************************************************************** + * GetMaximumProcessorCount (KERNEL32.@) + */ +DWORD WINAPI GetMaximumProcessorCount(WORD group) +{ + TRACE("(%u)\n", group); + + if (group && group != ALL_PROCESSOR_GROUPS) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + /* Wine only counts active processors so far */ + return system_info.NumberOfProcessors; +} + /*********************************************************************** * GetEnabledXStateFeatures (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 74af2a4570..c370a068c2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -718,7 +718,7 @@ # @ stub GetLongPathNameTransactedW @ stdcall GetLongPathNameW (wstr long long) @ stdcall GetMailslotInfo(long ptr ptr ptr ptr) -# @ stub GetMaximumProcessorCount +@ stdcall GetMaximumProcessorCount(long) # @ stub GetMaximumProcessorGroupCount @ stdcall GetModuleFileNameA(long ptr long) @ stdcall GetModuleFileNameW(long ptr long) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9f99720f32..850495bff7 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -91,6 +91,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void); static BOOL (WINAPI *pInitializeProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD, SIZE_T*); static BOOL (WINAPI *pUpdateProcThreadAttribute)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD_PTR, void *,SIZE_T,void*,SIZE_T*); static void (WINAPI *pDeleteProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*); +static DWORD (WINAPI *pGetActiveProcessorCount)(WORD); /* ############################### */ static char base[MAX_PATH]; @@ -258,6 +259,7 @@ static BOOL init(void) pInitializeProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "InitializeProcThreadAttributeList"); pUpdateProcThreadAttribute = (void *)GetProcAddress(hkernel32, "UpdateProcThreadAttribute"); pDeleteProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "DeleteProcThreadAttributeList"); + pGetActiveProcessorCount = (void *)GetProcAddress(hkernel32, "GetActiveProcessorCount"); return TRUE; } @@ -3655,6 +3657,26 @@ static void test_GetLogicalProcessorInformationEx(void) HeapFree(GetProcessHeap(), 0, info); } +static void test_GetActiveProcessorCount(void) +{ + DWORD count; + + if (!pGetActiveProcessorCount) + { + win_skip("GetActiveProcessorCount not available, skipping test\n"); + return; + } + + count = pGetActiveProcessorCount(0); + ok(count, "GetActiveProcessorCount failed, error %u\n", GetLastError()); + + /* Test would fail on systems with more than 6400 processors */ + SetLastError(0xdeadbeef); + count = pGetActiveProcessorCount(101); + ok(count == 0, "Expeced GetActiveProcessorCount to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); +} + static void test_largepages(void) { SIZE_T size; @@ -3868,6 +3890,7 @@ START_TEST(process) test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx(); + test_GetActiveProcessorCount(); test_largepages(); test_ProcThreadAttributeList(); test_SuspendProcessState(); diff --git a/include/winnt.h b/include/winnt.h index b8a630e6d3..d801de9df9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6089,6 +6089,8 @@ typedef struct _GROUP_AFFINITY WORD Reserved[3]; } GROUP_AFFINITY, *PGROUP_AFFINITY; +#define ALL_PROCESSOR_GROUPS 0xffff + typedef struct _PROCESSOR_NUMBER { WORD Group; -- 2.19.1

2 1

[PATCH] dbghelp: Turn variable 'code' into a static constant
by Alex Henrie 12 Nov '18

12 Nov '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/dbghelp/minidump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 1a5dca9de6..975bb45c9a 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -670,7 +670,7 @@ static unsigned dump_system_info(struct dump_context* dc) /* write Wine specific system information just behind the structure, and before any string */ if (wine_extra) { - char code[] = {'W','I','N','E'}; + static const char code[] = {'W','I','N','E'}; WriteFile(dc->hFile, code, 4, &written, NULL); /* number of sub-info, so that we can extend structure if needed */ -- 2.19.1

1 0

[PATCH] d3dcompiler_43: Turn variable 'c' into a static constant
by Alex Henrie 12 Nov '18

12 Nov '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/d3dcompiler_43/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 748501f207..bda41c4ea9 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2176,7 +2176,7 @@ static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) } else { - char c[] = {'x', 'y', 'z', 'w'}; + static const char c[] = {'x', 'y', 'z', 'w'}; for (i = 0; i < swizzle->node.data_type->dimx; ++i) TRACE("%c", c[(swizzle->swizzle >> i * 2) & 0x3]); -- 2.19.1

1 0

[PATCH] atl: Turn variable 'mshtml_prefixW' into a static constant
by Alex Henrie 12 Nov '18

12 Nov '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/atl/atl_ax.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index ff627ccddb..81212780e0 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1001,9 +1001,9 @@ enum content static enum content get_content_type(LPCOLESTR name, CLSID *control_id) { + static const WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':',0}; WCHAR new_urlW[MAX_PATH]; DWORD size = MAX_PATH; - WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':','\0'}; if (!name || !name[0]) { -- 2.19.1

1 0

[PATCH] testbot/TestLauncher: Remove a dependency on msvcrt.
by Francois Gouget 12 Nov '18

12 Nov '18

Use MAX_PATH instead of _MAX_PATH. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/TestLauncher/TestLauncher.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 3052198228..15929c50ab 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -102,7 +102,7 @@ static BOOL AllImportedDllsPresent(const char *TestExeName, const char *Subtest) DWORD NR; DWORD NewPos; DWORD FileOffset; - char ModuleName[_MAX_PATH]; + char ModuleName[MAX_PATH]; BOOL Found; BOOL AllPresent; @@ -284,10 +284,10 @@ int main(int argc, char *argv[]) int Arg; DWORD Start, TimeOut; BOOL UsageError; - char TestExeFullName[_MAX_PATH]; + char TestExeFullName[MAX_PATH]; char *TestExeFileName; const char *Suffix; - char TestName[_MAX_PATH]; + char TestName[MAX_PATH]; const char *Subtest; int TestArg; char *CommandLine; -- 2.19.1

1 0

[PATCH] widl: Don't make proxy vtbl const in interpreted mode.
by Jacek Caban 11 Nov '18

11 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/proxy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH] widl: Write async interface IIDs to _i.c file.
by Jacek Caban 11 Nov '18

11 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/widl.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH v2 2/3] comctl32/status: Hide size grip when the parent window is maximized.
by Waritnan Sookbuntherng 11 Nov '18

11 Nov '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- dlls/comctl32/status.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index cb27ee868c..3bf72fa577 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -284,7 +284,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) SelectObject (hdc, hOldFont); - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) STATUSBAR_DrawSizeGrip (theme, hdc, &rect); return 0; @@ -997,7 +998,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) static BOOL STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) { - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) { RECT rect; POINT pt; -- 2.19.1

2 1

[PATCH v2 1/3] comctl32/tests: Test statusbar size grip behavior.
by Waritnan Sookbuntherng 11 Nov '18

11 Nov '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- dlls/comctl32/tests/status.c | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d78bd20262..483b227a3e 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -586,6 +586,62 @@ static void test_notify(void) ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); } +static void test_sizegrip(void) +{ + HWND hwndStatus; + int r; + LONG oldstyle; + RECT rc; + POINT pt; + LPARAM lParam; + + hwndStatus = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, + 0, 0, 100, 100, g_hMainWnd, NULL, NULL, NULL); + + GetClientRect(hwndStatus, &rc); + + /* get bottom right of the window */ + pt.x = rc.right; + pt.y = rc.bottom; + ClientToScreen(hwndStatus, &pt); + lParam = MAKELPARAM(pt.x, pt.y); + + /* check size grip on bottom right */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, lParam); + ok(r == HTBOTTOMRIGHT, "expected HTBOTTOMRIGHT from WM_NCHITTEST, got %d\n", r); + + /* maximize the main window */ + oldstyle = GetWindowLongPtrA(g_hMainWnd, GWL_STYLE); + SetWindowLongA(g_hMainWnd, GWL_STYLE, oldstyle|WS_MAXIMIZE); + + /* check size grip again */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, lParam); + ok(r != HTBOTTOMRIGHT, "WM_NCHITTEST returned HTBOTTOMRIGHT\n"); + + /* set WS_EX_LAYOUTRTL which move size grip to the left */ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); + + /* check size grip on bottom left */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, lParam); + ok(r != HTBOTTOMLEFT, "WM_NCHITTEST returned HTBOTTOMLEFT\n"); + + /* unset WS_MAXIMIZE */ + SetWindowLongA(g_hMainWnd, GWL_STYLE, oldstyle & ~WS_MAXIMIZE); + + /* get new bottom left point */ + pt.x = rc.right; + pt.y = rc.bottom; + ClientToScreen(hwndStatus, &pt); + lParam = MAKELPARAM(pt.x, pt.y); + + /* check size grip again */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, lParam); + ok(r == HTBOTTOMLEFT, "expected HTBOTTOMLEFT from WM_NCHITTEST, got %d\n", r); + + SetWindowLongA(g_hMainWnd, GWL_STYLE, oldstyle); + DestroyWindow(hwndStatus); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -620,4 +676,5 @@ START_TEST(status) test_status_ownerdraw(); test_gettext(); test_notify(); + test_sizegrip(); } -- 2.19.1

2 1