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

Build Win32 resources as .res files and dump them into the .spec.c file.

Browse Source
This commit is contained in:
Alexandre Julliard 2000-10-23 21:39:39 +00:00
parent 003e24cadc
commit 21ec006fc1
62 changed files with 146 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Make.rules.in
View File

@ -16,7 +16,6 @@
# GLUE : C sources for which glue code needs to be generated # GLUE : C sources for which glue code needs to be generated
# EXTRA_SRCS : extra source files for make depend # EXTRA_SRCS : extra source files for make depend
# EXTRA_OBJS : extra object files # EXTRA_OBJS : extra object files
# WRCEXTRA : extra wrc flags (e.g. '-p _SysRes')
# SUBDIRS : subdirectories that contain a Makefile # SUBDIRS : subdirectories that contain a Makefile
# EXTRASUBDIRS : subdirectories that do not contain a Makefile # EXTRASUBDIRS : subdirectories that do not contain a Makefile
@ -55,10 +54,9 @@ LINT = @LINT@
LINTFLAGS = @LINTFLAGS@ LINTFLAGS = @LINTFLAGS@
ALLLINTFLAGS = $(LINTFLAGS) $(DEFS) $(OPTIONS) $(DIVINCL) ALLLINTFLAGS = $(LINTFLAGS) $(DEFS) $(OPTIONS) $(DIVINCL)
WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi_check/winapi_check WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi_check/winapi_check
BUILD = $(TOPOBJDIR)/tools/winebuild/winebuild WINEBUILD = $(TOPOBJDIR)/tools/winebuild/winebuild
MAKEDEP = $(TOPOBJDIR)/tools/makedep MAKEDEP = $(TOPOBJDIR)/tools/makedep
WRC = $(TOPOBJDIR)/tools/wrc/wrc WRC = $(TOPOBJDIR)/tools/wrc/wrc
WRCFLAGS = -c -s -p $*
WMC = $(TOPOBJDIR)/tools/wmc/wmc WMC = $(TOPOBJDIR)/tools/wmc/wmc
DLLDIR = $(TOPOBJDIR)/dlls DLLDIR = $(TOPOBJDIR)/dlls
@SET_MAKE@ @SET_MAKE@
@ -81,7 +79,7 @@ CLEAN_FILES = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
*.flc *.spec.c *.glue.c y.tab.c y.tab.h lex.yy.c core *.flc *.spec.c *.glue.c y.tab.c y.tab.h lex.yy.c core
OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \ OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
$(ASM_SRCS:.S=.o) $(RC_SRCS:.rc=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS) $(ASM_SRCS:.S=.o) $(RC16_SRCS:.rc16=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS)
LINTS = $(C_SRCS:.c=.ln) LINTS = $(C_SRCS:.c=.ln)
@ -156,7 +154,7 @@ DLLS = \
# Implicit rules # Implicit rules
.SUFFIXES: .mc .rc .res .spec .spec.c .spec.o .glue.c .SUFFIXES: .mc .rc .rc16 .res .spec .spec.c .spec.o .glue.c
.c.o: .c.o:
$(CC) -c $(ALLCFLAGS) -o $*.o $< $(CC) -c $(ALLCFLAGS) -o $*.o $<
@ -173,26 +171,17 @@ DLLS = \
.mc.rc: .mc.rc:
LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WMC) -i -H /dev/null -o $@ $< LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WMC) -i -H /dev/null -o $@ $<
.rc.s: .rc16.s:
$(WRC) $(WRCFLAGS) $(WRCEXTRA) $(DIVINCL) $< LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -w16 -m -c -p `basename $*` -s $<
.rc.h:
$(WRC) $(WRCFLAGS) $(WRCEXTRA) $(DIVINCL) -nh $<
.rc.res: .rc.res:
$(WRC) $(WRCFLAGS) $(WRCEXTRA) $(DIVINCL) -r $< LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $<
.res.s:
$(WRC) $(WRCFLAGS) $(WRCEXTRA) -b $<
.res.h:
$(WRC) $(WRCFLAGS) $(WRCEXTRA) -bnh $<
.spec.spec.c: .spec.spec.c:
$(BUILD) @DLLFLAGS@ -o $@ -spec $< LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WINEBUILD) @DLLFLAGS@ -o $@ -spec $<
.c.glue.c: .c.glue.c:
$(BUILD) @DLLFLAGS@ -o $@ -glue $< LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WINEBUILD) @DLLFLAGS@ -o $@ -glue $<
.c.ln: .c.ln:
$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
@ -205,24 +194,28 @@ all: Makefile
# Rule to rebuild the resource compiler # Rule to rebuild the resource compiler
$(WRC) check_wrc: $(WRC):
cd $(TOPOBJDIR)/tools/wrc && $(MAKE) wrc cd $(TOPOBJDIR)/tools/wrc && $(MAKE) wrc
# Rule to rebuild the message compiler # Rule to rebuild the message compiler
$(WMC) check_wmc: $(WMC):
cd $(TOPOBJDIR)/tools/wmc && $(MAKE) wmc cd $(TOPOBJDIR)/tools/wmc && $(MAKE) wmc
# Rule to rebuild the 'makedep' program # Rule to rebuild the 'makedep' program
$(MAKEDEP) check_makedep: $(MAKEDEP):
cd $(TOPOBJDIR)/tools && $(MAKE) makedep cd $(TOPOBJDIR)/tools && $(MAKE) makedep
# Rule to rebuild the 'winebuild' program # Rule to rebuild the 'winebuild' program
$(BUILD) check_winebuild: $(WINEBUILD):
cd $(TOPOBJDIR)/tools/winebuild && $(MAKE) winebuild cd $(TOPOBJDIR)/tools/winebuild && $(MAKE) winebuild
# Rule for main module spec file
$(MODULE).spec.c: $(RC_SRCS:.rc=.res)
# Rules for makefile # Rules for makefile
Makefile: Makefile.in $(TOPSRCDIR)/configure Makefile: Makefile.in $(TOPSRCDIR)/configure
@ -260,8 +253,8 @@ winapi_check::
$(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy $(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy
cd `dirname $@` && $(MAKE) depend cd `dirname $@` && $(MAKE) depend
depend: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) $(GEN_C_SRCS) $(SUBDIRS:%=%/__depend__) depend: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(RC16_SRCS) $(EXTRA_SRCS) $(GEN_C_SRCS) $(SUBDIRS:%=%/__depend__)
$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) -C. $(GEN_C_SRCS) $(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(RC16_SRCS) $(EXTRA_SRCS) -C. $(GEN_C_SRCS)
# Rules for cleaning # Rules for cleaning
@ -272,7 +265,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy
-cd `dirname $@` && $(RM) $(CLEAN_FILES) -cd `dirname $@` && $(RM) $(CLEAN_FILES)
clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
$(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.s) $(RC_SRCS:.rc=.h) $(MC_SRCS:.mc=.rc) $(PROGRAMS) $(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.res) $(RC16_SRCS:.rc16=.s) $(MC_SRCS:.mc=.rc) $(PROGRAMS)
# Rules for installing # Rules for installing
@ -284,11 +277,11 @@ $(SUBDIRS:%=%/__uninstall__): dummy
# Misc. rules # Misc. rules
$(SPEC_SRCS:.spec=.spec.c): $(BUILD) $(TOPSRCDIR)/include/builtin16.h $(SPEC_SRCS:.spec=.spec.c): $(WINEBUILD) $(TOPSRCDIR)/include/builtin16.h
$(GLUE:.c=.glue.c): $(BUILD) $(TOPSRCDIR)/include/builtin16.h $(GLUE:.c=.glue.c): $(WINEBUILD) $(TOPSRCDIR)/include/builtin16.h
$(RC_SRCS:.rc=.s): $(WRC) $(RC_SRCS:.rc=.res) $(RC16_SRCS:.rc16=.s): $(WRC)
$(MC_SRCS:.mc=.rc): $(WMC) $(MC_SRCS:.mc=.rc): $(WMC)

2
dlls/comctl32/.cvsignore
View File

@ -2,4 +2,4 @@
*.spec.glue.s *.spec.glue.s
Makefile Makefile
libcomctl32.so.1.0 libcomctl32.so.1.0
rsrc.s rsrc.res

3
dlls/comctl32/Makefile.in
View File

@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = comctl32 MODULE = comctl32
SOVERSION = 1.0 SOVERSION = 1.0
WRCEXTRA = -s -p$(MODULE)
IMPORTS = user32 gdi32 advapi32 kernel32 IMPORTS = user32 gdi32 advapi32 kernel32
C_SRCS = \ C_SRCS = \
@ -40,6 +39,4 @@ RC_SRCS= \
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
all: check_wrc
### Dependencies: ### Dependencies:

2
dlls/comctl32/comctl32.spec
View File

@ -1,7 +1,7 @@
name comctl32 name comctl32
type win32 type win32
init COMCTL32_LibMain init COMCTL32_LibMain
rsrc comctl32 rsrc rsrc.res
import user32.dll import user32.dll
import gdi32.dll import gdi32.dll

2
dlls/commdlg/.cvsignore
View File

@ -2,4 +2,4 @@
*.spec.glue.s *.spec.glue.s
Makefile Makefile
libcomdlg32.so.1.0 libcomdlg32.so.1.0
rsrc.s rsrc.res

3
dlls/commdlg/Makefile.in
View File

@ -6,7 +6,6 @@ MODULE = comdlg32
SOVERSION = 1.0 SOVERSION = 1.0
ALTNAMES = commdlg ALTNAMES = commdlg
IMPORTS = shell32 shlwapi comctl32 user32 winspool.drv gdi32 kernel32 IMPORTS = shell32 shlwapi comctl32 user32 winspool.drv gdi32 kernel32
WRCEXTRA = -s -pcomdlg32
C_SRCS = \ C_SRCS = \
cdlg32.c \ cdlg32.c \
@ -26,6 +25,4 @@ RC_SRCS= \
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
all: check_wrc
### Dependencies: ### Dependencies:

2
dlls/commdlg/comdlg32.spec
View File

@ -1,7 +1,7 @@
name comdlg32 name comdlg32
type win32 type win32
init COMDLG32_DllEntryPoint init COMDLG32_DllEntryPoint
rsrc comdlg32 rsrc rsrc.res
import shell32.dll import shell32.dll
import shlwapi.dll import shlwapi.dll

2
dlls/kernel/.cvsignore
View File

@ -1,5 +1,5 @@
*.spec.c *.spec.c
Makefile Makefile
kernel.s kernel.res
libkernel32.so.1.0 libkernel32.so.1.0
utthunk.glue.c utthunk.glue.c

2
dlls/kernel/Makefile.in
View File

@ -34,6 +34,6 @@ EXTRASUBDIRS = \
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
depend $(RC_SRCS:.rc=.s): $(MC_SRCS:.mc=.rc) depend $(RC_SRCS:.rc=.res): $(MC_SRCS:.mc=.rc)
### Dependencies: ### Dependencies:

2
dlls/kernel/kernel32.spec
View File

@ -1,7 +1,7 @@
name kernel32 name kernel32
type win32 type win32
init MAIN_KernelInit init MAIN_KernelInit
rsrc kernel rsrc kernel.res
import ntdll.dll import ntdll.dll

2
dlls/msacm/.cvsignore
View File

@ -3,4 +3,4 @@
Makefile Makefile
libmsacm.so.1.0 libmsacm.so.1.0
libmsacm32.so.1.0 libmsacm32.so.1.0
msacm.s msacm.res

2
dlls/msacm/msacm32.spec
View File

@ -1,7 +1,7 @@
name msacm32 name msacm32
type win32 type win32
init MSACM32_LibMain init MSACM32_LibMain
rsrc msacm rsrc msacm.res
import winmm.dll import winmm.dll
import user32.dll import user32.dll

2
dlls/serialui/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
libserialui.so.1.0 libserialui.so.1.0
serialui.spec.c serialui.spec.c
serialui_rc.s serialui_rc.res

2
dlls/serialui/serialui.spec
View File

@ -1,7 +1,7 @@
name serialui name serialui
type win32 type win32
init SERIALUI_LibMain init SERIALUI_LibMain
rsrc serialui_rc rsrc serialui_rc.res
import user32.dll import user32.dll
import advapi32.dll import advapi32.dll

2
dlls/shell32/.cvsignore
View File

@ -2,4 +2,4 @@
*.spec.glue.s *.spec.glue.s
Makefile Makefile
libshell32.so.1.0 libshell32.so.1.0
shres.s shres.res

2
dlls/shell32/Makefile.in
View File

@ -42,7 +42,5 @@ RC_SRCS= \
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
all: check_wrc
### Dependencies: ### Dependencies:

2
dlls/shell32/shell32.spec
View File

@ -1,7 +1,7 @@
name shell32 name shell32
type win32 type win32
init Shell32LibMain init Shell32LibMain
rsrc shres rsrc shres.res
# fixme: avoid this import # fixme: avoid this import
import ole32.dll import ole32.dll

15
dlls/user/Makefile.in
View File

@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = user32 MODULE = user32
SOVERSION = 1.0 SOVERSION = 1.0
WRCEXTRA = -w16 -m
ALTNAMES = user keyboard ddeml display mouse ALTNAMES = user keyboard ddeml display mouse
IMPORTS = gdi32 advapi32 kernel32 IMPORTS = gdi32 advapi32 kernel32
@ -23,26 +22,28 @@ C_SRCS = \
thunk.c \ thunk.c \
user_main.c user_main.c
RC_SRCS = \ RC16_SRCS = \
disp.rc \ resources/display.rc16 \
mouserc.rc resources/mouse.rc16
RC_SRCS = resources/user32.rc
GLUE = thunk.c GLUE = thunk.c
EXTRA_OBJS = \ EXTRA_OBJS = \
$(TOPOBJDIR)/controls/controls.o \ $(TOPOBJDIR)/controls/controls.o \
$(TOPOBJDIR)/resources/resources.o \
$(TOPOBJDIR)/windows/windows.o $(TOPOBJDIR)/windows/windows.o
SUBDIRS = \ SUBDIRS = \
$(TOPOBJDIR)/controls \ $(TOPOBJDIR)/controls \
$(TOPOBJDIR)/resources \
$(TOPOBJDIR)/windows $(TOPOBJDIR)/windows
EXTRASUBDIRS = \
resources
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
$(EXTRA_OBJS): $(TOOLSUBDIRS) dummy $(EXTRA_OBJS): $(TOOLSUBDIRS) dummy
@cd `dirname $@` && $(MAKE) `basename $@` @cd `dirname $@` && $(MAKE) `basename $@`
### Dependencies: ### Dependencies:

2
dlls/user/display.spec
View File

@ -1,7 +1,7 @@
name display name display
type win16 type win16
owner user32 owner user32
rsrc disp rsrc display
1 stub BitBlt 1 stub BitBlt
2 stub ColorInfo 2 stub ColorInfo

2
dlls/user/mouse.spec
View File

@ -1,7 +1,7 @@
name mouse name mouse
type win16 type win16
owner user32 owner user32
rsrc mouserc rsrc mouse
1 pascal16 Inquire(ptr) MOUSE_Inquire 1 pascal16 Inquire(ptr) MOUSE_Inquire
2 pascal16 Enable(segptr) WIN16_MOUSE_Enable 2 pascal16 Enable(segptr) WIN16_MOUSE_Enable

3
dlls/user/resources/.cvsignore Normal file
View File

@ -0,0 +1,3 @@
display.s
mouse.s
user32.res

2
dlls/user/user32.spec
View File

@ -1,7 +1,7 @@
name user32 name user32
type win32 type win32
init USER_Init init USER_Init
rsrc user32 rsrc resources/user32.res
import gdi32.dll import gdi32.dll
import advapi32.dll import advapi32.dll

2
dlls/wineps/.cvsignore
View File

@ -1,5 +1,5 @@
Makefile Makefile
libwineps.so.1.0 libwineps.so.1.0
rsrc.s rsrc.res
wineps.spec.c wineps.spec.c
wineps16.spec.c wineps16.spec.c

1
dlls/wineps/Makefile.in
View File

@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = wineps MODULE = wineps
SOVERSION = 1.0 SOVERSION = 1.0
ALTNAMES = wineps16 ALTNAMES = wineps16
WRCEXTRA = -s -pwineps
IMPORTS = user32 gdi32 kernel32 IMPORTS = user32 gdi32 kernel32
C_SRCS = \ C_SRCS = \

2
dlls/wineps/wineps.spec
View File

@ -1,7 +1,7 @@
name wineps name wineps
type win32 type win32
init PSDRV_Init init PSDRV_Init
rsrc wineps rsrc rsrc.res
import user32.dll import user32.dll
import gdi32.dll import gdi32.dll

2
dlls/winmm/.cvsignore
View File

@ -3,4 +3,4 @@
*.spec.glue.s *.spec.glue.s
Makefile Makefile
libwinmm.so.1.0 libwinmm.so.1.0
winmm_res.s winmm_res.res

2
dlls/winmm/Makefile.in
View File

@ -36,6 +36,4 @@ SUBDIRS = \
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
all: check_wrc
### Dependencies: ### Dependencies:

2
dlls/winmm/winmm.spec
View File

@ -1,7 +1,7 @@
name winmm name winmm
type win32 type win32
init WINMM_LibMain init WINMM_LibMain
rsrc winmm_res rsrc winmm_res.res
import user32.dll import user32.dll
import kernel32.dll import kernel32.dll

4
if1632/Makefile.in
View File

@ -23,7 +23,7 @@ all: $(MODULE).o
$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in $(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
$(LDCOMBINE) $(OBJS) -o $@ $(LDCOMBINE) $(OBJS) -o $@
asmrelay.s: $(BUILD) asmrelay.s: $(WINEBUILD)
$(BUILD) @DLLFLAGS@ -o $@ -relay LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WINEBUILD) @DLLFLAGS@ -o $@ -relay
### Dependencies: ### Dependencies:

2
libtest/.cvsignore
View File

@ -7,7 +7,7 @@ hello2
hello2.spec.c hello2.spec.c
hello3 hello3
hello3.spec.c hello3.spec.c
hello3res.s hello3res.res
hello4 hello4
hello4.spec.c hello4.spec.c
hello5 hello5

6
libtest/Makefile.in
View File

@ -21,7 +21,7 @@ SPEC_SRCS = \
RC_SRCS = \ RC_SRCS = \
hello3res.rc hello3res.rc
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
@ -34,9 +34,11 @@ hello: hello.o hello.spec.o
hello2: hello2.o hello2.spec.o hello2: hello2.o hello2.spec.o
$(CC) -o hello2 $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS) $(CC) -o hello2 $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)
hello3: hello3.o hello3.spec.o hello3res.o hello3: hello3.o hello3.spec.o
$(CC) -o hello3 $+ -L$(DLLDIR) -ladvapi32 -lcomctl32 -lcomdlg32 -lgdi32 -lkernel32 -lole32 -lrpcrt4 -lshell32 -lshlwapi -luser32 -lwinspool.drv $(DLL_LINK) $(LIBS) $(CC) -o hello3 $+ -L$(DLLDIR) -ladvapi32 -lcomctl32 -lcomdlg32 -lgdi32 -lkernel32 -lole32 -lrpcrt4 -lshell32 -lshlwapi -luser32 -lwinspool.drv $(DLL_LINK) $(LIBS)
hello3.spec.c: hello3res.res
hello4: hello4.o hello4.spec.o hello4: hello4.o hello4.spec.o
$(CC) -o hello4 $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS) $(CC) -o hello4 $+ -L$(DLLDIR) -lgdi32 -lkernel32 -luser32 $(DLL_LINK) $(LIBS)

