September 2011 - Wine-Commits

Gerald Pfeifer : wined3d: Remove dead code (and variable) from wined3d_surface_flip. wined3d_surface_flip.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 0affcc3a7df22bdc00c7127ff45c54d71a9556d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0affcc3a7df22bdc00c7127ff… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Sep 8 00:38:52 2011 +0200 wined3d: Remove dead code (and variable) from wined3d_surface_flip. wined3d_surface_flip. --- dlls/wined3d/surface.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 21b4f9a..4cc04cb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3767,8 +3767,6 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined3d_surface *override, DWORD flags) { - struct wined3d_swapchain *swapchain; - TRACE("surface %p, override %p, flags %#x.\n", surface, override, flags); if (flags) @@ -3787,7 +3785,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined ERR("Flipped surface is not on a swapchain.\n"); return WINEDDERR_NOTFLIPPABLE; } - swapchain = surface->container.u.swapchain; /* Flipping is only supported on render targets and overlays. */ if (!(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY)))

1 0

Francois Gouget : comctl32: Fix the wizard and property sheet dialog styles .
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 31a24ca7afd6e3f7fd1c411d031c004eb26cf676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31a24ca7afd6e3f7fd1c411d0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 00:37:20 2011 +0200 comctl32: Fix the wizard and property sheet dialog styles. --- dlls/comctl32/comctl_Bg.rc | 4 ++-- dlls/comctl32/comctl_Cs.rc | 4 ++-- dlls/comctl32/comctl_Da.rc | 4 ++-- dlls/comctl32/comctl_De.rc | 4 ++-- dlls/comctl32/comctl_El.rc | 4 ++-- dlls/comctl32/comctl_En.rc | 4 ++-- dlls/comctl32/comctl_Eo.rc | 4 ++-- dlls/comctl32/comctl_Es.rc | 4 ++-- dlls/comctl32/comctl_Fr.rc | 4 ++-- dlls/comctl32/comctl_He.rc | 4 ++-- dlls/comctl32/comctl_Hu.rc | 4 ++-- dlls/comctl32/comctl_It.rc | 4 ++-- dlls/comctl32/comctl_Ja.rc | 4 ++-- dlls/comctl32/comctl_Ko.rc | 4 ++-- dlls/comctl32/comctl_Lt.rc | 4 ++-- dlls/comctl32/comctl_Nl.rc | 4 ++-- dlls/comctl32/comctl_No.rc | 4 ++-- dlls/comctl32/comctl_Pl.rc | 4 ++-- dlls/comctl32/comctl_Pt.rc | 4 ++-- dlls/comctl32/comctl_Ro.rc | 4 ++-- dlls/comctl32/comctl_Ru.rc | 4 ++-- dlls/comctl32/comctl_Si.rc | 4 ++-- dlls/comctl32/comctl_Sk.rc | 4 ++-- dlls/comctl32/comctl_Sr.rc | 4 ++-- dlls/comctl32/comctl_Sv.rc | 4 ++-- dlls/comctl32/comctl_Th.rc | 4 ++-- dlls/comctl32/comctl_Tr.rc | 4 ++-- dlls/comctl32/comctl_Uk.rc | 4 ++-- dlls/comctl32/comctl_Zh.rc | 4 ++-- dlls/comctl32/tests/propsheet.c | 2 -- 30 files changed, 58 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31a24ca7afd6e3f7fd1c4…

1 0

