January 2009 - Wine-commits

Nikolay Sivov : ole32: Fix return value for DefaultHandler_GetMiscStatus.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 11c1d7a0e7ff8d4713c8177dce4ba54781e69ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c1d7a0e7ff8d4713c8177dc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 7 11:58:29 2009 +0300 ole32: Fix return value for DefaultHandler_GetMiscStatus. --- dlls/ole32/defaulthandler.c | 2 +- dlls/ole32/tests/ole2.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 5c6f9b2..2384cec 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -909,7 +909,7 @@ static HRESULT WINAPI DefaultHandler_GetMiscStatus( if (FAILED(hres)) *pdwStatus = 0; - return S_OK; + return hres; } /************************************************************************ diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 99b8acb..9d0644e 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1384,7 +1384,6 @@ static void test_default_handler(void) hr); hr = IOleObject_GetMiscStatus(pObject, DVASPECT_CONTENT, &dwStatus); - todo_wine ok(hr == REGDB_E_CLASSNOTREG, "IOleObject_GetMiscStatus should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); hr = IOleObject_GetUserClassID(pObject, &clsid);

1 0

Andrey Turkin : loadperf: Add stub loadperf.dll.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: faa7366c700eaae09982b2c290d52305c334fff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa7366c700eaae09982b2c29… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Jan 7 13:34:31 2009 +0300 loadperf: Add stub loadperf.dll. --- configure | 9 +++++++ configure.ac | 1 + dlls/loadperf/Makefile.in | 13 +++++++++++ dlls/loadperf/loadperf.spec | 14 ++++++++++++ dlls/loadperf/loadperf_main.c | 47 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6426882..a124c6a 100755 --- a/configure +++ b/configure @@ -25007,6 +25007,14 @@ dlls/kernel32/tests/Makefile: dlls/kernel32/tests/Makefile.in dlls/Maketest.rule ac_config_files="$ac_config_files dlls/kernel32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/loadperf/Makefile" +test "x$enable_loadperf" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + loadperf" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/loadperf/Makefile: dlls/loadperf/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/loadperf/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/localspl/Makefile" test "x$enable_localspl" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ localspl" @@ -28104,6 +28112,7 @@ do "dlls/jscript/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/jscript/tests/Makefile" ;; "dlls/kernel32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/Makefile" ;; "dlls/kernel32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/kernel32/tests/Makefile" ;; + "dlls/loadperf/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/loadperf/Makefile" ;; "dlls/localspl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/Makefile" ;; "dlls/localspl/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localspl/tests/Makefile" ;; "dlls/localui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/localui/Makefile" ;; diff --git a/configure.ac b/configure.ac index aaeff42..a4fdd8d 100644 --- a/configure.ac +++ b/configure.ac @@ -1900,6 +1900,7 @@ WINE_CONFIG_MAKEFILE([dlls/jscript/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/jscript/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/kernel32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/kernel32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/loadperf/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/localspl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/localspl/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/localui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/loadperf/Makefile.in b/dlls/loadperf/Makefile.in new file mode 100644 index 0000000..3d5019b --- /dev/null +++ b/dlls/loadperf/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = loadperf.dll +IMPORTS = kernel32 + +C_SRCS = \ + loadperf_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/loadperf/loadperf.spec b/dlls/loadperf/loadperf.spec new file mode 100644 index 0000000..9b64cf4 --- /dev/null +++ b/dlls/loadperf/loadperf.spec @@ -0,0 +1,14 @@ +@ stub BackupPerfRegistryToFileW +@ stub InstallPerfDllA +@ stub InstallPerfDllW +@ stub LoadMofFromInstalledServiceA +@ stub LoadMofFromInstalledServiceW +@ stub LoadPerfCounterTextStringsA +@ stub LoadPerfCounterTextStringsW +@ stub RestorePerfRegistryFromFileW +@ stub SetServiceAsTrustedA +@ stub SetServiceAsTrustedW +@ stub UnloadPerfCounterTextStringsA +@ stub UnloadPerfCounterTextStringsW +@ stub UpdatePerfNameFilesA +@ stub UpdatePerfNameFilesW diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c new file mode 100644 index 0000000..74ba24e --- /dev/null +++ b/dlls/loadperf/loadperf_main.c @@ -0,0 +1,47 @@ +/* + * Implementation of loadperf.dll + * + * Copyright 2009 Andrey Turkin + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(loadperf); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +}

1 0

Andrey Turkin : loadperf: Add UnloadPerfCounterTextStrings stubs.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 0eebcf57c32688a15a0195453cf9831df5123b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eebcf57c32688a15a0195453… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Jan 7 13:34:45 2009 +0300 loadperf: Add UnloadPerfCounterTextStrings stubs. --- dlls/loadperf/loadperf.spec | 4 +- dlls/loadperf/loadperf_main.c | 45 +++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/loadperf.h | 34 +++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/loadperf/loadperf.spec b/dlls/loadperf/loadperf.spec index 9b64cf4..2ea2680 100644 --- a/dlls/loadperf/loadperf.spec +++ b/dlls/loadperf/loadperf.spec @@ -8,7 +8,7 @@ @ stub RestorePerfRegistryFromFileW @ stub SetServiceAsTrustedA @ stub SetServiceAsTrustedW -@ stub UnloadPerfCounterTextStringsA -@ stub UnloadPerfCounterTextStringsW +@ stdcall UnloadPerfCounterTextStringsA(str long) +@ stdcall UnloadPerfCounterTextStringsW(wstr long) @ stub UpdatePerfNameFilesA @ stub UpdatePerfNameFilesW diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index 74ba24e..8dbfab7 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -24,8 +24,12 @@ #include "windef.h" #include "winbase.h" +#include "winerror.h" +#include "winnls.h" #include "wine/debug.h" +#include "loadperf.h" + WINE_DEFAULT_DEBUG_CHANNEL(loadperf); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -45,3 +49,44 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/************************************************************* + * UnloadPerfCounterTextStringsA (loadperf.@) + * + * NOTES + * See UnloadPerfCounterTextStringsW + */ +DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR cmdline, BOOL verbose) +{ + DWORD ret; + LPWSTR cmdlineW = NULL; + + if (cmdline) + { + INT len = MultiByteToWideChar(CP_ACP, 0, cmdline, -1, NULL, 0); + cmdlineW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!cmdlineW) return ERROR_NOT_ENOUGH_MEMORY; + MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlineW, len); + } + + ret = UnloadPerfCounterTextStringsW(cmdlineW, verbose); + + HeapFree(GetProcessHeap(), 0, cmdlineW); + + return ret; +} + +/************************************************************* + * UnloadPerfCounterTextStringsW (loadperf.@) + * + * PARAMS + * cmdline [in] Last argument in command line - application counters to be removed + * verbose [in] TRUE - the function may write to stdout + * + */ +DWORD WINAPI UnloadPerfCounterTextStringsW(LPCWSTR cmdline, BOOL verbose) +{ + FIXME("(%s, %d): stub\n", debugstr_w(cmdline), verbose); + + return ERROR_SUCCESS; +} diff --git a/include/Makefile.in b/include/Makefile.in index 8f004f2..8604b8f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -259,6 +259,7 @@ SRCDIR_INCLUDES = \ lmuse.h \ lmuseflg.h \ lmwksta.h \ + loadperf.h \ lzexpand.h \ mapi.h \ mapicode.h \ diff --git a/include/loadperf.h b/include/loadperf.h new file mode 100644 index 0000000..74472c7 --- /dev/null +++ b/include/loadperf.h @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2009 Andrey Turkin + * + * 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 + */ + +#ifndef __WINE_LOADPERF_H +#define __WINE_LOADPERF_H + +#ifdef __cplusplus +extern "C" { +#endif + +DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR, BOOL); +DWORD WINAPI UnloadPerfCounterTextStringsW(LPCWSTR, BOOL); +#define UnloadPerfCounterTextStrings WINELIB_NAME_AW(UnloadPerfCounterTextStrings) + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_LOADPERF_H */

