ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Make gdi.exe into a stand-alone 16-bit module.

This commit is contained in:
Alexandre Julliard 2009-12-04 21:47:30 +01:00
parent fc55cdcd59
commit 4edcf1caa5
13 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -45,7 +45,6 @@ dlls/advapi32/svcctl.h
dlls/advapi32/svcctl_c.c dlls/advapi32/svcctl_c.c
dlls/atl/atliface.h dlls/atl/atliface.h
dlls/dxdiagn/fil_data.h dlls/dxdiagn/fil_data.h
dlls/gdi.exe16
dlls/jscript/jsglobal.tlb dlls/jscript/jsglobal.tlb
dlls/jscript/parser.tab.c dlls/jscript/parser.tab.c
dlls/jscript/parser.tab.h dlls/jscript/parser.tab.h

9
configure vendored
View File

@ -14896,6 +14896,14 @@ ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/fwpuclnt/Makefile: dlls/fwpuclnt/Makefile.in dlls/Makedll.rules" dlls/fwpuclnt/Makefile: dlls/fwpuclnt/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/fwpuclnt/Makefile" ac_config_files="$ac_config_files dlls/fwpuclnt/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/gdi.exe16/Makefile"
test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
gdi.exe16"
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
dlls/gdi.exe16/Makefile: dlls/gdi.exe16/Makefile.in dlls/Makedll.rules"
ac_config_files="$ac_config_files dlls/gdi.exe16/Makefile"
ALL_MAKEFILES="$ALL_MAKEFILES \\ ALL_MAKEFILES="$ALL_MAKEFILES \\
dlls/gdi32/Makefile" dlls/gdi32/Makefile"
test "x$enable_gdi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ test "x$enable_gdi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
@ -18947,6 +18955,7 @@ do
"dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;; "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;;
"dlls/fusion/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/tests/Makefile" ;; "dlls/fusion/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/tests/Makefile" ;;
"dlls/fwpuclnt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fwpuclnt/Makefile" ;; "dlls/fwpuclnt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fwpuclnt/Makefile" ;;
"dlls/gdi.exe16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi.exe16/Makefile" ;;
"dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;; "dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;;
"dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;; "dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;;
"dlls/gdiplus/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/Makefile" ;; "dlls/gdiplus/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/Makefile" ;;

1
configure.ac
View File

@ -2250,6 +2250,7 @@ WINE_CONFIG_MAKEFILE([dlls/fltlib/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL
WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/fwpuclnt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/fwpuclnt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/gdi.exe16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
WINE_CONFIG_MAKEFILE([dlls/gdi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/gdi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/gdi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/gdi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
WINE_CONFIG_MAKEFILE([dlls/gdiplus/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/gdiplus/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])

4
dlls/Makefile.in
View File

@ -18,7 +18,6 @@ DOCSUBDIRS = $(DLLSUBDIRS)
# 16-bit dlls # 16-bit dlls
WIN16_FILES = \ WIN16_FILES = \
gdi.exe16 \
krnl386.exe16 \ krnl386.exe16 \
user.exe16 \ user.exe16 \
wprocs.dll16 wprocs.dll16
@ -31,9 +30,6 @@ all: $(BUILDSUBDIRS) @WIN16_FILES@
# Placeholders for 16-bit libraries # Placeholders for 16-bit libraries
gdi.exe16:
echo "gdi32.dll" >$@
krnl386.exe16: krnl386.exe16:
echo "kernel32.dll" >$@ echo "kernel32.dll" >$@

22
dlls/gdi.exe16/Makefile.in Normal file
View File

@ -0,0 +1,22 @@
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = gdi.exe16
IMPORTS = user32 advapi32 gdi32 kernel32
EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,gdi32.dll,--heap,65520
EXTRARCFLAGS = -O res16
C_SRCS = \
bidi.c \
env.c \
gdi.c \
metafile.c \
printdrv.c
RC_SRCS = version.rc
@MAKE_DLL_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend

0
dlls/gdi32/bidi16.c → dlls/gdi.exe16/bidi.c
View File

0
dlls/gdi32/env.c → dlls/gdi.exe16/env.c
View File

0
dlls/gdi32/gdi16.c → dlls/gdi.exe16/gdi.c
View File

0
dlls/gdi32/gdi.exe.spec → dlls/gdi.exe16/gdi.exe16.spec
View File

0
dlls/gdi32/metafile16.c → dlls/gdi.exe16/metafile.c
View File

1
dlls/gdi32/printdrv16.c → dlls/gdi.exe16/printdrv.c
View File

@ -48,7 +48,6 @@
#include "winreg.h" #include "winreg.h"
#include "wownt32.h" #include "wownt32.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "gdi_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(print); WINE_DEFAULT_DEBUG_CHANNEL(print);

0
dlls/gdi32/version16.rc → dlls/gdi.exe16/version.rc
View File

18
dlls/gdi32/Makefile.in
View File

@ -9,8 +9,6 @@ IMPORTS = advapi32 kernel32 ntdll
EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@ EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@
EXTRALIBS = @CARBONLIB@ EXTRALIBS = @CARBONLIB@
SPEC_SRCS16 = gdi.exe.spec
C_SRCS = \ C_SRCS = \
bidi.c \ bidi.c \
bitblt.c \ bitblt.c \
@ -49,15 +47,7 @@ C_SRCS = \
printdrv.c \ printdrv.c \
region.c region.c
C_SRCS16 = \
bidi16.c \
env.c \
gdi16.c \
metafile16.c \
printdrv16.c
RC_SRCS = version.rc RC_SRCS = version.rc
RC_SRCS16 = version16.rc
EXTRASUBDIRS = \ EXTRASUBDIRS = \
enhmfdrv \ enhmfdrv \
@ -65,12 +55,4 @@ EXTRASUBDIRS = \
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
# Special rules for 16-bit resource and spec files
gdi.exe.spec.o: gdi.exe.spec version16.res
$(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --heap 65520 --main-module $(MODULE) --res version16.res --export $(SRCDIR)/gdi.exe.spec
version16.res: version16.rc
$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc
@DEPENDENCIES@ # everything below this line is overwritten by make depend @DEPENDENCIES@ # everything below this line is overwritten by make depend