Francois Gouget : comctl32: Update the PROPSHEET{HEADER, PAGE} structures and add some PSH_XXX macros.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: f981e351275976523fcd27576287cd8054ff3ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f981e351275976523fcd27576… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 00:33:03 2011 +0200 comctl32: Update the PROPSHEET{HEADER,PAGE} structures and add some PSH_XXX macros. Also add the compatibility PROPSHEET*_SIZE macros. --- include/prsht.h | 111 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 86 insertions(+), 25 deletions(-) diff --git a/include/prsht.h b/include/prsht.h index 0830757..d538c8e 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -59,57 +59,84 @@ typedef BOOL (CALLBACK *LPFNADDPROPSHEETPAGES)(LPVOID, LPFNADDPROPSHEETPAGE, LPA /* * Property sheet support (structures) */ + +typedef LPCDLGTEMPLATEA PROPSHEETPAGE_RESOURCEA; +typedef LPCDLGTEMPLATEW PROPSHEETPAGE_RESOURCEW; +DECL_WINELIB_TYPE_AW(PROPSHEETPAGE_RESOURCE) + typedef struct _PROPSHEETPAGEA { DWORD dwSize; DWORD dwFlags; - HINSTANCE hInstance; + HINSTANCE hInstance; union { - LPCSTR pszTemplate; - LPCDLGTEMPLATEA pResource; - }DUMMYUNIONNAME; + LPCSTR pszTemplate; + PROPSHEETPAGE_RESOURCEA pResource; + } DUMMYUNIONNAME; union { HICON hIcon; - LPCSTR pszIcon; - }DUMMYUNIONNAME2; + LPCSTR pszIcon; + } DUMMYUNIONNAME2; LPCSTR pszTitle; - DLGPROC pfnDlgProc; + DLGPROC pfnDlgProc; LPARAM lParam; - LPFNPSPCALLBACKA pfnCallback; - UINT* pcRefParent; + LPFNPSPCALLBACKA pfnCallback; + UINT* pcRefParent; LPCSTR pszHeaderTitle; LPCSTR pszHeaderSubTitle; -} PROPSHEETPAGEA, *LPPROPSHEETPAGEA; - -typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA; + HANDLE hActCtx; + union + { + HBITMAP hbmHeader; + LPCSTR pszbmHeader; + } DUMMYUNIONNAME3; +} PROPSHEETPAGEA, *LPPROPSHEETPAGEA, + PROPSHEETPAGEA_LATEST, *LPPROPSHEETPAGEA_LATEST; + +typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA, *LPCPROPSHEETPAGEA_LATEST; +#define PROPSHEETPAGEA_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, pcRefParent) +#define PROPSHEETPAGEA_V2_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, pszHeaderSubTitle) +#define PROPSHEETPAGEA_V3_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, hActCtx) +#define PROPSHEETPAGEA_V4_SIZE sizeof(PROPSHEETHEADERA) typedef struct _PROPSHEETPAGEW { - DWORD dwSize; - DWORD dwFlags; - HINSTANCE hInstance; + DWORD dwSize; + DWORD dwFlags; + HINSTANCE hInstance; union { - LPCWSTR pszTemplate; - LPCDLGTEMPLATEW pResource; - }DUMMYUNIONNAME; + LPCWSTR pszTemplate; + PROPSHEETPAGE_RESOURCEW pResource; + } DUMMYUNIONNAME; union { HICON hIcon; - LPCWSTR pszIcon; - }DUMMYUNIONNAME2; + LPCWSTR pszIcon; + } DUMMYUNIONNAME2; LPCWSTR pszTitle; - DLGPROC pfnDlgProc; + DLGPROC pfnDlgProc; LPARAM lParam; - LPFNPSPCALLBACKW pfnCallback; - UINT* pcRefParent; + LPFNPSPCALLBACKW pfnCallback; + UINT* pcRefParent; LPCWSTR pszHeaderTitle; LPCWSTR pszHeaderSubTitle; -} PROPSHEETPAGEW, *LPPROPSHEETPAGEW; + HANDLE hActCtx; + union + { + HBITMAP hbmHeader; + LPCWSTR pszbmHeader; + } DUMMYUNIONNAME3; +} PROPSHEETPAGEW, *LPPROPSHEETPAGEW, + PROPSHEETPAGEW_LATEST, *LPPROPSHEETPAGEW_LATEST; -typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW; +typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW, *LPCPROPSHEETPAGEW_LATEST; +#define PROPSHEETPAGEW_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, pcRefParent) +#define PROPSHEETPAGEW_V2_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, pszHeaderSubTitle) +#define PROPSHEETPAGEW_V3_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, hActCtx) +#define PROPSHEETPAGEW_V4_SIZE sizeof(PROPSHEETHEADERA) typedef struct _PROPSHEETHEADERA @@ -150,6 +177,8 @@ typedef struct _PROPSHEETHEADERA } PROPSHEETHEADERA, *LPPROPSHEETHEADERA; typedef const PROPSHEETHEADERA *LPCPROPSHEETHEADERA; +#define PROPSHEETHEADERA_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETHEADERA, pfnCallback) +#define PROPSHEETHEADERA_V2_SIZE sizeof(PROPSHEETHEADERA) typedef struct _PROPSHEETHEADERW { @@ -189,6 +218,8 @@ typedef struct _PROPSHEETHEADERW } PROPSHEETHEADERW, *LPPROPSHEETHEADERW; typedef const PROPSHEETHEADERW *LPCPROPSHEETHEADERW; +#define PROPSHEETHEADERW_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETHEADERW, pfnCallback) +#define PROPSHEETHEADERW_V2_SIZE sizeof(PROPSHEETHEADERW) /* @@ -214,6 +245,32 @@ DECL_WINELIB_TYPE_AW(LPPROPSHEETHEADER) DECL_WINELIB_TYPE_AW(LPCPROPSHEETHEADER) DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK) +#ifdef WINE_NO_UNICODE_MACROS +# define PRSHT_NAME_AW(base, suffix) \ + base##_##suffix##_must_use_W_or_A_in_this_context \ + base##_##suffix##_must_use_W_or_A_in_this_context +# define DECL_PRSHT_TYPE_AW(base, suffix) /* nothing */ +#else /* WINE_NO_UNICODE_MACROS */ +# ifdef UNICODE +# define PRSHT_NAME_AW(base, suffix) base##W_##suffix +# else +# define PRSHT_NAME_AW(base, suffix) base##A_##suffix +# endif +# define DECL_PRSHT_TYPE_AW(base, suffix) typedef PRSHT_NAME_AW(base, suffix) base##_##suffix; +#endif /* WINE_NO_UNICODE_MACROS */ + +DECL_PRSHT_TYPE_AW(PROPSHEETPAGE, LATEST) +DECL_PRSHT_TYPE_AW(LPPROPSHEETPAGE, LATEST) +DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, LATEST) +#define PROPSHEETPAGE_V1_SIZE PRSHT_NAME_AW(PROPSHEETPAGE, V1_SIZE) +#define PROPSHEETPAGE_V2_SIZE PRSHT_NAME_AW(PROPSHEETPAGE, V2_SIZE) +#define PROPSHEETPAGE_V3_SIZE PRSHT_NAME_AW(PROPSHEETPAGE, V3_SIZE) +#define PROPSHEETPAGE_V4_SIZE PRSHT_NAME_AW(PROPSHEETPAGE, V4_SIZE) +#define PROPSHEETHEADER_V1_SIZE PRSHT_NAME_AW(PROPSHEETHEADER, V1_SIZE) +#define PROPSHEETHEADER_V2_SIZE PRSHT_NAME_AW(PROPSHEETHEADER, V2_SIZE) + +#undef PRSHT_NAME_AW +#undef DECL_PRSHT_TYPE_AW /* * Property sheet support (defines) @@ -255,6 +312,7 @@ DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK) #define PSH_WIZARDCONTEXTHELP 0x00001000 #define PSH_WIZARD97_OLD 0x00002000 /* for IE < 5 */ +#define PSH_AEROWIZARD 0x00004000 #define PSH_WATERMARK 0x00008000 #define PSH_USEHBMWATERMARK 0x00010000 #define PSH_USEHPLWATERMARK 0x00020000 @@ -265,6 +323,9 @@ DECL_WINELIB_TYPE_AW(LPFNPSPCALLBACK) #define PSH_WIZARD_LITE 0x00400000 #define PSH_WIZARD97_NEW 0x01000000 /* for IE >= 5 */ #define PSH_NOCONTEXTHELP 0x02000000 +#define PSH_RESIZABLE 0x04000000 +#define PSH_HEADERBITMAP 0x08000000 +#define PSH_NOMARGIN 0x10000000 #ifndef __WINESRC__ # if defined(_WIN32_IE) && (_WIN32_IE < 0x0500) # define PSH_WIZARD97 PSH_WIZARD97_OLD