1 0

Peter Urbanec : wintab32: Check for NULL before using context.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 65b3393dce9fb5ea6192c787809f543a84b49f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b3393dce9fb5ea6192c7878… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Wed Jan 7 10:46:04 2009 +1100 wintab32: Check for NULL before using context. --- dlls/wintab32/context.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index f52d8d2..6b52c08 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -685,6 +685,12 @@ BOOL WINAPI WTOverlap(HCTX hCtx, BOOL fToTop) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return FALSE; + } + /* if we want to send to top and it's not already there */ if (fToTop && context->context.lcStatus != CXS_ONTOP) { @@ -777,6 +783,12 @@ BOOL WINAPI WTSetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return FALSE; + } + LOGCONTEXTAtoW(lpLogCtx, &context->context); LeaveCriticalSection(&csTablet); @@ -799,6 +811,12 @@ BOOL WINAPI WTSetW(HCTX hCtx, LPLOGCONTEXTW lpLogCtx) EnterCriticalSection(&csTablet); context = TABLET_FindOpenContext(hCtx); + if (!context) + { + LeaveCriticalSection(&csTablet); + return FALSE; + } + memmove(&context->context, lpLogCtx, sizeof(LOGCONTEXTW)); LeaveCriticalSection(&csTablet);

1 0

