wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Michael Stefaniuc : shell32: COM cleanup for the IContextMenu2 iface.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: c40a6eee4c56da1b3002ed35ffde07511ee3d5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40a6eee4c56da1b3002ed35f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:47:45 2011 +0200 shell32: COM cleanup for the IContextMenu2 iface. --- dlls/shell32/shv_item_cmenu.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index bf00e70..62c4c7f 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -46,7 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); * IContextMenu Implementation */ typedef struct -{ const IContextMenu2Vtbl *lpVtbl; +{ + IContextMenu2 IContextMenu2_iface; LONG ref; IShellFolder* pSFParent; LPITEMIDLIST pidl; /* root pidl */ @@ -55,6 +56,11 @@ typedef struct BOOL bAllValues; } ItemCmImpl; +static inline ItemCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) +{ + return CONTAINING_RECORD(iface, ItemCmImpl, IContextMenu2_iface); +} + static const IContextMenu2Vtbl cmvt; @@ -86,7 +92,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl UINT u; cm = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ItemCmImpl)); - cm->lpVtbl = &cmvt; + cm->IContextMenu2_iface.lpVtbl = &cmvt; cm->ref = 1; cm->pidl = ILClone(pidl); cm->pSFParent = pSFParent; @@ -104,7 +110,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl TRACE("(%p)->()\n",cm); - return (IContextMenu2*)cm; + return &cm->IContextMenu2_iface; } /************************************************************************** @@ -112,7 +118,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl */ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); @@ -144,7 +150,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID ri */ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -157,7 +163,7 @@ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) */ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(count=%i)\n", This, refCount + 1); @@ -217,7 +223,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( UINT idCmdLast, UINT uFlags) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); INT uIDMax; TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -499,7 +505,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( IContextMenu2 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); if (lpcmi->cbSize != sizeof(CMINVOKECOMMANDINFO)) FIXME("Is an EX structure\n"); @@ -575,7 +581,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( LPSTR lpszName, UINT uMaxNameLen) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); HRESULT hr = E_INVALIDARG; @@ -630,7 +636,7 @@ static HRESULT WINAPI ISvItemCm_fnHandleMenuMsg( WPARAM wParam, LPARAM lParam) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); TRACE("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam);

1 0

