wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Alexandre Julliard : msvcrt: Silence FIXME about an unknown parameter that isn't used.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 3bb04c88b7bbb262e7dcc77c2c031a2df037be6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb04c88b7bbb262e7dcc77c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 12:41:49 2007 +0100 msvcrt: Silence FIXME about an unknown parameter that isn't used. --- dlls/msvcrt/cpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 045bab2..8328497 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1103,13 +1103,13 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, TRACE("obj: %p unknown: %d src: %p %s dst: %p %s do_throw: %d)\n", cppobj, unknown, src, dbgstr_type_info(src), dst, dbgstr_type_info(dst), do_throw); - if (unknown) FIXME("Unknown parameter is non-zero: please report\n"); - /* To cast an object at runtime: * 1.Find out the true type of the object from the typeinfo at vtable[-1] * 2.Search for the destination type in the class hierarchy * 3.If destination type is found, return base object address + dest offset * Otherwise, fail the cast + * + * FIXME: the unknown parameter doesn't seem to be used for anything */ __TRY {

1 0

Chris Wulff : hal: Added stubs for KfAquireSpinLock, KfReleaseSpinLock, KfLowerIrql, KfRaiseIrql.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: d230fd611946b6c1c735a6751cd75b27ba768d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d230fd611946b6c1c735a6751… Author: Chris Wulff <crwulff(a)rochester.rr.com> Date: Tue Oct 30 20:02:00 2007 -0400 hal: Added stubs for KfAquireSpinLock, KfReleaseSpinLock, KfLowerIrql, KfRaiseIrql. --- dlls/hal/Makefile.in | 3 + dlls/hal/hal.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/hal/hal.spec | 8 ++-- 3 files changed, 108 insertions(+), 4 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index b382cff..4f3cf1c 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -5,6 +5,9 @@ VPATH = @srcdir@ MODULE = hal.dll IMPORTS = kernel32 ntdll +C_SRCS = \ + hal.c + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c new file mode 100644 index 0000000..10c695b --- /dev/null +++ b/dlls/hal/hal.c @@ -0,0 +1,101 @@ +/* + * hal.dll implementation + * + * Copyright (C) 2007 Chris Wulff + * + * 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 "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "excpt.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); + +#ifdef __i386__ +#define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ + __ASM_GLOBAL_FUNC( name, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name ) +#define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ + __ASM_GLOBAL_FUNC( name, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name ) +#endif + + +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) +KIRQL WINAPI __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) +#else +KIRQL WINAPI KfAcquireSpinLock(PKSPIN_LOCK SpinLock) +#endif +{ + FIXME( "(%p) stub!\n", SpinLock ); + + return (KIRQL)0; +} + + +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( KfLowerIrql ) +VOID WINAPI __regs_KfLowerIrql(KIRQL NewIrql) +#else +VOID WINAPI KfLowerIrql(KIRQL NewIrql) +#endif +{ + FIXME( "(%u) stub!\n", NewIrql ); +} + + +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( KfRaiseIrql ) +KIRQL WINAPI __regs_KfRaiseIrql(KIRQL NewIrql) +#else +KIRQL WINAPI KfRaiseIrql(KIRQL NewIrql) +#endif +{ + FIXME( "(%u) stub!\n", NewIrql ); + + return (KIRQL)0; +} + + +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( KfReleaseSpinLock ) +VOID WINAPI __regs_KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) +#else +VOID WINAPI KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) +#endif +{ + FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 5c5fc5f..298dc8e 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -13,10 +13,10 @@ @ stub KeReleaseQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLockRaiseToSynch -@ stub KfAcquireSpinLock -@ stub KfLowerIrql -@ stub KfRaiseIrql -@ stub KfReleaseSpinLock +@ stdcall -norelay KfAcquireSpinLock(ptr) +@ stdcall -norelay KfLowerIrql(long) +@ stdcall -norelay KfRaiseIrql() +@ stdcall -norelay KfReleaseSpinLock(ptr long) @ stub HalAcquireDisplayOwnership @ stub HalAdjustResourceList @ stub HalAllProcessorsStarted

1 0

Chris Wulff : kernel32: Added a stub for FindVolumeMountPointClose.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 8cf7cb32c5bd57126397766c14621b27a3a92559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf7cb32c5bd57126397766c1… Author: Chris Wulff <crwulff(a)rochester.rr.com> Date: Tue Oct 30 20:02:26 2007 -0400 kernel32: Added a stub for FindVolumeMountPointClose. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/volume.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1032b01..fe98670 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -387,7 +387,7 @@ @ stdcall FindResourceExW(long wstr wstr long) @ stdcall FindResourceW(long wstr wstr) @ stub FindVolumeClose -@ stub FindVolumeMountPointClose +@ stdcall FindVolumeMountPointClose(ptr) @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 0f4c5da..8d3251e 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1406,3 +1406,12 @@ HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR root, LPWSTR mount_point, DWORD SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return INVALID_HANDLE_VALUE; } + +/*********************************************************************** + * FindVolumeMountPointClose (KERNEL32.@) + */ +BOOL WINAPI FindVolumeMountPointClose(HANDLE h) +{ + FIXME("(%p), stub!\n", h); + return FALSE; +}

1 0

Chris Wulff : shdocvw: Add IPersistMemory interface stub.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 62e7be0ede4ec02021312921870249cdf984d6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e7be0ede4ec020213129218… Author: Chris Wulff <crwulff(a)rochester.rr.com> Date: Wed Oct 31 00:06:58 2007 -0400 shdocvw: Add IPersistMemory interface stub. --- dlls/shdocvw/persist.c | 84 +++++++++++++++++++++++++++++++++++++++++++- dlls/shdocvw/shdocvw.h | 2 + dlls/shdocvw/webbrowser.c | 3 ++ 3 files changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/persist.c b/dlls/shdocvw/persist.c index b4fecbb..940dd16 100644 --- a/dlls/shdocvw/persist.c +++ b/dlls/shdocvw/persist.c @@ -92,8 +92,6 @@ static HRESULT WINAPI PersistStorage_SaveCompleted(IPersistStorage *iface, LPSTO return E_NOTIMPL; } -#define PERSTORAGE_THIS(ifce) DEFINE_THIS(WebBrowser, PersistStorage, iface) - static const IPersistStorageVtbl PersistStorageVtbl = { PersistStorage_QueryInterface, @@ -108,6 +106,87 @@ static const IPersistStorageVtbl PersistStorageVtbl = }; /********************************************************************** + * Implement the IPersistMemory interface + */ + +#define PERMEMORY_THIS(ifce) DEFINE_THIS(WebBrowser, PersistMemory, iface) + +static HRESULT WINAPI PersistMemory_QueryInterface(IPersistMemory *iface, + REFIID riid, LPVOID *ppobj) +{ + WebBrowser *This = PERMEMORY_THIS(iface); + return IWebBrowser_QueryInterface(WEBBROWSER(This), riid, ppobj); +} + +static ULONG WINAPI PersistMemory_AddRef(IPersistMemory *iface) +{ + WebBrowser *This = PERMEMORY_THIS(iface); + return IWebBrowser_AddRef(WEBBROWSER(This)); +} + +static ULONG WINAPI PersistMemory_Release(IPersistMemory *iface) +{ + WebBrowser *This = PERMEMORY_THIS(iface); + return IWebBrowser_Release(WEBBROWSER(This)); +} + +static HRESULT WINAPI PersistMemory_GetClassID(IPersistMemory *iface, CLSID *pClassID) +{ + WebBrowser *This = PERMEMORY_THIS(iface); + FIXME("(%p)->(%p)\n", This, pClassID); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistMemory_IsDirty(IPersistMemory *iface) +{ + WebBrowser *This = PERMEMORY_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistMemory_InitNew(IPersistMemory *iface) +{ + WebBrowser *This = PERMEMORY_THIS(iface); + FIXME("(%p)\n", This); + return S_OK; +} + +static HRESULT WINAPI PersistMemory_Load(IPersistMemory *iface, LPVOID pMem, ULONG cbSize) +{ + WebBrowser *This = PERMEMORY_THIS(iface); + FIXME("(%p)->(%p %x)\n", This, pMem, cbSize); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistMemory_Save(IPersistMemory *iface, LPVOID pMem, + BOOL fClearDirty, ULONG cbSize) +{ + WebBrowser *This = PERMEMORY_THIS(iface); + FIXME("(%p)->(%p %x %x)\n", This, pMem, fClearDirty, cbSize); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistMemory_GetSizeMax(IPersistMemory *iface, ULONG *pCbSize) +{ + WebBrowser *This = PERMEMORY_THIS(iface); + FIXME("(%p)->(%p)\n", This, pCbSize); + return E_NOTIMPL; +} + +static const IPersistMemoryVtbl PersistMemoryVtbl = +{ + PersistMemory_QueryInterface, + PersistMemory_AddRef, + PersistMemory_Release, + PersistMemory_GetClassID, + PersistMemory_IsDirty, + PersistMemory_Load, + PersistMemory_Save, + PersistMemory_GetSizeMax, + PersistMemory_InitNew +}; + +/********************************************************************** * Implement the IPersistStreamInit interface */ @@ -192,5 +271,6 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = void WebBrowser_Persist_Init(WebBrowser *This) { This->lpPersistStorageVtbl = &PersistStorageVtbl; + This->lpPersistMemoryVtbl = &PersistMemoryVtbl; This->lpPersistStreamInitVtbl = &PersistStreamInitVtbl; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 28637bf..db47b63 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -100,6 +100,7 @@ struct WebBrowser { const IOleInPlaceObjectVtbl *lpOleInPlaceObjectVtbl; const IOleControlVtbl *lpOleControlVtbl; const IPersistStorageVtbl *lpPersistStorageVtbl; + const IPersistMemoryVtbl *lpPersistMemoryVtbl; const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; const IProvideClassInfo2Vtbl *lpProvideClassInfoVtbl; const IViewObject2Vtbl *lpViewObjectVtbl; @@ -152,6 +153,7 @@ struct InternetExplorer { #define INPLACEOBJ(x) ((IOleInPlaceObject*) &(x)->lpOleInPlaceObjectVtbl) #define CONTROL(x) ((IOleControl*) &(x)->lpOleControlVtbl) #define PERSTORAGE(x) ((IPersistStorage*) &(x)->lpPersistStorageVtbl) +#define PERMEMORY(x) ((IPersistMemory*) &(x)->lpPersistMemoryVtbl) #define PERSTRINIT(x) ((IPersistStreamInit*) &(x)->lpPersistStreamInitVtbl) #define CLASSINFO(x) ((IProvideClassInfo2*) &(x)->lpProvideClassInfoVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index c9af82f..49914f7 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -72,6 +72,9 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IPersistStorage, riid)) { TRACE("(%p)->(IID_IPersistStorage %p)\n", This, ppv); *ppv = PERSTORAGE(This); + }else if(IsEqualGUID(&IID_IPersistMemory, riid)) { + TRACE("(%p)->(IID_IPersistStorage %p)\n", This, ppv); + *ppv = PERMEMORY(This); }else if(IsEqualGUID (&IID_IPersistStreamInit, riid)) { TRACE("(%p)->(IID_IPersistStreamInit %p)\n", This, ppv); *ppv = PERSTRINIT(This);

1 0

Chris Wulff : shdocvw: Implement OLEIVERB_HIDE.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 0a2008ae6722c3184d55968b6bce01df6dc808ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2008ae6722c3184d55968b6… Author: Chris Wulff <crwulff(a)rochester.rr.com> Date: Tue Oct 30 23:46:36 2007 -0400 shdocvw: Implement OLEIVERB_HIDE. --- dlls/shdocvw/oleobject.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index aa1edfe..81ade7b 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -416,6 +416,11 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag case OLEIVERB_INPLACEACTIVATE: TRACE("OLEIVERB_INPLACEACTIVATE\n"); return activate_inplace(This, pActiveSite); + case OLEIVERB_HIDE: + TRACE("OLEIVERB_HIDE\n"); + if(This->doc_host.hwnd) + ShowWindow(This->doc_host.hwnd, SW_HIDE); + return S_OK; default: FIXME("stub for %d\n", iVerb); break;

1 0

Dan Hipschman : widl: Add a --local-stubs option.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: ea7ab4da66c4eb96768fc210e34e1e2d14e284a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7ab4da66c4eb96768fc210e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Oct 30 19:07:36 2007 -0700 widl: Add a --local-stubs option. --- tools/widl/header.c | 75 ++++++++++++++++++++++++++++++++++++----------- tools/widl/header.h | 1 + tools/widl/parser.y | 2 + tools/widl/widl.c | 28 ++++++++++++++++++ tools/widl/widl.h | 2 + tools/widl/widl.man.in | 7 ++++- 6 files changed, 96 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea7ab4da66c4eb96768fc…

1 0

Andrew Talbot : shell32: Constify some variables.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: e7636c13e564d52d074b732b59e3999a89118c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7636c13e564d52d074b732b5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 30 23:07:38 2007 +0000 shell32: Constify some variables. --- dlls/shell32/shell.c | 2 +- dlls/shell32/shell32_main.h | 2 +- dlls/shell32/shlexec.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 26b6146..0078f57 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -584,7 +584,7 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len ) * SHELL_Execute16 [Internal] */ static UINT_PTR SHELL_Execute16(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) + const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out) { UINT ret; char sCmd[MAX_PATH]; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index f5fcf37..367bbde 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -220,7 +220,7 @@ static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) #define HINSTANCE_16(h32) (LOWORD(h32)) typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, - LPSHELLEXECUTEINFOW sei, LPSHELLEXECUTEINFOW sei_out); + const SHELLEXECUTEINFOW *sei, LPSHELLEXECUTEINFOW sei_out); BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc); diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 69608df..743d495 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -298,7 +298,7 @@ static HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR psz * */ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) + const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out) { STARTUPINFOW startup; PROCESS_INFORMATION info; @@ -752,7 +752,7 @@ static HDDEDATA CALLBACK dde_cb(UINT uType, UINT uFmt, HCONV hConv, static unsigned dde_connect(WCHAR* key, const WCHAR* start, WCHAR* ddeexec, const WCHAR* lpFile, WCHAR *env, LPCWSTR szCommandline, LPITEMIDLIST pidl, SHELL_ExecuteW32 execfunc, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) + const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out) { static const WCHAR wApplication[] = {'\\','a','p','p','l','i','c','a','t','i','o','n',0}; static const WCHAR wTopic[] = {'\\','t','o','p','i','c',0}; @@ -1034,7 +1034,7 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpR } /* FIXME: is this already implemented somewhere else? */ -static HKEY ShellExecute_GetClassKey( LPSHELLEXECUTEINFOW sei ) +static HKEY ShellExecute_GetClassKey( const SHELLEXECUTEINFOW *sei ) { LPCWSTR ext = NULL, lpClass = NULL; LPWSTR cls = NULL;