Henri Verbeet : wined3d: Remove a redundant parameter to drawPrimitive().
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 5f8c62e45d8771c815d57eb3364cd0a2cbfc0f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8c62e45d8771c815d57eb33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 7 09:00:55 2009 +0100 wined3d: Remove a redundant parameter to drawPrimitive(). startIdx should be the first index to draw, either from the vertex array or the index array, depending on if the draw is indexed or not. Having both at the same time wouldn't make sense. --- dlls/wined3d/device.c | 14 ++++++------ dlls/wined3d/drawprim.c | 42 +++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 12 +--------- 3 files changed, 27 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f8c62e45d8771c815d57…

1 0

Michael Stefaniuc : imm32: Remove superfluous casts.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 2b6981322242091c118a9665adee8794a844477a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6981322242091c118a9665a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 7 10:48:54 2009 +0100 imm32: Remove superfluous casts. --- dlls/imm32/imm.c | 96 +++++++++++++++++++++++++++--------------------------- 1 files changed, 48 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b6981322242091c118a9…

1 0

Henri Verbeet : wined3d: Don't delete queries from the wrong context.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 46eabd5b16f5c868fae3c41b0585561e0dc38ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46eabd5b16f5c868fae3c41b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 7 09:00:55 2009 +0100 wined3d: Don't delete queries from the wrong context. --- dlls/wined3d/query.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 6925572..05e114c 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -63,8 +63,18 @@ static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) { ref = InterlockedDecrement(&This->ref); if (ref == 0) { ENTER_GL(); + /* Queries are specific to the GL context that created them. Not + * deleting the query will obviously leak it, but that's still better + * than potentially deleting a different query with the same id in this + * context, and (still) leaking the actual query. */ if(This->type == WINED3DQUERYTYPE_EVENT) { - if(GL_SUPPORT(APPLE_FENCE)) { + if (((WineQueryEventData *)This->extendedData)->ctx != This->wineD3DDevice->activeContext + || This->wineD3DDevice->activeContext->tid != GetCurrentThreadId()) + { + FIXME("Query was created in a different context, skipping deletion\n"); + } + else if(GL_SUPPORT(APPLE_FENCE)) + { GL_EXTCALL(glDeleteFencesAPPLE(1, &((WineQueryEventData *)(This->extendedData))->fenceId)); checkGLcall("glDeleteFencesAPPLE"); } else if(GL_SUPPORT(NV_FENCE)) { @@ -72,8 +82,16 @@ static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) { checkGLcall("glDeleteFencesNV"); } } else if(This->type == WINED3DQUERYTYPE_OCCLUSION && GL_SUPPORT(ARB_OCCLUSION_QUERY)) { - GL_EXTCALL(glDeleteQueriesARB(1, &((WineQueryOcclusionData *)(This->extendedData))->queryId)); - checkGLcall("glDeleteQueriesARB"); + if (((WineQueryOcclusionData *)This->extendedData)->ctx != This->wineD3DDevice->activeContext + || This->wineD3DDevice->activeContext->tid != GetCurrentThreadId()) + { + FIXME("Query was created in a different context, skipping deletion\n"); + } + else + { + GL_EXTCALL(glDeleteQueriesARB(1, &((WineQueryOcclusionData *)(This->extendedData))->queryId)); + checkGLcall("glDeleteQueriesARB"); + } } LEAVE_GL();

1 0

Henri Verbeet : wined3d: Simplify IWineD3DOcclusionQueryImpl_GetData().
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 0e8ed9bebbffba5e812f8eb119e296f71a7f94a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8ed9bebbffba5e812f8eb11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 7 09:00:55 2009 +0100 wined3d: Simplify IWineD3DOcclusionQueryImpl_GetData(). --- dlls/wined3d/query.c | 86 +++++++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index c9989f2..6925572 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -268,60 +268,68 @@ static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pDa static HRESULT WINAPI IWineD3DOcclusionQueryImpl_GetData(IWineD3DQuery* iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags) { IWineD3DQueryImpl *This = (IWineD3DQueryImpl *) iface; + GLuint queryId = ((WineQueryOcclusionData *)This->extendedData)->queryId; DWORD* data = pData; + GLuint available; + GLuint samples; HRESULT res; + TRACE("(%p) : type D3DQUERY_OCCLUSION, pData %p, dwSize %#x, dwGetDataFlags %#x\n", This, pData, dwSize, dwGetDataFlags); - if(This->state == QUERY_CREATED) { + if (This->state == QUERY_CREATED) + { /* D3D allows GetData on a new query, OpenGL doesn't. So just invent the data ourselves */ TRACE("Query wasn't yet started, returning S_OK\n"); - res = S_OK; if(data) *data = 0; - } else if(This->state == QUERY_BUILDING) { + return S_OK; + } + + if (This->state == QUERY_BUILDING) + { /* Msdn says this returns an error, but our tests show that S_FALSE is returned */ TRACE("Query is building, returning S_FALSE\n"); - res = S_FALSE; + return S_FALSE; } - else if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) - { - if (((WineQueryOcclusionData *)This->extendedData)->ctx != This->wineD3DDevice->activeContext - || This->wineD3DDevice->activeContext->tid != GetCurrentThreadId()) - { - FIXME("%p Wrong context, returning 1.\n", This); - *data = 1; - res = S_OK; - } - else - { - GLuint available; - GLuint samples; - GLuint queryId = ((WineQueryOcclusionData *)This->extendedData)->queryId; - ENTER_GL(); - GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_AVAILABLE_ARB, &available)); - checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT_AVAILABLE)\n"); - TRACE("(%p) : available %d.\n", This, available); - - if (available) - { - if (data) - { - GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_ARB, &samples)); - checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT)\n"); - TRACE("(%p) : Returning %d samples.\n", This, samples); - *data = samples; - } - res = S_OK; - } else { - res = S_FALSE; - } - LEAVE_GL(); - } - } else { + if (!GL_SUPPORT(ARB_OCCLUSION_QUERY)) + { WARN("(%p) : Occlusion queries not supported. Returning 1.\n", This); *data = 1; + return S_OK; + } + + if (((WineQueryOcclusionData *)This->extendedData)->ctx != This->wineD3DDevice->activeContext + || This->wineD3DDevice->activeContext->tid != GetCurrentThreadId()) + { + FIXME("%p Wrong context, returning 1.\n", This); + *data = 1; + return S_OK; + } + + ENTER_GL(); + + GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_AVAILABLE_ARB, &available)); + checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT_AVAILABLE)\n"); + TRACE("(%p) : available %d.\n", This, available); + + if (available) + { + if (data) + { + GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_ARB, &samples)); + checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT)\n"); + TRACE("(%p) : Returning %d samples.\n", This, samples); + *data = samples; + } res = S_OK; } + else + { + res = S_FALSE; + } + + LEAVE_GL(); + return res; }

