February 2019 - Wine-commits

Alexandre Julliard : kernel32/tests: Add a test to check some fields in fake dlls.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 3ba4901134492f8f13de1b2661bb0ad7d6d0008c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ba4901134492f8f13de1b26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 21:11:17 2019 +0100 kernel32/tests: Add a test to check some fields in fake dlls. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45377 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 7046afc..b8dc72b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -78,6 +78,7 @@ static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRI PDELAYLOAD_FAILURE_SYSTEM_ROUTINE, PIMAGE_THUNK_DATA ThunkAddress,ULONG); static PVOID (WINAPI *pRtlImageDirectoryEntryToData)(HMODULE,BOOL,WORD,ULONG *); +static PIMAGE_NT_HEADERS (WINAPI *pRtlImageNtHeader)(HMODULE); static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); static BOOL (WINAPI *pFlsSetValue)(DWORD, PVOID); static PVOID (WINAPI *pFlsGetValue)(DWORD); @@ -3806,6 +3807,57 @@ static void test_InMemoryOrderModuleList(void) ok(entry2 == mark2, "expected entry2 == mark2, got %p and %p\n", entry2, mark2); } +static void test_dll_file( const char *name ) +{ + HMODULE module = GetModuleHandleA( name ); + IMAGE_NT_HEADERS *nt, *nt_file; + IMAGE_SECTION_HEADER *sec, *sec_file; + char path[MAX_PATH]; + HANDLE file, mapping; + int i = 0; + void *ptr; + + GetModuleFileNameA( module, path, MAX_PATH ); + file = CreateFileA( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "can't open '%s': %u\n", path, GetLastError() ); + + mapping = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 0, NULL ); + ok( mapping != NULL, "%s: CreateFileMappingW failed err %u\n", name, GetLastError() ); + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); + ok( ptr != NULL, "%s: MapViewOfFile failed err %u\n", name, GetLastError() ); + CloseHandle( mapping ); + CloseHandle( file ); + + nt = pRtlImageNtHeader( module ); + nt_file = pRtlImageNtHeader( ptr ); + ok( nt_file != NULL, "%s: invalid header\n", path ); +#define OK_FIELD(x) ok( nt->x == nt_file->x, "%s:%u: wrong " #x " %x / %x\n", name, i, nt->x, nt_file->x ) + todo_wine + OK_FIELD( FileHeader.NumberOfSections ); + todo_wine + OK_FIELD( OptionalHeader.AddressOfEntryPoint ); + OK_FIELD( OptionalHeader.NumberOfRvaAndSizes ); + for (i = 0; i < nt->OptionalHeader.NumberOfRvaAndSizes; i++) + { + todo_wine_if( i == IMAGE_DIRECTORY_ENTRY_EXPORT || + (i == IMAGE_DIRECTORY_ENTRY_IMPORT && nt->OptionalHeader.DataDirectory[i].Size) || + i == IMAGE_DIRECTORY_ENTRY_RESOURCE || + i == IMAGE_DIRECTORY_ENTRY_BASERELOC ) + OK_FIELD( OptionalHeader.DataDirectory[i].VirtualAddress ); + todo_wine_if( i == IMAGE_DIRECTORY_ENTRY_EXPORT || + (i == IMAGE_DIRECTORY_ENTRY_IMPORT && nt->OptionalHeader.DataDirectory[i].Size) || + i == IMAGE_DIRECTORY_ENTRY_BASERELOC ) + OK_FIELD( OptionalHeader.DataDirectory[i].Size ); + } + sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + sec_file = (IMAGE_SECTION_HEADER *)((char *)&nt_file->OptionalHeader + nt_file->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + todo_wine + ok( !memcmp( sec + i, sec_file + i, sizeof(*sec) ), "%s: wrong section %d\n", name, i ); + UnmapViewOfFile( ptr ); +#undef OK_FIELD +} + START_TEST(loader) { int argc; @@ -3834,6 +3886,7 @@ START_TEST(loader) pRtlAcquirePebLock = (void *)GetProcAddress(ntdll, "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(ntdll, "RtlReleasePebLock"); pRtlImageDirectoryEntryToData = (void *)GetProcAddress(ntdll, "RtlImageDirectoryEntryToData"); + pRtlImageNtHeader = (void *)GetProcAddress(ntdll, "RtlImageNtHeader"); pFlsAlloc = (void *)GetProcAddress(kernel32, "FlsAlloc"); pFlsSetValue = (void *)GetProcAddress(kernel32, "FlsSetValue"); pFlsGetValue = (void *)GetProcAddress(kernel32, "FlsGetValue"); @@ -3872,6 +3925,10 @@ START_TEST(loader) test_import_resolution(); test_ExitProcess(); test_InMemoryOrderModuleList(); + test_dll_file( "ntdll.dll" ); + test_dll_file( "kernel32.dll" ); + test_dll_file( "advapi32.dll" ); + test_dll_file( "user32.dll" ); /* loader test must be last, it can corrupt the internal loader state on Windows */ test_Loader(); }

