October 2018 - Wine-commits

Francois Gouget : services/tests: Some spelling and duplicate word fixes.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: b8953b2ecef30e367959dc95d9a2df009a06beb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8953b2ecef30e367959dc95… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 22 03:17:06 2018 +0200 services/tests: Some spelling and duplicate word fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index aaae680..5e9265d 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -149,11 +149,11 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR service_ok(r, "GetMonitorInfo failed.\n"); service_ok(mi.rcMonitor.left == 0 && mi.rcMonitor.top == 0 && mi.rcMonitor.right >= 640 && mi.rcMonitor.bottom >= 480, - "Unexepected monitor rcMonitor values: {%d,%d,%d,%d}\n", + "Unexpected monitor rcMonitor values: {%d,%d,%d,%d}\n", mi.rcMonitor.left, mi.rcMonitor.top, mi.rcMonitor.right, mi.rcMonitor.bottom); service_ok(mi.rcWork.left == 0 && mi.rcWork.top == 0 && mi.rcWork.right >= 640 && mi.rcWork.bottom >= 480, - "Unexepected monitor rcWork values: {%d,%d,%d,%d}\n", + "Unexpected monitor rcWork values: {%d,%d,%d,%d}\n", mi.rcWork.left, mi.rcWork.top, mi.rcWork.right, mi.rcWork.bottom); service_ok(!strcmp(mi.szDevice, "WinDisc") || !strcmp(mi.szDevice, "\\\\.\\DISPLAY1"), @@ -164,7 +164,7 @@ static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPAR return TRUE; } -/* query informations monitor information, even in non-interactive services */ +/* query monitor information, even in non-interactive services */ static void test_monitors(void) { BOOL r;

1 0

Francois Gouget : comctl32: Avoid an unneeded lstrlenW() call.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: ab9dccda63f3bfa02e6a9e87dfc2eff4a346cd12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab9dccda63f3bfa02e6a9e87… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 22 03:16:56 2018 +0200 comctl32: Avoid an unneeded lstrlenW() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 6a51ad7..ec3b498 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2435,7 +2435,7 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) btnInfo->btn = nmtb.tbButton; if (!(nmtb.tbButton.fsStyle & BTNS_SEP)) { - if (lstrlenW(nmtb.pszText)) + if (*nmtb.pszText) lstrcpyW(btnInfo->text, nmtb.pszText); else if (nmtb.tbButton.iString >= 0 && nmtb.tbButton.iString < infoPtr->nNumStrings)

1 0

Nikolay Sivov : dxgi: Support IID_IDXGIDevice in dxgi_adapter_CheckInterfaceSupport().
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 2ea796ad71d81503b5e84bc248080857f06d0962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ea796ad71d81503b5e84bc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 22 00:40:40 2018 +0300 dxgi: Support IID_IDXGIDevice in dxgi_adapter_CheckInterfaceSupport(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 3 ++- dlls/dxgi/tests/dxgi.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 4bc57a2..0079759 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -218,7 +218,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda TRACE("iface %p, guid %s, umd_version %p.\n", iface, debugstr_guid(guid), umd_version); /* This method works only for D3D10 interfaces. */ - if (!(IsEqualGUID(guid, &IID_ID3D10Device) + if (!(IsEqualGUID(guid, &IID_IDXGIDevice) + || IsEqualGUID(guid, &IID_ID3D10Device) || IsEqualGUID(guid, &IID_ID3D10Device1))) { WARN("Returning DXGI_ERROR_UNSUPPORTED for %s.\n", debugstr_guid(guid)); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f2bc9ed..bd5c574 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -838,6 +838,10 @@ static void test_check_interface_support(void) hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, &driver_version); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, &driver_version);

1 0

Nikolay Sivov : kernel32/tests: Remove workarounds for SearchPath().
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 6a106ac9bf5f14eb05a9d42106674b13a9d2bc59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a106ac9bf5f14eb05a9d421… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 22 11:39:35 2018 +0300 kernel32/tests: Remove workarounds for SearchPath(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 64 +++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index df91b31..1f3d385 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -70,8 +70,6 @@ static DWORD (WINAPI *pGetLongPathNameW)(LPWSTR,LPWSTR,DWORD); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathA)(LPCSTR); static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); -static DWORD (WINAPI *pSearchPathA)(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*); -static DWORD (WINAPI *pSearchPathW)(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); static BOOL (WINAPI *pSetSearchPathMode)(DWORD); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); @@ -1828,24 +1826,18 @@ static void test_SearchPathA(void) HANDLE handle; DWORD ret; - if (!pSearchPathA) - { - win_skip("SearchPathA isn't available\n"); - return; - } - GetWindowsDirectoryA(pathA, ARRAY_SIZE(pathA)); /* NULL filename */ SetLastError(0xdeadbeef); - ret = pSearchPathA(pathA, NULL, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); + ret = SearchPathA(pathA, NULL, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); /* empty filename */ SetLastError(0xdeadbeef); - ret = pSearchPathA(pathA, fileA, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); + ret = SearchPathA(pathA, fileA, NULL, ARRAY_SIZE(buffA), buffA, &ptrA); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); @@ -1861,38 +1853,38 @@ static void test_SearchPathA(void) delete_manifest_file("main.manifest"); /* search fails without active context */ - ret = pSearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret == 0, "got %d\n", ret); - ret = pSearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(path2A), path2A, NULL); ok(ret && ret == strlen(path2A), "got %d\n", ret); ret = pActivateActCtx(handle, &cookie); ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ - ret = pSearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep.dll", ".ext", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep.dll", ".ext", ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep", ".dll", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep", ".dll", ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); - ret = pSearchPathA(NULL, "testdep", ".ext", ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, "testdep", ".ext", ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* name contains path */ - ret = pSearchPathA(NULL, testdeprelA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, testdeprelA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* fails with specified path that doesn't contain this file */ - ret = pSearchPathA(pathA, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(pathA, testdepA, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(!ret, "got %d\n", ret); /* path is redirected for wellknown names too */ - ret = pSearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(buffA), buffA, NULL); + ret = SearchPathA(NULL, kernel32A, NULL, ARRAY_SIZE(buffA), buffA, NULL); ok(ret && ret == strlen(buffA), "got %d\n", ret); ok(strcmp(buffA, path2A), "got wrong path %s, %s\n", buffA, path2A); @@ -1918,23 +1910,17 @@ static void test_SearchPathW(void) HANDLE handle; DWORD ret; - if (!pSearchPathW) - { - win_skip("SearchPathW isn't available\n"); - return; - } - if (0) { /* NULL filename, crashes on nt4 */ - pSearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); + SearchPathW(pathW, NULL, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); } GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); /* empty filename */ SetLastError(0xdeadbeef); - ret = pSearchPathW(pathW, fileW, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); + ret = SearchPathW(pathW, fileW, NULL, ARRAY_SIZE(buffW), buffW, &ptrW); ok(ret == 0, "Expected failure, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); @@ -1950,15 +1936,15 @@ if (0) delete_manifest_file("main.manifest"); /* search fails without active context */ - ret = pSearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret == 0, "got %d\n", ret); - ret = pSearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(path2W), path2W, NULL); + ret = SearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(path2W), path2W, NULL); ok(ret && ret == lstrlenW(path2W), "got %d\n", ret); /* full path, name without 'dll' extension */ GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); - ret = pSearchPathW(pathW, kernel32W, NULL, ARRAY_SIZE(path2W), path2W, NULL); + ret = SearchPathW(pathW, kernel32W, NULL, ARRAY_SIZE(path2W), path2W, NULL); ok(ret == 0, "got %d\n", ret); GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); @@ -1967,33 +1953,33 @@ if (0) ok(ret, "failed to activate context, %u\n", GetLastError()); /* works when activated */ - ret = pSearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdepW, extW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdepW, extW, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdep1W, dllW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdep1W, dllW, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); - ret = pSearchPathW(NULL, testdep1W, extW, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdep1W, extW, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* name contains path */ - ret = pSearchPathW(NULL, testdeprelW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, testdeprelW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* fails with specified path that doesn't contain this file */ - ret = pSearchPathW(pathW, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(pathW, testdepW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(!ret, "got %d\n", ret); /* path is redirected for wellknown names too, meaning it takes precedence over normal search order */ - ret = pSearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, kernel32dllW, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); ok(lstrcmpW(buffW, path2W), "got wrong path %s, %s\n", wine_dbgstr_w(buffW), wine_dbgstr_w(path2W)); /* path is built using on manifest file name */ - ret = pSearchPathW(NULL, ole32W, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ret = SearchPathW(NULL, ole32W, NULL, ARRAY_SIZE(buffW), buffW, NULL); ok(ret && ret == lstrlenW(buffW), "got %d\n", ret); ret = pDeactivateActCtx(0, cookie); @@ -2134,8 +2120,6 @@ static void init_pointers(void) MAKEFUNC(GetLongPathNameW); MAKEFUNC(NeedCurrentDirectoryForExePathA); MAKEFUNC(NeedCurrentDirectoryForExePathW); - MAKEFUNC(SearchPathA); - MAKEFUNC(SearchPathW); MAKEFUNC(SetSearchPathMode); MAKEFUNC(ActivateActCtx); MAKEFUNC(CreateActCtxW);

1 0

Nikolay Sivov : kernel32/tests: Add SearchPath() test for file name with multiple extension delimiters.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: d75f2fc3c746a67c5a9caa2ee728b2f8c5a8fb27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d75f2fc3c746a67c5a9caa2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 22 11:39:36 2018 +0300 kernel32/tests: Add SearchPath() test for file name with multiple extension delimiters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 1f3d385..0a03225 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1842,9 +1842,33 @@ static void test_SearchPathA(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); + GetTempPathA(ARRAY_SIZE(pathA), pathA); + strcpy(path2A, pathA); + strcat(path2A, "testfile.ext.ext2"); + + handle = CreateFileA(path2A, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "Failed to create test file.\n"); + CloseHandle(handle); + + buffA[0] = 0; + ret = SearchPathA(pathA, "testfile.ext", NULL, ARRAY_SIZE(buffA), buffA, NULL); + ok(!ret, "Unexpected return value %u.\n", ret); + + buffA[0] = 0; + ret = SearchPathA(pathA, "testfile.ext", ".ext2", ARRAY_SIZE(buffA), buffA, NULL); + ok(!ret, "Unexpected return value %u.\n", ret); + + buffA[0] = 0; + ret = SearchPathA(pathA, "testfile.ext.ext2", NULL, ARRAY_SIZE(buffA), buffA, NULL); + ok(ret && ret == strlen(path2A), "got %d\n", ret); + + DeleteFileA(path2A); + if (!pActivateActCtx) return; + GetWindowsDirectoryA(pathA, ARRAY_SIZE(pathA)); + create_manifest_file("testdep1.manifest", manifest_dep); create_manifest_file("main.manifest", manifest_main); @@ -1895,12 +1919,15 @@ static void test_SearchPathA(void) static void test_SearchPathW(void) { + static const WCHAR fileext2W[] = {'t','e','s','t','f','i','l','e','.','e','x','t','.','e','x','t','2',0}; + static const WCHAR fileextW[] = {'t','e','s','t','f','i','l','e','.','e','x','t',0}; static const WCHAR testdeprelW[] = {'.','/','t','e','s','t','d','e','p','.','d','l','l',0}; static const WCHAR testdepW[] = {'t','e','s','t','d','e','p','.','d','l','l',0}; static const WCHAR testdep1W[] = {'t','e','s','t','d','e','p',0}; static const WCHAR kernel32dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; static const WCHAR ole32W[] = {'o','l','e','3','2',0}; + static const WCHAR ext2W[] = {'.','e','x','t','2',0}; static const WCHAR extW[] = {'.','e','x','t',0}; static const WCHAR dllW[] = {'.','d','l','l',0}; static const WCHAR fileW[] = { 0 }; @@ -1925,9 +1952,33 @@ if (0) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); + GetTempPathW(ARRAY_SIZE(pathW), pathW); + lstrcpyW(path2W, pathW); + lstrcatW(path2W, fileext2W); + + handle = CreateFileW(path2W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "Failed to create test file.\n"); + CloseHandle(handle); + + buffW[0] = 0; + ret = SearchPathW(pathW, fileextW, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ok(!ret, "Unexpected return value %u.\n", ret); + + buffW[0] = 0; + ret = SearchPathW(pathW, fileextW, ext2W, ARRAY_SIZE(buffW), buffW, NULL); + ok(!ret, "Unexpected return value %u.\n", ret); + + buffW[0] = 0; + ret = SearchPathW(pathW, fileext2W, NULL, ARRAY_SIZE(buffW), buffW, NULL); + ok(ret && ret == lstrlenW(path2W), "got %d\n", ret); + + DeleteFileW(path2W); + if (!pActivateActCtx) return; + GetWindowsDirectoryW(pathW, ARRAY_SIZE(pathW)); + create_manifest_file("testdep1.manifest", manifest_dep); create_manifest_file("main.manifest", manifest_main);

1 0

Nikolay Sivov : powrprof: Add PowerDeterminePlatformRoleEx() stub.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 0ba95f333f7cd4ab2d97575115e8507881234e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ba95f333f7cd4ab2d975751… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 22 11:51:20 2018 +0300 powrprof: Add PowerDeterminePlatformRoleEx() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec | 2 +- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec b/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec index 6591096..e51426c 100644 --- a/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec +++ b/dlls/api-ms-win-power-base-l1-1-0/api-ms-win-power-base-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall CallNtPowerInformation(long ptr long ptr long) powrprof.CallNtPowerInformation @ stdcall GetPwrCapabilities(ptr) powrprof.GetPwrCapabilities -@ stub PowerDeterminePlatformRoleEx +@ stdcall PowerDeterminePlatformRoleEx(long) powrprof.PowerDeterminePlatformRoleEx @ stub PowerRegisterSuspendResumeNotification @ stub PowerUnregisterSuspendResumeNotification diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 1597d96..d870fe2 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -321,6 +321,12 @@ POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) return PlatformRoleDesktop; } +POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRoleEx(ULONG version) +{ + FIXME("%u stub.\n", version); + return PlatformRoleDesktop; +} + DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, POWER_DATA_ACCESSOR flags, ULONG index, UCHAR *buffer, DWORD *buffer_size) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index a9e337a..169219a 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -11,6 +11,7 @@ @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () @ stdcall PowerDeterminePlatformRole () +@ stdcall PowerDeterminePlatformRoleEx(long) @ stdcall PowerEnumerate(long ptr ptr long long ptr ptr) @ stdcall PowerGetActiveScheme (ptr ptr) @ stdcall PowerSetActiveScheme (ptr ptr)

