December 2016 - Wine-Commits

Bruno Jesus : xinput1_3: Prefer builtin DLL.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: ecba1f4c5fcef8f0bf854064af63398462f32eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecba1f4c5fcef8f0bf854064a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Oct 29 23:13:25 2016 -0200 xinput1_3: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4b09e848b8867683007f4c90ac589b43dfdc5707) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 63f725b..d5d6147 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -35,8 +35,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); break;

1 0

Andrey Gusev : user32: Add support for WS_EX_RIGHT style.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 7a483350069fef3c6e7125f446bebed9db3cfd1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a483350069fef3c6e7125f44… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Oct 20 16:53:00 2016 +0300 user32: Add support for WS_EX_RIGHT style. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 535f1de80db22e5ba76af5cb69ae61524224eb31) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/button.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 13fc746..0968f10 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -859,6 +859,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) HFONT hFont; LONG state = get_button_state( hwnd ); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); HWND parent; HRGN hrgn; @@ -882,7 +883,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) (WPARAM)hDC, (LPARAM)hwnd ); hrgn = set_control_clipping( hDC, &client ); - if (style & BS_LEFTTEXT) + if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) { /* magic +4 is what CTL3D expects */

1 0

Austin English : api-ms-win-core-rtlsupport-l1-1-0: Add missing forwards.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 14a7ea3b199ee83803ff1322b06b2ba3cc371919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a7ea3b199ee83803ff1322b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 19 01:09:25 2016 -0500 api-ms-win-core-rtlsupport-l1-1-0: Add missing forwards. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 80aee498f0082f5b346f30c4628348306b5cd7eb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index 69136d5..d2966f5 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -1,4 +1,15 @@ +@ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) ntdll.RtlAddFunctionTable @ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace +@ stdcall RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory +@ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory +@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry +@ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -register RtlRaiseException(ptr) ntdll.RtlRaiseException +@ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) ntdll.RtlRestoreContext @ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx +@ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

Jacek Caban : msctf: Added Push/Pop context tests.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 1eb046bc37a24584f69acf3f31cd1c4de0287d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb046bc37a24584f69acf3f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 18:35:35 2016 +0200 msctf: Added Push/Pop context tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc645ca71a7e2575e9808d54b78a97f84f9ffe66) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 6cb08fe..2d0c6c0 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -73,6 +73,7 @@ static INT test_OnPushContext = SINK_UNEXPECTED; static INT test_OnPopContext = SINK_UNEXPECTED; static INT test_KEV_OnSetFocus = SINK_UNEXPECTED; static INT test_ACP_AdviseSink = SINK_UNEXPECTED; +static INT test_ACP_UnadviseSink = SINK_UNEXPECTED; static INT test_ACP_GetStatus = SINK_UNEXPECTED; static INT test_ACP_RequestLock = SINK_UNEXPECTED; static INT test_ACP_GetEndACP = SINK_UNEXPECTED; @@ -235,6 +236,9 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + if(ACPSink) + return S_OK; + hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink, (void**)&ACPSink); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); @@ -248,7 +252,7 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, IUnknown *punk) { - trace("\n"); + sink_fire_ok(&test_ACP_UnadviseSink,"TextStoreACP_UnadviseSink"); return S_OK; } @@ -1413,7 +1417,7 @@ static void test_startSession(void) DWORD editCookie; ITfDocumentMgr *dmtest; ITfContext *cxt,*cxt2,*cxt3,*cxtTest; - ITextStoreACP *ts; + ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1577,6 +1581,8 @@ static void test_startSession(void) ok(hr == S_FALSE, "ITfContext_GetDocumentMgr wrong rc %x\n",hr); ok(dmtest == NULL,"returned documentmgr should be null\n"); + ITfContext_Release(cxt2); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1587,6 +1593,25 @@ static void test_startSession(void) ok(cxtTest == cxt, "Wrong context on base\n"); ITfContext_Release(cxtTest); + hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt2, &editCookie); + ok(hr == S_OK,"CreateContext Failed\n"); + + test_OnPushContext = SINK_EXPECTED; + test_ACP_AdviseSink = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt2); + ok(hr == S_OK,"Push Failed\n"); + sink_check_ok(&test_OnPushContext,"OnPushContext"); + sink_check_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); + + test_ACP_UnadviseSink = SINK_EXPECTED; + cnt = check_context_refcount(cxt2); + test_OnPopContext = SINK_EXPECTED; + hr = ITfDocumentMgr_Pop(g_dm, 0); + ok(hr == S_OK,"Pop Failed\n"); + ok(check_context_refcount(cxt2) < cnt, "Ref count did not decrease\n"); + sink_check_ok(&test_OnPopContext,"OnPopContext"); + sink_check_ok(&test_ACP_UnadviseSink,"TextStoreACP_AdviseSink"); + hr = ITfDocumentMgr_Pop(g_dm, 0); ok(FAILED(hr),"Pop Succeeded\n");