1 0

Andrey Gusev : ext-ms-win-ntuser-windowclass-l1-1-0: Add dll.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: eb0b06b9cfdf28914100b468b68f7b30dadfa631 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb0b06b9cfdf28914100b468… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 18 21:37:03 2019 +0200 ext-ms-win-ntuser-windowclass-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-windowclass-l1-1-0.spec | 15 +++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 20 insertions(+) diff --git a/configure b/configure index 4ab39a4..efc3d65 100755 --- a/configure +++ b/configure @@ -1281,6 +1281,7 @@ enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_ntuser_window_l1_1_4 +enable_ext_ms_win_ntuser_windowclass_l1_1_0 enable_ext_ms_win_ntuser_windowclass_l1_1_1 enable_ext_ms_win_oleacc_l1_1_0 enable_ext_ms_win_ras_rasapi32_l1_1_0 @@ -19579,6 +19580,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_m wine_fn_config_makefile dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-4 enable_ext_ms_win_ntuser_window_l1_1_4 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-0 enable_ext_ms_win_ntuser_windowclass_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-1 enable_ext_ms_win_ntuser_windowclass_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-oleacc-l1-1-0 enable_ext_ms_win_oleacc_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ras-rasapi32-l1-1-0 enable_ext_ms_win_ras_rasapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 60f8acc..e3b7016 100644 --- a/configure.ac +++ b/configure.ac @@ -3318,6 +3318,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-4) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-oleacc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ras-rasapi32-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in new file mode 100644 index 0000000..9f5a87a --- /dev/null +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-windowclass-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec new file mode 100644 index 0000000..8b2ab2b --- /dev/null +++ b/dlls/ext-ms-win-ntuser-windowclass-l1-1-0/ext-ms-win-ntuser-windowclass-l1-1-0.spec @@ -0,0 +1,15 @@ +@ stdcall GetClassInfoA(long str ptr) user32.GetClassInfoA +@ stdcall GetClassInfoExA(long str ptr) user32.GetClassInfoExA +@ stdcall GetClassInfoExW(long wstr ptr) user32.GetClassInfoExW +@ stdcall GetClassInfoW(long wstr ptr) user32.GetClassInfoW +@ stdcall GetClassNameA(long ptr long) user32.GetClassNameA +@ stdcall GetClassNameW(long ptr long) user32.GetClassNameW +@ stdcall GetWindowLongA(long long) user32.GetWindowLongA +@ stdcall GetWindowLongW(long long) user32.GetWindowLongW +@ stdcall RegisterClassA(ptr) user32.RegisterClassA +@ stdcall RegisterClassExW(ptr) user32.RegisterClassExW +@ stdcall RegisterClassW(ptr) user32.RegisterClassW +@ stdcall SetWindowLongA(long long long) user32.SetWindowLongA +@ stdcall SetWindowLongW(long long long) user32.SetWindowLongW +@ stdcall UnregisterClassA(str long) user32.UnregisterClassA +@ stdcall UnregisterClassW(wstr long) user32.UnregisterClassW diff --git a/tools/make_specfiles b/tools/make_specfiles index 7666c3c..8f771b8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -389,6 +389,7 @@ my @dll_groups = "api-ms-win-ntuser-rectangle-l1-1-0", "api-ms-win-ntuser-sysparams-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", + "ext-ms-win-ntuser-windowclass-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-ntuser-window-l1-1-4",

1 0

