September 2006 - Wine-commits

Roderick Colenbrander : winex11.drv: Import glx makecurrent/wglsharelists.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 2b36c4a4c355fb9cc893c4f7ed7992c22edf6049 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b36c4a4c355fb9cc893c4f… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 29 16:58:49 2006 +0200 winex11.drv: Import glx makecurrent/wglsharelists. --- dlls/opengl32/wgl.c | 178 +++----------------------------- dlls/winex11.drv/opengl.c | 209 ++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/winex11.drv.spec | 3 + 3 files changed, 225 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2b36c4a4c355fb9cc89…

1 0

Stefan Leichter : dmusic: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 08e1260057a9e9cf9b4abf64dff87202f68a332f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08e1260057a9e9cf9b4abf6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Sep 10 22:22:36 2006 +0200 dmusic: Print 64bit integers with wine_dbgstr_longlong. --- dlls/dmusic/buffer.c | 6 +++--- dlls/dmusic/clock.c | 4 ++-- dlls/dmusic/dmusic_main.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 91ebfa8..b0718d0 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -76,13 +76,13 @@ static HRESULT WINAPI IDirectMusicBuffer static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD dwChannelMessage) { IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %lli, %ld, %ld): stub\n", This, rt, dwChannelGroup, dwChannelMessage); + FIXME("(%p, 0x%s, %ld, %ld): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, dwChannelMessage); return S_OK; } static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb) { IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %lli, %ld, %ld, %p): stub\n", This, rt, dwChannelGroup, cb, lpb); + FIXME("(%p, 0x%s, %ld, %ld, %p): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, cb, lpb); return S_OK; } @@ -130,7 +130,7 @@ static HRESULT WINAPI IDirectMusicBuffer static HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt) { IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %lli): stub\n", This, rt); + FIXME("(%p, 0x%s): stub\n", This, wine_dbgstr_longlong(rt)); return S_OK; } diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index dc1d9c8..e88ec68 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -72,13 +72,13 @@ static HRESULT WINAPI IReferenceClockImp static HRESULT WINAPI IReferenceClockImpl_AdviseTime (IReferenceClock *iface, REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HANDLE hEvent, DWORD* pdwAdviseCookie) { IReferenceClockImpl *This = (IReferenceClockImpl *)iface; - FIXME("(%p, %lli, %lli, %p, %p): stub\n", This, baseTime, streamTime, hEvent, pdwAdviseCookie); + FIXME("(%p, 0x%s, 0x%s, %p, %p): stub\n", This, wine_dbgstr_longlong(baseTime), wine_dbgstr_longlong(streamTime), hEvent, pdwAdviseCookie); return S_OK; } static HRESULT WINAPI IReferenceClockImpl_AdvisePeriodic (IReferenceClock *iface, REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HANDLE hSemaphore, DWORD* pdwAdviseCookie) { IReferenceClockImpl *This = (IReferenceClockImpl *)iface; - FIXME("(%p, %lli, %lli, %p, %p): stub\n", This, startTime, periodTime, hSemaphore, pdwAdviseCookie); + FIXME("(%p, 0x%s, 0x%s, %p, %p): stub\n", This, wine_dbgstr_longlong(startTime), wine_dbgstr_longlong(periodTime), hSemaphore, pdwAdviseCookie); return S_OK; } diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index ffc95f9..81c9142 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -596,7 +596,8 @@ const char *debugstr_DMUS_OBJECTDESC (LP if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = %lli\n - pbMemData = %p\n", pDesc->llMemLength, pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); return wine_dbg_sprintf("%s", buffer);

1 0

