November 2020 - Wine-commits

Chip Davis : ucrtbase: Sync __lc_time_data definitions.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 5d07f809a0ecb8b0fc96c1f34dafd2bfe00686bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d07f809a0ecb8b0fc96c1f3… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Nov 18 17:26:19 2020 +0100 ucrtbase: Sync __lc_time_data definitions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 7 ++++--- dlls/ucrtbase/tests/misc.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 0a14e64ec61..6c92bdf254d 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -47,7 +47,8 @@ typedef struct { const char *date; const char *time; LCID lcid; - int unk[2]; + int unk; + int refcount; } __lc_time_data; static __time32_t (__cdecl *p_mkgmtime32)(struct tm*); @@ -824,8 +825,8 @@ static void test_strftime(void) return; } - /* TODO: find meaning of unk[0] */ - time_data.unk[0] = 1; + /* TODO: find meaning of unk */ + time_data.unk = 1; for (i=0; i<ARRAY_SIZE(tests_td); i++) { time_data.short_date = tests_td[i].short_date; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 7b40a056af8..f15585369cb 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -87,7 +87,8 @@ typedef struct { const char *short_date; const char *date; const char *time; - int unk[2]; + int unk; + int refcount; const wchar_t *short_wdayW[7]; const wchar_t *wdayW[7]; const wchar_t *short_monW[12]; @@ -1037,7 +1038,7 @@ static void test_strftime(void) { "day1", "day2", "day3", "day4", "day5", "day6", "day7" }, { "m1", "m2", "m3", "m4", "m5", "m6", "m7", "m8", "m9", "m10", "m11", "m12" }, { "mon1", "mon2", "mon3", "mon4", "mon5", "mon6", "mon7", "mon8", "mon9", "mon10", "mon11", "mon12" }, - "tam", "tpm", 0, 0, 0, { 1, 0 }, + "tam", "tpm", 0, 0, 0, 1, 0, { L"D1", L"D2", L"D3", L"D4", L"D5", L"D6", L"D7" }, { L"Day1", L"Day2", L"Day3", L"Day4", L"Day5", L"Day6", L"Day7" }, { L"M1", L"M2", L"M3", L"M4", L"M5", L"M6", L"M7", L"M8", L"M9", L"M10", L"M11", L"M12" },

1 0

Chip Davis : msvcrt: Swap the threadlocinfo pointers in setlocale().
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: f2482218708e038bf1ccb9491d0da61fea4be34b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2482218708e038bf1ccb949… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Nov 18 17:26:24 2020 +0100 msvcrt: Swap the threadlocinfo pointers in setlocale(). Do this instead of swapping their contents. This way, the result of _get_current_locale(), which references the current threadlocinfo, won't change after a setlocale() call. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 344 ++++++++++++++++++------------------------- dlls/msvcrt/locale.c | 170 +++------------------ 2 files changed, 161 insertions(+), 353 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2482218708e038bf1cc…

1 0

Zebediah Figura : quartz/tests: Enable no longer failing tests for IBasicVideo::GetCurrentImage().
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: c00c6000bc221ffa43f14987807dfa4548044177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c00c6000bc221ffa43f14987… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 17 16:30:58 2020 -0600 quartz/tests: Enable no longer failing tests for IBasicVideo::GetCurrentImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 1101a98ab7d..0a72cbb9b74 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1300,11 +1300,8 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(size == sizeof(buffer), "Got size %d.\n", size); ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); - if (0) /* FIXME: Rendering is currently broken on Wine. */ - { - for (i = 0; i < 32 * 16; ++i) - ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); - } + for (i = 0; i < 32 * 16; ++i) + ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1316,11 +1313,8 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(size == sizeof(buffer), "Got size %d.\n", size); ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); - if (0) /* FIXME: Rendering is currently broken on Wine. */ - { - for (i = 0; i < 32 * 16; ++i) - ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); - } + for (i = 0; i < 32 * 16; ++i) + ok((data[i] & 0xffffff) == 0x555555, "Got unexpected color %08x at %u.\n", data[i], i); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Michael Stefaniuc : winmm: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 283c1be7310cdbba45952e5abe9c20a0aa4027c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=283c1be7310cdbba45952e5a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:38 2020 +0100 winmm: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/driver.c | 12 +++----- dlls/winmm/lolvldrv.c | 5 +--- dlls/winmm/mci.c | 75 ++++++++++++++++++------------------------------- dlls/winmm/playsound.c | 52 +++++++++++----------------------- dlls/winmm/tests/wave.c | 7 ++--- dlls/winmm/waveform.c | 3 +- 6 files changed, 52 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=283c1be7310cdbba4595…