2
libtest/hello3.spec
View File

@ -2,4 +2,4 @@ name hello3
mode guiexe mode guiexe
type win32 type win32
init WinMain init WinMain
rsrc hello3res rsrc hello3res.res

2
programs/avitools/Makefile.in
View File

@ -12,7 +12,7 @@ SPEC_SRCS = \
aviinfo.spec \ aviinfo.spec \
aviplay.spec aviplay.spec
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@

2
programs/clock/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
clock clock
clock.spec.c clock.spec.c
rsrc.s rsrc.res

6
programs/clock/Makefile.in
View File

@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = none MODULE = none
PROGRAMS = clock PROGRAMS = clock
IMPORTS = advapi32 comctl32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 IMPORTS = advapi32 comctl32 shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
WRCEXTRA = -s -p clock
LICENSELANG = En LICENSELANG = En
@ -21,14 +20,15 @@ SPEC_SRCS = clock.spec
RC_SRCS = rsrc.rc RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
clock: $(OBJS) clock: $(OBJS)
$(CC) -o clock $(OBJS) $(DLL_LINK) $(LIBS) $(CC) -o clock $(OBJS) $(DLL_LINK) $(LIBS)
$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
install:: install::
$(INSTALL_PROGRAM) clock $(bindir)/clock $(INSTALL_PROGRAM) clock $(bindir)/clock

