October 2012 - Wine-commits

Nozomi Kodama : d3dx9_36/tests: Remove useless casts.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 46fca31c4f18edecf4fea5a40c97d5f01d28b043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fca31c4f18edecf4fea5a40… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:14:12 2012 +0800 d3dx9_36/tests: Remove useless casts. --- dlls/d3dx9_36/tests/math.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8ab0391..3eb31f9 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2645,7 +2645,7 @@ static void test_D3DXSHMultiply3(void) { unsigned int i; FLOAT a[20], b[20], c[20]; - /* D3DXSHMultiply only modifies the first 9 elements of the array */ + /* D3DXSHMultiply3 only modifies the first 9 elements of the array */ const FLOAT expected[20] = { 7.813913f, 2.256058f, 5.9484005f, 4.970894f, 2.899858f, 3.598946f, 1.726572f, 5.573538f, 0.622063f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, @@ -2653,9 +2653,9 @@ static void test_D3DXSHMultiply3(void) for (i = 0; i < 20; i++) { - a[i] = 1.0f + (FLOAT)i/100.0f; - b[i] = 3.0f - (FLOAT)i/100.0f; - c[i] = (FLOAT)i; + a[i] = 1.0f + i / 100.0f; + b[i] = 3.0f - i / 100.0f; + c[i] = i; } D3DXSHMultiply3(c, a, b);

1 0

Erich Hoover : hhctrl.ocx: Store all the parameters the first time the WinType is filled in.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: bc2258d678d43062441bbc62f98ad3d7370ab4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2258d678d43062441bbc62f… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Oct 2 15:13:14 2012 -0600 hhctrl.ocx: Store all the parameters the first time the WinType is filled in. --- dlls/hhctrl.ocx/chm.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 88bd6e5..e3f2a44 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -263,6 +263,13 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) if (unhandled_params) FIXME("Unsupported fsValidMembers fields: 0x%x\n", unhandled_params); + dst->fsValidMembers |= merge; + if (dst->cbStruct == 0) + { + /* If the structure has not been filled in yet then use all of the values */ + dst->cbStruct = sizeof(HH_WINTYPEW); + merge = ~0; + } if (merge & HHWIN_PARAM_PROPERTIES) dst->fsWinProperties = src->fsWinProperties; if (merge & HHWIN_PARAM_STYLES) dst->dwStyles = src->dwStyles; if (merge & HHWIN_PARAM_EXSTYLES) dst->dwExStyles = src->dwExStyles; @@ -276,7 +283,6 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) if (merge & HHWIN_PARAM_TABORDER) memcpy(&dst->tabOrder, &src->tabOrder, sizeof(src->tabOrder)); if (merge & HHWIN_PARAM_HISTORY_COUNT) dst->cHistory = src->cHistory; if (merge & HHWIN_PARAM_CUR_TAB) dst->curNavType = src->curNavType; - dst->fsValidMembers |= merge; /* * Note: We assume that hwndHelp, hwndCaller, hwndToolBar, hwndNavigation, and hwndHTML cannot be

1 0

Piotr Caban : wininet: Fixed failing test.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 8e6d2bab3766e48cf559a011d6aa9b6419851ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e6d2bab3766e48cf559a011d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 3 12:29:15 2012 +0200 wininet: Fixed failing test. --- dlls/wininet/tests/urlcache.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index c8f4570..f4e50ce 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -41,6 +41,7 @@ static BOOL (WINAPI *pUnlockUrlCacheEntryFileA)(LPCSTR,DWORD); static char filenameA[MAX_PATH + 1]; static char filenameA1[MAX_PATH + 1]; +static BOOL old_ie = FALSE; static void check_cache_entry_infoA(const char *returnedfrom, LPINTERNET_CACHE_ENTRY_INFO lpCacheEntryInfo) { @@ -137,7 +138,7 @@ static void test_GetUrlCacheEntryInfoExA(void) /* Unicode version of function seems to ignore 0x200 flag */ ret = GetUrlCacheEntryInfoExW(test_urlW, NULL, NULL, NULL, NULL, NULL, 0x200 /*GET_INSTALLED_ENTRY*/); - ok(ret, "GetUrlCacheEntryInfoExW failed with error %d\n", GetLastError()); + ok(ret || broken(old_ie && !ret), "GetUrlCacheEntryInfoExW failed with error %d\n", GetLastError()); ret = GetUrlCacheEntryInfoEx(test_url, lpCacheEntryInfo, &cbCacheEntryInfo, NULL, NULL, NULL, 0); ok(ret, "GetUrlCacheEntryInfoEx failed with error %d\n", GetLastError()); @@ -845,10 +846,10 @@ static void test_GetDiskInfoA(void) ret = GetDiskInfoA(path, NULL, NULL, NULL); error = GetLastError(); ok(!ret || - broken(ret), /* < IE7 */ + broken(old_ie && ret), /* < IE7 */ "GetDiskInfoA succeeded\n"); ok(error == ERROR_PATH_NOT_FOUND || - broken(error == 0xdeadbeef), /* < IE7 */ + broken(old_ie && error == 0xdeadbeef), /* < IE7 */ "got %u expected ERROR_PATH_NOT_FOUND\n", error); SetLastError(0xdeadbeef); @@ -867,6 +868,8 @@ START_TEST(urlcache) win_skip("Too old IE (older than 6.0)\n"); return; } + if(!GetProcAddress(hdll, "InternetGetSecurityInfoByURL")) /* < IE7 */ + old_ie = TRUE; pDeleteUrlCacheEntryA = (void*)GetProcAddress(hdll, "DeleteUrlCacheEntryA"); pUnlockUrlCacheEntryFileA = (void*)GetProcAddress(hdll, "UnlockUrlCacheEntryFileA");

