July 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : secur32: Avoid the close-on-exec race with pipe() on kernels that support pipe2().
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: a6b05ea96c2ed3ea18eb82e2c871933f578b9c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b05ea96c2ed3ea18eb82e2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:14:08 2009 +0200 secur32: Avoid the close-on-exec race with pipe() on kernels that support pipe2(). --- dlls/secur32/dispatcher.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 91f425c..666baea 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <stdio.h> #ifdef HAVE_UNISTD_H @@ -57,16 +58,28 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, } TRACE("\n"); - if( pipe(pipe_in) < 0 ) +#ifdef HAVE_PIPE2 + if (pipe2( pipe_in, O_CLOEXEC ) < 0 ) +#endif { - return SEC_E_INTERNAL_ERROR; + if( pipe(pipe_in) < 0 ) return SEC_E_INTERNAL_ERROR; + fcntl( pipe_in[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_in[1], F_SETFD, FD_CLOEXEC ); } - if( pipe(pipe_out) < 0 ) +#ifdef HAVE_PIPE2 + if (pipe2( pipe_out, O_CLOEXEC ) < 0 ) +#endif { - close(pipe_in[0]); - close(pipe_in[1]); - return SEC_E_INTERNAL_ERROR; + if( pipe(pipe_out) < 0 ) + { + close(pipe_in[0]); + close(pipe_in[1]); + return SEC_E_INTERNAL_ERROR; + } + fcntl( pipe_out[0], F_SETFD, FD_CLOEXEC ); + fcntl( pipe_out[1], F_SETFD, FD_CLOEXEC ); } + if (!(helper = HeapAlloc(GetProcessHeap(),0, sizeof(NegoHelper)))) { close(pipe_in[0]); @@ -91,9 +104,6 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, if(helper->helper_pid == 0) { /* We're in the child now */ - close(0); - close(1); - dup2(pipe_out[0], 0); close(pipe_out[0]); close(pipe_out[1]); @@ -125,10 +135,8 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, helper->crypt.ntlm2.recv_sign_key = NULL; helper->crypt.ntlm2.recv_seal_key = NULL; helper->pipe_in = pipe_in[0]; - fcntl( pipe_in[0], F_SETFD, 1 ); close(pipe_in[1]); helper->pipe_out = pipe_out[1]; - fcntl( pipe_out[1], F_SETFD, 1 ); close(pipe_out[0]); }

1 0

Nikolay Sivov : comctl32/header: Always release item down state on WM_LBUTTONUP.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 1daf40a8375fb134e8db6fb22bd5e92fe9ce84a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1daf40a8375fb134e8db6fb22… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 1 01:33:29 2009 +0400 comctl32/header: Always release item down state on WM_LBUTTONUP. --- dlls/comctl32/header.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 1486a8a..ddc9cb0 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1590,6 +1590,9 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) HEADER_InternalHitTest (infoPtr, &pt, &flags, &nItem); if (infoPtr->bPressed) { + + infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; + if (infoPtr->bDragging) { HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; @@ -1597,8 +1600,7 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) ImageList_DragShowNolock(FALSE); ImageList_EndDrag(); - lpItem->bDown=FALSE; - + if (infoPtr->iHotDivider == -1) iNewOrder = -1; else if (infoPtr->iHotDivider == infoPtr->uNumItem) @@ -1623,14 +1625,14 @@ HEADER_LButtonUp (HEADER_INFO *infoPtr, INT x, INT y) infoPtr->bDragging = FALSE; HEADER_SetHotDivider(infoPtr, FALSE, -1); } - else if (!(infoPtr->dwStyle & HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) + else { - infoPtr->items[infoPtr->iMoveItem].bDown = FALSE; hdc = GetDC (infoPtr->hwndSelf); HEADER_RefreshItem (infoPtr, infoPtr->iMoveItem); ReleaseDC (infoPtr->hwndSelf, hdc); - HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCLICKW, infoPtr->iMoveItem, NULL); + if (!(infoPtr->dwStyle & HDS_DRAGDROP) || !HEADER_IsDragDistance(infoPtr, &pt)) + HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCLICKW, infoPtr->iMoveItem, NULL); } TRACE("Released item %d!\n", infoPtr->iMoveItem);

1 0