1 0

Marcus Meissner : Revert "msi: Check for return value of GetUserName ( Coverity).".
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 6d1ec3517dfe6ee315bfda8bdccbfec00854738a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1ec3517dfe6ee315bfda8bd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Sep 8 07:51:16 2011 +0200 Revert "msi: Check for return value of GetUserName (Coverity).". This reverts commit ac0a7b644fa464fa640e06a6e26b2191b5a29a92. GetUserName is supposed to return 0 here, as size is 0. --- dlls/msi/package.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bec7627..1025607 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -501,8 +501,7 @@ static UINT set_user_sid_prop( MSIPACKAGE *package ) UINT r = ERROR_FUNCTION_FAILED; size = 0; - if (!GetUserNameW( NULL, &size )) - return r; + GetUserNameW( NULL, &size ); user_name = msi_alloc( (size + 1) * sizeof(WCHAR) ); if (!user_name)

1 0

Francois Gouget : po: Remove English strin gs from the Norwegian Bokmål translation.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: aec5976fb257f366db943df8d8cfa2624dba2e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec5976fb257f366db943df8d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 00:23:09 2011 +0200 po: Remove English strings from the Norwegian Bokmål translation. --- po/nb_NO.po | 59 ++++++++++++++++++++++++++++------------------------------- 1 files changed, 28 insertions(+), 31 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 6dee78c..c02d43f 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -523,7 +523,7 @@ msgstr "Ingen toner; " #: comdlg32.rc:113 msgid "Page punt; " -msgstr "Page punt; " +msgstr "" #: comdlg32.rc:114 msgid "Interrupted by user; " @@ -3259,7 +3259,7 @@ msgstr "Ugyldig meldingsnavn\n" #: winerror.mc:966 msgid "Message 0x%1 not found in file %2\n" -msgstr "Message 0x%1 not found in file %2\n" +msgstr "" #: winerror.mc:971 msgid "Invalid address\n" @@ -5717,7 +5717,7 @@ msgstr "Wine Video 1-videokodek" #: oleacc.rc:27 msgid "unknown object" -msgstr "unknown object" +msgstr "" #: oleacc.rc:28 msgid "title bar" @@ -5809,7 +5809,7 @@ msgstr "verktøylinje" #: oleacc.rc:50 msgid "status bar" -msgstr "status bar" +msgstr "" #: oleacc.rc:51 msgid "table" @@ -8572,7 +8572,7 @@ msgstr "Ingen åpnekommando er tilknyttet filtypene '%s'\n" #: cmd.rc:294 msgid "Overwrite %s" -msgstr "Overwrite %s" +msgstr "" #: cmd.rc:295 msgid "More..." @@ -8580,43 +8580,43 @@ msgstr "Mer..." #: cmd.rc:296 msgid "Line in Batch processing possibly truncated. Using:\n" -msgstr "Line in Batch processing possibly truncated. Using:\n" +msgstr "" #: cmd.rc:298 msgid "Argument missing\n" -msgstr "Argument missing\n" +msgstr "" #: cmd.rc:299 msgid "Syntax error\n" -msgstr "Syntax error\n" +msgstr "" #: cmd.rc:301 msgid "No help available for %s\n" -msgstr "No help available for %s\n" +msgstr "" #: cmd.rc:302 msgid "Target to GOTO not found\n" -msgstr "Target to GOTO not found\n" +msgstr "" #: cmd.rc:303 msgid "Current Date is %s\n" -msgstr "Current Date is %s\n" +msgstr "" #: cmd.rc:304 msgid "Current Time is %s\n" -msgstr "Current Time is %s\n" +msgstr "" #: cmd.rc:305 msgid "Enter new date: " -msgstr "Enter new date: " +msgstr "" #: cmd.rc:306 msgid "Enter new time: " -msgstr "Enter new time: " +msgstr "" #: cmd.rc:307 msgid "Environment variable %s not defined\n" -msgstr "Environment variable %s not defined\n" +msgstr "" #: cmd.rc:308 xcopy.rc:38 msgid "Failed to open '%s'\n" @@ -8624,7 +8624,7 @@ msgstr "Klarte ikke åpne «%s»\n" #: cmd.rc:309 msgid "Cannot call batch label outside of a batch script\n" -msgstr "Cannot call batch label outside of a batch script\n" +msgstr "" #: cmd.rc:310 xcopy.rc:42 msgctxt "All key" @@ -8633,23 +8633,23 @@ msgstr "A" #: cmd.rc:311 msgid "%s, Delete" -msgstr "%s, Delete" +msgstr "" #: cmd.rc:312 msgid "Echo is %s\n" -msgstr "Echo is %s\n" +msgstr "" #: cmd.rc:313 msgid "Verify is %s\n" -msgstr "Verify is %s\n" +msgstr "" #: cmd.rc:314 msgid "Verify must be ON or OFF\n" -msgstr "Verify must be ON or OFF\n" +msgstr "" #: cmd.rc:315 msgid "Parameter error\n" -msgstr "Parameter error\n" +msgstr "" #: cmd.rc:316 msgid "" @@ -8657,21 +8657,18 @@ msgid "" "Volume Serial Number is %04x-%04x\n" "\n" msgstr "" -"Volume in drive %c is %s\n" -"Volume Serial Number is %04x-%04x\n" -"\n" #: cmd.rc:317 msgid "Volume label (11 characters, ENTER for none)?" -msgstr "Volume label (11 characters, ENTER for none)?" +msgstr "" #: cmd.rc:318 msgid "PATH not found\n" -msgstr "PATH not found\n" +msgstr "" #: cmd.rc:319 msgid "Press Return key to continue: " -msgstr "Press Return key to continue: " +msgstr "" #: cmd.rc:320 msgid "Wine Command Prompt" @@ -8679,15 +8676,15 @@ msgstr "Wine Command Prompt" #: cmd.rc:321 msgid "CMD Version %s\n" -msgstr "CMD Version %s\n" +msgstr "" #: cmd.rc:322 msgid "More? " -msgstr "More? " +msgstr "" #: cmd.rc:323 msgid "The input line is too long.\n" -msgstr "The input line is too long.\n" +msgstr "" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10173,7 +10170,7 @@ msgstr "Oppgavebehandler" #: taskmgr.rc:182 msgid "Create New Task" -msgstr "Create New Task" +msgstr "" #: taskmgr.rc:187 msgid "Runs a new program"

