wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

David Hedberg : shell32: Initial support for the properties command in the IContextMenu for shellview .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: bbe73787fcd100df4fe62f25f10794119c7f997b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe73787fcd100df4fe62f25f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 16 01:32:46 2010 +0100 shell32: Initial support for the properties command in the IContextMenu for shellview. --- dlls/shell32/shv_item_cmenu.c | 132 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 6beb08f..1bab77b 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -32,6 +32,8 @@ #include "pidl.h" #include "undocshell.h" #include "shlobj.h" +#include "winreg.h" +#include "prsht.h" #include "shell32_main.h" #include "shellfolder.h" @@ -381,6 +383,130 @@ static BOOL DoCopyOrCut( } return TRUE; } + +/************************************************************************** + * Properties_AddPropSheetCallback + * + * Used by DoOpenProperties through SHCreatePropSheetExtArrayEx to add + * propertysheet pages from shell extensions. + */ +static BOOL Properties_AddPropSheetCallback(HPROPSHEETPAGE hpage, LPARAM lparam) +{ + LPPROPSHEETHEADERW psh = (LPPROPSHEETHEADERW) lparam; + psh->u3.phpage[psh->nPages++] = hpage; + + return TRUE; +} + +/************************************************************************** + * DoOpenProperties + */ +static void DoOpenProperties(IContextMenu2 *iface, 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}; + LPSHELLFOLDER lpDesktopSF; + LPSHELLFOLDER lpSF; + LPDATAOBJECT lpDo; + WCHAR wszFiletype[MAX_PATH]; + WCHAR wszFilename[MAX_PATH]; + PROPSHEETHEADERW psh; + HPROPSHEETPAGE hpages[MAX_PROP_PAGES]; + HPSXA hpsxa; + UINT ret; + + TRACE("(%p)->(wnd=%p)\n", This, hwnd); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); + psh.dwSize = sizeof (PROPSHEETHEADERW); + psh.hwndParent = hwnd; + psh.dwFlags = PSH_PROPTITLE; + psh.nPages = 0; + psh.u3.phpage = hpages; + psh.u2.nStartPage = 0; + + _ILSimpleGetTextW(This->apidl[0], (LPVOID)&wszFilename, MAX_PATH); + psh.pszCaption = (LPCWSTR)&wszFilename; + + /* Find out where to look for the shell extensions */ + if (_ILIsValue(This->apidl[0])) + { + char sTemp[64]; + sTemp[0] = 0; + if (_ILGetExtension(This->apidl[0], sTemp, 64)) + { + HCR_MapTypeToValueA(sTemp, sTemp, 64, TRUE); + MultiByteToWideChar(CP_ACP, 0, sTemp, -1, wszFiletype, MAX_PATH); + } + else + { + wszFiletype[0] = 0; + } + } + else if (_ILIsFolder(This->apidl[0])) + { + lstrcpynW(wszFiletype, wszFolder, 64); + } + else if (_ILIsSpecialFolder(This->apidl[0])) + { + LPGUID folderGUID; + static const WCHAR wszclsid[] = {'C','L','S','I','D','\\', 0}; + folderGUID = _ILGetGUIDPointer(This->apidl[0]); + lstrcpyW(wszFiletype, wszclsid); + StringFromGUID2(folderGUID, &wszFiletype[6], MAX_PATH - 6); + } + else + { + FIXME("Requested properties for unknown type.\n"); + return; + } + + /* Get a suitable DataObject for accessing the files */ + SHGetDesktopFolder(&lpDesktopSF); + if (_ILIsPidlSimple(This->pidl)) + { + ret = IShellFolder_GetUIObjectOf(lpDesktopSF, hwnd, This->cidl, (LPCITEMIDLIST*)This->apidl, + &IID_IDataObject, NULL, (LPVOID *)&lpDo); + IShellFolder_Release(lpDesktopSF); + } + else + { + IShellFolder_BindToObject(lpDesktopSF, This->pidl, NULL, &IID_IShellFolder, (LPVOID*) &lpSF); + ret = IShellFolder_GetUIObjectOf(lpSF, hwnd, This->cidl, (LPCITEMIDLIST*)This->apidl, + &IID_IDataObject, NULL, (LPVOID *)&lpDo); + IShellFolder_Release(lpSF); + IShellFolder_Release(lpDesktopSF); + } + + if (SUCCEEDED(ret)) + { + hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletype, MAX_PROP_PAGES - psh.nPages, lpDo); + if (hpsxa != NULL) + { + SHAddFromPropSheetExtArray((HPSXA)hpsxa, + (LPFNADDPROPSHEETPAGE)&Properties_AddPropSheetCallback, + (LPARAM)&psh); + SHDestroyPropSheetExtArray(hpsxa); + } + hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletypeAll, MAX_PROP_PAGES - psh.nPages, lpDo); + if (hpsxa != NULL) + { + SHAddFromPropSheetExtArray((HPSXA)hpsxa, + (LPFNADDPROPSHEETPAGE)&Properties_AddPropSheetCallback, + (LPARAM)&psh); + SHDestroyPropSheetExtArray(hpsxa); + } + IDataObject_Release(lpDo); + } + + if (psh.nPages) + PropertySheetW(&psh); + else + FIXME("No property pages found.\n"); +} + /************************************************************************** * ISvItemCm_fnInvokeCommand() */ @@ -429,6 +555,10 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( TRACE("Verb FCIDM_SHVIEW_CUT\n"); DoCopyOrCut(iface, lpcmi->hwnd, TRUE); break; + case FCIDM_SHVIEW_PROPERTIES: + TRACE("Verb FCIDM_SHVIEW_PROPERTIES\n"); + DoOpenProperties(iface, lpcmi->hwnd); + break; default: FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); } @@ -438,6 +568,8 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( TRACE("Verb is %s\n",debugstr_a(lpcmi->lpVerb)); if (strcmp(lpcmi->lpVerb,"delete")==0) DoDelete(iface); + else if (strcmp(lpcmi->lpVerb,"properties")==0) + DoOpenProperties(iface, lpcmi->hwnd); else FIXME("Unhandled string verb %s\n",debugstr_a(lpcmi->lpVerb)); }

