August 2007 - Wine-commits - list.winehq.org

Kirill K. Smirnov : wineconsole: Rearrange control elements in Russian resources.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: b4779619c5886917a701607e6b2273e0e6582e58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4779619c5886917a701607e6… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Aug 9 11:52:56 2007 +0400 wineconsole: Rearrange control elements in Russian resources. --- programs/wineconsole/wineconsole_Ru.rc | 34 ++++++++++++++++---------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index 755d76c..8eea4df 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -45,23 +45,23 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " �� " FONT 8, "MS Shell Dlg" { - GROUPBOX "�� ", -1, 10, 11, 60, 44, BS_GROUPBOX - AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP - AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP - AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP + GROUPBOX "�� ", -1, 10, 11, 60, 54, BS_GROUPBOX + AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_SMALL, 14, 23, 52, 10, WS_TABSTOP + AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_MEDIUM, 14, 33, 52, 10, WS_TABSTOP + AUTORADIOBUTTON "&��", IDC_OPT_CURSOR_LARGE, 14, 43, 52, 10, WS_TABSTOP - GROUPBOX "��", -1, 75, 11, 125, 44, BS_GROUPBOX - LTEXT "�� ", -1, 79, 23, 40, 10 - AUTOCHECKBOX "&�trl", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP - AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP - LTEXT "�� ", -1, 79, 43, 50, 10 - AUTOCHECKBOX "&��", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP + GROUPBOX "��", -1, 75, 11, 123, 54, BS_GROUPBOX + LTEXT "�� ", -1, 79, 23, 50, 20 + AUTOCHECKBOX "&�trl", IDC_OPT_CONF_CTRL, 144, 23, 52, 10, WS_TABSTOP + AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 144, 33, 52, 10, WS_TABSTOP + LTEXT "�� ", -1, 79, 43, 60, 20 + AUTOCHECKBOX "&��", IDC_OPT_QUICK_EDIT, 144, 51, 52, 10, WS_TABSTOP - GROUPBOX "�� ", -1, 10, 57, 190, 35, BS_GROUPBOX - LTEXT "&�� :", -1, 14, 67, 78, 18 - EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + GROUPBOX "�� ", -1, 10, 67, 189, 35, BS_GROUPBOX + LTEXT "&�� :", -1, 14, 77, 78, 18 + EDITTEXT IDC_OPT_HIST_SIZE, 82, 79, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "&�� ", IDC_OPT_HIST_NODOUBLE, 130, 67, 50, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "&�� ", IDC_OPT_HIST_NODOUBLE, 120, 77, 70, 18, WS_TABSTOP|BS_MULTILINE } IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 @@ -77,7 +77,7 @@ FONT 8, "MS Shell Dlg" LTEXT "&��", -1, 158, 5, 40, 8 LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 - LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18 + LTEXT "", IDC_FNT_FONT_INFO, 128, 71, 80, 25 } IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 @@ -101,10 +101,10 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "�� ", -1, 115, 11, 80, 42, BS_GROUPBOX + GROUPBOX "�� ", -1, 115, 11, 85, 42, BS_GROUPBOX AUTOCHECKBOX "&�� ", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP - GROUPBOX "��", -1, 115, 55, 80, 42 + GROUPBOX "��", -1, 115, 55, 85, 42 COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP }

1 0

