March 2009 - Wine-commits - list.winehq.org

Aric Stewart : dinput: Map OS/ X joystick axes so even if they come out of order on the device we recognize them correctly .
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 08388a3c9b116531253c89665b0f1c75f0781b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08388a3c9b116531253c89665… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 10 14:59:56 2009 -0500 dinput: Map OS/X joystick axes so even if they come out of order on the device we recognize them correctly. --- dlls/dinput/joystick_osx.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index e0213b6..4faf621 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -284,7 +284,7 @@ static int get_osx_device_name(int id, char *name, int length) return 0; } -static void get_osx_device_elements(JoystickImpl *device) +static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) { IOHIDDeviceRef tIOHIDDeviceRef; CFArrayRef gElementCFArrayRef; @@ -351,6 +351,7 @@ static void get_osx_device_elements(JoystickImpl *device) case kHIDUsage_GD_Rz: { CFArrayInsertValueAtIndex(device->elementCFArrayRef, axes, tIOHIDElementRef); + axis_map[axes]=usage; axes++; break; } @@ -583,6 +584,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di HRESULT hr; LPDIDATAFORMAT df = NULL; int idx = 0; + int axis_map[8]; /* max axes */ TRACE("%s %p %p %p %hu\n", debugstr_guid(rguid), jvt, dinput, pdev, index); @@ -606,7 +608,8 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di newDevice->generic.name = HeapAlloc(GetProcessHeap(),0,strlen(name) + 1); strcpy(newDevice->generic.name, name); - get_osx_device_elements(newDevice); + memset(axis_map, 0, sizeof(axis_map)); + get_osx_device_elements(newDevice, axis_map); TRACE("%i axes %i buttons %i povs\n",newDevice->generic.devcaps.dwAxes,newDevice->generic.devcaps.dwButtons,newDevice->generic.devcaps.dwPOVs); @@ -632,8 +635,20 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di for (i = 0; i < newDevice->generic.devcaps.dwAxes; i++) { - memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[i], df->dwObjSize); - df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_ABSAXIS; + int wine_obj = -1; + switch (axis_map[i]) + { + case kHIDUsage_GD_X: wine_obj = 0; break; + case kHIDUsage_GD_Y: wine_obj = 1; break; + case kHIDUsage_GD_Z: wine_obj = 2; break; + case kHIDUsage_GD_Rx: wine_obj = 3; break; + case kHIDUsage_GD_Ry: wine_obj = 4; break; + case kHIDUsage_GD_Rz: wine_obj = 5; break; + } + if (wine_obj < 0 ) continue; + + memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[wine_obj], df->dwObjSize); + df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(wine_obj) | DIDFT_ABSAXIS; } for (i = 0; i < newDevice->generic.devcaps.dwPOVs; i++)

1 0

Aric Stewart : dinput: Add OS/X sliders.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: ae16df651f304fd56fa24a6697d01ab4a0ddf3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae16df651f304fd56fa24a669… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 10 15:00:03 2009 -0500 dinput: Add OS/X sliders. --- dlls/dinput/joystick_osx.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 4faf621..ea5ad63 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -289,6 +289,7 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) IOHIDDeviceRef tIOHIDDeviceRef; CFArrayRef gElementCFArrayRef; DWORD axes = 0; + DWORD sliders = 0; DWORD buttons = 0; DWORD povs = 0; @@ -343,6 +344,11 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) povs++; break; } + case kHIDUsage_GD_Slider: + sliders ++; + if (sliders > 2) + break; + /* fallthrough, sliders are axis */ case kHIDUsage_GD_X: case kHIDUsage_GD_Y: case kHIDUsage_GD_Z: @@ -413,6 +419,7 @@ static void poll_osx_device_state(JoystickGenericImpl *device_in) { int button_idx = 0; int pov_idx = 0; + int slider_idx = 0; CFIndex idx, cnt = CFArrayGetCount( gElementCFArrayRef ); for ( idx = 0; idx < cnt; idx++ ) @@ -455,6 +462,7 @@ static void poll_osx_device_state(JoystickGenericImpl *device_in) case kHIDUsage_GD_Rx: case kHIDUsage_GD_Ry: case kHIDUsage_GD_Rz: + case kHIDUsage_GD_Slider: { IOHIDDeviceGetValue(tIOHIDDeviceRef, tIOHIDElementRef, &valueRef); val = IOHIDValueGetIntegerValue(valueRef); @@ -478,6 +486,10 @@ static void poll_osx_device_state(JoystickGenericImpl *device_in) case kHIDUsage_GD_Rz: device->generic.js.lRz = joystick_map_axis(&device->generic.props[idx], val); break; + case kHIDUsage_GD_Slider: + device->generic.js.rglSlider[slider_idx] = joystick_map_axis(&device->generic.props[idx], val); + slider_idx ++; + break; } break; } @@ -585,6 +597,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di LPDIDATAFORMAT df = NULL; int idx = 0; int axis_map[8]; /* max axes */ + int slider_count = 0; TRACE("%s %p %p %p %hu\n", debugstr_guid(rguid), jvt, dinput, pdev, index); @@ -644,6 +657,10 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di case kHIDUsage_GD_Rx: wine_obj = 3; break; case kHIDUsage_GD_Ry: wine_obj = 4; break; case kHIDUsage_GD_Rz: wine_obj = 5; break; + case kHIDUsage_GD_Slider: + wine_obj = 6 + slider_count; + slider_count++; + break; } if (wine_obj < 0 ) continue;

