February 2016 - Wine-Commits

Alexandre Julliard : makefiles: Parse the entire top-level makefile.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: 49f88527c93e8d6b2d75455722defdabbff478b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f88527c93e8d6b2d7545572… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 17:08:12 2016 +0900 makefiles: Parse the entire top-level makefile. It's only done once so there are no longer any performance concerns. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 3 --- tools/makedep.c | 12 ++++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index b78f43b..91b134f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,6 @@ # sgmlpages: compile sgml source for the Wine API Guide # xmlpages: compile xml source for the Wine API Guide -# Start of common header # The following variable definitions are copied into all makefiles prefix = @prefix@ @@ -100,8 +99,6 @@ ALL_TEST_RESOURCES = @ALL_TEST_RESOURCES@ @ALL_VARS_RULES@ @SET_MAKE@ -# End of common header - all: wine @echo "Wine build complete." diff --git a/tools/makedep.c b/tools/makedep.c index 4264b5e..70dd753 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -182,6 +182,7 @@ struct makefile static struct makefile *top_makefile; +static const char separator[] = "### Dependencies"; static const char *output_makefile_name = "Makefile"; static const char *input_file_name; static const char *output_file_name; @@ -1685,7 +1686,7 @@ static int set_make_variable( struct strarray *array, const char *assignment ) /******************************************************************* * parse_makefile */ -static struct makefile *parse_makefile( const char *path, const char *separator ) +static struct makefile *parse_makefile( const char *path ) { char *buffer; FILE *file; @@ -1702,7 +1703,7 @@ static struct makefile *parse_makefile( const char *path, const char *separator file = open_input_makefile( make ); while ((buffer = get_line( file ))) { - if (separator && !strncmp( buffer, separator, strlen(separator) )) break; + if (!strncmp( buffer, separator, strlen(separator) )) break; if (*buffer == '\t') continue; /* command */ while (isspace( *buffer )) buffer++; if (*buffer == '#') continue; /* comment */ @@ -3211,7 +3212,6 @@ static void output_top_variables( const struct makefile *make ) */ static void output_dependencies( const struct makefile *make ) { - static const char separator[] = "### Dependencies"; struct strarray targets, ignore_files = empty_strarray; char buffer[1024]; FILE *src_file; @@ -3449,7 +3449,7 @@ int main( int argc, char *argv[] ) for (i = 0; i < HASH_SIZE; i++) list_init( &files[i] ); - top_makefile = parse_makefile( NULL, "# End of common header" ); + top_makefile = parse_makefile( NULL ); linguas = get_expanded_make_var_array( top_makefile, "LINGUAS" ); target_flags = get_expanded_make_var_array( top_makefile, "TARGETFLAGS" ); @@ -3485,7 +3485,7 @@ int main( int argc, char *argv[] ) top_makefile->submakes = xmalloc( top_makefile->subdirs.count * sizeof(*top_makefile->submakes) ); for (i = 0; i < top_makefile->subdirs.count; i++) - top_makefile->submakes[i] = parse_makefile( top_makefile->subdirs.str[i], NULL ); + top_makefile->submakes[i] = parse_makefile( top_makefile->subdirs.str[i] ); load_sources( top_makefile ); for (i = 0; i < top_makefile->subdirs.count; i++) @@ -3500,7 +3500,7 @@ int main( int argc, char *argv[] ) for (i = 1; i < argc; i++) { - struct makefile *make = parse_makefile( argv[i], NULL ); + struct makefile *make = parse_makefile( argv[i] ); load_sources( make ); output_dependencies( make ); }

1 0

Alexandre Julliard : makefiles: Generate top-level rules for pot files.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: ce231568a97285102a18a9caf192c52b7172ac1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce231568a97285102a18a9caf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 15:36:02 2016 +0900 makefiles: Generate top-level rules for pot files. Get rid of the rsrc.pot and msg.pot hacks, use each individual source file instead. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 33 +------- configure | 212 ++++++++++++++++++++++----------------------------- configure.ac | 176 +++++++++++++++++++++--------------------- tools/make_makefiles | 4 +- tools/makedep.c | 118 ++++++++++++++++++---------- 5 files changed, 257 insertions(+), 286 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce231568a97285102a18a…

1 0

