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

Adam Petaccia : gdiplus: Add another helper macro to deal with magic numbers.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 0a225750d92fafc46cae0e1c0bbb003494122f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a225750d92fafc46cae0e1c0… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 10 00:45:21 2008 -0400 gdiplus: Add another helper macro to deal with magic numbers. --- dlls/gdiplus/tests/region.c | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 7b1eba5..6b1c5f0 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -29,9 +29,12 @@ #define RGNDATA_INFINITE_RECT 0x10000003 #define RGNDATA_MAGIC 0xdbc01001 +#define RGNDATA_MAGIC2 0xdbc01002 #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expect_magic(value) ok(*value == RGNDATA_MAGIC || *value == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *value) + static inline void expect_dword(DWORD *value, DWORD expected) { ok(*value == expected, "expected %08x got %08x\n", expected, *value); @@ -73,7 +76,7 @@ todo_wine ok(needed == 20, "got %d\n", needed); expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); @@ -87,7 +90,7 @@ todo_wine ok(needed == 20, "got %d\n", needed); expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_EMPTY_RECT); @@ -101,7 +104,7 @@ todo_wine ok(needed == 20, "got %d\n", needed); expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); @@ -122,7 +125,7 @@ todo_wine ok(needed == 36, "got %d\n", needed); expect_dword(buf, 28); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_RECT); expect_float(buf + 5, 10.0); @@ -174,7 +177,7 @@ todo_wine ok(needed == 156, "got %d\n", needed); expect_dword(buf, 148); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 10); expect_dword(buf + 4, CombineModeExclude); expect_dword(buf + 5, CombineModeComplement); @@ -234,11 +237,11 @@ todo_wine ok(needed == 72, "got %d\n", needed); expect_dword(buf, 64); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); expect_dword(buf + 5, 0x00000030); - expect_dword(buf + 6, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 6)); expect_dword(buf + 7, 0x00000004); expect_dword(buf + 8, 0x00000000); expect_float(buf + 9, 12.5); @@ -266,12 +269,12 @@ todo_wine ok(needed == 96, "got %d\n", needed); expect_dword(buf, 88); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 2); expect_dword(buf + 4, CombineModeIntersect); expect_dword(buf + 5, RGNDATA_PATH); expect_dword(buf + 6, 0x00000030); - expect_dword(buf + 7, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 7)); expect_dword(buf + 8, 0x00000004); expect_dword(buf + 9, 0x00000000); expect_float(buf + 10, 12.5); @@ -307,13 +310,13 @@ todo_wine ok(needed == 36, "got %d\n", needed); expect_dword(buf, 28); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); /* Second signature for pathdata */ expect_dword(buf + 5, 12); - expect_dword(buf + 6, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 6)); expect_dword(buf + 7, 0); expect_dword(buf + 8, 0x00004000); @@ -338,12 +341,12 @@ todo_wine expect(Ok, status); expect_dword(buf, 48); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2 , RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3 , 0); expect_dword(buf + 4 , RGNDATA_PATH); expect_dword(buf + 5, 32); - expect_dword(buf + 6, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 6)); expect_dword(buf + 7, 4); expect_dword(buf + 8, 0x00004000); /* ?? */ @@ -380,12 +383,12 @@ todo_wine expect(Ok, status); expect_dword(buf, 64); trace("buf[1] = %08x\n", buf[1]); - expect_dword(buf + 2, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 2)); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); expect_dword(buf + 5, 48); - expect_dword(buf + 6, RGNDATA_MAGIC); + expect_magic((DWORD*)(buf + 6)); expect_dword(buf + 7, 4); expect_dword(buf + 8, 0); expect_float(buf + 9, 5.6);

1 0

