November 2019 - Wine-commits

Michael Stefaniuc : dmscript: Clarify TRACE in IsParamSupported method of Script track.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: cb4733e3b12b353bdc8cd84fdade7d720baaf5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb4733e3b12b353bdc8cd84f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 21 22:16:03 2019 +0100 dmscript: Clarify TRACE in IsParamSupported method of Script track. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/scripttrack.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 7035f2b57a..608e36bd90 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -139,14 +139,13 @@ static HRESULT WINAPI script_track_SetParam(IDirectMusicTrack8 *iface, REFGUID r return S_OK; } -static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType) +static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): param type not supported\n", This, debugstr_dmguid(type)); - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + return DMUS_E_TYPE_UNSUPPORTED; } static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID type)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 90fc020400c06c163d4ab117d8da755b0f0e0861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90fc020400c06c163d4ab117… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Nov 21 23:12:46 2019 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index 77152ebd9e..962af5547a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -621,7 +621,7 @@ msgstr "&Muokatut värit:" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|&Tasainen" #: comdlg32.rc:290 msgid "&Red:" @@ -658,11 +658,9 @@ msgid "&Define Custom Colors >>" msgstr "M&äärittele väri >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&Ei" +msgstr "&T" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find"

1 0

Vincent Povirk : windowscodecs: Fix tiffformat test on current Windows 10.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 546ab20cf350321aefe1b4ebee193d055c842f12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=546ab20cf350321aefe1b4eb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 20 11:28:55 2019 -0600 windowscodecs: Fix tiffformat test on current Windows 10. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/tiffformat.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 2f9a0ca65f..861e620e44 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -405,7 +405,6 @@ static void test_QueryCapability(void) WICBitmapDecoderCapabilityCanDecodeSomeImages; DWORD capability; LARGE_INTEGER pos; - ULARGE_INTEGER cur_pos; UINT frame_count; stream = create_stream(&tiff_1bpp_data, sizeof(tiff_1bpp_data)); @@ -442,11 +441,9 @@ static void test_QueryCapability(void) ok(hr == S_OK, "GetFrame error %#x\n", hr); IWICBitmapFrameDecode_Release(frame); - pos.QuadPart = 0; - hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); + pos.QuadPart = 5; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); - ok(cur_pos.QuadPart > 4 && cur_pos.QuadPart < sizeof(tiff_1bpp_data), - "current stream pos is at %x/%x\n", cur_pos.u.LowPart, cur_pos.u.HighPart); hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); @@ -456,6 +453,7 @@ static void test_QueryCapability(void) IWICBitmapDecoder_Release(decoder); + /* CreateDecoderFromStream fails if seeked past the start */ hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder); todo_wine ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr);

1 0

