mirror of
https://github.com/reactos/reactos.git
synced 2024-12-27 09:34:43 +00:00
- Replaced winedbg.dll with static library libwine.a.
svn path=/trunk/; revision=6848
This commit is contained in:
Filip Navara
parent
9b6a56054d
commit
c2642685e7
16 changed files with 22 additions and 146 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile,v 1.183 2003/11/29 14:41:45 rcampbell Exp $
|
||||
# $Id: Makefile,v 1.184 2003/12/02 18:12:04 navaraf Exp $
|
||||
#
|
||||
# Global makefile
|
||||
#
|
||||
|
|
@ -41,8 +41,8 @@ DLLS_KBD = kbdus kbdgr kbdfr
|
|||
# advapi32 cards crtdll fmifs gdi32 imagehlp kernel32 libpcap packet msafd msvcrt ntdll
|
||||
# epsapi psapi richedit rpcrt4 secur32 user32 version ws2help ws2_32 wsock32 wshirda mswsock
|
||||
# imagehlp
|
||||
DLLS = advapi32 cards crtdll fmifs freetype gdi32 kernel32 packet lzexpand msafd \
|
||||
msvcrt ntdll psapi richedit rpcrt4 secur32 syssetup twain user32 version winedbgc \
|
||||
DLLS = libwine advapi32 cards crtdll fmifs freetype gdi32 kernel32 packet lzexpand \
|
||||
msafd msvcrt ntdll psapi richedit rpcrt4 secur32 syssetup twain user32 version \
|
||||
winspool ws2help ws2_32 wsock32 wshirda iphlpapi msgina mswsock msimg32 d3d8thk \
|
||||
winmm ole32 comctl32 $(DLLS_KBD)
|
||||
|
||||
|
|
|
|||
|
|
@ -34,10 +34,8 @@ TARGET_RCFLAGS += -D__REACTOS__ -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501
|
|||
|
||||
TARGET_LFLAGS = -nostartfiles -nostdlib
|
||||
|
||||
TARGET_SDKLIBS = gdi32.a msvcrt.a kernel32.a user32.a advapi32.a winmm.a ole32.a
|
||||
|
||||
# For debugging
|
||||
TARGET_SDKLIBS += ntdll.a winedbgc.a
|
||||
TARGET_SDKLIBS = libwine.a gdi32.a msvcrt.a kernel32.a user32.a advapi32.a \
|
||||
winmm.a ole32.a ntdll.a
|
||||
|
||||
TARGET_BASE = 0x76160000
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ TARGET_NAME = d3d8thk
|
|||
# require os code to explicitly request A/W version of structs/functions
|
||||
TARGET_CFLAGS += -D_DISABLE_TIDENTS -Werror -Wall
|
||||
|
||||
TARGET_SDKLIBS = ntdll.a winedbgc.a
|
||||
TARGET_SDKLIBS = ntdll.a
|
||||
|
||||
TARGET_OBJECTS = win32k.o
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ TARGET_RCFLAGS += -D__REACTOS__ -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501
|
|||
|
||||
TARGET_LFLAGS = -nostartfiles -nostdlib
|
||||
|
||||
TARGET_SDKLIBS = ntdll.a kernel32.a winedbgc.a
|
||||
TARGET_SDKLIBS = ntdll.a kernel32.a libwine.a
|
||||
|
||||
TARGET_BASE = 0x76160000
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ TARGET_BASE=0x76380000
|
|||
# require os code to explicitly request A/W version of structs/functions
|
||||
TARGET_CFLAGS += -D_DISABLE_TIDENTS -D__USE_W32API
|
||||
|
||||
TARGET_SDKLIBS = user32.a kernel32.a winedbgc.a
|
||||
TARGET_SDKLIBS = user32.a kernel32.a libwine.a
|
||||
|
||||
TARGET_OBJECTS = imm.o
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@
|
|||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <tchar.h>
|
||||
#include "porting.h"
|
||||
//#include "trace.h"
|
||||
|
||||
/* ---------------------------------------------------------------------- */
|
||||
|
||||
|
|
@ -62,7 +60,7 @@ static inline void release(void *ptr)
|
|||
}
|
||||
|
||||
/***********************************************************************
|
||||
* wine_dbgstr_an (NTDLL.@)
|
||||
* wine_dbgstr_an
|
||||
*/
|
||||
const char *wine_dbgstr_an(const char *src, int n)
|
||||
{
|
||||
|
|
@ -114,7 +112,7 @@ const char *wine_dbgstr_an(const char *src, int n)
|
|||
}
|
||||
|
||||
/***********************************************************************
|
||||
* wine_dbgstr_wn (NTDLL.@)
|
||||
* wine_dbgstr_wn
|
||||
*/
|
||||
const char *wine_dbgstr_wn(const WCHAR *src, int n)
|
||||
{
|
||||
|
|
@ -166,7 +164,7 @@ const char *wine_dbgstr_wn(const WCHAR *src, int n)
|
|||
}
|
||||
|
||||
/***********************************************************************
|
||||
* wine_dbgstr_guid (NTDLL.@)
|
||||
* wine_dbgstr_guid
|
||||
*/
|
||||
const char *wine_dbgstr_guid(const GUID *id)
|
||||
{
|
||||
|
|
@ -185,8 +183,3 @@ const char *wine_dbgstr_guid(const GUID *id)
|
|||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -1,17 +1,14 @@
|
|||
# $Id: Makefile,v 1.6 2003/12/01 18:28:54 navaraf Exp $
|
||||
# $Id: makefile,v 1.1 2003/12/02 18:12:05 navaraf Exp $
|
||||
|
||||
PATH_TO_TOP = ../..
|
||||
|
||||
TARGET_DEFONLY = yes
|
||||
|
||||
TARGET_TYPE = dynlink
|
||||
TARGET_TYPE = library
|
||||
|
||||
TARGET_NAME = winedbgc
|
||||
TARGET_NAME = libwine
|
||||
|
||||
#TARGET_CFLAGS = -fno-rtti -D_ROS_ -D__WINE__
|
||||
|
||||
#TARGET_CFLAGS = -g -D__NTDLL__
|
||||
TARGET_CFLAGS = -D__NTDLL__
|
||||
#TARGET_CFLAGS = -D__NTDLL__
|
||||
|
||||
# require os code to explicitly request A/W version of structs/functions
|
||||
TARGET_CFLAGS += -D_DISABLE_TIDENTS -Werror -Wall
|
||||
|
|
@ -20,12 +17,8 @@ TARGET_LFLAGS = -Wl,--file-alignment,0x1000 \
|
|||
-Wl,--section-alignment,0x1000 \
|
||||
-nostartfiles
|
||||
|
||||
TARGET_BASE = 0x77a90000
|
||||
|
||||
TARGET_SDKLIBS = ntdll.a kernel32.a
|
||||
|
||||
TARGET_OBJECTS = \
|
||||
winedbgc.o
|
||||
debug.o
|
||||
|
||||
include $(PATH_TO_TOP)/rules.mak
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ TARGET_BASE = 0x76340000
|
|||
# require os code to explicitly request A/W version of structs/functions
|
||||
TARGET_CFLAGS += -DWM_ALTTABACTIVE=0x0029 -D_DISABLE_TIDENTS -D__USE_W32API -Werror -Wall
|
||||
|
||||
TARGET_SDKLIBS = ntdll.a winedbgc.a
|
||||
TARGET_SDKLIBS = ntdll.a libwine.a
|
||||
|
||||
TARGET_OBJECTS = charlist.o reader.o richedit.o text-writer.o
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ TARGET_CFLAGS += \
|
|||
|
||||
TARGET_RCFLAGS += -D__REACTOS__ -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x501
|
||||
|
||||
TARGET_SDKLIBS = ntdll.a winedbgc.a
|
||||
TARGET_SDKLIBS = libwine.a ntdll.a
|
||||
|
||||
TARGET_OBJECTS = \
|
||||
rpcrt4_main.o
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile,v 1.5 2003/12/01 18:28:54 navaraf Exp $
|
||||
# $Id: Makefile,v 1.6 2003/12/02 18:12:05 navaraf Exp $
|
||||
|
||||
PATH_TO_TOP = ../..
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ TARGET_CFLAGS += -D_DISABLE_TIDENTS -Wall -Werror
|
|||
|
||||
TARGET_BASE=0x76380000
|
||||
|
||||
TARGET_SDKLIBS = ntdll.a winedbgc.a
|
||||
TARGET_SDKLIBS = ntdll.a libwine.a
|
||||
|
||||
TARGET_OBJECTS = \
|
||||
capability.o \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: Makefile,v 1.31 2003/12/01 18:28:54 navaraf Exp $
|
||||
# $Id: Makefile,v 1.32 2003/12/02 18:12:05 navaraf Exp $
|
||||
|
||||
PATH_TO_TOP = ../..
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ TARGET_NAME = user32
|
|||
|
||||
TARGET_BASE = 0x77e70000
|
||||
|
||||
TARGET_SDKLIBS = ntdll.a kernel32.a gdi32.a rosrtl.a winedbgc.a
|
||||
TARGET_SDKLIBS = ntdll.a kernel32.a gdi32.a rosrtl.a libwine.a
|
||||
|
||||
TARGET_CFLAGS = \
|
||||
-I./include \
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
/*
|
||||
* Porting from wine to ReactOS definitions
|
||||
*
|
||||
* Copyright 2002 Robert Dickenson
|
||||
*
|
||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef __PORTING_WINE2ROS_H
|
||||
#define __PORTING_WINE2ROS_H
|
||||
|
||||
|
||||
#ifndef __GNUC__
|
||||
#define inline _inline
|
||||
#endif
|
||||
|
||||
long interlocked_xchg_add(long *dest, long incr);
|
||||
|
||||
#define strlenW wcslen
|
||||
#define strcpyW wcscpy
|
||||
#define strcatW wcscat
|
||||
#define strstrW wcsstr
|
||||
#define strtolW wcstol
|
||||
#define strchrW wcschr
|
||||
#define strncmpW wcsncmp
|
||||
#define tolowerW towlower
|
||||
#define atoiW _wtoi
|
||||
#define atolW _wtol
|
||||
#define strncasecmp strncmp
|
||||
#define snprintf _snprintf
|
||||
#define strcasecmp _stricmp
|
||||
|
||||
#ifdef __USE_W32API
|
||||
#define SLOWORD(l) ((SHORT)(LONG)(l))
|
||||
#define SHIWORD(l) ((SHORT)((LONG)(l) >> 16))
|
||||
#endif
|
||||
|
||||
#endif /* __PORTING_WINE2ROS_H */
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
; $Id: winedbgc.def,v 1.3 2003/12/01 18:28:54 navaraf Exp $
|
||||
;
|
||||
; ReactOS Operating System
|
||||
;
|
||||
LIBRARY winedbgc.dll
|
||||
|
||||
EXPORTS
|
||||
wine_dbgstr_an
|
||||
wine_dbgstr_guid
|
||||
wine_dbgstr_wn
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
; $Id: winedbgc.edf,v 1.3 2003/12/01 18:28:54 navaraf Exp $
|
||||
;
|
||||
; ReactOS Operating System
|
||||
;
|
||||
LIBRARY winedbgc.dll
|
||||
|
||||
EXPORTS
|
||||
wine_dbgstr_an
|
||||
wine_dbgstr_guid
|
||||
wine_dbgstr_wn
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
#include <defines.h>
|
||||
#include <reactos/resource.h>
|
||||
|
||||
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
|
||||
PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
#else
|
||||
FILEFLAGS 0x0L
|
||||
#endif
|
||||
FILEOS 0x40004L
|
||||
FILETYPE 0x2L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", RES_STR_COMPANY_NAME
|
||||
VALUE "FileDescription", "WINE debug channels for ReactOS\0"
|
||||
VALUE "FileVersion", RES_STR_FILE_VERSION
|
||||
VALUE "InternalName", "winedbgc\0"
|
||||
VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT
|
||||
VALUE "OriginalFilename", "winedbgc.dll\0"
|
||||
VALUE "ProductName", RES_STR_PRODUCT_NAME
|
||||
VALUE "ProductVersion", RES_STR_PRODUCT_VERSION
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
|
||||
Loading…
Reference in a new issue