Alexander Nicolaysen Sørnes : regedit: Use unicode for all key deletion.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: f4c3e0f464cb5cd7f664c5ea3a78db5557a43980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4c3e0f464cb5cd7f664c5ea3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 9 18:18:14 2008 +0200 regedit: Use unicode for all key deletion. --- programs/regedit/regedit.c | 6 ++++- programs/regedit/regproc.c | 46 ++++++++++++++++--------------------------- programs/regedit/regproc.h | 4 +- 3 files changed, 24 insertions(+), 32 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index ea8aee9..fca0cac 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -186,8 +186,12 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) getAppName()); fprintf(stderr,usage); exit(1); + } else + { + WCHAR* reg_key_nameW = GetWideString(reg_key_name, lstrlenA(reg_key_name)+1); + delete_registry_key(reg_key_nameW); + HeapFree(GetProcessHeap(), 0, reg_key_nameW); } - delete_registry_key(reg_key_name); break; } case ACTION_EXPORT: { diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a169889..7101e3a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -75,6 +75,20 @@ if (!(p)) \ } /****************************************************************************** + * Allocates memory and convers input from multibyte to wide chars + * Returned string must be freed by the caller + */ +WCHAR* GetWideString(char* strA, int len) +{ + WCHAR* strW = NULL; + + strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(strW); + MultiByteToWideChar(CP_ACP, 0, strA, len, strW, len); + return strW; +} + +/****************************************************************************** * Allocates memory and convers input from wide chars to multibyte * Returned string must be freed by the caller */ @@ -529,12 +543,8 @@ static void processRegEntry(LPSTR stdInput) /* delete the key if we encounter '-' at the start of reg key */ if ( stdInput[0] == '-') { - WCHAR* stdInputW = NULL; - int size = keyEnd - stdInput - 1; - stdInputW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(stdInputW); - MultiByteToWideChar(CP_ACP, 0, stdInput + 1, size, stdInputW, size); - delete_registry_keyW(stdInputW); + WCHAR* stdInputW = GetWideString(stdInput + 1, keyEnd - stdInput); + delete_registry_key(stdInputW); HeapFree(GetProcessHeap(), 0, stdInputW); } else if ( openKey(stdInput) != ERROR_SUCCESS ) { @@ -1062,29 +1072,7 @@ BOOL import_registry_file(LPTSTR filename) * reg_key_name - full name of registry branch to delete. Ignored if is NULL, * empty, points to register key class, does not exist. */ -void delete_registry_key(CHAR *reg_key_name) -{ - CHAR *key_name; - HKEY key_class; - - if (!reg_key_name || !reg_key_name[0]) - return; - - if (!parseKeyName(reg_key_name, &key_class, &key_name)) { - fprintf(stderr,"%s: Incorrect registry class specification in '%s'\n", - getAppName(), reg_key_name); - exit(1); - } - if (!*key_name) { - fprintf(stderr,"%s: Can't delete registry class '%s'\n", - getAppName(), reg_key_name); - exit(1); - } - - RegDeleteTreeA(key_class, key_name); -} - -void delete_registry_keyW(WCHAR *reg_key_name) +void delete_registry_key(WCHAR *reg_key_name) { WCHAR *key_name = NULL; HKEY key_class; diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 59e1b0c..9faf8b1 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -23,6 +23,6 @@ const CHAR *getAppName(void); BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name); BOOL import_registry_file(LPTSTR filename); -void delete_registry_key(CHAR *reg_key_name); -void delete_registry_keyW(WCHAR *reg_key_name); +void delete_registry_key(WCHAR *reg_key_name); +WCHAR* GetWideString(char* strA, int len); void processRegLines(FILE *in);

1 0

Adam Petaccia : gdiplus: Add more tests for regions and paths.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 5a60ec7f21f952eb7bad3b192228bd22dc87354a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a60ec7f21f952eb7bad3b192… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 10 00:44:47 2008 -0400 gdiplus: Add more tests for regions and paths. --- dlls/gdiplus/tests/region.c | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 699d565..1b1b047 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -30,6 +30,8 @@ #define RGNDATA_MAGIC 0xdbc01001 +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + static inline void expect_dword(DWORD *value, DWORD expected) { ok(*value == expected, "expected %08x got %08x\n", expected, *value); @@ -41,10 +43,17 @@ static inline void expect_float(DWORD *value, FLOAT expected) ok(valuef == expected, "expected %f got %f\n", expected, valuef); } +/* We get shorts back, not INTs like a GpPoint */ +typedef struct RegionDataPoint +{ + short X, Y; +} RegionDataPoint; + static void test_getregiondata(void) { GpStatus status; GpRegion *region, *region2; + RegionDataPoint *point; UINT needed; DWORD buf[100]; GpRect rect; @@ -285,6 +294,73 @@ todo_wine status = GdipDeletePath(path); ok(status == Ok, "status %08x\n", status); + /* Test an empty path */ + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + status = GdipCreateRegionPath(path, &region); + expect(Ok, status); + status = GdipGetRegionDataSize(region, &needed); + expect(Ok, status); + ok(needed == 36, "got %d\n", needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + expect(Ok, status); + ok(needed == 36, "got %d\n", needed); + expect_dword(buf, 28); + trace("buf[1] = %08x\n", buf[1]); + expect_dword(buf + 2, RGNDATA_MAGIC); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_PATH); + + /* Second signature for pathdata */ + expect_dword(buf + 5, 12); + expect_dword(buf + 6, RGNDATA_MAGIC); + expect_dword(buf + 7, 0); + expect_dword(buf + 8, 0x00004000); + + status = GdipDeleteRegion(region); + expect(Ok, status); + + /* Test a simple triangle of INTs */ + status = GdipAddPathLine(path, 5, 6, 7, 8); + expect(Ok, status); + status = GdipAddPathLine(path, 7, 8, 8, 1); + expect(Ok, status); + status = GdipAddPathLine(path, 8, 1, 5, 6); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + status = GdipCreateRegionPath(path, &region); + expect(Ok, status); + status = GdipGetRegionDataSize(region, &needed); + expect(Ok, status); + ok(needed == 56, "Expected 56, got %d\n", needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + expect(Ok, status); + expect_dword(buf, 48); + trace("buf[1] = %08x\n", buf[1]); + expect_dword(buf + 2 , RGNDATA_MAGIC); + expect_dword(buf + 3 , 0); + expect_dword(buf + 4 , RGNDATA_PATH); + + expect_dword(buf + 5, 32); + expect_dword(buf + 6, RGNDATA_MAGIC); + expect_dword(buf + 7, 4); + expect_dword(buf + 8, 0x00004000); /* ?? */ + + point = (RegionDataPoint*)buf + 9; + expect(5, point[0].X); + expect(6, point[0].Y); + expect(7, point[1].X); /* buf + 10 */ + expect(8, point[1].Y); + expect(8, point[2].X); /* buf + 11 */ + expect(1, point[2].Y); + expect(5, point[3].X); /* buf + 12 */ + expect(6, point[3].Y); + expect_dword(buf + 13, 0x81010100); /* 0x01010100 if we don't close the path */ + status = GdipDeletePath(path); + expect(Ok, status); + status = GdipDeleteRegion(region); + expect(Ok, status); } START_TEST(region)

1 0

Adam Petaccia : gdiplus: Add a test for a floating-point triangle.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: e253d6a084cea596210eff423f320d613c1df50f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e253d6a084cea596210eff423… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 10 00:44:55 2008 -0400 gdiplus: Add a test for a floating-point triangle. --- dlls/gdiplus/tests/region.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 1b1b047..7b1eba5 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -361,6 +361,44 @@ todo_wine expect(Ok, status); status = GdipDeleteRegion(region); expect(Ok, status); + + /* Test a floating-point triangle */ + status = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, status); + status = GdipAddPathLine(path, 5.6, 6.2, 7.2, 8.9); + expect(Ok, status); + status = GdipAddPathLine(path, 7.2, 8.9, 8.1, 1.6); + expect(Ok, status); + status = GdipAddPathLine(path, 8.1, 1.6, 5.6, 6.2); + expect(Ok, status); + status = GdipCreateRegionPath(path, &region); + expect(Ok, status); + status = GdipGetRegionDataSize(region, &needed); + expect(Ok, status); + ok(needed == 72, "Expected 72, got %d\n", needed); + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + expect(Ok, status); + expect_dword(buf, 64); + trace("buf[1] = %08x\n", buf[1]); + expect_dword(buf + 2, RGNDATA_MAGIC); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_PATH); + + expect_dword(buf + 5, 48); + expect_dword(buf + 6, RGNDATA_MAGIC); + expect_dword(buf + 7, 4); + expect_dword(buf + 8, 0); + expect_float(buf + 9, 5.6); + expect_float(buf + 10, 6.2); + expect_float(buf + 11, 7.2); + expect_float(buf + 12, 8.9); + expect_float(buf + 13, 8.1); + expect_float(buf + 14, 1.6); + expect_float(buf + 15, 5.6); + expect_float(buf + 16, 6.2); + + status = GdipDeleteRegion(region); + expect(Ok, status); } START_TEST(region)

