Alexandre Julliard <julliard@winehq.org>

- Added rules for building import libraries in the individual dll
  makefiles, and added support for building a .def.a static import
  library too.
Robert Shearman <rob@codeweavers.com>
- Rename MODULENAME_Dll* functions to Dll* for better consistency and
  type checking.
Vincent Beron <vberon@mecano.gme.usherb.ca>
- Use SUBLANG_NEUTRAL for French resources.

svn path=/trunk/; revision=15620

diff --git a/reactos/lib/shdocvw/Fr.rc b/reactos/lib/shdocvw/Fr.rc
index cab59b4..ea315ce 100644 (file)
--- a/reactos/lib/shdocvw/Fr.rc
+++ b/reactos/lib/shdocvw/Fr.rc
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 

-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL

 
 100 DIALOG LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 62
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 
 100 DIALOG LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 62
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

diff --git a/reactos/lib/shdocvw/Makefile.in b/reactos/lib/shdocvw/Makefile.in
index a00485e..a0135b6 100644 (file)
--- a/reactos/lib/shdocvw/Makefile.in
+++ b/reactos/lib/shdocvw/Makefile.in
@@ -4,6 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@\r
 VPATH     = @srcdir@\r
 MODULE    = shdocvw.dll\r
 SRCDIR    = @srcdir@\r
 VPATH     = @srcdir@\r
 MODULE    = shdocvw.dll\r

+IMPORTLIB = libshdocvw.$(IMPLIBEXT)\r

 IMPORTS   = urlmon ole32 user32 advapi32 kernel32\r
 EXTRALIBS = -luuid\r
 \r
 IMPORTS   = urlmon ole32 user32 advapi32 kernel32\r
 EXTRALIBS = -luuid\r
 \r

diff --git a/reactos/lib/shdocvw/regsvr.c b/reactos/lib/shdocvw/regsvr.c
index b81421f..405a856 100644 (file)
--- a/reactos/lib/shdocvw/regsvr.c
+++ b/reactos/lib/shdocvw/regsvr.c
@@ -523,7 +523,7 @@ static struct regsvr_interface const interface_list[] = {
 /***********************************************************************\r
  *             DllRegisterServer (SHDOCVW.@)\r
  */\r
 /***********************************************************************\r
  *             DllRegisterServer (SHDOCVW.@)\r
  */\r

-HRESULT WINAPI SHDOCVW_DllRegisterServer(void)\r
+HRESULT WINAPI DllRegisterServer(void)\r

 {\r
     HRESULT hr;\r
 \r
 {\r
     HRESULT hr;\r
 \r


@@ -538,7 +538,7 @@ HRESULT WINAPI SHDOCVW_DllRegisterServer(void)
 /***********************************************************************\r
  *             DllUnregisterServer (SHDOCVW.@)\r
  */\r
 /***********************************************************************\r
  *             DllUnregisterServer (SHDOCVW.@)\r
  */\r

-HRESULT WINAPI SHDOCVW_DllUnregisterServer(void)\r
+HRESULT WINAPI DllUnregisterServer(void)\r

 {\r
     HRESULT hr;\r
 \r
 {\r
     HRESULT hr;\r
 \r

diff --git a/reactos/lib/shdocvw/shdocvw.spec b/reactos/lib/shdocvw/shdocvw.spec
index c48373d..0ad28c3 100644 (file)
--- a/reactos/lib/shdocvw/shdocvw.spec
+++ b/reactos/lib/shdocvw/shdocvw.spec
@@ -102,12 +102,12 @@
 228 stub -noname SafeOpenPromptForShellExec\r
 229 stub -noname SafeOpenPromptForPackager\r
 \r
 228 stub -noname SafeOpenPromptForShellExec\r
 229 stub -noname SafeOpenPromptForPackager\r
 \r

-@ stdcall -private DllCanUnloadNow() SHDOCVW_DllCanUnloadNow\r
-@ stdcall -private DllGetClassObject(long long ptr) SHDOCVW_DllGetClassObject\r
-@ stdcall DllGetVersion(ptr) SHDOCVW_DllGetVersion\r
-@ stdcall DllInstall(long wstr) SHDOCVW_DllInstall\r
-@ stdcall -private DllRegisterServer() SHDOCVW_DllRegisterServer\r
-@ stdcall -private DllUnregisterServer() SHDOCVW_DllUnregisterServer\r
+@ stdcall -private DllCanUnloadNow()\r
+@ stdcall -private DllGetClassObject(long long ptr)\r
+@ stdcall -private DllGetVersion(ptr)\r
+@ stdcall -private DllInstall(long wstr)\r
+@ stdcall -private DllRegisterServer()\r
+@ stdcall -private DllUnregisterServer()\r

 @ stub DllRegisterWindowClasses\r
 @ stub DoAddToFavDlg\r
 @ stub DoAddToFavDlgW\r
 @ stub DllRegisterWindowClasses\r
 @ stub DoAddToFavDlg\r
 @ stub DoAddToFavDlgW\r

diff --git a/reactos/lib/shdocvw/shdocvw_main.c b/reactos/lib/shdocvw/shdocvw_main.c
index 6d4cc4a..5f94189 100644 (file)
--- a/reactos/lib/shdocvw/shdocvw_main.c
+++ b/reactos/lib/shdocvw/shdocvw_main.c
@@ -128,7 +128,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
 /*************************************************************************\r
  *              DllCanUnloadNow (SHDOCVW.@)\r
  */\r
 /*************************************************************************\r
  *              DllCanUnloadNow (SHDOCVW.@)\r
  */\r

-HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void)\r
+HRESULT WINAPI DllCanUnloadNow(void)\r

 {\r
     HRESULT moz_can_unload = S_OK;\r
     fnCanUnloadNow pCanUnloadNow;\r
 {\r
     HRESULT moz_can_unload = S_OK;\r
     fnCanUnloadNow pCanUnloadNow;\r


@@ -443,7 +443,7 @@ static BOOL SHDOCVW_TryLoadMozillaControl()
 /*************************************************************************\r
  *              DllGetClassObject (SHDOCVW.@)\r
  */\r
 /*************************************************************************\r
  *              DllGetClassObject (SHDOCVW.@)\r
  */\r

-HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)\r
+HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)\r

 {\r
     TRACE("\n");\r
 \r
 {\r
     TRACE("\n");\r
 \r


@@ -482,7 +482,7 @@ HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *p
 /***********************************************************************\r
  *              DllGetVersion (SHDOCVW.@)\r
  */\r
 /***********************************************************************\r
  *              DllGetVersion (SHDOCVW.@)\r
  */\r

-HRESULT WINAPI SHDOCVW_DllGetVersion(DLLVERSIONINFO *info)\r
+HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info)\r

 {\r
     if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support DLLVERSIONINFO2\n");\r
 \r
 {\r
     if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support DLLVERSIONINFO2\n");\r
 \r


@@ -498,7 +498,7 @@ HRESULT WINAPI SHDOCVW_DllGetVersion(DLLVERSIONINFO *info)
 /*************************************************************************\r
  *              DllInstall (SHDOCVW.@)\r
  */\r
 /*************************************************************************\r
  *              DllInstall (SHDOCVW.@)\r
  */\r

-HRESULT WINAPI SHDOCVW_DllInstall(BOOL bInstall, LPCWSTR cmdline)\r
+HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)\r

 {\r
    FIXME("(%s, %s): stub!\n", bInstall ? "TRUE":"FALSE", debugstr_w(cmdline));\r
 \r
 {\r
    FIXME("(%s, %s): stub!\n", bInstall ? "TRUE":"FALSE", debugstr_w(cmdline));\r
 \r