Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[URLMON]

Browse source 
* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
* Improve the GUIDs situation.
* Dedicated to the newborn Olivia !
CORE-7716

svn path=/trunk/; revision=61453
This commit is contained in:
Amine Khaldi 2013-12-27 23:11:32 +00:00
parent 41db8a3768
commit 562e2c1fe2
24 changed files with 12 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/urlmon/axinstall.c
View file

@ -16,20 +16,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define OEMRESOURCE #include "urlmon_main.h"
#include <assert.h> #include <assert.h>
#include "urlmon_main.h"
#include "resource.h" #include "resource.h"
#include "advpub.h"
#include "fdi.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
static const WCHAR ctxW[] = {'c','t','x',0}; static const WCHAR ctxW[] = {'c','t','x',0};
static const WCHAR cab_extW[] = {'.','c','a','b',0}; static const WCHAR cab_extW[] = {'.','c','a','b',0};
static const WCHAR infW[] = {'i','n','f',0}; static const WCHAR infW[] = {'i','n','f',0};

5
reactos/dll/win32/urlmon/bindctx.c
View file

@ -16,12 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
//#include <stdio.h>
#include "urlmon_main.h" #include "urlmon_main.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 };

6
reactos/dll/win32/urlmon/binding.c
View file

@ -17,12 +17,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
//#include "winreg.h"
#include <shlwapi.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
static WCHAR cbinding_contextW[] = {'C','B','i','n','d','i','n','g',' ','C','o','n','t','e','x','t',0}; static WCHAR cbinding_contextW[] = {'C','B','i','n','d','i','n','g',' ','C','o','n','t','e','x','t',0};
static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 };

3
reactos/dll/win32/urlmon/bindprot.c
View file

@ -17,9 +17,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef void (*task_proc_t)(BindProtocol*,task_header_t*); typedef void (*task_proc_t)(BindProtocol*,task_header_t*);

3
reactos/dll/win32/urlmon/download.c
View file

