wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Alexandre Julliard : kernel32: Move GeoID functions to kernelbase.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: eeb8eddfa2ae3bb8f81ad83fc8e9646d182e5a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeb8eddfa2ae3bb8f81ad83f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 9 19:10:21 2019 +0100 kernel32: Move GeoID functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 8 +- dlls/kernel32/locale.c | 657 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 8 +- dlls/kernelbase/locale.c | 492 ++++++++++++++++++++++++++++++ 4 files changed, 500 insertions(+), 665 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eeb8eddfa2ae3bb8f81a…

1 0

Alexandre Julliard : kernel32: Move the CompareString functions to kernelbase.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 098e71ad61e0112389bf5f214b531311005f5cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=098e71ad61e0112389bf5f21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 9 12:47:47 2019 +0100 kernel32: Move the CompareString functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 10 +- dlls/kernel32/locale.c | 198 ------------------------- dlls/kernelbase/kernelbase.spec | 10 +- dlls/kernelbase/locale.c | 312 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 322 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=098e71ad61e0112389bf…

1 0

Alexandre Julliard : kernel32: Move LCMapString functions to kernelbase.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 94a3add0ea7889dbd26a4ded60ace1c40b02ed89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94a3add0ea7889dbd26a4ded… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 9 12:21:17 2019 +0100 kernel32: Move LCMapString functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/locale.c | 564 ------------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/collation.c | 1659 +++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/locale.c | 617 +++++++++++++++ tools/make_unicode | 1 + 7 files changed, 2284 insertions(+), 570 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94a3add0ea7889dbd26a…

1 0

Alexandre Julliard : kernelbase: Directly use the wctype table for the IsChar* functions.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: c7c8016b70f2af228f3b858fe816cb14cf7f6754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c8016b70f2af228f3b858f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 9 10:08:23 2019 +0100 kernelbase: Directly use the wctype table for the IsChar* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/string.c | 91 ------------------------------ 2 files changed, 140 insertions(+), 91 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2dbcb0db17..950e9e230d 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2901,6 +2901,146 @@ LANGID WINAPI DECLSPEC_HOTPATCH GetUserDefaultUILanguage(void) } +/****************************************************************************** + * IsCharAlphaA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_ALPHA); +} + + +/****************************************************************************** + * IsCharAlphaW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_ALPHA); +} + + +/****************************************************************************** + * IsCharAlphaNumericA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaNumericA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & (C1_ALPHA | C1_DIGIT)); +} + + +/****************************************************************************** + * IsCharAlphaNumericW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharAlphaNumericW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & (C1_ALPHA | C1_DIGIT)); +} + + +/****************************************************************************** + * IsCharBlankW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharBlankW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_BLANK); +} + + +/****************************************************************************** + * IsCharCntrlW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharCntrlW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_CNTRL); +} + + +/****************************************************************************** + * IsCharDigitW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharDigitW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_DIGIT); +} + + +/****************************************************************************** + * IsCharLowerA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharLowerA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_LOWER); +} + + +/****************************************************************************** + * IsCharLowerW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharLowerW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_LOWER); +} + + +/****************************************************************************** + * IsCharPunctW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharPunctW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_PUNCT); +} + + +/****************************************************************************** + * IsCharSpaceA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharSpaceA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_SPACE); +} + + +/****************************************************************************** + * IsCharSpaceW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharSpaceW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_SPACE); +} + + +/****************************************************************************** + * IsCharUpperA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharUpperA( CHAR c ) +{ + WCHAR wc = nls_info.AnsiTableInfo.MultiByteTable[(unsigned char)c]; + return !!(get_table_entry( wctype_table, wc ) & C1_UPPER); +} + + +/****************************************************************************** + * IsCharUpperW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharUpperW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_UPPER); +} + + +/****************************************************************************** + * IsCharXDigitW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsCharXDigitW( WCHAR wc ) +{ + return !!(get_table_entry( wctype_table, wc ) & C1_XDIGIT); +} + + /****************************************************************************** * IsDBCSLeadByte (kernelbase.@) */ diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 668fd4fa37..9a4d8c0827 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -33,13 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(string); ((ch) >= 'A' && (ch) <= 'F') || \ ((ch) >= 'a' && (ch) <= 'f')) -static WORD get_char_type(WCHAR ch) -{ - WORD type = 0; - GetStringTypeW(CT_CTYPE1, &ch, 1, &type); - return type; -} - static BOOL char_compare(WORD ch1, WORD ch2, DWORD flags) { char str1[3], str2[3]; @@ -219,90 +212,6 @@ DWORD WINAPI StrCmpNICW(const WCHAR *str, const WCHAR *cmp, DWORD len) return StrCmpNIW(str, cmp, len); } -BOOL WINAPI IsCharBlankW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_BLANK); -} - -BOOL WINAPI IsCharCntrlW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_CNTRL); -} - -BOOL WINAPI IsCharDigitW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_DIGIT); -} - -BOOL WINAPI IsCharPunctW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_PUNCT); -} - -BOOL WINAPI IsCharSpaceA(CHAR c) -{ - WORD type; - return GetStringTypeA(GetSystemDefaultLCID(), CT_CTYPE1, &c, 1, &type) && (type & C1_SPACE); -} - -BOOL WINAPI IsCharSpaceW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_SPACE); -} - -BOOL WINAPI IsCharXDigitW(WCHAR wc) -{ - return !!(get_char_type(wc) & C1_XDIGIT); -} - -BOOL WINAPI IsCharAlphaA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharAlphaW(wch); -} - -BOOL WINAPI IsCharAlphaW(WCHAR ch) -{ - return !!(get_char_type(ch) & C1_ALPHA); -} - -BOOL WINAPI IsCharLowerA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharLowerW(wch); -} - -BOOL WINAPI IsCharLowerW(WCHAR ch) -{ - return !!(get_char_type(ch) & C1_LOWER); -} - -BOOL WINAPI IsCharAlphaNumericA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharAlphaNumericW(wch); -} - -BOOL WINAPI IsCharAlphaNumericW(WCHAR ch) -{ - return !!(get_char_type(ch) & (C1_ALPHA | C1_DIGIT)); -} - -BOOL WINAPI IsCharUpperA(CHAR x) -{ - WCHAR wch; - MultiByteToWideChar(CP_ACP, 0, &x, 1, &wch, 1); - return IsCharUpperW(wch); -} - -BOOL WINAPI IsCharUpperW(WCHAR ch) -{ - return !!(get_char_type(ch) & C1_UPPER); -} - char * WINAPI StrChrA(const char *str, WORD ch) { TRACE("%s, %#x\n", wine_dbgstr_a(str), ch);

1 0

Alexandre Julliard : kernel32: Move GetStringType functions to kernelbase.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 1b46da5c05ba0c1ab27506af27e31f0d0e7d3795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b46da5c05ba0c1ab27506af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 20:29:27 2019 +0100 kernel32: Move GetStringType functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 1 - dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/locale.c | 141 ++------------------------------- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/kernelbase.spec | 6 +- dlls/kernelbase/locale.c | 117 +++++++++++++++++++++++++++ dlls/{kernel32 => kernelbase}/wctype.c | 0 tools/make_unicode | 2 +- 8 files changed, 132 insertions(+), 144 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b46da5c05ba0c1ab275…

1 0

Alistair Leslie-Hughes : msado15: Support all interfaces in _Recordset QueryInterface.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: c123637b2d999e8429c9e1d727f75a7d6799a061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c123637b2d999e8429c9e1d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Dec 8 23:25:51 2019 +0000 msado15: Support all interfaces in _Recordset QueryInterface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index bf0ca6e90f..52282c7e82 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -67,8 +67,13 @@ static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, { TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); - if (IsEqualGUID( riid, &IID__Recordset ) || IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IUnknown )) + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__ADO) || + IsEqualIID(riid, &IID_Recordset15) || + IsEqualIID(riid, &IID_Recordset20) || + IsEqualIID(riid, &IID_Recordset21) || + IsEqualIID(riid, &IID__Recordset)) { *obj = iface; }