Michael Stefaniuc : shell32: Pass object pointers instead of ifaces to internal helpers.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: d06bf13a6dbf96993b497f0ea7c8f8f0ec97b9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06bf13a6dbf96993b497f0ea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:45:04 2011 +0200 shell32: Pass object pointers instead of ifaces to internal helpers. --- dlls/shell32/shv_item_cmenu.c | 44 +++++++++++++--------------------------- 1 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index e5d5e5b..bf00e70 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -267,13 +267,8 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( * for folders only */ -static void DoOpenExplore( - IContextMenu2 *iface, - HWND hwnd, - LPCSTR verb) +static void DoOpenExplore(ItemCmImpl *This, HWND hwnd, LPCSTR verb) { - ItemCmImpl *This = (ItemCmImpl *)iface; - UINT i, bFolderFound = FALSE; LPITEMIDLIST pidlFQ; SHELLEXECUTEINFOA sei; @@ -309,12 +304,8 @@ static void DoOpenExplore( /************************************************************************** * DoRename */ -static void DoRename( - IContextMenu2 *iface, - HWND hwnd) +static void DoRename(ItemCmImpl *This, HWND hwnd) { - ItemCmImpl *This = (ItemCmImpl *)iface; - LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV; @@ -338,9 +329,8 @@ static void DoRename( * * deletes the currently selected items */ -static void DoDelete(IContextMenu2 *iface) +static void DoDelete(ItemCmImpl *This) { - ItemCmImpl *This = (ItemCmImpl *)iface; ISFHelper * psfhlp; IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (LPVOID*)&psfhlp); @@ -356,13 +346,8 @@ static void DoDelete(IContextMenu2 *iface) * * copies the currently selected items into the clipboard */ -static BOOL DoCopyOrCut( - IContextMenu2 *iface, - HWND hwnd, - BOOL bCut) +static BOOL DoCopyOrCut(ItemCmImpl *This, HWND hwnd, BOOL bCut) { - ItemCmImpl *This = (ItemCmImpl *)iface; - LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV; LPDATAOBJECT lpDo; @@ -402,9 +387,8 @@ static BOOL Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARAM lparam) /************************************************************************** * DoOpenProperties */ -static void DoOpenProperties(IContextMenu2 *iface, HWND hwnd) +static void DoOpenProperties(ItemCmImpl *This, HWND hwnd) { - ItemCmImpl *This = (ItemCmImpl *)iface; static const UINT MAX_PROP_PAGES = 99; static const WCHAR wszFolder[] = {'F','o','l','d','e','r', 0}; static const WCHAR wszFiletypeAll[] = {'*',0}; @@ -534,31 +518,31 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( { case FCIDM_SHVIEW_EXPLORE: TRACE("Verb FCIDM_SHVIEW_EXPLORE\n"); - DoOpenExplore(iface, lpcmi->hwnd, "explore"); + DoOpenExplore(This, lpcmi->hwnd, "explore"); break; case FCIDM_SHVIEW_OPEN: TRACE("Verb FCIDM_SHVIEW_OPEN\n"); - DoOpenExplore(iface, lpcmi->hwnd, "open"); + DoOpenExplore(This, lpcmi->hwnd, "open"); break; case FCIDM_SHVIEW_RENAME: TRACE("Verb FCIDM_SHVIEW_RENAME\n"); - DoRename(iface, lpcmi->hwnd); + DoRename(This, lpcmi->hwnd); break; case FCIDM_SHVIEW_DELETE: TRACE("Verb FCIDM_SHVIEW_DELETE\n"); - DoDelete(iface); + DoDelete(This); break; case FCIDM_SHVIEW_COPY: TRACE("Verb FCIDM_SHVIEW_COPY\n"); - DoCopyOrCut(iface, lpcmi->hwnd, FALSE); + DoCopyOrCut(This, lpcmi->hwnd, FALSE); break; case FCIDM_SHVIEW_CUT: TRACE("Verb FCIDM_SHVIEW_CUT\n"); - DoCopyOrCut(iface, lpcmi->hwnd, TRUE); + DoCopyOrCut(This, lpcmi->hwnd, TRUE); break; case FCIDM_SHVIEW_PROPERTIES: TRACE("Verb FCIDM_SHVIEW_PROPERTIES\n"); - DoOpenProperties(iface, lpcmi->hwnd); + DoOpenProperties(This, lpcmi->hwnd); break; default: FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); @@ -569,9 +553,9 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( { TRACE("Verb is %s\n",debugstr_a(lpcmi->lpVerb)); if (strcmp(lpcmi->lpVerb,"delete")==0) - DoDelete(iface); + DoDelete(This); else if (strcmp(lpcmi->lpVerb,"properties")==0) - DoOpenProperties(iface, lpcmi->hwnd); + DoOpenProperties(This, lpcmi->hwnd); else { FIXME("Unhandled string verb %s\n",debugstr_a(lpcmi->lpVerb)); return E_FAIL;

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeInternational iface.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: ef4d631b198580ed1af7b50b5ba807e121f85a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4d631b198580ed1af7b50b5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:43:04 2011 +0200 inetcomm: COM cleanup for the IMimeInternational iface. --- dlls/inetcomm/mimeintl.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 187f1c5..1b15251 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -49,7 +49,7 @@ typedef struct typedef struct { - const IMimeInternationalVtbl *lpVtbl; + IMimeInternational IMimeInternational_iface; LONG refs; CRITICAL_SECTION cs; @@ -58,9 +58,9 @@ typedef struct HCHARSET default_charset; } internat_impl; -static inline internat_impl *impl_from_IMimeInternational( IMimeInternational *iface ) +static inline internat_impl *impl_from_IMimeInternational(IMimeInternational *iface) { - return (internat_impl *)((char*)iface - FIELD_OFFSET(internat_impl, lpVtbl)); + return CONTAINING_RECORD(iface, internat_impl, IMimeInternational_iface); } static inline HRESULT get_mlang(IMultiLanguage **ml) @@ -524,7 +524,7 @@ static internat_impl *global_internat; HRESULT MimeInternational_Construct(IMimeInternational **internat) { global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat)); - global_internat->lpVtbl = &mime_internat_vtbl; + global_internat->IMimeInternational_iface.lpVtbl = &mime_internat_vtbl; global_internat->refs = 0; InitializeCriticalSection(&global_internat->cs); @@ -532,7 +532,7 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) global_internat->next_charset_handle = 0; global_internat->default_charset = NULL; - *internat = (IMimeInternational*)&global_internat->lpVtbl; + *internat = &global_internat->IMimeInternational_iface; IMimeInternational_AddRef(*internat); return S_OK; @@ -542,7 +542,7 @@ HRESULT WINAPI MimeOleGetInternat(IMimeInternational **internat) { TRACE("(%p)\n", internat); - *internat = (IMimeInternational *)&global_internat->lpVtbl; + *internat = &global_internat->IMimeInternational_iface; IMimeInternational_AddRef(*internat); return S_OK; }

1 0

Michael Stefaniuc : inetcomm: Rename a typedef to prevent it from being shadowed.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: a052e29556f975c3e8bb78bcde7042d2b9b63acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a052e29556f975c3e8bb78bcd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:39:17 2011 +0200 inetcomm: Rename a typedef to prevent it from being shadowed. --- dlls/inetcomm/mimeintl.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 97b482e..187f1c5 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -56,11 +56,11 @@ typedef struct struct list charsets; LONG next_charset_handle; HCHARSET default_charset; -} internat; +} internat_impl; -static inline internat *impl_from_IMimeInternational( IMimeInternational *iface ) +static inline internat_impl *impl_from_IMimeInternational( IMimeInternational *iface ) { - return (internat *)((char*)iface - FIELD_OFFSET(internat, lpVtbl)); + return (internat_impl *)((char*)iface - FIELD_OFFSET(internat_impl, lpVtbl)); } static inline HRESULT get_mlang(IMultiLanguage **ml) @@ -85,13 +85,13 @@ static HRESULT WINAPI MimeInternat_QueryInterface( IMimeInternational *iface, RE static ULONG WINAPI MimeInternat_AddRef( IMimeInternational *iface ) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); return InterlockedIncrement(&This->refs); } static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); ULONG refs; refs = InterlockedDecrement(&This->refs); @@ -112,7 +112,7 @@ static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, HCHARSET hCharset) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); TRACE("(%p)->(%p)\n", iface, hCharset); @@ -126,7 +126,7 @@ static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, LPHCHARSET phCharset) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); HRESULT hr = S_OK; TRACE("(%p)->(%p)\n", iface, phCharset); @@ -238,7 +238,7 @@ static HCHARSET add_charset(struct list *list, MIMECSETINFO *mlang_info, HCHARSE static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR pszCharset, LPHCHARSET phCharset) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); HRESULT hr = MIME_E_NOT_FOUND; charset_entry *charset; @@ -278,7 +278,7 @@ static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR static HRESULT WINAPI MimeInternat_GetCharsetInfo(IMimeInternational *iface, HCHARSET hCharset, LPINETCSETINFO pCsetInfo) { - internat *This = impl_from_IMimeInternational( iface ); + internat_impl *This = impl_from_IMimeInternational( iface ); HRESULT hr = MIME_E_INVALID_HANDLE; charset_entry *charset; @@ -519,7 +519,7 @@ static IMimeInternationalVtbl mime_internat_vtbl = MimeInternat_Rfc1522Encode }; -static internat *global_internat; +static internat_impl *global_internat; HRESULT MimeInternational_Construct(IMimeInternational **internat) {

1 0

Michael Stefaniuc : advapi32: Remove wrong "is NULL and error out" code ( coccicheck).
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: b856884c3b27219302598536a05d49fa749c19c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b856884c3b27219302598536a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:33:47 2011 +0200 advapi32: Remove wrong "is NULL and error out" code (coccicheck). --- dlls/advapi32/crypt.c | 5 ----- dlls/advapi32/tests/crypt.c | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index a6f8bc1..26fda66 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1420,11 +1420,6 @@ BOOL WINAPI CryptGenKey (HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYPTKE TRACE("(0x%lx, %d, %08x, %p)\n", hProv, Algid, dwFlags, phKey); - if (!prov) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } if (!phKey || !prov || prov->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 865ffa4..1180275 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -238,6 +238,9 @@ static void test_incorrect_api_usage(void) if (!result) return; pCryptDestroyHash(hHash); + result = pCryptGenKey(0, CALG_RC4, 0, &hKey); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = pCryptGenKey(hProv, CALG_RC4, 0, &hKey); ok (result, "%d\n", GetLastError()); if (!result) return;

1 0

Austin English : ntoskrnl.exe: add a stub for IoSetThreadHardErrorMode.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: cd22aa18a628358d64c655d21f9d5f380304ab1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd22aa18a628358d64c655d21… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 5 15:48:37 2011 -0500 ntoskrnl.exe: add a stub for IoSetThreadHardErrorMode. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3f86cdc..b283a2f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1628,6 +1628,16 @@ NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) return STATUS_NOT_IMPLEMENTED; } + +/***************************************************** + * IoSetThreadHardErrorMode (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) +{ + FIXME("stub\n"); + return FALSE; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1456fbe..8fff636 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -456,7 +456,7 @@ @ stub IoSetShareAccess @ stub IoSetStartIoAttributes @ stub IoSetSystemPartition -@ stub IoSetThreadHardErrorMode +@ stdcall IoSetThreadHardErrorMode(long) @ stub IoSetTopLevelIrp @ stub IoStartNextPacket @ stub IoStartNextPacketByKey

1 0

Henri Verbeet : d3d9: Just return the resource type in IDirect3DResource8:: GetType() implementations.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: dbc0e72d17fc5c226d961f7ed3c8a9a224a357f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc0e72d17fc5c226d961f7ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:54 2011 +0200 d3d9: Just return the resource type in IDirect3DResource8::GetType() implementations. --- dlls/d3d9/cubetexture.c | 9 +-------- dlls/d3d9/texture.c | 9 +-------- dlls/d3d9/volumetexture.c | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 1f5e27b8..a4b07f0 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -197,16 +197,9 @@ static void WINAPI IDirect3DCubeTexture9Impl_PreLoad(IDirect3DCubeTexture9 *ifac static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture9Impl_GetType(IDirect3DCubeTexture9 *iface) { - IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(iface); - D3DRESOURCETYPE ret; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - ret = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return ret; + return D3DRTYPE_CUBETEXTURE; } /* IDirect3DCubeTexture9 IDirect3DBaseTexture9 Interface follow: */ diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index d1df0f5..970028b 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -192,16 +192,9 @@ static void WINAPI IDirect3DTexture9Impl_PreLoad(IDirect3DTexture9 *iface) static D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(IDirect3DTexture9 *iface) { - IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(iface); - HRESULT ret; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - ret = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return ret; + return D3DRTYPE_TEXTURE; } /* IDirect3DTexture9 IDirect3DBaseTexture9 Interface follow: */ diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 9528e9b..d5a1bcc 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -192,16 +192,9 @@ static void WINAPI IDirect3DVolumeTexture9Impl_PreLoad(IDirect3DVolumeTexture9 * static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture9Impl_GetType(IDirect3DVolumeTexture9 *iface) { - IDirect3DVolumeTexture9Impl *This = impl_from_IDirect3DVolumeTexture9(iface); - D3DRESOURCETYPE type; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - type = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return type; + return D3DRTYPE_VOLUMETEXTURE; } static DWORD WINAPI IDirect3DVolumeTexture9Impl_SetLOD(IDirect3DVolumeTexture9 *iface, DWORD LODNew)

1 0

Henri Verbeet : d3d8: Just return the resource type in IDirect3DResource8:: GetType() implementations.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: c866eab73050dbc9bb517530f05c1c76c99123d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c866eab73050dbc9bb517530f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:53 2011 +0200 d3d8: Just return the resource type in IDirect3DResource8::GetType() implementations. There's no need to ask wined3d, since it's constant for a given implementation. --- dlls/d3d8/cubetexture.c | 9 +-------- dlls/d3d8/texture.c | 9 +-------- dlls/d3d8/volumetexture.c | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 5915c54..304508b 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -194,16 +194,9 @@ static void WINAPI IDirect3DCubeTexture8Impl_PreLoad(IDirect3DCubeTexture8 *ifac static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture8Impl_GetType(IDirect3DCubeTexture8 *iface) { - IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); - D3DRESOURCETYPE type; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - type = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return type; + return D3DRTYPE_CUBETEXTURE; } /* IDirect3DCubeTexture8 IDirect3DBaseTexture8 Interface follow: */ diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 1b9db9d..20cb6ed 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -192,16 +192,9 @@ static void WINAPI IDirect3DTexture8Impl_PreLoad(IDirect3DTexture8 *iface) static D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(IDirect3DTexture8 *iface) { - IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); - D3DRESOURCETYPE type; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - type = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return type; + return D3DRTYPE_TEXTURE; } /* IDirect3DTexture8 IDirect3DBaseTexture8 Interface follow: */ diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 08e3680..df95401 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -192,16 +192,9 @@ static void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(IDirect3DVolumeTexture8 * static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(IDirect3DVolumeTexture8 *iface) { - IDirect3DVolumeTexture8Impl *This = impl_from_IDirect3DVolumeTexture8(iface); - D3DRESOURCETYPE type; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - type = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return type; + return D3DRTYPE_VOLUMETEXTURE; } /* IDirect3DVolumeTexture8 IDirect3DBaseTexture8 Interface follow: */

1 0

Henri Verbeet : wined3d: Rename Context_MarkStateDirty() to context_invalidate_state().
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 84ce0020f44d31af2e2387cd330b78ee99ee1b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ce0020f44d31af2e2387cd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:52 2011 +0200 wined3d: Rename Context_MarkStateDirty() to context_invalidate_state(). --- dlls/wined3d/context.c | 107 ++++++++++++++++++++--------------------------- 1 files changed, 46 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84ce0020f44d31af2e238…

1 0

Henri Verbeet : wined3d: Rename IWineD3DDeviceImpl_MarkStateDirty() to device_invalidate_state().
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: c8f26a1345661b94d4aec2e4d338657a7a4965fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8f26a1345661b94d4aec2e4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:51 2011 +0200 wined3d: Rename IWineD3DDeviceImpl_MarkStateDirty() to device_invalidate_state(). --- dlls/wined3d/buffer.c | 22 ++---- dlls/wined3d/context.c | 4 +- dlls/wined3d/device.c | 140 +++++++++++++++++++--------------------- dlls/wined3d/drawprim.c | 19 +++--- dlls/wined3d/surface.c | 22 +++---- dlls/wined3d/swapchain.c | 10 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_private.h | 2 +- 9 files changed, 105 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8f26a1345661b94d4aec…

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
81
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 June 2011