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

Renamed Winelib apps to .exe.so to follow the dll naming convention.

This commit is contained in:
Alexandre Julliard 2002-05-21 19:42:29 +00:00
parent 6114ee716b
commit cc2ee7636d
52 changed files with 143 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Make.rules.in
View File

@ -284,18 +284,18 @@ $(TESTMAIN):
$(TESTLIST): Makefile.in $(TESTLIST): Makefile.in
$(TOPSRCDIR)/programs/winetest/make_ctests $(CTESTS) >$(TESTLIST) || $(RM) $(TESTLIST) $(TOPSRCDIR)/programs/winetest/make_ctests $(CTESTS) >$(TESTLIST) || $(RM) $(TESTLIST)
$(TESTPROGRAM): $(TESTPROGRAM).so $(TESTPROGRAM): $(TESTPROGRAM).exe.so
$(RM) $(TESTPROGRAM) && cd tests && $(LN_S) $(TOPOBJDIR)/../wine `basename $(TESTPROGRAM)` $(RM) $(TESTPROGRAM) && cd tests && $(LN_S) $(TOPOBJDIR)/../wine `basename $(TESTPROGRAM)`
$(TESTPROGRAM).so: $(TESTPROGRAM).spec.o $(TESTOBJS) $(TESTPROGRAM).exe.so: $(TESTPROGRAM).exe.spec.o $(TESTOBJS)
$(LDSHARED) $(LDDLLFLAGS) $(TESTPROGRAM).spec.o $(TESTOBJS) -o $@ $(LIBWINE) $(LIBS) $(LDSHARED) $(LDDLLFLAGS) $(TESTPROGRAM).exe.spec.o $(TESTOBJS) -o $@ $(LIBWINE) $(LIBS)
$(TESTPROGRAM).tmp.o: $(TESTOBJS) $(TESTPROGRAM).exe.tmp.o: $(TESTOBJS)
$(LDCOMBINE) $(TESTOBJS) -o $@ $(LDCOMBINE) $(TESTOBJS) -o $@
-$(STRIP) --strip-unneeded $@ -$(STRIP) --strip-unneeded $@
$(TESTPROGRAM).spec.c: $(TESTPROGRAM).tmp.o $(WINEBUILD) $(TESTPROGRAM).exe.spec.c: $(TESTPROGRAM).exe.tmp.o $(WINEBUILD)
$(LDPATH) $(WINEBUILD) $(DEFS) -sym $(TESTPROGRAM).tmp.o -o $@ -exe $(TESTPROGRAM) -mcui -L$(DLLDIR) $(TESTIMPORTS:%=-l%) $(LDPATH) $(WINEBUILD) $(DEFS) -sym $(TESTPROGRAM).exe.tmp.o -o $@ -exe $(TESTPROGRAM).exe -mcui -L$(DLLDIR) $(TESTIMPORTS:%=-l%)
$(TESTPROGRAM).exe: $(TESTOBJS) $(TESTPROGRAM).exe: $(TESTOBJS)
$(CC) $(TESTOBJS) -o $@ $(TESTIMPORTS:%=-l%) $(LIBWINE) $(LIBS) $(CC) $(TESTOBJS) -o $@ $(TESTIMPORTS:%=-l%) $(LIBWINE) $(LIBS)

5
debugger/.cvsignore
View File

@ -1,7 +1,6 @@
Makefile Makefile
lex.yy.c lex.yy.c
winedbg winedbg.exe.dbg.c
winedbg.dbg.c winedbg.exe.spec.c
winedbg.spec.c
y.tab.c y.tab.c
y.tab.h y.tab.h

2
debugger/Makefile.in
View File

@ -3,7 +3,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = .. TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = winedbg MODULE = winedbg.exe
APPMODE = cui APPMODE = cui
IMPORTS = advapi32 kernel32 ntdll IMPORTS = advapi32 kernel32 ntdll
DELAYIMPORTS = user32 DELAYIMPORTS = user32

2
dlls/kernel/tests/.cvsignore
View File

