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

Detlef Riekenberg : winspool/tests: Fix 2 failing tests for restricted users.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 1c8a466cca0a7d6ad3c1b062ae43d69541de24d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8a466cca0a7d6ad3c1b062a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Aug 13 12:07:57 2007 +0200 winspool/tests: Fix 2 failing tests for restricted users. --- dlls/winspool.drv/tests/info.c | 48 ++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 6006db3..65d0cf4 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -87,17 +87,29 @@ static LPWSTR tempfileW = NULL; /* ################################ */ /* report common behavior only once */ -static DWORD report_deactivated_spooler = 1; +static DWORD deactivated_spooler_reported = 0; #define RETURN_ON_DEACTIVATED_SPOOLER(res) \ - if((res == 0) && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) \ + if ((res == 0) && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) \ { \ - if(report_deactivated_spooler > 0) { \ - report_deactivated_spooler--; \ + if (!deactivated_spooler_reported) { \ + deactivated_spooler_reported++; \ skip("The Service 'Spooler' is required for many test\n"); \ } \ return; \ } +static DWORD access_denied_reported = 0; +#define RETURN_ON_ACCESS_DENIED(res) \ + if ((res == 0) && (GetLastError() == ERROR_ACCESS_DENIED)) \ + { \ + if (!access_denied_reported) { \ + access_denied_reported++; \ + skip("More Access-Rights are required for many test\n"); \ + } \ + return; \ + } + +/* ################################ */ static void find_default_printer(VOID) { @@ -313,11 +325,7 @@ static void test_AddMonitor(void) SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); RETURN_ON_DEACTIVATED_SPOOLER(res) - - if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { - skip("(ACCESS_DENIED)\n"); - return; - } + RETURN_ON_ACCESS_DENIED(res) /* NT: ERROR_INVALID_PARAMETER, 9x: ERROR_INVALID_ENVIRONMENT */ ok(!res && ((GetLastError() == ERROR_INVALID_PARAMETER) || @@ -440,10 +448,8 @@ static void test_AddPort(void) SetLastError(0xdeadbeef); res = AddPortA(NULL, 0, empty); /* Allowed only for (Printer-)Administrators */ - if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { - skip("(ACCESS_DENIED)\n"); - return; - } + RETURN_ON_ACCESS_DENIED(res) + /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || (GetLastError() == ERROR_INVALID_PARAMETER)), @@ -593,10 +599,8 @@ static void test_ConfigurePort(void) SetLastError(0xdeadbeef); res = ConfigurePortA(NULL, 0, empty); /* Allowed only for (Printer-)Administrators */ - if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { - skip("(ACCESS_DENIED)\n"); - return; - } + RETURN_ON_ACCESS_DENIED(res) + /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || (GetLastError() == ERROR_INVALID_PARAMETER)), @@ -734,10 +738,8 @@ static void test_DeletePort(void) SetLastError(0xdeadbeef); res = DeletePortA(NULL, 0, empty); /* Allowed only for (Printer-)Administrators */ - if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { - skip("(ACCESS_DENIED)\n"); - return; - } + RETURN_ON_ACCESS_DENIED(res) + /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ ok( !res && ((GetLastError() == ERROR_NOT_SUPPORTED) || (GetLastError() == ERROR_INVALID_PARAMETER)), @@ -1810,6 +1812,8 @@ static void test_XcvDataW_MonitorUI(void) SetLastError(0xdeadbeef); res = OpenPrinter(xcv_localport, &hXcv, &pd); RETURN_ON_DEACTIVATED_SPOOLER(res) + RETURN_ON_ACCESS_DENIED(res) + ok(res, "returned %d with %u and handle %p (expected '!= 0')\n", res, GetLastError(), hXcv); if (!res) return; @@ -1927,6 +1931,8 @@ static void test_XcvDataW_PortIsValid(void) res = OpenPrinter(xcv_localport, &hXcv, &pd); RETURN_ON_DEACTIVATED_SPOOLER(res) + RETURN_ON_ACCESS_DENIED(res) + ok(res, "returned %d with %u and handle %p (expected '!= 0')\n", res, GetLastError(), hXcv); if (!res) return;

1 0

