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

Hongbo Ni : winconsole: Update simplified Chinese resource.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 1897f8369aa8f2abad0711c4e3863c52321072bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1897f8369aa8f2abad0711c4e… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 14:59:10 2008 +1000 winconsole: Update simplified Chinese resource. --- programs/wineconsole/wineconsole_Zh.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole_Zh.rc b/programs/wineconsole/wineconsole_Zh.rc index 3a717b1..d739e33 100644 --- a/programs/wineconsole/wineconsole_Zh.rc +++ b/programs/wineconsole/wineconsole_Zh.rc @@ -36,8 +36,8 @@ IDS_FNT_PREVIEW_1, " IDS_FNT_PREVIEW_2, "" IDS_DLG_TIT_DEFAULT, "�� - Ĭ��" IDS_DLG_TIT_CURRENT, "�� - ��ǰ��" -IDS_DLG_TIT_ERROR, "Configuration error" -IDS_DLG_ERR_SBWINSIZE, "Screen buffer size must be greater or equal to the window's one" +IDS_DLG_TIT_ERROR, "��ô��" +IDS_DLG_ERR_SBWINSIZE, "��Ļ��С��ڻ��Ӵ��" END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105

1 0

Hongbo Ni : progman: Update simplified Chinese resource.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: d9e45488f62ede4b5801f39ee2c117266a6e0136 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e45488f62ede4b5801f39ee… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 14:58:33 2008 +1000 progman: Update simplified Chinese resource. --- programs/progman/Zh.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/progman/Zh.rc b/programs/progman/Zh.rc index dfbfb26..70535cd 100644 --- a/programs/progman/Zh.rc +++ b/programs/progman/Zh.rc @@ -67,7 +67,7 @@ POPUP " DIALOG_NEW DIALOG 0, 0, 170, 65 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "New" +CAPTION "�½�" { RADIOBUTTON "", PM_NEW_GROUP, 10, 15, 10, 15 LTEXT "��飨&G��", PM_NEW_GROUP, 20, 18, 80, 15 @@ -83,7 +83,7 @@ PUSHBUTTON " DIALOG_MOVE DIALOG 0, 0, 250, 65 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Move Program" +CAPTION "�ƶ��" { LTEXT "�ƶ��", IDIGNORE, 5, 5, 90, 15 LTEXT "", PM_PROGRAM, 95, 5, 90, 15

1 0