1 0

Nikolay Sivov : vbscript: Support vb* constants for message box buttons.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 6666284fe6e709de333450a5a1752e1da13ac100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6666284fe6e709de333450a5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 3 15:53:42 2012 +0400 vbscript: Support vb* constants for message box buttons. --- dlls/vbscript/global.c | 24 ++++++++++++------------ dlls/vbscript/tests/api.vbs | 13 +++++++++++++ dlls/vbscript/vbsglobal.idl | 2 +- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e2319ae..32eebdc 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1594,38 +1594,38 @@ static HRESULT Global_vbFirstFullWeek(vbdisp_t *This, VARIANT *arg, unsigned arg static HRESULT Global_vbOKOnly(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_OK); } static HRESULT Global_vbOKCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_OKCANCEL); } static HRESULT Global_vbAbortRetryIgnore(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_ABORTRETRYIGNORE); } static HRESULT Global_vbYesNoCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_YESNOCANCEL); } static HRESULT Global_vbYesNo(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_YESNO); } static HRESULT Global_vbRetryCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, MB_RETRYCANCEL); } static HRESULT Global_vbCritical(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6bcded8..fc87c59 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -299,4 +299,17 @@ end if Call ok(getVT(Now()) = "VT_DATE", "getVT(Now()) = " & getVT(Now())) +Call ok(vbOKOnly = 0, "vbOKOnly = " & vbOKOnly) +Call ok(getVT(vbOKOnly) = "VT_I2", "getVT(vbOKOnly) = " & getVT(vbOKOnly)) +Call ok(vbOKCancel = 1, "vbOKCancel = " & vbOKCancel) +Call ok(getVT(vbOKCancel) = "VT_I2", "getVT(vbOKCancel) = " & getVT(vbOKCancel)) +Call ok(vbAbortRetryIgnore = 2, "vbAbortRetryIgnore = " & vbAbortRetryIgnore) +Call ok(getVT(vbAbortRetryIgnore) = "VT_I2", "getVT(vbAbortRetryIgnore) = " & getVT(vbAbortRetryIgnore)) +Call ok(vbYesNoCancel = 3, "vbYesNoCancel = " & vbYesNoCancel) +Call ok(getVT(vbYesNoCancel) = "VT_I2", "getVT(vbYesNoCancel) = " & getVT(vbYesNoCancel)) +Call ok(vbYesNo = 4, "vbYesNo = " & vbYesNo) +Call ok(getVT(vbYesNo) = "VT_I2", "getVT(vbYesNo) = " & getVT(vbYesNo)) +Call ok(vbRetryCancel = 5, "vbRetryCancel = " & vbRetryCancel) +Call ok(getVT(vbRetryCancel) = "VT_I2", "getVT(vbRetryCancel) = " & getVT(vbRetryCancel)) + Call reportSuccess() diff --git a/dlls/vbscript/vbsglobal.idl b/dlls/vbscript/vbsglobal.idl index 5487cdc..fb847c1 100644 --- a/dlls/vbscript/vbsglobal.idl +++ b/dlls/vbscript/vbsglobal.idl @@ -85,7 +85,7 @@ library VBScript_Global [id(DISPID_GLOBAL_VBYESNO), readonly] VARIANT vbYesNo; - [id(DISPID_GLOBAL_VBYESNOCANCEL), readonly] + [id(DISPID_GLOBAL_VBRETRYCANCEL), readonly] VARIANT vbRetryCancel; [id(DISPID_GLOBAL_VBCRITICAL), readonly]

1 0

Nikolay Sivov : vbscript: Support vb* constants for message box return value.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 0c0e6f537166fc7883a02a807b1018f8aa947560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0e6f537166fc7883a02a807… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 3 15:57:25 2012 +0400 vbscript: Support vb* constants for message box return value. --- dlls/vbscript/global.c | 28 ++++++++++++++-------------- dlls/vbscript/tests/api.vbs | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 32eebdc..76a035b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1690,44 +1690,44 @@ static HRESULT Global_vbSystemModal(vbdisp_t *This, VARIANT *arg, unsigned args_ static HRESULT Global_vbOK(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDOK); } static HRESULT Global_vbCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDCANCEL); } static HRESULT Global_vbAbort(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDABORT); } static HRESULT Global_vbRetry(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDRETRY); } static HRESULT Global_vbIgnore(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDIGNORE); } static HRESULT Global_vbYes(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDYES); } static HRESULT Global_vbNo(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, IDNO); } static HRESULT Global_vbEmpty(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index fc87c59..47fae0c 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -312,4 +312,19 @@ Call ok(getVT(vbYesNo) = "VT_I2", "getVT(vbYesNo) = " & getVT(vbYesNo)) Call ok(vbRetryCancel = 5, "vbRetryCancel = " & vbRetryCancel) Call ok(getVT(vbRetryCancel) = "VT_I2", "getVT(vbRetryCancel) = " & getVT(vbRetryCancel)) +Call ok(vbOK = 1, "vbOK = " & vbOK) +Call ok(getVT(vbOK) = "VT_I2", "getVT(vbOK) = " & getVT(vbOK)) +Call ok(vbCancel = 2, "vbCancel = " & vbCancel) +Call ok(getVT(vbCancel) = "VT_I2", "getVT(vbCancel) = " & getVT(vbCancel)) +Call ok(vbAbort = 3, "vbAbort = " & vbAbort) +Call ok(getVT(vbAbort) = "VT_I2", "getVT(vbAbort) = " & getVT(vbAbort)) +Call ok(vbRetry = 4, "vbRetry = " & vbRetry) +Call ok(getVT(vbRetry) = "VT_I2", "getVT(vbRetry) = " & getVT(vbRetry)) +Call ok(vbIgnore = 5, "vbIgnore = " & vbIgnore) +Call ok(getVT(vbIgnore) = "VT_I2", "getVT(vbIgnore) = " & getVT(vbIgnore)) +Call ok(vbYes = 6, "vbYes = " & vbYes) +Call ok(getVT(vbYes) = "VT_I2", "getVT(vbYes) = " & getVT(vbYes)) +Call ok(vbNo = 7, "vbNo = " & vbNo) +Call ok(getVT(vbNo) = "VT_I2", "getVT(vbNo) = " & getVT(vbNo)) + Call reportSuccess()

1 0

Alistair Leslie-Hughes : include: Add threading attribute to MSDAINITIALIZE .
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: be246e31e28c171adf5cdadefe98675e7f240bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be246e31e28c171adf5cdadef… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 3 16:00:28 2012 +1000 include: Add threading attribute to MSDAINITIALIZE. --- include/msdasc.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/msdasc.idl b/include/msdasc.idl index ca879e8..16d2372 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -63,6 +63,7 @@ library MSDASC [ uuid(2206CDB0-19C1-11D1-89E0-00C04FD7A829), + threading(both), progid("MSDASC.MSDAINITIALIZE.1"), vi_progid("MSDASC.MSDAINITIALIZE"), ]

1 0

Alistair Leslie-Hughes : oledb32: Add support for IDBInitialize interface in IDataInitialize.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 8f8212b856a8e6b339fea6126381ace3613dfa7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8212b856a8e6b339fea6126… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 25 12:43:58 2012 +1000 oledb32: Add support for IDBInitialize interface in IDataInitialize. --- dlls/oledb32/datainit.c | 109 ++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/Makefile.in | 3 +- dlls/oledb32/tests/convert.c | 1 - dlls/oledb32/tests/database.c | 73 +++++++++++++++++++++++++++ dlls/oledb32/tests/marshal.c | 1 - 5 files changed, 184 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index af596fe..a84d8aa 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -47,6 +47,110 @@ static inline datainit *impl_from_IDataInitialize(IDataInitialize *iface) return CONTAINING_RECORD(iface, datainit, IDataInitialize_iface); } +typedef struct +{ + IDBInitialize IDBInitialize_iface; + + LONG ref; +} dbinit; + +static inline dbinit *impl_from_IDBInitialize(IDBInitialize *iface) +{ + return CONTAINING_RECORD(iface, dbinit, IDBInitialize_iface); +} + +static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, void **obj) +{ + dbinit *This = impl_from_IDBInitialize(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDBInitialize)) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IDBInitialize_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI dbinit_AddRef(IDBInitialize *iface) +{ + dbinit *This = impl_from_IDBInitialize(iface); + TRACE("(%p)\n", This); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI dbinit_Release(IDBInitialize *iface) +{ + dbinit *This = impl_from_IDBInitialize(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) +{ + dbinit *This = impl_from_IDBInitialize(iface); + + FIXME("(%p) stub\n", This); + + return S_OK; +} + +static HRESULT WINAPI dbinit_Uninitialize(IDBInitialize *iface) +{ + dbinit *This = impl_from_IDBInitialize(iface); + + FIXME("(%p) stub\n", This); + + return S_OK; +} + +static const IDBInitializeVtbl dbinit_vtbl = +{ + dbinit_QueryInterface, + dbinit_AddRef, + dbinit_Release, + dbinit_Initialize, + dbinit_Uninitialize +}; + +static HRESULT create_db_init(void **obj) +{ + dbinit *This; + + TRACE("()\n"); + + *obj = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if(!This) return E_OUTOFMEMORY; + + This->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; + This->ref = 1; + + *obj = &This->IDBInitialize_iface; + + return S_OK; +} + static HRESULT WINAPI datainit_QueryInterface(IDataInitialize *iface, REFIID riid, void **obj) { datainit *This = impl_from_IDataInitialize(iface); @@ -102,6 +206,11 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *p FIXME("(%p)->(%p %d %s %s %p)\n", This, pUnkOuter, dwClsCtx, debugstr_w(pwszInitializationString), debugstr_guid(riid), ppDataSource); + if(IsEqualIID(riid, &IID_IDBInitialize)) + { + return create_db_init( (LPVOID*)ppDataSource); + } + return E_NOTIMPL; } diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in index f91f86b..07a4892 100644 --- a/dlls/oledb32/tests/Makefile.in +++ b/dlls/oledb32/tests/Makefile.in @@ -1,8 +1,9 @@ TESTDLL = oledb32.dll -IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 C_SRCS = \ convert.c \ + database.c \ marshal.c IDL_I_SRCS = convert.idl diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 1a1ea9a..9d50b8a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -35,7 +35,6 @@ #include "wine/test.h" -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static void test_dcinfo(void) { diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c new file mode 100644 index 0000000..c0d5237 --- /dev/null +++ b/dlls/oledb32/tests/database.c @@ -0,0 +1,73 @@ +/* OLEDB Database tests + * + * Copyright 2012 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "msdadc.h" +#include "msdasc.h" + +#include "wine/test.h" + + +void test_database(void) +{ + HRESULT hr; + IDBInitialize *dbinit = NULL; + IDataInitialize *datainit = NULL; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + if(FAILED(hr)) + { + win_skip("Unable to load oledb library\n"); + return; + } + + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, NULL, &IID_IDBInitialize, (IUnknown **)&dbinit); + ok(hr == S_OK, "got %08x\n", hr); + if(SUCCEEDED(hr)) + { + IDBProperties *props = NULL; + + hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(SUCCEEDED(hr)) + { + IDBProperties_Release(props); + } + + IDBInitialize_Release(dbinit); + } + + IDataInitialize_Release(datainit); +} + +START_TEST(database) +{ + OleInitialize(NULL); + + test_database(); + + OleUninitialize(); +} diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 39d8448..f9a2150 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" -#include "initguid.h" #include "objbase.h" #include "oledb.h"

1 0

Alexandre Julliard : winex11: Split copy_image_bits into a couple of helper functions.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 219e2a35452e4405e666316943658823d6a63482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219e2a35452e4405e66631694… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 12:43:44 2012 +0200 winex11: Split copy_image_bits into a couple of helper functions. --- dlls/winex11.drv/bitblt.c | 189 +++++++++++++++++++++++--------------------- 1 files changed, 99 insertions(+), 90 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 36e3ac9..2195fe5 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1036,41 +1036,122 @@ static inline BOOL is_r8g8b8( const XVisualInfo *vis ) return vis->depth == 24 && vis->red_mask == 0xff0000 && vis->blue_mask == 0x0000ff; } -/* copy the image bits, fixing up alignment and byte swapping as necessary */ -DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, - const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, - struct bitblt_coords *coords, const int *mapping, unsigned int zeropad_mask ) +static inline BOOL image_needs_byteswap( XImage *image, BOOL is_r8g8b8, int bit_count ) { #ifdef WORDS_BIGENDIAN static const int client_byte_order = MSBFirst; #else static const int client_byte_order = LSBFirst; #endif - BOOL need_byteswap; - int x, y, height = coords->visrect.bottom - coords->visrect.top; - int width_bytes = image->bytes_per_line; - int padding_pos; - unsigned char *src, *dst; + + switch (bit_count) + { + case 1: return image->bitmap_bit_order != MSBFirst; + case 4: return image->byte_order != MSBFirst; + case 16: + case 32: return image->byte_order != client_byte_order; + case 24: return (image->byte_order == MSBFirst) ^ !is_r8g8b8; + default: return FALSE; + } +} + +/* copy image bits with byte swapping and/or pixel mapping */ +static void copy_image_byteswap( BITMAPINFO *info, const unsigned char *src, unsigned char *dst, + int src_stride, int dst_stride, int height, + BOOL byteswap, const int *mapping, unsigned int zeropad_mask ) +{ + int x, y, padding_pos = abs(dst_stride) / sizeof(unsigned int) - 1; + + if (!byteswap && !mapping) /* simply copy */ + { + if (src != dst) + { + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + memcpy( dst, src, src_stride ); + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } + } + else if (zeropad_mask != ~0u) /* only need to clear the padding */ + { + for (y = 0; y < height; y++, dst += dst_stride) + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } + return; + } switch (info->bmiHeader.biBitCount) { case 1: - need_byteswap = (image->bitmap_bit_order != MSBFirst); + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + for (x = 0; x < src_stride; x++) dst[x] = bit_swap[src[x]]; + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; case 4: - need_byteswap = (image->byte_order != MSBFirst); + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + if (mapping) + { + if (byteswap) + for (x = 0; x < src_stride; x++) + dst[x] = (mapping[src[x] & 0x0f] << 4) | mapping[src[x] >> 4]; + else + for (x = 0; x < src_stride; x++) + dst[x] = mapping[src[x] & 0x0f] | (mapping[src[x] >> 4] << 4); + } + else + for (x = 0; x < src_stride; x++) + dst[x] = (src[x] << 4) | (src[x] >> 4); + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } + break; + case 8: + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + for (x = 0; x < src_stride; x++) dst[x] = mapping[src[x]]; + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; case 16: - case 32: - need_byteswap = (image->byte_order != client_byte_order); + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + for (x = 0; x < info->bmiHeader.biWidth; x++) + ((USHORT *)dst)[x] = RtlUshortByteSwap( ((const USHORT *)src)[x] ); + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; case 24: - need_byteswap = (image->byte_order == MSBFirst) ^ !is_r8g8b8; + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + for (x = 0; x < info->bmiHeader.biWidth; x++) + { + unsigned char tmp = src[3 * x]; + dst[3 * x] = src[3 * x + 2]; + dst[3 * x + 1] = src[3 * x + 1]; + dst[3 * x + 2] = tmp; + } + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; - default: - need_byteswap = FALSE; + case 32: + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + for (x = 0; x < info->bmiHeader.biWidth; x++) + ((ULONG *)dst)[x] = RtlUlongByteSwap( ((const ULONG *)src)[x] ); break; } +} + +/* copy the image bits, fixing up alignment and byte swapping as necessary */ +DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, + const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, + struct bitblt_coords *coords, const int *mapping, unsigned int zeropad_mask ) +{ + BOOL need_byteswap = image_needs_byteswap( image, is_r8g8b8, info->bmiHeader.biBitCount ); + int height = coords->visrect.bottom - coords->visrect.top; + int width_bytes = image->bytes_per_line; + unsigned char *src, *dst; src = src_bits->ptr; if (info->bmiHeader.biHeight > 0) @@ -1101,7 +1182,6 @@ DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, } dst = dst_bits->ptr; - padding_pos = width_bytes/sizeof(unsigned int) - 1; if (info->bmiHeader.biHeight > 0) { @@ -1109,79 +1189,8 @@ DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, width_bytes = -width_bytes; } - if (need_byteswap || mapping) - { - switch (info->bmiHeader.biBitCount) - { - case 1: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - for (x = 0; x < image->bytes_per_line; x++) - dst[x] = bit_swap[src[x]]; - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - break; - case 4: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - if (mapping) - for (x = 0; x < image->bytes_per_line; x++) - dst[x] = (mapping[src[x] & 0x0f] << 4) | mapping[src[x] >> 4]; - else - for (x = 0; x < image->bytes_per_line; x++) - dst[x] = (src[x] << 4) | (src[x] >> 4); - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - break; - case 8: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - for (x = 0; x < image->bytes_per_line; x++) - dst[x] = mapping[src[x]]; - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - break; - case 16: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - for (x = 0; x < info->bmiHeader.biWidth; x++) - ((USHORT *)dst)[x] = RtlUshortByteSwap( ((const USHORT *)src)[x] ); - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - break; - case 24: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - for (x = 0; x < info->bmiHeader.biWidth; x++) - { - unsigned char tmp = src[3 * x]; - dst[3 * x] = src[3 * x + 2]; - dst[3 * x + 1] = src[3 * x + 1]; - dst[3 * x + 2] = tmp; - } - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - break; - case 32: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - for (x = 0; x < info->bmiHeader.biWidth; x++) - ((ULONG *)dst)[x] = RtlUlongByteSwap( ((const ULONG *)src)[x] ); - break; - } - } - else if (src != dst) - { - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - memcpy( dst, src, image->bytes_per_line ); - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - } - else /* only need to clear the padding */ - { - for (y = 0; y < height; y++, dst += width_bytes) - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } + copy_image_byteswap( info, src, dst, image->bytes_per_line, width_bytes, height, + need_byteswap, mapping, zeropad_mask ); return ERROR_SUCCESS; }

1 0

Alexandre Julliard : winex11: Pass the source drawable to the FLUSH_GL_DRAWABLE escape.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: d8de77f01e8894a0af422f9f926e5ca683403dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8de77f01e8894a0af422f9f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 21:50:54 2012 +0200 winex11: Pass the source drawable to the FLUSH_GL_DRAWABLE escape. --- dlls/winex11.drv/opengl.c | 91 +++++++++++++++++++++++++++++--------------- dlls/winex11.drv/x11drv.h | 6 +++ 2 files changed, 66 insertions(+), 31 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 96954cc..d8a3322 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1107,7 +1107,6 @@ static void mark_drawable_dirty(Drawable old, Drawable new) /* Given the current context, make sure its drawable is sync'd */ static inline void sync_context(struct wgl_context *context) { - EnterCriticalSection( &context_section ); if (context->refresh_drawables) { if (glxRequireVersion(3)) pglXMakeContextCurrent(gdi_display, context->drawables[0], @@ -1116,7 +1115,6 @@ static inline void sync_context(struct wgl_context *context) pglXMakeCurrent(gdi_display, context->drawables[0], context->ctx); context->refresh_drawables = FALSE; } - LeaveCriticalSection( &context_section ); } static struct gl_drawable *get_gl_drawable( HWND hwnd, HDC hdc ) @@ -1818,53 +1816,73 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de return FALSE; } -static void flush_gl_drawable( struct glx_physdev *physdev ) +static void flush_gl_drawable( struct glx_physdev *physdev, Drawable src ) { RECT rect; int w = physdev->x11dev->dc_rect.right - physdev->x11dev->dc_rect.left; int h = physdev->x11dev->dc_rect.bottom - physdev->x11dev->dc_rect.top; - Drawable src = physdev->drawable; if (w <= 0 || h <= 0) return; - switch (physdev->type) - { - case DC_GL_PIXMAP_WIN: - src = physdev->pixmap; - /* fall through */ - case DC_GL_CHILD_WIN: - /* The GL drawable may be lagged behind if we don't flush first, so - * flush the display make sure we copy up-to-date data */ - XFlush(gdi_display); - XSetFunction(gdi_display, physdev->x11dev->gc, GXcopy); - XCopyArea(gdi_display, src, physdev->x11dev->drawable, physdev->x11dev->gc, 0, 0, w, h, - physdev->x11dev->dc_rect.left, physdev->x11dev->dc_rect.top); - SetRect( &rect, 0, 0, w, h ); - add_device_bounds( physdev->x11dev, &rect ); - default: - break; - } + /* The GL drawable may be lagged behind if we don't flush first, so + * flush the display make sure we copy up-to-date data */ + XFlush(gdi_display); + XSetFunction(gdi_display, physdev->x11dev->gc, GXcopy); + XCopyArea(gdi_display, src, physdev->x11dev->drawable, physdev->x11dev->gc, 0, 0, w, h, + physdev->x11dev->dc_rect.left, physdev->x11dev->dc_rect.top); + SetRect( &rect, 0, 0, w, h ); + add_device_bounds( physdev->x11dev, &rect ); } static void wglFinish(void) { + struct x11drv_escape_flush_gl_drawable escape; + struct gl_drawable *gl; struct wgl_context *ctx = NtCurrentTeb()->glContext; - enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; - sync_context(ctx); + escape.code = X11DRV_FLUSH_GL_DRAWABLE; + escape.gl_drawable = 0; + + if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) + { + switch (gl->type) + { + case DC_GL_PIXMAP_WIN: escape.gl_drawable = gl->pixmap; break; + case DC_GL_CHILD_WIN: escape.gl_drawable = gl->drawable; break; + default: break; + } + sync_context(ctx); + release_gl_drawable( gl ); + } + pglFinish(); - ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); + if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } static void wglFlush(void) { + struct x11drv_escape_flush_gl_drawable escape; + struct gl_drawable *gl; struct wgl_context *ctx = NtCurrentTeb()->glContext; - enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; - sync_context(ctx); + escape.code = X11DRV_FLUSH_GL_DRAWABLE; + escape.gl_drawable = 0; + + if ((gl = get_gl_drawable( WindowFromDC( ctx->hdc ), 0 ))) + { + switch (gl->type) + { + case DC_GL_PIXMAP_WIN: escape.gl_drawable = gl->pixmap; break; + case DC_GL_CHILD_WIN: escape.gl_drawable = gl->drawable; break; + default: break; + } + sync_context(ctx); + release_gl_drawable( gl ); + } + pglFlush(); - ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); + if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } /*********************************************************************** @@ -3034,12 +3052,15 @@ static void X11DRV_WineGL_LoadExtensions(void) */ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) { - enum x11drv_escape_codes code = X11DRV_FLUSH_GL_DRAWABLE; + struct x11drv_escape_flush_gl_drawable escape; struct gl_drawable *gl; struct wgl_context *ctx = NtCurrentTeb()->glContext; TRACE("(%p)\n", hdc); + escape.code = X11DRV_FLUSH_GL_DRAWABLE; + escape.gl_drawable = 0; + if (!(gl = get_gl_drawable( WindowFromDC( hdc ), hdc ))) { SetLastError( ERROR_INVALID_HANDLE ); @@ -3050,6 +3071,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) { case DC_GL_PIXMAP_WIN: if (ctx) sync_context( ctx ); + escape.gl_drawable = gl->pixmap; if (pglXCopySubBufferMESA) { /* (glX)SwapBuffers has an implicit glFlush effect, however * GLX_MESA_copy_sub_buffer doesn't. Make sure GL is flushed before @@ -3059,6 +3081,10 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top ); break; } + pglXSwapBuffers(gdi_display, gl->drawable); + break; + case DC_GL_CHILD_WIN: + escape.gl_drawable = gl->drawable; /* fall through */ default: pglXSwapBuffers(gdi_display, gl->drawable); @@ -3067,8 +3093,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) release_gl_drawable( gl ); - ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, 0, NULL ); - + if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); return TRUE; } @@ -3165,7 +3190,11 @@ static INT glxdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d } break; case X11DRV_FLUSH_GL_DRAWABLE: - flush_gl_drawable( physdev ); + if (in_count >= sizeof(struct x11drv_escape_flush_gl_drawable)) + { + const struct x11drv_escape_flush_gl_drawable *data = in_data; + flush_gl_drawable( physdev, data->gl_drawable ); + } return TRUE; default: break; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7d6ee68..1f286da 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -291,6 +291,12 @@ struct x11drv_escape_get_drawable int pixel_format; /* internal GL pixel format */ }; +struct x11drv_escape_flush_gl_drawable +{ + enum x11drv_escape_codes code; /* escape code (X11DRV_FLUSH_GL_DRAWABLE) */ + Drawable gl_drawable; /* GL drawable */ +}; + /************************************************************************** * X11 USER driver */

