December 2019 - Wine-commits

Alexandre Julliard : winebuild: Add a --builtin option to mark PE files as builtins.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: wine Branch: master Commit: 9dc348a071fc626f85c3d3d7b40425712bde1e2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dc348a071fc626f85c3d3d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 18 21:05:27 2019 +0100 winebuild: Add a --builtin option to mark PE files as builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 17 ++++++++++++++--- tools/winebuild/spec32.c | 35 ++++++++++++++++++++++++++++++++--- tools/winebuild/winebuild.man.in | 4 ++++ 4 files changed, 51 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 2b67d305e8..29cd997b96 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -320,6 +320,7 @@ extern void output_spec16_file( DLLSPEC *spec ); extern void output_fake_module16( DLLSPEC *spec16 ); extern void output_res_o_file( DLLSPEC *spec ); extern void output_asm_relays16(void); +extern void make_builtin_files( char *argv[] ); extern void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ); extern int parse_spec_file( FILE *file, DLLSPEC *spec ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f4abb55081..ca8f8af03a 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -113,6 +113,7 @@ enum exec_mode_values MODE_EXE, MODE_DEF, MODE_IMPLIB, + MODE_BUILTIN, MODE_RESOURCES }; @@ -291,11 +292,12 @@ static const char usage_str[] = " --version Print the version and exit\n" " -w, --warnings Turn on warnings\n" "\nMode options:\n" -" --dll Build a .c file from a .spec or .def file\n" +" --dll Build a library from a .spec file and object files\n" " --def Build a .def file from a .spec file\n" -" --exe Build a .c file for an executable\n" +" --exe Build an executable from object files\n" " --implib Build an import library\n" -" --resources Build a .o file for the resource files\n\n" +" --builtin Mark a library as a Wine builtin\n" +" --resources Build a .o or .res file for the resource files\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; enum long_options_values @@ -304,6 +306,7 @@ enum long_options_values LONG_OPT_DEF, LONG_OPT_EXE, LONG_OPT_IMPLIB, + LONG_OPT_BUILTIN, LONG_OPT_ASCMD, LONG_OPT_CCCMD, LONG_OPT_EXTERNAL_SYMS, @@ -326,6 +329,7 @@ static const struct option long_options[] = { "def", 0, 0, LONG_OPT_DEF }, { "exe", 0, 0, LONG_OPT_EXE }, { "implib", 0, 0, LONG_OPT_IMPLIB }, + { "builtin", 0, 0, LONG_OPT_BUILTIN }, { "as-cmd", 1, 0, LONG_OPT_ASCMD }, { "cc-cmd", 1, 0, LONG_OPT_CCCMD }, { "external-symbols", 0, 0, LONG_OPT_EXTERNAL_SYMS }, @@ -494,6 +498,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_IMPLIB: set_exec_mode( MODE_IMPLIB ); break; + case LONG_OPT_BUILTIN: + set_exec_mode( MODE_BUILTIN ); + break; case LONG_OPT_ASCMD: as_command = strarray_fromstring( optarg, " " ); break; @@ -677,6 +684,10 @@ int main(int argc, char **argv) if (!parse_input_file( spec )) break; output_import_lib( spec, argv ); break; + case MODE_BUILTIN: + if (!argv[0]) fatal_error( "missing file argument for --builtin option\n" ); + make_builtin_files( argv ); + break; case MODE_RESOURCES: load_resources( argv, spec ); output_res_o_file( spec ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index f2567e8a92..ecfe4c5011 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -48,6 +48,9 @@ int needs_get_pc_thunk = 0; +static const char builtin_signature[32] = "Wine builtin DLL"; +static const char fakedll_signature[32] = "Wine placeholder DLL"; + /* check if entry point needs a relay thunk */ static inline int needs_relay( const ORDDEF *odp ) { @@ -790,12 +793,11 @@ void output_fake_module( DLLSPEC *spec ) static const unsigned char exe_code_section[] = { 0xb8, 0x01, 0x00, 0x00, 0x00, /* movl $1,%eax */ 0xc2, 0x04, 0x00 }; /* ret $4 */ - static const char fakedll_signature[] = "Wine placeholder DLL"; const unsigned int page_size = get_page_size(); const unsigned int section_align = page_size; const unsigned int file_align = 0x200; const unsigned int reloc_size = 8; - const unsigned int lfanew = (0x40 + sizeof(fakedll_signature) + 15) & ~15; + const unsigned int lfanew = 0x40 + sizeof(fakedll_signature); const unsigned int nb_sections = 2 + (spec->nb_resources != 0); const unsigned int text_size = (spec->characteristics & IMAGE_FILE_DLL) ? sizeof(dll_code_section) : sizeof(exe_code_section); @@ -837,7 +839,6 @@ void output_fake_module( DLLSPEC *spec ) put_dword( lfanew ); put_data( fakedll_signature, sizeof(fakedll_signature) ); - align_output( 16 ); put_dword( 0x4550 ); /* Signature */ switch(target_cpu) @@ -1062,3 +1063,31 @@ void output_def_file( DLLSPEC *spec, int import_only ) if (!total) warning( "%s: Import library doesn't export anything\n", spec->file_name ); if (spec32) free_dll_spec( spec32 ); } + + +/******************************************************************* + * make_builtin_files + */ +void make_builtin_files( char *argv[] ) +{ + int i, fd; + struct + { + unsigned short e_magic; + unsigned short unused[29]; + unsigned int e_lfanew; + } header; + + for (i = 0; argv[i]; i++) + { + if ((fd = open( argv[i], O_RDWR | O_BINARY )) == -1) fatal_perror( "Cannot open %s", argv[i] ); + if (read( fd, &header, sizeof(header) ) == sizeof(header) && !memcmp( &header.e_magic, "MZ", 2 )) + { + if (header.e_lfanew < sizeof(header) + sizeof(builtin_signature)) + fatal_error( "%s: Not enough space (%x) for Wine signature\n", argv[i], header.e_lfanew ); + write( fd, builtin_signature, sizeof(builtin_signature) ); + } + else fatal_error( "%s: Unrecognized file format\n", argv[i] ); + close( fd ); + } +} diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 367121544d..4da48ffa81 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -51,6 +51,10 @@ Build a .a import library from a spec file. The .spec file is specified via the \fB-E\fR option. If the output library name ends in .delay.a, a delayed import library is built. .TP +.BI \--builtin +Mark a PE module as a Wine builtin module, by adding the "Wine builtin +DLL" signature string after the DOS header. +.TP .B \--resources Generate a .o file containing all the input resources. This is useful when building with a PE compiler, since the PE binutils cannot handle

