February 2019 - Wine-Commits

Hans Leidekker : winhttp: Include URL extra info in the path unless the caller asks for it separately.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 18e17e8d3631bfde8a17d20c10b558789eabd44d URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e17e8d3631bfde8a17d20c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 20 09:58:19 2019 +0100 winhttp: Include URL extra info in the path unless the caller asks for it separately. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/url.c | 19 ++++++++++++++++++- dlls/winhttp/url.c | 10 +++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 0a31e18..37a6e4a 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -81,6 +81,10 @@ static const WCHAR url19[] = {'h','t','t','p',':','/','/','?','t','e','x','t','=',0xfb00,0}; static const WCHAR url20[] = {'h','t','t','p',':','/','/','/','t','e','x','t','=',0xfb00,0}; +static const WCHAR url21[] = + {'h','t','t','p','s',':','/','/','n','b','a','2','k','1','9','-','w','s','.','2','k','s','p','o','r','t','s','.','c','o','m',':','1','9','1','3','3', + '/','n','b','a','/','v','4','/','A','c','c','o','u','n','t','s','/','g','e','t','_','a','c','c','o','u','n','t','?','x','=','3','7','8','9','5','2', + '6','7','7','5','2','6','5','6','6','3','8','7','6',0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -428,7 +432,7 @@ static void WinHttpCrackUrl_test( void ) static const WCHAR pathW[] = {'/','p','a','t','h','%','2','0','w','i','t','h','%','2','0','s','p','a','c','e','s',0}; URL_COMPONENTSW uc; - WCHAR scheme[20], user[20], pass[20], host[20], path[80], extra[40]; + WCHAR scheme[20], user[20], pass[20], host[40], path[80], extra[40]; DWORD error; BOOL ret; @@ -843,6 +847,19 @@ static void WinHttpCrackUrl_test( void ) ret = WinHttpCrackUrl( url17, 0, 0, &uc ); ok( ret, "got %u\n", GetLastError() ); todo_wine ok( uc.nPort == 80, "got %u\n", uc.nPort ); + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.lpszScheme = scheme; + uc.dwSchemeLength = ARRAY_SIZE(scheme); + uc.lpszHostName = host; + uc.dwHostNameLength = ARRAY_SIZE(host); + uc.lpszUrlPath = path; + uc.dwUrlPathLength = ARRAY_SIZE(path); + ret = WinHttpCrackUrl( url21, 0, 0, &uc ); + ok( ret, "got %u\n", GetLastError() ); + ok( !lstrcmpW( uc.lpszUrlPath, url21 + 37 ), "unexpected path %s\n", wine_dbgstr_w(uc.lpszUrlPath) ); + ok( uc.dwUrlPathLength == 50, "unexpected length %u\n", uc.dwUrlPathLength ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index e6aeac3..786378d 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -179,7 +179,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN TRACE("%s, %d, %x, %p\n", debugstr_wn(url, len), len, flags, uc); - if (!url || !uc || uc->dwStructSize != sizeof(URL_COMPONENTS)) + if (!url || !uc || uc->dwStructSize != sizeof(*uc)) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; @@ -268,8 +268,12 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN if ((r = memchrW( q, '?', len - (q - url) ))) { - if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, r - q, flags, &overflow ))) goto exit; - if ((err = set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, r, len - (r - url), flags, &overflow ))) goto exit; + if (uc->dwExtraInfoLength) + { + if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, r - q, flags, &overflow ))) goto exit; + if ((err = set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, r, len - (r - url), flags, &overflow ))) goto exit; + } + else if ((err = set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, q, len - (q - url), flags, &overflow ))) goto exit; } else {

1 0

Paul Gofman : wined3d: Only use the LSB of the _SAMP_SRGB_TEXTURE state value.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 225fdc35586719406943286dd0e0d1aa8c25e3a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=225fdc35586719406943286d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Feb 20 13:55:11 2019 +0330 wined3d: Only use the LSB of the _SAMP_SRGB_TEXTURE state value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37705 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 173 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 12 +++ 4 files changed, 168 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=225fdc35586719406943…

1 0

Michael Stefaniuc : ddraw/tests: Avoid using the comma operator ( coccinellery).
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 17325e6e697f6ccca612cfb14b50f16c66eefd00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17325e6e697f6ccca612cfb1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 19 20:27:36 2019 +0100 ddraw/tests: Avoid using the comma operator (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 1dc8856..ceb1f83 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8383,7 +8383,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface_Release(surface), + IDirectDrawSurface_Release(surface); refcount = IDirectDraw_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 91300ed..db67afa 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9535,7 +9535,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface_Release(surface), + IDirectDrawSurface_Release(surface); refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d192cdf..dbba9b5 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -10975,7 +10975,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface4_Release(surface), + IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index b43b538..215e1c7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -10878,7 +10878,7 @@ static void test_range_colorkey(void) ok(!ckey.dwColorSpaceLowValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceLowValue); ok(!ckey.dwColorSpaceHighValue, "Got unexpected value 0x%08x.\n", ckey.dwColorSpaceHighValue); - IDirectDrawSurface7_Release(surface), + IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window);

1 0

Gabriel Ivăncescu : comctl32/listbox: Use a helper to set item height by index.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: e0984d401329ca6e537824f4955c274445945b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0984d401329ca6e537824f4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 12:04:57 2019 +0000 comctl32/listbox: Use a helper to set item height by index. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index a457d63..ba8b7ee 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -168,6 +168,11 @@ static UINT get_item_height( const LB_DESCR *descr, UINT index ) return (descr->style & LBS_NODATA) ? 0 : descr->items[index].height; } +static void set_item_height( LB_DESCR *descr, UINT index, UINT height ) +{ + if (!(descr->style & LBS_NODATA)) descr->items[index].height = height; +} + static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) { if (!(descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL))) @@ -1233,7 +1238,7 @@ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BO return LB_ERR; } TRACE("[%p]: item %d height = %d\n", descr->self, index, height ); - descr->items[index].height = height; + set_item_height(descr, index, height); LISTBOX_UpdateScroll( descr ); if (repaint) LISTBOX_InvalidateItems( descr, index ); @@ -1590,7 +1595,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, mis.itemData = data; mis.itemHeight = descr->item_height; SendMessageW( descr->owner, WM_MEASUREITEM, id, (LPARAM)&mis ); - item->height = mis.itemHeight ? mis.itemHeight : 1; + set_item_height(descr, index, mis.itemHeight ? mis.itemHeight : 1); TRACE("[%p]: measure item %d (%s) = %d\n", descr->self, index, str ? debugstr_w(str) : "", get_item_height(descr, index)); }

