wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

David Hedberg : ole32: Add ManualResetEvent implementation.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: a0980b47c8840ae1952c3561923e02ca1ff3b376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0980b47c8840ae1952c35619… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon May 30 12:45:31 2011 +0200 ole32: Add ManualResetEvent implementation. --- dlls/ole32/compobj.c | 113 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/tests/marshal.c | 64 +++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0aa3aee..28e5da1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -458,6 +458,116 @@ static void COM_RevokeAllClasses(const struct apartment *apt) LeaveCriticalSection( &csRegisteredClassList ); } +/****************************************************************************** + * Implementation of the manual reset event object. (CLSID_ManualResetEvent) + */ + +typedef struct ManualResetEvent { + ISynchronize ISynchronize_iface; + LONG ref; + HANDLE event; +} MREImpl; + +static inline MREImpl *impl_from_ISynchronize(ISynchronize *iface) +{ + return CONTAINING_RECORD(iface, MREImpl, ISynchronize_iface); +} + +static HRESULT WINAPI ISynchronize_fnQueryInterface(ISynchronize *iface, REFIID riid, void **ppv) +{ + MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p (%s, %p)\n", This, debugstr_guid(riid), ppv); + + *ppv = NULL; + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ISynchronize)) + *ppv = This; + else + ERR("Unknown interface %s requested.\n", debugstr_guid(riid)); + + if(*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI ISynchronize_fnAddRef(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("%p - ref %d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ISynchronize_fnRelease(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + LONG ref = InterlockedDecrement(&This->ref); + TRACE("%p - ref %d\n", This, ref); + + if(!ref) + { + CloseHandle(This->event); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI ISynchronize_fnWait(ISynchronize *iface, DWORD dwFlags, DWORD dwMilliseconds) +{ + MREImpl *This = impl_from_ISynchronize(iface); + UINT index; + TRACE("%p (%08x, %08x)\n", This, dwFlags, dwMilliseconds); + return CoWaitForMultipleHandles(dwFlags, dwMilliseconds, 1, &This->event, &index); +} + +static HRESULT WINAPI ISynchronize_fnSignal(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p\n", This); + SetEvent(This->event); + return S_OK; +} + +static HRESULT WINAPI ISynchronize_fnReset(ISynchronize *iface) +{ + MREImpl *This = impl_from_ISynchronize(iface); + TRACE("%p\n", This); + ResetEvent(This->event); + return S_OK; +} + +static ISynchronizeVtbl vt_ISynchronize = { + ISynchronize_fnQueryInterface, + ISynchronize_fnAddRef, + ISynchronize_fnRelease, + ISynchronize_fnWait, + ISynchronize_fnSignal, + ISynchronize_fnReset +}; + +static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void **ppv) +{ + MREImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MREImpl)); + HRESULT hr; + + if(punkouter) + FIXME("Aggregation not implemented.\n"); + + This->ref = 1; + This->ISynchronize_iface.lpVtbl = &vt_ISynchronize; + This->event = CreateEventW(NULL, TRUE, FALSE, NULL); + + hr = ISynchronize_QueryInterface(&This->ISynchronize_iface, iid, ppv); + ISynchronize_Release(&This->ISynchronize_iface); + return hr; +} + /*********************************************************************** * CoRevokeClassObject [OLE32.@] * @@ -2510,6 +2620,9 @@ HRESULT WINAPI CoCreateInstance( return S_OK; } + if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) + return ManualResetEvent_Construct(pUnkOuter, iid, ppv); + /* * Get a class factory to construct the object we want. */ diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 86a8f0f..87b2006 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -36,6 +36,7 @@ #include "wine/test.h" DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); @@ -2836,6 +2837,68 @@ static void test_globalinterfacetable(void) IGlobalInterfaceTable_Release(git); } +static void test_manualresetevent(void) +{ + ISynchronize *psync1, *psync2; + IUnknown *punk; + LONG ref; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&punk); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!!punk, "Got NULL.\n"); + IUnknown_Release(punk); + + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_ISynchronize, (void**)&psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!!psync1, "Got NULL.\n"); + + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + hr = ISynchronize_Reset(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Signal(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Reset(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync1, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_ISynchronize, (void**)&psync2); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!!psync2, "Got NULL.\n"); + ok(psync1 != psync2, "psync1 == psync2.\n"); + hr = ISynchronize_Wait(psync2, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + hr = ISynchronize_Reset(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Reset(psync2); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Signal(psync1); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = ISynchronize_Wait(psync2, 0, 5); + ok(hr == RPC_S_CALLPENDING, "Got 0x%08x\n", hr); + + ref = ISynchronize_AddRef(psync1); + ok(ref == 2, "Got ref: %d\n", ref); + ref = ISynchronize_AddRef(psync1); + ok(ref == 3, "Got ref: %d\n", ref); + ref = ISynchronize_Release(psync1); + ok(ref == 2, "Got nonzero ref: %d\n", ref); + ref = ISynchronize_Release(psync2); + ok(!ref, "Got nonzero ref: %d\n", ref); + ref = ISynchronize_Release(psync1); + ok(ref == 1, "Got nonzero ref: %d\n", ref); + ref = ISynchronize_Release(psync1); + ok(!ref, "Got nonzero ref: %d\n", ref); +} + static const char *debugstr_iid(REFIID riid) { static char name[256]; @@ -3120,6 +3183,7 @@ START_TEST(marshal) test_local_server(); test_globalinterfacetable(); + test_manualresetevent(); /* must be last test as channel hooks can't be unregistered */ test_channel_hook();

1 0

David Hedberg : crypt32: Add BCryptEnumAlgorithms stub.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 66db40e89190e970e599aafcc2c682d030924f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=66db40e89190e970e599aafcc… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon May 30 12:45:30 2011 +0200 crypt32: Add BCryptEnumAlgorithms stub. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 12 ++++++++++++ include/bcrypt.h | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 7d85e12..e1ffb8a 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -14,7 +14,7 @@ @ stub BCryptDuplicateHash @ stub BCryptDuplicateKey @ stub BCryptEncrypt -@ stub BCryptEnumAlgorithms +@ stdcall BCryptEnumAlgorithms(long ptr ptr long) @ stub BCryptEnumContextFunctionProviders @ stub BCryptEnumContextFunctions @ stub BCryptEnumContexts diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index abe9750..441b3ef 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -22,6 +22,7 @@ #include "wine/debug.h" #include "winbase.h" +#include "bcrypt.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); @@ -38,3 +39,14 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } + +NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, + BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) +{ + FIXME("%08x, %p, %p, %08x - stub\n", dwAlgOperations, pAlgCount, ppAlgList, dwFlags); + + *ppAlgList=NULL; + *pAlgCount=0; + + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/bcrypt.h b/include/bcrypt.h index a3d7fe0..43d1f94 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -40,4 +40,11 @@ typedef LONG NTSTATUS; #endif +typedef struct _BCRYPT_ALGORITHM_IDENTIFIER +{ + LPWSTR pszName; + ULONG dwClass; + ULONG dwFlags; +} BCRYPT_ALGORITHM_IDENTIFIER; + #endif /* __WINE_BCRYPT_H */

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 8f3361b51dc3de6e96ce70920be83d0ec87094b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3361b51dc3de6e96ce70920… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat May 21 10:12:43 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index ec0c5ab..79c18bd 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-05-19 22:50+0300\n" +"PO-Revision-Date: 2011-05-23 19:33+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Virtaal 0.7.0-beta4\n" +"X-Generator: Virtaal 0.7.0-rc1\n" "X-Project-Style: default\n" #: appwiz.rc:28 @@ -280,23 +280,23 @@ msgstr "Kaštoninė" #: comdlg32.rc:133 wordpad.rc:116 msgid "Green" -msgstr "Žalia" +msgstr "Tamsiai žalia" #: comdlg32.rc:134 wordpad.rc:117 msgid "Olive" -msgstr "Alyvinė" +msgstr "Tamsiai geltona" #: comdlg32.rc:135 wordpad.rc:118 msgid "Navy" -msgstr "Ultramarinas" +msgstr "Tamsiai mėlyna" #: comdlg32.rc:136 wordpad.rc:119 msgid "Purple" -msgstr "Purpurinė" +msgstr "Violetinė" #: comdlg32.rc:137 wordpad.rc:120 msgid "Teal" -msgstr "Neutrali ciano" +msgstr "Tamsiai žydra" #: comdlg32.rc:138 wordpad.rc:121 msgid "Gray" @@ -312,7 +312,7 @@ msgstr "Raudona" #: comdlg32.rc:141 wordpad.rc:124 msgid "Lime" -msgstr "Gelsvai žalsva" +msgstr "Žalia" #: comdlg32.rc:142 wordpad.rc:125 msgid "Yellow" @@ -324,7 +324,7 @@ msgstr "Mėlyna" #: comdlg32.rc:144 wordpad.rc:127 msgid "Fuchsia" -msgstr "Fuksija" +msgstr "Purpurinė" #: comdlg32.rc:145 wordpad.rc:128 msgid "Aqua" @@ -8418,18 +8418,18 @@ msgstr "Įvedimo eilutė per ilga.\n" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "" +msgstr "Naudojimas: hostname\n" #: hostname.rc:28 -#, fuzzy msgid "Error: Invalid option '%c'.\n" -msgstr "Klaida: Netinkamas rakto vardas\n" +msgstr "Klaida: netinkamas parametras „%c“.\n" #: hostname.rc:29 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" msgstr "" +"Klaida: su programa „hostname“ neįmanoma nustatyti kompiuterio vardo.\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n"

1 0

Marko Nikolic : comctl32/tests: Fixed variable type, removed sign comparison warning.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: e3ba666485482c217e51f8c3a2f1e248b9770559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ba666485482c217e51f8c3a… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Fri May 27 14:49:05 2011 +0200 comctl32/tests: Fixed variable type, removed sign comparison warning. --- dlls/comctl32/tests/trackbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 8eaedf4..b72099d 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -954,7 +954,7 @@ static void test_ignore_selection(HWND hWndTrackbar){ static void test_initial_state(void) { HWND hWnd; - DWORD ret; + int ret; hWnd = create_trackbar(0, hWndParent);

1 0

Alexandre Julliard : winevdm: Print an error when trying to start a DOS app from the z: drive.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: cf5d9a0e34e01715ddfe842a22d71c3bbcdcbf5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5d9a0e34e01715ddfe842a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 17:25:39 2011 +0200 winevdm: Print an error when trying to start a DOS app from the z: drive. --- programs/winevdm/winevdm.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 0aaf041..04f2953 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -161,6 +161,12 @@ static void start_dosbox( const char *appname, const char *args ) char *dosbox = find_dosbox(); if (!dosbox) return; + if (tolower(appname[0]) == 'z') + { + WINE_MESSAGE( "winevdm: Cannot start DOS application %s\n", appname ); + WINE_MESSAGE( " because DOSBox doesn't support running from the Z: drive.\n" ); + ExitProcess(1); + } if (!GetTempPathW( MAX_PATH, path )) return; if (!GetTempFileNameW( path, cfgW, 0, config )) return; if (!GetCurrentDirectoryW( MAX_PATH, path )) return;

1 0

Alexandre Julliard : iphlpapi: Close the socket in IcmpCloseHandle.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 7165e22d7282df9ac53d727ed1c3fdd658ccd5f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7165e22d7282df9ac53d727ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 30 17:22:27 2011 +0200 iphlpapi: Close the socket in IcmpCloseHandle. --- dlls/iphlpapi/icmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 2b76041..50f5bf0 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -187,7 +187,7 @@ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) return FALSE; } - shutdown(icp->sid,2); + close( icp->sid ); HeapFree(GetProcessHeap (), 0, icp); return TRUE; }

1 0

Michael Stefaniuc : shell32: COM cleanup in autocomplete.c.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: cd3cdf62266612e665433a7cbc23fc9928155893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3cdf62266612e665433a7cb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 30 13:57:12 2011 +0200 shell32: COM cleanup in autocomplete.c. --- dlls/shell32/autocomplete.c | 58 ++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 8db542a..af450ba 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { - const IAutoComplete2Vtbl *lpVtbl; - const IAutoCompleteDropDownVtbl *lpDropDownVtbl; + IAutoComplete2 IAutoComplete2_iface; + IAutoCompleteDropDown IAutoCompleteDropDown_iface; LONG ref; BOOL initialized; BOOL enabled; @@ -85,16 +85,15 @@ static const IAutoCompleteDropDownVtbl acdropdownvt; static const WCHAR autocomplete_propertyW[] = {'W','i','n','e',' ','A','u','t','o', 'c','o','m','p','l','e','t','e',' ', 'c','o','n','t','r','o','l',0}; -/* - converts This to an interface pointer -*/ -#define _IUnknown_(This) ((IUnknown*)&(This)->lpVtbl) -#define _IAutoComplete2_(This) ((IAutoComplete2*)&(This)->lpVtbl) -#define _IAutoCompleteDropDown_(This) (&(This)->lpDropDownVtbl) + +static inline IAutoCompleteImpl *impl_from_IAutoComplete2(IAutoComplete2 *iface) +{ + return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoComplete2_iface); +} static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDropDown *iface) { - return (IAutoCompleteImpl *)((char *)iface - FIELD_OFFSET(IAutoCompleteImpl, lpDropDownVtbl)); + return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -134,13 +133,13 @@ HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVO return E_OUTOFMEMORY; lpac->ref = 1; - lpac->lpVtbl = &acvt; - lpac->lpDropDownVtbl = &acdropdownvt; + lpac->IAutoComplete2_iface.lpVtbl = &acvt; + lpac->IAutoCompleteDropDown_iface.lpVtbl = &acdropdownvt; lpac->enabled = TRUE; lpac->options = ACO_AUTOAPPEND; - hr = IUnknown_QueryInterface(_IUnknown_ (lpac), riid, ppv); - IUnknown_Release(_IUnknown_ (lpac)); + hr = IAutoComplete2_QueryInterface(&lpac->IAutoComplete2_iface, riid, ppv); + IAutoComplete2_Release(&lpac->IAutoComplete2_iface); TRACE("-- (%p)->\n",lpac); @@ -155,8 +154,8 @@ static HRESULT WINAPI IAutoComplete2_fnQueryInterface( REFIID riid, LPVOID *ppvObj) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); + TRACE("(%p)->(IID:%s,%p)\n", This, shdebugstr_guid(riid), ppvObj); *ppvObj = NULL; @@ -168,7 +167,7 @@ static HRESULT WINAPI IAutoComplete2_fnQueryInterface( } else if (IsEqualIID(riid, &IID_IAutoCompleteDropDown)) { - *ppvObj = _IAutoCompleteDropDown_(This); + *ppvObj = &This->IAutoCompleteDropDown_iface; } if (*ppvObj) @@ -187,9 +186,9 @@ static HRESULT WINAPI IAutoComplete2_fnQueryInterface( static ULONG WINAPI IAutoComplete2_fnAddRef( IAutoComplete2 * iface) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); ULONG refCount = InterlockedIncrement(&This->ref); - + TRACE("(%p)->(%u)\n", This, refCount - 1); return refCount; @@ -201,7 +200,7 @@ static ULONG WINAPI IAutoComplete2_fnAddRef( static ULONG WINAPI IAutoComplete2_fnRelease( IAutoComplete2 * iface) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(%u)\n", This, refCount + 1); @@ -224,8 +223,7 @@ static HRESULT WINAPI IAutoComplete2_fnEnable( IAutoComplete2 * iface, BOOL fEnable) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); HRESULT hr = S_OK; TRACE("(%p)->(%s)\n", This, (fEnable)?"true":"false"); @@ -245,7 +243,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete) { - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); TRACE("(%p)->(%p, %p, %s, %s)\n", This, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); @@ -274,7 +272,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->hwndEdit = hwndEdit; This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); /* Keep at least one reference to the object until the edit window is destroyed. */ - IAutoComplete2_AddRef((IAutoComplete2 *)This); + IAutoComplete2_AddRef(&This->IAutoComplete2_iface); SetPropW( hwndEdit, autocomplete_propertyW, This ); if (This->options & ACO_AUTOSUGGEST) @@ -326,10 +324,9 @@ static HRESULT WINAPI IAutoComplete2_fnGetOptions( IAutoComplete2 * iface, DWORD *pdwFlag) { + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); HRESULT hr = S_OK; - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - TRACE("(%p) -> (%p)\n", This, pdwFlag); *pdwFlag = This->options; @@ -344,10 +341,9 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( IAutoComplete2 * iface, DWORD dwFlag) { + IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); HRESULT hr = S_OK; - IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; - TRACE("(%p) -> (0x%x)\n", This, dwFlag); This->options = dwFlag; @@ -434,19 +430,19 @@ static HRESULT WINAPI IAutoCompleteDropDown_fnQueryInterface(IAutoCompleteDropDo REFIID riid, LPVOID *ppvObj) { IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); - return IAutoComplete2_fnQueryInterface(_IAutoComplete2_(This), riid, ppvObj); + return IAutoComplete2_fnQueryInterface(&This->IAutoComplete2_iface, riid, ppvObj); } static ULONG WINAPI IAutoCompleteDropDown_fnAddRef(IAutoCompleteDropDown *iface) { IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); - return IAutoComplete2_fnAddRef(_IAutoComplete2_(This)); + return IAutoComplete2_fnAddRef(&This->IAutoComplete2_iface); } static ULONG WINAPI IAutoCompleteDropDown_fnRelease(IAutoCompleteDropDown *iface) { IAutoCompleteImpl *This = impl_from_IAutoCompleteDropDown(iface); - return IAutoComplete2_fnRelease(_IAutoComplete2_(This)); + return IAutoComplete2_fnRelease(&This->IAutoComplete2_iface); } /************************************************************************** @@ -636,7 +632,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, This->hwndEdit = NULL; if (This->hwndListBox) DestroyWindow(This->hwndListBox); - IAutoComplete2_Release((IAutoComplete2 *)This); + IAutoComplete2_Release(&This->IAutoComplete2_iface); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); } default:

1 0

Michael Stefaniuc : d3dxof/tests: Fix an ok() comment to match the tested value.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 2317815da588de72910490ac80e2fa4e50a42a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2317815da588de72910490ac8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 30 13:52:24 2011 +0200 d3dxof/tests: Fix an ok() comment to match the tested value. --- dlls/d3dxof/tests/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 39fa880..e8bda82 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -123,7 +123,7 @@ static void test_refcount(void) ref = getRefcount( (IUnknown *) lpDirectXFile); ok(ref == 1, "Got refcount %d, expected 1\n", ref); ref = IDirectXFile_AddRef(lpDirectXFile); - ok(ref == 2, "Got refcount %d, expected 1\n", ref); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); ref = IDirectXFile_Release(lpDirectXFile); ok(ref == 1, "Got refcount %d, expected 1\n", ref);

1 0

Alistair Leslie-Hughes : dbghelp: Add stubs SymFromIndex, SymFromIndexW.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 5d01166f9699eddfa1d793f2ab5f676c19a142dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d01166f9699eddfa1d793f2a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 19 21:58:53 2011 +1000 dbghelp: Add stubs SymFromIndex, SymFromIndexW. --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/symbol.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 398847f..c50ab22 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -72,8 +72,8 @@ @ stdcall SymFindFileInPathW(long wstr wstr ptr long long long ptr ptr ptr) @ stdcall SymFromAddr(ptr int64 ptr ptr) @ stdcall SymFromAddrW(ptr int64 ptr ptr) -@ stub SymFromIndex -@ stub SymFromIndexW +@ stdcall SymFromIndex(long int64 long ptr) +@ stdcall SymFromIndexW(long int64 long ptr) @ stdcall SymFromName(long str ptr) @ stub SymFromNameW @ stub SymFromToken diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 16923e4..4682c85 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2087,3 +2087,27 @@ BOOL WINAPI SymGetLineFromNameW64(HANDLE hProcess, PCWSTR ModuleName, PCWSTR Fil dwLineNumber, plDisplacement, Line); return FALSE; } + +/****************************************************************** + * SymFromIndex (DBGHELP.@) + * + */ +BOOL WINAPI SymFromIndex(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBOL_INFO symbol) +{ + FIXME("hProcess = %p, BaseOfDll = %s, index = %d, symbol = %p\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), index, symbol); + + return FALSE; +} + +/****************************************************************** + * SymFromIndexW (DBGHELP.@) + * + */ +BOOL WINAPI SymFromIndexW(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBOL_INFOW symbol) +{ + FIXME("hProcess = %p, BaseOfDll = %s, index = %d, symbol = %p\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), index, symbol); + + return FALSE; +}

1 0

Hans Leidekker : uninstaller: Don't list system components.
by Alexandre Julliard 30 May '11

30 May '11

Module: wine Branch: master Commit: 3de8370a4e9c98590fcf95c3421a10fde830d292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de8370a4e9c98590fcf95c34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 09:28:45 2011 +0200 uninstaller: Don't list system components. --- programs/uninstaller/main.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index c85bf5a..e3178db 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -60,7 +60,7 @@ static const WCHAR PathUninstallW[] = { 'U','n','i','n','s','t','a','l','l',0 }; static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l','S','t','r','i','n','g',0}; static const WCHAR WindowsInstallerW[] = {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; - +static const WCHAR SystemComponentW[] = {'S','y','s','t','e','m','C','o','m','p','o','n','e','n','t',0}; /** * Used to output program list when used with --list @@ -176,19 +176,27 @@ static int FetchFromRootKey(HKEY root) { HKEY hkeyApp; int i; - DWORD sizeOfSubKeyName, displen, uninstlen; + DWORD sizeOfSubKeyName, displen, uninstlen, value, type, size; WCHAR subKeyName[256]; sizeOfSubKeyName = 255; for (i=0; RegEnumKeyExW( root, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL ) != ERROR_NO_MORE_ITEMS; ++i) { RegOpenKeyExW(root, subKeyName, 0, KEY_READ, &hkeyApp); + if (!RegQueryValueExW(hkeyApp, SystemComponentW, NULL, &type, (LPBYTE)&value, &size) && + type == REG_DWORD && value == 1) + { + RegCloseKey(hkeyApp); + sizeOfSubKeyName = 255; + continue; + } if (!RegQueryValueExW(hkeyApp, DisplayNameW, NULL, NULL, NULL, &displen)) { - DWORD value, type; WCHAR *command; - if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &type, NULL, &value) && type == REG_DWORD && value == 1) + size = sizeof(value); + if (!RegQueryValueExW(hkeyApp, WindowsInstallerW, NULL, &type, (LPBYTE)&value, &size) && + type == REG_DWORD && value == 1) { static const WCHAR fmtW[] = {'m','s','i','e','x','e','c',' ','/','x','%','s',0}; command = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(fmtW) + lstrlenW(subKeyName)) * sizeof(WCHAR));

1 0

← Newer
1
2
3
4
5
6
7
8
...
95
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 May 2011