ddrawex: Convert dll registration to the IRegistrar mechanism.
This commit is contained in:
Alexandre Julliard
parent
5940d37d11
commit
d3bb2ee811
|
|
@ -4,7 +4,8 @@ IMPORTS = dxguid uuid ddraw ole32 advapi32
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
ddraw.c \
|
ddraw.c \
|
||||||
main.c \
|
main.c \
|
||||||
regsvr.c \
|
|
||||||
surface.c
|
surface.c
|
||||||
|
|
||||||
|
IDL_R_SRCS = ddrawex.idl
|
||||||
|
|
||||||
@MAKE_DLL_RULES@
|
@MAKE_DLL_RULES@
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,25 @@
|
||||||
|
/*
|
||||||
|
* COM Classes for ddrawex
|
||||||
|
*
|
||||||
|
* Copyright 2010 Alexandre Julliard
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
*/
|
||||||
|
|
||||||
|
[
|
||||||
|
threading(both),
|
||||||
|
uuid(4fd2a832-86c8-11d0-8fca-00c04fd9189d)
|
||||||
|
]
|
||||||
|
coclass DirectDrawFactory { interface IDirectDrawFactory; }
|
||||||
|
|
@ -27,6 +27,8 @@
|
||||||
|
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "wingdi.h"
|
#include "wingdi.h"
|
||||||
|
#include "objbase.h"
|
||||||
|
#include "rpcproxy.h"
|
||||||
|
|
||||||
#include "ddraw.h"
|
#include "ddraw.h"
|
||||||
|
|
||||||
|
|
@ -35,6 +37,7 @@
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ddrawex);
|
WINE_DEFAULT_DEBUG_CHANNEL(ddrawex);
|
||||||
|
|
||||||
|
static HINSTANCE instance;
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* IDirectDrawClassFactory::QueryInterface
|
* IDirectDrawClassFactory::QueryInterface
|
||||||
|
|
@ -296,14 +299,32 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
|
||||||
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* DllMain (DDRAWEX.0)
|
* DllMain
|
||||||
*
|
*/
|
||||||
***********************************************************************/
|
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv)
|
||||||
BOOL WINAPI
|
|
||||||
DllMain(HINSTANCE hInstDLL,
|
|
||||||
DWORD Reason,
|
|
||||||
LPVOID lpv)
|
|
||||||
{
|
{
|
||||||
TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv);
|
switch (reason)
|
||||||
|
{
|
||||||
|
case DLL_PROCESS_ATTACH:
|
||||||
|
instance = hInstDLL;
|
||||||
|
DisableThreadLibraryCalls( hInstDLL );
|
||||||
|
break;
|
||||||
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
* DllRegisterServer (DDRAWEX.@)
|
||||||
|
*/
|
||||||
|
HRESULT WINAPI DllRegisterServer(void)
|
||||||
|
{
|
||||||
|
return __wine_register_resources( instance, NULL );
|
||||||
|
}
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
* DllUnregisterServer (DDRAWEX.@)
|
||||||
|
*/
|
||||||
|
HRESULT WINAPI DllUnregisterServer(void)
|
||||||
|
{
|
||||||
|
return __wine_unregister_resources( instance, NULL );
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,295 +0,0 @@
|
||||||
/*
|
|
||||||
* self-registerable dll functions for ddrawex.dll
|
|
||||||
*
|
|
||||||
* Copyright (C) 2003 John K. Hohm
|
|
||||||
* Copyright (C) 2007 Francois Gouget for CodeWeavers
|
|
||||||
*
|
|
||||||
* 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 <stdarg.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "winreg.h"
|
|
||||||
#include "wingdi.h"
|
|
||||||
#include "winuser.h"
|
|
||||||
#include "winerror.h"
|
|
||||||
|
|
||||||
#include "ddraw.h"
|
|
||||||
#include "ddrawex_private.h"
|
|
||||||
|
|
||||||
#include "wine/debug.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Near the bottom of this file are the exported DllRegisterServer and
|
|
||||||
* DllUnregisterServer, which make all this worthwhile.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* interface for self-registering
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct regsvr_coclass
|
|
||||||
{
|
|
||||||
CLSID const *clsid; /* NULL for end of list */
|
|
||||||
LPCSTR name; /* can be NULL to omit */
|
|
||||||
LPCSTR ips; /* can be NULL to omit */
|
|
||||||
LPCSTR ips32; /* can be NULL to omit */
|
|
||||||
LPCSTR ips32_tmodel; /* can be NULL to omit */
|
|
||||||
LPCSTR clsid_str; /* can be NULL to omit */
|
|
||||||
LPCSTR progid; /* can be NULL to omit */
|
|
||||||
};
|
|
||||||
|
|
||||||
static HRESULT register_coclasses(struct regsvr_coclass const *list);
|
|
||||||
static HRESULT unregister_coclasses(struct regsvr_coclass const *list);
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* static string constants
|
|
||||||
*/
|
|
||||||
static WCHAR const interface_keyname[10] = {
|
|
||||||
'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 };
|
|
||||||
static WCHAR const base_ifa_keyname[14] = {
|
|
||||||
'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c',
|
|
||||||
'e', 0 };
|
|
||||||
static WCHAR const num_methods_keyname[11] = {
|
|
||||||
'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 };
|
|
||||||
static WCHAR const ps_clsid_keyname[15] = {
|
|
||||||
'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
|
|
||||||
'i', 'd', 0 };
|
|
||||||
static WCHAR const ps_clsid32_keyname[17] = {
|
|
||||||
'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's',
|
|
||||||
'i', 'd', '3', '2', 0 };
|
|
||||||
static WCHAR const clsid_keyname[6] = {
|
|
||||||
'C', 'L', 'S', 'I', 'D', 0 };
|
|
||||||
static WCHAR const ips_keyname[13] = {
|
|
||||||
'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
|
|
||||||
0 };
|
|
||||||
static WCHAR const ips32_keyname[15] = {
|
|
||||||
'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r',
|
|
||||||
'3', '2', 0 };
|
|
||||||
static WCHAR const progid_keyname[7] = {
|
|
||||||
'P', 'r', 'o', 'g', 'I', 'D', 0 };
|
|
||||||
static char const tmodel_valuename[] = "ThreadingModel";
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* static helper functions
|
|
||||||
*/
|
|
||||||
static LONG register_key_defvalueW(HKEY base, WCHAR const *name,
|
|
||||||
WCHAR const *value);
|
|
||||||
static LONG register_key_defvalueA(HKEY base, WCHAR const *name,
|
|
||||||
char const *value);
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* register_coclasses
|
|
||||||
*/
|
|
||||||
static HRESULT register_coclasses(struct regsvr_coclass const *list)
|
|
||||||
{
|
|
||||||
LONG res = ERROR_SUCCESS;
|
|
||||||
HKEY coclass_key;
|
|
||||||
|
|
||||||
res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0,
|
|
||||||
KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL);
|
|
||||||
if (res != ERROR_SUCCESS) goto error_return;
|
|
||||||
|
|
||||||
for (; res == ERROR_SUCCESS && list->clsid; ++list) {
|
|
||||||
WCHAR buf[39];
|
|
||||||
HKEY clsid_key;
|
|
||||||
|
|
||||||
StringFromGUID2(list->clsid, buf, 39);
|
|
||||||
res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0,
|
|
||||||
KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL);
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
|
|
||||||
|
|
||||||
if (list->name) {
|
|
||||||
res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ,
|
|
||||||
(CONST BYTE*)(list->name),
|
|
||||||
strlen(list->name) + 1);
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (list->ips) {
|
|
||||||
res = register_key_defvalueA(clsid_key, ips_keyname, list->ips);
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (list->ips32) {
|
|
||||||
HKEY ips32_key;
|
|
||||||
|
|
||||||
res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0,
|
|
||||||
KEY_READ | KEY_WRITE, NULL,
|
|
||||||
&ips32_key, NULL);
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
|
||||||
|
|
||||||
res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ,
|
|
||||||
(CONST BYTE*)list->ips32,
|
|
||||||
lstrlenA(list->ips32) + 1);
|
|
||||||
if (res == ERROR_SUCCESS && list->ips32_tmodel)
|
|
||||||
res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ,
|
|
||||||
(CONST BYTE*)list->ips32_tmodel,
|
|
||||||
strlen(list->ips32_tmodel) + 1);
|
|
||||||
RegCloseKey(ips32_key);
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (list->clsid_str) {
|
|
||||||
res = register_key_defvalueA(clsid_key, clsid_keyname,
|
|
||||||
list->clsid_str);
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (list->progid) {
|
|
||||||
HKEY progid_key;
|
|
||||||
|
|
||||||
res = register_key_defvalueA(clsid_key, progid_keyname,
|
|
||||||
list->progid);
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
|
||||||
|
|
||||||
res = RegCreateKeyExA(HKEY_CLASSES_ROOT, list->progid, 0,
|
|
||||||
NULL, 0, KEY_READ | KEY_WRITE, NULL,
|
|
||||||
&progid_key, NULL);
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
|
||||||
|
|
||||||
res = register_key_defvalueW(progid_key, clsid_keyname, buf);
|
|
||||||
RegCloseKey(progid_key);
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_clsid_key;
|
|
||||||
}
|
|
||||||
|
|
||||||
error_close_clsid_key:
|
|
||||||
RegCloseKey(clsid_key);
|
|
||||||
}
|
|
||||||
|
|
||||||
error_close_coclass_key:
|
|
||||||
RegCloseKey(coclass_key);
|
|
||||||
error_return:
|
|
||||||
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* unregister_coclasses
|
|
||||||
*/
|
|
||||||
static HRESULT unregister_coclasses(struct regsvr_coclass const *list)
|
|
||||||
{
|
|
||||||
LONG res = ERROR_SUCCESS;
|
|
||||||
HKEY coclass_key;
|
|
||||||
|
|
||||||
res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0,
|
|
||||||
KEY_READ | KEY_WRITE, &coclass_key);
|
|
||||||
if (res == ERROR_FILE_NOT_FOUND) return S_OK;
|
|
||||||
if (res != ERROR_SUCCESS) goto error_return;
|
|
||||||
|
|
||||||
for (; res == ERROR_SUCCESS && list->clsid; ++list) {
|
|
||||||
WCHAR buf[39];
|
|
||||||
|
|
||||||
StringFromGUID2(list->clsid, buf, 39);
|
|
||||||
res = RegDeleteTreeW(coclass_key, buf);
|
|
||||||
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
|
|
||||||
|
|
||||||
if (list->progid) {
|
|
||||||
res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid);
|
|
||||||
if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
|
|
||||||
if (res != ERROR_SUCCESS) goto error_close_coclass_key;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
error_close_coclass_key:
|
|
||||||
RegCloseKey(coclass_key);
|
|
||||||
error_return:
|
|
||||||
return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* regsvr_key_defvalueW
|
|
||||||
*/
|
|
||||||
static LONG register_key_defvalueW(
|
|
||||||
HKEY base,
|
|
||||||
WCHAR const *name,
|
|
||||||
WCHAR const *value)
|
|
||||||
{
|
|
||||||
LONG res;
|
|
||||||
HKEY key;
|
|
||||||
|
|
||||||
res = RegCreateKeyExW(base, name, 0, NULL, 0,
|
|
||||||
KEY_READ | KEY_WRITE, NULL, &key, NULL);
|
|
||||||
if (res != ERROR_SUCCESS) return res;
|
|
||||||
res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
|
|
||||||
(lstrlenW(value) + 1) * sizeof(WCHAR));
|
|
||||||
RegCloseKey(key);
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* regsvr_key_defvalueA
|
|
||||||
*/
|
|
||||||
static LONG register_key_defvalueA(
|
|
||||||
HKEY base,
|
|
||||||
WCHAR const *name,
|
|
||||||
char const *value)
|
|
||||||
{
|
|
||||||
LONG res;
|
|
||||||
HKEY key;
|
|
||||||
|
|
||||||
res = RegCreateKeyExW(base, name, 0, NULL, 0,
|
|
||||||
KEY_READ | KEY_WRITE, NULL, &key, NULL);
|
|
||||||
if (res != ERROR_SUCCESS) return res;
|
|
||||||
res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value,
|
|
||||||
lstrlenA(value) + 1);
|
|
||||||
RegCloseKey(key);
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* coclass list
|
|
||||||
*/
|
|
||||||
|
|
||||||
static struct regsvr_coclass const coclass_list[] = {
|
|
||||||
{ &CLSID_DirectDrawFactory,
|
|
||||||
NULL,
|
|
||||||
NULL,
|
|
||||||
"ddrawex.dll",
|
|
||||||
"Both"
|
|
||||||
},
|
|
||||||
{ NULL } /* list terminator */
|
|
||||||
};
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* DllRegisterServer (DDRAWEX.@)
|
|
||||||
*/
|
|
||||||
HRESULT WINAPI DllRegisterServer(void)
|
|
||||||
{
|
|
||||||
HRESULT hr;
|
|
||||||
|
|
||||||
TRACE("\n");
|
|
||||||
|
|
||||||
hr = register_coclasses(coclass_list);
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
* DllUnregisterServer (DDRAWEX.@)
|
|
||||||
*/
|
|
||||||
HRESULT WINAPI DllUnregisterServer(void)
|
|
||||||
{
|
|
||||||
HRESULT hr;
|
|
||||||
|
|
||||||
TRACE("\n");
|
|
||||||
|
|
||||||
hr = unregister_coclasses(coclass_list);
|
|
||||||
return hr;
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue