June 2009 - Wine-commits - list.winehq.org

Tony Wasserka : d3dx9: Implement D3DXLoadSurfaceFromFile.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 2a9c43fb355c30a3f8a57e318eab45e45794f023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a9c43fb355c30a3f8a57e318… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Jun 22 17:33:48 2009 +0200 d3dx9: Implement D3DXLoadSurfaceFromFile. --- dlls/d3dx9_36/d3dx9_36.spec | 4 +- dlls/d3dx9_36/surface.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index dd9f74a..663483a 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -182,9 +182,9 @@ @ stub D3DXLoadPRTCompBufferFromFileA @ stub D3DXLoadPRTCompBufferFromFileW @ stub D3DXLoadSkinMeshFromXof -@ stub D3DXLoadSurfaceFromFileA +@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) -@ stub D3DXLoadSurfaceFromFileW +@ stdcall D3DXLoadSurfaceFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stub D3DXLoadSurfaceFromMemory @ stub D3DXLoadSurfaceFromResourceA @ stub D3DXLoadSurfaceFromResourceW diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a4a8910..ac619c6 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -197,3 +197,57 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, if( !pDestSurface || !pSrcData | !SrcDataSize ) return D3DERR_INVALIDCALL; return E_NOTIMPL; } + +/************************************************************ + * D3DXLoadSurfaceFromFile + */ +HRESULT WINAPI D3DXLoadSurfaceFromFileA(LPDIRECT3DSURFACE9 pDestSurface, + CONST PALETTEENTRY *pDestPalette, + CONST RECT *pDestRect, + LPCSTR pSrcFile, + CONST RECT *pSrcRect, + DWORD dwFilter, + D3DCOLOR Colorkey, + D3DXIMAGE_INFO *pSrcInfo) +{ + LPWSTR pWidename; + HRESULT hr; + int strlength; + TRACE("(void): relay\n"); + + if( !pSrcFile || !pDestSurface ) return D3DERR_INVALIDCALL; + + strlength = MultiByteToWideChar(CP_ACP, 0, pSrcFile, -1, NULL, 0); + pWidename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlength * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pSrcFile, -1, pWidename, strlength); + + hr = D3DXLoadSurfaceFromFileW(pDestSurface, pDestPalette, pDestRect, pWidename, pSrcRect, dwFilter, Colorkey, pSrcInfo); + HeapFree(GetProcessHeap(), 0, pWidename); + + return hr; +} + +HRESULT WINAPI D3DXLoadSurfaceFromFileW(LPDIRECT3DSURFACE9 pDestSurface, + CONST PALETTEENTRY *pDestPalette, + CONST RECT *pDestRect, + LPCWSTR pSrcFile, + CONST RECT *pSrcRect, + DWORD Filter, + D3DCOLOR Colorkey, + D3DXIMAGE_INFO *pSrcInfo) +{ + HRESULT hr; + DWORD dwSize; + LPVOID pBuffer; + TRACE("(void): relay\n"); + + if( !pSrcFile || !pDestSurface ) return D3DERR_INVALIDCALL; + + hr = map_view_of_file(pSrcFile, &pBuffer, &dwSize); + if(FAILED(hr)) return D3DXERR_INVALIDDATA; + + hr = D3DXLoadSurfaceFromFileInMemory(pDestSurface, pDestPalette, pDestRect, pBuffer, dwSize, pSrcRect, Filter, Colorkey, pSrcInfo); + UnmapViewOfFile(pBuffer); + + return hr; +}

1 0