1 0

Huw Davies : gdi32: Check that ExtFloodFill()' s initial co-ordinates lie within the dib.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 8eef454103e27ac38fbe75653c3e48690df6697d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eef454103e27ac38fbe75653… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 29 09:57:47 2016 +0100 gdi32: Check that ExtFloodFill()'s initial co-ordinates lie within the dib. It might seem more natural to move this check inside is_interior(), but this would slow down the unclipped case. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 04f8ecd95691b2536cac76663f9864f7caf450fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 3 +++ dlls/gdi32/tests/dib.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 2c865c0..e2d58e8 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -982,6 +982,9 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) TRACE( "(%p, %d, %d, %08x, %d)\n", pdev, x, y, color, type ); + if (x < 0 || x >= pdev->dib.rect.right - pdev->dib.rect.left || + y < 0 || y >= pdev->dib.rect.bottom - pdev->dib.rect.top) return FALSE; + if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE; if (!(rgn = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index d12c752..7d8d51b 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -2779,6 +2779,9 @@ static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) ExtSelectClipRgn( hdc, NULL, RGN_COPY ); + ret = ExtFloodFill( hdc, -1, -1, RGB( 0, 0xff, 0 ), FLOODFILLSURFACE ); + ok (!ret, "got ret %d\n", ret); + SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); DeleteObject(solid_brush);

1 0

