November 2019 - Wine-Commits

Jeff Smith : msvcrt: Correct day-of-month range for strftime.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: cdb09ed279806cb72a36fb9c18c3741ae4acfaf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb09ed279806cb72a36fb9c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 18:28:08 2019 -0600 msvcrt: Correct day-of-month range for strftime. 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/time.c | 10 +++++----- dlls/ucrtbase/tests/misc.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 802032d79e..288b4d5cda 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1052,7 +1052,7 @@ static inline BOOL strftime_format(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR switch(count) { case 1: case 2: - ret = strftime_int(str, pos, max, mstm->tm_mday, count==1 ? 0 : 2, 0, 31); + ret = strftime_int(str, pos, max, mstm->tm_mday, count==1 ? 0 : 2, 1, 31); break; case 3: ret = strftime_str(str, pos, max, STRFTIME_TD(time_data, short_wday)[mstm->tm_wday]); @@ -1286,7 +1286,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, break; #endif case 'd': - if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 1, 31)) return 0; break; #if _MSVCR_VER>=140 @@ -1297,7 +1297,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; if(ret < max) str[ret++] = '/'; - if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 1, 31)) return 0; if(ret < max) str[ret++] = '/'; @@ -1305,7 +1305,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; break; case 'e': - if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 1, 31)) return 0; if(!alternate && str[ret-2] == '0') str[ret-2] = ' '; @@ -1319,7 +1319,7 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; if(ret < max) str[ret++] = '-'; - if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 1, 31)) return 0; break; case 'g': diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 154781dd33..6700b4bdf1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -937,7 +937,7 @@ static void test_strftime(void) {"%C", "19", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%C", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, - {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, TRUE}, + {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE}, {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%d", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, @@ -948,7 +948,7 @@ static void test_strftime(void) {"%D", "01/01/99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }}, {"%#D", "1/1/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, TRUE}, + {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE}, {"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%e", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE},

1 0

Nikolay Sivov : kernel32: Use RegLoadMUIStringW() from kernelbase.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: f2e0a145ba0630d60b6ccfc35dbd0fcbc90e930d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e0a145ba0630d60b6ccfc3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 22 15:30:42 2019 +0300 kernel32: Use RegLoadMUIStringW() from kernelbase. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 23b47084db..817a830518 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -47,6 +47,7 @@ #define NONAMELESSUNION #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "winternl.h" #include "kernel_private.h" #include "wine/unicode.h" @@ -381,24 +382,6 @@ static BOOL reg_query_value(HKEY hkey, LPCWSTR name, DWORD type, void *data, DWO return TRUE; } -static BOOL reg_load_mui_string(HKEY hkey, LPCWSTR value, LPWSTR buffer, DWORD size) -{ - static const WCHAR advapi32W[] = {'a','d','v','a','p','i','3','2','.','d','l','l',0}; - DWORD (WINAPI *pRegLoadMUIStringW)(HKEY, LPCWSTR, LPWSTR, DWORD, DWORD *, DWORD, LPCWSTR); - HMODULE hDll; - BOOL ret = FALSE; - - hDll = LoadLibraryExW(advapi32W, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); - if (hDll) { - pRegLoadMUIStringW = (void *)GetProcAddress(hDll, "RegLoadMUIStringW"); - if (pRegLoadMUIStringW && - !pRegLoadMUIStringW(hkey, value, buffer, size, NULL, 0, DIR_System)) - ret = TRUE; - FreeLibrary(hDll); - } - return ret; -} - /*********************************************************************** * TIME_GetSpecificTimeZoneInfo * @@ -438,14 +421,14 @@ static BOOL TIME_GetSpecificTimeZoneInfo( const WCHAR *key_name, WORD year, if (!TIME_GetSpecificTimeZoneKey( key_name, &time_zone_key )) return FALSE; - if (!reg_load_mui_string( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName) ) && + if (RegLoadMUIStringW( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName), NULL, 0, DIR_System ) && !reg_query_value( time_zone_key, stdW, REG_SZ, tzinfo->StandardName, sizeof(tzinfo->StandardName) )) { NtClose( time_zone_key ); return FALSE; } - if (!reg_load_mui_string( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) ) && + if (RegLoadMUIStringW( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName), NULL, 0, DIR_System ) && !reg_query_value( time_zone_key, dltW, REG_SZ, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) )) { NtClose( time_zone_key ); @@ -1005,8 +988,8 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo if (!TIME_GetSpecificTimeZoneKey( tzinfo->TimeZoneKeyName, &time_zone_key )) return TIME_ZONE_ID_INVALID; - reg_load_mui_string( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName) ); - reg_load_mui_string( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName) ); + RegLoadMUIStringW( time_zone_key, mui_stdW, tzinfo->StandardName, sizeof(tzinfo->StandardName), NULL, 0, DIR_System ); + RegLoadMUIStringW( time_zone_key, mui_dltW, tzinfo->DaylightName, sizeof(tzinfo->DaylightName), NULL, 0, DIR_System ); NtClose( time_zone_key ); return TIME_ZoneID( (TIME_ZONE_INFORMATION*)tzinfo );

1 0

Gabriel Ivăncescu : jscript: Trace the pstrItemName parameter.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: ad1860e31a323eedc54aeb9d78698b5defbab5d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad1860e31a323eedc54aeb9d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 14 18:14:10 2019 +0200 jscript: Trace the pstrItemName parameter. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 67138da8ee..5b6fe3ecca 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -606,7 +606,7 @@ static HRESULT WINAPI JScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR { JScript *This = impl_from_IActiveScript(iface); - TRACE("(%p)->(%p)\n", This, ppdisp); + TRACE("(%p)->(%s %p)\n", This, debugstr_w(pstrItemName), ppdisp); if(!ppdisp) return E_POINTER;

1 0

Alex Henrie : winex11: Fix off-by-one error in color value scaling.
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: 1ff4a8fa41af500aff6e1b061f9dd187b61ba672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ff4a8fa41af500aff6e1b06… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 21 22:01:00 2019 -0700 winex11: Fix off-by-one error in color value scaling. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/palette.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 25bdb5f2bf..6cc6a0fe34 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -293,19 +293,19 @@ static BOOL X11DRV_PALETTE_BuildPrivateMap( const PALETTEENTRY *sys_pal_template { if( i < NB_RESERVED_COLORS/2 ) { - color.red = sys_pal_template[i].peRed * 65535 / 255; - color.green = sys_pal_template[i].peGreen * 65535 / 255; - color.blue = sys_pal_template[i].peBlue * 65535 / 255; - COLOR_sysPal[i] = sys_pal_template[i]; + color.red = sys_pal_template[i].peRed * (65535 / 255); + color.green = sys_pal_template[i].peGreen * (65535 / 255); + color.blue = sys_pal_template[i].peBlue * (65535 / 255); + COLOR_sysPal[i] = sys_pal_template[i]; COLOR_sysPal[i].peFlags |= PC_SYS_USED; } else if( i >= palette_size - NB_RESERVED_COLORS/2 ) { - int j = NB_RESERVED_COLORS + i - palette_size; - color.red = sys_pal_template[j].peRed * 65535 / 255; - color.green = sys_pal_template[j].peGreen * 65535 / 255; - color.blue = sys_pal_template[j].peBlue * 65535 / 255; - COLOR_sysPal[i] = sys_pal_template[j]; + int j = NB_RESERVED_COLORS + i - palette_size; + color.red = sys_pal_template[j].peRed * (65535 / 255); + color.green = sys_pal_template[j].peGreen * (65535 / 255); + color.blue = sys_pal_template[j].peBlue * (65535 / 255); + COLOR_sysPal[i] = sys_pal_template[j]; COLOR_sysPal[i].peFlags |= PC_SYS_USED; } @@ -633,9 +633,9 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa { XColor color; color.pixel = (X11DRV_PALETTE_PaletteToXPixel)? X11DRV_PALETTE_PaletteToXPixel[idx] : idx; - color.red = COLOR_sysPal[idx].peRed << 8; - color.green = COLOR_sysPal[idx].peGreen << 8; - color.blue = COLOR_sysPal[idx].peBlue << 8; + color.red = COLOR_sysPal[idx].peRed * (65535 / 255); + color.green = COLOR_sysPal[idx].peGreen * (65535 / 255); + color.blue = COLOR_sysPal[idx].peBlue * (65535 / 255); color.flags = DoRed | DoGreen | DoBlue; XStoreColor(gdi_display, default_colormap, &color); } @@ -1156,9 +1156,9 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) X11DRV_PALETTE_firstFree = X11DRV_PALETTE_freeList[index]; color.pixel = (X11DRV_PALETTE_PaletteToXPixel) ? X11DRV_PALETTE_PaletteToXPixel[index] : index; - color.red = entries[i].peRed << 8; - color.green = entries[i].peGreen << 8; - color.blue = entries[i].peBlue << 8; + color.red = entries[i].peRed * (65535 / 255); + color.green = entries[i].peGreen * (65535 / 255); + color.blue = entries[i].peBlue * (65535 / 255); color.flags = DoRed | DoGreen | DoBlue; XStoreColor(gdi_display, default_colormap, &color);

1 0

Alexandre Julliard : setupapi: Handle copy errors in SetupCommitFileQueueW().
by Alexandre Julliard Nov. 22, 2019

Nov. 22, 2019

Module: wine Branch: master Commit: b3abc343c373ee5fd0764a3ceedeef52589c0ab2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3abc343c373ee5fd0764a3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 22 12:51:50 2019 +0100 setupapi: Handle copy errors in SetupCommitFileQueueW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index f7da3a7128..2d2c833474 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1051,9 +1051,6 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, VersionSizeTarget = GetFileVersionInfoSizeW(target,&zero); } - TRACE("SizeTarget %i ... SizeSource %i\n",VersionSizeTarget, - VersionSizeSource); - if (VersionSizeSource && VersionSizeTarget) { LPVOID VersionSource; @@ -1143,7 +1140,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, if (docopy) { rc = CopyFileW(source,target,FALSE); - TRACE("Did copy... rc was %i\n",rc); + if (!rc) WARN( "failed to copy, err %u\n", GetLastError() ); } else SetLastError(ERROR_SUCCESS); @@ -1468,6 +1465,24 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC handler( context, SPFILENOTIFY_ENDCOPY, (UINT_PTR)&paths, 0 ); break; } + paths.Win32Error = GetLastError(); + if (paths.Win32Error == ERROR_PATH_NOT_FOUND || + paths.Win32Error == ERROR_FILE_NOT_FOUND) + continue; + + newpath[0] = 0; + op_result = handler( context, SPFILENOTIFY_COPYERROR, (UINT_PTR)&paths, (UINT_PTR)newpath ); + if (op_result == FILEOP_ABORT) + goto done; + else if (op_result == FILEOP_SKIP) + break; + else if (op_result == FILEOP_NEWPATH) + { + lstrcpyW(op->media->root, newpath); + build_filepathsW(op, &paths); + } + else if (op_result != FILEOP_DOIT) + FIXME("Unhandled return value %#x.\n", op_result); } } else

1 0

Francois Gouget : kernel32/tests: Fix the lcid and expected value in a codepage ok() call.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: af638bc1176b8bd34a9323204c690a5e034cdc57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af638bc1176b8bd34a932320… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 21 16:14:02 2019 +0100 kernel32/tests: Fix the lcid and expected value in a codepage ok() call. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8b6584415c..8fcc575a29 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1126,7 +1126,7 @@ static void test_threadcp(void) cp = 0xdeadbeef; GetLocaleInfoA(lcids[i].lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (LPSTR)&cp, sizeof(cp)); - ok(cp == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cp, lcids[i].threadcp, cp); + ok(cp == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cp, lcids[i].lcid, lcids[i].threadcp); /* GetCPInfoEx/GetCPInfo - CP_ACP */ SetLastError(0xdeadbeef);

1 0

Francois Gouget : user32/test: Start the AdjustWindowRectExForDpi() from a known state.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: c56116aa37a9726741fd04818ebea5b265d65321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56116aa37a9726741fd0481… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 17:15:19 2019 +0100 user32/test: Start the AdjustWindowRectExForDpi() from a known state. rect and rect2 have been modified by the previous test by the time we get to AdjustWindowRectExForDpi(). This makes interpreting the traces harder in case of a failure. So reset them to the same starting state as for the AdjustWindowRectEx() test. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 78dc55f00a..b9309a8cba 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5407,6 +5407,8 @@ static void test_AWR_flags(void) style, exstyle, wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &rect2 )); if (pAdjustWindowRectExForDpi) { + SetRect( &rect, 100, 100, 200, 200 ); + rect2 = rect; pAdjustWindowRectExForDpi( &rect, style, FALSE, exstyle, 192 ); wine_AdjustWindowRectExForDpi( &rect2, style, FALSE, exstyle, 192 ); ok( EqualRect( &rect, &rect2 ), "%08x %08x rects do not match: win %s wine %s\n",

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

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

Michael Stefaniuc : dmscript: Implement unimplemented Script track methods.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: f9dff8f1cc69d14cffe5910931e48ec57a3ec4af URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9dff8f1cc69d14cffe59109… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 21 22:16:01 2019 +0100 dmscript: Implement unimplemented Script track methods. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/scripttrack.c | 48 +++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 05c8f393a8..7035f2b57a 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -149,20 +149,22 @@ static HRESULT WINAPI script_track_IsParamSupported(IDirectMusicTrack8 *iface, R return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, - REFGUID rguidNotificationType) +static HRESULT WINAPI script_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + + return E_NOTIMPL; } -static HRESULT WINAPI script_track_RemoveNotificationType(IDirectMusicTrack8 *iface, - REFGUID rguidNotificationType) +static HRESULT WINAPI script_track_RemoveNotificationType(IDirectMusicTrack8 *iface, REFGUID type) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + + return E_NOTIMPL; } static HRESULT WINAPI script_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, @@ -202,21 +204,25 @@ static HRESULT WINAPI script_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID return S_OK; } -static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown *pContext, - DWORD dwTrackGroup, IDirectMusicTrack **ppResultTrack) +static HRESULT WINAPI script_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD group, IDirectMusicTrack **res_track) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, group, res_track); + + return E_NOTIMPL; } -static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *pNewTrack, - MUSIC_TIME mtJoin, IUnknown *pContext, DWORD dwTrackGroup, - IDirectMusicTrack **ppResultTrack) +static HRESULT WINAPI script_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *track2, + MUSIC_TIME join, IUnknown *context, DWORD group, IDirectMusicTrack **res_track) { - DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; + DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, track2, join, context, + group, res_track); + + return E_NOTIMPL; } static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {

1 0

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

Nov. 21, 2019

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