wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Greg Geldorp : kernel32/tests: Remove check of environment variables against registry.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: a2d1c7df5e3c123e13564368e67b6bedbbad39d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2d1c7df5e3c123e13564368e… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Tue Dec 21 16:44:42 2010 +0100 kernel32/tests: Remove check of environment variables against registry. --- dlls/kernel32/tests/environ.c | 63 +---------------------------------------- 1 files changed, 1 insertions(+), 62 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index b6a900e..0a7eef9 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "winerror.h" #include "winnls.h" -#include "winreg.h" static CHAR string[MAX_PATH]; #define ok_w(res, format, szString) \ @@ -53,16 +52,6 @@ static void init_functionpointers(void) static void test_Predefined(void) { - /* - * If anything fails here, your test environment is probably not set up - * correctly. - */ - HKEY UserEnvironment; - LSTATUS Err; - DWORD Index; - char ValueName[256]; - DWORD ValueNameSize; - DWORD Type; char Data[1024]; DWORD DataSize; char Env[sizeof(Data)]; @@ -71,58 +60,8 @@ static void test_Predefined(void) BOOL NoErr; /* - * Enumerate all values in HKCU\Environment and verify that environment - * variables with those names/values are present. - */ - Err = RegOpenKeyExA(HKEY_CURRENT_USER, "Environment", 0, KEY_QUERY_VALUE, - &UserEnvironment); - ok(Err == ERROR_SUCCESS || Err == ERROR_FILE_NOT_FOUND, - "Failed to open HKCU\\Environment key, error %d\n", - Err); - - if (Err == ERROR_SUCCESS) - { - Index = 0; - do - { - ValueNameSize = sizeof(ValueName); - DataSize = sizeof(Data); - Err = RegEnumValueA(UserEnvironment, Index, ValueName, &ValueNameSize, - NULL, &Type, (LPBYTE) Data, &DataSize); - if (Err == ERROR_SUCCESS) - { - if (Type == REG_EXPAND_SZ) - { - char Expanded[sizeof(Data)]; - DWORD ExpandedSize; - ExpandedSize = ExpandEnvironmentStringsA(Data, Expanded, - sizeof(Expanded)); - ok(ExpandedSize != 0 && ExpandedSize <= sizeof(Expanded), - "Failed to expand %s, error %u\n", Data, GetLastError()); - memcpy(Data, Expanded, ExpandedSize); - Type = REG_SZ; - } - ok(Type == REG_SZ, "Expected data type REG_SZ, got %d\n", Type); - EnvSize = GetEnvironmentVariableA(ValueName, Env, sizeof(Env)); - ok(EnvSize != 0 && EnvSize <= sizeof(Env), - "Failed to retrieve environment variable %s, error %u\n", - ValueName, GetLastError()); - ok(strcmp(Data, Env) == 0, - "Expected value %s for env var %s, got %s\n", Data, ValueName, - Env); - } - Index++; - } - while (Err == ERROR_SUCCESS); - ok(Err == ERROR_NO_MORE_ITEMS, - "Unexpected return %d from RegEnumValueA\n", Err); - - Err = RegCloseKey(UserEnvironment); - ok(Err == ERROR_SUCCESS, "Failed to close reg key, error %d\n", Err); - } - - /* * Check value of %USERPROFILE%, should be same as GetUserProfileDirectory() + * If this fails, your test environment is probably not set up */ if (pOpenProcessToken == NULL || pGetUserProfileDirectoryA == NULL) {

1 0

Greg Geldorp : kernel32/tests: Quote command line arguments that might contain spaces.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: a4a73c20af27edce5dd9384df45537c9a14377ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a73c20af27edce5dd9384df… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Tue Dec 21 16:41:24 2010 +0100 kernel32/tests: Quote command line arguments that might contain spaces. --- dlls/kernel32/tests/debugger.c | 12 +++++----- dlls/kernel32/tests/process.c | 44 ++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4a73c20af27edce5dd93…

1 0

Martin Storsjo : wineconsole: Fallback to window based console if the curses library isn't found.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 59398d7ca7e43cc9fe4bfecd5277ce648a181a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59398d7ca7e43cc9fe4bfecd5… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 21 14:26:03 2010 +0200 wineconsole: Fallback to window based console if the curses library isn't found. --- programs/wineconsole/curses.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index f1cab51..fc0261f 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -1039,7 +1039,7 @@ static int WCCURSES_MainLoop(struct inner_data* data) enum init_return WCCURSES_InitBackend(struct inner_data* data) { if( !WCCURSES_bind_libcurses() ) - return init_failed; + return init_not_supported; data->private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct inner_data_curse)); if (!data->private) return init_failed;

