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

Evan Stade : gdiplus: Added GdipMultiplyMatrix.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 12e3eadd415a13c070673234fc97817ca53a704d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e3eadd415a13c070673234f… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 17 19:31:15 2007 -0700 gdiplus: Added GdipMultiplyMatrix. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 36 ++++++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 7 +++++++ include/gdiplusflat.h | 1 + include/gdiplusgpstubs.h | 1 + 5 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9bc5122..21e3828 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -424,7 +424,7 @@ @ stub GdipMeasureDriverString @ stub GdipMeasureString @ stub GdipMultiplyLineTransform -@ stub GdipMultiplyMatrix +@ stdcall GdipMultiplyMatrix(ptr ptr long) @ stub GdipMultiplyPathGradientTransform @ stub GdipMultiplyPenTransform @ stub GdipMultiplyTextureTransform diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 909bfee..c8eb689 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -25,6 +25,28 @@ #include "gdiplus.h" #include "gdiplus_private.h" +/* Multiplies two matrices of the form + * + * idx:0 idx:1 0 + * idx:2 idx:3 0 + * idx:4 idx:5 1 + * + * and puts the output in out. + * */ +static void matrix_multiply(GDIPCONST REAL * left, GDIPCONST REAL * right, REAL * out) +{ + REAL temp[6]; + int i, odd; + + for(i = 0; i < 6; i++){ + odd = i % 2; + temp[i] = left[i - odd] * right[odd] + left[i - odd + 1] * right[odd + 2] + + (i >= 4 ? right[odd + 4] : 0.0); + } + + memcpy(out, temp, 6 * sizeof(REAL)); +} + GpStatus WINGDIPAPI GdipCreateMatrix2(REAL m11, REAL m12, REAL m21, REAL m22, REAL dx, REAL dy, GpMatrix **matrix) { @@ -57,6 +79,20 @@ GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix *matrix) return Ok; } +GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GpMatrix* matrix2, + GpMatrixOrder order) +{ + if(!matrix || !matrix2) + return InvalidParameter; + + if(order == MatrixOrderAppend) + matrix_multiply(matrix->matrix, matrix2->matrix, matrix->matrix); + else + matrix_multiply(matrix2->matrix, matrix->matrix, matrix->matrix); + + return Ok; +} + GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, INT count) { diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 4f5b193..eb807ce 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -151,6 +151,12 @@ enum DashStyle DashStyleCustom }; +enum MatrixOrder +{ + MatrixOrderPrepend = 0, + MatrixOrderAppend = 1 +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -166,6 +172,7 @@ typedef enum InterpolationMode InterpolationMode; typedef enum PixelOffsetMode PixelOffsetMode; typedef enum DashCap DashCap; typedef enum DashStyle DashStyle; +typedef enum MatrixOrder MatrixOrder; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a358a1e..e3ab4e0 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -87,6 +87,7 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); +GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder); GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 7cb1888..8bb5bb6 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -52,5 +52,6 @@ typedef RectF GpRectF; typedef LineJoin GpLineJoin; typedef DashCap GpDashCap; typedef DashStyle GpDashStyle; +typedef MatrixOrder GpMatrixOrder; #endif

1 0

