June 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add some missing GL locking to init_format_fbo_compat_info().
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 6df3f23bcac946405cd7509777f2a084049f28c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df3f23bcac946405cd750977… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 29 10:11:22 2009 +0200 wined3d: Add some missing GL locking to init_format_fbo_compat_info(). --- dlls/wined3d/utils.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f04ed43..7baf1d3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -592,8 +592,12 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + ENTER_GL(); + GL_EXTCALL(glGenFramebuffersEXT(1, &fbo)); GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo)); + + LEAVE_GL(); } for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) @@ -661,7 +665,11 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + ENTER_GL(); + GL_EXTCALL(glDeleteFramebuffersEXT(1, &fbo)); + + LEAVE_GL(); } }

1 0

Hwang YunSong : appwiz.cpl: Updated Korean resource.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 98c1d71d105f2c67a108125d948b66d72f2e4885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98c1d71d105f2c67a108125d9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jun 29 09:04:36 2009 +0900 appwiz.cpl: Updated Korean resource. --- dlls/appwiz.cpl/Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Ko.rc b/dlls/appwiz.cpl/Ko.rc index f74a770..ae41726 100644 --- a/dlls/appwiz.cpl/Ko.rc +++ b/dlls/appwiz.cpl/Ko.rc @@ -33,6 +33,7 @@ STRINGTABLE IDS_COLUMN_NAME, "�̸�" IDS_COLUMN_PUBLISHER, "��ۻ�" IDS_COLUMN_VERSION, "��" + IDS_INSTALL_FILTER, "��ġ ��α׷�0*instal*.exe;*setup*.exe;*.msi\0��α׷� (*.exe)\0*.exe\0�� ϵ� (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

Hwang YunSong : kernel32: Updated winerr_kor.mc.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 5922318af038045b86d8436b4a1b242553b81726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5922318af038045b86d8436b4… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jun 29 09:31:17 2009 +0900 kernel32: Updated winerr_kor.mc. --- dlls/kernel32/nls/winerr_kor.mc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/nls/winerr_kor.mc b/dlls/kernel32/nls/winerr_kor.mc index 44036de..b4cdc58 100644 --- a/dlls/kernel32/nls/winerr_kor.mc +++ b/dlls/kernel32/nls/winerr_kor.mc @@ -3729,3 +3729,8 @@ SymbolicName=RPC_S_GRP_ELT_NOT_REMOVED Language=KOR RPC_S_GRP_ELT_NOT_REMOVED . +MessageId=2221 +SymbolicName=NERR_UserNotFound +Language=KOR +�� ̸�� ã�� ϴ� +.

1 0