1 0

Nikolay Sivov : kernel32: Add GetProcessMitigationPolicy() stub.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 7d1cef5409cda64a419a11444933184109378df9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d1cef5409cda64a419a1144… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 22 11:51:49 2018 +0300 kernel32: Add GetProcessMitigationPolicy() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 616fa63..22a091a 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -22,7 +22,7 @@ @ stdcall GetProcessHandleCount(long ptr) kernel32.GetProcessHandleCount @ stdcall GetProcessId(long) kernel32.GetProcessId @ stdcall GetProcessIdOfThread(long) kernel32.GetProcessIdOfThread -@ stub GetProcessMitigationPolicy +@ stdcall GetProcessMitigationPolicy(long long ptr long) kernel32.GetProcessMitigationPolicy @ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes @ stdcall GetProcessVersion(long) kernel32.GetProcessVersion @ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 8de6c5b..180ec48 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -22,7 +22,7 @@ @ stdcall GetProcessHandleCount(long ptr) kernel32.GetProcessHandleCount @ stdcall GetProcessId(long) kernel32.GetProcessId @ stdcall GetProcessIdOfThread(long) kernel32.GetProcessIdOfThread -@ stub GetProcessMitigationPolicy +@ stdcall GetProcessMitigationPolicy(long long ptr long) kernel32.GetProcessMitigationPolicy @ stdcall GetProcessPriorityBoost(long ptr) kernel32.GetProcessPriorityBoost @ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes @ stdcall GetProcessVersion(long) kernel32.GetProcessVersion diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 52120dd..afd44df 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -786,6 +786,7 @@ @ stdcall GetProcessId(long) @ stdcall GetProcessIdOfThread(long) @ stdcall GetProcessIoCounters(long ptr) +@ stdcall GetProcessMitigationPolicy(long long ptr long) # @ stub GetProcessPreferredUILanguages @ stdcall GetProcessPriorityBoost(long ptr) @ stdcall GetProcessShutdownParameters(ptr ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f9456ae..c3dc113 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4701,3 +4701,13 @@ BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY policy, void *b return TRUE; } + +/********************************************************************** + * GetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI GetProcessMitigationPolicy(HANDLE hProcess, PROCESS_MITIGATION_POLICY policy, void *buffer, SIZE_T length) +{ + FIXME("(%p, %u, %p, %lu): stub\n", hProcess, policy, buffer, length); + + return TRUE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7fa8c1d..e12f14b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -631,7 +631,7 @@ # @ stub GetProcessImageFileNameW # @ stub GetProcessInformation # @ stub GetProcessMemoryInfo -# @ stub GetProcessMitigationPolicy +@ stdcall GetProcessMitigationPolicy(long long ptr long) kernel32.GetProcessMitigationPolicy @ stub GetProcessPreferredUILanguages @ stdcall GetProcessPriorityBoost(long ptr) kernel32.GetProcessPriorityBoost @ stdcall GetProcessShutdownParameters(ptr ptr) kernel32.GetProcessShutdownParameters

