May 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : wine.inf: Remove no longer used control panel section.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: b49c565f95241a7c60603abf685abae94b535ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49c565f95241a7c60603abf6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 15:47:50 2013 +0200 wine.inf: Remove no longer used control panel section. --- tools/wine.inf.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 89c6a75..e48d824 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -35,7 +35,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - ControlPanel,\ CurrentVersion,\ Debugger,\ DirectX,\ @@ -59,7 +58,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - ControlPanel,\ CurrentVersion,\ Debugger,\ DirectX,\ @@ -85,7 +83,6 @@ AddReg=\ Classes,\ ContentIndex,\ ControlClass,\ - ControlPanel,\ CurrentVersion,\ CurrentVersionWow64,\ Debugger,\

1 0

Nikolay Sivov : user32: Implement GetListBoxInfo().
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: 8f7779fc3b1ba7bf454a065181a783d32601278a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7779fc3b1ba7bf454a06518… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 21:18:43 2013 +0400 user32: Implement GetListBoxInfo(). --- dlls/user32/listbox.c | 11 ++++++--- dlls/user32/tests/listbox.c | 44 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user32.spec | 2 +- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 64691e4..5a78dda 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -27,8 +27,6 @@ * If you discover missing features, or bugs, please note them below. * * TODO: - * - GetListBoxInfo() - * - LB_GETLISTBOXINFO * - LBS_NODATA */ @@ -2955,8 +2953,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return LB_OKAY; case LB_GETLISTBOXINFO: - FIXME("LB_GETLISTBOXINFO: stub!\n"); - return 0; + return descr->page_size; case WM_DESTROY: return LISTBOX_Destroy( descr ); @@ -3149,3 +3146,9 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam return unicode ? DefWindowProcW( hwnd, msg, wParam, lParam ) : DefWindowProcA( hwnd, msg, wParam, lParam ); } + +DWORD WINAPI GetListBoxInfo(HWND hwnd) +{ + TRACE("%p\n", hwnd); + return SendMessageW(hwnd, LB_GETLISTBOXINFO, 0, 0); +} diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 5d96f5c..0a000cc 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1545,6 +1545,49 @@ static void test_set_count( void ) DestroyWindow( parent ); } +static DWORD (WINAPI *pGetListBoxInfo)(HWND); +static int lb_getlistboxinfo; + +static LRESULT WINAPI listbox_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (message == LB_GETLISTBOXINFO) + lb_getlistboxinfo++; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + +static void test_GetListBoxInfo(void) +{ + HWND listbox, parent; + WNDPROC oldproc; + DWORD ret; + + pGetListBoxInfo = (void*)GetProcAddress(GetModuleHandle("user32"), "GetListBoxInfo"); + + if (!pGetListBoxInfo) + { + win_skip("GetListBoxInfo() not available\n"); + return; + } + + parent = create_parent(); + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + oldproc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (LONG_PTR)listbox_subclass_proc); + SetWindowLongPtrA(listbox, GWLP_USERDATA, (LONG_PTR)oldproc); + + lb_getlistboxinfo = 0; + ret = pGetListBoxInfo(listbox); + ok(ret > 0, "got %d\n", ret); +todo_wine + ok(lb_getlistboxinfo == 0, "got %d\n", lb_getlistboxinfo); + + DestroyWindow(listbox); + DestroyWindow(parent); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -1624,4 +1667,5 @@ START_TEST(listbox) test_listbox_LB_DIR(); test_listbox_dlgdir(); test_set_count(); + test_GetListBoxInfo(); } diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1ad59d9..4b1f4b5 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -308,7 +308,7 @@ @ stdcall GetLastActivePopup(long) @ stdcall GetLastInputInfo(ptr) @ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) -# @ stub GetListBoxInfo +@ stdcall GetListBoxInfo(long) @ stdcall GetMenu(long) @ stdcall GetMenuBarInfo(long long long ptr) @ stdcall GetMenuCheckMarkDimensions()

1 0

Max Kellermann : msvcrt: Fix character/ byte confusion in buffer overflow branch.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: cee65e94094afcadac996473ff5f98beea2f7aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee65e94094afcadac996473f… Author: Max Kellermann <max(a)duempel.org> Date: Mon May 6 22:21:03 2013 +0200 msvcrt: Fix character/byte confusion in buffer overflow branch. --- dlls/msvcrt/printf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 3ccb1c4..0fe27f7 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -48,7 +48,7 @@ static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len); + memcpy(out->buf, str, out->len*sizeof(APICHAR)); out->buf += out->len; out->len = 0; return -1;

1 0

Stefan Leichter : include: Fix prototype of CryptUIWizDigitalSign.
by Alexandre Julliard 07 May '13

07 May '13

