October 2018 - Wine-Commits

Francois Gouget : po: Remove a stray line in the Chinese (PRC) translation.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: 905ad724e67c052b2db8cdff001631e881e3d2e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=905ad724e67c052b2db8cdff… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 22 03:13:31 2018 +0200 po: Remove a stray line in the Chinese (PRC) translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 2e1b4c7..982121a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -10729,9 +10729,7 @@ msgstr "Verify 处于 %1 状态\n" #: cmd.rc:390 msgid "Verify must be ON or OFF\n" -msgstr "" -"Verify 只能是开启 (ON) 或关闭 (OFF) 状态\n" -" \n" +msgstr "Verify 只能是开启 (ON) 或关闭 (OFF) 状态\n" #: cmd.rc:391 msgid "Parameter error\n"

1 0

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

Oct. 22, 2018

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 Oct. 22, 2018

Oct. 22, 2018

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: Add SearchPath() test for file name with multiple extension delimiters.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

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 Oct. 22, 2018

Oct. 22, 2018

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

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

Oct. 22, 2018

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

Dmitry Timoshkov : kernel32: GetLongPathName should fail when called with a wildcard.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: ccf9b18ea0aba1041b59fd287b6de8c726008a59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf9b18ea0aba1041b59fd28… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Oct 20 23:46:41 2018 +0300 kernel32: GetLongPathName should fail when called with a wildcard. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 10 ++++++++-- dlls/kernel32/tests/path.c | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index a9db7e8..41f0d34 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -297,6 +297,8 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen HANDLE goit; BOOL is_legal_8dot3; + TRACE("%s,%p,%u\n", debugstr_w(shortpath), longpath, longlen); + if (!shortpath) { SetLastError(ERROR_INVALID_PARAMETER); @@ -308,8 +310,6 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen return 0; } - TRACE("%s,%p,%d\n", debugstr_w(shortpath), longpath, longlen); - if (shortpath[0] == '\\' && shortpath[1] == '\\') { FIXME("UNC pathname %s\n", debugstr_w(shortpath)); @@ -333,6 +333,12 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen lp = sp = 2; } + if (strpbrkW(shortpath + sp, wildcardsW)) + { + SetLastError(ERROR_INVALID_NAME); + return 0; + } + while (shortpath[sp]) { /* check for path delimiters and reproduce them */ diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index f0cfb4d..df91b31 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1202,9 +1202,7 @@ static void test_GetLongPathNameA(void) strcpy(name, "*"); SetLastError(0xdeadbeef); length = pGetLongPathNameA(tempfile, temppath, MAX_PATH); -todo_wine ok(!length, "GetLongPathNameA should fail\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_NAME, "wrong error %d\n", GetLastError()); strcpy(name, "longfilename.longext");

1 0

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

Oct. 22, 2018

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

Gijs Vermeulen : include: Add LOCALE_[ SLOCALIZEDDISPLAYNAME|ALLOW_NEUTRAL_NAMES] definitions.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: 62b64a1f6f97f1f3cc30386367818691fab7117f URL: https://source.winehq.org/git/wine.git/?a=commit;h=62b64a1f6f97f1f3cc303863… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 22 00:53:46 2018 +0200 include: Add LOCALE_[SLOCALIZEDDISPLAYNAME|ALLOW_NEUTRAL_NAMES] definitions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45079 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index 7475f97..c8580bd 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -169,10 +169,12 @@ extern "C" { #define LOCALE_USE_CP_ACP 0x40000000 #define LOCALE_RETURN_NUMBER 0x20000000 #define LOCALE_RETURN_GENITIVE_NAMES 0x10000000 +#define LOCALE_ALLOW_NEUTRAL_NAMES 0x08000000 /* Locale information types */ #define LOCALE_ILANGUAGE 0x0001 #define LOCALE_SLANGUAGE 0x0002 +#define LOCALE_SLOCALIZEDDISPLAYNAME 0x0002 #define LOCALE_SENGLANGUAGE 0x1001 #define LOCALE_SENGLISHLANGUAGENAME 0x1001 #define LOCALE_SABBREVLANGNAME 0x0003

1 0

Jacek Caban : kernel32/tests: Add more PeekNamedPipe tests.
by Alexandre Julliard Oct. 22, 2018

Oct. 22, 2018

Module: wine Branch: master Commit: 0fe08b794d9029acf36c724a198724077b6257b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fe08b794d9029acf36c724a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 20 19:18:12 2018 +0200 kernel32/tests: Add more PeekNamedPipe tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 10c971b..b85e6ee 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2721,7 +2721,7 @@ static void test_readfileex_pending(void) static void _test_peek_pipe(unsigned line, HANDLE pipe, DWORD expected_read, DWORD expected_avail, DWORD expected_message_length) { DWORD bytes_read = 0xdeadbeed, avail = 0xdeadbeef, left = 0xdeadbeed; - char buf[4000]; + char buf[12000]; FILE_PIPE_PEEK_BUFFER *peek_buf = (void*)buf; IO_STATUS_BLOCK io; NTSTATUS status; @@ -2939,39 +2939,53 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL /* write more data than needed for read */ overlapped_write_sync(writer, buf, 4000); test_overlapped_result(reader, &read_overlapped, 1000, msg_read); + test_peek_pipe(reader, 3000, 3000, msg_mode ? 3000 : 0); /* test pending write with overlapped event */ overlapped_write_async(writer, buf, buf_size, &write_overlapped); + test_peek_pipe(reader, 3000 + (msg_mode ? 0 : buf_size), 3000 + buf_size, msg_mode ? 3000 : 0); /* write one more byte */ overlapped_write_async(writer, buf, 1, &write_overlapped2); flush_thread = test_flush_async(writer, ERROR_SUCCESS); test_not_signaled(write_overlapped.hEvent); + test_peek_pipe(reader, 3000 + (msg_mode ? 0 : buf_size + 1), 3000 + buf_size + 1, + msg_mode ? 3000 : 0); /* empty write will not block */ overlapped_write_sync(writer, buf, 0); test_not_signaled(write_overlapped.hEvent); test_not_signaled(write_overlapped2.hEvent); + test_peek_pipe(reader, 3000 + (msg_mode ? 0 : buf_size + 1), 3000 + buf_size + 1, + msg_mode ? 3000 : 0); /* read remaining data from the first write */ overlapped_read_sync(reader, read_buf, 3000, 3000, FALSE); test_overlapped_result(writer, &write_overlapped, buf_size, FALSE); test_not_signaled(write_overlapped2.hEvent); test_not_signaled(flush_thread); + test_peek_pipe(reader, buf_size + (msg_mode ? 0 : 1), buf_size + 1, msg_mode ? buf_size : 0); /* read one byte so that the next write fits the buffer */ overlapped_read_sync(reader, read_buf, 1, 1, msg_read); test_overlapped_result(writer, &write_overlapped2, 1, FALSE); + test_peek_pipe(reader, buf_size + (msg_mode ? -1 : 0), buf_size, msg_mode ? buf_size - 1 : 0); /* read the whole buffer */ overlapped_read_sync(reader, read_buf, buf_size, buf_size-msg_read, FALSE); + test_peek_pipe(reader, msg_read ? 1 : 0, msg_read ? 1 : 0, msg_read ? 1 : 0); if(msg_read) + { overlapped_read_sync(reader, read_buf, 1000, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); + } - if(msg_mode) { + if(msg_mode) + { /* we still have an empty message in queue */ overlapped_read_sync(reader, read_buf, 1000, 0, FALSE); + test_peek_pipe(reader, 0, 0, 0); } test_flush_done(flush_thread); @@ -2983,23 +2997,29 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL overlapped_write_sync(writer, buf, 1); test_overlapped_result(reader, &read_overlapped, 0, msg_read); test_overlapped_result(reader, &read_overlapped2, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* write a message larger than buffer */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); + test_peek_pipe(reader, buf_size + 2000, buf_size + 2000, msg_mode ? buf_size + 2000 : 0); /* read so that pending write is still larger than the buffer */ overlapped_read_sync(reader, read_buf, 1999, 1999, msg_read); test_not_signaled(write_overlapped.hEvent); + test_peek_pipe(reader, buf_size + 1, buf_size + 1, msg_mode ? buf_size + 1 : 0); /* read one more byte */ overlapped_read_sync(reader, read_buf, 1, 1, msg_read); test_overlapped_result(writer, &write_overlapped, buf_size+2000, FALSE); + test_peek_pipe(reader, buf_size, buf_size, msg_mode ? buf_size : 0); /* read remaining data */ overlapped_read_sync(reader, read_buf, buf_size+1, buf_size, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* simple pass of empty message */ overlapped_write_sync(writer, buf, 0); + test_peek_pipe(reader, 0, 0, 0); if(msg_mode) overlapped_read_sync(reader, read_buf, 1, 0, FALSE); @@ -3044,24 +3064,33 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL /* make two async writes, cancel the first one and make sure that we read from the second one */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); overlapped_write_async(writer, buf, 1, &write_overlapped2); + test_peek_pipe(reader, buf_size + 2000 + (msg_mode ? 0 : 1), + buf_size + 2001, msg_mode ? buf_size + 2000 : 0); cancel_overlapped(writer, &write_overlapped); + test_peek_pipe(reader, 1, 1, msg_mode ? 1 : 0); overlapped_read_sync(reader, read_buf, 1000, 1, FALSE); test_overlapped_result(writer, &write_overlapped2, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* same as above, but parially read written data before canceling */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); overlapped_write_async(writer, buf, 1, &write_overlapped2); + test_peek_pipe(reader, buf_size + 2000 + (msg_mode ? 0 : 1), + buf_size + 2001, msg_mode ? buf_size + 2000 : 0); overlapped_read_sync(reader, read_buf, 10, 10, msg_read); test_not_signaled(write_overlapped.hEvent); cancel_overlapped(writer, &write_overlapped); + test_peek_pipe(reader, 1, 1, msg_mode ? 1 : 0); overlapped_read_sync(reader, read_buf, 1000, 1, FALSE); test_overlapped_result(writer, &write_overlapped2, 1, FALSE); + test_peek_pipe(reader, 0, 0, 0); /* empty queue by canceling write and make sure that flush is signaled */ overlapped_write_async(writer, buf, buf_size+2000, &write_overlapped); flush_thread = test_flush_async(writer, ERROR_SUCCESS); test_not_signaled(flush_thread); cancel_overlapped(writer, &write_overlapped); + test_peek_pipe(reader, 0, 0, 0); test_flush_done(flush_thread); }

1 0