Tony Wasserka : d3dx9: Implement D3DXLoadSurfaceFromResource.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 88cea6c1cdcf944702cd92c7be12ffbeb03d8b2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88cea6c1cdcf944702cd92c7b… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Jun 22 17:38:15 2009 +0200 d3dx9: Implement D3DXLoadSurfaceFromResource. --- dlls/d3dx9_36/d3dx9_36.spec | 4 +- dlls/d3dx9_36/surface.c | 71 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 663483a..9b22ba0 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -186,8 +186,8 @@ @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileW(ptr ptr ptr wstr ptr long long ptr) @ stub D3DXLoadSurfaceFromMemory -@ stub D3DXLoadSurfaceFromResourceA -@ stub D3DXLoadSurfaceFromResourceW +@ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) +@ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stub D3DXLoadSurfaceFromSurface @ stub D3DXLoadVolumeFromFileA @ stub D3DXLoadVolumeFromFileInMemory diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ac619c6..bd627ba 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -251,3 +251,74 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileW(LPDIRECT3DSURFACE9 pDestSurface, return hr; } + +/************************************************************ + * D3DXLoadSurfaceFromResource + */ +HRESULT WINAPI D3DXLoadSurfaceFromResourceA(LPDIRECT3DSURFACE9 pDestSurface, + CONST PALETTEENTRY *pDestPalette, + CONST RECT *pDestRect, + HMODULE hSrcModule, + LPCSTR pResource, + CONST RECT *pSrcRect, + DWORD dwFilter, + D3DCOLOR Colorkey, + D3DXIMAGE_INFO *pSrcInfo) +{ + HRSRC hResInfo; + TRACE("(void): relay\n"); + + if( !pDestSurface ) return D3DERR_INVALIDCALL; + + hResInfo = FindResourceA(hSrcModule, pResource, (LPCSTR)RT_RCDATA); + if(hResInfo) { + LPVOID pBuffer; + HRESULT hr; + DWORD dwSize; + + hr = load_resource_into_memory(hSrcModule, hResInfo, &pBuffer, &dwSize); + if(FAILED(hr)) return D3DXERR_INVALIDDATA; + return D3DXLoadSurfaceFromFileInMemory(pDestSurface, pDestPalette, pDestRect, pBuffer, dwSize, pSrcRect, dwFilter, Colorkey, pSrcInfo); + } + + hResInfo = FindResourceA(hSrcModule, pResource, (LPCSTR)RT_BITMAP); + if(hResInfo) { + FIXME("Implement loading bitmaps from resource type RT_BITMAP\n"); + return E_NOTIMPL; + } + return D3DXERR_INVALIDDATA; +} + +HRESULT WINAPI D3DXLoadSurfaceFromResourceW(LPDIRECT3DSURFACE9 pDestSurface, + CONST PALETTEENTRY *pDestPalette, + CONST RECT *pDestRect, + HMODULE hSrcModule, + LPCWSTR pResource, + CONST RECT *pSrcRect, + DWORD dwFilter, + D3DCOLOR Colorkey, + D3DXIMAGE_INFO *pSrcInfo) +{ + HRSRC hResInfo; + TRACE("(void): relay\n"); + + if( !pDestSurface ) return D3DERR_INVALIDCALL; + + hResInfo = FindResourceW(hSrcModule, pResource, (LPCWSTR)RT_RCDATA); + if(hResInfo) { + LPVOID pBuffer; + HRESULT hr; + DWORD dwSize; + + hr = load_resource_into_memory(hSrcModule, hResInfo, &pBuffer, &dwSize); + if(FAILED(hr)) return D3DXERR_INVALIDDATA; + return D3DXLoadSurfaceFromFileInMemory(pDestSurface, pDestPalette, pDestRect, pBuffer, dwSize, pSrcRect, dwFilter, Colorkey, pSrcInfo); + } + + hResInfo = FindResourceW(hSrcModule, pResource, (LPCWSTR)RT_BITMAP); + if(hResInfo) { + FIXME("Implement loading bitmaps from resource type RT_BITMAP\n"); + return E_NOTIMPL; + } + return D3DXERR_INVALIDDATA; +}

1 0

Henri Verbeet : wined3d: Document GL context dependencies.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 7363b6e2e31639d81317b8817a2f885160370ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7363b6e2e31639d81317b8817… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 26 10:07:12 2009 +0200 wined3d: Document GL context dependencies. --- dlls/wined3d/arb_program_shader.c | 9 +++++++++ dlls/wined3d/ati_fragment_shader.c | 3 +++ dlls/wined3d/basetexture.c | 1 + dlls/wined3d/buffer.c | 4 ++++ dlls/wined3d/context.c | 2 ++ dlls/wined3d/cubetexture.c | 1 + dlls/wined3d/device.c | 5 ++++- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/nvidia_texture_shader.c | 3 +++ dlls/wined3d/state.c | 1 + dlls/wined3d/surface.c | 23 +++++++++++++++++------ dlls/wined3d/texture.c | 1 + dlls/wined3d/utils.c | 3 +++ dlls/wined3d/volume.c | 2 ++ dlls/wined3d/volumetexture.c | 1 + 16 files changed, 56 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7363b6e2e31639d81317b…

1 0

