wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Hans Leidekker : msi: Fix a trace.
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 6ef2d26a534b98f67485b7e59c84d46b7800567b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef2d26a534b98f67485b7e59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:19:45 2015 +0200 msi: Fix a trace. Reported by Marcus Meissner. --- dlls/msi/files.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8977a9c..9b46762 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -137,18 +137,14 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil { if (msi_compare_font_versions( font_version, file->Version ) < 0) { - TRACE("overwriting %s (new version %s old version %u.%u.%u.%u)\n", - debugstr_w(file->File), debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), LOWORD(file_version->dwFileVersionLS)); + TRACE("overwriting %s (new version %s old version %s)\n", + debugstr_w(file->File), debugstr_w(file->Version), debugstr_w(font_version)); state = msifs_overwrite; } else { - TRACE("keeping %s (new version %s old version %u.%u.%u.%u)\n", - debugstr_w(file->File), debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), LOWORD(file_version->dwFileVersionLS)); + TRACE("keeping %s (new version %s old version %s)\n", + debugstr_w(file->File), debugstr_w(file->Version), debugstr_w(font_version)); state = msifs_present; } msi_free( font_version );

1 0

Hans Leidekker : iexplore: Update version to 9.0.8112.16421.
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: ae84730e3429fc156f6729444e4b3fef22cd6a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae84730e3429fc156f6729444… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 21 11:19:20 2015 +0200 iexplore: Update version to 9.0.8112.16421. --- programs/iexplore/iexplore.inf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index a45df9f..41622b1 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -33,9 +33,9 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, [IE.Reg] -HKLM,"Software\Microsoft\Internet Explorer","Build",,"86001" -HKLM,"Software\Microsoft\Internet Explorer","Version",,"8.0.6001.18702" -HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" +HKLM,"Software\Microsoft\Internet Explorer","Build",,"98112" +HKLM,"Software\Microsoft\Internet Explorer","Version",,"9.0.8112.16421" +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"9.0.8112.16421" [Strings]

1 0

Michael Stefaniuc : rpcrt4: Don't open code CONTAINING_RECORD().
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 0a8427dc156a6e97f83886e108f48993e8df33cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a8427dc156a6e97f83886e10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 21 10:22:04 2015 +0200 rpcrt4: Don't open code CONTAINING_RECORD(). --- dlls/rpcrt4/cstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 0ddb1aa..838ed03 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -59,7 +59,7 @@ typedef struct static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface ) { - return (cstdstubbuffer_delegating_t*)((char *)iface - FIELD_OFFSET(cstdstubbuffer_delegating_t, stub_buffer)); + return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer); } HRESULT CStdStubBuffer_Construct(REFIID riid,

1 0

