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

Stefan Dösinger : wined3d: Alpha states -> misc pipeline states.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 58ef02fa69adcac6de8c3d16306e8e242cf27015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ef02fa69adcac6de8c3d163… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 20:18:55 2008 -0500 wined3d: Alpha states -> misc pipeline states. --- dlls/wined3d/state.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 82f7734..633fe2a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3837,7 +3837,7 @@ const struct StateEntry FFPStateTable[] = { /* 12, WINED3DRS_ROP2 */ STATE_RENDER(WINED3DRS_ROP2), NULL }, { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), NULL }, { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), NULL }, - { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, + { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }, { /* 17, WINED3DRS_TEXTUREMAG */ 0 /* Handled in ddraw */, state_undefined }, { /* 18, WINED3DRS_TEXTUREMIN */ 0 /* Handled in ddraw */, state_undefined }, @@ -3846,8 +3846,8 @@ const struct StateEntry FFPStateTable[] = { /* 21, WINED3DRS_TEXTUREMAPBLEND */ 0 /* Handled in ddraw */, state_undefined }, { /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode }, { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_zfunc }, - { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, - { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, + { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, + { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, @@ -3863,7 +3863,7 @@ const struct StateEntry FFPStateTable[] = { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, { /* 39, WINED3DRS_STIPPLEENABLE */ STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_stippleenable }, { /* 40, WINED3DRS_EDGEANTIALIAS */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, - { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, + { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 42, undefined */ 0, state_undefined }, { /* 43, WINED3DRS_BORDERCOLOR */ STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor }, { /* 44, WINED3DRS_TEXTUREADDRESSU */ 0, /* Handled in ddraw */ state_undefined }, @@ -4928,6 +4928,10 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ROP2), { STATE_RENDER(WINED3DRS_ROP2), state_rop2 }}, { STATE_RENDER(WINED3DRS_PLANEMASK), { STATE_RENDER(WINED3DRS_PLANEMASK), state_planemask }}, { STATE_RENDER(WINED3DRS_ZWRITEENABLE), { STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_zwritenable }}, + { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_ALPHAREF), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_ALPHAFUNC), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_COLORKEYENABLE), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Move pixelshader application to the fragment pipeline.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: f68ac7465ff89ec6144ba529e452113877d7f6fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68ac7465ff89ec6144ba529e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 15:47:18 2008 -0500 wined3d: Move pixelshader application to the fragment pipeline. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 41c5828..1f47e28 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4321,7 +4321,7 @@ const struct StateEntry FFPStateTable[] = { /*18, Vertex sampler 2 */ STATE_SAMPLER(18), sampler }, { /*19, Vertex sampler 3 */ STATE_SAMPLER(19), sampler }, /* Pixel shader */ - { /* , Pixel Shader */ STATE_PIXELSHADER, pixelshader }, + { /* , Pixel Shader */ STATE_PIXELSHADER, NULL }, /* Transform states follow */ { /* 1, undefined */ 0, state_undefined }, { /* 2, WINED3DTS_VIEW */ STATE_TRANSFORM(WINED3DTS_VIEW), NULL }, @@ -5383,6 +5383,7 @@ const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAARG0), { STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAOP), tex_alphaop }}, { STATE_TEXTURESTAGE(7, WINED3DTSS_RESULTARG), { STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), tex_colorop }}, { STATE_TEXTURESTAGE(7, WINED3DTSS_CONSTANT), { 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }}, + { STATE_PIXELSHADER, { STATE_PIXELSHADER, pixelshader }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Move WINED3DRS_ANTIALIAS to the misc states.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: cad055ae16e78bcf53a6c91f5bac97c12bfcd063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad055ae16e78bcf53a6c91f5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 15:50:00 2008 -0500 wined3d: Move WINED3DRS_ANTIALIAS to the misc states. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1f47e28..5bd8c62 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3824,7 +3824,7 @@ const struct StateEntry FFPStateTable[] = /* State name representative, apply function */ { /* 0, Undefined */ 0, state_undefined }, { /* 1, WINED3DRS_TEXTUREHANDLE */ 0 /* Handled in ddraw */, state_undefined }, - { /* 2, WINED3DRS_ANTIALIAS */ STATE_RENDER(WINED3DRS_ANTIALIAS), state_antialias }, + { /* 2, WINED3DRS_ANTIALIAS */ STATE_RENDER(WINED3DRS_ANTIALIAS), NULL }, { /* 3, WINED3DRS_TEXTUREADDRESS */ 0 /* Handled in ddraw */, state_undefined }, { /* 4, WINED3DRS_TEXTUREPERSPECTIVE */ STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }, { /* 5, WINED3DRS_WRAPU */ STATE_RENDER(WINED3DRS_WRAPU), state_wrapu }, @@ -4916,6 +4916,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }}, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }}, + { STATE_RENDER(WINED3DRS_ANTIALIAS), { STATE_RENDER(WINED3DRS_ANTIALIAS), state_antialias }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Initialize the state table before filling it.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: b24c409ceaba3d5f93e59c1394afee1aad8095ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24c409ceaba3d5f93e59c139… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 15:27:46 2008 -0500 wined3d: Initialize the state table before filling it. --- dlls/wined3d/state.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1e698d6..41c5828 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5418,6 +5418,11 @@ void compile_state_table(struct StateEntry *StateTable, memset(multistate_funcs, 0, sizeof(multistate_funcs)); + for(i = 0; i < STATE_HIGHEST + 1; i++) { + StateTable[i].representative = 0; + StateTable[i].apply = state_undefined; + } + for(type = 0; type < 3; type++) { /* This switch decides the order in which the states are applied */ switch(type) {

1 0

Hwang YunSong(황윤성) : winhlp32: Updated Korean resource.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: eebed38b5b7efe27c1af4db24784b54ff3b4104d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebed38b5b7efe27c1af4db24… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Jul 9 09:54:56 2008 +0900 winhlp32: Updated Korean resource. --- programs/winhlp32/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/Ko.rc b/programs/winhlp32/Ko.rc index ababbe4..18c59ab 100644 --- a/programs/winhlp32/Ko.rc +++ b/programs/winhlp32/Ko.rc @@ -89,7 +89,7 @@ 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)"

1 0

James Hawkins : msi: Add tests for opening a package from a database.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 1ed12b76e1b665e74742c27c0f065500f15433d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed12b76e1b665e74742c27c0… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 8 23:52:48 2008 -0500 msi: Add tests for opening a package from a database. --- dlls/msi/tests/db.c | 173 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 167 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 10c2a4a..78a6ca2 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -190,6 +190,27 @@ static UINT create_component_table( MSIHANDLE hdb ) "PRIMARY KEY `Component`)" ); } +static UINT create_custom_action_table( MSIHANDLE hdb ) +{ + return run_query( hdb, 0, + "CREATE TABLE `CustomAction` ( " + "`Action` CHAR(72) NOT NULL, " + "`Type` SHORT NOT NULL, " + "`Source` CHAR(72), " + "`Target` CHAR(255) " + "PRIMARY KEY `Action`)" ); +} + +static UINT create_directory_table( MSIHANDLE hdb ) +{ + return run_query( hdb, 0, + "CREATE TABLE `Directory` ( " + "`Directory` CHAR(255) NOT NULL, " + "`Directory_Parent` CHAR(255), " + "`DefaultDir` CHAR(255) NOT NULL " + "PRIMARY KEY `Directory`)" ); +} + static UINT create_feature_components_table( MSIHANDLE hdb ) { return run_query( hdb, 0, @@ -233,6 +254,22 @@ static UINT add_component_entry( MSIHANDLE hdb, const char *values ) return r; } +static UINT add_custom_action_entry( MSIHANDLE hdb, const char *values ) +{ + char insert[] = "INSERT INTO `CustomAction` " + "(`Action`, `Type`, `Source`, `Target`) " + "VALUES( %s )"; + char *query; + UINT sz, r; + + sz = strlen(values) + sizeof insert; + query = HeapAlloc(GetProcessHeap(),0,sz); + sprintf(query,insert,values); + r = run_query( hdb, 0, query ); + HeapFree(GetProcessHeap(), 0, query); + return r; +} + static UINT add_feature_components_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `FeatureComponents` " @@ -2331,12 +2368,7 @@ static MSIHANDLE create_package_db(LPCSTR filename) res = set_summary_info(hdb); - res = run_query( hdb, 0, - "CREATE TABLE `Directory` ( " - "`Directory` CHAR(255) NOT NULL, " - "`Directory_Parent` CHAR(255), " - "`DefaultDir` CHAR(255) NOT NULL " - "PRIMARY KEY `Directory`)" ); + res = create_directory_table(hdb); ok( res == ERROR_SUCCESS , "Failed to create directory table\n" ); return hdb; @@ -6153,6 +6185,134 @@ static void test_storages_table(void) DeleteFileA(msifile); } +static void test_dbtopackage(void) +{ + MSIHANDLE hdb, hpkg; + CHAR package[10]; + CHAR buf[MAX_PATH]; + DWORD size; + UINT r; + + /* create an empty database, transact mode */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Failed to create database\n"); + + set_summary_info(hdb); + + r = create_directory_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_custom_action_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_custom_action_entry(hdb, "'SetProp', 51, 'MYPROP', 'grape'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + sprintf(package, "#%li", hdb); + r = MsiOpenPackage(package, &hpkg); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* property is not set yet */ + size = MAX_PATH; + lstrcpyA(buf, "kiwi"); + r = MsiGetProperty(hpkg, "MYPROP", buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(size == 0, "Expected 0, got %d\n", size); + + /* run the custom action to set the property */ + r = MsiDoAction(hpkg, "SetProp"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* property is now set */ + size = MAX_PATH; + lstrcpyA(buf, "kiwi"); + r = MsiGetProperty(hpkg, "MYPROP", buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "grape"), "Expected \"grape\", got \"%s\"\n", buf); + ok(size == 5, "Expected 5, got %d\n", size); + + MsiCloseHandle(hpkg); + + /* reset the package */ + r = MsiOpenPackage(package, &hpkg); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* property is not set anymore */ + size = MAX_PATH; + lstrcpyA(buf, "kiwi"); + r = MsiGetProperty(hpkg, "MYPROP", buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(size == 0, "Expected 0, got %d\n", size); + } + + MsiCloseHandle(hdb); + MsiCloseHandle(hpkg); + + /* create an empty database, direct mode */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATEDIRECT, &hdb); + ok(r == ERROR_SUCCESS, "Failed to create database\n"); + + set_summary_info(hdb); + + r = create_directory_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = create_custom_action_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_custom_action_entry(hdb, "'SetProp', 51, 'MYPROP', 'grape'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + sprintf(package, "#%li", hdb); + r = MsiOpenPackage(package, &hpkg); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* property is not set yet */ + size = MAX_PATH; + lstrcpyA(buf, "kiwi"); + r = MsiGetProperty(hpkg, "MYPROP", buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(size == 0, "Expected 0, got %d\n", size); + + /* run the custom action to set the property */ + r = MsiDoAction(hpkg, "SetProp"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* property is now set */ + size = MAX_PATH; + lstrcpyA(buf, "kiwi"); + r = MsiGetProperty(hpkg, "MYPROP", buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "grape"), "Expected \"grape\", got \"%s\"\n", buf); + ok(size == 5, "Expected 5, got %d\n", size); + + MsiCloseHandle(hpkg); + + /* reset the package */ + r = MsiOpenPackage(package, &hpkg); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* property is not set anymore */ + size = MAX_PATH; + lstrcpyA(buf, "kiwi"); + r = MsiGetProperty(hpkg, "MYPROP", buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(size == 0, "Expected 0, got %d\n", size); + } + + MsiCloseHandle(hdb); + MsiCloseHandle(hpkg); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -6191,4 +6351,5 @@ START_TEST(db) test_viewmodify_refresh(); test_where_viewmodify(); test_storages_table(); + test_dbtopackage(); }

1 0

James Hawkins : msi: Only copy the resulting string if the RegistryValue call succeeded.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 1fed032a43a23df80de7da6f7dbf23b4ed2a020f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fed032a43a23df80de7da6f7… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Jul 8 23:56:26 2008 -0500 msi: Only copy the resulting string if the RegistryValue call succeeded. --- dlls/msi/tests/automation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 03154e1..2c741e8 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -804,7 +804,7 @@ static HRESULT Installer_RegistryValueI(HKEY hkey, LPCWSTR szKey, int iValue, LP V_I4(&vararg) = iValue; hr = Installer_RegistryValue(hkey, szKey, vararg, &varresult, vtResult); - if (vtResult == VT_BSTR) lstrcpyW(szString, V_BSTR(&varresult)); + if (SUCCEEDED(hr) && vtResult == VT_BSTR) lstrcpyW(szString, V_BSTR(&varresult)); VariantClear(&varresult); return hr; }

1 0

Nikolay Sivov : gdiplus: Implemeted GdipDrawClosedCurve2 and GdipDrawClosedCurve2I.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 8b8864b727671eadd942a8978885efe8b807a9f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8864b727671eadd942a8978… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 9 00:39:19 2008 +0400 gdiplus: Implemeted GdipDrawClosedCurve2 and GdipDrawClosedCurve2I. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphics.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a1c4849..9b272eb 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -159,8 +159,8 @@ @ stdcall GdipDrawBeziers(ptr ptr ptr long) @ stdcall GdipDrawBeziersI(ptr ptr ptr long) @ stub GdipDrawCachedBitmap -@ stub GdipDrawClosedCurve2 -@ stub GdipDrawClosedCurve2I +@ stdcall GdipDrawClosedCurve2(ptr ptr ptr long long) +@ stdcall GdipDrawClosedCurve2I(ptr ptr ptr long long) @ stub GdipDrawClosedCurve @ stub GdipDrawClosedCurveI @ stdcall GdipDrawCurve2(ptr ptr ptr long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6c9aa15..0f82404 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1045,6 +1045,57 @@ GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics *graphics, GpPen *pen, return ret; } +GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPointF *points, INT count, REAL tension) +{ + GpPointF *ptf; + GpStatus stat; + + if(!graphics || !pen || !points || count <= 0) + return InvalidParameter; + + /* make a full points copy.. */ + ptf = GdipAlloc(sizeof(GpPointF)*(count+1)); + if(!ptf) + return OutOfMemory; + memcpy(ptf, points, sizeof(GpPointF)*count); + + /* ..and add a first point as a last one */ + ptf[count] = ptf[0]; + + stat = GdipDrawCurve2(graphics, pen, ptf, count + 1, tension); + + GdipFree(ptf); + + return stat; +} + +GpStatus WINGDIPAPI GdipDrawClosedCurve2I(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPoint *points, INT count, REAL tension) +{ + 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 = GdipDrawClosedCurve2(graphics, pen, ptf, count, tension); + + GdipFree(ptf); + + return stat; +} + GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 3deca53..7538165 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -85,6 +85,8 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,R GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics*,GpPen*,INT,INT,INT,INT,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT); +GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL); +GpStatus WINGDIPAPI GdipDrawClosedCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL); GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipDrawCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL);