1 0

David Hedberg : shell32: SHCreatePropSheetExtArrayEx should check if the key itself contains the clsid of the shell extension .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 50c7cf5111d581f12d7f34116bd0d7f6ec819531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c7cf5111d581f12d7f34116… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 16 01:32:45 2010 +0100 shell32: SHCreatePropSheetExtArrayEx should check if the key itself contains the clsid of the shell extension. --- dlls/shell32/shellord.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 940633e..9e6425c 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1807,34 +1807,40 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ break; } - dwClsidSize = sizeof(szClsidHandler); - if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) + /* The CLSID is stored either in the key itself or in its default value. */ + if (!SUCCEEDED(lRet = SHCLSIDFromStringW(szHandler, &clsid))) { - /* Force a NULL-termination and convert the string */ - szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; - if (SUCCEEDED(SHCLSIDFromStringW(szClsidHandler, &clsid))) + dwClsidSize = sizeof(szClsidHandler); + if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) { - /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. - Only if both interfaces are supported it's a real shell extension. - Then call IShellExtInit's Initialize method. */ - if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + /* Force a NULL-termination and convert the string */ + szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; + lRet = SHCLSIDFromStringW(szClsidHandler, &clsid); + } + } + + if (SUCCEEDED(lRet)) + { + /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. + Only if both interfaces are supported it's a real shell extension. + Then call IShellExtInit's Initialize method. */ + if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + { + if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) { - if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) + if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) { - if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) - { - /* Add the IShellPropSheetExt instance to the array */ - psxa->pspsx[psxa->uiCount++] = pspsx; - } - else - { - psxi->lpVtbl->Release(psxi); - pspsx->lpVtbl->Release(pspsx); - } + /* Add the IShellPropSheetExt instance to the array */ + psxa->pspsx[psxa->uiCount++] = pspsx; } else + { + psxi->lpVtbl->Release(psxi); pspsx->lpVtbl->Release(pspsx); + } } + else + pspsx->lpVtbl->Release(pspsx); } }

