Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch from Filip Navara updating comctl32

Browse source 
svn path=/trunk/; revision=6084
This commit is contained in:
Vizzini 2003-09-15 02:48:15 +00:00
parent 5cb3c6a572
commit 6c6b49d3cb
6 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/dk/w32/Makefile
View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.5 2003/01/07 18:20:34 robd Exp $ # $Id: Makefile,v 1.6 2003/09/15 02:48:15 vizzini Exp $
# #
# PROJECT : ReactOS Operating System # PROJECT : ReactOS Operating System
# FILE : reactos/dk/w32/Makefile # FILE : reactos/dk/w32/Makefile
@ -54,7 +54,8 @@ MODULES_CRT=\
$(TARGET_FOLDER_LIB)/msvcrt.a $(TARGET_FOLDER_LIB)/msvcrt.a
MODULES_MISC=\ MODULES_MISC=\
$(TARGET_FOLDER_LIB)/version.a $(TARGET_FOLDER_LIB)/version.a\
$(TARGET_FOLDER_LIB)/winmm.a
MODULES_WINE=\ MODULES_WINE=\
$(TARGET_FOLDER_LIB)/libwine.a\ $(TARGET_FOLDER_LIB)/libwine.a\
@ -129,11 +130,11 @@ $(TARGET_FOLDER_LIB)/shell32.a: $(PATH_TO_TOP)/lib/shell32/shell32.def
-D shell32.dll\ -D shell32.dll\
-d $(PATH_TO_TOP)/lib/shell32/shell32.def -d $(PATH_TO_TOP)/lib/shell32/shell32.def
$(TARGET_FOLDER_LIB)/comctl32.a: $(PATH_TO_TOP)/../wine/dlls/comctl32/comctl32.def $(TARGET_FOLDER_LIB)/comctl32.a: $(PATH_TO_TOP)/lib/comctl32/comctl32.def
$(DLLTOOL) \ $(DLLTOOL) \
$(DTFLAGS)\ $(DTFLAGS)\
-D comctl32.dll\ -D comctl32.dll\
-d $(PATH_TO_TOP)/../wine/dlls/comctl32/comctl32.def -d $(PATH_TO_TOP)/lib/comctl32/comctl32.def
$(TARGET_FOLDER_LIB)/$(SHELL32_ALIAS).a: $(PATH_TO_TOP)/lib/shell32/shell32.def $(TARGET_FOLDER_LIB)/$(SHELL32_ALIAS).a: $(PATH_TO_TOP)/lib/shell32/shell32.def
@ -231,6 +232,12 @@ $(TARGET_FOLDER_LIB)/version.a: $(PATH_TO_TOP)/lib/version/version.def
-D version.dll\ -D version.dll\
-d $(PATH_TO_TOP)/lib/version/version.def -d $(PATH_TO_TOP)/lib/version/version.def
$(TARGET_FOLDER_LIB)/winmm.a: $(PATH_TO_TOP)/lib/winmm/winmm.def
$(DLLTOOL) \
$(DTFLAGS)\
-D winmm.dll\
-d $(PATH_TO_TOP)/lib/winmm/winmm.def
# --- WINE --- # --- WINE ---
$(TARGET_FOLDER_LIB)/ole32.a: $(PATH_TO_TOP)/../wine/dlls/ole32/ole32.def $(TARGET_FOLDER_LIB)/ole32.a: $(PATH_TO_TOP)/../wine/dlls/ole32/ole32.def

15
reactos/include/wine/debugtools.h
View file

@ -1,17 +1,8 @@
#ifndef __WINE_DEBUGTOOLS_H #ifndef __WINE_DEBUGTOOLS_H
#define __WINE_DEBUGTOOLS_H #define __WINE_DEBUGTOOLS_H
#ifndef __NTDLL__
#include <stdarg.h> #include <stdarg.h>
#include "config.h" #include <wchar.h>
#include "windef.h"
#else
#include <windows.h>
#endif /* __NTDLL__ */
struct _GUID; struct _GUID;
@ -110,10 +101,6 @@ inline static const char *debugres_w( const WCHAR *s ) { return wine_dbgstr_wn(
#define WINE_DEFAULT_DEBUG_CHANNEL(ch) DEFAULT_DEBUG_CHANNEL(ch) #define WINE_DEFAULT_DEBUG_CHANNEL(ch) DEFAULT_DEBUG_CHANNEL(ch)
#define WINE_DEFAULT_DEBUG_CHANNEL(ch) DEFAULT_DEBUG_CHANNEL(ch)
#define WINE_DEFAULT_DEBUG_CHANNEL(ch) DEFAULT_DEBUG_CHANNEL(ch)
#define DPRINTF wine_dbg_printf #define DPRINTF wine_dbg_printf
#define MESSAGE wine_dbg_printf #define MESSAGE wine_dbg_printf

3
reactos/include/wine/port.h
View file

@ -13,7 +13,4 @@ typedef short INT16;
#define snprintf _snprintf #define snprintf _snprintf
#define strcasecmp _stricmp #define strcasecmp _stricmp
/* Wine debugging porting */
#include "debugtools.h"
#endif /* _ROS_WINE_PORT */ #endif /* _ROS_WINE_PORT */

2
reactos/lib/user32/user32.def
View file

@ -183,7 +183,7 @@ DrawCaptionTempW@28
DrawEdge@16 DrawEdge@16
DrawFocusRect@8 DrawFocusRect@8
DrawFrame@16 DrawFrame@16
DrawFrameControl DrawFrameControl@16
DrawIcon@16 DrawIcon@16
DrawIconEx@36 DrawIconEx@36
DrawMenuBar@4 DrawMenuBar@4

2
reactos/lib/winedbgc/porting.h
View file

@ -42,7 +42,9 @@ long interlocked_xchg_add(long *dest, long incr);
#define snprintf _snprintf #define snprintf _snprintf
#define strcasecmp _stricmp #define strcasecmp _stricmp
#ifdef __USE_W32API
#define SLOWORD(l) ((SHORT)(LONG)(l)) #define SLOWORD(l) ((SHORT)(LONG)(l))
#define SHIWORD(l) ((SHORT)((LONG)(l) >> 16)) #define SHIWORD(l) ((SHORT)((LONG)(l) >> 16))
#endif
#endif /* __PORTING_WINE2ROS_H */ #endif /* __PORTING_WINE2ROS_H */

9
reactos/lib/winedbgc/trace.h
View file

@ -47,9 +47,6 @@ void Assert(void* assert, TCHAR* file, int line, void* msg);
void Trace(TCHAR* lpszFormat, ...); void Trace(TCHAR* lpszFormat, ...);
void Trace1(int code, TCHAR* lpszFormat, ...); void Trace1(int code, TCHAR* lpszFormat, ...);
#define TRACE Trace
#define TRACE0 Trace
#else // _DEBUG #else // _DEBUG
#ifndef ASSERT #ifndef ASSERT
@ -57,15 +54,9 @@ void Trace1(int code, TCHAR* lpszFormat, ...);
#define ASSERTMSG(exp, msg) #define ASSERTMSG(exp, msg)
#endif #endif
//#define TRACE0 TRACE
//#define TRACE1 TRACE
void Assert(void* assert, TCHAR* file, int line, void* msg); void Assert(void* assert, TCHAR* file, int line, void* msg);
void Trace(TCHAR* lpszFormat, ...); void Trace(TCHAR* lpszFormat, ...);
#define TRACE 0 ? (void)0 : Trace
#endif // !_DEBUG #endif // !_DEBUG
#endif // __TRACE_H__ #endif // __TRACE_H__