Nigel Liang : winecfg: Fix crash when remove app button is pressed in applications tab.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: 4f03cf760bf360608b81ba980de7a9a88d71f00d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f03cf760bf360608b81ba980… Author: Nigel Liang <ncliang(a)gmail.com> Date: Wed Aug 8 18:07:05 2007 -0700 winecfg: Fix crash when remove app button is pressed in applications tab. --- programs/winecfg/winecfg.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 4c86514..342d1e8 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -467,13 +467,16 @@ static void set_reg_key_ex(HKEY root, const WCHAR *path, const WCHAR *name, cons void set_reg_key(HKEY root, const char *path, const char *name, const char *value) { - WCHAR *wpath, *wname, *wvalue = NULL; + WCHAR *wpath, *wname = NULL, *wvalue = NULL; wpath = HeapAlloc(GetProcessHeap(), 0, (strlen(path)+1)*sizeof(WCHAR)); - wname = HeapAlloc(GetProcessHeap(), 0, (strlen(name)+1)*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, strlen(path)+1); - MultiByteToWideChar(CP_ACP, 0, name, -1, wname, strlen(name)+1); + + if (name) + { + wname = HeapAlloc(GetProcessHeap(), 0, (strlen(name)+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, name, -1, wname, strlen(name)+1); + } if (value) {

1 0

Dmitry Timoshkov : user32: CBN_SELCHANGE notification should be sent before an edit update.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: ce1ab638dac02ad61cdabb32a7353e54e7b1c8e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce1ab638dac02ad61cdabb32a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Aug 9 18:34:23 2007 +0900 user32: CBN_SELCHANGE notification should be sent before an edit update. --- dlls/user32/combo.c | 8 ++-- dlls/user32/tests/combo.c | 93 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 95 insertions(+), 6 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index e9a76b5..084e612 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1347,7 +1347,9 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) case LBN_SELCHANGE: case LBN_SELCANCEL: - TRACE("[%p]: lbox selection change [%x]\n", lphc->self, lphc->wState ); + TRACE("[%p]: lbox selection change [%x]\n", lphc->self, lphc->wState ); + + CB_NOTIFY( lphc, CBN_SELCHANGE ); if( HIWORD(wParam) == LBN_SELCHANGE) { @@ -1371,9 +1373,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) } else lphc->wState &= ~CBF_NOROLLUP; - CB_NOTIFY( lphc, CBN_SELCHANGE ); - - /* fall through */ + break; case LBN_SETFOCUS: case LBN_KILLFOCUS: diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index bf777c7..642c49d 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -21,12 +21,15 @@ #include <stdarg.h> #include <stdio.h> +#define STRICT #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "wine/test.h" -HWND hMainWnd; +#define COMBO_ID 1995 + +static HWND hMainWnd; #define expect_eq(expr, value, type, fmt); { type val = expr; ok(val == (value), #expr " expected " #fmt " got " #fmt "\n", (value), val); } #define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ @@ -35,7 +38,7 @@ HWND hMainWnd; static HWND build_combo(DWORD style) { - return CreateWindow("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, NULL, NULL, 0); + return CreateWindow("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)COMBO_ID, NULL, 0); } static int font_height(HFONT hFont) @@ -84,6 +87,9 @@ static void test_setfont(DWORD style) if (!is_font_installed("Marlett")) { skip("Marlett font not available\n"); + DestroyWindow(hCombo); + DeleteObject(hFont1); + DeleteObject(hFont2); return; } @@ -130,6 +136,87 @@ static void test_setfont(DWORD style) DeleteObject(hFont2); } +static LRESULT (CALLBACK *old_parent_proc)(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); +static LPCSTR expected_edit_text; +static LPCSTR expected_list_text; + +static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_COMMAND: + switch (wparam) + { + case MAKEWPARAM(COMBO_ID, CBN_SELCHANGE): + { + HWND hCombo = (HWND)lparam; + int idx; + char list[20], edit[20]; + + memset(list, 0, sizeof(list)); + memset(edit, 0, sizeof(edit)); + + idx = SendMessage(hCombo, CB_GETCURSEL, 0, 0); + SendMessage(hCombo, CB_GETLBTEXT, idx, (LPARAM)list); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + + ok(!strcmp(edit, expected_edit_text), "edit: got %s, expected %s\n", + edit, expected_edit_text); + ok(!strcmp(list, expected_list_text), "list: got %s, expected %s\n", + list, expected_list_text); + } + break; + } + break; + } + + return CallWindowProc(old_parent_proc, hwnd, msg, wparam, lparam); +} + +static void test_selection(DWORD style, const char * const text[], + const int *edit, const int *list) +{ + INT idx; + HWND hCombo; + + hCombo = build_combo(style); + + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM)text[0]); + SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM)text[1]); + SendMessage(hCombo, CB_SETCURSEL, -1, 0); + + old_parent_proc = (void *)SetWindowLongPtr(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)parent_wnd_proc); + + idx = SendMessage(hCombo, CB_GETCURSEL, 0, 0); + ok(idx == -1, "expected selection -1, got %d\n", idx); + + expected_list_text = text[list[0]]; + expected_edit_text = text[edit[0]]; + SendMessage(hCombo, WM_KEYDOWN, VK_DOWN, 0); + + expected_list_text = text[list[1]]; + expected_edit_text = text[edit[1]]; + SendMessage(hCombo, WM_KEYDOWN, VK_DOWN, 0); + + expected_list_text = text[list[2]]; + expected_edit_text = text[edit[2]]; + SendMessage(hCombo, WM_KEYDOWN, VK_UP, 0); + + SetWindowLongPtr(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); + DestroyWindow(hCombo); +} + +static void test_CBN_SELCHANGE(void) +{ + static const char * const text[] = { "alpha", "beta", "" }; + static const int sel_1[] = { 2, 0, 1 }; + static const int sel_2[] = { 0, 1, 0 }; + + test_selection(CBS_SIMPLE, text, sel_1, sel_2); + test_selection(CBS_DROPDOWN, text, sel_1, sel_2); + test_selection(CBS_DROPDOWNLIST, text, sel_2, sel_2); +} + START_TEST(combo) { hMainWnd = CreateWindow("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); @@ -137,5 +224,7 @@ START_TEST(combo) test_setfont(CBS_DROPDOWN); test_setfont(CBS_DROPDOWNLIST); + test_CBN_SELCHANGE(); + DestroyWindow(hMainWnd); }

1 0

Evan Stade : gdiplus: Added GdipSetImagePalette stub.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: c147389ff18f8a5dbc29d40aa35910d8125bffac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c147389ff18f8a5dbc29d40aa… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 8 19:42:16 2007 -0700 gdiplus: Added GdipSetImagePalette stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 14 ++++++++++++++ include/gdiplusflat.h | 1 + include/gdipluspixelformats.h | 21 +++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index f0d1bde..834d0e2 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -532,7 +532,7 @@ @ stub GdipSetImageAttributesThreshold @ stub GdipSetImageAttributesToIdentity @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) -@ stub GdipSetImagePalette +@ stdcall GdipSetImagePalette(ptr ptr) @ stub GdipSetInfinite @ stdcall GdipSetInterpolationMode(ptr long) @ stub GdipSetLineBlend diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 85cfc07..ec52d5d 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -668,3 +668,17 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, return Ok; } + +GpStatus WINGDIPAPI GdipSetImagePalette(GpImage *image, + GDIPCONST ColorPalette *palette) +{ + static int calls; + + if(!image || !palette) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 1ae9ced..57b14ab 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -208,6 +208,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromStreamICM(IStream*,GpImage**); GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage*,PROPID); GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage*,IStream*, GDIPCONST CLSID*,GDIPCONST EncoderParameters*); +GpStatus WINGDIPAPI GdipSetImagePalette(GpImage*,GDIPCONST ColorPalette*); GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*); diff --git a/include/gdipluspixelformats.h b/include/gdipluspixelformats.h index dd67410..d7382f1 100644 --- a/include/gdipluspixelformats.h +++ b/include/gdipluspixelformats.h @@ -48,4 +48,25 @@ typedef INT PixelFormat; #define PixelFormat64bppPARGB (14 | (64 << 8) | PixelFormatAlpha | PixelFormatPAlpha | PixelFormatExtended) #define PixelFormatMax 15 +#ifdef __cplusplus + +struct ColorPalette +{ +public: + UINT Flags; + UINT Count; + ARGB Entries[1]; +}; + +#else /* end of c++ typedefs */ + +typedef struct ColorPalette +{ + UINT Flags; + UINT Count; + ARGB Entries[1]; +} ColorPalette; + +#endif /* end of c typedefs */ + #endif