Marcus Meissner : Removes all unnecessary WINE_DEFAULT_DEBUG_CHANNEL and respective wine/ debug.h includes.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 0c15360a3e7222c94bb310f36de3adb5568895e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c15360a3e7222c94bb310f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 10 11:09:26 2006 +0200 Removes all unnecessary WINE_DEFAULT_DEBUG_CHANNEL and respective wine/debug.h includes. --- dlls/cabinet/fci.c | 2 -- dlls/gdi/bidi.c | 2 +- dlls/gdi/enhmfdrv/bitblt.c | 2 -- dlls/gphoto2.ds/ui.c | 2 -- dlls/imagehlp/imagehlp_main.c | 2 -- dlls/kernel/atom.c | 4 ---- dlls/kernel/kernel16.c | 3 --- dlls/mscms/icc.c | 3 --- dlls/msi/tokenize.c | 3 --- dlls/msvcrt/ctype.c | 3 --- dlls/netapi32/browsr.c | 3 --- dlls/netapi32/nbnamecache.c | 3 --- dlls/ntdll/wcstring.c | 4 ---- dlls/rsaenh/implglue.c | 3 --- dlls/user/driver.c | 4 +--- dlls/user/lstr.c | 4 ---- dlls/uxtheme/stylemap.c | 4 ---- dlls/wineps.drv/encode.c | 3 --- dlls/winex11.drv/clipping.c | 3 --- dlls/winex11.drv/codepage.c | 3 --- dlls/winspool.drv/wspool.c | 2 -- dlls/wsock32/protocol.c | 3 --- 22 files changed, 2 insertions(+), 63 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 87e76d5..a43c681 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -64,8 +64,6 @@ #define fci_set_error(A,B,C) do { \ if (B) SetLastError(B); } while(0) -WINE_DEFAULT_DEBUG_CHANNEL(cabinet); - typedef struct { cab_UBYTE signature[4]; /* !CAB for unfinished cabinets else MSCF */ cab_ULONG reserved1; diff --git a/dlls/gdi/bidi.c b/dlls/gdi/bidi.c index 80b930a..8109cf4 100644 --- a/dlls/gdi/bidi.c +++ b/dlls/gdi/bidi.c @@ -55,11 +55,11 @@ BOOL BIDI_Reorder( UINT *lpOrder /* [out] Logical -> Visual order map */ ) { -#ifdef HAVE_ICU TRACE("%s, %d, 0x%08lx lpOutString=%p, lpOrder=%p\n", debugstr_wn(lpString, uCount), uCount, dwFlags, lpOutString, lpOrder); +#ifdef HAVE_ICU if ((dwFlags & GCP_REORDER) != 0) { UBiDi *bidi; UErrorCode err=0; diff --git a/dlls/gdi/enhmfdrv/bitblt.c b/dlls/gdi/enhmfdrv/bitblt.c index 8abe5a6..3c7e97c 100644 --- a/dlls/gdi/enhmfdrv/bitblt.c +++ b/dlls/gdi/enhmfdrv/bitblt.c @@ -28,8 +28,6 @@ #include "gdi.h" #include "enhmetafiledrv.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); - BOOL EMFDRV_PatBlt( PHYSDEV dev, INT left, INT top, INT width, INT height, DWORD rop ) { diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index 88fa8fa..d6a488f 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -38,8 +38,6 @@ #include "gphoto2_i.h" #include "wine/debug.h" #include "resource.h" -WINE_DEFAULT_DEBUG_CHANNEL(twain); - static HBITMAP static_bitmap; static INT_PTR CALLBACK ConnectingProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index d8707e5..42a1a41 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -26,8 +26,6 @@ #include "imagehlp.h" #include "winerror.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); - /**********************************************************************/ HANDLE IMAGEHLP_hHeap = NULL; diff --git a/dlls/kernel/atom.c b/dlls/kernel/atom.c index 96c0bc4..f444ae0 100644 --- a/dlls/kernel/atom.c +++ b/dlls/kernel/atom.c @@ -38,10 +38,6 @@ #include "excpt.h" #include "wine/unicode.h" #include "kernel_private.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atom); - #define MAX_ATOM_LEN 255 /****************************************************************** diff --git a/dlls/kernel/kernel16.c b/dlls/kernel/kernel16.c index b7b03d4..50b11a0 100644 --- a/dlls/kernel/kernel16.c +++ b/dlls/kernel/kernel16.c @@ -28,9 +28,6 @@ #include "wownt32.h" #include "toolhelp.h" #include "kernel_private.h" #include "kernel16_private.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(kernel); /************************************************************************** * DllEntryPoint (KERNEL.669) diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 70f8190..715a8ed 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/debug.h" #include <stdarg.h> @@ -34,8 +33,6 @@ #include "icm.h" #include "mscms_priv.h" -WINE_DEFAULT_DEBUG_CHANNEL(mscms); - #ifdef HAVE_LCMS static inline void MSCMS_adjust_endianess32( ULONG *ptr ) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index cf0fd63..18bb341 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -22,13 +22,10 @@ #include <stdlib.h> #include "windef.h" #include "winbase.h" -#include "wine/debug.h" #include "wine/unicode.h" #include "query.h" #include "sql.tab.h" -WINE_DEFAULT_DEBUG_CHANNEL(msi); - /* ** All the keywords of the SQL language are stored as in a hash ** table composed of instances of the following structure. diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 9c23810..7b8c1fa 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -20,9 +20,6 @@ #include "msvcrt.h" #include "winnls.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* Some abbreviations to make the following table readable */ #define _C_ MSVCRT__CONTROL diff --git a/dlls/netapi32/browsr.c b/dlls/netapi32/browsr.c index 4d33b6a..8b0a5ed 100644 --- a/dlls/netapi32/browsr.c +++ b/dlls/netapi32/browsr.c @@ -26,9 +26,6 @@ #include "winerror.h" #include "lmcons.h" #include "lmbrowsr.h" #include "lmshare.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(netapi32); /************************************************************ * I_BrowserSetNetlogonState (NETAPI32.@) diff --git a/dlls/netapi32/nbnamecache.c b/dlls/netapi32/nbnamecache.c index 3868196..176105a 100644 --- a/dlls/netapi32/nbnamecache.c +++ b/dlls/netapi32/nbnamecache.c @@ -21,12 +21,9 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" #include "nbnamecache.h" -WINE_DEFAULT_DEBUG_CHANNEL(netbios); - typedef struct _NBNameCacheNode { DWORD expireTime; diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 6891258..23fc5e8 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -32,10 +32,6 @@ #include <stdio.h> #include "windef.h" #include "winternl.h" #include "wine/unicode.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ntdll); - /********************************************************************* * _wcsicmp (NTDLL.@) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 761eced..44c50f2 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -24,7 +24,6 @@ #include "config.h" #include "wine/port.h" #include "wine/library.h" -#include "wine/debug.h" #include "windef.h" #include "wincrypt.h" @@ -33,8 +32,6 @@ #include "implglue.h" #include <stdio.h> -WINE_DEFAULT_DEBUG_CHANNEL(crypt); - /* Function prototypes copied from dlls/advapi32/crypt_md4.c */ VOID WINAPI MD4Init( MD4_CTX *ctx ); VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ); diff --git a/dlls/user/driver.c b/dlls/user/driver.c index 15f2e92..e9ffe5a 100644 --- a/dlls/user/driver.c +++ b/dlls/user/driver.c @@ -23,11 +23,9 @@ #include <stdio.h> #include "windef.h" #include "winbase.h" #include "winuser.h" - -#include "user_private.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(user); +#include "user_private.h" static const USER_DRIVER null_driver, lazy_load_driver; diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c index 95d1922..dacca84 100644 --- a/dlls/user/lstr.c +++ b/dlls/user/lstr.c @@ -38,10 +38,6 @@ #include "wine/exception.h" #include "wine/unicode.h" #include "excpt.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(resource); - /*********************************************************************** * CharNextA (USER32.@) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 4be9819..a310d40 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -29,10 +29,6 @@ #include "tmschema.h" #define TMT_ENUM 200 -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); - typedef struct _MSSTYLES_PROPERTY_MAP { WORD dwPrimitiveType; WORD dwPropertyID; diff --git a/dlls/wineps.drv/encode.c b/dlls/wineps.drv/encode.c index 5fb129a..ede5cbd 100644 --- a/dlls/wineps.drv/encode.c +++ b/dlls/wineps.drv/encode.c @@ -22,9 +22,6 @@ #include <stdio.h> #include <string.h> #include "psdrv.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(psdrv); DWORD RLE_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) { diff --git a/dlls/winex11.drv/clipping.c b/dlls/winex11.drv/clipping.c index 11e03f3..d26db99 100644 --- a/dlls/winex11.drv/clipping.c +++ b/dlls/winex11.drv/clipping.c @@ -23,9 +23,6 @@ #include "config.h" #include <stdio.h> #include "x11drv.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(x11drv); /*********************************************************************** * X11DRV_GetRegionData diff --git a/dlls/winex11.drv/codepage.c b/dlls/winex11.drv/codepage.c index 697b648..7611735 100644 --- a/dlls/winex11.drv/codepage.c +++ b/dlls/winex11.drv/codepage.c @@ -27,9 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" #include "x11font.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(text); /*********************************************************************** * IsLegalDBCSChar for cp932/936/949/950/euc diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index ba7d1ff..27c39e6 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -28,9 +28,7 @@ #include "winbase.h" #include "wingdi.h" #include "winspool.h" #include "wspool.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(winspool); HINSTANCE WINSPOOL_hInstance = NULL; /****************************************************************************** diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 0b22cc1..cd2cf71 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -38,9 +38,6 @@ #include "winbase.h" #include "winsock2.h" #include "wine/unicode.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winsock); /***************************************************************************** * inet_network [WSOCK32.1100]

