September 2019 - Wine-Commits

Piotr Caban : msvcrt: Add wcrtomb_s implementation.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: a57d67b9bc1ae6ac8e7cc634e8025bcc23f95e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a57d67b9bc1ae6ac8e7cc634… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 30 19:09:09 2019 +0200 msvcrt: Add wcrtomb_s implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index f5b77d6a99..c0e287321a 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -102,7 +102,7 @@ @ cdecl -ret64 strtoull(str ptr long) ucrtbase.strtoull @ cdecl -ret64 strtoumax(str ptr long) ucrtbase.strtoumax @ cdecl wcrtomb(ptr long ptr) ucrtbase.wcrtomb -@ stub wcrtomb_s +@ cdecl wcrtomb_s(ptr ptr long long ptr) ucrtbase.wcrtomb_s @ cdecl wcsrtombs(ptr ptr long ptr) ucrtbase.wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) ucrtbase.wcsrtombs_s @ cdecl wcstod(wstr ptr) ucrtbase.wcstod diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index cf4d6d4cd2..895298478d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1853,7 +1853,7 @@ @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb -@ stub wcrtomb_s +@ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 410aae4476..66c6f65a9b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2211,7 +2211,7 @@ @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb -@ stub wcrtomb_s +@ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 171cfd27e1..8c9d93fd81 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2446,7 +2446,7 @@ @ stub vwscanf @ stub vwscanf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb -@ stub wcrtomb_s +@ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f9e3a0087f..ba1b351e89 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2108,7 +2108,7 @@ @ stub vwscanf @ stub vwscanf_s @ cdecl wcrtomb(ptr long ptr) msvcr120.wcrtomb -@ stub wcrtomb_s +@ cdecl wcrtomb_s(ptr ptr long long ptr) msvcr120.wcrtomb_s @ cdecl wcscat(wstr wstr) msvcr120.wcscat @ cdecl wcscat_s(wstr long wstr) msvcr120.wcscat_s @ cdecl wcschr(wstr long) msvcr120.wcschr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3fc18d2c8d..f8d0920c3c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1533,7 +1533,7 @@ @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb -@ stub wcrtomb_s +@ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4050f42382..d2f469a77d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1506,7 +1506,7 @@ @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb -@ stub wcrtomb_s +@ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e6f0841f7f..9f2a70c2f9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1480,7 +1480,7 @@ @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb -# stub wcrtomb_s(ptr ptr long long ptr) +@ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 6b8c7bbe0f..f84963ce2e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1821,6 +1821,20 @@ INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) return MSVCRT_EOF; } +/********************************************************************* + * wcrtomb_s (MSVCRT.@) + */ +INT CDECL MSVCRT_wcrtomb_s(MSVCRT_size_t *len, char *mbchar, + MSVCRT_size_t size, MSVCRT_wchar_t wch, MSVCRT_mbstate_t *s) +{ + int ilen, ret; + + if (s) *s = 0; + ret = MSVCRT_wctomb_s(&ilen, mbchar, size, wch); + if (len) *len = ilen; + return ret; +} + /********************************************************************* * wcrtomb (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6b7a140b19..3b590ee266 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2553,7 +2553,7 @@ @ cdecl ungetc(long ptr) MSVCRT_ungetc @ cdecl ungetwc(long ptr) MSVCRT_ungetwc @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb -@ stub wcrtomb_s +@ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr

1 0