1 0

Nikolay Sivov : gdiplus: Implemented GdipDrawClosedCurve and GdipDrawClosedCurveI.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 55916bb9701d550baf68697e642841088d01354b URL: http://source.winehq.org/git/wine.git/?a=commit;h=55916bb9701d550baf68697e6… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 9 00:39:31 2008 +0400 gdiplus: Implemented GdipDrawClosedCurve and GdipDrawClosedCurveI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 12 ++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9b272eb..3836b68 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -161,8 +161,8 @@ @ stub GdipDrawCachedBitmap @ stdcall GdipDrawClosedCurve2(ptr ptr ptr long long) @ stdcall GdipDrawClosedCurve2I(ptr ptr ptr long long) -@ stub GdipDrawClosedCurve -@ stub GdipDrawClosedCurveI +@ stdcall GdipDrawClosedCurve(ptr ptr ptr long) +@ stdcall GdipDrawClosedCurveI(ptr ptr ptr long) @ stdcall GdipDrawCurve2(ptr ptr ptr long long) @ stdcall GdipDrawCurve2I(ptr ptr ptr long long) @ stub GdipDrawCurve3 diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0f82404..893799d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1045,6 +1045,18 @@ GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics *graphics, GpPen *pen, return ret; } +GpStatus WINGDIPAPI GdipDrawClosedCurve(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPointF *points, INT count) +{ + return GdipDrawClosedCurve2(graphics, pen, points, count, 1.0); +} + +GpStatus WINGDIPAPI GdipDrawClosedCurveI(GpGraphics *graphics, GpPen *pen, + GDIPCONST GpPoint *points, INT count) +{ + return GdipDrawClosedCurve2I(graphics, pen, points, count, 1.0); +} + GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 7538165..854039c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -85,6 +85,8 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,R GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics*,GpPen*,INT,INT,INT,INT,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT); +GpStatus WINGDIPAPI GdipDrawClosedCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipDrawClosedCurveI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipDrawClosedCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL); GpStatus WINGDIPAPI GdipDrawCurve(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT);