@ -2,7 +2,7 @@ alloc.ok
atom.ok atom.ok
directory.ok directory.ok
file.ok file.ok
kernel32_test.spec.c kernel32_test.exe.spec.c
path.ok path.ok
process.ok process.ok
testlist.c testlist.c

2
dlls/oleaut32/tests/.cvsignore
View File

@ -1,3 +1,3 @@
oleaut32_test.spec.c oleaut32_test.exe.spec.c
testlist.c testlist.c
vartest.ok vartest.ok

2
dlls/shlwapi/tests/.cvsignore
View File

@ -1,3 +1,3 @@
shlwapi_test.spec.c shlwapi_test.exe.spec.c
shreg.ok shreg.ok
testlist.c testlist.c

2
dlls/user/tests/.cvsignore
View File

@ -1,5 +1,5 @@
class.ok class.ok
sysparams.ok sysparams.ok
testlist.c testlist.c
user32_test.spec.c user32_test.exe.spec.c
wsprintf.ok wsprintf.ok

2
dlls/winsock/tests/.cvsignore
View File

@ -1,3 +1,3 @@
sock.ok sock.ok
testlist.c testlist.c
ws2_32_test.spec.c ws2_32_test.exe.spec.c

27
programs/Makeprog.rules.in
View File

@ -14,12 +14,13 @@ LDDLLFLAGS = @LDDLLFLAGS@
ALL_OBJS = $(OBJS) $(MODULE).dbg.o ALL_OBJS = $(OBJS) $(MODULE).dbg.o
ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS) ALL_LIBS = $(LIBWINE) $(EXTRALIBS) $(LIBS)
SYMBOLFILE = $(MODULE).tmp.o SYMBOLFILE = $(MODULE).tmp.o
BASEMODULE = $(MODULE:.exe=)
TESTIMPORTS = $(DELAYIMPORTS) $(IMPORTS) TESTIMPORTS = $(DELAYIMPORTS) $(IMPORTS)
RCOBJS = $(RC_SRCS:.rc=.res.o) RCOBJS = $(RC_SRCS:.rc=.res.o)
@MAKE_RULES@ @MAKE_RULES@
all: $(MODULE)$(EXEEXT) all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(EXEEXT)
# Rule for main module spec file # Rule for main module spec file
@ -31,12 +32,12 @@ $(MODULE).spec.c: $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD)
$(MODULE).so: $(MODULE).spec.o $(ALL_OBJS) Makefile.in $(MODULE).so: $(MODULE).spec.o $(ALL_OBJS) Makefile.in
$(LDSHARED) $(LDDLLFLAGS) $(MODULE).spec.o $(ALL_OBJS) -o $@ $(ALL_LIBS) $(LDSHARED) $(LDDLLFLAGS) $(MODULE).spec.o $(ALL_OBJS) -o $@ $(ALL_LIBS)
$(MODULE): $(MODULE).so $(BASEMODULE): $(MODULE).so
$(RM) $(MODULE) && $(LN_S) $(TOPOBJDIR)/wine $(MODULE) $(RM) $(BASEMODULE) && $(LN_S) $(TOPOBJDIR)/wine $(BASEMODULE)
# Rules for .exe main module # Rules for .exe main module
$(MODULE).exe: $(ALL_OBJS) $(RCOBJS) Makefile.in $(MODULE): $(ALL_OBJS) $(RCOBJS) Makefile.in
$(CC) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS) $(CC) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
# Rules for checking that no imports are missing # Rules for checking that no imports are missing
@ -46,25 +47,25 @@ checklink:: $(MODULE).so
# Rules for testing # Rules for testing
$(TESTRESULTS): $(MODULE).so $(TESTRESULTS): $(MODULE)$(DLLEXT)
# Rules for installation # Rules for installation
.PHONY: install_prog$(EXEEXT) .PHONY: install_prog install_prog.so
install_prog:: $(MODULE).so install_prog.so:: $(MODULE).so
$(MKINSTALLDIRS) $(bindir) $(MKINSTALLDIRS) $(bindir)
$(INSTALL_PROGRAM) $(MODULE).so $(bindir)/$(MODULE).so $(INSTALL_PROGRAM) $(MODULE).so $(bindir)/$(MODULE).so
cd $(bindir) && $(RM) $(MODULE) && $(LN_S) wine $(MODULE) cd $(bindir) && $(RM) $(BASEMODULE) && $(LN_S) wine $(BASEMODULE)
install_prog.exe:: $(MODULE).exe install_prog.exe:: $(MODULE)
$(MKINSTALLDIRS) $(bindir) $(MKINSTALLDIRS) $(bindir)
$(INSTALL_PROGRAM) $(MODULE).exe $(bindir)/$(MODULE).exe $(INSTALL_PROGRAM) $(MODULE) $(bindir)/$(MODULE)
install:: install_prog$(EXEEXT) install:: install_prog$(DLLEXT)
uninstall:: uninstall::
$(RM) $(bindir)/$(MODULE)$(EXEEXT) $(bindir)/$(MODULE).so $(RM) $(bindir)/$(BASEMODULE) $(bindir)/$(MODULE) $(bindir)/$(MODULE).so
clean:: clean::
$(RM) $(MODULE)$(EXEEXT) $(RM) $(BASEMODULE) $(MODULE)

