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

Alexandre Julliard : configure: Fix the netinet header checks for Mac OS and Solaris.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: dfb308a6b108c9f137a53595e7710283838c9ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb308a6b108c9f137a53595e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 14:06:47 2008 +0200 configure: Fix the netinet header checks for Mac OS and Solaris. --- configure | 31 ++++++++++++++++++++++++------- configure.ac | 25 ++++++++++++++++++++----- dlls/iphlpapi/ipstats.c | 8 +++++++- include/config.h.in | 3 +++ 4 files changed, 54 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 2f13aa8..d91102b 100755 --- a/configure +++ b/configure @@ -7210,9 +7210,6 @@ done - - - for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7261,13 +7258,10 @@ for ac_header in \ mntent.h \ ncurses.h \ netdb.h \ - netinet/if_ether.h \ netinet/in.h \ netinet/in_systm.h \ - netinet/ip_icmp.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ - netinet/udp.h \ openssl/err.h \ openssl/ssl.h \ png.h \ @@ -7615,7 +7609,24 @@ done -for ac_header in netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if_dl.h net/if_types.h net/route.h netipx/ipx.h + + + + +for ac_header in \ + netinet/ip.h \ + net/if.h \ + net/if_arp.h \ + net/if_dl.h \ + net/if_types.h \ + net/route.h \ + netinet/if_ether.h \ + netinet/in_pcb.h \ + netinet/ip_icmp.h \ + netinet/ip_var.h \ + netinet/udp.h \ + netipx/ipx.h \ + do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -7639,6 +7650,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif + #ifdef HAVE_NETINET_IP_H + # include <netinet/ip.h> + #endif #include <$ac_header> _ACEOF @@ -7713,6 +7727,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif + #ifdef HAVE_NETINET_IP_H + # include <netinet/ip.h> + #endif #ifdef HAVE_NETINET_IP_VAR_H # include <netinet/ip_var.h> #endif diff --git a/configure.ac b/configure.ac index 8695b89..84ffddd 100644 --- a/configure.ac +++ b/configure.ac @@ -274,13 +274,10 @@ AC_CHECK_HEADERS(\ mntent.h \ ncurses.h \ netdb.h \ - netinet/if_ether.h \ netinet/in.h \ netinet/in_systm.h \ - netinet/ip_icmp.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ - netinet/udp.h \ openssl/err.h \ openssl/ssl.h \ png.h \ @@ -352,8 +349,20 @@ AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/user.h sys/vfs.h],,, # include <sys/param.h> #endif]) -AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if_dl.h net/if_types.h net/route.h netipx/ipx.h],,, - [#include <sys/types.h> +AC_CHECK_HEADERS(\ + netinet/ip.h \ + net/if.h \ + net/if_arp.h \ + net/if_dl.h \ + net/if_types.h \ + net/route.h \ + netinet/if_ether.h \ + netinet/in_pcb.h \ + netinet/ip_icmp.h \ + netinet/ip_var.h \ + netinet/udp.h \ + netipx/ipx.h \ +,,,[#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif @@ -362,6 +371,9 @@ AC_CHECK_HEADERS([netinet/in_pcb.h netinet/ip_var.h net/if.h net/if_arp.h net/if #endif #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> + #endif + #ifdef HAVE_NETINET_IP_H + # include <netinet/ip.h> #endif]) AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h ],,, @@ -378,6 +390,9 @@ AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif + #ifdef HAVE_NETINET_IP_H + # include <netinet/ip.h> + #endif #ifdef HAVE_NETINET_IP_VAR_H # include <netinet/ip_var.h> #endif diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index d6d8ab4..5e40219 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -61,13 +61,15 @@ #ifdef HAVE_NETINET_IF_ETHER_H #include <netinet/if_ether.h> #endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif #ifdef HAVE_NETINET_TCP_H #include <netinet/tcp.h> #endif #ifdef HAVE_NETINET_TCP_FSM_H #include <netinet/tcp_fsm.h> #endif - #ifdef HAVE_NETINET_IN_PCB_H #include <netinet/in_pcb.h> #endif @@ -628,6 +630,10 @@ DWORD getIPStats(PMIB_IPSTATS stats) DWORD getTCPStats(MIB_TCPSTATS *stats) { #if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) +#ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ +#define TCPTV_MIN 2 +#define TCPTV_REXMTMAX 128 +#endif int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) #define hz 1000 diff --git a/include/config.h.in b/include/config.h.in index 63e8e89..f57ca1a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -453,6 +453,9 @@ /* Define to 1 if you have the <netinet/in_systm.h> header file. */ #undef HAVE_NETINET_IN_SYSTM_H +/* Define to 1 if you have the <netinet/ip.h> header file. */ +#undef HAVE_NETINET_IP_H + /* Define to 1 if you have the <netinet/ip_icmp.h> header file. */ #undef HAVE_NETINET_IP_ICMP_H

