November 2019 - Wine-commits

Alexandre Julliard : kernel32: Move EnumDateFormats functions to kernelbase.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 02d9ccb3c3903550c3206ca0ee6c59de30470e35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d9ccb3c3903550c3206ca0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 19:57:12 2019 +0100 kernel32: Move EnumDateFormats functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/lcformat.c | 173 ---------------------------------------- dlls/kernel32/locale.c | 24 ++++++ dlls/kernelbase/kernelbase.spec | 8 +- dlls/kernelbase/locale.c | 83 +++++++++++++++++++ 5 files changed, 114 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02d9ccb3c3903550c320…

1 0

Alexandre Julliard : kernel32: Move EnumTimeFormats functions to kernelbase.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 50d15730dfa3f44bee722e777989d03b86bc35ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=50d15730dfa3f44bee722e77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 20:11:21 2019 +0100 kernel32: Move EnumTimeFormats functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/lcformat.c | 122 ---------------------------------------- dlls/kernel32/locale.c | 19 +++++++ dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/locale.c | 64 +++++++++++++++++++++ 5 files changed, 88 insertions(+), 127 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a7043c223d..3f6943a29d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -426,8 +426,8 @@ @ stdcall -import EnumSystemLocalesEx(ptr long long ptr) @ stdcall -import EnumSystemLocalesW(ptr long) @ stdcall EnumTimeFormatsA(ptr long long) -@ stdcall EnumTimeFormatsEx(ptr wstr long long) -@ stdcall EnumTimeFormatsW(ptr long long) +@ stdcall -import EnumTimeFormatsEx(ptr wstr long long) +@ stdcall -import EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesA(ptr long long) @ stdcall -import EnumUILanguagesW(ptr long long) # @ stub EnumerateLocalComputerNamesA diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 6a6a5174c0..28e305a8ee 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1780,128 +1780,6 @@ enum enum_callback_type { CALLBACK_ENUMPROCEXEX }; -struct enumtimeformats_context { - enum enum_callback_type type; /* callback kind */ - union { - TIMEFMT_ENUMPROCW callback; /* user callback pointer */ - TIMEFMT_ENUMPROCEX callbackex; - } u; - LCID lcid; /* locale of interest */ - DWORD flags; - LPARAM lParam; - BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ -}; - -static BOOL NLS_EnumTimeFormats(struct enumtimeformats_context *ctxt) -{ - WCHAR bufW[256]; - char bufA[256]; - LCTYPE lctype; - INT ret; - - if (!ctxt->u.callback) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - switch (ctxt->flags & ~LOCALE_USE_CP_ACP) - { - case 0: - lctype = LOCALE_STIMEFORMAT; - break; - case TIME_NOSECONDS: - lctype = LOCALE_SSHORTTIME; - break; - default: - FIXME("Unknown time format (%d)\n", ctxt->flags); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - lctype |= ctxt->flags & LOCALE_USE_CP_ACP; - if (ctxt->unicode) - ret = GetLocaleInfoW(ctxt->lcid, lctype, bufW, ARRAY_SIZE(bufW)); - else - ret = GetLocaleInfoA(ctxt->lcid, lctype, bufA, ARRAY_SIZE(bufA)); - - if (ret) - { - switch (ctxt->type) - { - case CALLBACK_ENUMPROC: - ctxt->u.callback(ctxt->unicode ? bufW : (WCHAR*)bufA); - break; - case CALLBACK_ENUMPROCEX: - ctxt->u.callbackex(bufW, ctxt->lParam); - break; - default: - ; - } - } - - return TRUE; -} - -/************************************************************************** - * EnumTimeFormatsA (KERNEL32.@) - * - * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle - * LOCALE_NOUSEROVERRIDE here as well? - */ -BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) -{ - struct enumtimeformats_context ctxt; - - /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ - if (flags & ~LOCALE_USE_CP_ACP) - { - SetLastError(ERROR_INVALID_FLAGS); - return FALSE; - } - - ctxt.type = CALLBACK_ENUMPROC; - ctxt.u.callback = (TIMEFMT_ENUMPROCW)proc; - ctxt.lcid = lcid; - ctxt.flags = flags; - ctxt.unicode = FALSE; - - return NLS_EnumTimeFormats(&ctxt); -} - -/************************************************************************** - * EnumTimeFormatsW (KERNEL32.@) - */ -BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) -{ - struct enumtimeformats_context ctxt; - - ctxt.type = CALLBACK_ENUMPROC; - ctxt.u.callback = proc; - ctxt.lcid = lcid; - ctxt.flags = flags; - ctxt.unicode = TRUE; - - return NLS_EnumTimeFormats(&ctxt); -} - -/************************************************************************** - * EnumTimeFormatsEx (KERNEL32.@) - */ -BOOL WINAPI EnumTimeFormatsEx(TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, DWORD flags, LPARAM lParam) -{ - struct enumtimeformats_context ctxt; - - ctxt.type = CALLBACK_ENUMPROCEX; - ctxt.u.callbackex = proc; - ctxt.lcid = LocaleNameToLCID(locale, 0); - ctxt.flags = flags; - ctxt.lParam = lParam; - ctxt.unicode = TRUE; - - return NLS_EnumTimeFormats(&ctxt); -} - struct enumcalendar_context { enum enum_callback_type type; /* callback kind */ union { diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f3468949f7..d7f32cbfda 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -66,6 +66,8 @@ extern BOOL WINAPI Internal_EnumLanguageGroupLocales( LANGGROUPLOCALE_ENUMPROCW extern BOOL WINAPI Internal_EnumSystemCodePages( CODEPAGE_ENUMPROCW proc, DWORD flags, BOOL unicode ); extern BOOL WINAPI Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); +extern BOOL WINAPI Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, + BOOL unicode, BOOL ex, LPARAM lparam ); extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); @@ -3648,6 +3650,23 @@ BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA proc, LCID lcid, DWORD flags) return Internal_EnumDateFormats( (DATEFMT_ENUMPROCW)proc, lcid, flags, FALSE, FALSE, FALSE, 0 ); } +/************************************************************************** + * EnumTimeFormatsA (KERNEL32.@) + * + * FIXME: MSDN mentions only LOCALE_USE_CP_ACP, should we handle + * LOCALE_NOUSEROVERRIDE here as well? + */ +BOOL WINAPI EnumTimeFormatsA( TIMEFMT_ENUMPROCA proc, LCID lcid, DWORD flags ) +{ + /* EnumTimeFormatsA doesn't support flags, EnumTimeFormatsW does. */ + if (flags & ~LOCALE_USE_CP_ACP) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, lcid, flags, FALSE, FALSE, 0 ); +} + /****************************************************************************** * InvalidateNLSCache (KERNEL32.@) * diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 1cea884e9b..546a52c7ef 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -318,8 +318,8 @@ @ stdcall EnumSystemLocalesA(ptr long) @ stdcall EnumSystemLocalesEx(ptr long long ptr) @ stdcall EnumSystemLocalesW(ptr long) -@ stdcall EnumTimeFormatsEx(ptr wstr long long) kernel32.EnumTimeFormatsEx -@ stdcall EnumTimeFormatsW(ptr long long) kernel32.EnumTimeFormatsW +@ stdcall EnumTimeFormatsEx(ptr wstr long long) +@ stdcall EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesW(ptr long long) # @ stub EnumerateStateAtomValues # @ stub EnumerateStateContainerItems @@ -830,7 +830,7 @@ @ stdcall Internal_EnumSystemCodePages(ptr long long) @ stdcall Internal_EnumSystemLanguageGroups(ptr long ptr long) @ stub Internal_EnumSystemLocales -@ stub Internal_EnumTimeFormats +@ stdcall Internal_EnumTimeFormats(ptr long long long long long) @ stdcall Internal_EnumUILanguages(ptr long long long) # @ stub InternetTimeFromSystemTimeA # @ stub InternetTimeFromSystemTimeW diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2e1e76c4d7..473e6e2391 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -244,6 +244,50 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumSystemLanguageGroups( LANGUAGEGROUP_E } +/************************************************************************** + * Internal_EnumTimeFormats (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags, + BOOL unicode, BOOL ex, LPARAM lparam ) +{ + WCHAR buffer[256]; + LCTYPE lctype; + INT ret; + + if (!proc) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + switch (flags & ~LOCALE_USE_CP_ACP) + { + case 0: + lctype = LOCALE_STIMEFORMAT; + break; + case TIME_NOSECONDS: + lctype = LOCALE_SSHORTTIME; + break; + default: + FIXME( "Unknown time format %x\n", flags ); + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + lctype |= flags & LOCALE_USE_CP_ACP; + if (unicode) + ret = GetLocaleInfoW( lcid, lctype, buffer, ARRAY_SIZE(buffer) ); + else + ret = GetLocaleInfoA( lcid, lctype, (char *)buffer, sizeof(buffer) ); + + if (ret) + { + if (ex) ((TIMEFMT_ENUMPROCEX)proc)( buffer, lparam ); + else proc( buffer ); + } + return TRUE; +} + + /****************************************************************************** * Internal_EnumUILanguages (kernelbase.@) */ @@ -475,6 +519,26 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumSystemLocalesEx( LOCALE_ENUMPROCEX proc, DWORD } +/************************************************************************** + * EnumTimeFormatsW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsW( TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags ) +{ + return Internal_EnumTimeFormats( proc, lcid, flags, TRUE, FALSE, 0 ); +} + + +/************************************************************************** + * EnumTimeFormatsEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH EnumTimeFormatsEx( TIMEFMT_ENUMPROCEX proc, const WCHAR *locale, + DWORD flags, LPARAM lparam ) +{ + LCID lcid = LocaleNameToLCID( locale, 0 ); + return Internal_EnumTimeFormats( (TIMEFMT_ENUMPROCW)proc, lcid, flags, TRUE, TRUE, lparam ); +} + + /****************************************************************************** * FindStringOrdinal (kernelbase.@) */

