March 2020 - Wine-commits - list.winehq.org

Roman Pišl : shell32: Implement SHCreateAssociationRegistration.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 82a4e7203666a2f0167f0da5a135956424800398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82a4e7203666a2f0167f0da5… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat Feb 29 18:47:50 2020 +0100 shell32: Implement SHCreateAssociationRegistration. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44253 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/assoc.c | 8 ++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index a501dea2e7..49751048f3 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -1139,6 +1139,14 @@ static const IEnumAssocHandlersVtbl enumassochandlersvtbl = { enumassochandlers_Next }; +/************************************************************************** + * SHCreateAssociationRegistration [SHELL32.@] + */ +HRESULT WINAPI SHCreateAssociationRegistration(REFIID riid, LPVOID *ppv) +{ + return ApplicationAssociationRegistration_Constructor(NULL, riid, ppv); +} + /************************************************************************** * SHAssocEnumHandlers [SHELL32.@] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 96251a87ca..d4571212ce 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -338,6 +338,7 @@ @ stdcall SHBrowseForFolderW(ptr) @ stdcall SHChangeNotify (long long ptr ptr) @ stub SHChangeNotifySuspendResume +@ stdcall SHCreateAssociationRegistration(ptr ptr) @ stdcall SHCreateDataObject(ptr long ptr ptr ptr ptr) @ stdcall SHCreateDefaultContextMenu(ptr ptr ptr) @ stdcall SHCreateDirectoryExA(long str ptr)

1 0

Jacek Caban : ucrtbase: Add exe entry points implementation.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 78eca968878cfac7f5b75ca9ccb3f2ad5100309d URL: https://source.winehq.org/git/wine.git/?a=commit;h=78eca968878cfac7f5b75ca9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 15:25:23 2020 +0100 ucrtbase: Add exe entry points implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/crt_main.c | 16 +++++++++++++++- dlls/msvcrt/crt_wmain.c | 16 +++++++++++++++- dlls/ucrtbase/Makefile.in | 5 +++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/crt_main.c b/dlls/msvcrt/crt_main.c index 81ec188058..fa325d64b3 100644 --- a/dlls/msvcrt/crt_main.c +++ b/dlls/msvcrt/crt_main.c @@ -24,7 +24,12 @@ #ifdef __MINGW32__ +#if _MSVCR_VER >= 140 +#define _UCRT +#endif + #include <stdarg.h> +#include <stdlib.h> #include <process.h> #include "windef.h" @@ -40,10 +45,19 @@ static const IMAGE_NT_HEADERS *get_nt_header( void ) int __cdecl mainCRTStartup(void) { - int argc, new_mode = 0, ret; + int argc, ret; char **argv, **env; +#ifdef _UCRT + _configure_narrow_argv(_crt_argv_unexpanded_arguments); + _initialize_narrow_environment(); + argc = *__p___argc(); + argv = *__p___argv(); + env = _get_initial_narrow_environment(); +#else + int new_mode = 0; __getmainargs(&argc, &argv, &env, 0, &new_mode); +#endif _set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? _crt_gui_app : _crt_console_app); ret = main(argc, argv, env); diff --git a/dlls/msvcrt/crt_wmain.c b/dlls/msvcrt/crt_wmain.c index 77eb4dbfa7..6bc20e2e0f 100644 --- a/dlls/msvcrt/crt_wmain.c +++ b/dlls/msvcrt/crt_wmain.c @@ -24,7 +24,12 @@ #ifdef __MINGW32__ +#if _MSVCR_VER >= 140 +#define _UCRT +#endif + #include <stdarg.h> +#include <stdlib.h> #include <process.h> #include "windef.h" @@ -40,10 +45,19 @@ static const IMAGE_NT_HEADERS *get_nt_header( void ) int __cdecl wmainCRTStartup(void) { - int argc, new_mode = 0, ret; + int argc, ret; WCHAR **argv, **env; +#ifdef _UCRT + _configure_wide_argv(_crt_argv_unexpanded_arguments); + _initialize_wide_environment(); + argc = *__p___argc(); + argv = *__p___wargv(); + env = _get_initial_wide_environment(); +#else + int new_mode = 0; __wgetmainargs(&argc, &argv, &env, 0, &new_mode); +#endif _set_app_type(get_nt_header()->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI ? _crt_gui_app : _crt_console_app); ret = wmain(argc, argv, env); diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index 2caef7c8c7..6711b4e66c 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -7,6 +7,11 @@ PARENTSRC = ../msvcrt C_SRCS = \ console.c \ cpp.c \ + crt_gccmain.c \ + crt_main.c \ + crt_winmain.c \ + crt_wmain.c \ + crt_wwinmain.c \ ctype.c \ data.c \ dir.c \

1 0

Jacek Caban : msvcrt: Silence wide environment initialization debug messages.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 72633d509d700d07dc01d810f0146400e8cfddf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72633d509d700d07dc01d810… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 14:39:57 2020 +0100 msvcrt: Silence wide environment initialization debug messages. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index af7a13528f..9cc380f74a 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -651,7 +651,7 @@ MSVCRT_wchar_t** CDECL _get_initial_wide_environment(void) */ int CDECL _configure_wide_argv(int mode) { - FIXME("(%d) stub\n", mode); + WARN("(%d) stub\n", mode); return 0; } @@ -660,7 +660,7 @@ int CDECL _configure_wide_argv(int mode) */ int CDECL _initialize_wide_environment(void) { - FIXME("stub\n"); + WARN("stub\n"); return 0; }