1 0

Evan Stade : gdiplus/tests: Added GdipCreateBitmapFromScan0 test.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: cae277f13ed892e731201d941d07da079aaa541c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae277f13ed892e731201d941… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 8 19:42:20 2007 -0700 gdiplus/tests: Added GdipCreateBitmapFromScan0 test. --- dlls/gdiplus/tests/Makefile.in | 1 + dlls/gdiplus/tests/image.c | 83 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 421bd4e..3771da2 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -9,6 +9,7 @@ CTESTS = \ brush.c \ graphics.c \ graphicspath.c \ + image.c \ matrix.c \ pen.c diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c new file mode 100644 index 0000000..ac86fb7 --- /dev/null +++ b/dlls/gdiplus/tests/image.c @@ -0,0 +1,83 @@ +/* + * Unit test suite for images + * + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windows.h" +#include "gdiplus.h" +#include "wine/test.h" + +#define expect(expected, got) ok(((UINT)got) == ((UINT)expected), "Expected %.8x, got %.8x\n", (UINT)expected, (UINT)got) + +static void test_Scan0() +{ + GpBitmap *bm; + GpStatus stat; + BYTE buff[360]; + + bm = NULL; + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, NULL, &bm); + todo_wine{ + expect(Ok, stat); + ok(NULL != bm, "Expected bitmap to be initialized\n"); + } + GdipDisposeImage((GpImage*)bm); + + bm = (GpBitmap*)0xdeadbeef; + stat = GdipCreateBitmapFromScan0(10, -10, 10, PixelFormat24bppRGB, NULL, &bm); + expect(InvalidParameter, stat); + todo_wine + expect(NULL, bm); + + bm = (GpBitmap*)0xdeadbeef; + stat = GdipCreateBitmapFromScan0(-10, 10, 10, PixelFormat24bppRGB, NULL, &bm); + expect(InvalidParameter, stat); + todo_wine + expect(NULL, bm); + + bm = (GpBitmap*)0xdeadbeef; + stat = GdipCreateBitmapFromScan0(10, 0, 10, PixelFormat24bppRGB, NULL, &bm); + expect(InvalidParameter, stat); + todo_wine + expect(NULL, bm); + + bm = NULL; + stat = GdipCreateBitmapFromScan0(10, 10, 12, PixelFormat24bppRGB, buff, &bm); + expect(Ok, stat); + ok(NULL != bm, "Expected bitmap to be initialized\n"); + GdipDisposeImage((GpImage*)bm); + + bm = (GpBitmap*) 0xdeadbeef; + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, buff, &bm); + todo_wine{ + expect(InvalidParameter, stat); + expect(NULL, bm); + } + + bm = (GpBitmap*)0xdeadbeef; + stat = GdipCreateBitmapFromScan0(10, 10, 0, PixelFormat24bppRGB, buff, &bm); + todo_wine{ + expect(InvalidParameter, stat); + expect(0xdeadbeef, bm); + } +} + +START_TEST(image) +{ + test_Scan0(); +}

1 0

Evan Stade : gdiplus: Fixed conformance of GdipCreateBitmapFromScan0.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: a41fa500f456650a430e7bff817eb306ff14a8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41fa500f456650a430e7bff8… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 8 19:42:24 2007 -0700 gdiplus: Fixed conformance of GdipCreateBitmapFromScan0. --- dlls/gdiplus/image.c | 29 +++++++++++++++++++++++++---- dlls/gdiplus/tests/image.c | 30 ++++++++++++------------------ 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ec52d5d..d34e76d 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -257,17 +257,34 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, BITMAPFILEHEADER *bmfh; BITMAPINFOHEADER *bmih; BYTE *buff; - INT datalen = stride * height, size; + INT datalen, size; IStream *stream; TRACE("%d %d %d %d %p %p\n", width, height, stride, format, scan0, bitmap); - if(!scan0 || !bitmap) + if(!bitmap || width <= 0 || height <= 0 || (scan0 && (stride % 4))){ + *bitmap = NULL; + return InvalidParameter; + } + + if(scan0 && !stride) return InvalidParameter; + /* FIXME: windows allows negative stride (reads backwards from scan0) */ + if(stride < 0){ + FIXME("negative stride\n"); + return InvalidParameter; + } + *bitmap = GdipAlloc(sizeof(GpBitmap)); if(!*bitmap) return OutOfMemory; + if(stride == 0){ + stride = width * (PIXELFORMATBPP(format) / 8); + stride = (stride + 3) & ~3; + } + + datalen = abs(stride * height); size = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER) + datalen; buff = GdipAlloc(size); if(!buff){ @@ -284,12 +301,16 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, bmih->biSize = sizeof(BITMAPINFOHEADER); bmih->biWidth = width; - bmih->biHeight = height; + bmih->biHeight = -height; /* FIXME: use the rest of the data from format */ bmih->biBitCount = PIXELFORMATBPP(format); bmih->biCompression = BI_RGB; + bmih->biSizeImage = datalen; - memcpy(bmih + 1, scan0, datalen); + if(scan0) + memcpy(bmih + 1, scan0, datalen); + else + memset(bmih + 1, 0, datalen); if(CreateStreamOnHGlobal(buff, TRUE, &stream) != S_OK){ ERR("could not make stream\n"); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index ac86fb7..0dda717 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -32,29 +32,27 @@ static void test_Scan0() bm = NULL; stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, NULL, &bm); - todo_wine{ - expect(Ok, stat); - ok(NULL != bm, "Expected bitmap to be initialized\n"); - } + expect(Ok, stat); + ok(NULL != bm, "Expected bitmap to be initialized\n"); GdipDisposeImage((GpImage*)bm); bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, -10, 10, PixelFormat24bppRGB, NULL, &bm); expect(InvalidParameter, stat); - todo_wine - expect(NULL, bm); + + expect(NULL, bm); bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(-10, 10, 10, PixelFormat24bppRGB, NULL, &bm); expect(InvalidParameter, stat); - todo_wine - expect(NULL, bm); + + expect(NULL, bm); bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, 0, 10, PixelFormat24bppRGB, NULL, &bm); expect(InvalidParameter, stat); - todo_wine - expect(NULL, bm); + + expect(NULL, bm); bm = NULL; stat = GdipCreateBitmapFromScan0(10, 10, 12, PixelFormat24bppRGB, buff, &bm); @@ -64,17 +62,13 @@ static void test_Scan0() bm = (GpBitmap*) 0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, buff, &bm); - todo_wine{ - expect(InvalidParameter, stat); - expect(NULL, bm); - } + expect(InvalidParameter, stat); + expect(NULL, bm); bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, 10, 0, PixelFormat24bppRGB, buff, &bm); - todo_wine{ - expect(InvalidParameter, stat); - expect(0xdeadbeef, bm); - } + expect(InvalidParameter, stat); + expect(0xdeadbeef, bm); } START_TEST(image)