Alexandre Julliard : ntdll: Avoid the close-on-exec race with pipe() on kernels that support pipe2().
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 6f68b774d7c04016a05c2d5829d0934baba02dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f68b774d7c04016a05c2d582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:13:34 2009 +0200 ntdll: Avoid the close-on-exec race with pipe() on kernels that support pipe2(). --- configure | 2 ++ configure.ac | 1 + dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/server.c | 35 ++++++++++++++++++++++++++++------- dlls/ntdll/thread.c | 3 +-- include/config.h.in | 3 +++ 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 51a5440..8ce9434 100755 --- a/configure +++ b/configure @@ -18351,6 +18351,7 @@ CFLAGS="$CFLAGS $BUILTINFLAG" + for ac_func in \ _pclose \ _popen \ @@ -18388,6 +18389,7 @@ for ac_func in \ memmove \ mmap \ pclose \ + pipe2 \ poll \ popen \ prctl \ diff --git a/configure.ac b/configure.ac index 2dafff3..c6843d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1610,6 +1610,7 @@ AC_CHECK_FUNCS(\ memmove \ mmap \ pclose \ + pipe2 \ poll \ popen \ prctl \ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index b6a3d88..8da7148 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -85,6 +85,7 @@ extern void server_leave_uninterrupted_section( RTL_CRITICAL_SECTION *cs, sigset extern int server_remove_fd_from_cache( HANDLE handle ); extern int server_get_unix_fd( HANDLE handle, unsigned int access, int *unix_fd, int *needs_close, enum server_fd_type *type, unsigned int *options ); +extern int server_pipe( int fd[2] ); /* security descriptors */ NTSTATUS NTDLL_create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_descriptor **server_sd, diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 9e54ada..e90ea72 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -663,6 +663,32 @@ void CDECL wine_server_release_fd( HANDLE handle, int unix_fd ) /*********************************************************************** + * server_pipe + * + * Create a pipe for communicating with the server. + */ +int server_pipe( int fd[2] ) +{ + int ret; +#ifdef HAVE_PIPE2 + static int have_pipe2 = 1; + + if (have_pipe2) + { + if (!(ret = pipe2( fd, O_CLOEXEC ))) return ret; + if (errno == ENOSYS || errno == EINVAL) have_pipe2 = 0; /* don't try again */ + } +#endif + if (!(ret = pipe( fd ))) + { + fcntl( fd[0], F_SETFD, FD_CLOEXEC ); + fcntl( fd[1], F_SETFD, FD_CLOEXEC ); + } + return ret; +} + + +/*********************************************************************** * start_server * * Start a new wine server. @@ -1029,18 +1055,13 @@ size_t server_init_thread( void *entry_point ) sigaction( SIGCHLD, &sig_act, NULL ); /* create the server->client communication pipes */ - if (pipe( reply_pipe ) == -1) server_protocol_perror( "pipe" ); - if (pipe( ntdll_get_thread_data()->wait_fd ) == -1) server_protocol_perror( "pipe" ); + if (server_pipe( reply_pipe ) == -1) server_protocol_perror( "pipe" ); + if (server_pipe( ntdll_get_thread_data()->wait_fd ) == -1) server_protocol_perror( "pipe" ); wine_server_send_fd( reply_pipe[1] ); wine_server_send_fd( ntdll_get_thread_data()->wait_fd[1] ); ntdll_get_thread_data()->reply_fd = reply_pipe[0]; close( reply_pipe[1] ); - /* set close on exec flag */ - fcntl( ntdll_get_thread_data()->reply_fd, F_SETFD, 1 ); - fcntl( ntdll_get_thread_data()->wait_fd[0], F_SETFD, 1 ); - fcntl( ntdll_get_thread_data()->wait_fd[1], F_SETFD, 1 ); - SERVER_START_REQ( init_thread ) { req->unix_pid = getpid(); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 0b924b2..0c73ffd 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -488,8 +488,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * return result.create_thread.status; } - if (pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; - fcntl( request_pipe[1], F_SETFD, 1 ); /* set close on exec flag */ + if (server_pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; wine_server_send_fd( request_pipe[0] ); SERVER_START_REQ( new_thread ) diff --git a/include/config.h.in b/include/config.h.in index e12aa1a..6ef0892 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -552,6 +552,9 @@ /* Define to 1 if the system has the type `pid_t'. */ #undef HAVE_PID_T +/* Define to 1 if you have the `pipe2' function. */ +#undef HAVE_PIPE2 + /* Define to 1 if you have the <png.h> header file. */ #undef HAVE_PNG_H

1 0

Michael Stefaniuc : winedbg: Include the local resource header last.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 34f771c2070ad9a5bdd5fdfab3d5e76808642049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f771c2070ad9a5bdd5fdfab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 10:15:12 2009 +0200 winedbg: Include the local resource header last. --- programs/winedbg/crashdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index db25021..4a24dcc 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" #include "debugger.h" #include "wingdi.h" #include "winuser.h" @@ -27,6 +26,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "resource.h" #define MAX_PROGRAM_NAME_LENGTH 80

1 0

Alexandre Julliard : oleaut32: Properly release cache DCs instead of trying to delete them.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 70e4611e733029964fba040c768158b58008069c URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e4611e733029964fba040c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:07:35 2009 +0200 oleaut32: Properly release cache DCs instead of trying to delete them. --- dlls/oleaut32/olepicture.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 4409a15..54baf12 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1232,7 +1232,6 @@ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xr if (pixel == (transparent & 0x000000FFU)) monoPointer[j >> 3] |= 1 << (7 - (j & 7)); } } - hdcref = GetDC(0); hTempMask = CreateDIBitmap( hdcref, &bmi->bmiHeader, @@ -1241,7 +1240,6 @@ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xr bmi, DIB_RGB_COLORS ); - DeleteDC(hdcref); bmi->bmiHeader.biHeight = -bmi->bmiHeader.biHeight; This->hbmMask = CreateBitmap(bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, 1, 1, NULL); @@ -1266,7 +1264,7 @@ static HRESULT OLEPictureImpl_LoadGif(OLEPictureImpl *This, BYTE *xbuf, ULONG xr DeleteObject(hTempMask); } - DeleteDC(hdcref); + ReleaseDC(0, hdcref); This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); DGifCloseFile(gif); @@ -1369,7 +1367,7 @@ static HRESULT OLEPictureImpl_LoadJpeg(OLEPictureImpl *This, BYTE *xbuf, ULONG x (BITMAPINFO*)&bmi, DIB_RGB_COLORS ); - DeleteDC(hdcref); + ReleaseDC(0, hdcref); This->desc.picType = PICTYPE_BITMAP; OLEPictureImpl_SetBitmap(This); HeapFree(GetProcessHeap(),0,bits); @@ -1398,7 +1396,7 @@ static HRESULT OLEPictureImpl_LoadDIB(OLEPictureImpl *This, BYTE *xbuf, ULONG xr bi, DIB_RGB_COLORS ); - DeleteDC(hdcref); + ReleaseDC(0, hdcref); if (This->desc.u.bmp.hbitmap == 0) return E_FAIL; This->desc.picType = PICTYPE_BITMAP;