1 0

Dmitry Timoshkov : wordpad: Pass correct parameters to WM_SIZE message handler.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: da88293338d2cbec8e3e5295b76a964683c0f8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da88293338d2cbec8e3e5295b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jun 27 19:05:44 2008 +0900 wordpad: Pass correct parameters to WM_SIZE message handler. --- programs/wordpad/wordpad.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index f26e153..0900ea3 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -595,9 +595,9 @@ static void update_window(void) { RECT rect; - GetWindowRect(hMainWnd, &rect); + GetClientRect(hMainWnd, &rect); - (void) OnSize(hMainWnd, SIZE_RESTORED, MAKELONG(rect.bottom, rect.right)); + OnSize(hMainWnd, SIZE_RESTORED, MAKELPARAM(rect.right, rect.bottom)); } static BOOL is_bar_visible(int bandId)

1 0

Dmitry Timoshkov : user32: Add a test for focus behaviour on minimize/ restore.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 3a934e7323e82d35018b7f0dcf55abe7b39e8128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a934e7323e82d35018b7f0dc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jun 27 19:05:16 2008 +0900 user32: Add a test for focus behaviour on minimize/restore. --- dlls/user32/tests/win.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cac34f7..6cb784f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2164,9 +2164,23 @@ static void test_vis_rgn( HWND hwnd ) ReleaseDC( hwnd, hdc ); } +static LRESULT WINAPI set_focus_on_activate_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_ACTIVATE && LOWORD(wp) == WA_ACTIVE) + { + HWND child = GetWindow(hwnd, GW_CHILD); + ok(child != 0, "couldn't find child window\n"); + SetFocus(child); + ok(GetFocus() == child, "Focus should be on child %p\n", child); + return 0; + } + return DefWindowProc(hwnd, msg, wp, lp); +} + static void test_SetFocus(HWND hwnd) { HWND child; + WNDPROC old_wnd_proc; /* check if we can set focus to non-visible windows */ @@ -2213,6 +2227,28 @@ static void test_SetFocus(HWND hwnd) ok( GetFocus() == child, "Focus should still be on child %p\n", child ); EnableWindow(hwnd, TRUE); + ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); + ShowWindow(hwnd, SW_SHOWMINIMIZED); + ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); +todo_wine + ok( GetFocus() != child, "Focus should not be on child %p\n", child ); + ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd ); + ShowWindow(hwnd, SW_RESTORE); + ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); + ok( GetFocus() == hwnd, "Focus should be on parent %p\n", hwnd ); + ShowWindow(hwnd, SW_SHOWMINIMIZED); + ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); + ok( GetFocus() != child, "Focus should not be on child %p\n", child ); +todo_wine + ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd ); + old_wnd_proc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); + ShowWindow(hwnd, SW_RESTORE); + ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); +todo_wine + ok( GetFocus() == child, "Focus should be on child %p, not %p\n", child, GetFocus() ); + + SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)old_wnd_proc); + DestroyWindow( child ); }

1 0

Przemysław Białek : gdiplus: Implementation of function GdipDrawEllipse.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 864384e75d030ea3da0f396a8c081abeb544788d URL: http://source.winehq.org/git/wine.git/?a=commit;h=864384e75d030ea3da0f396a8… Author: Przemysław Białek <lobo(a)chello.pl> Date: Fri Jun 27 10:59:23 2008 +0200 gdiplus: Implementation of function GdipDrawEllipse. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 36db95e..7e127d7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -170,8 +170,8 @@ @ stdcall GdipDrawCurve(ptr ptr ptr long) @ stdcall GdipDrawCurveI(ptr ptr ptr long) @ stub GdipDrawDriverString -@ stub GdipDrawEllipse -@ stub GdipDrawEllipseI +@ stdcall GdipDrawEllipse(ptr ptr long long long long) +@ stdcall GdipDrawEllipseI(ptr ptr long long long long) @ stdcall GdipDrawImage(ptr ptr long long) @ stub GdipDrawImageFX @ stdcall GdipDrawImageI(ptr ptr long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5716341..c274b2e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1106,6 +1106,40 @@ GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics *graphics, GpPen *pen, return ret; } +GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, + REAL y, REAL width, REAL height) +{ + INT save_state; + GpPointF ptf[2]; + POINT pti[2]; + + if(!graphics || !pen) + return InvalidParameter; + + ptf[0].X = x; + ptf[0].Y = y; + ptf[1].X = x + width; + ptf[1].Y = y + height; + + save_state = prepare_dc(graphics, pen); + SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); + + transform_and_round_points(graphics, pti, ptf, 2); + + Ellipse(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y); + + restore_dc(graphics, save_state); + + return Ok; +} + +GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics *graphics, GpPen *pen, INT x, + INT y, INT width, INT height) +{ + return GdipDrawEllipse(graphics,pen,(REAL)x,(REAL)y,(REAL)width,(REAL)height); +} + + GpStatus WINGDIPAPI GdipDrawImage(GpGraphics *graphics, GpImage *image, REAL x, REAL y) { /* IPicture::Render uses LONG coords */