1 0

Evan Stade : gdiplus: Added GdipCreateBitmapFromGraphics stub.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: ad8ea1b0a6054f3ff4873dc983a8ebd0e2c4a6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad8ea1b0a6054f3ff4873dc98… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 8 19:42:28 2007 -0700 gdiplus: Added GdipCreateBitmapFromGraphics stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 20 ++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 834d0e2..50d2f6b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -74,7 +74,7 @@ @ stdcall GdipCreateBitmapFromFile(wstr ptr) @ stub GdipCreateBitmapFromFileICM @ stub GdipCreateBitmapFromGdiDib -@ stub GdipCreateBitmapFromGraphics +@ stdcall GdipCreateBitmapFromGraphics(long long ptr ptr) @ stub GdipCreateBitmapFromHBITMAP @ stub GdipCreateBitmapFromHICON @ stub GdipCreateBitmapFromResource diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d34e76d..d813678 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -251,6 +251,26 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, return stat; } +/* FIXME: this should create a bitmap in the given size with the attributes + * (resolution etc.) of the graphics object */ +GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, + GpGraphics* target, GpBitmap** bitmap) +{ + static int calls; + GpStatus ret; + + if(!target || !bitmap) + return InvalidParameter; + + if(!(calls++)) + FIXME("hacked stub\n"); + + ret = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat24bppRGB, + NULL, bitmap); + + return ret; +} + GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 57b14ab..33d0e33 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -185,6 +185,7 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*); GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**); +GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*, GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream*,GpBitmap**);

