December 2010 - Wine-commits

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLTxtRange iface.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 4b37d5c72b2cec22bc6ed4f45440dde34d1327c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b37d5c72b2cec22bc6ed4f45… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:52:48 2010 +0100 mshtml: COM cleanup for the IHTMLTxtRange iface. --- dlls/mshtml/txtrange.c | 121 +++++++++++++++++++++++------------------------ 1 files changed, 59 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b37d5c72b2cec22bc6ed…

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in nsProtocolHandler.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 33883536799230b0e6d18cbd859f40fbdd6a59ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=33883536799230b0e6d18cbd8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:52:32 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in nsProtocolHandler. --- dlls/mshtml/nsio.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 3d0be0f..48ddb10 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2464,30 +2464,31 @@ HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsWineURI **ret) } typedef struct { - const nsIProtocolHandlerVtbl *lpProtocolHandlerVtbl; + nsIProtocolHandler nsIProtocolHandler_iface; LONG ref; nsIProtocolHandler *nshandler; } nsProtocolHandler; -#define NSPROTHANDLER(x) ((nsIProtocolHandler*) &(x)->lpProtocolHandlerVtbl) - -#define NSPROTHANDLER_THIS(iface) DEFINE_THIS(nsProtocolHandler, ProtocolHandler, iface) +static inline nsProtocolHandler *impl_from_nsIProtocolHandler(nsIProtocolHandler *iface) +{ + return CONTAINING_RECORD(iface, nsProtocolHandler, nsIProtocolHandler_iface); +} static nsresult NSAPI nsProtocolHandler_QueryInterface(nsIProtocolHandler *iface, nsIIDRef riid, void **result) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); *result = NULL; if(IsEqualGUID(&IID_nsISupports, riid)) { TRACE("(%p)->(IID_nsISupports %p)\n", This, result); - *result = NSPROTHANDLER(This); + *result = &This->nsIProtocolHandler_iface; }else if(IsEqualGUID(&IID_nsIProtocolHandler, riid)) { TRACE("(%p)->(IID_nsIProtocolHandler %p)\n", This, result); - *result = NSPROTHANDLER(This); + *result = &This->nsIProtocolHandler_iface; }else if(IsEqualGUID(&IID_nsIExternalProtocolHandler, riid)) { TRACE("(%p)->(IID_nsIExternalProtocolHandler %p), returning NULL\n", This, result); return NS_NOINTERFACE; @@ -2504,7 +2505,7 @@ static nsresult NSAPI nsProtocolHandler_QueryInterface(nsIProtocolHandler *iface static nsrefcnt NSAPI nsProtocolHandler_AddRef(nsIProtocolHandler *iface) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -2514,7 +2515,7 @@ static nsrefcnt NSAPI nsProtocolHandler_AddRef(nsIProtocolHandler *iface) static nsrefcnt NSAPI nsProtocolHandler_Release(nsIProtocolHandler *iface) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -2530,7 +2531,7 @@ static nsrefcnt NSAPI nsProtocolHandler_Release(nsIProtocolHandler *iface) static nsresult NSAPI nsProtocolHandler_GetScheme(nsIProtocolHandler *iface, nsACString *aScheme) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("(%p)->(%p)\n", This, aScheme); @@ -2542,7 +2543,7 @@ static nsresult NSAPI nsProtocolHandler_GetScheme(nsIProtocolHandler *iface, nsA static nsresult NSAPI nsProtocolHandler_GetDefaultPort(nsIProtocolHandler *iface, PRInt32 *aDefaultPort) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("(%p)->(%p)\n", This, aDefaultPort); @@ -2554,7 +2555,7 @@ static nsresult NSAPI nsProtocolHandler_GetDefaultPort(nsIProtocolHandler *iface static nsresult NSAPI nsProtocolHandler_GetProtocolFlags(nsIProtocolHandler *iface, PRUint32 *aProtocolFlags) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("(%p)->(%p)\n", This, aProtocolFlags); @@ -2566,7 +2567,7 @@ static nsresult NSAPI nsProtocolHandler_GetProtocolFlags(nsIProtocolHandler *ifa static nsresult NSAPI nsProtocolHandler_NewURI(nsIProtocolHandler *iface, const nsACString *aSpec, const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("((%p)->%s %s %p %p)\n", This, debugstr_nsacstr(aSpec), debugstr_a(aOriginCharset), aBaseURI, _retval); @@ -2579,7 +2580,7 @@ static nsresult NSAPI nsProtocolHandler_NewURI(nsIProtocolHandler *iface, static nsresult NSAPI nsProtocolHandler_NewChannel(nsIProtocolHandler *iface, nsIURI *aURI, nsIChannel **_retval) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("(%p)->(%p %p)\n", This, aURI, _retval); @@ -2591,7 +2592,7 @@ static nsresult NSAPI nsProtocolHandler_NewChannel(nsIProtocolHandler *iface, static nsresult NSAPI nsProtocolHandler_AllowPort(nsIProtocolHandler *iface, PRInt32 port, const char *scheme, PRBool *_retval) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("(%p)->(%d %s %p)\n", This, port, debugstr_a(scheme), _retval); @@ -2600,8 +2601,6 @@ static nsresult NSAPI nsProtocolHandler_AllowPort(nsIProtocolHandler *iface, return NS_ERROR_NOT_IMPLEMENTED; } -#undef NSPROTHANDLER_THIS - static const nsIProtocolHandlerVtbl nsProtocolHandlerVtbl = { nsProtocolHandler_QueryInterface, nsProtocolHandler_AddRef, @@ -2618,11 +2617,11 @@ static nsIProtocolHandler *create_protocol_handler(nsIProtocolHandler *nshandler { nsProtocolHandler *ret = heap_alloc(sizeof(nsProtocolHandler)); - ret->lpProtocolHandlerVtbl = &nsProtocolHandlerVtbl; + ret->nsIProtocolHandler_iface.lpVtbl = &nsProtocolHandlerVtbl; ret->ref = 1; ret->nshandler = nshandler; - return NSPROTHANDLER(ret); + return &ret->nsIProtocolHandler_iface; } static nsresult NSAPI nsIOService_QueryInterface(nsIIOService*,nsIIDRef,void**);