Sven Baars : gdi32/tests: Remove the D3DKMTCreateDCFromMemory test with Width = 0.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: c9f15c20f943a140bed1605f0701a63815ba46b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f15c20f943a140bed1605f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Nov 20 10:43:31 2019 +0100 gdi32/tests: Remove the D3DKMTCreateDCFromMemory test with Width = 0. This test fails with STATUS_INVALID_PARAMETER on Windows 7+. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index c1651b5a2b..8fe160546c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5780,20 +5780,6 @@ static void test_D3DKMTCreateDCFromMemory( void ) test_data[i].name, create_desc.hBitmap); create_desc.Height = 7; - create_desc.Width = 0; - status = pD3DKMTCreateDCFromMemory( &create_desc ); - ok(status == test_data[i].status, "%s: Got unexpected status %#x, expected %#x.\n", - test_data[i].name, status, test_data[i].status); - if (status == STATUS_SUCCESS) - { - destroy_desc.hDc = create_desc.hDc; - destroy_desc.hBitmap = create_desc.hBitmap; - status = pD3DKMTDestroyDCFromMemory( &destroy_desc ); - ok(status == STATUS_SUCCESS, "%s: Got unexpected status %#x.\n", test_data[i].name, status); - create_desc.hDc = (void *)0x010baade; - create_desc.hBitmap = (void *)0x020baade; - } - create_desc.Pitch = 0; status = pD3DKMTCreateDCFromMemory( &create_desc ); ok(status == STATUS_INVALID_PARAMETER, "%s: Got unexpected status %#x.\n",

1 0

Alexandre Julliard : kernel32: Move string normalization functions to ntdll.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: fd588a22b74b092e3f629b90a09685024d64322d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd588a22b74b092e3f629b90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 10:43:46 2019 +0100 kernel32: Move string normalization functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernel32/locale.c | 66 -------------------------------------- dlls/kernel32/tests/locale.c | 29 +++++++++++++++-- dlls/kernelbase/kernelbase.spec | 4 +-- dlls/kernelbase/locale.c | 22 +++++++++++++ dlls/ntdll/locale.c | 70 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ include/winternl.h | 2 ++ 8 files changed, 126 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd588a22b74b092e3f62…

1 0

Alexandre Julliard : kernel32: Move some locale functions to kernelbase.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 2cbb6f8d34dc5481f757f32ad77d5facbef83f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cbb6f8d34dc5481f757f32a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 10:55:35 2019 +0100 kernel32: Move some locale functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 16 +-- dlls/kernel32/locale.c | 251 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 16 +-- dlls/kernelbase/locale.c | 239 +++++++++++++++++++++++++++++++++----- 4 files changed, 226 insertions(+), 296 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2cbb6f8d34dc5481f757…

1 0

Alexandre Julliard : ntdll: Handle version parsing in Unicode.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: c77cb5a5f7d20828c48ee120d1596e560aa44797 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c77cb5a5f7d20828c48ee120… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 17:31:43 2019 +0100 ntdll: Handle version parsing in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 91 ++++++++++++++++++++++------------------------------ 1 file changed, 39 insertions(+), 52 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index bd03382899..61e48f6fbd 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -191,27 +191,34 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }; -static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = -{ /* no spaces in here ! */ - "win20", /* WIN20 */ - "win30", /* WIN30 */ - "win31", /* WIN31 */ - "win95", /* WIN95 */ - "win98", /* WIN98 */ - "winme", /* WINME */ - "nt351", /* NT351 */ - "nt40", /* NT40 */ - "win2000,win2k,nt2k,nt2000", /* NT2K */ - "winxp", /* WINXP */ - "winxp64", /* WINXP64 */ - "win2003,win2k3", /* WIN2K3 */ - "vista,winvista", /* WINVISTA*/ - "win2008,win2k8", /* WIN2K8 */ - "win2008r2,win2k8r2", /* WIN2K8R2 */ - "win7", /* WIN7 */ - "win8", /* WIN8 */ - "win81", /* WIN81 */ - "win10", /* WIN10 */ +static const struct { WCHAR name[12]; WINDOWS_VERSION ver; } version_names[] = +{ + { {'w','i','n','2','0',0}, WIN20 }, + { {'w','i','n','3','0',0}, WIN30 }, + { {'w','i','n','3','1',0}, WIN31 }, + { {'w','i','n','9','5',0}, WIN95 }, + { {'w','i','n','9','8',0}, WIN98 }, + { {'w','i','n','m','e',0}, WINME }, + { {'n','t','3','5','1',0}, NT351 }, + { {'n','t','4','0',0}, NT40 }, + { {'w','i','n','2','0','0','0',0}, NT2K }, + { {'w','i','n','2','k',0}, NT2K }, + { {'n','t','2','k',0}, NT2K }, + { {'n','t','2','0','0','0',0}, NT2K }, + { {'w','i','n','x','p',0}, WINXP }, + { {'w','i','n','x','p','6','4',0}, WINXP64 }, + { {'w','i','n','2','0','0','3',0}, WIN2K3 }, + { {'w','i','n','2','k','3',0}, WIN2K3 }, + { {'v','i','s','t','a',0}, WINVISTA }, + { {'w','i','n','v','i','s','t','a',0}, WINVISTA }, + { {'w','i','n','2','0','0','8',0}, WIN2K8 }, + { {'w','i','n','2','k','8',0}, WIN2K8 }, + { {'w','i','n','2','0','0','8','r','2',0}, WIN2K8R2 }, + { {'w','i','n','2','k','8','r','2',0}, WIN2K8R2 }, + { {'w','i','n','7',0}, WIN7 }, + { {'w','i','n','8',0}, WIN8 }, + { {'w','i','n','8','1',0}, WIN81 }, + { {'w','i','n','1','0',0}, WIN10 }, }; @@ -438,46 +445,26 @@ static BOOL parse_win_version( HANDLE hkey ) static const WCHAR VersionW[] = {'V','e','r','s','i','o','n',0}; UNICODE_STRING valueW; - char tmp[64], buffer[50]; + WCHAR *name, tmp[64]; KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)tmp; - DWORD count, len; - int i; + DWORD i, count; RtlInitUnicodeString( &valueW, VersionW ); - if (NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp), &count )) + if (NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp) - sizeof(WCHAR), &count )) return FALSE; - RtlUnicodeToMultiByteN( buffer, sizeof(buffer)-1, &len, (WCHAR *)info->Data, info->DataLength ); - buffer[len] = 0; + name = (WCHAR *)info->Data; + name[info->DataLength / sizeof(WCHAR)] = 0; - for (i = 0; i < NB_WINDOWS_VERSIONS; i++) + for (i = 0; i < ARRAY_SIZE(version_names); i++) { - const char *p, *pCurr = WinVersionNames[i]; - /* iterate through all winver aliases separated by comma */ - do { - p = strchr(pCurr, ','); - len = p ? p - pCurr : strlen(pCurr); - if ( (!strncmp( pCurr, buffer, len )) && (buffer[len] == 0) ) - { - current_version = &VersionData[i]; - TRACE( "got win version %s\n", WinVersionNames[i] ); - return TRUE; - } - pCurr = p+1; - } while (p); + if (strcmpW( version_names[i].name, name )) continue; + current_version = &VersionData[version_names[i].ver]; + TRACE( "got win version %s\n", debugstr_w(version_names[i].name) ); + return TRUE; } - MESSAGE("Invalid Windows version value '%s' specified in config file.\n", buffer ); - MESSAGE("Valid versions are:" ); - for (i = 0; i < NB_WINDOWS_VERSIONS; i++) - { - /* only list the first, "official" alias in case of aliases */ - const char *pCurr = WinVersionNames[i]; - const char *p = strchr(pCurr, ','); - len = (p) ? p - pCurr : strlen(pCurr); - - MESSAGE(" '%.*s'%c", (int)len, pCurr, (i == NB_WINDOWS_VERSIONS - 1) ? '\n' : ',' ); - } + ERR( "Invalid Windows version value %s specified in config file.\n", debugstr_w(name) ); return FALSE; }

