From 8935863f550fd26e8cc111dd92a90d4c9b15ef01 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 15 Jul 2015 15:57:51 +0900 Subject: [PATCH] winebuild: Add DllMain to the list of functions that should be private. --- dlls/acledit/acledit.spec | 2 +- dlls/gpkcsp/gpkcsp.spec | 2 +- dlls/xinput1_3/xinput1_3.spec | 2 +- dlls/xinput1_4/xinput1_4.spec | 2 +- tools/winebuild/parser.c | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/acledit/acledit.spec b/dlls/acledit/acledit.spec index e1a30a1c708..73432908ff9 100644 --- a/dlls/acledit/acledit.spec +++ b/dlls/acledit/acledit.spec @@ -1,7 +1,7 @@ 1 stub EditAuditInfo 2 stub EditOwnerInfo 3 stub EditPermissionInfo -4 stdcall DllMain(long long ptr) +4 stdcall -private DllMain(long long ptr) 5 stdcall FMExtensionProcW(long long long) 6 stub SedDiscretionaryAclEditor 7 stub SedSystemAclEditor diff --git a/dlls/gpkcsp/gpkcsp.spec b/dlls/gpkcsp/gpkcsp.spec index af3cdee2ae5..7b21641fd9e 100644 --- a/dlls/gpkcsp/gpkcsp.spec +++ b/dlls/gpkcsp/gpkcsp.spec @@ -21,6 +21,6 @@ @ stub CPSetProvParam @ stub CPSignHash @ stub CPVerifySignature -@ stdcall DllMain(ptr long ptr) +@ stdcall -private DllMain(ptr long ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index 5b7f1b97cb3..af4f1e00c81 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -1,4 +1,4 @@ -1 stdcall DllMain(long long ptr) +1 stdcall -private DllMain(long long ptr) 2 stdcall XInputGetState(long ptr) 3 stdcall XInputSetState(long ptr) 4 stdcall XInputGetCapabilities(long long ptr) diff --git a/dlls/xinput1_4/xinput1_4.spec b/dlls/xinput1_4/xinput1_4.spec index a9116665abd..9d08286b822 100644 --- a/dlls/xinput1_4/xinput1_4.spec +++ b/dlls/xinput1_4/xinput1_4.spec @@ -1,4 +1,4 @@ -1 stdcall DllMain(long long ptr) +1 stdcall -private DllMain(long long ptr) 2 stdcall XInputGetState(long ptr) xinput1_3.XInputGetState 3 stdcall XInputSetState(long ptr) xinput1_3.XInputSetState 4 stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 9252ee8f31c..1d7b84e883d 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -603,6 +603,7 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) { if (!strcmp( odp->name, "DllRegisterServer" ) || !strcmp( odp->name, "DllUnregisterServer" ) || + !strcmp( odp->name, "DllMain" ) || !strcmp( odp->name, "DllGetClassObject" ) || !strcmp( odp->name, "DllGetVersion" ) || !strcmp( odp->name, "DllInstall" ) ||