winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2010
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
866 discussions
Start a n
N
ew thread
Piotr Caban : shell32: Improved IShellFolder_GetUIObjectOf implementation.
by Alexandre Julliard
10 Nov '10
10 Nov '10
Module: wine Branch: master Commit: e062d4a6fffd6ee2806919aea7109bffa9a73408 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e062d4a6fffd6ee2806919aea…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 10 14:19:29 2010 +0100 shell32: Improved IShellFolder_GetUIObjectOf implementation. --- dlls/shell32/shell32_main.h | 2 + dlls/shell32/shfldr.h | 2 + dlls/shell32/shfldr_fs.c | 90 ++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shfldr_unixfs.c | 7 +++ 4 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index af83fe4..77fd42a 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -69,6 +69,8 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD dwAttributes); DWORD WINAPI ParseFieldA(LPCSTR src, DWORD nField, LPSTR dst, DWORD len); DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len); +BOOL WINAPI GUIDFromStringW(LPCWSTR, LPGUID); + /**************************************************************************** * Class constructors */ diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index 38e0a0b..56833d1 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -49,6 +49,8 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path); +HRESULT SHELL32_CreateExtensionUIObject(IShellFolder2 *iface, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut); + static inline int SHELL32_GUIDToStringA (REFGUID guid, LPSTR str) { return sprintf(str, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 305902c..850424d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -611,6 +611,90 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, } /************************************************************************** + * SHELL32_CreateExtensionUIObject (internal) + */ +HRESULT SHELL32_CreateExtensionUIObject(IShellFolder2 *iface, + LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppvOut) +{ + static const WCHAR reg_blockedW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'S','h','e','l','l',' ','E','x','t','e','n','s','i','o','n','s','\\', + 'B','l','o','c','k','e','d',0}; + static const WCHAR formatW[] = {'.','%','s','\\','S','h','e','l','l','E','x','\\', + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', + '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; + + IPersistFile *persist_file; + char extensionA[20]; + WCHAR extensionW[20], buf[MAX_PATH]; + DWORD size = MAX_PATH; + STRRET path; + WCHAR *file; + GUID guid; + HKEY key; + HRESULT hr; + + + if(!_ILGetExtension(pidl, extensionA, 20)) + return S_FALSE; + + MultiByteToWideChar(CP_ACP, 0, extensionA, -1, extensionW, 20); + + sprintfW(buf, formatW, extensionW, riid->Data1, riid->Data2, riid->Data3, + riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], + riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + if(RegGetValueW(HKEY_CLASSES_ROOT, buf, NULL, RRF_RT_REG_SZ, + NULL, buf, &size) != ERROR_SUCCESS) + return S_FALSE; + + if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, reg_blockedW, 0, 0, 0, + KEY_READ, NULL, &key, NULL) != ERROR_SUCCESS) + return E_FAIL; + if(RegQueryValueExW(key, buf, 0, NULL, NULL, NULL) + != ERROR_FILE_NOT_FOUND) + return E_ACCESSDENIED; + RegCloseKey(key); + + if(RegCreateKeyExW(HKEY_CURRENT_USER, reg_blockedW, 0, 0, 0, + KEY_READ, NULL, &key, NULL) != ERROR_SUCCESS) + return E_FAIL; + if(RegQueryValueExW(key, buf, 0, NULL, NULL, NULL) + != ERROR_FILE_NOT_FOUND) + return E_ACCESSDENIED; + RegCloseKey(key); + + if(!GUIDFromStringW(buf, &guid)) + return E_FAIL; + + hr = CoCreateInstance(&guid, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistFile, (void**)&persist_file); + if(FAILED(hr)) + return hr; + + hr = IShellFolder_GetDisplayNameOf(iface, pidl, SHGDN_FORPARSING, &path); + if(SUCCEEDED(hr)) + hr = StrRetToStrW(&path, NULL, &file); + if(FAILED(hr)) { + IPersistFile_Release(persist_file); + return hr; + } + + hr = IPersistFile_Load(persist_file, file, STGM_READ); + CoTaskMemFree(file); + if(FAILED(hr)) { + IPersistFile_Release(persist_file); + return hr; + } + + hr = IPersistFile_QueryInterface(persist_file, riid, ppvOut); + IPersistFile_Release(persist_file); + return hr; +} + +/************************************************************************** * IShellFolder_fnGetUIObjectOf * * PARAMETERS @@ -651,6 +735,12 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, if (ppvOut) { *ppvOut = NULL; + if(cidl == 1) { + hr = SHELL32_CreateExtensionUIObject(iface, *apidl, riid, ppvOut); + if(hr != S_FALSE) + return hr; + } + if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface, This->pidlRoot, apidl, cidl); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index e02399a..11f3686 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1115,6 +1115,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetUIObjectOf(IShellFolder2* ifac { UnixFolder *This = ADJUST_THIS(UnixFolder, IShellFolder2, iface); UINT i; + HRESULT hr; TRACE("(iface=%p, hwndOwner=%p, cidl=%d, apidl=%p, riid=%s, prgfInOut=%p, ppv=%p)\n", iface, hwndOwner, cidl, apidl, debugstr_guid(riid), prgfInOut, ppvOut); @@ -1125,6 +1126,12 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetUIObjectOf(IShellFolder2* ifac for (i=0; i<cidl; i++) if (!apidl[i]) return E_INVALIDARG; + + if(cidl == 1) { + hr = SHELL32_CreateExtensionUIObject(iface, *apidl, riid, ppvOut); + if(hr != S_FALSE) + return hr; + } if (IsEqualIID(&IID_IContextMenu, riid)) { *ppvOut = ISvItemCm_Constructor((IShellFolder*)iface, This->m_pidlLocation, apidl, cidl);
1
0
0
0
Dmitry Timoshkov : gdi32: Remove broken check for WinXP.
by Alexandre Julliard
10 Nov '10
10 Nov '10
Module: wine Branch: master Commit: d419f2437251ad4fa08badcb34d6343493e5597a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d419f2437251ad4fa08badcb3…
Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Nov 10 20:38:55 2010 +0800 gdi32: Remove broken check for WinXP. --- dlls/gdi32/tests/font.c | 99 ++++++++++++++++++++++------------------------- 1 files changed, 46 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cede3aa..b200ca1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3185,8 +3185,6 @@ static void test_AddFontMemResource(void) void *font; DWORD font_size, num_fonts; HANDLE ret; - DEVMODEA dmA; - BOOL is_winxp; if (!pAddFontMemResourceEx || !pRemoveFontMemResourceEx) { @@ -3201,62 +3199,59 @@ static void test_AddFontMemResource(void) return; } - is_winxp = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dmA) && - (dmA.dmFields & DM_DISPLAYORIENTATION); - - if (is_winxp) - { - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 10, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 10, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 0, NULL, &num_fonts); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 0, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(NULL, 10, NULL, &num_fonts); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(NULL, 10, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 0, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 0, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 10, NULL, NULL); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 10, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); - num_fonts = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = pAddFontMemResourceEx(font, 0, NULL, &num_fonts); - ok(!ret, "AddFontMemResourceEx should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", - GetLastError()); - ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); + num_fonts = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, 0, NULL, &num_fonts); + ok(!ret, "AddFontMemResourceEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); + if (0) /* hangs under windows 2000 */ + { num_fonts = 0xdeadbeef; SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, 10, NULL, &num_fonts); @@ -3266,8 +3261,6 @@ static void test_AddFontMemResource(void) GetLastError()); ok(num_fonts == 0xdeadbeef, "number of loaded fonts should be 0xdeadbeef\n"); } - else - win_skip("AddFontMemResourceEx invalid parameter tests are problematic on Win2k\n"); num_fonts = 0xdeadbeef; SetLastError(0xdeadbeef);
1
0
0
0
Henri Verbeet : wined3d: Don' t unregister a window unless the window proc is what we expect it to be.
by Alexandre Julliard
10 Nov '10
10 Nov '10
Module: wine Branch: master Commit: 7a354177b38c9451c938389576890a14d5c543fa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7a354177b38c9451c93838957…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:04 2010 +0100 wined3d: Don't unregister a window unless the window proc is what we expect it to be. In particular, if we'd unregister a window when the application replaced our window proc, but still forwards to us, we'd create a loop when we register the same window again later. --- dlls/ddraw/tests/d3d.c | 84 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_main.c | 52 +++++++++++++++++---------- 2 files changed, 115 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 82fdedf..a8535a3 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3263,9 +3263,9 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM static void test_wndproc(void) { + LONG_PTR proc, ddraw_proc; IDirectDraw7 *ddraw7; WNDCLASSA wc = {0}; - LONG_PTR proc; HWND window; HRESULT hr; ULONG ref; @@ -3356,7 +3356,87 @@ static void test_wndproc(void) (LONG_PTR)test_proc, proc); /* The original window proc is only restored by ddraw if the current - * window proc matches the one ddraw set. */ + * window proc matches the one ddraw set. This also affects switching + * from DDSCL_NORMAL to DDSCL_EXCLUSIVE. */ + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + ddraw_proc = proc; + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)DefWindowProcA, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)ddraw_proc); + ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)DefWindowProcA, proc); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0e44702..8cc2828 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -467,35 +467,49 @@ BOOL wined3d_register_window(HWND window, IWineD3DDeviceImpl *device) void wined3d_unregister_window(HWND window) { - unsigned int i; + struct wined3d_wndproc *entry, *last; + LONG_PTR proc; wined3d_mutex_lock(); - for (i = 0; i < wndproc_table.count; ++i) + + if (!(entry = wined3d_find_wndproc(window))) { - if (wndproc_table.entries[i].window == window) - { - struct wined3d_wndproc *entry = &wndproc_table.entries[i]; - struct wined3d_wndproc *last = &wndproc_table.entries[--wndproc_table.count]; + wined3d_mutex_unlock(); + ERR("Window %p is not registered with wined3d.\n", window); + return; + } - if (entry->unicode) - { - if (GetWindowLongPtrW(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) - SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); - } - else - { - if (GetWindowLongPtrA(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) - SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); - } - if (entry != last) *entry = *last; + if (entry->unicode) + { + proc = GetWindowLongPtrW(window, GWLP_WNDPROC); + if (proc != (LONG_PTR)wined3d_wndproc) + { wined3d_mutex_unlock(); + WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", + window, proc, wined3d_wndproc); + return; + } + SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + } + else + { + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + if (proc != (LONG_PTR)wined3d_wndproc) + { + wined3d_mutex_unlock(); + WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", + window, proc, wined3d_wndproc); return; } + + SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); } - wined3d_mutex_unlock(); - ERR("Window %p is not registered with wined3d.\n", window); + last = &wndproc_table.entries[--wndproc_table.count]; + if (entry != last) *entry = *last; + + wined3d_mutex_unlock(); } /* At process attach */
1
0
0
0
Henri Verbeet : wined3d: Register a window only once.
by Alexandre Julliard
10 Nov '10
10 Nov '10
Module: wine Branch: master Commit: 9a1fddb0fd8f0d5c2c8601a9eadfe7737598c007 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9a1fddb0fd8f0d5c2c8601a9e…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:03 2010 +0100 wined3d: Register a window only once. --- dlls/wined3d/wined3d_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0932351..0e44702 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -422,6 +422,13 @@ BOOL wined3d_register_window(HWND window, IWineD3DDeviceImpl *device) wined3d_mutex_lock(); + if (wined3d_find_wndproc(window)) + { + wined3d_mutex_unlock(); + WARN("Window %p is already registered with wined3d.\n", window); + return TRUE; + } + if (wndproc_table.size == wndproc_table.count) { unsigned int new_size = max(1, wndproc_table.size * 2);
1
0
0
0
Henri Verbeet : ddraw: Make switching to/ from fullscreen work more than once.
by Alexandre Julliard
10 Nov '10
10 Nov '10
Module: wine Branch: master Commit: 2b0684c56db343112d845e0b277bf831f6b578df URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2b0684c56db343112d845e0b2…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:02 2010 +0100 ddraw: Make switching to/from fullscreen work more than once. --- dlls/ddraw/ddraw.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e155482..b9ff201 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -647,15 +647,12 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE))) IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); - /* Do we switch from fullscreen to non-fullscreen ? */ - if (!(cooplevel & DDSCL_FULLSCREEN) && (This->cooperative_level & DDSCL_FULLSCREEN)) - { - IWineD3DDevice_RestoreFullscreenWindow(This->wineD3DDevice, This->dest_window); - } - - /* Don't override focus windows or private device windows */ - if (hwnd && !This->focuswindow && !This->devicewindow && (hwnd != window)) + if ((cooplevel & DDSCL_FULLSCREEN) != (This->cooperative_level & DDSCL_FULLSCREEN) || hwnd != window) { + if (This->cooperative_level & DDSCL_FULLSCREEN) + { + IWineD3DDevice_RestoreFullscreenWindow(This->wineD3DDevice, window); + } if (cooplevel & DDSCL_FULLSCREEN) { WINED3DDISPLAYMODE display_mode; @@ -663,7 +660,6 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, IWineD3D_GetAdapterDisplayMode(This->wineD3D, WINED3DADAPTER_DEFAULT, &display_mode); IWineD3DDevice_SetupFullscreenWindow(This->wineD3DDevice, hwnd, display_mode.Width, display_mode.Height); } - This->dest_window = hwnd; } if ((cooplevel & DDSCL_EXCLUSIVE) @@ -678,6 +674,10 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, } } + /* Don't override focus windows or private device windows */ + if (hwnd && !This->focuswindow && !This->devicewindow && (hwnd != window)) + This->dest_window = hwnd; + if(cooplevel & DDSCL_CREATEDEVICEWINDOW) { /* Don't create a device window if a focus window is set */
1
0
0
0
Henri Verbeet : ddraw: Window proc replacement depends on DDSCL_EXCLUSIVE, not DDSCL_FULLSCREEN.
by Alexandre Julliard
10 Nov '10
10 Nov '10
Module: wine Branch: master Commit: 6fcb33f59f8449d836bf7eb58acd48172bf9ad4f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6fcb33f59f8449d836bf7eb58…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:01 2010 +0100 ddraw: Window proc replacement depends on DDSCL_EXCLUSIVE, not DDSCL_FULLSCREEN. --- dlls/ddraw/ddraw.c | 27 +++++++++++++++++---------- dlls/ddraw/tests/d3d.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 512fd8e..e155482 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -641,12 +641,15 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, TRACE("(%p) SetCooperativeLevel needs at least SetFocusWindow or Exclusive or Normal mode\n", This); LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; - } + } + + if ((This->cooperative_level & DDSCL_EXCLUSIVE) + && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE))) + IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); /* Do we switch from fullscreen to non-fullscreen ? */ if (!(cooplevel & DDSCL_FULLSCREEN) && (This->cooperative_level & DDSCL_FULLSCREEN)) { - IWineD3DDevice_ReleaseFocusWindow(This->wineD3DDevice); IWineD3DDevice_RestoreFullscreenWindow(This->wineD3DDevice, This->dest_window); } @@ -656,21 +659,25 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, if (cooplevel & DDSCL_FULLSCREEN) { WINED3DDISPLAYMODE display_mode; - HRESULT hr; IWineD3D_GetAdapterDisplayMode(This->wineD3D, WINED3DADAPTER_DEFAULT, &display_mode); IWineD3DDevice_SetupFullscreenWindow(This->wineD3DDevice, hwnd, display_mode.Width, display_mode.Height); - hr = IWineD3DDevice_AcquireFocusWindow(This->wineD3DDevice, hwnd); - if (FAILED(hr)) - { - ERR("Failed to acquire focus window, hr %#x.\n", hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } } This->dest_window = hwnd; } + if ((cooplevel & DDSCL_EXCLUSIVE) + && (hwnd != window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) + { + HRESULT hr = IWineD3DDevice_AcquireFocusWindow(This->wineD3DDevice, hwnd); + if (FAILED(hr)) + { + ERR("Failed to acquire focus window, hr %#x.\n", hr); + LeaveCriticalSection(&ddraw_cs); + return hr; + } + } + if(cooplevel & DDSCL_CREATEDEVICEWINDOW) { /* Don't create a device window if a focus window is set */ diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 9066e4e..82fdedf 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3281,6 +3281,7 @@ static void test_wndproc(void) 0, }; + /* DDSCL_EXCLUSIVE replaces the window's window proc. */ hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) { @@ -3323,6 +3324,39 @@ static void test_wndproc(void) ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); + /* DDSCL_NORMAL doesn't. */ + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_NORMAL | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + /* The original window proc is only restored by ddraw if the current + * window proc matches the one ddraw set. */ hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) {
1
0
0
0
Henri Verbeet : wined3d: Use a lookup table in select_card_ati_binary().
by Alexandre Julliard
10 Nov '10
10 Nov '10
Module: wine Branch: master Commit: 4503d0cb4b4fa5ab5857980ab232bf7bedfd6cc6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4503d0cb4b4fa5ab5857980ab…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 10 10:53:00 2010 +0100 wined3d: Use a lookup table in select_card_ati_binary(). --- dlls/wined3d/directx.c | 124 ++++++++++++++++++------------------------------ 1 files changed, 47 insertions(+), 77 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7ceb742..4485491 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1578,89 +1578,59 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ if (WINE_D3D10_CAPABLE(gl_info)) { - /* Radeon EG CYPRESS XT / PRO HD5800 - highend */ - if (strstr(gl_renderer, "HD 5800") /* Radeon EG CYPRESS HD58xx generic renderer string */ - || strstr(gl_renderer, "HD 5850") /* Radeon EG CYPRESS XT */ - || strstr(gl_renderer, "HD 5870")) /* Radeon EG CYPRESS PRO */ - { - return CARD_ATI_RADEON_HD5800; - } - - /* Radeon EG JUNIPER XT / LE HD5700 - midend */ - if (strstr(gl_renderer, "HD 5700") /* Radeon EG JUNIPER HD57xx generic renderer string */ - || strstr(gl_renderer, "HD 5750") /* Radeon EG JUNIPER LE */ - || strstr(gl_renderer, "HD 5770")) /* Radeon EG JUNIPER XT */ - { - return CARD_ATI_RADEON_HD5700; - } - - /* Radeon R7xx HD4800 - highend */ - if (strstr(gl_renderer, "HD 4800") /* Radeon RV7xx HD48xx generic renderer string */ - || strstr(gl_renderer, "HD 4830") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4850") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4870") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4890")) /* Radeon RV790 */ - { - return CARD_ATI_RADEON_HD4800; - } - - /* Radeon R740 HD4700 - midend */ - if (strstr(gl_renderer, "HD 4700") /* Radeon RV770 */ - || strstr(gl_renderer, "HD 4770")) /* Radeon RV740 */ - { - return CARD_ATI_RADEON_HD4700; - } - - /* Radeon R730 HD4600 - midend */ - if (strstr(gl_renderer, "HD 4600") /* Radeon RV730 */ - || strstr(gl_renderer, "HD 4650") /* Radeon RV730 */ - || strstr(gl_renderer, "HD 4670")) /* Radeon RV730 */ - { - return CARD_ATI_RADEON_HD4600; - } - - /* Radeon R710 HD4500/HD4350 - lowend */ - if (strstr(gl_renderer, "HD 4350") /* Radeon RV710 */ - || strstr(gl_renderer, "HD 4550")) /* Radeon RV710 */ - { - return CARD_ATI_RADEON_HD4350; - } - - /* Radeon R6xx HD2900/HD3800 - highend */ - if (strstr(gl_renderer, "HD 2900") - || strstr(gl_renderer, "HD 3870") - || strstr(gl_renderer, "HD 3850")) - { - return CARD_ATI_RADEON_HD2900; - } + unsigned int i; - /* Radeon R6xx HD2600/HD3600 - midend; HD3830 is China-only midend */ - if (strstr(gl_renderer, "HD 2600") - || strstr(gl_renderer, "HD 3830") - || strstr(gl_renderer, "HD 3690") - || strstr(gl_renderer, "HD 3650")) + static const struct { - return CARD_ATI_RADEON_HD2600; + const char *renderer; + enum wined3d_pci_device id; } - - /* Radeon R6xx HD2350/HD2400/HD3400 - lowend - * Note HD2300=DX9, HD2350=DX10 */ - if (strstr(gl_renderer, "HD 2350") - || strstr(gl_renderer, "HD 2400") - || strstr(gl_renderer, "HD 3470") - || strstr(gl_renderer, "HD 3450") - || strstr(gl_renderer, "HD 3430") - || strstr(gl_renderer, "HD 3400")) + cards[] = { - return CARD_ATI_RADEON_HD2350; - } + /* Evergreen */ + {"HD 5870", CARD_ATI_RADEON_HD5800}, /* Radeon EG CYPRESS PRO */ + {"HD 5850", CARD_ATI_RADEON_HD5800}, /* Radeon EG CYPRESS XT */ + {"HD 5800", CARD_ATI_RADEON_HD5800}, /* Radeon EG CYPRESS HD58xx generic renderer string */ + {"HD 5770", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER XT */ + {"HD 5750", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER LE */ + {"HD 5700", CARD_ATI_RADEON_HD5700}, /* Radeon EG JUNIPER HD57xx generic renderer string */ + /* R700 */ + {"HD 4890", CARD_ATI_RADEON_HD4800}, /* Radeon RV790 */ + {"HD 4870", CARD_ATI_RADEON_HD4800}, /* Radeon RV770 */ + {"HD 4850", CARD_ATI_RADEON_HD4800}, /* Radeon RV770 */ + {"HD 4830", CARD_ATI_RADEON_HD4800}, /* Radeon RV770 */ + {"HD 4800", CARD_ATI_RADEON_HD4800}, /* Radeon RV7xx HD48xx generic renderer string */ + {"HD 4770", CARD_ATI_RADEON_HD4700}, /* Radeon RV740 */ + {"HD 4700", CARD_ATI_RADEON_HD4700}, /* Radeon RV7xx HD47xx generic renderer string */ + {"HD 4670", CARD_ATI_RADEON_HD4600}, /* Radeon RV730 */ + {"HD 4650", CARD_ATI_RADEON_HD4600}, /* Radeon RV730 */ + {"HD 4600", CARD_ATI_RADEON_HD4600}, /* Radeon RV730 */ + {"HD 4550", CARD_ATI_RADEON_HD4350}, /* Radeon RV710 */ + {"HD 4350", CARD_ATI_RADEON_HD4350}, /* Radeon RV710 */ + /* R600/R700 integrated */ + {"HD 3300", CARD_ATI_RADEON_HD3200}, + {"HD 3200", CARD_ATI_RADEON_HD3200}, + {"HD 3100", CARD_ATI_RADEON_HD3200}, + /* R600 */ + {"HD 3870", CARD_ATI_RADEON_HD2900}, /* HD2900/HD3800 - highend */ + {"HD 3850", CARD_ATI_RADEON_HD2900}, /* HD2900/HD3800 - highend */ + {"HD 2900", CARD_ATI_RADEON_HD2900}, /* HD2900/HD3800 - highend */ + {"HD 3830", CARD_ATI_RADEON_HD2600}, /* China-only midend */ + {"HD 3690", CARD_ATI_RADEON_HD2600}, /* HD2600/HD3600 - midend */ + {"HD 3650", CARD_ATI_RADEON_HD2600}, /* HD2600/HD3600 - midend */ + {"HD 2600", CARD_ATI_RADEON_HD2600}, /* HD2600/HD3600 - midend */ + {"HD 3470", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 3450", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 3430", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 3400", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 2400", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + {"HD 2350", CARD_ATI_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + }; - /* Radeon R6xx/R7xx integrated */ - if (strstr(gl_renderer, "HD 3100") - || strstr(gl_renderer, "HD 3200") - || strstr(gl_renderer, "HD 3300")) + for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) { - return CARD_ATI_RADEON_HD3200; + if (strstr(gl_renderer, cards[i].renderer)) + return cards[i].id; } /* Default for when no GPU has been found */
1
0
0
0
Michael Stefaniuc : urlmon/tests: Escape '\' in C strings (sparse).
by Alexandre Julliard
10 Nov '10
10 Nov '10
Module: wine Branch: master Commit: 0f21814bbe293bd9efc84e9722b8161a582eab63 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0f21814bbe293bd9efc84e972…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 10 01:20:38 2010 +0100 urlmon/tests: Escape '\' in C strings (sparse). --- dlls/urlmon/tests/uri.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b11a3a0..8c4fd38 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3307,20 +3307,20 @@ static const uri_properties uri_tests[] = { } }, /* Allow more characters when Uri_CREATE_FILE_USE_DOS_PATH is specified */ - { "file:///c:/dir\%%61%20%5Fname/file%2A.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, + { "file:///c:/dir\\%%61%20%5Fname/file%2A.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, { - {"file://c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"file://c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, {"",S_FALSE,FALSE}, - {"file://c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"file://c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, {"",S_FALSE,FALSE}, {".html",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}, - {"c:\\dir\%a _name\\file*.html",S_OK,FALSE}, - {"c:\\dir\%a _name\\file*.html",S_OK,FALSE}, + {"c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, + {"c:\\dir\\%a _name\\file*.html",S_OK,FALSE}, {"",S_FALSE,FALSE}, - {"file:///c:/dir\%%61%20%5Fname/file%2A.html",S_OK,FALSE}, + {"file:///c:/dir\\%%61%20%5Fname/file%2A.html",S_OK,FALSE}, {"file",S_OK,FALSE}, {"",S_FALSE,FALSE}, {"",S_FALSE,FALSE}
1
0
0
0
Michael Stefaniuc : kernel32/tests: '\' needs to be escaped in a C string ( sparse).
by Alexandre Julliard
10 Nov '10
10 Nov '10
Module: wine Branch: master Commit: bb442a2a576fc8026dca8cbb5f460ee25262923b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bb442a2a576fc8026dca8cbb5…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 10 01:19:48 2010 +0100 kernel32/tests: '\' needs to be escaped in a C string (sparse). --- dlls/kernel32/tests/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 55d62aa..1ccafb7 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -362,7 +362,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) for(unique=0;unique<3;unique++) { /* Nonexistent path */ - sprintf(invalid_dir, "%s\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); + sprintf(invalid_dir, "%s\\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); SetLastError(0xdeadbeef); ok(!GetTempFileNameA(invalid_dir,"tfn",unique,newdir),"GetTempFileNameA should have failed\n"); ok(GetLastError()==ERROR_DIRECTORY || broken(GetLastError()==ERROR_PATH_NOT_FOUND)/*win98*/,
1
0
0
0
Michael Stefaniuc : include: Avoid a multi-character character constant.
by Alexandre Julliard
10 Nov '10
10 Nov '10
Module: wine Branch: master Commit: b6b7069f2f6571883c13480d0851ee743cb8b457 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b6b7069f2f6571883c13480d0…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 10 01:18:28 2010 +0100 include: Avoid a multi-character character constant. Multi-character character constants aren't portable as their behaviour is compiler dependent according to the C standard (sparse). --- include/devicetopology.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 4dc182b..18bfa50 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -35,7 +35,7 @@ cpp_quote("#ifndef E_NOTFOUND") cpp_quote("#define E_NOTFOUND HRESULT_FROM_WIN32(ERROR_NOT_FOUND)") cpp_quote("#endif") -cpp_quote("#define DEVTOPO_HARDWARE_INITIATED_EVENTCONTEXT 'draH'") +cpp_quote("#define DEVTOPO_HARDWARE_INITIATED_EVENTCONTEXT 0x64726148 /* 'draH' */") cpp_quote("DEFINE_GUID(EVENTCONTEXT_VOLUMESLIDER, 0xe2c2e9de, 0x09b1, 0x4b04,0x84,0xe5, 0x07, 0x93, 0x12, 0x25, 0xee, 0x04);") cpp_quote("#define _IKsControl_")
1
0
0
0
← Newer
1
...
47
48
49
50
51
52
53
...
87
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
Results per page:
10
25
50
100
200