November 2005 - Wine-commits

wine/include winuser.h
by Alexandre Julliard 30 Nov '05

30 Nov '05

ChangeSet ID: 21580 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 14:57:01 Modified files: include : winuser.h Log message: Peter Lemenkov <petro(a)mail.ru> Added WS_EX_COMPOSITED. Patch: http://cvs.winehq.org/patch.py?id=21580 Old revision New revision Changes Path 1.229 1.230 +4 -6 wine/include/winuser.h Index: wine/include/winuser.h diff -u -p wine/include/winuser.h:1.229 wine/include/winuser.h:1.230 --- wine/include/winuser.h:1.229 30 Nov 2005 20:57: 1 -0000 +++ wine/include/winuser.h 30 Nov 2005 20:57: 1 -0000 @@ -3003,8 +3003,6 @@ typedef struct tagMINIMIZEDMETRICS { #define WS_EX_TOPMOST 0x00000008L #define WS_EX_ACCEPTFILES 0x00000010L #define WS_EX_TRANSPARENT 0x00000020L - -/* New Win95/WinNT4 styles */ #define WS_EX_MDICHILD 0x00000040L #define WS_EX_TOOLWINDOW 0x00000080L #define WS_EX_WINDOWEDGE 0x00000100L @@ -3019,15 +3017,15 @@ typedef struct tagMINIMIZEDMETRICS { #define WS_EX_CONTROLPARENT 0x00010000L #define WS_EX_STATICEDGE 0x00020000L #define WS_EX_APPWINDOW 0x00040000L -#define WS_EX_LAYOUTRTL 0x00400000L +#define WS_EX_LAYERED 0x00080000L #define WS_EX_NOINHERITLAYOUT 0x00100000L +#define WS_EX_LAYOUTRTL 0x00400000L +#define WS_EX_COMPOSITED 0x02000000L +#define WS_EX_NOACTIVATE 0x08000000L #define WS_EX_OVERLAPPEDWINDOW (WS_EX_WINDOWEDGE|WS_EX_CLIENTEDGE) #define WS_EX_PALETTEWINDOW (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW|WS_EX_TOPMOST) -/* New Win2000 styles */ -#define WS_EX_LAYERED 0x00080000L - /* WINE internal... */ #define WS_EX_TRAYWINDOW 0x80000000L

1 0

wine/dlls/user painting.c tests/msg.c
by Alexandre Julliard 30 Nov '05

30 Nov '05