2
programs/clock/clock.spec
View File

@ -2,4 +2,4 @@ name clock
mode guiexe mode guiexe
type win32 type win32
init WinMain init WinMain
rsrc clock rsrc rsrc.res

2
programs/cmdlgtst/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
cmdlgr.s cmdlgr.res
cmdlgtst cmdlgtst
cmdlgtst.spec.c cmdlgtst.spec.c

5
programs/cmdlgtst/Makefile.in
View File

@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = none MODULE = none
PROGRAMS = cmdlgtst PROGRAMS = cmdlgtst
IMPORTS = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 IMPORTS = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
WRCEXTRA = -s -p cmdlgtst
C_SRCS = \ C_SRCS = \
cmdlgtst.c cmdlgtst.c
@ -17,13 +16,15 @@ SPEC_SRCS = \
RC_SRCS = \ RC_SRCS = \
cmdlgr.rc cmdlgr.rc
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
cmdlgtst: $(OBJS) cmdlgtst: $(OBJS)
$(CC) -o cmdlgtst $(OBJS) $(DLL_LINK) $(LIBS) $(CC) -o cmdlgtst $(OBJS) $(DLL_LINK) $(LIBS)
$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
install:: install::
$(INSTALL_PROGRAM) cmdlgtst $(bindir)/cmdlgtst $(INSTALL_PROGRAM) cmdlgtst $(bindir)/cmdlgtst

