March 2011 - Wine-Commits - list.winehq.org

Marcus Meissner : winealsa.drv: Fixed bad sizeof (pointer vs struct) ( Coverity).
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: a1a2de18532173248961c39dfb0e9a5649fe0b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1a2de18532173248961c39df… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Mar 14 08:36:47 2011 +0100 winealsa.drv: Fixed bad sizeof (pointer vs struct) (Coverity). --- dlls/winealsa.drv/alsa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 0b244fa..ca775a2 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -351,7 +351,7 @@ void ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2) { unsigned int iLength; - ZeroMemory(wf2, sizeof(wf2)); + ZeroMemory(wf2, sizeof(*wf2)); if (wf1->wFormatTag == WAVE_FORMAT_PCM) iLength = sizeof(PCMWAVEFORMAT); else if (wf1->wFormatTag == WAVE_FORMAT_EXTENSIBLE)

1 0

Stefan Dösinger : d3d8: Disallow z buffers smaller than the color buffer.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 733f81ef7428e7cb9fe76671f8a56278cdaee867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=733f81ef7428e7cb9fe76671f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 22:21:15 2011 +0100 d3d8: Disallow z buffers smaller than the color buffer. --- dlls/d3d8/device.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0a3c9c8..9383173 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1032,6 +1032,24 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(IDirect3DDevice8 *ifa wined3d_mutex_lock(); + if (pZSurface) + { + struct wined3d_resource_desc ds_desc, rt_desc; + struct wined3d_resource *wined3d_resource; + + wined3d_resource = IWineD3DSurface_GetResource(pZSurface->wineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &ds_desc); + wined3d_resource = IWineD3DSurface_GetResource(pSurface->wineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &rt_desc); + + if (ds_desc.width < rt_desc.width || ds_desc.height < rt_desc.height) + { + WARN("Depth stencil is smaller than the render target, returning D3DERR_INVALIDCALL\n"); + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + } + hr = IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice, &original_ds); if (hr == WINED3D_OK || hr == WINED3DERR_NOTFOUND) {

1 0

Stefan Dösinger : d3d8: Use a proper window class for the device test.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: ee2ac1ca6b023726c3917690c3712c142a95d56d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2ac1ca6b023726c3917690c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 10 19:59:47 2011 +0100 d3d8: Use a proper window class for the device test. --- dlls/d3d8/tests/device.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 62f19a2..def9f80 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -183,7 +183,7 @@ static void test_mipmap_levels(void) pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -231,7 +231,7 @@ static void test_swapchain(void) pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -377,7 +377,7 @@ static void test_refcount(void) pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -701,7 +701,7 @@ static void test_cursor(void) pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -781,7 +781,7 @@ static void test_states(void) pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -879,7 +879,7 @@ static void test_scene(void) pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -989,7 +989,7 @@ static void test_shader(void) pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -1202,7 +1202,7 @@ static void test_limits(void) pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -1269,7 +1269,7 @@ static void test_lights(void) d3d8 = pDirect3DCreate8( D3D_SDK_VERSION ); ok(d3d8 != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!d3d8 || !hwnd) goto cleanup; @@ -1354,7 +1354,7 @@ static void test_render_zero_triangles(void) d3d8 = pDirect3DCreate8( D3D_SDK_VERSION ); ok(d3d8 != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!d3d8 || !hwnd) goto cleanup; @@ -1418,7 +1418,7 @@ static void test_depth_stencil_reset(void) d3d8 = pDirect3DCreate8(D3D_SDK_VERSION); ok(d3d8 != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow("static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + hwnd = CreateWindow("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "Failed to create window\n"); if (!d3d8 || !hwnd) goto cleanup; @@ -1999,7 +1999,7 @@ static void test_fpu_setup(void) ok(!!d3d8, "Failed to create a d3d8 object.\n"); if (!d3d8) return; - window = CreateWindowA("static", "d3d8_test", WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); + window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); ok(!!window, "Failed to create a window.\n"); if (!window) goto done; @@ -2064,7 +2064,7 @@ static void test_ApplyStateBlock(void) d3d8 = pDirect3DCreate8( D3D_SDK_VERSION ); ok(d3d8 != NULL, "Failed to create IDirect3D8 object\n"); - hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!d3d8 || !hwnd) goto cleanup; @@ -2120,12 +2120,17 @@ cleanup: START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); + WNDCLASS wc = {0}; if (!d3d8_handle) { skip("Could not load d3d8.dll\n"); return; } + wc.lpfnWndProc = DefWindowProc; + wc.lpszClassName = "d3d8_test_wc"; + RegisterClass(&wc); + pDirect3DCreate8 = (void *)GetProcAddress( d3d8_handle, "Direct3DCreate8" ); ok(pDirect3DCreate8 != NULL, "Failed to get address of Direct3DCreate8\n"); if (pDirect3DCreate8) @@ -2160,4 +2165,5 @@ START_TEST(device) test_wndproc(); test_wndproc_windowed(); } + UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Michael Stefaniuc : mscoree: COM cleanup in metahost.c.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: c3afbcfd60014f139d88801fbcbabc26b04647d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3afbcfd60014f139d88801fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 10:23:01 2011 +0100 mscoree: COM cleanup in metahost.c. --- dlls/mscoree/metahost.c | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index ca4795e..fb03fb1 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -752,15 +752,19 @@ end: struct InstalledRuntimeEnum { - const struct IEnumUnknownVtbl *Vtbl; + IEnumUnknown IEnumUnknown_iface; LONG ref; ULONG pos; }; const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl; -static HRESULT WINAPI InstalledRuntimeEnum_QueryInterface(IEnumUnknown* iface, - REFIID riid, +static inline struct InstalledRuntimeEnum *impl_from_IEnumUnknown(IEnumUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct InstalledRuntimeEnum, IEnumUnknown_iface); +} + +static HRESULT WINAPI InstalledRuntimeEnum_QueryInterface(IEnumUnknown* iface, REFIID riid, void **ppvObject) { TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); @@ -783,7 +787,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_QueryInterface(IEnumUnknown* iface, static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -793,7 +797,7 @@ static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -809,7 +813,7 @@ static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); int num_fetched = 0; HRESULT hr=S_OK; IUnknown *item; @@ -841,7 +845,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, static HRESULT WINAPI InstalledRuntimeEnum_Skip(IEnumUnknown *iface, ULONG celt) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); int num_fetched = 0; HRESULT hr=S_OK; @@ -866,7 +870,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Skip(IEnumUnknown *iface, ULONG celt) static HRESULT WINAPI InstalledRuntimeEnum_Reset(IEnumUnknown *iface) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); TRACE("(%p)\n", iface); @@ -877,7 +881,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Reset(IEnumUnknown *iface) static HRESULT WINAPI InstalledRuntimeEnum_Clone(IEnumUnknown *iface, IEnumUnknown **ppenum) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); struct InstalledRuntimeEnum *new_enum; TRACE("(%p)\n", iface); @@ -886,11 +890,11 @@ static HRESULT WINAPI InstalledRuntimeEnum_Clone(IEnumUnknown *iface, IEnumUnkno if (!new_enum) return E_OUTOFMEMORY; - new_enum->Vtbl = &InstalledRuntimeEnum_Vtbl; + new_enum->IEnumUnknown_iface.lpVtbl = &InstalledRuntimeEnum_Vtbl; new_enum->ref = 1; new_enum->pos = This->pos; - *ppenum = (IEnumUnknown*)new_enum; + *ppenum = &new_enum->IEnumUnknown_iface; return S_OK; } @@ -907,10 +911,10 @@ const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl = { struct CLRMetaHost { - const struct ICLRMetaHostVtbl *CLRMetaHost_vtbl; + ICLRMetaHost ICLRMetaHost_iface; }; -static const struct CLRMetaHost GlobalCLRMetaHost; +static struct CLRMetaHost GlobalCLRMetaHost; static HRESULT WINAPI CLRMetaHost_QueryInterface(ICLRMetaHost* iface, REFIID riid, @@ -1069,11 +1073,11 @@ static HRESULT WINAPI CLRMetaHost_EnumerateInstalledRuntimes(ICLRMetaHost* iface if (!new_enum) return E_OUTOFMEMORY; - new_enum->Vtbl = &InstalledRuntimeEnum_Vtbl; + new_enum->IEnumUnknown_iface.lpVtbl = &InstalledRuntimeEnum_Vtbl; new_enum->ref = 1; new_enum->pos = 0; - *ppEnumerator = (IEnumUnknown*)new_enum; + *ppEnumerator = &new_enum->IEnumUnknown_iface; return S_OK; } @@ -1123,13 +1127,13 @@ static const struct ICLRMetaHostVtbl CLRMetaHost_vtbl = CLRMetaHost_ExitProcess }; -static const struct CLRMetaHost GlobalCLRMetaHost = { - &CLRMetaHost_vtbl +static struct CLRMetaHost GlobalCLRMetaHost = { + { &CLRMetaHost_vtbl } }; extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) { - return ICLRMetaHost_QueryInterface((ICLRMetaHost*)&GlobalCLRMetaHost, riid, ppobj); + return ICLRMetaHost_QueryInterface(&GlobalCLRMetaHost.ICLRMetaHost_iface, riid, ppobj); } static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data)

