February 2016 - Wine-Commits

Michael Müller : ntdll: Implement SystemRecommendedSharedDataAlignment class in NtQuerySystemInformation.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 5c50f658306119c40358721c9f0bf75f324e01dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c50f658306119c40358721c9… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Feb 12 08:37:32 2016 +0100 ntdll: Implement SystemRecommendedSharedDataAlignment class in NtQuerySystemInformation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 11 +++++++++++ dlls/ntdll/tests/info.c | 16 ++++++++++++++++ include/winternl.h | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a18dfae..47d7b31 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2317,6 +2317,17 @@ NTSTATUS WINAPI NtQuerySystemInformation( RtlFreeHeap(GetProcessHeap(), 0, buf); } break; + case SystemRecommendedSharedDataAlignment: + { + len = sizeof(DWORD); + if (Length >= len) + { + if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; + else *((DWORD *)SystemInformation) = 64; + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + } + break; default: FIXME("(0x%08x,%p,0x%08x,%p) stub\n", SystemInformationClass,SystemInformation,Length,ResultLength); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c9b6703..be355fb 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1984,6 +1984,19 @@ static void test_thread_start_address(void) CloseHandle(thread); } +static void test_query_data_alignment(void) +{ + ULONG ReturnLength; + NTSTATUS status; + DWORD value; + + value = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(sizeof(value) == ReturnLength, "Inconsistent length %u\n", ReturnLength); + ok(value == 64, "Expected 64, got %u\n", value); +} + START_TEST(info) { char **argv; @@ -2116,4 +2129,7 @@ START_TEST(info) trace("Starting test_thread_start_address()\n"); test_thread_start_address(); + + trace("Starting test_query_data_alignment()\n"); + test_query_data_alignment(); } diff --git a/include/winternl.h b/include/winternl.h index 51320f2..9b40fd4 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -826,7 +826,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS { Unknown55, Unknown56, Unknown57, - Unknown58, + SystemRecommendedSharedDataAlignment = 58, Unknown59, Unknown60, Unknown61,

1 0

Sebastian Lackner : xaudio2_7: Unset DebugInfo->Spare[0] before destroying critical sections.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: caff64333f6dfee3b99cc067ed522da101f40a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=caff64333f6dfee3b99cc067e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 06:12:12 2016 +0100 xaudio2_7: Unset DebugInfo->Spare[0] before destroying critical sections. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 503c974..1393599 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1252,12 +1252,14 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) LIST_FOR_EACH_ENTRY_SAFE(src, src2, &This->source_voices, XA2SourceImpl, entry){ HeapFree(GetProcessHeap(), 0, src->sends); IXAudio2SourceVoice_DestroyVoice(&src->IXAudio2SourceVoice_iface); + src->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&src->lock); HeapFree(GetProcessHeap(), 0, src); } LIST_FOR_EACH_ENTRY_SAFE(sub, sub2, &This->submix_voices, XA2SubmixImpl, entry){ IXAudio2SubmixVoice_DestroyVoice(&sub->IXAudio2SubmixVoice_iface); + sub->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&sub->lock); HeapFree(GetProcessHeap(), 0, sub); } @@ -1273,6 +1275,7 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) CloseHandle(This->mmevt); + This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This);

1 0