2
programs/cmdlgtst/cmdlgtst.spec
View File

@ -2,5 +2,5 @@ name cmdlgtst
mode guiexe mode guiexe
type win32 type win32
init WinMain init WinMain
rsrc cmdlgtst rsrc cmdlgr.res
import comdlg32.dll import comdlg32.dll

2
programs/notepad/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
notepad notepad
notepad.spec.c notepad.spec.c
rsrc.s rsrc.res

5
programs/notepad/Makefile.in
View File

@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = none MODULE = none
PROGRAMS = notepad PROGRAMS = notepad
IMPORTS = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32 IMPORTS = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32
WRCEXTRA = -s -p notepad
LICENSELANG = En LICENSELANG = En
@ -22,13 +21,15 @@ SPEC_SRCS = notepad.spec
RC_SRCS = rsrc.rc RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
notepad: $(OBJS) notepad: $(OBJS)
$(CC) -o notepad $(OBJS) $(DLL_LINK) $(LIBS) $(CC) -o notepad $(OBJS) $(DLL_LINK) $(LIBS)
$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
install:: install::
$(INSTALL_PROGRAM) notepad $(bindir)/notepad $(INSTALL_PROGRAM) notepad $(bindir)/notepad

2
programs/notepad/notepad.spec
View File

@ -2,5 +2,5 @@ name notepad
mode guiexe mode guiexe
type win32 type win32
init WinMain init WinMain
rsrc notepad rsrc rsrc.res
import comdlg32.dll import comdlg32.dll