1 0

Jacek Caban : makedep: Build builtin programs with ucrt.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 0959d189c86eb4b218a8f4a49a6d6d897c09255b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0959d189c86eb4b218a8f4a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 28 14:40:02 2020 +0100 makedep: Build builtin programs with ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 6dec1b3900..c324802916 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4260,11 +4260,6 @@ static void load_sources( struct makefile *make ) make->use_msvcrt = 1; } - LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); - LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); - - make->is_cross = crosstarget && make->use_msvcrt; - if (make->use_msvcrt) { for (i = 0; i < make->imports.count; i++) @@ -4273,10 +4268,23 @@ static void load_sources( struct makefile *make ) if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] ); crt_dll = make->imports.str[i]; } - if (!crt_dll) crt_dll = "msvcrt"; + if (!crt_dll) + { + if (make->use_msvcrt && make->is_exe) + { + strarray_add( &make->imports, "ucrtbase" ); + crt_dll = "ucrtbase"; + } + else crt_dll = "msvcrt"; + } if (!strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); } + LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); + LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); + + make->is_cross = crosstarget && make->use_msvcrt; + if (make->is_cross) { for (i = 0; i < make->imports.count; i++)

1 0

Dmitry Timoshkov : include/sal.h: Add _Ret_writes_z_ for Visual Studio 14.0.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 2703827f9bb4a0437f1e82407fef31217fb4f129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2703827f9bb4a0437f1e8240… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:27:09 2020 +0800 include/sal.h: Add _Ret_writes_z_ for Visual Studio 14.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index 81a828dd97..ca8b824f1b 100644 --- a/include/sal.h +++ b/include/sal.h @@ -217,6 +217,7 @@ #define _Ret_opt_z_cap_(count) #define _Ret_range_(exp,exp2) #define _Ret_writes_bytes_maybenull_(count) +#define _Ret_writes_z_(count) #define _Ret_z_ #define _Return_type_success_(count)

1 0

Dmitry Timoshkov : kernel32/tests: Fix locale.c compilation with Visual Studio 14.0.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 7c461d6302b6820acad10c8e0ff320d2095927d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c461d6302b6820acad10c8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:35 2020 +0800 kernel32/tests: Fix locale.c compilation with Visual Studio 14.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1df3c0dcd6..31add74e4e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -25,6 +25,8 @@ * the control panel i8n page), we will still get the expected results. */ +#define _CRT_NON_CONFORMING_WCSTOK + #include <assert.h> #include <stdlib.h> #include <stdarg.h> @@ -4197,7 +4199,7 @@ static void test_GetCPInfo(void) for (i = 0; i <= sizeof(buf); i++) { memset( wbuf, 0xcc, sizeof(wbuf) ); - RtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i ); + pRtlCustomCPToUnicodeN( &table, wbuf, sizeof(wbuf), &reslen, (char *)buf, i ); for (j = 0; j < 4; j++) if (expect[i][j] == 0xcccc) break; ok( reslen == j * sizeof(WCHAR), "%u: wrong len %u\n", i, reslen ); for (j = 0; j < 4; j++)

1 0

Dmitry Timoshkov : kernel32/tests: Fix initialization of parameters in Get[*]PreferredUILanguages tests.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 9870f9325af50bf4fc762266a97c663f587e8a59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9870f9325af50bf4fc762266… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:37 2020 +0800 kernel32/tests: Fix initialization of parameters in Get[*]PreferredUILanguages tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 44 +++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9870f9325af50bf4fc76…

1 0

