October 2005 - Wine-commits

wine/programs/winetest Makefile.in
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 21008 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 15:10:47 Modified files: programs/winetest: Makefile.in Log message: Stefan Huehner <stefan(a)huehner.org> Add msxml3,setupapi tests to winetest. Patch: http://cvs.winehq.org/patch.py?id=21008 Old revision New revision Changes Path 1.43 1.44 +6 -0 wine/programs/winetest/Makefile.in Index: wine/programs/winetest/Makefile.in diff -u -p wine/programs/winetest/Makefile.in:1.43 wine/programs/winetest/Makefile.in:1.44 --- wine/programs/winetest/Makefile.in 31 Oct 2005 21:10:47 -0000 +++ /dev/null 31 Oct 2005 21:10:47 -0000 @@ -40,6 +40,7 @@ TESTBINS = \ msi_test.exe$(DLLEXT) \ msvcrt_test.exe$(DLLEXT) \ msvcrtd_test.exe$(DLLEXT) \ + msxml3_test.exe$(DLLEXT) \ netapi32_test.exe$(DLLEXT) \ ntdll_test.exe$(DLLEXT) \ ole32_test.exe$(DLLEXT) \ @@ -50,6 +51,7 @@ TESTBINS = \ rsabase_test.exe$(DLLEXT) \ rsaenh_test.exe$(DLLEXT) \ secur32_test.exe$(DLLEXT) \ + setupapi_test.exe$(DLLEXT) \ shell32_test.exe$(DLLEXT) \ shlwapi_test.exe$(DLLEXT) \ urlmon_test.exe$(DLLEXT) \ @@ -131,6 +133,8 @@ msvcrt_test.exe$(DLLEXT): $(DLLDIR)/msvc cp $(DLLDIR)/msvcrt/tests/msvcrt_test.exe$(DLLEXT) $@ && $(STRIP) $@ msvcrtd_test.exe$(DLLEXT): $(DLLDIR)/msvcrtd/tests/msvcrtd_test.exe$(DLLEXT) cp $(DLLDIR)/msvcrtd/tests/msvcrtd_test.exe$(DLLEXT) $@ && $(STRIP) $@ +msxml3_test.exe$(DLLEXT): $(DLLDIR)/msxml3/tests/msxml3_test.exe$(DLLEXT) + cp $(DLLDIR)/msxml3/tests/msxml3_test.exe$(DLLEXT) $@ && $(STRIP) $@ netapi32_test.exe$(DLLEXT): $(DLLDIR)/netapi32/tests/netapi32_test.exe$(DLLEXT) cp $(DLLDIR)/netapi32/tests/netapi32_test.exe$(DLLEXT) $@ && $(STRIP) $@ ntdll_test.exe$(DLLEXT): $(DLLDIR)/ntdll/tests/ntdll_test.exe$(DLLEXT) @@ -151,6 +155,8 @@ rsaenh_test.exe$(DLLEXT): $(DLLDIR)/rsae cp $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) $@ && $(STRIP) $@ secur32_test.exe$(DLLEXT): $(DLLDIR)/secur32/tests/secur32_test.exe$(DLLEXT) cp $(DLLDIR)/secur32/tests/secur32_test.exe$(DLLEXT) $@ && $(STRIP) $@ +setupapi_test.exe$(DLLEXT): $(DLLDIR)/setupapi/tests/setupapi_test.exe$(DLLEXT) + cp $(DLLDIR)/setupapi/tests/setupapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ shell32_test.exe$(DLLEXT): $(DLLDIR)/shell32/tests/shell32_test.exe$(DLLEXT) cp $(DLLDIR)/shell32/tests/shell32_test.exe$(DLLEXT) $@ && $(STRIP) $@ shlwapi_test.exe$(DLLEXT): $(DLLDIR)/shlwapi/tests/shlwapi_test.exe$(DLLEXT)

1 0

wine/ programs/Makefile.in ./configure.ac ./co ...
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 21007 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 15:10:38 Modified files: programs : Makefile.in . : configure.ac configure Added files: programs/eject : eject.c Makefile.in .cvsignore Log message: Added an 'eject' Winelib app that allows unmounting and ejecting a CD even if a Windows app has files open on it. Patch: http://cvs.winehq.org/patch.py?id=21007 Old revision New revision Changes Path Added 1.1 +0 -0 wine/programs/eject/eject.c Added 1.1 +0 -0 wine/programs/eject/Makefile.in Added 1.1 +0 -0 wine/programs/eject/.cvsignore 1.48 1.49 +7 -0 wine/programs/Makefile.in 1.411 1.412 +1 -0 wine/configure.ac 1.713 1.714 +2 -1 wine/configure

