March 2018 - Wine-commits - list.winehq.org

Joel Holdsworth : urlmon: Support [Add.Code] sections in ActiveX INF files.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 5575c1e9f01c7a3df41a1f4cd467ad5e4e80340d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5575c1e9f01c7a3df41a1f4c… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Dec 13 13:32:22 2017 -0700 urlmon: Support [Add.Code] sections in ActiveX INF files. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 185bcc4523c5827a78a56c63735f1a5f502e999b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/axinstall.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 7ee7d94..d2cf7e6 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -251,12 +251,25 @@ static HRESULT install_inf_file(install_ctx_t *ctx) len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); if(len) { - FIXME("[Add.Code] section not supported\n"); + default_install = FALSE; - /* Don't throw an error if we successfully ran setup hooks; - installation is likely to be complete enough */ - if(default_install) - return E_NOTIMPL; + for(key = buf; *key; key += strlenW(key)+1) { + TRACE("[Add.Code] key: %s\n", debugstr_w(key)); + + len = GetPrivateProfileStringW(add_codeW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + ctx->install_file); + if(!len) { + WARN("Could not get key value\n"); + return E_FAIL; + } + + hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, sect_name, + ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); + if(FAILED(hres)) { + WARN("RunSetupCommandW failed: %08x\n", hres); + return hres; + } + } } if(default_install) {

1 0

Matteo Bruni : d3dx9: Implement D3DXGetShader{Input|Output}Semantics().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 300a23fa50bf361e31096b3cf0bc43467b078bee URL: https://source.winehq.org/git/wine.git/?a=commit;h=300a23fa50bf361e31096b3c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Dec 7 22:56:15 2017 +0100 d3dx9: Implement D3DXGetShader{Input|Output}Semantics(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 50734ad54f4212b8e522d0acf7c616e51df19644) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 4 +- dlls/d3dx9_25/d3dx9_25.spec | 4 +- dlls/d3dx9_26/d3dx9_26.spec | 4 +- dlls/d3dx9_27/d3dx9_27.spec | 4 +- dlls/d3dx9_28/d3dx9_28.spec | 4 +- dlls/d3dx9_29/d3dx9_29.spec | 4 +- dlls/d3dx9_30/d3dx9_30.spec | 4 +- dlls/d3dx9_31/d3dx9_31.spec | 4 +- dlls/d3dx9_32/d3dx9_32.spec | 4 +- dlls/d3dx9_33/d3dx9_33.spec | 4 +- dlls/d3dx9_34/d3dx9_34.spec | 4 +- dlls/d3dx9_35/d3dx9_35.spec | 4 +- dlls/d3dx9_36/d3dx9_36.spec | 4 +- dlls/d3dx9_36/shader.c | 246 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 4 +- dlls/d3dx9_38/d3dx9_38.spec | 4 +- dlls/d3dx9_39/d3dx9_39.spec | 4 +- dlls/d3dx9_40/d3dx9_40.spec | 4 +- dlls/d3dx9_41/d3dx9_41.spec | 4 +- dlls/d3dx9_42/d3dx9_42.spec | 4 +- dlls/d3dx9_43/d3dx9_43.spec | 4 +- 21 files changed, 286 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=300a23fa50bf361e3109…

1 0

Hugh McMaster : setupapi: Recursively remove any subkeys before calling NtDeleteKey().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 54612205b446ae8dc84177e1907b2a9da2008364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54612205b446ae8dc84177e1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Sep 12 06:08:13 2017 +0000 setupapi: Recursively remove any subkeys before calling NtDeleteKey(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c9308b8d6b1e2f4dd39b19a6890423cd42fd4620) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/install.c | 6 +++++- dlls/setupapi/tests/install.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index a8d38aa..0593df8 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -320,7 +320,11 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context } else RegDeleteValueW( hkey, value ); } - else NtDeleteKey( hkey ); + else + { + RegDeleteTreeW( hkey, NULL ); + NtDeleteKey( hkey ); + } return TRUE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 558453c..3ca7f26 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -174,7 +174,6 @@ static void test_registry(void) /* Check if the registry key is recursively deleted */ res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key); - todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Didn't expect the registry key to exist\n"); /* Just in case */ if (res == ERROR_SUCCESS)

