February 2019 - Wine-Commits

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

Feb. 18, 2019

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

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

Feb. 18, 2019

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-window-l1-1-0: Add dll.
by Alexandre Julliard Feb. 18, 2019

Feb. 18, 2019

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 Feb. 18, 2019

Feb. 18, 2019

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

Sven Baars : windowscodecs: Add missing source_bpp initialization ( Valgrind).
by Alexandre Julliard Feb. 18, 2019

Feb. 18, 2019

Module: wine Branch: master Commit: 1d8882e04be101f5c7773a84d2059353ca768a1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d8882e04be101f5c7773a84… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Feb 17 11:47:55 2019 +0100 windowscodecs: Add missing source_bpp initialization (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 3d53b24..58cd04e 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -289,6 +289,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->reverse_bgr = 0; decode_info->invert_grayscale = 0; decode_info->tiled = 0; + decode_info->source_bpp = 0; ret = pTIFFGetField(tiff, TIFFTAG_PHOTOMETRIC, &photometric); if (!ret)

1 0

Sven Baars : windowscodecs/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Feb. 18, 2019

Feb. 18, 2019

Module: wine Branch: master Commit: 13eb82922cafff26363b85c1b9b18dd965dffa55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13eb82922cafff26363b85c1… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Feb 17 11:16:21 2019 +0100 windowscodecs/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 455c6ae..b99f987 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -880,6 +880,8 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) } else tag[i].value[0] = -1; + + PropVariantClear(&value); } IWICMetadataReader_Release(reader);

1 0

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

Feb. 18, 2019

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

Gijs Vermeulen : ntdll: Validate len in NtQueryVirtualMemory.
by Alexandre Julliard Feb. 18, 2019

Feb. 18, 2019

Module: wine Branch: master Commit: d2d52717af2a64196d9bc983ba8b75e64c05c3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d52717af2a64196d9bc983… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Feb 18 15:22:52 2019 +0100 ntdll: Validate len in NtQueryVirtualMemory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45632 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 3 +++ dlls/ntdll/virtual.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7690696..5f27d8b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2005,6 +2005,9 @@ static void test_queryvirtualmemory(void) /* check error code when addr is higher than working set limit */ status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); + /* check error code when len is less than MEMORY_BASIC_INFORMATION size */ + status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION) - 1, &readcount); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); } static void test_affinity(void) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c008db7..c86ca88 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2820,6 +2820,9 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, } } + if (len < sizeof(MEMORY_BASIC_INFORMATION)) + return STATUS_INFO_LENGTH_MISMATCH; + if (process != NtCurrentProcess()) { NTSTATUS status;

1 0

Nikolay Sivov : mfplat: Implement MFCreateAsyncResult().
by Alexandre Julliard Feb. 18, 2019

Feb. 18, 2019

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

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

Feb. 18, 2019

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