Dmitry Timoshkov : server: GetQueueStatus should clear only checked queue changed bits.
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: c0e876cb9e0f0d5663eddeda0fdbf7d2b491f9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e876cb9e0f0d5663eddeda0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 16:01:37 2015 +0800 server: GetQueueStatus should clear only checked queue changed bits. --- dlls/user32/input.c | 4 ++-- dlls/user32/tests/msg.c | 1 - include/wine/server_protocol.h | 4 ++-- server/protocol.def | 2 +- server/queue.c | 2 +- server/request.h | 2 +- server/trace.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 57594a7..4fcc531 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -434,7 +434,7 @@ DWORD WINAPI GetQueueStatus( UINT flags ) SERVER_START_REQ( get_queue_status ) { - req->clear = 1; + req->clear_bits = flags; wine_server_call( req ); ret = MAKELONG( reply->changed_bits & flags, reply->wake_bits & flags ); } @@ -454,7 +454,7 @@ BOOL WINAPI GetInputState(void) SERVER_START_REQ( get_queue_status ) { - req->clear = 0; + req->clear_bits = 0; wine_server_call( req ); ret = reply->wake_bits & (QS_KEY | QS_MOUSEBUTTON); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4794b12..50e1e2b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14699,7 +14699,6 @@ static void test_SendMessage_other_thread(int thread_n) } ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); -todo_wine ok(ret == MAKELONG(QS_POSTMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); trace("main: call GetMessage\n"); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d27914a..37dad95 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2822,7 +2822,7 @@ struct set_queue_mask_reply struct get_queue_status_request { struct request_header __header; - int clear; + unsigned int clear_bits; }; struct get_queue_status_reply { @@ -5972,6 +5972,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 467 +#define SERVER_PROTOCOL_VERSION 468 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 54501e8..5d57f96 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2059,7 +2059,7 @@ enum char_info_mode /* Get the current message queue status */ @REQ(get_queue_status) - int clear; /* should we clear the change bits? */ + unsigned int clear_bits; /* should we clear the change bits? */ @REPLY unsigned int wake_bits; /* wake bits */ unsigned int changed_bits; /* changed bits since last time */ diff --git a/server/queue.c b/server/queue.c index 3a321cd..912df3a 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2198,7 +2198,7 @@ DECL_HANDLER(get_queue_status) { reply->wake_bits = queue->wake_bits; reply->changed_bits = queue->changed_bits; - if (req->clear) queue->changed_bits = 0; + queue->changed_bits &= ~req->clear_bits; } else reply->wake_bits = reply->changed_bits = 0; } diff --git a/server/request.h b/server/request.h index f94235f..daa5301 100644 --- a/server/request.h +++ b/server/request.h @@ -1416,7 +1416,7 @@ C_ASSERT( sizeof(struct set_queue_mask_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_queue_mask_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct set_queue_mask_reply, changed_bits) == 12 ); C_ASSERT( sizeof(struct set_queue_mask_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_queue_status_request, clear_bits) == 12 ); C_ASSERT( sizeof(struct get_queue_status_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, wake_bits) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_queue_status_reply, changed_bits) == 12 ); diff --git a/server/trace.c b/server/trace.c index 20895b1..6ac0549 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2546,7 +2546,7 @@ static void dump_set_queue_mask_reply( const struct set_queue_mask_reply *req ) static void dump_get_queue_status_request( const struct get_queue_status_request *req ) { - fprintf( stderr, " clear=%d", req->clear ); + fprintf( stderr, " clear_bits=%08x", req->clear_bits ); } static void dump_get_queue_status_reply( const struct get_queue_status_reply *req )

1 0

Dmitry Timoshkov : user32/tests: Add PeekMessage(PM_NOREMOVE) call to inter-thread messages test.
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: d31e8a311871ba98f22b2a33b2fb7bdbba9cc2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31e8a311871ba98f22b2a33b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 21 16:01:30 2015 +0800 user32/tests: Add PeekMessage(PM_NOREMOVE) call to inter-thread messages test. --- dlls/user32/tests/msg.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b014dd9..4794b12 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14609,6 +14609,9 @@ static const struct message send_message_2[] = { }; static const struct message send_message_3[] = { { WM_USER+3, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message send_message_4[] = { { WM_USER+1, sent|wparam|lparam, 0, 0 }, { 0 } }; @@ -14716,10 +14719,15 @@ todo_wine ok(ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); trace("main: call PeekMessage\n"); + ok(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE), "PeekMessage should not fail\n"); + ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); + ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + + trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + ok_sequence(send_message_4, "SendMessage from other thread 4", FALSE); /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); @@ -14733,7 +14741,7 @@ else trace("main: call PeekMessage\n"); ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); - ok_sequence(WmEmptySeq, "SendMessage from other thread 4", thread_n == 2); + ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); ok(ret == 0, "wrong status %08x\n", ret);

1 0