Hwang YunSong(황윤성) : cmd: Updated Korean resource.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 70ce53af03f924be7b9a43e86e4b4a2021caf019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ce53af03f924be7b9a43e86… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Jul 17 14:45:13 2007 +0900 cmd: Updated Korean resource. --- programs/cmd/Ko.rc | 54 ++++++++++++++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index 88f0626..cc584a3 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -235,33 +235,33 @@ HELP <��>�� ġ�� \n" WCMD_NO, "�ƴϿ�" WCMD_NOASSOC, "�� Ȯ�� %s�� Ǯ�׸�� ϴ�. \n" WCMD_NOFTYPE, "�� '%s'�� �� ɵ� ��ϴ�.'\n" - WCMD_OVERWRITE, "Overwrite %s" + WCMD_OVERWRITE, "%s ����" WCMD_MORESTR, "�� ..." - WCMD_TRUNCATEDLINE, "Line in Batch processing possibly truncated. Using:\n" - WCMD_NYI, "Not Yet Implemented\n\n" - WCMD_NOARG, "Argument missing\n" - WCMD_SYNTAXERR, "Syntax error\n" - WCMD_FILENOTFOUND, "%s : File Not Found\n" - WCMD_NOCMDHELP, "No help available for %s\n" - WCMD_NOTARGET, "Target to GOTO not found\n" - WCMD_CURRENTDATE, "Current Date is %s\n" - WCMD_CURRENTTIME, "Current Time is %s\n" - WCMD_NEWDATE, "Enter new date: " - WCMD_NEWTIME, "Enter new time: " - WCMD_MISSINGENV, "Environment variable %s not defined\n" - WCMD_READFAIL, "Failed to open '%s'\n" - WCMD_CALLINSCRIPT, "Cannot call batch label outside of a batch script\n" + WCMD_TRUNCATEDLINE, "��ġ �۾�� Ƹ�� ҿ�� ϴ�. ��:\n" + WCMD_NYI, "�� ʾҽ��ϴ�\n\n" + WCMD_NOARG, "�μ�� ϴ�\n" + WCMD_SYNTAXERR, "�� \n" + WCMD_FILENOTFOUND, "%s :�� ã�� ϴ�\n" + WCMD_NOCMDHELP, "%s�� �� 򸻵� ã�� ϴ�\n" + WCMD_NOTARGET, "GOTO Ÿ�� ã�� ϴ�\n" + WCMD_CURRENTDATE, "�� ¥�� %s\n" + WCMD_CURRENTTIME, "�� ð�� %s\n" + WCMD_NEWDATE, "�� ¥ �Է�: " + WCMD_NEWTIME, "�� ð� �Է�: " + WCMD_MISSINGENV, "ȯ�� %s �� ǵ�� ʾҽ��ϴ�\n" + WCMD_READFAIL, "'%s' �� \n" + WCMD_CALLINSCRIPT, "��ġ ��ũ��Ʈ �� ġ �� ҷ��ü� ��ϴ�\n" WCMD_ALL, "A" - WCMD_DELPROMPT, "%s, Delete" - WCMD_ECHOPROMPT, "Echo is %s\n" - WCMD_VERIFYPROMPT, "Verify is %s\n" - WCMD_VERIFYERR, "Verify must be ON or OFF\n"; - WCMD_ARGERR, "Parameter error\n" - WCMD_VOLUMEDETAIL, "Volume in drive %c is %s\nVolume Serial Number is %04x-%04x\n\n" - WCMD_VOLUMEPROMPT, "Volume label (11 characters, ENTER for none)?" - WCMD_NOPATH, "PATH not found\n" - WCMD_ANYKEY,"Press Return key to continue: " - WCMD_CONSTITLE,"Wine Command Prompt" - WCMD_VERSION,"CMD Version %s\n\n" - WCMD_MOREPROMPT, "More? " + WCMD_DELPROMPT, "%s, ��" + WCMD_ECHOPROMPT, "��(Echo)�� %s\n" + WCMD_VERIFYPROMPT, "��(Verify)�� %s\n" + WCMD_VERIFYERR, "��(Verify)�� ݵ�� ON �̳� OFF�� Ǿ�� մϴ�.\n"; + WCMD_ARGERR, "�Ű�� \n" + WCMD_VOLUMEDETAIL, "%c ��̺�� %s\n�� ø�� ȣ�� %04x-%04x\n\n" + WCMD_VOLUMEPROMPT, "�� (11 ��, ENTER�� )?" + WCMD_NOPATH, "PATH�� ã�� ϴ�\n" + WCMD_ANYKEY,"�� Ű�� : " + WCMD_CONSTITLE,"Wine �� Է´��" + WCMD_VERSION,"CMD �� %s\n\n" + WCMD_MOREPROMPT, " ��? " }

1 0

Hwang YunSong(황윤성) : wordpad: Updated Korean resource.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 9e2f6b113bf0240abe1f03c243edd34874f7c77a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2f6b113bf0240abe1f03c24… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Jul 17 15:03:39 2007 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index c4a4c27..5aab506 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -53,11 +53,11 @@ BEGIN MENUITEM "�ؽ�Ʈ ��(&G)", ID_EDIT_GETTEXT END END - POPUP "&View" + POPUP "��(&V)" BEGIN - MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR - MENUITEM "&Formatbar", ID_TOGGLE_FORMATBAR - MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR + MENUITEM "��(&T)", ID_TOGGLE_TOOLBAR + MENUITEM "��Ĺ�(&F)", ID_TOGGLE_FORMATBAR + MENUITEM "��¹�(&S)", ID_TOGGLE_STATUSBAR END POPUP "��(&O)" BEGIN @@ -79,11 +79,11 @@ STRINGTABLE DISCARDABLE BEGIN STRING_RICHTEXT_FILES_RTF, "��ġ �ؽ�Ʈ �� (*.rtf)" STRING_TEXT_FILES_TXT, "�ؽ�Ʈ �� (*.txt)" - STRING_ALL_FILES, "�� (*.*)" + STRING_ALL_FILES, "�� (*.*)" END STRINGTABLE DISCARDABLE BEGIN - STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" + STRING_DEFAULT_FILENAME, "��" + STRING_PROMPT_SAVE_CHANGES, "'%s'�� ٲ� �� ϰڽ��ϱ�?" END

