July 2007 - Wine-commits - list.winehq.org

Roderick Colenbrander : wgl: Replace glReadPixels in wglBindTexImage2D by the MUCH faster glCopyTexImage2D .
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: d03e2696cfdc1b7a032c9233901ff453a550b36b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03e2696cfdc1b7a032c92339… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Jul 29 14:13:45 2007 +0200 wgl: Replace glReadPixels in wglBindTexImage2D by the MUCH faster glCopyTexImage2D. --- dlls/winex11.drv/opengl.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 635476a..6880b8e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -250,6 +250,7 @@ static void (*pglXFreeMemoryNV)(GLvoid *pointer); MAKE_FUNCPTR(glBindTexture) MAKE_FUNCPTR(glBitmap) MAKE_FUNCPTR(glCopyTexSubImage1D) +MAKE_FUNCPTR(glCopyTexImage2D) MAKE_FUNCPTR(glCopyTexSubImage2D) MAKE_FUNCPTR(glDisable) MAKE_FUNCPTR(glDrawBuffer) @@ -396,6 +397,7 @@ LOAD_FUNCPTR(glXGetFBConfigs) LOAD_FUNCPTR(glBindTexture) LOAD_FUNCPTR(glBitmap) LOAD_FUNCPTR(glCopyTexSubImage1D) +LOAD_FUNCPTR(glCopyTexImage2D) LOAD_FUNCPTR(glCopyTexSubImage2D) LOAD_FUNCPTR(glDisable) LOAD_FUNCPTR(glDrawBuffer) @@ -2134,7 +2136,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, goto create_failed; } object->texture_target = GL_TEXTURE_CUBE_MAP; - object->texture_bind_target = GL_TEXTURE_CUBE_MAP; + object->texture_bind_target = GL_TEXTURE_BINDING_CUBE_MAP; break; } case WGL_TEXTURE_1D_ARB: { @@ -2143,12 +2145,12 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, goto create_failed; } object->texture_target = GL_TEXTURE_1D; - object->texture_bind_target = GL_TEXTURE_1D; + object->texture_bind_target = GL_TEXTURE_BINDING_1D; break; } case WGL_TEXTURE_2D_ARB: { object->texture_target = GL_TEXTURE_2D; - object->texture_bind_target = GL_TEXTURE_2D; + object->texture_bind_target = GL_TEXTURE_BINDING_2D; break; } case WGL_TEXTURE_RECTANGLE_NV: { @@ -2736,8 +2738,8 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf } if (!use_render_texture_ati && 1 == use_render_texture_emulation) { - void *buf; static int init = 0; + int prev_binded_texture = 0; GLXContext prev_context = pglXGetCurrentContext(); Drawable prev_drawable = pglXGetCurrentDrawable(); GLXContext tmp_context; @@ -2751,25 +2753,22 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf FIXME("partial stub!\n"); } - buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->texture_bpp*object->width*object->height); - if(!buf) { - ERR("Unable to allocate a buffer for render_texture emulation\n"); - return GL_FALSE; - } - TRACE("drawable=%p, context=%p\n", (void*)object->drawable, prev_context); - tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, NULL, True); + tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); + + pglGetIntegerv(object->texture_bind_target, &prev_binded_texture); - /* Switch to our pbuffer and readback its contents */ + /* Switch to our pbuffer */ pglXMakeCurrent(gdi_display, object->drawable, tmp_context); - pglReadPixels(0, 0, object->width, object->height, object->texture_format, object->texture_type, buf); + + /* Make sure that the prev_binded_texture is set as the current texture state isn't shared between contexts. + * After that upload the pbuffer texture data. */ + pglBindTexture(object->texture_target, prev_binded_texture); + pglCopyTexImage2D(object->texture_target, 0, object->use_render_texture, 0, 0, object->width, object->height, 0); /* Switch back to the original drawable and upload the pbuffer-texture */ pglXMakeCurrent(object->display, prev_drawable, prev_context); - pglTexImage2D(object->texture_target, 0, object->use_render_texture, object->width, object->height, 0, object->texture_format, object->texture_type, buf); - pglXDestroyContext(gdi_display, tmp_context); - HeapFree(GetProcessHeap(), 0, buf); return GL_TRUE; }

1 0

