From 55ef9a5a68765d415517c7ee8ef02a97824f9364 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Mon, 24 Apr 2000 18:03:54 +0000 Subject: [PATCH] Fixed issues found by winapi_check. --- dlls/comctl32/comctl32.spec | 2 +- dlls/comctl32/commctrl.c | 10 ++++++ dlls/dinput/dinput.spec | 8 ++--- dlls/dinput/dinput_main.c | 42 ++++++++++++++++++++++ dlls/dplayx/dpclassfactory.c | 11 +++++- dlls/dplayx/dplayx.spec | 4 +-- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shell32_main.c | 2 +- dlls/urlmon/Makefile.in | 4 ++- dlls/urlmon/urlmon.spec | 10 +++--- dlls/urlmon/urlmon_main.c | 68 ++++++++++++++++++++++++++++++++++++ dlls/wininet/Makefile.in | 3 +- dlls/wininet/wininet.spec | 2 +- dlls/wininet/wininet_main.c | 25 +++++++++++++ 14 files changed, 175 insertions(+), 18 deletions(-) create mode 100644 dlls/urlmon/urlmon_main.c create mode 100644 dlls/wininet/wininet_main.c diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 088c0e76df3..3141238723a 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -32,7 +32,7 @@ rsrc comctl32 23 stdcall CreateToolbarEx(long long long long long long ptr long long long long long long) CreateToolbarEx 24 stdcall DestroyPropertySheetPage(long) DestroyPropertySheetPage 25 stdcall DllGetVersion(ptr) COMCTL32_DllGetVersion - 26 stub DllInstall + 26 stdcall DllInstall(long ptr) COMCTL32_DllInstall 27 stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA 28 stdcall DrawStatusTextW(long ptr wstr long) DrawStatusTextW 29 stdcall FlatSB_EnableScrollBar (long long long) FlatSB_EnableScrollBar diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index abae86d4af1..175a1220377 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -852,6 +852,16 @@ COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi) return S_OK; } +/*********************************************************************** + * DllInstall (COMCTL32.@) + */ +HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", + debugstr_w(cmdline)); + + return S_OK; +} static int iTrackMax = 0; static HWND TrackingList[10]; diff --git a/dlls/dinput/dinput.spec b/dlls/dinput/dinput.spec index 564f9b5808e..a7daa791287 100644 --- a/dlls/dinput/dinput.spec +++ b/dlls/dinput/dinput.spec @@ -3,7 +3,7 @@ type win32 @ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA @ stub DirectInputCreateW -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall DllCanUnloadNow() DINPUT_DllCanUnloadNow +@ stdcall DllGetClassObject(ptr ptr ptr) DINPUT_DllGetClassObject +@ stdcall DllRegisterServer() DINPUT_DllRegisterServer +@ stdcall DllUnregisterServer() DINPUT_DllUnregisterServer diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 08a991be5cc..622dbcb24fd 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -2273,3 +2273,45 @@ static ICOM_VTABLE(IDirectInputDevice2A) JoystickAvt = IDirectInputDevice2AImpl_SendDeviceData, }; #endif + +/*********************************************************************** + * DllCanUnloadNow (DINPUT.@) + */ +HRESULT WINAPI DINPUT_DllCanUnloadNow(void) +{ + FIXME("(void): stub\n"); + + return S_FALSE; +} + +/*********************************************************************** + * DllGetClassObject (DINPUT.@) + */ +HRESULT WINAPI DINPUT_DllGetClassObject(REFCLSID rclsid, REFIID riid, + LPVOID *ppv) +{ + FIXME("(%p, %p, %p): stub\n", debugstr_guid(rclsid), + debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllRegisterServer (DINPUT.@) + */ +HRESULT WINAPI DINPUT_DllRegisterServer(void) +{ + FIXME("(void): stub\n"); + + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (DINPUT.@) + */ +HRESULT WINAPI DINPUT_DllUnregisterServer(void) +{ + FIXME("(void): stub\n"); + + return S_OK; +} diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index a69116b61d2..0b338133b48 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -95,7 +95,7 @@ static IClassFactoryImpl DP_and_DPL_CF = {&DP_and_DPL_Vtbl, 1 }; * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, * E_UNEXPECTED */ -DWORD WINAPI DP_and_DPL_DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID *ppv) +DWORD WINAPI DPLAYX_DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID *ppv) { TRACE("(%p,%p,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); @@ -111,3 +111,12 @@ DWORD WINAPI DP_and_DPL_DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID *pp return CLASS_E_CLASSNOTAVAILABLE; } +/*********************************************************************** + * DllCanUnloadNow (DPLAYX.@) + */ +HRESULT WINAPI DPLAYX_DllCanUnloadNow(void) +{ + FIXME("(void): stub\n"); + + return S_FALSE; +} diff --git a/dlls/dplayx/dplayx.spec b/dlls/dplayx/dplayx.spec index a821fe61ce3..e56f92844ab 100644 --- a/dlls/dplayx/dplayx.spec +++ b/dlls/dplayx/dplayx.spec @@ -11,5 +11,5 @@ import ole32.dll 5 stdcall DirectPlayLobbyCreateW(ptr ptr ptr ptr long) DirectPlayLobbyCreateW 6 stub gdwDPlaySPRefCount 9 stdcall DirectPlayEnumerate(ptr ptr) DirectPlayEnumerateA - 10 stub DllCanUnloadNow - 11 stdcall DllGetClassObject(ptr ptr ptr) DP_and_DPL_DllGetClassObject + 10 stdcall DllCanUnloadNow() DPLAYX_DllCanUnloadNow + 11 stdcall DllGetClassObject(ptr ptr ptr) DPLAYX_DllGetClassObject diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 65540d5c86a..44e546ed2eb 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -396,4 +396,4 @@ import comctl32.dll 1224 stdcall SHFileOperationA (ptr) SHFileOperationA # exported by name 1225 stdcall SHFileOperationW (ptr) SHFileOperationW # exported by name -1226 stdcall DllInstall (long wstr) DllInstall # win98:202 +1226 stdcall DllInstall (long wstr) SHELL32_DllInstall # win98:202 diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index e3423affd57..1916da56444 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -876,7 +876,7 @@ BOOL WINAPI Shell32LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) * LPCWSTR pszCmdLine - command line (unused by shell32?) */ -HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +HRESULT WINAPI SHELL32_DllInstall(BOOL bInstall, LPCWSTR cmdline) { FIXME("(%s, %s): stub!\n", bInstall ? "TRUE":"FALSE", debugstr_w(cmdline)); diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index 3993b8992a1..054fde4606d 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -9,7 +9,9 @@ WRCEXTRA = -s -p$(MODULE) SPEC_SRCS = urlmon.spec -C_SRCS = umon.c +C_SRCS = \ + umon.c \ + urlmon_main.c @MAKE_DLL_RULES@ diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 92e86704a51..a2f97c76b65 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -25,12 +25,12 @@ import ole32.dll @ stub CreateAsyncBindCtxEx @ stub CreateFormatEnumerator @ stdcall CreateURLMoniker(ptr str ptr) CreateURLMoniker -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllInstall -@ stub DllRegisterServer +@ stdcall DllCanUnloadNow() URLMON_DllCanUnloadNow +@ stdcall DllGetClassObject(ptr ptr ptr) URLMON_DllGetClassObject +@ stdcall DllInstall(long ptr) URLMON_DllInstall +@ stdcall DllRegisterServer() URLMON_DllRegisterServer @ stub DllRegisterServerEx -@ stub DllUnregisterServer +@ stdcall DllUnregisterServer() URLMON_DllUnregisterServer @ stub Extract @ stub FaultInIEFeature @ stub FindMediaType diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c new file mode 100644 index 00000000000..a37089798be --- /dev/null +++ b/dlls/urlmon/urlmon_main.c @@ -0,0 +1,68 @@ +/* + * UrlMon + * + * Copyright (c) 2000 Patrik Stridvall + * + */ + +#include "windef.h" +#include "winerror.h" +#include "wtypes.h" + +#include "debugtools.h" + +DEFAULT_DEBUG_CHANNEL(win32); + +/*********************************************************************** + * URLMON_DllInstall (URLMON.@) + */ +HRESULT WINAPI URLMON_DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", + debugstr_w(cmdline)); + + return S_OK; +} + +/*********************************************************************** + * DllCanUnloadNow (URLMON.@) + */ +HRESULT WINAPI URLMON_DllCanUnloadNow(void) +{ + FIXME("(void): stub\n"); + + return S_FALSE; +} + +/*********************************************************************** + * DllGetClassObject (URLMON.@) + */ +HRESULT WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID riid, + LPVOID *ppv) +{ + FIXME("(%p, %p, %p): stub\n", debugstr_guid(rclsid), + debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllRegisterServer (URLMON.@) + */ +HRESULT WINAPI URLMON_DllRegisterServer(void) +{ + FIXME("(void): stub\n"); + + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (URLMON.@) + */ +HRESULT WINAPI URLMON_DllUnregisterServer(void) +{ + FIXME("(void): stub\n"); + + return S_OK; +} + diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 4181df4f82b..1bab6178a59 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -10,7 +10,8 @@ SPEC_SRCS = wininet.spec C_SRCS = \ internet.c \ ftp.c \ - utility.c + utility.c \ + wininet_main.c @MAKE_DLL_RULES@ diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 9308726b953..6ee7e52d7c7 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -16,7 +16,7 @@ init WININET_LibMain @ stub DeleteUrlCacheContainerW @ stub DeleteUrlCacheEntry @ stub DeleteUrlCacheGroup -@ stub DllInstall +@ stdcall DllInstall(long ptr) WININET_DllInstall @ stub FindCloseUrlCache @ stub FindFirstUrlCacheContainerA @ stub FindFirstUrlCacheContainerW diff --git a/dlls/wininet/wininet_main.c b/dlls/wininet/wininet_main.c new file mode 100644 index 00000000000..6cc40f217f1 --- /dev/null +++ b/dlls/wininet/wininet_main.c @@ -0,0 +1,25 @@ +/* + * WinInet + * + * Copyright (c) 2000 Patrik Stridvall + * + */ + +#include "windef.h" +#include "winerror.h" + +#include "debugtools.h" + +DEFAULT_DEBUG_CHANNEL(wininet); + +/*********************************************************************** + * WININET_DllInstall (WININET.@) + */ +HRESULT WINAPI WININET_DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", + debugstr_w(cmdline)); + + return S_OK; +} +