Michael Müller : api-ms-win-core-libraryloader-l1-2-0 : Add dll.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 8f1476dc786c9381848d4a44ad95540f673aa7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1476dc786c9381848d4a44a… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 11 22:53:44 2016 +0100 api-ms-win-core-libraryloader-l1-2-0: Add dll. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-libraryloader-l1-2-0.spec | 29 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 34 insertions(+) diff --git a/configure b/configure index 5ca5b4e..2b9dda7 100755 --- a/configure +++ b/configure @@ -895,6 +895,7 @@ enable_api_ms_win_core_io_l1_1_1 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_1 +enable_api_ms_win_core_libraryloader_l1_2_0 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 @@ -17322,6 +17323,7 @@ wine_fn_config_dll api-ms-win-core-io-l1-1-1 enable_api_ms_win_core_io_l1_1_1 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_win_core_libraryloader_l1_1_1 +wine_fn_config_dll api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 wine_fn_config_dll api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_dll api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_dll api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 diff --git a/configure.ac b/configure.ac index d701ddb..3684747 100644 --- a/configure.ac +++ b/configure.ac @@ -2662,6 +2662,7 @@ WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-0/Makefile.in b/dlls/api-ms-win-core-libraryloader-l1-2-0/Makefile.in new file mode 100644 index 0000000..5552133 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-libraryloader-l1-2-0.dll diff --git a/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec b/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec new file mode 100644 index 0000000..6c385b6 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec @@ -0,0 +1,29 @@ +@ stub AddDllDirectory +@ stdcall DisableThreadLibraryCalls(long) kernel32.DisableThreadLibraryCalls +@ stdcall EnumResourceLanguagesExA(long str str ptr long long long) kernel32.EnumResourceLanguagesExA +@ stdcall EnumResourceLanguagesExW(long wstr wstr ptr long long long) kernel32.EnumResourceLanguagesExW +@ stub EnumResourceNamesExA +@ stub EnumResourceNamesExW +@ stub EnumResourceTypesExA +@ stub EnumResourceTypesExW +@ stdcall FindResourceExW(long wstr wstr long) kernel32.FindResourceExW +@ stub FindStringOrdinal +@ stdcall FreeLibrary(long) kernel32.FreeLibrary +@ stdcall FreeLibraryAndExitThread(long long) kernel32.FreeLibraryAndExitThread +@ stdcall FreeResource(long) kernel32.FreeResource +@ stdcall GetModuleFileNameA(long ptr long) kernel32.GetModuleFileNameA +@ stdcall GetModuleFileNameW(long ptr long) kernel32.GetModuleFileNameW +@ stdcall GetModuleHandleA(str) kernel32.GetModuleHandleA +@ stdcall GetModuleHandleExA(long ptr ptr) kernel32.GetModuleHandleExA +@ stdcall GetModuleHandleExW(long ptr ptr) kernel32.GetModuleHandleExW +@ stdcall GetModuleHandleW(wstr) kernel32.GetModuleHandleW +@ stdcall GetProcAddress(long str) kernel32.GetProcAddress +@ stdcall LoadLibraryExA( str long long) kernel32.LoadLibraryExA +@ stdcall LoadLibraryExW(wstr long long) kernel32.LoadLibraryExW +@ stdcall LoadResource(long long) kernel32.LoadResource +@ stdcall LoadStringA(long long ptr long) user32.LoadStringA +@ stdcall LoadStringW(long long ptr long) user32.LoadStringW +@ stdcall LockResource(long) kernel32.LockResource +@ stub RemoveDllDirectory +@ stub SetDefaultDllDirectories +@ stdcall SizeofResource(long long) kernel32.SizeofResource diff --git a/tools/make_specfiles b/tools/make_specfiles index d778f62..aedd762 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -214,6 +214,7 @@ my @dll_groups = "user32", "api-ms-win-core-libraryloader-l1-1-0", "api-ms-win-core-libraryloader-l1-1-1", + "api-ms-win-core-libraryloader-l1-2-0", ], [ "kernel32",

1 0

Michael Müller : api-ms-win-core-delayload-l1-1-1: Add dll.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 6582e0e5882f0dd2021419730a2ab3cffbe30baa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6582e0e5882f0dd2021419730… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 11 22:53:10 2016 +0100 api-ms-win-core-delayload-l1-1-1: Add dll. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-delayload-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-delayload-l1-1-1.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index ca7a2bb..5ca5b4e 100755 --- a/configure +++ b/configure @@ -875,6 +875,7 @@ enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_0 enable_api_ms_win_core_debug_l1_1_1 +enable_api_ms_win_core_delayload_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_0 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_2 @@ -17301,6 +17302,7 @@ wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_dateti wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-0 enable_api_ms_win_core_debug_l1_1_0 wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 +wine_fn_config_dll api-ms-win-core-delayload-l1-1-1 enable_api_ms_win_core_delayload_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-0 enable_api_ms_win_core_errorhandling_l1_1_0 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-2 enable_api_ms_win_core_errorhandling_l1_1_2 diff --git a/configure.ac b/configure.ac index 4d965a4..d701ddb 100644 --- a/configure.ac +++ b/configure.ac @@ -2642,6 +2642,7 @@ WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-delayload-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-2) diff --git a/dlls/api-ms-win-core-delayload-l1-1-1/Makefile.in b/dlls/api-ms-win-core-delayload-l1-1-1/Makefile.in new file mode 100644 index 0000000..bccec10 --- /dev/null +++ b/dlls/api-ms-win-core-delayload-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-delayload-l1-1-1.dll diff --git a/dlls/api-ms-win-core-delayload-l1-1-1/api-ms-win-core-delayload-l1-1-1.spec b/dlls/api-ms-win-core-delayload-l1-1-1/api-ms-win-core-delayload-l1-1-1.spec new file mode 100644 index 0000000..fe2b354 --- /dev/null +++ b/dlls/api-ms-win-core-delayload-l1-1-1/api-ms-win-core-delayload-l1-1-1.spec @@ -0,0 +1,3 @@ +@ stdcall DelayLoadFailureHook(str str) kernel32.DelayLoadFailureHook +@ stdcall ResolveDelayLoadedAPI(ptr ptr ptr ptr ptr long) kernel32.ResolveDelayLoadedAPI +@ stub ResolveDelayLoadsFromDll diff --git a/tools/make_specfiles b/tools/make_specfiles index 7b9bd3d..d778f62 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -165,6 +165,7 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", + "api-ms-win-core-delayload-l1-1-1", "api-ms-win-core-errorhandling-l1-1-0", "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-interlocked-l1-1-0",

