Rename MODULENAME_Dll* functions to Dll* for better consistency and

type checking.
This commit is contained in:
Robert Shearman 2005-05-17 14:41:37 +00:00 committed by Alexandre Julliard
parent 4417574d2c
commit 54160222a0
26 changed files with 79 additions and 76 deletions

View File

@ -1,4 +1,4 @@
@ stdcall -private DllCanUnloadNow() DEVENUM_DllCanUnloadNow @ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(ptr ptr ptr) DEVENUM_DllGetClassObject @ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall -private DllRegisterServer() DEVENUM_DllRegisterServer @ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer() DEVENUM_DllUnregisterServer @ stdcall -private DllUnregisterServer()

View File

@ -66,7 +66,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
/*********************************************************************** /***********************************************************************
* DllGetClassObject (DEVENUM.@) * DllGetClassObject (DEVENUM.@)
*/ */
HRESULT WINAPI DEVENUM_DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
{ {
TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv);
@ -85,7 +85,7 @@ HRESULT WINAPI DEVENUM_DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *pp
/*********************************************************************** /***********************************************************************
* DllCanUnloadNow (DEVENUM.@) * DllCanUnloadNow (DEVENUM.@)
*/ */
HRESULT WINAPI DEVENUM_DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
return dll_refs != 0 ? S_FALSE : S_OK; return dll_refs != 0 ? S_FALSE : S_OK;
} }
@ -93,7 +93,7 @@ HRESULT WINAPI DEVENUM_DllCanUnloadNow(void)
/*********************************************************************** /***********************************************************************
* DllRegisterServer (DEVENUM.@) * DllRegisterServer (DEVENUM.@)
*/ */
HRESULT WINAPI DEVENUM_DllRegisterServer(void) HRESULT WINAPI DllRegisterServer(void)
{ {
HRESULT res; HRESULT res;
HKEY hkeyClsid = NULL; HKEY hkeyClsid = NULL;
@ -289,7 +289,7 @@ HRESULT WINAPI DEVENUM_DllRegisterServer(void)
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (DEVENUM.@) * DllUnregisterServer (DEVENUM.@)
*/ */
HRESULT WINAPI DEVENUM_DllUnregisterServer(void) HRESULT WINAPI DllUnregisterServer(void)
{ {
FIXME("stub!\n"); FIXME("stub!\n");
return E_FAIL; return E_FAIL;

View File

@ -1,4 +1,4 @@
@ stdcall -private DllCanUnloadNow() DMCOMPOS_DllCanUnloadNow @ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(long long ptr) DMCOMPOS_DllGetClassObject @ stdcall -private DllGetClassObject(long long ptr)
@ stdcall -private DllRegisterServer() DMCOMPOS_DllRegisterServer @ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer() DMCOMPOS_DllUnregisterServer @ stdcall -private DllUnregisterServer()

View File

@ -302,7 +302,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
* *
* *
*/ */
HRESULT WINAPI DMCOMPOS_DllCanUnloadNow(void) { HRESULT WINAPI DllCanUnloadNow(void) {
return DMCOMPOS_refCount != 0 ? S_FALSE : S_OK; return DMCOMPOS_refCount != 0 ? S_FALSE : S_OK;
} }
@ -312,7 +312,7 @@ HRESULT WINAPI DMCOMPOS_DllCanUnloadNow(void) {
* *
* *
*/ */
HRESULT WINAPI DMCOMPOS_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) {
TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv);
if (IsEqualCLSID (rclsid, &CLSID_DirectMusicChordMap) && IsEqualIID (riid, &IID_IClassFactory)) { if (IsEqualCLSID (rclsid, &CLSID_DirectMusicChordMap) && IsEqualIID (riid, &IID_IClassFactory)) {
*ppv = (LPVOID) &ChordMap_CF; *ppv = (LPVOID) &ChordMap_CF;

View File

@ -531,7 +531,8 @@ static struct regsvr_interface const interface_list[] = {
/*********************************************************************** /***********************************************************************
* DllRegisterServer (DMCOMPOS.3) * DllRegisterServer (DMCOMPOS.3)
*/ */
HRESULT WINAPI DMCOMPOS_DllRegisterServer(void) { HRESULT WINAPI DllRegisterServer(void)
{
HRESULT hr; HRESULT hr;
TRACE("\n"); TRACE("\n");
@ -545,7 +546,8 @@ HRESULT WINAPI DMCOMPOS_DllRegisterServer(void) {
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (DMCOMPOS.4) * DllUnregisterServer (DMCOMPOS.4)
*/ */
HRESULT WINAPI DMCOMPOS_DllUnregisterServer(void) { HRESULT WINAPI DllUnregisterServer(void)
{
HRESULT hr; HRESULT hr;
TRACE("\n"); TRACE("\n");

View File

@ -1,4 +1,4 @@
@ stdcall -private DllCanUnloadNow() DMIME_DllCanUnloadNow @ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(long long ptr) DMIME_DllGetClassObject @ stdcall -private DllGetClassObject(long long ptr)
@ stdcall -private DllRegisterServer() DMIME_DllRegisterServer @ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer() DMIME_DllUnregisterServer @ stdcall -private DllUnregisterServer()

View File

@ -752,7 +752,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
* *
* *
*/ */
HRESULT WINAPI DMIME_DllCanUnloadNow(void) { HRESULT WINAPI DllCanUnloadNow(void)
{
return DMIME_refCount != 0 ? S_FALSE : S_OK; return DMIME_refCount != 0 ? S_FALSE : S_OK;
} }
@ -762,7 +763,7 @@ HRESULT WINAPI DMIME_DllCanUnloadNow(void) {
* *
* *
*/ */
HRESULT WINAPI DMIME_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{ {
TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv);
if (IsEqualCLSID (rclsid, &CLSID_DirectMusicPerformance) && IsEqualIID (riid, &IID_IClassFactory)) { if (IsEqualCLSID (rclsid, &CLSID_DirectMusicPerformance) && IsEqualIID (riid, &IID_IClassFactory)) {

View File

@ -611,7 +611,7 @@ static struct regsvr_interface const interface_list[] = {
/*********************************************************************** /***********************************************************************
* DllRegisterServer (DMIME.3) * DllRegisterServer (DMIME.3)
*/ */
HRESULT WINAPI DMIME_DllRegisterServer(void) { HRESULT WINAPI DllRegisterServer(void) {
HRESULT hr; HRESULT hr;
TRACE("\n"); TRACE("\n");
@ -625,7 +625,7 @@ HRESULT WINAPI DMIME_DllRegisterServer(void) {
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (DMIME.4) * DllUnregisterServer (DMIME.4)
*/ */
HRESULT WINAPI DMIME_DllUnregisterServer(void) { HRESULT WINAPI DllUnregisterServer(void) {
HRESULT hr; HRESULT hr;
TRACE("\n"); TRACE("\n");

View File

@ -1,4 +1,4 @@
@ stdcall -private DllCanUnloadNow() DMSTYLE_DllCanUnloadNow @ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(long long ptr) DMSTYLE_DllGetClassObject @ stdcall -private DllGetClassObject(long long ptr)
@ stdcall -private DllRegisterServer() DMSTYLE_DllRegisterServer @ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer() DMSTYLE_DllUnregisterServer @ stdcall -private DllUnregisterServer()

View File

@ -452,7 +452,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
* *
* *
*/ */
HRESULT WINAPI DMSTYLE_DllCanUnloadNow(void) { HRESULT WINAPI DllCanUnloadNow(void) {
return DMSTYLE_refCount != 0 ? S_FALSE : S_OK; return DMSTYLE_refCount != 0 ? S_FALSE : S_OK;
} }
@ -462,7 +462,7 @@ HRESULT WINAPI DMSTYLE_DllCanUnloadNow(void) {
* *
* *
*/ */
HRESULT WINAPI DMSTYLE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) {
TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv);
if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSection) && IsEqualIID (riid, &IID_IClassFactory)) { if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSection) && IsEqualIID (riid, &IID_IClassFactory)) {

View File

@ -563,7 +563,7 @@ static struct regsvr_interface const interface_list[] = {
/*********************************************************************** /***********************************************************************
* DllRegisterServer (DMSTYLE.3) * DllRegisterServer (DMSTYLE.3)
*/ */
HRESULT WINAPI DMSTYLE_DllRegisterServer() { HRESULT WINAPI DllRegisterServer() {
HRESULT hr; HRESULT hr;
TRACE("\n"); TRACE("\n");
@ -577,7 +577,7 @@ HRESULT WINAPI DMSTYLE_DllRegisterServer() {
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (DMSTYLE.4) * DllUnregisterServer (DMSTYLE.4)
*/ */
HRESULT WINAPI DMSTYLE_DllUnregisterServer() { HRESULT WINAPI DllUnregisterServer() {
HRESULT hr; HRESULT hr;
TRACE("\n"); TRACE("\n");

View File

@ -1,8 +1,6 @@
1 stdcall DirectSoundCreate(ptr ptr ptr) 1 stdcall DirectSoundCreate(ptr ptr ptr)
2 stdcall DirectSoundEnumerateA(ptr ptr) 2 stdcall DirectSoundEnumerateA(ptr ptr)
3 stdcall DirectSoundEnumerateW(ptr ptr) 3 stdcall DirectSoundEnumerateW(ptr ptr)
4 stdcall -private DllCanUnloadNow() DSOUND_DllCanUnloadNow
5 stdcall -private DllGetClassObject(ptr ptr ptr) DSOUND_DllGetClassObject
6 stdcall DirectSoundCaptureCreate(ptr ptr ptr) DirectSoundCaptureCreate8 6 stdcall DirectSoundCaptureCreate(ptr ptr ptr) DirectSoundCaptureCreate8
7 stdcall DirectSoundCaptureEnumerateA(ptr ptr) 7 stdcall DirectSoundCaptureEnumerateA(ptr ptr)
8 stdcall DirectSoundCaptureEnumerateW(ptr ptr) 8 stdcall DirectSoundCaptureEnumerateW(ptr ptr)
@ -10,5 +8,7 @@
10 stdcall DirectSoundFullDuplexCreate(ptr ptr ptr ptr long long ptr ptr ptr ptr) 10 stdcall DirectSoundFullDuplexCreate(ptr ptr ptr ptr long long ptr ptr ptr ptr)
11 stdcall DirectSoundCreate8(ptr ptr ptr) 11 stdcall DirectSoundCreate8(ptr ptr ptr)
12 stdcall DirectSoundCaptureCreate8(ptr ptr ptr) 12 stdcall DirectSoundCaptureCreate8(ptr ptr ptr)
@ stdcall -private DllRegisterServer() DSOUND_DllRegisterServer @ stdcall -private DllCanUnloadNow()
@ stdcall -private DllUnregisterServer() DSOUND_DllUnregisterServer @ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer()

View File

@ -570,7 +570,7 @@ static IClassFactoryImpl DSOUND_PRIVATE_CF = { &DSPCF_Vtbl, 1 };
* Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG,
* E_UNEXPECTED * E_UNEXPECTED
*/ */
DWORD WINAPI DSOUND_DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID *ppv) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{ {
TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
@ -640,7 +640,7 @@ DWORD WINAPI DSOUND_DllGetClassObject(REFCLSID rclsid,REFIID riid,LPVOID *ppv)
* Success: S_OK * Success: S_OK
* Failure: S_FALSE * Failure: S_FALSE
*/ */
DWORD WINAPI DSOUND_DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
FIXME("(void): stub\n"); FIXME("(void): stub\n");
return S_FALSE; return S_FALSE;

View File

@ -555,7 +555,7 @@ static struct regsvr_interface const interface_list[] = {
/*********************************************************************** /***********************************************************************
* DllRegisterServer (DSOUND.@) * DllRegisterServer (DSOUND.@)
*/ */
HRESULT WINAPI DSOUND_DllRegisterServer(void) HRESULT WINAPI DllRegisterServer(void)
{ {
HRESULT hr; HRESULT hr;
@ -570,7 +570,7 @@ HRESULT WINAPI DSOUND_DllRegisterServer(void)
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (DSOUND.@) * DllUnregisterServer (DSOUND.@)
*/ */
HRESULT WINAPI DSOUND_DllUnregisterServer(void) HRESULT WINAPI DllUnregisterServer(void)
{ {
HRESULT hr; HRESULT hr;

View File

@ -1,5 +1,5 @@
13 stdcall doWinMain(long ptr) 13 stdcall doWinMain(long ptr)
14 stdcall HtmlHelpA(ptr ptr long long) 14 stdcall HtmlHelpA(ptr ptr long long)
15 stdcall HtmlHelpW(ptr ptr long long) 15 stdcall HtmlHelpW(ptr ptr long long)
@ stdcall -private DllRegisterServer() HHCTRL_DllRegisterServer @ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer() HHCTRL_DllUnregisterServer @ stdcall -private DllUnregisterServer()

View File

@ -542,7 +542,7 @@ static struct regsvr_interface const interface_list[] = {
/*********************************************************************** /***********************************************************************
* DllRegisterServer (HHCTRL.@) * DllRegisterServer (HHCTRL.@)
*/ */
HRESULT WINAPI HHCTRL_DllRegisterServer(void) HRESULT WINAPI DllRegisterServer(void)
{ {
HRESULT hr; HRESULT hr;
@ -557,7 +557,7 @@ HRESULT WINAPI HHCTRL_DllRegisterServer(void)
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (HHCTRL.@) * DllUnregisterServer (HHCTRL.@)
*/ */
HRESULT WINAPI HHCTRL_DllUnregisterServer(void) HRESULT WINAPI DllUnregisterServer(void)
{ {
HRESULT hr; HRESULT hr;

View File

@ -5,7 +5,7 @@
252 stdcall OleCreatePictureIndirect(ptr ptr long ptr) oleaut32.OleCreatePictureIndirect 252 stdcall OleCreatePictureIndirect(ptr ptr long ptr) oleaut32.OleCreatePictureIndirect
253 stdcall OleCreateFontIndirect(ptr ptr ptr) oleaut32.OleCreateFontIndirect 253 stdcall OleCreateFontIndirect(ptr ptr ptr) oleaut32.OleCreateFontIndirect
254 stdcall OleTranslateColor(long long long) oleaut32.OleTranslateColor 254 stdcall OleTranslateColor(long long long) oleaut32.OleTranslateColor
@ stdcall -private DllCanUnloadNow() OLEPRO32_DllCanUnloadNow @ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject( ptr ptr ptr ) OLEPRO32_DllGetClassObject @ stdcall -private DllGetClassObject( ptr ptr ptr )
@ stdcall -private DllRegisterServer() OLEPRO32_DllRegisterServer @ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer() OLEPRO32_DllUnregisterServer @ stdcall -private DllUnregisterServer()

View File

@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (OLEPRO32.258) * DllUnregisterServer (OLEPRO32.258)
*/ */
HRESULT WINAPI OLEPRO32_DllUnregisterServer() HRESULT WINAPI DllUnregisterServer()
{ {
FIXME("not implemented (olepro32.dll) \n"); FIXME("not implemented (olepro32.dll) \n");
return S_OK; return S_OK;
@ -43,7 +43,7 @@ HRESULT WINAPI OLEPRO32_DllUnregisterServer()
/*********************************************************************** /***********************************************************************
* DllRegisterServer (OLEPRO32.257) * DllRegisterServer (OLEPRO32.257)
*/ */
HRESULT WINAPI OLEPRO32_DllRegisterServer() HRESULT WINAPI DllRegisterServer()
{ {
FIXME("not implemented (olepro32.dll) \n"); FIXME("not implemented (olepro32.dll) \n");
return S_OK; return S_OK;
@ -52,7 +52,7 @@ HRESULT WINAPI OLEPRO32_DllRegisterServer()
/*********************************************************************** /***********************************************************************
* DllCanUnloadNow (OLEPRO32.255) * DllCanUnloadNow (OLEPRO32.255)
*/ */
HRESULT WINAPI OLEPRO32_DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
FIXME("not implemented (olepro32.dll) \n"); FIXME("not implemented (olepro32.dll) \n");
return S_OK; return S_OK;
@ -61,7 +61,7 @@ HRESULT WINAPI OLEPRO32_DllCanUnloadNow(void)
/*********************************************************************** /***********************************************************************
* DllGetClassObject (OLEPRO32.256) * DllGetClassObject (OLEPRO32.256)
*/ */
HRESULT WINAPI OLEPRO32_DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv )
{ {
FIXME("not implemented (olepro32.dll) \n"); FIXME("not implemented (olepro32.dll) \n");
return S_OK; return S_OK;

View File

@ -162,7 +162,7 @@ static IClassFactoryVtbl DSCF_Vtbl =
* Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG,
* E_UNEXPECTED * E_UNEXPECTED
*/ */
DWORD WINAPI QUARTZ_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{ {
unsigned int i; unsigned int i;
IClassFactoryImpl *factory; IClassFactoryImpl *factory;
@ -200,7 +200,7 @@ DWORD WINAPI QUARTZ_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
/*********************************************************************** /***********************************************************************
* DllCanUnloadNow (QUARTZ.@) * DllCanUnloadNow (QUARTZ.@)
*/ */
HRESULT WINAPI QUARTZ_DllCanUnloadNow() HRESULT WINAPI DllCanUnloadNow()
{ {
return dll_ref != 0 ? S_FALSE : S_OK; return dll_ref != 0 ? S_FALSE : S_OK;
} }

View File

@ -2,8 +2,8 @@
@ stub AMGetErrorTextW @ stub AMGetErrorTextW
@ stdcall AmpFactorToDB(long) @ stdcall AmpFactorToDB(long)
@ stdcall DBToAmpFactor(long) @ stdcall DBToAmpFactor(long)
@ stdcall -private DllCanUnloadNow() QUARTZ_DllCanUnloadNow @ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(ptr ptr ptr) QUARTZ_DllGetClassObject @ stdcall -private DllGetClassObject(ptr ptr ptr)
@ stdcall -private DllRegisterServer() QUARTZ_DllRegisterServer @ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer() QUARTZ_DllUnregisterServer @ stdcall -private DllUnregisterServer()
@ stub GetProxyDllInfo @ stub GetProxyDllInfo

View File

@ -1124,7 +1124,7 @@ static struct regsvr_filter const filter_list[] = {
/*********************************************************************** /***********************************************************************
* DllRegisterServer (QUARTZ.@) * DllRegisterServer (QUARTZ.@)
*/ */
HRESULT WINAPI QUARTZ_DllRegisterServer(void) HRESULT WINAPI DllRegisterServer(void)
{ {
HRESULT hr; HRESULT hr;
@ -1145,7 +1145,7 @@ HRESULT WINAPI QUARTZ_DllRegisterServer(void)
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (QUARTZ.@) * DllUnregisterServer (QUARTZ.@)
*/ */
HRESULT WINAPI QUARTZ_DllUnregisterServer(void) HRESULT WINAPI DllUnregisterServer(void)
{ {
HRESULT hr; HRESULT hr;

View File

@ -3572,7 +3572,7 @@ static const WCHAR szDefaultKeys[2][65] = {
* Microsoft Strong Cryptographpic Provider * Microsoft Strong Cryptographpic Provider
* - HKLM\Software\Microsoft\Cryptography\Defaults\Provider Types\Type 001 * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider Types\Type 001
*/ */
HRESULT WINAPI RSAENH_DllRegisterServer() HRESULT WINAPI DllRegisterServer()
{ {
HKEY key; HKEY key;
DWORD dp; DWORD dp;
@ -3649,7 +3649,7 @@ HRESULT WINAPI RSAENH_DllRegisterServer()
* NOTES * NOTES
* For the relevant keys see DllRegisterServer. * For the relevant keys see DllRegisterServer.
*/ */
HRESULT WINAPI RSAENH_DllUnregisterServer() HRESULT WINAPI DllUnregisterServer()
{ {
RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[0]); RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[0]);
RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[1]); RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[1]);

View File

@ -23,5 +23,5 @@
@ stdcall CPSetProvParam(long long ptr long) RSAENH_CPSetProvParam @ stdcall CPSetProvParam(long long ptr long) RSAENH_CPSetProvParam
@ stdcall CPSignHash(long long long wstr long ptr ptr) RSAENH_CPSignHash @ stdcall CPSignHash(long long long wstr long ptr ptr) RSAENH_CPSignHash
@ stdcall CPVerifySignature(long long ptr long long wstr long) RSAENH_CPVerifySignature @ stdcall CPVerifySignature(long long ptr long long wstr long) RSAENH_CPVerifySignature
@ stdcall -private DllRegisterServer() RSAENH_DllRegisterServer @ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer() RSAENH_DllUnregisterServer @ stdcall -private DllUnregisterServer()

View File

@ -523,7 +523,7 @@ static struct regsvr_interface const interface_list[] = {
/*********************************************************************** /***********************************************************************
* DllRegisterServer (SHDOCVW.@) * DllRegisterServer (SHDOCVW.@)
*/ */
HRESULT WINAPI SHDOCVW_DllRegisterServer(void) HRESULT WINAPI DllRegisterServer(void)
{ {
HRESULT hr; HRESULT hr;
@ -538,7 +538,7 @@ HRESULT WINAPI SHDOCVW_DllRegisterServer(void)
/*********************************************************************** /***********************************************************************
* DllUnregisterServer (SHDOCVW.@) * DllUnregisterServer (SHDOCVW.@)
*/ */
HRESULT WINAPI SHDOCVW_DllUnregisterServer(void) HRESULT WINAPI DllUnregisterServer(void)
{ {
HRESULT hr; HRESULT hr;

View File

@ -102,12 +102,12 @@
228 stub -noname SafeOpenPromptForShellExec 228 stub -noname SafeOpenPromptForShellExec
229 stub -noname SafeOpenPromptForPackager 229 stub -noname SafeOpenPromptForPackager
@ stdcall -private DllCanUnloadNow() SHDOCVW_DllCanUnloadNow @ stdcall -private DllCanUnloadNow()
@ stdcall -private DllGetClassObject(long long ptr) SHDOCVW_DllGetClassObject @ stdcall -private DllGetClassObject(long long ptr)
@ stdcall DllGetVersion(ptr) SHDOCVW_DllGetVersion @ stdcall -private DllGetVersion(ptr)
@ stdcall DllInstall(long wstr) SHDOCVW_DllInstall @ stdcall -private DllInstall(long wstr)
@ stdcall -private DllRegisterServer() SHDOCVW_DllRegisterServer @ stdcall -private DllRegisterServer()
@ stdcall -private DllUnregisterServer() SHDOCVW_DllUnregisterServer @ stdcall -private DllUnregisterServer()
@ stub DllRegisterWindowClasses @ stub DllRegisterWindowClasses
@ stub DoAddToFavDlg @ stub DoAddToFavDlg
@ stub DoAddToFavDlgW @ stub DoAddToFavDlgW

View File

@ -128,7 +128,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
/************************************************************************* /*************************************************************************
* DllCanUnloadNow (SHDOCVW.@) * DllCanUnloadNow (SHDOCVW.@)
*/ */
HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
HRESULT moz_can_unload = S_OK; HRESULT moz_can_unload = S_OK;
fnCanUnloadNow pCanUnloadNow; fnCanUnloadNow pCanUnloadNow;
@ -443,7 +443,7 @@ static BOOL SHDOCVW_TryLoadMozillaControl()
/************************************************************************* /*************************************************************************
* DllGetClassObject (SHDOCVW.@) * DllGetClassObject (SHDOCVW.@)
*/ */
HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
{ {
TRACE("\n"); TRACE("\n");
@ -482,7 +482,7 @@ HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *p
/*********************************************************************** /***********************************************************************
* DllGetVersion (SHDOCVW.@) * DllGetVersion (SHDOCVW.@)
*/ */
HRESULT WINAPI SHDOCVW_DllGetVersion(DLLVERSIONINFO *info) HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info)
{ {
if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support DLLVERSIONINFO2\n"); if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support DLLVERSIONINFO2\n");
@ -498,7 +498,7 @@ HRESULT WINAPI SHDOCVW_DllGetVersion(DLLVERSIONINFO *info)
/************************************************************************* /*************************************************************************
* DllInstall (SHDOCVW.@) * DllInstall (SHDOCVW.@)
*/ */
HRESULT WINAPI SHDOCVW_DllInstall(BOOL bInstall, LPCWSTR cmdline) HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
{ {
FIXME("(%s, %s): stub!\n", bInstall ? "TRUE":"FALSE", debugstr_w(cmdline)); FIXME("(%s, %s): stub!\n", bInstall ? "TRUE":"FALSE", debugstr_w(cmdline));