Hwang YunSong : winecfg: Updated Korean resource.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: eafba4a8f59af1e363852d98354cbd0f434a1d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafba4a8f59af1e363852d983… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jun 29 09:03:01 2009 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 5092140..4ee5e5f 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -43,9 +43,9 @@ BEGIN LTEXT "�� ̺귯�� Ʈ��Դϴ�. �� Ʈ�� (Free Software Foundation)�� GNU LGPL(Lesser General Public License) �Ʒ�� α׷�� Ǵ� �� ֽ��ϴ�. ��̼�� 2.1 �Ǵ� (��) �� ˴ϴ�.", IDC_STATIC,119,44,131,66 GROUPBOX " �� ", IDC_STATIC, 15, 110, 230, 55 - LTEXT "��:", IDC_STATIC, 22, 126, 40, 20 + LTEXT "��(&O):", IDC_STATIC, 22, 126, 40, 20 EDITTEXT IDC_ABT_OWNER, 75, 126, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP - LTEXT "��ü:", IDC_STATIC, 22, 140, 50, 20 + LTEXT "��ü(&Z):", IDC_STATIC, 22, 140, 50, 20 EDITTEXT IDC_ABT_ORG, 75, 140, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP END @@ -56,7 +56,7 @@ FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " ��α׷� �� ",IDC_STATIC, 8,4,244,240 LTEXT "Wine�� α׷�� ؼ� �ٸ� ��  �䳻�� ֽ��ϴ�. �� ̺귯�� , �׷�� ǰ� ��Ǿ� �־, �̵� �� ̿��Ͽ� �ý�� ü �Ǵ� ��α׷�� մϴ�.", - IDC_STATIC,15,20,227,30 + IDC_STATIC,17,14,227,33 CONTROL "��α׷�",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,150 PUSHBUTTON "��α׷� �߰�(&A)...",IDC_APP_ADDAPP, 90,204,75,14 @@ -89,7 +89,7 @@ BEGIN CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,163,10,8 - LTEXT "This is a sample text using 10 point Tahoma( Ÿȣ�� 10��Ʈ �۲�� ؽ�Ʈ�Դϴ�",IDC_RES_FONT_PREVIEW,15,181,230,55 + LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -205,7 +205,7 @@ BEGIN LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 CONTROL "�� ġ(&L):",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,55,13 EDITTEXT IDC_EDIT_SFPATH,75,195,135,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "ã��(&R)...",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "ã��(&R)...",IDC_BROWSE_SFPATH,215,195,34,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -225,7 +225,7 @@ BEGIN IDS_WINECFG_TITLE_APP "%s�� Wine ��" IDS_THEMEFILE "�׸� ��" IDS_THEMEFILE_SELECT "�׸� �� " - IDS_AUDIO_MISSING "�� Ʈ�� ̹�� Ǿ� �� ʽ��ϴ�.\n\n��õ ��̹�� þ��ϴ�.\n�� ̹�� ϰų� �� ٸ� ��̹�� ֽ��ϴ�.\n\n�� ȿ�� Ÿ�� ؼ�� ư�� մϴ�." + IDS_AUDIO_MISSING "�� Ʈ�� ̹�� Ǿ� �� ʽ��ϴ�.\n\n��õ ��̹�� õǾ��ϴ�.\n�� ̹�� ϰų� �� ٸ� ��̹�� ֽ��ϴ�.\n\n�� ȿ�� Ÿ�� ؼ�� ư�� մϴ�." IDS_SHELL_FOLDER "��" IDS_LINKS_TO "�� ġ" END

1 0

Hwang YunSong : taskmgr: Updated Korean resource.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 780d096e84b53d7c8a04cf2d2b80925cbb9b4fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=780d096e84b53d7c8a04cf2d2… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jun 29 09:22:53 2009 +0900 taskmgr: Updated Korean resource. --- programs/taskmgr/Ko.rc | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc index 9d21466..4759f0a 100644 --- a/programs/taskmgr/Ko.rc +++ b/programs/taskmgr/Ko.rc @@ -483,4 +483,89 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "�۾�� 뺸�� Ŭ�� " ID_PROCESS_PAGE_SETPRIORITY_LOW "�۾�� Ŭ�� " + ID_PROCESS_PAGE_DEBUGCHANNELS "�� ä�� " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_VIEW_LARGE "ū ��(&G)" + IDS_VIEW_SMALL "�� (&M)" + IDS_VIEW_DETAILS "�׸�(&D)" + IDS_WINDOWS "â(&W)" + IDS_VIEW_SELECTCOLUMNS "�÷� ��(&S)..." + IDS_OPTIONS_SHOW16BITTASKS "16��Ʈ �۾� ��ֱ�(&S)" + IDS_VIEW_CPUHISTORY "&CPU ��" + IDS_VIEW_CPUHISTORY_ONEGRAPHALL " �� CPU�� ϳ�� ׷��(&O)" + IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU�� ׷��(&P)" + IDS_VIEW_SHOWKERNELTIMES "Ŀ�� ð� ��ֱ�(&S)" + IDS_APPLICATIONS "��α׷�" + IDS_PROCESSES "�۾�" + IDS_PERFORMANCE "��ս�" + IDS_STATUS_BAR_CPU_USAGE "CPU ��뷮: %3d%%" + IDS_STATUS_BAR_PROCESSES "��μ��: %d" + IDS_STATUS_BAR_MEMORY_USAGE "�޸� ��뷮: %dK / %dK" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGENAME "�̹�� ̸�" + IDS_PID "PID" + IDS_CPUUSAGE "CPU" + IDS_CPUTIME "CPU �ð�" + IDS_MEMORYUSAGE "�޸� ��뷮" + IDS_MEMORYUSAGEDELTA "�޸� ��Ÿ" + IDS_PEAKMEMORYUSAGE "��ũ �޸� ��" + IDS_PAGEFAULTS "�� " + IDS_USEROBJECTS "�� ü" + IDS_IOREADS "I/O �б�" + IDS_IOREADBYTES "I/O �� Ʈ" + IDS_SESSIONID "�� ID" + IDS_USERNAME "�� ̸�" + IDS_PAGEFAULTSDELTA "PF ��Ÿ" + IDS_VIRTUALMEMORYSIZE "VM ũ��" + IDS_PAGEDPOOL "�� Ǯ" + IDS_NONPAGEDPOOL "NP Ǯ" + IDS_BASEPRIORITY "�⺻ Pri" + IDS_HANDLECOUNT "�ڵ�" + IDS_THREADCOUNT "��" + IDS_GDIOBJECTS "GDI ��ü" + IDS_IOWRITES "I/O ��" + IDS_IOWRITEBYTES "I/O �� Ʈ" + IDS_IOOTHER "I/O ��Ÿ" + IDS_IOOTHERBYTES "I/O ��Ÿ ��Ʈ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WARNING_TITLE "�۾� �� " + IDS_PRIORITY_CHANGE_MESSAGE "��: ��μ�� 켱 �� Ŭ��׸� ��ϴ� ��\n\ + �ý�� Ҿ�� ؼ� �ٶ�� ֽ��ϴ�. ��\n\ + �켱 �� Ͻðڽ��ϱ�?" + IDS_PRIORITY_UNABLE2CHANGE "�켱�� ٲ� �� ϴ�" + IDS_TERMINATE_MESSAGE "��: ��μ�� ߴܽ�Ű�� Ÿ �սǰ�\n\ + �ý�� Ҿ�� ؼ� �ٶ�� \n\ + �ֽ��ϴ�. �� μ�� ͳ� ��¸� �� ȸ��\n\ + �־�� Դϴ�. \n\ + �� ߴܽ�Ű�ڽ��ϱ�?" + IDS_TERMINATE_UNABLE2TERMINATE "��μ�� ߴܽ�ų �� ϴ�" + IDS_DEBUG_MESSAGE "��: ��μ�� ϴ� �� ս�� ֽ��ϴ�.\n\ + ��Ÿ� ��Ͻðڽ��ϱ�?" + IDS_DEBUG_UNABLE2DEBUG "��μ�� ϴ�" + IDS_AFFINITY_ERROR_MESSAGE " ��  �ϳ�� μ�� ־��մϴ�" + IDS_AFFINITY_ERROR_TITLE "�ùٸ�� ɼ�" + IDS_AFFINITY_UNABLE2ACCESS "��Ҽ� ��ų� ��μ�� Ҽ� ��ϴ�" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SYSTEM_IDLE_PROCESS "�ý�� ۾�" + IDS_APPLICATION_NOT_RESPONDING "�� " + IDS_APPLICATION_RUNNING "��" + IDS_APPLICATION_TASK "�½�ũ" + IDS_APPLICATION_STATUS "��" + IDS_DEBUG_CHANNEL "�� ä��" + IDS_DEBUG_CHANNEL_FIXME " ��" + IDS_DEBUG_CHANNEL_ERR " ��" + IDS_DEBUG_CHANNEL_WARN "��" + IDS_DEBUG_CHANNEL_TRACE "��" END

1 0

Paul Vriens : kernel32: Update Dutch translations.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 75529e66724da4c777c835c74af8cd9e90447423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75529e66724da4c777c835c74… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 29 09:57:45 2009 +0200 kernel32: Update Dutch translations. --- dlls/kernel32/nls/winerr_nld.mc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/nls/winerr_nld.mc b/dlls/kernel32/nls/winerr_nld.mc index ab583d9..b3c7dac 100644 --- a/dlls/kernel32/nls/winerr_nld.mc +++ b/dlls/kernel32/nls/winerr_nld.mc @@ -3728,3 +3728,8 @@ SymbolicName=RPC_S_GRP_ELT_NOT_REMOVED Language=NLD RPC_S_GRP_ELT_NOT_REMOVED . +MessageId=2221 +SymbolicName=NERR_UserNotFound +Language=NLD +Gebruikersnaam niet gevonden +.