Sebastian Lackner : server: Allow to create win32 prefix when directory already exists.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: d56dbbb39ebe3f9795b07e57683cc2cd1662afae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56dbbb39ebe3f9795b07e576… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Sep 21 15:24:38 2016 +0200 server: Allow to create win32 prefix when directory already exists. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 808619b72d1524df2c576ed5faac67dd2093c0f3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/server.c | 11 ----------- server/registry.c | 8 +++++++- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 356d631..25c6473 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1139,17 +1139,6 @@ static void setup_config_dir(void) mkdir( config_dir, 0777 ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s\n", config_dir ); - if ((p = getenv( "WINEARCH" )) && !strcmp( p, "win32" )) - { - /* force creation of a 32-bit prefix */ - int fd = open( "system.reg", O_WRONLY | O_CREAT | O_EXCL, 0666 ); - if (fd != -1) - { - static const char regfile[] = "WINE REGISTRY Version 2\n\n#arch=win32\n"; - write( fd, regfile, sizeof(regfile) - 1 ); - close( fd ); - } - } MESSAGE( "wine: created the configuration directory '%s'\n", config_dir ); } diff --git a/server/registry.c b/server/registry.c index a3c1390..65126c3 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1791,6 +1791,7 @@ void init_registry(void) WCHAR *current_user_path; struct unicode_str current_user_str; struct key *key, *hklm, *hkcu; + char *p; /* switch to the config dir */ @@ -1807,7 +1808,12 @@ void init_registry(void) fatal_error( "could not create Machine registry key\n" ); if (!load_init_registry_from_file( "system.reg", hklm )) - prefix_type = sizeof(void *) > sizeof(int) ? PREFIX_64BIT : PREFIX_32BIT; + { + if ((p = getenv( "WINEARCH" )) && !strcmp( p, "win32" )) + prefix_type = PREFIX_32BIT; + else + prefix_type = sizeof(void *) > sizeof(int) ? PREFIX_64BIT : PREFIX_32BIT; + } else if (prefix_type == PREFIX_UNKNOWN) prefix_type = PREFIX_32BIT;

1 0

Huw Davies : ucrtbase: Add __stdio_common_vswscanf().
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 7c93deb22d874587f3b3c244284da43c8acc20a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c93deb22d874587f3b3c2442… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 24 12:58:31 2016 +0100 ucrtbase: Add __stdio_common_vswscanf(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f22769f81a2384219c6cb0f6b9f6daf4ac3c8857) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 22 +++++++++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 23 insertions(+), 3 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 448311d..6e066dc 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 @@ -18,7 +18,7 @@ @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s -@ stub __stdio_common_vswscanf +@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswscanf @ cdecl _chsize(long long) ucrtbase._chsize @ cdecl _chsize_s(long int64) ucrtbase._chsize_s @ cdecl _close(long) ucrtbase._close diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 2ebb515..a1575db 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -66,7 +66,7 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef SECURE #include "scanf.h" -/* vfscanf_l */ +/* vfscanf_s_l */ #define SECURE 1 #include "scanf.h" @@ -683,6 +683,26 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, } /********************************************************************* + * __stdio_common_vswscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, + const MSVCRT_wchar_t *input, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + /* LEGACY_WIDE_SPECIFIERS only has got an effect on the wide + * scanf. LEGACY_MSVCRT_COMPATIBILITY affects parsing of nan/inf, + * but parsing of those isn't implemented at all yet. */ + if (options & ~UCRTBASE_SCANF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + if (options & UCRTBASE_SCANF_SECURECRT) + return MSVCRT_vsnwscanf_s_l(input, length, format, locale, valist); + else + return MSVCRT_vsnwscanf_l(input, length, format, locale, valist); +} + +/********************************************************************* * __stdio_common_vfwscanf (MSVCRT.@) */ int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 25dfb2f..aa4e7e0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -163,7 +163,7 @@ @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf @ stub __stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s -@ stub __stdio_common_vswscanf +@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf @ stub __strncnt @ cdecl __sys_errlist() @ cdecl __sys_nerr()

1 0

Daniel Lehman : ucrtbase: Add __stdio_common_vfwscanf.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 0d8882ada83bf55fbffaa17f37f9e0fb7dfc3196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8882ada83bf55fbffaa17f3… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 8 14:02:16 2016 -0700 ucrtbase: Add __stdio_common_vfwscanf. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 48340bd1fea772d0c3539edc693135ce800d4aaa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 19 insertions(+), 2 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 10a2ab7..448311d 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 @@ -8,7 +8,7 @@ @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s -@ stub __stdio_common_vfwscanf +@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwscanf @ 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 diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index a19d450..2ebb515 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -683,6 +683,23 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, } /********************************************************************* + * __stdio_common_vfwscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, + MSVCRT_FILE *file, + const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + if (options & ~UCRTBASE_SCANF_SECURECRT) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + if (options & UCRTBASE_SCANF_SECURECRT) + return MSVCRT_vfwscanf_s_l(file, format, locale, valist); + else + return MSVCRT_vfwscanf_l(file, format, locale, valist); +} + +/********************************************************************* * _snwscanf (MSVCRT.@) */ int CDECL MSVCRT__snwscanf(MSVCRT_wchar_t *input, MSVCRT_size_t length, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index fde39e8..25dfb2f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -153,7 +153,7 @@ @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p @ stub __stdio_common_vfwprintf_s -@ stub __stdio_common_vfwscanf +@ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf @ 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

1 0

Austin English : wine.inf: Add HKLM\System\CurrentControlSet\Control\hivelist key.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 6d360b0f39270c5ec3c46aff810036ba74bd32a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d360b0f39270c5ec3c46aff8… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 27 12:05:59 2016 -0500 wine.inf: Add HKLM\System\CurrentControlSet\Control\hivelist key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c2150301b30c13c425866b69fec1aa85a64a35eb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 16f7c87..dc55f52 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -664,6 +664,7 @@ HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Microsoft\WBEM,"Installation Directory",2,"%11%\wbem" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 +HKLM,System\CurrentControlSet\Control\hivelist,,16 HKLM,System\CurrentControlSet\Control\Lsa,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI"

1 0

André Hentschel : loader/wine.inf: Open pdf files using winebrowser.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: stable Commit: 83e485755c3f0de86790c5b8fbc682ab0b9fda81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e485755c3f0de86790c5b8f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 5 22:56:31 2016 +0200 loader/wine.inf: Open pdf files using winebrowser. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3e997a75d3cae811e0f90c760c1d5f0616ba3558) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 2039798..16f7c87 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -173,6 +173,7 @@ HKCR,.ini,,2,"inifile" HKCR,.lnk,,2,"lnkfile" HKCR,.msi,,2,"Msi.Package" HKCR,.msp,,2,"Msi.Patch" +HKCR,.pdf,,2,"pdffile" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" HKCR,*\shellex\ContextMenuHandlers,,16 @@ -217,6 +218,12 @@ HKCR,Msi.Package\shell\Uninstall\command,,2,"%11%\msiexec.exe /x ""%1""" HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" +HKCR,pdffile,,2,"PDF Document" +HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" +HKCR,pdffile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," +HKCR,pdffile\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,pdffile\shell\open\ddeexec\Application,,2,"IExplore" +HKCR,pdffile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1"

1 0