1 0

David Hedberg : wine.inf: Add key for approved shell extensions.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 990a31975085622c088e37613c7865395bfc7c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=990a31975085622c088e37613… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 16 01:32:44 2010 +0100 wine.inf: Add key for approved shell extensions. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 7ad4291..7476df7 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -428,6 +428,7 @@ HKLM,%CurrentVersion%\PreviewHandlers,,16 HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" +HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,""

1 0

Nikolay Sivov : ole32: Turn FIXME to TRACE for CoGetTreatAsClass.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 825a63569233abf991e9fd90bbb5e0cf081d9c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825a63569233abf991e9fd90b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 22:51:56 2010 +0300 ole32: Turn FIXME to TRACE for CoGetTreatAsClass. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 583a9cb..12f8314 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2956,7 +2956,7 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID clsidNew) HRESULT res = S_OK; LONG len = sizeof(szClsidNew); - FIXME("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); + TRACE("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); *clsidNew = *clsidOld; /* copy over old value */ res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey);

1 0

Paul Vriens : gdiplus/tests: Fix a test failure on Win98/WinMe.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 0513eb506efdc89e26ef18e6564275a5d82e3a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0513eb506efdc89e26ef18e65… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 16 11:00:59 2010 +0100 gdiplus/tests: Fix a test failure on Win98/WinMe. --- dlls/gdiplus/tests/graphics.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b2dc9b2..9dffd52 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2415,7 +2415,10 @@ static void test_GdipGetNearestColor(void) expect(Ok, status); status = GdipGetNearestColor(graphics, &color); expect(Ok, status); - todo_wine expect(0xffa8b8e8, color); + todo_wine + ok(color == 0xffa8b8e8 || + broken(color == 0xffa0b8e0), /* Win98/WinMe */ + "Expected ffa8b8e8, got %.8x\n", color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap);

1 0

Yann Droneaud : cmd: Add another expansion test.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: ac8d92405c24dcc3a10277ad0c3f53b2acd789c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8d92405c24dcc3a10277ad0… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Tue Mar 16 10:54:26 2010 +0100 cmd: Add another expansion test. Test %VAR%VAR% to check that the second variable is not expanded. --- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a7d7027..696ce13 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -32,6 +32,7 @@ echo P%UNKNOWN%S echo %ERRORLEVEL echo %ERRORLEVEL% echo %ERRORLEVEL%%ERRORLEVEL% +echo %ERRORLEVEL%ERRORLEVEL% echo %ERRORLEVEL%% echo %ERRORLEVEL%%% echo P%ERRORLEVEL% diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e8e5473..55fc9f2 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -25,6 +25,7 @@ PS ERRORLEVEL 0 00 +0ERRORLEVEL 0 0% P0

1 0

Yann Droneaud : cmd: Remove %CD% test.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 954d06ca354146e1d813fa688ec1dcc00cf71370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=954d06ca354146e1d813fa688… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Tue Mar 16 10:53:28 2010 +0100 cmd: Remove %CD% test. %CD% seems not supported on Windows NT 4. --- programs/cmd/tests/test_builtins.cmd | 1 - programs/cmd/tests/test_builtins.cmd.exp | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index e346ffa..a7d7027 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -23,7 +23,6 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir -echo %CD% echo %% echo P% echo %P diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a8b2fc0..e8e5473 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -16,7 +16,6 @@ bar ~dp0 should be directory containing batch file @pwd@\ @pwd@\ -@pwd@ % P P

1 0

