December 2007 - Wine-Commits

Sam Dennis : advapi32: Fix undocumented behaviour in ReqQueryValueEx when ' count' and 'type' point to the same address.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: 1590b1f73198f34a5f49a177e66c315aa0aa00a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1590b1f73198f34a5f49a177e… Author: Sam Dennis <samuel.howard.dennis(a)gmail.com> Date: Fri Dec 14 05:48:28 2007 +0000 advapi32: Fix undocumented behaviour in ReqQueryValueEx when 'count' and 'type' point to the same address. --- dlls/advapi32/registry.c | 9 +++++---- dlls/advapi32/tests/registry.c | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4b9f29d..d7f6dc4 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1217,7 +1217,7 @@ LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWO { NTSTATUS status; ANSI_STRING nameA; - DWORD total_size; + DWORD total_size, datalen = 0; char buffer[256], *buf_ptr = buffer; KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); @@ -1228,6 +1228,7 @@ LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWO if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + if (count) datalen = *count; if (!data && count) *count = 0; /* this matches Win9x behaviour - NT sets *type to a random value */ @@ -1270,21 +1271,21 @@ LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWO total_size - info_size ); if (data && len) { - if (len > *count) status = STATUS_BUFFER_OVERFLOW; + if (len > datalen) status = STATUS_BUFFER_OVERFLOW; else { RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(buf_ptr + info_size), total_size - info_size ); /* if the type is REG_SZ and data is not 0-terminated * and there is enough space in the buffer NT appends a \0 */ - if (len < *count && data[len-1]) data[len] = 0; + if (len < datalen && data[len-1]) data[len] = 0; } } total_size = len + info_size; } else if (data) { - if (total_size - info_size > *count) status = STATUS_BUFFER_OVERFLOW; + if (total_size - info_size > datalen) status = STATUS_BUFFER_OVERFLOW; else memcpy( data, buf_ptr + info_size, total_size - info_size ); } } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1c50d2a..23af17c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -580,6 +580,10 @@ static void test_query_value_ex(void) ret = RegQueryValueExA(HKEY_CLASSES_ROOT, "Nonexistent Value", NULL, &type, buffer, &size); ok(ret == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", ret); ok(size == sizeof(buffer), "size shouldn't have been changed to %d\n", size); + + size = 4; + ret = RegQueryValueExA(hkey_main, "BIN32", NULL, &size, buffer, &size); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); } static void test_get_value(void)

1 0

Alexandre Julliard : gdi32/tests: Fix a compiler warning.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: 976939745d8c24efc9331687c6bca13a3de32cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=976939745d8c24efc9331687c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 14:31:06 2007 +0100 gdi32/tests: Fix a compiler warning. --- dlls/gdi32/tests/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 394d694..0964f0d 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1701,7 +1701,7 @@ static void test_CreateBitmap(void) BITMAP bmp; HDC screenDC = GetDC(0); HDC hdc = CreateCompatibleDC(screenDC); - UINT i, expect; + UINT i, expect = 0; /* all of these are the stock monochrome bitmap */ HBITMAP bm = CreateCompatibleBitmap(hdc, 0, 0);

1 0

Alexandre Julliard : riched20/tests: Avoid using size_t in traces.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: f0c4fdbad92c4e553a442078464c8abfe5a23522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c4fdbad92c4e553a4420784… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 14:31:24 2007 +0100 riched20/tests: Avoid using size_t in traces. --- dlls/riched20/tests/editor.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 7a5c9c9..73f87fa 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -664,8 +664,8 @@ static void test_WM_GETTEXT(void) /* Baseline test with normal-sized buffer */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - ok(result == strlen(buffer), - "WM_GETTEXT returned %d, expected %d\n", result, strlen(buffer)); + ok(result == lstrlen(buffer), + "WM_GETTEXT returned %d, expected %d\n", result, lstrlen(buffer)); SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); result = strcmp(buffer,text); ok(result == 0, @@ -673,9 +673,9 @@ static void test_WM_GETTEXT(void) /* Test for returned value of WM_GETTEXTLENGTH */ result = SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == strlen(text), + ok(result == lstrlen(text), "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, strlen(text)); + result, lstrlen(text)); /* Test for behavior in overflow case */ memset(buffer, 0, 1024); @@ -689,17 +689,17 @@ static void test_WM_GETTEXT(void) /* Baseline test with normal-sized buffer and carriage return */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text2); result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); - ok(result == strlen(buffer), - "WM_GETTEXT returned %d, expected %d\n", result, strlen(buffer)); + ok(result == lstrlen(buffer), + "WM_GETTEXT returned %d, expected %d\n", result, lstrlen(buffer)); result = strcmp(buffer,text2_after); ok(result == 0, "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); /* Test for returned value of WM_GETTEXTLENGTH */ result = SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - ok(result == strlen(text2_after), + ok(result == lstrlen(text2_after), "WM_GETTEXTLENGTH reports incorrect length %d, expected %d\n", - result, strlen(text2_after)); + result, lstrlen(text2_after)); /* Test for behavior of CRLF conversion in case of overflow */ memset(buffer, 0, 1024);

1 0

Stefan Dösinger : user32: Add a test for EnumDisplaySettings vs GetDeviceCaps.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: 5fa90ca910843fa9947f5b85f683300fa211b95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa90ca910843fa9947f5b85f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 14 00:22:40 2007 +0100 user32: Add a test for EnumDisplaySettings vs GetDeviceCaps. --- dlls/user32/tests/sysparams.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index ecaae35..9e4e6b2 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2521,6 +2521,36 @@ static void test_GetSystemMetrics( void) ReleaseDC( 0, hdc); } +static void test_EnumDisplaySettings(void) +{ + DEVMODE devmode; + DWORD val; + HDC hdc; + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); + + 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); + } + + val = GetDeviceCaps(hdc, NUMCOLORS); + if(devmode.dmBitsPerPel <= 8) { + ok(val == 256, "Screen bpp is %d, NUMCOLORS returned %d\n", devmode.dmBitsPerPel, val); + } else { + ok(val == -1, "Screen bpp is %d, NUMCOLORS returned %d\n", devmode.dmBitsPerPel, val); + } + + ReleaseDC(0, hdc); +} + START_TEST(sysparams) { int argc; @@ -2545,6 +2575,8 @@ START_TEST(sysparams) trace("testing GetSystemMetrics with your current desktop settings\n"); test_GetSystemMetrics( ); + trace("testing EnumDisplaySettings vs GetDeviceCaps\n"); + test_EnumDisplaySettings( ); change_counter = 0; change_last_param = 0;

1 0

Stefan Dösinger : user32: Add a test for WM_DISPLAYCHANGE.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: 920506b23076ded0d03146af99268cc832c87987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=920506b23076ded0d03146af9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 14 00:19:08 2007 +0100 user32: Add a test for WM_DISPLAYCHANGE. --- dlls/user32/tests/sysparams.c | 88 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 68e6cca..ecaae35 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -150,16 +150,26 @@ static LRESULT CALLBACK SysParamsTestWndProc( HWND hWnd, UINT msg, WPARAM wParam LPARAM lParam ); static int change_counter; static int change_last_param; +static int last_bpp; +static BOOL displaychange_ok = FALSE, displaychange_test_active = FALSE; +static HANDLE displaychange_sem = 0; static LRESULT CALLBACK SysParamsTestWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ) { switch (msg) { + case WM_DISPLAYCHANGE: + ok(displaychange_ok, "Unexpected WM_DISPLAYCHANGE message\n"); + last_bpp = wParam; + displaychange_ok = FALSE; + ReleaseSemaphore(displaychange_sem, 1, 0); + break; + case WM_SETTINGCHANGE: if (change_counter>0) { /* ignore these messages caused by resizing of toolbars */ - if( wParam == SPI_SETWORKAREA) break; + if( wParam == SPI_SETWORKAREA || displaychange_test_active) break; if( change_last_param == SPI_SETWORKAREA) { change_last_param = wParam; break; @@ -175,6 +185,7 @@ static LRESULT CALLBACK SysParamsTestWndProc( HWND hWnd, UINT msg, WPARAM wParam PostQuitMessage( 0 ); break; + /* drop through */ default: return( DefWindowProcA( hWnd, msg, wParam, lParam ) ); } @@ -2169,6 +2180,78 @@ static void test_SPI_SETWALLPAPER( void ) /* 115 */ test_reg_key(SPI_SETDESKWALLPAPER_REGKEY, SPI_SETDESKWALLPAPER_VALNAME, oldval); } +static void test_WM_DISPLAYCHANGE(void) +{ + DEVMODE mode, startmode; + int start_bpp, last_set_bpp = 0; + int test_bpps[] = {8, 16, 24, 32}, i; + LONG change_ret; + DWORD wait_ret; + + displaychange_test_active = TRUE; + + memset(&startmode, 0, sizeof(startmode)); + startmode.dmSize = sizeof(startmode); + EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &startmode); + start_bpp = startmode.dmBitsPerPel; + + displaychange_sem = CreateSemaphore(NULL, 0, 1, NULL); + + for(i = 0; i < sizeof(test_bpps)/sizeof(test_bpps[0]); i++) { + last_bpp = -1; + + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + mode.dmBitsPerPel = test_bpps[i]; + mode.dmPelsWidth = GetSystemMetrics(SM_CXSCREEN); + mode.dmPelsHeight = GetSystemMetrics(SM_CYSCREEN); + + change_counter = 0; /* This sends a SETTINGSCHANGE message as well in which we aren't interested */ + displaychange_ok = TRUE; + change_ret = ChangeDisplaySettingsEx(NULL, &mode, NULL, 0, NULL); + /* Wait quite long for the message, screen setting changes can take some time */ + if(change_ret == DISP_CHANGE_SUCCESSFUL) { + wait_ret = WaitForSingleObject(displaychange_sem, 10000); + ok(wait_ret == WAIT_OBJECT_0, "Waiting for the WM_DISPLAYCHANGE message timed out\n"); + } + displaychange_ok = FALSE; + + if(change_ret != DISP_CHANGE_SUCCESSFUL) { + skip("Setting depth %d failed(ret = %d)\n", test_bpps[i], change_ret); + ok(last_bpp == -1, "WM_DISPLAYCHANGE was sent with wParam %d despide mode change failure\n", last_bpp); + continue; + } + + if((start_bpp != test_bpps[i] || + (test_bpps[i] == 32 && last_bpp == 24)) && + !(test_bpps[i] == 24 && start_bpp == 32)) { + 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); + } + last_set_bpp = test_bpps[i]; + } + + if(start_bpp != last_set_bpp && last_set_bpp != 0) { + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; + mode.dmBitsPerPel = start_bpp; + mode.dmPelsWidth = GetSystemMetrics(SM_CXSCREEN); + mode.dmPelsHeight = GetSystemMetrics(SM_CYSCREEN); + + displaychange_ok = TRUE; + change_ret = ChangeDisplaySettingsEx(NULL, &mode, NULL, 0, NULL); + WaitForSingleObject(displaychange_sem, 10000); + displaychange_ok = FALSE; + CloseHandle(displaychange_sem); + displaychange_sem = 0; + } + + displaychange_test_active = FALSE; +} + /* * Registry entries for the system parameters. * Names are created by 'SET' flags names. @@ -2210,6 +2293,9 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam ) test_SPI_SETWHEELSCROLLLINES(); /* 105 */ test_SPI_SETMENUSHOWDELAY(); /* 107 */ test_SPI_SETWALLPAPER(); /* 115 */ + + test_WM_DISPLAYCHANGE(); + SendMessageA( ghTestWnd, WM_DESTROY, 0, 0 ); return 0; }

