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

Johan Gill : ddraw: Do not restore the display mode from inside SetCooperativeLevel.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 7c90c1a0b5f049ff6bbca657b52c1132f6b74f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c90c1a0b5f049ff6bbca657b… Author: Johan Gill <johan.gill(a)gmail.com> Date: Fri Apr 16 23:04:41 2010 +0200 ddraw: Do not restore the display mode from inside SetCooperativeLevel. --- dlls/ddraw/ddraw.c | 5 +--- dlls/ddraw/tests/ddrawmodes.c | 44 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 0a6781c..a8dbafa 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -264,8 +264,8 @@ IDirectDrawImpl_AddRef(IDirectDraw7 *iface) void IDirectDrawImpl_Destroy(IDirectDrawImpl *This) { - /* Clear the cooplevel to restore window and display mode */ IDirectDraw7_SetCooperativeLevel((IDirectDraw7 *)This, NULL, DDSCL_NORMAL); + IDirectDraw7_RestoreDisplayMode((IDirectDraw7 *)This); /* Destroy the device window if we created one */ if(This->devicewindow != 0) @@ -441,9 +441,6 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, /* Switching from fullscreen? */ if(This->cooperative_level & DDSCL_FULLSCREEN) { - /* Restore the display mode */ - IDirectDraw7_RestoreDisplayMode(iface); - This->cooperative_level &= ~DDSCL_FULLSCREEN; This->cooperative_level &= ~DDSCL_EXCLUSIVE; This->cooperative_level &= ~DDSCL_ALLOWMODEX; diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 59f668b..7818255 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -37,6 +37,8 @@ static HWND hwnd; static int modes_cnt; static int modes_size; static LPDDSURFACEDESC modes; +static RECT rect_before_create; +static RECT rect_after_delete; static HRESULT (WINAPI *pDirectDrawEnumerateA)(LPDDENUMCALLBACKA,LPVOID); static HRESULT (WINAPI *pDirectDrawEnumerateW)(LPDDENUMCALLBACKW,LPVOID); @@ -83,6 +85,8 @@ static BOOL createdirectdraw(void) { HRESULT rc; + SetRect(&rect_before_create, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + rc = DirectDrawCreate(NULL, &lpDD, NULL); ok(rc==DD_OK || rc==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %x\n", rc); if (!lpDD) { @@ -95,11 +99,16 @@ static BOOL createdirectdraw(void) static void releasedirectdraw(void) { - if( lpDD != NULL ) - { - IDirectDraw_Release(lpDD); - lpDD = NULL; - } + if( lpDD != NULL ) + { + IDirectDraw_Release(lpDD); + lpDD = NULL; + SetRect(&rect_after_delete, 0, 0, + GetSystemMetrics(SM_CXSCREEN), + GetSystemMetrics(SM_CYSCREEN)); + ok(EqualRect(&rect_before_create, &rect_after_delete) != 0, + "Original display mode was not restored\n"); + } } static BOOL WINAPI crash_callbackA(GUID *lpGUID, LPSTR lpDriverDescription, @@ -414,11 +423,36 @@ static void setdisplaymode(int i) scrn.right, scrn.bottom, virt.left, virt.top, virt.right, virt.bottom); if (!EqualRect(&scrn, &orig_rect)) { + HRESULT rect_result; + /* Check that the client rect was resized */ rc = GetClientRect(hwnd, &test); ok(rc!=0, "GetClientRect returned %x\n", rc); rc = EqualRect(&scrn, &test); todo_wine ok(rc!=0, "Fullscreen window has wrong size\n"); + + /* Check that switching to normal cooperative level + does not restore the display mode */ + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_NORMAL); + ok(rc==DD_OK, "SetCooperativeLevel returned %x\n", rc); + SetRect(&test, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + rect_result = EqualRect(&scrn, &test); + ok(rect_result!=0, "Setting cooperative level to DDSCL_NORMAL changed the display mode\n"); + + /* Go back to fullscreen */ + rc = IDirectDraw_SetCooperativeLevel(lpDD, + hwnd, DDSCL_ALLOWMODEX | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(rc==DD_OK, "SetCooperativeLevel returned: %x\n",rc); + + /* If the display mode was changed, set the correct mode + to avoid irrelevant failures */ + if (rect_result == 0) + { + rc = IDirectDraw_SetDisplayMode(lpDD, + modes[i].dwWidth, modes[i].dwHeight, + U1(modes[i].ddpfPixelFormat).dwRGBBitCount); + ok(DD_OK==rc, "SetDisplayMode returned: %x\n",rc); + } } ok(GetClipCursor(&r), "GetClipCursor() failed\n"); /* ddraw sets clip rect here to the screen size, even for

1 0

Aric Stewart : usp10: Improve Hebrew support in ScriptItemize.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 4459c5b619fd5e556c613a49194482dcb81bf911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4459c5b619fd5e556c613a491… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 19 07:31:16 2010 -0500 usp10: Improve Hebrew support in ScriptItemize. --- dlls/usp10/tests/usp10.c | 125 +++++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/usp10.c | 16 +++++- 2 files changed, 138 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4459c5b619fd5e556c613…

1 0

Aric Stewart : usp10: Improve support for Syriac in ScriptItemize.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: af3dfc198a5d76dad236c1ff035998295dc6ee40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3dfc198a5d76dad236c1ff0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 19 07:31:28 2010 -0500 usp10: Improve support for Syriac in ScriptItemize. --- dlls/usp10/tests/usp10.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 16 +++++++++- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 2867677..9be26e5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -55,6 +55,10 @@ static void test_ScriptItemize( void ) static const WCHAR test7[] = {'p','a','r','t',' ','o','n','e',' ',0x05d7, 0x05dc, 0x05e7, ' ', 0x05e9, 0x05ea, 0x05d9, 0x05d9, 0x05dd, ' ','p','a','r','t',' ','t','h','r','e','e', 0}; static const WCHAR test8[] = {0x0633, 0x0644, 0x0627, 0x0645,0}; + /* Syriac (Like Arabic )*/ + static const WCHAR test9[] = {0x0710, 0x0712, 0x0712, 0x0714, '.',0}; + static const WCHAR test10[] = {0x0717, 0x0718, 0x071a, 0x071b,0}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -407,6 +411,70 @@ static void test_ScriptItemize( void ) ok(items[0].a.fRTL == 1, "Wrong fRTL\n"); ok(items[0].a.fLayoutRTL == 1, "Wrong fLayoutRTL\n"); ok(items[0].a.s.uBidiLevel == 1, "Wrong BidiLevel\n"); + + hr = ScriptItemize(test9, 5, 10, NULL, NULL, items, &nItems); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(nItems == 2, "Wrong number of items\n"); + ok(items[0].iCharPos == 0, "Wrong CharPos \n"); + ok(items[0].a.fRTL == 1, "Wrong fRTL\n"); + ok(items[0].a.fLayoutRTL == 1, "Wrong fLayoutRTL\n"); + ok(items[0].a.s.uBidiLevel == 1, "Wrong BidiLevel\n"); + ok(items[1].iCharPos == 4, "Wrong CharPos \n"); + ok(items[1].a.fRTL == 0, "Wrong fRTL\n"); + ok(items[1].a.fLayoutRTL == 0, "Wrong fLayoutRTL\n"); + ok(items[1].a.s.uBidiLevel == 0, "Wrong BidiLevel\n"); + + State.uBidiLevel = 0; + hr = ScriptItemize(test9, 5, 10, &Control, &State, items, &nItems); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(nItems == 2, "Wrong number of items\n"); + ok(items[0].iCharPos == 0, "Wrong CharPos \n"); + ok(items[0].a.fRTL == 1, "Wrong fRTL\n"); + ok(items[0].a.fLayoutRTL == 1, "Wrong fLayoutRTL\n"); + ok(items[0].a.s.uBidiLevel == 1, "Wrong BidiLevel\n"); + ok(items[1].iCharPos == 4, "Wrong CharPos \n"); + ok(items[1].a.fRTL == 0, "Wrong fRTL\n"); + ok(items[1].a.fLayoutRTL == 0, "Wrong fLayoutRTL\n"); + ok(items[1].a.s.uBidiLevel == 0, "Wrong BidiLevel\n"); + + State.uBidiLevel = 1; + hr = ScriptItemize(test9, 5, 10, &Control, &State, items, &nItems); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(nItems == 2, "Wrong number of items\n"); + ok(items[0].iCharPos == 0, "Wrong CharPos \n"); + ok(items[0].a.fRTL == 1, "Wrong fRTL\n"); + ok(items[0].a.fLayoutRTL == 1, "Wrong fLayoutRTL\n"); + ok(items[0].a.s.uBidiLevel == 1, "Wrong BidiLevel\n"); + ok(items[1].iCharPos == 4, "Wrong CharPos \n"); + todo_wine ok(items[1].a.fRTL == 1, "Wrong fRTL\n"); + todo_wine ok(items[1].a.fLayoutRTL == 1, "Wrong fLayoutRTL\n"); + todo_wine ok(items[1].a.s.uBidiLevel == 1, "Wrong BidiLevel\n"); + + hr = ScriptItemize(test10, 4, 10, NULL, NULL, items, &nItems); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(nItems == 1, "Wrong number of items\n"); + ok(items[0].iCharPos == 0, "Wrong CharPos \n"); + ok(items[0].a.fRTL == 1, "Wrong fRTL\n"); + ok(items[0].a.fLayoutRTL == 1, "Wrong fLayoutRTL\n"); + ok(items[0].a.s.uBidiLevel == 1, "Wrong BidiLevel\n"); + + State.uBidiLevel = 0; + hr = ScriptItemize(test10, 4, 10, &Control, &State, items, &nItems); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(nItems == 1, "Wrong number of items\n"); + ok(items[0].iCharPos == 0, "Wrong CharPos \n"); + ok(items[0].a.fRTL == 1, "Wrong fRTL\n"); + ok(items[0].a.fLayoutRTL == 1, "Wrong fLayoutRTL\n"); + ok(items[0].a.s.uBidiLevel == 1, "Wrong BidiLevel\n"); + + State.uBidiLevel = 1; + hr = ScriptItemize(test10, 4, 10, &Control, &State, items, &nItems); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(nItems == 1, "Wrong number of items\n"); + ok(items[0].iCharPos == 0, "Wrong CharPos \n"); + ok(items[0].a.fRTL == 1, "Wrong fRTL\n"); + ok(items[0].a.fLayoutRTL == 1, "Wrong fLayoutRTL\n"); + ok(items[0].a.s.uBidiLevel == 1, "Wrong BidiLevel\n"); } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a1af271..201a74a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -519,8 +519,11 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem #define Arabic_stop 0x06ff #define Hebrew_start 0x0590 #define Hebrew_stop 0x05ff +#define Syriac_start 0x0700 +#define Syriac_stop 0x074f #define Latin_start 0x0001 #define Latin_stop 0x024f +#define Script_Syriac 8 #define Script_Hebrew 7 #define Script_Arabic 6 #define Script_Latin 1 @@ -574,6 +577,9 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem if (pwcInChars[cnt] >= Hebrew_start && pwcInChars[cnt] <= Hebrew_stop) pItems[index].a.eScript = Script_Hebrew; else + if (pwcInChars[cnt] >= Syriac_start && pwcInChars[cnt] <= Syriac_stop) + pItems[index].a.eScript = Script_Syriac; + else if (pwcInChars[cnt] >= Latin_start && pwcInChars[cnt] <= Latin_stop) pItems[index].a.eScript = Script_Latin; @@ -584,7 +590,8 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem pItems[index].a.s.uBidiLevel = levels[cnt]; } else if ((pItems[index].a.eScript == Script_Arabic) || - (pItems[index].a.eScript == Script_Hebrew)) + (pItems[index].a.eScript == Script_Hebrew) || + (pItems[index].a.eScript == Script_Syriac)) { pItems[index].a.s.uBidiLevel = 1; pItems[index].a.fRTL = 1; @@ -619,6 +626,10 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem || (New_Script == Script_Hebrew && pwcInChars[cnt] == Numeric_space)) New_Script = Script_Hebrew; else + if ((pwcInChars[cnt] >= Syriac_start && pwcInChars[cnt] <= Syriac_stop) + || (New_Script == Script_Syriac && pwcInChars[cnt] == Numeric_space)) + New_Script = Script_Syriac; + else if ((pwcInChars[cnt] >= Latin_start && pwcInChars[cnt] <= Latin_stop) || (New_Script == Script_Latin && pwcInChars[cnt] == Numeric_space)) New_Script = Script_Latin; @@ -642,7 +653,8 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem pItems[index].a.s.uBidiLevel = levels[cnt]; } else if ((New_Script == Script_Arabic) || - (New_Script == Script_Hebrew)) + (New_Script == Script_Hebrew) || + (New_Script == Script_Syriac)) { pItems[index].a.s.uBidiLevel = 1; pItems[index].a.fRTL = 1;

1 0

Alexandre Julliard : winex11: Move creation of an ARGB bitmap for icons to a separate function.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 425312074593292c5bfe458380324ff5a7eea13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=425312074593292c5bfe45838… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 11:13:34 2010 +0200 winex11: Move creation of an ARGB bitmap for icons to a separate function. --- dlls/winex11.drv/window.c | 91 +++++++++++++++++++++++++++----------------- 1 files changed, 56 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 559f1d8..f8e7fb2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -812,6 +812,51 @@ static void destroy_icon_window( Display *display, struct x11drv_win_data *data /*********************************************************************** + * get_bitmap_argb + * + * Return the bitmap bits in ARGB format. Helper for setting icon hints. + */ +static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, unsigned int *size ) +{ + BITMAP bm; + BITMAPINFO *info; + unsigned int *bits = NULL; + int i; + + if (!GetObjectW( color, sizeof(bm), &bm )) return NULL; + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return NULL; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = bm.bmWidth; + info->bmiHeader.biHeight = -bm.bmHeight; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + *size = bm.bmWidth * bm.bmHeight + 2; + if (!(bits = HeapAlloc( GetProcessHeap(), 0, *size * sizeof(long) ))) goto failed; + if (!GetDIBits( hdc, color, 0, bm.bmHeight, bits + 2, info, DIB_RGB_COLORS )) goto failed; + + bits[0] = bm.bmWidth; + bits[1] = bm.bmHeight; + + /* convert to array of longs */ + if (bits && sizeof(long) > sizeof(int)) + for (i = *size - 1; i >= 0; i--) ((unsigned long *)bits)[i] = bits[i]; + + return (unsigned long *)bits; + +failed: + HeapFree( GetProcessHeap(), 0, info ); + HeapFree( GetProcessHeap(), 0, bits ); + return NULL; +} + + +/*********************************************************************** * set_icon_hints * * Set the icon wm hints @@ -838,6 +883,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICO BITMAP bm; ICONINFO ii; HDC hDC; + unsigned int size; + unsigned long *bits; GetIconInfo(hIcon, &ii); @@ -852,41 +899,15 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, HICO InvertRect(hDC, &rcMask); SelectObject(hDC, ii.hbmColor); /* force the color bitmap to x11drv mode too */ - GetObjectW(ii.hbmColor, sizeof(bm), &bm); - if (bm.bmBitsPixel == 32) /* FIXME: do this for other depths too */ - { - BITMAPINFO info; - unsigned int size, *bits; - - info.bmiHeader.biSize = sizeof(info); - info.bmiHeader.biWidth = bm.bmWidth; - info.bmiHeader.biHeight = -bm.bmHeight; - info.bmiHeader.biPlanes = 1; - info.bmiHeader.biBitCount = 32; - info.bmiHeader.biCompression = BI_RGB; - info.bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; - info.bmiHeader.biXPelsPerMeter = 0; - info.bmiHeader.biYPelsPerMeter = 0; - info.bmiHeader.biClrUsed = 0; - info.bmiHeader.biClrImportant = 0; - size = bm.bmWidth * bm.bmHeight + 2; - bits = HeapAlloc( GetProcessHeap(), 0, size * sizeof(long) ); - if (bits && GetDIBits( hDC, ii.hbmColor, 0, bm.bmHeight, bits + 2, &info, DIB_RGB_COLORS )) - { - bits[0] = bm.bmWidth; - bits[1] = bm.bmHeight; - if (sizeof(long) > sizeof(int)) /* convert to array of longs */ - { - int i = size; - while (--i >= 0) ((unsigned long *)bits)[i] = bits[i]; - } - wine_tsx11_lock(); - XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON), - XA_CARDINAL, 32, PropModeReplace, (unsigned char *)bits, size ); - wine_tsx11_unlock(); - } - HeapFree( GetProcessHeap(), 0, bits ); - } + bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); + wine_tsx11_lock(); + if (bits) + XChangeProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON), + XA_CARDINAL, 32, PropModeReplace, (unsigned char *)bits, size ); + else + XDeleteProperty( display, data->whole_window, x11drv_atom(_NET_WM_ICON) ); + wine_tsx11_unlock(); + HeapFree( GetProcessHeap(), 0, bits ); SelectObject(hDC, hbmOrig); DeleteDC(hDC);

