February 2023 - Wine-commits

Eric Pouech : dbghelp: Filter on machine when searching for Wine system PE modules.
by Alexandre Julliard 06 Feb '23

06 Feb '23

Module: wine Branch: master Commit: aac4e9df0afc879c3a5d24ef9532e59a28144fbc URL: https://gitlab.winehq.org/wine/wine/-/commit/aac4e9df0afc879c3a5d24ef9532e5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 1 16:22:57 2023 +0100 dbghelp: Filter on machine when searching for Wine system PE modules. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 4 ++-- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/path.c | 5 +++-- dlls/dbghelp/pe_module.c | 3 ++- dlls/dbghelp/tests/dbghelp.c | 2 -- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index a8ef5bfff84..96169ae1bf6 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -764,8 +764,8 @@ extern BOOL path_find_symbol_file(const struct process* pcs, const struc PCSTR full_path, enum module_type type, const GUID* guid, DWORD dw1, DWORD dw2, WCHAR *buffer, BOOL* is_unmatched) DECLSPEC_HIDDEN; extern WCHAR *get_dos_file_name(const WCHAR *filename) __WINE_DEALLOC(HeapFree, 3) __WINE_MALLOC DECLSPEC_HIDDEN; -extern BOOL search_dll_path(const struct process* process, const WCHAR *name, - BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) DECLSPEC_HIDDEN; +extern BOOL search_dll_path(const struct process* process, const WCHAR *name, WORD machine, + BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) DECLSPEC_HIDDEN; extern BOOL search_unix_path(const WCHAR *name, const WCHAR *path, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) DECLSPEC_HIDDEN; extern const WCHAR* file_name(const WCHAR* str) DECLSPEC_HIDDEN; extern const char* file_nameA(const char* str) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index bc063bf1466..1a38949a321 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1445,7 +1445,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, load_elf.elf_info = elf_info; ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) - || search_dll_path(pcs, filename, elf_load_file_cb, &load_elf); + || search_dll_path(pcs, filename, IMAGE_FILE_MACHINE_UNKNOWN, elf_load_file_cb, &load_elf); } return ret; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4852f5beaa4..f1b3107408c 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1583,7 +1583,7 @@ static BOOL macho_search_and_load_file(struct process* pcs, const WCHAR* filenam ret = search_unix_path(p, fallback, macho_load_file_cb, &load_params); } if (!ret && p == filename) - ret = search_dll_path(pcs, filename, macho_load_file_cb, &load_params); + ret = search_dll_path(pcs, filename, IMAGE_FILE_MACHINE_UNKNOWN, macho_load_file_cb, &load_params); return ret; } diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index d23a4b5733e..fe1da8849eb 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -722,7 +722,7 @@ static BOOL try_match_file(const WCHAR *name, BOOL (*match)(void*, HANDLE, const return FALSE; } -BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) +BOOL search_dll_path(const struct process *process, const WCHAR *name, WORD machine, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) { const WCHAR *env; WCHAR *p, *end; @@ -733,7 +733,8 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma name = file_name(name); - cpu = process_get_cpu(process); + cpu = machine == IMAGE_FILE_MACHINE_UNKNOWN ? process_get_cpu(process) : cpu_find(machine); + for (machine_dir = all_machine_dir; machine_dir < all_machine_dir + ARRAY_SIZE(all_machine_dir); machine_dir++) if (machine_dir->machine == cpu->machine) break; if (machine_dir >= all_machine_dir + ARRAY_SIZE(all_machine_dir)) return FALSE; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 3262f93db9c..7aeb1cf8901 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -824,7 +824,8 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) { struct builtin_search builtin = { NULL }; - if (opened && modfmt->u.pe_info->fmap.u.pe.builtin && search_dll_path(pcs, loaded_name, search_builtin_pe, &builtin)) + if (opened && modfmt->u.pe_info->fmap.u.pe.builtin && + search_dll_path(pcs, loaded_name, modfmt->u.pe_info->fmap.u.pe.file_header.Machine, search_builtin_pe, &builtin)) { TRACE("reloaded %s from %s\n", debugstr_w(loaded_name), debugstr_w(builtin.path)); image_unmap_file(&modfmt->u.pe_info->fmap); diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index b9f922c69df..713c93b0a02 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -240,7 +240,6 @@ static void test_modules(void) ret = SymGetModuleInfoW64(GetCurrentProcess(), base2, &im); ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); ok(im.BaseOfImage == base2, "Wrong base address\n"); - todo_wine_if(sizeof(void*) == 8) ok(im.MachineType == get_module_machine("C:\\windows\\syswow64\\notepad.exe"), "Wrong machine %lx\n", im.MachineType); } @@ -272,7 +271,6 @@ static void test_modules(void) ret = SymGetModuleInfoW64(GetCurrentProcess(), base2, &im); ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); ok(im.BaseOfImage == base2, "Wrong base address\n"); - todo_wine_if(sizeof(void*) == 8) ok(im.MachineType == get_module_machine("C:\\windows\\syswow64\\notepad.exe"), "Wrong machine %lx\n", im.MachineType); }