1 0

Stefan Leichter : d3dx8: Fix number of parameter of functions D3DXVec4Cross and D3DXVec?CatmullRom.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: b84a7844b6736edf21af167817dcbd5d45890d41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84a7844b6736edf21af16781… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Oct 30 22:56:03 2007 +0100 d3dx8: Fix number of parameter of functions D3DXVec4Cross and D3DXVec?CatmullRom. --- dlls/d3dx8/d3dx8.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx8/d3dx8.spec b/dlls/d3dx8/d3dx8.spec index 2b7eedd..07d6235 100644 --- a/dlls/d3dx8/d3dx8.spec +++ b/dlls/d3dx8/d3dx8.spec @@ -1,23 +1,23 @@ @ stdcall D3DXVec2Normalize(ptr ptr) @ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr long) -@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr long) +@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr long long) @ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec2Transform(ptr ptr ptr) @ stdcall D3DXVec2TransformCoord(ptr ptr ptr) @ stdcall D3DXVec2TransformNormal(ptr ptr ptr) @ stdcall D3DXVec3Normalize(ptr ptr) @ stdcall D3DXVec3Hermite(ptr ptr ptr ptr ptr long) -@ stdcall D3DXVec3CatmullRom(ptr ptr ptr ptr long) +@ stdcall D3DXVec3CatmullRom(ptr ptr ptr ptr long long) @ stdcall D3DXVec3BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec3Transform(ptr ptr ptr) @ stdcall D3DXVec3TransformCoord(ptr ptr ptr) @ stdcall D3DXVec3TransformNormal(ptr ptr ptr) @ stub D3DXVec3Project @ stub D3DXVec3Unproject -@ stdcall D3DXVec4Cross(ptr ptr ptr) +@ stdcall D3DXVec4Cross(ptr ptr ptr ptr) @ stdcall D3DXVec4Normalize(ptr ptr) @ stdcall D3DXVec4Hermite(ptr ptr ptr ptr ptr long) -@ stdcall D3DXVec4CatmullRom(ptr ptr ptr ptr long) +@ stdcall D3DXVec4CatmullRom(ptr ptr ptr ptr long long) @ stdcall D3DXVec4BaryCentric(ptr ptr ptr ptr long long) @ stdcall D3DXVec4Transform(ptr ptr ptr) @ stdcall D3DXMatrixfDeterminant(ptr)