1 0

Alexandre Julliard : kernel32: Move EnumCalendarInfo functions to kernelbase.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 42ed9797b1929fc5917bd967f7062cab953fab55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ed9797b1929fc5917bd967… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 21:00:08 2019 +0100 kernel32: Move EnumCalendarInfo functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/lcformat.c | 261 ---------------------------------------- dlls/kernel32/locale.c | 19 +++ dlls/kernelbase/kernelbase.spec | 8 +- dlls/kernelbase/locale.c | 86 +++++++++++++ 5 files changed, 112 insertions(+), 268 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42ed9797b1929fc5917b…

1 0

Alexandre Julliard : kernel32: Move Get/SetCalendarInfo to kernelbase.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: ab6970d9b09d763ccd27660e706dff157b6195e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6970d9b09d763ccd27660e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 16 21:27:00 2019 +0100 kernel32: Move Get/SetCalendarInfo to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/time.c | 227 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/locale.c | 204 ++++++++++++++++++++++++++++++++++++ 4 files changed, 210 insertions(+), 233 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab6970d9b09d763ccd27…

1 0

Alexandre Julliard : appwiz.cpl: Use Unicode strings for addons file names.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 0a443c1f36c9f7fd8242f129dbbfcc4604cf8e2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a443c1f36c9f7fd8242f129… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 17 15:58:59 2019 +0100 appwiz.cpl: Use Unicode strings for addons file names. --- dlls/appwiz.cpl/addons.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 350c25ef90..8d4be64930 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -63,8 +63,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); typedef struct { const char *version; - const char *file_name; - const char *subdir_name; + const WCHAR *file_name; + const WCHAR *subdir_name; const char *sha; const char *url_default; const char *config_key; @@ -79,8 +79,8 @@ typedef struct { static const addon_info_t addons_info[] = { { GECKO_VERSION, - "wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", - "gecko", + L"wine_gecko-" GECKO_VERSION "-" ARCH_STRING ".msi", + L"gecko", GECKO_SHA, "http://source.winehq.org/winegecko.php", "MSHTML", "GeckoUrl", "GeckoCabDir", @@ -88,8 +88,8 @@ static const addon_info_t addons_info[] = { }, { MONO_VERSION, - "wine-mono-" MONO_VERSION ".msi", - "mono", + L"wine-mono-" MONO_VERSION ".msi", + L"mono", MONO_SHA, "http://source.winehq.org/winemono.php", "Dotnet", "MonoUrl", "MonoCabDir", @@ -198,28 +198,23 @@ static enum install_res install_file(const WCHAR *file_name) return INSTALL_OK; } -static enum install_res install_from_dos_file(const WCHAR *dir, const char *subdir, const char *file_name) +static enum install_res install_from_dos_file(const WCHAR *dir, const WCHAR *subdir, const WCHAR *file_name) { - static const WCHAR ntprefixW[] = {'\\','?','?','\\',0}; WCHAR *path; enum install_res ret; int len = lstrlenW( dir ); int size = len + 1; - size += MultiByteToWideChar( CP_UNIXCP, 0, subdir, -1, NULL, 0 ); - size += MultiByteToWideChar( CP_UNIXCP, 0, file_name, -1, NULL, 0 ); + size += lstrlenW( subdir ) + lstrlenW( file_name ) + 2; if (!(path = heap_alloc( size * sizeof(WCHAR) ))) return INSTALL_FAILED; lstrcpyW( path, dir ); - if (!wcsncmp( path, ntprefixW, wcslen(ntprefixW) )) path[1] = '\\'; /* change \??\ into \\?\ */ + if (!wcsncmp( path, L"\\??\\", 4 )) path[1] = '\\'; /* change \??\ into \\?\ */ if (len && path[len-1] != '/' && path[len-1] != '\\') path[len++] = '\\'; - if (*subdir) - { - len += MultiByteToWideChar( CP_UNIXCP, 0, subdir, -1, path + len, size - len ); - path[len - 1] = '\\'; - } - MultiByteToWideChar( CP_UNIXCP, 0, file_name, -1, path + len, size - len ); + lstrcpyW( path + len, subdir ); + lstrcatW( path, L"\\" ); + lstrcatW( path, file_name ); if (GetFileAttributesW( path ) == INVALID_FILE_ATTRIBUTES) { @@ -234,7 +229,7 @@ static enum install_res install_from_dos_file(const WCHAR *dir, const char *subd return ret; } -static enum install_res install_from_unix_file(const char *dir, const char *subdir, const char *file_name) +static enum install_res install_from_unix_file(const char *dir, const WCHAR *subdir, const WCHAR *file_name) { WCHAR *dos_dir; enum install_res ret = INSTALL_NEXT; @@ -290,7 +285,7 @@ static enum install_res install_from_registered_dir(void) return INSTALL_FAILED; } - ret = install_from_unix_file(package_dir, "", addon->file_name); + ret = install_from_unix_file(package_dir, L"", addon->file_name); heap_free(package_dir); return ret; @@ -357,8 +352,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) return NULL; } - size = lstrlenW( cache_dir ) + ARRAY_SIZE(wineW); - size += MultiByteToWideChar( CP_UNIXCP, 0, addon->file_name, -1, NULL, 0 ); + size = lstrlenW( cache_dir ) + ARRAY_SIZE(wineW) + lstrlenW( addon->file_name ) + 1; if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) { heap_free( cache_dir ); @@ -376,7 +370,7 @@ static WCHAR *get_cache_file_name(BOOL ensure_exists) } len = lstrlenW( ret ); ret[len++] = '\\'; - MultiByteToWideChar( CP_UNIXCP, 0, addon->file_name, -1, ret + len, size - len ); + lstrcpyW( ret + len, addon->file_name ); TRACE( "got %s\n", debugstr_w(ret) ); return ret;

1 0

Alexandre Julliard : mscoree: Store the Mono base directory in Unicode.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: df3c911c635c3c0d236af30ddfff1c618367dd8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=df3c911c635c3c0d236af30d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Nov 17 16:09:37 2019 +0100 mscoree: Store the Mono base directory in Unicode. --- dlls/mscoree/metahost.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 18232a4568..4c1e4e97c1 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -711,7 +711,7 @@ static BOOL get_mono_path_registry(LPWSTR path) static BOOL get_mono_path_dos(const WCHAR *dir, LPWSTR path) { static const WCHAR unix_prefix[] = {'\\','\\','?','\\','u','n','i','x','\\'}; - static const char basedir[] = "\\wine-mono-" WINE_MONO_VERSION; + static const WCHAR basedir[] = L"\\wine-mono-" WINE_MONO_VERSION; LPWSTR dos_dir; WCHAR mono_dll_path[MAX_PATH]; DWORD len; @@ -720,10 +720,10 @@ static BOOL get_mono_path_dos(const WCHAR *dir, LPWSTR path) if (memcmp(dir, unix_prefix, sizeof(unix_prefix)) == 0) return FALSE; /* No drive letter for this directory */ - len = lstrlenW( dir ) + MultiByteToWideChar( CP_UNIXCP, 0, basedir, -1, NULL, 0 ); + len = lstrlenW( dir ) + lstrlenW( basedir ) + 1; if (!(dos_dir = heap_alloc( len * sizeof(WCHAR) ))) return FALSE; lstrcpyW( dos_dir, dir ); - MultiByteToWideChar( CP_UNIXCP, 0, basedir, -1, dos_dir + lstrlenW(dos_dir), len - lstrlenW(dos_dir)); + lstrcatW( dos_dir, basedir ); ret = find_mono_dll(dos_dir, mono_dll_path); if (ret)

1 0

Gijs Vermeulen : odbccp32: Handle NULL sizeout in SQLGetInstalledDrivers.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 3915b8d22921daeb30015b2204ff90f25ca19cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3915b8d22921daeb30015b22… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Sat Nov 16 17:08:44 2019 +0100 odbccp32: Handle NULL sizeout in SQLGetInstalledDrivers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48111 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 3 ++- dlls/odbccp32/tests/misc.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 1198b487f3..a09d6571f3 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -583,7 +583,8 @@ BOOL WINAPI SQLGetInstalledDrivers(char *buf, WORD size, WORD *sizeout) return FALSE; } - *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); + if (sizeout) + *sizeout = WideCharToMultiByte(CP_ACP, 0, wbuf, written, NULL, 0, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, wbuf, written, buf, size, NULL, NULL); heap_free(wbuf); diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index dc2ca7ed3f..e2f48ee732 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -643,6 +643,11 @@ static void test_SQLGetInstalledDrivers(void) ok(!ret, "got %d\n", ret); check_error(ODBC_ERROR_INVALID_BUFF_LEN); + ret = SQLGetInstalledDrivers(buffer, 10, NULL); + ok(ret, "got %d\n", ret); + ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer)); + ok(!buffer[9], "buffer not doubly null-terminated\n"); + ret = SQLGetInstalledDrivers(buffer, 10, &written); ok(ret, "got %d\n", ret); ok(strlen(buffer) == 8, "got len %u\n", lstrlenA(buffer));