1 0

Nikolay Sivov : comdlg32/tests: Simplify a test using todo_wine_if().
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: be27c23df93546d2a13ff9ec150ca1734987afd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be27c23df93546d2a13ff9ec1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 11 21:32:42 2016 +0300 comdlg32/tests: Simplify a test using todo_wine_if(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/filedlg.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0a4c509..0b55c5c 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -395,8 +395,7 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L } else if( count == 1){ resize = resize_testcases[index].resize_check; GetWindowRect( parent, &rc); - if( resize_testcases[index].todo){ - todo_wine { + todo_wine_if( resize_testcases[index].todo){ ok( resize == rc.right - rc.left - initrc.right + initrc.left, "testid %d size-x change %d expected %d\n", index, rc.right - rc.left - initrc.right + initrc.left, resize); @@ -404,14 +403,6 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L "testid %d size-y change %d expected %d\n", index, rc.bottom - rc.top - initrc.bottom + initrc.top, resize); } - }else{ - ok( resize == rc.right - rc.left - initrc.right + initrc.left, - "testid %d size-x change %d expected %d\n", index, - rc.right - rc.left - initrc.right + initrc.left, resize); - ok( resize == rc.bottom - rc.top - initrc.bottom + initrc.top, - "testid %d size-y change %d expected %d\n", index, - rc.bottom - rc.top - initrc.bottom + initrc.top, resize); - } if( resize_testcases[index].testcontrols) { int i; RECT rc;

1 0

Akihiro Sagawa : imm32/tests: Terminate the thread cleanly.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 2cd81c149d1ffe267ecc69c8aac60400a26b1877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd81c149d1ffe267ecc69c8a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 11 23:03:30 2016 +0900 imm32/tests: Terminate the thread cleanly. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 9ab55f3..eb544bb 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -640,7 +640,10 @@ static void test_ImmThreads(void) ImmReleaseContext(hwnd,himc); SendMessageA(threadinfo.hwnd, WM_CLOSE, 0, 0); - TerminateThread(hThread, 1); + rc = PostThreadMessageA(dwThreadId, WM_QUIT, 1, 0); + ok(rc == 1, "PostThreadMessage should succeed\n"); + WaitForSingleObject(hThread, INFINITE); + CloseHandle(hThread); himc = ImmGetContext(GetDesktopWindow()); ok(himc == NULL, "Should not be able to get himc from other process window\n"); @@ -842,6 +845,7 @@ static void test_ImmDefaultHwnd(void) WaitForSingleObject(thread, INFINITE); ok(thread_ime_wnd != def1, "thread_ime_wnd == def1\n"); ok(!IsWindow(thread_ime_wnd), "thread_ime_wnd was not destroyed\n"); + CloseHandle(thread); ImmReleaseContext(hwnd, imc1); ImmReleaseContext(hwnd, imc3);

1 0

Michael Müller : api-ms-win-core-com-l1-1-1: Add dll.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 9a67157dd1f2ac8b89dab43342a955995244fe2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a67157dd1f2ac8b89dab4334… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 11 22:52:43 2016 +0100 api-ms-win-core-com-l1-1-1: Add dll. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-com-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-com-l1-1-1.spec | 82 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 87 insertions(+) diff --git a/configure b/configure index 4eb195a..ca7a2bb 100755 --- a/configure +++ b/configure @@ -869,6 +869,7 @@ enable_advapi32 enable_advpack enable_amstream enable_api_ms_win_core_com_l1_1_0 +enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 @@ -17294,6 +17295,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 +wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 diff --git a/configure.ac b/configure.ac index 76fb87d..4d965a4 100644 --- a/configure.ac +++ b/configure.ac @@ -2636,6 +2636,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) diff --git a/dlls/api-ms-win-core-com-l1-1-1/Makefile.in b/dlls/api-ms-win-core-com-l1-1-1/Makefile.in new file mode 100644 index 0000000..a37f743 --- /dev/null +++ b/dlls/api-ms-win-core-com-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-com-l1-1-1.dll diff --git a/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec new file mode 100644 index 0000000..56aaf36 --- /dev/null +++ b/dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-com-l1-1-1.spec @@ -0,0 +1,82 @@ +@ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID +@ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString +@ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess +@ stub CoAllowUnmarshalerCLSID +@ stub CoCancelCall +@ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy +@ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler +@ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid +@ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance +@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx +@ stub CoCreateInstanceFromApp +@ stub CoDecodeProxy +@ stub CoDecrementMTAUsage +@ stub CoDisableCallCancellation +@ stub CoDisconnectContext +@ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject +@ stub CoEnableCallCancellation +@ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries +@ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx +@ stub CoGetApartmentType +@ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext +@ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID +@ stub CoGetCancelObject +@ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject +@ stdcall CoGetContextToken(ptr) ole32.CoGetContextToken +@ stdcall CoGetCurrentLogicalThreadId(ptr) ole32.CoGetCurrentLogicalThreadId +@ stdcall CoGetCurrentProcess() ole32.CoGetCurrentProcess +@ stdcall CoGetDefaultContext(long ptr ptr) ole32.CoGetDefaultContext +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream +@ stdcall CoGetMalloc(long ptr) ole32.CoGetMalloc +@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax +@ stdcall CoGetObjectContext(ptr ptr) ole32.CoGetObjectContext +@ stdcall CoGetPSClsid(ptr ptr) ole32.CoGetPSClsid +@ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) ole32.CoGetStandardMarshal +@ stub CoGetStdMarshalEx +@ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass +@ stdcall CoImpersonateClient() ole32.CoImpersonateClient +@ stub CoIncrementMTAUsage +@ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx +@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity +@ stub CoInvalidateRemoteMachineBindings +@ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected +@ stdcall CoLockObjectExternal(ptr long long) ole32.CoLockObjectExternal +@ stdcall CoMarshalHresult(ptr long) ole32.CoMarshalHresult +@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) ole32.CoMarshalInterThreadInterfaceInStream +@ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface +@ stub CoQueryAuthenticationServices +@ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryClientBlanket +@ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryProxyBlanket +@ stub CoRegisterActivationFilter +@ stdcall CoRegisterClassObject(ptr ptr long long ptr) ole32.CoRegisterClassObject +@ stdcall CoRegisterPSClsid(ptr ptr) ole32.CoRegisterPSClsid +@ stub CoRegisterSurrogate +@ stdcall CoReleaseMarshalData(ptr) ole32.CoReleaseMarshalData +@ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess +@ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects +@ stdcall CoRevertToSelf() ole32.CoRevertToSelf +@ stdcall CoRevokeClassObject(long) ole32.CoRevokeClassObject +@ stub CoSetCancelObject +@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) ole32.CoSetProxyBlanket +@ stdcall CoSuspendClassObjects() ole32.CoSuspendClassObjects +@ stdcall CoSwitchCallContext(ptr ptr) ole32.CoSwitchCallContext +@ stdcall CoTaskMemAlloc(long) ole32.CoTaskMemAlloc +@ stdcall CoTaskMemFree(ptr) ole32.CoTaskMemFree +@ stdcall CoTaskMemRealloc(ptr long) ole32.CoTaskMemRealloc +@ stub CoTestCancel +@ stdcall CoUninitialize() ole32.CoUninitialize +@ stdcall CoUnmarshalHresult(ptr ptr) ole32.CoUnmarshalHresult +@ stdcall CoUnmarshalInterface(ptr ptr ptr) ole32.CoUnmarshalInterface +@ stdcall CoWaitForMultipleHandles(long long long ptr ptr) ole32.CoWaitForMultipleHandles +@ stub CoWaitForMultipleObjects +@ stdcall CreateStreamOnHGlobal(ptr long ptr) ole32.CreateStreamOnHGlobal +@ stdcall FreePropVariantArray(long ptr) ole32.FreePropVariantArray +@ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream +@ stdcall IIDFromString(wstr ptr) ole32.IIDFromString +@ stdcall ProgIDFromCLSID(ptr ptr) ole32.ProgIDFromCLSID +@ stdcall PropVariantClear(ptr) ole32.PropVariantClear +@ stdcall PropVariantCopy(ptr ptr) ole32.PropVariantCopy +@ stub RoGetAgileReference +@ stdcall StringFromCLSID(ptr ptr) ole32.StringFromCLSID +@ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 +@ stdcall StringFromIID(ptr ptr) ole32.StringFromIID diff --git a/tools/make_specfiles b/tools/make_specfiles index 41a9afe..7b9bd3d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -225,6 +225,7 @@ my @dll_groups = "ole32", "api-ms-win-downlevel-ole32-l1-1-0", "api-ms-win-core-com-l1-1-0", + "api-ms-win-core-com-l1-1-1", "combase", ], [

1 0

Sebastian Lackner : kernel32/tests: Add additional tests for CompareStringA.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: 90819e9c1b2c0575993128d962df1b348e93adc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90819e9c1b2c0575993128d96… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Feb 12 08:53:04 2016 +0100 kernel32/tests: Add additional tests for CompareStringA. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 385e8e4..4a9e540 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1636,7 +1636,21 @@ static const struct comparestringa_entry comparestringa_data[] = { { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'o", -1, "/m", -1, CSTR_LESS_THAN }, { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "'o", -1, CSTR_GREATER_THAN }, { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ", 9, CSTR_EQUAL }, - { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN } + { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a-", 3, "a\0", 3, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a'", 3, "a\0", 3, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a-", 3, "a\0", 3, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "a'", 3, "a\0", 3, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a.", 3, "a\0", 3, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, NORM_IGNORESYMBOLS, "a ", 3, "a\0", 3, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "a", 1, "a\0\0", 4, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "a", 2, "a\0\0", 4, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "a\0\0", 4, "a", 1, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "a\0\0", 4, "a", 2, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "a", 1, "a\0x", 4, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a", 2, "a\0x", 4, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a\0x", 4, "a", 1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a\0x", 4, "a", 2, CSTR_GREATER_THAN }, }; static void test_CompareStringA(void)

1 0

Dmitry Timoshkov : kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: dfbbd55af7e625968473d233671d9aa63ec33f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbbd55af7e625968473d2336… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 12 08:52:50 2016 +0100 kernel32: CompareStringW should abort on the first nonmatching character to avoid an invalid memory access. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/sortkey.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/libs/wine/sortkey.c b/libs/wine/sortkey.c index 17b5537..7280501 100644 --- a/libs/wine/sortkey.c +++ b/libs/wine/sortkey.c @@ -223,6 +223,16 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1 len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -272,6 +282,16 @@ static inline int compare_diacritic_weights(int flags, const WCHAR *str1, int le len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -321,23 +341,24 @@ static inline int compare_case_weights(int flags, const WCHAR *str1, int len1, len1--; len2--; } + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } -static inline int real_length(const WCHAR *str, int len) -{ - while (len && !str[len - 1]) len--; - return len; -} - int wine_compare_string(int flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2) { int ret; - len1 = real_length(str1, len1); - len2 = real_length(str2, len2); - ret = compare_unicode_weights(flags, str1, len1, str2, len2); if (!ret) {

1 0

Akihiro Sagawa : imm32/tests: Fix typo.
by Alexandre Julliard Feb. 12, 2016

Feb. 12, 2016

Module: wine Branch: master Commit: ba0e38b1758ad7c10fabd5099e2e01f646c4a4ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0e38b1758ad7c10fabd5099… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 11 23:03:19 2016 +0900 imm32/tests: Fix typo. hwnd is a global variable, hWnd is a local variable. They're very confusable. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d55503a..72444e2 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -184,7 +184,7 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) return TRUE; } - return DefWindowProcA(hwnd,msg,wParam,lParam); + return DefWindowProcA(hWnd,msg,wParam,lParam); } static BOOL init(void) {

1 0