1 0

wine/dlls/rpcrt4 ndr_marshall.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 21006 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 15:05:00 Modified files: dlls/rpcrt4 : ndr_marshall.c Log message: Huw Davies <huw(a)codeweavers.com> Marshal enums. Patch: http://cvs.winehq.org/patch.py?id=21006 Old revision New revision Changes Path 1.29 1.30 +4 -0 wine/dlls/rpcrt4/ndr_marshall.c Index: wine/dlls/rpcrt4/ndr_marshall.c diff -u -p wine/dlls/rpcrt4/ndr_marshall.c:1.29 wine/dlls/rpcrt4/ndr_marshall.c:1.30 --- wine/dlls/rpcrt4/ndr_marshall.c 31 Oct 2005 21: 5: 0 -0000 +++ /dev/null 31 Oct 2005 21: 5: 0 -0000 @@ -1404,6 +1404,7 @@ unsigned char * WINAPI ComplexMarshall(P break; case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_ENUM32: TRACE("long=%ld <= %p\n", *(DWORD*)pMemory, pMemory); memcpy(pStubMsg->Buffer, pMemory, 4); pStubMsg->Buffer += 4; @@ -1465,6 +1466,7 @@ unsigned char * WINAPI ComplexUnmarshall break; case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_ENUM32: memcpy(pMemory, pStubMsg->Buffer, 4); TRACE("long=%ld => %p\n", *(DWORD*)pMemory, pMemory); pStubMsg->Buffer += 4; @@ -1525,6 +1527,7 @@ unsigned char * WINAPI ComplexBufferSize break; case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_ENUM32: pStubMsg->BufferLength += 4; pMemory += 4; break; @@ -1578,6 +1581,7 @@ unsigned char * WINAPI ComplexFree(PMIDL break; case RPC_FC_LONG: case RPC_FC_ULONG: + case RPC_FC_ENUM32: pMemory += 4; break; case RPC_FC_POINTER:

1 0

