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

[PROPSYS]

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.
CORE-7716

svn path=/trunk/; revision=61431
This commit is contained in:
Amine Khaldi 2013-12-26 19:11:46 +00:00
parent 5dc3ad07bd
commit 4e38168404
4 changed files with 25 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

20
reactos/dll/win32/propsys/propstore.c
View file

@ -18,31 +18,13 @@
* 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 WIN32_NO_STATUS #include "propsys_private.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include <config.h>
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
//#include "rpcproxy.h"
#include <propsys.h>
#include <wine/debug.h>
//#include "wine/unicode.h"
#include <wine/list.h> #include <wine/list.h>
#include <initguid.h> #include <initguid.h>
//#include "propsys_private.h"
DEFINE_GUID(FMTID_NamedProperties, 0xd5cdd505, 0x2e9c, 0x101b, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae); DEFINE_GUID(FMTID_NamedProperties, 0xd5cdd505, 0x2e9c, 0x101b, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae);
WINE_DEFAULT_DEBUG_CHANNEL(propsys);
typedef struct { typedef struct {
struct list entry; struct list entry;
DWORD pid; DWORD pid;

19
reactos/dll/win32/propsys/propsys_main.c
View file

@ -19,26 +19,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
*/ */
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include <config.h>
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include <rpcproxy.h>
#include <propsys.h>
#include <wine/debug.h>
#include <wine/unicode.h>
#include "propsys_private.h" #include "propsys_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(propsys); #include <rpcproxy.h>
static HINSTANCE propsys_hInstance; static HINSTANCE propsys_hInstance;

21
reactos/dll/win32/propsys/propsys_private.h
View file

@ -18,4 +18,25 @@
* 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 <config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION
#include <windef.h>
#include <winbase.h>
#include <objbase.h>
#include <propsys.h>
#include <wine/debug.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(propsys);
HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN;

19
reactos/dll/win32/propsys/propvar.c
View file

@ -18,28 +18,13 @@
* 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 WIN32_NO_STATUS #include "propsys_private.h"
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
//#include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#define NONAMELESSUNION
#include <windef.h>
#include <winbase.h>
//#include "winerror.h"
#include <winreg.h> #include <winreg.h>
//#include "winuser.h" #include <oleauto.h>
#include <shlobj.h>
#include <propvarutil.h> #include <propvarutil.h>
#include <wine/debug.h>
#include <wine/unicode.h>
WINE_DEFAULT_DEBUG_CHANNEL(propsys);
static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest,
REFPROPVARIANT propvarSrc, VARTYPE vt) REFPROPVARIANT propvarSrc, VARTYPE vt)
{ {