1 0

Adam Petaccia : gdiplus: Test for CharacterRange.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: 2f7bb7c5385c86dced1c7e1d183c8a2a38699a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7bb7c5385c86dced1c7e1d1… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Jul 9 03:33:52 2008 -0400 gdiplus: Test for CharacterRange. --- dlls/gdiplus/tests/stringformat.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index 9cf46a4..919e1f7 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -49,6 +49,28 @@ static void test_constructor(void) expect(Ok, stat); } +static void test_characterrange(void) +{ + CharacterRange ranges[3]; + INT count; + GpStringFormat* format; + GpStatus stat; + + stat = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); + expect(Ok, stat); +todo_wine +{ + stat = GdipSetStringFormatMeasurableCharacterRanges(format, 3, ranges); + expect(Ok, stat); + stat = GdipGetStringFormatMeasurableCharacterRangeCount(format, &count); + expect(Ok, stat); + expect(3, count); +} + stat= GdipDeleteStringFormat(format); + expect(Ok, stat); +} + + START_TEST(stringformat) { struct GdiplusStartupInput gdiplusStartupInput; @@ -62,6 +84,7 @@ START_TEST(stringformat) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); test_constructor(); + test_characterrange(); GdiplusShutdown(gdiplusToken); }

1 0

Adam Petaccia : gdiplus: Stub GdipSetStringFormatMeasurableCharacterRanges.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: b135d4a7001067caad8e25c383f90639752911d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b135d4a7001067caad8e25c38… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Jul 9 03:33:37 2008 -0400 gdiplus: Stub GdipSetStringFormatMeasurableCharacterRanges. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/stringformat.c | 11 +++++++++++ include/gdiplusflat.h | 2 ++ include/gdiplustypes.h | 6 ++++++ 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5660ad7..99627e9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -590,7 +590,7 @@ @ stdcall GdipSetStringFormatFlags(ptr long) @ stdcall GdipSetStringFormatHotkeyPrefix(ptr long) @ stdcall GdipSetStringFormatLineAlign(ptr long) -@ stub GdipSetStringFormatMeasurableCharacterRanges +@ stdcall GdipSetStringFormatMeasurableCharacterRanges(ptr long ptr) @ stub GdipSetStringFormatTabStops @ stdcall GdipSetStringFormatTrimming(ptr long) @ stub GdipSetTextContrast diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 26ce3ed..c9361dc 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -167,6 +167,17 @@ GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat *format, return Ok; } +GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges(GpStringFormat* + format, INT rangeCount, GDIPCONST CharacterRange* ranges) +{ + if (!(format && rangeCount && ranges)) + return InvalidParameter; + + FIXME("stub: %p, %d, %p\n", format, rangeCount, ranges); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, StringTrimming trimming) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b36afd4..d10f5ff 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -414,6 +414,8 @@ GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*) GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment); GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT); GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat*,StringAlignment); +GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges( + GpStringFormat*, INT, GDIPCONST CharacterRange*); GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat*,StringTrimming); GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat*,GpStringFormat**); diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 29616e9..4f97432 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -236,6 +236,12 @@ typedef struct Rect INT Height; } Rect; +typedef struct CharacterRange +{ + INT First; + INT Length; +} CharacterRange; + typedef enum Status Status; #endif /* end of c typedefs */