Zebediah Figura : winegstreamer: Initialize COM on the callback dispatcher thread.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: f65cb89cbcaf2fddd9d8e79113528f6cea8dc86b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65cb89cbcaf2fddd9d8e791… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 30 08:53:52 2019 -0500 winegstreamer: Initialize COM on the callback dispatcher thread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47822 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 1 - dlls/winegstreamer/gstdemux.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index d7ae766f11..c781a52857 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -760,7 +760,6 @@ static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) HRESULT hr; hr = IFilterGraph2_RenderFile(graph, filename, NULL); -todo_wine ok(SUCCEEDED(hr), "RenderFile failed: %x\n", hr); if (SUCCEEDED(hr)) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index cee90d195b..66b7114c52 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2273,6 +2273,8 @@ static DWORD WINAPI dispatch_thread(void *user) { struct cb_data *cbdata; + CoInitializeEx(NULL, COINIT_MULTITHREADED); + pthread_mutex_lock(&cb_list_lock); while(1){ @@ -2288,6 +2290,8 @@ static DWORD WINAPI dispatch_thread(void *user) pthread_mutex_unlock(&cb_list_lock); + CoUninitialize(); + return 0; }

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetVertexShaderConstantB().
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 7ec5cd1d477f534a096006103020e70a48b706c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec5cd1d477f534a09600610… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 18:32:55 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetVertexShaderConstantB(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8228d07ab3..faf4cb7ea6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3550,7 +3550,9 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantB(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_b(device->wined3d_device, reg_idx, count, data); + hr = wined3d_stateblock_set_vs_consts_b(device->update_state, reg_idx, count, data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_vs_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_vs_consts_b().
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 0ffde4ca81f7fce5c3f0133ce07d96626955ab18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ffde4ca81f7fce5c3f0133c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 18:32:54 2019 -0500 wined3d: Introduce wined3d_stateblock_set_vs_consts_b(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index e056ace213..dfe6ab47c7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1308,6 +1308,26 @@ HRESULT CDECL wined3d_stateblock_set_vs_consts_i(struct wined3d_stateblock *stat return WINED3D_OK; } +HRESULT CDECL wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const BOOL *constants) +{ + unsigned int i; + + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) + return WINED3DERR_INVALIDCALL; + + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + + memcpy(&stateblock->stateblock_state.vs_consts_b[start_idx], constants, count * sizeof(*constants)); + for (i = start_idx; i < count + start_idx; ++i) + stateblock->changed.vertexShaderConstantsB |= (1u << i); + return WINED3D_OK; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index abfbaa7e40..f88da75306 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,6 +258,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2ad28a3345..3a06f650aa 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2660,6 +2660,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +HRESULT __cdecl wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_stateblock_set_vs_consts_i(struct wined3d_stateblock *stateblock,

1 0

Hans Leidekker : wbemprox: Implement Win32_QuickFixEngineering.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: ca93830fc5674b6960406552c8b37a36d1f5e786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca93830fc5674b6960406552… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 30 17:12:58 2019 +0200 wbemprox: Implement Win32_QuickFixEngineering. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47755 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2aca2f8693..96d1e0b850 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -111,6 +111,8 @@ static const WCHAR class_processor2W[] = {'C','I','M','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR class_qualifiersW[] = {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; +static const WCHAR class_quickfixengineeringW[] = + {'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',0}; static const WCHAR class_sidW[] = {'W','i','n','3','2','_','S','I','D',0}; static const WCHAR class_sounddeviceW[] = @@ -268,6 +270,8 @@ static const WCHAR prop_graphicsscoreW[] = {'G','r','a','p','h','i','c','s','S','c','o','r','e',0}; static const WCHAR prop_horizontalresolutionW[] = {'H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; +static const WCHAR prop_hotfixidW[] = + {'H','o','t','F','i','x','I','D',0}; static const WCHAR prop_idW[] = {'I','D',0}; static const WCHAR prop_identificationcodeW[] = @@ -754,6 +758,11 @@ static const struct column col_qualifier[] = { prop_strvalueW, CIM_STRING }, { prop_boolvalueW, CIM_BOOLEAN } }; +static const struct column col_quickfixengineering[] = +{ + { prop_captionW, CIM_STRING }, + { prop_hotfixidW, CIM_STRING|COL_FLAG_KEY } +}; static const struct column col_service[] = { { prop_acceptpauseW, CIM_BOOLEAN }, @@ -920,6 +929,10 @@ static const WCHAR os_serialnumberW[] = {'1','2','3','4','5','-','O','E','M','-','1','2','3','4','5','6','7','-','1','2','3','4','5',0}; static const WCHAR physicalmedia_tagW[] = {'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; +static const WCHAR quickfixengineering_captionW[] = + {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; +static const WCHAR quickfixengineering_hotfixidW[] = + {'K','B','1','2','3','4','5','6','7',0}; static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; static const WCHAR systemenclosure_systemenclosureW[] = @@ -1224,6 +1237,11 @@ struct record_qualifier const WCHAR *strvalue; int boolvalue; }; +struct record_quickfixengineering +{ + const WCHAR *caption; + const WCHAR *hotfixid; +}; struct record_service { int accept_pause; @@ -1364,6 +1382,10 @@ static const struct record_qualifier data_qualifier[] = { class_process_getowner_outW, param_userW, CIM_SINT32, FLAVOR_ID, prop_idW, 0 }, { class_process_getowner_outW, param_domainW, CIM_SINT32, FLAVOR_ID, prop_idW, 1 } }; +static const struct record_quickfixengineering data_quickfixengineering[] = +{ + { quickfixengineering_captionW, quickfixengineering_hotfixidW }, +}; static const struct record_sounddevice data_sounddevice[] = { { sounddevice_productnameW, sounddevice_productnameW, 3 /* enabled */ } @@ -4443,6 +4465,7 @@ static struct table builtin_classes[] = { class_processorW, C(col_processor), 0, 0, NULL, fill_processor }, { class_processor2W, C(col_processor), 0, 0, NULL, fill_processor }, { class_qualifiersW, C(col_qualifier), D(data_qualifier) }, + { class_quickfixengineeringW, C(col_quickfixengineering), D(data_quickfixengineering) }, { class_serviceW, C(col_service), 0, 0, NULL, fill_service }, { class_sidW, C(col_sid), 0, 0, NULL, fill_sid }, { class_sounddeviceW, C(col_sounddevice), D(data_sounddevice) }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index ee4eac88e9..cdbbc02820 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1756,6 +1756,49 @@ static void test_Win32_DisplayControllerConfiguration( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_QuickFixEngineering( IWbemServices *services ) +{ + static const WCHAR captionW[] = + {'C','a','p','t','i','o','n',0}; + static const WCHAR hotfixidW[] = + {'H','o','t','F','i','x','I','D',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count, total = 0; + VARIANT caption; + CIMTYPE type; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + type = 0xdeadbeef; + VariantInit( &caption ); + hr = IWbemClassObject_Get( obj, captionW, 0, &caption, &type, NULL ); + ok( hr == S_OK, "failed to get caption %08x\n", hr ); + ok( V_VT( &caption ) == VT_BSTR || V_VT( &caption ) == VT_NULL /* winxp */, + "unexpected variant type 0x%x\n", V_VT( &caption ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + + check_property( obj, hotfixidW, VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + if (total++ >= 10) break; + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1804,6 +1847,7 @@ START_TEST(query) test_Win32_Process( services, FALSE ); test_Win32_Process( services, TRUE ); test_Win32_Processor( services ); + test_Win32_QuickFixEngineering( services ); test_Win32_Service( services ); test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services );

1 0

Rémi Bernon : wined3d: Add GPU information for Intel UHD Graphics 620.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 08141ee9bdd387409b36d86517ccdf94e2b31f70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08141ee9bdd387409b36d865… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 26 15:21:47 2019 +0200 wined3d: Add GPU information for Intel UHD Graphics 620. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 92d4766bc5..726b1e3775 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -481,6 +481,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_UHD617, "Intel(R) UHD Graphics 617", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD620, "Intel(R) UHD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5ce23f85f6..307f7a42ad 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2637,6 +2637,7 @@ enum wined3d_pci_device CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, CARD_INTEL_UHD617 = 0x87c0, + CARD_INTEL_UHD620 = 0x3ea0, CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630_1 = 0x5912, CARD_INTEL_HD630_2 = 0x591b,

1 0

Alistair Leslie-Hughes : include: Allow building against dmusic.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 41bed7025ab6cfc9c2a16d6d5b7b02621fcd65b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41bed7025ab6cfc9c2a16d6d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 30 04:55:49 2019 +0000 include: Allow building against dmusic. Correct the following error when building against dmusic. .../wine/windows/dmusici.h:370:14: error: use of enum ‘enumDMUS_STYLET_TYPES’ without previous declaration Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dls1.h | 71 +++++++++++++++++++++--------------------------------- include/dmplugin.h | 9 +++---- include/dmusici.h | 63 ++++++++++++++++++------------------------------ 3 files changed, 55 insertions(+), 88 deletions(-) diff --git a/include/dls1.h b/include/dls1.h index d980b2b9b4..24c49c1e52 100644 --- a/include/dls1.h +++ b/include/dls1.h @@ -99,104 +99,89 @@ /***************************************************************************** * Structures */ -/* typedef definitions */ -typedef struct _DLSID DLSID, *LPDLSID; -typedef struct _DLSVERSION DLSVERSION, *LPDLSVERSION; -typedef struct _CONNECTION CONNECTION, *LPCONNECTION; -typedef struct _CONNECTIONLIST CONNECTIONLIST, *LPCONNECTIONLIST; -typedef struct _RGNRANGE RGNRANGE, *LPRGNRANGE; -typedef struct _MIDILOCALE MIDILOCALE, *LPMIDILOCALE; -typedef struct _RGNHEADER RGNHEADER, *LPRGNHEADER; -typedef struct _INSTHEADER INSTHEADER, *LPINSTHEADER; -typedef struct _DLSHEADER DLSHEADER, *LPDLSHEADER; -typedef struct _WAVELINK WAVELINK, *LPWAVELINK; -typedef struct _POOLCUE POOLCUE, *LPPOOLCUE; -typedef struct _POOLTABLE POOLTABLE, *LPPOOLTABLE; -typedef struct _rwsmp WSMPL, *LPWSMPL; -typedef struct _rloop WLOOP, *LPWLOOP; /* actual structures */ -struct _DLSID { +typedef struct _DLSID { ULONG ulData1; USHORT usData2; USHORT usData3; BYTE abData4[8]; -}; +} DLSID, *LPDLSID; -struct _DLSVERSION { +typedef struct _DLSVERSION { DWORD dwVersionMS; DWORD dwVersionLS; -}; +} DLSVERSION, *LPDLSVERSION; -struct _CONNECTION { +typedef struct _CONNECTION { USHORT usSource; USHORT usControl; USHORT usDestination; USHORT usTransform; LONG lScale; -}; +} CONNECTION, *LPCONNECTION; -struct _CONNECTIONLIST { +typedef struct _CONNECTIONLIST { ULONG cbSize; ULONG cConnections; -}; +} CONNECTIONLIST, *LPCONNECTIONLIST; -struct _RGNRANGE { +typedef struct _RGNRANGE { USHORT usLow; USHORT usHigh; -}; +} RGNRANGE, *LPRGNRANGE; -struct _MIDILOCALE { +typedef struct _MIDILOCALE { ULONG ulBank; ULONG ulInstrument; -}; +} MIDILOCALE, *LPMIDILOCALE; -struct _RGNHEADER { +typedef struct _RGNHEADER { RGNRANGE RangeKey; RGNRANGE RangeVelocity; USHORT fusOptions; USHORT usKeyGroup; -}; +} RGNHEADER, *LPRGNHEADER; -struct _INSTHEADER { +typedef struct _INSTHEADER { ULONG cRegions; MIDILOCALE Locale; -}; +} INSTHEADER, *LPINSTHEADER; -struct _DLSHEADER { +typedef struct _DLSHEADER { ULONG cInstruments; -}; +} DLSHEADER, *LPDLSHEADER; -struct _WAVELINK { +typedef struct _WAVELINK { USHORT fusOptions; USHORT usPhaseGroup; ULONG ulChannel; ULONG ulTableIndex; -}; +} WAVELINK, *LPWAVELINK; -struct _POOLCUE { +typedef struct _POOLCUE { ULONG ulOffset; -}; +} POOLCUE, *LPPOOLCUE; -struct _POOLTABLE { +typedef struct _POOLTABLE { ULONG cbSize; ULONG cCues; -}; +} POOLTABLE, *LPPOOLTABLE; -struct _rwsmp { +typedef struct _rwsmp { ULONG cbSize; USHORT usUnityNote; SHORT sFineTune; LONG lAttenuation; ULONG fulOptions; ULONG cSampleLoops; -}; +} WSMPL, *LPWSMPL; -struct _rloop { +typedef struct _rloop { ULONG cbSize; ULONG ulType; ULONG ulStart; ULONG ulLength; -}; +} WLOOP, *LPWLOOP; #endif /* __WINE_INCLUDE_DLS1_H */ diff --git a/include/dmplugin.h b/include/dmplugin.h index ccd9f6bd36..88584e884d 100644 --- a/include/dmplugin.h +++ b/include/dmplugin.h @@ -101,11 +101,8 @@ typedef LONG MUSIC_TIME; /***************************************************************************** * Enumerations */ -/* typedef definitions */ -typedef enum enumDMUS_TRACKF_FLAGS DMUS_TRACKF_FLAGS; - -/* actual enumerations */ -enum enumDMUS_TRACKF_FLAGS { +typedef enum enumDMUS_TRACKF_FLAGS +{ DMUS_TRACKF_SEEK = 0x001, DMUS_TRACKF_LOOP = 0x002, DMUS_TRACKF_START = 0x004, @@ -117,7 +114,7 @@ enum enumDMUS_TRACKF_FLAGS { DMUS_TRACKF_STOP = 0x100, DMUS_TRACKF_RECOMPOSE = 0x200, DMUS_TRACKF_CLOCK = 0x400, -}; +} DMUS_TRACKF_FLAGS; /***************************************************************************** * IDirectMusicTool interface diff --git a/include/dmusici.h b/include/dmusici.h index 7e393eaf29..80e89a37d0 100644 --- a/include/dmusici.h +++ b/include/dmusici.h @@ -366,38 +366,23 @@ typedef WORD TRANSITION_TYPE, *LPTRANSITION_TYPE; /***************************************************************************** * Enumerations */ -/* typedef definitions */ -typedef enum enumDMUS_STYLET_TYPES DMUS_STYLET_TYPES; -typedef enum enumDMUS_COMMANDT_TYPES DMUS_COMMANDT_TYPES; -typedef enum enumDMUS_SHAPET_TYPES DMUS_SHAPET_TYPES; -typedef enum enumDMUS_COMPOSEF_FLAGS DMUS_COMPOSEF_FLAGS; -typedef enum enumDMUS_PMSGF_FLAGS DMUS_PMSGF_FLAGS; -typedef enum enumDMUS_PMSGT_TYPES DMUS_PMSGT_TYPES; -typedef enum enumDMUS_SEGF_FLAGS DMUS_SEGF_FLAGS; -typedef enum enumDMUS_TIME_RESOLVE_FLAGS DMUS_TIME_RESOLVE_FLAGS; -typedef enum enumDMUS_CHORDKEYF_FLAGS DMUS_CHORDKEYF_FLAGS; -typedef enum enumDMUS_NOTEF_FLAGS DMUS_NOTEF_FLAGS; -typedef enum enumDMUS_PLAYMODE_FLAGS DMUS_PLAYMODE_FLAGS; -typedef enum enumDMUS_CURVE_FLAGS DMUS_CURVE_FLAGS; - - /* actual enumerations */ -enum enumDMUS_STYLET_TYPES { +typedef enum enumDMUS_STYLET_TYPES { DMUS_STYLET_PATTERN = 0x0, DMUS_STYLET_MOTIF = 0x1, -}; +} DMUS_STYLET_TYPES; -enum enumDMUS_COMMANDT_TYPES { +typedef enum enumDMUS_COMMANDT_TYPES { DMUS_COMMANDT_GROOVE = 0x0, DMUS_COMMANDT_FILL = 0x1, DMUS_COMMANDT_INTRO = 0x2, DMUS_COMMANDT_BREAK = 0x3, DMUS_COMMANDT_END = 0x4, DMUS_COMMANDT_ENDANDINTRO = 0x5 -}; +} DMUS_COMMANDT_TYPES; -enum enumDMUS_SHAPET_TYPES { +typedef enum enumDMUS_SHAPET_TYPES { DMUS_SHAPET_FALLING = 0x0, DMUS_SHAPET_LEVEL = 0x1, DMUS_SHAPET_LOOPABLE = 0x2, @@ -407,9 +392,9 @@ enum enumDMUS_SHAPET_TYPES { DMUS_SHAPET_RANDOM = 0x6, DMUS_SHAPET_RISING = 0x7, DMUS_SHAPET_SONG = 0x8 -}; +} DMUS_SHAPET_TYPES; -enum enumDMUS_COMPOSEF_FLAGS { +typedef enum enumDMUS_COMPOSEF_FLAGS { DMUS_COMPOSEF_NONE = 0x000000, DMUS_COMPOSEF_ALIGN = 0x000001, DMUS_COMPOSEF_OVERLAP = 0x000002, @@ -434,9 +419,9 @@ enum enumDMUS_COMPOSEF_FLAGS { DMUS_COMPOSEF_NOINVALIDATE = 0x100000, DMUS_COMPOSEF_USE_AUDIOPATH = 0x200000, DMUS_COMPOSEF_INVALIDATE_PRI = 0x400000 -}; +} DMUS_COMPOSEF_FLAGS; -enum enumDMUS_PMSGF_FLAGS { +typedef enum enumDMUS_PMSGF_FLAGS { DMUS_PMSGF_REFTIME = 1, DMUS_PMSGF_MUSICTIME = 2, DMUS_PMSGF_TOOL_IMMEDIATE = 4, @@ -445,9 +430,9 @@ enum enumDMUS_PMSGF_FLAGS { DMUS_PMSGF_TOOL_FLUSH = 0x20, DMUS_PMSGF_LOCKTOREFTIME = 0x40, DMUS_PMSGF_DX8 = 0x80 -}; +} DMUS_PMSGF_FLAGS; -enum enumDMUS_PMSGT_TYPES { +typedef enum enumDMUS_PMSGT_TYPES { DMUS_PMSGT_MIDI = 0x00, DMUS_PMSGT_NOTE = 0x01, DMUS_PMSGT_SYSEX = 0x02, @@ -464,9 +449,9 @@ enum enumDMUS_PMSGT_TYPES { DMUS_PMSGT_LYRIC = 0x0D, DMUS_PMSGT_SCRIPTLYRIC = 0x0E, DMUS_PMSGT_USER = 0xFF -}; +} DMUS_PMSGT_TYPES; -enum enumDMUS_SEGF_FLAGS { +typedef enum enumDMUS_SEGF_FLAGS { DMUS_SEGF_REFTIME = 0x000040, DMUS_SEGF_SECONDARY = 0x000080, DMUS_SEGF_QUEUE = 0x000100, @@ -490,9 +475,9 @@ enum enumDMUS_SEGF_FLAGS { DMUS_SEGF_USE_AUDIOPATH = 0x04000000, DMUS_SEGF_VALID_START_MEASURE = 0x08000000, DMUS_SEGF_INVALIDATE_PRI = 0x10000000 -}; +} DMUS_SEGF_FLAGS; -enum enumDMUS_TIME_RESOLVE_FLAGS { +typedef enum enumDMUS_TIME_RESOLVE_FLAGS { DMUS_TIME_RESOLVE_AFTERPREPARETIME = DMUS_SEGF_AFTERPREPARETIME, DMUS_TIME_RESOLVE_AFTERQUEUETIME = DMUS_SEGF_AFTERQUEUETIME, DMUS_TIME_RESOLVE_AFTERLATENCYTIME = DMUS_SEGF_AFTERLATENCYTIME, @@ -501,33 +486,33 @@ enum enumDMUS_TIME_RESOLVE_FLAGS { DMUS_TIME_RESOLVE_MEASURE = DMUS_SEGF_MEASURE, DMUS_TIME_RESOLVE_MARKER = DMUS_SEGF_MARKER, DMUS_TIME_RESOLVE_SEGMENTEND = DMUS_SEGF_SEGMENTEND, -}; +} DMUS_TIME_RESOLVE_FLAGS; -enum enumDMUS_CHORDKEYF_FLAGS { +typedef enum enumDMUS_CHORDKEYF_FLAGS { DMUS_CHORDKEYF_SILENT = 0x1, -}; +} DMUS_CHORDKEYF_FLAGS; -enum enumDMUS_NOTEF_FLAGS { +typedef enum enumDMUS_NOTEF_FLAGS { DMUS_NOTEF_NOTEON = 0x01, /* DX8 */ DMUS_NOTEF_NOINVALIDATE = 0x02, DMUS_NOTEF_NOINVALIDATE_INSCALE = 0x04, DMUS_NOTEF_NOINVALIDATE_INCHORD = 0x08, DMUS_NOTEF_REGENERATE = 0x10, -}; +} DMUS_NOTEF_FLAGS; -enum enumDMUS_PLAYMODE_FLAGS { +typedef enum enumDMUS_PLAYMODE_FLAGS { DMUS_PLAYMODE_KEY_ROOT = 0x01, DMUS_PLAYMODE_CHORD_ROOT = 0x02, DMUS_PLAYMODE_SCALE_INTERVALS = 0x04, DMUS_PLAYMODE_CHORD_INTERVALS = 0x08, DMUS_PLAYMODE_NONE = 0x10, -}; +} DMUS_PLAYMODE_FLAGS; -enum enumDMUS_CURVE_FLAGS { +typedef enum enumDMUS_CURVE_FLAGS { DMUS_CURVE_RESET = 0x1, DMUS_CURVE_START_FROM_CURRENT = 0x2 -}; +} DMUS_CURVE_FLAGS; enum { DMUS_CURVES_LINEAR = 0x0,

1 0

Jacek Caban : scrrun: Add support for TristateUseDefault text stream format.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: b22236d1b158bfeef4fe57e7df0bf4b87c0673dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b22236d1b158bfeef4fe57e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 16:33:49 2019 +0200 scrrun: Add support for TristateUseDefault text stream format. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 62 +++++++++++++-------- dlls/scrrun/tests/filesystem.c | 121 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 24 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1713d5bb28..3c0ee0821e 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -689,7 +689,7 @@ static const ITextStreamVtbl textstreamvtbl = { textstream_Close }; -static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, BOOL unicode, ITextStream **ret) +static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, Tristate format, ITextStream **ret) { struct textstream *stream; DWORD access = 0; @@ -704,7 +704,7 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod access = GENERIC_WRITE; break; case ForAppending: - access = FILE_APPEND_DATA; + access = GENERIC_READ | GENERIC_WRITE; break; default: return E_INVALIDARG; @@ -716,7 +716,6 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod stream->ITextStream_iface.lpVtbl = &textstreamvtbl; stream->ref = 1; stream->mode = mode; - stream->unicode = unicode; stream->first_read = TRUE; stream->file = CreateFileW(filename, access, 0, NULL, disposition, FILE_ATTRIBUTE_NORMAL, NULL); @@ -732,14 +731,39 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod else stream->size.QuadPart = 0; - /* Write Unicode BOM */ - if (unicode && mode == ForWriting && (disposition == CREATE_ALWAYS || disposition == CREATE_NEW)) { - DWORD written = 0; - BOOL ret = WriteFile(stream->file, &utf16bom, sizeof(utf16bom), &written, NULL); - if (!ret || written != sizeof(utf16bom)) { - ITextStream_Release(&stream->ITextStream_iface); - return create_error(GetLastError()); + if (mode == ForWriting) + { + stream->unicode = format == TristateTrue; + /* Write Unicode BOM */ + if (stream->unicode && (disposition == CREATE_ALWAYS || disposition == CREATE_NEW)) { + DWORD written = 0; + BOOL ret = WriteFile(stream->file, &utf16bom, sizeof(utf16bom), &written, NULL); + if (!ret || written != sizeof(utf16bom)) { + ITextStream_Release(&stream->ITextStream_iface); + return create_error(GetLastError()); + } + } + } + else + { + if (format == TristateUseDefault) + { + BYTE buf[64]; + DWORD read; + BOOL ret; + + ret = ReadFile(stream->file, buf, sizeof(buf), &read, NULL); + if (!ret) { + ITextStream_Release(&stream->ITextStream_iface); + return create_error(GetLastError()); + } + + stream->unicode = IsTextUnicode(buf, read, NULL); + if (mode == ForReading) SetFilePointer(stream->file, 0, 0, FILE_BEGIN); } + else stream->unicode = format != TristateFalse; + + if (mode == ForAppending) SetFilePointer(stream->file, 0, 0, FILE_END); } init_classinfo(&CLSID_TextStream, (IUnknown *)&stream->ITextStream_iface, &stream->classinfo); @@ -2811,12 +2835,7 @@ static HRESULT WINAPI file_OpenAsTextStream(IFile *iface, IOMode mode, Tristate TRACE("(%p)->(%d %d %p)\n", This, mode, format, stream); - if (format == TristateUseDefault) { - FIXME("default format not handled, defaulting to unicode\n"); - format = TristateTrue; - } - - return create_textstream(This->path, OPEN_EXISTING, mode, format == TristateTrue, stream); + return create_textstream(This->path, OPEN_EXISTING, mode, format, stream); } static const IFileVtbl file_vtbl = { @@ -3851,7 +3870,7 @@ static HRESULT WINAPI filesys_CreateTextFile(IFileSystem3 *iface, BSTR filename, TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; - return create_textstream(filename, disposition, ForWriting, !!unicode, stream); + return create_textstream(filename, disposition, ForWriting, unicode ? TristateTrue : TristateFalse, stream); } static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, @@ -3861,14 +3880,9 @@ static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, DWORD disposition; TRACE("(%p)->(%s %d %d %d %p)\n", iface, debugstr_w(filename), mode, create, format, stream); - disposition = create == VARIANT_TRUE ? OPEN_ALWAYS : OPEN_EXISTING; - if (format == TristateUseDefault) { - FIXME("default format not handled, defaulting to unicode\n"); - format = TristateTrue; - } - - return create_textstream(filename, disposition, mode, format == TristateTrue, stream); + disposition = create == VARIANT_TRUE ? OPEN_ALWAYS : OPEN_EXISTING; + return create_textstream(filename, disposition, mode, format, stream); } static HRESULT WINAPI filesys_GetStandardStream(IFileSystem3 *iface, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 566f6f922b..ed49856921 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1887,6 +1887,127 @@ todo_wine SysFreeString(str); ITextStream_Release(stream); + /* default read will use Unicode */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + lstrcpyW(buffW, nameW); + lstrcatW(buffW, crlfW); + lstrcatW(buffW, secondlineW); + lstrcatW(buffW, crlfW); + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + /* default append will use Unicode */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForAppending, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"123"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + lstrcatW(buffW, L"123"); + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + /* default write will use ASCII */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForWriting, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"123"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!wcscmp(str, L"123"), "got %s\n", wine_dbgstr_w(str)); + + ITextStream_Release(stream); + /* ASCII file, read with default stream */ + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + str = SysAllocString(L"test"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!wcscmp(str, L"test"), "got %s\n", wine_dbgstr_w(str)); + + ITextStream_Release(stream); + + /* default append will use Unicode */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForAppending, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"123"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"test123", str), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + /* default write will use ASCII as well */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForWriting, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"test string"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!wcscmp(str, L"test string"), "got %s\n", wine_dbgstr_w(str)); + + ITextStream_Release(stream); + /* ASCII file, read with Unicode stream */ /* 1. one byte content, not enough for Unicode read */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream);

1 0

Vijay Kiran Kamuju : msvcrt: Implement %R format for strftime.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 20810377ed6353cc59c4b73149f132178657de80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20810377ed6353cc59c4b731… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Sep 30 16:52:14 2019 +0200 msvcrt: Implement %R format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 10 ++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index fea7ca19db..faf1a6dcb4 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%R", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%T", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4aaa89ac0e..c72b3ed21e 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1189,6 +1189,16 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f time_data->str.names.am : time_data->str.names.pm)) return 0; break; +#if _MSVCR_VER>=140 + case 'R': + if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) + return 0; + if(ret < max) + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) + return 0; + break; +#endif case 'S': if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index bb0c2e3a0a..02ea1297bb 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -895,6 +895,14 @@ static void test_strftime(void) char bufA[256]; size_t retA; + retA = p_strftime(bufA, sizeof(bufA), "%R", &epoch); + ok(retA == 5, "expected 5, got %d\n", (int)retA); + ok(!strcmp(bufA, "00:00"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#R", &epoch); + ok(retA == 3, "expected 3, got %d\n", (int)retA); + ok(!strcmp(bufA, "0:0"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%T", &epoch); ok(retA == 8, "expected 8, got %d\n", (int)retA); ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA);

1 0

Piotr Caban : msvcrt: Don't write past buffer in strftime.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 30913ff564191d86d2d1d7ee5de359054fd30fff URL: https://source.winehq.org/git/wine.git/?a=commit;h=30913ff564191d86d2d1d7ee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 30 16:52:07 2019 +0200 msvcrt: Don't write past buffer in strftime. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b7d11e0543..4aaa89ac0e 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1197,10 +1197,12 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f case 'T': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; - str[ret++] = ':'; + if(ret < max) + str[ret++] = ':'; if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) return 0; - str[ret++] = ':'; + if(ret < max) + str[ret++] = ':'; if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; break;

1 0