Module: wine Branch: master Commit: d0ea3642917006fac9a93f24f94eeb949dd5ec53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ea3642917006fac9a93f24f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon May 6 22:23:35 2013 +0200 include: Fix prototype of CryptUIWizDigitalSign. --- include/cryptuiapi.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/cryptuiapi.h b/include/cryptuiapi.h index 81c58af..7201cbc 100644 --- a/include/cryptuiapi.h +++ b/include/cryptuiapi.h @@ -240,6 +240,7 @@ typedef struct _CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT DWORD cbBlob; BYTE *pbBlob; } CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT, *PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT; +typedef const CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT; /* Values for CryptUIWizDigitalSign's dwFlags */ #define CRYPTUI_WIZ_NO_UI 0x00000001 @@ -248,7 +249,7 @@ typedef struct _CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT BOOL WINAPI CryptUIWizDigitalSign(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO pDigitalSignInfo, - PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *ppSignContext); + PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *ppSignContext); BOOL WINAPI CryptUIWizFreeDigitalSignContext( PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT pSignContext);

1 0

Francois Gouget : sane.ds: Fix a typo in the libsane check.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 2a897ef2427f424568a749c697f74d4c5334c7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a897ef2427f424568a749c69… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 6 11:22:46 2013 +0200 sane.ds: Fix a typo in the libsane check. --- configure | 3 ++- configure.ac | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3b1b38c..794b4f2 100755 --- a/configure +++ b/configure @@ -10573,7 +10573,8 @@ _ACEOF fi - SANE_CFLAGS="" +else + SANE_CFLAGS="" fi diff --git a/configure.ac b/configure.ac index c6b04ea..86a2fb9 100644 --- a/configure.ac +++ b/configure.ac @@ -1380,7 +1380,7 @@ then ac_save_CPPFLAGS="$CPPFLAGS" WINE_PACKAGE_FLAGS(SANE,[libsane],,[sane-config --cflags],[sane-config --ldflags]) AC_CHECK_HEADER(sane/sane.h, - [WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])] + [WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])], [SANE_CFLAGS=""]) CPPFLAGS="$ac_save_CPPFLAGS" fi

1 0