9
programs/avitools/.cvsignore
View File

@ -1,7 +1,4 @@
Makefile Makefile
icinfo aviinfo.exe.spec.c
icinfo.spec.c aviplay.exe.spec.c
aviplay icinfo.exe.spec.c
aviplay.spec.c
aviinfo
aviinfo.spec.c

75
programs/avitools/Makefile.in
View File

@ -5,54 +5,77 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = none MODULE = none
PROGRAMS = icinfo aviinfo aviplay PROGRAMS = aviinfo.exe aviplay.exe icinfo.exe
ALL_LIBS = $(LIBWINE) $(LIBS) ALL_LIBS = $(LIBWINE) $(LIBS)
all: $(PROGRAMS) C_SRCS = \
aviinfo.c \
aviplay.c \
icinfo.c
@MAKE_RULES@ @MAKE_RULES@
aviinfo.spec.c: aviinfo.o $(WINEBUILD) all: $(PROGRAMS:%=%$(DLLEXT)) $(PROGRAMS:%.exe=%$(EXEEXT))
$(LDPATH) $(WINEBUILD) $(DEFS) -sym aviinfo.o -o aviinfo.spec.c -exe aviinfo -mgui -L$(DLLDIR) -lkernel32
aviplay.spec.c: aviplay.o $(WINEBUILD) aviinfo.exe.spec.c: aviinfo.o $(WINEBUILD)
$(LDPATH) $(WINEBUILD) $(DEFS) -sym aviplay.o -o aviplay.spec.c -exe aviplay -mgui -L$(DLLDIR) -lddraw -lkernel32 $(LDPATH) $(WINEBUILD) $(DEFS) -sym aviinfo.o -o aviinfo.exe.spec.c -exe aviinfo.exe -mgui -L$(DLLDIR) -lkernel32
icinfo.spec.c: icinfo.o $(WINEBUILD) aviplay.exe.spec.c: aviplay.o $(WINEBUILD)
$(LDPATH) $(WINEBUILD) $(DEFS) -sym icinfo.o -o icinfo.spec.c -exe icinfo -mgui -L$(DLLDIR) -lmsvfw32 -lkernel32 $(LDPATH) $(WINEBUILD) $(DEFS) -sym aviplay.o -o aviplay.exe.spec.c -exe aviplay.exe -mgui -L$(DLLDIR) -lddraw -lkernel32
aviinfo.so: aviinfo.o aviinfo.spec.o icinfo.exe.spec.c: icinfo.o $(WINEBUILD)
$(LDSHARED) $(LDDLLFLAGS) -o aviinfo.so aviinfo.o aviinfo.spec.o $(ALL_LIBS) $(LDPATH) $(WINEBUILD) $(DEFS) -sym icinfo.o -o icinfo.exe.spec.c -exe icinfo.exe -mgui -L$(DLLDIR) -lmsvfw32 -lkernel32
aviplay.so: aviplay.o aviplay.spec.o aviinfo.exe.so: aviinfo.o aviinfo.exe.spec.o
$(LDSHARED) $(LDDLLFLAGS) -o aviplay.so aviplay.o aviplay.spec.o $(ALL_LIBS) $(LDSHARED) $(LDDLLFLAGS) -o aviinfo.exe.so aviinfo.o aviinfo.exe.spec.o $(ALL_LIBS)
icinfo.so: icinfo.o icinfo.spec.o aviplay.exe.so: aviplay.o aviplay.exe.spec.o
$(LDSHARED) $(LDDLLFLAGS) -o icinfo.so icinfo.o icinfo.spec.o $(ALL_LIBS) $(LDSHARED) $(LDDLLFLAGS) -o aviplay.exe.so aviplay.o aviplay.exe.spec.o $(ALL_LIBS)
aviinfo: aviinfo.so icinfo.exe.so: icinfo.o icinfo.exe.spec.o
$(LDSHARED) $(LDDLLFLAGS) -o icinfo.exe.so icinfo.o icinfo.exe.spec.o $(ALL_LIBS)
aviinfo.exe: aviinfo.o
$(CC) -o $@ aviinfo.o -lkernel32 $(ALL_LIBS)
aviplay.exe: aviplay.o
$(CC) -o $@ aviplay.o -lddraw -lkernel32 $(ALL_LIBS)
icinfo.exe: icinfo.o
$(CC) -o $@ icinfo.o -lmsvfw32 -lkernel32 $(ALL_LIBS)
aviinfo: aviinfo.exe.so
$(RM) aviinfo && $(LN_S) $(TOPOBJDIR)/wine aviinfo $(RM) aviinfo && $(LN_S) $(TOPOBJDIR)/wine aviinfo
aviplay: aviplay.so aviplay: aviplay.exe.so
$(RM) aviplay && $(LN_S) $(TOPOBJDIR)/wine aviplay $(RM) aviplay && $(LN_S) $(TOPOBJDIR)/wine aviplay
icinfo: icinfo.so icinfo: icinfo.exe.so
$(RM) icinfo && $(LN_S) $(TOPOBJDIR)/wine icinfo $(RM) icinfo && $(LN_S) $(TOPOBJDIR)/wine icinfo
install:: $(PROGRAMS:%=%.so) .PHONY: install_prog install_prog.so
install_prog.so:: $(PROGRAMS:%=%.so)
$(MKINSTALLDIRS) $(bindir) $(MKINSTALLDIRS) $(bindir)
$(INSTALL_PROGRAM) aviinfo.so $(bindir)/aviinfo.so $(INSTALL_PROGRAM) aviinfo.exe.so $(bindir)/aviinfo.exe.so
$(INSTALL_PROGRAM) aviplay.so $(bindir)/aviplay.so $(INSTALL_PROGRAM) aviplay.exe.so $(bindir)/aviplay.exe.so
$(INSTALL_PROGRAM) icinfo.so $(bindir)/icinfo.so $(INSTALL_PROGRAM) icinfo.exe.so $(bindir)/icinfo.exe.so
cd $(bindir) && $(LN_S) wine aviinfo && $(LN_S) wine aviplay && $(LN_S) wine icinfo cd $(bindir) && $(LN_S) wine aviinfo && $(LN_S) wine aviplay && $(LN_S) wine icinfo
install_prog:: $(PROGRAMS)
$(MKINSTALLDIRS) $(bindir)
$(INSTALL_PROGRAM) aviinfo.exe $(bindir)/aviinfo.exe
$(INSTALL_PROGRAM) aviplay.exe $(bindir)/aviplay.exe
$(INSTALL_PROGRAM) icinfo.exe $(bindir)/icinfo.exe
install:: install_prog$(DLLEXT)
uninstall:: uninstall::
$(RM) $(bindir)/aviinfo.so $(bindir)/aviplay.so $(bindir)/icinfo.so $(RM) $(PROGRAMS:%=$(bindir)/%$(DLLEXT)) $(PROGRAMS:%.exe=$(bindir)/%)
$(RM) $(bindir)/aviinfo $(bindir)/aviplay $(bindir)/icinfo
checklink:: $(PROGRAMS:%=%.so) checklink:: $(PROGRAMS:%=%.so)
$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviinfo.so && $(RM) checklink $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviinfo.exe.so && $(RM) checklink
$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviplay.so && $(RM) checklink $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c aviplay.exe.so && $(RM) checklink
$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c icinfo.so && $(RM) checklink $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c icinfo.exe.so && $(RM) checklink
### Dependencies: ### Dependencies:

5
programs/clock/.cvsignore
View File

@ -1,5 +1,4 @@
Makefile Makefile
clock clock.exe.dbg.c
clock.dbg.c clock.exe.spec.c
clock.spec.c
rsrc.res rsrc.res

2
programs/clock/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = clock MODULE = clock.exe
APPMODE = gui APPMODE = gui
IMPORTS = comdlg32 shell32 user32 gdi32 kernel32 IMPORTS = comdlg32 shell32 user32 gdi32 kernel32

5
programs/cmdlgtst/.cvsignore
View File

@ -1,5 +1,4 @@
Makefile Makefile
cmdlgr.res cmdlgr.res
cmdlgtst cmdlgtst.exe.dbg.c
cmdlgtst.dbg.c cmdlgtst.exe.spec.c
cmdlgtst.spec.c

2
programs/cmdlgtst/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = cmdlgtst MODULE = cmdlgtst.exe
APPMODE = gui APPMODE = gui
IMPORTS = comdlg32 user32 gdi32 kernel32 IMPORTS = comdlg32 user32 gdi32 kernel32

5
programs/control/.cvsignore
View File

@ -1,4 +1,3 @@
Makefile Makefile
control control.exe.dbg.c
control.dbg.c control.exe.spec.c
control.spec.c

2
programs/control/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = control MODULE = control.exe
APPMODE = gui APPMODE = gui
IMPORTS = shell32 user32 kernel32 IMPORTS = shell32 user32 kernel32