ChangeSet ID: 21579 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 14:56:45 Modified files: dlls/user : painting.c dlls/user/tests: msg.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add a test for RedrawWindow with an empty region/rectangle, make it pass under Wine. Patch: http://cvs.winehq.org/patch.py?id=21579 Old revision New revision Changes Path 1.36 1.37 +2 -1 wine/dlls/user/painting.c 1.107 1.108 +18 -3 wine/dlls/user/tests/msg.c Index: wine/dlls/user/painting.c diff -u -p wine/dlls/user/painting.c:1.36 wine/dlls/user/painting.c:1.37 --- wine/dlls/user/painting.c:1.36 30 Nov 2005 20:56:45 -0000 +++ wine/dlls/user/painting.c 30 Nov 2005 20:56:45 -0000 @@ -571,6 +571,7 @@ BOOL WINAPI LockWindowUpdate( HWND hwnd */ BOOL WINAPI RedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ) { + static const RECT empty; BOOL ret; if (!hwnd) hwnd = GetDesktopWindow(); @@ -596,6 +597,7 @@ BOOL WINAPI RedrawWindow( HWND hwnd, con if (rect && !hrgn) { + if (IsRectEmpty( rect )) rect = ∅ ret = redraw_window_rects( hwnd, flags, rect, 1 ); } else if (!hrgn) @@ -606,7 +608,6 @@ BOOL WINAPI RedrawWindow( HWND hwnd, con { DWORD size; RGNDATA *data = NULL; - static const RECT empty; if (!(size = GetRegionData( hrgn, 0, NULL ))) return FALSE; if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; Index: wine/dlls/user/tests/msg.c diff -u -p wine/dlls/user/tests/msg.c:1.107 wine/dlls/user/tests/msg.c:1.108 --- wine/dlls/user/tests/msg.c:1.107 30 Nov 2005 20:56:45 -0000 +++ wine/dlls/user/tests/msg.c 30 Nov 2005 20:56:45 -0000 @@ -3925,6 +3925,7 @@ static const struct message WmSetParentS static void test_paint_messages(void) { + BOOL ret; RECT rect; POINT pt; MSG msg; @@ -3944,14 +3945,28 @@ static void test_paint_messages(void) check_update_rgn( hwnd, 0 ); SetRectRgn( hrgn, 10, 10, 20, 20 ); - RedrawWindow( hwnd, NULL, hrgn, RDW_INVALIDATE ); + ret = RedrawWindow( hwnd, NULL, hrgn, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); check_update_rgn( hwnd, hrgn ); SetRectRgn( hrgn2, 20, 20, 30, 30 ); - RedrawWindow( hwnd, NULL, hrgn2, RDW_INVALIDATE ); + ret = RedrawWindow( hwnd, NULL, hrgn2, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); CombineRgn( hrgn, hrgn, hrgn2, RGN_OR ); check_update_rgn( hwnd, hrgn ); /* validate everything */ - RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + ret = RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); + check_update_rgn( hwnd, 0 ); + + /* test empty region */ + SetRectRgn( hrgn, 10, 10, 10, 15 ); + ret = RedrawWindow( hwnd, NULL, hrgn, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); + check_update_rgn( hwnd, 0 ); + /* test empty rect */ + SetRect( &rect, 10, 10, 10, 15 ); + ret = RedrawWindow( hwnd, &rect, NULL, RDW_INVALIDATE ); + ok(ret, "RedrawWindow returned %d instead of TRUE\n", ret); check_update_rgn( hwnd, 0 ); /* flush pending messages */

1 0

wine/ dlls/wined3d/directx.c include/wine/wine ...
by Alexandre Julliard 30 Nov '05

30 Nov '05

ChangeSet ID: 21578 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 14:56:17 Modified files: dlls/wined3d : directx.c include/wine : wined3d_gl.h Log message: Willie Sippel <willie(a)zeitgeistmedia.net> Added more Nvidia card IDs. Patch: http://cvs.winehq.org/patch.py?id=21578 Old revision New revision Changes Path 1.63 1.64 +8 -0 wine/dlls/wined3d/directx.c 1.13 1.14 +4 -0 wine/include/wine/wined3d_gl.h Index: wine/dlls/wined3d/directx.c diff -u -p wine/dlls/wined3d/directx.c:1.63 wine/dlls/wined3d/directx.c:1.64 --- wine/dlls/wined3d/directx.c:1.63 30 Nov 2005 20:56:17 -0000 +++ wine/dlls/wined3d/directx.c 30 Nov 2005 20:56:17 -0000 @@ -368,6 +368,14 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine gl_info->gl_card = CARD_NVIDIA_GEFORCE4_TI4600; } else if (strstr(gl_info->gl_renderer, "GeForceFX")) { gl_info->gl_card = CARD_NVIDIA_GEFORCEFX_5900ULTRA; + } else if (strstr(gl_info->gl_renderer, "Quadro FX 3000")) { + gl_info->gl_card = CARD_NVIDIA_QUADROFX_3000; + } else if (strstr(gl_info->gl_renderer, "GeForce 6800")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_6800ULTRA; + } else if (strstr(gl_info->gl_renderer, "Quadro FX 4000")) { + gl_info->gl_card = CARD_NVIDIA_QUADROFX_4000; + } else if (strstr(gl_info->gl_renderer, "GeForce 7800")) { + gl_info->gl_card = CARD_NVIDIA_GEFORCE_7800ULTRA; } else { gl_info->gl_card = CARD_NVIDIA_GEFORCE4_TI4600; } Index: wine/include/wine/wined3d_gl.h diff -u -p wine/include/wine/wined3d_gl.h:1.13 wine/include/wine/wined3d_gl.h:1.14 --- wine/include/wine/wined3d_gl.h:1.13 30 Nov 2005 20:56:17 -0000 +++ wine/include/wine/wined3d_gl.h 30 Nov 2005 20:56:17 -0000 @@ -860,6 +860,10 @@ typedef enum _GL_Cards { CARD_NVIDIA_GEFORCE4_TI4600 = 0x0250, CARD_NVIDIA_GEFORCE4_TI4200 = 0x0281, CARD_NVIDIA_GEFORCEFX_5900ULTRA = 0x0330, + CARD_NVIDIA_QUADROFX_3000 = 0x0338, + CARD_NVIDIA_GEFORCE_6800ULTRA = 0x0040, + CARD_NVIDIA_QUADROFX_4000 = 0x004e, + CARD_NVIDIA_GEFORCE_7800ULTRA = 0x0090, CARD_INTEL_845G = 0x2562, CARD_INTEL_I830G = 0x3577,