Alexandre Julliard : configure: Add a pkg-config check for liblcms.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 9ddd30d11c458884312c63b4bd95d405d58b467b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ddd30d11c458884312c63b4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 11:47:31 2013 +0200 configure: Add a pkg-config check for liblcms. --- configure | 55 ++++++++++++++++++++++++++++++++++++++++------- configure.ac | 23 ++++++++++++------- dlls/mscms/Makefile.in | 3 +- 3 files changed, 62 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 794b4f2..8829b5e 100755 --- a/configure +++ b/configure @@ -652,7 +652,8 @@ LIBGETTEXTPO ZLIB FREETYPE_LIBS FREETYPE_CFLAGS -LCMSLIBS +LCMS_LIBS +LCMS_CFLAGS RESOLVLIBS GPHOTO2_PORT_LIBS GPHOTO2_PORT_CFLAGS @@ -878,6 +879,8 @@ GPHOTO2_CFLAGS GPHOTO2_LIBS GPHOTO2_PORT_CFLAGS GPHOTO2_PORT_LIBS +LCMS_CFLAGS +LCMS_LIBS FREETYPE_CFLAGS FREETYPE_LIBS GSTREAMER_CFLAGS @@ -1590,6 +1593,8 @@ Some influential environment variables: C compiler flags for libgphoto2_port, overriding pkg-config GPHOTO2_PORT_LIBS Linker flags for libgphoto2_port, overriding pkg-config + LCMS_CFLAGS C compiler flags for lcms, overriding pkg-config + LCMS_LIBS Linker flags for lcms, overriding pkg-config FREETYPE_CFLAGS C compiler flags for freetype2, overriding pkg-config FREETYPE_LIBS @@ -2603,7 +2608,7 @@ fi # Check whether --with-cms was given. if test "${with_cms+set}" = set; then : - withval=$with_cms; if test "x$withval" = "xno"; then ac_cv_header_lcms_h=no; ac_cv_header_lcms_lcms_h=no; fi + withval=$with_cms; fi @@ -5851,8 +5856,6 @@ for ac_header in \ jpeglib.h \ kstat.h \ lber.h \ - lcms.h \ - lcms/lcms.h \ ldap.h \ link.h \ linux/cdrom.h \ @@ -10843,11 +10846,39 @@ rm -f core conftest.err conftest.$ac_objext \ LIBS="$ac_save_LIBS" fi -LCMSLIBS="" - -if test "$ac_cv_header_lcms_h" = "yes" -o "$ac_cv_header_lcms_lcms_h" = "yes" +if test "x$with_lcms" != "xno" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsOpenProfileFromFile in -llcms" >&5 + ac_save_CPPFLAGS="$CPPFLAGS" + if test -n "$LCMS_CFLAGS"; then : + +elif test -n "$PKG_CONFIG"; then : + LCMS_CFLAGS=`$PKG_CONFIG --cflags lcms 2>/dev/null` +fi + +CPPFLAGS="$CPPFLAGS $LCMS_CFLAGS" +if test -n "$LCMS_LIBS"; then : + +elif test -n "$PKG_CONFIG"; then : + LCMS_LIBS=`$PKG_CONFIG --libs lcms 2>/dev/null` +fi + +LCMS_LIBS=${LCMS_LIBS:-"-llcms"} + for ac_header in lcms.h lcms/lcms.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_lcms_h" = "yes" -o "$ac_cv_header_lcms_lcms_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cmsOpenProfileFromFile in -llcms" >&5 $as_echo_n "checking for cmsOpenProfileFromFile in -llcms... " >&6; } if ${ac_cv_lib_lcms_cmsOpenProfileFromFile+:} false; then : $as_echo_n "(cached) " >&6 @@ -10887,9 +10918,15 @@ if test "x$ac_cv_lib_lcms_cmsOpenProfileFromFile" = xyes; then : $as_echo "#define HAVE_LCMS 1" >>confdefs.h - LCMSLIBS="-llcms" +else + LCMS_LIBS="" fi + else + LCMS_CFLAGS="" + LCMS_LIBS="" + fi + CPPFLAGS="$ac_save_CPPFLAGS" fi if test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"; then : case "x$with_cms" in diff --git a/configure.ac b/configure.ac index 86a2fb9..98c3dd4 100644 --- a/configure.ac +++ b/configure.ac @@ -35,8 +35,7 @@ AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa soun [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi]) AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)]), [if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi]) -AC_ARG_WITH(cms, AS_HELP_STRING([--without-cms],[do not use CMS (color management support)]), - [if test "x$withval" = "xno"; then ac_cv_header_lcms_h=no; ac_cv_header_lcms_lcms_h=no; fi]) +AC_ARG_WITH(cms, AS_HELP_STRING([--without-cms],[do not use CMS (color management support)])) AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support]), [if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi]) AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS])) @@ -434,8 +433,6 @@ AC_CHECK_HEADERS(\ jpeglib.h \ kstat.h \ lber.h \ - lcms.h \ - lcms/lcms.h \ ldap.h \ link.h \ linux/cdrom.h \ @@ -1445,12 +1442,20 @@ then fi dnl **** Check for LittleCMS *** -AC_SUBST(LCMSLIBS,"") -if test "$ac_cv_header_lcms_h" = "yes" -o "$ac_cv_header_lcms_lcms_h" = "yes" +if test "x$with_lcms" != "xno" then - AC_CHECK_LIB(lcms, cmsOpenProfileFromFile, - [AC_DEFINE(HAVE_LCMS, 1, [Define if you have the LittleCMS development environment]) - LCMSLIBS="-llcms"]) + ac_save_CPPFLAGS="$CPPFLAGS" + WINE_PACKAGE_FLAGS(LCMS,[lcms],[-llcms]) + AC_CHECK_HEADERS([lcms.h lcms/lcms.h]) + if test "$ac_cv_header_lcms_h" = "yes" -o "$ac_cv_header_lcms_lcms_h" = "yes" + then + AC_CHECK_LIB(lcms, cmsOpenProfileFromFile, + [AC_DEFINE(HAVE_LCMS, 1, [Define if you have the LittleCMS development environment])],[LCMS_LIBS=""]) + else + LCMS_CFLAGS="" + LCMS_LIBS="" + fi + CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"], [liblcms ${notice_platform}development files not found, Color Management won't be supported.]) diff --git a/dlls/mscms/Makefile.in b/dlls/mscms/Makefile.in index 6589598..6fb5e1f 100644 --- a/dlls/mscms/Makefile.in +++ b/dlls/mscms/Makefile.in @@ -1,7 +1,8 @@ MODULE = mscms.dll IMPORTLIB = mscms IMPORTS = shlwapi advapi32 -EXTRALIBS = @LCMSLIBS@ +EXTRAINCL = @LCMS_CFLAGS@ +EXTRALIBS = @LCMS_LIBS@ C_SRCS = \ handle.c \

1 0