1 0

Aric Stewart : dinput: OS/X joystick add POV controls.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 87d61ab21bfde7d63aa1c1bc3925e1d2f6673129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d61ab21bfde7d63aa1c1bc3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 10 14:59:35 2009 -0500 dinput: OS/X joystick add POV controls. --- dlls/dinput/joystick_osx.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 9dafcb5..fb59ec5 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -332,6 +332,22 @@ static void get_osx_device_elements(JoystickImpl *device) axes++; break; } + case kIOHIDElementTypeInput_Misc: + { + uint32_t usage = IOHIDElementGetUsage( tIOHIDElementRef ); + switch(usage) + { + case kHIDUsage_GD_Hatswitch: + { + CFArrayInsertValueAtIndex(device->elementCFArrayRef, (axes+povs), tIOHIDElementRef); + povs++; + break; + } + default: + FIXME("Unhandled usage %i\n",usage); + } + break; + } default: FIXME("Unhandled type %i\n",eleType); } @@ -384,6 +400,7 @@ static void poll_osx_device_state(JoystickGenericImpl *device_in) if (gElementCFArrayRef) { int button_idx = 0; + int pov_idx = 0; CFIndex idx, cnt = CFArrayGetCount( gElementCFArrayRef ); for ( idx = 0; idx < cnt; idx++ ) @@ -404,6 +421,27 @@ static void poll_osx_device_state(JoystickGenericImpl *device_in) button_idx ++; } break; + case kIOHIDElementTypeInput_Misc: + { + uint32_t usage = IOHIDElementGetUsage( tIOHIDElementRef ); + switch(usage) + { + case kHIDUsage_GD_Hatswitch: + { + IOHIDDeviceGetValue(tIOHIDDeviceRef, tIOHIDElementRef, &valueRef); + val = IOHIDValueGetIntegerValue(valueRef); + if (val >= 8) + device->generic.js.rgdwPOV[pov_idx] = -1; + else + device->generic.js.rgdwPOV[pov_idx] = val * 4500; + pov_idx ++; + break; + } + default: + FIXME("unhandled usage %i\n",usage); + } + break; + } default: FIXME("Unhandled type %i\n",eleType); }

1 0

Aric Stewart : dinput: OS/X joystick add GD_X, GD_Y, GD_Z axes.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: ffbd6a79a4032f01baf9cd56d2b54b8f1a7f37cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbd6a79a4032f01baf9cd56d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 10 14:59:41 2009 -0500 dinput: OS/X joystick add GD_X, GD_Y, GD_Z axes. --- dlls/dinput/joystick_osx.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index fb59ec5..709c4a7 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -343,6 +343,14 @@ static void get_osx_device_elements(JoystickImpl *device) povs++; break; } + case kHIDUsage_GD_X: + case kHIDUsage_GD_Y: + case kHIDUsage_GD_Z: + { + CFArrayInsertValueAtIndex(device->elementCFArrayRef, axes, tIOHIDElementRef); + axes++; + break; + } default: FIXME("Unhandled usage %i\n",usage); } @@ -437,6 +445,26 @@ static void poll_osx_device_state(JoystickGenericImpl *device_in) pov_idx ++; break; } + case kHIDUsage_GD_X: + case kHIDUsage_GD_Y: + case kHIDUsage_GD_Z: + { + IOHIDDeviceGetValue(tIOHIDDeviceRef, tIOHIDElementRef, &valueRef); + val = IOHIDValueGetIntegerValue(valueRef); + switch (usage) + { + case kHIDUsage_GD_X: + device->generic.js.lX = joystick_map_axis(&device->generic.props[idx], val); + break; + case kHIDUsage_GD_Y: + device->generic.js.lY = joystick_map_axis(&device->generic.props[idx], val); + break; + case kHIDUsage_GD_Z: + device->generic.js.lZ = joystick_map_axis(&device->generic.props[idx], val); + break; + } + break; + } default: FIXME("unhandled usage %i\n",usage); }

