December 2007 - Wine-Commits

Lionel Debroux : winedevice: Fix memory leak (found by Smatch).
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 6ac689368a7d10d89547d9554648a6d229c99ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac689368a7d10d89547d9554… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Fri Dec 14 14:57:17 2007 +0100 winedevice: Fix memory leak (found by Smatch). --- programs/winedevice/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 9af85f4..f40d5d8 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -118,6 +118,7 @@ static BOOL load_driver(void) if (RegOpenKeyW( HKEY_LOCAL_MACHINE, str + 18 /* skip \registry\machine */, &driver_hkey )) { WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(str), GetLastError() ); + HeapFree( GetProcessHeap(), 0, str); return FALSE; } RtlInitUnicodeString( &keypath, str );

1 0

Stefan Dösinger : d3d9: Do not set NONE MIN and MAG filters.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: b9860a9b2748330257be08b47511ab7c77c86540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9860a9b2748330257be08b47… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 8 16:46:05 2007 +0100 d3d9: Do not set NONE MIN and MAG filters. --- dlls/d3d9/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6180325..5d9ec8a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1014,9 +1014,9 @@ static void offscreen_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, D3DTEXF_NONE); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_MINFILTER failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_NONE); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_MAGFILTER failed (0x%08x)\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); @@ -5235,9 +5235,9 @@ static void alpha_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); ok(hr == D3D_OK, "SetTextureStageState failed, hr = %s\n", DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, D3DTEXF_NONE); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_MINFILTER failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_NONE); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "SetSamplerState D3DSAMP_MAGFILTER failed (0x%08x)\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr));

1 0

Stefan Dösinger : d3d9: The refrast returns an error on invalid clear rects.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: b060390c7305d0ebfeb566d2aef32bae9d330d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b060390c7305d0ebfeb566d2a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 8 16:13:54 2007 +0100 d3d9: The refrast returns an error on invalid clear rects. --- dlls/d3d9/tests/visual.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 23053ed..699676a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -279,6 +279,7 @@ static void clear_test(IDirect3DDevice9 *device) D3DVIEWPORT9 old_vp, vp; RECT scissor; DWORD oldColorWrite; + BOOL invalid_clear_failed = FALSE; hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); @@ -294,11 +295,12 @@ static void clear_test(IDirect3DDevice9 *device) rect[1].y1 = 0; rect[1].x2 = 320; rect[1].y2 = 240; - /* Clear 2 rectangles with one call. Shows that a positive value is returned, but the negative rectangle - * is ignored, the positive is still cleared afterwards + /* Clear 2 rectangles with one call. The refrast returns an error in this case, every real driver tested so far + * returns D3D_OK, but ignores the rectangle silently */ hr = IDirect3DDevice9_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + if(hr == D3DERR_INVALIDCALL) invalid_clear_failed = TRUE; /* negative x, negative y */ rect_negneg.x1 = 640; @@ -306,14 +308,21 @@ static void clear_test(IDirect3DDevice9 *device) rect_negneg.x2 = 320; rect_negneg.y2 = 0; hr = IDirect3DDevice9_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_Clear failed with %s\n", DXGetErrorString9(hr)); + if(hr == D3DERR_INVALIDCALL) invalid_clear_failed = TRUE; IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); color = getPixelColor(device, 160, 360); /* lower left quad */ ok(color == 0x00ffffff, "Clear rectangle 3(pos, neg) has color %08x\n", color); color = getPixelColor(device, 160, 120); /* upper left quad */ - ok(color == 0x00ff0000, "Clear rectangle 1(pos, pos) has color %08x\n", color); + if(invalid_clear_failed) { + /* If the negative rectangle was refused, the other rectangles in the list shouldn't be cleared either */ + ok(color == 0x00ffffff, "Clear rectangle 1(pos, pos) has color %08x\n", color); + } else { + /* If the negative rectangle was dropped silently, the correct ones are cleared */ + ok(color == 0x00ff0000, "Clear rectangle 1(pos, pos) has color %08x\n", color); + } color = getPixelColor(device, 480, 360); /* lower right quad */ ok(color == 0x00ffffff, "Clear rectangle 4(NULL) has color %08x\n", color); color = getPixelColor(device, 480, 120); /* upper right quad */