Erich Hoover : user32: SetTimer and SetSystemTimer should respect the timeout limits.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 057b0d8bcac633ff80238c6de3ece04655eccf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=057b0d8bcac633ff80238c6de… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu May 2 21:18:03 2013 -0600 user32: SetTimer and SetSystemTimer should respect the timeout limits. --- dlls/user32/message.c | 14 +++++-- dlls/user32/tests/msg.c | 84 ++++++++++++++++++++++++++++++++++++++++------- include/winuser.h | 4 ++ 3 files changed, 86 insertions(+), 16 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 09a4cb3..e819983 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -56,8 +56,6 @@ WINE_DECLARE_DEBUG_CHANNEL(key); #define MAX_PACK_COUNT 4 -#define SYS_TIMER_RATE 55 /* min. timer rate in ms (actually 54.925)*/ - /* the various structures that can be sent in messages, in platform-independent layout */ struct packed_CREATESTRUCTW { @@ -4385,12 +4383,16 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); + /* MSDN states that the minimum timeout should be USER_TIMER_MINIMUM (10.0 ms), but testing + * indicates that the true minimum is closer to 15.6 ms. */ + timeout = min( max( 15, timeout ), USER_TIMER_MAXIMUM ); + SERVER_START_REQ( set_win_timer ) { req->win = wine_server_user_handle( hwnd ); req->msg = WM_TIMER; req->id = id; - req->rate = max( timeout, SYS_TIMER_RATE ); + req->rate = timeout; req->lparam = (ULONG_PTR)winproc; if (!wine_server_call_err( req )) { @@ -4416,12 +4418,16 @@ UINT_PTR WINAPI SetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); + /* MSDN states that the minimum timeout should be USER_TIMER_MINIMUM (10.0 ms), but testing + * indicates that the true minimum is closer to 15.6 ms. */ + timeout = min( max( 15, timeout ), USER_TIMER_MAXIMUM ); + SERVER_START_REQ( set_win_timer ) { req->win = wine_server_user_handle( hwnd ); req->msg = WM_SYSTIMER; req->id = id; - req->rate = max( timeout, SYS_TIMER_RATE ); + req->rate = timeout; req->lparam = (ULONG_PTR)winproc; if (!wine_server_call_err( req )) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ac3ba16..d88dc7e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1722,6 +1722,8 @@ static BOOL (WINAPI *pUnhookWinEvent)(HWINEVENTHOOK); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); +static UINT_PTR (WINAPI *pSetSystemTimer)(HWND, UINT_PTR, UINT, TIMERPROC); +static UINT_PTR (WINAPI *pKillSystemTimer)(HWND, UINT_PTR); /* kernel32 functions */ static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA); @@ -1746,6 +1748,8 @@ static void init_procs(void) GET_PROC(user32, GetMonitorInfoA) GET_PROC(user32, MonitorFromPoint) GET_PROC(user32, UpdateLayeredWindow) + GET_PROC(user32, SetSystemTimer) + GET_PROC(user32, KillSystemTimer) GET_PROC(kernel32, GetCPInfoExA) @@ -8156,7 +8160,15 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) { } -#define TIMER_ID 0x19 +#define TIMER_ID 0x19 +#define TIMER_COUNT_EXPECTED 64 +#define TIMER_COUNT_TOLERANCE 9 + +static int count = 0; +static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +{ + count++; +} static DWORD WINAPI timer_thread_proc(LPVOID x) { @@ -8176,7 +8188,9 @@ static DWORD WINAPI timer_thread_proc(LPVOID x) static void test_timers(void) { struct timer_info info; + DWORD start; DWORD id; + MSG msg; info.hWnd = CreateWindow ("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW , @@ -8198,23 +8212,53 @@ static void test_timers(void) ok( KillTimer(info.hWnd, TIMER_ID), "KillTimer failed\n"); - ok(DestroyWindow(info.hWnd), "failed to destroy window\n"); -} + /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, + * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is + * some measurement error between test runs we're allowing for ±8 counts (~2 ms). + */ + count = 0; + id = SetTimer(info.hWnd, TIMER_ID, 0, callback_count); + ok(id != 0, "did not get id from SetTimer.\n"); + ok(id==TIMER_ID, "SetTimer timer ID different\n"); + start = GetTickCount(); + while (GetTickCount()-start < 1001 && GetMessage(&msg, info.hWnd, 0, 0)) + DispatchMessage(&msg); + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE + || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3 */, + "did not get expected count for minimum timeout (%d != ~%d).\n", + count, TIMER_COUNT_EXPECTED); + ok(KillTimer(info.hWnd, id), "KillTimer failed\n"); + /* Perform the same check on SetSystemTimer (only available on w2k3 and older) */ + if (pSetSystemTimer) + { + int syscount = 0; + + count = 0; + id = pSetSystemTimer(info.hWnd, TIMER_ID, 0, callback_count); + ok(id != 0, "did not get id from SetSystemTimer.\n"); + ok(id==TIMER_ID, "SetTimer timer ID different\n"); + start = GetTickCount(); + while (GetTickCount()-start < 1001 && GetMessage(&msg, info.hWnd, 0, 0)) + { + if (msg.message == WM_SYSTIMER) + syscount++; + DispatchMessage(&msg); + } + ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + "did not get expected count for minimum timeout (%d != ~%d).\n", + syscount, TIMER_COUNT_EXPECTED); + todo_wine ok(count == 0, "did not get expected count for callback timeout (%d != 0).\n", + count); + ok(pKillSystemTimer(info.hWnd, id), "KillSystemTimer failed\n"); + } -static int count = 0; -static VOID CALLBACK callback_count( - HWND hwnd, - UINT uMsg, - UINT_PTR idEvent, - DWORD dwTime -) -{ - count++; + ok(DestroyWindow(info.hWnd), "failed to destroy window\n"); } static void test_timers_no_wnd(void) { UINT_PTR id, id2; + DWORD start; MSG msg; count = 0; @@ -8232,6 +8276,22 @@ static void test_timers_no_wnd(void) Sleep(250); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok(count == 1, "killing replaced timer did not work (%i).\n", count); + + /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, + * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is + * some measurement error between test runs we're allowing for ±8 counts (~2 ms). + */ + count = 0; + id = SetTimer(NULL, 0, 0, callback_count); + ok(id != 0, "did not get id from SetTimer.\n"); + start = GetTickCount(); + while (GetTickCount()-start < 1001 && GetMessage(&msg, NULL, 0, 0)) + DispatchMessage(&msg); + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + "did not get expected count for minimum timeout (%d != ~%d).\n", + count, TIMER_COUNT_EXPECTED); + KillTimer(NULL, id); + /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */ } /* Various win events with arbitrary parameters */ diff --git a/include/winuser.h b/include/winuser.h index 59d5b8e..fb0fa95 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2521,6 +2521,10 @@ typedef struct tagMINIMIZEDMETRICS { #define PM_QS_PAINT (QS_PAINT << 16) #define PM_QS_SENDMESSAGE (QS_SENDMESSAGE << 16) +/* SetTimer() limits */ +#define USER_TIMER_MINIMUM 0x0000000A +#define USER_TIMER_MAXIMUM 0x7FFFFFFF + /* AnimateWindow() flags */ #define AW_SLIDE 0x00040000 #define AW_ACTIVATE 0x00020000