Hongbo Ni : clock: Update simplified Chinese resource.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: b46ffb40c654e9175ebcffb6691660385641d4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46ffb40c654e9175ebcffb66… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 15:21:29 2008 +1000 clock: Update simplified Chinese resource. --- programs/clock/Zh.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/clock/Zh.rc b/programs/clock/Zh.rc index e6e0ae8..5d0d9e0 100644 --- a/programs/clock/Zh.rc +++ b/programs/clock/Zh.rc @@ -22,13 +22,13 @@ MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED { POPUP "��ԣ�&P��" { MENUITEM "ģ��ʱ�ӣ�&L��", IDM_ANALOG - MENUITEM "��ʱ�ӣ�&T��", IDM_DIGITAL + MENUITEM "��ʱ�ӣ�&T��", IDM_DIGITAL MENUITEM SEPARATOR MENUITEM "��壨&F��...", IDM_FONT MENUITEM SEPARATOR MENUITEM "�ޱ��&W��", IDM_NOTITLE MENUITEM SEPARATOR - MENUITEM "�루&��", IDM_SECONDS + MENUITEM "�루&S��", IDM_SECONDS MENUITEM "��ڣ�&D��", IDM_DATE MENUITEM SEPARATOR MENUITEM "��ǰ�棨&A��", IDM_ONTOP

1 0

Hongbo Ni : winhlp32: Update simplified Chinese resource.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 3f83493a7f3dd2ffd985857520f05b6a6417dfc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f83493a7f3dd2ffd98585752… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 14:59:45 2008 +1000 winhlp32: Update simplified Chinese resource. --- programs/winhlp32/Zh.rc | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/winhlp32/Zh.rc b/programs/winhlp32/Zh.rc index 41f9056..7f69ec2 100644 --- a/programs/winhlp32/Zh.rc +++ b/programs/winhlp32/Zh.rc @@ -39,21 +39,21 @@ MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED POPUP "��ǩ��&B��" { MENUITEM "��壨&D��...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "ѡ�&O��" { + POPUP "��ʾ��" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Ĭ��", MNID_OPTS_HELP_DEFAULT + MENUITEM "��ʾ", MNID_OPTS_HELP_VISIBLE + MENUITEM "��ʾ", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "��ʷ", MNID_OPTS_HISTORY + POPUP "��" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL - MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "С��", MNID_OPTS_FONTS_SMALL + MENUITEM "�к�", MNID_OPTS_FONTS_NORMAL + MENUITEM "��", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "ʹ��ϵͳ��ɫ", MNID_OPTS_SYSTEM_COLORS } POPUP "��&H��" { MENUITEM "��ʹ�ð��&O��", MNID_HELP_HELPON @@ -76,11 +76,11 @@ STID_INFO, " STID_NOT_IMPLEMENTED, "δʵ��" STID_HLPFILE_ERROR_s, "��ļ� ��%s�� ʱ��" STID_INDEX, "��ݣ�&C��" -STID_CONTENTS, "Summary" +STID_CONTENTS, "��Ҫ" STID_BACK, "��أ�&B��" STID_ALL_FILES, "��ļ� (*.*)" STID_HELP_FILES_HLP, "��ļ� (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_FILE_NOT_FOUND_s "��ܴ��ļ� '%s'. ��Ҫ�Լ��ļ��?" +STID_NO_RICHEDIT "�Ҳ�� richedit ... ��ֹ" +STID_PSH_INDEX, "��: " }

1 0

Muneyuki Noguchi : notepad: Update Japanese translation.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: f9bc73e25f549a8cf225929c269ee390b302c9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9bc73e25f549a8cf225929c2… Author: Muneyuki Noguchi <noguchi(a)localhost.localdomain> Date: Fri Aug 22 11:37:44 2008 +0900 notepad: Update Japanese translation. --- programs/notepad/Ja.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index 2573739..eea61fa 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -37,14 +37,14 @@ MAIN_MENU MENU MENUITEM "�I��(&x)", CMD_EXIT } POPUP "�ҏW(&E)" { - MENUITEM "�A��h�D(&U)\tCtrl+Z", CMD_UNDO + MENUITEM "��ɖ߂�(&U)\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR MENUITEM "�؂��(&t)\tCtrl+X", CMD_CUT MENUITEM "�R�s�[(&C)\tCtrl+C", CMD_COPY - MENUITEM "�y�[�X�g(&P)\tCtrl+V", CMD_PASTE + MENUITEM "�\\��t��(&P)\tCtrl+V", CMD_PASTE MENUITEM "�폜(&D)\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "�S�đI��(&a)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "��ׂđI��(&a)\tCtrl+A", CMD_SELECT_ALL MENUITEM "��t�Ǝ��(&T)\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "��s��܂�Ԃ�(&W)", CMD_WRAP @@ -52,14 +52,14 @@ POPUP " } POPUP "��(&S)" { MENUITEM "��(&S)...\tCtrl+F", CMD_SEARCH - MENUITEM "��̌��(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "��(&S)\tF3", CMD_SEARCH_NEXT } POPUP "�w��v(&H)" { MENUITEM "�ڎ�(&C)", CMD_HELP_CONTENTS MENUITEM "��(&S)...", CMD_HELP_SEARCH MENUITEM "�w��v�̎g��(&H)", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "��ɂ��(&A)", CMD_HELP_ABOUT_NOTEPAD } }

1 0

Muneyuki Noguchi : winecfg: Update Japanese translation.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: da11bfda288af17f050833f67d7dd031ee15c5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=da11bfda288af17f050833f67… Author: Muneyuki Noguchi <noguchi(a)localhost.localdomain> Date: Fri Aug 22 12:16:20 2008 +0900 winecfg: Update Japanese translation. --- programs/winecfg/Ja.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index ff111ee..8fbe6a4 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -142,7 +142,7 @@ BEGIN LTEXT "��x��ƃV��A��ԍ�",IDC_LABELSERIAL_STATIC,15,155,95,10 - PUSHBUTTON "�ڍׂ�\��(&S)",IDC_BUTTON_SHOW_HIDE_ADVANCED,186,136,60,13 + PUSHBUTTON "�ڍׂ�\\��(&S)",IDC_BUTTON_SHOW_HIDE_ADVANCED,186,136,60,13 CONTROL "�f�o�C�X��玩��o(&F):",IDC_RADIO_AUTODETECT,"Button", BS_AUTORADIOBUTTON,15,166,93,10 EDITTEXT IDC_EDIT_DEVICE,27,176,174,13,ES_AUTOHSCROLL @@ -155,7 +155,7 @@ BEGIN LTEXT "�V��A��ԍ�(&E):",IDC_STATIC_SERIAL,33,225,29,12 EDITTEXT IDC_EDIT_SERIAL,63,221,78,13,ES_AUTOHSCROLL | WS_TABSTOP - CONTROL "dot �t�@�C��\��",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,260,230,8 + CONTROL "dot �t�@�C��\\��",IDC_SHOW_DOT_FILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,260,230,8 END IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -189,14 +189,14 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "�T�C�Y:",IDC_THEME_SIZETEXT,135,40,110,8 COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Item:",IDC_STATIC,15,64,112,8 + LTEXT "��:",IDC_STATIC,15,64,112,8 COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Color:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED + LTEXT "�F:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Size:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED + LTEXT "�T�C�Y:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 - PUSHBUTTON "Font",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED + PUSHBUTTON "�t�H��g",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 @@ -212,10 +212,10 @@ BEGIN IDS_TAB_DRIVES "�h��C�u" IDS_CHOOSE_PATH "Select the unix target directory, please." IDS_HIDE_ADVANCED "�ڍׂ��B��" - IDS_SHOW_ADVANCED "�ڍׂ�\��" + IDS_SHOW_ADVANCED "�ڍׂ�\\��" IDS_NOTHEME "(�e�[�}��)" IDS_TAB_GRAPHICS "��" - IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" + IDS_TAB_DESKTOP_INTEGRATION "�f�X�N�g�b�v��" IDS_TAB_AUDIO "�I�[�f�B�I" IDS_TAB_ABOUT "Wine�ɂ��" IDS_WINECFG_TITLE "Wine�ݒ�"

1 0

Huw Davies : crypt32: Remove some unnecessary code.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 08c2b101f28a3a5852634aba20784cb4a8a8b728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c2b101f28a3a5852634aba2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 21 17:56:17 2008 +0100 crypt32: Remove some unnecessary code. --- dlls/crypt32/str.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index b0b0990..d574790 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -169,10 +169,8 @@ static DWORD CRYPT_AddPrefixA(LPCSTR prefix, LPSTR psz, DWORD csz) { chars = min(lstrlenA(prefix), csz); memcpy(psz, prefix, chars); - csz -= chars; *(psz + chars) = '='; chars++; - csz--; } else chars = lstrlenA(prefix) + 1; @@ -303,10 +301,8 @@ static DWORD CRYPT_AddPrefixAToW(LPCSTR prefix, LPWSTR psz, DWORD csz) chars = min(lstrlenA(prefix), csz); for (i = 0; i < chars; i++) *(psz + i) = prefix[i]; - csz -= chars; *(psz + chars) = '='; chars++; - csz--; } else chars = lstrlenA(prefix) + 1; @@ -328,10 +324,8 @@ static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz) { chars = min(lstrlenW(prefix), csz); memcpy(psz, prefix, chars * sizeof(WCHAR)); - csz -= chars; *(psz + chars) = '='; chars++; - csz--; } else chars = lstrlenW(prefix) + 1;

1 0

Alexander Nicolaysen Sørnes : winhlp32: Update Norwegian Bokmål translation.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 237b4109bd9f3e7805673a679c4c5c41608400a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=237b4109bd9f3e7805673a679… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 21 22:10:46 2008 +0200 winhlp32: Update Norwegian Bokmål translation. --- programs/winhlp32/No.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/No.rc b/programs/winhlp32/No.rc index 1632da6..5f3e310 100644 --- a/programs/winhlp32/No.rc +++ b/programs/winhlp32/No.rc @@ -73,6 +73,14 @@ CAPTION "Innhold" LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "S�k" +{ + LTEXT "Ikke laget enn�", -1, 10, 10, 180, 150 +} + /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL {

1 0

Stefan Leichter : rasapi: Fix test failure on platforms vista, w2k8.
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 3ad8b7ea1a119d88c849d0862300a78248805508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad8b7ea1a119d88c849d0862… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 21 22:44:32 2008 +0200 rasapi: Fix test failure on platforms vista, w2k8. --- dlls/rasapi32/tests/rasapi.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index da733a1..bcd4310 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -106,8 +106,9 @@ static void test_rasenum(void) rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = 0; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - ok(result == ERROR_BUFFER_TOO_SMALL, - "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + ok(result == ERROR_BUFFER_TOO_SMALL || + result == ERROR_INVALID_SIZE, /* vista, 2k8 */ + "Expected ERROR_BUFFER_TOO_SMALL/ERROR_INVALID_SIZE, got %08d\n", result); rasDevInfo[0].dwSize = sizeof(RASDEVINFOA); cb = bufsize -1;

1 0

Nikolay Sivov : gdiplus: Implemented GdipFillClosedCurve2[I].
by Alexandre Julliard 22 Aug '08

22 Aug '08

Module: wine Branch: master Commit: 4a44100aa7b198575b552bf6ab149b6e0cd1738c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a44100aa7b198575b552bf6a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Aug 22 02:16:49 2008 +0400 gdiplus: Implemented GdipFillClosedCurve2[I]. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphics.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 5 ++++ 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a00140f..9e94d57 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -213,8 +213,8 @@ @ stub GdipEnumerateMetafileSrcRectDestPointsI @ stub GdipEnumerateMetafileSrcRectDestRect @ stub GdipEnumerateMetafileSrcRectDestRectI -@ stub GdipFillClosedCurve2 -@ stub GdipFillClosedCurve2I +@ stdcall GdipFillClosedCurve2(ptr ptr ptr long long) +@ stdcall GdipFillClosedCurve2I(ptr ptr ptr long long) @ stub GdipFillClosedCurve @ stub GdipFillClosedCurveI @ stdcall GdipFillEllipse(ptr ptr long long long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3a7ffce..7bbcc74 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1801,6 +1801,62 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string return Ok; } +GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics *graphics, GpBrush *brush, + GDIPCONST GpPointF *points, INT count, REAL tension, GpFillMode fill) +{ + GpPath *path; + GpStatus stat; + + if(!graphics || !brush || !points) + return InvalidParameter; + + stat = GdipCreatePath(fill, &path); + if(stat != Ok) + return stat; + + stat = GdipAddPathClosedCurve2(path, points, count, tension); + if(stat != Ok){ + GdipDeletePath(path); + return stat; + } + + stat = GdipFillPath(graphics, brush, path); + if(stat != Ok){ + GdipDeletePath(path); + return stat; + } + + GdipDeletePath(path); + + return Ok; +} + +GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics *graphics, GpBrush *brush, + GDIPCONST GpPoint *points, INT count, REAL tension, GpFillMode fill) +{ + GpPointF *ptf; + GpStatus stat; + INT i; + + if(!points || count <= 0) + return InvalidParameter; + + ptf = GdipAlloc(sizeof(GpPointF)*count); + if(!ptf) + return OutOfMemory; + + for(i = 0;i < count;i++){ + ptf[i].X = (REAL)points[i].X; + ptf[i].Y = (REAL)points[i].Y; + } + + stat = GdipFillClosedCurve2(graphics, brush, ptf, count, tension, fill); + + GdipFree(ptf); + + return stat; +} + GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ed97542..c5eac71 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -132,6 +132,11 @@ GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics*,GpPen*,GDIPCONST GpRect*,INT GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*, GDIPCONST GpBrush*); + +GpStatus WINGDIPAPI GdipFillClosedCurve2(GpGraphics*,GpBrush*,GDIPCONST GpPointF*,INT, + REAL,GpFillMode); +GpStatus WINGDIPAPI GdipFillClosedCurve2I(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT, + REAL,GpFillMode); GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics*,GpBrush*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*);

1 0