1 0

Stefan Dösinger : d3d9: D3DLOCK_DISCARD is not valid on managed textures.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 297b88486ed6915ee2ead5cb991b829d5653aadc URL: http://source.winehq.org/git/wine.git/?a=commit;h=297b88486ed6915ee2ead5cb9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Dec 8 16:32:07 2007 +0100 d3d9: D3DLOCK_DISCARD is not valid on managed textures. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 699676a..6180325 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1733,7 +1733,7 @@ static void fill_surface(IDirect3DSurface9 *surface, DWORD color) memset(&l, 0, sizeof(l)); hr = IDirect3DSurface9_GetDesc(surface, &desc); ok(hr == D3D_OK, "IDirect3DSurface9_GetDesc failed with %s\n", DXGetErrorString9(hr)); - hr = IDirect3DSurface9_LockRect(surface, &l, NULL, D3DLOCK_DISCARD); + hr = IDirect3DSurface9_LockRect(surface, &l, NULL, 0); ok(hr == D3D_OK, "IDirect3DSurface9_LockRect failed with %s\n", DXGetErrorString9(hr)); if(FAILED(hr)) return;

1 0

Stefan Dösinger : winex11: Activate the depth-bpp difference.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 5461d505d727411f8de3f7846c5d1e8ed6343247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5461d505d727411f8de3f7846… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 14 00:39:34 2007 +0100 winex11: Activate the depth-bpp difference. --- dlls/gdi32/tests/bitmap.c | 6 +----- dlls/user32/tests/sysparams.c | 13 +++---------- dlls/winex11.drv/bitmap.c | 2 -- dlls/winex11.drv/desktop.c | 2 -- dlls/winex11.drv/settings.c | 11 +++++++---- dlls/winex11.drv/x11drv_main.c | 32 +++++++++++++++++++++++++++++++- dlls/winex11.drv/xrandr.c | 1 - dlls/winex11.drv/xvidmode.c | 2 -- 8 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 0964f0d..eb6c09d 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1638,11 +1638,7 @@ static void test_select_object(void) ok(hbm_old != 0, "SelectObject failed, BITSPIXEL: %d, created depth: %d\n", bpp, depths[i]); SelectObject(hdc, hbm_old); } else { - if(bpp == 24 && depths[i] == 32) { - todo_wine ok(hbm_old == 0, "SelectObject should fail. BITSPIXELS: %d, created depth: %d\n", bpp, depths[i]); - } else { - ok(hbm_old == 0, "SelectObject should fail. BITSPIXELS: %d, created depth: %d\n", bpp, depths[i]); - } + ok(hbm_old == 0, "SelectObject should fail. BITSPIXELS: %d, created depth: %d\n", bpp, depths[i]); } memset(&bm, 0xAA, sizeof(bm)); diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 9e4e6b2..b554430 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2223,9 +2223,7 @@ static void test_WM_DISPLAYCHANGE(void) continue; } - if((start_bpp != test_bpps[i] || - (test_bpps[i] == 32 && last_bpp == 24)) && - !(test_bpps[i] == 24 && start_bpp == 32)) { + if(start_bpp != test_bpps[i]) { todo_wine ok(last_bpp == test_bpps[i], "Set bpp %d, but WM_DISPLAYCHANGE reported bpp %d\n", test_bpps[i], last_bpp); } else { ok(last_bpp == test_bpps[i], "Set bpp %d, but WM_DISPLAYCHANGE reported bpp %d\n", test_bpps[i], last_bpp); @@ -2533,13 +2531,8 @@ static void test_EnumDisplaySettings(void) hdc = GetDC(0); val = GetDeviceCaps(hdc, BITSPIXEL); - if(devmode.dmBitsPerPel == 32 && val == 24) { - todo_wine ok(devmode.dmBitsPerPel == val, "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", - val, devmode.dmBitsPerPel); - } else { - ok(devmode.dmBitsPerPel == val, "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", - val, devmode.dmBitsPerPel); - } + ok(devmode.dmBitsPerPel == val, "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", + val, devmode.dmBitsPerPel); val = GetDeviceCaps(hdc, NUMCOLORS); if(devmode.dmBitsPerPel <= 8) { diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index b52b05d..fffcab1 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -124,8 +124,6 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit /* check if bpp is compatible with screen depth */ if (!((bitmap.bmBitsPixel == 1) || (bitmap.bmBitsPixel == screen_bpp) || - (bitmap.bmBitsPixel == 24 && screen_bpp == 32) || /* FIXME: Not compatible */ - (bitmap.bmBitsPixel == 32 && screen_bpp == 24) || /* FIXME: Not compatible */ (bitmap.bmBitsPixel == 16 && screen_bpp == 15))) /* TODO: Confirm this */ { ERR("Trying to make bitmap with planes=%d, bpp=%d\n", diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 188cb1e..1e189c8 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -104,7 +104,6 @@ static int X11DRV_desktop_GetCurrentMode(void) { unsigned int i; DWORD dwBpp = screen_bpp; - if (dwBpp == 24) dwBpp = 32; for (i=0; i<dd_mode_count; i++) { if ( (screen_width == dd_modes[i].dwWidth) && @@ -119,7 +118,6 @@ static int X11DRV_desktop_GetCurrentMode(void) static LONG X11DRV_desktop_SetCurrentMode(int mode) { DWORD dwBpp = screen_bpp; - if (dwBpp == 24) dwBpp = 32; if (dwBpp != dd_modes[mode].dwBPP) { FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].dwBPP); diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 2db0c7f..ada827e 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -44,7 +44,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11settings); static LPDDHALMODEINFO dd_modes = NULL; static unsigned int dd_mode_count = 0; static unsigned int dd_max_modes = 0; -static const unsigned int depths[] = {8, 16, 32}; +/* All Windows drivers seen so far either support 32 bit depths, or 24 bit depths, but never both. So if we have + * a 32 bit framebuffer, report 32 bit bpps, otherwise 24 bit ones. + */ +static const unsigned int depths_24[] = {8, 16, 24}; +static const unsigned int depths_32[] = {8, 16, 32}; /* pointers to functions that actually do the hard stuff */ static int (*pGetCurrentMode)(void); @@ -92,7 +96,6 @@ void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigne ERR("Maximum modes (%d) exceeded\n", dd_max_modes); return; } - if (dwBpp == 24) dwBpp = 32; if (bpp == 0) bpp = dwBpp; info->dwWidth = width; info->dwHeight = height; @@ -115,7 +118,7 @@ void X11DRV_Settings_AddDepthModes(void) int i, j; int existing_modes = dd_mode_count; DWORD dwBpp = screen_bpp; - if (dwBpp == 24) dwBpp = 32; + const DWORD *depths = screen_bpp == 32 ? depths_32 : depths_24; for (j=0; j<3; j++) { @@ -360,7 +363,7 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, devmode->dmPelsWidth,devmode->dmPelsHeight, devmode->dmBitsPerPel,devmode->dmDisplayFrequency, handler_name); - dwBpp = (devmode->dmBitsPerPel == 24) ? 32 : devmode->dmBitsPerPel; + dwBpp = devmode->dmBitsPerPel; if (devmode->dmFields & DM_BITSPERPEL) def_mode &= !dwBpp; if (devmode->dmFields & DM_PELSWIDTH) def_mode &= !devmode->dmPelsWidth; if (devmode->dmFields & DM_PELSHEIGHT) def_mode &= !devmode->dmPelsHeight; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 5912a4a..11cd33a 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -492,7 +492,37 @@ static BOOL process_attach(void) XFree(desktop_vi); } - screen_bpp = screen_depth; /* TODO */ + switch(screen_depth) { + case 8: + screen_bpp = 8; + break; + + case 15: + /* Out tests suggest that windows does not support 15 bpp color depth. + * X11 does, what should we do with these situations? + */ + FIXME("The X server is running at 15 bpp color depth\n"); + screen_bpp = 15; + break; + + case 16: + screen_bpp = 16; + break; + + case 24: + /* This is not necessarily right. X11 always has 24 bits per pixel, but it can run + * with 24 bit framebuffers and 32 bit framebuffers. It doesn't make any difference + * for windowing, but gl applications can get visuals with alpha channels. So we + * should check the framebuffer and/or opengl formats available to find out what the + * framebuffer actually does + */ + screen_bpp = 32; + break; + + default: + FIXME("Unexpected X11 depth %d bpp, what to report to app?\n", screen_depth); + screen_bpp = screen_depth; + } XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms ); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index f2a5229..ad2dc08 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -179,7 +179,6 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode) unsigned int i; int j; DWORD dwBpp = screen_bpp; - if (dwBpp == 24) dwBpp = 32; wine_tsx11_lock(); root = RootWindow (gdi_display, DefaultScreen(gdi_display)); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 6b67594..49c48b3 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -95,7 +95,6 @@ static int X11DRV_XF86VM_GetCurrentMode(void) unsigned int i; DDHALMODEINFO cmode; DWORD dwBpp = screen_bpp; - if (dwBpp == 24) dwBpp = 32; TRACE("Querying XVidMode current mode\n"); wine_tsx11_lock(); @@ -114,7 +113,6 @@ static int X11DRV_XF86VM_GetCurrentMode(void) static LONG X11DRV_XF86VM_SetCurrentMode(int mode) { DWORD dwBpp = screen_bpp; - if (dwBpp == 24) dwBpp = 32; /* only set modes from the original color depth */ if (dwBpp != dd_modes[mode].dwBPP) {

1 0

Stefan Dösinger : winex11: Distinguish between bpp and depth.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: ccab10bd46d129e469b36a155b934084b1e8dc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccab10bd46d129e469b36a155… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 16 14:00:45 2007 +0100 winex11: Distinguish between bpp and depth. --- dlls/winex11.drv/bitmap.c | 8 ++++---- dlls/winex11.drv/desktop.c | 4 ++-- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/settings.c | 5 +++-- dlls/winex11.drv/winpos.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 3 +++ dlls/winex11.drv/xrandr.c | 4 ++-- dlls/winex11.drv/xvidmode.c | 4 ++-- 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 98514d3..b52b05d 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -123,10 +123,10 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit /* check if bpp is compatible with screen depth */ if (!((bitmap.bmBitsPixel == 1) || - (bitmap.bmBitsPixel == screen_depth) || - (bitmap.bmBitsPixel == 24 && screen_depth == 32) || /* FIXME: Not compatible */ - (bitmap.bmBitsPixel == 32 && screen_depth == 24) || /* FIXME: Not compatible */ - (bitmap.bmBitsPixel == 16 && screen_depth == 15))) /* TODO: Confirm this */ + (bitmap.bmBitsPixel == screen_bpp) || + (bitmap.bmBitsPixel == 24 && screen_bpp == 32) || /* FIXME: Not compatible */ + (bitmap.bmBitsPixel == 32 && screen_bpp == 24) || /* FIXME: Not compatible */ + (bitmap.bmBitsPixel == 16 && screen_bpp == 15))) /* TODO: Confirm this */ { ERR("Trying to make bitmap with planes=%d, bpp=%d\n", bitmap.bmPlanes, bitmap.bmBitsPixel); diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 92686fb..188cb1e 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -103,7 +103,7 @@ static int X11DRV_resize_desktop( unsigned int width, unsigned int height ) static int X11DRV_desktop_GetCurrentMode(void) { unsigned int i; - DWORD dwBpp = screen_depth; + DWORD dwBpp = screen_bpp; if (dwBpp == 24) dwBpp = 32; for (i=0; i<dd_mode_count; i++) { @@ -118,7 +118,7 @@ static int X11DRV_desktop_GetCurrentMode(void) static LONG X11DRV_desktop_SetCurrentMode(int mode) { - DWORD dwBpp = screen_depth; + DWORD dwBpp = screen_bpp; if (dwBpp == 24) dwBpp = 32; if (dwBpp != dd_modes[mode].dwBPP) { diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8492385..bcf60e5 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -202,7 +202,7 @@ INT X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap ) case DESKTOPVERTRES: return virtual_screen_rect.bottom - virtual_screen_rect.top; case BITSPIXEL: - return screen_depth; + return screen_bpp; case PLANES: return 1; case NUMBRUSHES: diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index ac6f4ad..2db0c7f 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -86,7 +86,7 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name, void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) { LPDDHALMODEINFO info = &(dd_modes[dd_mode_count]); - DWORD dwBpp = screen_depth; + DWORD dwBpp = screen_bpp; if (dd_mode_count >= dd_max_modes) { ERR("Maximum modes (%d) exceeded\n", dd_max_modes); @@ -114,8 +114,9 @@ void X11DRV_Settings_AddDepthModes(void) { int i, j; int existing_modes = dd_mode_count; - DWORD dwBpp = screen_depth; + DWORD dwBpp = screen_bpp; if (dwBpp == 24) dwBpp = 32; + for (j=0; j<3; j++) { if (depths[j] != dwBpp) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index c01f702..a521bf7 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -895,7 +895,7 @@ void X11DRV_handle_desktop_resize( unsigned int width, unsigned int height ) SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE, NULL ); data->lock_changes--; ClipCursor(NULL); - SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_depth, + SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ec03e71..3328981 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -531,6 +531,7 @@ extern Visual *visual; extern Window root_window; extern unsigned int screen_width; extern unsigned int screen_height; +extern unsigned int screen_bpp; extern unsigned int screen_depth; extern RECT virtual_screen_rect; extern unsigned int text_caps; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index d26fa8b..5912a4a 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -70,6 +70,7 @@ Screen *screen; Visual *visual; unsigned int screen_width; unsigned int screen_height; +unsigned int screen_bpp; unsigned int screen_depth; RECT virtual_screen_rect; Window root_window; @@ -491,6 +492,8 @@ static BOOL process_attach(void) XFree(desktop_vi); } + screen_bpp = screen_depth; /* TODO */ + XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms ); if (TRACE_ON(synchronous)) XSynchronize( display, True ); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e6ae615..f2a5229 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -178,9 +178,9 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode) short rate; unsigned int i; int j; - DWORD dwBpp = screen_depth; + DWORD dwBpp = screen_bpp; if (dwBpp == 24) dwBpp = 32; - + wine_tsx11_lock(); root = RootWindow (gdi_display, DefaultScreen(gdi_display)); sc = pXRRGetScreenInfo (gdi_display, root); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index be05ac4..6b67594 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -94,7 +94,7 @@ static int X11DRV_XF86VM_GetCurrentMode(void) int dotclock; unsigned int i; DDHALMODEINFO cmode; - DWORD dwBpp = screen_depth; + DWORD dwBpp = screen_bpp; if (dwBpp == 24) dwBpp = 32; TRACE("Querying XVidMode current mode\n"); @@ -113,7 +113,7 @@ static int X11DRV_XF86VM_GetCurrentMode(void) static LONG X11DRV_XF86VM_SetCurrentMode(int mode) { - DWORD dwBpp = screen_depth; + DWORD dwBpp = screen_bpp; if (dwBpp == 24) dwBpp = 32; /* only set modes from the original color depth */ if (dwBpp != dd_modes[mode].dwBPP)

1 0

Rob Shearman : hlink: Fix some memory leaks in the tests.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 126e5d2cb1cb105b7aa1f104db0a679e4c20ed08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126e5d2cb1cb105b7aa1f104d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 14 19:55:10 2007 +0000 hlink: Fix some memory leaks in the tests. --- dlls/hlink/tests/hlink.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 06d1ee8..a2d7360 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -101,6 +101,7 @@ static void test_reference(void) r = IHlink_GetStringReference(lnk, -1, &str, NULL); ok(r == S_OK, "failed\n"); + CoTaskMemFree(str); r = IHlink_GetStringReference(lnk, HLINKGETREF_DEFAULT, &str, NULL); ok(r == S_OK, "failed\n"); @@ -115,6 +116,8 @@ static void test_reference(void) r = IHlink_GetStringReference(lnk, HLINKGETREF_DEFAULT, NULL, &str); ok(r == S_OK, "failed\n"); ok(str == NULL, "string should be null\n"); + + IHlink_Release(lnk); } /* url only */

1 0

Rob Shearman : rpcrt4: Move association code into a separate file.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 737510eeb6019596f6a838f5a86a346183893f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=737510eeb6019596f6a838f5a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 16 12:11:49 2007 +0000 rpcrt4: Move association code into a separate file. --- dlls/rpcrt4/Makefile.in | 1 + dlls/rpcrt4/rpc_assoc.c | 392 +++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpc_assoc.h | 46 +++++ dlls/rpcrt4/rpc_binding.c | 2 +- dlls/rpcrt4/rpc_binding.h | 26 +--- dlls/rpcrt4/rpc_server.c | 1 + dlls/rpcrt4/rpc_transport.c | 357 --------------------------------------- 7 files changed, 442 insertions(+), 383 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=737510eeb6019596f6a83…

1 0

Rob Shearman : rpcrt4: Make a server association when a bind packet is received in the server.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 22f530c8350a40289957c6fc31b93a95d4cecdec URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f530c8350a40289957c6fc3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 16 12:07:30 2007 +0000 rpcrt4: Make a server association when a bind packet is received in the server. Support handing out association group IDs. --- dlls/rpcrt4/rpc_binding.h | 15 ++++-- dlls/rpcrt4/rpc_message.c | 2 + dlls/rpcrt4/rpc_message.h | 2 +- dlls/rpcrt4/rpc_server.c | 24 ++++++---- dlls/rpcrt4/rpc_transport.c | 107 +++++++++++++++++++++++++++++++++++------- 5 files changed, 117 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22f530c8350a40289957c…

1 0

Rob Shearman : rpcrt4: Return an error from rpcrt4_conn_tcp_read if recv returns 0.
by Alexandre Julliard Dec. 17, 2007

Dec. 17, 2007

Module: wine Branch: master Commit: 2bda19c6b00b60074e194437b9fa03b21d6e51da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bda19c6b00b60074e194437b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 16 12:07:01 2007 +0000 rpcrt4: Return an error from rpcrt4_conn_tcp_read if recv returns 0. --- dlls/rpcrt4/rpc_transport.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index e4d12c3..1a78a9d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -967,10 +967,15 @@ static int rpcrt4_conn_tcp_read(RpcConnection *Connection, do { int r = recv(tcpc->sock, (char *)buffer + bytes_read, count - bytes_read, 0); - if (r >= 0) + if (!r) + return -1; + else if (r > 0) bytes_read += r; else if (errno != EAGAIN) + { + WARN("recv() failed: %s\n", strerror(errno)); return -1; + } else { struct pollfd pfds[2];

1 0