1 0

Hwang YunSong : cryptui: Update Korean resource.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: a7e89145264a41f13a2db3c2359705d3a4ac6168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e89145264a41f13a2db3c23… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Dec 21 17:14:28 2010 +0900 cryptui: Update Korean resource. --- dlls/cryptui/cryptui_Ko.rc | 490 ++++++++++++++++++++++---------------------- 1 files changed, 246 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7e89145264a41f13a2db…

1 0

Hwang YunSong : cryptdlg: Update Korean resource.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: f66d6df842e2328758f8131617fb2537a6ca86ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f66d6df842e2328758f813161… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Dec 21 17:12:54 2010 +0900 cryptdlg: Update Korean resource. --- dlls/cryptdlg/cryptdlg_Ko.rc | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_Ko.rc b/dlls/cryptdlg/cryptdlg_Ko.rc index 5ace44d..5571dfc 100644 --- a/dlls/cryptdlg/cryptdlg_Ko.rc +++ b/dlls/cryptdlg/cryptdlg_Ko.rc @@ -2,7 +2,7 @@ * cryptdlg dll resources * * Copyright 2008 Juan Lang - * Copyright 2008 YunSong Hwang + * Copyright 2008,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,19 +21,21 @@ #include "cryptres.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_CERT_POLICY "�� å" - IDS_POLICY_ID "��å �ĺ��: " - IDS_POLICY_QUALIFIER_INFO "��å �� " - IDS_POLICY_QUALIFIER_ID "��å �� ̵�=" - IDS_CPS "CPS"/*�� */ - IDS_USER_NOTICE "�� " - IDS_QUALIFIER "��" - IDS_NOTICE_REF "�� " - IDS_ORGANIZATION "��=" - IDS_NOTICE_NUM "�� ȣ=" - IDS_NOTICE_TEXT "�� ؽ�Ʈ=" + IDS_CERT_POLICY "인증 정책" + IDS_POLICY_ID "정책 식별자: " + IDS_POLICY_QUALIFIER_INFO "정책 구별자 정보" + IDS_POLICY_QUALIFIER_ID "정책 구별자 아이디=" + IDS_CPS "CPS"/*인증 실현 선언 */ + IDS_USER_NOTICE "사용자 통지" + IDS_QUALIFIER "구별자" + IDS_NOTICE_REF "통지 참조" + IDS_ORGANIZATION "기관=" + IDS_NOTICE_NUM "통지 번호=" + IDS_NOTICE_TEXT "통지 텍스트=" }

1 0

Michael Stefaniuc : oleaut32: Standardize the COM usage in tmarshal.c.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 80a08012d837c6e55bce93391887d39fb663620a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a08012d837c6e55bce93391… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 21 11:30:58 2010 +0100 oleaut32: Standardize the COM usage in tmarshal.c. --- dlls/oleaut32/tmarshal.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 440319f..45aacf2 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -390,7 +390,7 @@ typedef struct _TMAsmProxy { typedef struct _TMProxyImpl { LPVOID *lpvtbl; - const IRpcProxyBufferVtbl *lpvtbl2; + IRpcProxyBuffer IRpcProxyBuffer_iface; LONG ref; TMAsmProxy *asmstubs; @@ -405,7 +405,7 @@ typedef struct _TMProxyImpl { static inline TMProxyImpl *impl_from_IRpcProxyBuffer( IRpcProxyBuffer *iface ) { - return (TMProxyImpl *)((char*)iface - FIELD_OFFSET(TMProxyImpl, lpvtbl2)); + return CONTAINING_RECORD(iface, TMProxyImpl, IRpcProxyBuffer_iface); } static HRESULT WINAPI @@ -1743,7 +1743,7 @@ PSFacBuf_CreateProxy( CoTaskMemFree(proxy); return E_OUTOFMEMORY; } - proxy->lpvtbl2 = &tmproxyvtable; + proxy->IRpcProxyBuffer_iface.lpVtbl = &tmproxyvtable; /* one reference for the proxy */ proxy->ref = 1; proxy->tinfo = tinfo; @@ -1835,17 +1835,17 @@ PSFacBuf_CreateProxy( if (hres == S_OK) { *ppv = proxy; - *ppProxy = (IRpcProxyBuffer *)&(proxy->lpvtbl2); + *ppProxy = &proxy->IRpcProxyBuffer_iface; IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } else - TMProxyImpl_Release((IRpcProxyBuffer *)&proxy->lpvtbl2); + TMProxyImpl_Release(&proxy->IRpcProxyBuffer_iface); return hres; } typedef struct _TMStubImpl { - const IRpcStubBufferVtbl *lpvtbl; + IRpcStubBuffer IRpcStubBuffer_iface; LONG ref; LPUNKNOWN pUnk; @@ -1855,6 +1855,11 @@ typedef struct _TMStubImpl { BOOL dispatch_derivative; } TMStubImpl; +static inline TMStubImpl *impl_from_IRpcStubBuffer(IRpcStubBuffer *iface) +{ + return CONTAINING_RECORD(iface, TMStubImpl, IRpcStubBuffer_iface); +} + static HRESULT WINAPI TMStubImpl_QueryInterface(LPRPCSTUBBUFFER iface, REFIID riid, LPVOID *ppv) { @@ -1870,9 +1875,9 @@ TMStubImpl_QueryInterface(LPRPCSTUBBUFFER iface, REFIID riid, LPVOID *ppv) static ULONG WINAPI TMStubImpl_AddRef(LPRPCSTUBBUFFER iface) { - TMStubImpl *This = (TMStubImpl *)iface; + TMStubImpl *This = impl_from_IRpcStubBuffer(iface); ULONG refCount = InterlockedIncrement(&This->ref); - + TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); return refCount; @@ -1881,7 +1886,7 @@ TMStubImpl_AddRef(LPRPCSTUBBUFFER iface) static ULONG WINAPI TMStubImpl_Release(LPRPCSTUBBUFFER iface) { - TMStubImpl *This = (TMStubImpl *)iface; + TMStubImpl *This = impl_from_IRpcStubBuffer(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -1900,7 +1905,7 @@ TMStubImpl_Release(LPRPCSTUBBUFFER iface) static HRESULT WINAPI TMStubImpl_Connect(LPRPCSTUBBUFFER iface, LPUNKNOWN pUnkServer) { - TMStubImpl *This = (TMStubImpl *)iface; + TMStubImpl *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->(%p)\n", This, pUnkServer); @@ -1916,7 +1921,7 @@ TMStubImpl_Connect(LPRPCSTUBBUFFER iface, LPUNKNOWN pUnkServer) static void WINAPI TMStubImpl_Disconnect(LPRPCSTUBBUFFER iface) { - TMStubImpl *This = (TMStubImpl *)iface; + TMStubImpl *This = impl_from_IRpcStubBuffer(iface); TRACE("(%p)->()\n", This); @@ -1937,7 +1942,7 @@ TMStubImpl_Invoke( #ifdef __i386__ int i; const FUNCDESC *fdesc; - TMStubImpl *This = (TMStubImpl *)iface; + TMStubImpl *This = impl_from_IRpcStubBuffer(iface); HRESULT hres; DWORD *args = NULL, res, *xargs, nrofargs; marshal_state buf; @@ -2113,7 +2118,7 @@ TMStubImpl_IsIIDSupported(LPRPCSTUBBUFFER iface, REFIID riid) { static ULONG WINAPI TMStubImpl_CountRefs(LPRPCSTUBBUFFER iface) { - TMStubImpl *This = (TMStubImpl *)iface; + TMStubImpl *This = impl_from_IRpcStubBuffer(iface); FIXME("()\n"); return This->ref; /*FIXME? */ @@ -2163,14 +2168,14 @@ PSFacBuf_CreateStub( stub = CoTaskMemAlloc(sizeof(TMStubImpl)); if (!stub) return E_OUTOFMEMORY; - stub->lpvtbl = &tmstubvtbl; + stub->IRpcStubBuffer_iface.lpVtbl = &tmstubvtbl; stub->ref = 1; stub->tinfo = tinfo; stub->dispatch_stub = NULL; stub->dispatch_derivative = FALSE; stub->iid = *riid; - hres = IRpcStubBuffer_Connect((LPRPCSTUBBUFFER)stub,pUnkServer); - *ppStub = (LPRPCSTUBBUFFER)stub; + hres = IRpcStubBuffer_Connect(&stub->IRpcStubBuffer_iface,pUnkServer); + *ppStub = &stub->IRpcStubBuffer_iface; TRACE("IRpcStubBuffer: %p\n", stub); if (hres) ERR("Connect to pUnkServer failed?\n");

1 0

Michael Stefaniuc : oleaut32/tests: Standardize the COM usage in tmarshal.c .
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 366a92146ddd903c1c4755b2c3e854da78649197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366a92146ddd903c1c4755b2c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 21 11:30:37 2010 +0100 oleaut32/tests: Standardize the COM usage in tmarshal.c. --- dlls/oleaut32/tests/tmarshal.c | 41 +++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f7df82f..7773551 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -216,11 +216,16 @@ static ItestDual TestDualDisp = { &TestDualVtbl }; typedef struct Widget { - const IWidgetVtbl *lpVtbl; + IWidget IWidget_iface; LONG refs; IUnknown *pDispatchUnknown; } Widget; +static inline Widget *impl_from_IWidget(IWidget *iface) +{ + return CONTAINING_RECORD(iface, Widget, IWidget_iface); +} + static HRESULT WINAPI Widget_QueryInterface( IWidget *iface, /* [in] */ REFIID riid, @@ -242,7 +247,7 @@ static HRESULT WINAPI Widget_QueryInterface( static ULONG WINAPI Widget_AddRef( IWidget *iface) { - Widget *This = (Widget *)iface; + Widget *This = impl_from_IWidget(iface); return InterlockedIncrement(&This->refs); } @@ -250,7 +255,7 @@ static ULONG WINAPI Widget_AddRef( static ULONG WINAPI Widget_Release( IWidget *iface) { - Widget *This = (Widget *)iface; + Widget *This = impl_from_IWidget(iface); ULONG refs = InterlockedDecrement(&This->refs); if (!refs) { @@ -267,7 +272,7 @@ static HRESULT WINAPI Widget_GetTypeInfoCount( IWidget *iface, /* [out] */ UINT __RPC_FAR *pctinfo) { - Widget *This = (Widget *)iface; + Widget *This = impl_from_IWidget(iface); IDispatch *pDispatch; HRESULT hr = IUnknown_QueryInterface(This->pDispatchUnknown, &IID_IDispatch, (void **)&pDispatch); if (SUCCEEDED(hr)) @@ -284,7 +289,7 @@ static HRESULT WINAPI Widget_GetTypeInfo( /* [in] */ LCID lcid, /* [out] */ ITypeInfo __RPC_FAR *__RPC_FAR *ppTInfo) { - Widget *This = (Widget *)iface; + Widget *This = impl_from_IWidget(iface); IDispatch *pDispatch; HRESULT hr = IUnknown_QueryInterface(This->pDispatchUnknown, &IID_IDispatch, (void **)&pDispatch); if (SUCCEEDED(hr)) @@ -303,7 +308,7 @@ static HRESULT WINAPI Widget_GetIDsOfNames( /* [in] */ LCID lcid, /* [size_is][out] */ DISPID __RPC_FAR *rgDispId) { - Widget *This = (Widget *)iface; + Widget *This = impl_from_IWidget(iface); IDispatch *pDispatch; HRESULT hr = IUnknown_QueryInterface(This->pDispatchUnknown, &IID_IDispatch, (void **)&pDispatch); if (SUCCEEDED(hr)) @@ -325,7 +330,7 @@ static HRESULT WINAPI Widget_Invoke( /* [out] */ EXCEPINFO __RPC_FAR *pExcepInfo, /* [out] */ UINT __RPC_FAR *puArgErr) { - Widget *This = (Widget *)iface; + Widget *This = impl_from_IWidget(iface); IDispatch *pDispatch; HRESULT hr = IUnknown_QueryInterface(This->pDispatchUnknown, &IID_IDispatch, (void **)&pDispatch); if (SUCCEEDED(hr)) @@ -723,10 +728,15 @@ static IStaticWidget StaticWidget = { &StaticWidgetVtbl }; typedef struct KindaEnum { - const IKindaEnumWidgetVtbl *lpVtbl; + IKindaEnumWidget IKindaEnumWidget_iface; LONG refs; } KindaEnum; +static inline KindaEnum *impl_from_IKindaEnumWidget(IKindaEnumWidget *iface) +{ + return CONTAINING_RECORD(iface, KindaEnum, IKindaEnumWidget_iface); +} + static HRESULT register_current_module_typelib(void) { WCHAR path[MAX_PATH]; @@ -777,16 +787,17 @@ static IWidget *Widget_Create(void) return NULL; This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - This->lpVtbl = &Widget_VTable; + This->IWidget_iface.lpVtbl = &Widget_VTable; This->refs = 1; This->pDispatchUnknown = NULL; - hr = CreateStdDispatch((IUnknown *)&This->lpVtbl, This, pTypeInfo, &This->pDispatchUnknown); + hr = CreateStdDispatch((IUnknown *)&This->IWidget_iface, This, pTypeInfo, + &This->pDispatchUnknown); ok_ole_success(hr, CreateStdDispatch); ITypeInfo_Release(pTypeInfo); if (SUCCEEDED(hr)) - return (IWidget *)&This->lpVtbl; + return &This->IWidget_iface; else { HeapFree(GetProcessHeap(), 0, This); @@ -815,7 +826,7 @@ static HRESULT WINAPI KindaEnum_QueryInterface( static ULONG WINAPI KindaEnum_AddRef( IKindaEnumWidget *iface) { - KindaEnum *This = (KindaEnum *)iface; + KindaEnum *This = impl_from_IKindaEnumWidget(iface); return InterlockedIncrement(&This->refs); } @@ -823,7 +834,7 @@ static ULONG WINAPI KindaEnum_AddRef( static ULONG WINAPI KindaEnum_Release( IKindaEnumWidget *iface) { - KindaEnum *This = (KindaEnum *)iface; + KindaEnum *This = impl_from_IKindaEnumWidget(iface); ULONG refs = InterlockedDecrement(&This->refs); if (!refs) { @@ -883,9 +894,9 @@ static IKindaEnumWidget *KindaEnumWidget_Create(void) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return NULL; - This->lpVtbl = &KindaEnumWidget_VTable; + This->IKindaEnumWidget_iface.lpVtbl = &KindaEnumWidget_VTable; This->refs = 1; - return (IKindaEnumWidget *)This; + return &This->IKindaEnumWidget_iface; } static HRESULT WINAPI NonOleAutomation_QueryInterface(INonOleAutomation *iface, REFIID riid, void **ppv)

1 0

Michael Stefaniuc : qcap: Use ifaces instead of vtbl pointers in VfwCapture .
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 671400c45591d000cbc2ef9b707ec84d355175f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=671400c45591d000cbc2ef9b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 21 11:31:10 2010 +0100 qcap: Use ifaces instead of vtbl pointers in VfwCapture. --- dlls/qcap/vfwcapture.c | 65 +++++++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 387a05e..4492eab 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -60,9 +60,9 @@ static HRESULT VfwPin_Construct( IBaseFilter *, LPCRITICAL_SECTION, IPin ** ); typedef struct VfwCapture { BaseFilter filter; - const IAMStreamConfigVtbl * IAMStreamConfig_vtbl; - const IAMVideoProcAmpVtbl * IAMVideoProcAmp_vtbl; - const IPersistPropertyBagVtbl * IPersistPropertyBag_vtbl; + IAMStreamConfig IAMStreamConfig_iface; + IAMVideoProcAmp IAMVideoProcAmp_iface; + IPersistPropertyBag IPersistPropertyBag_iface; BOOL init; Capture *driver_info; @@ -70,6 +70,21 @@ typedef struct VfwCapture IPin * pOutputPin; } VfwCapture; +static inline VfwCapture *impl_from_IAMStreamConfig(IAMStreamConfig *iface) +{ + return CONTAINING_RECORD(iface, VfwCapture, IAMStreamConfig_iface); +} + +static inline VfwCapture *impl_from_IAMVideoProcAmp(IAMVideoProcAmp *iface) +{ + return CONTAINING_RECORD(iface, VfwCapture, IAMVideoProcAmp_iface); +} + +static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) +{ + return CONTAINING_RECORD(iface, VfwCapture, IPersistPropertyBag_iface); +} + /* VfwPin implementation */ typedef struct VfwPinImpl { @@ -119,9 +134,9 @@ IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) BaseFilter_Init(&pVfwCapture->filter, &VfwCapture_Vtbl, &CLSID_VfwCapture, (DWORD_PTR)(__FILE__ ": VfwCapture.csFilter"), &BaseFuncTable); - pVfwCapture->IAMStreamConfig_vtbl = &IAMStreamConfig_VTable; - pVfwCapture->IAMVideoProcAmp_vtbl = &IAMVideoProcAmp_VTable; - pVfwCapture->IPersistPropertyBag_vtbl = &IPersistPropertyBag_VTable; + pVfwCapture->IAMStreamConfig_iface.lpVtbl = &IAMStreamConfig_VTable; + pVfwCapture->IAMVideoProcAmp_iface.lpVtbl = &IAMVideoProcAmp_VTable; + pVfwCapture->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; pVfwCapture->init = FALSE; hr = VfwPin_Construct((IBaseFilter *)&pVfwCapture->filter.lpVtbl, @@ -152,11 +167,11 @@ static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid *ppv = This; } else if (IsEqualIID(riid, &IID_IAMStreamConfig)) - *ppv = &(This->IAMStreamConfig_vtbl); + *ppv = &This->IAMStreamConfig_iface; else if (IsEqualIID(riid, &IID_IAMVideoProcAmp)) - *ppv = &(This->IAMVideoProcAmp_vtbl); + *ppv = &This->IAMVideoProcAmp_iface; else if (IsEqualIID(riid, &IID_IPersistPropertyBag)) - *ppv = &(This->IPersistPropertyBag_vtbl); + *ppv = &This->IPersistPropertyBag_iface; if (!IsEqualIID(riid, &IID_IUnknown) && !IsEqualIID(riid, &IID_IPersist) && @@ -271,7 +286,7 @@ static const IBaseFilterVtbl VfwCapture_Vtbl = static HRESULT WINAPI AMStreamConfig_QueryInterface( IAMStreamConfig * iface, REFIID riid, LPVOID * ppv ) { - ICOM_THIS_MULTI(VfwCapture, IAMStreamConfig_vtbl, iface); + VfwCapture *This = impl_from_IAMStreamConfig(iface); TRACE("%p --> %s\n", This, debugstr_guid(riid)); @@ -289,7 +304,7 @@ AMStreamConfig_QueryInterface( IAMStreamConfig * iface, REFIID riid, LPVOID * pp static ULONG WINAPI AMStreamConfig_AddRef( IAMStreamConfig * iface ) { - ICOM_THIS_MULTI(VfwCapture, IAMStreamConfig_vtbl, iface); + VfwCapture *This = impl_from_IAMStreamConfig(iface); TRACE("%p --> Forwarding to VfwCapture (%p)\n", iface, This); return IUnknown_AddRef((IUnknown *)This); @@ -297,7 +312,7 @@ static ULONG WINAPI AMStreamConfig_AddRef( IAMStreamConfig * iface ) static ULONG WINAPI AMStreamConfig_Release( IAMStreamConfig * iface ) { - ICOM_THIS_MULTI(VfwCapture, IAMStreamConfig_vtbl, iface); + VfwCapture *This = impl_from_IAMStreamConfig(iface); TRACE("%p --> Forwarding to VfwCapture (%p)\n", iface, This); return IUnknown_Release((IUnknown *)This); @@ -307,7 +322,7 @@ static HRESULT WINAPI AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) { HRESULT hr; - ICOM_THIS_MULTI(VfwCapture, IAMStreamConfig_vtbl, iface); + VfwCapture *This = impl_from_IAMStreamConfig(iface); BasePin *pin; TRACE("(%p): %p->%p\n", iface, pmt, pmt ? pmt->pbFormat : NULL); @@ -349,7 +364,7 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt) static HRESULT WINAPI AMStreamConfig_GetFormat( IAMStreamConfig *iface, AM_MEDIA_TYPE **pmt ) { - ICOM_THIS_MULTI(VfwCapture, IAMStreamConfig_vtbl, iface); + VfwCapture *This = impl_from_IAMStreamConfig(iface); TRACE("%p -> (%p)\n", iface, pmt); return qcap_driver_get_format(This->driver_info, pmt); @@ -400,14 +415,14 @@ AMVideoProcAmp_QueryInterface( IAMVideoProcAmp * iface, REFIID riid, static ULONG WINAPI AMVideoProcAmp_AddRef(IAMVideoProcAmp * iface) { - ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface); + VfwCapture *This = impl_from_IAMVideoProcAmp(iface); return IUnknown_AddRef((IUnknown *)This); } static ULONG WINAPI AMVideoProcAmp_Release(IAMVideoProcAmp * iface) { - ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface); + VfwCapture *This = impl_from_IAMVideoProcAmp(iface); return IUnknown_Release((IUnknown *)This); } @@ -416,7 +431,7 @@ static HRESULT WINAPI AMVideoProcAmp_GetRange( IAMVideoProcAmp * iface, LONG Property, LONG *pMin, LONG *pMax, LONG *pSteppingDelta, LONG *pDefault, LONG *pCapsFlags ) { - ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface); + VfwCapture *This = impl_from_IAMVideoProcAmp(iface); return qcap_driver_get_prop_range( This->driver_info, Property, pMin, pMax, pSteppingDelta, pDefault, pCapsFlags ); @@ -426,7 +441,7 @@ static HRESULT WINAPI AMVideoProcAmp_Set( IAMVideoProcAmp * iface, LONG Property, LONG lValue, LONG Flags ) { - ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface); + VfwCapture *This = impl_from_IAMVideoProcAmp(iface); return qcap_driver_set_prop(This->driver_info, Property, lValue, Flags); } @@ -435,7 +450,7 @@ static HRESULT WINAPI AMVideoProcAmp_Get( IAMVideoProcAmp * iface, LONG Property, LONG *lValue, LONG *Flags ) { - ICOM_THIS_MULTI(VfwCapture, IAMVideoProcAmp_vtbl, iface); + VfwCapture *This = impl_from_IAMVideoProcAmp(iface); return qcap_driver_get_prop(This->driver_info, Property, lValue, Flags); } @@ -475,7 +490,7 @@ PPB_QueryInterface( IPersistPropertyBag * iface, REFIID riid, LPVOID * ppv ) static ULONG WINAPI PPB_AddRef(IPersistPropertyBag * iface) { - ICOM_THIS_MULTI(VfwCapture, IPersistPropertyBag_vtbl, iface); + VfwCapture *This = impl_from_IPersistPropertyBag(iface); TRACE("%p --> Forwarding to VfwCapture (%p)\n", iface, This); @@ -484,7 +499,7 @@ static ULONG WINAPI PPB_AddRef(IPersistPropertyBag * iface) static ULONG WINAPI PPB_Release(IPersistPropertyBag * iface) { - ICOM_THIS_MULTI(VfwCapture, IPersistPropertyBag_vtbl, iface); + VfwCapture *This = impl_from_IPersistPropertyBag(iface); TRACE("%p --> Forwarding to VfwCapture (%p)\n", iface, This); @@ -494,7 +509,7 @@ static ULONG WINAPI PPB_Release(IPersistPropertyBag * iface) static HRESULT WINAPI PPB_GetClassID( IPersistPropertyBag * iface, CLSID * pClassID ) { - ICOM_THIS_MULTI(VfwCapture, IPersistPropertyBag_vtbl, iface); + VfwCapture *This = impl_from_IPersistPropertyBag(iface); FIXME("%p - stub\n", This); @@ -503,7 +518,7 @@ PPB_GetClassID( IPersistPropertyBag * iface, CLSID * pClassID ) static HRESULT WINAPI PPB_InitNew(IPersistPropertyBag * iface) { - ICOM_THIS_MULTI(VfwCapture, IPersistPropertyBag_vtbl, iface); + VfwCapture *This = impl_from_IPersistPropertyBag(iface); FIXME("%p - stub\n", This); @@ -514,7 +529,7 @@ static HRESULT WINAPI PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag, IErrorLog *pErrorLog ) { - ICOM_THIS_MULTI(VfwCapture, IPersistPropertyBag_vtbl, iface); + VfwCapture *This = impl_from_IPersistPropertyBag(iface); HRESULT hr; VARIANT var; const OLECHAR VFWIndex[] = {'V','F','W','I','n','d','e','x',0}; @@ -549,7 +564,7 @@ static HRESULT WINAPI PPB_Save( IPersistPropertyBag * iface, IPropertyBag *pPropBag, BOOL fClearDirty, BOOL fSaveAllProperties ) { - ICOM_THIS_MULTI(VfwCapture, IPersistPropertyBag_vtbl, iface); + VfwCapture *This = impl_from_IPersistPropertyBag(iface); FIXME("%p - stub\n", This); return E_NOTIMPL; }

1 0

Michael Stefaniuc : d3dx9_36: Use an iface instead of an vtbl pointer in ID3DXConstantTableImpl.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 303f84c4093a431ac4da9ec70fb7dd1bc55e8b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=303f84c4093a431ac4da9ec70… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 21 11:30:28 2010 +0100 d3dx9_36: Use an iface instead of an vtbl pointer in ID3DXConstantTableImpl. --- dlls/d3dx9_36/shader.c | 65 +++++++++++++++++++++++++---------------------- 1 files changed, 35 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=303f84c4093a431ac4da9…

1 0

Rico Schüller : d3dcompiler: Parse ISGN in the reflection interface.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: f8e4771be4bfee1b67eb32c0bcdd763fb944b779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e4771be4bfee1b67eb32c0b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 21 11:06:11 2010 +0100 d3dcompiler: Parse ISGN in the reflection interface. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 9 +++ dlls/d3dcompiler_43/reflection.c | 108 ++++++++++++++++++++++++++++- 2 files changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3e0915a..5c4f80f 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -57,6 +57,13 @@ HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) D HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN; HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN; +struct d3dcompiler_shader_signature +{ + D3D11_SIGNATURE_PARAMETER_DESC *elements; + UINT element_count; + char *string_data; +}; + /* ID3D11ShaderReflection */ struct d3dcompiler_shader_reflection { @@ -89,6 +96,8 @@ struct d3dcompiler_shader_reflection D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; D3D_TESSELLATOR_PARTITIONING hs_prtitioning; D3D_TESSELLATOR_DOMAIN tessellator_domain; + + struct d3dcompiler_shader_signature *isgn; }; /* reflection handling */ diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e0f634c..1e287de 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -25,6 +25,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +static void free_signature(struct d3dcompiler_shader_signature *sig) +{ + TRACE("Free signature %p\n", sig); + + HeapFree(GetProcessHeap(), 0, sig->elements); + HeapFree(GetProcessHeap(), 0, sig->string_data); +} + +static void reflection_cleanup(struct d3dcompiler_shader_reflection *ref) +{ + TRACE("Cleanup %p\n", ref); + + if (ref->isgn) + { + free_signature(ref->isgn); + HeapFree(GetProcessHeap(), 0, ref->isgn); + } +} + static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflection(ID3D11ShaderReflection *iface) { return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D11ShaderReflection_iface); @@ -69,6 +88,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade if (!refcount) { + reflection_cleanup(This); HeapFree(GetProcessHeap(), 0, This); } @@ -361,6 +381,68 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c return E_FAIL; } +HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, const char *data, DWORD data_size) +{ + D3D11_SIGNATURE_PARAMETER_DESC *d; + unsigned int string_data_offset; + unsigned int string_data_size; + const char *ptr = data; + char *string_data; + unsigned int i; + DWORD count; + + read_dword(&ptr, &count); + TRACE("%u elements\n", count); + + skip_dword_unknown(&ptr, 1); + + d = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*d)); + if (!d) + { + ERR("Failed to allocate signature memory.\n"); + return E_OUTOFMEMORY; + } + + /* 2 DWORDs for the header, 6 for each element. */ + string_data_offset = 2 * sizeof(DWORD) + count * 6 * sizeof(DWORD); + string_data_size = data_size - string_data_offset; + string_data = HeapAlloc(GetProcessHeap(), 0, string_data_size); + if (!string_data) + { + ERR("Failed to allocate string data memory.\n"); + HeapFree(GetProcessHeap(), 0, d); + return E_OUTOFMEMORY; + } + memcpy(string_data, data + string_data_offset, string_data_size); + + for (i = 0; i < count; ++i) + { + UINT name_offset; + DWORD mask; + + read_dword(&ptr, &name_offset); + d[i].SemanticName = string_data + (name_offset - string_data_offset); + read_dword(&ptr, &d[i].SemanticIndex); + read_dword(&ptr, &d[i].SystemValueType); + read_dword(&ptr, &d[i].ComponentType); + read_dword(&ptr, &d[i].Register); + read_dword(&ptr, &mask); + d[i].ReadWriteMask = (mask >> 8) & 0xff; + d[i].Mask = mask & 0xff; + + TRACE("semantic: %s, semantic idx: %u, sysval_semantic %#x, " + "type %u, register idx: %u, use_mask %#x, input_mask %#x, stream %u\n", + debugstr_a(d[i].SemanticName), d[i].SemanticIndex, d[i].SystemValueType, + d[i].ComponentType, d[i].Register, d[i].Mask, d[i].ReadWriteMask, d[i].Stream); + } + + s->elements = d; + s->element_count = count; + s->string_data = string_data; + + return S_OK; +} + HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection *reflection, const void *data, SIZE_T data_size) { @@ -388,9 +470,25 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection hr = d3dcompiler_parse_stat(reflection, section->data, section->data_size); if (FAILED(hr)) { - dxbc_destroy(&src_dxbc); WARN("Failed to parse section STAT.\n"); - return hr; + goto err_out; + } + break; + + case TAG_ISGN: + reflection->isgn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*reflection->isgn)); + if (!reflection->isgn) + { + ERR("Failed to allocate ISGN memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + hr = d3dcompiler_parse_signature(reflection->isgn, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse section ISGN.\n"); + goto err_out; } break; @@ -403,4 +501,10 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection dxbc_destroy(&src_dxbc); return hr; + +err_out: + reflection_cleanup(reflection); + dxbc_destroy(&src_dxbc); + + return hr; }

1 0

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 December 2010