Paul Vriens : kernel32/tests: Run tests again on Win95.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: b120836bd25debfefe02057a85c4e381f67266de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b120836bd25debfefe02057a8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 16 10:42:48 2010 +0100 kernel32/tests: Run tests again on Win95. --- dlls/kernel32/tests/debugger.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 057b977..e116c9d 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -44,6 +44,7 @@ static char** myARGV; static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); +static BOOL (WINAPI *pIsDebuggerPresent)(void); static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static LONG child_failures; @@ -529,7 +530,7 @@ static void doChild(int argc, char **argv) ret = CloseHandle(parent); child_ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); - ret = IsDebuggerPresent(); + ret = pIsDebuggerPresent(); child_ok(ret, "Expected ret != 0, got %#x.\n", ret); ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); @@ -539,7 +540,7 @@ static void doChild(int argc, char **argv) { pNtCurrentTeb()->Peb->BeingDebugged = FALSE; - ret = IsDebuggerPresent(); + ret = pIsDebuggerPresent(); child_ok(!ret, "Expected ret != 0, got %#x.\n", ret); ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); @@ -624,6 +625,7 @@ START_TEST(debugger) pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); + pIsDebuggerPresent=(void*)GetProcAddress(hdll, "IsDebuggerPresent"); hdll=GetModuleHandle("ntdll.dll"); if (hdll) pNtCurrentTeb = (void*)GetProcAddress(hdll, "NtCurrentTeb");

1 0

Paul Vriens : mshtml/tests: Fix some test failures on Win9x/ WinMe by using a A-function.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: e014154fb7db071da787aa4e54d5fa9903100769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e014154fb7db071da787aa4e5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 16 10:18:52 2010 +0100 mshtml/tests: Fix some test failures on Win9x/WinMe by using a A-function. --- dlls/mshtml/tests/dom.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 264f9fb..c6f5479 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3195,8 +3195,6 @@ static void test_screen(IHTMLWindow2 *window) HDC hdc; HRESULT hres; - static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; - screen = NULL; hres = IHTMLWindow2_get_screen(window, &screen); ok(hres == S_OK, "get_screen failed: %08x\n", hres); @@ -3216,7 +3214,7 @@ static void test_screen(IHTMLWindow2 *window) IDispatchEx_Release(dispex); } - hdc = CreateICW(displayW, NULL, NULL, NULL); + hdc = CreateICA("DISPLAY", NULL, NULL, NULL); exl = GetDeviceCaps(hdc, HORZRES); l = 0xdeadbeef;

1 0

Stefan Dösinger : wined3d: Check the alignment of mapped buffer pointers.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: cc6d17ba7cacb171a478f63ed81473ee0730ef35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc6d17ba7cacb171a478f63ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 11 13:20:32 2010 +0100 wined3d: Check the alignment of mapped buffer pointers. Windows returns 32 byte aligned pointers when locking vertex and index buffers, and some applications(Half Life 2, Alpha Prime, possibly others) rely on this. Check the alignment and fall back to double buffered buffers with HeapAlloced and aligned pointers if the alignment doesn't fit. --- dlls/wined3d/buffer.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 08d3097..46131af 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1186,6 +1186,21 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); } LEAVE_GL(); + + if (((DWORD_PTR) This->resource.allocatedMemory) & (RESOURCE_ALIGNMENT - 1)) + { + WARN("Pointer %p is not %u byte aligned, falling back to double buffered operation\n", + This->resource.allocatedMemory, RESOURCE_ALIGNMENT); + + ENTER_GL(); + GL_EXTCALL(glUnmapBufferARB(This->buffer_type_hint)); + checkGLcall("glUnmapBufferARB"); + LEAVE_GL(); + This->resource.allocatedMemory = NULL; + + buffer_get_sysmem(This); + TRACE("New pointer is %p\n", This->resource.allocatedMemory); + } context_release(context); } }

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
92
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 March 2010