1 0

Rico Schüller : include: Fix ID3DXBaseEffect interface .
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: b1c26a0e9573b819e83a7646e78361109a4406d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c26a0e9573b819e83a7646e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 13 22:46:05 2011 +0100 include: Fix ID3DXBaseEffect interface. --- include/d3dx9effect.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 79b635c..67d28b2 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -140,9 +140,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) STDMETHOD(GetString)(THIS_ D3DXHANDLE parameter, LPCSTR* string) PURE; STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; - STDMETHOD(SetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 pshader) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9* pshader) PURE; - STDMETHOD(SetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 vshader) PURE; STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; };

1 0

Detlef Riekenberg : inetcpl: Update German translation.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 9328d28115c9e564f03410d055d7fbbb1feb9c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9328d28115c9e564f03410d05… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 13 22:01:45 2011 +0100 inetcpl: Update German translation. --- dlls/inetcpl.cpl/cpl_De.rc | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_De.rc b/dlls/inetcpl.cpl/cpl_De.rc index 3e1e5b6..0f75bee 100644 --- a/dlls/inetcpl.cpl/cpl_De.rc +++ b/dlls/inetcpl.cpl/cpl_De.rc @@ -39,14 +39,35 @@ BEGIN PUSHBUTTON "A&ktuelle Seite", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "&Standardseite", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "&Leere Seite", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " Browserverlauf ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Sie können temporäre Dateien, Cookies und andere Daten löschen.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "&Daten löschen...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "&Einstellungen...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Gespeicherte Browserdaten löchen" +BEGIN + + AUTOCHECKBOX "&Temporäre Inernetdateien\nZwischengespeicherte Kopien von Webseiten, Bildern und Zertifikaten.", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Cookies\nVon Webseiten auf ihrem Computer gespeicherte Dateien, die Benutzereinstellungen oder Anmeldeinformationen enthalten.", + IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Verlauf\nListe von Webseiten, die Sie aufgerufen haben.", + IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Formulardaten\nBenutzernamen und andere Informationen, die Sie in Formulare eingegeben haben.", + IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Kennwörter\nGespeicherte Kennwörter, die Sie in Formulare eingegeben haben.", + IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "&Abbrechen", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "&Löschen", IDOK, 120, 230, 60, 15, WS_GROUP + +END /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DCubeTexture::Map().
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 3ac924a2da111fe553ebe1e28312c281256a0baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ac924a2da111fe553ebe1e28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 13 20:54:30 2011 +0100 wined3d: Get rid of IWineD3DCubeTexture::Map(). --- dlls/d3d8/cubetexture.c | 18 +++++++++++------- dlls/d3d9/cubetexture.c | 16 ++++++++++------ dlls/wined3d/cubetexture.c | 20 -------------------- include/wine/wined3d.idl | 6 ------ 4 files changed, 21 insertions(+), 39 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 515be63..891042e 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -306,20 +306,24 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(IDirect3DCubeT } static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(IDirect3DCubeTexture8 *iface, - D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT *pLockedRect, const RECT *pRect, - DWORD Flags) + D3DCUBEMAP_FACES face, UINT level, D3DLOCKED_RECT *locked_rect, const RECT *rect, + DWORD flags) { - IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); + IDirect3DCubeTexture8Impl *texture = impl_from_IDirect3DCubeTexture8(iface); + struct wined3d_resource *sub_resource; UINT sub_resource_idx; HRESULT hr; TRACE("iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#x.\n", - iface, FaceType, Level, pLockedRect, pRect, Flags); + iface, face, level, locked_rect, rect, flags); wined3d_mutex_lock(); - sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture) * FaceType + Level; - hr = IWineD3DCubeTexture_Map(This->wineD3DCubeTexture, sub_resource_idx, - (WINED3DLOCKED_RECT *)pLockedRect, pRect, Flags); + sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(texture->wineD3DCubeTexture) * face + level; + if (!(sub_resource = IWineD3DCubeTexture_GetSubResource(texture->wineD3DCubeTexture, sub_resource_idx))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface8_LockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource), + locked_rect, rect, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index f6cacd9..87d00c1 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -322,19 +322,23 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetCubeMapSurface(IDirect3DCubeT } static HRESULT WINAPI IDirect3DCubeTexture9Impl_LockRect(IDirect3DCubeTexture9 *iface, - D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) + D3DCUBEMAP_FACES face, UINT level, D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { - IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; + IDirect3DCubeTexture9Impl *texture = (IDirect3DCubeTexture9Impl *)iface; + struct wined3d_resource *sub_resource; UINT sub_resource_idx; HRESULT hr; TRACE("iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#x.\n", - iface, FaceType, Level, pLockedRect, pRect, Flags); + iface, face, level, locked_rect, rect, flags); wined3d_mutex_lock(); - sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture) * FaceType + Level; - hr = IWineD3DCubeTexture_Map(This->wineD3DCubeTexture, sub_resource_idx, - (WINED3DLOCKED_RECT *)pLockedRect, pRect, Flags); + sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(texture->wineD3DCubeTexture) * face + level; + if (!(sub_resource = IWineD3DCubeTexture_GetSubResource(texture->wineD3DCubeTexture, sub_resource_idx))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface9_LockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource), + locked_rect, rect, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 4031162..b5294dd 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -336,25 +336,6 @@ static struct wined3d_resource * WINAPI IWineD3DCubeTextureImpl_GetSubResource(I return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DCubeTextureImpl_Map(IWineD3DCubeTexture *iface, - UINT sub_resource_idx, WINED3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u, locked_rect %p, rect %s, flags %#x.\n", - iface, sub_resource_idx, locked_rect, wine_dbgstr_rect(rect), flags); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DSurface_Map((IWineD3DSurface *)surface_from_resource(sub_resource), - locked_rect, rect, flags); -} - static HRESULT WINAPI IWineD3DCubeTextureImpl_Unmap(IWineD3DCubeTexture *iface, UINT sub_resource_idx) { @@ -420,7 +401,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_IsCondNP2, IWineD3DCubeTextureImpl_GetSubResource, /* IWineD3DCubeTexture */ - IWineD3DCubeTextureImpl_Map, IWineD3DCubeTextureImpl_Unmap, IWineD3DCubeTextureImpl_AddDirtyRect }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index a74b941..83e0479 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2382,12 +2382,6 @@ interface IWineD3DTexture : IWineD3DBaseTexture ] interface IWineD3DCubeTexture : IWineD3DBaseTexture { - HRESULT Map( - [in] UINT sub_resource_idx, - [out] WINED3DLOCKED_RECT *locked_rect, - [in] const RECT *rect, - [in] DWORD flags - ); HRESULT Unmap( [in] UINT sub_resource_idx );

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DTexture::Map().
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: b77a661515c7cdb1bf7ae98f6b265ae643f22ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77a661515c7cdb1bf7ae98f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 13 20:54:28 2011 +0100 wined3d: Get rid of IWineD3DTexture::Map(). --- dlls/d3d8/texture.c | 15 ++++++++++----- dlls/d3d9/texture.c | 15 +++++++++++---- dlls/wined3d/texture.c | 19 ------------------- include/wine/wined3d.idl | 6 ------ 4 files changed, 21 insertions(+), 34 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 31196ac..ebab8a0 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -300,17 +300,22 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(IDirect3DTexture8 *i return D3D_OK; } -static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(IDirect3DTexture8 *iface, UINT Level, - D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) +static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(IDirect3DTexture8 *iface, UINT level, + D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { - IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); + IDirect3DTexture8Impl *texture = impl_from_IDirect3DTexture8(iface); + struct wined3d_resource *sub_resource; HRESULT hr; TRACE("iface %p, level %u, locked_rect %p, rect %p, flags %#x.\n", - iface, Level, pLockedRect, pRect, Flags); + iface, level, locked_rect, rect, flags); wined3d_mutex_lock(); - hr = IWineD3DTexture_Map(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *)pLockedRect, pRect, Flags); + if (!(sub_resource = IWineD3DTexture_GetSubResource(texture->wineD3DTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface8_LockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource), + locked_rect, rect, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 611ef67..fa84116 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -315,15 +315,22 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(IDirect3DTexture9 *i return D3D_OK; } -static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { - IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; +static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(IDirect3DTexture9 *iface, + UINT level, D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) +{ + IDirect3DTexture9Impl *texture = (IDirect3DTexture9Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; TRACE("iface %p, level %u, locked_rect %p, rect %p, flags %#x.\n", - iface, Level, pLockedRect, pRect, Flags); + iface, level, locked_rect, rect, flags); wined3d_mutex_lock(); - hr = IWineD3DTexture_Map(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *)pLockedRect, pRect, Flags); + if (!(sub_resource = IWineD3DTexture_GetSubResource(texture->wineD3DTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface9_LockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource), + locked_rect, rect, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 752ea8f..8fe4883 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -361,24 +361,6 @@ static struct wined3d_resource * WINAPI IWineD3DTextureImpl_GetSubResource(IWine return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DTextureImpl_Map(IWineD3DTexture *iface, - UINT sub_resource_idx, WINED3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u, locked_rect %p, rect %s, flags %#x.\n", - iface, sub_resource_idx, locked_rect, wine_dbgstr_rect(rect), flags); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DSurface_Map((IWineD3DSurface *)surface_from_resource(sub_resource), locked_rect, rect, flags); -} - static HRESULT WINAPI IWineD3DTextureImpl_Unmap(IWineD3DTexture *iface, UINT sub_resource_idx) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -439,7 +421,6 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_IsCondNP2, IWineD3DTextureImpl_GetSubResource, /* IWineD3DTexture */ - IWineD3DTextureImpl_Map, IWineD3DTextureImpl_Unmap, IWineD3DTextureImpl_AddDirtyRect }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 21f7039..df4bba7 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2370,12 +2370,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ] interface IWineD3DTexture : IWineD3DBaseTexture { - HRESULT Map( - [in] UINT sub_resource_idx, - [out] WINED3DLOCKED_RECT *locked_rect, - [in] const RECT *rect, - [in] DWORD flags - ); HRESULT Unmap( [in] UINT sub_resource_idx );

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DTexture::Unmap().
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 13b05b9dbecbb8bd73dc4aa8c0c4899a12901c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b05b9dbecbb8bd73dc4aa8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 13 20:54:29 2011 +0100 wined3d: Get rid of IWineD3DTexture::Unmap(). --- dlls/d3d8/texture.c | 12 ++++++++---- dlls/d3d9/texture.c | 13 +++++++++---- dlls/wined3d/texture.c | 17 ----------------- include/wine/wined3d.idl | 3 --- 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index ebab8a0..d153b8f 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -321,15 +321,19 @@ static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(IDirect3DTexture8 *iface, U return hr; } -static HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(IDirect3DTexture8 *iface, UINT Level) +static HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(IDirect3DTexture8 *iface, UINT level) { - IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); + IDirect3DTexture8Impl *texture = impl_from_IDirect3DTexture8(iface); + struct wined3d_resource *sub_resource; HRESULT hr; - TRACE("iface %p, level %u.\n", iface, Level); + TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - hr = IWineD3DTexture_Unmap(This->wineD3DTexture, Level); + if (!(sub_resource = IWineD3DTexture_GetSubResource(texture->wineD3DTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface8_UnlockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index fa84116..9816bfb 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -336,14 +336,19 @@ static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(IDirect3DTexture9 *iface, return hr; } -static HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(LPDIRECT3DTEXTURE9 iface, UINT Level) { - IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; +static HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(IDirect3DTexture9 *iface, UINT level) +{ + IDirect3DTexture9Impl *texture = (IDirect3DTexture9Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; - TRACE("iface %p, level %u.\n", iface, Level); + TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - hr = IWineD3DTexture_Unmap(This->wineD3DTexture, Level); + if (!(sub_resource = IWineD3DTexture_GetSubResource(texture->wineD3DTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface9_UnlockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8fe4883..99446b6 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -361,22 +361,6 @@ static struct wined3d_resource * WINAPI IWineD3DTextureImpl_GetSubResource(IWine return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DTextureImpl_Unmap(IWineD3DTexture *iface, UINT sub_resource_idx) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DSurface_Unmap((IWineD3DSurface *)surface_from_resource(sub_resource)); -} - static HRESULT WINAPI IWineD3DTextureImpl_AddDirtyRect(IWineD3DTexture *iface, const RECT *dirty_rect) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -421,7 +405,6 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_IsCondNP2, IWineD3DTextureImpl_GetSubResource, /* IWineD3DTexture */ - IWineD3DTextureImpl_Unmap, IWineD3DTextureImpl_AddDirtyRect }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index df4bba7..a74b941 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2370,9 +2370,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ] interface IWineD3DTexture : IWineD3DBaseTexture { - HRESULT Unmap( - [in] UINT sub_resource_idx - ); HRESULT AddDirtyRect( [in] const RECT *dirty_rect );

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DCubeTexture::Unmap().
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 3494106d7797f2f3216f027aa661a591685ef9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3494106d7797f2f3216f027aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 13 20:54:31 2011 +0100 wined3d: Get rid of IWineD3DCubeTexture::Unmap(). --- dlls/d3d8/cubetexture.c | 14 +++++++++----- dlls/d3d9/cubetexture.c | 14 +++++++++----- dlls/wined3d/cubetexture.c | 19 ------------------- include/wine/wined3d.idl | 3 --- 4 files changed, 18 insertions(+), 32 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 891042e..1ecf47c8 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -330,17 +330,21 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(IDirect3DCubeTexture8 * } static HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(IDirect3DCubeTexture8 *iface, - D3DCUBEMAP_FACES FaceType, UINT Level) + D3DCUBEMAP_FACES face, UINT level) { - IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); + IDirect3DCubeTexture8Impl *texture = impl_from_IDirect3DCubeTexture8(iface); + struct wined3d_resource *sub_resource; UINT sub_resource_idx; HRESULT hr; - TRACE("iface %p, face %#x, level %u.\n", iface, FaceType, Level); + TRACE("iface %p, face %#x, level %u.\n", iface, face, level); wined3d_mutex_lock(); - sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture) * FaceType + Level; - hr = IWineD3DCubeTexture_Unmap(This->wineD3DCubeTexture, sub_resource_idx); + sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(texture->wineD3DCubeTexture) * face + level; + if (!(sub_resource = IWineD3DCubeTexture_GetSubResource(texture->wineD3DCubeTexture, sub_resource_idx))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface8_UnlockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 87d00c1..798ffc9 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -345,17 +345,21 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_LockRect(IDirect3DCubeTexture9 * } static HRESULT WINAPI IDirect3DCubeTexture9Impl_UnlockRect(IDirect3DCubeTexture9 *iface, - D3DCUBEMAP_FACES FaceType, UINT Level) + D3DCUBEMAP_FACES face, UINT level) { - IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; + IDirect3DCubeTexture9Impl *texture = (IDirect3DCubeTexture9Impl *)iface; + struct wined3d_resource *sub_resource; UINT sub_resource_idx; HRESULT hr; - TRACE("iface %p, face %#x, level %u.\n", iface, FaceType, Level); + TRACE("iface %p, face %#x, level %u.\n", iface, face, level); wined3d_mutex_lock(); - sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture) * FaceType + Level; - hr = IWineD3DCubeTexture_Unmap(This->wineD3DCubeTexture, sub_resource_idx); + sub_resource_idx = IWineD3DCubeTexture_GetLevelCount(texture->wineD3DCubeTexture) * face + level; + if (!(sub_resource = IWineD3DCubeTexture_GetSubResource(texture->wineD3DCubeTexture, sub_resource_idx))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DSurface9_UnlockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index b5294dd..db5cbd3 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -336,24 +336,6 @@ static struct wined3d_resource * WINAPI IWineD3DCubeTextureImpl_GetSubResource(I return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DCubeTextureImpl_Unmap(IWineD3DCubeTexture *iface, - UINT sub_resource_idx) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u.\n", - iface, sub_resource_idx); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DSurface_Unmap((IWineD3DSurface *)surface_from_resource(sub_resource)); -} - static HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture *iface, WINED3DCUBEMAP_FACES face, const RECT *dirty_rect) { @@ -401,7 +383,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_IsCondNP2, IWineD3DCubeTextureImpl_GetSubResource, /* IWineD3DCubeTexture */ - IWineD3DCubeTextureImpl_Unmap, IWineD3DCubeTextureImpl_AddDirtyRect }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 83e0479..7827080 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2382,9 +2382,6 @@ interface IWineD3DTexture : IWineD3DBaseTexture ] interface IWineD3DCubeTexture : IWineD3DBaseTexture { - HRESULT Unmap( - [in] UINT sub_resource_idx - ); HRESULT AddDirtyRect( [in] WINED3DCUBEMAP_FACES face, [in] const RECT *dirty_rect

1 0