1 0

Stefan Dösinger : gdi32: Test the "alpha" channel on compatible bitmaps.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: b3d1ea85960c5e5f61884fecef5cd6ef711fdde1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d1ea85960c5e5f61884fece… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 13 23:11:56 2007 +0100 gdi32: Test the "alpha" channel on compatible bitmaps. --- dlls/gdi32/tests/bitmap.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a895f34..394d694 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -119,8 +119,10 @@ static void test_createdibitmap(void) { HDC hdc, hdcmem; BITMAPINFOHEADER bmih; + BITMAPINFO bm; HBITMAP hbm, hbm_colour, hbm_old; INT screen_depth; + DWORD pixel; hdc = GetDC(0); screen_depth = GetDeviceCaps(hdc, BITSPIXEL); @@ -219,7 +221,30 @@ static void test_createdibitmap(void) test_bitmap_info(hbm, 1, &bmih); DeleteObject(hbm); } - + + /* Test how formats are converted */ + pixel = 0xffffffff; + bmih.biBitCount = 1; + bmih.biWidth = 1; + bmih.biHeight = 1; + + memset(&bm, 0, sizeof(bm)); + bm.bmiHeader.biSize = sizeof(bm.bmiHeader); + bm.bmiHeader.biWidth = 1; + bm.bmiHeader.biHeight = 1; + bm.bmiHeader.biPlanes = 1; + bm.bmiHeader.biBitCount= 24; + bm.bmiHeader.biCompression= BI_RGB; + bm.bmiHeader.biSizeImage = 0; + hbm = CreateDIBitmap(hdc, &bmih, CBM_INIT, &pixel, &bm, DIB_RGB_COLORS); + ok(hbm != NULL, "CreateDIBitmap failed\n"); + + pixel = 0xdeadbeef; + bm.bmiHeader.biBitCount= 32; + GetDIBits(hdc, hbm, 0, 1, &pixel, &bm, DIB_RGB_COLORS); + ok(pixel == 0x00ffffff, "Reading a 32 bit pixel from a DDB returned %08x\n", pixel); + DeleteObject(hbm); + ReleaseDC(0, hdc); }