1 0

wine/tools winewrapper
by Alexandre Julliard 30 Nov '05

30 Nov '05

ChangeSet ID: 21577 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 14:56:03 Modified files: tools : winewrapper Log message: Added support for Darwin DYLD_LIBRARY_PATH. Patch: http://cvs.winehq.org/patch.py?id=21577 Old revision New revision Changes Path 1.11 1.12 +17 -4 wine/tools/winewrapper Index: wine/tools/winewrapper diff -u -p wine/tools/winewrapper:1.11 wine/tools/winewrapper:1.12 --- wine/tools/winewrapper:1.11 30 Nov 2005 20:56: 3 -0000 +++ wine/tools/winewrapper 30 Nov 2005 20:56: 3 -0000 @@ -62,12 +62,25 @@ fi topdir=`cd "$topdir" && pwd` -if [ -n "$LD_LIBRARY_PATH" ] +if [ "`uname -s`" = "Darwin" ] then - LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH" + if [ -n "$DYLD_LIBRARY_PATH" ] + then + DYLD_LIBRARY_PATH="$topdir/libs:$DYLD_LIBRARY_PATH" + else + DYLD_LIBRARY_PATH="$topdir/libs" + fi + export DYLD_LIBRARY_PATH else - LD_LIBRARY_PATH="$topdir/libs" + if [ -n "$LD_LIBRARY_PATH" ] + then + LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH" + else + LD_LIBRARY_PATH="$topdir/libs" + fi + export LD_LIBRARY_PATH fi + if [ -n "$WINEDLLPATH" ] then WINEDLLPATH="$topdir/dlls:$topdir/programs:$WINEDLLPATH" @@ -76,7 +89,7 @@ else fi WINESERVER="$topdir/server/wineserver" WINELOADER="$topdir/loader/wine" -export LD_LIBRARY_PATH WINEDLLPATH WINESERVER WINELOADER +export WINEDLLPATH WINESERVER WINELOADER # any local settings ? if [ -f "$topdir/.winewrapper" ]

1 0

wine/ server/Makefile.in server/directory.c se ...
by Alexandre Julliard 30 Nov '05

30 Nov '05

ChangeSet ID: 21576 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 14:55:59 Modified files: server : Makefile.in directory.c object.h protocol.def request.h trace.c dlls/ntdll : om.c dlls/ntdll/tests: om.c include/wine : server_protocol.h Added files: server : symlink.c Log message: Vitaliy Margolen <wine-patch(a)kievinfo.com> Implement symbolic link object in wineserver. Implement Nt[Create|Open|Query]SymbolicLinkObject. Change tests accordingly. Patch: http://cvs.winehq.org/patch.py?id=21576 Old revision New revision Changes Path 1.59 1.60 +1 -0 wine/server/Makefile.in 1.1 1.2 +32 -7 wine/server/directory.c 1.71 1.72 +6 -0 wine/server/object.h 1.163 1.164 +32 -0 wine/server/protocol.def 1.125 1.126 +6 -0 wine/server/request.h 1.272 1.273 +52 -0 wine/server/trace.c Added 1.1 +0 -0 wine/server/symlink.c 1.38 1.39 +119 -26 wine/dlls/ntdll/om.c 1.7 1.8 +16 -18 wine/dlls/ntdll/tests/om.c 1.164 1.165 +57 -1 wine/include/wine/server_protocol.h