1 0

Alexandre Julliard : mountmgr: Don't include sys/time.h before winsock.h.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: e7040616c899eafbccdfa697f80b92044b64a3c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7040616c899eafbccdfa697… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 11:59:10 2019 +0100 mountmgr: Don't include sys/time.h before winsock.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/diskarb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 66c121e114..7f04c5f1e0 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -25,7 +25,6 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> -#include <sys/time.h> #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H #include <DiskArbitration/DiskArbitration.h> #endif

1 0

Jeff Smith : msvcrt: Add _Strftime tests for seconds.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 84879eb377e0dc5d175122a21dce4073a3668317 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84879eb377e0dc5d175122a2… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 07:04:18 2019 -0600 msvcrt: Add _Strftime tests for seconds. Signed-off-by: Jeff Smith <whydoubt(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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 5df8951c15..e53083c561 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -678,6 +678,9 @@ static void test_strftime(void) { "%X", "0", 0, 0, "m", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%X", "00", 0, 0, "mm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%X", "m00", 0, 0, "mmm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "0", 0, 0, "s", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "00", 0, 0, "ss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "s00", 0, 0, "sss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "t", 0, 0, "t", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "tam", 0, 0, "tt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "tam", 0, 0, "ttttttttt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE},

1 0

Jeff Smith : ucrtbase: Add _Strftime tests for seconds.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: e25962553fe39afee11e96df620d813c7a2bb042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e25962553fe39afee11e96df… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 07:04:19 2019 -0600 ucrtbase: Add _Strftime tests for seconds. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index bf4b2a0e37..cdf3820dcc 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -996,6 +996,9 @@ static void test_strftime(void) { "%X", "0", 0, 0, L"m", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%X", "00", 0, 0, L"mm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%X", "m00", 0, 0, L"mmm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "0", 0, 0, L"s", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "00", 0, 0, L"ss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "s00", 0, 0, L"sss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "T", 0, 0, L"t", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "TAM", 0, 0, L"tt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "TAM", 0, 0, L"ttttttttt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE},

1 0