1 0

Eric Pouech : conhost: Only update font when running with a window.
by Alexandre Julliard 06 Feb '23

06 Feb '23

Module: wine Branch: master Commit: 7077c5bcabbfe9f18c92a5a1e89f408329515ba6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7077c5bcabbfe9f18c92a5a1e89f40… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 10:30:34 2023 +0100 conhost: Only update font when running with a window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54449 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 0a44186beb1..63bf532fd73 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -932,6 +932,8 @@ void update_console_font( struct console *console, const WCHAR *face_name, size_ { LOGFONTW lf; + if (!console->window) return; + fill_logfont( &lf, face_name, face_name_size, height, weight ); set_console_font( console, &lf );

1 0

Michael Stefaniuc : d3d11/tests: Actually test the return of CreateRasterizerState().
by Alexandre Julliard 06 Feb '23

06 Feb '23

Module: wine Branch: master Commit: b0e65dbe50127dcf75e462d40aa4ee6255ea5a64 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0e65dbe50127dcf75e462d40aa4ee… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 2 20:36:14 2023 +0100 d3d11/tests: Actually test the return of CreateRasterizerState(). --- dlls/d3d11/tests/d3d11.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index de548672c2b..a13d350c582 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -21839,7 +21839,7 @@ static void test_stencil_separate(void) rs_desc.ScissorEnable = FALSE; rs_desc.MultisampleEnable = FALSE; rs_desc.AntialiasedLineEnable = FALSE; - ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); @@ -21859,7 +21859,7 @@ static void test_stencil_separate(void) ID3D11RasterizerState_Release(rs); rs_desc.FrontCounterClockwise = TRUE; - ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); + hr = ID3D11Device_CreateRasterizerState(device, &rs_desc, &rs); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_RSSetState(context, rs); @@ -28408,7 +28408,7 @@ static void test_depth_bias(void) for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; - ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); + hr = ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(hr == S_OK, "Format %#x, quad %u, bias %u, clamp %u: Got unexpected hr %#lx.\n", format, i, j, k, hr); ID3D11DeviceContext_RSSetState(context, rs); @@ -28492,7 +28492,7 @@ static void test_depth_bias(void) { BOOL all_match = TRUE; rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; - ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); + hr = ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(hr == S_OK, "Format %#x, slope %u, bias %u, clamp %u: Got unexpected hr %#lx.\n", format, i, j, k, hr); ID3D11DeviceContext_RSSetState(context, rs);

1 0

Alex Henrie : msi: Handle memory allocation failure in get_link_file (cppcheck).
by Alexandre Julliard 06 Feb '23

06 Feb '23

Module: wine Branch: master Commit: 687c4f5c8dc65def6fc066d5d802d7448db70d7f URL: https://gitlab.winehq.org/wine/wine/-/commit/687c4f5c8dc65def6fc066d5d802d7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 3 22:52:07 2023 -0700 msi: Handle memory allocation failure in get_link_file (cppcheck). --- dlls/msi/action.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b6f22308e3a..8b3d1c42aa5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3655,7 +3655,7 @@ static UINT ACTION_UnregisterTypeLibraries( MSIPACKAGE *package ) static WCHAR *get_link_file( MSIPACKAGE *package, MSIRECORD *row ) { LPCWSTR directory, extension, link_folder; - LPWSTR link_file, filename; + WCHAR *link_file = NULL, *filename, *new_filename; directory = MSI_RecordGetString( row, 2 ); link_folder = msi_get_target_folder( package, directory ); @@ -3668,18 +3668,22 @@ static WCHAR *get_link_file( MSIPACKAGE *package, MSIRECORD *row ) msi_create_full_path( package, link_folder ); filename = msi_dup_record_field( row, 3 ); + if (!filename) return NULL; msi_reduce_to_long_filename( filename ); extension = wcsrchr( filename, '.' ); if (!extension || wcsicmp( extension, L".lnk" )) { int len = lstrlenW( filename ); - filename = realloc( filename, len * sizeof(WCHAR) + sizeof(L".lnk") ); + new_filename = realloc( filename, len * sizeof(WCHAR) + sizeof(L".lnk") ); + if (!new_filename) goto done; + filename = new_filename; memcpy( filename + len, L".lnk", sizeof(L".lnk") ); } link_file = msi_build_directory_name( 2, link_folder, filename ); - free( filename ); +done: + free( filename ); return link_file; }