1 0

Francois Gouget : wintrust: In recent SDKs, WinVerifyTrust()' s last parameter is a void pointer.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 6393fed2d439964b586e5beea18c8b48c250d0c8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6393fed2d439964b586e5be… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 7 20:02:35 2006 +0200 wintrust: In recent SDKs, WinVerifyTrust()'s last parameter is a void pointer. --- dlls/wintrust/wintrust_main.c | 2 +- include/wintrust.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 8a9a2f5..0636aed 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -150,7 +150,7 @@ BOOL WINAPI TrustIsCertificateSelfSigned * Trust providers can be found at: * HKLM\SOFTWARE\Microsoft\Cryptography\Providers\Trust\ */ -LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, WINTRUST_DATA* ActionData ) +LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) { FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); return ERROR_SUCCESS; diff --git a/include/wintrust.h b/include/wintrust.h index 7a364a7..b6c8785 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -317,7 +317,7 @@ BOOL WINAPI WintrustAddActionID(GUI BOOL WINAPI WintrustRemoveActionID(GUID*); BOOL WINAPI WintrustLoadFunctionPointers(GUID*,CRYPT_PROVIDER_FUNCTIONS*); void WINAPI WintrustGetRegPolicyFlags(DWORD*); -LONG WINAPI WinVerifyTrust(HWND,GUID*,WINTRUST_DATA*); +LONG WINAPI WinVerifyTrust(HWND,GUID*,LPVOID); HRESULT WINAPI WinVerifyTrustEx(HWND,GUID*,WINTRUST_DATA*); CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain(

1 0

Matt Finnicum : riched20: Rewrite of scrolling and some redrawing code.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: abecd9e393925e008449a80ec14682790b29042c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=abecd9e393925e008449a80… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Fri Sep 8 16:37:25 2006 -0500 riched20: Rewrite of scrolling and some redrawing code. Replaces duplicated scrolling code with re-usable functions. Removes excessive boundary checking on scroll code, since that's done in the scrollbar control anyways. Properly separates repaint calls based on what has changed. Send EN_UPDATE and EN_CHANGE at the right places. Only call EnsureVisible on changes, not all repaints. --- dlls/riched20/caret.c | 12 +-- dlls/riched20/editor.c | 178 +++++++++++----------------------------- dlls/riched20/editor.h | 14 ++- dlls/riched20/editstr.h | 2 dlls/riched20/paint.c | 208 ++++++++++++++++++++++++++--------------------- 5 files changed, 181 insertions(+), 233 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=abecd9e393925e00844…

1 0

Louis. Lenders : d3d8: Better stub for ValidateVertexShader + tests.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 9002468c7b4d7e8a15e536792fe2df2c99ca063c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9002468c7b4d7e8a15e5367… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Sep 10 12:05:45 2006 +0100 d3d8: Better stub for ValidateVertexShader + tests. --- dlls/d3d8/d3d8.spec | 2 + dlls/d3d8/d3d8_main.c | 29 ++++++++++++++--- dlls/d3d8/tests/Makefile.in | 1 + dlls/d3d8/tests/d3d8_main.c | 72 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 dlls/d3d8/tests/d3d8_main.c diff --git a/dlls/d3d8/d3d8.spec b/dlls/d3d8/d3d8.spec index bc82cd0..4bad850 100644 --- a/dlls/d3d8/d3d8.spec +++ b/dlls/d3d8/d3d8.spec @@ -2,4 +2,4 @@ @ stdcall DebugSetMute() @ stdcall Direct3DCreate8(long) @ stdcall ValidatePixelShader(ptr long long ptr) -@ stdcall ValidateVertexShader(ptr long long ptr) +@ stdcall ValidateVertexShader(ptr ptr ptr long ptr) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index b7627ab..65b8a00 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -72,13 +72,32 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, /*********************************************************************** * ValidateVertexShader (D3D8.@) * - * PARAMS + * I've seen reserved1 and reserved2 always passed as 0's + * bool seems always passed as 0 or 1, but other values work as well.... * toto result? */ -BOOL WINAPI ValidateVertexShader(LPVOID pFunction, int param1, int param2, LPVOID toto) -{ - FIXME("(%p %d %d %p): stub\n", pFunction, param1, param2, toto); - return TRUE; +HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, int bool, DWORD* toto) +{ + HRESULT ret; + FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); + + if (!vertexshader) + return E_FAIL; + + if (reserved1 || reserved2) + return E_FAIL; + + switch(*vertexshader) { + case 0xFFFE0101: + case 0xFFFE0100: + ret=S_OK; + break; + default: + ERR("vertexshader version mismatch\n"); + ret=E_FAIL; + } + + return ret; } /*********************************************************************** diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index 6576058..a936043 100644 --- a/dlls/d3d8/tests/Makefile.in +++ b/dlls/d3d8/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = user32 kernel32 EXTRALIBS = -ldxerr8 CTESTS = \ + d3d8_main.c \ device.c @MAKE_TEST_RULES@ diff --git a/dlls/d3d8/tests/d3d8_main.c b/dlls/d3d8/tests/d3d8_main.c new file mode 100644 index 0000000..e2f03bd --- /dev/null +++ b/dlls/d3d8/tests/d3d8_main.c @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2006 Louis Lenders + * + * 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 "wine/test.h" + +static HRESULT (WINAPI *ValidateVertexShader)(DWORD*,DWORD*,DWORD*,int,DWORD*); + +static void test_ValidateVertexShader(void) +{ + HRESULT ret; + static DWORD simple_vs[] = {0xFFFE0101, /* vs_1_1 */ + 0x00000009, 0xC0010000, 0x90E40000, 0xA0E40000, /* dp4 oPos.x, v0, c0 */ + 0x00000009, 0xC0020000, 0x90E40000, 0xA0E40001, /* dp4 oPos.y, v0, c1 */ + 0x00000009, 0xC0040000, 0x90E40000, 0xA0E40002, /* dp4 oPos.z, v0, c2 */ + 0x00000009, 0xC0080000, 0x90E40000, 0xA0E40003, /* dp4 oPos.w, v0, c3 */ + 0x0000FFFF}; + + ret=ValidateVertexShader(0,0,0,0,0); + ok(ret==E_FAIL,"ValidateVertexShader returned %lx but expected E_FAIL\n",ret); + + ret=ValidateVertexShader(0,0,0,1,0); + ok(ret==E_FAIL,"ValidateVertexShader returned %lx but expected E_FAIL\n",ret); + + ret=ValidateVertexShader(simple_vs,0,0,0,0); + ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); + + ret=ValidateVertexShader(simple_vs,0,0,1,0); + ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); + /* seems to do some version checking */ + *simple_vs=0xFFFE0100; /* vs_1_0 */ + ret=ValidateVertexShader(simple_vs,0,0,0,0); + ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); + + *simple_vs=0xFFFE0102; /* bogus version */ + ret=ValidateVertexShader(simple_vs,0,0,1,0); + ok(ret==E_FAIL,"ValidateVertexShader returned %lx but expected E_FAIL\n",ret); + /* I've seen that applications pass 2nd and 3rd parameter always as 0;simple test with non-zero parameters */ + *simple_vs=0xFFFE0101; /* vs_1_1 */ + ret=ValidateVertexShader(simple_vs,simple_vs,0,1,0); + ok(ret==E_FAIL,"ValidateVertexShader returned %lx but expected E_FAIL\n",ret); + + ret=ValidateVertexShader(simple_vs,0,simple_vs,1,0); + ok(ret==E_FAIL,"ValidateVertexShader returned %lx but expected E_FAIL\n",ret); + /* I've seen 4th parameter is always passed as either 0 or 1, but passing other values doesn't seem to hurt*/ + ret=ValidateVertexShader(simple_vs,0,0,12345,0); + ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); + /* What is 5th parameter ???? Following works ok */ + ret=ValidateVertexShader(simple_vs,0,0,1,simple_vs); + ok(ret==S_OK,"ValidateVertexShader returned %lx but expected S_OK\n",ret); +} + +START_TEST(d3d8_main) +{ + HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); + ValidateVertexShader = (void*)GetProcAddress (d3d8_handle, "ValidateVertexShader" ); + test_ValidateVertexShader(); +}

