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

Evan Stade : gdi32: Added more tests for ExtCreatePen on PS_USERSTLYE.
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: ff5076c0082d090133be8c8fa1a4bee66e6b9ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff5076c0082d090133be8c8fa… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:09:08 2007 -0700 gdi32: Added more tests for ExtCreatePen on PS_USERSTLYE. --- dlls/gdi32/tests/pen.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 77073f1..0de3f0d 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -482,8 +482,83 @@ static void test_ps_alternate(void) DeleteDC(hdc); } +static void test_ps_userstyle(void) +{ + static DWORD style[17] = {0, 2, 0, 4, 5, 0, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 17}; + static DWORD bad_style[5] = {0, 0, 0, 0, 0}; + static DWORD bad_style2[5] = {4, 7, 8, 3, -1}; + + LOGBRUSH lb; + HPEN pen; + INT size, i; + + struct + { + EXTLOGPEN elp; + DWORD style_data[15]; + } ext_pen; + + lb.lbColor = 0x00ff0000; + lb.lbStyle = BS_SOLID; + lb.lbHatch = 0; + + pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 3, NULL); + ok(pen == 0, "ExtCreatePen should fail\n"); + expect(ERROR_INVALID_PARAMETER, GetLastError()); + DeleteObject(pen); + SetLastError(0xdeadbeef); + + pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 0, style); + ok(pen == 0, "ExtCreatePen should fail\n"); + todo_wine + expect(0xdeadbeef, GetLastError()); + DeleteObject(pen); + SetLastError(0xdeadbeef); + + pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 17, style); + ok(pen == 0, "ExtCreatePen should fail\n"); + expect(ERROR_INVALID_PARAMETER, GetLastError()); + DeleteObject(pen); + SetLastError(0xdeadbeef); + + pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, -1, style); + ok(pen == 0, "ExtCreatePen should fail\n"); + todo_wine + expect(0xdeadbeef, GetLastError()); + DeleteObject(pen); + SetLastError(0xdeadbeef); + + pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 5, bad_style); + todo_wine + ok(pen == 0, "ExtCreatePen should fail\n"); + todo_wine + expect(ERROR_INVALID_PARAMETER, GetLastError()); + DeleteObject(pen); + SetLastError(0xdeadbeef); + + pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 5, bad_style2); + todo_wine + ok(pen == 0, "ExtCreatePen should fail\n"); + todo_wine + expect(ERROR_INVALID_PARAMETER, GetLastError()); + DeleteObject(pen); + SetLastError(0xdeadbeef); + + pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 16, style); + ok(pen != 0, "ExtCreatePen should not fail\n"); + + size = GetObject(pen, sizeof(ext_pen), &ext_pen); + expect(88, size); + + for(i = 0; i < 16; i++) + expect(style[i], ext_pen.elp.elpStyleEntry[i]); + + DeleteObject(pen); +} + START_TEST(pen) { test_logpen(); test_ps_alternate(); + test_ps_userstyle(); }

1 0

Evan Stade : gdi32: Improve ExtCreatePen parameter checking.
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: 030abff4ac849df1fcda3ac345cbbdad4ce9575f URL: http://source.winehq.org/git/wine.git/?a=commit;h=030abff4ac849df1fcda3ac34… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:09:02 2007 -0700 gdi32: Improve ExtCreatePen parameter checking. --- dlls/gdi32/pen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index fb84788..3dd545b 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -123,7 +123,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, if ((style & PS_STYLE_MASK) == PS_USERSTYLE) { - if (!style_count || !style_bits) + if (!style_count || (style_count > 16) || !style_bits) { SetLastError(ERROR_INVALID_PARAMETER); return 0;

1 0

