December 2008 - Wine-Commits

Andrew Talbot : msvfw32: Remove superfluous semicolon.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: 6e59407e1c5d9081dcea1049d322c1edf1d67a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e59407e1c5d9081dcea1049d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 22 20:22:10 2008 +0000 msvfw32: Remove superfluous semicolon. --- dlls/msvfw32/msvideo_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index fa02716..247c00e 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1026,9 +1026,9 @@ void VFWAPI ICCompressorFree(PCOMPVARS pc) LRESULT MSVIDEO_SendMessage(WINE_HIC* whic, UINT msg, DWORD_PTR lParam1, DWORD_PTR lParam2) { LRESULT ret; - -#define XX(x) case x: TRACE("(%p,"#x",0x%08lx,0x%08lx)\n",whic,lParam1,lParam2); break; - + +#define XX(x) case x: TRACE("(%p,"#x",0x%08lx,0x%08lx)\n",whic,lParam1,lParam2); break + switch (msg) { /* DRV_* */ XX(DRV_LOAD);

1 0

Andrew Talbot : winex11.drv: Superfluous semicolons fix.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: 1b802bd5ac6672e2faa66e573a29037e3590c8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b802bd5ac6672e2faa66e573… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 22 20:22:14 2008 +0000 winex11.drv: Superfluous semicolons fix. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index fcde245..9c540d1 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2126,7 +2126,7 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) { Display *display = thread_init_display(); -#define returnMVK(value) { TRACE("returning 0x%x.\n",value); return value; } +#define returnMVK(value) do { TRACE("returning 0x%x.\n",value); return value; } while(0) TRACE("wCode=0x%x, wMapType=%d, hkl %p\n", wCode, wMapType, hkl); if (!match_x11_keyboard_layout(hkl))

1 0

Andrew Talbot : mshtml: Remove superfluous semicolons.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: 37d18db78bcbeb804aab3e5c4ff98a89cfa4d4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d18db78bcbeb804aab3e5c4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 22 20:22:06 2008 +0000 mshtml: Remove superfluous semicolons. --- dlls/mshtml/htmlstylesheet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index b074c25..adbe740 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -56,8 +56,8 @@ typedef struct { nsIDOMCSSRuleList *nslist; } HTMLStyleSheetRulesCollection; -#define HTMLSTYLESHEET(x) ((IHTMLStyleSheet*) &(x)->lpHTMLStyleSheetVtbl); -#define HTMLSTYLESHEETSCOL(x) ((IHTMLStyleSheetsCollection*) &(x)->lpHTMLStyleSheetsCollectionVtbl); +#define HTMLSTYLESHEET(x) ((IHTMLStyleSheet*) &(x)->lpHTMLStyleSheetVtbl) +#define HTMLSTYLESHEETSCOL(x) ((IHTMLStyleSheetsCollection*) &(x)->lpHTMLStyleSheetsCollectionVtbl) #define HTMLSTYLERULESCOL(x) ((IHTMLStyleSheetRulesCollection*) &(x)->lpHTMLStyleSheetRulesCollectionVtbl) #define HTMLSTYLERULESCOL_THIS(iface) \

1 0

Paul Vriens : winmm/tests: Fix a test failure on NT4 and W2K.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: cb05885f5db7fc6849a56dcbf74133bfe39a56bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb05885f5db7fc6849a56dcbf… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Dec 22 19:42:46 2008 +0100 winmm/tests: Fix a test failure on NT4 and W2K. --- dlls/winmm/tests/mixer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 6951621..472baa6 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -1016,8 +1016,9 @@ static void test_mixerOpen() mmsys_error(rc)); rc = mixerOpen(&mix, -1, 0, 0, 0); - ok(rc == MMSYSERR_BADDEVICEID, - "mixerOpen: MMSYSERR_BADDEVICEID expected, got %s\n", + ok(rc == MMSYSERR_BADDEVICEID || + rc == MMSYSERR_INVALHANDLE, /* NT4/W2K */ + "mixerOpen: MMSYSERR_BADDEVICEID or MMSYSERR_INVALHANDLE expected, got %s\n", mmsys_error(rc)); for (d = 0; d < ndev; d++) {

1 0

Paul Vriens : shell32/tests: Cope with Vista's behavior.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: 7f752f7c9c08d486a085dba3213170b8088e616a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f752f7c9c08d486a085dba32… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Dec 22 15:29:51 2008 +0100 shell32/tests: Cope with Vista's behavior. --- dlls/shell32/tests/shlfileop.c | 248 +++++++++++++++++++++++++++++++--------- 1 files changed, 191 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f752f7c9c08d486a085d…

1 0

Alexandre Julliard : include: Add the needed dllimport attribute to the RtlUnwind declaration.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: a7a4f843662cf8676e24c85f6e107230e749a64d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a4f843662cf8676e24c85f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 20:20:48 2008 +0100 include: Add the needed dllimport attribute to the RtlUnwind declaration. --- include/wine/exception.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index ccace07..7e0d5bc 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -233,7 +233,7 @@ extern void __wine_enter_vm86( CONTEXT *context ); #ifndef USE_COMPILER_EXCEPTIONS -extern void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); +NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); /* wrapper for RtlUnwind since it clobbers registers on Windows */ static inline void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record )

1 0

Alexandre Julliard : shell32: Use RtlRandom instead of the non-portable rand_r.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: 03fe2d0d51d5c10a38787b65c09cbbb4fb411c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fe2d0d51d5c10a38787b65c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 20:14:59 2008 +0100 shell32: Use RtlRandom instead of the non-portable rand_r. --- dlls/shell32/trash.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 568c557..d692046 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -215,7 +215,7 @@ static char *create_trashinfo(const char *info_dir, const char *file_path) { const char *base_name; char *filename_buffer; - unsigned int seed = (unsigned int)time(NULL); + ULONG seed = GetTickCount(); int i; errno = ENOMEM; /* out-of-memory is the only case when errno isn't set */ @@ -240,7 +240,7 @@ static char *create_trashinfo(const char *info_dir, const char *file_path) for (i=0; i<1000; i++) { - sprintf(filename_buffer, "%s-%08x", base_name, rand_r(&seed)); + sprintf(filename_buffer, "%s-%08x", base_name, RtlRandom(&seed)); if (try_create_trashinfo_file(info_dir, filename_buffer, file_path)) return filename_buffer; }

1 0

Alexandre Julliard : gdi32: Fix the build without Freetype LCD support.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: 30137f168c18748bf5728476c57777b3cc6619dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=30137f168c18748bf5728476c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 23 12:34:01 2008 +0100 gdi32: Fix the build without Freetype LCD support. --- dlls/gdi32/freetype.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e3c7da2..9eb1d13 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -184,11 +184,13 @@ MAKE_FUNCPTR(FT_Set_Pixel_Sizes); MAKE_FUNCPTR(FT_Vector_Transform); MAKE_FUNCPTR(FT_Render_Glyph); static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*); -static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); static FT_Error (*pFT_Load_Sfnt_Table)(FT_Face,FT_ULong,FT_Long,FT_Byte*,FT_ULong*); static FT_ULong (*pFT_Get_First_Char)(FT_Face,FT_UInt*); static FT_ULong (*pFT_Get_Next_Char)(FT_Face,FT_ULong,FT_UInt*); static FT_TrueTypeEngineType (*pFT_Get_TrueType_Engine_Type)(FT_Library); +#ifdef HAVE_FREETYPE_FTLCDFIL_H +static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); +#endif #ifdef HAVE_FREETYPE_FTWINFNT_H MAKE_FUNCPTR(FT_Get_WinFNT_Header); #endif @@ -2491,11 +2493,13 @@ static BOOL init_freetype(void) #undef LOAD_FUNCPTR /* Don't warn if these ones are missing */ pFT_Library_Version = wine_dlsym(ft_handle, "FT_Library_Version", NULL, 0); - pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); pFT_Load_Sfnt_Table = wine_dlsym(ft_handle, "FT_Load_Sfnt_Table", NULL, 0); pFT_Get_First_Char = wine_dlsym(ft_handle, "FT_Get_First_Char", NULL, 0); pFT_Get_Next_Char = wine_dlsym(ft_handle, "FT_Get_Next_Char", NULL, 0); pFT_Get_TrueType_Engine_Type = wine_dlsym(ft_handle, "FT_Get_TrueType_Engine_Type", NULL, 0); +#ifdef HAVE_FREETYPE_FTLCDFIL_H + pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0); +#endif #ifdef HAVE_FREETYPE_FTWINFNT_H pFT_Get_WinFNT_Header = wine_dlsym(ft_handle, "FT_Get_WinFNT_Header", NULL, 0); #endif @@ -4735,6 +4739,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, case WINE_GGO_HBGR_BITMAP: case WINE_GGO_VRGB_BITMAP: case WINE_GGO_VBGR_BITMAP: +#ifdef HAVE_FREETYPE_FTLCDFIL_H { width = lpgm->gmBlackBoxX; height = lpgm->gmBlackBoxY; @@ -4836,6 +4841,10 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, break; } +#else + LeaveCriticalSection( &freetype_cs ); + return GDI_ERROR; +#endif case GGO_NATIVE: { @@ -5917,13 +5926,12 @@ static BOOL is_hinting_enabled(void) static BOOL is_subpixel_rendering_enabled( void ) { - if ( !pFT_Library_SetLcdFilter ) - return FALSE; - - if ( pFT_Library_SetLcdFilter ( NULL, 0 ) == FT_Err_Unimplemented_Feature ) - return FALSE; - - return TRUE; +#ifdef HAVE_FREETYPE_FTLCDFIL_H + return pFT_Library_SetLcdFilter && + pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature; +#else + return FALSE; +#endif } /*************************************************************************

1 0

Jesse Allen : winecfg: Make virtual desktop shortcut key unique.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: e39a471aacde434bdb96b8f0ce1920e77afc166b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39a471aacde434bdb96b8f0c… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 22 07:21:39 2008 -0700 winecfg: Make virtual desktop shortcut key unique. --- programs/winecfg/En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index ebdde0c..5743ba3 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -71,7 +71,7 @@ BEGIN CONTROL "Allow DirectX apps to stop the &mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Allow the &window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 - CONTROL "Emulate a virtual &desktop",IDC_ENABLE_DESKTOP,"Button", + CONTROL "&Emulate a virtual desktop",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 LTEXT "Desktop &size:",IDC_DESKTOP_SIZE,15,70,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,109,70,8,8,WS_DISABLED

1 0

Alexandre Julliard : ws2_32: Added implementation for inet_ntop.
by Alexandre Julliard Dec. 23, 2008

Dec. 23, 2008

Module: wine Branch: master Commit: bc85fb4cd3b091678b79e8416dfe573e98aee1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc85fb4cd3b091678b79e8416… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 19:40:08 2008 +0100 ws2_32: Added implementation for inet_ntop. --- configure | 2 ++ configure.ac | 1 + dlls/ws2_32/socket.c | 24 ++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/config.h.in | 3 +++ 5 files changed, 31 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 43ea106..2cc3711 100755 --- a/configure +++ b/configure @@ -17792,6 +17792,7 @@ esac + for ac_func in \ _pclose \ _popen \ @@ -17824,6 +17825,7 @@ for ac_func in \ gettid \ gettimeofday \ getuid \ + inet_ntop \ inet_pton \ kqueue \ lstat \ diff --git a/configure.ac b/configure.ac index 400011c..8ace1cb 100644 --- a/configure.ac +++ b/configure.ac @@ -1387,6 +1387,7 @@ AC_CHECK_FUNCS(\ gettid \ gettimeofday \ getuid \ + inet_ntop \ inet_pton \ kqueue \ lstat \ diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 14f357f..5b748c8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4555,6 +4555,30 @@ int WINAPI WSARemoveServiceClass(LPGUID info) } /*********************************************************************** + * inet_ntop (WS2_32.@) + */ +PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, size_t len ) +{ +#ifdef HAVE_INET_NTOP + union generic_unix_sockaddr unix_addr; + + switch (family) + { + case WS_AF_INET: + ws_sockaddr_ws2u( addr, sizeof(struct WS_sockaddr_in), &unix_addr ); + return inet_ntop( AF_INET, &unix_addr, buffer, len ); + case WS_AF_INET6: + ws_sockaddr_ws2u( addr, sizeof(struct WS_sockaddr_in6), &unix_addr ); + return inet_ntop( AF_INET6, &unix_addr, buffer, len ); + } +#else + FIXME( "not supported on this platform\n" ); +#endif + WSASetLastError( WSAEAFNOSUPPORT ); + return NULL; +} + +/*********************************************************************** * WSAStringToAddressA (WS2_32.80) */ INT WINAPI WSAStringToAddressA(LPSTR AddressString, diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index bbcafc0..74e71be 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -117,3 +117,4 @@ @ stdcall freeaddrinfo(ptr) WS_freeaddrinfo @ stdcall getaddrinfo(str str ptr ptr) WS_getaddrinfo @ stdcall getnameinfo(ptr long ptr long ptr long long) WS_getnameinfo +@ stdcall inet_ntop(long ptr ptr long) WS_inet_ntop diff --git a/include/config.h.in b/include/config.h.in index 4aafaed..1753e41 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -249,6 +249,9 @@ /* Define to 1 if you have the `inet_network' function. */ #undef HAVE_INET_NETWORK +/* Define to 1 if you have the `inet_ntop' function. */ +#undef HAVE_INET_NTOP + /* Define to 1 if you have the `inet_pton' function. */ #undef HAVE_INET_PTON

1 0