wine/dlls/msxml3 nodemap.c nodelist.c node.c e ...
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 21005 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 15:04:31 Modified files: dlls/msxml3 : nodemap.c nodelist.c node.c element.c domdoc.c Log message: Huw Davies <huw(a)codeweavers.com> Actually print the IIDs. Patch: http://cvs.winehq.org/patch.py?id=21005 Old revision New revision Changes Path 1.5 1.6 +1 -1 wine/dlls/msxml3/nodemap.c 1.2 1.3 +1 -1 wine/dlls/msxml3/nodelist.c 1.8 1.9 +1 -1 wine/dlls/msxml3/node.c 1.8 1.9 +1 -1 wine/dlls/msxml3/element.c 1.14 1.15 +1 -1 wine/dlls/msxml3/domdoc.c Index: wine/dlls/msxml3/nodemap.c diff -u -p wine/dlls/msxml3/nodemap.c:1.5 wine/dlls/msxml3/nodemap.c:1.6 --- wine/dlls/msxml3/nodemap.c 31 Oct 2005 21: 4:31 -0000 +++ /dev/null 31 Oct 2005 21: 4:31 -0000 @@ -57,7 +57,7 @@ static HRESULT WINAPI xmlnodemap_QueryIn IXMLDOMNamedNodeMap *iface, REFIID riid, void** ppvObject ) { - TRACE("%p %p %p\n", iface, debugstr_guid(riid), ppvObject); + TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); if( IsEqualGUID( riid, &IID_IXMLDOMElement ) || IsEqualGUID( riid, &IID_IUnknown ) || Index: wine/dlls/msxml3/nodelist.c diff -u -p wine/dlls/msxml3/nodelist.c:1.2 wine/dlls/msxml3/nodelist.c:1.3 --- wine/dlls/msxml3/nodelist.c 31 Oct 2005 21: 4:31 -0000 +++ /dev/null 31 Oct 2005 21: 4:31 -0000 @@ -162,7 +162,7 @@ static HRESULT WINAPI xmlnodelist_QueryI REFIID riid, void** ppvObject ) { - TRACE("%p %p %p\n", iface, debugstr_guid(riid), ppvObject); + TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || Index: wine/dlls/msxml3/node.c diff -u -p wine/dlls/msxml3/node.c:1.8 wine/dlls/msxml3/node.c:1.9 --- wine/dlls/msxml3/node.c 31 Oct 2005 21: 4:31 -0000 +++ /dev/null 31 Oct 2005 21: 4:31 -0000 @@ -73,7 +73,7 @@ static HRESULT WINAPI xmlnode_QueryInter REFIID riid, void** ppvObject ) { - TRACE("%p %p %p\n", iface, debugstr_guid(riid), ppvObject); + TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || Index: wine/dlls/msxml3/element.c diff -u -p wine/dlls/msxml3/element.c:1.8 wine/dlls/msxml3/element.c:1.9 --- wine/dlls/msxml3/element.c 31 Oct 2005 21: 4:31 -0000 +++ /dev/null 31 Oct 2005 21: 4:31 -0000 @@ -62,7 +62,7 @@ static HRESULT WINAPI domelem_QueryInter REFIID riid, void** ppvObject ) { - TRACE("%p %p %p\n", iface, debugstr_guid(riid), ppvObject); + TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || IsEqualGUID( riid, &IID_IUnknown ) || Index: wine/dlls/msxml3/domdoc.c diff -u -p wine/dlls/msxml3/domdoc.c:1.14 wine/dlls/msxml3/domdoc.c:1.15 --- wine/dlls/msxml3/domdoc.c 31 Oct 2005 21: 4:31 -0000 +++ /dev/null 31 Oct 2005 21: 4:31 -0000 @@ -62,7 +62,7 @@ static HRESULT WINAPI domdoc_QueryInterf { domdoc *This = impl_from_IXMLDOMDocument( iface ); - TRACE("%p %p %p\n", This, debugstr_guid( riid ), ppvObject ); + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); if ( IsEqualGUID( riid, &IID_IXMLDOMDocument ) || IsEqualGUID( riid, &IID_IXMLDOMNode ) ||

1 0