1 0

Evan Stade : oleaut32: Handle transparency data when loading PNG images.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: a08b998f204374fedfbb73aaa7daf7a18fa2a5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a08b998f204374fedfbb73aaa… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 8 19:42:33 2007 -0700 oleaut32: Handle transparency data when loading PNG images. --- dlls/oleaut32/olepicture.c | 98 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 82 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index b12a85b..d8f01db 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1376,6 +1376,9 @@ MAKE_FUNCPTR(png_set_bgr); MAKE_FUNCPTR(png_destroy_read_struct); MAKE_FUNCPTR(png_set_palette_to_rgb); MAKE_FUNCPTR(png_read_update_info); +MAKE_FUNCPTR(png_get_tRNS); +MAKE_FUNCPTR(png_get_PLTE); +MAKE_FUNCPTR(png_set_expand); #undef MAKE_FUNCPTR static void *load_libpng(void) @@ -1397,6 +1400,9 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_destroy_read_struct); LOAD_FUNCPTR(png_set_palette_to_rgb); LOAD_FUNCPTR(png_read_update_info); + LOAD_FUNCPTR(png_get_tRNS); + LOAD_FUNCPTR(png_get_PLTE); + LOAD_FUNCPTR(png_set_expand); #undef LOAD_FUNCPTR } @@ -1410,13 +1416,17 @@ static HRESULT OLEPictureImpl_LoadPNG(OLEPictureImpl *This, BYTE *xbuf, ULONG xr png_io io; png_structp png_ptr = NULL; png_infop info_ptr = NULL; - INT row, rowsize, height, width; + INT row, rowsize, height, width, num_trans, i, j; png_bytep* row_pointers = NULL; png_bytep pngdata = NULL; BITMAPINFOHEADER bmi; - HDC hdcref = NULL; + HDC hdcref = NULL, hdcXor, hdcMask; HRESULT ret; - BOOL set_bgr = FALSE; + BOOL transparency; + png_bytep trans; + png_color_16p trans_values; + COLORREF white = RGB(255, 255, 255), black = RGB(0, 0, 0); + HBITMAP hbmoldXor, hbmoldMask, temp; if(!libpng_handle) { if(!load_libpng()) { @@ -1435,7 +1445,7 @@ static HRESULT OLEPictureImpl_LoadPNG(OLEPictureImpl *This, BYTE *xbuf, ULONG xr if(setjmp(png_jmpbuf(png_ptr))){ TRACE("Error in libpng\n"); ret = E_FAIL; - goto pngend; + goto end; } info_ptr = ppng_create_info_struct(png_ptr); @@ -1447,19 +1457,16 @@ static HRESULT OLEPictureImpl_LoadPNG(OLEPictureImpl *This, BYTE *xbuf, ULONG xr png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)){ FIXME("Unsupported .PNG type: %d\n", png_ptr->color_type); ret = E_FAIL; - goto pngend; + goto end; } - if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE){ - ppng_set_palette_to_rgb(png_ptr); - set_bgr = TRUE; - } + transparency = (ppng_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &trans_values) + == PNG_INFO_tRNS); - if (png_ptr->color_type == PNG_COLOR_TYPE_RGB || - png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || - set_bgr){ - ppng_set_bgr(png_ptr); - } + /* sets format from anything to RGBA */ + ppng_set_expand(png_ptr); + /* sets format to BGRA */ + ppng_set_bgr(png_ptr); ppng_read_update_info(png_ptr, info_ptr); @@ -1474,7 +1481,7 @@ static HRESULT OLEPictureImpl_LoadPNG(OLEPictureImpl *This, BYTE *xbuf, ULONG xr if(!pngdata || !row_pointers){ ret = E_FAIL; - goto pngend; + goto end; } for (row = 0; row < height; row++){ @@ -1504,12 +1511,71 @@ static HRESULT OLEPictureImpl_LoadPNG(OLEPictureImpl *This, BYTE *xbuf, ULONG xr (BITMAPINFO*)&bmi, DIB_RGB_COLORS ); + + /* only fully-transparent alpha is handled */ + if((info_ptr->channels != 4) || !transparency){ + ReleaseDC(0, hdcref); + goto succ; + } + + This->hbmXor = CreateDIBitmap( + hdcref, + &bmi, + CBM_INIT, + pngdata, + (BITMAPINFO*)&bmi, + DIB_RGB_COLORS + ); + + /* set transparent pixels to black, all others to white */ + for(i = 0; i < height; i++){ + for(j = 3; j < rowsize; j += 4){ + if(row_pointers[i][j] == 0) + *((DWORD*)(&row_pointers[i][j - 3])) = black; + else + *((DWORD*)(&row_pointers[i][j - 3])) = white; + } + } + + temp = CreateDIBitmap( + hdcref, + &bmi, + CBM_INIT, + pngdata, + (BITMAPINFO*)&bmi, + DIB_RGB_COLORS + ); + ReleaseDC(0, hdcref); + + This->hbmMask = CreateBitmap(width,-height,1,1,NULL); + hdcXor = CreateCompatibleDC(NULL); + hdcMask = CreateCompatibleDC(NULL); + + hbmoldXor = SelectObject(hdcXor,temp); + hbmoldMask = SelectObject(hdcMask,This->hbmMask); + SetBkColor(hdcXor,black); + BitBlt(hdcMask,0,0,width,height,hdcXor,0,0,SRCCOPY); + + SelectObject(hdcXor,This->hbmXor); + DeleteObject(temp); + + SetTextColor(hdcXor,white); + SetBkColor(hdcXor,black); + BitBlt(hdcXor,0,0,width,height,hdcMask,0,0,SRCAND); + + SelectObject(hdcXor,hbmoldXor); + SelectObject(hdcMask,hbmoldMask); + + DeleteDC(hdcXor); + DeleteDC(hdcMask); + +succ: This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); ret = S_OK; -pngend: +end: if(png_ptr) ppng_destroy_read_struct(&png_ptr, (info_ptr ? &info_ptr : (png_infopp) NULL),