1 0

Daniel Jelinski : include: Added transact.idl.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: adafd6c49de86a1b1df2a13fbd00a309619e6bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=adafd6c49de86a1b1df2a13fb… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri May 3 15:58:54 2013 +0200 include: Added transact.idl. --- .gitignore | 1 + dlls/adsiid/adsiid.c | 1 + include/Makefile.in | 1 + include/transact.idl | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 229 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index b13b6be..9cb851b 100644 --- a/.gitignore +++ b/.gitignore @@ -246,6 +246,7 @@ include/structuredquerycondition.h include/textstor.h include/tlogstg.h include/tom.h +include/transact.h include/uiautomationclient.h include/uiautomationcore.h include/unknwn.h diff --git a/dlls/adsiid/adsiid.c b/dlls/adsiid/adsiid.c index e4e85d8..fc0b8b1 100644 --- a/dlls/adsiid/adsiid.c +++ b/dlls/adsiid/adsiid.c @@ -25,3 +25,4 @@ #include "initguid.h" #include "iads.h" +#include "transact.h" diff --git a/include/Makefile.in b/include/Makefile.in index 9589c34..39821d2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -98,6 +98,7 @@ PUBLIC_IDL_H_SRCS = \ textstor.idl \ tlogstg.idl \ tom.idl \ + transact.idl \ uiautomationclient.idl \ uiautomationcore.idl \ unknwn.idl \ diff --git a/include/transact.idl b/include/transact.idl new file mode 100644 index 0000000..c9dbc69 --- /dev/null +++ b/include/transact.idl @@ -0,0 +1,226 @@ +/* + * Copyright (C) 2013 Daniel Jeliński + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; + +cpp_quote("#include <winerror.h>") + +interface ITransaction; +interface ITransactionCloner; +interface ITransaction2; +interface ITransactionDispenser; +interface ITransactionOptions; +interface ITransactionOutcomeEvents; +interface ITmNodeName; + +typedef struct BOID { + byte rgb[16]; +} BOID; + +cpp_quote("#ifndef MAX_TRAN_DESC_DEFINED") +cpp_quote("#define MAX_TRAN_DESC_DEFINED") +typedef enum TX_MISC_CONSTANTS { + MAX_TRAN_DESC = 40 +} TX_MISC_CONSTANTS; +cpp_quote("#endif") + +typedef BOID XACTUOW; +typedef LONG ISOLEVEL; + +typedef enum ISOLATIONLEVEL { + ISOLATIONLEVEL_UNSPECIFIED = 0xffffffff, + ISOLATIONLEVEL_CHAOS = 0x10, + ISOLATIONLEVEL_READUNCOMMITTED = 0x100, + ISOLATIONLEVEL_BROWSE = 0x100, + ISOLATIONLEVEL_CURSORSTABILITY = 0x1000, + ISOLATIONLEVEL_READCOMMITTED = 0x1000, + ISOLATIONLEVEL_REPEATABLEREAD = 0x10000, + ISOLATIONLEVEL_SERIALIZABLE = 0x100000, + ISOLATIONLEVEL_ISOLATED = 0x100000 +} ISOLATIONLEVEL; + +typedef struct XACTTRANSINFO { + XACTUOW uow; + ISOLEVEL isoLevel; + ULONG isoFlags; + DWORD grfTCSupported; + DWORD grfRMSupported; + DWORD grfTCSupportedRetaining; + DWORD grfRMSupportedRetaining; +} XACTTRANSINFO; + +typedef struct XACTSTATS { + ULONG cOpen; + ULONG cCommitting; + ULONG cCommitted; + ULONG cAborting; + ULONG cAborted; + ULONG cInDoubt; + ULONG cHeuristicDecision; + FILETIME timeTransactionsUp; +} XACTSTATS; + +typedef enum ISOFLAG { + ISOFLAG_RETAIN_COMMIT_DC = 1, + ISOFLAG_RETAIN_COMMIT = 2, + ISOFLAG_RETAIN_COMMIT_NO = 3, + ISOFLAG_RETAIN_ABORT_DC = 4, + ISOFLAG_RETAIN_ABORT = 8, + ISOFLAG_RETAIN_ABORT_NO = 12, + ISOFLAG_RETAIN_DONTCARE = ISOFLAG_RETAIN_COMMIT_DC | ISOFLAG_RETAIN_ABORT_DC, + ISOFLAG_RETAIN_BOTH = ISOFLAG_RETAIN_COMMIT | ISOFLAG_RETAIN_ABORT, + ISOFLAG_RETAIN_NONE = ISOFLAG_RETAIN_COMMIT_NO | ISOFLAG_RETAIN_ABORT_NO, + ISOFLAG_OPTIMISTIC = 16, + ISOFLAG_READONLY = 32 +} ISOFLAG; + +typedef enum XACTTC { + XACTTC_NONE = 0, + XACTTC_SYNC_PHASEONE = 1, + XACTTC_SYNC_PHASETWO = 2, + XACTTC_SYNC = 2, + XACTTC_ASYNC_PHASEONE = 4, + XACTTC_ASYNC = 4 +} XACTTC; + +typedef enum XACTRM { + XACTRM_OPTIMISTICLASTWINS = 1, + XACTRM_NOREADONLYPREPARES +} XACTRM; + +typedef enum XACTCONST { + XACTCONST_TIMEOUTINFINITE +} XACTCONST; + +typedef enum XACTHEURISTIC { + XACTHEURISTIC_ABORT = 1, + XACTHEURISTIC_COMMIT, + XACTHEURISTIC_DAMAGE, + XACTHEURISTIC_DANGER +} XACTHEURISTIC; + +typedef enum XACTSTAT { + XACTSTAT_NONE = 0, + XACTSTAT_OPENNORMAL = 0x1, + XACTSTAT_OPENREFUSED = 0x2, + XACTSTAT_PREPARING = 0x4, + XACTSTAT_PREPARED = 0x8, + XACTSTAT_PREPARERETAINING = 0x10, + XACTSTAT_PREPARERETAINED = 0x20, + XACTSTAT_COMMITTING = 0x40, + XACTSTAT_COMMITRETAINING = 0x80, + XACTSTAT_ABORTING = 0x100, + XACTSTAT_ABORTED = 0x200, + XACTSTAT_COMMITTED = 0x400, + XACTSTAT_HEURISTIC_ABORT = 0x800, + XACTSTAT_HEURISTIC_COMMIT = 0x1000, + XACTSTAT_HEURISTIC_DAMAGE = 0x2000, + XACTSTAT_HEURISTIC_DANGER = 0x4000, + XACTSTAT_FORCED_ABORT = 0x8000, + XACTSTAT_FORCED_COMMIT = 0x10000, + XACTSTAT_INDOUBT = 0x20000, + XACTSTAT_CLOSED = 0x40000, + XACTSTAT_OPEN = 0x3, + XACTSTAT_NOTPREPARED = 0x7ffc3, + XACTSTAT_ALL = 0x7ffff +} XACTSTAT; + +typedef struct XACTOPT { + ULONG ulTimeout; + char szDescription[40 ]; +} XACTOPT; + +[ + object, + uuid(0fb15084-af41-11ce-bd2b-204c4f4f5020) +] +interface ITransaction : IUnknown { + HRESULT Commit([in] BOOL fRetaining, + [in] DWORD grfTC, + [in] DWORD grfRM); + HRESULT Abort([in, unique] BOID *pboidReason, + [in] BOOL fRetaining, + [in] BOOL fAsync); + HRESULT GetTransactionInfo([out] XACTTRANSINFO *pinfo); +}; + +[ + object, + uuid(02656950-2152-11d0-944C-00A0C905416E) +] +interface ITransactionCloner : ITransaction { + HRESULT CloneWithCommitDisabled([out] ITransaction **ppITransaction); +}; + +[ + object, + uuid(34021548-0065-11d3-bac1-00c04f797be2) +] +interface ITransaction2 : ITransactionCloner { + HRESULT GetTransactionInfo2([out] XACTTRANSINFO *pinfo); +}; + +[ + object, + uuid(3A6AD9E1-23B9-11cf-AD60-00AA00A74CCD) +] +interface ITransactionDispenser : IUnknown { + HRESULT GetOptionsObject([out] ITransactionOptions **ppOptions); + HRESULT BeginTransaction([in, unique] IUnknown *punkOuter, + [in] ISOLEVEL isoLevel, + [in] ULONG isoFlags, + [in, unique] ITransactionOptions *pOptions, + [out] ITransaction **ppTransaction); +}; + +[ + object, + uuid(3A6AD9E0-23B9-11cf-AD60-00AA00A74CCD) +] +interface ITransactionOptions : IUnknown { + HRESULT SetOptions([in] XACTOPT *pOptions); + HRESULT GetOptions([in, out] XACTOPT *pOptions); +}; + +[ + object, + uuid(3A6AD9E2-23B9-11cf-AD60-00AA00A74CCD) +] +interface ITransactionOutcomeEvents : IUnknown { + HRESULT Committed([in] BOOL fRetaining, + [in, unique] XACTUOW *pNewUOW, + [in] HRESULT hr); + HRESULT Aborted([in, unique] BOID *pboidReason, + [in] BOOL fRetaining, + [in, unique] XACTUOW *pNewUOW, + [in] HRESULT hr); + HRESULT HeuristicDecision([in] DWORD dwDecision, + [in, unique] BOID *pboidReason, + [in] HRESULT hr); + HRESULT Indoubt(void); +}; + +[ + object, + uuid(30274F88-6EE4-474e-9B95-7807BC9EF8CF) +] +interface ITmNodeName : IUnknown { + HRESULT GetNodeNameSize([out] ULONG *pcbNodeNameSize); + HRESULT GetNodeName([in] ULONG cbNodeNameBufferSize, + [in, out] LPWSTR pNodeNameBuffer); +};