wine/ include/wingdi.h dlls/gdi/enhmetafile.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 21004 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 15:04:18 Modified files: include : wingdi.h dlls/gdi : enhmetafile.c Log message: Huw Davies <huw(a)codeweavers.com> Implement playback of EMR_ALPHABLEND. Patch: http://cvs.winehq.org/patch.py?id=21004 Old revision New revision Changes Path 1.127 1.128 +21 -0 wine/include/wingdi.h 1.15 1.16 +41 -1 wine/dlls/gdi/enhmetafile.c Index: wine/include/wingdi.h diff -u -p wine/include/wingdi.h:1.127 wine/include/wingdi.h:1.128 --- wine/include/wingdi.h 31 Oct 2005 21: 4:18 -0000 +++ /dev/null 31 Oct 2005 21: 4:18 -0000 @@ -2582,6 +2582,27 @@ typedef struct { } EMRSTRETCHBLT, *PEMRSTRETCHBLT; typedef struct { + EMR emr; + RECTL rclBounds; + LONG xDest; + LONG yDest; + LONG cxDest; + LONG cyDest; + DWORD dwRop; + LONG xSrc; + LONG ySrc; + XFORM xformSrc; + COLORREF crBkColorSrc; + DWORD iUsageSrc; + DWORD offBmiSrc; + DWORD cbBmiSrc; + DWORD offBitsSrc; + DWORD cbBitsSrc; + LONG cxSrc; + LONG cySrc; +} EMRALPHABLEND, *PEMRALPHABLEND; + +typedef struct { EMR emr; RECTL rclBounds; LONG xDest; Index: wine/dlls/gdi/enhmetafile.c diff -u -p wine/dlls/gdi/enhmetafile.c:1.15 wine/dlls/gdi/enhmetafile.c:1.16 --- wine/dlls/gdi/enhmetafile.c 31 Oct 2005 21: 4:18 -0000 +++ /dev/null 31 Oct 2005 21: 4:18 -0000 @@ -646,6 +646,7 @@ static BOOL emr_produces_output(int type case EMR_POLYTEXTOUTA: case EMR_POLYTEXTOUTW: case EMR_SMALLTEXTOUT: + case EMR_ALPHABLEND: case EMR_TRANSPARENTBLT: return TRUE; default: @@ -1795,6 +1796,46 @@ BOOL WINAPI PlayEnhMetaFileRecord( break; } + case EMR_ALPHABLEND: + { + PEMRALPHABLEND pAlphaBlend= (PEMRALPHABLEND)mr; + + TRACE("EMR_ALPHABLEND: %ld, %ld %ldx%ld -> %ld, %ld %ldx%ld. blendfn %08lx offBitsSrc %ld\n", + pAlphaBlend->xSrc, pAlphaBlend->ySrc, pAlphaBlend->cxSrc, pAlphaBlend->cySrc, + pAlphaBlend->xDest, pAlphaBlend->yDest, pAlphaBlend->cxDest, pAlphaBlend->cyDest, + pAlphaBlend->dwRop, pAlphaBlend->offBitsSrc); + + if(pAlphaBlend->offBmiSrc == 0) { + FIXME("EMR_ALPHABLEND: offBmiSrc == 0\n"); + } else { + HDC hdcSrc = CreateCompatibleDC(hdc); + HBITMAP hBmp = 0, hBmpOld = 0; + BITMAPINFO *pbi = (BITMAPINFO *)((BYTE *)mr + pAlphaBlend->offBmiSrc); + BLENDFUNCTION blendfn; + void *bits; + + SetWorldTransform(hdcSrc, &pAlphaBlend->xformSrc); + + hBmp = CreateDIBSection(hdc, pbi, pAlphaBlend->iUsageSrc, &bits, NULL, 0); + memcpy(bits, (BYTE*)mr + pAlphaBlend->offBitsSrc, pAlphaBlend->cbBitsSrc); + hBmpOld = SelectObject(hdcSrc, hBmp); + + blendfn.BlendOp = (pAlphaBlend->dwRop >> 24) & 0xff; + blendfn.BlendFlags = (pAlphaBlend->dwRop >> 16) & 0xff; + blendfn.SourceConstantAlpha = (pAlphaBlend->dwRop >> 8) & 0xff; + blendfn.AlphaFormat = (pAlphaBlend->dwRop) & 0xff; + + GdiAlphaBlend(hdc, pAlphaBlend->xDest, pAlphaBlend->yDest, pAlphaBlend->cxDest, pAlphaBlend->cyDest, + hdcSrc, pAlphaBlend->xSrc, pAlphaBlend->ySrc, pAlphaBlend->cxSrc, pAlphaBlend->cySrc, + blendfn); + + SelectObject(hdcSrc, hBmpOld); + DeleteObject(hBmp); + DeleteDC(hdcSrc); + } + break; + } + case EMR_MASKBLT: { PEMRMASKBLT pMaskBlt= (PEMRMASKBLT)mr; @@ -2061,7 +2102,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_COLORCORRECTPALETTE: case EMR_SETICMPROFILEA: case EMR_SETICMPROFILEW: - case EMR_ALPHABLEND: case EMR_TRANSPARENTBLT: case EMR_GRADIENTFILL: case EMR_SETLINKEDUFI:

1 0

wine/dlls/gdi freetype.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 21003 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 15:03:28 Modified files: dlls/gdi : freetype.c Log message: Huw Davies <huw(a)codeweavers.com> Only select a bitmap font as a last resort if we can't find a font with the correct facename. Patch: http://cvs.winehq.org/patch.py?id=21003 Old revision New revision Changes Path 1.105 1.106 +25 -8 wine/dlls/gdi/freetype.c Index: wine/dlls/gdi/freetype.c diff -u -p wine/dlls/gdi/freetype.c:1.105 wine/dlls/gdi/freetype.c:1.106 --- wine/dlls/gdi/freetype.c 31 Oct 2005 21: 3:28 -0000 +++ /dev/null 31 Oct 2005 21: 3:28 -0000 @@ -2071,7 +2071,7 @@ GdiFont WineEngCreateFontInstance(DC *dc { GdiFont ret; Face *face, *best; - Family *family; + Family *family, *last_resort_family; struct list *family_elem_ptr, *face_elem_ptr; INT height, width = 0; signed int diff = 0, newdiff; @@ -2212,31 +2212,48 @@ GdiFont WineEngCreateFontInstance(DC *dc } } + last_resort_family = NULL; LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) - if(face->scalable || can_use_bitmap) + if(csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) { + if(face->scalable) goto found; + if(can_use_bitmap && !last_resort_family) + last_resort_family = family; + } } } - + if(last_resort_family) { + family = last_resort_family; + csi.fs.fsCsb[0] = 0; + goto found; + } + LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(face->scalable || can_use_bitmap) { + if(face->scalable) { csi.fs.fsCsb[0] = 0; FIXME("just using first face for now\n"); goto found; } + if(can_use_bitmap && !last_resort_family) + last_resort_family = family; } } - FIXME("can't find a single appropriate font - bailing\n"); - free_font(ret); - return NULL; + if(!last_resort_family) { + FIXME("can't find a single appropriate font - bailing\n"); + free_font(ret); + return NULL; + } + + WARN("could only find a bitmap font - this will probably look awful!\n"); + family = last_resort_family; + csi.fs.fsCsb[0] = 0; found: it = lf.lfItalic ? 1 : 0;