1 0

Andrew Talbot : wined3d: Remove const qualifier from output pointers.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 3e1fad5350e805755cc2bd7e872ff2daf4312a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1fad5350e805755cc2bd7e8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jul 8 22:49:35 2008 +0100 wined3d: Remove const qualifier from output pointers. --- include/wine/wined3d_gl.h | 64 ++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 2062507..58f0cbc 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -803,7 +803,7 @@ typedef void GLvoid; void (WINE_GLAPI *glAccum) (GLenum op, GLfloat value); void (WINE_GLAPI *glAlphaFunc) (GLenum func, GLclampf ref); -GLboolean (WINE_GLAPI *glAreTexturesResident) (GLsizei n, const GLuint* textures, const GLboolean* residences); +GLboolean (WINE_GLAPI *glAreTexturesResident) (GLsizei n, const GLuint* textures, GLboolean* residences); void (WINE_GLAPI *glArrayElement) (GLint i); void (WINE_GLAPI *glBegin) (GLenum mode); void (WINE_GLAPI *glBindTexture) (GLenum target, GLuint texture); @@ -889,7 +889,7 @@ void (WINE_GLAPI *glEvalMesh1) (GLenum mode, GLint i1, GLint i2); void (WINE_GLAPI *glEvalMesh2) (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); void (WINE_GLAPI *glEvalPoint1) (GLint i); void (WINE_GLAPI *glEvalPoint2) (GLint i, GLint j); -void (WINE_GLAPI *glFeedbackBuffer) (GLsizei size, GLenum type, const GLfloat* buffer); +void (WINE_GLAPI *glFeedbackBuffer) (GLsizei size, GLenum type, GLfloat* buffer); void (WINE_GLAPI *glFinish) (); void (WINE_GLAPI *glFlush) (); void (WINE_GLAPI *glFogf) (GLenum pname, GLfloat param); @@ -899,36 +899,36 @@ void (WINE_GLAPI *glFogiv) (GLenum pname, const GLint* params); void (WINE_GLAPI *glFrontFace) (GLenum mode); void (WINE_GLAPI *glFrustum) (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); GLuint (WINE_GLAPI *glGenLists) (GLsizei range); -void (WINE_GLAPI *glGenTextures) (GLsizei n, const GLuint* textures); -void (WINE_GLAPI *glGetBooleanv) (GLenum pname, const GLboolean* params); -void (WINE_GLAPI *glGetClipPlane) (GLenum plane, const GLdouble* equation); -void (WINE_GLAPI *glGetDoublev) (GLenum pname, const GLdouble* params); +void (WINE_GLAPI *glGenTextures) (GLsizei n, GLuint* textures); +void (WINE_GLAPI *glGetBooleanv) (GLenum pname, GLboolean* params); +void (WINE_GLAPI *glGetClipPlane) (GLenum plane, GLdouble* equation); +void (WINE_GLAPI *glGetDoublev) (GLenum pname, GLdouble* params); GLenum (WINE_GLAPI *glGetError) (); -void (WINE_GLAPI *glGetFloatv) (GLenum pname, const GLfloat* params); -void (WINE_GLAPI *glGetIntegerv) (GLenum pname, const GLint* params); -void (WINE_GLAPI *glGetLightfv) (GLenum light, GLenum pname, const GLfloat* params); -void (WINE_GLAPI *glGetLightiv) (GLenum light, GLenum pname, const GLint* params); -void (WINE_GLAPI *glGetMapdv) (GLenum target, GLenum query, const GLdouble* v); -void (WINE_GLAPI *glGetMapfv) (GLenum target, GLenum query, const GLfloat* v); -void (WINE_GLAPI *glGetMapiv) (GLenum target, GLenum query, const GLint* v); -void (WINE_GLAPI *glGetMaterialfv) (GLenum face, GLenum pname, const GLfloat* params); -void (WINE_GLAPI *glGetMaterialiv) (GLenum face, GLenum pname, const GLint* params); -void (WINE_GLAPI *glGetPixelMapfv) (GLenum map, const GLfloat* values); -void (WINE_GLAPI *glGetPixelMapuiv) (GLenum map, const GLuint* values); -void (WINE_GLAPI *glGetPixelMapusv) (GLenum map, const GLushort* values); -void (WINE_GLAPI *glGetPointerv) (GLenum pname, const GLvoid** params); -void (WINE_GLAPI *glGetPolygonStipple) (const GLubyte* mask); +void (WINE_GLAPI *glGetFloatv) (GLenum pname, GLfloat* params); +void (WINE_GLAPI *glGetIntegerv) (GLenum pname, GLint* params); +void (WINE_GLAPI *glGetLightfv) (GLenum light, GLenum pname, GLfloat* params); +void (WINE_GLAPI *glGetLightiv) (GLenum light, GLenum pname, GLint* params); +void (WINE_GLAPI *glGetMapdv) (GLenum target, GLenum query, GLdouble* v); +void (WINE_GLAPI *glGetMapfv) (GLenum target, GLenum query, GLfloat* v); +void (WINE_GLAPI *glGetMapiv) (GLenum target, GLenum query, GLint* v); +void (WINE_GLAPI *glGetMaterialfv) (GLenum face, GLenum pname, GLfloat* params); +void (WINE_GLAPI *glGetMaterialiv) (GLenum face, GLenum pname, GLint* params); +void (WINE_GLAPI *glGetPixelMapfv) (GLenum map, GLfloat* values); +void (WINE_GLAPI *glGetPixelMapuiv) (GLenum map, GLuint* values); +void (WINE_GLAPI *glGetPixelMapusv) (GLenum map, GLushort* values); +void (WINE_GLAPI *glGetPointerv) (GLenum pname, GLvoid** params); +void (WINE_GLAPI *glGetPolygonStipple) (GLubyte* mask); const GLubyte * (WINE_GLAPI *glGetString) (GLenum name); -void (WINE_GLAPI *glGetTexEnvfv) (GLenum target, GLenum pname, const GLfloat* params); -void (WINE_GLAPI *glGetTexEnviv) (GLenum target, GLenum pname, const GLint* params); -void (WINE_GLAPI *glGetTexGendv) (GLenum coord, GLenum pname, const GLdouble* params); -void (WINE_GLAPI *glGetTexGenfv) (GLenum coord, GLenum pname, const GLfloat* params); -void (WINE_GLAPI *glGetTexGeniv) (GLenum coord, GLenum pname, const GLint* params); -void (WINE_GLAPI *glGetTexImage) (GLenum target, GLint level, GLenum format, GLenum type, const GLvoid* pixels); -void (WINE_GLAPI *glGetTexLevelParameterfv) (GLenum target, GLint level, GLenum pname, const GLfloat* params); -void (WINE_GLAPI *glGetTexLevelParameteriv) (GLenum target, GLint level, GLenum pname, const GLint* params); -void (WINE_GLAPI *glGetTexParameterfv) (GLenum target, GLenum pname, const GLfloat* params); -void (WINE_GLAPI *glGetTexParameteriv) (GLenum target, GLenum pname, const GLint* params); +void (WINE_GLAPI *glGetTexEnvfv) (GLenum target, GLenum pname, GLfloat* params); +void (WINE_GLAPI *glGetTexEnviv) (GLenum target, GLenum pname, GLint* params); +void (WINE_GLAPI *glGetTexGendv) (GLenum coord, GLenum pname, GLdouble* params); +void (WINE_GLAPI *glGetTexGenfv) (GLenum coord, GLenum pname, GLfloat* params); +void (WINE_GLAPI *glGetTexGeniv) (GLenum coord, GLenum pname, GLint* params); +void (WINE_GLAPI *glGetTexImage) (GLenum target, GLint level, GLenum format, GLenum type, GLvoid* pixels); +void (WINE_GLAPI *glGetTexLevelParameterfv) (GLenum target, GLint level, GLenum pname, GLfloat* params); +void (WINE_GLAPI *glGetTexLevelParameteriv) (GLenum target, GLint level, GLenum pname, GLint* params); +void (WINE_GLAPI *glGetTexParameterfv) (GLenum target, GLenum pname, GLfloat* params); +void (WINE_GLAPI *glGetTexParameteriv) (GLenum target, GLenum pname, GLint* params); void (WINE_GLAPI *glHint) (GLenum target, GLenum mode); void (WINE_GLAPI *glIndexMask) (GLuint mask); void (WINE_GLAPI *glIndexPointer) (GLenum type, GLsizei stride, const GLvoid* pointer); @@ -1038,7 +1038,7 @@ void (WINE_GLAPI *glRasterPos4iv) (const GLint* v); void (WINE_GLAPI *glRasterPos4s) (GLshort x, GLshort y, GLshort z, GLshort w); void (WINE_GLAPI *glRasterPos4sv) (const GLshort* v); void (WINE_GLAPI *glReadBuffer) (GLenum mode); -void (WINE_GLAPI *glReadPixels) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels); +void (WINE_GLAPI *glReadPixels) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels); void (WINE_GLAPI *glRectd) (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); void (WINE_GLAPI *glRectdv) (const GLdouble* v1, const GLdouble* v2); void (WINE_GLAPI *glRectf) (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); @@ -1053,7 +1053,7 @@ void (WINE_GLAPI *glRotatef) (GLfloat angle, GLfloat x, GLfloat y, GLfloat z); void (WINE_GLAPI *glScaled) (GLdouble x, GLdouble y, GLdouble z); void (WINE_GLAPI *glScalef) (GLfloat x, GLfloat y, GLfloat z); void (WINE_GLAPI *glScissor) (GLint x, GLint y, GLsizei width, GLsizei height); -void (WINE_GLAPI *glSelectBuffer) (GLsizei size, const GLuint* buffer); +void (WINE_GLAPI *glSelectBuffer) (GLsizei size, GLuint* buffer); void (WINE_GLAPI *glShadeModel) (GLenum mode); void (WINE_GLAPI *glStencilFunc) (GLenum func, GLint ref, GLuint mask); void (WINE_GLAPI *glStencilMask) (GLuint mask);

1 0