4
programs/expand/.cvsignore
View File

@ -1,3 +1,3 @@
Makefile Makefile
expand.dbg.c expand.exe.dbg.c
expand.spec.c expand.exe.spec.c

2
programs/expand/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = expand MODULE = expand.exe
APPMODE = cui APPMODE = cui
IMPORTS = lz32 kernel32 IMPORTS = lz32 kernel32

5
programs/notepad/.cvsignore
View File

@ -1,5 +1,4 @@
Makefile Makefile
notepad notepad.exe.dbg.c
notepad.dbg.c notepad.exe.spec.c
notepad.spec.c
rsrc.res rsrc.res

2
programs/notepad/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = notepad MODULE = notepad.exe
APPMODE = gui APPMODE = gui
IMPORTS = comdlg32 shell32 user32 gdi32 kernel32 IMPORTS = comdlg32 shell32 user32 gdi32 kernel32

5
programs/osversioncheck/.cvsignore
View File

@ -1,4 +1,3 @@
Makefile Makefile
osversioncheck osversioncheck.exe.dbg.c
osversioncheck.dbg.c osversioncheck.exe.spec.c
osversioncheck.spec.c

2
programs/osversioncheck/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = osversioncheck MODULE = osversioncheck.exe
APPMODE = cui APPMODE = cui
IMPORTS = kernel32 IMPORTS = kernel32

5
programs/progman/.cvsignore
View File

@ -1,5 +1,4 @@
Makefile Makefile
progman progman.exe.dbg.c
progman.dbg.c progman.exe.spec.c
progman.spec.c
rsrc.res rsrc.res

2
programs/progman/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = progman MODULE = progman.exe
APPMODE = gui APPMODE = gui
IMPORTS = shell32 comdlg32 user32 gdi32 kernel32 IMPORTS = shell32 comdlg32 user32 gdi32 kernel32