1 0

Detlef Riekenberg : winspool: String cleanup in the tests.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: b317aeaf0a8bad64c1b71e94acf9a11ac66a3cd7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b317aeaf0a8bad64c1b71e9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Sep 10 19:01:30 2006 +0200 winspool: String cleanup in the tests. --- dlls/winspool.drv/tests/info.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 3d6ae78..3b114c3 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -32,9 +32,15 @@ #include "winspool.h" #define MAGIC_DEAD 0xdeadbeef #define DEFAULT_PRINTER_SIZE 1000 -static char env_x86[] = "Windows NT x86"; -static char env_win9x_case[] = "windowS 4.0"; -static char winetest_monitor[] = "winetest"; +static CHAR does_not_exist_dll[]= "does_not_exists.dll"; +static CHAR empty[] = ""; +static CHAR env_x86[] = "Windows NT x86"; +static CHAR env_win9x_case[] = "windowS 4.0"; +static CHAR illegal_name[] = "illegal,name"; +static CHAR invalid_env[] = "invalid_env"; +static CHAR invalid_server[] = "\\invalid_server"; +static CHAR version_dll[] = "version.dll"; +static CHAR winetest_monitor[] = "winetest"; static HANDLE hwinspool; static FARPROC pGetDefaultPrinterA; @@ -176,9 +182,6 @@ static void test_AddMonitor(void) { MONITOR_INFO_2A mi2a; struct monitor_entry * entry = NULL; - static CHAR empty[] = "", - does_not_exist_dll[] = "does_not_exists.dll", - version_dll[] = "version.dll"; DWORD res; entry = find_installed_monitor(); @@ -325,8 +328,7 @@ static void test_DeleteMonitor(void) MONITOR_INFO_2A mi2a; struct monitor_entry * entry = NULL; DWORD res; - static CHAR empty[] = "", - bad_env[] = "bad_env"; + entry = find_installed_monitor(); @@ -369,7 +371,7 @@ static void test_DeleteMonitor(void) AddMonitorA(NULL, 2, (LPBYTE) &mi2a); SetLastError(MAGIC_DEAD); - res = DeleteMonitorA(NULL, bad_env, winetest_monitor); + res = DeleteMonitorA(NULL, invalid_env, winetest_monitor); ok(res, "returned %ld with %ld (expected '!=0')\n", res, GetLastError()); /* the monitor-name */ @@ -700,7 +702,7 @@ static void test_GetPrinterDriverDirecto LPBYTE buffer = NULL; DWORD cbBuf = 0, pcbNeeded = 0; BOOL res; - static CHAR empty[] = ""; + SetLastError(MAGIC_DEAD); res = GetPrinterDriverDirectoryA( NULL, NULL, 1, NULL, 0, &cbBuf); @@ -850,9 +852,7 @@ static void test_GetPrintProcessorDirect DWORD cbBuf = 0; DWORD pcbNeeded = 0; BOOL res; - static CHAR empty[] = "", - invalid_env[] = "invalid_env", - invalid_server[] = "\\invalid_server"; + SetLastError(0xdeadbeef); res = GetPrintProcessorDirectoryA(NULL, NULL, 1, NULL, 0, &cbBuf); @@ -982,8 +982,7 @@ static void test_OpenPrinter(void) DWORD size; CHAR buffer[DEFAULT_PRINTER_SIZE]; LPSTR ptr; - static CHAR empty[] = "", - illegal_name[] = "illegal,name"; + SetLastError(MAGIC_DEAD); res = OpenPrinter(NULL, NULL, NULL);