Paul Gofman : d3dx9: Don' t pass usage flags when creating temporary texture
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: 546c55a09d77d197e3ca74426a2f329fad8bc8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=546c55a09d77d197e3ca74426… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Feb 25 13:37:12 2016 +0300 d3dx9: Don't pass usage flags when creating temporary texture Some usage flags require D3DPOOL_DEFAULT (and not D3DPOOL_SYSTEMMEM), and the usage of texture being created is overall not related to intermediate buffer texture usage. If texture being created has D3DUSAGE_AUTOGENMIPMAP, updating it from non autogenerated mipmap should be fine according to MSDN (IDirect3DDevice9::UpdateTexture). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 38349e2..27f08ad 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -678,7 +678,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { - hr = D3DXCreateTexture(device, width, height, miplevels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); + hr = D3DXCreateTexture(device, width, height, miplevels, 0, format, D3DPOOL_SYSTEMMEM, &buftex); texptr = &buftex; } else

1 0

Piotr Caban : msvcp110: Add _Thrd_detach implementation.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: b793e2e4220a3d1c7996d2000d444311230310d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b793e2e4220a3d1c7996d2000… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 10:47:34 2016 +0100 msvcp110: Add _Thrd_detach implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 15 +++++++++++++-- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 5 +++++ 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 09aaac9..87b2392 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3858,7 +3858,7 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ stub _Thrd_detach +@ cdecl _Thrd_detach(ptr) @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 737cfe3..8fdd4e7 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3805,7 +3805,7 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ stub _Thrd_detach +@ cdecl _Thrd_detach(ptr) @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 915f58a..8c7c093 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -203,6 +203,7 @@ static void (__cdecl *p__Thrd_sleep)(const xtime*); static _Thrd_t (__cdecl *p__Thrd_current)(void); static int (__cdecl *p__Thrd_create)(_Thrd_t*, _Thrd_start_t, void*); static int (__cdecl *p__Thrd_join)(_Thrd_t, int*); +static int (__cdecl *p__Thrd_detach)(_Thrd_t); #ifdef __i386__ static ULONGLONG (__cdecl *p_i386_Thrd_current)(void); @@ -486,6 +487,8 @@ static BOOL init(void) "_Thrd_create"); SET(p__Thrd_join, "_Thrd_join"); + SET(p__Thrd_detach, + "_Thrd_detach"); SET(p__Mtx_init, "_Mtx_init"); @@ -1677,7 +1680,8 @@ static int __cdecl thrd_thread(void *arg) { _Thrd_t *thr = arg; - *thr = p__Thrd_current(); + if(thr) + *thr = p__Thrd_current(); return 0x42; } @@ -1759,7 +1763,14 @@ static void test_thrd(void) ok(ta.id == tb.id, "expected %d, got %d\n", ta.id, tb.id); ok(ta.hnd != tb.hnd, "same handles, got %p\n", ta.hnd); ok(r == 0x42, "expected 0x42, got %d\n", r); - ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); + ret = p__Thrd_detach(ta); + ok(ret == 4, "_Thrd_detach should have failed with error 4, got %d\n", ret); + + ret = p__Thrd_create(&ta, thrd_thread, NULL); + ok(!ret, "failed to create thread, got %d\n", ret); + ret = p__Thrd_detach(ta); + ok(!ret, "_Thrd_detach failed, got %d\n", ret); + } #define NUM_THREADS 10 diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index af63a39..12a92fd 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3805,7 +3805,7 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl _Thrd_current() msvcp120._Thrd_current -@ stub _Thrd_detach +@ cdecl _Thrd_detach(ptr) msvcp120._Thrd_detach @ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index fa4ff7b..b1348d5 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -874,6 +874,11 @@ int __cdecl _Thrd_create(_Thrd_t *thr, _Thrd_start_t proc, void *arg) return ret; } +int __cdecl _Thrd_detach(_Thrd_t thr) +{ + return CloseHandle(thr.hnd) ? 0 : _THRD_ERROR; +} + typedef struct { const vtable_ptr *vtable;

1 0