1 0

wine/dlls/shell32 shellpath.c
by Alexandre Julliard 30 Nov '05

30 Nov '05

ChangeSet ID: 21575 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 14:55:19 Modified files: dlls/shell32 : shellpath.c Log message: Markus Gömmel <m.goemmel(a)compulab.de> Added CSIDL_MYVIDEO|MYPICTURES|MYMUSIC to _SHRegisterUserShellFolders. Patch: http://cvs.winehq.org/patch.py?id=21575 Old revision New revision Changes Path 1.108 1.109 +3 -0 wine/dlls/shell32/shellpath.c Index: wine/dlls/shell32/shellpath.c diff -u -p wine/dlls/shell32/shellpath.c:1.108 wine/dlls/shell32/shellpath.c:1.109 --- wine/dlls/shell32/shellpath.c:1.108 30 Nov 2005 20:55:19 -0000 +++ wine/dlls/shell32/shellpath.c 30 Nov 2005 20:55:19 -0000 @@ -1921,12 +1921,15 @@ static HRESULT _SHRegisterUserShellFolde CSIDL_RECENT, CSIDL_SENDTO, CSIDL_STARTMENU, + CSIDL_MYMUSIC, + CSIDL_MYVIDEO, CSIDL_DESKTOPDIRECTORY, CSIDL_NETHOOD, CSIDL_TEMPLATES, CSIDL_PRINTHOOD, CSIDL_COOKIES, CSIDL_HISTORY, + CSIDL_MYPICTURES }; WCHAR userShellFolderPath[MAX_PATH], shellFolderPath[MAX_PATH]; LPCWSTR pUserShellFolderPath, pShellFolderPath;

1 0

wine/dlls/x11drv dib.c
by Alexandre Julliard 30 Nov '05

30 Nov '05