1 0

wine/server mapping.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 21002 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 15:03:05 Modified files: server : mapping.c Log message: Marcus Meissner <marcus(a)jet.franken.de> Do not overflow the stackbased "nt" struct when reading non-conforming PE files. Patch: http://cvs.winehq.org/patch.py?id=21002 Old revision New revision Changes Path 1.58 1.59 +3 -3 wine/server/mapping.c Index: wine/server/mapping.c diff -u -p wine/server/mapping.c:1.58 wine/server/mapping.c:1.59 --- wine/server/mapping.c 31 Oct 2005 21: 3: 5 -0000 +++ /dev/null 31 Oct 2005 21: 3: 5 -0000 @@ -206,7 +206,7 @@ static int get_image_params( struct mapp IMAGE_SECTION_HEADER *sec = NULL; struct fd *fd; off_t pos; - int unix_fd, size; + int unix_fd, size, toread; /* load the headers */ @@ -225,8 +225,8 @@ static int get_image_params( struct mapp pos += sizeof(nt.FileHeader); /* zero out Optional header in the case it's not present or partial */ memset(&nt.OptionalHeader, 0, sizeof(nt.OptionalHeader)); - if (pread( unix_fd, &nt.OptionalHeader, nt.FileHeader.SizeOfOptionalHeader, - pos ) != nt.FileHeader.SizeOfOptionalHeader) goto error; + toread = min( sizeof(nt.OptionalHeader), nt.FileHeader.SizeOfOptionalHeader ); + if (pread( unix_fd, &nt.OptionalHeader, toread, pos ) != toread) goto error; pos += nt.FileHeader.SizeOfOptionalHeader; /* load the section headers */

1 0

wine/ dlls/Makefile.in ./configure.ac ./config ...
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 21001 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 10:10:03 Modified files: dlls : Makefile.in . : configure.ac configure DEVELOPERS-HINTS Removed files: dlls/ttydrv : wnd.c winetty.drv.spec ttydrv_main.c ttydrv.h palette.c objects.c graphics.c dc.c bitmap.c Makefile.in .cvsignore Log message: Get rid of the no longer used tty driver. Patch: http://cvs.winehq.org/patch.py?id=21001 Old revision New revision Changes Path 1.45 Removed +0 -0 wine/dlls/ttydrv/wnd.c 1.4 Removed +0 -0 wine/dlls/ttydrv/winetty.drv.spec 1.21 Removed +0 -0 wine/dlls/ttydrv/ttydrv_main.c 1.28 Removed +0 -0 wine/dlls/ttydrv/ttydrv.h 1.11 Removed +0 -0 wine/dlls/ttydrv/palette.c 1.15 Removed +0 -0 wine/dlls/ttydrv/objects.c 1.17 Removed +0 -0 wine/dlls/ttydrv/graphics.c 1.25 Removed +0 -0 wine/dlls/ttydrv/dc.c 1.17 Removed +0 -0 wine/dlls/ttydrv/bitmap.c 1.23 Removed +0 -0 wine/dlls/ttydrv/Makefile.in 1.8 Removed +0 -0 wine/dlls/ttydrv/.cvsignore 1.264 1.265 +0 -6 wine/dlls/Makefile.in 1.410 1.411 +0 -1 wine/configure.ac 1.712 1.713 +1 -2 wine/configure 1.62 1.63 +0 -1 wine/DEVELOPERS-HINTS

1 0