1 0

Alexandre Julliard : winex11: Move the FLUSH_GL_DRAWABLE implementation to the main ExtEscape routine.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 05fe1e4e35de8864839310813fa4267cdf78ba84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05fe1e4e35de8864839310813… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 21:56:43 2012 +0200 winex11: Move the FLUSH_GL_DRAWABLE implementation to the main ExtEscape routine. --- dlls/winex11.drv/init.c | 18 ++++++++++ dlls/winex11.drv/opengl.c | 82 +-------------------------------------------- 2 files changed, 19 insertions(+), 81 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index d6b45d8..12cff17 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -351,6 +351,24 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d return TRUE; } break; + case X11DRV_FLUSH_GL_DRAWABLE: + if (in_count >= sizeof(struct x11drv_escape_flush_gl_drawable)) + { + const struct x11drv_escape_flush_gl_drawable *data = in_data; + RECT rect = physDev->dc_rect; + + OffsetRect( &rect, -physDev->dc_rect.left, -physDev->dc_rect.top ); + /* The GL drawable may be lagged behind if we don't flush first, so + * flush the display make sure we copy up-to-date data */ + XFlush( gdi_display ); + XSetFunction( gdi_display, physDev->gc, GXcopy ); + XCopyArea( gdi_display, data->gl_drawable, physDev->drawable, physDev->gc, + 0, 0, rect.right, rect.bottom, + physDev->dc_rect.left, physDev->dc_rect.top ); + add_device_bounds( physDev, &rect ); + return TRUE; + } + break; case X11DRV_START_EXPOSURES: XSetGraphicsExposures( gdi_display, physDev->gc, True ); physDev->exposures = 0; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d8a3322..4b6cb1f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1816,25 +1816,6 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de return FALSE; } -static void flush_gl_drawable( struct glx_physdev *physdev, Drawable src ) -{ - RECT rect; - int w = physdev->x11dev->dc_rect.right - physdev->x11dev->dc_rect.left; - int h = physdev->x11dev->dc_rect.bottom - physdev->x11dev->dc_rect.top; - - if (w <= 0 || h <= 0) return; - - /* The GL drawable may be lagged behind if we don't flush first, so - * flush the display make sure we copy up-to-date data */ - XFlush(gdi_display); - XSetFunction(gdi_display, physdev->x11dev->gc, GXcopy); - XCopyArea(gdi_display, src, physdev->x11dev->drawable, physdev->x11dev->gc, 0, 0, w, h, - physdev->x11dev->dc_rect.left, physdev->x11dev->dc_rect.top); - SetRect( &rect, 0, 0, w, h ); - add_device_bounds( physdev->x11dev, &rect ); -} - - static void wglFinish(void) { struct x11drv_escape_flush_gl_drawable escape; @@ -3143,67 +3124,6 @@ static BOOL glxdrv_DeleteDC( PHYSDEV dev ) } /********************************************************************** - * glxdrv_ExtEscape - */ -static INT glxdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, - INT out_count, LPVOID out_data ) -{ - struct glx_physdev *physdev = get_glxdrv_dev( dev ); - - dev = GET_NEXT_PHYSDEV( dev, pExtEscape ); - - if (escape == X11DRV_ESCAPE && in_data && in_count >= sizeof(enum x11drv_escape_codes)) - { - switch (*(const enum x11drv_escape_codes *)in_data) - { - case X11DRV_SET_DRAWABLE: - if (in_count >= sizeof(struct x11drv_escape_set_drawable)) - { - struct gl_drawable *gl; - const struct x11drv_escape_set_drawable *data = in_data; - - if ((gl = get_gl_drawable( data->hwnd, dev->hdc ))) - { - physdev->format = gl->format; - physdev->type = gl->type; - physdev->drawable = gl->drawable; - physdev->pixmap = gl->pixmap; - release_gl_drawable( gl ); - } - else - { - physdev->format = NULL; - physdev->type = DC_GL_NONE; - physdev->drawable = 0; - physdev->pixmap = 0; - } - TRACE( "SET_DRAWABLE hdc %p drawable %lx pf %p type %u\n", - dev->hdc, physdev->drawable, physdev->format, physdev->type ); - } - break; - case X11DRV_GET_DRAWABLE: - if (out_count >= sizeof(struct x11drv_escape_get_drawable)) - { - struct x11drv_escape_get_drawable *data = out_data; - data->pixel_format = physdev->format ? physdev->format - pixel_formats + 1 : 0; - data->gl_drawable = physdev->drawable; - } - break; - case X11DRV_FLUSH_GL_DRAWABLE: - if (in_count >= sizeof(struct x11drv_escape_flush_gl_drawable)) - { - const struct x11drv_escape_flush_gl_drawable *data = in_data; - flush_gl_drawable( physdev, data->gl_drawable ); - } - return TRUE; - default: - break; - } - } - return dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); -} - -/********************************************************************** * glxdrv_wine_get_wgl_driver */ static struct opengl_funcs * glxdrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) @@ -3245,7 +3165,7 @@ static const struct gdi_dc_funcs glxdrv_funcs = NULL, /* pEnumICMProfiles */ NULL, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ - glxdrv_ExtEscape, /* pExtEscape */ + NULL, /* pExtEscape */ NULL, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ NULL, /* pExtTextOut */

1 0