1 0

Henri Verbeet : wined3d: Make calling a query from the wrong context a FIXME.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: ab275ab48700013e57441e9bca6f5c96c2ceb6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab275ab48700013e57441e9bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 7 09:00:55 2009 +0100 wined3d: Make calling a query from the wrong context a FIXME. We want to know if this happens a lot. If the query is always called from a different context than the one that created it, occlusion culling would effectively be disabled, which could have a significant performance impact, depending on the type of objects being culled. --- dlls/wined3d/query.c | 60 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 7826325..c9989f2 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -281,32 +281,44 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_GetData(IWineD3DQuery* iface, /* Msdn says this returns an error, but our tests show that S_FALSE is returned */ TRACE("Query is building, returning S_FALSE\n"); res = S_FALSE; - } else if (GL_SUPPORT(ARB_OCCLUSION_QUERY) && - ((WineQueryOcclusionData *)This->extendedData)->ctx == This->wineD3DDevice->activeContext && - This->wineD3DDevice->activeContext->tid == GetCurrentThreadId()) { - GLuint available; - GLuint samples; - GLuint queryId = ((WineQueryOcclusionData *)This->extendedData)->queryId; + } + else if (GL_SUPPORT(ARB_OCCLUSION_QUERY)) + { + if (((WineQueryOcclusionData *)This->extendedData)->ctx != This->wineD3DDevice->activeContext + || This->wineD3DDevice->activeContext->tid != GetCurrentThreadId()) + { + FIXME("%p Wrong context, returning 1.\n", This); + *data = 1; + res = S_OK; + } + else + { + GLuint available; + GLuint samples; + GLuint queryId = ((WineQueryOcclusionData *)This->extendedData)->queryId; - ENTER_GL(); - GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_AVAILABLE_ARB, &available)); - checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT_AVAILABLE)\n"); - TRACE("(%p) : available %d.\n", This, available); - - if (available) { - if(data) { - GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_ARB, &samples)); - checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT)\n"); - TRACE("(%p) : Returning %d samples.\n", This, samples); - *data = samples; + ENTER_GL(); + GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_AVAILABLE_ARB, &available)); + checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT_AVAILABLE)\n"); + TRACE("(%p) : available %d.\n", This, available); + + if (available) + { + if (data) + { + GL_EXTCALL(glGetQueryObjectuivARB(queryId, GL_QUERY_RESULT_ARB, &samples)); + checkGLcall("glGetQueryObjectuivARB(GL_QUERY_RESULT)\n"); + TRACE("(%p) : Returning %d samples.\n", This, samples); + *data = samples; + } + res = S_OK; + } else { + res = S_FALSE; } - res = S_OK; - } else { - res = S_FALSE; + LEAVE_GL(); } - LEAVE_GL(); } else { - WARN("(%p) : Occlusion queries not supported, or wrong context. Returning 1.\n", This); + WARN("(%p) : Occlusion queries not supported. Returning 1.\n", This); *data = 1; res = S_OK; } @@ -324,7 +336,7 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void return S_OK; } if(ctx != This->wineD3DDevice->activeContext || ctx->tid != GetCurrentThreadId()) { /* See comment in IWineD3DQuery::Issue, event query codeblock */ - WARN("Query context not active, reporting GPU idle\n"); + FIXME("Query context not active, reporting GPU idle\n"); *data = TRUE; } else if(GL_SUPPORT(APPLE_FENCE)) { ENTER_GL(); @@ -460,7 +472,7 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_Issue(IWineD3DQuery* iface, D WineD3DContext *ctx = ((WineQueryOcclusionData *)This->extendedData)->ctx; if(ctx != This->wineD3DDevice->activeContext || ctx->tid != GetCurrentThreadId()) { - WARN("Not the owning context, can't start query\n"); + FIXME("Not the owning context, can't start query\n"); } else { ENTER_GL(); /* This is allowed according to msdn and our tests. Reset the query and restart */

1 0

Henri Verbeet : wined3d: Also apply the last sampler state.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 691894d1abafdf2698ac12332bce6446af7e6efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=691894d1abafdf2698ac12332… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 7 09:00:55 2009 +0100 wined3d: Also apply the last sampler state. In practice we don't implement WINED3DSAMP_DMAPOFFSET anyway, so this is unlikely to make much of a difference. --- dlls/wined3d/stateblock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4203073..e1f1dd8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1025,7 +1025,8 @@ should really perform a delta so that only the changes get updated*/ UINT sampler = j < MAX_FRAGMENT_SAMPLERS ? j : WINED3DVERTEXTEXTURESAMPLER0 + j - MAX_FRAGMENT_SAMPLERS; IWineD3DDevice_SetTexture(pDevice, sampler, This->textures[j]); - for(i = 1; i < WINED3D_HIGHEST_SAMPLER_STATE; i++) { + for (i = 1; i <= WINED3D_HIGHEST_SAMPLER_STATE; ++i) + { IWineD3DDevice_SetSamplerState(pDevice, sampler, i, This->samplerState[j][i]); } }

1 0