1 0

Nikolay Sivov : comctl32/tooltips: Remove window subclass right before window is destroyed.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0f53cac352f287a86615431564430a07d2f84595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f53cac352f287a866154315… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 20 01:21:44 2017 +0300 comctl32/tooltips: Remove window subclass right before window is destroyed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b68dbf4ea1294a98ca653f32e88b07be632a5bae) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tooltips.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 56dc743..e26964d 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1921,16 +1921,12 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } + /* Reset subclassing data. */ + if (toolPtr->uInternalFlags & TTF_SUBCLASS) + SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, + TOOLTIPS_SubclassProc, 1, 0); } - } + Free (infoPtr->tools); } @@ -2151,12 +2147,13 @@ TOOLTIPS_WinIniChange (TOOLTIPS_INFO *infoPtr) static LRESULT CALLBACK -TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) +TOOLTIPS_SubclassProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr ((HWND)dwRef); MSG msg; - switch(uMsg) { + switch (message) + { case WM_MOUSEMOVE: case WM_LBUTTONDOWN: case WM_LBUTTONUP: @@ -2164,17 +2161,23 @@ TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_ case WM_MBUTTONUP: case WM_RBUTTONDOWN: case WM_RBUTTONUP: - msg.hwnd = hwnd; - msg.message = uMsg; - msg.wParam = wParam; - msg.lParam = lParam; - TOOLTIPS_RelayEvent(infoPtr, &msg); - break; - + if (infoPtr) + { + msg.hwnd = hwnd; + msg.message = message; + msg.wParam = wParam; + msg.lParam = lParam; + TOOLTIPS_RelayEvent(infoPtr, &msg); + } + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, TOOLTIPS_SubclassProc, 1); + break; default: break; } - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + + return DefSubclassProc(hwnd, message, wParam, lParam); }

1 0