1 0

Kai Blin : netapi32: Don't test NetUserChangePassword for now.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: ce81d843c606d891c594b7e31de04c5e62fdcbbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce81d843c606d891c594b7e31… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri Jun 27 11:45:18 2008 +0200 netapi32: Don't test NetUserChangePassword for now. --- dlls/netapi32/tests/access.c | 40 +++------------------------------------- 1 files changed, 3 insertions(+), 37 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 8af585d..1e1dbf2 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -51,8 +51,6 @@ static WCHAR sTooLongPassword[] = {'a','b','c','d','e','f','g','h','a','b','c',' static WCHAR sTestUserName[] = {'t', 'e', 's', 't', 'u', 's', 'e', 'r', 0}; static WCHAR sTestUserOldPass[] = {'O', 'l', 'd', 'P', 'a', 's', 's', 'W', '0', 'r', 'd', 'S', 'e', 't', '!', '~', 0}; -static WCHAR sTestUserNewPass[] = {'N', 'e', 'w', 'P', 'a', 's', 's', 'W', '0', 'r', 'd', 'S', 'e', 't', '!', '~', 0}; -static const WCHAR sLoopbackPath[] = {'\\','\\','1','2','7','.','0','.','0','.','1', 0}; static const WCHAR sBadNetPath[] = {'\\','\\','B','a',' ',' ','p','a','t','h',0}; static const WCHAR sInvalidName[] = {'\\',0}; static const WCHAR sInvalidName2[] = {'\\','\\',0}; @@ -64,7 +62,6 @@ static NET_API_STATUS (WINAPI *pNetQueryDisplayInformation)(LPWSTR,DWORD,DWORD,D static NET_API_STATUS (WINAPI *pNetUserGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetUserModalsGet)(LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetUserAdd)(LPCWSTR,DWORD,LPBYTE,LPDWORD)=NULL; -static NET_API_STATUS (WINAPI *pNetUserChangePassword)(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR)=NULL; static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL; static int init_access_tests(void) @@ -298,41 +295,11 @@ static void run_userhandling_tests(void) /* On Windows XP (and newer), calling NetUserChangePassword with a NULL * domainname parameter creates a user home directory, iff the machine is * not member of a domain. - * As we don't want to clutter up the folder containing the home - * directories, specify \\127.0.0.1 as domainname to access the local samdb. - * Note that \\localhost does not work. + * Using \\127.0.0.1 as domain name does not work on standalone machines + * either, unless the ForceGuest option in the registry is turned off. + * So let's not test NetUserChangePassword for now. */ - ret = pNetUserChangePassword(sLoopbackPath, sNonexistentUser, - sTestUserOldPass, sTestUserNewPass); - ok(ret == NERR_UserNotFound || ret == ERROR_INVALID_PASSWORD || - ret == ERROR_CANT_ACCESS_DOMAIN_INFO, - "Changing password for nonexistent user returned 0x%08x.\n", ret); - - ret = pNetUserChangePassword(sLoopbackPath, sTestUserName, sTestUserOldPass, - sTestUserOldPass); - /* Apparently NERR_PasswordTooShort can be returned on windows xp if a - * strict password policy is enforced - */ - ok(ret == NERR_Success || ret == NERR_PasswordTooShort || - ret == ERROR_CANT_ACCESS_DOMAIN_INFO || ret == ERROR_INVALID_PASSWORD, - "Changing old password to old password returned 0x%08x.\n", ret); - - ret = pNetUserChangePassword(sLoopbackPath, sTestUserName, sTestUserNewPass, - sTestUserOldPass); - ok(ret == ERROR_INVALID_PASSWORD || ret == ERROR_CANT_ACCESS_DOMAIN_INFO, - "Trying to change password giving an invalid password returned 0x%08x.\n", ret); - - ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, - sTooLongPassword); - ok(ret == ERROR_PASSWORD_RESTRICTION, - "Changing to a password that's too long returned 0x%08x.\n", ret); - - ret = pNetUserChangePassword(sLoopbackPath, sTestUserName, sTestUserOldPass, - sTestUserNewPass); - ok(ret == NERR_Success || ret == ERROR_CANT_ACCESS_DOMAIN_INFO || - ret == ERROR_INVALID_PASSWORD, "Changing the password correctly returned 0x%08x.\n", ret); - ret = pNetUserDel(NULL, sTestUserName); ok(ret == NERR_Success, "Deleting the user failed.\n"); @@ -350,7 +317,6 @@ START_TEST(access) pNetUserGetInfo=(void*)GetProcAddress(hnetapi32,"NetUserGetInfo"); pNetUserModalsGet=(void*)GetProcAddress(hnetapi32,"NetUserModalsGet"); pNetUserAdd=(void*)GetProcAddress(hnetapi32, "NetUserAdd"); - pNetUserChangePassword=(void*)GetProcAddress(hnetapi32, "NetUserChangePassword"); pNetUserDel=(void*)GetProcAddress(hnetapi32, "NetUserDel"); /* These functions were introduced with NT. It's safe to assume that

1 0

Kai Blin : netapi32: Remove double free test from apibuf tests.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: ac7511b9fa4b1890c3943bba5faa0965ce3380e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7511b9fa4b1890c3943bba5… Author: Kai Blin <kai.blin(a)gmail.com> Date: Fri Jun 27 11:45:10 2008 +0200 netapi32: Remove double free test from apibuf tests. --- dlls/netapi32/tests/apibuf.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 920be6a..5589c18 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -54,9 +54,6 @@ static void run_apibuf_tests(void) ok(pNetApiBufferFree(p) == NERR_Success, "Freed\n"); - /* test errors handling */ - ok(pNetApiBufferFree(p) == NERR_Success, "Freed\n"); - ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n"); ok(pNetApiBufferSize(NULL, &dwSize) == ERROR_INVALID_PARAMETER, "Error for NULL pointer\n");

1 0

Zac Brown : shell32: Add stub implementation for SHGetIconOverlayIndex[AW].
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 7a42aba9da5ce57478a567a9db3cf3413ae7b442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a42aba9da5ce57478a567a9d… Author: Zac Brown <zac(a)zacbrown.org> Date: Wed Jun 25 22:58:43 2008 -0700 shell32: Add stub implementation for SHGetIconOverlayIndex[AW]. --- dlls/shell32/iconcache.c | 25 +++++++++++++++++++++++++ dlls/shell32/shell32.spec | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 7345010..dc4a3ef 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -840,3 +840,28 @@ HRESULT WINAPI SHDefExtractIconA(LPCSTR pszIconFile, int iIndex, UINT uFlags, HeapFree(GetProcessHeap(), 0, lpwstrFile); return ret; } + + +/**************************************************************************** + * SHGetIconOverlayIndexA [SHELL32.@] + * + * Returns the index of the overlay icon in the system image list. + */ +INT WINAPI SHGetIconOverlayIndexA(LPCSTR pszIconPath, INT iIconIndex) +{ + FIXME("%s, %d\n", debugstr_a(pszIconPath), iIconIndex); + + return -1; +} + +/**************************************************************************** + * SHGetIconOverlayIndexW [SHELL32.@] + * + * Returns the index of the overlay icon in the system image list. + */ +INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) +{ + FIXME("%s, %d\n", debugstr_w(pszIconPath), iIconIndex); + + return -1; +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index e054db3..8bbabb9 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -348,8 +348,8 @@ @ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) @ stdcall SHGetFolderPathW(long long long long ptr) @ stub SHGetFreeDiskSpace -@ stub SHGetIconOverlayIndexA -@ stub SHGetIconOverlayIndexW +@ stdcall SHGetIconOverlayIndexA(str long) +@ stdcall SHGetIconOverlayIndexW(wstr long) @ stdcall SHGetInstanceExplorer(long) @ stdcall SHGetMalloc(ptr) @ stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA

1 0

Alistair Leslie-Hughes : msxml3: Added support for creating DOMFreeThreadedDocument.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 1fc1bb654df64d7a4e5f13e115999d4dfdaefde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc1bb654df64d7a4e5f13e11… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 25 14:52:34 2008 +1000 msxml3: Added support for creating DOMFreeThreadedDocument. --- dlls/msxml3/factory.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index cd0d108..beb5bbc 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -159,7 +159,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = (IClassFactory*) &xmldoccf.lpVtbl; } - else if( IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) ) + else if( IsEqualCLSID( rclsid, &CLSID_DOMFreeThreadedDocument ) || /* Version indep. v 2.x */ + IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) ) { cf = (IClassFactory*) &domdoccf.lpVtbl; }

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetPenDashCap197819.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: 02a9b6ae2e67c978191dcff7bcccb58bbf237943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a9b6ae2e67c978191dcff7b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 27 03:27:18 2008 +0400 gdiplus: Implemented GdipGetPenDashCap197819. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8933e66..36db95e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -355,7 +355,7 @@ @ stub GdipGetPenCustomEndCap @ stub GdipGetPenCustomStartCap @ stdcall GdipGetPenDashArray(ptr ptr long) -@ stub GdipGetPenDashCap197819 +@ stdcall GdipGetPenDashCap197819(ptr ptr) @ stub GdipGetPenDashCount @ stdcall GdipGetPenDashOffset(ptr ptr) @ stdcall GdipGetPenDashStyle(ptr ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index a3d697f..852494f 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -177,6 +177,16 @@ GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen *pen, REAL *dash, INT count) return Ok; } +GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen *pen, GpDashCap *dashCap) +{ + if(!pen || !dashCap) + return InvalidParameter; + + *dashCap = pen->dashcap; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen *pen, REAL *offset) { if(!pen || !offset) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2504457..0903637 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -49,6 +49,7 @@ GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen*,GpLineJoin); GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen*,REAL); GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL); +GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen*,GpDashCap*); GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen*,GpLineCap*); GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen*,GpLineJoin*); GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen*,REAL*);