1 0

Zebediah Figura : wined3d: Make depth bounds test a proper state and handle it in wined3d_device_apply_stateblock().
by Alexandre Julliard 06 Feb '23

06 Feb '23

Module: wine Branch: master Commit: cf553129c2a57efcfbb5132e2f52a5e5319b9746 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf553129c2a57efcfbb5132e2f52a5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 11 12:14:03 2022 -0600 wined3d: Make depth bounds test a proper state and handle it in wined3d_device_apply_stateblock(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/cs.c | 34 ++++++++++++++++++++++++ dlls/wined3d/device.c | 16 ++++++++++++ dlls/wined3d/directx.c | 1 + dlls/wined3d/state.c | 59 ++++++++++++++---------------------------- dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 21 ++++++++++++++- 7 files changed, 94 insertions(+), 40 deletions(-)

1 0

Jason Kuo : wininet: Partially implement InternetSetFilePointer.
by Alexandre Julliard 06 Feb '23

06 Feb '23

Module: wine Branch: master Commit: 00ea06977717447cf7b65aada8d2e449f1aebfec URL: https://gitlab.winehq.org/wine/wine/-/commit/00ea06977717447cf7b65aada8d2e4… Author: Jason Kuo <j20001970(a)gmail.com> Date: Sat Nov 5 17:14:16 2022 +0800 wininet: Partially implement InternetSetFilePointer. The function is implemented by setting the newly added contentPos that keep track of current read position in the content, when InternetReadFile related function is called, data will be read from req_file->file_handle before continuing reading from http stream. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26570 --- dlls/wininet/ftp.c | 3 ++ dlls/wininet/http.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/wininet/internet.c | 29 +++++++++++-- dlls/wininet/internet.h | 3 ++ 4 files changed, 140 insertions(+), 7 deletions(-)

1 0

Jason Kuo : wininet/tests: Add InternetSetFilePointer tests.
by Alexandre Julliard 06 Feb '23

06 Feb '23

Module: wine Branch: master Commit: 90713a5c10fd5d8d1e9334bd0f45a040ef54dfcc URL: https://gitlab.winehq.org/wine/wine/-/commit/90713a5c10fd5d8d1e9334bd0f45a0… Author: Jason Kuo <j20001970(a)gmail.com> Date: Sat Nov 5 16:21:21 2022 +0800 wininet/tests: Add InternetSetFilePointer tests. --- dlls/wininet/tests/http.c | 272 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 272 insertions(+)

1 0

Jacek Caban : wininet/tests: Add more InternetSetFilePointer tests.
by Alexandre Julliard 06 Feb '23

06 Feb '23

Module: wine Branch: master Commit: de2ca5e5aeb983d27633213281dfe54ad2518552 URL: https://gitlab.winehq.org/wine/wine/-/commit/de2ca5e5aeb983d27633213281dfe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 16:48:54 2023 +0100 wininet/tests: Add more InternetSetFilePointer tests. --- dlls/wininet/tests/http.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5d487840771..eeb4a28da4b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6109,6 +6109,80 @@ static void test_http_read(int port) skip_receive_notification_tests = FALSE; } +static void test_file_pointer(int port) +{ + INTERNET_BUFFERSW ib; + test_request_t req; + char buf[24000]; + DWORD pos, read_size; + + skip_receive_notification_tests = TRUE; + + memset(&ib, 0, sizeof(ib)); + ib.dwStructSize = sizeof(ib); + ib.lpvBuffer = buf; + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 100\r\n" + "\r\n" + "xyz"); + + SET_OPTIONAL(INTERNET_STATUS_RECEIVING_RESPONSE); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "xyz", 0); + CLEAR_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + + /* jump back to 2nd byte */ + pos = InternetSetFilePointer(req.request, 2, NULL, FILE_BEGIN, 0); + ok(pos == 2, "pos = %ld (gle %lu)\n", pos, GetLastError()); + + expect_data_available(req.request, 1); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "z", 0); + + /* jump forward to 5th byte (not yet available) */ + pos = InternetSetFilePointer(req.request, 5, NULL, FILE_BEGIN, 0); + ok(pos == 5, "pos = %ld (gle %lu)\n", pos, GetLastError()); + + /* querying available data will wait until we have enough data */ + async_query_data_available(req.request, &read_size); + send_response_and_wait("12345", FALSE, NULL, &read_size, NULL, 3, 3, 61); + expect_data_available(req.request, 3); + + /* skip one byte and verify that we're at expected position by reading one byte */ + pos = InternetSetFilePointer(req.request, 1, NULL, FILE_CURRENT, 0); + ok(pos == 6, "pos = %ld (gle %lu)\n", pos, GetLastError()); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, 1, "4", 0); + + /* jump past available bytes, read will wait for available data */ + pos = InternetSetFilePointer(req.request, 2, NULL, FILE_CURRENT, 0); + ok(pos == 9, "pos = %ld (gle %lu)\n", pos, GetLastError()); + + readex_expect_async(req.request, IRF_ASYNC, &ib, 3, ""); + send_response_ex_and_wait("abcde", FALSE, &ib, "bcd", 0, 61); + + /* jump back to the beginning */ + pos = InternetSetFilePointer(req.request, 0, NULL, FILE_BEGIN, 0); + ok(pos == 0, "pos = %ld (gle %lu)\n", pos, GetLastError()); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, 12, "xyz12345abcd", 0); + + /* jump past the available data then send more data and close the connection */ + pos = InternetSetFilePointer(req.request, 3, NULL, FILE_CURRENT, 0); + ok(pos == 15, "pos = %ld (gle %lu)\n", pos, GetLastError()); + readex_expect_async(req.request, IRF_ASYNC, &ib, sizeof(buf), ""); + send_response_ex_and_wait("12345", TRUE, &ib, "345", 0, 61); + + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, 2); + todo_wine + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + todo_wine + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + + skip_receive_notification_tests = FALSE; +} + static void test_connection_break(int port) { INTERNET_BUFFERSW ib; @@ -6559,6 +6633,7 @@ static void test_http_connection(void) test_basic_auth_credentials_cached_manual(si.port); test_async_read(si.port); test_http_read(si.port); + test_file_pointer(si.port); test_connection_break(si.port); test_long_url(si.port); test_redirect(si.port);

1 0

Michael Stefaniuc : mshtml/tests: Actually test a return value.
by Alexandre Julliard 06 Feb '23

06 Feb '23

Module: wine Branch: master Commit: dc31e66e01f102bc03ba48759af8df9651ae994f URL: https://gitlab.winehq.org/wine/wine/-/commit/dc31e66e01f102bc03ba48759af8df… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 2 20:31:10 2023 +0100 mshtml/tests: Actually test a return value. --- dlls/mshtml/tests/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index ecc3bfb3bc1..a410b464756 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3170,7 +3170,7 @@ static void test_doc_obj(IHTMLDocument2 *doc) ok(!!event_target, "event_target = NULL\n"); bstr = SysAllocString(L"click"); - IEventTarget_addEventListener(event_target, bstr, (IDispatch*)&docobj_onclick_obj, TRUE); + hres = IEventTarget_addEventListener(event_target, bstr, (IDispatch*)&docobj_onclick_obj, TRUE); ok(hres == S_OK, "addEventListener failed: %08lx\n", hres); SysFreeString(bstr);

1 0

Giovanni Mascellani : wbemprox: Do not call Release() inside wbemprox_cf_CreateInstance().
by Alexandre Julliard 06 Feb '23

06 Feb '23

Module: wine Branch: master Commit: 798fbd420540310a8c853ec9676cf3490fc880ca URL: https://gitlab.winehq.org/wine/wine/-/commit/798fbd420540310a8c853ec9676cf3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 20 15:41:19 2022 +0100 wbemprox: Do not call Release() inside wbemprox_cf_CreateInstance(). The Ubisoft overlay version 135 hot patches and hooks wbem_locator_Release(), but crashes if Release() is called inside CoCreateInstance(), a condition that doesn't appear to happen on Windows. So we try to exhibit the same behavior. --- dlls/wbemprox/main.c | 12 ++---------- dlls/wbemprox/services.c | 8 ++++++-- dlls/wbemprox/wbemlocator.c | 6 +++++- dlls/wbemprox/wbemprox_private.h | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 20ca1a08530..30363658636 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -37,7 +37,7 @@ static HINSTANCE instance; struct list *table_list[WBEMPROX_NAMESPACE_LAST]; -typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); +typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj, REFIID riid ); typedef struct { @@ -77,8 +77,6 @@ static HRESULT WINAPI wbemprox_cf_CreateInstance( IClassFactory *iface, LPUNKNOW REFIID riid, LPVOID *ppobj ) { wbemprox_cf *This = impl_from_IClassFactory( iface ); - HRESULT r; - IUnknown *punk; TRACE("%p %s %p\n", pOuter, debugstr_guid(riid), ppobj); @@ -87,13 +85,7 @@ static HRESULT WINAPI wbemprox_cf_CreateInstance( IClassFactory *iface, LPUNKNOW if (pOuter) return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( (LPVOID *)&punk ); - if (FAILED(r)) - return r; - - r = IUnknown_QueryInterface( punk, riid, ppobj ); - IUnknown_Release( punk ); - return r; + return This->pfnCreateInstance( ppobj, riid ); } static HRESULT WINAPI wbemprox_cf_LockServer( IClassFactory *iface, BOOL dolock ) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 6fc05be9f3c..203b0e90784 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -1058,7 +1058,7 @@ static HRESULT WINAPI wbem_context_Clone( TRACE("%p, %p\n", iface, newcopy); - if (SUCCEEDED(hr = WbemContext_create( (void **)&cloned_context ))) + if (SUCCEEDED(hr = WbemContext_create( (void **)&cloned_context, &IID_IWbemContext ))) { LIST_FOR_EACH_ENTRY( value, &context->values, struct wbem_context_value, entry ) { @@ -1225,12 +1225,16 @@ static const IWbemContextVtbl wbem_context_vtbl = wbem_context_DeleteAll, }; -HRESULT WbemContext_create( void **obj ) +HRESULT WbemContext_create( void **obj, REFIID riid ) { struct wbem_context *context; TRACE("(%p)\n", obj); + if ( !IsEqualGUID( riid, &IID_IWbemContext ) && + !IsEqualGUID( riid, &IID_IUnknown ) ) + return E_NOINTERFACE; + if (!(context = malloc( sizeof(*context) ))) return E_OUTOFMEMORY; context->IWbemContext_iface.lpVtbl = &wbem_context_vtbl; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 32408cf6a90..6e5bddea156 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -202,12 +202,16 @@ static const IWbemLocatorVtbl wbem_locator_vtbl = wbem_locator_ConnectServer }; -HRESULT WbemLocator_create( LPVOID *ppObj ) +HRESULT WbemLocator_create( LPVOID *ppObj, REFIID riid ) { wbem_locator *wl; TRACE("(%p)\n", ppObj); + if ( !IsEqualGUID( riid, &IID_IWbemLocator ) && + !IsEqualGUID( riid, &IID_IUnknown ) ) + return E_NOINTERFACE; + if (!(wl = malloc( sizeof(*wl) ))) return E_OUTOFMEMORY; wl->IWbemLocator_iface.lpVtbl = &wbem_locator_vtbl; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 328840e9dfe..4f23a8b8451 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -246,9 +246,9 @@ void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ) DECLSPEC_HIDDEN; HRESULT create_signature( enum wbm_namespace ns, const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** ) DECLSPEC_HIDDEN; -HRESULT WbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemLocator_create(LPVOID *, REFIID) DECLSPEC_HIDDEN; HRESULT WbemServices_create(const WCHAR *, IWbemContext *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemContext_create(void **) DECLSPEC_HIDDEN; +HRESULT WbemContext_create(void **, REFIID) DECLSPEC_HIDDEN; HRESULT create_class_object(enum wbm_namespace ns, const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(struct query *, LPVOID *) DECLSPEC_HIDDEN;

1 0