1 0

Michael Stefaniuc : hhctrl.ocx: Build language resource files separately.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 46e5df5cb291d311c0811e999561a95d0387dc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e5df5cb291d311c0811e999… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 10:17:48 2009 +0200 hhctrl.ocx: Build language resource files separately. Do not include them from an other rc file. --- dlls/hhctrl.ocx/Cs.rc | 2 + dlls/hhctrl.ocx/Da.rc | 2 + dlls/hhctrl.ocx/De.rc | 2 + dlls/hhctrl.ocx/El.rc | 2 + dlls/hhctrl.ocx/En.rc | 2 + dlls/hhctrl.ocx/Fi.rc | 2 + dlls/hhctrl.ocx/Fr.rc | 2 + dlls/hhctrl.ocx/Hu.rc | 2 + dlls/hhctrl.ocx/Ko.rc | 2 + dlls/hhctrl.ocx/Lt.rc | 4 +- dlls/hhctrl.ocx/Makefile.in | 22 ++++++++++++++++++- dlls/hhctrl.ocx/Nl.rc | 2 + dlls/hhctrl.ocx/No.rc | 2 + dlls/hhctrl.ocx/Pl.rc | 2 + dlls/hhctrl.ocx/Pt.rc | 2 + dlls/hhctrl.ocx/Ru.rc | 2 + dlls/hhctrl.ocx/Si.rc | 4 +- dlls/hhctrl.ocx/Sv.rc | 2 + dlls/hhctrl.ocx/Tr.rc | 2 + dlls/hhctrl.ocx/Zh.rc | 4 +- dlls/hhctrl.ocx/hhctrl.rc | 50 ------------------------------------------- dlls/hhctrl.ocx/resource.h | 5 ++++ 22 files changed, 64 insertions(+), 57 deletions(-) diff --git a/dlls/hhctrl.ocx/Cs.rc b/dlls/hhctrl.ocx/Cs.rc index ec564d8..b914762 100644 --- a/dlls/hhctrl.ocx/Cs.rc +++ b/dlls/hhctrl.ocx/Cs.rc @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Czech strings in CP1250 */ diff --git a/dlls/hhctrl.ocx/Da.rc b/dlls/hhctrl.ocx/Da.rc index e425ef0..1832d71 100644 --- a/dlls/hhctrl.ocx/Da.rc +++ b/dlls/hhctrl.ocx/Da.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/De.rc b/dlls/hhctrl.ocx/De.rc index ef6e699..7254902 100644 --- a/dlls/hhctrl.ocx/De.rc +++ b/dlls/hhctrl.ocx/De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/El.rc b/dlls/hhctrl.ocx/El.rc index dd81eb6..4fa79a2 100644 --- a/dlls/hhctrl.ocx/El.rc +++ b/dlls/hhctrl.ocx/El.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/En.rc b/dlls/hhctrl.ocx/En.rc index 83917f6..95ccd51 100644 --- a/dlls/hhctrl.ocx/En.rc +++ b/dlls/hhctrl.ocx/En.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Fi.rc b/dlls/hhctrl.ocx/Fi.rc index 975ce1f..825422e 100644 --- a/dlls/hhctrl.ocx/Fi.rc +++ b/dlls/hhctrl.ocx/Fi.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Fr.rc b/dlls/hhctrl.ocx/Fr.rc index 0e5dd4f..206479e 100644 --- a/dlls/hhctrl.ocx/Fr.rc +++ b/dlls/hhctrl.ocx/Fr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/Hu.rc b/dlls/hhctrl.ocx/Hu.rc index 225c04a..0cab8cd 100644 --- a/dlls/hhctrl.ocx/Hu.rc +++ b/dlls/hhctrl.ocx/Hu.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Ko.rc b/dlls/hhctrl.ocx/Ko.rc index 169eb70..37831df 100644 --- a/dlls/hhctrl.ocx/Ko.rc +++ b/dlls/hhctrl.ocx/Ko.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Lt.rc b/dlls/hhctrl.ocx/Lt.rc index fed6b40..8c813ba 100644 --- a/dlls/hhctrl.ocx/Lt.rc +++ b/dlls/hhctrl.ocx/Lt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -59,5 +61,3 @@ BEGIN IDTB_TOC_NEXT "IDTB_TOC_NEXT" IDTB_TOC_PREV "IDTB_TOC_PREV" END - -#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 229bd2a..60f2c50 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -13,7 +13,27 @@ C_SRCS = \ regsvr.c \ webbrowser.c -RC_SRCS = hhctrl.rc +RC_SRCS = \ + Cs.rc \ + Da.rc \ + De.rc \ + El.rc \ + En.rc \ + Fi.rc \ + Fr.rc \ + Hu.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/hhctrl.ocx/Nl.rc b/dlls/hhctrl.ocx/Nl.rc index 929ac39..99c12fa 100644 --- a/dlls/hhctrl.ocx/Nl.rc +++ b/dlls/hhctrl.ocx/Nl.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/No.rc b/dlls/hhctrl.ocx/No.rc index 5ff634d..a76ad31 100644 --- a/dlls/hhctrl.ocx/No.rc +++ b/dlls/hhctrl.ocx/No.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/Pl.rc b/dlls/hhctrl.ocx/Pl.rc index 40d3089..f3ce6f2 100644 --- a/dlls/hhctrl.ocx/Pl.rc +++ b/dlls/hhctrl.ocx/Pl.rc @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Pt.rc b/dlls/hhctrl.ocx/Pt.rc index d196ff4..13476ce 100644 --- a/dlls/hhctrl.ocx/Pt.rc +++ b/dlls/hhctrl.ocx/Pt.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/Ru.rc b/dlls/hhctrl.ocx/Ru.rc index a530f80..9d16db1 100644 --- a/dlls/hhctrl.ocx/Ru.rc +++ b/dlls/hhctrl.ocx/Ru.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Si.rc b/dlls/hhctrl.ocx/Si.rc index c8ea447..bc8ca1d 100644 --- a/dlls/hhctrl.ocx/Si.rc +++ b/dlls/hhctrl.ocx/Si.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -58,5 +60,3 @@ BEGIN IDTB_TOC_NEXT "IDTB_TOC_NEXT" IDTB_TOC_PREV "IDTB_TOC_PREV" END - -#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/Sv.rc b/dlls/hhctrl.ocx/Sv.rc index cb3e4e2..b92c63c 100644 --- a/dlls/hhctrl.ocx/Sv.rc +++ b/dlls/hhctrl.ocx/Sv.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/hhctrl.ocx/Tr.rc b/dlls/hhctrl.ocx/Tr.rc index 7488999..f1011b1 100644 --- a/dlls/hhctrl.ocx/Tr.rc +++ b/dlls/hhctrl.ocx/Tr.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE diff --git a/dlls/hhctrl.ocx/Zh.rc b/dlls/hhctrl.ocx/Zh.rc index a7ccab0..d6295a9 100644 --- a/dlls/hhctrl.ocx/Zh.rc +++ b/dlls/hhctrl.ocx/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -96,5 +98,3 @@ BEGIN IDTB_TOC_NEXT "後一項" IDTB_TOC_PREV "前一項" END - -#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc deleted file mode 100644 index 8618819..0000000 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ /dev/null @@ -1,50 +0,0 @@ -/* - * HTML Help resources - * - * Copyright 2005 James Hawkins - * - * 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 - */ - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winnls.h" -#include "htmlhelp.h" -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "version.rc" - -#include "Cs.rc" -#include "Da.rc" -#include "De.rc" -#include "El.rc" -#include "En.rc" -#include "Fr.rc" -#include "Fi.rc" -#include "Hu.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" diff --git a/dlls/hhctrl.ocx/resource.h b/dlls/hhctrl.ocx/resource.h index 02df946..a08fdd9 100644 --- a/dlls/hhctrl.ocx/resource.h +++ b/dlls/hhctrl.ocx/resource.h @@ -18,6 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <htmlhelp.h> + #define IDS_CONTENTS 1 #define IDS_INDEX 2 #define IDS_SEARCH 3

