April 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Build the mouse input structure directly in the mouse event handlers.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: b1be3ddbc618a0bacc478090f5552ca50daa0efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1be3ddbc618a0bacc478090f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 21:20:08 2011 +0200 winex11: Build the mouse input structure directly in the mouse event handlers. --- dlls/winex11.drv/mouse.c | 152 +++++++++++++++++++++++++--------------------- 1 files changed, 82 insertions(+), 70 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index eb903cd..1716916 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -92,6 +92,32 @@ static const UINT button_up_flags[NB_BUTTONS] = MOUSEEVENTF_XUP }; +static const UINT button_down_data[NB_BUTTONS] = +{ + 0, + 0, + 0, + WHEEL_DELTA, + -WHEEL_DELTA, + XBUTTON1, + XBUTTON2, + XBUTTON1, + XBUTTON2 +}; + +static const UINT button_up_data[NB_BUTTONS] = +{ + 0, + 0, + 0, + 0, + 0, + XBUTTON1, + XBUTTON2, + XBUTTON1, + XBUTTON2 +}; + static HWND cursor_window; static HCURSOR last_cursor; static DWORD last_cursor_change; @@ -214,34 +240,35 @@ void sync_window_cursor( Window window ) * * Update the various window states on a mouse event. */ -static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y, - unsigned int state, DWORD mouse_data, Time time ) +static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPUT *input ) { struct x11drv_win_data *data; POINT pt; - INPUT input; + + input->type = INPUT_MOUSE; if (!hwnd && window == clip_window) { - pt.x = x + clip_rect.left; - pt.y = y + clip_rect.top; - goto done; + input->u.mi.dx += clip_rect.left; + input->u.mi.dy += clip_rect.top; + __wine_send_input( hwnd, input ); + return; } if (!(data = X11DRV_get_win_data( hwnd ))) return; if (window == data->whole_window) { - x += data->whole_rect.left - data->client_rect.left; - y += data->whole_rect.top - data->client_rect.top; + input->u.mi.dx += data->whole_rect.left - data->client_rect.left; + input->u.mi.dy += data->whole_rect.top - data->client_rect.top; } if (window == root_window) { - x += virtual_screen_rect.left; - y += virtual_screen_rect.top; + input->u.mi.dx += virtual_screen_rect.left; + input->u.mi.dy += virtual_screen_rect.top; } - pt.x = x; - pt.y = y; + pt.x = input->u.mi.dx; + pt.y = input->u.mi.dy; if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; MapWindowPoints( hwnd, 0, &pt, 1 ); @@ -277,16 +304,9 @@ static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y SERVER_END_REQ; } -done: - input.type = INPUT_MOUSE; - input.u.mi.dx = pt.x; - input.u.mi.dy = pt.y; - input.u.mi.mouseData = mouse_data; - input.u.mi.dwFlags = flags; - input.u.mi.time = EVENT_x11_time_to_win32_time( time ); - input.u.mi.dwExtraInfo = 0; - - __wine_send_input( hwnd, &input ); + input->u.mi.dx = pt.x; + input->u.mi.dy = pt.y; + __wine_send_input( hwnd, input ); } #ifdef SONAME_LIBXCURSOR @@ -983,35 +1003,21 @@ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) { XButtonEvent *event = &xev->xbutton; int buttonNum = event->button - 1; - WORD wData = 0; + INPUT input; if (buttonNum >= NB_BUTTONS) return; - switch (buttonNum) - { - case 3: - wData = WHEEL_DELTA; - break; - case 4: - wData = -WHEEL_DELTA; - break; - case 5: - wData = XBUTTON1; - break; - case 6: - wData = XBUTTON2; - break; - case 7: - wData = XBUTTON1; - break; - case 8: - wData = XBUTTON2; - break; - } + TRACE( "hwnd %p/%lx button %u pos %d,%d\n", hwnd, event->window, buttonNum, event->x, event->y ); + + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = button_down_data[buttonNum]; + input.u.mi.dwFlags = button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; update_user_time( event->time ); - send_mouse_input( hwnd, button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, - event->window, event->x, event->y, event->state, wData, event->time ); + send_mouse_input( hwnd, event->window, event->state, &input ); } @@ -1022,28 +1028,20 @@ void X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) { XButtonEvent *event = &xev->xbutton; int buttonNum = event->button - 1; - WORD wData = 0; + INPUT input; if (buttonNum >= NB_BUTTONS || !button_up_flags[buttonNum]) return; - switch (buttonNum) - { - case 5: - wData = XBUTTON1; - break; - case 6: - wData = XBUTTON2; - break; - case 7: - wData = XBUTTON1; - break; - case 8: - wData = XBUTTON2; - break; - } + TRACE( "hwnd %p/%lx button %u pos %d,%d\n", hwnd, event->window, buttonNum, event->x, event->y ); + + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = button_up_data[buttonNum]; + input.u.mi.dwFlags = button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; - send_mouse_input( hwnd, button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, - event->window, event->x, event->y, event->state, wData, event->time ); + send_mouse_input( hwnd, event->window, event->state, &input ); } @@ -1053,11 +1051,18 @@ void X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) { XMotionEvent *event = &xev->xmotion; + INPUT input; - TRACE("hwnd %p, event->is_hint %d\n", hwnd, event->is_hint); + TRACE( "hwnd %p/%lx pos %d,%d is_hint %d\n", hwnd, event->window, event->x, event->y, event->is_hint ); - send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, - event->window, event->x, event->y, event->state, 0, event->time ); + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + send_mouse_input( hwnd, event->window, event->state, &input ); } @@ -1067,13 +1072,20 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) { XCrossingEvent *event = &xev->xcrossing; + INPUT input; - TRACE("hwnd %p, event->detail %d\n", hwnd, event->detail); + TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); if (event->detail == NotifyVirtual || event->detail == NotifyNonlinearVirtual) return; if (event->window == x11drv_thread_data()->grab_window) return; /* simulate a mouse motion event */ - send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, - event->window, event->x, event->y, event->state, 0, event->time ); + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + send_mouse_input( hwnd, event->window, event->state, &input ); }