2
programs/progman/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
progman progman
progman.spec.c progman.spec.c
rsrc.s rsrc.res

5
programs/progman/Makefile.in
View File

@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = none MODULE = none
PROGRAMS = progman PROGRAMS = progman
IMPORTS = shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 IMPORTS = shlwapi shell32 comdlg32 ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
WRCEXTRA = -s -p progman
LICENSELANG = En LICENSELANG = En
@ -24,13 +23,15 @@ SPEC_SRCS = progman.spec
RC_SRCS = rsrc.rc RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
progman: $(OBJS) progman: $(OBJS)
$(CC) -o progman $(OBJS) $(DLL_LINK) $(LIBS) $(CC) -o progman $(OBJS) $(DLL_LINK) $(LIBS)
$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
install:: install::
$(INSTALL_PROGRAM) progman $(bindir)/progman $(INSTALL_PROGRAM) progman $(bindir)/progman

2
programs/progman/progman.spec
View File

@ -2,5 +2,5 @@ name progman
mode guiexe mode guiexe
type win32 type win32
init WinMain init WinMain
rsrc progman rsrc rsrc.res
import comdlg32.dll import comdlg32.dll

2
programs/uninstaller/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
rsrc.s rsrc.res
uninstaller uninstaller
uninstaller.spec.c uninstaller.spec.c