1 0

Lei Zhang : quartz: Do aggregation test for more video renderer interfaces.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: e8f69b5a427d571ba4850bde918064d56557b139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f69b5a427d571ba4850bde9… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 13 15:33:08 2007 -0800 quartz: Do aggregation test for more video renderer interfaces. --- dlls/quartz/tests/videorenderer.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index e58912f..eeda91c 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -190,6 +190,20 @@ static void test_query_interface(void) RELEASE_EXPECT(pVideoWindow, 1); } +static void test_all_aggregations(void) +{ + IID iids[] = { + IID_IMediaFilter, IID_IBaseFilter, IID_IBasicVideo, IID_IVideoWindow + }; + int i; + + for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + { + test_aggregation(CLSID_SystemClock, CLSID_VideoRenderer, + IID_IReferenceClock, iids[i]); + } +} + START_TEST(videorenderer) { CoInitialize(NULL); @@ -197,8 +211,7 @@ START_TEST(videorenderer) return; test_query_interface(); - test_aggregation(CLSID_SystemClock, CLSID_VideoRenderer, - IID_IReferenceClock, IID_IVideoWindow); + test_all_aggregations(); release_video_renderer(); }

1 0

Stefan Dösinger : winex11: Ignore the alpha if all pixels are 0.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: 7f97af2e2e40e39371dd1c847fdeec4d2b012d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f97af2e2e40e39371dd1c847… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 13 12:12:23 2007 +0100 winex11: Ignore the alpha if all pixels are 0. --- dlls/winex11.drv/mouse.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b175c6b..97e097b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -409,6 +409,7 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) int and_width_bytes, xor_width_bytes; XcursorPixel *pixel_ptr; XcursorImage *image; + BOOL alpha_zero = TRUE; ymax = (ptr->nHeight > 32) ? 32 : ptr->nHeight; xmax = (ptr->nWidth > 32) ? 32 : ptr->nWidth; @@ -425,6 +426,37 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) image = pXcursorImageCreate( xmax, ymax ); pixel_ptr = image->pixels; + /* Generally 32 bit bitmaps have an alpha channel which is used in favor + * of the AND mask. However, if all pixels have alpha = 0x00, the bitmap + * is treated like one without alpha and the masks are used. As soon as + * one pixel has alpha != 0x00, and the mask ignored as described in the + * docs. + * + * This is most likely for applications which create the bitmaps with + * CreateDIBitmap, which creates a device dependent bitmap, so the format + * that arrives when loading depends on the screen's bpp. Apps that were + * written at 8 / 16 bpp times do not know about the 32 bit alpha, so + * they would get a completely transparent cursor on 32 bit displays. + * + * Non-32 bit bitmaps always use the AND mask + */ + if(ptr->bBitsPerPixel == 32) + { + for (y = 0; alpha_zero && y < ymax; ++y) + { + xor_ptr = xor_bits + (y * xor_width_bytes); + for (x = 0; x < xmax; ++x) + { + if (xor_ptr[3] != 0x00) + { + alpha_zero = FALSE; + break; + } + xor_ptr+=4; + } + } + } + /* On windows, to calculate the color for a pixel, first an AND is done * with the background and the "and" bitmap, then an XOR with the "xor" * bitmap. This means that when the data in the "and" bitmap is 0, the @@ -484,7 +516,7 @@ static XcursorImage *create_cursor_image( CURSORICONINFO *ptr ) return 0; } - if (ptr->bBitsPerPixel != 32) + if (alpha_zero) { /* Alpha channel */ if (~*and_ptr & (1 << (7 - (x & 7)))) *pixel_ptr |= 0xff << 24;