Dmitry Timoshkov : mshtml: Constify some data.
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: e4fb0fe9e90cea2234b352aaf0fde03af53fb05a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fb0fe9e90cea2234b352aaf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jul 31 17:48:59 2007 +0900 mshtml: Constify some data. --- dlls/mshtml/editor.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 5bf160e..022f41d 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -488,7 +488,7 @@ static nsIDOMNode *get_child_text_node(nsIDOMNode *node, BOOL first) return NULL; } -static void handle_arrow_key(HTMLDocument *This, nsIDOMKeyEvent *event, const char *cmds[4]) +static void handle_arrow_key(HTMLDocument *This, nsIDOMKeyEvent *event, const char * const cmds[4]) { int i=0; PRBool b; @@ -518,7 +518,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) switch(code) { case DOM_VK_LEFT: { - static const char *cmds[] = { + static const char * const cmds[] = { NSCMD_CHARPREVIOUS, NSCMD_WORDPREVIOUS, NSCMD_SELECTCHARPREVIOUS, @@ -530,7 +530,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) break; } case DOM_VK_RIGHT: { - static const char *cmds[] = { + static const char * const cmds[] = { NSCMD_CHARNEXT, NSCMD_WORDNEXT, NSCMD_SELECTCHARNEXT, @@ -542,7 +542,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) break; } case DOM_VK_UP: { - static const char *cmds[] = { + static const char * const cmds[] = { NSCMD_LINEPREVIOUS, NSCMD_MOVEPAGEUP, NSCMD_SELECTLINEPREVIOUS, @@ -554,7 +554,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) break; } case DOM_VK_DOWN: { - static const char *cmds[] = { + static const char * const cmds[] = { NSCMD_LINENEXT, NSCMD_MOVEPAGEDOWN, NSCMD_SELECTLINENEXT, @@ -566,7 +566,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) break; } case DOM_VK_DELETE: { - static const char *cmds[] = { + static const char * const cmds[] = { NSCMD_DELETECHARFORWARD, NSCMD_DELETEWORDFORWARD, NULL, NULL @@ -577,7 +577,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) break; } case DOM_VK_HOME: { - static const char *cmds[] = { + static const char * const cmds[] = { NSCMD_BEGINLINE, NSCMD_MOVETOP, NSCMD_SELECTBEGINLINE, @@ -589,7 +589,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) break; } case DOM_VK_END: { - static const char *cmds[] = { + static const char * const cmds[] = { NSCMD_ENDLINE, NSCMD_MOVEBOTTOM, NSCMD_SELECTENDLINE,

1 0

Dmitry Timoshkov : kernel32: Skip remainder of the time zone test if SystemTimeToTzSpecificLocalTime not present .
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: 9472e044472045528b356cbbcaa6ce6239a19835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9472e044472045528b356cbbc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jul 31 17:48:26 2007 +0900 kernel32: Skip remainder of the time zone test if SystemTimeToTzSpecificLocalTime not present. --- dlls/kernel32/tests/time.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 5bdb5a0..6bf79ed 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -277,6 +277,12 @@ static void test_GetTimeZoneInformation(void) ok(SetEnvironmentVariableA("TZ",NULL) != 0, "SetEnvironmentVariableA failed\n"); + if (!pSystemTimeToTzSpecificLocalTime) + { + skip("SystemTimeToTzSpecificLocalTime not present\n"); + return; + } + diff = get_tz_bias(&tzinfo, tz_id); utc = st;

1 0

Paul Vriens : setupapi/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: c0cc85f78e748ae7cd9114f7053c45b588922c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cc85f78e748ae7cd9114f70… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jul 31 09:30:55 2007 +0200 setupapi/tests: Use GetModuleHandleA instead of LoadLibraryA. --- dlls/setupapi/tests/devinst.c | 13 ++++--------- dlls/setupapi/tests/parser.c | 4 +--- dlls/setupapi/tests/query.c | 21 +++++++++------------ dlls/setupapi/tests/stringtable.c | 6 +----- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index d0756b7..6232105 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -39,14 +39,11 @@ static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PV static void init_function_pointers(void) { - hSetupAPI = LoadLibraryA("setupapi.dll"); + hSetupAPI = GetModuleHandleA("setupapi.dll"); - if (hSetupAPI) - { - pSetupDiCreateDeviceInfoListExW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoListExW"); - pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); - pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); - } + pSetupDiCreateDeviceInfoListExW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoListExW"); + pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); + pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); } static void test_SetupDiCreateDeviceInfoListEx(void) @@ -129,8 +126,6 @@ static void test_SetupDiOpenClassRegKeyExA(void) START_TEST(devinst) { init_function_pointers(); - if (!hSetupAPI) - return; if (pSetupDiCreateDeviceInfoListExW && pSetupDiDestroyDeviceInfoList) test_SetupDiCreateDeviceInfoListEx(); diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 2aaaa5e..4c1043e 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -36,9 +36,7 @@ static LPCWSTR (WINAPI *pSetupGetField)(PINFCONTEXT,DWORD); static void init_function_pointers(void) { - hSetupAPI = LoadLibraryA("setupapi.dll"); - if (!hSetupAPI) - return; + hSetupAPI = GetModuleHandleA("setupapi.dll"); pSetupGetField = (void *)GetProcAddress(hSetupAPI, "pSetupGetField"); } diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 39c91c7..ef2f9f5 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -38,18 +38,15 @@ CHAR WIN_DIR[MAX_PATH]; static void init_function_pointers(void) { - hSetupAPI = LoadLibraryA("setupapi.dll"); - - if (hSetupAPI) - { - pSetupCloseInfFile = (void *)GetProcAddress(hSetupAPI, "SetupCloseInfFile"); - pSetupGetInfInformationA = (void *)GetProcAddress(hSetupAPI, "SetupGetInfInformationA"); - pSetupOpenInfFileA = (void *)GetProcAddress(hSetupAPI, "SetupOpenInfFileA"); - pSetupQueryInfFileInformationA = (void *)GetProcAddress(hSetupAPI, "SetupQueryInfFileInformationA"); - pSetupGetSourceFileLocationA = (void *)GetProcAddress(hSetupAPI, "SetupGetSourceFileLocationA"); - pSetupGetSourceInfoA = (void *)GetProcAddress(hSetupAPI, "SetupGetSourceInfoA"); - pSetupGetTargetPathA = (void *)GetProcAddress(hSetupAPI, "SetupGetTargetPathA"); - } + hSetupAPI = GetModuleHandleA("setupapi.dll"); + + pSetupCloseInfFile = (void *)GetProcAddress(hSetupAPI, "SetupCloseInfFile"); + pSetupGetInfInformationA = (void *)GetProcAddress(hSetupAPI, "SetupGetInfInformationA"); + pSetupOpenInfFileA = (void *)GetProcAddress(hSetupAPI, "SetupOpenInfFileA"); + pSetupQueryInfFileInformationA = (void *)GetProcAddress(hSetupAPI, "SetupQueryInfFileInformationA"); + pSetupGetSourceFileLocationA = (void *)GetProcAddress(hSetupAPI, "SetupGetSourceFileLocationA"); + pSetupGetSourceInfoA = (void *)GetProcAddress(hSetupAPI, "SetupGetSourceInfoA"); + pSetupGetTargetPathA = (void *)GetProcAddress(hSetupAPI, "SetupGetTargetPathA"); } static void get_directories(void) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 59e49c0..d48984a 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -59,9 +59,7 @@ HANDLE table, table2; /* Handles pointing to our tables */ static void load_it_up(void) { - hdll = LoadLibraryA("setupapi.dll"); - if (!hdll) - return; + hdll = GetModuleHandleA("setupapi.dll"); pStringTableInitialize = (void*)GetProcAddress(hdll, "StringTableInitialize"); if (!pStringTableInitialize) @@ -192,6 +190,4 @@ START_TEST(stringtable) /* assume we can always distroy */ pStringTableDestroy(table); pStringTableDestroy(table2); - - FreeLibrary(hdll); }

1 0

Detlef Riekenberg : user32: Add a stub for GetAppCompatFlags2.
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: b90c6e27929f649cfd92fe7a2b57eec354e98e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90c6e27929f649cfd92fe7a2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jul 31 05:27:55 2007 +0200 user32: Add a stub for GetAppCompatFlags2. --- dlls/user32/misc.c | 11 ++++++++++- dlls/user32/user32.spec | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index bd1c9f7..f8cb157 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -575,7 +575,16 @@ BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY hnd) */ DWORD WINAPI GetAppCompatFlags( HTASK hTask ) { - FIXME("stub\n"); + FIXME("(%p) stub\n", hTask); + return 0; +} + +/*********************************************************************** + * GetAppCompatFlags2 (USER32.@) + */ +DWORD WINAPI GetAppCompatFlags2( HTASK hTask ) +{ + FIXME("(%p) stub\n", hTask); return 0; } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8bf9ad1..d626053 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -244,8 +244,8 @@ @ stdcall GetAltTabInfoA(long long ptr ptr long) @ stdcall GetAltTabInfoW(long long ptr ptr long) @ stdcall GetAncestor(long long) -# @ stub GetAppCompatFlags2 @ stdcall GetAppCompatFlags(long) +@ stdcall GetAppCompatFlags2(long) @ stdcall GetAsyncKeyState(long) @ stdcall GetCapture() @ stdcall GetCaretBlinkTime()

1 0

Tomas Carnecky : configure: Check whether linker supports --enable-new-dtags.
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: f4077ae5d0070416a3f58a0889845dd04184af8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4077ae5d0070416a3f58a088… Author: Tomas Carnecky <tom(a)dbservice.com> Date: Mon Jul 30 22:38:55 2007 +0200 configure: Check whether linker supports --enable-new-dtags. --- configure | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 3 ++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5d2e9a4..6a55924 100755 --- a/configure +++ b/configure @@ -8657,6 +8657,65 @@ fi fi + { echo "$as_me:$LINENO: checking whether the compiler supports -Wl,--enable-new-dtags" >&5 +echo $ECHO_N "checking whether the compiler supports -Wl,--enable-new-dtags... $ECHO_C" >&6; } +if test "${ac_cv_cflags__Wl___enable_new_dtags+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,--enable-new-dtags" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_cflags__Wl___enable_new_dtags=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_cflags__Wl___enable_new_dtags=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__Wl___enable_new_dtags" >&5 +echo "${ECHO_T}$ac_cv_cflags__Wl___enable_new_dtags" >&6; } +if test $ac_cv_cflags__Wl___enable_new_dtags = yes; then + LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags" +fi + + case $host_cpu in *i[3456789]86* | x86_64) { echo "$as_me:$LINENO: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5 diff --git a/configure.ac b/configure.ac index ec728e9..8687171 100644 --- a/configure.ac +++ b/configure.ac @@ -441,6 +441,9 @@ case $host_os in [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"])]) + WINE_TRY_CFLAGS([-Wl,--enable-new-dtags], + [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"]) + case $host_cpu in *i[[3456789]]86* | x86_64) WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400],

1 0

Evan Stade : gdiplus: Implemented GdipGetImageBounds for metafiles.
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: 586e63ef380335137c83c010b844560d7976d48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=586e63ef380335137c83c010b… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:09:57 2007 -0700 gdiplus: Implemented GdipGetImageBounds for metafiles. --- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphics.c | 8 ++++++++ dlls/gdiplus/image.c | 15 +++++++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e440dba..c31de0e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -124,6 +124,8 @@ struct GpImage{ struct GpMetafile{ GpImage image; + GpRectF bounds; + GpUnit unit; }; struct GpImageAttributes{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2f582b2..7b19db0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -895,6 +895,14 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, } (*metafile)->image.type = ImageTypeMetafile; + (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); + (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Right) / ((REAL) placeable->Inch); + (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right + - placeable->BoundingBox.Left)) / ((REAL) placeable->Inch); + (*metafile)->bounds.Height = ((REAL) (placeable->BoundingBox.Bottom + - placeable->BoundingBox.Top)) / ((REAL) placeable->Inch); + (*metafile)->unit = UnitInch; + if(delete) DeleteMetaFile(hwmf); diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 849b1b4..9b6ed41 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -45,15 +45,18 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, GpUnit *srcUnit) { - static int calls; - if(!image || !srcRect || !srcUnit) return InvalidParameter; + if(image->type == ImageTypeMetafile){ + memcpy(srcRect, &((GpMetafile*)image)->bounds, sizeof(GpRectF)); + *srcUnit = ((GpMetafile*)image)->unit; + } + else{ + FIXME("not implemented for bitmaps\n"); + return NotImplemented; + } - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height)

1 0

Evan Stade : gdiplus: Partial implementation of GdipDrawImagePointsRect.
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: a9c4f30c564a16acf4cc6b543e9882c1f64dccd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c4f30c564a16acf4cc6b543… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:10:07 2007 -0700 gdiplus: Partial implementation of GdipDrawImagePointsRect. --- dlls/gdiplus/graphics.c | 41 ++++++++++++++++++++++++++++++++--------- 1 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7b19db0..80684ff 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1024,20 +1024,43 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, return retval; } +/* FIXME: partially implemented */ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, - GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, - REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, - DrawImageAbort callback, VOID * callbackData) + GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, + REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, + DrawImageAbort callback, VOID * callbackData) { - static int calls; + GpPointF ptf[3]; + POINT pti[3]; - if(!graphics || !image || !points || !imageAttributes) - return InvalidParameter; + TRACE("%p %p %p %d %f %f %f %f %d %p %p %p\n", graphics, image, points, count, + srcx, srcy, srcwidth, srcheight, srcUnit, imageAttributes, callback, + callbackData); - if(!(calls++)) - FIXME("not implemented\n"); + if(!graphics || !image || !points || !imageAttributes || count != 3) + return InvalidParameter; - return NotImplemented; + if(image->type != ImageTypeMetafile) + return NotImplemented; + if((points[0].X != points[2].X) || (points[0].Y != points[1].Y)) + return NotImplemented; + if(srcUnit != UnitInch) + return NotImplemented; + + memcpy(ptf, points, 3 * sizeof(GpPointF)); + transform_and_round_points(graphics, pti, ptf, 3); + + if(IPicture_Render(image->picture, graphics->hdc, + pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, + srcx * INCH_HIMETRIC, srcy * INCH_HIMETRIC, + srcwidth * INCH_HIMETRIC, srcheight * INCH_HIMETRIC, + NULL) != S_OK){ + if(callback) + callback(callbackData); + return GenericError; + } + + return Ok; } GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1,

1 0

Evan Stade : gdiplus: Added a minimal implementation of GdipCreateImageAttributes.
by Alexandre Julliard 31 Jul '07

31 Jul '07

Module: wine Branch: master Commit: 6d9e4a4a927b622049a5788d31d8c71cae43f24e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9e4a4a927b622049a5788d3… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:09:54 2007 -0700 gdiplus: Added a minimal implementation of GdipCreateImageAttributes. --- dlls/gdiplus/gdiplus_private.h | 4 ++++ dlls/gdiplus/imageattributes.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8050125..e440dba 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -126,4 +126,8 @@ struct GpMetafile{ GpImage image; }; +struct GpImageAttributes{ + WrapMode wrap; +}; + #endif diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 81fd107..e441b0e 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -26,15 +26,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr) { - static int calls; - if(!imageattr) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + *imageattr = GdipAlloc(sizeof(GpImageAttributes)); + if(!*imageattr) return OutOfMemory; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr)

1 0