1 0

Akihiro Sagawa : winmm: Add support for MEVT_LONGMSG.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 203d06d4109d285503138a4ddeea72346b1e0c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203d06d4109d285503138a4dd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 7 21:50:09 2011 +0900 winmm: Add support for MEVT_LONGMSG. --- dlls/winmm/winmm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 480a4e9..a77d448 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1195,7 +1195,7 @@ start_header: /* do nothing, skip bytes */ break; case MEVT_LONGMSG: - FIXME("NIY: MEVT_LONGMSG, aka sending Sysex event\n"); + midiOutLongMsg(lpMidiStrm->hDevice, lpMidiStrm->lpMidiHdr, MEVT_EVENTPARM(me->dwEvent)); break; case MEVT_NOP: break;

1 0

Bruno Jesus : ws2_32: Fix support for SIO_KEEPALIVE_VALS.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 2e08b31f7cf2449c90909c1bc46eace80028f8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e08b31f7cf2449c90909c1bc… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 7 21:20:37 2011 -0300 ws2_32: Fix support for SIO_KEEPALIVE_VALS. --- dlls/ws2_32/socket.c | 16 ++++++++++------ dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ff3c282..ef24723 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3376,8 +3376,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID k = in_buff; keepalive = k->onoff ? 1 : 0; - keepidle = k->keepalivetime / 1000; - keepintvl = k->keepaliveinterval / 1000; + keepidle = max( 1, (k->keepalivetime + 500) / 1000 ); + keepintvl = max( 1, (k->keepaliveinterval + 500) / 1000 ); TRACE("onoff: %d, keepalivetime: %d, keepaliveinterval: %d\n", keepalive, keepidle, keepintvl); @@ -3385,10 +3385,14 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive, sizeof(int)) == -1) status = WSAEINVAL; #if defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) - else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, sizeof(int)) == -1) - status = WSAEINVAL; - else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) - status = WSAEINVAL; + /* these values need to be set only if SO_KEEPALIVE is enabled */ + else if(keepalive) + { + if (keepidle && setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, sizeof(int)) == -1) + status = WSAEINVAL; + else if (keepintvl && setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) + status = WSAEINVAL; + } #else else FIXME("ignoring keepalive interval and timeout\n"); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fd6b8c2..3766186 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -53,6 +53,11 @@ ok ( cond tmp, msg, GetCurrentThreadId(), err); \ } while (0); +#define make_keepalive(k, enable, time, interval) \ + k.onoff = enable; \ + k.keepalivetime = time; \ + k.keepaliveinterval = interval; + /* Function pointers */ static void (WINAPI *pFreeAddrInfoW)(PADDRINFOW) = 0; static int (WINAPI *pGetAddrInfoW)(LPCWSTR,LPCWSTR,const ADDRINFOW *,PADDRINFOW *) = 0; @@ -2933,6 +2938,7 @@ static void test_addr_to_print(void) static void test_ioctlsocket(void) { SOCKET sock; + struct tcp_keepalive kalive; int ret; static const LONG cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; UINT i; @@ -2972,6 +2978,31 @@ static void test_ioctlsocket(void) ret = WSAGetLastError(); ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + /* broken used to catch W95, W98, NT4 */ + make_keepalive(kalive, 0, 0, 0); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + + make_keepalive(kalive, 1, 0, 0); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + + make_keepalive(kalive, 1, 1000, 1000); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + + make_keepalive(kalive, 1, 10000, 10000); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + + make_keepalive(kalive, 1, 100, 100); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + + make_keepalive(kalive, 0, 100, 100); + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &kalive, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); + closesocket(sock); }