1 0

Lei Zhang : quartz: Make aggregation test generic.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: bf20ca1dd476d5647447e7983ff2ddf3c9ae7812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf20ca1dd476d5647447e7983… Author: Lei Zhang <thestig(a)google.com> Date: Thu Dec 13 15:29:58 2007 -0800 quartz: Make aggregation test generic. --- dlls/quartz/tests/videorenderer.c | 64 +++++++++++++++++++------------------ 1 files changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 3c15772..e58912f 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -43,19 +43,20 @@ static IUnknown *pVideoRenderer = NULL; -static void test_aggregation(void) +static void test_aggregation(const CLSID clsidOuter, const CLSID clsidInner, + const IID iidOuter, const IID iidInner) { HRESULT hr; IUnknown *pUnkOuter = NULL; IUnknown *pUnkInner = NULL; - IVideoWindow *pVideoWindowInner = NULL; + IUnknown *pUnkInnerFail = NULL; IUnknown *pUnkOuterTest = NULL; IUnknown *pUnkInnerTest = NULL; - IVideoWindow *pVideoWindowTest = NULL; - IReferenceClock *pReferenceClockTest = NULL; + IUnknown *pUnkAggregatee = NULL; + IUnknown *pUnkAggregator = NULL; IUnknown *pUnkTest = NULL; - hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&clsidOuter, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&pUnkOuter); ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pUnkOuter != NULL, "pUnkOuter is NULL\n"); @@ -67,13 +68,13 @@ static void test_aggregation(void) } /* for aggregation, we should only be able to request IUnknown */ - hr = CoCreateInstance(&CLSID_VideoRenderer, pUnkOuter, CLSCTX_INPROC_SERVER, - &IID_IVideoWindow, (LPVOID*)&pVideoWindowInner); + hr = CoCreateInstance(&clsidInner, pUnkOuter, CLSCTX_INPROC_SERVER, + &iidInner, (LPVOID*)&pUnkInnerFail); ok(hr == E_NOINTERFACE, "CoCreateInstance returned %x\n", hr); - ok(pVideoWindowInner == NULL, "pVideoWindowInner is not NULL\n"); + ok(pUnkInnerFail == NULL, "pUnkInnerFail is not NULL\n"); /* aggregation, request IUnknown */ - hr = CoCreateInstance(&CLSID_VideoRenderer, pUnkOuter, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&clsidInner, pUnkOuter, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&pUnkInner); ok(hr == S_OK, "CoCreateInstance returned %x\n", hr); ok(pUnkInner != NULL, "pUnkInner is NULL\n"); @@ -89,49 +90,49 @@ static void test_aggregation(void) RELEASE_EXPECT(pUnkOuter, 1); RELEASE_EXPECT(pUnkInner, 1); - QI_FAIL(pUnkOuter, IID_IVideoWindow, pVideoWindowTest); - QI_FAIL(pUnkInner, IID_IReferenceClock, pReferenceClockTest); + QI_FAIL(pUnkOuter, iidInner, pUnkAggregatee); + QI_FAIL(pUnkInner, iidOuter, pUnkAggregator); /* these QueryInterface calls should work */ - QI_SUCCEED(pUnkOuter, IID_IReferenceClock, pReferenceClockTest); + QI_SUCCEED(pUnkOuter, iidOuter, pUnkAggregator); QI_SUCCEED(pUnkOuter, IID_IUnknown, pUnkOuterTest); - QI_SUCCEED(pUnkInner, IID_IVideoWindow, pVideoWindowTest); + QI_SUCCEED(pUnkInner, iidInner, pUnkAggregatee); QI_SUCCEED(pUnkInner, IID_IUnknown, pUnkInnerTest); - if (!pReferenceClockTest || !pUnkOuterTest || !pVideoWindowTest \ + if (!pUnkAggregator || !pUnkOuterTest || !pUnkAggregatee \ || !pUnkInnerTest) { skip("One of the required interfaces is NULL\n"); return; } - ADDREF_EXPECT(pReferenceClockTest, 5); + ADDREF_EXPECT(pUnkAggregator, 5); ADDREF_EXPECT(pUnkOuterTest, 6); - ADDREF_EXPECT(pVideoWindowTest, 7); + ADDREF_EXPECT(pUnkAggregatee, 7); ADDREF_EXPECT(pUnkInnerTest, 3); - RELEASE_EXPECT(pReferenceClockTest, 6); + RELEASE_EXPECT(pUnkAggregator, 6); RELEASE_EXPECT(pUnkOuterTest, 5); - RELEASE_EXPECT(pVideoWindowTest, 4); + RELEASE_EXPECT(pUnkAggregatee, 4); RELEASE_EXPECT(pUnkInnerTest, 2); - QI_SUCCEED(pReferenceClockTest, IID_IUnknown, pUnkTest); + QI_SUCCEED(pUnkAggregator, IID_IUnknown, pUnkTest); QI_SUCCEED(pUnkOuterTest, IID_IUnknown, pUnkTest); - QI_SUCCEED(pVideoWindowTest, IID_IUnknown, pUnkTest); + QI_SUCCEED(pUnkAggregatee, IID_IUnknown, pUnkTest); QI_SUCCEED(pUnkInnerTest, IID_IUnknown, pUnkTest); - QI_FAIL(pReferenceClockTest, IID_IVideoWindow, pUnkTest); - QI_FAIL(pUnkOuterTest, IID_IVideoWindow, pUnkTest); - QI_FAIL(pVideoWindowTest, IID_IVideoWindow, pUnkTest); - QI_SUCCEED(pUnkInnerTest, IID_IVideoWindow, pUnkTest); + QI_FAIL(pUnkAggregator, iidInner, pUnkTest); + QI_FAIL(pUnkOuterTest, iidInner, pUnkTest); + QI_FAIL(pUnkAggregatee, iidInner, pUnkTest); + QI_SUCCEED(pUnkInnerTest, iidInner, pUnkTest); - QI_SUCCEED(pReferenceClockTest, IID_IReferenceClock, pUnkTest); - QI_SUCCEED(pUnkOuterTest, IID_IReferenceClock, pUnkTest); - QI_SUCCEED(pVideoWindowTest, IID_IReferenceClock, pUnkTest); - QI_FAIL(pUnkInnerTest, IID_IReferenceClock, pUnkTest); + QI_SUCCEED(pUnkAggregator, iidOuter, pUnkTest); + QI_SUCCEED(pUnkOuterTest, iidOuter, pUnkTest); + QI_SUCCEED(pUnkAggregatee, iidOuter, pUnkTest); + QI_FAIL(pUnkInnerTest, iidOuter, pUnkTest); - RELEASE_EXPECT(pReferenceClockTest, 10); + RELEASE_EXPECT(pUnkAggregator, 10); RELEASE_EXPECT(pUnkOuterTest, 9); - RELEASE_EXPECT(pVideoWindowTest, 8); + RELEASE_EXPECT(pUnkAggregatee, 8); RELEASE_EXPECT(pUnkInnerTest, 2); RELEASE_EXPECT(pUnkOuter, 7); RELEASE_EXPECT(pUnkInner, 1); @@ -196,7 +197,8 @@ START_TEST(videorenderer) return; test_query_interface(); - test_aggregation(); + test_aggregation(CLSID_SystemClock, CLSID_VideoRenderer, + IID_IReferenceClock, IID_IVideoWindow); release_video_renderer(); }