Roderick Colenbrander : wined3d: Pass the proper DeviceName to ChangeDisplaySettings.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 6b177c44e10d7c1495de2de2ca605e03a8a11d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b177c44e10d7c1495de2de2c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Aug 13 16:47:17 2007 +0200 wined3d: Pass the proper DeviceName to ChangeDisplaySettings. --- dlls/wined3d/device.c | 3 +-- dlls/wined3d/directx.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0c0b20..11679af 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1343,8 +1343,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic devmode.dmBitsPerPel = (bpp >= 24) ? 32 : bpp; /* Stupid XVidMode cannot change bpp */ devmode.dmPelsWidth = pPresentationParameters->BackBufferWidth; devmode.dmPelsHeight = pPresentationParameters->BackBufferHeight; - MultiByteToWideChar(CP_ACP, 0, "Gamers CG", -1, devmode.dmDeviceName, CCHDEVICENAME); - ChangeDisplaySettingsExW(devmode.dmDeviceName, &devmode, object->win_handle, CDS_FULLSCREEN, NULL); + ChangeDisplaySettingsExW(This->adapter->DeviceName, &devmode, NULL, CDS_FULLSCREEN, NULL); /* For GetDisplayMode */ This->ddraw_width = devmode.dmPelsWidth; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 13fcf51..563c714 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2479,6 +2479,8 @@ BOOL InitAdapters(void) { /* For now only one default adapter */ { int attribute; + DISPLAY_DEVICEW DisplayDevice; + TRACE("Initializing default adapter\n"); Adapters[0].monitorPoint.x = -1; Adapters[0].monitorPoint.y = -1; @@ -2499,6 +2501,12 @@ BOOL InitAdapters(void) { Adapters[0].driver = "Display"; Adapters[0].description = "Direct3D HAL"; + /* Initialize the Adapter's DeviceName which is required for ChangeDisplaySettings and friends */ + DisplayDevice.cb = sizeof(DisplayDevice); + EnumDisplayDevicesW(NULL, 0 /* Adapter 0 = iDevNum 0 */, &DisplayDevice, 0); + TRACE("DeviceName: %s\n", debugstr_w(DisplayDevice.DeviceName)); + strcpyW(Adapters[0].DeviceName, DisplayDevice.DeviceName); + if (WineD3D_CreateFakeGLContext()) { int iPixelFormat; int attribs[8]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3ceb767..159844e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -588,6 +588,7 @@ struct WineD3DAdapter WineD3D_GL_Info gl_info; const char *driver; const char *description; + WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ int nCfgs; WineD3D_PixelFormat *cfgs; };

1 0

Vitaliy Margolen : wined3d: Activate context before applying fbo state.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: b56afd0cffe4b26cc8134d21dfa2f7527e0ae1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56afd0cffe4b26cc8134d21d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Aug 13 08:11:21 2007 -0600 wined3d: Activate context before applying fbo state. --- dlls/wined3d/device.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 11679af..bc936b6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4415,16 +4415,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun /* This is for offscreen rendering as well as for multithreading, thus activate the set render target * and not the last active one. */ + ActivateContext(This, This->render_targets[0], CTXUSAGE_CLEAR); + ENTER_GL(); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - ENTER_GL(); apply_fbo_state(iface); - LEAVE_GL(); } - ActivateContext(This, This->render_targets[0], CTXUSAGE_CLEAR); - ENTER_GL(); - if (Count > 0 && pRects) { curRect = pRects; } else {

1 0

Stefan Dösinger : wined3d: Optimize transform state in stateblocks.
by Alexandre Julliard 14 Aug '07

14 Aug '07

Module: wine Branch: master Commit: 92ce028a0b3aba513f8fb62d7021533896cd99f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ce028a0b3aba513f8fb62d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 31 15:44:13 2007 +0200 wined3d: Optimize transform state in stateblocks. --- dlls/wined3d/device.c | 12 +++++++++++- dlls/wined3d/stateblock.c | 18 ++++++++---------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bc936b6..8522dac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -469,7 +469,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, for(j = 1; j <= WINEHIGHEST_RENDER_STATE; j++) { object->contained_render_states[j - 1] = j; } - object->num_contained_render_states = WINEHIGHEST_RENDER_STATE; + /* TODO: Filter unused transforms between TEXTURE8 and WORLD0? */ + for(j = 1; j <= HIGHEST_TRANSFORMSTATE; j++) { + object->contained_transform_states[j - 1] = j; + } + object->num_contained_transform_states = HIGHEST_TRANSFORMSTATE; } else if (Type == WINED3DSBT_PIXELSTATE) { @@ -4324,6 +4328,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW object->num_contained_render_states++; } } + for(i = 1; i <= HIGHEST_TRANSFORMSTATE; i++) { + if(object->changed.transform[i]) { + object->contained_transform_states[object->num_contained_transform_states] = i; + object->num_contained_transform_states++; + } + } *ppStateBlock = (IWineD3DStateBlock*) object; This->isRecordingState = FALSE; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 79bfe56..0c0965b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -485,13 +485,11 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } /* Others + Render & Texture */ - for (i = 1; i <= HIGHEST_TRANSFORMSTATE; i++) { - if (This->changed.transform[i] && memcmp(&targetStateBlock->transforms[i], - &This->transforms[i], - sizeof(WINED3DMATRIX)) != 0) { - TRACE("Updating transform %d\n", i); - memcpy(&This->transforms[i], &targetStateBlock->transforms[i], sizeof(WINED3DMATRIX)); - } + for (i = 0; i < This->num_contained_transform_states; i++) { + TRACE("Updating transform %d\n", i); + memcpy(&This->transforms[This->contained_transform_states[i]], + &targetStateBlock->transforms[This->contained_transform_states[i]], + sizeof(WINED3DMATRIX)); } if (This->changed.indices && ((This->pIndexData != targetStateBlock->pIndexData) @@ -695,9 +693,9 @@ should really perform a delta so that only the changes get updated*/ /* Others + Render & Texture */ if (/*TODO: 'magic' statetype, replace with BOOL This->blockType == D3DSBT_RECORDED || */ This->blockType == WINED3DSBT_ALL || This->blockType == WINED3DSBT_INIT) { - for (i = 1; i <= HIGHEST_TRANSFORMSTATE; i++) { - if (This->changed.transform[i]) - IWineD3DDevice_SetTransform(pDevice, i, &This->transforms[i]); + for (i = 0; i < This->num_contained_transform_states; i++) { + IWineD3DDevice_SetTransform(pDevice, This->contained_transform_states[i], + &This->transforms[This->contained_transform_states[i]]); } if (This->changed.indices) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 159844e..f31e7dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1369,6 +1369,8 @@ struct IWineD3DStateBlockImpl /* Contained state management */ DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; unsigned int num_contained_render_states; + DWORD contained_transform_states[WINEHIGHEST_RENDER_STATE + 1]; + unsigned int num_contained_transform_states; }; extern void stateblock_savedstates_set(

1 0

Chris Robinson : winex11: Set proper pixel format flags.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 308da6313ec8dcf0352f312fc1192290cf717f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308da6313ec8dcf0352f312fc… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Aug 12 13:57:02 2007 -0700 winex11: Set proper pixel format flags. --- dlls/winex11.drv/opengl.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 521b9e7..ebed630 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1233,11 +1233,21 @@ int X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, ppfd->nVersion = 1; /* These flags are always the same... */ - ppfd->dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL; + ppfd->dwFlags = PFD_SUPPORT_OPENGL; /* Now the flags extracted from the Visual */ wine_tsx11_lock(); + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_X_RENDERABLE, &value); + if(value) + ppfd->dwFlags |= PFD_SUPPORT_GDI; + + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DRAWABLE_TYPE, &value); + if(value & GLX_WINDOW_BIT) + ppfd->dwFlags |= PFD_DRAW_TO_WINDOW; + if(value & GLX_PIXMAP_BIT) + ppfd->dwFlags |= PFD_DRAW_TO_BITMAP; + pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_CONFIG_CAVEAT, &value); if(value == GLX_SLOW_CONFIG) ppfd->dwFlags |= PFD_GENERIC_ACCELERATED;

1 0

Roderick Colenbrander : wgl: Re-enable GLX_ATI_render_texture support.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 04d383381ff090c9dace841f5f15d6429ae34334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d383381ff090c9dace841f5… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Aug 12 17:31:25 2007 +0200 wgl: Re-enable GLX_ATI_render_texture support. --- dlls/winex11.drv/opengl.c | 75 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 62 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ca379d0..521b9e7 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -139,7 +139,7 @@ typedef struct wine_glpbuffer { static Wine_GLContext *context_list; static struct WineGLInfo WineGLInfo = { 0 }; static int use_render_texture_emulation = 1; -static int use_render_texture_ati = 0; +static int use_render_texture_ati = 1; static int swap_interval = 1; #define MAX_EXTENSIONS 16 @@ -241,11 +241,13 @@ MAKE_FUNCPTR(glXGetCurrentReadDrawable) /* GLX Extensions */ static void* (*pglXGetProcAddressARB)(const GLubyte *); -static BOOL (*pglXBindTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer); -static BOOL (*pglXReleaseTexImageARB)(Display *dpy, GLXPbuffer pbuffer, int buffer); -static BOOL (*pglXDrawableAttribARB)(Display *dpy, GLXDrawable draw, const int *attribList); static int (*pglXSwapIntervalSGI)(int); +/* ATI GLX Extensions */ +static BOOL (*pglXBindTexImageATI)(Display *dpy, GLXPbuffer pbuffer, int buffer); +static BOOL (*pglXReleaseTexImageATI)(Display *dpy, GLXPbuffer pbuffer, int buffer); +static BOOL (*pglXDrawableAttribATI)(Display *dpy, GLXDrawable draw, const int *attribList); + /* NV GLX Extension */ static void* (*pglXAllocateMemoryNV)(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); static void (*pglXFreeMemoryNV)(GLvoid *pointer); @@ -502,9 +504,9 @@ LOAD_FUNCPTR(glXFreeMemoryNV) } if(glxRequireExtension("GLX_ATI_render_texture")) { - pglXBindTexImageARB = (void*)pglXGetProcAddressARB((const GLubyte *) "glXBindTexImageARB"); - pglXReleaseTexImageARB = (void*)pglXGetProcAddressARB((const GLubyte *) "glXReleaseTexImageARB"); - pglXDrawableAttribARB = (void*)pglXGetProcAddressARB((const GLubyte *) "glXDrawableAttribARB"); + pglXBindTexImageATI = (void*)pglXGetProcAddressARB((const GLubyte *) "glXBindTexImageATI"); + pglXReleaseTexImageATI = (void*)pglXGetProcAddressARB((const GLubyte *) "glXReleaseTexImageATI"); + pglXDrawableAttribATI = (void*)pglXGetProcAddressARB((const GLubyte *) "glXDrawableAttribATI"); } X11DRV_WineGL_LoadExtensions(); @@ -2490,11 +2492,11 @@ static GLboolean WINAPI X11DRV_wglSetPbufferAttribARB(HPBUFFERARB hPbuffer, cons if (!use_render_texture_ati && 1 == use_render_texture_emulation) { return GL_TRUE; } - if (NULL != pglXDrawableAttribARB) { + if (NULL != pglXDrawableAttribATI) { if (use_render_texture_ati) { FIXME("Need conversion for GLX_ATI_render_texture\n"); } - return pglXDrawableAttribARB(object->display, object->drawable, piAttribList); + return pglXDrawableAttribATI(object->display, object->drawable, piAttribList); } return GL_FALSE; } @@ -2893,8 +2895,35 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf return GL_TRUE; } - if (NULL != pglXBindTexImageARB) { - return pglXBindTexImageARB(object->display, object->drawable, iBuffer); + if (NULL != pglXBindTexImageATI) { + int buffer; + + switch(iBuffer) + { + case WGL_FRONT_LEFT_ARB: + buffer = GLX_FRONT_LEFT_ATI; + break; + case WGL_FRONT_RIGHT_ARB: + buffer = GLX_FRONT_RIGHT_ATI; + break; + case WGL_BACK_LEFT_ARB: + buffer = GLX_BACK_LEFT_ATI; + break; + case WGL_BACK_RIGHT_ARB: + buffer = GLX_BACK_RIGHT_ATI; + break; + default: + ERR("Unknown iBuffer=%#x\n", iBuffer); + return FALSE; + } + + /* In the sample 'ogl_offscreen_rendering_3' from codesampler.net I get garbage on the screen. + * I'm not sure if that's a bug in the ATI extension or in the program. I think that the program + * expected a single buffering format since it didn't ask for double buffering. A buffer swap + * fixed the program. I don't know what the correct behavior is. On the other hand that demo + * works fine using our pbuffer emulation path. + */ + return pglXBindTexImageATI(object->display, object->drawable, buffer); } return GL_FALSE; } @@ -2919,8 +2948,28 @@ static GLboolean WINAPI X11DRV_wglReleaseTexImageARB(HPBUFFERARB hPbuffer, int i if (!use_render_texture_ati && 1 == use_render_texture_emulation) { return GL_TRUE; } - if (NULL != pglXReleaseTexImageARB) { - return pglXReleaseTexImageARB(object->display, object->drawable, iBuffer); + if (NULL != pglXReleaseTexImageATI) { + int buffer; + + switch(iBuffer) + { + case WGL_FRONT_LEFT_ARB: + buffer = GLX_FRONT_LEFT_ATI; + break; + case WGL_FRONT_RIGHT_ARB: + buffer = GLX_FRONT_RIGHT_ATI; + break; + case WGL_BACK_LEFT_ARB: + buffer = GLX_BACK_LEFT_ATI; + break; + case WGL_BACK_RIGHT_ARB: + buffer = GLX_BACK_RIGHT_ATI; + break; + default: + ERR("Unknown iBuffer=%#x\n", iBuffer); + return FALSE; + } + return pglXReleaseTexImageATI(object->display, object->drawable, buffer); } return GL_FALSE; }

1 0

Jason Edmeades : setupapi: Remove duplicate backslashes on dirids.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 7f901f41f05556307b8ed445591d68e264c61375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f901f41f05556307b8ed4455… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Aug 10 22:28:35 2007 +0100 setupapi: Remove duplicate backslashes on dirids. --- dlls/advpack/tests/advpack.c | 10 ++++------ dlls/setupapi/parser.c | 6 ++++-- dlls/setupapi/tests/parser.c | 12 ++++++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 577f274..4c49e3f 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -419,12 +419,10 @@ static void translateinfstringex_test(void) hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result1", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine { /* Wine returns C:\\Program Files, not C:\Program Files */ - ok(!lstrcmpi(buffer, PROG_FILES_ROOT), - "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); - ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", - lstrlenA(PROG_FILES_ROOT)+1, size); - } + ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); + ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + lstrlenA(PROG_FILES_ROOT)+1, size); memset(buffer, 'a', PROG_FILES_LEN); buffer[PROG_FILES_LEN - 1] = '\0'; diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index ea410f8..d5b7643 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -316,7 +316,8 @@ static const WCHAR *get_dirid_subst( struct inf_file *file, int dirid, unsigned /* retrieve the string substitution for a given string, or NULL if not found */ /* if found, len is set to the substitution length */ -static const WCHAR *get_string_subst( struct inf_file *file, const WCHAR *str, unsigned int *len ) +static const WCHAR *get_string_subst( struct inf_file *file, const WCHAR *str, unsigned int *len, + BOOL no_trailing_slash ) { static const WCHAR percent = '%'; @@ -353,6 +354,7 @@ static const WCHAR *get_string_subst( struct inf_file *file, const WCHAR *str, u dirid_str[*len] = 0; dirid = strtolW( dirid_str, &end, 10 ); if (!*end) ret = get_dirid_subst( file, dirid, len ); + if (no_trailing_slash && ret && *len && ret[*len - 1] == '\\') *len -= 1; HeapFree( GetProcessHeap(), 0, dirid_str ); return ret; } @@ -387,7 +389,7 @@ unsigned int PARSER_string_substW( struct inf_file *file, const WCHAR *text, WCH else /* end of the %xx% string, find substitution */ { len = p - start - 1; - subst = get_string_subst( file, start + 1, &len ); + subst = get_string_subst( file, start + 1, &len, p[1] == '\\' ); if (!subst) { subst = start; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 858c889..f11abb8 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -60,6 +60,7 @@ static const char tmpfilename[] = ".\\tmp.inf"; #define STR_SECTION "[Strings]\nfoo=aaa\nbar=bbb\nloop=%loop2%\nloop2=%loop%\n" \ "per%%cent=abcd\nper=1\ncent=2\n22=foo\n" \ "big=" A400 "\n" \ + "mydrive=\"C:\\\"\n" \ "verybig=" A400 A400 A400 "\n" /* create a new file with specified contents and open it */ @@ -284,6 +285,7 @@ static const struct { "ab=cd\",\"ef", "ab", { "cd,ef" } }, { "ab=cd\",ef", "ab", { "cd,ef" } }, { "ab=cd\",ef\\\nab", "ab", { "cd,ef\\" } }, + /* single quotes (unhandled)*/ { "HKLM,A,B,'C',D", NULL, { "HKLM", "A","B","'C'","D" } }, /* spaces */ @@ -317,6 +319,16 @@ static const struct { "a=%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 } }, { "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A400 A400 A400 A400 A400 A400 A400 A400 A400 } }, { "a=%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%%big%\n" STR_SECTION, "a", { A4097 /*MAX_INF_STRING_LENGTH+1*/ } }, + + /* Prove expansion of system entries removes extra \'s and string + replacements doesnt */ + { "ab=\"%24%\"\n" STR_SECTION, "ab", { "C:\\" } }, + { "ab=\"%mydrive%\"\n" STR_SECTION, "ab", { "C:\\" } }, + { "ab=\"%24%\\fred\"\n" STR_SECTION, "ab", { "C:\\fred" } }, + { "ab=\"%mydrive%\\fred\"\n" STR_SECTION,"ab", { "C:\\\\fred" } }, + /* Confirm duplicate \'s kept */ + { "ab=\"%24%\\\\fred\"", "ab", { "C:\\\\fred" } }, + { "ab=C:\\\\FRED", "ab", { "C:\\\\FRED" } }, }; /* check the key of a certain line */