5
programs/regapi/.cvsignore
View File

@ -1,4 +1,3 @@
Makefile Makefile
regapi regapi.exe.dbg.c
regapi.dbg.c regapi.exe.spec.c
regapi.spec.c

2
programs/regapi/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = regapi MODULE = regapi.exe
APPMODE = gui APPMODE = gui
IMPORTS = advapi32 kernel32 IMPORTS = advapi32 kernel32

4
programs/regedit/.cvsignore
View File

@ -1,3 +1,3 @@
Makefile Makefile
regedit.dbg.c regedit.exe.dbg.c
regedit.spec.c regedit.exe.spec.c

2
programs/regedit/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = regedit MODULE = regedit.exe
APPMODE = gui APPMODE = gui
IMPORTS = msvcrt advapi32 kernel32 IMPORTS = msvcrt advapi32 kernel32

4
programs/regsvr32/.cvsignore
View File

@ -1,3 +1,3 @@
Makefile Makefile
regsvr32.dbg.c regsvr32.exe.dbg.c
regsvr32.spec.c regsvr32.exe.spec.c

2
programs/regsvr32/Makefile.in
View File

@ -3,7 +3,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = regsvr32 MODULE = regsvr32.exe
APPMODE = cui APPMODE = cui
IMPORTS = msvcrt kernel32 IMPORTS = msvcrt kernel32

5
programs/regtest/.cvsignore
View File

@ -1,4 +1,3 @@
Makefile Makefile
regtest regtest.exe.dbg.c
regtest.dbg.c regtest.exe.spec.c
regtest.spec.c

2
programs/regtest/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = regtest MODULE = regtest.exe
APPMODE = gui APPMODE = gui
IMPORTS = advapi32 kernel32 IMPORTS = advapi32 kernel32

5
programs/uninstaller/.cvsignore
View File

@ -1,5 +1,4 @@
Makefile Makefile
rsrc.res rsrc.res
uninstaller uninstaller.exe.dbg.c
uninstaller.dbg.c uninstaller.exe.spec.c
uninstaller.spec.c

2
programs/uninstaller/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = uninstaller MODULE = uninstaller.exe
APPMODE = gui APPMODE = gui
IMPORTS = user32 gdi32 advapi32 kernel32 IMPORTS = user32 gdi32 advapi32 kernel32

5
programs/view/.cvsignore
View File

@ -1,5 +1,4 @@
Makefile Makefile
view view.exe.dbg.c
view.dbg.c view.exe.spec.c
view.spec.c
viewrc.res viewrc.res

2
programs/view/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = view MODULE = view.exe
APPMODE = gui APPMODE = gui
IMPORTS = comdlg32 user32 gdi32 kernel32 IMPORTS = comdlg32 user32 gdi32 kernel32

5
programs/wcmd/.cvsignore
View File

@ -1,5 +1,4 @@
Makefile Makefile
wcmd wcmd.exe.dbg.c
wcmd.dbg.c wcmd.exe.spec.c
wcmd.spec.c
wcmdrc.res wcmdrc.res

2
programs/wcmd/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = wcmd MODULE = wcmd.exe
APPMODE = cui APPMODE = cui
IMPORTS = shell32 user32 kernel32 IMPORTS = shell32 user32 kernel32

5
programs/wineconsole/.cvsignore
View File

@ -1,5 +1,4 @@
Makefile Makefile
wineconsole wineconsole.exe.dbg.c
wineconsole.dbg.c wineconsole.exe.spec.c
wineconsole.spec.c
wineconsole_res.res wineconsole_res.res

2
programs/wineconsole/Makefile.in
View File

@ -3,7 +3,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = wineconsole MODULE = wineconsole.exe
APPMODE = gui APPMODE = gui
IMPORTS = gdi32 user32 advapi32 kernel32 ntdll IMPORTS = gdi32 user32 advapi32 kernel32 ntdll
DELAYIMPORTS = comctl32 DELAYIMPORTS = comctl32