1 0

Francois Gouget : comctl32/tests: Check the styles of the wizard and property sheet dialogs.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 325275304cad1687dd4b47a88a46052c73ba4e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=325275304cad1687dd4b47a88… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 00:33:29 2011 +0200 comctl32/tests: Check the styles of the wizard and property sheet dialogs. --- dlls/comctl32/tests/propsheet.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index e6c2bb5..22af39c 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -107,6 +107,7 @@ static void test_title(void) PROPSHEETPAGEA psp; PROPSHEETHEADERA psh; HWND hdlg; + DWORD style; memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); @@ -131,6 +132,12 @@ static void test_title(void) hdlg = (HWND)PropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + style = GetWindowLong(hdlg, GWL_STYLE); + todo_wine + ok(style == (WS_POPUP|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CAPTION|WS_SYSMENU| + DS_CONTEXTHELP|DS_MODALFRAME|DS_SETFONT|DS_3DLOOK), + "got unexpected style: %x\n", style); + DestroyWindow(hdlg); } @@ -276,6 +283,7 @@ static void test_wiznavigation(void) PROPSHEETHEADERA psh; HWND hdlg, control; LONG_PTR controlID; + DWORD style; LRESULT defidres; BOOL hwndtoindex_supported = TRUE; const INT nextID = 12324; @@ -321,6 +329,12 @@ static void test_wiznavigation(void) ok(active_page == 0, "Active page should be 0. Is: %d\n", active_page); + style = GetWindowLong(hdlg, GWL_STYLE) & ~(DS_CONTEXTHELP|WS_SYSMENU); + todo_wine + ok(style == (WS_POPUP|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CAPTION| + DS_MODALFRAME|DS_SETFONT|DS_3DLOOK), + "got unexpected style: %x\n", style); + control = GetFocus(); controlID = GetWindowLongPtr(control, GWLP_ID); ok(controlID == nextID, "Focus should have been set to the Next button. Expected: %d, Found: %ld\n", nextID, controlID);