James Hawkins : msi: Treat an empty string and a NULL string as the same value.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 5e81dbebb07fb82131f2e1944797e70b53429b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e81dbebb07fb82131f2e1944… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Jul 29 21:23:19 2007 -0700 msi: Treat an empty string and a NULL string as the same value. --- dlls/msi/tests/db.c | 18 ++++++++++++++++++ dlls/msi/where.c | 3 ++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 3e38f20..89cc48a 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1562,6 +1562,24 @@ static void test_where(void) ok( r == ERROR_SUCCESS, "query failed: %d\n", r ); MsiCloseHandle( rec ); + rec = MsiCreateRecord(1); + MsiRecordSetString(rec, 1, ""); + + query = "SELECT * FROM `Media` WHERE `DiskPrompt` = ?"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(view, rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(rec); + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(rec); + MsiViewClose(view); + MsiCloseHandle(view); + MsiCloseHandle( hdb ); DeleteFile(msifile); } diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 5104e67..ecca17a 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -192,7 +192,8 @@ static UINT STRCMP_Evaluate( MSIWHEREVIEW *wv, UINT row, const struct expr *cond l_str = STRING_evaluate( wv, row, cond->u.expr.left, record ); r_str = STRING_evaluate( wv, row, cond->u.expr.right, record ); - if( l_str == r_str ) + if( l_str == r_str || + ((!l_str || !*l_str) && (!r_str || !*r_str)) ) sr = 0; else if( l_str && ! r_str ) sr = 1;

1 0

James Hawkins : msi: Add a stub implementation of MsiSourceListEnumSourcesA .
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 37286473a05fb9e35f1ff5e785b675764d10e966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37286473a05fb9e35f1ff5e78… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Jul 29 21:29:21 2007 -0700 msi: Add a stub implementation of MsiSourceListEnumSourcesA. --- dlls/msi/msi.spec | 2 +- dlls/msi/source.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 6aa8957..3990849 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -256,7 +256,7 @@ 260 stub MsiSourceListClearAllExW 261 stub MsiSourceListForceResolutionExA 262 stub MsiSourceListForceResolutionExW -263 stub MsiSourceListEnumSourcesA +263 stdcall MsiSourceListEnumSourcesA(str str long long long ptr ptr) 264 stub MsiSourceListEnumSourcesW 265 stdcall MsiSourceListGetInfoA(str str long long str ptr ptr) 266 stub MsiSourceListGetInfoW diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 975b0f2..69f10f3 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -169,6 +169,19 @@ static UINT find_given_source(HKEY key, LPCWSTR szSource, media_info *ss) } /****************************************************************** + * MsiSourceListEnumSourcesA (MSI.@) + */ +UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR szProductCodeOrPatch, LPCSTR szUserSid, + MSIINSTALLCONTEXT dwContext, + DWORD dwOptions, DWORD dwIndex, + LPSTR szSource, LPDWORD pcchSource) +{ + FIXME("(%s, %s, %d, %d, %d, %p, %p): stub!\n", szProductCodeOrPatch, szUserSid, + dwContext, dwOptions, dwIndex, szSource, pcchSource); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************** * MsiSourceListGetInfoA (MSI.@) */ UINT WINAPI MsiSourceListGetInfoA( LPCSTR szProduct, LPCSTR szUserSid,

1 0

Roderick Colenbrander : wgl: Add WGL_ATI_pixel_format_float/ WGL_ARB_pixel_format_float support.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 14e17b0a2e9ad0173dcc30beecc54bce6ca3e205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e17b0a2e9ad0173dcc30bee… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Jul 28 18:56:12 2007 +0200 wgl: Add WGL_ATI_pixel_format_float/WGL_ARB_pixel_format_float support. --- dlls/winex11.drv/opengl.c | 79 ++++++++++++++++++++++++++++++++------------- 1 files changed, 56 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 6ceb635..ef30bab 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -67,20 +67,6 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl); WINE_DECLARE_DEBUG_CHANNEL(fps); -typedef struct wine_glcontext { - HDC hdc; - XVisualInfo *vis; - GLXFBConfig fbconfig; - GLXContext ctx; - BOOL do_escape; - X11DRV_PDEVICE *physDev; - RECT viewport; - RECT scissor; - BOOL scissor_enabled; - struct wine_glcontext *next; - struct wine_glcontext *prev; -} Wine_GLContext; - typedef struct wine_glextension { const char *extName; struct { @@ -111,9 +97,24 @@ typedef struct wine_glpixelformat { int iPixelFormat; GLXFBConfig fbconfig; int fmt_id; + int render_type; BOOL offscreenOnly; } WineGLPixelFormat; +typedef struct wine_glcontext { + HDC hdc; + XVisualInfo *vis; + WineGLPixelFormat *fmt; + GLXContext ctx; + BOOL do_escape; + X11DRV_PDEVICE *physDev; + RECT viewport; + RECT scissor; + BOOL scissor_enabled; + struct wine_glcontext *next; + struct wine_glcontext *prev; +} Wine_GLContext; + typedef struct wine_glpbuffer { Drawable drawable; Display* display; @@ -565,9 +566,9 @@ static int describeContext(Wine_GLContext* ctx) { int tmp; int ctx_vis_id; TRACE(" Context %p have (vis:%p):\n", ctx, ctx->vis); - pglXGetFBConfigAttrib(gdi_display, ctx->fbconfig, GLX_FBCONFIG_ID, &tmp); + pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_FBCONFIG_ID, &tmp); TRACE(" - FBCONFIG_ID 0x%x\n", tmp); - pglXGetFBConfigAttrib(gdi_display, ctx->fbconfig, GLX_VISUAL_ID, &tmp); + pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_VISUAL_ID, &tmp); TRACE(" - VISUAL_ID 0x%x\n", tmp); ctx_vis_id = tmp; return ctx_vis_id; @@ -669,7 +670,8 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf switch (pop) { case WGL_TYPE_COLORINDEX_ARB: pop = GLX_COLOR_INDEX_BIT; isColor = 1; break ; case WGL_TYPE_RGBA_ARB: pop = GLX_RGBA_BIT; break ; - case WGL_TYPE_RGBA_FLOAT_ATI: pop = GLX_RGBA_FLOAT_ATI_BIT; break ; + /* This is the same as WGL_TYPE_RGBA_FLOAT_ATI but the GLX constants differ, only the ARB GLX one is widely supported so use that */ + case WGL_TYPE_RGBA_FLOAT_ATI: pop = GLX_RGBA_FLOAT_BIT_ARB; break ; default: ERR("unexpected PixelType(%x)\n", pop); pop = 0; @@ -826,6 +828,27 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf return nAttribs; } +static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) +{ + int render_type=0, render_type_bit; + pglXGetFBConfigAttrib(display, fbconfig, GLX_RENDER_TYPE, &render_type_bit); + switch(render_type_bit) + { + case GLX_RGBA_BIT: + render_type = GLX_RGBA_TYPE; + break; + case GLX_COLOR_INDEX_BIT: + render_type = GLX_COLOR_INDEX_TYPE; + break; + case GLX_RGBA_FLOAT_BIT_ARB: + render_type = GLX_RGBA_FLOAT_TYPE_ARB; + break; + default: + ERR("Unknown render_type: %x\n", render_type); + } + return render_type; +} + static BOOL get_fbconfig_from_visualid(Display *display, Visual *visual, GLXFBConfig *fbconfig, int *fmt_id) { GLXFBConfig* cfgs = NULL; @@ -896,6 +919,7 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) WineGLPixelFormatList[0].iPixelFormat = 1; WineGLPixelFormatList[0].fbconfig = fbconfig; WineGLPixelFormatList[0].fmt_id = fmt_id; + WineGLPixelFormatList[0].render_type = get_render_type_from_fbconfig(display, fbconfig); WineGLPixelFormatList[0].offscreenOnly = FALSE; WineGLPixelFormatListSize = 1; } @@ -916,6 +940,7 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) WineGLPixelFormatList[0].iPixelFormat = 1; WineGLPixelFormatList[0].fbconfig = fbconfig; WineGLPixelFormatList[0].fmt_id = fmt_id; + WineGLPixelFormatList[0].render_type = get_render_type_from_fbconfig(display, fbconfig); WineGLPixelFormatList[0].offscreenOnly = FALSE; WineGLPixelFormatListSize = 1; @@ -930,6 +955,7 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = tmp_fmt_id; + WineGLPixelFormatList[WineGLPixelFormatListSize].render_type = get_render_type_from_fbconfig(display, cfgs[i]); WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE; WineGLPixelFormatListSize++; } @@ -1351,7 +1377,8 @@ HGLRC X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) wine_tsx11_unlock(); ret->hdc = hdc; ret->physDev = physDev; - ret->fbconfig = fmt->fbconfig; + ret->fmt = fmt; + /*ret->vis = vis;*/ ret->vis = pglXGetVisualFromFBConfig(gdi_display, fmt->fbconfig); @@ -1541,7 +1568,7 @@ BOOL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { if(ctx->vis) ctx->ctx = pglXCreateContext(gdi_display, ctx->vis, NULL, type == OBJ_MEMDC ? False : True); else /* Create a GLX Context for a pbuffer */ - ctx->ctx = pglXCreateNewContext(gdi_display, ctx->fbconfig, GLX_RGBA_TYPE, NULL, True); + ctx->ctx = pglXCreateNewContext(gdi_display, ctx->fmt->fbconfig, ctx->fmt->render_type, NULL, True); TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); } @@ -1636,7 +1663,7 @@ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { if(org->vis) org->ctx = pglXCreateContext(gdi_display, org->vis, NULL, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); else /* Create a GLX Context for a pbuffer */ - org->ctx = pglXCreateNewContext(gdi_display, org->fbconfig, GLX_RGBA_TYPE, NULL, True); + org->ctx = pglXCreateNewContext(gdi_display, org->fmt->fbconfig, org->fmt->render_type, NULL, True); wine_tsx11_unlock(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p\n", org->ctx, org); } @@ -1647,7 +1674,7 @@ BOOL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { if(dest->vis) dest->ctx = pglXCreateContext(gdi_display, dest->vis, org->ctx, GetObjectType(org->physDev->hdc) == OBJ_MEMDC ? False : True); else /* Create a GLX Context for a pbuffer */ - dest->ctx = pglXCreateNewContext(gdi_display, dest->fbconfig, GLX_RGBA_TYPE, org->ctx, True); + dest->ctx = pglXCreateNewContext(gdi_display, dest->fmt->fbconfig, dest->fmt->render_type, org->ctx, True); wine_tsx11_unlock(); TRACE(" created a delayed OpenGL context (%p) for Wine context %p sharing lists with OpenGL ctx %p\n", dest->ctx, dest, org->ctx); return TRUE; @@ -1882,7 +1909,7 @@ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) GLXContext gl_ctx = pglXGetCurrentContext(); Wine_GLContext* ret = get_context_from_GLXContext(gl_ctx); - pglXGetFBConfigAttrib(gdi_display, ret->fbconfig, GLX_ALPHA_SIZE, params); + pglXGetFBConfigAttrib(gdi_display, ret->fmt->fbconfig, GLX_ALPHA_SIZE, params); TRACE("returns GL_ALPHA_BITS as '%d'\n", *params); break; } @@ -2731,7 +2758,7 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf } TRACE("drawable=%p, context=%p\n", (void*)object->drawable, prev_context); - tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, GLX_RGBA_TYPE, NULL, True); + tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, NULL, True); /* Switch to our pbuffer and readback its contents */ pglXMakeCurrent(gdi_display, object->drawable, tmp_context); @@ -2993,6 +3020,12 @@ static void X11DRV_WineGL_LoadExtensions(void) /* ARB Extensions */ + if(glxRequireExtension("GLX_ARB_fbconfig_float")) + { + register_extension_string("WGL_ARB_pixel_format_float"); + register_extension_string("WGL_ATI_pixel_format_float"); + } + register_extension(&WGL_ARB_extensions_string); if (glxRequireVersion(3))

1 0

Roderick Colenbrander : wgl: wglBindTexImageARB should return TRUE on success.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 8cbb0a6f185f16d0eeec9ef4cd197a1cf36953d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbb0a6f185f16d0eeec9ef4c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Jul 28 23:21:57 2007 +0200 wgl: wglBindTexImageARB should return TRUE on success. --- dlls/winex11.drv/opengl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ef30bab..635476a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2770,6 +2770,7 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf pglXDestroyContext(gdi_display, tmp_context); HeapFree(GetProcessHeap(), 0, buf); + return GL_TRUE; } if (NULL != pglXBindTexImageARB) {

1 0

Jason Edmeades : cmd: Remove some debug code.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: e34f58ad78fa1b20ee7dcd914dd587fefcd6efcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e34f58ad78fa1b20ee7dcd914… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jul 27 21:43:39 2007 +0100 cmd: Remove some debug code. --- programs/cmd/wcmdmain.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 4cd8416..708686c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2069,12 +2069,10 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* Ignore open brackets inside the for set */ if (curLen == 0 && !inIn) { - WINE_TRACE("@@@4\n"); curDepth++; /* If in quotes, ignore brackets */ } else if (inQuotes) { - WINE_TRACE("@@@3\n"); curString[curLen++] = *curPos; /* In a FOR loop, an unquoted '(' may occur straight after @@ -2088,7 +2086,6 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF (inElse && lastWasElse && onlyWhiteSpace) || (inFor && (lastWasIn || lastWasDo) && onlyWhiteSpace)) { - WINE_TRACE("@@@2\n"); /* If entering into an 'IN', set inIn */ if (inFor && lastWasIn && onlyWhiteSpace) { WINE_TRACE("Inside an IN\n"); @@ -2114,7 +2111,6 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF curDepth++; } else { - WINE_TRACE("@@@1\n"); curString[curLen++] = *curPos; } break;

1 0

Roderick Colenbrander : wgl: Enable WGL_EXT_swap_control by default even when the GLX version isn' t there.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: daaf08f0d276996f738b6b0a48786691926d8f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daaf08f0d276996f738b6b0a4… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Jul 28 00:32:32 2007 +0200 wgl: Enable WGL_EXT_swap_control by default even when the GLX version isn't there. --- dlls/winex11.drv/opengl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c26e509..6ceb635 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3037,8 +3037,9 @@ static void X11DRV_WineGL_LoadExtensions(void) register_extension(&WGL_EXT_extensions_string); - if (glxRequireExtension("GLX_SGI_swap_control")) - register_extension(&WGL_EXT_swap_control); + /* Load this extension even when it isn't backed by a GLX extension because it is has been around for ages. + * Games like Call of Duty and K.O.T.O.R. rely on it. Further our emulation is good enough. */ + register_extension(&WGL_EXT_swap_control); /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */ if(strstr(WineGLInfo.glExtensions, "GL_NV_vertex_array_range") != NULL)

1 0

Roderick Colenbrander : wgl: Use correct types and pixelformats for pbuffers.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 96f9cceb68fb9a1831414520ce39636d1d6cee45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96f9cceb68fb9a1831414520c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Jul 28 00:20:44 2007 +0200 wgl: Use correct types and pixelformats for pbuffers. --- dlls/winex11.drv/opengl.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 89238ef..c26e509 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -123,9 +123,12 @@ typedef struct wine_glpbuffer { int* attribList; HDC hdc; - int use_render_texture; + int use_render_texture; /* This is also the internal texture format */ + int texture_bind_target; + int texture_bpp; + GLint texture_format; GLuint texture_target; - GLuint texture_bind_target; + GLenum texture_type; GLuint texture; int texture_level; } Wine_GLPBuffer; @@ -2027,23 +2030,41 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, switch (attr_v) { case WGL_TEXTURE_RGB_ARB: object->use_render_texture = GL_RGB; + object->texture_bpp = 3; + object->texture_format = GL_RGB; + object->texture_type = GL_UNSIGNED_BYTE; break; case WGL_TEXTURE_RGBA_ARB: object->use_render_texture = GL_RGBA; + object->texture_bpp = 4; + object->texture_format = GL_RGBA; + object->texture_type = GL_UNSIGNED_BYTE; break; /* WGL_FLOAT_COMPONENTS_NV */ case WGL_TEXTURE_FLOAT_R_NV: object->use_render_texture = GL_FLOAT_R_NV; + object->texture_bpp = 4; + object->texture_format = GL_RED; + object->texture_type = GL_FLOAT; break; case WGL_TEXTURE_FLOAT_RG_NV: object->use_render_texture = GL_FLOAT_RG_NV; + object->texture_bpp = 8; + object->texture_format = GL_LUMINANCE_ALPHA; + object->texture_type = GL_FLOAT; break; case WGL_TEXTURE_FLOAT_RGB_NV: object->use_render_texture = GL_FLOAT_RGB_NV; + object->texture_bpp = 12; + object->texture_format = GL_RGB; + object->texture_type = GL_FLOAT; break; case WGL_TEXTURE_FLOAT_RGBA_NV: object->use_render_texture = GL_FLOAT_RGBA_NV; + object->texture_bpp = 16; + object->texture_format = GL_RGBA; + object->texture_type = GL_FLOAT; break; default: ERR("Unknown texture format: %x\n", attr_v); @@ -2703,7 +2724,7 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf FIXME("partial stub!\n"); } - buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 4*object->width*object->height); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->texture_bpp*object->width*object->height); if(!buf) { ERR("Unable to allocate a buffer for render_texture emulation\n"); return GL_FALSE; @@ -2714,11 +2735,11 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf /* Switch to our pbuffer and readback its contents */ pglXMakeCurrent(gdi_display, object->drawable, tmp_context); - pglReadPixels(0, 0, object->width, object->height, GL_RGBA, GL_UNSIGNED_BYTE, buf); + pglReadPixels(0, 0, object->width, object->height, object->texture_format, object->texture_type, buf); /* Switch back to the original drawable and upload the pbuffer-texture */ pglXMakeCurrent(object->display, prev_drawable, prev_context); - pglTexImage2D(object->texture_target, 0, GL_RGBA8, object->width, object->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buf); + pglTexImage2D(object->texture_target, 0, object->use_render_texture, object->width, object->height, 0, object->texture_format, object->texture_type, buf); pglXDestroyContext(gdi_display, tmp_context); HeapFree(GetProcessHeap(), 0, buf);

1 0

Jason Edmeades : cmd: Add support for wildcards in copy.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: a766ba057061e669f8a8bbad19287f46d6391bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=a766ba057061e669f8a8bbad1… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jul 27 21:43:37 2007 +0100 cmd: Add support for wildcards in copy. --- programs/cmd/builtins.c | 113 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 87 insertions(+), 26 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index af58717..9c34e8f 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -108,7 +108,7 @@ void WCMD_change_tty (void) { * WCMD_copy * * Copy a file or wildcarded set. - * FIXME: No wildcard support + * FIXME: Add support for a+b+c type syntax */ void WCMD_copy (void) { @@ -116,21 +116,52 @@ void WCMD_copy (void) { WIN32_FIND_DATA fd; HANDLE hff; BOOL force, status; - WCHAR outpath[MAX_PATH], inpath[MAX_PATH], *infile, copycmd[3]; + WCHAR outpath[MAX_PATH], srcpath[MAX_PATH], copycmd[3]; DWORD len; static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; + BOOL copyToDir = FALSE; + BOOL copyFromDir = FALSE; + WCHAR srcspec[MAX_PATH]; + DWORD attribs; + WCHAR drive[10]; + WCHAR dir[MAX_PATH]; + WCHAR fname[MAX_PATH]; + WCHAR ext[MAX_PATH]; if (param1[0] == 0x00) { WCMD_output (WCMD_LoadMessage(WCMD_NOARG)); return; } - if ((strchrW(param1,'*') != NULL) && (strchrW(param1,'%') != NULL)) { - WCMD_output (WCMD_LoadMessage(WCMD_NYI)); - return; + /* Convert source into full spec */ + WINE_TRACE("Copy source (supplied): '%s'\n", wine_dbgstr_w(param1)); + GetFullPathName (param1, sizeof(srcpath)/sizeof(WCHAR), srcpath, NULL); + if (srcpath[strlenW(srcpath) - 1] == '\\') + srcpath[strlenW(srcpath) - 1] = '\0'; + + if ((strchrW(srcpath,'*') == NULL) && (strchrW(srcpath,'?') == NULL)) { + attribs = GetFileAttributes(srcpath); + } else { + attribs = 0; } + strcpyW(srcspec, srcpath); + + /* If a directory, then add \* on the end when searching */ + if (attribs & FILE_ATTRIBUTE_DIRECTORY) { + strcatW(srcpath, slashW); + copyFromDir = TRUE; + strcatW(srcspec, slashW); + strcatW(srcspec, starW); + } else { + WCMD_splitpath(srcpath, drive, dir, fname, ext); + strcpyW(srcpath, drive); + strcatW(srcpath, dir); + } + + WINE_TRACE("Copy source (calculated): path: '%s'\n", wine_dbgstr_w(srcpath)); /* If no destination supplied, assume current directory */ + WINE_TRACE("Copy destination (supplied): '%s'\n", wine_dbgstr_w(param2)); if (param2[0] == 0x00) { strcpyW(param2, dotW); } @@ -138,15 +169,13 @@ void WCMD_copy (void) { GetFullPathName (param2, sizeof(outpath)/sizeof(WCHAR), outpath, NULL); if (outpath[strlenW(outpath) - 1] == '\\') outpath[strlenW(outpath) - 1] = '\0'; - hff = FindFirstFile (outpath, &fd); - if (hff != INVALID_HANDLE_VALUE) { - if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - GetFullPathName (param1, sizeof(inpath)/sizeof(WCHAR), inpath, &infile); - strcatW (outpath, slashW); - strcatW (outpath, infile); - } - FindClose (hff); + attribs = GetFileAttributes(outpath); + if (attribs & FILE_ATTRIBUTE_DIRECTORY) { + strcatW (outpath, slashW); + copyToDir = TRUE; } + WINE_TRACE("Copy destination (calculated): '%s'(%d)\n", + wine_dbgstr_w(outpath), copyToDir); /* /-Y has the highest priority, then /Y and finally the COPYCMD env. variable */ if (strstrW (quals, parmNoY)) @@ -158,21 +187,53 @@ void WCMD_copy (void) { force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) && ! lstrcmpiW (copycmd, parmY)); } - if (!force) { - hff = FindFirstFile (outpath, &fd); - if (hff != INVALID_HANDLE_VALUE) { - WCHAR buffer[MAXSTRING]; + /* Loop through all source files */ + WINE_TRACE("Searching for: '%s'\n", wine_dbgstr_w(srcspec)); + hff = FindFirstFile (srcspec, &fd); + if (hff != INVALID_HANDLE_VALUE) { + do { + WCHAR outname[MAX_PATH]; + WCHAR srcname[MAX_PATH]; + BOOL overwrite = force; + + /* Destination is either supplied filename, or source name in + supplied destination directory */ + strcpyW(outname, outpath); + if (copyToDir) strcatW(outname, fd.cFileName); + strcpyW(srcname, srcpath); + strcatW(srcname, fd.cFileName); + + WINE_TRACE("Copying from : '%s'\n", wine_dbgstr_w(srcname)); + WINE_TRACE("Copying to : '%s'\n", wine_dbgstr_w(outname)); + + /* Skip . and .., and directories */ + if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + overwrite = FALSE; + WINE_TRACE("Skipping directories\n"); + } + + /* Prompt before overwriting */ + else if (!overwrite) { + attribs = GetFileAttributes(outname); + if (attribs != INVALID_FILE_ATTRIBUTES) { + WCHAR buffer[MAXSTRING]; + wsprintf(buffer, WCMD_LoadMessage(WCMD_OVERWRITE), outname); + overwrite = WCMD_ask_confirm(buffer, FALSE, NULL); + } + else overwrite = TRUE; + } - FindClose (hff); + /* Do the copy as appropriate */ + if (overwrite) { + status = CopyFile (srcname, outname, FALSE); + if (!status) WCMD_print_error (); + } - wsprintf(buffer, WCMD_LoadMessage(WCMD_OVERWRITE), outpath); - force = WCMD_ask_confirm(buffer, FALSE, NULL); - } - else force = TRUE; - } - if (force) { - status = CopyFile (param1, outpath, FALSE); - if (!status) WCMD_print_error (); + } while (FindNextFile(hff, &fd) != 0); + FindClose (hff); + } else { + status = ERROR_FILE_NOT_FOUND; + WCMD_print_error (); } }

1 0

Jason Edmeades : cmd: Fix comment to accurately reflect the function.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 8e08983e5f7c821268df51d1fc9d2a45707f057e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e08983e5f7c821268df51d1f… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Jul 27 21:43:38 2007 +0100 cmd: Fix comment to accurately reflect the function. --- programs/cmd/builtins.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9c34e8f..d887c4f 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -770,8 +770,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { * * Execute a command, and any && or bracketed follow on to the command. The * first command to be executed may not be at the front of the - * commands->thiscommand string (eg. it may point after a DO or ELSE - * Returns TRUE if something like exit or goto has aborted all processing + * commands->thiscommand string (eg. it may point after a DO or ELSE) */ void WCMD_part_execute(CMD_LIST **cmdList, WCHAR *firstcmd, WCHAR *variable, WCHAR *value, BOOL isIF, BOOL conditionTRUE) {

1 0