1 0

Andrew Eikum : gdiplus/tests: Add tests for GdipDrawCurveI.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: fe55f0df2a8c8bb592a4794eb0c6d22f57aa4cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe55f0df2a8c8bb592a4794eb… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun Jun 28 13:33:52 2009 -0500 gdiplus/tests: Add tests for GdipDrawCurveI. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 62 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 27cd6fb..4d7f096 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1423,7 +1423,7 @@ GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics *graphics, GpPen *pen, TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); - if(!points || count <= 0) + if(!points) return InvalidParameter; pointsF = GdipAlloc(sizeof(GpPointF)*count); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b738ae7..f83d012 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -489,6 +489,67 @@ static void test_GdipDrawCurve(void) ReleaseDC(0, hdc); } +static void test_GdipDrawCurveI(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + HDC hdc = GetDC(0); + GpPoint points[3]; + + points[0].X = 0; + points[0].Y = 0; + + points[1].X = 40; + points[1].Y = 20; + + points[2].X = 10; + points[2].Y = 40; + + /* make a graphics object and pen object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* InvalidParameter cases: null graphics, null pen */ + status = GdipDrawCurveI(NULL, NULL, points, 3); + expect(InvalidParameter, status); + + status = GdipDrawCurveI(graphics, NULL, points, 3); + expect(InvalidParameter, status); + + status = GdipDrawCurveI(NULL, pen, points, 3); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid count */ + status = GdipDrawCurveI(graphics, pen, points, -1); + expect(OutOfMemory, status); + + status = GdipDrawCurveI(graphics, pen, points, 0); + expect(InvalidParameter, status); + + status = GdipDrawCurveI(graphics, pen, points, 1); + expect(InvalidParameter, status); + + /* Valid test cases */ + status = GdipDrawCurveI(graphics, pen, points, 2); + expect(Ok, status); + + status = GdipDrawCurveI(graphics, pen, points, 3); + expect(Ok, status); + + GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + + ReleaseDC(0, hdc); +} + static void test_GdipDrawLineI(void) { GpStatus status; @@ -1214,6 +1275,7 @@ START_TEST(graphics) test_GdipDrawArc(); test_GdipDrawArcI(); test_GdipDrawCurve(); + test_GdipDrawCurveI(); test_GdipDrawCurve2(); test_GdipDrawLineI(); test_GdipDrawLinesI();

1 0

Francois Gouget : setupapi: Ellipses should be preceded by a space in Slovenian.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 9880f0509448f0f09e0ecb587d5df367b99979c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9880f0509448f0f09e0ecb587… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 28 18:53:07 2009 +0200 setupapi: Ellipses should be preceded by a space in Slovenian. --- dlls/setupapi/Si.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/Si.rc b/dlls/setupapi/Si.rc index 6dd0c58..b9bf6e1 100644 --- a/dlls/setupapi/Si.rc +++ b/dlls/setupapi/Si.rc @@ -54,7 +54,7 @@ BEGIN CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 PUSHBUTTON "V redu", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Prekliči", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Brskaj...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Brskaj ...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END #pragma code_page(default)

1 0

Andrew Eikum : gdiplus/tests: Add tests for GdipDrawCurve2I.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: c2aa66d506c6b0ffb498102c0b02fe2f17d3dd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2aa66d506c6b0ffb498102c0… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun Jun 28 13:33:59 2009 -0500 gdiplus/tests: Add tests for GdipDrawCurve2I. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 68 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4d7f096..c052bc3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1514,7 +1514,7 @@ GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics *graphics, GpPen *pen, TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension); - if(!points || count <= 0) + if(!points) return InvalidParameter; pointsF = GdipAlloc(sizeof(GpPointF)*count); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f83d012..e42044a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -428,6 +428,73 @@ static void test_GdipDrawCurve2(void) ReleaseDC(0, hdc); } +static void test_GdipDrawCurve2I(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + HDC hdc = GetDC(0); + GpPoint points[3]; + + points[0].X = 0; + points[0].Y = 0; + + points[1].X = 40; + points[1].Y = 20; + + points[2].X = 10; + points[2].Y = 40; + + /* make a graphics object and pen object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* InvalidParameter cases: null graphics, null pen */ + status = GdipDrawCurve2I(NULL, NULL, points, 3, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve2I(graphics, NULL, points, 3, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve2I(NULL, pen, points, 3, 1); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid count */ + status = GdipDrawCurve2I(graphics, pen, points, -1, 1); + expect(OutOfMemory, status); + + status = GdipDrawCurve2I(graphics, pen, points, 0, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve2I(graphics, pen, points, 1, 1); + expect(InvalidParameter, status); + + /* Valid test cases */ + status = GdipDrawCurve2I(graphics, pen, points, 2, 1); + expect(Ok, status); + + status = GdipDrawCurve2I(graphics, pen, points, 3, 2); + expect(Ok, status); + + status = GdipDrawCurve2I(graphics, pen, points, 3, -2); + expect(Ok, status); + + status = GdipDrawCurve2I(graphics, pen, points, 3, 0); + expect(Ok, status); + + GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + + ReleaseDC(0, hdc); +} + static void test_GdipDrawCurve(void) { GpStatus status; @@ -1277,6 +1344,7 @@ START_TEST(graphics) test_GdipDrawCurve(); test_GdipDrawCurveI(); test_GdipDrawCurve2(); + test_GdipDrawCurve2I(); test_GdipDrawLineI(); test_GdipDrawLinesI(); test_GdipDrawString();

1 0

Andrew Eikum : gdiplus/tests: Add tests for GdipDrawCurve2.
by Alexandre Julliard June 29, 2009

June 29, 2009

Module: wine Branch: master Commit: 7dcfb09b1e50fb2bb79fc3bdd12fc82611798a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dcfb09b1e50fb2bb79fc3bdd… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun Jun 28 12:37:11 2009 -0500 gdiplus/tests: Add tests for GdipDrawCurve2. --- dlls/gdiplus/tests/graphics.c | 68 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 68c0e29..b738ae7 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -361,6 +361,73 @@ static void test_GdipDrawBezierI(void) ReleaseDC(0, hdc); } +static void test_GdipDrawCurve2(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + HDC hdc = GetDC(0); + GpPointF points[3]; + + points[0].X = 0; + points[0].Y = 0; + + points[1].X = 40; + points[1].Y = 20; + + points[2].X = 10; + points[2].Y = 40; + + /* make a graphics object and pen object */ + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* InvalidParameter cases: null graphics, null pen */ + status = GdipDrawCurve2(NULL, NULL, points, 3, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve2(graphics, NULL, points, 3, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve2(NULL, pen, points, 3, 1); + expect(InvalidParameter, status); + + /* InvalidParameter cases: invalid count */ + status = GdipDrawCurve2(graphics, pen, points, -1, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve2(graphics, pen, points, 0, 1); + expect(InvalidParameter, status); + + status = GdipDrawCurve2(graphics, pen, points, 1, 1); + expect(InvalidParameter, status); + + /* Valid test cases */ + status = GdipDrawCurve2(graphics, pen, points, 2, 1); + expect(Ok, status); + + status = GdipDrawCurve2(graphics, pen, points, 3, 2); + expect(Ok, status); + + status = GdipDrawCurve2(graphics, pen, points, 3, -2); + expect(Ok, status); + + status = GdipDrawCurve2(graphics, pen, points, 3, 0); + expect(Ok, status); + + GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + + ReleaseDC(0, hdc); +} + static void test_GdipDrawCurve(void) { GpStatus status; @@ -1147,6 +1214,7 @@ START_TEST(graphics) test_GdipDrawArc(); test_GdipDrawArcI(); test_GdipDrawCurve(); + test_GdipDrawCurve2(); test_GdipDrawLineI(); test_GdipDrawLinesI(); test_GdipDrawString();

1 0