1 0

Bruno Jesus : user32/tests: Add SetCaretPos/GetCaretPos tests.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 2b6f0b9af73a64f98fa66f9c2749c4b078c7765a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6f0b9af73a64f98fa66f9c2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 7 23:59:10 2011 -0300 user32/tests: Add SetCaretPos/GetCaretPos tests. --- dlls/user32/tests/edit.c | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index c6c815a..934fc52 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -736,9 +736,10 @@ static void test_edit_control_1(void) */ static void test_edit_control_2(void) { - HWND hwndMain; + HWND hwndMain, phwnd; char szLocalString[MAXLEN]; - LONG r; + LONG r, w = 150, h = 50; + POINT cpos; /* Create main and edit windows. */ hwndMain = CreateWindow(szEditTest2Class, "ET2", WS_OVERLAPPEDWINDOW, @@ -749,7 +750,7 @@ static void test_edit_control_2(void) hwndET2 = CreateWindow("EDIT", NULL, WS_CHILD|WS_BORDER|ES_LEFT|ES_AUTOHSCROLL, - 0, 0, 150, 50, /* important this not be 0 size. */ + 0, 0, w, h, /* important this not be 0 size. */ hwndMain, (HMENU) ID_EDITTEST2, hinst, NULL); assert(hwndET2); if (winetest_interactive) @@ -768,6 +769,37 @@ static void test_edit_control_2(void) ok(lstrcmp(szLocalString, "bar")==0, "Wrong contents of edit: %s\n", szLocalString); + /* try setting the caret before it's visible */ + r = SetCaretPos(0, 0); + todo_wine ok(0 == r, "SetCaretPos succeeded unexpectedly, expected: 0, got: %d\n", r); + phwnd = SetFocus(hwndET2); + ok(phwnd != NULL, "SetFocus failed unexpectedly, expected non-zero, got NULL"); + r = SetCaretPos(0, 0); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == 0 && cpos.y == 0, "Wrong caret position, expected: (0,0), got: (%d,%d)\n", cpos.x, cpos.y); + r = SetCaretPos(-1, -1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == -1 && cpos.y == -1, "Wrong caret position, expected: (-1,-1), got: (%d,%d)\n", cpos.x, cpos.y); + r = SetCaretPos(w << 1, h << 1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == (w << 1) && cpos.y == (h << 1), "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w << 1, h << 1, cpos.x, cpos.y); + r = SetCaretPos(w, h); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == w && cpos.y == h, "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w, h, cpos.x, cpos.y); + r = SetCaretPos(w - 1, h - 1); + ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + r = GetCaretPos(&cpos); + ok(1 == r, "GetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); + ok(cpos.x == (w - 1) && cpos.y == (h - 1), "Wrong caret position, expected: (%d,%d), got: (%d,%d)\n", w - 1, h - 1, cpos.x, cpos.y); + /* OK, done! */ DestroyWindow (hwndET2); DestroyWindow (hwndMain);

1 0

Alexandre Julliard : d3dx9_36: Avoid using fminf/fmaxf.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 4cddd5ffdf0c568445365c6c62e7788d7dbbca7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cddd5ffdf0c568445365c6c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 8 12:13:08 2011 +0200 d3dx9_36: Avoid using fminf/fmaxf. --- dlls/d3dx9_36/mesh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 04ee7d0..c6317c8 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2548,10 +2548,10 @@ static HRESULT parse_vertex_colors(IDirectXFileData *filedata, struct mesh_data } memcpy(&color, data, sizeof(color)); data += sizeof(color); - color.r = fminf(1.0f, fmaxf(0.0f, color.r)); - color.g = fminf(1.0f, fmaxf(0.0f, color.g)); - color.b = fminf(1.0f, fmaxf(0.0f, color.b)); - color.a = fminf(1.0f, fmaxf(0.0f, color.a)); + color.r = min(1.0f, max(0.0f, color.r)); + color.g = min(1.0f, max(0.0f, color.g)); + color.b = min(1.0f, max(0.0f, color.b)); + color.a = min(1.0f, max(0.0f, color.a)); mesh->vertex_colors[index] = D3DCOLOR_ARGB((BYTE)(color.a * 255.0f + 0.5f), (BYTE)(color.r * 255.0f + 0.5f), (BYTE)(color.g * 255.0f + 0.5f),

1 0