5
programs/uninstaller/Makefile.in
View File

@ -5,7 +5,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = none MODULE = none
PROGRAMS = uninstaller PROGRAMS = uninstaller
WRCEXTRA = -s -p uninstaller
IMPORTS = user32 gdi32 kernel32 IMPORTS = user32 gdi32 kernel32
LICENSELANG = En LICENSELANG = En
@ -17,13 +16,15 @@ SPEC_SRCS = uninstaller.spec
RC_SRCS = rsrc.rc RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
uninstaller: $(OBJS) uninstaller: $(OBJS)
$(CC) -o uninstaller $(OBJS) $(DLL_LINK) $(LIBS) $(CC) -o uninstaller $(OBJS) $(DLL_LINK) $(LIBS)
$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
install:: install::
$(INSTALL_PROGRAM) uninstaller $(bindir)/uninstaller $(INSTALL_PROGRAM) uninstaller $(bindir)/uninstaller

2
programs/uninstaller/uninstaller.spec
View File

@ -2,4 +2,4 @@ name uninstaller
mode guiexe mode guiexe
type win32 type win32
init WinMain init WinMain
rsrc uninstaller rsrc rsrc.res

2
programs/view/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
view view
view.spec.c view.spec.c
viewrc.s viewrc.res

5
programs/view/Makefile.in
View File

@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = none MODULE = none
PROGRAMS = view PROGRAMS = view
IMPORTS = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32 IMPORTS = advapi32 comctl32 comdlg32 shell32 shlwapi ole32 rpcrt4 winspool.drv user32 gdi32 kernel32
WRCEXTRA = -s -p view
C_SRCS = \ C_SRCS = \
init.c \ init.c \
@ -19,13 +18,15 @@ SPEC_SRCS = \
RC_SRCS = \ RC_SRCS = \
viewrc.rc viewrc.rc
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
view: $(OBJS) view: $(OBJS)
$(CC) -o view $(OBJS) $(DLL_LINK) $(LIBS) $(CC) -o view $(OBJS) $(DLL_LINK) $(LIBS)
$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
install:: install::
$(INSTALL_PROGRAM) view $(bindir)/view $(INSTALL_PROGRAM) view $(bindir)/view