Hugh McMaster : reg: Ignore the slash zero character sequence if a custom separator is specified.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: b57b998354a6ceaa1aae2c6e0864e96fd7f846fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57b998354a6ceaa1aae2c6e0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 25 19:54:09 2016 +1100 reg: Ignore the slash zero character sequence if a custom separator is specified. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 0155912..e66ba5a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -290,7 +290,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r for (i = 0, destindex = 0; i < len; i++, destindex++) { - if (data[i] == '\\' && data[i + 1] == '0') + if (!separator && data[i] == '\\' && data[i + 1] == '0') { buffer[destindex] = 0; i++; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 151739c..efb2839 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -391,15 +391,15 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi19 /t REG_MULTI_SZ /s \"#\" /d \"two\\0#strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi19", REG_MULTI_SZ, "two\\0\0strings\0", 15, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "multi19", REG_MULTI_SZ, "two\\0\0strings\0", 15, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi20 /t REG_MULTI_SZ /s \"#\" /d \"two#\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi20", REG_MULTI_SZ, "two\0\\0strings\0", 15, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "multi20", REG_MULTI_SZ, "two\0\\0strings\0", 15, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi21 /t REG_MULTI_SZ /s \"#\" /d \"two\\0\\0strings\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, 0); RegCloseKey(hkey);

1 0

Alexandre Julliard : makefiles: Automatically create all directories that contain a target file.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: f17419ec4fa72fa6c2a4eecac1cd4ca5cbfc1b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17419ec4fa72fa6c2a4eecac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 25 18:00:36 2016 +0900 makefiles: Automatically create all directories that contain a target file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 79ad71d..45c9209 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1839,6 +1839,29 @@ static void create_dir( const char *dir ) /******************************************************************* + * create_file_directories + * + * Create the base directories of all the files. + */ +static void create_file_directories( const struct makefile *make, struct strarray files ) +{ + struct strarray subdirs = empty_strarray; + unsigned int i; + char *dir; + + for (i = 0; i < files.count; i++) + { + if (!strchr( files.str[i], '/' )) continue; + dir = base_dir_path( make, files.str[i] ); + *strrchr( dir, '/' ) = 0; + strarray_add_uniq( &subdirs, dir ); + } + + for (i = 0; i < subdirs.count; i++) create_dir( subdirs.str[i] ); +} + + +/******************************************************************* * output_filenames_obj_dir */ static void output_filenames_obj_dir( const struct makefile *make, struct strarray array ) @@ -2213,7 +2236,6 @@ static struct strarray output_sources( const struct makefile *make ) struct strarray c2man_files = empty_strarray; struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; - struct strarray subdirs = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = empty_strarray; struct strarray install_rules[NB_INSTALL_RULES]; @@ -2245,13 +2267,6 @@ static struct strarray output_sources( const struct makefile *make ) if (!ext) fatal_error( "unsupported file type %s\n", source->name ); *ext++ = 0; - if (make->src_dir && strchr( obj, '/' )) - { - char *subdir = base_dir_path( make, obj ); - *strrchr( subdir, '/' ) = 0; - strarray_add_uniq( &subdirs, subdir ); - } - extradefs = get_expanded_file_local_var( make, obj, "EXTRADEFS" ); get_dependencies( &dependencies, source, source ); @@ -3046,8 +3061,6 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); } - for (i = 0; i < subdirs.count; i++) create_dir( subdirs.str[i] ); - return clean_files; } @@ -3231,6 +3244,8 @@ static void output_dependencies( const struct makefile *make ) FILE *src_file; int found = 0; + if (make->base_dir) create_dir( make->base_dir ); + output_file_name = base_dir_path( make, output_makefile_name ); output_file = create_temp_file( output_file_name ); output_top_variables( make ); @@ -3263,6 +3278,8 @@ static void output_dependencies( const struct makefile *make ) if (!make->src_dir && make->base_dir) output_gitignore( base_dir_path( make, ".gitignore" ), ignore_files ); + create_file_directories( make, targets ); + output_file_name = NULL; } @@ -3345,9 +3362,6 @@ static void load_sources( struct makefile *make ) list_init( &make->sources ); list_init( &make->includes ); - /* FIXME: target dir has to exist to allow locating srcdir-relative include files */ - if (make->base_dir) create_dir( make->base_dir ); - for (var = source_vars; *var; var++) { value = get_expanded_make_var_array( make, *var );

1 0

Frédéric Delanoy : windowscodecs/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: e8704b6b8d9530680ceff2bd49d137985dedbdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8704b6b8d9530680ceff2bd4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 23 21:42:30 2016 +0100 windowscodecs/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/bitmap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 1b91dca..42f452a 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -823,13 +823,8 @@ todo_wine hr = IWICBitmap_CopyPixels(bitmap, NULL, 4, sizeof(data), data); ok(hr == S_OK, "IWICBitmap_CopyPixels error %#x\n", hr); for (i = 0; i < sizeof(data); i++) - { - if (data[i] != data_8bpp_pal_wic[i]) -todo_wine + todo_wine_if (data[i] != data_8bpp_pal_wic[i]) ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); - else - ok(data[i] == data_8bpp_pal_wic[i], "%u: expected %#x, got %#x\n", i, data_8bpp_pal_wic[i], data[i]); - } IWICBitmap_Release(bitmap); DeleteObject(hbmp);

