October 2006 - Wine-commits

Juan Lang : crypt32: Forward CryptAcquireContextU to CryptAcquireContextW.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 92afe743efbfa41b8f8c1cde58d0ef00055dbb20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92afe743efbfa41b8f8c1cde5… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Oct 3 21:59:15 2006 -0700 crypt32: Forward CryptAcquireContextU to CryptAcquireContextW. --- dlls/crypt32/crypt32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index d7b5918..aa5c1cb 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -94,7 +94,7 @@ @ stub CryptBinaryToStringW # (ptr long long ptr ptr) @ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) @ stub CryptStringToBinaryW # (wstr long long ptr ptr ptr ptr) -@ stub CryptAcquireContextU +@ stdcall CryptAcquireContextU(ptr wstr wstr long long) advapi32.CryptAcquireContextW @ stdcall CryptAcquireCertificatePrivateKey(ptr long ptr ptr ptr ptr) @ stub CryptCloseAsyncHandle @ stub CryptCreateAsyncHandle

1 0

Marcus Meissner : wine.inf: Add some more fake binaries.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 36551e9b0dda5879a880c4e27236e5391a0843fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=36551e9b0dda5879a880c4e27… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 3 21:39:15 2006 +0200 wine.inf: Add some more fake binaries. --- tools/wine.inf | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 200745d..8487a6b 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2147,7 +2147,10 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,crypt32.dll 11,,d3d8.dll 11,,dbghelp.dll +11,,ddhelp.exe 11,,ddraw.dll +11,,dsound.dll +11,,dsound.vxd 11,,explorer.exe 11,,gdi32.dll 11,,hhctrl.ocx

1 0

James Hawkins : comctl32: Set the TVIF_TEXT mask when notifying the parent window of a selection change .
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 3d2b37cc8391f9f02f6405649f33492adf1242b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2b37cc8391f9f02f6405649… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Oct 3 14:58:43 2006 -0700 comctl32: Set the TVIF_TEXT mask when notifying the parent window of a selection change. --- dlls/comctl32/treeview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 499faa2..6aca626 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4245,7 +4245,7 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *inf if (TREEVIEW_SendTreeviewNotify(infoPtr, TVN_SELCHANGINGW, cause, - TVIF_HANDLE | TVIF_STATE | TVIF_PARAM, + TVIF_TEXT | TVIF_HANDLE | TVIF_STATE | TVIF_PARAM, prevSelect, newSelect)) return FALSE; @@ -4267,7 +4267,7 @@ TREEVIEW_DoSelectItem(TREEVIEW_INFO *inf TREEVIEW_SendTreeviewNotify(infoPtr, TVN_SELCHANGEDW, cause, - TVIF_HANDLE | TVIF_STATE | TVIF_PARAM, + TVIF_TEXT | TVIF_HANDLE | TVIF_STATE | TVIF_PARAM, prevSelect, newSelect); break;

1 0

Michael Stefaniuc : spoolss: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 52f86323006c68c422c96a93fb79335b512fde08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f86323006c68c422c96a93f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:40:54 2006 +0200 spoolss: Win64 printf format warning fixes. --- dlls/spoolss/Makefile.in | 1 - dlls/spoolss/spoolss_main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index b31dbae..e344f9c 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = spoolss.dll IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ spoolss_main.c diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 5b2a4d3..d39cac3 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolss); */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_WINE_PREATTACH: @@ -67,7 +67,7 @@ LPVOID WINAPI DllAllocSplMem(DWORD size) LPVOID res; res = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - TRACE("(%ld) => %p\n", size, res); + TRACE("(%d) => %p\n", size, res); return res; }

1 0

