Sync to Wine-20050524: 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. Modified: trunk/reactos/lib/olepro32/Makefile.in Modified: trunk/reactos/lib/olepro32/olepro32.spec Modified: trunk/reactos/lib/olepro32/olepro32stubs.c _____
Modified: trunk/reactos/lib/olepro32/Makefile.in --- trunk/reactos/lib/olepro32/Makefile.in 2005-05-28 09:38:28 UTC (rev 15565) +++ trunk/reactos/lib/olepro32/Makefile.in 2005-05-28 09:38:59 UTC (rev 15566) @@ -3,6 +3,7 @@
SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = olepro32.dll +IMPORTLIB = libolepro32.$(IMPLIBEXT) IMPORTS = oleaut32
C_SRCS = olepro32stubs.c _____
Modified: trunk/reactos/lib/olepro32/olepro32.spec --- trunk/reactos/lib/olepro32/olepro32.spec 2005-05-28 09:38:28 UTC (rev 15565) +++ trunk/reactos/lib/olepro32/olepro32.spec 2005-05-28 09:38:59 UTC (rev 15566) @@ -5,7 +5,7 @@
252 stdcall OleCreatePictureIndirect(ptr ptr long ptr) oleaut32.OleCreatePictureIndirect 253 stdcall OleCreateFontIndirect(ptr ptr ptr) oleaut32.OleCreateFontIndirect 254 stdcall OleTranslateColor(long long long) oleaut32.OleTranslateColor -@ stdcall -private DllCanUnloadNow() OLEPRO32_DllCanUnloadNow -@ stdcall -private DllGetClassObject( ptr ptr ptr ) OLEPRO32_DllGetClassObject -@ stdcall -private DllRegisterServer() OLEPRO32_DllRegisterServer -@ stdcall -private DllUnregisterServer() OLEPRO32_DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject( ptr ptr ptr ) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() _____
Modified: trunk/reactos/lib/olepro32/olepro32stubs.c --- trunk/reactos/lib/olepro32/olepro32stubs.c 2005-05-28 09:38:28 UTC (rev 15565) +++ trunk/reactos/lib/olepro32/olepro32stubs.c 2005-05-28 09:38:59 UTC (rev 15566) @@ -34,7 +34,7 @@
/*********************************************************************** * DllUnregisterServer (OLEPRO32.258) */ -HRESULT WINAPI OLEPRO32_DllUnregisterServer() +HRESULT WINAPI DllUnregisterServer() { FIXME("not implemented (olepro32.dll) \n"); return S_OK; @@ -43,7 +43,7 @@
/*********************************************************************** * DllRegisterServer (OLEPRO32.257) */ -HRESULT WINAPI OLEPRO32_DllRegisterServer() +HRESULT WINAPI DllRegisterServer() { FIXME("not implemented (olepro32.dll) \n"); return S_OK; @@ -52,7 +52,7 @@
/*********************************************************************** * DllCanUnloadNow (OLEPRO32.255) */ -HRESULT WINAPI OLEPRO32_DllCanUnloadNow(void) +HRESULT WINAPI DllCanUnloadNow(void) { FIXME("not implemented (olepro32.dll) \n"); return S_OK; @@ -61,7 +61,7 @@
/*********************************************************************** * DllGetClassObject (OLEPRO32.256) */ -HRESULT WINAPI OLEPRO32_DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) { FIXME("not implemented (olepro32.dll) \n"); return S_OK;