1 0

Roderick Colenbrander : wined3d: Proper CheckDeviceType / CheckDepthStencilMatch support.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: d391c11d434fb799aceedf07b1ce5058bfacc8c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d391c11d434fb799aceedf07b… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Aug 11 16:25:58 2007 +0200 wined3d: Proper CheckDeviceType / CheckDepthStencilMatch support. --- dlls/wined3d/directx.c | 232 +++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 8 ++ 2 files changed, 104 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d391c11d434fb799aceed…

1 0

Roderick Colenbrander : wined3d: Check the results of SetPixelFormat.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 1dc0298a55b6050f19cf2df298268dcda4b85081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc0298a55b6050f19cf2df29… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Aug 11 17:04:26 2007 +0200 wined3d: Check the results of SetPixelFormat. --- dlls/wined3d/context.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9edbd73..0727aee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -208,6 +208,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar short red, green, blue, alpha; short colorBits; short depthBits, stencilBits; + int res; hdc = GetDC(win_handle); if(hdc == NULL) { @@ -249,7 +250,20 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } DescribePixelFormat(hdc, iPixelFormat, sizeof(pfd), &pfd); - SetPixelFormat(hdc, iPixelFormat, NULL); + res = SetPixelFormat(hdc, iPixelFormat, NULL); + if(!res) { + int oldPixelFormat = GetPixelFormat(hdc); + + if(oldPixelFormat) { + /* OpenGL doesn't allow pixel format adjustments. Print an error and continue using the old format. + * There's a big chance that the old format works although with a performance hit and perhaps rendering errors. */ + ERR("HDC=%p is already set to iPixelFormat=%d and OpenGL doesn't allow changes!\n", hdc, oldPixelFormat); + } + else { + ERR("SetPixelFormat failed on HDC=%p for iPixelFormat=%d\n", hdc, iPixelFormat); + return FALSE; + } + } } ctx = wglCreateContext(hdc);