1 0

Evan Stade : gdiplus: Added GdipCreatePath2.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: ff2e63d41edbc4be10954802946878210c13e599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2e63d41edbc4be109548029… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 8 19:41:56 2007 -0700 gdiplus: Added GdipCreatePath2. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 30 ++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 12fda8f..4b507d9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -113,7 +113,7 @@ @ stub GdipCreateMetafileFromStream @ stdcall GdipCreateMetafileFromWmf(ptr long ptr ptr) @ stub GdipCreateMetafileFromWmfFile -@ stub GdipCreatePath2 +@ stdcall GdipCreatePath2(ptr ptr long long ptr) @ stub GdipCreatePath2I @ stdcall GdipCreatePath(long ptr) @ stdcall GdipCreatePathGradient(ptr long long ptr) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index b11d918..5cfac5f 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -282,6 +282,36 @@ GpStatus WINGDIPAPI GdipCreatePath(GpFillMode fill, GpPath **path) return Ok; } +GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF* points, + GDIPCONST BYTE* types, INT count, GpFillMode fill, GpPath **path) +{ + if(!path) + return InvalidParameter; + + *path = GdipAlloc(sizeof(GpPath)); + if(!*path) return OutOfMemory; + + (*path)->pathdata.Points = GdipAlloc(count * sizeof(PointF)); + (*path)->pathdata.Types = GdipAlloc(count); + + if(!(*path)->pathdata.Points || !(*path)->pathdata.Types){ + GdipFree((*path)->pathdata.Points); + GdipFree((*path)->pathdata.Types); + GdipFree(*path); + return OutOfMemory; + } + + memcpy((*path)->pathdata.Points, points, count * sizeof(PointF)); + memcpy((*path)->pathdata.Types, types, count); + (*path)->pathdata.Count = count; + (*path)->datalen = count; + + (*path)->fill = fill; + (*path)->newfigure = TRUE; + + return Ok; +} + GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 04aa8c1..2320c7b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -130,6 +130,8 @@ GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*); GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*); GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**); +GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF*,GDIPCONST BYTE*,INT, + GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics*,GpBrush*,GDIPCONST GpPointF*, INT,GpFillMode);