1 0

Henri Verbeet : comctl32: Allocate the correct amount of memory for tab items in TAB_InsertItemT().
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: e5c3883c923d345848315a39a090607bdddac936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c3883c923d345848315a39a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 12 17:39:19 2011 +0200 comctl32: Allocate the correct amount of memory for tab items in TAB_InsertItemT(). --- dlls/comctl32/tab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 6744ed7..a9a0548 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2644,7 +2644,7 @@ TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, const TCITEMW *pti, BOOL bUnicode TAB_DumpItemExternalT(pti, iItem, bUnicode); - if (!(item = Alloc(sizeof(TAB_ITEM_SIZE(infoPtr))))) return FALSE; + if (!(item = Alloc(TAB_ITEM_SIZE(infoPtr)))) return FALSE; if (DPA_InsertPtr(infoPtr->items, iItem, item) == -1) { Free(item);

1 0

Jacek Caban : shdocvw: Register known protocols as URL protocols.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 9e18a77046558e544137aecdde853c48c8addcfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e18a77046558e544137aecdd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 13:27:39 2011 +0200 shdocvw: Register known protocols as URL protocols. --- dlls/shdocvw/shdocvw.rgs | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/shdocvw.rgs b/dlls/shdocvw/shdocvw.rgs index 9e9fcb4..8f8bc53 100644 --- a/dlls/shdocvw/shdocvw.rgs +++ b/dlls/shdocvw/shdocvw.rgs @@ -61,4 +61,21 @@ HKCR } } ForceRemove '.url' = s 'InternetShortcut' + + ftp + { + val 'URL Protocol' = s '' + } + http + { + val 'URL Protocol' = s '' + } + https + { + val 'URL Protocol' = s '' + } + mailto + { + val 'URL Protocol' = s '' + } }

1 0