@ -17,9 +17,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct { typedef struct {
IBindStatusCallback IBindStatusCallback_iface; IBindStatusCallback IBindStatusCallback_iface;

6
reactos/dll/win32/urlmon/file.c
View file

@ -17,12 +17,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
//#include "winreg.h"
#include <shlwapi.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct { typedef struct {
IInternetProtocolEx IInternetProtocolEx_iface; IInternetProtocolEx IInternetProtocolEx_iface;

3
reactos/dll/win32/urlmon/format.c
View file

@ -17,9 +17,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
static WCHAR wszEnumFORMATETC[] = {'_','E','n','u','m','F','O','R','M','A','T','E','T','C','_',0}; static WCHAR wszEnumFORMATETC[] = {'_','E','n','u','m','F','O','R','M','A','T','E','T','C','_',0};

7
reactos/dll/win32/urlmon/ftp.c
View file

@ -18,13 +18,6 @@
#include "urlmon_main.h" #include "urlmon_main.h"
#define NO_SHLWAPI_REG
#include <shlwapi.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct { typedef struct {
Protocol base; Protocol base;

3
reactos/dll/win32/urlmon/gopher.c
View file

@ -17,9 +17,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct { typedef struct {
Protocol base; Protocol base;

8
reactos/dll/win32/urlmon/http.c
View file

@ -18,14 +18,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
//#include "wininet.h"
#define NO_SHLWAPI_REG
#include <shlwapi.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct { typedef struct {
Protocol base; Protocol base;

6
reactos/dll/win32/urlmon/internet.c
View file

@ -18,12 +18,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
//#include "winreg.h"
#include <shlwapi.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
static const WCHAR feature_control_keyW[] = static const WCHAR feature_control_keyW[] =
{'S','o','f','t','w','a','r','e','\\', {'S','o','f','t','w','a','r','e','\\',

3
reactos/dll/win32/urlmon/mimefilter.c
View file

@ -17,9 +17,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct { typedef struct {
IInternetProtocol IInternetProtocol_iface; IInternetProtocol IInternetProtocol_iface;

6
reactos/dll/win32/urlmon/mk.c
View file

@ -17,12 +17,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
#include <wine/debug.h>
#define NO_SHLWAPI_REG
#include <shlwapi.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct { typedef struct {
IInternetProtocolEx IInternetProtocolEx_iface; IInternetProtocolEx IInternetProtocolEx_iface;

4
reactos/dll/win32/urlmon/protocol.c
View file

@ -19,10 +19,6 @@
#include "urlmon_main.h" #include "urlmon_main.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
static inline HRESULT report_progress(Protocol *protocol, ULONG status_code, LPCWSTR status_text) static inline HRESULT report_progress(Protocol *protocol, ULONG status_code, LPCWSTR status_text)
{ {
return IInternetProtocolSink_ReportProgress(protocol->protocol_sink, status_code, status_text); return IInternetProtocolSink_ReportProgress(protocol->protocol_sink, status_code, status_text);

2
reactos/dll/win32/urlmon/resource.h
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#pragma once
#define ID_AXINSTALL_WARNING_DLG 1000 #define ID_AXINSTALL_WARNING_DLG 1000
#define ID_AXINSTALL_LOCATION 1001 #define ID_AXINSTALL_LOCATION 1001
#define ID_AXINSTALL_INSTALL_BTN 1002 #define ID_AXINSTALL_INSTALL_BTN 1002

11
reactos/dll/win32/urlmon/sec_mgr.c
View file

@ -21,18 +21,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
//#include <stdio.h>
#include "urlmon_main.h" #include "urlmon_main.h"
//#include "winreg.h"
//#include "wininet.h"
#define NO_SHLWAPI_REG
#include <shlwapi.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
static const WCHAR currentlevelW[] = {'C','u','r','r','e','n','t','L','e','v','e','l',0}; static const WCHAR currentlevelW[] = {'C','u','r','r','e','n','t','L','e','v','e','l',0};
static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0};

5
reactos/dll/win32/urlmon/session.c
View file

@ -17,11 +17,6 @@
*/ */
#include "urlmon_main.h" #include "urlmon_main.h"
//#include "winreg.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct { typedef struct {
LPWSTR protocol; LPWSTR protocol;

7
reactos/dll/win32/urlmon/umon.c
View file

@ -22,14 +22,7 @@
#include "urlmon_main.h" #include "urlmon_main.h"
//#include "winreg.h"
#include <shlwapi.h>
#include <hlink.h> #include <hlink.h>
//#include "shellapi.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct { typedef struct {
IMoniker IMoniker_iface; IMoniker IMoniker_iface;

9
reactos/dll/win32/urlmon/umstream.c
View file

@ -21,15 +21,6 @@
#include "urlmon_main.h" #include "urlmon_main.h"
//#include "winreg.h"
//#include "winternl.h"
//#include "wininet.h"
//#include "shlwapi.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct ProxyBindStatusCallback typedef struct ProxyBindStatusCallback
{ {
IBindStatusCallback IBindStatusCallback_iface; IBindStatusCallback IBindStatusCallback_iface;

8
reactos/dll/win32/urlmon/uri.c
View file

@ -17,13 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
//#include <limits.h>
#include "urlmon_main.h" #include "urlmon_main.h"
#include <wine/debug.h>
#define NO_SHLWAPI_REG
#include <shlwapi.h>
#include <strsafe.h> #include <strsafe.h>
@ -42,8 +36,6 @@
#define COMBINE_URI_FORCE_FLAG_USE 0x1 #define COMBINE_URI_FORCE_FLAG_USE 0x1
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
static const IID IID_IUriObj = {0x4b364760,0x9f51,0x11df,{0x98,0x1c,0x08,0x00,0x20,0x0c,0x9a,0x66}}; static const IID IID_IUriObj = {0x4b364760,0x9f51,0x11df,{0x98,0x1c,0x08,0x00,0x20,0x0c,0x9a,0x66}};
typedef struct { typedef struct {

1
reactos/dll/win32/urlmon/urlmon.rc
View file

@ -18,7 +18,6 @@
#include <windef.h> #include <windef.h>
#include <winuser.h> #include <winuser.h>
#include <commctrl.h>
#include "resource.h" #include "resource.h"

14
reactos/dll/win32/urlmon/urlmon_main.c
View file

@ -18,23 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
//#include <stdarg.h>
#include "urlmon_main.h" #include "urlmon_main.h"
//#include "winreg.h"
#define NO_SHLWAPI_REG
//#include "shlwapi.h"
#include <advpub.h>
#include <initguid.h> #include <initguid.h>
#include <wine/debug.h>
#include "urlmon.h"
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C);
LONG URLMON_refCount = 0; LONG URLMON_refCount = 0;

13
reactos/dll/win32/urlmon/urlmon_main.h
View file

@ -20,12 +20,12 @@
#ifndef __WINE_URLMON_MAIN_H #ifndef __WINE_URLMON_MAIN_H
#define __WINE_URLMON_MAIN_H #define __WINE_URLMON_MAIN_H
#include <stdarg.h>
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <stdarg.h>
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
@ -33,14 +33,19 @@
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <winreg.h> #include <winreg.h>
//#include "winuser.h"
#include <ole2.h> #include <ole2.h>
#include <urlmon.h> #include <urlmon.h>
#include <wininet.h> #include <wininet.h>
#include <shellapi.h> #include <shellapi.h>
#include <advpub.h>
#define NO_SHLWAPI_REG
#include <shlwapi.h>
#include <wine/unicode.h>
#include <wine/list.h> #include <wine/list.h>
#include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; extern HINSTANCE hProxyDll DECLSPEC_HIDDEN;
extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN;

4
reactos/dll/win32/urlmon/usrmarshal.c
View file

@ -18,10 +18,6 @@
#include "urlmon_main.h" #include "urlmon_main.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
HRESULT CALLBACK IWinInetHttpInfo_QueryInfo_Proxy(IWinInetHttpInfo* This, HRESULT CALLBACK IWinInetHttpInfo_QueryInfo_Proxy(IWinInetHttpInfo* This,
DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, DWORD *pdwFlags, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, DWORD *pdwFlags,
DWORD *pdwReserved) DWORD *pdwReserved)