1 0

Roderick Colenbrander : wined3d: Use the proper depth stencil format.
by Alexandre Julliard 13 Aug '07

13 Aug '07

Module: wine Branch: master Commit: 5754726aeb6397d6861ecc04c954f47574fcf72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5754726aeb6397d6861ecc04c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Aug 11 12:17:56 2007 +0200 wined3d: Use the proper depth stencil format. --- dlls/wined3d/context.c | 22 ++++++++++++++-------- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index eef4bd9..9edbd73 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -119,9 +119,10 @@ static WineD3DContext *AddContextToArray(IWineD3DDeviceImpl *This, HWND win_hand * target: Surface this context will render to * win_handle: handle to the window which we are drawing to * create_pbuffer: tells whether to create a pbuffer or not + * pPresentParameters: contains the pixelformats to use for onscreen rendering * *****************************************************************************/ -WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win_handle, BOOL create_pbuffer) { +WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win_handle, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms) { HDC oldDrawable, hdc; HPBUFFERARB pbuffer = NULL; HGLRC ctx = NULL, oldCtx; @@ -222,18 +223,23 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ pfd.iPixelType = PFD_TYPE_RGBA; pfd.cColorBits = 32; - pfd.cDepthBits = 24; - pfd.cStencilBits = 8; + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; pfd.iLayerType = PFD_MAIN_PLANE; /* Try to match the colorBits of the d3d format */ if(getColorBits(target->resource.format, &red, &green, &blue, &alpha, &colorBits)) pfd.cColorBits = colorBits; - /* TODO: get the depth/stencil format from auto depth stencil format */ - if(getDepthStencilBits(WINED3DFMT_D24S8, &depthBits, &stencilBits)) { - pfd.cDepthBits = depthBits; - pfd.cStencilBits = stencilBits; + /* Retrieve the depth stencil format from the present parameters. + * The choice of the proper format can give a nice performance boost + * in case of GPU limited programs. */ + if(pPresentParms->EnableAutoDepthStencil) { + TRACE("pPresentParms->EnableAutoDepthStencil=enabled; using AutoDepthStencilFormat=%s\n", debug_d3dformat(pPresentParms->AutoDepthStencilFormat)); + if(getDepthStencilBits(pPresentParms->AutoDepthStencilFormat, &depthBits, &stencilBits)) { + pfd.cDepthBits = depthBits; + pfd.cStencilBits = stencilBits; + } } iPixelFormat = ChoosePixelFormat(hdc, &pfd); @@ -696,7 +702,7 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf */ This->pbufferContext = CreateContext(This, targetimpl, ((IWineD3DSwapChainImpl *) This->swapchains[0])->context[0]->win_handle, - TRUE /* pbuffer */); + TRUE /* pbuffer */, &((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms); This->pbufferWidth = targetimpl->currentDesc.Width; This->pbufferHeight = targetimpl->currentDesc.Height; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 59bc35f..b0c0b20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1302,7 +1302,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic object->num_contexts = 1; ENTER_GL(); - object->context[0] = CreateContext(This, (IWineD3DSurfaceImpl *) object->frontBuffer, object->win_handle, FALSE /* pbuffer */); + object->context[0] = CreateContext(This, (IWineD3DSurfaceImpl *) object->frontBuffer, object->win_handle, FALSE /* pbuffer */, pPresentationParameters); LEAVE_GL(); if (!object->context[0]) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7741b37..5d1edbe 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -205,7 +205,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSurface_UnlockRect(This->backBuffer[0]); DestroyContext(This->wineD3DDevice, This->context[0]); - This->context[0] = CreateContext(This->wineD3DDevice, (IWineD3DSurfaceImpl *) This->frontBuffer, This->win_handle, FALSE /* pbuffer */); + This->context[0] = CreateContext(This->wineD3DDevice, (IWineD3DSurfaceImpl *) This->frontBuffer, This->win_handle, FALSE /* pbuffer */, &This->presentParms); IWineD3DSurface_LockRect(This->backBuffer[0], &r, NULL, WINED3DLOCK_DISCARD); memcpy(r.pBits, mem, r.Pitch * ((IWineD3DSurfaceImpl *) This->backBuffer[0])->currentDesc.Height); @@ -537,7 +537,7 @@ WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain * TRACE("Creating a new context for swapchain %p, thread %d\n", This, GetCurrentThreadId()); ctx = CreateContext(This->wineD3DDevice, (IWineD3DSurfaceImpl *) This->frontBuffer, - This->context[0]->win_handle, FALSE /* pbuffer */); + This->context[0]->win_handle, FALSE /* pbuffer */, &This->presentParms); if(!ctx) { ERR("Failed to create a new context for the swapchain\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b2fe145..c996b23 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -535,7 +535,7 @@ typedef enum ContextUsage { } ContextUsage; void ActivateContext(IWineD3DDeviceImpl *device, IWineD3DSurface *target, ContextUsage usage); -WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win, BOOL create_pbuffer); +WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms); void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context); void apply_fbo_state(IWineD3DDevice *iface);

1 0