1 0

Aric Stewart : dinput: OS/X joystick add axes.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 0e7eba1e3fd5aa37ecf74d601bbb968a5cea6028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7eba1e3fd5aa37ecf74d601… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 10 14:59:28 2009 -0500 dinput: OS/X joystick add axes. --- dlls/dinput/joystick_osx.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 04af1e5..9dafcb5 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -326,6 +326,12 @@ static void get_osx_device_elements(JoystickImpl *device) } break; } + case kIOHIDElementTypeInput_Axis: + { + CFArrayInsertValueAtIndex(device->elementCFArrayRef, axes, tIOHIDElementRef); + axes++; + break; + } default: FIXME("Unhandled type %i\n",eleType); }

1 0

Dylan Smith : winhlp32: Prevent cursor flicker on mouse moves over richedit control.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: a36b408f7ee03df290ab599733c2e2c9fb10a6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36b408f7ee03df290ab59973… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Mar 10 15:19:59 2009 -0400 winhlp32: Prevent cursor flicker on mouse moves over richedit control. Previously the cursor was being set by winhlp32 on WM_MOUSEMOVE, then the richedit control would change it again on WM_SETCURSOR. Since the cursor set in both of these places was different, the cursor would flicker from being frequently changed. The reason winhlp32 is setting the cursor, rather than letting the richedit control set the cursor, is that winhlp32 needs the hand cursor to be shown over a link. My first instinct was to just add the CFE_LINK effect to the link characters, however this also forced a colour for the link that was inconsistent with native winhlp32. Native winhlp32 doesn't seem to load any richedit dll, so this doesn't imply that there is an undocumented way of changing the colour of characters with CFE_LINK. This patch has winhlp32 override the WNDPROC for the richedit control to handle the WM_SETCURSOR. It simply sets the cursor to the hand if the cursor is over the link, otherwise it just calls the original richedit window proc. --- programs/winhlp32/winhelp.c | 103 +++++++++++++++++++++++++----------------- programs/winhlp32/winhelp.h | 2 + 2 files changed, 63 insertions(+), 42 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index d62649f..db9769a 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -581,6 +581,64 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, WINHELP_WNDPAGE* wpage) /*********************************************************************** * + * WINHELP_FindLink + */ +static HLPFILE_LINK* WINHELP_FindLink(WINHELP_WINDOW* win, LPARAM pos) +{ + HLPFILE_LINK* link; + POINTL mouse_ptl, char_ptl, char_next_ptl; + DWORD cp; + + if (!win->page) return NULL; + + mouse_ptl.x = (short)LOWORD(pos); + mouse_ptl.y = (short)HIWORD(pos); + cp = SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_CHARFROMPOS, + 0, (LPARAM)&mouse_ptl); + + for (link = win->page->first_link; link; link = link->next) + { + if (link->cpMin <= cp && cp <= link->cpMax) + { + /* check whether we're at end of line */ + SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_POSFROMCHAR, + (LPARAM)&char_ptl, cp); + SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_POSFROMCHAR, + (LPARAM)&char_next_ptl, cp + 1); + if (char_next_ptl.y != char_ptl.y || mouse_ptl.x >= char_next_ptl.x) + link = NULL; + break; + } + } + return link; +} + +static LRESULT CALLBACK WINHELP_RicheditWndProc(HWND hWnd, UINT msg, + WPARAM wParam, LPARAM lParam) +{ + WINHELP_WINDOW *win = (WINHELP_WINDOW*) GetWindowLongPtr(GetParent(hWnd), 0); + DWORD messagePos; + POINT pt; + switch(msg) + { + case WM_SETCURSOR: + messagePos = GetMessagePos(); + pt.x = (short)LOWORD(messagePos); + pt.y = (short)HIWORD(messagePos); + ScreenToClient(hWnd, &pt); + if (win->page && WINHELP_FindLink(win, MAKELPARAM(pt.x, pt.y))) + { + SetCursor(win->hHandCur); + return 0; + } + /* fall through */ + default: + return CallWindowProcA(win->origRicheditWndProc, hWnd, msg, wParam, lParam); + } +} + +/*********************************************************************** + * * WINHELP_CreateHelpWindow */ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remember) @@ -701,6 +759,8 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe 0, 0, 0, 0, win->hMainWnd, (HMENU)CTL_ID_TEXT, Globals.hInstance, NULL); SendMessage(hTextWnd, EM_SETEVENTMASK, 0, SendMessage(hTextWnd, EM_GETEVENTMASK, 0, 0) | ENM_MOUSEEVENTS); + win->origRicheditWndProc = (WNDPROC)SetWindowLongPtr(hTextWnd, GWLP_WNDPROC, + (LONG_PTR)WINHELP_RicheditWndProc); } hIcon = (wpage->page) ? wpage->page->file->hIcon : NULL; @@ -769,40 +829,6 @@ BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*lookup)(HLPFILE*, LONG, ULONG*), return WINHELP_CreateHelpWindow(&wpage, nCmdShow, TRUE); } -/*********************************************************************** - * - * WINHELP_FindLink - */ -static HLPFILE_LINK* WINHELP_FindLink(WINHELP_WINDOW* win, LPARAM pos) -{ - HLPFILE_LINK* link; - POINTL mouse_ptl, char_ptl, char_next_ptl; - DWORD cp; - - if (!win->page) return NULL; - - mouse_ptl.x = (short)LOWORD(pos); - mouse_ptl.y = (short)HIWORD(pos); - cp = SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_CHARFROMPOS, - 0, (LPARAM)&mouse_ptl); - - for (link = win->page->first_link; link; link = link->next) - { - if (link->cpMin <= cp && cp <= link->cpMax) - { - /* check whether we're at end of line */ - SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_POSFROMCHAR, - (LPARAM)&char_ptl, cp); - SendMessageW(GetDlgItem(win->hMainWnd, CTL_ID_TEXT), EM_POSFROMCHAR, - (LPARAM)&char_next_ptl, cp + 1); - if (char_next_ptl.y != char_ptl.y || mouse_ptl.x >= char_next_ptl.x) - link = NULL; - break; - } - } - return link; -} - /****************************************************************** * WINHELP_HandleTextMouse * @@ -815,14 +841,7 @@ static BOOL WINHELP_HandleTextMouse(WINHELP_WINDOW* win, UINT msg, LPARAM lParam switch (msg) { - case WM_MOUSEMOVE: - if (WINHELP_FindLink(win, lParam)) - SetCursor(win->hHandCur); - else - SetCursor(LoadCursor(0, IDC_ARROW)); - break; - - case WM_LBUTTONDOWN: + case WM_LBUTTONDOWN: if ((win->current_link = WINHELP_FindLink(win, lParam))) ret = TRUE; break; diff --git a/programs/winhlp32/winhelp.h b/programs/winhlp32/winhelp.h index feaf637..407089e 100644 --- a/programs/winhlp32/winhelp.h +++ b/programs/winhlp32/winhelp.h @@ -80,6 +80,8 @@ typedef struct tagWinHelp HWND hShadowWnd; HWND hHistoryWnd; + WNDPROC origRicheditWndProc; + HFONT* fonts; UINT fonts_len;

1 0

Aric Stewart : dinput: Add Mac OS/X joystick support.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 225a494d663add0d3c25296e2c4ed5f5ab64c9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=225a494d663add0d3c25296e2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 10 14:59:20 2009 -0500 dinput: Add Mac OS/X joystick support. --- configure | 2 + configure.ac | 1 + dlls/dinput/Makefile.in | 2 + dlls/dinput/dinput_main.c | 3 +- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick_osx.c | 787 ++++++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 + 7 files changed, 798 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=225a494d663add0d3c252…

1 0

Huw Davies : gdi32/tests: Under win9x GetBitmapBits returns zero when passed a NULL buffer.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: 908ff58339837272458c6598e9bd67cde1b8f36d URL: http://source.winehq.org/git/wine.git/?a=commit;h=908ff58339837272458c6598e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 11 10:20:03 2009 +0000 gdi32/tests: Under win9x GetBitmapBits returns zero when passed a NULL buffer. --- dlls/gdi32/tests/bitmap.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 9271b00..75f3310 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1660,8 +1660,9 @@ static void test_GetDIBits(void) ok(!bm.bmBits, "wrong bmBits %p\n", bm.bmBits); bytes = GetBitmapBits(hbmp, 0, NULL); - ok(bytes == bm.bmWidthBytes * bm.bmHeight, "expected %d got %d bytes\n", - bm.bmWidthBytes * bm.bmHeight, bytes); + ok(bytes == bm.bmWidthBytes * bm.bmHeight || + broken(bytes == 0), /* win9x */ + "expected %d got %d bytes\n", bm.bmWidthBytes * bm.bmHeight, bytes); bytes = GetBitmapBits(hbmp, sizeof(buf), buf); ok(bytes == bm.bmWidthBytes * bm.bmHeight, "expected %d got %d bytes\n", bm.bmWidthBytes * bm.bmHeight, bytes);

