Hans Leidekker : winhttp: Register interfaces and add a typelib resource.
Alexandre Julliard
julliard at winehq.org
Fri Jul 8 11:23:43 CDT 2011
Module: wine
Branch: master
Commit: e688167c73635a5c49a7ef05a92007a03a4ad442
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e688167c73635a5c49a7ef05a92007a03a4ad442
Author: Hans Leidekker <hans at codeweavers.com>
Date: Fri Jul 8 16:46:48 2011 +0200
winhttp: Register interfaces and add a typelib resource.
---
.gitignore | 1 +
dlls/winhttp/Makefile.in | 6 ++++--
dlls/winhttp/main.c | 10 ++++++----
dlls/winhttp/version.rc | 3 +++
dlls/winhttp/winhttp_tlb.idl | 21 +++++++++++++++++++++
tools/wine.inf.in | 1 +
6 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index 63d1433..b4003a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,6 +140,7 @@ dlls/urlmon/urlmon_urlmon_p.c
dlls/vbscript/vbscript_classes.h
dlls/windowscodecs/windowscodecs_wincodec.h
dlls/windowscodecs/windowscodecs_wincodec_p.c
+dlls/winhttp/winhttp_tlb.tlb
dlls/wuapi/wuapi_tlb.tlb
include/activaut.h
include/activdbg.h
diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in
index ed8968e..8cc2343 100644
--- a/dlls/winhttp/Makefile.in
+++ b/dlls/winhttp/Makefile.in
@@ -13,7 +13,9 @@ C_SRCS = \
session.c \
url.c
-RC_SRCS = \
- version.rc
+IDL_TLB_SRCS = winhttp_tlb.idl
+IDL_R_SRCS = winhttp_tlb.idl
+
+RC_SRCS = version.rc
@MAKE_DLL_RULES@
diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c
index 917e13a..d80998f 100644
--- a/dlls/winhttp/main.c
+++ b/dlls/winhttp/main.c
@@ -23,12 +23,15 @@
#include "windef.h"
#include "winbase.h"
#include "objbase.h"
+#include "rpcproxy.h"
#include "httprequest.h"
#include "winhttp.h"
#include "wine/debug.h"
#include "winhttp_private.h"
+static HINSTANCE instance;
+
WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
/******************************************************************
@@ -39,6 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
switch(fdwReason)
{
case DLL_PROCESS_ATTACH:
+ instance = hInstDLL;
DisableThreadLibraryCalls(hInstDLL);
break;
case DLL_PROCESS_DETACH:
@@ -166,8 +170,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
*/
HRESULT WINAPI DllRegisterServer(void)
{
- FIXME("()\n");
- return S_OK;
+ return __wine_register_resources( instance, NULL );
}
/***********************************************************************
@@ -175,6 +178,5 @@ HRESULT WINAPI DllRegisterServer(void)
*/
HRESULT WINAPI DllUnregisterServer(void)
{
- FIXME("()\n");
- return S_OK;
+ return __wine_unregister_resources( instance, NULL );
}
diff --git a/dlls/winhttp/version.rc b/dlls/winhttp/version.rc
index 3dca59f..170ba38 100644
--- a/dlls/winhttp/version.rc
+++ b/dlls/winhttp/version.rc
@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+/* @makedep: winhttp_tlb.tlb */
+1 TYPELIB winhttp_tlb.tlb
+
#define WINE_FILEDESCRIPTION_STR "Wine HTTP Library"
#define WINE_FILENAME_STR "winhttp.dll"
#define WINE_FILEVERSION_MAJOR 5
diff --git a/dlls/winhttp/winhttp_tlb.idl b/dlls/winhttp/winhttp_tlb.idl
new file mode 100644
index 0000000..74beb57
--- /dev/null
+++ b/dlls/winhttp/winhttp_tlb.idl
@@ -0,0 +1,21 @@
+/*
+ * Typelib for winhttp
+ *
+ * Copyright 2011 Hans Leidekker 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 "httprequest.idl"
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index 5493f60..d9159dd 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -2564,6 +2564,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
11,,windowscodecs.dll,1
11,,winegstreamer.dll,1
11,,wineqtdecoder.dll,1
+11,,winhttp.dll,1
11,,wintrust.dll,1
11,,wmiutils.dll,1
11,,wuapi.dll,1
More information about the wine-cvs
mailing list