Austin English : winex11: Make sure GetKeyNameText gets the correct length to return.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 349337d7ef3ba9178f92c85d61d93bde7528e4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349337d7ef3ba9178f92c85d6… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jun 26 03:55:12 2009 -0500 winex11: Make sure GetKeyNameText gets the correct length to return. --- dlls/winex11.drv/keyboard.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 8a6dd37..3ffa13c 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2349,11 +2349,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) TRACE("found scan=%04x keyc=%04x keysym=%04x string=%s\n", scanCode, keyc, (int)keys, name); if (lpBuffer && nSize && name) - { - MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); - lpBuffer[nSize - 1] = 0; - return nSize; - } + return MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); } /* Finally issue WARN for unknown keys */

1 0

Andrew Eikum : gdiplus/tests: Fix resource leaks in several tests.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: ff95a69f5a97db5f4c0908c7dda77ba7d6563ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff95a69f5a97db5f4c0908c7d… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Thu Jun 25 08:40:28 2009 -0500 gdiplus/tests: Fix resource leaks in several tests. A few tests initialized two GpGraphics objects, and only released one. These have been fixed by removing the redundant initialization. --- dlls/gdiplus/tests/graphics.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 668d261..68c0e29 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -243,8 +243,6 @@ static void test_GdipDrawArc(void) HDC hdc = GetDC(0); /* make a graphics object and pen object */ - status = GdipCreateFromHDC(hdc, &graphics); - expect(Ok, status); ok(hdc != NULL, "Expected HDC to be initialized\n"); status = GdipCreateFromHDC(hdc, &graphics); @@ -289,8 +287,6 @@ static void test_GdipDrawArcI(void) HDC hdc = GetDC(0); /* make a graphics object and pen object */ - status = GdipCreateFromHDC(hdc, &graphics); - expect(Ok, status); ok(hdc != NULL, "Expected HDC to be initialized\n"); status = GdipCreateFromHDC(hdc, &graphics); @@ -335,8 +331,6 @@ static void test_GdipDrawBezierI(void) HDC hdc = GetDC(0); /* make a graphics object and pen object */ - status = GdipCreateFromHDC(hdc, &graphics); - expect(Ok, status); ok(hdc != NULL, "Expected HDC to be initialized\n"); status = GdipCreateFromHDC(hdc, &graphics); @@ -436,8 +430,6 @@ static void test_GdipDrawLineI(void) HDC hdc = GetDC(0); /* make a graphics object and pen object */ - status = GdipCreateFromHDC(hdc, &graphics); - expect(Ok, status); ok(hdc != NULL, "Expected HDC to be initialized\n"); status = GdipCreateFromHDC(hdc, &graphics); @@ -477,8 +469,6 @@ static void test_GdipDrawLinesI(void) HDC hdc = GetDC(0); /* make a graphics object and pen object */ - status = GdipCreateFromHDC(hdc, &graphics); - expect(Ok, status); ok(hdc != NULL, "Expected HDC to be initialized\n"); status = GdipCreateFromHDC(hdc, &graphics);

1 0