1 0

Daniel Jelinski : xolehlp: Implement ITransactionDispenser.
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 19e2b37f0eb2a40a128b5efef40e530c04ff259e URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e2b37f0eb2a40a128b5efef… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Apr 30 23:37:27 2013 +0200 xolehlp: Implement ITransactionDispenser. --- dlls/xolehlp/Makefile.in | 1 + dlls/xolehlp/xolehlp.c | 161 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 156 insertions(+), 6 deletions(-) diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in index b1389ca..0614be1 100644 --- a/dlls/xolehlp/Makefile.in +++ b/dlls/xolehlp/Makefile.in @@ -1,4 +1,5 @@ MODULE = xolehlp.dll +IMPORTS = adsiid uuid C_SRCS = xolehlp.c diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 475ef67..2d686cc 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -17,12 +17,122 @@ */ #include <stdarg.h> +#define COBJMACROS #include "windef.h" #include "winbase.h" +#include "transact.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xolehlp); +typedef struct { + ITransactionDispenser ITransactionDispenser_iface; + LONG ref; +} TransactionManager; + +static inline TransactionManager *impl_from_ITransactionDispenser(ITransactionDispenser *iface) +{ + return CONTAINING_RECORD(iface, TransactionManager, ITransactionDispenser_iface); +} + +static HRESULT WINAPI TransactionDispenser_QueryInterface(ITransactionDispenser *iface, REFIID iid, + void **ppv) +{ + TransactionManager *This = impl_from_ITransactionDispenser(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_ITransactionDispenser, iid)) + { + *ppv = &This->ITransactionDispenser_iface; + } + else + { + FIXME("(%s): not implemented\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI TransactionDispenser_AddRef(ITransactionDispenser *iface) +{ + TransactionManager *This = impl_from_ITransactionDispenser(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI TransactionDispenser_Release(ITransactionDispenser *iface) +{ + TransactionManager *This = impl_from_ITransactionDispenser(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI TransactionDispenser_GetOptionsObject(ITransactionDispenser *iface, + ITransactionOptions **ppOptions) +{ + FIXME("(%p, %p): stub\n", iface, ppOptions); + if (!ppOptions) return E_INVALIDARG; + *ppOptions = NULL; + return E_NOTIMPL; +} +static HRESULT WINAPI TransactionDispenser_BeginTransaction(ITransactionDispenser *iface, + IUnknown *punkOuter, + ISOLEVEL isoLevel, + ULONG isoFlags, + ITransactionOptions *pOptions, + ITransaction **ppTransaction) +{ + FIXME("(%p, %p, %08x, %08x, %p, %p): stub\n", iface, punkOuter, + isoLevel, isoFlags, pOptions, ppTransaction); + + if (!ppTransaction) return E_INVALIDARG; + *ppTransaction = NULL; + if (punkOuter) return CLASS_E_NOAGGREGATION; + return E_NOTIMPL; +} +static const ITransactionDispenserVtbl TransactionDispenser_Vtbl = { + TransactionDispenser_QueryInterface, + TransactionDispenser_AddRef, + TransactionDispenser_Release, + TransactionDispenser_GetOptionsObject, + TransactionDispenser_BeginTransaction +}; + +static HRESULT TransactionManager_Create(REFIID riid, void **ppv) +{ + TransactionManager *This; + HRESULT ret; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(TransactionManager)); + if (!This) return E_OUTOFMEMORY; + + This->ITransactionDispenser_iface.lpVtbl = &TransactionDispenser_Vtbl; + This->ref = 1; + + ret = ITransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, riid, ppv); + ITransactionDispenser_Release(&This->ITransactionDispenser_iface); + + return ret; +} + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE("%p, %u, %p\n", hinst, reason, reserved); @@ -38,26 +148,65 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } +static BOOL is_local_machineA( const CHAR *server ) +{ + static const CHAR dot[] = "."; + CHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len = sizeof(buffer) / sizeof(buffer[0]); + + if (!server || !strcmp( server, dot )) return TRUE; + if (GetComputerNameA( buffer, &len ) && !lstrcmpiA( server, buffer )) return TRUE; + return FALSE; +} +static BOOL is_local_machineW( const WCHAR *server ) +{ + static const WCHAR dotW[] = {'.',0}; + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len = sizeof(buffer) / sizeof(buffer[0]); + + if (!server || !strcmpW( server, dotW )) return TRUE; + if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; + return FALSE; +} + HRESULT CDECL DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, DWORD dwReserved1, WORD wcbReserved2, void *pvReserved2, void **ppv) { - FIXME("(%s, %s, %s, %d, %d, %p, %p): stub\n", debugstr_a(host), debugstr_a(tm_name), + TRACE("(%s, %s, %s, %d, %d, %p, %p)\n", debugstr_a(host), debugstr_a(tm_name), debugstr_guid(riid), dwReserved1, wcbReserved2, pvReserved2, ppv); - return E_NOTIMPL; + + if (!is_local_machineA(host)) + { + FIXME("remote computer not supported\n"); + return E_NOTIMPL; + } + return TransactionManager_Create(riid, ppv); } HRESULT CDECL DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { - FIXME("(%s, %s, %s, %d, %p, %p): stub\n", debugstr_a(host), debugstr_a(tm_name), + TRACE("(%s, %s, %s, %d, %p, %p)\n", debugstr_a(host), debugstr_a(tm_name), debugstr_guid(riid), options, config, ppv); - return E_NOTIMPL; + + if (!is_local_machineA(host)) + { + FIXME("remote computer not supported\n"); + return E_NOTIMPL; + } + return TransactionManager_Create(riid, ppv); } HRESULT CDECL DtcGetTransactionManagerExW(WCHAR *host, WCHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { - FIXME("(%s, %s, %s, %d, %p, %p): stub\n", debugstr_w(host), debugstr_w(tm_name), + TRACE("(%s, %s, %s, %d, %p, %p)\n", debugstr_w(host), debugstr_w(tm_name), debugstr_guid(riid), options, config, ppv); - return E_NOTIMPL; + + if (!is_local_machineW(host)) + { + FIXME("remote computer not supported\n"); + return E_NOTIMPL; + } + return TransactionManager_Create(riid, ppv); }