2
programs/view/view.spec
View File

@ -2,4 +2,4 @@ name view
mode guiexe mode guiexe
type win32 type win32
init WinMain init WinMain
rsrc view rsrc viewrc.res

2
programs/wcmd/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
wcmd wcmd
wcmd.spec.c wcmd.spec.c
wcmdrc.s wcmdrc.res

5
programs/wcmd/Makefile.in
View File

@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = none MODULE = none
PROGRAMS = wcmd PROGRAMS = wcmd
IMPORTS = user32 gdi32 kernel32 IMPORTS = user32 gdi32 kernel32
WRCEXTRA = -s -p wcmd
C_SRCS = \ C_SRCS = \
batch.c \ batch.c \
@ -20,10 +19,12 @@ SPEC_SRCS = \
RC_SRCS = \ RC_SRCS = \
wcmdrc.rc wcmdrc.rc
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
wcmd: $(OBJS) wcmd: $(OBJS)
$(CC) -o wcmd $(OBJS) $(DLL_LINK) $(LIBS) $(CC) -o wcmd $(OBJS) $(DLL_LINK) $(LIBS)

2
programs/wcmd/wcmd.spec
View File

@ -1,5 +1,5 @@
name wcmd name wcmd
mode cuiexe mode cuiexe
type win32 type win32
rsrc wcmd
init wine_main init wine_main
rsrc wcmdrc.res

2
programs/winemine/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
rsrc.s rsrc.res
winemine winemine
winemine.spec.c winemine.spec.c

6
programs/winemine/Makefile.in
View File

@ -5,7 +5,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = none MODULE = none
PROGRAMS = winemine PROGRAMS = winemine
WRCEXTRA = -s -p winemine
IMPORTS = user32 gdi32 kernel32 IMPORTS = user32 gdi32 kernel32
LICENSELANG = En LICENSELANG = En
@ -14,18 +13,19 @@ C_SRCS = \
main.c \ main.c \
dialog.c dialog.c
SPEC_SRCS = winemine.spec SPEC_SRCS = winemine.spec
RC_SRCS = rsrc.rc RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
winemine: $(OBJS) winemine: $(OBJS)
$(CC) -o winemine $(OBJS) $(DLL_LINK) $(LIBS) $(CC) -o winemine $(OBJS) $(DLL_LINK) $(LIBS)
$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
install:: install::
$(INSTALL_PROGRAM) winemine $(bindir)/winemine $(INSTALL_PROGRAM) winemine $(bindir)/winemine

2
programs/winemine/winemine.spec
View File

@ -2,4 +2,4 @@ name winemine
mode guiexe mode guiexe
type win32 type win32
init WinMain init WinMain
rsrc winemine rsrc rsrc.res

2
programs/winhelp/.cvsignore
View File

@ -1,7 +1,7 @@
Makefile Makefile
hlp2sgml hlp2sgml
lex.yy.c lex.yy.c
rsrc.s rsrc.res
winhelp winhelp
winhelp.spec.c winhelp.spec.c
y.tab.c y.tab.c

5
programs/winhelp/Makefile.in
View File

@ -6,7 +6,6 @@ VPATH = @srcdir@
MODULE = none MODULE = none
PROGRAMS = winhelp hlp2sgml PROGRAMS = winhelp hlp2sgml
IMPORTS = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32 IMPORTS = advapi32 comctl32 shlwapi shell32 ole32 rpcrt4 comdlg32 winspool.drv user32 gdi32 kernel32
WRCEXTRA = -s -p winhelp
C_SRCS = \ C_SRCS = \
winhelp.c \ winhelp.c \
@ -21,12 +20,14 @@ EXTRA_OBJS = y.tab.o lex.yy.o
RC_SRCS = rsrc.rc RC_SRCS = rsrc.rc
all: check_wrc $(PROGRAMS) all: $(PROGRAMS)
depend: y.tab.h depend: y.tab.h
@MAKE_RULES@ @MAKE_RULES@
$(SPEC_SRCS:.spec=.spec.c): $(RC_SRCS:.rc=.res)
winhelp: $(OBJS) winhelp: $(OBJS)
$(CC) -o winhelp $(OBJS) $(DLL_LINK) $(LIBS) $(CC) -o winhelp $(OBJS) $(DLL_LINK) $(LIBS)

2
programs/winhelp/winhelp.spec
View File