1 0

Kirill K. Smirnov : kernel32: Add stubs for [G|S]etConsoleDisplayMode.
by Alexandre Julliard 27 Jun '08

27 Jun '08

Module: wine Branch: master Commit: a470c0b017dad71506bc173a0bd03a6b7f329c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a470c0b017dad71506bc173a0… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Thu Jun 26 21:14:41 2008 +0400 kernel32: Add stubs for [G|S]etConsoleDisplayMode. --- dlls/kernel32/console.c | 27 +++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index a04ff26..a985060 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2544,6 +2544,33 @@ BOOL WINAPI AttachConsole(DWORD dwProcessId) return TRUE; } +/****************************************************************** + * GetConsoleDisplayMode (KERNEL32.@) + */ +BOOL WINAPI GetConsoleDisplayMode(LPDWORD lpModeFlags) +{ + TRACE("semi-stub: %p\n", lpModeFlags); + /* It is safe to successfully report windowed mode */ + *lpModeFlags = 0; + return TRUE; +} + +/****************************************************************** + * SetConsoleDisplayMode (KERNEL32.@) + */ +BOOL WINAPI SetConsoleDisplayMode(HANDLE hConsoleOutput, DWORD dwFlags, + COORD *lpNewScreenBufferDimensions) +{ + TRACE("(%p, %x, (%d, %d))\n", hConsoleOutput, dwFlags, + lpNewScreenBufferDimensions->X, lpNewScreenBufferDimensions->Y); + if (dwFlags == 1) + { + /* We cannot switch to fullscreen */ + return FALSE; + } + return TRUE; +} + /* ==================================================================== * diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6fb14bb..6a24e33 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -457,7 +457,7 @@ @ stub GetConsoleCommandHistoryW @ stdcall GetConsoleCursorInfo(long ptr) @ stub GetConsoleCursorMode -@ stub GetConsoleDisplayMode +@ stdcall GetConsoleDisplayMode(ptr) @ stub GetConsoleFontInfo @ stub GetConsoleFontSize @ stub GetConsoleHardwareState @@ -964,7 +964,7 @@ @ stdcall SetConsoleCursorInfo(long ptr) @ stub SetConsoleCursorMode @ stdcall SetConsoleCursorPosition(long long) -@ stub SetConsoleDisplayMode +@ stdcall SetConsoleDisplayMode(long long ptr) @ stub SetConsoleFont @ stub SetConsoleHardwareState @ stub SetConsoleIcon

1 0