Austin English : winecfg: Fix cd detection for FreeBSD.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 6b80c80410f92967fa922b10944ea0ceb1f1d455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b80c80410f92967fa922b109… Author: Austin English <austinenglish(a)bordeauxgroup.com> Date: Fri Jun 26 01:40:59 2009 -0500 winecfg: Fix cd detection for FreeBSD. --- programs/winecfg/drivedetect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 8e55f56..75bce53 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -56,8 +56,10 @@ typedef struct static const DEV_NODES sDeviceNodes[] = { {"/dev/fd", DRIVE_REMOVABLE}, {"/dev/pf", DRIVE_REMOVABLE}, + {"/dev/acd", DRIVE_CDROM}, {"/dev/aztcd", DRIVE_CDROM}, {"/dev/bpcd", DRIVE_CDROM}, + {"/dev/cd", DRIVE_CDROM}, {"/dev/cdrom", DRIVE_CDROM}, {"/dev/cdu535", DRIVE_CDROM}, {"/dev/cdwriter", DRIVE_CDROM},

1 0

Gerald Pfeifer : d3d9: Fix variable type in reset_enum_callback().
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: b44596ffff3302493eb6ba13ae52fc58bd3ea0e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44596ffff3302493eb6ba13a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jun 25 21:56:00 2009 +0200 d3d9: Fix variable type in reset_enum_callback(). --- dlls/d3d9/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9d1c72e..14885de 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -424,7 +424,7 @@ static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9EX ifac static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data) { BOOL *resources_ok = data; - WINED3DRESOURCETYPE type; + D3DRESOURCETYPE type; HRESULT ret = S_OK; WINED3DSURFACE_DESC surface_desc; WINED3DVOLUME_DESC volume_desc;

1 0

Aric Stewart : shell32: Handle shell: urls internal in ParseDisplayName instead of passing them to shdocvw.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 92246095890d4e7fff2d6bcdf372c99772663660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92246095890d4e7fff2d6bcdf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jun 26 17:01:08 2009 +0900 shell32: Handle shell: urls internal in ParseDisplayName instead of passing them to shdocvw. --- dlls/shell32/shfldr_desktop.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index c9b7412..a08bb41 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -187,7 +187,19 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, } else if (strchrW(lpszDisplayName,':')) { - return IEParseDisplayNameWithBCW(CP_ACP,lpszDisplayName,pbc,ppidl); + PARSEDURLW urldata; + + urldata.cbSize = sizeof(urldata); + ParseURLW(lpszDisplayName,&urldata); + + if (urldata.nScheme == URL_SCHEME_SHELL) /* handle shell: urls */ + { + TRACE ("-- shell url: %s\n", debugstr_w(urldata.pszSuffix)); + SHCLSIDFromStringW (urldata.pszSuffix+2, &clsid); + pidlTemp = _ILCreateGuid (PT_GUID, &clsid); + } + else + return IEParseDisplayNameWithBCW(CP_ACP,lpszDisplayName,pbc,ppidl); } else {

1 0

Aric Stewart : shell32: Implement SHCreateShellFolderView (ordinal 256).
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: a6c81e07548aec5777a2a53fbd4c7dca4cec4ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c81e07548aec5777a2a53fb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jun 26 17:01:29 2009 +0900 shell32: Implement SHCreateShellFolderView (ordinal 256). Used by IE7's Add On management dialog. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 60 ++++++++++++++++++++++++-------------------- include/shlobj.h | 35 ++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index b50890b..433ed3a 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -210,7 +210,7 @@ 249 stdcall -noname PathParseIconLocation(ptr) PathParseIconLocationAW 250 stdcall -noname PathRemoveExtension(ptr) PathRemoveExtensionAW 251 stdcall -noname PathRemoveArgs(ptr) PathRemoveArgsAW - 256 stdcall @(ptr ptr) SHELL32_256 + 256 stdcall SHCreateShellFolderView(ptr ptr) 258 stdcall -noname LinkWindow_RegisterClass() 259 stdcall -noname LinkWindow_UnregisterClass() #299 stub Shl1632_ThunkData32 diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 2fef940..44c9c7e 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1893,33 +1893,6 @@ HRESULT WINAPI SHCreateStdEnumFmtEtc( return hRes; } - -/************************************************************************* - * SHELL32_256 (SHELL32.256) - */ -HRESULT WINAPI SHELL32_256(LPDWORD lpdw0, LPDWORD lpdw1) -{ - HRESULT ret = S_OK; - - FIXME("stub %p 0x%08x %p\n", lpdw0, lpdw0 ? *lpdw0 : 0, lpdw1); - - if (!lpdw0 || *lpdw0 != 0x10) - ret = E_INVALIDARG; - else - { - LPVOID lpdata = 0;/*LocalAlloc(LMEM_ZEROINIT, 0x4E4);*/ - - if (!lpdata) - ret = E_OUTOFMEMORY; - else - { - /* Initialize and return unknown lpdata structure */ - } - } - - return ret; -} - /************************************************************************* * SHFindFiles (SHELL32.90) */ @@ -2140,3 +2113,36 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) FIXME("STUB: %i %s\n",iImageList,debugstr_guid(riid)); return E_NOINTERFACE; } + +/************************************************************************* + * SHCreateShellFolderView [SHELL32.256] + * + * Create a new instance of the default Shell folder view object. + * + * RETURNS + * Success: S_OK + * Failure: error value + * + * NOTES + * see IShellFolder::CreateViewObject + */ +HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pcsfv, + IShellView **ppsv) +{ + IShellView * psf; + HRESULT hRes; + + TRACE("sf=%p outer=%p callback=%p\n", + pcsfv->pshf, pcsfv->psvOuter, pcsfv->psfvcb); + + psf = IShellView_Constructor(pcsfv->pshf); + + if (!psf) + return E_OUTOFMEMORY; + + IShellView_AddRef(psf); + hRes = IShellView_QueryInterface(psf, &IID_IShellView, (LPVOID *)ppsv); + IShellView_Release(psf); + + return hRes; +} diff --git a/include/shlobj.h b/include/shlobj.h index 01f8368..c24c29c 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -514,6 +514,31 @@ DECLARE_INTERFACE_(IACList2,IACList) #define IACList2_SetOptions(p,a) (p)->lpVtbl->SetOptions(p,a) #endif +/**************************************************************************** + * IShellFolderViewCB interface + */ + +#define INTERFACE IShellFolderViewCB +DECLARE_INTERFACE_(IShellFolderViewCB,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IShellFolderViewCB methods ***/ + STDMETHOD(MessageSFVCB)(THIS_ UINT uMsg, WPARAM wParam, LPARAM lParam) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IShellFolderViewCB_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IShellFolderViewCB_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IShellFolderViewCB_Release(p) (p)->lpVtbl->Release(p) +/*** IShellFolderViewCB methods ***/ +#define IShellFolderViewCB_MessageSFVCB(p,a,b,c) (p)->lpVtbl->MessageSFVCB(p,a,b,c) +#endif + /* IProgressDialog interface */ #define PROGDLG_NORMAL 0x00000000 #define PROGDLG_MODAL 0x00000001 @@ -737,6 +762,16 @@ HRESULT WINAPI SHCreateShellFolderViewEx(LPCSFV pshfvi, IShellView **ppshv); #define SFVM_GET_WEBVIEW_THEME 86 /* undocumented */ #define SFVM_GETDEFERREDVIEWSETTINGS 92 /* undocumented */ +typedef struct _SFV_CREATE +{ + UINT cbSize; + IShellFolder *pshf; + IShellView *psvOuter; + IShellFolderViewCB *psfvcb; +} SFV_CREATE; + +HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pscfv, IShellView **ppsv); + /* Types and definitions for the SFM_* parameters */ #include <pshpack8.h>

1 0

Henri Verbeet : wined3d: Make sure queries have an active GL context.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 181442a6a2127cbad550af23fdd33ee6a85e7180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=181442a6a2127cbad550af23f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 26 10:07:08 2009 +0200 wined3d: Make sure queries have an active GL context. --- dlls/wined3d/query.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 481177f..a24f513 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -62,6 +62,8 @@ static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) { TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { + ActivateContext(This->wineD3DDevice, This->wineD3DDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); /* Queries are specific to the GL context that created them. Not * deleting the query will obviously leak it, but that's still better @@ -316,6 +318,8 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_GetData(IWineD3DQuery* iface, return S_OK; } + ActivateContext(This->wineD3DDevice, This->wineD3DDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if (((WineQueryOcclusionData *)This->extendedData)->ctx != This->wineD3DDevice->activeContext || This->wineD3DDevice->activeContext->tid != GetCurrentThreadId()) { @@ -357,6 +361,8 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void WineD3DContext *ctx; TRACE("(%p) : type D3DQUERY_EVENT, pData %p, dwSize %#x, dwGetDataFlags %#x\n", This, pData, dwSize, dwGetDataFlags); + ActivateContext(This->wineD3DDevice, This->wineD3DDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ctx = ((WineQueryEventData *)This->extendedData)->ctx; if(pData == NULL || dwSize == 0) { return S_OK; @@ -457,6 +463,9 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD TRACE("(%p) : dwIssueFlags %#x, type D3DQUERY_EVENT\n", This, dwIssueFlags); if (dwIssueFlags & WINED3DISSUE_END) { WineD3DContext *ctx = ((WineQueryEventData *)This->extendedData)->ctx; + + ActivateContext(This->wineD3DDevice, This->wineD3DDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if(ctx != This->wineD3DDevice->activeContext || ctx->tid != GetCurrentThreadId()) { /* GL fences can be used only from the context that created them, * so if a different context is active, don't bother setting the query. The penalty @@ -497,6 +506,8 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_Issue(IWineD3DQuery* iface, D if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) { WineD3DContext *ctx = ((WineQueryOcclusionData *)This->extendedData)->ctx; + ActivateContext(This->wineD3DDevice, This->wineD3DDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if(ctx != This->wineD3DDevice->activeContext || ctx->tid != GetCurrentThreadId()) { FIXME("Not the owning context, can't start query\n"); } else {

1 0