1 0

Gabriel Ivăncescu : comctl32/listbox: Move the item data removal into a separate function.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: e98d4b4502ba75e8e206984e5d819aee0af3d670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e98d4b4502ba75e8e206984e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 12:04:59 2019 +0000 comctl32/listbox: Move the item data removal into a separate function. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 44e3b1c..e89d257 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -200,6 +200,15 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR item->selected = FALSE; } +static void remove_item_data(LB_DESCR *descr, UINT index) +{ + LB_ITEMDATA *item; + + item = descr->items + index; + if (index < descr->nb_items) + memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); +} + /*********************************************************************** * LISTBOX_GetCurrentPageSize * @@ -1699,8 +1708,6 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) */ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) { - LB_ITEMDATA *item; - if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; /* We need to invalidate the original rect instead of the updated one. */ @@ -1713,15 +1720,9 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) } descr->nb_items--; LISTBOX_DeleteItem( descr, index ); + remove_item_data(descr, index); - /* Remove the item */ - - item = &descr->items[index]; - if (index < descr->nb_items) - RtlMoveMemory( item, item + 1, - (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); if (descr->anchor_item == descr->nb_items) descr->anchor_item--; - resize_storage(descr, descr->nb_items); /* Repaint the items */

1 0

Gabriel Ivăncescu : comctl32/listbox: Implement LBS_NODATA for single-selection listboxes.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 1b7886edaf15b1f13c6ae47bc45e2475589c7638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7886edaf15b1f13c6ae47b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 20 12:05:00 2019 +0000 comctl32/listbox: Implement LBS_NODATA for single-selection listboxes. The LBS_NODATA style's purpose is to drastically improve performance and memory usage on very large lists, since they should function as virtual lists. Thus, don't store any data for single-selection listboxes (descr->items always NULL). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32374 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index e89d257..cbe57f2 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - LBS_NODATA + * - LBS_NODATA for multi-selection listboxes */ #include <string.h> @@ -135,17 +135,20 @@ static BOOL resize_storage(LB_DESCR *descr, UINT items_size) items_size + LB_ARRAY_GRANULARITY * 2 < descr->items_size) { items_size = (items_size + LB_ARRAY_GRANULARITY - 1) & ~(LB_ARRAY_GRANULARITY - 1); - items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); - if (!items) + if ((descr->style & (LBS_NODATA | LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) != LBS_NODATA) { - SEND_NOTIFICATION(descr, LBN_ERRSPACE); - return FALSE; + items = heap_realloc(descr->items, items_size * sizeof(LB_ITEMDATA)); + if (!items) + { + SEND_NOTIFICATION(descr, LBN_ERRSPACE); + return FALSE; + } + descr->items = items; } descr->items_size = items_size; - descr->items = items; } - if ((descr->style & LBS_NODATA) && items_size > descr->nb_items) + if ((descr->style & LBS_NODATA) && descr->items && items_size > descr->nb_items) { memset(&descr->items[descr->nb_items], 0, (items_size - descr->nb_items) * sizeof(LB_ITEMDATA)); @@ -190,6 +193,8 @@ static void insert_item_data(LB_DESCR *descr, UINT index, WCHAR *str, ULONG_PTR { LB_ITEMDATA *item; + if (!descr->items) return; + item = descr->items + index; if (index < descr->nb_items) memmove(item + 1, item, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); @@ -204,6 +209,8 @@ static void remove_item_data(LB_DESCR *descr, UINT index) { LB_ITEMDATA *item; + if (!descr->items) return; + item = descr->items + index; if (index < descr->nb_items) memmove(item, item + 1, (descr->nb_items - index) * sizeof(LB_ITEMDATA)); @@ -1762,7 +1769,8 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) { INT i; - for(i = descr->nb_items - 1; i>=0; i--) LISTBOX_DeleteItem( descr, i); + if (!(descr->style & LBS_NODATA)) + for (i = descr->nb_items - 1; i >= 0; i--) LISTBOX_DeleteItem(descr, i); HeapFree( GetProcessHeap(), 0, descr->items ); descr->nb_items = 0; descr->top_item = 0;

1 0

Andrey Gusev : ext-ms-win-ntuser-message-l1-1-0: Add dll.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: fe852ef122f3dcdc0b8631c9c2333c2560790513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe852ef122f3dcdc0b8631c9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 20 14:23:38 2019 +0200 ext-ms-win-ntuser-message-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-message-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-message-l1-1-0.spec | 22 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 27 insertions(+) diff --git a/configure b/configure index c5c8ab8..1c15b5a 100755 --- a/configure +++ b/configure @@ -1278,6 +1278,7 @@ enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 +enable_ext_ms_win_ntuser_message_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_misc_l1_2_0 enable_ext_ms_win_ntuser_misc_l1_5_1 @@ -19586,6 +19587,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntu wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-1-0 enable_ext_ms_win_ntuser_gui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-0 enable_ext_ms_win_ntuser_message_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-2-0 enable_ext_ms_win_ntuser_misc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-5-1 enable_ext_ms_win_ntuser_misc_l1_5_1 diff --git a/configure.ac b/configure.ac index d77fa7b..91cba94 100644 --- a/configure.ac +++ b/configure.ac @@ -3316,6 +3316,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-5-1) diff --git a/dlls/ext-ms-win-ntuser-message-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-message-l1-1-0/Makefile.in new file mode 100644 index 0000000..f42015a --- /dev/null +++ b/dlls/ext-ms-win-ntuser-message-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-message-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-message-l1-1-0/ext-ms-win-ntuser-message-l1-1-0.spec b/dlls/ext-ms-win-ntuser-message-l1-1-0/ext-ms-win-ntuser-message-l1-1-0.spec new file mode 100644 index 0000000..f449bf4 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-message-l1-1-0/ext-ms-win-ntuser-message-l1-1-0.spec @@ -0,0 +1,22 @@ +@ stdcall CallMsgFilterW(ptr long) user32.CallMsgFilterW +@ stdcall DispatchMessageA(ptr) user32.DispatchMessageA +@ stdcall DispatchMessageW(ptr) user32.DispatchMessageW +@ stdcall GetMessageA(ptr long long long) user32.GetMessageA +@ stdcall GetMessageW(ptr long long long) user32.GetMessageW +@ stdcall GetQueueStatus(long) user32.GetQueueStatus +@ stdcall InSendMessage() user32.InSendMessage +@ stdcall InSendMessageEx(ptr) user32.InSendMessageEx +@ stdcall PeekMessageA(ptr long long long long) user32.PeekMessageA +@ stdcall PeekMessageW(ptr long long long long) user32.PeekMessageW +@ stdcall PostMessageA(long long long long) user32.PostMessageA +@ stdcall PostMessageW(long long long long) user32.PostMessageW +@ stdcall PostQuitMessage(long) user32.PostQuitMessage +@ stdcall PostThreadMessageA(long long long long) user32.PostThreadMessageA +@ stdcall PostThreadMessageW(long long long long) user32.PostThreadMessageW +@ stdcall RegisterWindowMessageA(str) user32.RegisterWindowMessageA +@ stdcall RegisterWindowMessageW(wstr) user32.RegisterWindowMessageW +@ stdcall SendMessageA(long long long long) user32.SendMessageA +@ stdcall SendMessageTimeoutW(long long long long long long ptr) user32.SendMessageTimeoutW +@ stdcall SendMessageW(long long long long) user32.SendMessageW +@ stdcall SetMessageQueue(long) user32.SetMessageQueue +@ stdcall TranslateMessage(ptr) user32.TranslateMessage diff --git a/tools/make_specfiles b/tools/make_specfiles index f6cfea1..ab5b3fd 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -381,6 +381,7 @@ my @dll_groups = "ext-ms-win-ntuser-gui-l1-1-0", "ext-ms-win-ntuser-gui-l1-3-0", "ext-ms-win-ntuser-keyboard-l1-3-0", + "ext-ms-win-ntuser-message-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-misc-l1-2-0", "ext-ms-win-ntuser-misc-l1-5-1",

