Removed unnecessary code in the 16-bit DllEntryPoint function of some
dlls, and also fixed its ordinal in a few places.
diff --git a/dlls/msacm/msacm.spec b/dlls/msacm/msacm.spec
index 9f03617..e49115f 100644
--- a/dlls/msacm/msacm.spec
+++ b/dlls/msacm/msacm.spec
@@ -1,6 +1,7 @@
- 1 stub WEP
+# 1 stub WEP
2 stub DRIVERPROC
- 3 stub ___EXPORTEDSTUB
+ 3 pascal DllEntryPoint(long word word word long word) MSACM_DllEntryPoint
+ 4 stub ___EXPORTEDSTUB
7 pascal acmGetVersion() acmGetVersion16
8 pascal -ret16 acmMetrics(word word ptr) acmMetrics16
10 pascal -ret16 acmDriverEnum(ptr long long) acmDriverEnum16
@@ -37,4 +38,3 @@
201 stub ACMCLOSECONVERSION
202 stub ACMCONVERT
203 stub ACMCHOOSEFORMAT
-255 pascal DllEntryPoint(long word word word long word) MSACM_DllEntryPoint
diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index 53b17e1..d68f1c1 100644
--- a/dlls/msacm/msacm_main.c
+++ b/dlls/msacm/msacm_main.c
@@ -34,7 +34,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(msacm);
/**************************************************************************
- * DllEntryPoint (MSACM.255)
+ * DllEntryPoint (MSACM.3)
*
* MSACM DLL entry point
*
@@ -42,25 +42,6 @@
BOOL WINAPI MSACM_DllEntryPoint(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds,
WORD wHeapSize, DWORD dwReserved1, WORD wReserved2)
{
- static HANDLE hndl;
-
- TRACE("0x%x 0x%lx\n", hinstDLL, fdwReason);
-
- switch (fdwReason) {
- case DLL_PROCESS_ATTACH:
- if (!hndl && !(hndl = LoadLibraryA("MSACM32.DLL"))) {
- ERR("Could not load sibling MsAcm32.dll\n");
- return FALSE;
- }
- break;
- case DLL_PROCESS_DETACH:
- FreeLibrary(hndl);
- hndl = 0;
- break;
- case DLL_THREAD_ATTACH:
- case DLL_THREAD_DETACH:
- break;
- }
return TRUE;
}