Jacek Caban : shdocvw: Added more InternetShortcut tests.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 6db795873d81b1248599db4efdcf39b368dc2bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db795873d81b1248599db4ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 12 13:27:55 2011 +0200 shdocvw: Added more InternetShortcut tests. --- dlls/shdocvw/tests/intshcut.c | 72 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index 108e4f5..ca28450 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -128,6 +128,24 @@ static void test_QueryInterface(void) IUnknown_Release(pUnknown); } +#define test_shortcut_url(a,b) _test_shortcut_url(__LINE__,a,b) +static void _test_shortcut_url(unsigned line, IUnknown *unk, const char *exurl) +{ + IUniformResourceLocatorA *locator_a; + char *url_a; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IUniformResourceLocatorA, (void**)&locator_a); + ok_(__FILE__,line)(hres == S_OK, "Could not get IUniformResourceLocatorA iface: %08x\n", hres); + + hres = locator_a->lpVtbl->GetURL(locator_a, &url_a); + ok_(__FILE__,line)(hres == S_OK, "GetURL failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp(url_a, exurl), "unexpected URL, got %s, expected %s\n", url_a, exurl); + CoTaskMemFree(url_a); + + IUnknown_Release(locator_a); +} + #define check_string_transform(a,b,c,d,e) _check_string_transform(__LINE__,a,b,c,d,e) static void _check_string_transform(unsigned line, IUniformResourceLocatorA *urlA, LPCSTR input, DWORD flags, LPCSTR expectedOutput, BOOL is_todo) @@ -314,6 +332,59 @@ static void test_NullURLs(void) urlA->lpVtbl->Release(urlA); } +typedef struct { + const char *data; + const char *url; +} load_test_t; + +static const load_test_t load_tests[] = { + {"[InternetShortcut]\n" + "URL=http://www.winehq.org/\n" + "HotKey=0\n" + "IDList=\n" + "[{000214A0-0000-0000-C000-000000000046}]\n" + "Prop0=1,2\n", + + "http://www.winehq.org/" + } +}; + +static void test_Load(void) +{ + IPersistFile *persist_file; + const load_test_t *test; + WCHAR file_path[MAX_PATH]; + DWORD size; + HANDLE file; + HRESULT hres; + + static const WCHAR test_urlW[] = {'t','e','s','t','.','u','r','l',0}; + + GetTempPathW(MAX_PATH, file_path); + lstrcatW(file_path, test_urlW); + + for(test = load_tests; test < load_tests + sizeof(load_tests)/sizeof(*load_tests); test++) { + file = CreateFileW(file_path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "could not create test file\n"); + if(file == INVALID_HANDLE_VALUE) + continue; + + WriteFile(file, test->data, strlen(test->data), &size, NULL); + CloseHandle(file); + + hres = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IPersistFile, (void**)&persist_file); + ok(hres == S_OK, "Could not create InternetShortcut instance: %08x\n", hres); + + hres = IPersistFile_Load(persist_file, file_path, 0); + ok(hres == S_OK, "Load failed: %08x\n", hres); + + test_shortcut_url((IUnknown*)persist_file, test->url); + + IPersistFile_Release(persist_file); + DeleteFileW(file_path); + } +} + static void test_SetURLFlags(void) { HRESULT hr; @@ -347,6 +418,7 @@ static void test_InternetShortcut(void) test_NullURLs(); test_SetURLFlags(); test_ReadAndWriteProperties(); + test_Load(); } START_TEST(intshcut)

1 0

Alexandre Julliard : winex11: Get rid of the old ddraw HAL support.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: f13c65b4f5f3d14a18afbd8e1743d27787571d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13c65b4f5f3d14a18afbd8e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 16:56:30 2011 +0200 winex11: Get rid of the old ddraw HAL support. --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/init.c | 9 - dlls/winex11.drv/settings.c | 37 ---- dlls/winex11.drv/x11ddraw.c | 453 ---------------------------------------- dlls/winex11.drv/x11drv.h | 5 - dlls/winex11.drv/x11drv_main.c | 4 - 6 files changed, 0 insertions(+), 509 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f13c65b4f5f3d14a18afb…