wine/dlls/user driver.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 21000 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 09:54:55 Modified files: dlls/user : driver.c Log message: Default to the null driver instead of dying if the specified display driver couldn't be loaded. Patch: http://cvs.winehq.org/patch.py?id=21000 Old revision New revision Changes Path 1.2 1.3 +59 -58 wine/dlls/user/driver.c Index: wine/dlls/user/driver.c diff -u -p wine/dlls/user/driver.c:1.2 wine/dlls/user/driver.c:1.3 --- wine/dlls/user/driver.c 31 Oct 2005 15:54:55 -0000 +++ /dev/null 31 Oct 2005 15:54:55 -0000 @@ -42,7 +42,7 @@ static const USER_DRIVER *load_driver(vo HMODULE graphics_driver; USER_DRIVER *driver, *prev; - strcpy( buffer, "x11,tty" ); /* default value */ + strcpy( buffer, "x11" ); /* default value */ /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) { @@ -61,70 +61,66 @@ static const USER_DRIVER *load_driver(vo if ((graphics_driver = LoadLibraryA( libname )) != 0) break; name = next; } - if (!graphics_driver) - { - MESSAGE( "wine: Could not load graphics driver '%s'.\n", buffer ); - if (!strcasecmp( buffer, "x11" )) - MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" ); - ExitProcess(1); - } driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) ); memcpy( driver, &null_driver, sizeof(*driver) ); + if (graphics_driver) + { #define GET_USER_FUNC(name) \ do { if ((ptr = GetProcAddress( graphics_driver, #name ))) driver->p##name = ptr; } while(0) - GET_USER_FUNC(ActivateKeyboardLayout); - GET_USER_FUNC(Beep); - GET_USER_FUNC(GetAsyncKeyState); - GET_USER_FUNC(GetKeyNameText); - GET_USER_FUNC(GetKeyboardLayout); - GET_USER_FUNC(GetKeyboardLayoutList); - GET_USER_FUNC(GetKeyboardLayoutName); - GET_USER_FUNC(LoadKeyboardLayout); - GET_USER_FUNC(MapVirtualKeyEx); - GET_USER_FUNC(SendInput); - GET_USER_FUNC(ToUnicodeEx); - GET_USER_FUNC(UnloadKeyboardLayout); - GET_USER_FUNC(VkKeyScanEx); - GET_USER_FUNC(SetCursor); - GET_USER_FUNC(GetCursorPos); - GET_USER_FUNC(SetCursorPos); - GET_USER_FUNC(GetScreenSaveActive); - GET_USER_FUNC(SetScreenSaveActive); - GET_USER_FUNC(AcquireClipboard); - GET_USER_FUNC(EmptyClipboard); - GET_USER_FUNC(SetClipboardData); - GET_USER_FUNC(GetClipboardData); - GET_USER_FUNC(CountClipboardFormats); - GET_USER_FUNC(EnumClipboardFormats); - GET_USER_FUNC(IsClipboardFormatAvailable); - GET_USER_FUNC(RegisterClipboardFormat); - GET_USER_FUNC(GetClipboardFormatName); - GET_USER_FUNC(EndClipboardUpdate); - GET_USER_FUNC(ResetSelectionOwner); - GET_USER_FUNC(ChangeDisplaySettingsEx); - GET_USER_FUNC(EnumDisplaySettingsEx); - GET_USER_FUNC(CreateDesktopWindow); - GET_USER_FUNC(CreateWindow); - GET_USER_FUNC(DestroyWindow); - GET_USER_FUNC(GetDCEx); - GET_USER_FUNC(MsgWaitForMultipleObjectsEx); - GET_USER_FUNC(ReleaseDC); - GET_USER_FUNC(ScrollDC); - GET_USER_FUNC(SetFocus); - GET_USER_FUNC(SetParent); - GET_USER_FUNC(SetWindowPos); - GET_USER_FUNC(SetWindowRgn); - GET_USER_FUNC(SetWindowIcon); - GET_USER_FUNC(SetWindowStyle); - GET_USER_FUNC(SetWindowText); - GET_USER_FUNC(ShowWindow); - GET_USER_FUNC(SysCommandSizeMove); - GET_USER_FUNC(WindowFromDC); - GET_USER_FUNC(WindowMessage); + GET_USER_FUNC(ActivateKeyboardLayout); + GET_USER_FUNC(Beep); + GET_USER_FUNC(GetAsyncKeyState); + GET_USER_FUNC(GetKeyNameText); + GET_USER_FUNC(GetKeyboardLayout); + GET_USER_FUNC(GetKeyboardLayoutList); + GET_USER_FUNC(GetKeyboardLayoutName); + GET_USER_FUNC(LoadKeyboardLayout); + GET_USER_FUNC(MapVirtualKeyEx); + GET_USER_FUNC(SendInput); + GET_USER_FUNC(ToUnicodeEx); + GET_USER_FUNC(UnloadKeyboardLayout); + GET_USER_FUNC(VkKeyScanEx); + GET_USER_FUNC(SetCursor); + GET_USER_FUNC(GetCursorPos); + GET_USER_FUNC(SetCursorPos); + GET_USER_FUNC(GetScreenSaveActive); + GET_USER_FUNC(SetScreenSaveActive); + GET_USER_FUNC(AcquireClipboard); + GET_USER_FUNC(EmptyClipboard); + GET_USER_FUNC(SetClipboardData); + GET_USER_FUNC(GetClipboardData); + GET_USER_FUNC(CountClipboardFormats); + GET_USER_FUNC(EnumClipboardFormats); + GET_USER_FUNC(IsClipboardFormatAvailable); + GET_USER_FUNC(RegisterClipboardFormat); + GET_USER_FUNC(GetClipboardFormatName); + GET_USER_FUNC(EndClipboardUpdate); + GET_USER_FUNC(ResetSelectionOwner); + GET_USER_FUNC(ChangeDisplaySettingsEx); + GET_USER_FUNC(EnumDisplaySettingsEx); + GET_USER_FUNC(CreateDesktopWindow); + GET_USER_FUNC(CreateWindow); + GET_USER_FUNC(DestroyWindow); + GET_USER_FUNC(GetDCEx); + GET_USER_FUNC(MsgWaitForMultipleObjectsEx); + GET_USER_FUNC(ReleaseDC); + GET_USER_FUNC(ScrollDC); + GET_USER_FUNC(SetFocus); + GET_USER_FUNC(SetParent); + GET_USER_FUNC(SetWindowPos); + GET_USER_FUNC(SetWindowRgn); + GET_USER_FUNC(SetWindowIcon); + GET_USER_FUNC(SetWindowStyle); + GET_USER_FUNC(SetWindowText); + GET_USER_FUNC(ShowWindow); + GET_USER_FUNC(SysCommandSizeMove); + GET_USER_FUNC(WindowFromDC); + GET_USER_FUNC(WindowMessage); #undef GET_USER_FUNC + } prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, (void *)&lazy_load_driver ); if (prev != &lazy_load_driver) @@ -308,7 +304,12 @@ static BOOL nulldrv_CreateDesktopWindow( static BOOL nulldrv_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) { - return TRUE; + static int warned; + + if (!warned++) + MESSAGE( "Application tries to create a window, but no driver could be loaded.\n" + "Make sure that your X server is running and that $DISPLAY is set correctly.\n" ); + return FALSE; } static void nulldrv_DestroyWindow( HWND hwnd )

