[gvg] 15620: Alexandre Julliard <[e-mail]>

Alexandre Julliard <julliard(a)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(a)codeweavers.com>
- Rename MODULENAME_Dll* functions to Dll* for better consistency and
  type checking.
Vincent Beron <vberon(a)mecano.gme.usherb.ca>
- Use SUBLANG_NEUTRAL for French resources.
Modified: trunk/reactos/lib/shdocvw/Fr.rc
Modified: trunk/reactos/lib/shdocvw/Makefile.in
Modified: trunk/reactos/lib/shdocvw/regsvr.c
Modified: trunk/reactos/lib/shdocvw/shdocvw.spec
Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c
  _____  

Modified: trunk/reactos/lib/shdocvw/Fr.rc
--- trunk/reactos/lib/shdocvw/Fr.rc	2005-05-28 21:32:23 UTC (rev
15619)
+++ trunk/reactos/lib/shdocvw/Fr.rc	2005-05-28 21:34:33 UTC (rev
15620)
@@ -16,7 +16,7 @@

  * 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
  _____  

Modified: trunk/reactos/lib/shdocvw/Makefile.in
--- trunk/reactos/lib/shdocvw/Makefile.in	2005-05-28 21:32:23 UTC
(rev 15619)
+++ trunk/reactos/lib/shdocvw/Makefile.in	2005-05-28 21:34:33 UTC
(rev 15620)
@@ -4,6 +4,7 @@

 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shdocvw.dll
+IMPORTLIB = libshdocvw.$(IMPLIBEXT)
 IMPORTS   = urlmon ole32 user32 advapi32 kernel32
 EXTRALIBS = -luuid
 
  _____  

Modified: trunk/reactos/lib/shdocvw/regsvr.c
--- trunk/reactos/lib/shdocvw/regsvr.c	2005-05-28 21:32:23 UTC (rev
15619)
+++ trunk/reactos/lib/shdocvw/regsvr.c	2005-05-28 21:34:33 UTC (rev
15620)
@@ -523,7 +523,7 @@

 
/***********************************************************************
  *		DllRegisterServer (SHDOCVW.@)
  */
-HRESULT WINAPI SHDOCVW_DllRegisterServer(void)
+HRESULT WINAPI DllRegisterServer(void)
 {
     HRESULT hr;
 
@@ -538,7 +538,7 @@
 
/***********************************************************************
  *		DllUnregisterServer (SHDOCVW.@)
  */
-HRESULT WINAPI SHDOCVW_DllUnregisterServer(void)
+HRESULT WINAPI DllUnregisterServer(void)
 {
     HRESULT hr;
 
  _____  

Modified: trunk/reactos/lib/shdocvw/shdocvw.spec
--- trunk/reactos/lib/shdocvw/shdocvw.spec	2005-05-28 21:32:23 UTC
(rev 15619)
+++ trunk/reactos/lib/shdocvw/shdocvw.spec	2005-05-28 21:34:33 UTC
(rev 15620)
@@ -102,12 +102,12 @@

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

Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c
--- trunk/reactos/lib/shdocvw/shdocvw_main.c	2005-05-28 21:32:23 UTC
(rev 15619)
+++ trunk/reactos/lib/shdocvw/shdocvw_main.c	2005-05-28 21:34:33 UTC
(rev 15620)
@@ -128,7 +128,7 @@

 
/***********************************************************************
**
  *              DllCanUnloadNow (SHDOCVW.@)
  */
-HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void)
+HRESULT WINAPI DllCanUnloadNow(void)
 {
     HRESULT moz_can_unload = S_OK;
     fnCanUnloadNow pCanUnloadNow;
@@ -443,7 +443,7 @@
 
/***********************************************************************
**
  *              DllGetClassObject (SHDOCVW.@)
  */
-HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid,
LPVOID *ppv)
+HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID
*ppv)
 {
     TRACE("\n");
 
@@ -482,7 +482,7 @@
 
/***********************************************************************
  *              DllGetVersion (SHDOCVW.@)
  */
-HRESULT WINAPI SHDOCVW_DllGetVersion(DLLVERSIONINFO *info)
+HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info)
 {
     if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support
DLLVERSIONINFO2\n");
 
@@ -498,7 +498,7 @@
 
/***********************************************************************
**
  *              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));