ChangeSet ID: 21574 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 14:55:09 Modified files: dlls/x11drv : dib.c Log message: Oldrich Jedlicka <oldium.pro(a)seznam.cz> Fix for RGB mask that corresponds to the visual's mask. Patch: http://cvs.winehq.org/patch.py?id=21574 Old revision New revision Changes Path 1.45 1.46 +36 -12 wine/dlls/x11drv/dib.c Index: wine/dlls/x11drv/dib.c diff -u -p wine/dlls/x11drv/dib.c:1.45 wine/dlls/x11drv/dib.c:1.46 --- wine/dlls/x11drv/dib.c:1.45 30 Nov 2005 20:55: 9 -0000 +++ wine/dlls/x11drv/dib.c 30 Nov 2005 20:55: 9 -0000 @@ -521,6 +521,18 @@ INT X11DRV_DIB_MaskToShift(DWORD mask) } /*********************************************************************** + * X11DRV_DIB_CheckMask + * + * Check RGB mask if it is either 0 or matches visual's mask. + */ +static inline int X11DRV_DIB_CheckMask(int red_mask, int green_mask, int blue_mask) +{ + return ( red_mask == 0 && green_mask == 0 && blue_mask == 0 ) || + ( red_mask == visual->red_mask && green_mask == visual->green_mask && + blue_mask == visual->blue_mask ); +} + +/*********************************************************************** * X11DRV_DIB_SetImageBits_1 * * SetDIBits for a 1-bit deep DIB. @@ -602,7 +614,8 @@ static void X11DRV_DIB_GetImageBits_1( i { case 1: case 4: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 1 or 4 bmp -> pal 1 dib ==== */ BYTE* dstbyte; @@ -634,7 +647,8 @@ static void X11DRV_DIB_GetImageBits_1( i break; case 8: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask, bmpImage->green_mask, bmpImage->blue_mask) + && srccolors) { /* ==== pal 8 bmp -> pal 1 dib ==== */ const void* srcbits; const BYTE* srcpixel; @@ -978,7 +992,8 @@ static void X11DRV_DIB_GetImageBits_4( i switch (bmpImage->depth) { case 1: case 4: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 1 or 4 bmp -> pal 4 dib ==== */ BYTE* dstbyte; @@ -1010,7 +1025,8 @@ static void X11DRV_DIB_GetImageBits_4( i break; case 8: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 8 bmp -> pal 4 dib ==== */ const void* srcbits; const BYTE *srcpixel; @@ -1568,7 +1584,8 @@ static void X11DRV_DIB_GetImageBits_8( i switch (bmpImage->depth) { case 1: case 4: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 1 bmp -> pal 8 dib ==== */ /* ==== pal 4 bmp -> pal 8 dib ==== */ @@ -1590,7 +1607,8 @@ static void X11DRV_DIB_GetImageBits_8( i break; case 8: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 8 bmp -> pal 8 dib ==== */ const void* srcbits; const BYTE* srcpixel; @@ -2374,7 +2392,8 @@ static void X11DRV_DIB_GetImageBits_16( case 1: case 4: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 1 or 4 bmp -> rgb or bgr 555 or 565 dib ==== */ int rShift,gShift,bShift; WORD* dstpixel; @@ -2412,7 +2431,8 @@ static void X11DRV_DIB_GetImageBits_16( break; case 8: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 8 bmp -> rgb or bgr 555 or 565 dib ==== */ int rShift,gShift,bShift; const BYTE* srcbits; @@ -2799,7 +2819,8 @@ static void X11DRV_DIB_GetImageBits_24( case 1: case 4: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 1 or 4 bmp -> rgb 888 dib ==== */ BYTE* dstbyte; @@ -2822,7 +2843,8 @@ static void X11DRV_DIB_GetImageBits_24( break; case 8: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask == 0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 8 bmp -> rgb 888 dib ==== */ const void* srcbits; const BYTE* srcpixel; @@ -3377,7 +3399,8 @@ static void X11DRV_DIB_GetImageBits_32( case 1: case 4: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 1 or 4 bmp -> any 0888 dib ==== */ int rShift,gShift,bShift; DWORD* dstpixel; @@ -3402,7 +3425,8 @@ static void X11DRV_DIB_GetImageBits_32( break; case 8: - if (bmpImage->red_mask==0 && bmpImage->green_mask==0 && bmpImage->blue_mask==0 && srccolors) { + if (X11DRV_DIB_CheckMask(bmpImage->red_mask,bmpImage->green_mask,bmpImage->blue_mask) + && srccolors) { /* ==== pal 8 bmp -> any 0888 dib ==== */ int rShift,gShift,bShift; const void* srcbits;

1 0

wine/dlls/wldap32 control.c
by Alexandre Julliard 30 Nov '05

30 Nov '05

ChangeSet ID: 21573 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 14:54:51 Modified files: dlls/wldap32 : control.c Log message: Hans Leidekker <hans(a)it.vu.nl> Document the ldap_control* functions. Patch: http://cvs.winehq.org/patch.py?id=21573 Old revision New revision Changes Path 1.4 1.5 +159 -0 wine/dlls/wldap32/control.c

1 0

wine/dlls/shell32 shlexec.c
by Alexandre Julliard 30 Nov '05

30 Nov '05

ChangeSet ID: 21572 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 14:54:46 Modified files: dlls/shell32 : shlexec.c Log message: Martin Fuchs <martin-fuchs(a)gmx.net> Fix context menu handling for more than one entry in order to repair .lnk-file execution: Don't break at the first non-matching entry. Patch: http://cvs.winehq.org/patch.py?id=21572 Old revision New revision Changes Path 1.77 1.78 +8 -8 wine/dlls/shell32/shlexec.c Index: wine/dlls/shell32/shlexec.c diff -u -p wine/dlls/shell32/shlexec.c:1.77 wine/dlls/shell32/shlexec.c:1.78 --- wine/dlls/shell32/shlexec.c:1.77 30 Nov 2005 20:54:46 -0000 +++ wine/dlls/shell32/shlexec.c 30 Nov 2005 20:54:46 -0000 @@ -1156,15 +1156,15 @@ static LONG ShellExecute_FromContextMenu r = RegEnumKeyW( hkeycm, i++, szguid, 39 ); if ( r != ERROR_SUCCESS ) break; - r = ERROR_FUNCTION_FAILED; + hr = CLSIDFromString( szguid, &guid ); - if ( FAILED( hr ) ) - break; - r = ERROR_SUCCESS; - /* stop at the first one that succeeds in running */ - hr = shellex_load_object_and_run( hkey, &guid, sei ); - if ( SUCCEEDED( hr ) ) - break; + if (SUCCEEDED(hr)) + { + /* stop at the first one that succeeds in running */ + hr = shellex_load_object_and_run( hkey, &guid, sei ); + if ( SUCCEEDED( hr ) ) + break; + } } RegCloseKey( hkeycm ); }

1 0

wine/dlls/opengl32 wgl.c
by Alexandre Julliard 30 Nov '05

30 Nov '05

ChangeSet ID: 21571 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/30 14:54:38 Modified files: dlls/opengl32 : wgl.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Added some checks on wglCreatContext to avoid problems (and SetLastErrors). Patch: http://cvs.winehq.org/patch.py?id=21571 Old revision New revision Changes Path 1.68 1.69 +22 -11 wine/dlls/opengl32/wgl.c Index: wine/dlls/opengl32/wgl.c diff -u -p wine/dlls/opengl32/wgl.c:1.68 wine/dlls/opengl32/wgl.c:1.69 --- wine/dlls/opengl32/wgl.c:1.68 30 Nov 2005 20:54:38 -0000 +++ wine/dlls/opengl32/wgl.c 30 Nov 2005 20:54:38 -0000 @@ -165,6 +165,8 @@ HGLRC WINAPI wglCreateContext(HDC hdc) int num; XVisualInfo template; Display *display = get_display( hdc ); + int hdcPF = GetPixelFormat(hdc); + GLXFBConfig cur_cfg; TRACE("(%p)\n", hdc); @@ -178,37 +180,46 @@ HGLRC WINAPI wglCreateContext(HDC hdc) /* Need to set errors here */ return NULL; } - - /* The context will be allocated in the wglMakeCurrent call */ - ENTER_GL(); - ret = alloc_context(); - LEAVE_GL(); - ret->hdc = hdc; - ret->display = display; - ret->vis = vis; + if (0 >= hdcPF) { + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + return NULL; + } { - int hdcPF = GetPixelFormat(hdc); int nCfgs_fmt = 0; GLXFBConfig* cfgs_fmt = NULL; - GLXFBConfig cur_cfg; int value; int gl_test = 0; cfgs_fmt = glXGetFBConfigs(display, DefaultScreen(display), &nCfgs_fmt); if (NULL == cfgs_fmt || 0 == nCfgs_fmt) { ERR("Cannot get FB Configs, expect problems.\n"); + SetLastError(ERROR_INVALID_PIXEL_FORMAT); + return NULL; + } + if (nCfgs_fmt < hdcPF) { + ERR("(%p): unexpected pixelFormat(%d) > nFormats(%d), returns NULL\n", hdc, hdcPF, nCfgs_fmt); + SetLastError(ERROR_INVALID_PIXEL_FORMAT); return NULL; } cur_cfg = cfgs_fmt[hdcPF - 1]; gl_test = glXGetFBConfigAttrib(display, cur_cfg, GLX_FBCONFIG_ID, &value); if (gl_test) { ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); + SetLastError(ERROR_INVALID_PIXEL_FORMAT); return NULL; } - ret->fb_conf = cur_cfg; XFree(cfgs_fmt); } + /* The context will be allocated in the wglMakeCurrent call */ + ENTER_GL(); + ret = alloc_context(); + LEAVE_GL(); + ret->hdc = hdc; + ret->display = display; + ret->vis = vis; + ret->fb_conf = cur_cfg; + TRACE(" creating context %p (GL context creation delayed)\n", ret); return (HGLRC) ret; }

1 0