1 0

Adam Petaccia : gdiplus: Stub GdipMeasureCharacterRanges.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: be4a226a11a71cc07c4c62bd0ec5df636521959b URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4a226a11a71cc07c4c62bd0… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Jul 9 03:33:40 2008 -0400 gdiplus: Stub GdipMeasureCharacterRanges. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 14 ++++++++++++++ include/gdiplusflat.h | 4 ++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 99627e9..0e397bb 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -439,7 +439,7 @@ @ stdcall GdipLoadImageFromFileICM(wstr ptr) @ stdcall GdipLoadImageFromStream(ptr ptr) @ stdcall GdipLoadImageFromStreamICM(ptr ptr) -@ stub GdipMeasureCharacterRanges +@ stdcall GdipMeasureCharacterRanges(ptr wstr long ptr ptr ptr long ptr) @ stub GdipMeasureDriverString @ stdcall GdipMeasureString(ptr wstr long ptr ptr ptr ptr ptr ptr) @ stub GdipMultiplyLineTransform diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 893799d..23919e2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2215,6 +2215,20 @@ GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics *graphics, GpMatrix *matrix return Ok; } +GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, + GDIPCONST WCHAR* string, INT length, GDIPCONST GpFont* font, + GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, + INT regionCount, GpRegion** regions) +{ + if (!(graphics && string && font && layoutRect && stringFormat && regions)) + return InvalidParameter; + + FIXME("stub: %p %s %d %p %p %p %d %p\n", graphics, debugstr_w(string), + length, font, layoutRect, stringFormat, regionCount, regions); + + return NotImplemented; +} + /* Find the smallest rectangle that bounds the text when it is printed in rect * according to the format options listed in format. If rect has 0 width and * height, then just find the smallest rectangle that bounds the text when it's diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index d10f5ff..190e6f1 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -154,6 +154,10 @@ GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*); GpStatus WINGDIPAPI GdipGetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipMeasureString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*,GDIPCONST GpStringFormat*,RectF*,INT*,INT*); +GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics*, GDIPCONST WCHAR*, + INT, GDIPCONST GpFont*, GDIPCONST RectF*, GDIPCONST GpStringFormat*, INT, + GpRegion**); + GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC); GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics*,GraphicsState); GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder);

1 0

Adam Petaccia : gdiplus: Stub GdipFillRegion.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: c89bd5b87863a302c0fe35ccc8553834a18b6a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89bd5b87863a302c0fe35ccc… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Jul 9 03:33:47 2008 -0400 gdiplus: Stub GdipFillRegion. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/region.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0e397bb..df323aa 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -230,7 +230,7 @@ @ stdcall GdipFillRectangleI(ptr ptr long long long long) @ stdcall GdipFillRectangles(ptr ptr ptr long) @ stdcall GdipFillRectanglesI(ptr ptr ptr long) -@ stub GdipFillRegion +@ stdcall GdipFillRegion(ptr ptr ptr) @ stdcall GdipFindFirstImageItem(ptr ptr) @ stub GdipFindNextImageItem @ stub GdipFlattenPath diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index fc53c86..76126ef 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -162,6 +162,17 @@ GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) return NotImplemented; } +GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, + GpRegion* region) +{ + if (!(graphics && brush && region)) + return InvalidParameter; + + FIXME("(%p, %p, %p): stub\n", graphics, brush, region); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, GpRectF *rect) { FIXME("(%p, %p, %p): stub\n", region, graphics, rect);

1 0

Adam Petaccia : gdiplus: Stub GdipGetStringFormatMeasurableCharacterRangeCount.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: ae443728e98b476899fcbd5945c8fc4fa358196a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae443728e98b476899fcbd594… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Jul 9 03:33:35 2008 -0400 gdiplus: Stub GdipGetStringFormatMeasurableCharacterRangeCount. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/stringformat.c | 11 +++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1182133..5660ad7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -391,7 +391,7 @@ @ stdcall GdipGetStringFormatFlags(ptr ptr) @ stdcall GdipGetStringFormatHotkeyPrefix(ptr ptr) @ stdcall GdipGetStringFormatLineAlign(ptr ptr) -@ stub GdipGetStringFormatMeasurableCharacterRangeCount +@ stdcall GdipGetStringFormatMeasurableCharacterRangeCount(ptr ptr) @ stub GdipGetStringFormatTabStopCount @ stub GdipGetStringFormatTabStops @ stdcall GdipGetStringFormatTrimming(ptr ptr) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index d832ce8..26ce3ed 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -112,6 +112,17 @@ GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat *format, return Ok; } +GpStatus WINGDIPAPI GdipGetStringFormatMeasurableCharacterRangeCount( + GDIPCONST GpStringFormat* format, INT* count) +{ + if (!(format && count)) + return InvalidParameter; + + FIXME("stub: %p %p\n", format, count); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat *format, StringTrimming *trimming) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0e6518e..b36afd4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -408,6 +408,8 @@ GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); GpStatus WINGDIPAPI GdipGetStringFormatFlags(GDIPCONST GpStringFormat*, INT*); GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*); GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat*,StringAlignment*); +GpStatus WINGDIPAPI GdipGetStringFormatMeasurableCharacterRangeCount( + GDIPCONST GpStringFormat*, INT*); GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*); GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment); GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT);

1 0

Adam Petaccia : gdiplus: GdipMeasureString: .spec file fix.
by Alexandre Julliard 10 Jul '08

10 Jul '08

Module: wine Branch: master Commit: f9b304e4ad4b8aaed9b1a693b19f89afda2cc85b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b304e4ad4b8aaed9b1a693b… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Jul 9 03:33:32 2008 -0400 gdiplus: GdipMeasureString: .spec file fix. --- dlls/gdiplus/gdiplus.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 185354d..1182133 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -441,7 +441,7 @@ @ stdcall GdipLoadImageFromStreamICM(ptr ptr) @ stub GdipMeasureCharacterRanges @ stub GdipMeasureDriverString -@ stdcall GdipMeasureString(ptr ptr long ptr ptr ptr ptr ptr ptr) +@ stdcall GdipMeasureString(ptr wstr long ptr ptr ptr ptr ptr ptr) @ stub GdipMultiplyLineTransform @ stdcall GdipMultiplyMatrix(ptr ptr long) @ stub GdipMultiplyPathGradientTransform

1 0