1 0

Tim Schwartz : netapi32: Add stub for NetUseEnum().
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: db994bf6ed82a7cf048e17091477ed35540e6e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db994bf6ed82a7cf048e17091… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Tue Oct 30 15:34:48 2007 -0500 netapi32: Add stub for NetUseEnum(). --- dlls/netapi32/netapi32.c | 8 ++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index d095647..8847e24 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -157,3 +157,11 @@ DWORD WINAPI NetpNetBiosStatusToApiStatus(DWORD nrc) } return ret; } + +NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize, + LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) +{ + FIXME("stub (%p, %d, %p, %d, %p, %p, %p)\n", server, level, bufptr, prefmaxsize, + entriesread, totalentries, resumehandle); + return ERROR_NOT_SUPPORTED; +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index e546151..2750497 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -199,7 +199,7 @@ @ stdcall NetStatisticsGet(wstr wstr long long ptr) @ stdcall NetUseAdd(wstr long ptr ptr) @ stub NetUseDel -@ stub NetUseEnum +@ stdcall NetUseEnum(wstr long ptr long ptr ptr ptr) @ stub NetUseGetInfo @ stdcall NetUserAdd(wstr long ptr ptr) @ stdcall NetUserChangePassword(wstr wstr wstr wstr)

1 0

Michael Stefaniuc : pdh: Fix two missing LeaveCriticalSection() on error paths.
by Alexandre Julliard 31 Oct '07

31 Oct '07

Module: wine Branch: master Commit: 9056049882b41bbc399673794f842113ddf8a61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9056049882b41bbc399673794… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 30 21:10:09 2007 +0100 pdh: Fix two missing LeaveCriticalSection() on error paths. --- dlls/pdh/pdh_main.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 37613ed..69c12df 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -407,7 +407,11 @@ PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle ) WaitForSingleObject( thread, INFINITE ); EnterCriticalSection( &pdh_handle_cs ); - if (query->magic != PDH_MAGIC_QUERY) return ERROR_SUCCESS; + if (query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; + } CloseHandle( query->stop ); CloseHandle( query->thread ); query->thread = NULL; @@ -530,7 +534,11 @@ PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HAND WaitForSingleObject( thread, INFINITE ); EnterCriticalSection( &pdh_handle_cs ); - if (query->magic != PDH_MAGIC_QUERY) return PDH_INVALID_HANDLE; + if (query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } CloseHandle( query->thread ); query->thread = NULL; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2007