Nikolay Sivov : wshom.ocx: Fix BSTR allocation for string registry values (Valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: a8150b53b67b30cf87c4c401c66aade9af751ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8150b53b67b30cf87c4c401c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 15:53:32 2015 +0300 wshom.ocx: Fix BSTR allocation for string registry values (Valgrind). --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 826e290..f9ec9dc 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1376,7 +1376,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v case REG_SZ: case REG_EXPAND_SZ: V_VT(value) = VT_BSTR; - V_BSTR(value) = SysAllocStringLen((WCHAR*)data, datalen - sizeof(WCHAR)); + V_BSTR(value) = SysAllocString((WCHAR*)data); if (!V_BSTR(value)) hr = E_OUTOFMEMORY; break; diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 9591c5c..46ffc58 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -276,7 +276,7 @@ static void test_registry(void) { static const WCHAR keypathW[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\', 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','T','e','s','t','\\',0}; - + static const WCHAR regsz2W[] = {'r','e','g','s','z','2',0}; static const WCHAR regszW[] = {'r','e','g','s','z',0}; static const WCHAR regdwordW[] = {'r','e','g','d','w','o','r','d',0}; static const WCHAR regbinaryW[] = {'r','e','g','b','i','n','a','r','y',0}; @@ -332,6 +332,9 @@ static void test_registry(void) ret = RegSetValueExA(root, "regsz", 0, REG_SZ, (const BYTE*)"foobar", 7); ok(ret == 0, "got %d\n", ret); + ret = RegSetValueExA(root, "regsz2", 0, REG_SZ, (const BYTE*)"foobar\0f", 9); + ok(ret == 0, "got %d\n", ret); + ret = RegSetValueExA(root, "regmultisz", 0, REG_MULTI_SZ, (const BYTE*)"foo\0bar\0", 9); ok(ret == 0, "got %d\n", ret); @@ -355,6 +358,18 @@ static void test_registry(void) VariantClear(&value); SysFreeString(name); + /* REG_SZ with embedded NULL */ + lstrcpyW(pathW, keypathW); + lstrcatW(pathW, regsz2W); + name = SysAllocString(pathW); + VariantInit(&value); + hr = IWshShell3_RegRead(sh3, name, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); + ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); + VariantClear(&value); + SysFreeString(name); + /* REG_DWORD */ lstrcpyW(pathW, keypathW); lstrcatW(pathW, regdwordW);

1 0

Qian Hong : ntdll: Correctly document the offset of ntdll_thread_data.
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 604c4dba80ecf52671d7da9ba40e2d886a9b2c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604c4dba80ecf52671d7da9ba… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Apr 21 03:11:04 2015 +0800 ntdll: Correctly document the offset of ntdll_thread_data. This is a follow up of 16ddc624050a9780c16abb0421e093925bc351cf. --- dlls/ntdll/ntdll_misc.h | 2 +- tools/winebuild/relay.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 674fcbc..cbd19db 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -214,7 +214,7 @@ struct debug_info char output[1024]; /* current output line */ }; -/* thread private data, stored in NtCurrentTeb()->SystemReserved2 */ +/* thread private data, stored in NtCurrentTeb()->SpareBytes1 */ struct ntdll_thread_data { #ifdef __i386__ diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index cb4b0ca..e9228a0 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -34,7 +34,7 @@ #define STACKOFFSET 0xc0 /* FIELD_OFFSET(TEB,WOW32Reserved) */ /* fix this if the ntdll_thread_regs structure is changed */ -#define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(ntdll_thread_data,gs) */ +#define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SpareBytes1) + FIELD_OFFSET(ntdll_thread_data,gs) */ #define DPMI_VIF_OFFSET (0x1fc + 0) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,dpmi_vif) */ #define VM86_PENDING_OFFSET (0x1fc + 4) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,vm86_pending) */

1 0

Andrey Gusev : Ukrainian translation for release 1.7.41
by Jeremy Newman 20 Apr '15

20 Apr '15

Module: website Branch: master Commit: fa15d9870746621e9a3ee3bff46a07f34f39c77e URL: http://source.winehq.org/git/website.git/?a=commit;h=fa15d9870746621e9a3ee3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Apr 17 18:11:21 2015 +0300 Ukrainian translation for release 1.7.41 --- news/uk/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2015041701.xml b/news/uk/2015041701.xml new file mode 100644 index 0000000..924f375 --- /dev/null +++ b/news/uk/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>17 квітня 2015</date> +<title>Випущено Wine 1.7.41</title> +<body> + Розробницький реліз Wine 1.7.41 наразі доступний. + <a href="{$root}/announce/1.7.41">Що нового</a> в цьому релізі: +<ul> + <li>Більша підтримка Known Folders у Shell.</li> + <li>Більша підтримка для Kernel Job Objects.</li> + <li>Більше вдосконалень для підтримки патчів для MSI.</li> + <li>Деякі виправлення оформлення.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Jacek Caban : inseng: Added CLSID_ActiveSetupEng class factory.
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: f3ff3e5055f08fdee8c8505e7c0d681550686fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3ff3e5055f08fdee8c8505e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 20 13:40:40 2015 +0200 inseng: Added CLSID_ActiveSetupEng class factory. --- dlls/inseng/Makefile.in | 3 +-- dlls/inseng/inseng_main.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in index 2981c25..a4b09de 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,7 +1,6 @@ MODULE = inseng.dll IMPORTS = uuid ole32 advapi32 -C_SRCS = \ - inseng_main.c +C_SRCS = inseng_main.c IDL_SRCS = inseng.idl diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 061aabb..d264b99 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "rpcproxy.h" #include "initguid.h" +#include "inseng.h" #include "wine/debug.h" @@ -37,6 +38,59 @@ WINE_DEFAULT_DEBUG_CHANNEL(inseng); static HINSTANCE instance; +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + return S_OK; +} + +static HRESULT WINAPI ActiveSetupEngCF_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static const IClassFactoryVtbl ActiveSetupEngCFVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ActiveSetupEngCF_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ActiveSetupEngCF = { &ActiveSetupEngCFVtbl }; + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) @@ -56,8 +110,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + if(IsEqualGUID(rclsid, &CLSID_ActiveSetupEng)) { + TRACE("(CLSID_ActiveSetupEng %s %p)\n", debugstr_guid(iid), ppv); + return IClassFactory_QueryInterface(&ActiveSetupEngCF, iid, ppv); + } + FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Nikolay Sivov : dxdiagn/tests: Fix a couple of leaks (Valgrind).
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: 2c59f6fe464f416b617d8b6c48f03285e9b45740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c59f6fe464f416b617d8b6c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 14:58:07 2015 +0300 dxdiagn/tests: Fix a couple of leaks (Valgrind). --- dlls/dxdiagn/tests/container.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index ce0fb77..5bc5161 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -701,6 +701,7 @@ static void test_GetProp(void) IDxDiagContainer_AddRef(child); ref = IDxDiagContainer_Release(child); ok(ref == 2, "Expected reference count to be 2, got %u\n", ref); + IDxDiagContainer_Release(child); IDxDiagContainer_Release(child); cleanup: @@ -1010,6 +1011,7 @@ static void test_DxDiag_DisplayDevices(void) trace("Testing container %s\n", wine_dbgstr_w(child_container)); test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); } + IDxDiagContainer_Release(child); } cleanup:

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2015