Dmitry Timoshkov : kernel32/tests: Add more tests for Get[*]PreferredUILanguages APIs.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: cac04651637f339720cfde3c0c58672477c777c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cac04651637f339720cfde3c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:40 2020 +0800 kernel32/tests: Add more tests for Get[*]PreferredUILanguages APIs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 63 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 8ff630a1eb..eff6c88b9e 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5461,12 +5461,24 @@ static void test_GetSystemPreferredUILanguages(void) "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); + size = 0; + SetLastError(0xdeadbeef); + ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); +todo_wine + ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); +todo_wine + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(size == size_id, "expected %u, got %u\n", size_id, size); + size = 1; SetLastError(0xdeadbeef); ret = pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &count, buffer, &size); ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -1; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); @@ -5475,6 +5487,8 @@ static void test_GetSystemPreferredUILanguages(void) ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -2; memset(buffer, 0x5a, size_buffer * sizeof(WCHAR)); @@ -5483,6 +5497,8 @@ static void test_GetSystemPreferredUILanguages(void) ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id + 2 || size == size_id + 1 /* before win10 1809 */, "expected %u, got %u\n", size_id + 2, size); HeapFree(GetProcessHeap(), 0, buffer); } @@ -5490,7 +5506,7 @@ static void test_GetSystemPreferredUILanguages(void) static void test_GetThreadPreferredUILanguages(void) { BOOL ret; - ULONG count, size; + ULONG count, size, size_id; WCHAR *buf; if (!pGetThreadPreferredUILanguages) @@ -5510,6 +5526,51 @@ static void test_GetThreadPreferredUILanguages(void) ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID|MUI_UI_FALLBACK, &count, buf, &size); ok(ret, "got %u\n", GetLastError()); ok(count, "expected count > 0\n"); + + size_id = count = 0; + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, NULL, &size_id); + ok(ret, "got %u\n", GetLastError()); + ok(count, "expected count > 0\n"); + ok(size_id, "expected size > 0\n"); + ok(size_id <= size, "expected size > 0\n"); + + size = 0; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); +todo_wine + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); +todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = 1; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = size_id - 1; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(MUI_LANGUAGE_ID, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id, "expected %u, got %u\n", size_id, size); + + size = size_id - 2; + SetLastError(0xdeadbeef); + ret = pGetThreadPreferredUILanguages(0, &count, buf, &size); + ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); +todo_wine + ok(size == size_id || size == size_id - 1 /* before win10 1809 */, "expected %u, got %u\n", size_id, size); + HeapFree(GetProcessHeap(), 0, buf); }

1 0

Dmitry Timoshkov : kernel32: Get[*]PreferredUILanguages should return buffer size when setting ERROR_INSUFFICIENT_BUFFER.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: 081737379a827bfac31efcc684591ef1f4860392 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081737379a827bfac31efcc6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 2 14:30:42 2020 +0800 kernel32: Get[*]PreferredUILanguages should return buffer size when setting ERROR_INSUFFICIENT_BUFFER. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 1 + dlls/kernel32/tests/locale.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 98f9efa1b6..63b27f9453 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -112,6 +112,7 @@ static BOOL get_dummy_preferred_ui_language( DWORD flags, ULONG *count, WCHAR *b if (lsize > *size) { + *size = lsize; SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index eff6c88b9e..fa067b7301 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5477,7 +5477,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -1; @@ -5487,7 +5486,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id -2; @@ -5497,7 +5495,6 @@ todo_wine ok(!ret, "Expected GetSystemPreferredUILanguages to fail\n"); ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id + 2 || size == size_id + 1 /* before win10 1809 */, "expected %u, got %u\n", size_id + 2, size); HeapFree(GetProcessHeap(), 0, buffer); @@ -5550,7 +5547,6 @@ todo_wine ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id - 1; @@ -5559,7 +5555,6 @@ todo_wine ok(!ret, "Expected GetThreadPreferredUILanguages to fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); -todo_wine ok(size == size_id, "expected %u, got %u\n", size_id, size); size = size_id - 2;

1 0

Alistair Leslie-Hughes : oledb32: Initialize all DBGUID values.
by Alexandre Julliard 02 Mar '20

02 Mar '20

Module: wine Branch: master Commit: ce434a8a146ffe2cae4586e0f54c856d0098aa9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce434a8a146ffe2cae4586e0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 2 06:37:53 2020 +0000 oledb32: Initialize all DBGUID values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 2acd23ea08..130fb626ea 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -34,7 +34,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); -DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DB_NULLGUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +DEFINE_GUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +DEFINE_GUID(DBPROPSET_COLUMN, 0xc8b522b9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCE, 0xc8b522ba, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCEINFO, 0xc8b522bb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_INDEX, 0xc8b522bd, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_ROWSET, 0xc8b522be, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_TABLE, 0xc8b522bf, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCEALL, 0xc8b522c0, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DATASOURCEINFOALL, 0xc8b522c1, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_ROWSETALL, 0xc8b522c2, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_SESSION, 0xc8b522c6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); typedef struct datainit {

1 0