Nikolay Sivov : comctl32/updown: Reset control width conditionally on UDM_SETBUDDY with NULL buddy handle.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 46a46bde32f8113cf73caa25ba7d75c632c1207a URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a46bde32f8113cf73caa25… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 21 12:14:45 2017 +0300 comctl32/updown: Reset control width conditionally on UDM_SETBUDDY with NULL buddy handle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 030488bc76156248170c4cc030bc8049e81a52d2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/updown.c | 77 +++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/updown.c | 11 ++++--- 2 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index cc06f65..449a8b7 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -518,6 +518,7 @@ static void test_updown_pos32(void) static void test_updown_buddy(void) { HWND updown, buddyReturn, buddy; + RECT rect, rect2; WNDPROC proc; DWORD style; @@ -564,8 +565,82 @@ static void test_updown_buddy(void) } DestroyWindow(updown); - DestroyWindow(buddy); + + /* Create with buddy and UDS_HORZ, reset buddy. */ + updown = create_updown_control(UDS_HORZ, g_edit); + + buddyReturn = (HWND)SendMessageA(updown, UDM_GETBUDDY, 0, 0); + ok(buddyReturn == g_edit, "Unexpected buddy window.\n"); + + GetClientRect(updown, &rect); + + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0); + ok(buddyReturn == g_edit, "Unexpected buddy window.\n"); + + GetClientRect(updown, &rect2); + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + /* Remove UDS_HORZ, reset buddy again. */ + style = GetWindowLongA(updown, GWL_STYLE); + SetWindowLongA(updown, GWL_STYLE, style & ~UDS_HORZ); + style = GetWindowLongA(updown, GWL_STYLE); + ok(!(style & UDS_HORZ), "Unexpected style.\n"); + + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0); + ok(buddyReturn == NULL, "Unexpected buddy window.\n"); + + GetClientRect(updown, &rect2); + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + DestroyWindow(updown); + + /* Without UDS_HORZ. */ + updown = create_updown_control(0, g_edit); + + buddyReturn = (HWND)SendMessageA(updown, UDM_GETBUDDY, 0, 0); + ok(buddyReturn == g_edit, "Unexpected buddy window.\n"); + + GetClientRect(updown, &rect); + + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0); + ok(buddyReturn == g_edit, "Unexpected buddy window.\n"); + + GetClientRect(updown, &rect2); + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + DestroyWindow(updown); + + /* Create without buddy. */ + GetClientRect(parent_wnd, &rect); + updown = CreateWindowExA(0, UPDOWN_CLASSA, NULL, WS_CHILD | WS_BORDER | WS_VISIBLE | UDS_HORZ, + 0, 0, rect.right, rect.bottom, parent_wnd, (HMENU)1, GetModuleHandleA(NULL), NULL); + ok(updown != NULL, "Failed to create UpDown control.\n"); + + GetClientRect(updown, &rect); + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0); + ok(buddyReturn == NULL, "Unexpected buddy window.\n"); + GetClientRect(updown, &rect2); + + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + style = GetWindowLongA(updown, GWL_STYLE); + SetWindowLongA(updown, GWL_STYLE, style & ~UDS_HORZ); + + GetClientRect(updown, &rect2); + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, (WPARAM)g_edit, 0); + ok(buddyReturn == NULL, "Unexpected buddy window.\n"); + GetClientRect(updown, &rect); + + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0); + ok(buddyReturn == g_edit, "Unexpected buddy window.\n"); + GetClientRect(updown, &rect2); +todo_wine + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + DestroyWindow(updown); } static void test_updown_base(void) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index d188408..4f44b90 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -622,11 +622,11 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) RECT budRect; /* new coord for the buddy */ int x, width; /* new x position and width for the up-down */ WCHAR buddyClass[40]; - HWND ret; + HWND old_buddy; TRACE("(hwnd=%p, bud=%p)\n", infoPtr->Self, bud); - ret = infoPtr->Buddy; + old_buddy = infoPtr->Buddy; /* there is already a buddy assigned */ if (infoPtr->Buddy) RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, @@ -663,7 +663,7 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) x = budRect.right+DEFAULT_XSEP; } else { /* nothing to do */ - return ret; + return old_buddy; } /* first adjust the buddy to accommodate the up/down */ @@ -692,14 +692,15 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) budRect.top - DEFAULT_ADDTOP, width, budRect.bottom - budRect.top + DEFAULT_ADDTOP + DEFAULT_ADDBOT, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER); - } else { + } else if (!(infoPtr->dwStyle & UDS_HORZ) && old_buddy != NULL) { RECT rect; GetWindowRect(infoPtr->Self, &rect); MapWindowPoints(HWND_DESKTOP, GetParent(infoPtr->Self), (POINT *)&rect, 2); SetWindowPos(infoPtr->Self, 0, rect.left, rect.top, DEFAULT_WIDTH, rect.bottom - rect.top, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER); } - return ret; + + return old_buddy; } /***********************************************************************

1 0

Sebastian Lackner : user32: Globally invalidate key state on changes in other threads.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: cacd11edc1e20011f3641681f28044a82d693669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cacd11edc1e20011f3641681… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 18 16:20:58 2017 +0100 user32: Globally invalidate key state on changes in other threads. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 059d5ece23265e003ab413aa711e963da9c0564e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/input.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 44b7e70..bc62f87 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -371,6 +371,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; INT counter = global_key_state_counter; + BYTE prev_key_state; SHORT ret; if (key < 0 || key >= 256) return 0; @@ -398,14 +399,23 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { req->tid = 0; req->key = key; - if (key_state_info) wine_server_set_reply( req, key_state_info->state, - sizeof(key_state_info->state) ); + if (key_state_info) + { + prev_key_state = key_state_info->state[key]; + wine_server_set_reply( req, key_state_info->state, sizeof(key_state_info->state) ); + } if (!wine_server_call( req )) { if (reply->state & 0x40) ret |= 0x0001; if (reply->state & 0x80) ret |= 0x8000; if (key_state_info) { + /* force refreshing the key state cache - some multithreaded programs + * (like Adobe Photoshop CS5) expect that changes to the async key state + * are also immediately available in other threads. */ + if (prev_key_state != key_state_info->state[key]) + counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; + key_state_info->time = GetTickCount(); key_state_info->counter = counter; }