1 0

Aric Stewart : cryptnet: InternetCrackUrlW requires component buffers when used with ICU_DECODE.
by Alexandre Julliard Dec. 14, 2007

Dec. 14, 2007

Module: wine Branch: master Commit: 1f98ede4f01147f3efcf0b41e45b95d857512cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f98ede4f01147f3efcf0b41e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 14 16:55:19 2007 +0900 cryptnet: InternetCrackUrlW requires component buffers when used with ICU_DECODE. --- dlls/cryptnet/cryptnet_main.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 0ad302d..eba8648 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -476,18 +476,16 @@ static BOOL CRYPT_CrackUrl(LPCWSTR pszURL, URL_COMPONENTSW *components) memset(components, 0, sizeof(*components)); components->dwStructSize = sizeof(*components); - components->dwHostNameLength = 1; - components->dwUrlPathLength = 1; + components->lpszHostName = CryptMemAlloc(MAX_PATH * sizeof(WCHAR)); + components->dwHostNameLength = MAX_PATH; + components->lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); + components->dwUrlPathLength = 2 * MAX_PATH; ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, components); if (ret) { - LPWSTR hostname = strndupW(components->lpszHostName, - components->dwHostNameLength); - LPWSTR path = strndupW(components->lpszUrlPath, - components->dwUrlPathLength); - - components->lpszHostName = hostname; - components->lpszUrlPath = path; + if ((components->dwUrlPathLength == 2 * MAX_PATH - 1) || + (components->dwHostNameLength == MAX_PATH - 1)) + FIXME("Buffers are too small\n"); switch (components->nScheme) { case INTERNET_SCHEME_FTP: @@ -873,12 +871,16 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, *ppfnFreeObject = CRYPT_FreeBlob; *ppvFreeContext = NULL; - components.dwUrlPathLength = 1; + components.lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); + components.dwUrlPathLength = 2 * MAX_PATH; ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, &components); if (ret) { LPWSTR path; + if (components.dwUrlPathLength == 2 * MAX_PATH - 1) + FIXME("Buffers are too small\n"); + /* 3 == lstrlenW(L"c:") + 1 */ path = CryptMemAlloc((components.dwUrlPathLength + 3) * sizeof(WCHAR)); if (path) @@ -932,6 +934,7 @@ static BOOL WINAPI File_RetrieveEncodedObjectW(LPCWSTR pszURL, CryptMemFree(path); } } + CryptMemFree(components.lpszUrlPath); return ret; } @@ -952,7 +955,7 @@ static BOOL CRYPT_GetRetrieveFunction(LPCWSTR pszURL, *pFunc = NULL; *phFunc = 0; components.dwSchemeLength = 1; - ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, &components); + ret = InternetCrackUrlW(pszURL, 0, 0, &components); if (ret) { /* Microsoft always uses CryptInitOIDFunctionSet/

1 0