Commit 32f91739 authored by Damjan Jovanovic's avatar Damjan Jovanovic Committed by Alexandre Julliard

windowscodecs: Add COM proxies and stubs.

parent 0b66a0d3
...@@ -139,6 +139,8 @@ dlls/sti/sti_wia.h ...@@ -139,6 +139,8 @@ dlls/sti/sti_wia.h
dlls/sti/sti_wia_p.c dlls/sti/sti_wia_p.c
dlls/urlmon/urlmon_urlmon.h dlls/urlmon/urlmon_urlmon.h
dlls/urlmon/urlmon_urlmon_p.c dlls/urlmon/urlmon_urlmon_p.c
dlls/windowscodecs/windowscodecs_wincodec.h
dlls/windowscodecs/windowscodecs_wincodec_p.c
include/activaut.h include/activaut.h
include/activdbg.h include/activdbg.h
include/activscp.h include/activscp.h
......
MODULE = windowscodecs.dll MODULE = windowscodecs.dll
IMPORTLIB = windowscodecs IMPORTLIB = windowscodecs
IMPORTS = uuid ole32 shlwapi advapi32 IMPORTS = uuid ole32 oleaut32 shlwapi advapi32 rpcrt4
EXTRAINCL = @PNGINCL@ EXTRAINCL = @PNGINCL@
EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DREGISTER_PROXY_DLL
C_SRCS = \ C_SRCS = \
bmpdecode.c \ bmpdecode.c \
...@@ -27,4 +28,9 @@ C_SRCS = \ ...@@ -27,4 +28,9 @@ C_SRCS = \
RC_SRCS = version.rc RC_SRCS = version.rc
IDL_P_SRCS = \
windowscodecs_wincodec.idl
EXTRA_OBJS = dlldata.o
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
...@@ -36,6 +36,8 @@ ...@@ -36,6 +36,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN;
typedef struct { typedef struct {
REFCLSID classid; REFCLSID classid;
HRESULT (*constructor)(IUnknown*,REFIID,void**); HRESULT (*constructor)(IUnknown*,REFIID,void**);
...@@ -174,7 +176,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) ...@@ -174,7 +176,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
if (info) if (info)
ret = ClassFactoryImpl_Constructor(info, iid, ppv); ret = ClassFactoryImpl_Constructor(info, iid, ppv);
else else
ret = CLASS_E_CLASSNOTAVAILABLE; ret = WIC_DllGetClassObject(rclsid, iid, ppv);
TRACE("<-- %08X\n", ret); TRACE("<-- %08X\n", ret);
return ret; return ret;
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
extern BOOL WINAPI WIC_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{ {
...@@ -44,7 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) ...@@ -44,7 +46,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
break; break;
} }
return TRUE; return WIC_DllMain(hinstDLL, fdwReason, lpvReserved);
} }
HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer,
......
...@@ -1294,13 +1294,18 @@ static struct regsvr_converter const converter_list[] = { ...@@ -1294,13 +1294,18 @@ static struct regsvr_converter const converter_list[] = {
{ NULL } /* list terminator */ { NULL } /* list terminator */
}; };
extern HRESULT WINAPI WIC_DllRegisterServer(void) DECLSPEC_HIDDEN;
extern HRESULT WINAPI WIC_DllUnregisterServer(void) DECLSPEC_HIDDEN;
HRESULT WINAPI DllRegisterServer(void) HRESULT WINAPI DllRegisterServer(void)
{ {
HRESULT hr; HRESULT hr;
TRACE("\n"); TRACE("\n");
hr = register_coclasses(coclass_list); hr = WIC_DllRegisterServer();
if (SUCCEEDED(hr))
hr = register_coclasses(coclass_list);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
register_decoders(decoder_list); register_decoders(decoder_list);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
...@@ -1316,7 +1321,9 @@ HRESULT WINAPI DllUnregisterServer(void) ...@@ -1316,7 +1321,9 @@ HRESULT WINAPI DllUnregisterServer(void)
TRACE("\n"); TRACE("\n");
hr = unregister_coclasses(coclass_list); hr = WIC_DllUnregisterServer();
if (SUCCEEDED(hr))
hr = unregister_coclasses(coclass_list);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
unregister_decoders(decoder_list); unregister_decoders(decoder_list);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
......
/*
* Copyright 2010 Damjan Jovanovic
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "wincodec.idl"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment