wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Jacek Caban : msi: Ude default calling convention for internal functions.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 9ef5af540b560fd16c77efdc32f974bbf8dca3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef5af540b560fd16c77efdc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 16:15:22 2011 +0200 msi: Ude default calling convention for internal functions. --- dlls/msi/automation.c | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 1be56b1..8dc1e44 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -67,7 +67,7 @@ struct AutomationObject { MSIHANDLE msiHandle; /* A function that is called from AutomationObject::Invoke, specific to this type of object. */ - HRESULT (STDMETHODCALLTYPE *funcInvoke)( + HRESULT (*funcInvoke)( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -80,7 +80,7 @@ struct AutomationObject { /* A function that is called from AutomationObject::Release when the object is being freed to free any private * data structures (or NULL) */ - void (STDMETHODCALLTYPE *funcFree)(AutomationObject* This); + void (*funcFree)(AutomationObject* This); }; /* @@ -151,11 +151,9 @@ HRESULT load_type_info(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID /* Create the automation object, placing the result in the pointer ppObj. The automation object is created * with the appropriate clsid and invocation function. */ -static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOID *ppObj, REFIID clsid, - HRESULT (STDMETHODCALLTYPE *funcInvoke)(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*, - VARIANT*,EXCEPINFO*,UINT*), - void (STDMETHODCALLTYPE *funcFree)(AutomationObject*), - SIZE_T sizetPrivateData) +static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, void **ppObj, REFIID clsid, + HRESULT (*funcInvoke)(AutomationObject*,DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*), + void (*funcFree)(AutomationObject*), SIZE_T sizetPrivateData) { AutomationObject *object; HRESULT hr; @@ -732,7 +730,7 @@ static HRESULT DispGetParam_CopyOnly( &pdispparams->rgvarg[pos]); } -static HRESULT WINAPI SummaryInfoImpl_Invoke( +static HRESULT SummaryInfoImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -884,7 +882,7 @@ static HRESULT WINAPI SummaryInfoImpl_Invoke( return S_OK; } -static HRESULT WINAPI RecordImpl_Invoke( +static HRESULT RecordImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -975,7 +973,7 @@ static HRESULT WINAPI RecordImpl_Invoke( return S_OK; } -static HRESULT WINAPI ListImpl_Invoke( +static HRESULT ListImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -1034,7 +1032,7 @@ static HRESULT WINAPI ListImpl_Invoke( return S_OK; } -static void WINAPI ListImpl_Free(AutomationObject *This) +static void ListImpl_Free(AutomationObject *This) { ListData *data = private_data(This); ULONG idx; @@ -1044,7 +1042,7 @@ static void WINAPI ListImpl_Free(AutomationObject *This) msi_free(data->pVars); } -static HRESULT WINAPI ViewImpl_Invoke( +static HRESULT ViewImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -1151,7 +1149,7 @@ static HRESULT DatabaseImpl_LastErrorRecord(WORD wFlags, return S_OK; } -static HRESULT WINAPI DatabaseImpl_Invoke( +static HRESULT DatabaseImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -1236,7 +1234,7 @@ static HRESULT WINAPI DatabaseImpl_Invoke( return S_OK; } -static HRESULT WINAPI SessionImpl_Invoke( +static HRESULT SessionImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -2306,7 +2304,7 @@ done: return hr; } -static HRESULT WINAPI InstallerImpl_Invoke( +static HRESULT InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid,

1 0

Jacek Caban : msi: Use struct instead of interface in object declarations.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 81031c532eac726e95e6cf506c8d7de9f0bf3c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81031c532eac726e95e6cf506… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 16:15:12 2011 +0200 msi: Use struct instead of interface in object declarations. --- dlls/msi/automation.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index d6ef5c9..1be56b1 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -47,9 +47,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); * called from AutomationObject::Invoke, and pass this function to create_automation_object. */ -typedef interface AutomationObject AutomationObject; +typedef struct AutomationObject AutomationObject; -interface AutomationObject { +struct AutomationObject { /* * VTables - We provide IDispatch, IProvideClassInfo, IProvideClassInfo2, IProvideMultipleClassInfo */ @@ -87,9 +87,7 @@ interface AutomationObject { * ListEnumerator - IEnumVARIANT implementation for MSI automation lists. */ -typedef interface ListEnumerator ListEnumerator; - -interface ListEnumerator { +typedef struct { /* VTables */ const IEnumVARIANTVtbl *lpVtbl; @@ -99,7 +97,7 @@ interface ListEnumerator { /* Current position and pointer to AutomationObject that stores actual data */ ULONG ulPos; AutomationObject *pObj; -}; +} ListEnumerator; /* * Structures for additional data required by specific automation objects

1 0

Michael Stefaniuc : shell32: Move ISvBgCm_Constructor() to avoid a forward declaration.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 6419969c386ef4103e20290b2846275967022b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6419969c386ef4103e20290b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 14:16:37 2011 +0200 shell32: Move ISvBgCm_Constructor() to avoid a forward declaration. --- dlls/shell32/shv_bg_cmenu.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index 7b9e6c6..b67dc4d 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -49,33 +49,12 @@ typedef struct UINT verb_offset; } BgCmImpl; - -static const IContextMenu2Vtbl cmvt; - static inline BgCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) { return CONTAINING_RECORD(iface, BgCmImpl, IContextMenu2_iface); } /************************************************************************** -* ISVBgCm_Constructor() -*/ -IContextMenu2 *ISvBgCm_Constructor(IShellFolder* pSFParent, BOOL bDesktop) -{ - BgCmImpl* cm; - - cm = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(BgCmImpl)); - cm->IContextMenu2_iface.lpVtbl = &cmvt; - cm->ref = 1; - cm->pSFParent = pSFParent; - cm->bDesktop = bDesktop; - if(pSFParent) IShellFolder_AddRef(pSFParent); - - TRACE("(%p)->()\n",cm); - return &cm->IContextMenu2_iface; -} - -/************************************************************************** * ISVBgCm_fnQueryInterface */ static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) @@ -461,3 +440,18 @@ static const IContextMenu2Vtbl cmvt = ISVBgCm_fnGetCommandString, ISVBgCm_fnHandleMenuMsg }; + +IContextMenu2 *ISvBgCm_Constructor(IShellFolder *pSFParent, BOOL bDesktop) +{ + BgCmImpl *cm; + + cm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cm)); + cm->IContextMenu2_iface.lpVtbl = &cmvt; + cm->ref = 1; + cm->pSFParent = pSFParent; + cm->bDesktop = bDesktop; + if(pSFParent) IShellFolder_AddRef(pSFParent); + + TRACE("(%p)->()\n", cm); + return &cm->IContextMenu2_iface; +}

1 0

Michael Stefaniuc : shell32: COM cleanup in shv_bg_cmenu.c.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 47a705965b8f5c9ca5fdd42e54df3a9a104bdcad URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a705965b8f5c9ca5fdd42e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 14:15:45 2011 +0200 shell32: COM cleanup in shv_bg_cmenu.c. --- dlls/shell32/shv_bg_cmenu.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index bd99d3a..7b9e6c6 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); */ typedef struct { - const IContextMenu2Vtbl *lpVtbl; + IContextMenu2 IContextMenu2_iface; IShellFolder* pSFParent; LONG ref; BOOL bDesktop; @@ -52,6 +52,11 @@ typedef struct static const IContextMenu2Vtbl cmvt; +static inline BgCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) +{ + return CONTAINING_RECORD(iface, BgCmImpl, IContextMenu2_iface); +} + /************************************************************************** * ISVBgCm_Constructor() */ @@ -60,14 +65,14 @@ IContextMenu2 *ISvBgCm_Constructor(IShellFolder* pSFParent, BOOL bDesktop) BgCmImpl* cm; cm = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(BgCmImpl)); - cm->lpVtbl = &cmvt; + cm->IContextMenu2_iface.lpVtbl = &cmvt; cm->ref = 1; cm->pSFParent = pSFParent; cm->bDesktop = bDesktop; if(pSFParent) IShellFolder_AddRef(pSFParent); TRACE("(%p)->()\n",cm); - return (IContextMenu2*)cm; + return &cm->IContextMenu2_iface; } /************************************************************************** @@ -75,7 +80,7 @@ IContextMenu2 *ISvBgCm_Constructor(IShellFolder* pSFParent, BOOL bDesktop) */ static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) { - BgCmImpl *This = (BgCmImpl *)iface; + BgCmImpl *This = impl_from_IContextMenu2(iface); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); @@ -107,7 +112,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid */ static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface) { - BgCmImpl *This = (BgCmImpl *)iface; + BgCmImpl *This = impl_from_IContextMenu2(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -120,7 +125,7 @@ static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface) */ static ULONG WINAPI ISVBgCm_fnRelease(IContextMenu2 *iface) { - BgCmImpl *This = (BgCmImpl *)iface; + BgCmImpl *This = impl_from_IContextMenu2(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(count=%i)\n", This, refCount + 1); @@ -149,12 +154,11 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu( UINT idCmdLast, UINT uFlags) { - HMENU hMyMenu; - UINT idMax; + BgCmImpl *This = impl_from_IContextMenu2(iface); + HMENU hMyMenu; + UINT idMax; HRESULT hr; - BgCmImpl *This = (BgCmImpl *)iface; - TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -318,9 +322,8 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( IContextMenu2 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - BgCmImpl *This = (BgCmImpl *)iface; - - LPSHELLBROWSER lpSB; + BgCmImpl *This = impl_from_IContextMenu2(iface); + LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV = NULL; HWND hWndSV = 0; @@ -405,7 +408,7 @@ static HRESULT WINAPI ISVBgCm_fnGetCommandString( LPSTR lpszName, UINT uMaxNameLen) { - BgCmImpl *This = (BgCmImpl *)iface; + BgCmImpl *This = impl_from_IContextMenu2(iface); TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); @@ -437,7 +440,7 @@ static HRESULT WINAPI ISVBgCm_fnHandleMenuMsg( WPARAM wParam, LPARAM lParam) { - BgCmImpl *This = (BgCmImpl *)iface; + BgCmImpl *This = impl_from_IContextMenu2(iface); FIXME("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam);

1 0

Michael Stefaniuc : shell32: Pass objects instead of ifaces to helpers.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 2cf8335d70044c6c33c0499650eb8f9e6daa4fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf8335d70044c6c33c049965… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 14:14:10 2011 +0200 shell32: Pass objects instead of ifaces to helpers. --- dlls/shell32/shv_bg_cmenu.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index 5b1b434..bd99d3a 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -189,10 +189,9 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu( * DoNewFolder */ static void DoNewFolder( - IContextMenu2 *iface, + BgCmImpl *This, IShellView *psv) { - BgCmImpl *This = (BgCmImpl *)iface; ISFHelper * psfhlp; WCHAR wszName[MAX_PATH]; @@ -220,9 +219,8 @@ static void DoNewFolder( * DoPaste */ static BOOL DoPaste( - IContextMenu2 *iface) + BgCmImpl *This) { - BgCmImpl *This = (BgCmImpl *)iface; BOOL bSuccess = FALSE; IDataObject * pda; @@ -343,7 +341,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( if (! strcmp(lpcmi->lpVerb,CMDSTR_NEWFOLDERA)) { - DoNewFolder(iface, lpSV); + DoNewFolder(This, lpSV); } else if (! strcmp(lpcmi->lpVerb,CMDSTR_VIEWLISTA)) { @@ -367,11 +365,11 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( break; case FCIDM_SHVIEW_NEWFOLDER: - DoNewFolder(iface, lpSV); + DoNewFolder(This, lpSV); break; case FCIDM_SHVIEW_INSERT: - DoPaste(iface); + DoPaste(This); break; case FCIDM_SHVIEW_PROPERTIES:

1 0

Octavian Voicu : ole32: Fix a few incorrect pointer/integer casts on 64-bit .
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 9b1fc0fd74d48bffb3987bb3c59088b2fd16d607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b1fc0fd74d48bffb3987bb3c… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Aug 31 13:52:02 2011 +0300 ole32: Fix a few incorrect pointer/integer casts on 64-bit. --- dlls/ole32/pointermoniker.c | 2 +- dlls/ole32/tests/moniker.c | 4 ++-- dlls/ole32/usrmarshal.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index d79afd2..d39be1d 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -370,7 +370,7 @@ static HRESULT WINAPI PointerMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) if (pdwHash==NULL) return E_POINTER; - *pdwHash = (DWORD)This->pObject; + *pdwHash = PtrToUlong(This->pObject); return S_OK; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 54a5f8c..aa57b9b 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1780,9 +1780,9 @@ static void test_pointer_moniker(void) /* Hashing */ hr = IMoniker_Hash(moniker, &hash); ok_ole_success(hr, IMoniker_Hash); - ok(hash == (DWORD)&Test_ClassFactory, + ok(hash == PtrToUlong(&Test_ClassFactory), "Hash value should have been 0x%08x, instead of 0x%08x\n", - (DWORD)&Test_ClassFactory, hash); + PtrToUlong(&Test_ClassFactory), hash); /* IsSystemMoniker test */ hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 2d238e6..8f5feef 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -429,7 +429,7 @@ unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBu { *(ULONG *)pBuffer = WDT_REMOTE_CALL; pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = (ULONG)*phGlobal; + *(ULONG *)pBuffer = HandleToULong(*phGlobal); pBuffer += sizeof(ULONG); if (*phGlobal) { @@ -437,7 +437,7 @@ unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBu SIZE_T size = GlobalSize(*phGlobal); *(ULONG *)pBuffer = (ULONG)size; pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = (ULONG)*phGlobal; + *(ULONG *)pBuffer = HandleToULong(*phGlobal); pBuffer += sizeof(ULONG); *(ULONG *)pBuffer = (ULONG)size; pBuffer += sizeof(ULONG);

1 0

Octavian Voicu : ieframe: Fix a few incorrect pointer/ integer casts on 64-bit.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: f8d0afe4355d5054359585f61bef846f66d0e9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8d0afe4355d5054359585f61… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Aug 31 13:51:24 2011 +0300 ieframe: Fix a few incorrect pointer/integer casts on 64-bit. --- dlls/ieframe/iexplore.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 99e3003..d5fd56c 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -873,7 +873,7 @@ static BOOL create_ie_window(LPCSTR cmdline) return TRUE; } -static ULONG open_dde_url(WCHAR *dde_url) +static HDDEDATA open_dde_url(WCHAR *dde_url) { InternetExplorer *ie = NULL, *iter; WCHAR *url, *url_end; @@ -928,7 +928,7 @@ static ULONG open_dde_url(WCHAR *dde_url) return 0; IWebBrowser2_Release(&ie->IWebBrowser2_iface); - return DDE_FACK; + return ULongToHandle(DDE_FACK); } static HDDEDATA WINAPI dde_proc(UINT type, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA data, @@ -937,7 +937,7 @@ static HDDEDATA WINAPI dde_proc(UINT type, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ switch(type) { case XTYP_CONNECT: TRACE("XTYP_CONNECT %p\n", hsz1); - return (HDDEDATA)!DdeCmpStringHandles(hsz1, ddestr_openurl); + return ULongToHandle(!DdeCmpStringHandles(hsz1, ddestr_openurl)); case XTYP_EXECUTE: { WCHAR *url; @@ -961,7 +961,7 @@ static HDDEDATA WINAPI dde_proc(UINT type, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ break; } - ret = (HDDEDATA)open_dde_url(url); + ret = open_dde_url(url); heap_free(url); return ret; @@ -999,7 +999,7 @@ static void init_dde(void) if(!ddestr_openurl) WARN("Failed to create string handle: %u\n", DdeGetLastError(dde_inst)); - res = (ULONG)DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER); + res = HandleToULong(DdeNameService(dde_inst, ddestr_iexplore, 0, DNS_REGISTER)); if(res != DMLERR_NO_ERROR) WARN("DdeNameService failed: %u\n", res); }

1 0

Octavian Voicu : msxml3/tests: Fix a warning in saxreader tests when compiling on x64.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 9e3d83e003f89cc3f8666d88e90d94b0e266ed69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3d83e003f89cc3f8666d88e… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Aug 31 02:20:59 2011 +0300 msxml3/tests: Fix a warning in saxreader tests when compiling on x64. --- dlls/msxml3/tests/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index b5800d0..8a75211 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1934,7 +1934,7 @@ static void test_mxwriter_stream(void) IMXWriter_Release(writer); ok(current_write_test->last, "The last %d write calls on test %d were missed\n", - current_write_test-test->expected_writes, current_stream_test_index); + (int)(current_write_test-test->expected_writes), current_stream_test_index); } hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER,

1 0

Frédéric Delanoy : cmd/tests: Add pushd/ popd tests.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: ba094f2830c460174557a3c5726025eb1a1bd3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba094f2830c460174557a3c57… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 30 23:33:52 2011 +0200 cmd/tests: Add pushd/popd tests. --- programs/cmd/tests/test_builtins.cmd | 33 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 15 +++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f473b91..5bd375e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1027,6 +1027,39 @@ if not exist foobar (echo foobar removed) else echo foobar not removed! if not exist bar\baz (echo bar\baz removed) else echo bar\baz not removed! cd .. & rd /s/q foobaz +echo ----------- Testing pushd/popd ----------- +cd +echo ...popd is no-op when dir stack is empty +popd +cd +echo ...pushing non-existing dir +pushd foobar +cd +echo ...basic behaviour +mkdir foobar\baz +pushd foobar +cd +popd +cd +pushd foobar +pushd baz +cd +popd +cd +pushd baz +popd +cd +popd +cd +pushd . +cd foobar\baz +pushd .. +cd +popd +popd +cd +rd /s/q foobar + echo ------------ Testing attrib -------------- rem FIXME Add tests for archive, hidden and system attributes + mixed attributes modifications mkdir foobar & cd foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5419476..c67b10f 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -634,6 +634,21 @@ foo removed bar removed foobar removed bar\baz removed +----------- Testing pushd/popd ----------- +@pwd@ +...popd is no-op when dir stack is empty +@pwd@ +...pushing non-existing dir +@pwd@ +...basic behaviour +@pwd@\foobar +@pwd@ +@pwd@\foobar\baz +@pwd@\foobar +@pwd@\foobar +@pwd@ +@pwd@\foobar +@pwd@ ------------ Testing attrib -------------- @todo_wine@A @pwd@\foobar\foo@or_broken@A @pwd@\foobar\foo@or_broken@A I @pwd@\foobar\foo ... read-only attribute

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateTextW.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 2f1917956b9a568682822a851139821f548ac8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1917956b9a568682822a851… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 19:05:52 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateTextW. --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index d07d4bd..04ee7d0 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5344,11 +5344,11 @@ HRESULT WINAPI D3DXCreateTextW(LPDIRECT3DDEVICE9 device, if (FAILED(hr)) goto error; - hr = mesh->lpVtbl->LockVertexBuffer(mesh, D3DLOCK_DISCARD, (LPVOID *)&vertices); + hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, (LPVOID *)&vertices); if (FAILED(hr)) goto error; - hr = mesh->lpVtbl->LockIndexBuffer(mesh, D3DLOCK_DISCARD, (LPVOID *)&faces); + hr = mesh->lpVtbl->LockIndexBuffer(mesh, 0, (LPVOID *)&faces); if (FAILED(hr)) goto error;

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 August 2011