1 0

Francois Gouget : cmd: Avoid unneeded strlenW() calls.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 040c435075aa58448fe439712e4ce3259ad1a1e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=040c435075aa58448fe43971… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:48:16 2019 +0100 cmd: Avoid unneeded strlenW() calls. Neither WCMD_give_help(), nor WCMD_setshow_default() are ever called with a NULL pointer (notice how WCMD_skip_leading_spaces() already assumes its argument is not NULL and does not return NULL). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ee45acaf7c..43c4d9efef 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2549,7 +2549,7 @@ void WCMD_give_help (const WCHAR *args) size_t i; args = WCMD_skip_leading_spaces((WCHAR*) args); - if (lstrlenW(args) == 0) { + if (!*args) { WCMD_output_asis (WCMD_LoadMessage(WCMD_ALLHELP)); } else { @@ -3460,7 +3460,8 @@ void WCMD_setshow_default (const WCHAR *args) { } GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); - if (lstrlenW(args) == 0) { + + if (!*args) { lstrcatW (cwd, newlineW); WCMD_output_asis (cwd); } @@ -3552,7 +3553,7 @@ void WCMD_setshow_date (void) { DWORD count; static const WCHAR parmT[] = {'/','T','\0'}; - if (lstrlenW(param1) == 0) { + if (!*param1) { if (GetDateFormatW(LOCALE_USER_DEFAULT, 0, NULL, NULL, curdate, ARRAY_SIZE(curdate))) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); if (wcsstr (quals, parmT) == NULL) { @@ -4194,7 +4195,7 @@ void WCMD_setshow_env (WCHAR *s) { /* Output the prompt */ *p++ = '\0'; - if (lstrlenW(p) != 0) WCMD_output_asis(p); + if (*p) WCMD_output_asis(p); /* Read the reply */ WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, ARRAY_SIZE(string), &count); @@ -4268,7 +4269,7 @@ void WCMD_setshow_env (WCHAR *s) { } *p++ = '\0'; - if (lstrlenW(p) == 0) p = NULL; + if (!*p) p = NULL; WINE_TRACE("set: Setting var '%s' to '%s'\n", wine_dbgstr_w(s), wine_dbgstr_w(p)); status = SetEnvironmentVariableW(s, p); @@ -4293,7 +4294,7 @@ void WCMD_setshow_path (const WCHAR *args) { static const WCHAR pathW[] = {'P','A','T','H','\0'}; static const WCHAR pathEqW[] = {'P','A','T','H','=','\0'}; - if (lstrlenW(param1) == 0 && lstrlenW(param2) == 0) { + if (!*param1 && !*param2) { status = GetEnvironmentVariableW(pathW, string, ARRAY_SIZE(string)); if (status != 0) { WCMD_output_asis ( pathEqW); @@ -4322,13 +4323,13 @@ void WCMD_setshow_prompt (void) { WCHAR *s; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; - if (lstrlenW(param1) == 0) { + if (!*param1) { SetEnvironmentVariableW(promptW, NULL); } else { s = param1; while ((*s == '=') || (*s == ' ') || (*s == '\t')) s++; - if (lstrlenW(s) == 0) { + if (!*s) { SetEnvironmentVariableW(promptW, NULL); } else SetEnvironmentVariableW(promptW, s); @@ -4349,7 +4350,7 @@ void WCMD_setshow_time (void) { SYSTEMTIME st; static const WCHAR parmT[] = {'/','T','\0'}; - if (lstrlenW(param1) == 0) { + if (!*param1) { GetLocalTime(&st); if (GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, ARRAY_SIZE(curtime))) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); @@ -4756,7 +4757,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) WCHAR string[MAX_PATH], label[MAX_PATH], curdir[MAX_PATH]; BOOL status; - if (lstrlenW(path) == 0) { + if (!*path) { status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); if (!status) { WCMD_print_error (); @@ -4794,7 +4795,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ } - if (lstrlenW(path) != 0) { + if (*path) { if (!SetVolumeLabelW(curdir, string)) WCMD_print_error (); } else {

1 0

Francois Gouget : winedbg: Avoid unneeded strlen() calls.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 9fbfa988f28e4bba289a7cc292f310253a60bb4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fbfa988f28e4bba289a7cc2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:47:45 2019 +0100 winedbg: Avoid unneeded strlen() calls. Note that target_xml is an array and thus cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b7f59ee05b..85ebc882a6 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1615,7 +1615,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) return packet_ok; if (strncmp(gdbctx->in_packet, "Supported", 9) == 0) { - if (strlen(target_xml)) + if (*target_xml) return packet_reply(gdbctx, "PacketSize=400;qXfer:features:read+"); else { @@ -1652,7 +1652,7 @@ static enum packet_return packet_query(struct gdb_context* gdbctx) } break; case 'X': - if (strlen(target_xml) && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) + if (*target_xml && strncmp(gdbctx->in_packet, "Xfer:features:read:target.xml", 29) == 0) return packet_reply(gdbctx, target_xml); break; }

1 0

Francois Gouget : user32/tests: Fix the spelling of an ok() message.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: cca965d94e1029e914224821441b1c20d5b0feec URL: https://source.winehq.org/git/wine.git/?a=commit;h=cca965d94e1029e914224821… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:47:28 2019 +0100 user32/tests: Fix the spelling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/winstation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 6bebfe95f4..aaa51d560a 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -591,7 +591,7 @@ static void test_inputdesktop(void) /* by default, GetThreadDesktop is the input desktop, SendInput should succeed. */ old_thread_desk = GetThreadDesktop(GetCurrentThreadId()); - ok(old_thread_desk != NULL, "GetThreadDesktop faile!\n"); + ok(old_thread_desk != NULL, "GetThreadDesktop failed!\n"); memset(name, 0, sizeof(name)); ret = GetUserObjectInformationA(old_thread_desk, UOI_NAME, name, 1024, NULL); ok(!strcmp(name, "Default"), "unexpected desktop %s\n", name);

1 0

Francois Gouget : oleaut32: Fix the spelling of a FIXME() message.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 1a46034c4643c9b4948bed94bb7450aea62e1f99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a46034c4643c9b4948bed94… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 9 09:47:17 2019 +0100 oleaut32: Fix the spelling of a FIXME() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 6e8a18c9d7..668ad8d582 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3757,7 +3757,7 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) ptr += 6; if((w = *(WORD*)ptr) != 0xffff) { - FIXME("LibBlk.res06 = %04x. Assumung string and skipping\n", w); + FIXME("LibBlk.res06 = %04x. Assuming string and skipping\n", w); ptr += w; } ptr += 2;

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2019