1 0

Michael Stefaniuc : winmm/tests: Use a string literal instead of a char array.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: da0b1336550978a9ba5e0999ed5723e75380acd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da0b1336550978a9ba5e0999… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:39 2020 +0100 winmm/tests: Use a string literal instead of a char array. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mcicda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mcicda.c b/dlls/winmm/tests/mcicda.c index f6e126d29d1..73668c21031 100644 --- a/dlls/winmm/tests/mcicda.c +++ b/dlls/winmm/tests/mcicda.c @@ -553,7 +553,7 @@ static void test_openclose(HWND hwnd) MCIDEVICEID wDeviceID; MCI_PARMS_UNION parm; MCIERROR err; - char drive[] = {'a',':','\\','X','\0'}; + char drive[] = "a:\\X"; if (ok_open == MCIERR_CANNOT_LOAD_DRIVER) { /* todo_wine Every open below should yield this same error. */ skip("CD-ROM device likely not installed or disabled.\n");

1 0

Michael Stefaniuc : dpnet: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: ffa8f64889be4c84be2ea85e68703b2bc0af0aab URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffa8f64889be4c84be2ea85e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:40 2020 +0100 dpnet: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 9 +++------ dlls/dpnet/tests/address.c | 21 ++++++++++----------- dlls/dpnet/tests/client.c | 16 ++++++++-------- dlls/dpnet/tests/server.c | 22 +++++++--------------- dlls/dpnet/tests/thread.c | 5 ++--- 5 files changed, 30 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ffa8f64889be4c84be2e…

1 0

Michael Stefaniuc : dxdiagn: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: ea298a4c0967045a0a6db3c3feaaf7b5fe88adba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea298a4c0967045a0a6db3c3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:41 2020 +0100 dxdiagn: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 604 +++++++++++++++++------------------------------- 1 file changed, 208 insertions(+), 396 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea298a4c0967045a0a6d…

1 0

Nikolay Sivov : xmllite/reader: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 6b5bf48c51214c23c6f73bf30cf651c69f313a9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b5bf48c51214c23c6f73bf3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:44:41 2020 +0300 xmllite/reader: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 138 +++++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b5bf48c51214c23c6f7…

1 0

Nikolay Sivov : xmllite/writer: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: f8182ac19ce1f8ded2ae37b6e5da9491fb18369b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8182ac19ce1f8ded2ae37b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:44:42 2020 +0300 xmllite/writer: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 130 +++++++++++++++++++------------------------------- 1 file changed, 48 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f8182ac19ce1f8ded2ae…

1 0

Nikolay Sivov : mfplat: Use wide-char string literals.
by Alexandre Julliard 18 Nov '20

18 Nov '20

Module: wine Branch: master Commit: 04106fa7872fc40ce28d634c8dd5dc5c832173f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04106fa7872fc40ce28d634c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:47:49 2020 +0300 mfplat: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 47 ++++++++++++++++------------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 44f29522487..6394784593e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -624,21 +624,8 @@ HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate) return create_transform_activate(NULL, activate); } -static const WCHAR transform_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', - 'T','r','a','n','s','f','o','r','m','s',0}; -static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', - 'T','r','a','n','s','f','o','r','m','s','\\', - 'C','a','t','e','g','o','r','i','e','s',0}; -static const WCHAR inputtypesW[] = {'I','n','p','u','t','T','y','p','e','s',0}; -static const WCHAR outputtypesW[] = {'O','u','t','p','u','t','T','y','p','e','s',0}; -static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; -static const WCHAR mftflagsW[] = {'M','F','T','F','l','a','g','s',0}; -static const WCHAR szGUIDFmt[] = -{ - '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', - '2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2', - 'x','%','0','2','x','%','0','2','x','%','0','2','x',0 -}; +static const WCHAR transform_keyW[] = L"MediaFoundation\\Transforms"; +static const WCHAR categories_keyW[] = L"MediaFoundation\\Transforms\\Categories"; static const BYTE guid_conv_table[256] = { @@ -653,10 +640,10 @@ static const BYTE guid_conv_table[256] = static WCHAR* GUIDToString(WCHAR *str, REFGUID guid) { - swprintf(str, 39, szGUIDFmt, guid->Data1, guid->Data2, - guid->Data3, guid->Data4[0], guid->Data4[1], - guid->Data4[2], guid->Data4[3], guid->Data4[4], - guid->Data4[5], guid->Data4[6], guid->Data4[7]); + swprintf(str, 39, L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], + guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], + guid->Data4[6], guid->Data4[7]); return str; } @@ -733,7 +720,6 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes) { - static const WCHAR reg_format[] = {'%','s','\\','%','s',0}; HRESULT hr = S_OK; HKEY hclsid = 0; WCHAR buffer[64]; @@ -742,7 +728,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 UINT8 *blob; GUIDToString(buffer, clsid); - swprintf(str, ARRAY_SIZE(str), reg_format, transform_keyW, buffer); + swprintf(str, ARRAY_SIZE(str), L"%s\\%s", transform_keyW, buffer); if ((ret = RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid))) hr = HRESULT_FROM_WIN32(ret); @@ -757,14 +743,14 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 if (SUCCEEDED(hr) && cinput && input_types) { size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); - if ((ret = RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)input_types, size))) + if ((ret = RegSetValueExW(hclsid, L"InputTypes", 0, REG_BINARY, (BYTE *)input_types, size))) hr = HRESULT_FROM_WIN32(ret); } if (SUCCEEDED(hr) && coutput && output_types) { size = coutput * sizeof(MFT_REGISTER_TYPE_INFO); - if ((ret = RegSetValueExW(hclsid, outputtypesW, 0, REG_BINARY, (BYTE *)output_types, size))) + if ((ret = RegSetValueExW(hclsid, L"OutputTypes", 0, REG_BINARY, (BYTE *)output_types, size))) hr = HRESULT_FROM_WIN32(ret); } @@ -776,7 +762,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 { if (SUCCEEDED(hr = MFGetAttributesAsBlob(attributes, blob, size))) { - if ((ret = RegSetValueExW(hclsid, attributesW, 0, REG_BINARY, blob, size))) + if ((ret = RegSetValueExW(hclsid, L"Attributes", 0, REG_BINARY, blob, size))) hr = HRESULT_FROM_WIN32(ret); } heap_free(blob); @@ -788,7 +774,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 if (SUCCEEDED(hr) && flags) { - if ((ret = RegSetValueExW(hclsid, mftflagsW, 0, REG_DWORD, (BYTE *)&flags, sizeof(flags)))) + if ((ret = RegSetValueExW(hclsid, L"MFTFlags", 0, REG_DWORD, (BYTE *)&flags, sizeof(flags)))) hr = HRESULT_FROM_WIN32(ret); } @@ -798,7 +784,6 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 static HRESULT register_category(CLSID *clsid, GUID *category) { - static const WCHAR reg_format[] = {'%','s','\\','%','s','\\','%','s',0}; HKEY htmp1; WCHAR guid1[64], guid2[64]; WCHAR str[350]; @@ -806,7 +791,7 @@ static HRESULT register_category(CLSID *clsid, GUID *category) GUIDToString(guid1, category); GUIDToString(guid2, clsid); - swprintf(str, ARRAY_SIZE(str), reg_format, categories_keyW, guid1, guid2); + swprintf(str, ARRAY_SIZE(str), L"%s\\%s\\%s", categories_keyW, guid1, guid2); if (RegCreateKeyW(HKEY_CLASSES_ROOT, str, &htmp1)) return E_FAIL; @@ -1157,13 +1142,13 @@ static HRESULT mft_collect_machine_reg(struct list *mfts, const GUID *category, if (!GUIDFromString(clsidW, &mft.clsid)) goto next; - mft_get_reg_flags(clsidW, mftflagsW, &mft.flags); + mft_get_reg_flags(clsidW, L"MFTFlags", &mft.flags); if (output_type) - mft_get_reg_type_info(clsidW, outputtypesW, &mft.output_types, &mft.output_types_count); + mft_get_reg_type_info(clsidW, L"OutputTypes", &mft.output_types, &mft.output_types_count); if (input_type) - mft_get_reg_type_info(clsidW, inputtypesW, &mft.input_types, &mft.input_types_count); + mft_get_reg_type_info(clsidW, L"InputTypes", &mft.input_types, &mft.input_types_count); if (!mft_is_type_info_match(&mft, category, flags, plugin_control, input_type, output_type)) { @@ -6139,7 +6124,7 @@ static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSchemeHandler **handler) { - static const WCHAR fileschemeW[] = {'f','i','l','e',':',0}; + static const WCHAR fileschemeW[] = L"file:"; const WCHAR *ptr = url; unsigned int len; WCHAR *scheme;

1 0