1 0

Detlef Riekenberg : taskmgr: Remove dead code in trayicon.c (Coverity).
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: ed8ce298e196c8c3020d0c12759321d615774756 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed8ce298e196c8c3020d0c1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Sep 10 21:15:11 2006 +0200 taskmgr: Remove dead code in trayicon.c (Coverity). --- programs/taskmgr/trayicon.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index 6a677fa..e088f3f 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -40,7 +40,7 @@ HICON TrayIcon_GetProcessorUsageIcon(voi HDC hScreenDC = NULL; HDC hDC = NULL; HBITMAP hBitmap = NULL; - HBITMAP hOldBitmap = NULL; + HBITMAP hOldBitmap; HBITMAP hBitmapMask = NULL; ICONINFO iconInfo; ULONG ProcessorUsage; @@ -108,8 +108,7 @@ HICON TrayIcon_GetProcessorUsageIcon(voi * old bitmap back. */ SelectObject(hDC, hOldBitmap); - hOldBitmap = NULL; - + iconInfo.fIcon = TRUE; iconInfo.xHotspot = 0; iconInfo.yHotspot = 0; @@ -124,8 +123,6 @@ done: */ if (hScreenDC) ReleaseDC(NULL, hScreenDC); - if (hOldBitmap) - SelectObject(hDC, hOldBitmap); if (hDC) DeleteDC(hDC); if (hBitmapBrush)

1 0

Alexandre Julliard : makedep: For generated headers, parse the source idl instead.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: e4fca883a2125e17e411af406c03226246ed285f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4fca883a2125e17e411af4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Sep 10 22:04:42 2006 +0200 makedep: For generated headers, parse the source idl instead. This avoids having to generate all the headers before make depend. --- Make.rules.in | 2 - Makefile.in | 2 - tools/makedep.c | 201 ++++++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 163 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e4fca883a2125e17e41…

1 0

Mikołaj Zalewski : shell32: Document the shell32 " mini-COM" functions.
by Alexandre Julliard 10 Sep '06

10 Sep '06

Module: wine Branch: master Commit: 8fcc0bdf7888ce700fb8595a014649ce6d0bbd9a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8fcc0bdf7888ce700fb8595… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Sep 8 21:11:01 2006 +0200 shell32: Document the shell32 "mini-COM" functions. --- dlls/shell32/shellole.c | 58 ++++++++++++++++++++++++++++++++++++++--------- dlls/shell32/shellord.c | 47 +++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index b16be1b..2576cbf 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -78,12 +78,6 @@ static const struct { {NULL,NULL} }; -/************************************************************************* - * SHCoCreateInstance [SHELL32.102] - * - * NOTES - * exported by ordinal - */ /* FIXME: this should be SHLWAPI.24 since we can't yet import by ordinal */ @@ -103,8 +97,22 @@ DWORD WINAPI __SHGUIDToStringW (REFGUID } -/************************************************************************/ - +/************************************************************************* + * SHCoCreateInstance [SHELL32.102] + * + * Equivalent to CoCreateInstance. Under Windows 9x this function could sometimes + * use the shell32 built-in "mini-COM" without the need to load ole32.dll - see + * SHLoadOLE for details. + * + * Under wine if a "LoadWithoutCOM" value is present or the object resides in + * shell32.dll the function will load the object manually without the help of ole32 + * + * NOTES + * exported by ordinal + * + * SEE ALSO + * CoCreateInstace, SHLoadOLE + */ HRESULT WINAPI SHCoCreateInstance( LPCWSTR aclsid, const CLSID *clsid, @@ -253,8 +261,16 @@ HRESULT WINAPI DllGetClassObject(REFCLSI /************************************************************************* * SHCLSIDFromString [SHELL32.147] * + * Under Windows 9x this was an ANSI version of CLSIDFromString. It also allowed + * to avoid dependency on ole32.dll (see SHLoadOLE for details). + * + * Under Windows NT/2000/XP this is equivalent to CLSIDFromString + * * NOTES * exported by ordinal + * + * SEE ALSO + * CLSIDFromString, SHLoadOLE */ DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id) { @@ -405,7 +421,9 @@ static const IMallocVtbl VT_Shell_IMallo /************************************************************************* * SHGetMalloc [SHELL32.@] * - * Return the shell IMalloc interface. + * Equivalent to CoGetMalloc(MEMCTX_TASK, ...). Under Windows 9x this function + * could use the shell32 built-in "mini-COM" without the need to load ole32.dll - + * see SHLoadOLE for details. * * PARAMS * lpmal [O] Destination for IMalloc interface. @@ -415,8 +433,12 @@ static const IMallocVtbl VT_Shell_IMallo * Failure. An HRESULT error code. * * NOTES - * This function will use CoGetMalloc() if OLE32.DLL is already loaded. - * If not it uses an internal implementation as a fallback. + * wine contains an implementation of an allocator to use when ole32.dll is not + * loaded but it is never used as ole32 is imported by shlwapi which is imported by + * shell32 + * + * SEE ALSO + * CoGetMalloc, SHLoadOLE */ HRESULT WINAPI SHGetMalloc(LPMALLOC *lpmal) { @@ -446,8 +468,15 @@ HRESULT WINAPI SHGetMalloc(LPMALLOC *lpm /************************************************************************* * SHAlloc [SHELL32.196] * + * Equivalent to CoTaskMemAlloc. Under Windows 9x this function could use + * the shell32 built-in "mini-COM" without the need to load ole32.dll - + * see SHLoadOLE for details. + * * NOTES * exported by ordinal + * + * SEE ALSO + * CoTaskMemAlloc, SHLoadOLE */ LPVOID WINAPI SHAlloc(DWORD len) { @@ -464,8 +493,15 @@ LPVOID WINAPI SHAlloc(DWORD len) /************************************************************************* * SHFree [SHELL32.195] * + * Equivalent to CoTaskMemFree. Under Windows 9x this function could use + * the shell32 built-in "mini-COM" without the need to load ole32.dll - + * see SHLoadOLE for details. + * * NOTES * exported by ordinal + * + * SEE ALSO + * CoTaskMemFree, SHLoadOLE */ void WINAPI SHFree(LPVOID pv) { diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index c1f953b..14ffcfd 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -438,8 +438,15 @@ int WINAPIV ShellMessageBoxA( /************************************************************************* * SHRegisterDragDrop [SHELL32.86] * + * Probably equivalent to RegisterDragDrop but under Windows 9x it could use the + * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE + * for details + * * NOTES * exported by ordinal + * + * SEE ALSO + * RegisterDragDrop, SHLoadOLE */ HRESULT WINAPI SHRegisterDragDrop( HWND hWnd, @@ -452,8 +459,15 @@ HRESULT WINAPI SHRegisterDragDrop( /************************************************************************* * SHRevokeDragDrop [SHELL32.87] * + * Probably equivalent to RevokeDragDrop but under Windows 9x it could use the + * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE + * for details + * * NOTES * exported by ordinal + * + * SEE ALSO + * RevokeDragDrop, SHLoadOLE */ HRESULT WINAPI SHRevokeDragDrop(HWND hWnd) { @@ -464,8 +478,15 @@ HRESULT WINAPI SHRevokeDragDrop(HWND hWn /************************************************************************* * SHDoDragDrop [SHELL32.88] * + * Probably equivalent to DoDragDrop but under Windows 9x it could use the + * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE + * for details + * * NOTES * exported by ordinal + * + * SEE ALSO + * DoDragDrop, SHLoadOLE */ HRESULT WINAPI SHDoDragDrop( HWND hWnd, @@ -1054,12 +1075,20 @@ HRESULT WINAPI SHGetInstanceExplorer (LP /************************************************************************* * SHFreeUnusedLibraries [SHELL32.123] * + * Probably equivalent to CoFreeUnusedLibraries but under Windows 9x it could use + * the shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE + * for details + * * NOTES - * exported by name + * exported by ordinal + * + * SEE ALSO + * CoFreeUnusedLibraries, SHLoadOLE */ void WINAPI SHFreeUnusedLibraries (void) { FIXME("stub\n"); + CoFreeUnusedLibraries(); } /************************************************************************* * DAD_AutoScroll [SHELL32.129] @@ -1284,9 +1313,25 @@ HRESULT WINAPI SetAppStartingCursor(HWND { FIXME("hwnd=%p 0x%04lx stub\n",u,v ); return 0; } + /************************************************************************* * SHLoadOLE [SHELL32.151] * + * To reduce the memory usage of Windows 95 it's shell32 contained an + * internal implementation of a part of COM (see e.g. SHGetMalloc, SHCoCreateInstance, + * SHRegisterDragDrop etc.) that allowed to use in-process STA objects without + * the need to load OLE32.DLL. If OLE32.DLL was already loaded, the SH* function + * would just call the Co* functions. + * + * The SHLoadOLE was called when OLE32.DLL was being loaded to transfer all the + * informations from the shell32 "mini-COM" to ole32.dll. + * + * See http://blogs.msdn.com/oldnewthing/archive/2004/07/05/173226.aspx for a + * detailed description. + * + * Under wine ole32.dll is always loaded as it is imported by shlwapi.dll which is + * imported by shell32 and no "mini-COM" is used (except for the "LoadWithoutCOM" + * hack in SHCoCreateInstance) */ HRESULT WINAPI SHLoadOLE(LPARAM lParam) { FIXME("0x%04lx stub\n",lParam);

1 0