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

Michael Stefaniuc : winhttp: Remove redundant "not 0" test of argument len.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: eb558c4403fb344972e0f106ab32a2f1eab771ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb558c4403fb344972e0f106a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 17 01:11:43 2010 +0200 winhttp: Remove redundant "not 0" test of argument len. --- dlls/winhttp/net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 455ee55..5890c06 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -736,7 +736,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd } else memcpy( conn->peek_msg, buf, *recvd ); } - if (*recvd < 1 && len) return FALSE; + if (*recvd < 1) return FALSE; return TRUE; #else return FALSE;

1 0

Michael Stefaniuc : riched20: Avoid using long.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: cf13e8a3900e3831afe08c7cedf3bd23fdd28aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf13e8a3900e3831afe08c7ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 17 01:11:23 2010 +0200 riched20: Avoid using long. --- dlls/riched20/editor.c | 2 +- dlls/riched20/rtf.h | 2 +- dlls/riched20/tests/editor.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 591f9ff..fcbab6e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -289,7 +289,7 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea TRACE("%08x %p\n", dwFormat, stream); do { - long nWideChars = 0; + LONG nWideChars = 0; if (!stream->dwSize) { diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index d8ac323..4bff331 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1122,7 +1122,7 @@ struct _RTF_Info { char *rtfTextBuf; int rtfTextLen; - long rtfLineNum; + int rtfLineNum; int rtfLinePos; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ee26683..685eead 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4318,7 +4318,7 @@ const struct exsetsel_s exsetsel_tests[] = { static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { CHARRANGE cr; - long result; + LRESULT result; int start, end; cr.cpMin = setsel->min;

1 0

Michael Stefaniuc : mciavi32: Remove redundant "not NULL" checks of the lpParms arg.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: cea6f01cd97a9a18afa9aa98f1d8eac727fd32ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea6f01cd97a9a18afa9aa98f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 17 01:12:08 2010 +0200 mciavi32: Remove redundant "not NULL" checks of the lpParms arg. --- dlls/mciavi32/mciavi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 1c15dc5..a3bce9d 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -427,10 +427,10 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms dwFromFrame = wma->dwCurrVideoFrame; dwToFrame = wma->dwPlayableVideoFrames - 1; - if (lpParms && (dwFlags & MCI_FROM)) { + if (dwFlags & MCI_FROM) { dwFromFrame = MCIAVI_ConvertTimeFormatToFrame(wma, lpParms->dwFrom); } - if (lpParms && (dwFlags & MCI_TO)) { + if (dwFlags & MCI_TO) { dwToFrame = MCIAVI_ConvertTimeFormatToFrame(wma, lpParms->dwTo); } if (dwToFrame >= wma->dwPlayableVideoFrames) @@ -552,7 +552,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms mci_play_done: wma->dwStatus = MCI_MODE_STOP; - if (lpParms && (dwFlags & MCI_NOTIFY)) { + if (dwFlags & MCI_NOTIFY) { TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL);

1 0

Wolfram Sang : user32: Apply sanity-check in BITMAP_Load.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 636e35d8ada49883fc16de3700a006f7daad6441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=636e35d8ada49883fc16de370… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Mon May 17 04:57:36 2010 +0200 user32: Apply sanity-check in BITMAP_Load. --- dlls/user32/cursoricon.c | 9 +++++++-- dlls/user32/tests/cursoricon.c | 21 ++++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8cccbbe..dcd94b1 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2421,12 +2421,16 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (bmfh->bfType != 0x4d42 /* 'BM' */) { WARN("Invalid/unsupported bitmap format!\n"); - UnmapViewOfFile( ptr ); - return 0; + goto end_close; } offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } + if (info->bmiHeader.biHeight > 65535 || info->bmiHeader.biWidth > 65535) { + WARN("Broken BitmapInfoHeader!\n"); + goto end_close; + } + size = bitmap_info_size(info, DIB_RGB_COLORS); fix_info = HeapAlloc(GetProcessHeap(), 0, size); scaled_info = HeapAlloc(GetProcessHeap(), 0, size); @@ -2490,6 +2494,7 @@ end: if (screen_mem_dc) DeleteDC(screen_mem_dc); HeapFree(GetProcessHeap(), 0, scaled_info); HeapFree(GetProcessHeap(), 0, fix_info); +end_close: if (loadflags & LR_LOADFROMFILE) UnmapViewOfFile( ptr ); return hbitmap; diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index a7be34f..8af4126 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -667,14 +667,14 @@ static void test_CreateIcon(void) /* Shamelessly ripped from dlls/oleaut32/tests/olepicture.c */ /* 1x1 pixel gif */ -static const unsigned char gifimage[35] = { +static unsigned char gifimage[35] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, 0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, 0x01,0x00,0x3b }; /* 1x1 pixel jpg */ -static const unsigned char jpgimage[285] = { +static unsigned char jpgimage[285] = { 0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x01,0x2c, 0x01,0x2c,0x00,0x00,0xff,0xdb,0x00,0x43,0x00,0x05,0x03,0x04,0x04,0x04,0x03,0x05, 0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x07,0x0c,0x08,0x07,0x07,0x07,0x07,0x0f,0x0b, @@ -696,7 +696,7 @@ static const unsigned char jpgimage[285] = { }; /* 1x1 pixel png */ -static const unsigned char pngimage[285] = { +static unsigned char pngimage[285] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, 0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, @@ -708,7 +708,7 @@ static const unsigned char pngimage[285] = { /* 1x1 pixel bmp with gap between palette and bitmap. Correct bitmap contains only zeroes, gap is 0xFF. */ -static const unsigned char bmpimage[70] = { +static unsigned char bmpimage[70] = { 0x42,0x4d,0x46,0x00,0x00,0x00,0xDE,0xAD,0xBE,0xEF,0x42,0x00,0x00,0x00,0x28,0x00, 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, @@ -717,7 +717,7 @@ static const unsigned char bmpimage[70] = { }; /* 2x2 pixel gif */ -static const unsigned char gif4pixel[42] = { +static unsigned char gif4pixel[42] = { 0x47,0x49,0x46,0x38,0x37,0x61,0x02,0x00,0x02,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, 0x39,0x62,0xfc,0xff,0x1a,0xe5,0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x02,0x00, 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b @@ -746,7 +746,7 @@ static void test_LoadImageBitmap(HBITMAP hbm) ok(color_match(pixel, 0x00ffffff), "Pixel is 0x%08x\n", pixel); } -static void test_LoadImageFile(const unsigned char * image_data, +static void test_LoadImageFile(unsigned char * image_data, unsigned int image_size, const char * ext, BOOL expect_success) { HANDLE handle; @@ -787,7 +787,7 @@ static void test_LoadImageFile(const unsigned char * image_data, "Last error: %u\n", error); if (handle != NULL) DestroyIcon(handle); - /* Load as bitmap. Should succeed if bmp, fail for everything else */ + /* Load as bitmap. Should succeed for correct bmp, fail for everything else */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); error = GetLastError(); @@ -897,6 +897,13 @@ static void test_LoadImage(void) test_LoadImageFile(gif4pixel, sizeof(gif4pixel), "gif", 0); test_LoadImageFile(jpgimage, sizeof(jpgimage), "jpg", 0); test_LoadImageFile(pngimage, sizeof(pngimage), "png", 0); + /* Check failure for broken BMP images */ + bmpimage[0x14]++; /* biHeight > 65535 */ + test_LoadImageFile(bmpimage, sizeof(bmpimage), "bmp", 0); + bmpimage[0x14]--; + bmpimage[0x18]++; /* biWidth > 65535 */ + test_LoadImageFile(bmpimage, sizeof(bmpimage), "bmp", 0); + bmpimage[0x18]--; } static void test_CreateIconFromResource(void)

1 0

Joel Holdsworth : comctl32: Replaced idb_view_large. bmp with a Tango compliant tool strip.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 6ac142b0b7e4222ce11ca42dbc430648bbfefe43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac142b0b7e4222ce11ca42db… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:08:30 2010 +0100 comctl32: Replaced idb_view_large.bmp with a Tango compliant tool strip. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/idb_view_large.bmp | Bin 2270 -> 27770 bytes dlls/comctl32/idb_view_large.svg | 289 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 290 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ac142b0b7e4222ce11ca…

1 0

Joel Holdsworth : comctl32: Replaced idb_std_small. bmp with a Tango compliant tool strip.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 4079e368b5c060afba6a3158321ae80ddcee8c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4079e368b5c060afba6a31583… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:08:45 2010 +0100 comctl32: Replaced idb_std_small.bmp with a Tango compliant tool strip. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/idb_std_small.bmp | Bin 1824 -> 15482 bytes dlls/comctl32/idb_std_small.svg | 45 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4079e368b5c060afba6a3…

1 0

Joel Holdsworth : comctl32: Replaced idb_std_large. bmp with a Tango compliant tool strip.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 32adeb44d9fa1e51d12cf665706d30ab2d611830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32adeb44d9fa1e51d12cf6657… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:08:59 2010 +0100 comctl32: Replaced idb_std_large.bmp with a Tango compliant tool strip. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/idb_std_large.bmp | Bin 2774 -> 34682 bytes dlls/comctl32/idb_std_large.svg | 1016 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 1017 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32adeb44d9fa1e51d12cf…

1 0

Joel Holdsworth : comctl32: Replaced idb_hist_small. bmp with a Tango compliant tool strip.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 6e5b8597ca4165d656ff44eac07021d5eec5cba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5b8597ca4165d656ff44eac… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:09:21 2010 +0100 comctl32: Replaced idb_hist_small.bmp with a Tango compliant tool strip. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/idb_hist_small.bmp | Bin 1418 -> 5242 bytes dlls/comctl32/idb_hist_small.svg | 254 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 255 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e5b8597ca4165d656ff4…

1 0

Joel Holdsworth : comctl32: Replaced idb_hist_large. bmp with a Tango compliant tool strip.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 4578a9262d03489819d513a413f44d726f371fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4578a9262d03489819d513a41… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:09:37 2010 +0100 comctl32: Replaced idb_hist_large.bmp with a Tango compliant tool strip. --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/idb_hist_large.bmp | Bin 1558 -> 11642 bytes dlls/comctl32/idb_hist_large.svg | 55 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 7d1d28a..cb0b947 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -76,6 +76,7 @@ RC_SRCS = \ rsrc.rc SVG_SRCS = \ + idb_hist_large.svg \ idb_hist_small.svg \ idb_std_large.svg \ idb_std_small.svg \ diff --git a/dlls/comctl32/idb_hist_large.bmp b/dlls/comctl32/idb_hist_large.bmp index 20596fa..b7818fb 100644 Binary files a/dlls/comctl32/idb_hist_large.bmp and b/dlls/comctl32/idb_hist_large.bmp differ diff --git a/dlls/comctl32/idb_hist_large.svg b/dlls/comctl32/idb_hist_large.svg new file mode 100644 index 0000000..a811fbc --- /dev/null +++ b/dlls/comctl32/idb_hist_large.svg @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg id="bitmap:120-32" xmlns="http://www.w3.org/2000/svg" height="24" width="120" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs id="defs2916"> + <radialGradient id="radialGradient1361" gradientUnits="userSpaceOnUse" cy="36.421" cx="24.837" gradientTransform="matrix(1,0,0,0.536723,0,16.87306)" r="15.645"> + <stop id="stop8664" stop-color="#000" offset="0"/> + <stop id="stop8666" stop-color="#000" stop-opacity="0" offset="1"/> + </radialGradient> + <radialGradient id="radialGradient3241" gradientUnits="userSpaceOnUse" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(-0.99935,0,0,0.783428,33.4962,1.6234577)"> + <stop id="stop8652-1" stop-color="#FFF" offset="0"/> + <stop id="stop8654-1" stop-color="#FFF" stop-opacity="0" offset="1"/> + </radialGradient> + <radialGradient id="radialGradient3244" gradientUnits="userSpaceOnUse" cx="17.481" cy="16.118" r="16.956" gradientTransform="matrix(-0.411558,0.00716573,-0.00521275,-0.299389,21.69622,19.724318)"> + <stop id="stop2593-6" stop-color="#73d216" offset="0"/> + <stop id="stop2595-2" stop-color="#4e9a06" offset="1"/> + </radialGradient> + <radialGradient id="radialGradient3263" gradientUnits="userSpaceOnUse" cx="15.987" cy="1.535" r="17.171" gradientTransform="matrix(0.99731932,0,0,0.783428,14.565151,1.62346)"> + <stop id="stop8652" stop-color="#FFF" offset="0"/> + <stop id="stop8654" stop-color="#FFF" stop-opacity="0" offset="1"/> + </radialGradient> + <radialGradient id="radialGradient3266" gradientUnits="userSpaceOnUse" cx="27.547" cy="15.843" r="16.956" gradientTransform="matrix(0.41071672,0.0074091,0.00521275,-0.288964,26.347891,19.75179)"> + <stop id="stop2593" stop-color="#73d216" offset="0"/> + <stop id="stop2595" stop-color="#4e9a06" offset="1"/> + </radialGradient> + <linearGradient id="linearGradient3278" y2="4" gradientUnits="userSpaceOnUse" y1="15" gradientTransform="translate(96,-1)" x2="4" x1="4"> + <stop id="stop10718" stop-color="#d3d7cf" offset="0"/> + <stop id="stop10720" stop-color="#babdb6" offset="1"/> + </linearGradient> + <linearGradient id="linearGradient3281" y2="5" gradientUnits="userSpaceOnUse" y1="2" gradientTransform="translate(96,0)" x2="4" x1="4"> + <stop id="stop10746" stop-color="#729fcf" offset="0"/> + <stop id="stop10748" stop-color="#3465a4" offset="1"/> + </linearGradient> + </defs> + <g id="g3268"> + <path id="path8660" opacity="0.32156863" style="color:#000000;" d="m40.482,36.421a15.645,8.3969,0,1,1,-31.289,0,15.645,8.3969,0,1,1,31.289,0z" fill-rule="evenodd" transform="matrix(0.703097,0,0,0.655005,18.537026,-6.3560112)" fill="url(#radialGradient1361)"/> + <path id="path8643" stroke-linejoin="round" style="color:#000000;stroke-dasharray:none;" d="m28.501,16.5,0-9,5.9878,0,0-4,10.011,8.5554l-10.011,8.445v-4h-5.9878z" fill-rule="evenodd" stroke-dashoffset="0" stroke="#3a7304" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.99999964" fill="url(#radialGradient3266)"/> + <path id="path8645" opacity="0.5080214" style="color:#000000;" d="m34.988,4.5,0,3.5h-5.988l0.03167,4.5c5.9878-3,8.9817,2,14.471-0.5l-8.515-7.5z" fill-rule="evenodd" fill="url(#radialGradient3263)"/> + <path id="path8658" opacity="0.48128339" stroke-linejoin="miter" style="color:#000000;stroke-dasharray:none;" d="m29.499,15.5,0-7,5.9878,0,0-3,7.4848,6.5-7.4848,6.5,0-3-5.9878,0z" stroke-dashoffset="0" stroke="#FFF" stroke-linecap="butt" stroke-miterlimit="10" stroke-width="0.99999976" fill="none"/> + </g> + <g id="g3246"> + <path id="path8660-4" opacity="0.32156863" style="color:#000000;" d="m40.482,36.421a15.645,8.3969,0,1,1,-31.289,0,15.645,8.3969,0,1,1,31.289,0z" fill-rule="evenodd" transform="matrix(0.703097,0,0,0.655005,-5.4629086,-6.3560133)" fill="url(#radialGradient1361)"/> + <path id="path8643-2" stroke-linejoin="round" style="color:#000000;stroke-dasharray:none;" d="m19.532,16.5,0-9-6,0,0-4-10.032,8.5554,10.032,8.4446,0-4,6,0z" fill-rule="evenodd" stroke-dashoffset="0" stroke="#3a7304" stroke-linecap="round" stroke-miterlimit="10" stroke-width="0.99999988" fill="url(#radialGradient3244)"/> + <path id="path8645-4" opacity="0.5080214" style="color:#000000;" d="m13.032,4.5,0,3.5,6,0-0.03173,4.5c-6-3-9,2-14.5-0.5l8.5317-7.5z" fill-rule="evenodd" fill="url(#radialGradient3241)"/> + <path id="path8658-0" opacity="0.48128339" stroke-linejoin="miter" style="color:#000000;stroke-dasharray:none;" d="m18.532,15.5,0-7-6,0,0-3-7.5,6.5,7.5,6.5,0-3,6,0z" stroke-dashoffset="0" stroke="#FFF" stroke-linecap="butt" stroke-miterlimit="10" stroke-width="1" fill="none"/> + </g> + <image id="image3101" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A /wD/oL2nkwAAAAlwSFlzAAAN1wAADdcBQiibeAAAAAd0SU1FB9kHCwovJyZFtIYAAAKZSURBVDjL vZTLT1QxGMVPe3vbKXONgRASAwkwK5c+4k5NJHHQnUYTFq50JRGDEHVjTPARlsYQdDAYNxoT/wAB WfkfqFGDiuIjwMgwYww6L2amn4t7uc6VuTgstKu2aX89PedrgX/U2Fqnf6DvdDL5NUFEqNjtmE/L 0E22IOzs/LFuPhbr7B0cuDAGAGLtgOXldOLQ4W60tbVi9449eDwxjcSj17h08QSIvEWejKvD97Fv 7350dR2AZVkAAGMMhq4MJQAEwFQqlTA5MQXOOZ7teo6ZN7OolFvw4t0CFpZXfFWtLVsBAE+mJ/Hx 8wcAQEd7B+IHuwPqRfXAcRwoFcHZM/2YmprGy9tPkfn2HUtLGV9uRBiUV/M4euQY4vE4iAg3R26s syUAZowjk0mDyIAxoLSax2oxj2Ih6wdSKmiUSwVUKhWUyyUIYdfMQYSmygDOJWzbhi2V6xcBlrDB reptVA/49yLOOYTUECoKpYtegAQ7oiFs7QdGtbnhil24BcY5LGH7ACEkuCVAZDywqb03DKqUdPMK kSSl9OC0OcWRSATMq4QtDQpRrbDysxAAG2Pq9bhaccQLjLA49wWpZBot25rR3Ljdv5FrBdVhBVUr VuCc4e2r90gl07h1vQepZBqzM3Pus7YljKHQ8PhGVhhDSCXTGBvuQVOjg9FrxzH/aRGcM0hph9qw oRVSKjwYOQmtNbTWAAiO4+Dh6Cnkcvm//m4i6AT59RmNNniqWCB9x3GgtUahUKwf7B9ABkqpQK26 YBduWRai0YbNg40xXjBu6m5Zba6FgKlKLdUF+vPwoMeG0NTY5D0MDsviYIx5Pybz+szru3NrwLv3 xhGLdfbWAo9mc9m+bC6LO+Njm7q2lOry4Lnz1/E/2i8h2hqY4UCQ2AAAAABJRU5ErkJggg== " height="22" width="22" y="1" x="49"/> + <image id="image3115" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1QoRFQYvy1T0IwAAAzhJREFUOMutk91rW2Ucxz/Pc56T k7Osprqa6Iq9KLS1JqUJrXUT9LZeKYhziHjltZfiEMuk1KrzUiYI3vkXFBUvZJdSNzPQWhbm0rXd 8rK0aR1NmreTnMeLJIeQprOiXzg8nHOe5/N8f2+CHs29culj4DLHSAiRv/7jp08BNPKvmcBzoObA 3QV3FdhV4RVXdA58duWTRWAB4FYyxe18mIVL76B1B9haF5e/JTqcY3xinDPBCi/NPmT4mfNIa4S9 7LX1s0/88QY0UqrLzMIH738IwHff/8DyVz/z+58ZMrsH3obhUBCANy+8xfz8PLp2A12/gwi8CsLP 0FkjSvXW69D4WvWGurm5SaGwh1Mvs7f/kHx+z7PrVy6NeoVCoUA2m8UUFR6zHcxmGWFI6pU0PikO 0DRVnxxiSInjlKnXKtSqh63vgFO1aThVtra2WFtbQ4oGc/EnQV/DNG0y91eZGHFuAsW+YCkFUlqY ponpswDQGgxlIg3F6OgosVgMgKrbxKnlGTrVILFuMTHS/E2FV9z+jg2J8tkoK4Bl19oF1Jh+G2Xa bGxsMDg4CEA8HkfLYfCd4UHhJ1R4pQrQF9xybSCkxFCm1xlK+ZCGYmxsjNnZ2Z5zCq29JkP2gn+9 eQPLslr16hB7tL29TSKRIJFIYJomUh7BHHX8wvPnyGQyCFq3D5yyCNgWB6WqtycWizEzM4Nod0tn fSRYCEGpVAIBWmuyd++xkysQenqIocefBSCTyWDbNgBTU1N9Hct+YL/fjxSC2+spdnIFri5dZCdX 4E7yLgCRSIRoNMr09DRSyr6OZb8c+v1+XK3ZyRX4cvECg8EBri5dJL2VRUpBIBBAKdVV6BPk+Jfr q4yPTfDNlbdJp9OUD4tUyiVc1+Xyey9Tq9VIpVLs7+977dZPR8Dnz71IMBikWCwSCoVaYUnphdxs NnEch0AgAIBhGLiue/LiSSlJJpP8k+Lx+MlS0a3JyUlM0zxmgGR7Sk/ouLsvH+X4X/dxtyKRiOeu 47B31Vqj+0zoEXA4HOb/kAd2XXfp8y+WP/ovsPv30u966TzmstPAQPs5DQTaw2QAGnCACvAXcAAc tt+b7f/8DTlPJBp8S28uAAAAAElFTkSuQmCC " height="22" width="22" y="1" x="73"/> + <g id="g3306"> + <path id="rect9935" stroke-linejoin="round" d="m98.5,1.5,19,0c0.554,0,1,0.446,1,1v20h-21v-20c0-0.554,0.446-1,1-1z" stroke="#204a87" stroke-linecap="round" stroke-miterlimit="4" stroke-width="1" fill="url(#linearGradient3281)"/> + <rect id="rect9941" stroke-linejoin="miter" style="stroke-dasharray:none;" height="15" width="5" stroke="#d3d7cf" stroke-linecap="round" stroke-miterlimit="4" y="5.5" x="99.5" stroke-width="1" fill="url(#linearGradient3278)"/> + <path id="path9939" stroke-linejoin="miter" d="M105.5,21" fill-rule="evenodd" stroke="#888a85" stroke-linecap="butt" stroke-width="1px" fill="#204a87"/> + <rect id="rect10713" stroke-linejoin="miter" style="stroke-dasharray:none;" height="15" width="10" stroke="#eeeeec" stroke-linecap="round" stroke-miterlimit="4" y="5.5" x="106.5" stroke-width="1" fill="#eeeeec"/> + <path id="path10754" stroke-linejoin="miter" d="m105.5,21,0-16" stroke="#888a85" stroke-linecap="butt" stroke-width="1px" fill="none"/> + </g> +</svg>

1 0

Joel Holdsworth : wordpad: Replaced toolbar. bmp with a Tango compliant tool strip.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 4ac898d7cf7a5bf2ad975ea58c2c12bd1a71de59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac898d7cf7a5bf2ad975ea58… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun May 16 23:09:55 2010 +0100 wordpad: Replaced toolbar.bmp with a Tango compliant tool strip. --- programs/wordpad/Makefile.in | 4 +++- programs/wordpad/toolbar.bmp | Bin 246 -> 1146 bytes programs/wordpad/toolbar.svg | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/Makefile.in b/programs/wordpad/Makefile.in index 8daea72..0ad0549 100644 --- a/programs/wordpad/Makefile.in +++ b/programs/wordpad/Makefile.in @@ -36,6 +36,8 @@ RC_SRCS = \ Zh.rc \ rsrc.rc -SVG_SRCS = wordpad.svg +SVG_SRCS = \ + toolbar.svg \ + wordpad.svg @MAKE_PROG_RULES@ diff --git a/programs/wordpad/toolbar.bmp b/programs/wordpad/toolbar.bmp index 0580719..37f1925 100644 Binary files a/programs/wordpad/toolbar.bmp and b/programs/wordpad/toolbar.bmp differ diff --git a/programs/wordpad/toolbar.svg b/programs/wordpad/toolbar.svg new file mode 100644 index 0000000..43724b4 --- /dev/null +++ b/programs/wordpad/toolbar.svg @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg id="bitmap:16-32" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs id="defs2898"></defs> + <image id="image2904" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1gELCgIyFaRN9wAAAelJREFUOMuVk09rE1EUxX8zb4gx CWFmGRAhC7uyrsRvoCCI0i66EBdS+gG6SCMq0iKMTMcK6kZQaOgmSPFfapeu1FVpqlYJuHDTaieh 05JFgjGZl+dCZ5pYleas7rn3nsc99/LgNxzXXnBc+1UPn3ZcW/2Lh9Bm527lVFfdZkBoujZ1JXdt Dse1lVJKOa6t3rx9rUI4rq0qlYqSUiopZR8P6wB676vvP7zD8zw8zwNgafk5W1vfqNVqEQ/jEEYY nD83ghCCXg6gaXofr9frZDKZqE9vNBoAmKZJMplkY/Mrj+YLpFIp8tdvcGl8gpXVMpZlYVkWpmkC EOoiC/F4HF3XsWddnr4oIaXk7JnTODdneDhfQCmFUopqrdpnQf9zu/fv7B1kePg4V6dnGBsdiXJB p9O/A9/fAaDVau071WQuz4N7dwlkAIBX9Wj9+NUX6oz/3fpwPM7kVB4FPHtc/GuP0ekZSUqJYRgs PVlECEFxoRDVfN9n6NgQiUSCIOgQ6gxN06KmWCyGEAJd1xFC0Gw2qdaqBEHA7u4O2WyWl8sltrd9 Ql1kofe2IdLp9L58u93m46f1PQtKqY3xictHB/0LQog1AA3QTpw81b04doFyee1A4s9fNllfXTkE dA0gBlBcLA06xBHg+0/ideVD/5EpgQAAAABJRU5ErkJggg== " height="16" width="16" y="0" x="0"/> +</svg>

1 0