1 0

Alex Henrie : ucrtbase: Add __stdio_common_vsprintf_p.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 98811bc25544d22020820ed6c9e9bb14e914285e URL: https://source.winehq.org/git/wine.git/?a=commit;h=98811bc25544d22020820ed6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Oct 13 20:11:24 2017 +0200 ucrtbase: Add __stdio_common_vsprintf_p. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8b6eada458a632e443d653da23f997840ffa5d8c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 33 ++++++++++++++++------ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 6196fb4..8315d3c 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -12,7 +12,7 @@ @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf -@ stub __stdio_common_vsprintf_p +@ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 2ff9ec8..509f699 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1447,11 +1447,8 @@ int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElemen format, locale, args ); } -/********************************************************************* - * _vsprintf_p_l (MSVCRT.@) - */ -int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *format, - MSVCRT__locale_t locale, __ms_va_list args) +static int MSVCRT_vsprintf_p_l_opt(char *buffer, MSVCRT_size_t length, const char *format, + DWORD options, MSVCRT__locale_t locale, __ms_va_list args) { static const char nullbyte = '\0'; printf_arg args_ctx[MSVCRT__ARGMAX+1]; @@ -1466,11 +1463,11 @@ int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *fo *MSVCRT__errno() = MSVCRT_EINVAL; return ret; } else if(ret == 0) - ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, - arg_clbk_valist, NULL, &args); + ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_valist, NULL, &args); else ret = pf_printf_a(puts_clbk_str_a, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_positional, args_ctx, NULL); puts_clbk_str_a(&puts_ctx, 1, &nullbyte); @@ -1478,6 +1475,15 @@ int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *fo } /********************************************************************* + * _vsprintf_p_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsprintf_p_l(char *buffer, MSVCRT_size_t length, const char *format, + MSVCRT__locale_t locale, __ms_va_list args) +{ + return MSVCRT_vsprintf_p_l_opt(buffer, length, format, 0, locale, args); +} + +/********************************************************************* * _vsprintf_p (MSVCRT.@) */ int CDECL MSVCRT_vsprintf_p(char *buffer, MSVCRT_size_t length, @@ -1487,6 +1493,17 @@ int CDECL MSVCRT_vsprintf_p(char *buffer, MSVCRT_size_t length, } /********************************************************************* + * __stdio_common_vsprintf_p (UCRTBASE.@) + */ +int CDECL MSVCRT__stdio_common_vsprintf_p(unsigned __int64 options, char *buffer, MSVCRT_size_t length, + const char *format, MSVCRT__locale_t locale, __ms_va_list args) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return MSVCRT_vsprintf_p_l_opt(buffer, length, format, options & UCRTBASE_PRINTF_MASK, locale, args); +} + +/********************************************************************* * _sprintf_p_l (MSVCRT.@) */ int CDECL MSVCRT_sprintf_p_l(char *buffer, MSVCRT_size_t length, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ee95ee4..deee852 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -157,7 +157,7 @@ @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s @ cdecl __stdio_common_vsprintf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf -@ stub __stdio_common_vsprintf_p +@ cdecl __stdio_common_vsprintf_p(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_p @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf

1 0