1 0

Michael Stefaniuc : winedbg: Build language resource files separately.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 7cf2855cf76bd21ec996339a2982b0d6b9e1506d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf2855cf76bd21ec996339a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 10:15:45 2009 +0200 winedbg: Build language resource files separately. Do not include them from an other rc file. --- programs/winedbg/Makefile.in | 9 ++++++++- programs/winedbg/resource.h | 2 ++ programs/winedbg/rsrc.rc | 32 -------------------------------- programs/winedbg/rsrc_De.rc | 4 ++-- programs/winedbg/rsrc_En.rc | 2 ++ programs/winedbg/rsrc_Fr.rc | 5 ++--- programs/winedbg/rsrc_Ko.rc | 2 ++ programs/winedbg/rsrc_Lt.rc | 4 ++-- programs/winedbg/rsrc_Nl.rc | 2 ++ programs/winedbg/rsrc_Ru.rc | 2 ++ 10 files changed, 24 insertions(+), 40 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index b4dd150..9147f1b 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -30,7 +30,14 @@ C_SRCS = \ types.c \ winedbg.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + rsrc_De.rc \ + rsrc_En.rc \ + rsrc_Fr.rc \ + rsrc_Ko.rc \ + rsrc_Lt.rc \ + rsrc_Nl.rc \ + rsrc_Ru.rc LEX_SRCS = debug.l BISON_SRCS = dbg.y diff --git a/programs/winedbg/resource.h b/programs/winedbg/resource.h index 49d19ef..11c2cb9 100644 --- a/programs/winedbg/resource.h +++ b/programs/winedbg/resource.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> #define IDD_CRASH_DLG 100 diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc deleted file mode 100644 index 604c54d..0000000 --- a/programs/winedbg/rsrc.rc +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Resources (rsrc.rc) - * - * Copyright 2008 Mikolaj Zalewski - * - * 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 - */ - -#include <windef.h> -#include <winuser.h> - -#include "resource.h" - -#include "rsrc_De.rc" -#include "rsrc_En.rc" -#include "rsrc_Fr.rc" -#include "rsrc_Ko.rc" -#include "rsrc_Lt.rc" -#include "rsrc_Nl.rc" -#include "rsrc_Ru.rc" diff --git a/programs/winedbg/rsrc_De.rc b/programs/winedbg/rsrc_De.rc index da04942..360f156 100644 --- a/programs/winedbg/rsrc_De.rc +++ b/programs/winedbg/rsrc_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -53,5 +55,3 @@ BEGIN IDS_INVALID_PARAMS "Interne Fehler - ungültige Parameter empfangen" IDS_UNIDENTIFIED "(unbekannt)" END - -#pragma code_page(default) diff --git a/programs/winedbg/rsrc_En.rc b/programs/winedbg/rsrc_En.rc index 3d580c4..0919c73 100644 --- a/programs/winedbg/rsrc_En.rc +++ b/programs/winedbg/rsrc_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDM_DEBUG_POPUP MENU diff --git a/programs/winedbg/rsrc_Fr.rc b/programs/winedbg/rsrc_Fr.rc index a483c29..4fb6d42 100644 --- a/programs/winedbg/rsrc_Fr.rc +++ b/programs/winedbg/rsrc_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -54,6 +56,3 @@ BEGIN IDS_INVALID_PARAMS "Erreurs internes - paramètres invalides reçus" IDS_UNIDENTIFIED "(non identifié)" END - -#pragma code_page(default) - diff --git a/programs/winedbg/rsrc_Ko.rc b/programs/winedbg/rsrc_Ko.rc index 457212f..a68deac 100644 --- a/programs/winedbg/rsrc_Ko.rc +++ b/programs/winedbg/rsrc_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDM_DEBUG_POPUP MENU diff --git a/programs/winedbg/rsrc_Lt.rc b/programs/winedbg/rsrc_Lt.rc index 7b49d8d..6aa5ca4 100644 --- a/programs/winedbg/rsrc_Lt.rc +++ b/programs/winedbg/rsrc_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -54,5 +56,3 @@ BEGIN IDS_INVALID_PARAMS "Vidinės klaidos - gauti neteisingi parametrai" IDS_UNIDENTIFIED "(nenustatytas)" END - -#pragma code_page(default) diff --git a/programs/winedbg/rsrc_Nl.rc b/programs/winedbg/rsrc_Nl.rc index 01be67b..e2e23e8 100644 --- a/programs/winedbg/rsrc_Nl.rc +++ b/programs/winedbg/rsrc_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDM_DEBUG_POPUP MENU diff --git a/programs/winedbg/rsrc_Ru.rc b/programs/winedbg/rsrc_Ru.rc index 7fc05bb..622ff7b 100644 --- a/programs/winedbg/rsrc_Ru.rc +++ b/programs/winedbg/rsrc_Ru.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDM_DEBUG_POPUP MENU