1 0

Dmitry Timoshkov : gdiplus: Implement GdipEnumerateMetafileDestRect and GdipEnumerateMetafileDestRectI .
by Alexandre Julliard 06 May '13

06 May '13

Module: wine Branch: master Commit: 69d74ece533d1c62276a00e5601ff04920249088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d74ece533d1c62276a00e56… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 12:08:38 2013 +0900 gdiplus: Implement GdipEnumerateMetafileDestRect and GdipEnumerateMetafileDestRectI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 4 ++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 920d78e..2fa1771 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -194,8 +194,8 @@ 194 stub GdipEnumerateMetafileDestPointI 195 stub GdipEnumerateMetafileDestPoints 196 stub GdipEnumerateMetafileDestPointsI -197 stub GdipEnumerateMetafileDestRect -198 stub GdipEnumerateMetafileDestRectI +197 stdcall GdipEnumerateMetafileDestRect(ptr ptr ptr ptr ptr ptr) +198 stdcall GdipEnumerateMetafileDestRectI(ptr ptr ptr ptr ptr ptr) 199 stub GdipEnumerateMetafileSrcRectDestPoint 200 stub GdipEnumerateMetafileSrcRectDestPointI 201 stdcall GdipEnumerateMetafileSrcRectDestPoints(ptr ptr ptr long ptr long ptr ptr ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f03557b..893fe6b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -551,6 +551,39 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, return stat; } +GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics *graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST GpRectF *dest, + EnumerateMetafileProc callback, VOID *cb_data, GDIPCONST GpImageAttributes *attrs) +{ + GpPointF points[3]; + + if (!graphics || !metafile || !dest) return InvalidParameter; + + points[0].X = points[2].X = dest->X; + points[0].Y = points[1].Y = dest->Y; + points[1].X = dest->X + dest->Width; + points[2].Y = dest->Y + dest->Height; + + return GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, points, 3, + &metafile->bounds, metafile->unit, callback, cb_data, attrs); +} + +GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics *graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST GpRect *dest, + EnumerateMetafileProc callback, VOID *cb_data, GDIPCONST GpImageAttributes *attrs) +{ + GpRectF destf; + + if (!graphics || !metafile || !dest) return InvalidParameter; + + destf.X = dest->X; + destf.Y = dest->Y; + destf.Width = dest->Width; + destf.Height = dest->Height; + + return GdipEnumerateMetafileDestRect(graphics, metafile, &destf, callback, cb_data, attrs); +} + static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, int nObj, LPARAM lpData) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f4ecec6..8e720f1 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -206,6 +206,10 @@ GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics*,GpPen*,GDIPCONST GpRect*,INT GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*, GDIPCONST GpBrush*); +GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics*,GDIPCONST GpMetafile*, + GDIPCONST GpRectF*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); +GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics*,GDIPCONST GpMetafile*, + GDIPCONST GpRect*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics*, GDIPCONST GpMetafile*,GDIPCONST GpPointF*,INT,GDIPCONST GpRectF*,Unit, EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);

1 0