1 0

Michael Stefaniuc : inetcomm: Use an iface instead of a vtbl pointer in cf.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 65ff66a111e57c3fc1101ac2ef4e8b5ba242b3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ff66a111e57c3fc1101ac2e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:53:15 2010 +0100 inetcomm: Use an iface instead of a vtbl pointer in cf. --- dlls/inetcomm/inetcomm_main.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 885b79d..1e45c22 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -72,13 +72,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) */ typedef struct { - const struct IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; HRESULT (*create_object)(IUnknown *, void **); } cf; static inline cf *impl_from_IClassFactory( IClassFactory *iface ) { - return (cf *)((char*)iface - FIELD_OFFSET(cf, lpVtbl)); + return CONTAINING_RECORD(iface, cf, IClassFactory_iface); } static HRESULT WINAPI cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) @@ -141,11 +141,11 @@ static const struct IClassFactoryVtbl cf_vtbl = cf_LockServer }; -static cf mime_body_cf = { &cf_vtbl, MimeBody_create }; -static cf mime_allocator_cf = { &cf_vtbl, MimeAllocator_create }; -static cf mime_message_cf = { &cf_vtbl, MimeMessage_create }; -static cf mime_security_cf = { &cf_vtbl, MimeSecurity_create }; -static cf virtual_stream_cf = { &cf_vtbl, VirtualStream_create }; +static cf mime_body_cf = { { &cf_vtbl }, MimeBody_create }; +static cf mime_allocator_cf = { { &cf_vtbl }, MimeAllocator_create }; +static cf mime_message_cf = { { &cf_vtbl }, MimeMessage_create }; +static cf mime_security_cf = { { &cf_vtbl }, MimeSecurity_create }; +static cf virtual_stream_cf = { { &cf_vtbl }, VirtualStream_create }; /*********************************************************************** * DllGetClassObject (INETCOMM.@) @@ -170,23 +170,23 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) if ( IsEqualCLSID( rclsid, &CLSID_IMimeSecurity )) { - cf = (IClassFactory*) &mime_security_cf.lpVtbl; + cf = &mime_security_cf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_IMimeMessage )) { - cf = (IClassFactory*) &mime_message_cf.lpVtbl; + cf = &mime_message_cf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_IMimeBody )) { - cf = (IClassFactory*) &mime_body_cf.lpVtbl; + cf = &mime_body_cf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_IMimeAllocator )) { - cf = (IClassFactory*) &mime_allocator_cf.lpVtbl; + cf = &mime_allocator_cf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_IVirtualStream )) { - cf = (IClassFactory*) &virtual_stream_cf.lpVtbl; + cf = &virtual_stream_cf.IClassFactory_iface; } if ( !cf )

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 6ac2a7eb048605685445f1bd41110cadfee39744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac2a7eb048605685445f1bd4… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Dec 28 19:16:00 2010 +0200 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index 5cdf572..4653382 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -37,6 +37,7 @@ STRINGTABLE IDS_LBRACKET "Tikėtasi „(“" IDS_RBRACKET "Tikėtasi „)“" IDS_UNTERMINATED_STR "Nebaigta eilutės konstanta" + IDS_DISABLED_CC "Sąlyginis kompiliavimas yra išjungtas" IDS_NOT_FUNC "Tikėtasi funkcijos" IDS_NOT_DATE "„[objektas]“ nėra datos objektas" IDS_NOT_NUM "Tikėtasi skaičiaus"

1 0

André Hentschel : jscript: Update German translation.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 06560dd0929b4640c49ed7ab38249715c3a99d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06560dd0929b4640c49ed7ab3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 28 18:35:29 2010 +0100 jscript: Update German translation. --- dlls/jscript/jscript_De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index a78afd2..a60d569 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -36,6 +36,7 @@ STRINGTABLE IDS_LBRACKET "'(' erwartet" IDS_RBRACKET "')' erwartet" IDS_UNTERMINATED_STR "konstante Zeichenkette nicht terminiert" + IDS_DISABLED_CC "Bedingte Kompilierung ist ausgeschaltet" IDS_NOT_FUNC "Funktion erwartet" IDS_NOT_DATE "'[Objekt]' ist kein Datums-Objekt" IDS_NOT_NUM "Nummer erwartet"

1 0

Yaron Shahrabani : wininet: Updated Hebrew translation.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 4a17b11d97e946d6d5c5f7861ad45d76eb647b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a17b11d97e946d6d5c5f7861… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue Dec 28 19:32:17 2010 +0200 wininet: Updated Hebrew translation. --- dlls/wininet/wininet_He.rc | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/wininet_He.rc b/dlls/wininet/wininet_He.rc index 2a739d4..1fca4e4 100644 --- a/dlls/wininet/wininet_He.rc +++ b/dlls/wininet/wininet_He.rc @@ -26,13 +26,13 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT IDD_PROXYDLG DIALOG 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL -CAPTION "נא להזין את ססמת הרשת" +CAPTION "הזנת ססמת הרשת" FONT 8, "MS Shell Dlg" { - LTEXT "נא להזין את שם המשתמש והססמה שלך:", -1, 40, 6, 150, 15 + LTEXT "נא להזין את שם המשתמש ואת הססמה שלך:", -1, 40, 6, 150, 15 LTEXT "מתווך", -1, 40, 26, 50, 10 LTEXT "תחום", -1, 40, 46, 50, 10 - LTEXT "שם משתמש", -1, 40, 66, 50, 10 + LTEXT "משתמש", -1, 40, 66, 50, 10 LTEXT "ססמה", -1, 40, 86, 50, 10 LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 @@ -50,7 +50,7 @@ EXSTYLE WS_EX_LAYOUTRTL CAPTION "נדרש אימות" FONT 8, "MS Shell Dlg" { - LTEXT "נא להזין את שם המשתמש והססמה שלך:", -1, 40, 6, 150, 15 + LTEXT "נא להזין את שם המשתמש ואת הססמה שלך:", -1, 40, 6, 150, 15 LTEXT "שרת", -1, 40, 26, 50, 10 LTEXT "תחום", -1, 40, 46, 50, 10 LTEXT "שם משתמש", -1, 40, 66, 50, 10 @@ -65,7 +65,24 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "ביטול", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_INVCERTDLG DIALOG 3, 24, 250, 86 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "אזהרת אבטחה" +FONT 8, "MS Shell Dlg" +{ + LTEXT "אירעה תקלה עם האישור לאתר זה.", -1, 40, 6, 200, 20 + LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 + LTEXT "האם ברצונך להמשיך בכל זאת?", -1, 40, 46, 200, 20 + PUSHBUTTON "כן", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "לא", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE { - IDS_LANCONNECTION "חיבור לרשת מקומית" + IDS_LANCONNECTION "חיבור רשת מקומית" + IDS_CERT_CA_INVALID "האישור הונפק על ידי מפיץ בלתי ידוע או בלתי מהימן." + IDS_CERT_DATE_INVALID "התאריך על האישור שגוי." + IDS_CERT_CN_INVALID "השם על האישור אינו תואם את שם האתר." + IDS_CERT_ERRORS "ישנה לפחות בעיית אבטחה אחת שלא צוינה עם אישור זה." }

1 0

Vitaliy Margolen : dinput: Convert DirectInput to using interface instead of vtbl.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 2774d4046369d0826138d46147eeb5d7bdd2db25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2774d4046369d0826138d4614… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Dec 28 12:24:38 2010 -0700 dinput: Convert DirectInput to using interface instead of vtbl. --- dlls/dinput/dinput_main.c | 45 +++++++++++++++++++++++------------------ dlls/dinput/dinput_private.h | 8 +++--- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 066d8a8..d0943c2 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -56,24 +56,29 @@ static const IDirectInput7WVtbl ddi7wvt; static const IDirectInput8AVtbl ddi8avt; static const IDirectInput8WVtbl ddi8wvt; +static inline IDirectInputImpl *impl_from_IDirectInput7A( IDirectInput7A *iface ) +{ + return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput7A_iface ); +} + static inline IDirectInputImpl *impl_from_IDirectInput7W( IDirectInput7W *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl7w ); + return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput7W_iface ); } static inline IDirectInputImpl *impl_from_IDirectInput8A( IDirectInput8A *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl8a ); + return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8A_iface ); } static inline IDirectInputImpl *impl_from_IDirectInput8W( IDirectInput8W *iface ) { - return CONTAINING_RECORD( iface, IDirectInputImpl, lpVtbl8w ); + return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8W_iface ); } static inline IDirectInput7W *IDirectInput7W_from_impl( IDirectInputImpl *iface ) { - return (IDirectInput7W *)(&iface->lpVtbl7w); + return (IDirectInput7W *)(&iface->IDirectInput7W_iface); } static const struct dinput_device *dinput_devices[] = @@ -133,10 +138,10 @@ HRESULT WINAPI DirectInputCreateEx( else return DIERR_OLDDIRECTINPUTVERSION; - This->lpVtbl = &ddi7avt; - This->lpVtbl7w = &ddi7wvt; - This->lpVtbl8a = &ddi8avt; - This->lpVtbl8w = &ddi8wvt; + This->IDirectInput7A_iface.lpVtbl = &ddi7avt; + This->IDirectInput7W_iface.lpVtbl = &ddi7wvt; + This->IDirectInput8A_iface.lpVtbl = &ddi8avt; + This->IDirectInput8W_iface.lpVtbl = &ddi8wvt; This->ref = 0; This->dwVersion = dwVersion; This->evsequence = 1; @@ -252,7 +257,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( LPDIRECTINPUT7A iface, DWORD dwDevType, LPDIENUMDEVICESCALLBACKA lpCallback, LPVOID pvRef, DWORD dwFlags) { - IDirectInputImpl *This = (IDirectInputImpl *)iface; + IDirectInputImpl *This = impl_from_IDirectInput7A(iface); DIDEVICEINSTANCEA devInstance; unsigned int i; int j, r; @@ -310,7 +315,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( static ULONG WINAPI IDirectInputAImpl_AddRef(LPDIRECTINPUT7A iface) { - IDirectInputImpl *This = (IDirectInputImpl *)iface; + IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedIncrement(&This->ref); TRACE( "(%p) incrementing from %d\n", This, ref - 1); @@ -325,7 +330,7 @@ static ULONG WINAPI IDirectInputWImpl_AddRef(LPDIRECTINPUT7W iface) static ULONG WINAPI IDirectInputAImpl_Release(LPDIRECTINPUT7A iface) { - IDirectInputImpl *This = (IDirectInputImpl *)iface; + IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedDecrement( &This->ref ); TRACE( "(%p) releasing from %d\n", This, ref + 1 ); @@ -354,7 +359,7 @@ static ULONG WINAPI IDirectInputWImpl_Release(LPDIRECTINPUT7W iface) static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, REFIID riid, LPVOID *ppobj) { - IDirectInputImpl *This = (IDirectInputImpl *)iface; + IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); TRACE( "(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj ); @@ -363,7 +368,7 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE IsEqualGUID( &IID_IDirectInput2A, riid ) || IsEqualGUID( &IID_IDirectInput7A, riid )) { - *ppobj = &This->lpVtbl; + *ppobj = &This->IDirectInput7A_iface; IUnknown_AddRef( (IUnknown*)*ppobj ); return DI_OK; @@ -373,7 +378,7 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE IsEqualGUID( &IID_IDirectInput2W, riid ) || IsEqualGUID( &IID_IDirectInput7W, riid )) { - *ppobj = &This->lpVtbl7w; + *ppobj = &This->IDirectInput7W_iface; IUnknown_AddRef( (IUnknown*)*ppobj ); return DI_OK; @@ -381,7 +386,7 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE if (IsEqualGUID( &IID_IDirectInput8A, riid )) { - *ppobj = &This->lpVtbl8a; + *ppobj = &This->IDirectInput8A_iface; IUnknown_AddRef( (IUnknown*)*ppobj ); return DI_OK; @@ -389,7 +394,7 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE if (IsEqualGUID( &IID_IDirectInput8W, riid )) { - *ppobj = &This->lpVtbl8w; + *ppobj = &This->IDirectInput8W_iface; IUnknown_AddRef( (IUnknown*)*ppobj ); return DI_OK; @@ -423,7 +428,7 @@ static HRESULT WINAPI IDirectInputWImpl_Initialize(LPDIRECTINPUT7W iface, HINSTA static HRESULT WINAPI IDirectInputAImpl_GetDeviceStatus(LPDIRECTINPUT7A iface, REFGUID rguid) { - IDirectInputImpl *This = (IDirectInputImpl *)iface; + IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); HRESULT hr; LPDIRECTINPUTDEVICEA device; @@ -447,7 +452,7 @@ static HRESULT WINAPI IDirectInputAImpl_RunControlPanel(LPDIRECTINPUT7A iface, HWND hwndOwner, DWORD dwFlags) { - IDirectInputImpl *This = (IDirectInputImpl *)iface; + IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); FIXME( "(%p)->(%p,%08x): stub\n", This, hwndOwner, dwFlags ); @@ -463,7 +468,7 @@ static HRESULT WINAPI IDirectInputWImpl_RunControlPanel(LPDIRECTINPUT7W iface, H static HRESULT WINAPI IDirectInput2AImpl_FindDevice(LPDIRECTINPUT7A iface, REFGUID rguid, LPCSTR pszName, LPGUID pguidInstance) { - IDirectInputImpl *This = (IDirectInputImpl *)iface; + IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); FIXME( "(%p)->(%s, %s, %p): stub\n", This, debugstr_guid(rguid), pszName, pguidInstance ); @@ -483,7 +488,7 @@ static HRESULT WINAPI IDirectInput2WImpl_FindDevice(LPDIRECTINPUT7W iface, REFGU static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, REFGUID rguid, REFIID riid, LPVOID* pvOut, LPUNKNOWN lpUnknownOuter) { - IDirectInputImpl *This = (IDirectInputImpl *)iface; + IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); HRESULT ret_value = DIERR_DEVICENOTREG; unsigned int i; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 16b4559..b2b4c00 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -30,10 +30,10 @@ typedef struct IDirectInputImpl IDirectInputImpl; struct IDirectInputImpl { - const IDirectInput7AVtbl *lpVtbl; - const IDirectInput7WVtbl *lpVtbl7w; - const IDirectInput8AVtbl *lpVtbl8a; - const IDirectInput8WVtbl *lpVtbl8w; + IDirectInput7A IDirectInput7A_iface; + IDirectInput7W IDirectInput7W_iface; + IDirectInput8A IDirectInput8A_iface; + IDirectInput8W IDirectInput8W_iface; LONG ref;

1 0

André Hentschel : ntdll/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: ba1f962d10756ee5590ad7e459bf0895c6c3efa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1f962d10756ee5590ad7e45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 28 21:10:40 2010 +0100 ntdll/tests: Don't test function directly when reporting GetLastError(). --- dlls/ntdll/tests/directory.c | 9 +++++---- dlls/ntdll/tests/exception.c | 6 ++++-- dlls/ntdll/tests/file.c | 5 +++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index bc4ad39..be8dd13 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -71,9 +71,10 @@ static const int max_test_dir_size = 20; /* size of above plus some for .. etc static void set_up_attribute_test(const char *testdirA) { int i; + BOOL ret; - ok(CreateDirectoryA(testdirA, NULL), - "couldn't create dir '%s', error %d\n", testdirA, GetLastError()); + ret = CreateDirectoryA(testdirA, NULL); + ok(ret, "couldn't create dir '%s', error %d\n", testdirA, GetLastError()); for (i=0; testfiles[i].name; i++) { char buf[MAX_PATH]; @@ -82,8 +83,8 @@ static void set_up_attribute_test(const char *testdirA) sprintf(buf, "%s\\%s", testdirA, testfiles[i].name); testfiles[i].nfound = 0; if (testfiles[i].attr & FILE_ATTRIBUTE_DIRECTORY) { - ok(CreateDirectoryA(buf, NULL), - "couldn't create dir '%s', error %d\n", buf, GetLastError()); + ret = CreateDirectoryA(buf, NULL); + ok(ret, "couldn't create dir '%s', error %d\n", buf, GetLastError()); } else { HANDLE h = CreateFileA(buf, GENERIC_READ|GENERIC_WRITE, diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index dd03d5f..386c5a6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -828,8 +828,10 @@ static void test_debugger(void) } while (de.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); winetest_wait_child_process( pi.hProcess ); - ok(CloseHandle(pi.hThread) != 0, "error %u\n", GetLastError()); - ok(CloseHandle(pi.hProcess) != 0, "error %u\n", GetLastError()); + ret = CloseHandle(pi.hThread); + ok(ret, "error %u\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "error %u\n", GetLastError()); return; } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index c72e0f0..5afb025 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -456,6 +456,7 @@ static void read_file_test(void) char buffer[128]; LARGE_INTEGER offset; HANDLE event = CreateEventA( NULL, TRUE, FALSE, NULL ); + BOOL ret; buffer[0] = 1; @@ -599,8 +600,8 @@ static void read_file_test(void) CloseHandle( read ); if (!create_pipe( &read, &write, FILE_FLAG_OVERLAPPED, 4096 )) return; - ok(DuplicateHandle(GetCurrentProcess(), read, GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS), - "Failed to duplicate handle: %d\n", GetLastError()); + ret = DuplicateHandle(GetCurrentProcess(), read, GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS); + ok(ret, "Failed to duplicate handle: %d\n", GetLastError()); apc_count = 0; U(iosb).Status = 0xdeadbabe;

1 0

Gerald Pfeifer : dbghelp: Make ehdr_addr in elf_enum_modules_internal dependent on AT_SYSINFO_EHDR.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: 8f7d06b69bd23c23e900980e464b0ec6c1d0dcf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7d06b69bd23c23e900980e4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Dec 28 22:24:57 2010 +0100 dbghelp: Make ehdr_addr in elf_enum_modules_internal dependent on AT_SYSINFO_EHDR. --- dlls/dbghelp/elf_module.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 2bfa2a4..ff8b9d2 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1404,7 +1404,6 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, struct link_map lm; char bufstr[256]; WCHAR bufstrW[MAX_PATH]; - unsigned long ehdr_addr; if (!pcs->dbg_hdr_addr || !ReadProcessMemory(pcs->handle, (void*)pcs->dbg_hdr_addr, @@ -1431,11 +1430,17 @@ static BOOL elf_enum_modules_internal(const struct process* pcs, if (!cb(bufstrW, (unsigned long)lm.l_addr, (unsigned long)lm.l_ld, FALSE, user)) break; } } + #ifdef AT_SYSINFO_EHDR - if (!lm_addr && elf_search_auxv(pcs, AT_SYSINFO_EHDR, &ehdr_addr)) + if (!lm_addr) { - static const WCHAR vdsoW[] = {'[','v','d','s','o',']','.','s','o',0}; - cb(vdsoW, ehdr_addr, 0, TRUE, user); + unsigned long ehdr_addr; + + if (elf_search_auxv(pcs, AT_SYSINFO_EHDR, &ehdr_addr)) + { + static const WCHAR vdsoW[] = {'[','v','d','s','o',']','.','s','o',0}; + cb(vdsoW, ehdr_addr, 0, TRUE, user); + } } #endif return TRUE;

1 0

André Hentschel : advapi32/tests: Even more tests for the merged view of HKCR.
by Alexandre Julliard 29 Dec '10

29 Dec '10

Module: wine Branch: master Commit: ffea4ba5ace819a76efa161c7726caa6ce79ea3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffea4ba5ace819a76efa161c7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 29 01:06:20 2010 +0100 advapi32/tests: Even more tests for the merged view of HKCR. --- dlls/advapi32/tests/registry.c | 104 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 101 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d4beb17..c70767f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1914,7 +1914,7 @@ static void test_redirection(void) static void test_classesroot(void) { - HKEY hkey, hklm, hkcr; + HKEY hkey, hklm, hkcr, hkeysub1, hklmsub1, hkcrsub1; DWORD size = 8; DWORD type = REG_SZ; static CHAR buffer[8]; @@ -1961,6 +1961,24 @@ static void test_classesroot(void) ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + /* set a value in hkcr */ + res = RegSetValueExA(hkcr, "val0", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* try to find the value in user's classes */ + res = RegQueryValueExA(hkcr, "val0", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + + /* modify the value in user's classes */ + res = RegSetValueExA(hkcr, "val0", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + + /* check if the value is also modified in hkcr */ + res = RegQueryValueExA(hkey, "val0", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + /* cleanup */ delete_key( hkey ); delete_key( hkcr ); @@ -1994,7 +2012,7 @@ static void test_classesroot(void) } /* set a value in hklm classes */ - res = RegSetValueExA(hklm, "val2", 0, REG_SZ, (const BYTE *)"hklm", sizeof("user")); + res = RegSetValueExA(hklm, "val2", 0, REG_SZ, (const BYTE *)"hklm", sizeof("hklm")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* try to find the value in hkcr */ @@ -2030,7 +2048,7 @@ static void test_classesroot(void) ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); /* modify the value in hklm */ - res = RegSetValueExA(hklm, "val2", 0, REG_SZ, (const BYTE *)"hklm", sizeof("user")); + res = RegSetValueExA(hklm, "val2", 0, REG_SZ, (const BYTE *)"hklm", sizeof("hklm")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); /* check that the value is not overwritten in hkcr or user's classes */ @@ -2041,13 +2059,93 @@ static void test_classesroot(void) ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + /* modify the value in hkcr */ + res = RegSetValueExA(hkcr, "val2", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + + /* check that the value is overwritten in hklm and user's classes */ + res = RegQueryValueExA(hkcr, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + res = RegQueryValueExA(hkey, "val2", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + + /* create a subkey in hklm */ + if (RegCreateKeyExA( hklm, "subkey1", 0, NULL, 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hklmsub1, NULL )) return; + /* try to open that subkey in hkcr */ + res = RegOpenKeyExA( hkcr, "subkey1", 0, KEY_QUERY_VALUE|KEY_SET_VALUE, &hkcrsub1 ); + ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + + /* set a value in hklm classes */ + res = RegSetValueExA(hklmsub1, "subval1", 0, REG_SZ, (const BYTE *)"hklm", sizeof("hklm")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* try to find the value in hkcr */ + res = RegQueryValueExA(hkcrsub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "hklm" ), "value set to '%s'\n", buffer ); + + /* modify the value in hkcr */ + res = RegSetValueExA(hkcrsub1, "subval1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + + /* check that the value is modified in hklm classes */ + res = RegQueryValueExA(hklmsub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + + /* create a subkey in user's classes */ + if (RegCreateKeyExA( hkey, "subkey1", 0, NULL, 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkeysub1, NULL )) return; + + /* set a value in user's classes */ + res = RegSetValueExA(hkeysub1, "subval1", 0, REG_SZ, (const BYTE *)"user", sizeof("user")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* try to find the value in hkcr */ + res = RegQueryValueExA(hkcrsub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + + /* modify the value in hklm */ + res = RegSetValueExA(hklmsub1, "subval1", 0, REG_SZ, (const BYTE *)"hklm", sizeof("hklm")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); + + /* check that the value is not overwritten in hkcr or user's classes */ + res = RegQueryValueExA(hkcrsub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + res = RegQueryValueExA(hkeysub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); + ok(!strcmp( buffer, "user" ), "value set to '%s'\n", buffer ); + + /* modify the value in hkcr */ + res = RegSetValueExA(hkcrsub1, "subval1", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + + /* check that the value is overwritten in hklm and user's classes */ + res = RegQueryValueExA(hkcrsub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", res); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + res = RegQueryValueExA(hkeysub1, "subval1", NULL, &type, (LPBYTE)buffer, &size); + ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); + /* cleanup */ delete_key( hkey ); delete_key( hklm ); delete_key( hkcr ); + delete_key( hkeysub1 ); + delete_key( hklmsub1 ); + delete_key( hkcrsub1 ); RegCloseKey( hkey ); RegCloseKey( hklm ); RegCloseKey( hkcr ); + RegCloseKey( hkeysub1 ); + RegCloseKey( hklmsub1 ); + RegCloseKey( hkcrsub1 ); } static void test_deleted_key(void)

1 0