Andrey Gusev : ext-ms-win-ntuser-window-l1-1-0: Add dll.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: e527d25de1deb0b50fd7af3ca4f953ea1a1597fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e527d25de1deb0b50fd7af3c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 18 21:37:04 2019 +0200 ext-ms-win-ntuser-window-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-window-l1-1-0.spec | 40 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 45 insertions(+) diff --git a/configure b/configure index efc3d65..3738f43 100755 --- a/configure +++ b/configure @@ -1279,6 +1279,7 @@ enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_private_l1_3_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 +enable_ext_ms_win_ntuser_window_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_ntuser_window_l1_1_4 enable_ext_ms_win_ntuser_windowclass_l1_1_0 @@ -19578,6 +19579,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-3-1 enable_ext_ms_win_ntuser_private_l1_3_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-0 enable_ext_ms_win_ntuser_window_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-window-l1-1-4 enable_ext_ms_win_ntuser_window_l1_1_4 wine_fn_config_makefile dlls/ext-ms-win-ntuser-windowclass-l1-1-0 enable_ext_ms_win_ntuser_windowclass_l1_1_0 diff --git a/configure.ac b/configure.ac index e3b7016..16f72f6 100644 --- a/configure.ac +++ b/configure.ac @@ -3316,6 +3316,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-3-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-window-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-windowclass-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in new file mode 100644 index 0000000..d89b45b8 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-window-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-window-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-0/ext-ms-win-ntuser-window-l1-1-0.spec b/dlls/ext-ms-win-ntuser-window-l1-1-0/ext-ms-win-ntuser-window-l1-1-0.spec new file mode 100644 index 0000000..a332425 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-window-l1-1-0/ext-ms-win-ntuser-window-l1-1-0.spec @@ -0,0 +1,40 @@ +@ stdcall AdjustWindowRectEx(ptr long long long) user32.AdjustWindowRectEx +@ stdcall AllowSetForegroundWindow(long) user32.AllowSetForegroundWindow +@ stdcall AnimateWindow(long long long) user32.AnimateWindow +@ stdcall BringWindowToTop(long) user32.BringWindowToTop +@ stdcall CallNextHookEx(long long long long) user32.CallNextHookEx +@ stdcall CreateWindowExA(long str str long long long long long long long long ptr) user32.CreateWindowExA +@ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) user32.CreateWindowExW +@ stdcall DefWindowProcA(long long long long) user32.DefWindowProcA +@ stdcall DefWindowProcW(long long long long) user32.DefWindowProcW +@ stdcall DestroyWindow(long) user32.DestroyWindow +@ stdcall EnumChildWindows(long ptr long) user32.EnumChildWindows +@ stdcall EnumThreadWindows(long ptr long) user32.EnumThreadWindows +@ stdcall EnumWindows(ptr long) user32.EnumWindows +@ stdcall FindWindowA(str str) user32.FindWindowA +@ stdcall FindWindowW(wstr wstr) user32.FindWindowW +@ stdcall GetClientRect(long long) user32.GetClientRect +@ stdcall GetDesktopWindow() user32.GetDesktopWindow +@ stdcall GetForegroundWindow() user32.GetForegroundWindow +@ stdcall GetParent(long) user32.GetParent +@ stdcall GetPropW(long wstr) user32.GetPropW +@ stdcall GetShellWindow() user32.GetShellWindow +@ stdcall GetWindow(long long) user32.GetWindow +@ stdcall GetWindowInfo(long ptr) user32.GetWindowInfo +@ stdcall GetWindowPlacement(long ptr) user32.GetWindowPlacement +@ stdcall GetWindowRect(long ptr) user32.GetWindowRect +@ stdcall GetWindowTextW(long ptr long) user32.GetWindowTextW +@ stdcall GetWindowThreadProcessId(long ptr) user32.GetWindowThreadProcessId +@ stdcall IsChild(long long) user32.IsChild +@ stdcall IsIconic(long) user32.IsIconic +@ stdcall IsWindow(long) user32.IsWindow +@ stdcall RemovePropW(long wstr) user32.RemovePropW +@ stdcall SetForegroundWindow(long) user32.SetForegroundWindow +@ stdcall SetParent(long long) user32.SetParent +@ stdcall SetPropW(long wstr long) user32.SetPropW +@ stdcall SetWindowPos(long long long long long long long) user32.SetWindowPos +@ stdcall SetWindowsHookExW(long long long long) user32.SetWindowsHookExW +@ stdcall SetWindowTextW(long wstr) user32.SetWindowTextW +@ stdcall ShowWindow(long long) user32.ShowWindow +@ stub SoundSentry +@ stdcall UnhookWindowsHookEx(long) user32.UnhookWindowsHookEx diff --git a/tools/make_specfiles b/tools/make_specfiles index 8f771b8..42e0f9f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -391,6 +391,7 @@ my @dll_groups = "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-0", "ext-ms-win-ntuser-windowclass-l1-1-1", + "ext-ms-win-ntuser-window-l1-1-0", "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-ntuser-window-l1-1-4", "ext-ms-win-rtcore-ntuser-cursor-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-ntuser-window-l1-1-4: Update spec file.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 1c7855af78249cf3c44ab4dc4266bfd7d964b48a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c7855af78249cf3c44ab4dc… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 18 21:37:05 2019 +0200 ext-ms-win-ntuser-window-l1-1-4: Update spec file. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec b/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec index 77e7b1f..a950535 100644 --- a/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec +++ b/dlls/ext-ms-win-ntuser-window-l1-1-4/ext-ms-win-ntuser-window-l1-1-4.spec @@ -1,3 +1,4 @@ +@ stdcall CallWindowProcW(ptr long long long long) user32.CallWindowProcW @ stdcall KillTimer(long long) user32.KillTimer @ stdcall ScreenToClient(long ptr) user32.ScreenToClient @ stdcall SetTimer(long long long ptr) user32.SetTimer