1 0

Zebediah Figura : strmbase: Get rid of the unused "cs" parameter to strmbase_video_init().
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 70d2ba7482c61270f84a2e69992d1682771d698e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d2ba7482c61270f84a2e69… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 11:20:13 2019 -0600 strmbase: Get rid of the unused "cs" parameter to strmbase_video_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 3 +-- dlls/quartz/vmr9.c | 3 +-- dlls/strmbase/video.c | 3 +-- include/wine/strmbase.h | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b21cc281b9..449bd31f68 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -771,8 +771,7 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) if (FAILED(hr)) goto fail; - hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, - &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.filter.csFilter, + hr = strmbase_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 1a4f85c87c..a2ed46d05d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2239,8 +2239,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid) goto fail; hr = strmbase_video_init(&pVMR->baseControlVideo, &pVMR->renderer.filter, - &pVMR->renderer.filter.csFilter, &pVMR->renderer.sink.pin, - &renderer_BaseControlVideoFuncTable); + &pVMR->renderer.sink.pin, &renderer_BaseControlVideoFuncTable); if (FAILED(hr)) goto fail; diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index d1ebbdf235..081794e9b3 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -648,11 +648,10 @@ static const IBasicVideoVtbl basic_video_vtbl = }; HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, - CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) + struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table) { video->IBasicVideo_iface.lpVtbl = &basic_video_vtbl; video->pFilter = filter; - video->pInterfaceLock = cs; video->pPin = pin; video->pFuncsTable = func_table; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index f92a375a56..7f9d2cb64d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -477,7 +477,6 @@ typedef struct tagBaseControlVideo IBasicVideo IBasicVideo_iface; struct strmbase_filter *pFilter; - CRITICAL_SECTION* pInterfaceLock; struct strmbase_pin *pPin; const struct BaseControlVideoFuncTable* pFuncsTable; @@ -509,7 +508,7 @@ typedef struct BaseControlVideoFuncTable { } BaseControlVideoFuncTable; HRESULT WINAPI strmbase_video_init(BaseControlVideo *video, struct strmbase_filter *filter, - CRITICAL_SECTION *cs, struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table); + struct strmbase_pin *pin, const BaseControlVideoFuncTable *func_table); HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); #endif #endif