5
programs/winemine/.cvsignore
View File

@ -1,5 +1,4 @@
Makefile Makefile
rsrc.res rsrc.res
winemine winemine.exe.dbg.c
winemine.dbg.c winemine.exe.spec.c
winemine.spec.c

2
programs/winemine/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = winemine MODULE = winemine.exe
APPMODE = gui APPMODE = gui
IMPORTS = user32 gdi32 advapi32 kernel32 IMPORTS = user32 gdi32 advapi32 kernel32

5
programs/winepath/.cvsignore
View File

@ -1,4 +1,3 @@
Makefile Makefile
winepath winepath.exe.dbg.c
winepath.dbg.c winepath.exe.spec.c
winepath.spec.c

2
programs/winepath/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = winepath MODULE = winepath.exe
APPMODE = cui APPMODE = cui
IMPORTS = kernel32 IMPORTS = kernel32

4
programs/winetest/.cvsignore
View File

@ -1,4 +1,4 @@
Makefile Makefile
wine.c wine.c
winetest.dbg.c winetest.exe.dbg.c
winetest.spec.c winetest.exe.spec.c

2
programs/winetest/Makefile.in
View File

@ -6,7 +6,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = winetest MODULE = winetest.exe
APPMODE = cui APPMODE = cui
IMPORTS = kernel32 IMPORTS = kernel32

5
programs/winhelp/.cvsignore
View File

@ -2,8 +2,7 @@ Makefile
hlp2sgml hlp2sgml
lex.yy.c lex.yy.c
rsrc.res rsrc.res
winhelp winhelp.exe.dbg.c
winhelp.dbg.c winhelp.exe.spec.c
winhelp.spec.c
y.tab.c y.tab.c
y.tab.h y.tab.h

2
programs/winhelp/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = winhelp MODULE = winhelp.exe
APPMODE = gui APPMODE = gui
IMPORTS = comdlg32 shell32 user32 gdi32 kernel32 IMPORTS = comdlg32 shell32 user32 gdi32 kernel32
PROGRAMS = hlp2sgml PROGRAMS = hlp2sgml

5
programs/winver/.cvsignore
View File

@ -1,4 +1,3 @@
Makefile Makefile
winver winver.exe.dbg.c
winver.dbg.c winver.exe.spec.c
winver.spec.c

2
programs/winver/Makefile.in
View File

@ -2,7 +2,7 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = winver MODULE = winver.exe
APPMODE = gui APPMODE = gui
IMPORTS = shell32 kernel32 IMPORTS = shell32 kernel32

7
scheduler/process.c
View File

@ -450,15 +450,14 @@ void *open_winelib_app( char *argv[] )
else name++; else name++;
if (!strcmp( name, "wine" )) return NULL; if (!strcmp( name, "wine" )) return NULL;
} }
/* now try argv[0] with ".so" appended */ /* now try argv[0] with ".so" appended */
if ((tmp = HeapAlloc( GetProcessHeap(), 0, strlen(argv0) + 4 ))) if ((tmp = HeapAlloc( GetProcessHeap(), 0, strlen(argv0) + 8 )))
{ {
strcpy( tmp, argv0 ); strcpy( tmp, argv0 );
strcat( tmp, ".so" ); strcat( tmp, ".exe.so" );
/* search in PATH only if there was no '/' in argv[0] */ /* search in PATH only if there was no '/' in argv[0] */
ret = wine_dll_load_main_exe( tmp, (name == argv0), errStr, sizeof(errStr) ); ret = wine_dll_load_main_exe( tmp, (name == argv0), errStr, sizeof(errStr) );
if (!ret && !argv[1]) if (!ret && !argv[1] && !main_exe_name[0])
{ {
/* if no argv[1], this will be better than displaying usage */ /* if no argv[1], this will be better than displaying usage */
MESSAGE( "%s: could not load library '%s' as Winelib application: %s\n", MESSAGE( "%s: could not load library '%s' as Winelib application: %s\n",