1 0

Andrey Gusev : ext-ms-win-gdi-dc-create-l1-1-0: Add dll.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 8a46597dc4b75f681b4a339b06e79b391620493f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a46597dc4b75f681b4a339b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Feb 18 21:37:06 2019 +0200 ext-ms-win-gdi-dc-create-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in | 1 + .../ext-ms-win-gdi-dc-create-l1-1-0.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index 3738f43..ac22582 100755 --- a/configure +++ b/configure @@ -1261,6 +1261,7 @@ enable_explorerframe enable_ext_ms_win_authz_context_l1_1_0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 enable_ext_ms_win_dwmapi_ext_l1_1_0 +enable_ext_ms_win_gdi_dc_create_l1_1_0 enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 @@ -19561,6 +19562,7 @@ wine_fn_config_makefile dlls/explorerframe/tests enable_tests wine_fn_config_makefile dlls/ext-ms-win-authz-context-l1-1-0 enable_ext_ms_win_authz_context_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-domainjoin-netjoin-l1-1-0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-dwmapi-ext-l1-1-0 enable_ext_ms_win_dwmapi_ext_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-0 enable_ext_ms_win_gdi_dc_create_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 diff --git a/configure.ac b/configure.ac index 16f72f6..e468966 100644 --- a/configure.ac +++ b/configure.ac @@ -3298,6 +3298,7 @@ WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-authz-context-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-domainjoin-netjoin-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-dwmapi-ext-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) diff --git a/dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in new file mode 100644 index 0000000..aa82fc2 --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-dc-create-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-dc-create-l1-1-0/ext-ms-win-gdi-dc-create-l1-1-0.spec b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/ext-ms-win-gdi-dc-create-l1-1-0.spec new file mode 100644 index 0000000..114f8bc --- /dev/null +++ b/dlls/ext-ms-win-gdi-dc-create-l1-1-0/ext-ms-win-gdi-dc-create-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stdcall CreateCompatibleDC(long) gdi32.CreateCompatibleDC +@ stdcall CreateDCW(wstr wstr wstr ptr) gdi32.CreateDCW +@ stdcall DeleteDC(long) gdi32.DeleteDC diff --git a/tools/make_specfiles b/tools/make_specfiles index 42e0f9f..d93723d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -431,6 +431,7 @@ my @dll_groups = "gdi32", "api-ms-win-dx-d3dkmt-l1-1-0", "api-ms-win-gdi-dpiinfo-l1-1-0", + "ext-ms-win-gdi-dc-create-l1-1-0", "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0",

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.8.0.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 5e86cc0a8f37295072b03b1c13aa205ff3e6f3e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e86cc0a8f37295072b03b1c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 18 13:41:37 2019 -0600 mscoree: Update Wine Mono to 4.8.0. New in this release: * Nearly 2 years of updates from the Mono project. * A separate Framework64 directory is now created in 64-bit prefixes. * The csc command-line interface to the C# compiler is now present in Framework directories. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46639 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 5b71a66..225f915 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.7.5" -#define MONO_SHA "154d68d476cdedef56f159d837fbb5eef9358a9f85de89f86c189ec4da004b3f" +#define MONO_VERSION "4.8.0" +#define MONO_SHA "890159ffd1679ca7d45e840e1890caba8c24acbc18c59db1ca718b35a5ab8778" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 19d120e..785ecd0 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.7.5"; + static const char* mono_version = "4.8.0"; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Sebastian Lackner : server: Improve handling of cursor position clipping for empty rectangle.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 5ff6a116972089f8e112dd4234d57689a60ab4dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff6a116972089f8e112dd42… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Feb 18 08:26:11 2019 -0600 server: Improve handling of cursor position clipping for empty rectangle. Based on a patch by Kevin Buhr. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38791 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42631 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ server/queue.c | 8 +++--- 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index ffdd4b7..835dfb1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1269,6 +1269,19 @@ static LRESULT CALLBACK hook_proc2( int code, WPARAM wparam, LPARAM lparam ) return CallNextHookEx( 0, code, wparam, lparam ); } +static LRESULT CALLBACK hook_proc3( int code, WPARAM wparam, LPARAM lparam ) +{ + POINT pt; + + if (code == HC_ACTION) + { + /* MSLLHOOKSTRUCT does not seem to be reliable and contains different data on each run. */ + GetCursorPos(&pt); + ok(pt.x == pt_old.x && pt.y == pt_old.y, "GetCursorPos: (%d,%d)\n", pt.x, pt.y); + } + return CallNextHookEx( 0, code, wparam, lparam ); +} + static void test_mouse_ll_hook(void) { HWND hwnd; @@ -1342,6 +1355,62 @@ static void test_mouse_ll_hook(void) ok(pt.x == pt_new.x && pt.y == pt_new.y, "Position changed: (%d,%d)\n", pt.x, pt.y); UnhookWindowsHookEx(hook2); + hook1 = SetWindowsHookExA(WH_MOUSE_LL, hook_proc3, GetModuleHandleA(0), 0); + + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + clipped = TRUE; + + SetCursorPos(140, 140); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + SetCursorPos(160, 160); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, -STEP, -STEP, 0, 0); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, +STEP, +STEP, 0, 0); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + + clipped = FALSE; + ClipCursor(NULL); + + SetCursorPos(140, 140); + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + GetCursorPos(&pt_old); + ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ClipCursor(NULL); + + SetCursorPos(160, 160); + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ClipCursor(NULL); + + SetCursorPos(150, 150); + SetRect(&rc, 150, 150, 150, 150); + ClipCursor(&rc); + GetCursorPos(&pt_old); + todo_wine + ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ClipCursor(NULL); + + UnhookWindowsHookEx(hook1); + done: DestroyWindow(hwnd); SetCursorPos(pt_org.x, pt_org.y); diff --git a/server/queue.c b/server/queue.c index 545991b..2eec422 100644 --- a/server/queue.c +++ b/server/queue.c @@ -411,8 +411,8 @@ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, 0 ); /* warp the mouse to be inside the clip rect */ - x = min( max( desktop->cursor.x, desktop->cursor.clip.left ), desktop->cursor.clip.right-1 ); - y = min( max( desktop->cursor.y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom-1 ); + x = max( min( desktop->cursor.x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); + y = max( min( desktop->cursor.y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); if (x != desktop->cursor.x || y != desktop->cursor.y) set_cursor_pos( desktop, x, y ); } @@ -1500,8 +1500,8 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg { if (msg->msg == WM_MOUSEMOVE) { - int x = min( max( msg->x, desktop->cursor.clip.left ), desktop->cursor.clip.right-1 ); - int y = min( max( msg->y, desktop->cursor.clip.top ), desktop->cursor.clip.bottom-1 ); + int x = max( min( msg->x, desktop->cursor.clip.right - 1 ), desktop->cursor.clip.left ); + int y = max( min( msg->y, desktop->cursor.clip.bottom - 1 ), desktop->cursor.clip.top ); if (desktop->cursor.x != x || desktop->cursor.y != y) always_queue = 1; desktop->cursor.x = x; desktop->cursor.y = y;