1 0

Huw Davies : winex11: Don't use the bitfields for the BI_RGB case.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: b295b53630d70673c0b857ef262f78903b96c0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b295b53630d70673c0b857ef2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 12 12:36:18 2011 +0100 winex11: Don't use the bitfields for the BI_RGB case. --- dlls/winex11.drv/xrender.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index fde0b91..33e420a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1132,14 +1132,25 @@ BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, if (dib) { - X11DRV_PALETTE_ComputeColorShifts(&shifts, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + const DWORD *bitfields; + static const DWORD bitfields_32[3] = {0xff0000, 0x00ff00, 0x0000ff}; + static const DWORD bitfields_16[3] = {0x7c00, 0x03e0, 0x001f}; + + if(dib->dsBmih.biCompression == BI_BITFIELDS) + bitfields = dib->dsBitfields; + else if(bits_pixel == 24 || bits_pixel == 32) + bitfields = bitfields_32; + else + bitfields = bitfields_16; + + X11DRV_PALETTE_ComputeColorShifts(&shifts, bitfields[0], bitfields[1], bitfields[2]); fmt = get_xrender_format_from_color_shifts(dib->dsBm.bmBitsPixel, &shifts); /* Common formats should be in our picture format table. */ if (!fmt) { TRACE("Unhandled dibsection format bpp=%d, redMask=%x, greenMask=%x, blueMask=%x\n", - dib->dsBm.bmBitsPixel, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + dib->dsBm.bmBitsPixel, bitfields[0], bitfields[1], bitfields[2]); return FALSE; } }

1 0

Huw Davies : gdi32: Don't use the bitfields for the BI_RGB case.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 673dd73548e1d52afd89041f5e9970760cd0cf07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=673dd73548e1d52afd89041f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 12 12:46:24 2011 +0100 gdi32: Don't use the bitfields for the BI_RGB case. --- dlls/gdi32/dib.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 96f6920..b63eb13 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -774,7 +774,17 @@ INT WINAPI GetDIBits( case 16: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - if (bmp->dib) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + if (bmp->dib) + { + if (bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + else + { + ((PDWORD)info->bmiColors)[0] = 0x7c00; + ((PDWORD)info->bmiColors)[1] = 0x03e0; + ((PDWORD)info->bmiColors)[2] = 0x001f; + } + } else { ((PDWORD)info->bmiColors)[0] = 0xf800; @@ -788,7 +798,8 @@ INT WINAPI GetDIBits( case 32: if (info->bmiHeader.biCompression == BI_BITFIELDS) { - if (bmp->dib) memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); + if (bmp->dib && bmp->dib->dsBmih.biCompression == BI_BITFIELDS) + memcpy( info->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD) ); else { ((PDWORD)info->bmiColors)[0] = 0xff0000;

1 0

Huw Davies : gdi32: Don' t use the bitfields for the BI_RGB case and also cope with zero masks.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: bb28917bc2e1c939edef0a5fb234fa075a509bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb28917bc2e1c939edef0a5fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 12 12:49:08 2011 +0100 gdi32: Don't use the bitfields for the BI_RGB case and also cope with zero masks. --- dlls/gdi32/dibdrv/dc.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index d784c94..e5048d4 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -40,6 +40,12 @@ static void calc_shift_and_len(DWORD mask, int *shift, int *len) { int s, l; + if(!mask) + { + *shift = *len = 0; + return; + } + s = 0; while ((mask & 1) == 0) { @@ -90,11 +96,16 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit switch(dib->bit_count) { case 32: - init_bit_fields(dib, bit_fields); - if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) + if(bi->biCompression == BI_RGB) dib->funcs = &funcs_8888; else - dib->funcs = &funcs_32; + { + init_bit_fields(dib, bit_fields); + if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) + dib->funcs = &funcs_8888; + else + dib->funcs = &funcs_32; + } break; default:

1 0

Huw Davies : gdi32: Don't set the bitfields when the dib section is BI_RGB.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 48f083b39d5ecb861329de9a77043c8075f30494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f083b39d5ecb861329de9a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 12 13:06:34 2011 +0100 gdi32: Don't set the bitfields when the dib section is BI_RGB. --- dlls/gdi32/dib.c | 35 ++++++++++++++++--------------- dlls/gdi32/tests/dib.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index b63eb13..38b95c3 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1216,8 +1216,9 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) return 0; - TRACE("format (%d,%d), planes %d, bpp %d, size %d, %s\n", - width, height, planes, bpp, sizeImage, usage == DIB_PAL_COLORS? "PAL" : "RGB"); + TRACE("format (%d,%d), planes %d, bpp %d, %s, size %d %s\n", + width, height, planes, bpp, compression == BI_BITFIELDS? "BI_BITFIELDS" : "BI_RGB", + sizeImage, usage == DIB_PAL_COLORS? "PAL" : "RGB"); dib->dsBm.bmType = 0; dib->dsBm.bmWidth = width; @@ -1255,24 +1256,24 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, dib->dsBmih.biSizeImage = dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; /* set dsBitfields values */ - if (usage == DIB_PAL_COLORS || bpp <= 8) + dib->dsBitfields[0] = dib->dsBitfields[1] = dib->dsBitfields[2] = 0; + + if((bpp == 15 || bpp == 16) && compression == BI_RGB) { - dib->dsBitfields[0] = dib->dsBitfields[1] = dib->dsBitfields[2] = 0; + /* In this case Windows changes biCompression to BI_BITFIELDS, + however for now we won't do this, as there are a lot + of places where BI_BITFIELDS is currently unsupported. */ + + /* dib->dsBmih.biCompression = compression = BI_BITFIELDS;*/ + dib->dsBitfields[0] = 0x7c00; + dib->dsBitfields[1] = 0x03e0; + dib->dsBitfields[2] = 0x001f; } - else switch( bpp ) + else if(compression == BI_BITFIELDS) { - case 15: - case 16: - dib->dsBitfields[0] = (compression == BI_BITFIELDS) ? *(const DWORD *)bmi->bmiColors : 0x7c00; - dib->dsBitfields[1] = (compression == BI_BITFIELDS) ? *((const DWORD *)bmi->bmiColors + 1) : 0x03e0; - dib->dsBitfields[2] = (compression == BI_BITFIELDS) ? *((const DWORD *)bmi->bmiColors + 2) : 0x001f; - break; - case 24: - case 32: - dib->dsBitfields[0] = (compression == BI_BITFIELDS) ? *(const DWORD *)bmi->bmiColors : 0xff0000; - dib->dsBitfields[1] = (compression == BI_BITFIELDS) ? *((const DWORD *)bmi->bmiColors + 1) : 0x00ff00; - dib->dsBitfields[2] = (compression == BI_BITFIELDS) ? *((const DWORD *)bmi->bmiColors + 2) : 0x0000ff; - break; + dib->dsBitfields[0] = *(const DWORD *)bmi->bmiColors; + dib->dsBitfields[1] = *((const DWORD *)bmi->bmiColors + 1); + dib->dsBitfields[2] = *((const DWORD *)bmi->bmiColors + 2); } /* get storage location for DIB bits */ diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 784f0dd..d89a6fa 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -204,10 +204,14 @@ static void test_simple_graphics(void) { char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + DWORD *bit_fields = (DWORD*)(bmibuf + sizeof(BITMAPINFOHEADER)); HDC mem_dc; BYTE *bits; HBITMAP dib, orig_bm; const char **sha1; + DIBSECTION ds; + + mem_dc = CreateCompatibleDC(NULL); /* a8r8g8b8 */ trace("8888\n"); @@ -221,7 +225,12 @@ static void test_simple_graphics(void) dib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(dib != NULL, "ret NULL\n"); - mem_dc = CreateCompatibleDC(NULL); + ok(GetObjectW( dib, sizeof(ds), &ds ), "GetObject failed\n"); + ok(ds.dsBitfields[0] == 0, "got %08x\n", ds.dsBitfields[0]); + ok(ds.dsBitfields[1] == 0, "got %08x\n", ds.dsBitfields[1]); + ok(ds.dsBitfields[2] == 0, "got %08x\n", ds.dsBitfields[2]); + ok(ds.dsBmih.biCompression == BI_RGB, "got %x\n", ds.dsBmih.biCompression); + orig_bm = SelectObject(mem_dc, dib); sha1 = sha1_graphics_a8r8g8b8; @@ -229,6 +238,47 @@ static void test_simple_graphics(void) SelectObject(mem_dc, orig_bm); DeleteObject(dib); + + /* a8r8g8b8 - bitfields. Should be the same as the regular 32 bit case.*/ + trace("8888 - bitfields\n"); + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biCompression = BI_BITFIELDS; + bit_fields[0] = 0xff0000; + bit_fields[1] = 0x00ff00; + bit_fields[2] = 0x0000ff; + + dib = CreateDIBSection(mem_dc, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(dib != NULL, "ret NULL\n"); + ok(GetObjectW( dib, sizeof(ds), &ds ), "GetObject failed\n"); + ok(ds.dsBitfields[0] == 0xff0000, "got %08x\n", ds.dsBitfields[0]); + ok(ds.dsBitfields[1] == 0x00ff00, "got %08x\n", ds.dsBitfields[1]); + ok(ds.dsBitfields[2] == 0x0000ff, "got %08x\n", ds.dsBitfields[2]); + ok(ds.dsBmih.biCompression == BI_BITFIELDS, "got %x\n", ds.dsBmih.biCompression); + + orig_bm = SelectObject(mem_dc, dib); + + sha1 = sha1_graphics_a8r8g8b8; + draw_graphics(mem_dc, bmi, bits, &sha1); + + SelectObject(mem_dc, orig_bm); + DeleteObject(dib); + + + /* r5g5b5 */ + bmi->bmiHeader.biBitCount = 16; + bmi->bmiHeader.biCompression = BI_RGB; + + dib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(dib != NULL, "ret NULL\n"); + ok(GetObjectW( dib, sizeof(ds), &ds ), "GetObject failed\n"); + ok(ds.dsBitfields[0] == 0x7c00, "got %08x\n", ds.dsBitfields[0]); + ok(ds.dsBitfields[1] == 0x03e0, "got %08x\n", ds.dsBitfields[1]); + ok(ds.dsBitfields[2] == 0x001f, "got %08x\n", ds.dsBitfields[2]); +todo_wine + ok(ds.dsBmih.biCompression == BI_BITFIELDS, "got %x\n", ds.dsBmih.biCompression); + + DeleteObject(dib); + DeleteDC(mem_dc); }

1 0

Dmitry Timoshkov : user32: Fix the single menu item activation using a hot key.
by Alexandre Julliard 12 Apr '11

12 Apr '11

Module: wine Branch: master Commit: 629f382a80efe35f3f48c41b4a1aff0fecce8977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629f382a80efe35f3f48c41b4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Apr 12 19:07:45 2011 +0900 user32: Fix the single menu item activation using a hot key. --- dlls/user32/menu.c | 2 +- dlls/user32/tests/msg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 0e2d9fb..e834cbd 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3397,7 +3397,7 @@ void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar) if( uItem == NO_SELECTED_ITEM ) MENU_MoveSelection( hwnd, hTrackMenu, ITEM_NEXT ); else - PostMessageW( hwnd, WM_KEYDOWN, VK_DOWN, 0L ); + PostMessageW( hwnd, WM_KEYDOWN, VK_RETURN, 0 ); } track_menu: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 89e1edf..c3b9493 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12163,7 +12163,7 @@ static void test_menu_messages(void) TranslateMessage(&msg); DispatchMessage(&msg); } - ok_sequence(wm_single_menu_item, "single menu item command", TRUE); + ok_sequence(wm_single_menu_item, "single menu item command", FALSE); set_menu_style(hmenu, 0); style = get_menu_style(hmenu);

1 0