1 0

Francois Gouget : testbot/LogUtils: Highlight TestLauncher errors.
by Alexandre Julliard 18 Dec '19

18 Dec '19

Module: tools Branch: master Commit: b7c2334ea3a741112f75070bde9e2007793ecb6d URL: https://source.winehq.org/git/tools.git/?a=commit;h=b7c2334ea3a741112f75070… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 18 14:12:53 2019 +0100 testbot/LogUtils: Highlight TestLauncher errors. Such as when it cannot parse the subtests list (typically because a missing library prevented the test from running at all). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17a0286..c577426 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -186,6 +186,7 @@ sub GetLogLineCategory($) $Line =~ /^[a-zA-Z.]+:error: / or # TestBot error $Line =~ /^BotError:/ or + $Line =~ /^Error:/ or # X errors $Line =~ /^X Error of failed request: / or $Line =~ / opcode of failed request: /)

1 0

Alexandre Julliard : d3dx9_36/tests: Fix some constant conversion warnings.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: 863da013a216bb50b925bbb9e3987b21206fb782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=863da013a216bb50b925bbb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:29:18 2019 +0100 d3dx9_36/tests: Fix some constant conversion warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/mesh.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index da9b80c578..3882bb404a 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -7484,9 +7484,9 @@ static void test_weld_vertices(void) {{ 2.0f, 3.0f, 0.f}, {0, 0, 0, 0}}, {{ 0.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, - {{ 3.0f, 3.0f, 0.f}, {65535, 65535, 65535, 65535}}, + {{ 3.0f, 3.0f, 0.f}, {-1, -1, -1, -1}}, {{ 3.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, - {{ 1.0f, 0.0f, 0.f}, {65534, 65534, 65534, 65534}}, + {{ 1.0f, 0.0f, 0.f}, {-2, -2, -2, -2}}, }; const DWORD indices22[] = {0, 1, 2, 3, 4, 5}; const DWORD attributes22[] = {0, 0}; @@ -7501,7 +7501,7 @@ static void test_weld_vertices(void) {{ 2.0f, 3.0f, 0.f}, {0, 0, 0, 0}}, {{ 0.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, - {{ 2.0f, 3.0f, 0.f}, {65535, 65535, 65535, 65535}}, + {{ 2.0f, 3.0f, 0.f}, {-1, -1, -1, -1}}, {{ 3.0f, 0.0f, 0.f}, {0, 0, 0, 0}}, }; const DWORD exp_indices22[] = {0, 1, 2, 3, 4, 2};

1 0

Alexandre Julliard : oledb32/tests: Fix a constant conversion warning.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: b5157c528d220fea70c6f227831eea008840ed1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5157c528d220fea70c6f227… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:49:56 2019 +0100 oledb32/tests: Fix a constant conversion warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 28401e68c9..8ec64d40ae 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3092,7 +3092,7 @@ static void test_getconversionsize(void) SAFEARRAYBOUND rgsabound[1]; int i4 = 200; WORD i2 = 201; - char i1 = 203; + char i1 = (char)203; FLOAT f4 = 1.0; LONGLONG i8 = 202; DATE dbdate;

1 0

Alexandre Julliard : winmm/tests: Fix a constant conversion warning.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: ef35796376e01688a4dd28fea00782877eeac344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef35796376e01688a4dd28fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:50:40 2019 +0100 winmm/tests: Fix a constant conversion warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a2f2a82880..f9fc5c5aad 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -161,7 +161,7 @@ static char* wave_generate_silence(WAVEFORMATEX* wfx, double duration, DWORD* si for (i=0;i<nb_samples;i++) { if (wfx->wBitsPerSample==8) { for (j = 0; j < wfx->nChannels; j++) - *b++=128; + *b++=(char)128; } else if (wfx->wBitsPerSample==16) { for (j = 0; j < wfx->nChannels; j++) { b[0]=0;

1 0

Alexandre Julliard : msvcp120/tests: Don't use const pointers to avoid compiler warnings.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: 74b3f392ab24378c81ad88cb2d7572e93c1b26f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b3f392ab24378c81ad88cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 16:50:53 2019 +0100 msvcp120/tests: Don't use const pointers to avoid compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 9c3f22a367..7a382ac6fa 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -115,17 +115,12 @@ struct thiscall_thunk #include "poppack.h" static void * (WINAPI *call_thiscall_func1)( void *func, void *this ); -static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); -static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, - const void *b ); -static void * (WINAPI *call_thiscall_func4)( void *func, void *this, const void *a, - const void *b, const void *c ); -static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, - const void *b, const void *c, const void *d ); -static void * (WINAPI *call_thiscall_func6)( void *func, void *this, const void *a, - const void *b, const void *c, const void *d, const void *e ); -static void * (WINAPI *call_thiscall_func7)( void *func, void *this, const void *a, - const void *b, const void *c, const void *d, const void *e, const void *f ); +static void * (WINAPI *call_thiscall_func2)( void *func, void *this, void *a ); +static void * (WINAPI *call_thiscall_func3)( void *func, void *this, void *a, void *b ); +static void * (WINAPI *call_thiscall_func4)( void *func, void *this, void *a, void *b, void *c ); +static void * (WINAPI *call_thiscall_func5)( void *func, void *this, void *a, void *b, void *c, void *d ); +static void * (WINAPI *call_thiscall_func6)( void *func, void *this, void *a, void *b, void *c, void *d, void *e ); +static void * (WINAPI *call_thiscall_func7)( void *func, void *this, void *a, void *b, void *c, void *d, void *e, void *f ); static void init_thiscall_thunk(void) { @@ -146,17 +141,12 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) -#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),\ - (const void*)(b)) -#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c)) -#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c),(const void*)(d)) -#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e)) -#define call_func7(func,_this,a,b,c,d,e,f) call_thiscall_func7(func,_this,(const void*)(a),\ - (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e),(const void*)(f)) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(void*)(a),(void*)(b)) +#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(void*)(a),(void*)(b),(void*)(c)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(void*)(a),(void*)(b),(void*)(c),(void*)(d)) +#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(void*)(a),(void*)(b),(void*)(c),(void*)(d),(void*)(e)) +#define call_func7(func,_this,a,b,c,d,e,f) call_thiscall_func7(func,_this,(void*)(a),(void*)(b),(void*)(c),(void*)(d),(void*)(e),(void*)(f)) #else #define init_thiscall_thunk()

1 0

Alexandre Julliard : ntdll: Silence the timezone fixme when the registry is empty.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: 238c6be5b81cbfcf8cd147b1cbb25d16803efbe1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=238c6be5b81cbfcf8cd147b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 19:38:42 2019 +0100 ntdll: Silence the timezone fixme when the registry is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48300 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 7f79c3e4ff..1d5c4f2b31 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -854,6 +854,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* NtClose(hkey); + if (idx == 1) return; /* registry info not initialized yet */ + FIXME("Can't find matching timezone information in the registry for " "%s, bias %d, std (d/m/y): %u/%02u/%04u, dlt (d/m/y): %u/%02u/%04u\n", tz_name, tzi->Bias,

1 0

Alistair Leslie-Hughes : oledb32/tests: Add PromptNew interactive test.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: b5c02b217e25763afab8e5cb66a2d2735e1aaf4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5c02b217e25763afab8e5cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 17 01:03:03 2019 +0000 oledb32/tests: Add PromptNew interactive test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/database.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 8ff55b9d2a..83a4767b90 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -940,6 +940,26 @@ static void test_dslocator(void) hr = IDataSourceLocator_QueryInterface(dslocator, &IID_IRpcOptions, (void **)&opts); ok(hr == E_NOINTERFACE, "got %08x\n", hr); + if (winetest_interactive) + { + IDispatch *disp = NULL; + + hr = IDataSourceLocator_PromptNew(dslocator, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IDataSourceLocator_PromptNew(dslocator, &disp); + if (hr == S_OK) + { + ok(disp != NULL, "got %08x\n", hr); + IDispatch_Release(disp); + } + else + { + ok(hr == S_FALSE, "got %08x\n", hr); + ok(!disp, "got %08x\n", hr); + } + } + IDataInitialize_Release(datainit2); IDataInitialize_Release(datainit);

1 0

Nikolay Sivov : ole32/tests: Add tests for system moniker identification queries.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: 0c9205ad1d3821bbcf3d7a4fd9c7b2b369977953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9205ad1d3821bbcf3d7a4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 17 10:51:55 2019 +0300 ole32/tests: Add tests for system moniker identification queries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 64 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d911ce57e9..4fec233a57 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -31,6 +31,7 @@ #include "ocidl.h" #include "comcat.h" #include "olectl.h" +#include "initguid.h" #include "wine/test.h" @@ -62,6 +63,13 @@ static const CLSID CLSID_TestMoniker = {0xb9, 0x3e, 0x2f, 0xf9, 0xc8, 0x32, 0x23, 0xd7} }; +DEFINE_OLEGUID(CLSID_FileMoniker, 0x303, 0, 0); +DEFINE_OLEGUID(CLSID_ItemMoniker, 0x304, 0, 0); +DEFINE_OLEGUID(CLSID_AntiMoniker, 0x305, 0, 0); +DEFINE_OLEGUID(CLSID_CompositeMoniker, 0x309, 0, 0); +DEFINE_OLEGUID(CLSID_ClassMoniker, 0x31a, 0, 0); +DEFINE_OLEGUID(CLSID_PointerMoniker, 0x306, 0, 0); + static LONG cLocks; static void LockModule(void) @@ -1543,7 +1551,15 @@ static void test_class_moniker(void) hr = CreateClassMoniker(&CLSID_StdComponentCategoriesMgr, &moniker); ok_ole_success(hr, CreateClassMoniker); - if (!moniker) return; + + hr = IMoniker_QueryInterface(moniker, &CLSID_ClassMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } test_moniker("class moniker", moniker, expected_class_moniker_marshal_data, sizeof(expected_class_moniker_marshal_data), @@ -1603,11 +1619,21 @@ static void test_file_moniker(WCHAR* path) { IStream *stream; IMoniker *moniker1 = NULL, *moniker2 = NULL; + IUnknown *unk; HRESULT hr; hr = CreateFileMoniker(path, &moniker1); ok_ole_success(hr, CreateFileMoniker); + hr = IMoniker_QueryInterface(moniker1, &CLSID_FileMoniker, (void **)&unk); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unk == (IUnknown *)moniker1, "Unexpected interface.\n"); + IUnknown_Release(unk); + } + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok_ole_success(hr, CreateStreamOnHGlobal); @@ -1719,6 +1745,15 @@ static void test_item_moniker(void) hr = CreateItemMoniker(NULL, wszObjectName, &moniker); ok(hr == S_OK, "Failed to create item moniker, hr %#x.\n", hr); + hr = IMoniker_QueryInterface(moniker, &CLSID_ItemMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } + test_moniker("item moniker 2", moniker, expected_item_moniker_marshal_data2, sizeof(expected_item_moniker_marshal_data2), expected_item_moniker_saved_data2, sizeof(expected_item_moniker_saved_data2), @@ -1860,7 +1895,15 @@ static void test_anti_moniker(void) hr = CreateAntiMoniker(&moniker); ok_ole_success(hr, CreateAntiMoniker); - if (!moniker) return; + + hr = IMoniker_QueryInterface(moniker, &CLSID_AntiMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } test_moniker("anti moniker", moniker, expected_anti_moniker_marshal_data, sizeof(expected_anti_moniker_marshal_data), @@ -1932,6 +1975,13 @@ static void test_generic_composite_moniker(void) hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok_ole_success(hr, CreateGenericComposite); + /* Generic composite is special, as it does not addref in this case. */ + hr = IMoniker_QueryInterface(moniker, &CLSID_CompositeMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + test_moniker("generic composite moniker", moniker, expected_gc_moniker_marshal_data, sizeof(expected_gc_moniker_marshal_data), expected_gc_moniker_saved_data, sizeof(expected_gc_moniker_saved_data), @@ -2007,7 +2057,15 @@ static void test_pointer_moniker(void) hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); ok_ole_success(hr, CreatePointerMoniker); - if (!moniker) return; + + hr = IMoniker_QueryInterface(moniker, &CLSID_PointerMoniker, (void **)&unknown); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); + IUnknown_Release(unknown); + } ok_more_than_one_lock();

1 0

Nikolay Sivov : ole32/tests: Add some tests for item moniker equality.
by Alexandre Julliard 17 Dec '19

17 Dec '19

Module: wine Branch: master Commit: 7b07188d7a4c87dcab0eeb68cd194a86cfb6a0c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b07188d7a4c87dcab0eeb68… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 17 10:51:56 2019 +0300 ole32/tests: Add some tests for item moniker equality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 4fec233a57..a275671a69 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1728,6 +1728,23 @@ static void test_item_moniker(void) { item_moniker_unicode_item_stream, sizeof(item_moniker_unicode_item_stream), L"!B" }, { item_moniker_unicode_delim_item_stream, sizeof(item_moniker_unicode_delim_item_stream), L"!C" }, }; + static const struct + { + const WCHAR *delim1; + const WCHAR *item1; + const WCHAR *delim2; + const WCHAR *item2; + HRESULT hr; + } isequal_tests[] = + { + { L"!", L"Item1", L"!", L"ITEM1", S_OK }, + { NULL, L"Item1", L"!", L"ITEM1", S_OK }, + { L"", L"Item1", L"!", L"ITEM1", S_OK }, + { L"&", L"Item1", L"!", L"ITEM1", S_OK }, + {L"&&", L"Item1", L"&", L"&Item1", S_FALSE }, + { NULL, L"Item1", NULL, L"Item2", S_FALSE }, + { NULL, L"Item1", NULL, L"ITEM1", S_OK }, + }; IMoniker *moniker, *moniker2; HRESULT hr; DWORD moniker_type, i; @@ -1879,6 +1896,27 @@ todo_wine IMoniker_Release(inverse); IMoniker_Release(moniker); + + /* IsEqual */ + for (i = 0; i < ARRAY_SIZE(isequal_tests); ++i) + { + hr = CreateItemMoniker(isequal_tests[i].delim1, isequal_tests[i].item1, &moniker); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = CreateItemMoniker(isequal_tests[i].delim2, isequal_tests[i].item2, &moniker2); + ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); + + hr = IMoniker_IsEqual(moniker, moniker2); + todo_wine_if(i == 4 || i == 5) + ok(hr == isequal_tests[i].hr, "%d: unexpected result %#x.\n", i, hr); + + hr = IMoniker_IsEqual(moniker2, moniker); + todo_wine_if(i == 4 || i == 5) + ok(hr == isequal_tests[i].hr, "%d: unexpected result %#x.\n", i, hr); + + IMoniker_Release(moniker); + IMoniker_Release(moniker2); + } } static void test_anti_moniker(void)

1 0