1 0

Nikolay Sivov : comctl32/toolbar: Send BN_CLICKED for button that was pressed, not released.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: f3775ed2ac13ade19a4603f5fba558064311f0b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3775ed2ac13ade19a4603f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 17 01:33:10 2019 +0300 comctl32/toolbar: Send BN_CLICKED for button that was pressed, not released. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35516 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index f4bdb60..b0c1fb5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5733,7 +5733,10 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TOOLBAR_SendNotify(&hdr, infoPtr, TBN_TOOLBARCHANGE); } - else if (infoPtr->nButtonDown >= 0) { + else if (infoPtr->nButtonDown >= 0) + { + BOOL was_clicked = nHit == infoPtr->nButtonDown; + btnPtr = &infoPtr->buttons[infoPtr->nButtonDown]; btnPtr->fsState &= ~TBSTATE_PRESSED; @@ -5775,7 +5778,7 @@ TOOLBAR_LButtonUp (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_ENDDRAG); - if (btnPtr->fsState & TBSTATE_ENABLED) + if (was_clicked && btnPtr->fsState & TBSTATE_ENABLED) { SendMessageW (infoPtr->hwndNotify, WM_COMMAND, MAKEWPARAM(infoPtr->buttons[nHit].idCommand, BN_CLICKED), (LPARAM)infoPtr->hwndSelf);

1 0

Nikolay Sivov : comctl32/updown: Make sure buttons rectangles are consistent with each other.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: cfc323db26c926791a2afd1e8bc2aae8828ef6bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfc323db26c926791a2afd1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 18 10:28:34 2019 +0300 comctl32/updown: Make sure buttons rectangles are consistent with each other. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/updown.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 8dec7a4..a48f1e4 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> @@ -170,13 +171,16 @@ static BOOL UPDOWN_HasBuddyBorder(const UPDOWN_INFO *infoPtr) * rect - will hold the rectangle * arrow - FLAG_INCR to get the "increment" rect (up or right) * FLAG_DECR to get the "decrement" rect (down or left) - * If both flags are present, the envelope is returned. */ -static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, int arrow) +static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, unsigned int arrow) { HTHEME theme = GetWindowTheme (infoPtr->Self); const int border = theme ? DEFAULT_BUDDYBORDER_THEMED : DEFAULT_BUDDYBORDER; const int spacer = theme ? DEFAULT_BUDDYSPACER_THEMED : DEFAULT_BUDDYSPACER; + int size; + + assert(arrow && (arrow & (FLAG_INCR | FLAG_DECR)) != (FLAG_INCR | FLAG_DECR)); + GetClientRect (infoPtr->Self, rect); /* @@ -200,21 +204,20 @@ static void UPDOWN_GetArrowRect (const UPDOWN_INFO* infoPtr, RECT *rect, int arr /* * We're calculating the midpoint to figure-out where the - * separation between the buttons will lay. We make sure that we - * round the uneven numbers by adding 1. + * separation between the buttons will lay. */ if (infoPtr->dwStyle & UDS_HORZ) { - int len = rect->right - rect->left + 1; /* compute the width */ + size = (rect->right - rect->left) / 2; if (arrow & FLAG_INCR) - rect->left = rect->left + len/2; - if (arrow & FLAG_DECR) - rect->right = rect->left + len/2 - (theme ? 0 : 1); + rect->left = rect->right - size; + else if (arrow & FLAG_DECR) + rect->right = rect->left + size; } else { - int len = rect->bottom - rect->top + 1; /* compute the height */ + size = (rect->bottom - rect->top) / 2; if (arrow & FLAG_INCR) - rect->bottom = rect->top + len/2 - (theme ? 0 : 1); - if (arrow & FLAG_DECR) - rect->top = rect->top + len/2; + rect->bottom = rect->top + size; + else if (arrow & FLAG_DECR) + rect->top = rect->bottom - size; } }

1 0

Nikolay Sivov : mfplat: Implement MFCreateAsyncResult().
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 9a6fcdf42f3706a95c8c4395691aa6dd33b11977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a6fcdf42f3706a95c8c4395… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 18 16:24:09 2019 +0300 mfplat: Implement MFCreateAsyncResult(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 3 +- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/queue.c | 190 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/tests/mfplat.c | 140 +++++++++++++++++++++++++++++++++ include/mfapi.h | 14 ++++ 5 files changed, 347 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9a6fcdf42f3706a95c8c…

1 0