Józef Kucia : wined3d: Use correct data type for immediate constants.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 5a6f24d2abdc54706fa1ac35e14c0453d6f34516 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a6f24d2abdc54706fa1ac35… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Oct 14 17:36:26 2017 +0200 wined3d: Use correct data type for immediate constants. In order to generate correct GLSL for image stores. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 033df637578ba76201a7ab6d4de1f506108f27b8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 78e1764..f0dbe97 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2475,7 +2475,8 @@ static void shader_glsl_gen_modifier(enum wined3d_shader_src_modifier src_modifi /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, - char *register_name, BOOL *is_color, const struct wined3d_shader_instruction *ins) + enum wined3d_data_type data_type, char *register_name, BOOL *is_color, + const struct wined3d_shader_instruction *ins) { /* oPos, oFog and oPts in D3D */ static const char * const hwrastout_reg_names[] = {"vs_out[10]", "vs_out[11].x", "vs_out[11].y"}; @@ -2697,7 +2698,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_SCALAR: - switch (reg->data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) @@ -2714,13 +2715,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "%#xu", reg->u.immconst_data[0]); break; default: - sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; case WINED3D_IMMCONST_VEC4: - switch (reg->data_type) + switch (data_type) { case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) @@ -2752,7 +2753,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * reg->u.immconst_data[2], reg->u.immconst_data[3]); break; default: - sprintf(register_name, "<unhandled data type %#x>", reg->data_type); + sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; @@ -2874,7 +2875,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; - shader_glsl_get_register_name(&wined3d_src->reg, glsl_src->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); if (wined3d_src->reg.type == WINED3DSPR_IMMCONST || wined3d_src->reg.type == WINED3DSPR_PRIMID) @@ -2925,7 +2926,8 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->mask_str[0] = '\0'; glsl_dst->reg_name[0] = '\0'; - shader_glsl_get_register_name(&wined3d_dst->reg, glsl_dst->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, + glsl_dst->reg_name, &is_color, ins); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3212,7 +3214,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction char reg_name[256]; BOOL is_color; - shader_glsl_get_register_name(&ins->dst[0].reg, reg_name, &is_color, ins); + shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins); shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); }

1 0

Alexandre Julliard : setupapi: Use correct architecture for fake dlls on ARM and ARM64.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 9b50f08d6d6b086685d8be341e558638c356a566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b50f08d6d6b086685d8be34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 1 10:41:51 2017 +0100 setupapi: Use correct architecture for fake dlls on ARM and ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 35719665d79bc1cc3be19628021a154f563daa51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/fakedll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index d521b0a..d310cc9 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -713,6 +713,10 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR static const char current_arch[] = "x86"; #elif defined __x86_64__ static const char current_arch[] = "amd64"; +#elif defined __arm__ + static const char current_arch[] = "arm"; +#elif defined __aarch64__ + static const char current_arch[] = "arm64"; #else static const char current_arch[] = "none"; #endif

1 0

Andrey Gusev : d3dx10: Add D3DX10PreprocessShaderFromMemory stub.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: e2951030e23a9406705381ceb58b17bc318c53af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2951030e23a9406705381ce… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 9 16:25:05 2017 +0200 d3dx10: Add D3DX10PreprocessShaderFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 010119085b4cee3d7edbad2c5a46d35daa95000d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx10_43/async.c | 11 +++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10async.h | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index fb988a4..397ec93 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -396,3 +396,14 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res return S_OK; } + +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, + ID3D10Blob **errors, HRESULT *hresult) +{ + FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, errors %p, " + "hresult %p stub!\n", + debugstr_a(data), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 49a6d3a..a36220f 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -57,7 +57,7 @@ @ stub D3DX10LoadTextureFromTexture(ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) -@ stub D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) +@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) @ stub D3DX10SHProjectCubeMap(long ptr ptr ptr ptr) diff --git a/include/d3dx10async.h b/include/d3dx10async.h index 6663be4..c8204bc 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -54,6 +54,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult); +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, + ID3D10Blob **errors, HRESULT *hresult); + HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, ID3DX10DataLoader **loader);

1 0