1 0

Henri Verbeet : wined3d: Use flags for driver quirks.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 40bc47901c9cdc9c17ddf3d24011232df41ee82f URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bc47901c9cdc9c17ddf3d24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 1 09:46:19 2009 +0200 wined3d: Use flags for driver quirks. --- dlls/wined3d/arb_program_shader.c | 10 ++++++---- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/glsl_shader.c | 10 ++++++---- dlls/wined3d/vertexshader.c | 8 ++++---- dlls/wined3d/wined3d_gl.h | 5 ++--- dlls/wined3d/wined3d_private.h | 5 +++++ 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e438366..28118c7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -49,9 +49,10 @@ static BOOL need_mova_const(IWineD3DBaseShader *shader, const WineD3D_GL_Info *g } static BOOL need_helper_const(const WineD3D_GL_Info *gl_info) { - if(!GL_SUPPORT(NV_VERTEX_PROGRAM) || /* Need to init colors */ - gl_info->arb_vs_offset_limit || /* Have to init texcoords */ - gl_info->set_texcoord_w) { /* Load the immval offset */ + if (!GL_SUPPORT(NV_VERTEX_PROGRAM) /* Need to init colors. */ + || gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT /* Load the immval offset. */ + || gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) /* Have to init texcoords. */ + { return TRUE; } return FALSE; @@ -3751,7 +3752,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, if(!GL_SUPPORT(NV_VERTEX_PROGRAM)) { shader_addline(buffer, "MOV result.color.secondary, -helper_const.wwwy;\n"); - if((GLINFO_LOCATION).set_texcoord_w && !device->frag_pipe->ffp_proj_control) { + if ((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W && !device->frag_pipe->ffp_proj_control) + { int i; for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { if(This->baseShader.reg_maps.texcoord_mask[i] != 0 && diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index eda6854..523528f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -950,7 +950,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->vs_arb_max_instructions = gl_max; TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM native instructions: %d\n", gl_info->vs_arb_max_instructions); - gl_info->arb_vs_offset_limit = test_arb_vs_offset_limit(gl_info); + if (test_arb_vs_offset_limit(gl_info)) gl_info->quirks |= WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT; } if (gl_info->supported[ARB_VERTEX_SHADER]) { glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &gl_max); @@ -4196,11 +4196,11 @@ static void quirk_texcoord_w(WineD3D_GL_Info *gl_info) { * performance negatively. */ TRACE("Enabling vertex texture coord fixes in vertex shaders\n"); - gl_info->set_texcoord_w = TRUE; + gl_info->quirks |= WINED3D_QUIRK_SET_TEXCOORD_W; } static void quirk_clip_varying(WineD3D_GL_Info *gl_info) { - gl_info->glsl_clip_varying = TRUE; + gl_info->quirks |= WINED3D_QUIRK_GLSL_CLIP_VARYING; } struct driver_quirk diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 501023d..f7b193e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -776,7 +776,7 @@ static int vec4_varyings(DWORD shader_major, const WineD3D_GL_Info *gl_info) if(shader_major > 3) return ret; /* 3.0 shaders may need an extra varying for the clip coord on some cards(mostly dx10 ones) */ - if(gl_info->glsl_clip_varying) ret -= 1; + if (gl_info->quirks & WINED3D_QUIRK_GLSL_CLIP_VARYING) ret -= 1; return ret; } @@ -3529,8 +3529,9 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs * Take care about the texcoord .w fixup though if we're using the fixed function fragment pipeline */ device = (IWineD3DDeviceImpl *) vs->baseShader.device; - if((GLINFO_LOCATION).set_texcoord_w && ps_major == 0 && vs_major > 0 && - !device->frag_pipe->ffp_proj_control) { + if (((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W) + && ps_major == 0 && vs_major > 0 && !device->frag_pipe->ffp_proj_control) + { shader_addline(&buffer, "void order_ps_input() {\n"); for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { if(vs->baseShader.reg_maps.texcoord_mask[i] != 0 && @@ -3575,7 +3576,8 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs { if (semantic_idx < 8) { - if (!(GLINFO_LOCATION).set_texcoord_w || ps_major > 0) write_mask |= WINED3DSP_WRITEMASK_3; + if (!((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) + write_mask |= WINED3DSP_WRITEMASK_3; shader_addline(&buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n", semantic_idx, reg_mask, i, reg_mask); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 6c1440d..6348e1c 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -280,10 +280,10 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader vshader_set_limits(This); - if(deviceImpl->vs_selected_mode == SHADER_ARB && - (GLINFO_LOCATION).arb_vs_offset_limit && - This->min_rel_offset <= This->max_rel_offset) { - + if (deviceImpl->vs_selected_mode == SHADER_ARB + && ((GLINFO_LOCATION).quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) + && This->min_rel_offset <= This->max_rel_offset) + { if(This->max_rel_offset - This->min_rel_offset > 127) { FIXME("The difference between the minimum and maximum relative offset is > 127\n"); FIXME("Which this OpenGL implementation does not support. Try using GLSL\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2d3cc3a..da35319 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4000,10 +4000,9 @@ typedef struct _WineD3D_GL_Info { GL_VSVersion vs_nv_version; GL_VSVersion vs_ati_version; - BOOL arb_vs_offset_limit; - BOOL set_texcoord_w; DWORD reserved_glsl_constants; - BOOL glsl_clip_varying; + + DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ffee326..7af5719 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -43,6 +43,11 @@ #include "wine/list.h" #include "wine/rbtree.h" +/* Driver quirks */ +#define WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT 0x00000001 +#define WINED3D_QUIRK_SET_TEXCOORD_W 0x00000002 +#define WINED3D_QUIRK_GLSL_CLIP_VARYING 0x00000004 + /* Texture format fixups */ enum fixup_channel_source

1 0

Alexandre Julliard : ntdll: Avoid the close-on-exec race with recvmsg() on kernels that support this.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 3269d8c726eb13925fe0d8cd571e8552ae348154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3269d8c726eb13925fe0d8cd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 1 12:11:53 2009 +0200 ntdll: Avoid the close-on-exec race with recvmsg() on kernels that support this. --- dlls/ntdll/server.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index a7bc493..9e54ada 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -73,6 +73,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(server); #define SCM_RIGHTS 1 #endif +#ifndef MSG_CMSG_CLOEXEC +#define MSG_CMSG_CLOEXEC 0 +#endif + #define SOCKETNAME "socket" /* name of the socket file */ #define LOCKNAME "lock" /* name of the lock file */ @@ -408,12 +412,12 @@ static int receive_fd( obj_handle_t *handle ) for (;;) { - if ((ret = recvmsg( fd_socket, &msghdr, 0 )) > 0) + if ((ret = recvmsg( fd_socket, &msghdr, MSG_CMSG_CLOEXEC )) > 0) { #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS fd = cmsg.fd; #endif - if (fd != -1) fcntl( fd, F_SETFD, 1 ); /* set close on exec flag */ + if (fd != -1) fcntl( fd, F_SETFD, FD_CLOEXEC ); /* in case MSG_CMSG_CLOEXEC is not supported */ return fd; } if (!ret) break;

1 0

Michael Stefaniuc : mshtml: Build language resource files separately.
by Alexandre Julliard July 1, 2009

July 1, 2009

Module: wine Branch: master Commit: 62a2196887ac1157be8f7174715de6af5223a245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a2196887ac1157be8f71747… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 1 10:16:57 2009 +0200 mshtml: Build language resource files separately. Do not include them from an other rc file. --- dlls/mshtml/Bg.rc | 1 + dlls/mshtml/Da.rc | 1 + dlls/mshtml/De.rc | 3 +-- dlls/mshtml/En.rc | 1 + dlls/mshtml/Es.rc | 1 + dlls/mshtml/Fi.rc | 1 + dlls/mshtml/Fr.rc | 1 + dlls/mshtml/Hu.rc | 1 + dlls/mshtml/Ja.rc | 3 ++- dlls/mshtml/Ko.rc | 1 + dlls/mshtml/Lt.rc | 4 ++-- dlls/mshtml/Makefile.in | 24 +++++++++++++++++++++++- dlls/mshtml/Nl.rc | 1 + dlls/mshtml/No.rc | 1 + dlls/mshtml/Pl.rc | 1 + dlls/mshtml/Pt.rc | 1 + dlls/mshtml/Ro.rc | 3 +-- dlls/mshtml/Ru.rc | 1 + dlls/mshtml/Si.rc | 4 ++-- dlls/mshtml/Sv.rc | 1 + dlls/mshtml/Tr.rc | 1 + dlls/mshtml/Zh.rc | 4 ++-- dlls/mshtml/resource.h | 4 ++++ dlls/mshtml/rsrc.rc | 31 ------------------------------- 24 files changed, 52 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/Bg.rc b/dlls/mshtml/Bg.rc index 92c86b6..a8fd605 100644 --- a/dlls/mshtml/Bg.rc +++ b/dlls/mshtml/Bg.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Da.rc b/dlls/mshtml/Da.rc index 47579b5..574ea09 100644 --- a/dlls/mshtml/Da.rc +++ b/dlls/mshtml/Da.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 991e84d..e1963ec 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL @@ -69,5 +70,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/En.rc b/dlls/mshtml/En.rc index 09370de..41ee119 100644 --- a/dlls/mshtml/En.rc +++ b/dlls/mshtml/En.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Es.rc b/dlls/mshtml/Es.rc index 94af0cf..fb79f87 100644 --- a/dlls/mshtml/Es.rc +++ b/dlls/mshtml/Es.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/dlls/mshtml/Fi.rc b/dlls/mshtml/Fi.rc index d1d389a..564345d 100644 --- a/dlls/mshtml/Fi.rc +++ b/dlls/mshtml/Fi.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index 507d0c2..4d45d51 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL diff --git a/dlls/mshtml/Hu.rc b/dlls/mshtml/Hu.rc index 7f3d254..137a100 100644 --- a/dlls/mshtml/Hu.rc +++ b/dlls/mshtml/Hu.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Ja.rc b/dlls/mshtml/Ja.rc index 4e060d7..202bd43 100644 --- a/dlls/mshtml/Ja.rc +++ b/dlls/mshtml/Ja.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -66,4 +68,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "キャンセル", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } -#pragma code_page(default) diff --git a/dlls/mshtml/Ko.rc b/dlls/mshtml/Ko.rc index efad007..01456e3 100644 --- a/dlls/mshtml/Ko.rc +++ b/dlls/mshtml/Ko.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Lt.rc b/dlls/mshtml/Lt.rc index f63b177..26167a9 100644 --- a/dlls/mshtml/Lt.rc +++ b/dlls/mshtml/Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* UTF-8 */ #pragma code_page(65001) @@ -66,5 +68,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Gerai", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Atsisakyti", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 241ec9d..acda821 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -65,7 +65,29 @@ C_SRCS = \ txtrange.c \ view.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + Bg.rc \ + Da.rc \ + De.rc \ + En.rc \ + Es.rc \ + Fi.rc \ + Fr.rc \ + Hu.rc \ + Ja.rc \ + Ko.rc \ + Lt.rc \ + Nl.rc \ + No.rc \ + Pl.rc \ + Pt.rc \ + Ro.rc \ + Ru.rc \ + Si.rc \ + Sv.rc \ + Tr.rc \ + Zh.rc \ + rsrc.rc IDL_H_SRCS = nsiface.idl diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index f6f47e1..1aab09c 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/dlls/mshtml/No.rc b/dlls/mshtml/No.rc index 6060a51..4e24ece 100644 --- a/dlls/mshtml/No.rc +++ b/dlls/mshtml/No.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/dlls/mshtml/Pl.rc b/dlls/mshtml/Pl.rc index a177686..11659ee 100644 --- a/dlls/mshtml/Pl.rc +++ b/dlls/mshtml/Pl.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index 0a83ee0..6a471e4 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/dlls/mshtml/Ro.rc b/dlls/mshtml/Ro.rc index 4bb7199..1bac216 100644 --- a/dlls/mshtml/Ro.rc +++ b/dlls/mshtml/Ro.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -65,5 +66,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Renunță", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc index 9460f24..d6fbc2b 100644 --- a/dlls/mshtml/Ru.rc +++ b/dlls/mshtml/Ru.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Si.rc b/dlls/mshtml/Si.rc index 9500c18..92721df 100644 --- a/dlls/mshtml/Si.rc +++ b/dlls/mshtml/Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -66,5 +68,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "V redu", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Prekliči", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/Sv.rc b/dlls/mshtml/Sv.rc index b6a1fd0..041ff8b 100644 --- a/dlls/mshtml/Sv.rc +++ b/dlls/mshtml/Sv.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/dlls/mshtml/Tr.rc b/dlls/mshtml/Tr.rc index 6d843a1..7e85fc6 100644 --- a/dlls/mshtml/Tr.rc +++ b/dlls/mshtml/Tr.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/dlls/mshtml/Zh.rc b/dlls/mshtml/Zh.rc index 4b258a4..2365120 100644 --- a/dlls/mshtml/Zh.rc +++ b/dlls/mshtml/Zh.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resource.h" + /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -94,5 +96,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "確定", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } - -#pragma code_page(default) diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h index f409380..1e92637 100644 --- a/dlls/mshtml/resource.h +++ b/dlls/mshtml/resource.h @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windef.h> +#include <winuser.h> +#include <commctrl.h> + #define IDS_HTMLDISABLED 7500 #define IDS_HTMLDOCUMENT 7501 #define IDS_DOWNLOADING 7502 diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 8be957f..5e669de 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -16,13 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windef.h" -#include "winuser.h" -#include "commctrl.h" -#include "mshtmcid.h" - -#include "resource.h" - #define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine HTML Viewer" #define WINE_FILENAME_STR "mshtml.dll" @@ -33,30 +26,6 @@ #include "wine/wine_common_ver.rc" -#include "Bg.rc" -#include "Da.rc" -#include "De.rc" -#include "En.rc" -#include "Es.rc" -#include "Fi.rc" -#include "Fr.rc" -#include "Hu.rc" -#include "Ja.rc" -#include "Ko.rc" -#include "Lt.rc" -#include "Nl.rc" -#include "No.rc" -#include "Pl.rc" -#include "Pt.rc" -#include "Ro.rc" -#include "Ru.rc" -#include "Si.rc" -#include "Sv.rc" -#include "Tr.rc" -#include "Zh.rc" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - /* @makedep: mshtml.inf */ REGINST REGINST mshtml.inf

1 0