1 0

Evan Stade : gdiplus: Added GdipGetPenDashOffset/GdipSetPenDashOffset.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: b5d7af5438072f886735f85eff7663a864def089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d7af5438072f886735f85ef… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 8 19:42:03 2007 -0700 gdiplus: Added GdipGetPenDashOffset/GdipSetPenDashOffset. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/pen.c | 22 ++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4b507d9..0da04b0 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -357,7 +357,7 @@ @ stdcall GdipGetPenDashArray(ptr ptr long) @ stub GdipGetPenDashCap197819 @ stub GdipGetPenDashCount -@ stub GdipGetPenDashOffset +@ stdcall GdipGetPenDashOffset(ptr ptr) @ stdcall GdipGetPenDashStyle(ptr ptr) @ stub GdipGetPenEndCap @ stub GdipGetPenFillType @@ -569,7 +569,7 @@ @ stdcall GdipSetPenCustomStartCap(ptr ptr) @ stdcall GdipSetPenDashArray(ptr ptr long) @ stub GdipSetPenDashCap197819 -@ stub GdipSetPenDashOffset +@ stdcall GdipSetPenDashOffset(ptr long) @ stdcall GdipSetPenDashStyle(ptr long) @ stdcall GdipSetPenEndCap(ptr long) @ stdcall GdipSetPenLineCap197819(ptr long long long) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 855d7ee..8555db7 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -68,6 +68,7 @@ struct GpPen{ GpDashStyle dash; REAL *dashes; INT numdashes; + REAL offset; /* dash offset */ GpBrush *brush; }; diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 20a44bc..320f375 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -102,6 +102,7 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, REAL width, GpUnit unit, gp_pen->join = LineJoinMiter; gp_pen->miterlimit = 10.0; gp_pen->dash = DashStyleSolid; + gp_pen->offset = 0.0; GdipCreateSolidFill(color, (GpSolidFill **)(&gp_pen->brush)); if(!((gp_pen->unit == UnitWorld) || (gp_pen->unit == UnitPixel))) { @@ -161,6 +162,16 @@ GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen *pen, REAL *dash, INT count) return Ok; } +GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen *pen, REAL *offset) +{ + if(!pen || !offset) + return InvalidParameter; + + *offset = pen->offset; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash) { if(!pen || !dash) @@ -258,6 +269,17 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, return Ok; } +/* FIXME: dash offset not used */ +GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen *pen, REAL offset) +{ + if(!pen) + return InvalidParameter; + + pen->offset = offset; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen *pen, GpDashStyle dash) { if(!pen) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2320c7b..2a0a28e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -33,12 +33,14 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**); GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*); GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT); +GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB); GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen*,GpCustomLineCap*); GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen*,GDIPCONST REAL*,INT); +GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen*,REAL); GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle); GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap);

1 0