1 0

Huw Davies : gdi32/tests: Mark as broken another case where win9x doesn' t set biSizeImage.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: f1e1ae7483de9f036696360f411f917c66e0170e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e1ae7483de9f036696360f4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 11 10:17:51 2009 +0000 gdi32/tests: Mark as broken another case where win9x doesn't set biSizeImage. --- dlls/gdi32/tests/bitmap.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d05cd5e..9271b00 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1816,7 +1816,9 @@ static void test_GetDIBits_BI_BITFIELDS(void) ok( bitmasks[0] != 0, "red mask is not set\n" ); ok( bitmasks[1] != 0, "green mask is not set\n" ); ok( bitmasks[2] != 0, "blue mask is not set\n" ); - ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef || + broken(dibinfo->bmiHeader.biSizeImage == 0xdeadbeef), /* win9x */ + "size image not set\n" ); /* now with bits and 0 lines */ memset(dibinfo, 0, sizeof(dibinfo_buf));

1 0

Huw Davies : gdi32/tests: win9x doesn't initialise the bitmap bits. Mark this behaviour as broken.
by Alexandre Julliard 11 Mar '09

11 Mar '09

Module: wine Branch: master Commit: d77ed15f0560209b27f7eed562424f1de6538b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77ed15f0560209b27f7eed56… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 11 10:14:46 2009 +0000 gdi32/tests: win9x doesn't initialise the bitmap bits. Mark this behaviour as broken. --- dlls/gdi32/tests/bitmap.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 107d274..d05cd5e 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -101,10 +101,9 @@ static void test_bitmap_info(HBITMAP hbm, INT expected_depth, const BITMAPINFOHE memset(buf, 0xAA, sizeof(buf)); ret = GetBitmapBits(hbm, sizeof(buf), buf); ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); - if(bm.bmType == 21072) - win_skip("win9x does not initialize the bitmap\n"); - else - ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match, depth %d\n", bmih->biBitCount); + ok(!memcmp(buf, buf_cmp, sizeof(buf)) || + broken(memcmp(buf, buf_cmp, sizeof(buf))), /* win9x doesn't init the bitmap bits */ + "buffers do not match, depth %d\n", bmih->biBitCount); /* test various buffer sizes for GetObject */ ret = GetObject(hbm, sizeof(*bma) * 2, bma); @@ -1117,7 +1116,9 @@ static void test_bitmap(void) memset(buf, 0xAA, sizeof(buf)); ret = GetBitmapBits(hbmp, sizeof(buf), buf); ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); - ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match\n"); + ok(!memcmp(buf, buf_cmp, sizeof(buf)) || + broken(memcmp(buf, buf_cmp, sizeof(buf))), /* win9x doesn't init the bitmap bits */ + "buffers do not match\n"); hbmp_old = SelectObject(hdc, hbmp); @@ -1135,7 +1136,9 @@ static void test_bitmap(void) memset(buf, 0xAA, sizeof(buf)); ret = GetBitmapBits(hbmp, sizeof(buf), buf); ok(ret == bm.bmWidthBytes * bm.bmHeight, "%d != %d\n", ret, bm.bmWidthBytes * bm.bmHeight); - ok(!memcmp(buf, buf_cmp, sizeof(buf)), "buffers do not match\n"); + ok(!memcmp(buf, buf_cmp, sizeof(buf)) || + broken(memcmp(buf, buf_cmp, sizeof(buf))), /* win9x doesn't init the bitmap bits */ + "buffers do not match\n"); hbmp_old = SelectObject(hdc, hbmp_old); ok(hbmp_old == hbmp, "wrong old bitmap %p\n", hbmp_old);

1 0