1 0

Alexandre Julliard : winex11: Generate an alpha channel from the bitmask for icons that don't have one.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: f0644c6d071e3aa9601a50d38c42dde68d667030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0644c6d071e3aa9601a50d38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 19 14:49:26 2010 +0200 winex11: Generate an alpha channel from the bitmask for icons that don't have one. --- dlls/winex11.drv/window.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f8e7fb2..73c45ff 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -820,8 +820,9 @@ static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, uns { BITMAP bm; BITMAPINFO *info; - unsigned int *bits = NULL; - int i; + unsigned int *ptr, *bits = NULL; + unsigned char *mask_bits = NULL; + int i, j, has_alpha = 0; if (!GetObjectW( color, sizeof(bm), &bm )) return NULL; if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return NULL; @@ -843,6 +844,23 @@ static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, uns bits[0] = bm.bmWidth; bits[1] = bm.bmHeight; + for (i = 0; i < bm.bmWidth * bm.bmHeight; i++) + if ((has_alpha = (bits[i + 2] & 0xff000000) != 0)) break; + + if (!has_alpha) + { + unsigned int width_bytes = (bm.bmWidth + 31) / 32 * 4; + /* generate alpha channel from the mask */ + info->bmiHeader.biBitCount = 1; + info->bmiHeader.biSizeImage = width_bytes * bm.bmHeight; + if (!(mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto failed; + if (!GetDIBits( hdc, mask, 0, bm.bmHeight, mask_bits, info, DIB_RGB_COLORS )) goto failed; + ptr = bits + 2; + for (i = 0; i < bm.bmHeight; i++) + for (j = 0; j < bm.bmWidth; j++, ptr++) + if ((mask_bits[i * width_bytes + j / 8] << (j % 8)) & 0x80) *ptr |= 0xff000000; + } + /* convert to array of longs */ if (bits && sizeof(long) > sizeof(int)) for (i = *size - 1; i >= 0; i--) ((unsigned long *)bits)[i] = bits[i]; @@ -852,6 +870,7 @@ static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, uns failed: HeapFree( GetProcessHeap(), 0, info ); HeapFree( GetProcessHeap(), 0, bits ); + HeapFree( GetProcessHeap(), 0, mask_bits ); return NULL; }

1 0

Joel Holdsworth : wcmd: Replaced program icon with a Tango compliant icon.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 8b37b340b7c902c78eb160c15b95a27039ed1e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b37b340b7c902c78eb160c15… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Apr 18 16:28:12 2010 +0100 wcmd: Replaced program icon with a Tango compliant icon. --- programs/cmd/wcmd.ico | Bin 15086 -> 25214 bytes programs/cmd/wcmd.svg | 494 +++++++++++++++++++++++++++++-------------------- 2 files changed, 289 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b37b340b7c902c78eb16…

1 0

Joel Holdsworth : winemine: Replaced program icon with a Tango compliant icon.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 878224dd2fde2b772ae64cec947e82a8cfa19b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=878224dd2fde2b772ae64cec9… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Apr 18 16:28:20 2010 +0100 winemine: Replaced program icon with a Tango compliant icon. --- programs/winemine/winemine.ico | Bin 15086 -> 25214 bytes programs/winemine/winemine.svg | 969 ++++------------------------------------ 2 files changed, 98 insertions(+), 871 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=878224dd2fde2b772ae64…

1 0

Joel Holdsworth : winetest: Replaced program icon with a Tango compliant icon.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: b1e891cff5ec1d87ae0215e41834b7e714ebc125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e891cff5ec1d87ae0215e41… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Apr 18 16:28:28 2010 +0100 winetest: Replaced program icon with a Tango compliant icon. --- programs/winetest/winetest.ico | Bin 15086 -> 25214 bytes programs/winetest/winetest.svg | 1011 ++++++++-------------------------------- 2 files changed, 191 insertions(+), 820 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1e891cff5ec1d87ae021…

1 0

Joel Holdsworth : winefile: Replaced program icon with a Tango compliant icon.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: f40e0c6e8711a0df29ebab4b825e4edabeb5ad33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40e0c6e8711a0df29ebab4b8… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Apr 18 16:28:43 2010 +0100 winefile: Replaced program icon with a Tango compliant icon. --- programs/winefile/winefile.ico | Bin 15086 -> 25214 bytes programs/winefile/winefile.svg | 959 +++++++++------------------------------- 2 files changed, 200 insertions(+), 759 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f40e0c6e8711a0df29eba…

1 0

Joel Holdsworth : regedit: Replaced progam icon with a Tango compliant icon .
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 1339b0058ba003d5be494a409fd078ef85b09278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1339b0058ba003d5be494a409… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Apr 18 16:28:51 2010 +0100 regedit: Replaced progam icon with a Tango compliant icon. --- programs/regedit/regedit.ico | Bin 15086 -> 25214 bytes programs/regedit/regedit.svg | 1152 ++++++++---------------------------------- 2 files changed, 208 insertions(+), 944 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1339b0058ba003d5be494…

1 0