@ -2,5 +2,5 @@ name winhelp
mode guiexe mode guiexe
type win32 type win32
init WinMain init WinMain
rsrc winhelp rsrc rsrc.res
import comdlg32.dll import comdlg32.dll

34
relay32/builtin32.c
View File

@ -115,6 +115,28 @@ static inline void fixup_rva_ptrs( void *array, void *base, int count )
} }
/***********************************************************************
* fixup_resources
*/
static void fixup_resources( IMAGE_RESOURCE_DIRECTORY *dir, char *root, void *base )
{
IMAGE_RESOURCE_DIRECTORY_ENTRY *entry;
int i;
entry = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(dir + 1);
for (i = 0; i < dir->NumberOfNamedEntries + dir->NumberOfIdEntries; i++, entry++)
{
void *ptr = root + entry->u2.s.OffsetToDirectory;
if (entry->u2.s.DataIsDirectory) fixup_resources( ptr, root, base );
else
{
IMAGE_RESOURCE_DATA_ENTRY *data = ptr;
fixup_rva_ptrs( &data->OffsetToData, base, 1 );
}
}
}
/*********************************************************************** /***********************************************************************
* BUILTIN32_DoLoadImage * BUILTIN32_DoLoadImage
* *
@ -126,7 +148,7 @@ static HMODULE BUILTIN32_DoLoadImage( const BUILTIN32_DESCRIPTOR *descr )
IMAGE_DOS_HEADER *dos; IMAGE_DOS_HEADER *dos;
IMAGE_NT_HEADERS *nt; IMAGE_NT_HEADERS *nt;
IMAGE_SECTION_HEADER *sec; IMAGE_SECTION_HEADER *sec;
INT i, size, nb_sections; INT size, nb_sections;
BYTE *addr, *code_start, *data_start; BYTE *addr, *code_start, *data_start;
int page_size = VIRTUAL_GetPageSize(); int page_size = VIRTUAL_GetPageSize();
@ -213,13 +235,11 @@ static HMODULE BUILTIN32_DoLoadImage( const BUILTIN32_DESCRIPTOR *descr )
/* Build the resource directory */ /* Build the resource directory */
dir = &nt->OptionalHeader.DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY]; dir = &nt->OptionalHeader.DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY];
if (dir->VirtualAddress) if (dir->Size)
{ {
BUILTIN32_RESOURCE *rsrc = (BUILTIN32_RESOURCE *)dir->VirtualAddress; void *ptr = (void *)dir->VirtualAddress;
IMAGE_RESOURCE_DATA_ENTRY *rdep = rsrc->entries; fixup_rva_ptrs( &dir->VirtualAddress, addr, 1 );
dir->VirtualAddress = (BYTE *)rsrc->restab - addr; fixup_resources( ptr, ptr, addr );
dir->Size = rsrc->restabsize;
for (i = 0; i < rsrc->nresources; i++) rdep[i].OffsetToData += dir->VirtualAddress;
} }
/* Build the export directory */ /* Build the export directory */

25
tools/makedep.c
View File

@ -265,27 +265,26 @@ static void output_src( FILE *file, INCL_FILE *pFile, int *column )
char *ext = strrchr( obj, '.' ); char *ext = strrchr( obj, '.' );
if (ext) if (ext)
{ {
if (!strcmp( ext, ".y" )) /* yacc file */ *ext++ = 0;
if (!strcmp( ext, "y" )) /* yacc file */
{ {
fprintf( file, "y.tab.o: y.tab.c" ); *column += fprintf( file, "y.tab.o: y.tab.c" );
*column += 16;
} }
else if (!strcmp( ext, ".l" )) /* lex file */ else if (!strcmp( ext, "l" )) /* lex file */
{ {
fprintf( file, "lex.yy.o: lex.yy.c" ); *column += fprintf( file, "lex.yy.o: lex.yy.c" );
*column += 18;
} }
else if (!strcmp( ext, ".rc" )) /* resource file */ else if (!strcmp( ext, "rc" )) /* resource file */
{ {
strcpy( ext, ".s" ); *column += fprintf( file, "%s.res: %s", obj, pFile->filename );
fprintf( file, "%s: %s", obj, pFile->filename ); }
*column += strlen(obj) + strlen(pFile->filename); else if (!strcmp( ext, "rc16" )) /* Win16 resource file */
{
*column += fprintf( file, "%s.s: %s", obj, pFile->filename );
} }
else else
{ {
strcpy( ext, ".o" ); *column += fprintf( file, "%s.o: %s", obj, pFile->filename );
fprintf( file, "%s: %s", obj, pFile->filename );
*column += strlen(obj) + strlen(pFile->filename) + 2;
} }
} }
free( obj ); free( obj );