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
This commit is contained in:
Gé van Geldorp 2005-05-28 21:34:33 +00:00
parent e9c01796ad
commit 74c1a38507
5 changed files with 14 additions and 13 deletions

View file

@ -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

View file

@ -4,6 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = shdocvw.dll
IMPORTLIB = libshdocvw.$(IMPLIBEXT)
IMPORTS = urlmon ole32 user32 advapi32 kernel32
EXTRALIBS = -luuid

View file

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

View file

@ -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

View file

@ -128,7 +128,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
/*************************************************************************
* DllCanUnloadNow (SHDOCVW.@)
*/
HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void)
HRESULT WINAPI DllCanUnloadNow(void)
{
HRESULT moz_can_unload = S_OK;
fnCanUnloadNow pCanUnloadNow;
@ -443,7 +443,7 @@ static BOOL SHDOCVW_TryLoadMozillaControl()
/*************************************************************************
* 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 @@ HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *p
/***********************************************************************
* 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 @@ HRESULT WINAPI SHDOCVW_DllGetVersion(DLLVERSIONINFO *info)
/*************************************************************************
* 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));