1 0

wine/dlls/user tests/msg.c painting.c
by Alexandre Julliard 31 Oct '05

31 Oct '05

ChangeSet ID: 20999 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/10/31 09:45:16 Modified files: dlls/user/tests: msg.c dlls/user : painting.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add the tests for behaviour of [In]validateRect and [In]validateRgn with hwnd set to 0, make them pass under Wine. Patch: http://cvs.winehq.org/patch.py?id=20999 Old revision New revision Changes Path 1.99 1.100 +49 -0 wine/dlls/user/tests/msg.c 1.33 1.34 +36 -2 wine/dlls/user/painting.c Index: wine/dlls/user/tests/msg.c diff -u -p wine/dlls/user/tests/msg.c:1.99 wine/dlls/user/tests/msg.c:1.100 --- wine/dlls/user/tests/msg.c 31 Oct 2005 15:45:16 -0000 +++ /dev/null 31 Oct 2005 15:45:16 -0000 @@ -3697,6 +3697,55 @@ static void test_paint_messages(void) /* validate everything */ RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); check_update_rgn( hwnd, 0 ); + + /* flush pending messages */ + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + flush_sequence(); + + GetClientRect( hwnd, &rect ); + SetRectRgn( hrgn, 0, 0, rect.right - rect.left, rect.bottom - rect.top ); + /* MSDN: if hwnd parameter is NULL, InvalidateRect invalidates and redraws + * all windows and sends WM_ERASEBKGND and WM_NCPAINT. + */ + trace("testing InvalidateRect(0, NULL, FALSE)\n"); + SetRectEmpty( &rect ); + ok(InvalidateRect(0, &rect, FALSE), "InvalidateRect(0, &rc, FALSE) should fail\n"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + /* MSDN: if hwnd parameter is NULL, ValidateRect invalidates and redraws + * all windows and sends WM_ERASEBKGND and WM_NCPAINT. + */ + trace("testing ValidateRect(0, NULL)\n"); + SetRectEmpty( &rect ); + ok(ValidateRect(0, &rect), "ValidateRect(0, &rc) should not fail"); + check_update_rgn( hwnd, hrgn ); + ok_sequence( WmInvalidateErase, "InvalidateErase", FALSE ); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + ok_sequence( WmPaint, "Paint", FALSE ); + RedrawWindow( hwnd, NULL, NULL, RDW_VALIDATE ); + check_update_rgn( hwnd, 0 ); + + trace("testing InvalidateRgn(0, NULL, FALSE)\n"); + SetLastError(0xdeadbeef); + ok(!InvalidateRgn(0, NULL, FALSE), "InvalidateRgn(0, NULL, FALSE) should fail\n"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error code %ld\n", GetLastError()); + check_update_rgn( hwnd, 0 ); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); + + trace("testing ValidateRgn(0, NULL)\n"); + SetLastError(0xdeadbeef); + ok(!ValidateRgn(0, NULL), "ValidateRgn(0, NULL) should fail"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error code %ld\n", GetLastError()); + check_update_rgn( hwnd, 0 ); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + ok_sequence( WmEmptySeq, "WmEmptySeq", FALSE ); + /* now with frame */ SetRectRgn( hrgn, -5, -5, 20, 20 ); Index: wine/dlls/user/painting.c diff -u -p wine/dlls/user/painting.c:1.33 wine/dlls/user/painting.c:1.34 --- wine/dlls/user/painting.c 31 Oct 2005 15:45:16 -0000 +++ /dev/null 31 Oct 2005 15:45:16 -0000 @@ -593,16 +593,33 @@ BOOL WINAPI UpdateWindow( HWND hwnd ) */ BOOL WINAPI InvalidateRgn( HWND hwnd, HRGN hrgn, BOOL erase ) { + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + return RedrawWindow(hwnd, NULL, hrgn, RDW_INVALIDATE | (erase ? RDW_ERASE : 0) ); } /*********************************************************************** * InvalidateRect (USER32.@) + * + * MSDN: if hwnd parameter is NULL, InvalidateRect invalidates and redraws + * all windows and sends WM_ERASEBKGND and WM_NCPAINT. */ BOOL WINAPI InvalidateRect( HWND hwnd, const RECT *rect, BOOL erase ) { - return RedrawWindow( hwnd, rect, 0, RDW_INVALIDATE | (erase ? RDW_ERASE : 0) ); + UINT flags = RDW_INVALIDATE | (erase ? RDW_ERASE : 0); + + if (!hwnd) + { + flags = RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW; + rect = NULL; + } + + return RedrawWindow( hwnd, rect, 0, flags ); } @@ -611,16 +628,33 @@ BOOL WINAPI InvalidateRect( HWND hwnd, c */ BOOL WINAPI ValidateRgn( HWND hwnd, HRGN hrgn ) { + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + return RedrawWindow( hwnd, NULL, hrgn, RDW_VALIDATE ); } /*********************************************************************** * ValidateRect (USER32.@) + * + * MSDN: if hwnd parameter is NULL, ValidateRect invalidates and redraws + * all windows and sends WM_ERASEBKGND and WM_NCPAINT. */ BOOL WINAPI ValidateRect( HWND hwnd, const RECT *rect ) { - return RedrawWindow( hwnd, rect, 0, RDW_VALIDATE ); + UINT flags = RDW_VALIDATE; + + if (!hwnd) + { + flags = RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_FRAME | RDW_ERASE | RDW_ERASENOW; + rect = NULL; + } + + return RedrawWindow( hwnd, rect, 0, flags ); }

1 0