1 0

Dmitry Timoshkov : windowscodecs: Fix the SupportsTransparency flag value for various pixel formats.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: 4af1c0c246b95737ae14cbe1a72784cdf4428af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4af1c0c246b95737ae14cbe1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 12:07:10 2019 +0800 windowscodecs: Fix the SupportsTransparency flag value for various pixel formats. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/regsvr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index c8338f1..d215e30 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1775,7 +1775,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_1bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat2bppIndexed, "The Wine Project", @@ -1786,7 +1786,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_2bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat4bppIndexed, "The Wine Project", @@ -1797,7 +1797,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_4bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormat8bppIndexed, "The Wine Project", @@ -1808,7 +1808,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_8bit, WICPixelFormatNumericRepresentationIndexed, - 1 + 0 }, { &GUID_WICPixelFormatBlackWhite, "The Wine Project", @@ -1995,7 +1995,7 @@ static struct regsvr_pixelformat const pixelformat_list[] = { 1, /* channel count */ channel_masks_32bit, WICPixelFormatNumericRepresentationFloat, - 1 + 0 }, { &GUID_WICPixelFormat48bppRGB, "The Wine Project",

1 0

Dmitry Timoshkov : windowscodecs: Fail earlier in TIFF decoder' s Initialize method for unsupported pixel formats.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: ea6118e9b740c8f0ede866b45b71b162c6f315e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea6118e9b740c8f0ede866b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 12:07:36 2019 +0800 windowscodecs: Fail earlier in TIFF decoder's Initialize method for unsupported pixel formats. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 58cd04e..3bc8d69 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -638,6 +638,7 @@ static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream * { TiffDecoder *This = impl_from_IWICBitmapDecoder(iface); TIFF *tiff; + tiff_decode_info decode_info; HRESULT hr=S_OK; TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); @@ -651,13 +652,20 @@ static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream * } tiff = tiff_open_stream(pIStream, "r"); - if (!tiff) { hr = E_FAIL; goto exit; } + /* make sure that TIFF format is supported */ + hr = tiff_get_decode_info(tiff, &decode_info); + if (hr != S_OK) + { + pTIFFClose(tiff); + goto exit; + } + This->tiff = tiff; This->stream = pIStream; IStream_AddRef(pIStream);

1 0

Andrey Gusev : ext-ms-win-ntuser-misc-l1-1-0: Add dll.
by Alexandre Julliard Feb. 20, 2019

Feb. 20, 2019

Module: wine Branch: master Commit: a1a9ca8f4a6f21dcc03f341fd0b7fed1475b4396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1a9ca8f4a6f21dcc03f341f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Feb 20 14:23:39 2019 +0200 ext-ms-win-ntuser-misc-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-misc-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-misc-l1-1-0.spec | 20 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 25 insertions(+) diff --git a/configure b/configure index 1c15b5a..166ddbf 100755 --- a/configure +++ b/configure @@ -1280,6 +1280,7 @@ enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_misc_l1_1_0 enable_ext_ms_win_ntuser_misc_l1_2_0 enable_ext_ms_win_ntuser_misc_l1_5_1 enable_ext_ms_win_ntuser_mouse_l1_1_0 @@ -19589,6 +19590,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntus wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-0 enable_ext_ms_win_ntuser_message_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-1-0 enable_ext_ms_win_ntuser_misc_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-2-0 enable_ext_ms_win_ntuser_misc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-5-1 enable_ext_ms_win_ntuser_misc_l1_5_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 diff --git a/configure.ac b/configure.ac index 91cba94..f11a452 100644 --- a/configure.ac +++ b/configure.ac @@ -3318,6 +3318,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-5-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-misc-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-misc-l1-1-0/Makefile.in new file mode 100644 index 0000000..da5be2d --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-misc-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-misc-l1-1-0/ext-ms-win-ntuser-misc-l1-1-0.spec b/dlls/ext-ms-win-ntuser-misc-l1-1-0/ext-ms-win-ntuser-misc-l1-1-0.spec new file mode 100644 index 0000000..4a19314 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-1-0/ext-ms-win-ntuser-misc-l1-1-0.spec @@ -0,0 +1,20 @@ +@ stdcall DrawTextW(long wstr long ptr long) user32.DrawTextW +@ stdcall ExitWindowsEx(long long) user32.ExitWindowsEx +@ stdcall GetClipboardFormatNameW(long ptr long) user32.GetClipboardFormatNameW +@ stdcall GetGuiResources(long long) user32.GetGuiResources +@ stdcall GetUserObjectSecurity(long ptr ptr long ptr) user32.GetUserObjectSecurity +@ stdcall KillTimer(long long) user32.KillTimer +@ stdcall MessageBeep(long) user32.MessageBeep +@ stdcall MonitorFromPoint(int64 long) user32.MonitorFromPoint +@ stdcall MonitorFromRect(ptr long) user32.MonitorFromRect +@ stdcall RegisterClipboardFormatW(wstr) user32.RegisterClipboardFormatW +@ stdcall RegisterDeviceNotificationW(long ptr long) user32.RegisterDeviceNotificationW +@ stdcall SetCoalescableTimer(long long long ptr long) user32.SetCoalescableTimer +@ stdcall SetTimer(long long long ptr) user32.SetTimer +@ stdcall SetUserObjectSecurity(long ptr ptr) user32.SetUserObjectSecurity +@ stdcall ShutdownBlockReasonCreate(long wstr) user32.ShutdownBlockReasonCreate +@ stdcall ShutdownBlockReasonDestroy(long) user32.ShutdownBlockReasonDestroy +@ stdcall TabbedTextOutW(long long long wstr long long ptr long) user32.TabbedTextOutW +@ stdcall UnregisterDeviceNotification(long) user32.UnregisterDeviceNotification +@ stdcall WaitForInputIdle(long long) user32.WaitForInputIdle +@ stdcall WinHelpW(long wstr long long) user32.WinHelpW diff --git a/tools/make_specfiles b/tools/make_specfiles index ab5b3fd..3bd6123 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -383,6 +383,7 @@ my @dll_groups = "ext-ms-win-ntuser-keyboard-l1-3-0", "ext-ms-win-ntuser-message-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-misc-l1-1-0", "ext-ms-win-ntuser-misc-l1-2-0", "ext-ms-win-ntuser-misc-l1-5-1", "ext-ms-win-ntuser-mouse-l1-1-0",

1 0