1 0

Paul Vriens : advapi32/service: Test for duplicate displayname.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: f8ea5a73ce799ae7a8b8e3d9d5ae9d28511c1d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ea5a73ce799ae7a8b8e3d9d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jul 17 22:06:51 2007 +0200 advapi32/service: Test for duplicate displayname. --- dlls/advapi32/tests/service.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 9157dea..4013988 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -144,6 +144,10 @@ static void test_create_delete_svc(void) static const CHAR empty [] = ""; static const CHAR spooler [] = "Spooler"; /* Should be available on all platforms */ static const CHAR password [] = "secret"; + BOOL spooler_exists = FALSE; + BOOL ret; + CHAR display[4096]; + DWORD display_size = sizeof(display); /* Get the username and turn it into an account to be used in some tests */ GetUserNameA(username, &user_size); @@ -277,6 +281,7 @@ static void test_create_delete_svc(void) svc_handle1 = OpenServiceA(scm_handle, spooler, GENERIC_READ); if (svc_handle1) { + spooler_exists = TRUE; CloseServiceHandle(svc_handle1); SetLastError(0xdeadbeef); svc_handle1 = CreateServiceA(scm_handle, spooler, NULL, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); @@ -286,7 +291,35 @@ static void test_create_delete_svc(void) else skip("Spooler service doesn't exist\n"); - /* TODO: Add check for displayname, it must be unique (or NULL/empty) */ + /* To find an existing displayname we check the 'Spooler' service. Although the registry doesn't show DisplayName on NT4, this call + * will return a displayname which is equal to the servicename and can't be used as well for a new displayname. + */ + if (spooler_exists) + { + ret = GetServiceDisplayNameA(scm_handle, spooler, display, &display_size); + + if (!ret) + skip("Could not retrieve a displayname for the Spooler service\n"); + else + { + svc_handle1 = CreateServiceA(scm_handle, servicename, display, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, 0, + pathname, NULL, NULL, NULL, NULL, NULL); + todo_wine + { + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Expected ERROR_DUPLICATE_SERVICE_NAME, got %d\n", GetLastError()); + } + } + } + else + skip("Could not retrieve a displayname (Spooler service doesn't exist)\n"); + + /* FIXME: Remove this when Wine is fixed */ + if (svc_handle1) + { + DeleteService(svc_handle1); + CloseServiceHandle(svc_handle1); + } CloseServiceHandle(scm_handle); }

1 0

Detlef Riekenberg : include/winspool.h: Add missing struct.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 76fe458eb5edaccff0dc7e70cb5319ce92368fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fe458eb5edaccff0dc7e70c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jul 18 05:09:22 2007 +0200 include/winspool.h: Add missing struct. --- include/winspool.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/include/winspool.h b/include/winspool.h index 7ae2dc8..9501d2d 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -474,6 +474,68 @@ DECL_WINELIB_TYPE_AW(DRIVER_INFO_6) DECL_WINELIB_TYPE_AW(PDRIVER_INFO_6) DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_6) +/* DRIVER_INFO_7 is not defined in native winspool.h and not found in the www */ + +typedef struct _DRIVER_INFO_8A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; + LPSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPSTR pszMfgName; + LPSTR pszOEMUrl; + LPSTR pszHardwareID; + LPSTR pszProvider; + LPSTR pszPrintProcessor; + LPSTR pszVendorSetup; + LPSTR pszzColorProfiles; + LPSTR pszInfPath; + DWORD dwPrinterDriverAttributes; + LPSTR pszzCoreDriverDependencies; + FILETIME ftMinInboxDriverVerDate; + DWORDLONG dwlMinInboxDriverVerVersion; +} DRIVER_INFO_8A, *PDRIVER_INFO_8A, *LPDRIVER_INFO_8A; + +typedef struct _DRIVER_INFO_8W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPWSTR pszMfgName; + LPWSTR pszOEMUrl; + LPWSTR pszHardwareID; + LPWSTR pszProvider; + LPWSTR pszPrintProcessor; + LPWSTR pszVendorSetup; + LPWSTR pszzColorProfiles; + LPWSTR pszInfPath; + DWORD dwPrinterDriverAttributes; + LPWSTR pszzCoreDriverDependencies; + FILETIME ftMinInboxDriverVerDate; + DWORDLONG dwlMinInboxDriverVerVersion; +} DRIVER_INFO_8W, *PDRIVER_INFO_8W, *LPDRIVER_INFO_8W; + +DECL_WINELIB_TYPE_AW(DRIVER_INFO_8) +DECL_WINELIB_TYPE_AW(PDRIVER_INFO_8) +DECL_WINELIB_TYPE_AW(LPDRIVER_INFO_8) + typedef struct _PRINTER_INFO_1A { DWORD Flags;

1 0

Evan Stade : gdiplus: Added GdipClonePen.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 628c9a69c1ee6b2321d81866eab299aca03e95eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=628c9a69c1ee6b2321d81866e… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 17 19:30:50 2007 -0700 gdiplus: Added GdipClonePen. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 22 ++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index cc64b98..ee1a576 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -51,7 +51,7 @@ @ stub GdipCloneImageAttributes @ stub GdipCloneMatrix @ stub GdipClonePath -@ stub GdipClonePen +@ stdcall GdipClonePen(ptr ptr) @ stub GdipCloneRegion @ stub GdipCloneStringFormat @ stdcall GdipClosePathFigure(ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 53559bd..a2cbff5 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -65,6 +65,28 @@ static DWORD gdip_to_gdi_join(GpLineJoin join) } } +GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) +{ + LOGBRUSH lb; + + if(!pen || !clonepen) + return InvalidParameter; + + *clonepen = GdipAlloc(sizeof(GpPen)); + if(!*clonepen) return OutOfMemory; + + memcpy(*clonepen, pen, sizeof(GpPen)); + + lb.lbStyle = BS_SOLID; + lb.lbColor = (*clonepen)->color; + lb.lbHatch = 0; + + (*clonepen)->gdipen = ExtCreatePen((*clonepen)->style, + roundr((*clonepen)->width), &lb, 0, NULL); + + return Ok; +} + GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, GpPen **pen) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index fb760f0..8388f95 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -27,6 +27,7 @@ extern "C" { #endif +GpStatus WINGDIPAPI GdipClonePen(GpPen*,GpPen**); GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle);

1 0

Evan Stade : gdiplus: Added GdipGetPenDashStyle.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 024800cb9abc22e3a11749e76ee1c7eca8aa854c URL: http://source.winehq.org/git/wine.git/?a=commit;h=024800cb9abc22e3a11749e76… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 17 19:31:01 2007 -0700 gdiplus: Added GdipGetPenDashStyle. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 12 +++++++++++- include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ee1a576..9bc5122 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -342,7 +342,7 @@ @ stub GdipGetPenDashCap197819 @ stub GdipGetPenDashCount @ stub GdipGetPenDashOffset -@ stub GdipGetPenDashStyle +@ stdcall GdipGetPenDashStyle(ptr ptr) @ stub GdipGetPenEndCap @ stub GdipGetPenFillType @ stub GdipGetPenLineJoin diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index a2cbff5..52ee8e2 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -106,8 +106,8 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, gp_pen->endcap = LineCapFlat; gp_pen->join = LineJoinMiter; gp_pen->miterlimit = 10.0; + gp_pen->dash = DashStyleSolid; - /* FIXME: Currently only solid lines supported. */ lb.lbStyle = BS_SOLID; lb.lbColor = gp_pen->color; lb.lbHatch = 0; @@ -135,6 +135,16 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen *pen) return Ok; } +GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash) +{ + if(!pen || !dash) + return InvalidParameter; + + *dash = pen->dash; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen *pen, GpDashStyle dash) { LOGBRUSH lb; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8388f95..a358a1e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -30,6 +30,7 @@ extern "C" { GpStatus WINGDIPAPI GdipClonePen(GpPen*,GpPen**); GpStatus WINGDIPAPI GdipCreatePen1(ARGB,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); +GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen*,GpDashStyle); GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen*,GpLineCap,GpLineCap,GpDashCap);

1 0

James Hawkins : Revert "msi: Only call a custom action remotely if the type is msidbCustomActionTypeInScript ."
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 929acbcb7f019d89101c579e0348bc3ad5120a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=929acbcb7f019d89101c579e0… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 17 17:48:43 2007 -0700 Revert "msi: Only call a custom action remotely if the type is msidbCustomActionTypeInScript." This reverts f2ae31000b6d6c105838fad36c17ba1fb1f5524b commit. --- dlls/msi/custom.c | 78 +---------------------------------------------------- 1 files changed, 1 insertions(+), 77 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 86d4ccb..06699d2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -647,7 +647,7 @@ static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, return ERROR_SUCCESS; } -static DWORD WINAPI ACTION_CallRemoteDllFunction( const GUID *guid ) +static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) { MsiCustomActionEntryPoint fn; MSIHANDLE hPackage, handle; @@ -713,82 +713,6 @@ static DWORD WINAPI ACTION_CallRemoteDllFunction( const GUID *guid ) return r; } -static DWORD WINAPI ACTION_CallLocalDllFunction( msi_custom_action_info *info ) -{ - MsiCustomActionEntryPoint fn; - MSIHANDLE hPackage; - HANDLE hModule; - LPSTR proc; - UINT r = ERROR_FUNCTION_FAILED; - - TRACE("%s %s\n", debugstr_w( info->source ), debugstr_w( info->target ) ); - - hModule = LoadLibraryW( info->source ); - if (!hModule) - { - ERR("failed to load dll %s\n", debugstr_w( info->source ) ); - return r; - } - - proc = strdupWtoA( info->target ); - fn = (MsiCustomActionEntryPoint) GetProcAddress( hModule, proc ); - msi_free( proc ); - if (fn) - { - hPackage = alloc_msihandle( &info->package->hdr ); - if (hPackage) - { - TRACE("calling %s\n", debugstr_w( info->target ) ); - handle_msi_break( info->target ); - - __TRY - { - r = fn( hPackage ); - } - __EXCEPT_PAGE_FAULT - { - ERR("Custom action (%s:%s) caused a page fault: %08x\n", - debugstr_w(info->source), debugstr_w(info->target), GetExceptionCode()); - r = ERROR_SUCCESS; - } - __ENDTRY; - - MsiCloseHandle( hPackage ); - } - else - ERR("failed to create handle for %p\n", info->package ); - } - else - ERR("GetProcAddress(%s) failed\n", debugstr_w( info->target ) ); - - FreeLibrary(hModule); - - return r; -} - -static DWORD WINAPI ACTION_CallDllFunction(const GUID *guid) -{ - msi_custom_action_info *info; - UINT r; - - info = find_action_by_guid(guid); - if (!info) - { - ERR("failed to find action %s\n", debugstr_guid(guid)); - return ERROR_FUNCTION_FAILED; - } - - TRACE("%s %s\n", debugstr_w(info->source), debugstr_w(info->target)); - - if (info->type & msidbCustomActionTypeInScript) - r = ACTION_CallRemoteDllFunction(guid); - else - r = ACTION_CallLocalDllFunction(info); - - release_custom_action_data(info); - return r; -} - static DWORD WINAPI DllThread( LPVOID arg ) { LPGUID guid = arg;

1 0

James Hawkins : msi: Only double the size if the remote call is from MsiGetPropertyA.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 24e158e972e03c992389c259d05ab41ad1dcc1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e158e972e03c992389c259d… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 17 17:50:15 2007 -0700 msi: Only double the size if the remote call is from MsiGetPropertyA. --- dlls/msi/package.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 0309dc3..35cd328 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1475,7 +1475,10 @@ static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, goto done; r = msi_strcpy_to_awstring( value, szValueBuf, pchValueBuf ); - *pchValueBuf *= sizeof(WCHAR); /* Bug required by Adobe installers */ + + /* Bug required by Adobe installers */ + if (!szValueBuf->unicode) + *pchValueBuf *= sizeof(WCHAR); done: IWineMsiRemotePackage_Release(remote_package);

1 0

Andrew Talbot : comdlg32: Cast-qual warning fix.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: c03736f3603662a2067d3c511d1afb32fb916e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03736f3603662a2067d3c511… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jul 17 21:18:16 2007 +0100 comdlg32: Cast-qual warning fix. --- dlls/comdlg32/filedlg31.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 6c0f08d..89bedb0 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -872,7 +872,7 @@ LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) ofn->nFilterIndex = 1; SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0); lstrcpynW(tmpstr, FD31_GetFileType(ofn->lpstrCustomFilter, - (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE); + ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE); TRACE("nFilterIndex = %d, SetText of edt1 to %s\n", ofn->nFilterIndex, debugstr_w(tmpstr)); SetDlgItemTextW( hWnd, edt1, tmpstr );

1 0