1 0

Alexandre Julliard : server: Add a separate request to exec a new process.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: a77ef5c44345701eca6fbbf065e0de3b8f88b6b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a77ef5c44345701eca6fbbf0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 11:44:25 2018 +0200 server: Add a separate request to exec a new process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 3 +-- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/process.c | 43 ++++++++++++++++++++++++++++++++---------- server/protocol.def | 8 ++++++++ server/request.h | 6 ++++++ server/trace.c | 10 ++++++++++ 6 files changed, 76 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c3dc113..d0f269c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2228,9 +2228,8 @@ static BOOL create_process( HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ { wine_server_send_fd( socketfd[1] ); close( socketfd[1] ); - SERVER_START_REQ( new_process ) + SERVER_START_REQ( exec_process ) { - req->create_flags = flags; req->socket_fd = socketfd[1]; req->exe_file = wine_server_obj_handle( hFile ); req->cpu = pe_info->cpu; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d3aa8e2..76d5f79 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -745,6 +745,20 @@ struct new_process_reply +struct exec_process_request +{ + struct request_header __header; + int socket_fd; + obj_handle_t exe_file; + cpu_type_t cpu; +}; +struct exec_process_reply +{ + struct reply_header __header; +}; + + + struct get_new_process_info_request { struct request_header __header; @@ -5632,6 +5646,7 @@ struct terminate_job_reply enum request { REQ_new_process, + REQ_exec_process, REQ_get_new_process_info, REQ_new_thread, REQ_get_startup_info, @@ -5928,6 +5943,7 @@ union generic_request struct request_max_size max_size; struct request_header request_header; struct new_process_request new_process_request; + struct exec_process_request exec_process_request; struct get_new_process_info_request get_new_process_info_request; struct new_thread_request new_thread_request; struct get_startup_info_request get_startup_info_request; @@ -6222,6 +6238,7 @@ union generic_reply struct request_max_size max_size; struct reply_header reply_header; struct new_process_reply new_process_reply; + struct exec_process_reply exec_process_reply; struct get_new_process_info_reply get_new_process_info_reply; struct new_thread_reply new_thread_reply; struct get_startup_info_reply get_startup_info_reply; @@ -6512,6 +6529,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 567 +#define SERVER_PROTOCOL_VERSION 568 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index b512141..b609a62 100644 --- a/server/process.c +++ b/server/process.c @@ -1112,16 +1112,6 @@ DECL_HANDLER(new_process) return; } - if (!req->info_size) /* create an orphaned process */ - { - if ((process = create_process( socket_fd, NULL, 0, sd ))) - { - create_thread( -1, process, NULL ); - release_object( process ); - } - return; - } - /* build the startup info for a new process */ if (!(info = alloc_object( &startup_info_ops ))) { @@ -1238,6 +1228,39 @@ DECL_HANDLER(new_process) release_object( info ); } +/* execute a new process, replacing the existing one */ +DECL_HANDLER(exec_process) +{ + struct process *process; + int socket_fd = thread_get_inflight_fd( current, req->socket_fd ); + + if (socket_fd == -1) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + if (fcntl( socket_fd, F_SETFL, O_NONBLOCK ) == -1) + { + set_error( STATUS_INVALID_HANDLE ); + close( socket_fd ); + return; + } + if (shutdown_stage) + { + set_error( STATUS_SHUTDOWN_IN_PROGRESS ); + close( socket_fd ); + return; + } + if (!is_cpu_supported( req->cpu )) + { + close( socket_fd ); + return; + } + if (!(process = create_process( socket_fd, NULL, 0, NULL ))) return; + create_thread( -1, process, NULL ); + release_object( process ); +} + /* Retrieve information about a newly started process */ DECL_HANDLER(get_new_process_info) { diff --git a/server/protocol.def b/server/protocol.def index d849f73..96cb2d3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -754,6 +754,14 @@ struct rawinput_device @END +/* Execute a process, replacing the current one */ +(a)REQ(exec_process) + int socket_fd; /* file descriptor for process socket */ + obj_handle_t exe_file; /* file handle for main exe */ + cpu_type_t cpu; /* CPU that the new process will use */ +(a)END + + /* Retrieve information about a newly started process */ @REQ(get_new_process_info) obj_handle_t info; /* info handle returned from new_process_request */ diff --git a/server/request.h b/server/request.h index 5044bf3..3719bbd 100644 --- a/server/request.h +++ b/server/request.h @@ -113,6 +113,7 @@ static inline void set_reply_data_ptr( void *data, data_size_t size ) /* ### make_requests begin ### */ DECL_HANDLER(new_process); +DECL_HANDLER(exec_process); DECL_HANDLER(get_new_process_info); DECL_HANDLER(new_thread); DECL_HANDLER(get_startup_info); @@ -408,6 +409,7 @@ typedef void (*req_handler)( const void *req, void *reply ); static const req_handler req_handlers[REQ_NB_REQUESTS] = { (req_handler)req_new_process, + (req_handler)req_exec_process, (req_handler)req_get_new_process_info, (req_handler)req_new_thread, (req_handler)req_get_startup_info, @@ -740,6 +742,10 @@ C_ASSERT( FIELD_OFFSET(struct new_process_reply, info) == 8 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, handle) == 16 ); C_ASSERT( sizeof(struct new_process_reply) == 24 ); +C_ASSERT( FIELD_OFFSET(struct exec_process_request, socket_fd) == 12 ); +C_ASSERT( FIELD_OFFSET(struct exec_process_request, exe_file) == 16 ); +C_ASSERT( FIELD_OFFSET(struct exec_process_request, cpu) == 20 ); +C_ASSERT( sizeof(struct exec_process_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_new_process_info_request, info) == 12 ); C_ASSERT( sizeof(struct get_new_process_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_new_process_info_reply, success) == 8 ); diff --git a/server/trace.c b/server/trace.c index 36d3021..087e3dd 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1246,6 +1246,13 @@ static void dump_new_process_reply( const struct new_process_reply *req ) fprintf( stderr, ", handle=%04x", req->handle ); } +static void dump_exec_process_request( const struct exec_process_request *req ) +{ + fprintf( stderr, " socket_fd=%d", req->socket_fd ); + fprintf( stderr, ", exe_file=%04x", req->exe_file ); + dump_cpu_type( ", cpu=", &req->cpu ); +} + static void dump_get_new_process_info_request( const struct get_new_process_info_request *req ) { fprintf( stderr, " info=%04x", req->info ); @@ -4529,6 +4536,7 @@ static void dump_terminate_job_request( const struct terminate_job_request *req static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, + (dump_func)dump_exec_process_request, (dump_func)dump_get_new_process_info_request, (dump_func)dump_new_thread_request, (dump_func)dump_get_startup_info_request, @@ -4821,6 +4829,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_reply, + NULL, (dump_func)dump_get_new_process_info_reply, (dump_func)dump_new_thread_reply, (dump_func)dump_get_startup_info_reply, @@ -5113,6 +5122,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { static const char * const req_names[REQ_NB_REQUESTS] = { "new_process", + "exec_process", "get_new_process_info", "new_thread", "get_startup_info",

1 0

Alexandre Julliard : server: Pass a process as parent to create_process().
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: bff32557035edc090246272d731e95b03a9bade0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bff32557035edc090246272d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 11:44:38 2018 +0200 server: Pass a process as parent to create_process(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 7 +++---- server/process.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/server/process.c b/server/process.c index b609a62..3bd545a 100644 --- a/server/process.c +++ b/server/process.c @@ -484,7 +484,7 @@ static void start_sigkill_timer( struct process *process ) /* create a new process */ /* if the function fails the fd is closed */ -struct process *create_process( int fd, struct thread *parent_thread, int inherit_all, +struct process *create_process( int fd, struct process *parent, int inherit_all, const struct security_descriptor *sd ) { struct process *process; @@ -547,7 +547,7 @@ struct process *create_process( int fd, struct thread *parent_thread, int inheri if (!(process->msg_fd = create_anonymous_fd( &process_fd_ops, fd, &process->obj, 0 ))) goto error; /* create the handle table */ - if (!parent_thread) + if (!parent) { process->handles = alloc_handle_table( process, 0 ); process->token = token_create_admin(); @@ -555,7 +555,6 @@ struct process *create_process( int fd, struct thread *parent_thread, int inheri } else { - struct process *parent = parent_thread->process; process->parent_id = parent->id; process->handles = inherit_all ? copy_handle_table( process, parent ) : alloc_handle_table( process, 0 ); @@ -1162,7 +1161,7 @@ DECL_HANDLER(new_process) #undef FIXUP_LEN } - if (!(process = create_process( socket_fd, current, req->inherit_all, sd ))) goto done; + if (!(process = create_process( socket_fd, parent, req->inherit_all, sd ))) goto done; process->startup_info = (struct startup_info *)grab_object( info ); diff --git a/server/process.h b/server/process.h index a12d523..4566a04 100644 --- a/server/process.h +++ b/server/process.h @@ -115,7 +115,7 @@ struct process_snapshot extern unsigned int alloc_ptid( void *ptr ); extern void free_ptid( unsigned int id ); extern void *get_ptid_entry( unsigned int id ); -extern struct process *create_process( int fd, struct thread *parent_thread, int inherit_all, +extern struct process *create_process( int fd, struct process *parent, int inherit_all, const struct security_descriptor *sd ); extern data_size_t init_process( struct thread *thread ); extern struct thread *get_process_first_thread( struct process *process );

1 0

Alexandre Julliard : kernel32: Separate the exec process functionality.
by Alexandre Julliard 22 Oct '18

22 Oct '18

Module: wine Branch: master Commit: 7e965140292cbcdfec439fe4f5600ffb3a7d182b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e965140292cbcdfec439fe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 22 11:45:54 2018 +0200 kernel32: Separate the exec process functionality. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 222 +++++++++++++++++++++++++++++++----------------- 1 file changed, 146 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e965140292cbcdfec43…

1 0