Michael Stefaniuc : w32skrnl: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 80f1d890c72ed81f5f9a49711e73954d180d2e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f1d890c72ed81f5f9a49711… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:41:14 2006 +0200 w32skrnl: Win64 printf format warning fixes. --- dlls/w32skrnl/Makefile.in | 1 - dlls/w32skrnl/w32sys.c | 2 +- dlls/w32skrnl/win32s16.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/w32skrnl/Makefile.in b/dlls/w32skrnl/Makefile.in index a060a44..1f67722 100644 --- a/dlls/w32skrnl/Makefile.in +++ b/dlls/w32skrnl/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = w32skrnl.dll IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ w32skernel.c \ diff --git a/dlls/w32skrnl/w32sys.c b/dlls/w32skrnl/w32sys.c index 64c0344..77f4bc9 100644 --- a/dlls/w32skrnl/w32sys.c +++ b/dlls/w32skrnl/w32sys.c @@ -83,7 +83,7 @@ WORD WINAPI GetPEResourceTable16( * LoadPeResource (W32SYS.11) */ DWORD WINAPI LoadPeResource16(WORD x,SEGPTR y) { - FIXME("(0x%04x,0x%08lx),stub!\n",x,y); + FIXME("(0x%04x,0x%08x),stub!\n",x,y); return 0; } diff --git a/dlls/w32skrnl/win32s16.c b/dlls/w32skrnl/win32s16.c index bd3d27f..3e983f0 100644 --- a/dlls/w32skrnl/win32s16.c +++ b/dlls/w32skrnl/win32s16.c @@ -83,7 +83,7 @@ BOOL WINAPI ContinueDebugEvent16(DWORD p BOOL WINAPI ReadProcessMemory16(HANDLE process, LPCVOID addr, LPVOID buffer, DWORD size, LPDWORD bytes_read) { - return ReadProcessMemory(process, addr, buffer, size, bytes_read); + return ReadProcessMemory(process, addr, buffer, size, (SIZE_T *)bytes_read); } /***********************************************************************

1 0

Michael Stefaniuc : oleacc: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: f9c23da310ed5b874574e6e67980eb07122df077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c23da310ed5b874574e6e67… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:40:23 2006 +0200 oleacc: Win64 printf format warning fixes. --- dlls/oleacc/Makefile.in | 1 - dlls/oleacc/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index de81290..d52d548 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = oleacc.dll IMPORTLIB = liboleacc.$(IMPLIBEXT) IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ main.c diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 753a3ed..eb57396 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { - FIXME("%p %ld %s %p\n", hwnd, idObject, + FIXME("%p %d %s %p\n", hwnd, idObject, debugstr_guid( riidInterface ), ppvObject ); return E_NOTIMPL; } @@ -45,7 +45,7 @@ HRESULT WINAPI LresultFromObject( REFIID HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { - FIXME("%p %ld %s %p\n", hwnd, dwObjectID, + FIXME("%p %d %s %p\n", hwnd, dwObjectID, debugstr_guid( riid ), ppvObject ); return E_NOTIMPL; }

1 0

Michael Stefaniuc : query: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 20834a18be42f3b0bf6e29dcdd65cf1a07e9307a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20834a18be42f3b0bf6e29dcd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:40:42 2006 +0200 query: Win64 printf format warning fixes. --- dlls/query/Makefile.in | 2 +- dlls/query/query_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 2d69d43..1990e12 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = query.dll IMPORTS = ole32 user32 advapi32 kernel32 ntdll EXTRALIBS = -luuid -EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT +EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ query_main.c diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index 938c4ca..f25c905 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -82,7 +82,7 @@ HRESULT WINAPI LocateCatalogsA(CHAR cons CHAR *pwszCat, ULONG *pcCat) { - FIXME("%s %lu %p %p %p %p\n", debugstr_a(pwszScope), + FIXME("%s %u %p %p %p %p\n", debugstr_a(pwszScope), iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; } @@ -92,7 +92,7 @@ HRESULT WINAPI LocateCatalogsW(WCHAR con WCHAR *pwszCat, ULONG *pcCat) { - FIXME("%s %lu %p %p %p %p\n", debugstr_w(pwszScope), + FIXME("%s %u %p %p %p %p\n", debugstr_w(pwszScope), iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; }

1 0

Michael Stefaniuc : cards: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 9f725a2719692cfd2894c92dd61470c12083a633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f725a2719692cfd2894c92dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:38:17 2006 +0200 cards: Win64 printf format warning fixes. --- dlls/cards/Makefile.in | 1 - dlls/cards/cards.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cards/Makefile.in b/dlls/cards/Makefile.in index 0433d06..cf65144 100644 --- a/dlls/cards/Makefile.in +++ b/dlls/cards/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = cards.dll IMPORTLIB = libcards.$(IMPLIBEXT) IMPORTS = user32 gdi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ cards.c diff --git a/dlls/cards/cards.c b/dlls/cards/cards.c index 7938bc1..5baf47a 100644 --- a/dlls/cards/cards.c +++ b/dlls/cards/cards.c @@ -94,7 +94,7 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, i BOOL eraseFlag = FALSE; BOOL drawFlag = TRUE; - TRACE("(%p, %d, %d, %d, %d, %d, %d, %ld)\n", hdc, x, y, dx, dy, card, mode, color); + TRACE("(%p, %d, %d, %d, %d, %d, %d, %d)\n", hdc, x, y, dx, dy, card, mode, color); roundCornersFlag = !(mode & MODEFLAG_DONT_ROUND_CORNERS) && (dx == cardWidth) && (dy == cardHeight); @@ -243,7 +243,7 @@ BOOL WINAPI cdtDrawExt(HDC hdc, int x, i */ BOOL WINAPI cdtDraw(HDC hdc, int x, int y, int card, int mode, DWORD color) { - TRACE("(%p, %d, %d, %d, %d, %ld)\n", hdc, x, y, card, mode, color); + TRACE("(%p, %d, %d, %d, %d, %d)\n", hdc, x, y, card, mode, color); return cdtDrawExt(hdc, x, y, cardWidth, cardHeight, card, mode, color); }

1 0

Michael Stefaniuc : dinput8: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 16e15913d9458b6ab072c555c87ff74f82753034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e15913d9458b6ab072c555c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:38:46 2006 +0200 dinput8: Win64 printf format warning fixes. --- dlls/dinput8/Makefile.in | 1 - dlls/dinput8/dinput8_main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index f721660..f7e049b 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -6,7 +6,6 @@ MODULE = dinput8.dll IMPORTLIB = libdinput8.$(IMPLIBEXT) IMPORTS = dinput ole32 advapi32 kernel32 EXTRALIBS = -luuid -ldxguid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ dinput8_main.c diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c index f06e2a4..5b0e634 100644 --- a/dlls/dinput8/dinput8_main.c +++ b/dlls/dinput8/dinput8_main.c @@ -53,7 +53,7 @@ static void UnlockModule(void) HRESULT WINAPI DirectInput8Create(HINSTANCE hinst, DWORD dwVersion, REFIID riid, LPVOID *ppDI, LPUNKNOWN punkOuter) { HRESULT hr; - TRACE("hInst (%p), dwVersion: %ld, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); + TRACE("hInst (%p), dwVersion: %d, riid (%s), punkOuter (%p))\n", hinst, dwVersion, debugstr_guid(riid), punkOuter); /* The specified version needs to be dinput8 (0x800) or higher */ if(dwVersion < 0x800) @@ -66,7 +66,7 @@ HRESULT WINAPI DirectInput8Create(HINSTA hr = CoCreateInstance( &CLSID_DirectInput8, punkOuter, CLSCTX_INPROC_SERVER, riid, ppDI); if(FAILED(hr)) { - ERR("CoCreateInstance failed with hr = %ld; Try running wineprefixcreate to fix it.\n", hr); + ERR("CoCreateInstance failed with hr = %d; Try running wineprefixcreate to fix it.\n", hr); return DIERR_INVALIDPARAM; }

1 0

Michael Stefaniuc : d3dx8: Win64 printf format warning fixes.
by Alexandre Julliard 04 Oct '06

04 Oct '06

Module: wine Branch: master Commit: 277fab6cc7a513cc28193de57aa54204b3a81570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277fab6cc7a513cc28193de57… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 3 23:38:31 2006 +0200 d3dx8: Win64 printf format warning fixes. --- dlls/d3dx8/Makefile.in | 1 - dlls/d3dx8/d3dxbuffer.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx8/Makefile.in b/dlls/d3dx8/Makefile.in index a422632..f8159bb 100644 --- a/dlls/d3dx8/Makefile.in +++ b/dlls/d3dx8/Makefile.in @@ -6,7 +6,6 @@ MODULE = d3dx8.dll IMPORTLIB = libd3dx8.$(IMPLIBEXT) IMPORTS = d3d8 user32 gdi32 kernel32 EXTRALIBS = -ldxguid -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ d3dx8_main.c \ diff --git a/dlls/d3dx8/d3dxbuffer.c b/dlls/d3dx8/d3dxbuffer.c index 6d0a780..369714c 100644 --- a/dlls/d3dx8/d3dxbuffer.c +++ b/dlls/d3dx8/d3dxbuffer.c @@ -54,7 +54,7 @@ static ULONG WINAPI ID3DXBufferImpl_AddR ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %ld\n", This, ref - 1); + TRACE("(%p) : AddRef from %d\n", This, ref - 1); return ref; } @@ -63,7 +63,7 @@ static ULONG WINAPI ID3DXBufferImpl_Rele ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %ld\n", This, ref); + TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { HeapFree(GetProcessHeap(), 0, This->buffer);

1 0