1 0

Jacek Caban : mshtml/tests: Fixed tests on some IE versions.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: b652c119690afe8b89b8ce9cddde34b4c1589a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b652c119690afe8b89b8ce9cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 16:12:24 2016 +0100 mshtml/tests: Fixed tests on some IE versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 5a0bbfb..64e03f5 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -160,8 +160,8 @@ function test_string_event_handler() { window.onload = function() { try { ok(inlscr_complete_called, "onreadystatechange not fired"); - ok(extern_res_script_rs === "eval,complete1,", - "extern_res_script_rs = " + extern_res_script_rs + " expected eval,complete1,"); + ok(extern_res_script_rs === "eval,complete1," || extern_res_script_rs == "loaded0,eval,complete1,", + "extern_res_script_rs = " + extern_res_script_rs + " expected (loaded0)?,eval,complete1,"); ok(extern_http_script_rs === "loading,loaded,complete,", "extern_http_script_rs = " + extern_http_script_rs + " expected loading,loaded,complete,");

1 0

Jacek Caban : mshtml: Added HTMLXMLHttpRequestFactory DISPID_VALUE implementation.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: 5996de5c2e5b8f1b27aa345714cb9dca401333d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5996de5c2e5b8f1b27aa34571… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 15:21:14 2016 +0100 mshtml: Added HTMLXMLHttpRequestFactory DISPID_VALUE implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index d188478..ba6dc05 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -828,12 +828,44 @@ static const IHTMLXMLHttpRequestFactoryVtbl HTMLXMLHttpRequestFactoryVtbl = { HTMLXMLHttpRequestFactory_create }; +static inline HTMLXMLHttpRequestFactory *factory_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLXMLHttpRequestFactory, dispex); +} + +static HRESULT HTMLXMLHttpRequestFactory_value(DispatchEx *iface, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + HTMLXMLHttpRequestFactory *This = factory_from_DispatchEx(iface); + IHTMLXMLHttpRequest *xhr; + HRESULT hres; + + TRACE("\n"); + + if(flags != DISPATCH_CONSTRUCT) { + FIXME("flags %x not supported\n", flags); + return E_NOTIMPL; + } + + hres = IHTMLXMLHttpRequestFactory_create(&This->IHTMLXMLHttpRequestFactory_iface, &xhr); + if(FAILED(hres)) + return hres; + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)xhr; + return S_OK; +} + +static const dispex_static_data_vtbl_t HTMLXMLHttpRequestFactory_dispex_vtbl = { + HTMLXMLHttpRequestFactory_value +}; + static const tid_t HTMLXMLHttpRequestFactory_iface_tids[] = { IHTMLXMLHttpRequestFactory_tid, 0 }; static dispex_static_data_t HTMLXMLHttpRequestFactory_dispex = { - NULL, + &HTMLXMLHttpRequestFactory_dispex_vtbl, IHTMLXMLHttpRequestFactory_tid, NULL, HTMLXMLHttpRequestFactory_iface_tids

1 0

Jacek Caban : user32: Added debug traces to SetParent.
by Alexandre Julliard Feb. 24, 2016

Feb. 24, 2016

Module: wine Branch: master Commit: 3ece2ab7eef49cb274f4fe37448b01252774738f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ece2ab7eef49cb274f4fe374… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 22 12:55:04 2016 +0100 user32: Added debug traces to SetParent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2ef49fa..33aedbd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2984,6 +2984,8 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) POINT pt; BOOL ret; + TRACE("(%p %p)\n", hwnd, parent); + if (is_broadcast(hwnd) || is_broadcast(parent)) { SetLastError(ERROR_INVALID_PARAMETER);

1 0