1 0

Zebediah Figura : strmbase: Get rid of the unused segment fields from struct strmbase_pin.
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: 21ac839711f766098e5b9d5164fe11e9e1a1f0b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21ac839711f766098e5b9d51… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 16 11:20:14 2019 -0600 strmbase: Get rid of the unused segment fields from struct strmbase_pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 23 +++++++---------------- include/wine/strmbase.h | 2 -- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 2d98168418..9a88246a7f 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -333,16 +333,10 @@ HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ } -HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - struct strmbase_pin *This = impl_from_IPin(iface); - TRACE("iface %p, start %s, stop %s, rate %.16e.\n", - iface, debugstr_time(tStart), debugstr_time(tStop), dRate); - - This->tStart = tStart; - This->tStop = tStop; - This->dRate = dRate; + iface, debugstr_time(start), debugstr_time(stop), rate); return S_OK; } @@ -696,7 +690,6 @@ void strmbase_source_init(struct strmbase_source *pin, const IPinVtbl *vtbl, str { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; - pin->pin.dRate = 1.0; pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); @@ -843,17 +836,16 @@ static HRESULT deliver_newsegment(IPin *pin, LPVOID data) return IPin_NewSegment(pin, args->tStart, args->tStop, args->rate); } -HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) { - BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; TRACE("iface %p, start %s, stop %s, rate %.16e.\n", - iface, debugstr_time(tStart), debugstr_time(tStop), dRate); + iface, debugstr_time(start), debugstr_time(stop), rate); - args.tStart = This->pin.tStart = tStart; - args.tStop = This->pin.tStop = tStop; - args.rate = This->pin.dRate = dRate; + args.tStart = start; + args.tStop = stop; + args.rate = rate; return SendFurther( iface, deliver_newsegment, &args, NULL ); } @@ -994,7 +986,6 @@ void strmbase_sink_init(BaseInputPin *pin, const IPinVtbl *vtbl, struct strmbase { memset(pin, 0, sizeof(*pin)); pin->pin.IPin_iface.lpVtbl = vtbl; - pin->pin.dRate = 1.0; pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 7f9d2cb64d..f87b726d0a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -38,8 +38,6 @@ struct strmbase_pin WCHAR name[128]; IPin *peer; AM_MEDIA_TYPE mtCurrent; - REFERENCE_TIME tStart, tStop; - double dRate; const struct BasePinFuncTable* pFuncsTable; };

1 0

Nikolay Sivov : ole32/tests: Check more return values in moniker tests (Coverity).
by Alexandre Julliard 18 Nov '19

18 Nov '19

Module: wine Branch: master Commit: b9462e66a4d75e4477285bf220af4e92ca8bcbed URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9462e66a4d75e4477285bf2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 16 21:06:38 2019 +0300 ole32/tests: Check more return values in moniker tests (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9e2c23b421..cbffad4dfa 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1049,36 +1049,33 @@ todo_wine ok_ole_success(hr, CreateBindCtx); hr = CreateFileMoniker(wszFileName1, &pmk1); - ok(hr==0, "CreateFileMoniker for file hr=%08x\n", hr); + ok(hr == S_OK, "Failed to create file moniker, hr %#x.\n", hr); hr = CreateFileMoniker(wszFileName2, &pmk2); - ok(hr==0, "CreateFileMoniker for file hr=%08x\n", hr); + ok(hr == S_OK, "Failed to create file moniker, hr %#x.\n", hr); hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); - ok(hr==0, "IBindCtx_GetRunningObjectTable hr=%08x\n", hr); + ok(hr == S_OK, "Failed to get ROT, hr %#x.\n", hr); /* Check EnumMoniker before registering */ hr = IRunningObjectTable_EnumRunning(pprot, &spEM1); - ok(hr==0, "IRunningObjectTable_EnumRunning hr=%08x\n", hr); - hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void*) &lpEM1); + ok(hr == S_OK, "Failed to get enum object, hr %#x.\n", hr); + hr = IEnumMoniker_QueryInterface(spEM1, &IID_IUnknown, (void *)&lpEM1); /* Register a couple of Monikers and check is ok */ - ok(hr==0, "IEnumMoniker_QueryInterface hr %08x %p\n", hr, lpEM1); - + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + matchCnt = count_moniker_matches(pbc, spEM1); trace("Number of matches is %i\n", matchCnt); grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk1, &pdwReg1); - ok(hr==0, "IRunningObjectTable_Register hr=%08x %p %08x %p %p %d\n", - hr, pprot, grflags, lpEM1, pmk1, pdwReg1); + ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr); - trace("IROT::Register\n"); grflags=0; grflags= grflags | ROTFLAGS_REGISTRATIONKEEPSALIVE; hr = IRunningObjectTable_Register(pprot, grflags, lpEM1, pmk2, &pdwReg2); - ok(hr==0, "IRunningObjectTable_Register hr=%08x %p %08x %p %p %d\n", hr, - pprot, grflags, lpEM1, pmk2, pdwReg2); + ok(hr == S_OK, "Failed to register object, hr %#x.\n", hr); hr = IRunningObjectTable_EnumRunning(pprot, &spEM2); - ok(hr==0, "IRunningObjectTable_EnumRunning hr=%08x\n", hr); + ok(hr == S_OK, "Failed to get enum object, hr %#x.\n", hr); matchCnt = count_moniker_matches(pbc, spEM2); ok(matchCnt==2, "Number of matches should be equal to 2 not %i\n", matchCnt); @@ -1094,8 +1091,10 @@ todo_wine matchCnt = count_moniker_matches(pbc, spEM3); ok(matchCnt==2, "Number of matches should be equal to 2 not %i\n", matchCnt); - IRunningObjectTable_Revoke(pprot,pdwReg1); - IRunningObjectTable_Revoke(pprot,pdwReg2); + hr = IRunningObjectTable_Revoke(pprot,pdwReg1); + ok(hr == S_OK, "Failed to revoke, hr %#x.\n", hr); + hr = IRunningObjectTable_Revoke(pprot,pdwReg2); + ok(hr == S_OK, "Failed to revoke, hr %#x.\n", hr); IUnknown_Release(lpEM1); IEnumMoniker_Release(spEM1); IEnumMoniker_Release(spEM2);

1 0