wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

Alexander Farber : cmd: Support / -Y and COPYCMD environment variable in the "copy" builtin.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: f6ec44173fdfb9141a8373d520488df3f1635396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ec44173fdfb9141a8373d52… Author: Alexander Farber <afarber(a)h754814.serverkompetenz.net> Date: Wed Feb 28 14:49:46 2007 +0100 cmd: Support /-Y and COPYCMD environment variable in the "copy" builtin. --- programs/cmd/builtins.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3c93231..c44b929 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -110,7 +110,8 @@ WIN32_FIND_DATA fd; HANDLE hff; BOOL force, status; static const char overwrite[] = "Overwrite file (Y/N)?"; -char string[8], outpath[MAX_PATH], inpath[MAX_PATH], *infile; +char string[8], outpath[MAX_PATH], inpath[MAX_PATH], *infile, copycmd[3]; +DWORD len; if (param1[0] == 0x00) { WCMD_output ("Argument missing\n"); @@ -140,7 +141,16 @@ char string[8], outpath[MAX_PATH], inpath[MAX_PATH], *infile; FindClose (hff); } - force = (strstr (quals, "/Y") != NULL); + /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ + if (strstr (quals, "/-Y")) + force = FALSE; + else if (strstr (quals, "/Y")) + force = TRUE; + else { + len = GetEnvironmentVariable ("COPYCMD", copycmd, sizeof(copycmd)); + force = (len && len < sizeof(copycmd) && ! lstrcmpi (copycmd, "/Y")); + } + if (!force) { hff = FindFirstFile (outpath, &fd); if (hff != INVALID_HANDLE_VALUE) {

1 0

Alexandre Julliard : cmd: Fix silly local variables indentation that breaks diff -p.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: abfe105c2fdbc730a280a32d5a7ffdb0af46cda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abfe105c2fdbc730a280a32d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 1 12:43:19 2007 +0100 cmd: Fix silly local variables indentation that breaks diff -p. --- programs/cmd/batch.c | 24 +++++----- programs/cmd/builtins.c | 116 +++++++++++++++++++++++----------------------- programs/cmd/directory.c | 38 ++++++++-------- programs/cmd/wcmdmain.c | 30 ++++++------ 4 files changed, 104 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abfe105c2fdbc730a280a…

1 0

Alexander Farber : cmd: Fixed 3 buffer overflows when fetching environment variables.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: fdeb6d5ae56ca40d3f4f1a7c4d75d31f2e58d6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdeb6d5ae56ca40d3f4f1a7c4… Author: Alexander Farber <Alexander.Farber(a)nokia.com> Date: Wed Feb 28 15:23:15 2007 +0100 cmd: Fixed 3 buffer overflows when fetching environment variables. --- programs/cmd/wcmdmain.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index fdf864a..754dec7 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -672,6 +672,7 @@ void WCMD_run_program (char *command, int called) { BOOL extensionsupplied = FALSE; BOOL launched = FALSE; BOOL status; + DWORD len; WCMD_parse (command, quals, param1, param2); /* Quick way to get the filename */ @@ -681,8 +682,8 @@ void WCMD_run_program (char *command, int called) { /* Calculate the search path and stem to search for */ if (strpbrk (param1, "/\\:") == NULL) { /* No explicit path given, search path */ strcpy(pathtosearch,".;"); - status = GetEnvironmentVariable ("PATH", &pathtosearch[2], sizeof(pathtosearch)-2); - if ((status == 0) || (status > sizeof(pathtosearch))) { + len = GetEnvironmentVariable ("PATH", &pathtosearch[2], sizeof(pathtosearch)-2); + if ((len == 0) || (len >= sizeof(pathtosearch) - 2)) { lstrcpy (pathtosearch, "."); } if (strchr(param1, '.') != NULL) extensionsupplied = TRUE; @@ -699,8 +700,8 @@ void WCMD_run_program (char *command, int called) { } /* Now extract PATHEXT */ - status = GetEnvironmentVariable ("PATHEXT", pathext, sizeof(pathext)); - if ((status == 0) || (status > sizeof(pathext))) { + len = GetEnvironmentVariable ("PATHEXT", pathext, sizeof(pathext)); + if ((len == 0) || (len >= sizeof(pathext))) { lstrcpy (pathext, ".bat;.com;.cmd;.exe"); } @@ -857,9 +858,10 @@ void WCMD_show_prompt (void) { int status; char out_string[MAX_PATH], curdir[MAX_PATH], prompt_string[MAX_PATH]; char *p, *q; +DWORD len; - status = GetEnvironmentVariable ("PROMPT", prompt_string, sizeof(prompt_string)); - if ((status == 0) || (status > sizeof(prompt_string))) { + len = GetEnvironmentVariable ("PROMPT", prompt_string, sizeof(prompt_string)); + if ((len == 0) || (len >= sizeof(prompt_string))) { lstrcpy (prompt_string, "$P$G"); } p = prompt_string;

1 0

Paul Vriens : wininet/ftp: Let CreateFile deal with last error.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: 23473ccc9e47c4e23b9bc11d2d9dc3fd10d71b51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23473ccc9e47c4e23b9bc11d2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Mar 1 12:01:04 2007 +0100 wininet/ftp: Let CreateFile deal with last error. --- dlls/wininet/ftp.c | 4 +--- dlls/wininet/tests/ftp.c | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 81ebdb9..0931ccc 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -284,10 +284,8 @@ BOOL WINAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile, /* Open file to be uploaded */ if (INVALID_HANDLE_VALUE == (hFile = CreateFileW(lpszLocalFile, GENERIC_READ, 0, 0, OPEN_EXISTING, 0, 0))) - { - INTERNET_SetLastError(ERROR_FILE_NOT_FOUND); + /* Let CreateFile set the appropriate error */ return FALSE; - } hIC = lpwfs->lpAppInfo; diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index b10e8d1..b12f88b 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -616,6 +616,9 @@ static void test_putfile(void) return; } + /* Start clean */ + DeleteFileA("non_existing_local"); + /* We should have a ftp-connection, try some puts */ /* No local file given */

1 0

Tomas Carnecky : winex11.drv: Spring cleanup in X11DRV_setup_opengl_visual, and added one new visual config (with aux buffers).
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: 24eabb8a46e2ce544ca0534c7b41e9f08cfed924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24eabb8a46e2ce544ca0534c7… Author: Tomas Carnecky <tom(a)dbservice.com> Date: Thu Mar 1 12:06:45 2007 +0100 winex11.drv: Spring cleanup in X11DRV_setup_opengl_visual, and added one new visual config (with aux buffers). --- dlls/winex11.drv/opengl.c | 49 +++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fdb92ae..df8e29e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3083,37 +3083,34 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) XVisualInfo *X11DRV_setup_opengl_visual( Display *display ) { XVisualInfo *visual = NULL; - /* In order to support OpenGL or D3D, we require a double-buffered visual and stencil buffer support, */ - int dblBuf[] = {GLX_RGBA,GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_DOUBLEBUFFER, None}; - if (!has_opengl()) return NULL; + int i; + + /* In order to support OpenGL or D3D, we require a double-buffered visual and stencil buffer support, + * D3D and some applications can make use of aux buffers. + */ + int visualProperties[][11] = { + { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_AUX_BUFFERS, 1, None }, + { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, None }, + { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 16, GLX_STENCIL_SIZE, 8, None }, + { GLX_RGBA, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 16, None }, + }; + + if (!has_opengl()) + return NULL; wine_tsx11_lock(); - visual = pglXChooseVisual(display, DefaultScreen(display), dblBuf); + for (i = 0; i < sizeof(visualProperties)/sizeof(visualProperties[0]); ++i) { + visual = pglXChooseVisual(display, DefaultScreen(display), visualProperties[i]); + if (visual) + break; + } wine_tsx11_unlock(); - if (visual == NULL) { - /* fallback to 16 bits depth, no alpha */ - int dblBuf2[] = {GLX_RGBA,GLX_DEPTH_SIZE, 16, GLX_STENCIL_SIZE, 8, GLX_DOUBLEBUFFER, None}; - WARN("Failed to get a visual with at least 24 bits depth\n"); - wine_tsx11_lock(); - visual = pglXChooseVisual(display, DefaultScreen(display), dblBuf2); - wine_tsx11_unlock(); - if (visual == NULL) { - /* fallback to no stencil */ - int dblBuf2[] = {GLX_RGBA,GLX_DEPTH_SIZE, 16, GLX_DOUBLEBUFFER, None}; - WARN("Failed to get a visual with at least 8 bits of stencil\n"); + if (visual) + TRACE("Visual ID %lx Chosen\n", visual->visualid); + else + WARN("No suitable visual found\n"); - wine_tsx11_lock(); - visual = pglXChooseVisual(display, DefaultScreen(display), dblBuf2); - wine_tsx11_unlock(); - if (visual == NULL) { - /* This should only happen if we cannot find a match with a depth size 16 */ - FIXME("Failed to find a suitable visual\n"); - return visual; - } - } - } - TRACE("Visual ID %lx Chosen\n",visual->visualid); return visual; }

1 0

Stefan Dösinger : wined3d: Support GL_APPLE_fence for event queries.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: 95efeb7e4bc5acdd0be0640cc6d8ea7fe7f19664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95efeb7e4bc5acdd0be0640cc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 1 01:17:05 2007 +0100 wined3d: Support GL_APPLE_fence for event queries. --- dlls/wined3d/device.c | 8 ++++++-- dlls/wined3d/directx.c | 16 ++++++++++++++-- dlls/wined3d/query.c | 30 +++++++++++++++++++++--------- include/wine/wined3d_gl.h | 24 ++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3ab1279..0ad2c47 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1075,7 +1075,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE break; case WINED3DQUERYTYPE_EVENT: - if(!GL_SUPPORT(NV_FENCE)) { + if(!(GL_SUPPORT(NV_FENCE) || GL_SUPPORT(APPLE_FENCE) )) { /* Half-Life 2 needs this query. It does not render the main menu correctly otherwise * Pretend to support it, faking this query does not do much harm except potentially lowering performance */ @@ -1116,7 +1116,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE } case WINED3DQUERYTYPE_EVENT: /* TODO: GL_APPLE_fence */ - if(GL_SUPPORT(NV_FENCE)) { + if(GL_SUPPORT(APPLE_FENCE)) { + object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryEventData)); + GL_EXTCALL(glGenFencesAPPLE(1, &((WineQueryEventData *)(object->extendedData))->fenceId)); + checkGLcall("glGenFencesAPPLE"); + } else if(GL_SUPPORT(NV_FENCE)) { object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryEventData)); GL_EXTCALL(glGenFencesNV(1, &((WineQueryEventData *)(object->extendedData))->fenceId)); checkGLcall("glGenFencesNV"); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 291ac5b..d3ce06f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -788,7 +788,9 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { TRACE_(d3d_caps)(" FOUND: NVIDIA (NV) Vertex Shader support - version=%02x\n", gl_info->vs_nv_version); gl_info->supported[NV_VERTEX_PROGRAM] = TRUE; } else if (strstr(ThisExtn, "GL_NV_fence")) { - gl_info->supported[NV_FENCE] = TRUE; + if(!gl_info->supported[APPLE_FENCE]) { + gl_info->supported[NV_FENCE] = TRUE; + } /** * ATI @@ -807,9 +809,19 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { gl_info->vs_ati_version = VS_VERSION_11; TRACE_(d3d_caps)(" FOUND: ATI (EXT) Vertex Shader support - version=%02x\n", gl_info->vs_ati_version); gl_info->supported[EXT_VERTEX_SHADER] = TRUE; + /** + * Apple + */ + } else if (strstr(ThisExtn, "GL_APPLE_fence")) { + /* GL_NV_fence and GL_APPLE_fence provide the same functionality basically. + * The apple extension interacts with some other apple exts. Disable the NV + * extension if the apple one is support to prevent confusion in other parts + * of the code + */ + gl_info->supported[NV_FENCE] = FALSE; + gl_info->supported[APPLE_FENCE] = TRUE; } - if (*GL_Extensions == ' ') GL_Extensions++; } } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 10a43e3..10f5c6d 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -65,9 +65,14 @@ static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) { TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { - if(This->type == WINED3DQUERYTYPE_EVENT && GL_SUPPORT(NV_FENCE)) { - GL_EXTCALL(glDeleteFencesNV(1, &((WineQueryEventData *)(This->extendedData))->fenceId)); - checkGLcall("glDeleteFencesNV"); + if(This->type == WINED3DQUERYTYPE_EVENT) { + if(GL_SUPPORT(APPLE_FENCE)) { + GL_EXTCALL(glDeleteFencesAPPLE(1, &((WineQueryEventData *)(This->extendedData))->fenceId)); + checkGLcall("glDeleteFencesAPPLE"); + } else if(GL_SUPPORT(NV_FENCE)) { + GL_EXTCALL(glDeleteFencesNV(1, &((WineQueryEventData *)(This->extendedData))->fenceId)); + checkGLcall("glDeleteFencesNV"); + } } else if(This->type == WINED3DQUERYTYPE_OCCLUSION && GL_SUPPORT(ARB_OCCLUSION_QUERY)) { GL_EXTCALL(glDeleteQueriesARB(1, &((WineQueryOcclusionData *)(This->extendedData))->queryId)); checkGLcall("glDeleteQueriesARB"); @@ -162,7 +167,10 @@ static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pDa case WINED3DQUERYTYPE_EVENT: { BOOL* data = pData; - if(GL_SUPPORT(NV_FENCE)) { + if(GL_SUPPORT(APPLE_FENCE)) { + *data = GL_EXTCALL(glTestFenceAPPLE(((WineQueryEventData *)This->extendedData)->fenceId)); + checkGLcall("glTestFenceAPPLE"); + } else if(GL_SUPPORT(NV_FENCE)) { *data = GL_EXTCALL(glTestFenceNV(((WineQueryEventData *)This->extendedData)->fenceId)); checkGLcall("glTestFenceNV"); } else { @@ -381,13 +389,17 @@ static HRESULT WINAPI IWineD3DQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIs break; case WINED3DQUERYTYPE_EVENT: { - if (GL_SUPPORT(GL_NV_fence)) { - if (dwIssueFlags & WINED3DISSUE_END) { + if (dwIssueFlags & WINED3DISSUE_END) { + if(GL_SUPPORT(APPLE_FENCE)) { + GL_EXTCALL(glSetFenceAPPLE(((WineQueryEventData *)This->extendedData)->fenceId)); + checkGLcall("glSetFenceAPPLE"); + } else if (GL_SUPPORT(NV_FENCE)) { GL_EXTCALL(glSetFenceNV(((WineQueryEventData *)This->extendedData)->fenceId, GL_ALL_COMPLETED_NV)); - } else if(dwIssueFlags & WINED3DISSUE_BEGIN) { - /* Started implicitly at device creation */ - ERR("Event query issued with START flag - what to do?\n"); + checkGLcall("glSetFenceNV"); } + } else if(dwIssueFlags & WINED3DISSUE_BEGIN) { + /* Started implicitly at device creation */ + ERR("Event query issued with START flag - what to do?\n"); } } diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 3d3f22b..7af8c98 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1146,6 +1146,19 @@ typedef GLboolean (APIENTRY * PGLFNTESTFENCENVPROC) (GLuint); typedef void (APIENTRY * PGLFNFINISHFENCENVPROC) (GLuint); typedef GLboolean (APIENTRY * PGLFNISFENCENVPROC) (GLuint); typedef void (APIENTRY * PGLFNGETFENCEIVNVPROC) (GLuint, GLenum, GLint *); +/* GL_APPLE_fence */ +#ifndef GL_NV_fence +#define GL_DRAW_PIXELS_APPLE 0x8A0A +#define GL_FENCE_APPLE 0x84F3 +#endif +typedef void (APIENTRY * PGLFNGENFENCESAPPLEPROC) (GLsizei, GLuint *); +typedef void (APIENTRY * PGLFNDELETEFENCESAPPLEPROC) (GLuint, const GLuint *); +typedef void (APIENTRY * PGLFNSETFENCEAPPLEPROC) (GLuint); +typedef GLboolean (APIENTRY * PGLFNTESTFENCEAPPLEPROC) (GLuint); +typedef void (APIENTRY * PGLFNFINISHFENCEAPPLEPROC) (GLuint); +typedef GLboolean (APIENTRY * PGLFNISFENCEAPPLEPROC) (GLuint); +typedef GLboolean (APIENTRY * PGLFNTESTOBJECTAPPLEPROC) (GLenum, GLuint); +typedef void (APIENTRY * PGLFNFINISHOBJECTAPPLEPROC) (GLenum, GLuint); /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 @@ -1509,6 +1522,8 @@ typedef enum _GL_SupportedExt { ATI_TEXTURE_ENV_COMBINE3, ATI_TEXTURE_MIRROR_ONCE, EXT_VERTEX_SHADER, + /* APPLE */ + APPLE_FENCE, OPENGL_SUPPORTED_EXT_END } GL_SupportedExt; @@ -1708,6 +1723,15 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNFINISHFENCENVPROC, glFinishFenceNV); \ USE_GL_FUNC(PGLFNISFENCENVPROC, glIsFenceNV); \ USE_GL_FUNC(PGLFNGETFENCEIVNVPROC, glGetFenceivNV); \ + /* GL_APPLE_fence */ \ + USE_GL_FUNC(PGLFNGENFENCESAPPLEPROC, glGenFencesAPPLE); \ + USE_GL_FUNC(PGLFNDELETEFENCESAPPLEPROC, glDeleteFencesAPPLE); \ + USE_GL_FUNC(PGLFNSETFENCEAPPLEPROC, glSetFenceAPPLE); \ + USE_GL_FUNC(PGLFNTESTFENCEAPPLEPROC, glTestFenceAPPLE); \ + USE_GL_FUNC(PGLFNFINISHFENCEAPPLEPROC, glFinishFenceAPPLE); \ + USE_GL_FUNC(PGLFNISFENCEAPPLEPROC, glIsFenceAPPLE); \ + USE_GL_FUNC(PGLFNTESTOBJECTAPPLEPROC, glTestObjectAPPLE); \ + USE_GL_FUNC(PGLFNFINISHOBJECTAPPLEPROC, glFinishObjectAPPLE); \ /* OpenGL 2.0 functions */ #define GL2_FUNCS_GEN \

1 0

Stefan Dösinger : wined3d: Support event queries using GL_NV_fence.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: 76b60b0516d029f26e8d9671fae9f7a8359987c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b60b0516d029f26e8d9671f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 1 00:34:33 2007 +0100 wined3d: Support event queries using GL_NV_fence. --- dlls/wined3d/device.c | 20 +++++++++++++++----- dlls/wined3d/query.c | 28 ++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bd37c51..3ab1279 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1075,10 +1075,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE break; case WINED3DQUERYTYPE_EVENT: - /* Half-Life 2 needs this query. It does not render the main menu correctly otherwise - * Pretend to support it, faking this query does not do much harm except potentially lowering performance - */ - FIXME("(%p) Event query: Unimplemented, but pretending to be supported\n", This); + if(!GL_SUPPORT(NV_FENCE)) { + /* Half-Life 2 needs this query. It does not render the main menu correctly otherwise + * Pretend to support it, faking this query does not do much harm except potentially lowering performance + */ + FIXME("(%p) Event query: Unimplemented, but pretending to be supported\n", This); + } hr = WINED3D_OK; break; @@ -1112,10 +1114,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE GL_EXTCALL(glGenQueriesARB(1, &((WineQueryOcclusionData *)(object->extendedData))->queryId)); break; } + case WINED3DQUERYTYPE_EVENT: + /* TODO: GL_APPLE_fence */ + if(GL_SUPPORT(NV_FENCE)) { + object->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineQueryEventData)); + GL_EXTCALL(glGenFencesNV(1, &((WineQueryEventData *)(object->extendedData))->fenceId)); + checkGLcall("glGenFencesNV"); + } + break; + case WINED3DQUERYTYPE_VCACHE: case WINED3DQUERYTYPE_RESOURCEMANAGER: case WINED3DQUERYTYPE_VERTEXSTATS: - case WINED3DQUERYTYPE_EVENT: case WINED3DQUERYTYPE_TIMESTAMP: case WINED3DQUERYTYPE_TIMESTAMPDISJOINT: case WINED3DQUERYTYPE_TIMESTAMPFREQ: diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 41bebf6..10a43e3 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -65,6 +65,14 @@ static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) { TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { + if(This->type == WINED3DQUERYTYPE_EVENT && GL_SUPPORT(NV_FENCE)) { + GL_EXTCALL(glDeleteFencesNV(1, &((WineQueryEventData *)(This->extendedData))->fenceId)); + checkGLcall("glDeleteFencesNV"); + } else if(This->type == WINED3DQUERYTYPE_OCCLUSION && GL_SUPPORT(ARB_OCCLUSION_QUERY)) { + GL_EXTCALL(glDeleteQueriesARB(1, &((WineQueryOcclusionData *)(This->extendedData))->queryId)); + checkGLcall("glDeleteQueriesARB"); + } + HeapFree(GetProcessHeap(), 0, This->extendedData); HeapFree(GetProcessHeap(), 0, This); } @@ -154,8 +162,13 @@ static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pDa case WINED3DQUERYTYPE_EVENT: { BOOL* data = pData; - FIXME("(%p): Unimplemented query WINED3DQUERYTYPE_EVENT\n", This); - *data = TRUE; /*Don't know what this is supposed to be*/ + if(GL_SUPPORT(NV_FENCE)) { + *data = GL_EXTCALL(glTestFenceNV(((WineQueryEventData *)This->extendedData)->fenceId)); + checkGLcall("glTestFenceNV"); + } else { + WARN("(%p): reporting GPU idle\n", This); + *data = TRUE; + } } break; case WINED3DQUERYTYPE_OCCLUSION: @@ -367,6 +380,17 @@ static HRESULT WINAPI IWineD3DQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIs } break; + case WINED3DQUERYTYPE_EVENT: { + if (GL_SUPPORT(GL_NV_fence)) { + if (dwIssueFlags & WINED3DISSUE_END) { + GL_EXTCALL(glSetFenceNV(((WineQueryEventData *)This->extendedData)->fenceId, GL_ALL_COMPLETED_NV)); + } else if(dwIssueFlags & WINED3DISSUE_BEGIN) { + /* Started implicitly at device creation */ + ERR("Event query issued with START flag - what to do?\n"); + } + } + } + default: /* The fixme is printed when the app asks for the resulting data */ WARN("(%p) : Unhandled query type %#x\n", This, This->type); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a5d3eb..895a9c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1339,6 +1339,9 @@ typedef struct WineQueryOcclusionData { GLuint queryId; } WineQueryOcclusionData; +typedef struct WineQueryEventData { + GLuint fenceId; +} WineQueryEventData; /***************************************************************************** * IWineD3DSwapChainImpl implementation structure (extends IUnknown)

1 0

Stefan Dösinger : wined3d: Add GL_NV_fence defines and functions.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: be8e9e17bc9bea82c1b79a27435f2abe652aa0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8e9e17bc9bea82c1b79a274… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 1 01:00:09 2007 +0100 wined3d: Add GL_NV_fence defines and functions. --- dlls/wined3d/directx.c | 2 ++ include/wine/wined3d_gl.h | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 577e0db..291ac5b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -787,6 +787,8 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { gl_info->vs_nv_version = VS_VERSION_10; TRACE_(d3d_caps)(" FOUND: NVIDIA (NV) Vertex Shader support - version=%02x\n", gl_info->vs_nv_version); gl_info->supported[NV_VERTEX_PROGRAM] = TRUE; + } else if (strstr(ThisExtn, "GL_NV_fence")) { + gl_info->supported[NV_FENCE] = TRUE; /** * ATI diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index fcec035..3d3f22b 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -345,6 +345,7 @@ typedef void (APIENTRY * PGLFNGLWEIGHTPOINTERARB) (GLint size, GLenum type, GLsi #define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF #define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 #define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 + #endif typedef GLboolean (APIENTRY * PGLFNGLISRENDERBUFFEREXTPROC)(GLuint renderbuffer); typedef void (APIENTRY * PGLFNGLBINDRENDERBUFFEREXTPROC)(GLenum target, GLuint renderbuffer); @@ -1132,6 +1133,20 @@ typedef void (APIENTRY * PGLFNACTIVESTENCILFACEEXTPROC) (GLenum face); #endif typedef void (APIENTRY * PGLFNSTENCILOPSEPARATEATIPROC) (GLenum, GLenum, GLenum, GLenum); typedef void (APIENTRY * PGLFNSTENCILFUNCSEPARATEATIPROC) (GLenum, GLenum, GLint, GLuint); +/* GL_NV_fence */ +#ifndef GL_NV_fence +#define GL_ALL_COMPLETED_NV 0x84F2 +#define GL_FENCE_STATUS_NV 0x84F3 +#define GL_FENCE_CONDITION_NV 0x84F4 +#endif +typedef void (APIENTRY * PGLFNGENFENCESNVPROC) (GLsizei, GLuint *); +typedef void (APIENTRY * PGLFNDELETEFENCESNVPROC) (GLuint, const GLuint *); +typedef void (APIENTRY * PGLFNSETFENCENVPROC) (GLuint, GLenum); +typedef GLboolean (APIENTRY * PGLFNTESTFENCENVPROC) (GLuint); +typedef void (APIENTRY * PGLFNFINISHFENCENVPROC) (GLuint); +typedef GLboolean (APIENTRY * PGLFNISFENCENVPROC) (GLuint); +typedef void (APIENTRY * PGLFNGETFENCEIVNVPROC) (GLuint, GLenum, GLint *); + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -1488,6 +1503,7 @@ typedef enum _GL_SupportedExt { NV_TEXTURE_SHADER2, NV_TEXTURE_SHADER3, NV_VERTEX_PROGRAM, + NV_FENCE, /* ATI */ ATI_SEPARATE_STENCIL, ATI_TEXTURE_ENV_COMBINE3, @@ -1684,6 +1700,14 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNCOMBINERPARAMETERINVPROC, glCombinerParameteriNV); \ USE_GL_FUNC(PGLFNCOMBINERPARAMETERIVNVPROC, glCombinerParameterivNV); \ USE_GL_FUNC(PGLFNFINALCOMBINERINPUTNVPROC, glFinalCombinerInputNV); \ + /* GL_NV_fence */ \ + USE_GL_FUNC(PGLFNGENFENCESNVPROC, glGenFencesNV); \ + USE_GL_FUNC(PGLFNDELETEFENCESNVPROC, glDeleteFencesNV); \ + USE_GL_FUNC(PGLFNSETFENCENVPROC, glSetFenceNV); \ + USE_GL_FUNC(PGLFNTESTFENCENVPROC, glTestFenceNV); \ + USE_GL_FUNC(PGLFNFINISHFENCENVPROC, glFinishFenceNV); \ + USE_GL_FUNC(PGLFNISFENCENVPROC, glIsFenceNV); \ + USE_GL_FUNC(PGLFNGETFENCEIVNVPROC, glGetFenceivNV); \ /* OpenGL 2.0 functions */ #define GL2_FUNCS_GEN \

1 0

Stefan Dösinger : wined3d: Use the source surface' s texture for writing the backup.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: 424d34f84f4b2d178ef42a51a99c573235fa231e URL: http://source.winehq.org/git/wine.git/?a=commit;h=424d34f84f4b2d178ef42a51a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 1 01:42:50 2007 +0100 wined3d: Use the source surface's texture for writing the backup. The hwstretch blit code creates a new texture each time it is called to back up the back buffer and releases it afterwards. It is more efficient to keep the texture and release it with the surface. --- dlls/wined3d/surface.c | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8e5bd88..95b7cc7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2251,7 +2251,7 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D /* Uses the hardware to stretch and flip the image */ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface, IWineD3DSwapChainImpl *swapchain, WINED3DRECT *srect, WINED3DRECT *drect, BOOL upsidedown) { - GLuint backup, src; + GLuint src, backup = 0; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface; float left, right, top, bottom; /* Texture coordinates */ @@ -2263,22 +2263,27 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine ENTER_GL(); ActivateContext(myDevice, SrcSurface, CTXUSAGE_BLIT); - /* Backup the back buffer and copy the source buffer into a texture to draw an upside down stretched quad. If - * we are reading from the back buffer, the backup can be used as source texture - */ - glGenTextures(1, &backup); - checkGLcall("glGenTextures(1, &backup)"); - glBindTexture(GL_TEXTURE_2D, backup); - checkGLcall("glBindTexture(GL_TEXTURE_2D, backup)"); + if(!swapchain && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + glGenTextures(1, &backup); + checkGLcall("glGenTextures\n"); + glBindTexture(GL_TEXTURE_2D, backup); + checkGLcall("glBindTexture(Src->glDescription.target, Src->glDescription.textureName)"); + } else { + /* Backup the back buffer and copy the source buffer into a texture to draw an upside down stretched quad. If + * we are reading from the back buffer, the backup can be used as source texture + */ + if(Src->glDescription.textureName == 0) { + /* Get it a description */ + IWineD3DSurface_PreLoad(SrcSurface); + } + glBindTexture(GL_TEXTURE_2D, Src->glDescription.textureName); + checkGLcall("glBindTexture(Src->glDescription.target, Src->glDescription.textureName)"); + } glReadBuffer(GL_BACK); checkGLcall("glReadBuffer(GL_BACK)"); /* TODO: Only back up the part that will be overwritten */ - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, Src->pow2Width, Src->pow2Height, 0, - GL_RGBA, GL_UNSIGNED_BYTE, NULL); - checkGLcall("glTexImage2D"); - glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0 /* read offsets */, 0, 0, @@ -2287,13 +2292,14 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine checkGLcall("glCopyTexSubImage2D"); + /* No issue with overriding these - the sampler is dirty due to blit usage */ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); checkGLcall("glTexParameteri"); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); checkGLcall("glTexParameteri"); - if(!swapchain || (IWineD3DSurface *) This == swapchain->backBuffer[0]) { - src = backup; + if(!swapchain || (IWineD3DSurface *) Src == swapchain->backBuffer[0]) { + src = backup ? backup : Src->glDescription.textureName; } else { glReadBuffer(GL_FRONT); checkGLcall("glReadBuffer(GL_FRONT)"); @@ -2370,8 +2376,8 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine checkGLcall("glCopyTexSubImage2D"); /* Write the back buffer backup back */ - glBindTexture(GL_TEXTURE_2D, backup); - checkGLcall("glBindTexture(GL_TEXTURE_2D, backup)"); + glBindTexture(GL_TEXTURE_2D, backup ? backup : Src->glDescription.textureName); + checkGLcall("glBindTexture(GL_TEXTURE_2D, Src->glDescription.textureName)"); glBegin(GL_QUADS); /* top left */ @@ -2392,12 +2398,14 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine glEnd(); /* Cleanup */ - if(src != backup) { + if(src != Src->glDescription.textureName && src != backup) { glDeleteTextures(1, &src); checkGLcall("glDeleteTextures(1, &src)"); } - glDeleteTextures(1, &backup); - checkGLcall("glDeleteTextures(1, &backup)"); + if(backup) { + glDeleteTextures(1, &backup); + checkGLcall("glDeleteTextures(1, &backup)"); + } LEAVE_GL(); }

1 0

Stefan Dösinger : wined3d: Prepare only fixed function samplers for blit.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: 6ac8d88d5cef451fc4f26a4767a088a5af0f6594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac8d88d5cef451fc4f26a476… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 1 01:21:47 2007 +0100 wined3d: Prepare only fixed function samplers for blit. --- dlls/wined3d/context.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d087a4c..6b00120 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -472,11 +472,13 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)"); } if (GL_SUPPORT(ARB_MULTITEXTURE)) { - for(i = GL_LIMITS(samplers) - 1; i > 0 ; i--) { - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); - checkGLcall("glActiveTextureARB"); - } + /* The blitting code uses (for now) the fixed function pipeline, so make sure to reset all fixed + * function texture unit. No need to care for higher samplers + */ + for(i = GL_LIMITS(textures) - 1; i > 0 ; i--) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); + checkGLcall("glActiveTextureARB"); + glDisable(GL_TEXTURE_CUBE_MAP_ARB); checkGLcall("glDisable GL_TEXTURE_CUBE_MAP_ARB"); glDisable(GL_TEXTURE_3D); @@ -486,9 +488,10 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex glDisable(GL_TEXTURE_1D); checkGLcall("glDisable GL_TEXTURE_1D"); - if(i < MAX_TEXTURES) { - Context_MarkStateDirty(context, STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)); - } + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + checkGLcall("glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);"); + + Context_MarkStateDirty(context, STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)); Context_MarkStateDirty(context, STATE_SAMPLER(i)); } GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB));

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2007