July 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : make_dlls: Recursively ignore testlist. c in all tests directories.
by Alexandre Julliard 11 Jul '06

11 Jul '06

1 0

Alexandre Julliard : make_dlls: Recursively ignore . ok files in all tests directories.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 0fa8baafcb5bf4074135c546795069e667d0ac65 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0fa8baafcb5bf4074135c54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 21:26:50 2006 +0200 make_dlls: Recursively ignore .ok files in all tests directories. --- dlls/.gitignore | 1 + dlls/advapi32/tests/.gitignore | 8 -------- dlls/advpack/tests/.gitignore | 3 --- dlls/cabinet/tests/.gitignore | 1 - dlls/comctl32/tests/.gitignore | 15 --------------- dlls/comdlg32/tests/.gitignore | 1 - dlls/crypt32/tests/.gitignore | 9 --------- dlls/d3d8/tests/.gitignore | 1 - dlls/d3d9/tests/.gitignore | 7 ------- dlls/ddraw/tests/.gitignore | 4 ---- dlls/dinput/tests/.gitignore | 3 --- dlls/dnsapi/tests/.gitignore | 2 -- dlls/dsound/tests/.gitignore | 7 ------- dlls/gdi/tests/.gitignore | 11 ----------- dlls/iphlpapi/tests/.gitignore | 1 - dlls/kernel/tests/.gitignore | 28 ---------------------------- dlls/lz32/tests/.gitignore | 1 - dlls/make_dlls | 1 + dlls/mapi32/tests/.gitignore | 3 --- dlls/mlang/tests/.gitignore | 1 - dlls/msacm32/tests/.gitignore | 1 - dlls/mscms/tests/.gitignore | 1 - dlls/mshtml/tests/.gitignore | 3 --- dlls/msi/tests/.gitignore | 7 ------- dlls/msvcrt/tests/.gitignore | 11 ----------- dlls/msvcrtd/tests/.gitignore | 1 - dlls/msxml3/tests/.gitignore | 1 - dlls/netapi32/tests/.gitignore | 4 ---- dlls/ntdll/tests/.gitignore | 17 ----------------- dlls/ole32/tests/.gitignore | 7 ------- dlls/oleaut32/tests/.gitignore | 7 ------- dlls/psapi/tests/.gitignore | 1 - dlls/quartz/tests/.gitignore | 2 -- dlls/riched20/tests/.gitignore | 1 - dlls/rpcrt4/tests/.gitignore | 3 --- dlls/rsabase/tests/.gitignore | 1 - dlls/rsaenh/tests/.gitignore | 1 - dlls/secur32/tests/.gitignore | 1 - dlls/setupapi/tests/.gitignore | 4 ---- dlls/shdocvw/tests/.gitignore | 2 -- dlls/shell32/tests/.gitignore | 7 ------- dlls/shlwapi/tests/.gitignore | 7 ------- dlls/urlmon/tests/.gitignore | 4 ---- dlls/user/tests/.gitignore | 18 ------------------ dlls/usp10/tests/.gitignore | 1 - dlls/uxtheme/tests/.gitignore | 1 - dlls/version/tests/.gitignore | 2 -- dlls/wininet/tests/.gitignore | 4 ---- dlls/winmm/tests/.gitignore | 5 ----- dlls/winspool.drv/tests/.gitignore | 1 - dlls/ws2_32/tests/.gitignore | 2 -- 51 files changed, 2 insertions(+), 234 deletions(-) delete mode 100644 dlls/advapi32/tests/.gitignore delete mode 100644 dlls/advpack/tests/.gitignore delete mode 100644 dlls/cabinet/tests/.gitignore delete mode 100644 dlls/comdlg32/tests/.gitignore delete mode 100644 dlls/crypt32/tests/.gitignore delete mode 100644 dlls/d3d8/tests/.gitignore delete mode 100644 dlls/d3d9/tests/.gitignore delete mode 100644 dlls/ddraw/tests/.gitignore delete mode 100644 dlls/dinput/tests/.gitignore delete mode 100644 dlls/dnsapi/tests/.gitignore delete mode 100644 dlls/dsound/tests/.gitignore delete mode 100644 dlls/gdi/tests/.gitignore delete mode 100644 dlls/iphlpapi/tests/.gitignore delete mode 100644 dlls/kernel/tests/.gitignore delete mode 100644 dlls/lz32/tests/.gitignore delete mode 100644 dlls/mapi32/tests/.gitignore delete mode 100644 dlls/mlang/tests/.gitignore delete mode 100644 dlls/msacm32/tests/.gitignore delete mode 100644 dlls/mscms/tests/.gitignore delete mode 100644 dlls/mshtml/tests/.gitignore delete mode 100644 dlls/msi/tests/.gitignore delete mode 100644 dlls/msvcrt/tests/.gitignore delete mode 100644 dlls/msvcrtd/tests/.gitignore delete mode 100644 dlls/msxml3/tests/.gitignore delete mode 100644 dlls/netapi32/tests/.gitignore delete mode 100644 dlls/ntdll/tests/.gitignore delete mode 100644 dlls/ole32/tests/.gitignore delete mode 100644 dlls/oleaut32/tests/.gitignore delete mode 100644 dlls/psapi/tests/.gitignore delete mode 100644 dlls/quartz/tests/.gitignore delete mode 100644 dlls/riched20/tests/.gitignore delete mode 100644 dlls/rpcrt4/tests/.gitignore delete mode 100644 dlls/rsabase/tests/.gitignore delete mode 100644 dlls/rsaenh/tests/.gitignore delete mode 100644 dlls/secur32/tests/.gitignore delete mode 100644 dlls/setupapi/tests/.gitignore delete mode 100644 dlls/shdocvw/tests/.gitignore delete mode 100644 dlls/shell32/tests/.gitignore delete mode 100644 dlls/shlwapi/tests/.gitignore delete mode 100644 dlls/urlmon/tests/.gitignore delete mode 100644 dlls/usp10/tests/.gitignore delete mode 100644 dlls/uxtheme/tests/.gitignore delete mode 100644 dlls/wininet/tests/.gitignore delete mode 100644 dlls/winmm/tests/.gitignore delete mode 100644 dlls/winspool.drv/tests/.gitignore delete mode 100644 dlls/ws2_32/tests/.gitignore Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0fa8baafcb5bf407413…

1 0

Alexandre Julliard : make_dlls: Ignore generated import libraries from the top-level .gitignore.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 5258e061dcf3f5a5270a04e7cb6747b069f902bb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5258e061dcf3f5a5270a04e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 20:55:58 2006 +0200 make_dlls: Ignore generated import libraries from the top-level .gitignore. --- dlls/.gitignore | 114 ++++++++++++++++++++++++++++++++++++++++++ dlls/activeds/.gitignore | 1 dlls/advapi32/.gitignore | 1 dlls/advpack/.gitignore | 1 dlls/atl/.gitignore | 1 dlls/avicap32/.gitignore | 1 dlls/avifil32/.gitignore | 1 dlls/cabinet/.gitignore | 1 dlls/capi2032/.gitignore | 1 dlls/cards/.gitignore | 1 dlls/cfgmgr32/.gitignore | 1 dlls/comctl32/.gitignore | 1 dlls/comdlg32/.gitignore | 1 dlls/compstui/.gitignore | 1 dlls/crtdll/.gitignore | 1 dlls/crypt32/.gitignore | 1 dlls/cryptdll/.gitignore | 1 dlls/ctl3d32/.gitignore | 1 dlls/d3d8/.gitignore | 1 dlls/d3d9/.gitignore | 1 dlls/d3dim/.gitignore | 1 dlls/d3drm/.gitignore | 1 dlls/d3dx8/.gitignore | 1 dlls/d3dxof/.gitignore | 1 dlls/dbghelp/.gitignore | 1 dlls/dciman32/.gitignore | 1 dlls/ddraw/.gitignore | 1 dlls/dinput/.gitignore | 1 dlls/dinput8/.gitignore | 1 dlls/dmusic32/.gitignore | 1 dlls/dnsapi/.gitignore | 1 dlls/dplay/.gitignore | 1 dlls/dplayx/.gitignore | 1 dlls/dpnet/.gitignore | 1 dlls/dsound/.gitignore | 1 dlls/gdi/.gitignore | 1 dlls/glu32/.gitignore | 1 dlls/glut32/.gitignore | 1 dlls/icmp/.gitignore | 1 dlls/imagehlp/.gitignore | 1 dlls/imm32/.gitignore | 1 dlls/iphlpapi/.gitignore | 1 dlls/kernel/.gitignore | 1 dlls/lz32/.gitignore | 1 dlls/make_dlls | 8 +++ dlls/mapi32/.gitignore | 1 dlls/mlang/.gitignore | 1 dlls/mpr/.gitignore | 1 dlls/mprapi/.gitignore | 1 dlls/msacm32/.gitignore | 1 dlls/mscms/.gitignore | 1 dlls/msdmo/.gitignore | 1 dlls/msftedit/.gitignore | 1 dlls/mshtml/.gitignore | 1 dlls/msi/.gitignore | 1 dlls/msimg32/.gitignore | 1 dlls/msvcrt/.gitignore | 1 dlls/msvcrt20/.gitignore | 1 dlls/msvcrt40/.gitignore | 1 dlls/msvcrtd/.gitignore | 1 dlls/msvfw32/.gitignore | 1 dlls/mswsock/.gitignore | 1 dlls/netapi32/.gitignore | 1 dlls/newdev/.gitignore | 1 dlls/ntdll/.gitignore | 1 dlls/ntdsapi/.gitignore | 1 dlls/odbc32/.gitignore | 1 dlls/odbccp32/.gitignore | 1 dlls/ole32/.gitignore | 1 dlls/oleacc/.gitignore | 1 dlls/oleaut32/.gitignore | 1 dlls/olecli32/.gitignore | 1 dlls/oledlg/.gitignore | 1 dlls/olepro32/.gitignore | 1 dlls/olesvr32/.gitignore | 1 dlls/opengl32/.gitignore | 1 dlls/powrprof/.gitignore | 1 dlls/psapi/.gitignore | 1 dlls/quartz/.gitignore | 1 dlls/rasapi32/.gitignore | 1 dlls/riched20/.gitignore | 1 dlls/rpcrt4/.gitignore | 1 dlls/rsaenh/.gitignore | 1 dlls/secur32/.gitignore | 1 dlls/sensapi/.gitignore | 1 dlls/serialui/.gitignore | 1 dlls/setupapi/.gitignore | 1 dlls/sfc/.gitignore | 1 dlls/shdocvw/.gitignore | 1 dlls/shell32/.gitignore | 1 dlls/shfolder/.gitignore | 1 dlls/shlwapi/.gitignore | 1 dlls/snmpapi/.gitignore | 1 dlls/sti/.gitignore | 1 dlls/tapi32/.gitignore | 1 dlls/unicows/.gitignore | 1 dlls/url/.gitignore | 1 dlls/urlmon/.gitignore | 1 dlls/user/.gitignore | 1 dlls/usp10/.gitignore | 1 dlls/uxtheme/.gitignore | 1 dlls/vdmdbg/.gitignore | 1 dlls/version/.gitignore | 1 dlls/wined3d/.gitignore | 1 dlls/winedos/.gitignore | 1 dlls/wininet/.gitignore | 1 dlls/winmm/.gitignore | 1 dlls/winnls32/.gitignore | 1 dlls/winspool.drv/.gitignore | 1 dlls/wintab32/.gitignore | 1 dlls/wintrust/.gitignore | 1 dlls/wldap32/.gitignore | 1 dlls/wnaspi32/.gitignore | 1 dlls/wow32/.gitignore | 1 dlls/ws2_32/.gitignore | 1 dlls/wsock32/.gitignore | 1 dlls/wtsapi32/.gitignore | 1 117 files changed, 122 insertions(+), 115 deletions(-) delete mode 100644 dlls/activeds/.gitignore delete mode 100644 dlls/advapi32/.gitignore delete mode 100644 dlls/advpack/.gitignore delete mode 100644 dlls/avicap32/.gitignore delete mode 100644 dlls/capi2032/.gitignore delete mode 100644 dlls/cfgmgr32/.gitignore delete mode 100644 dlls/compstui/.gitignore delete mode 100644 dlls/crtdll/.gitignore delete mode 100644 dlls/cryptdll/.gitignore delete mode 100644 dlls/ctl3d32/.gitignore delete mode 100644 dlls/d3dx8/.gitignore delete mode 100644 dlls/dbghelp/.gitignore delete mode 100644 dlls/dciman32/.gitignore delete mode 100644 dlls/dnsapi/.gitignore delete mode 100644 dlls/glu32/.gitignore delete mode 100644 dlls/glut32/.gitignore delete mode 100644 dlls/icmp/.gitignore delete mode 100644 dlls/imagehlp/.gitignore delete mode 100644 dlls/imm32/.gitignore delete mode 100644 dlls/iphlpapi/.gitignore delete mode 100644 dlls/lz32/.gitignore delete mode 100644 dlls/mapi32/.gitignore delete mode 100644 dlls/mlang/.gitignore delete mode 100644 dlls/mprapi/.gitignore delete mode 100644 dlls/msftedit/.gitignore delete mode 100644 dlls/msimg32/.gitignore delete mode 100644 dlls/msvcrt20/.gitignore delete mode 100644 dlls/msvcrt40/.gitignore delete mode 100644 dlls/msvcrtd/.gitignore delete mode 100644 dlls/netapi32/.gitignore delete mode 100644 dlls/newdev/.gitignore delete mode 100644 dlls/ntdll/.gitignore delete mode 100644 dlls/ntdsapi/.gitignore delete mode 100644 dlls/odbc32/.gitignore delete mode 100644 dlls/odbccp32/.gitignore delete mode 100644 dlls/oleacc/.gitignore delete mode 100644 dlls/olecli32/.gitignore delete mode 100644 dlls/olepro32/.gitignore delete mode 100644 dlls/olesvr32/.gitignore delete mode 100644 dlls/powrprof/.gitignore delete mode 100644 dlls/psapi/.gitignore delete mode 100644 dlls/rasapi32/.gitignore delete mode 100644 dlls/rpcrt4/.gitignore delete mode 100644 dlls/rsaenh/.gitignore delete mode 100644 dlls/secur32/.gitignore delete mode 100644 dlls/sensapi/.gitignore delete mode 100644 dlls/sfc/.gitignore delete mode 100644 dlls/shfolder/.gitignore delete mode 100644 dlls/snmpapi/.gitignore delete mode 100644 dlls/sti/.gitignore delete mode 100644 dlls/tapi32/.gitignore delete mode 100644 dlls/unicows/.gitignore delete mode 100644 dlls/url/.gitignore delete mode 100644 dlls/user/.gitignore delete mode 100644 dlls/usp10/.gitignore delete mode 100644 dlls/vdmdbg/.gitignore delete mode 100644 dlls/version/.gitignore delete mode 100644 dlls/wined3d/.gitignore delete mode 100644 dlls/winedos/.gitignore delete mode 100644 dlls/winnls32/.gitignore delete mode 100644 dlls/wintab32/.gitignore delete mode 100644 dlls/wnaspi32/.gitignore delete mode 100644 dlls/wow32/.gitignore delete mode 100644 dlls/wtsapi32/.gitignore Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5258e061dcf3f5a5270…

1 0

Alexandre Julliard : make_progs: Generate the .gitignore file.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 028ab92bf7211261d37908dd73df76292cb75e4c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=028ab92bf7211261d37908d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 20:59:06 2006 +0200 make_progs: Generate the .gitignore file. Ignore generated programs from the top-level .gitignore. --- programs/.gitignore | 37 +++++++++++++++++++++++++++++++++++ programs/clock/.gitignore | 1 - programs/cmdlgtst/.gitignore | 1 - programs/control/.gitignore | 1 - programs/eject/.gitignore | 1 - programs/expand/.gitignore | 1 - programs/explorer/.gitignore | 1 - programs/hh/.gitignore | 1 - programs/icinfo/.gitignore | 1 - programs/iexplore/.gitignore | 1 - programs/make_progs | 24 +++++++++++++++++++++++ programs/msiexec/.gitignore | 1 - programs/notepad/.gitignore | 1 - programs/oleview/.gitignore | 1 - programs/progman/.gitignore | 1 - programs/regedit/.gitignore | 1 - programs/regsvr32/.gitignore | 1 - programs/rpcss/.gitignore | 1 - programs/rundll32/.gitignore | 1 - programs/start/.gitignore | 1 - programs/taskmgr/.gitignore | 1 - programs/uninstaller/.gitignore | 1 - programs/view/.gitignore | 1 - programs/wcmd/.gitignore | 1 - programs/wineboot/.gitignore | 1 - programs/winebrowser/.gitignore | 1 - programs/winecfg/.gitignore | 1 - programs/wineconsole/.gitignore | 1 - programs/winedbg/.gitignore | 1 - programs/winefile/.gitignore | 1 - programs/winemenubuilder/.gitignore | 1 - programs/winemine/.gitignore | 1 - programs/winepath/.gitignore | 1 - programs/winetest/.gitignore | 1 - programs/winevdm/.gitignore | 1 - programs/winhelp/.gitignore | 1 - programs/winver/.gitignore | 1 - programs/wordpad/.gitignore | 1 - 38 files changed, 61 insertions(+), 36 deletions(-) delete mode 100644 programs/control/.gitignore delete mode 100644 programs/eject/.gitignore delete mode 100644 programs/expand/.gitignore delete mode 100644 programs/explorer/.gitignore delete mode 100644 programs/hh/.gitignore delete mode 100644 programs/icinfo/.gitignore delete mode 100644 programs/iexplore/.gitignore delete mode 100644 programs/rpcss/.gitignore delete mode 100644 programs/rundll32/.gitignore delete mode 100644 programs/wineboot/.gitignore delete mode 100644 programs/winebrowser/.gitignore delete mode 100644 programs/winemenubuilder/.gitignore delete mode 100644 programs/winepath/.gitignore delete mode 100644 programs/winevdm/.gitignore delete mode 100644 programs/winver/.gitignore diff --git a/programs/.gitignore b/programs/.gitignore index 98c564f..7320986 100644 --- a/programs/.gitignore +++ b/programs/.gitignore @@ -1,3 +1,40 @@ +# Automatically generated by make_dlls; DO NOT EDIT!! /Makeprog.rules /wineapploader /winelauncher +clock/clock +cmdlgtst/cmdlgtst +control/control +eject/eject +expand/expand +explorer/explorer +hh/hh +icinfo/icinfo +iexplore/iexplore +msiexec/msiexec +notepad/notepad +oleview/oleview +progman/progman +regedit/regedit +regsvr32/regsvr32 +rpcss/rpcss +rundll32/rundll32 +start/start +taskmgr/taskmgr +uninstaller/uninstaller +view/view +wcmd/wcmd +wineboot/wineboot +winebrowser/winebrowser +winecfg/winecfg +wineconsole/wineconsole +winedbg/winedbg +winefile/winefile +winemenubuilder/winemenubuilder +winemine/winemine +winepath/winepath +winetest/winetest +winevdm/winevdm +winhelp/winhelp +winver/winver +wordpad/wordpad diff --git a/programs/clock/.gitignore b/programs/clock/.gitignore index c10b08c..2a51044 100644 --- a/programs/clock/.gitignore +++ b/programs/clock/.gitignore @@ -1,2 +1 @@ -/clock /rsrc.res diff --git a/programs/cmdlgtst/.gitignore b/programs/cmdlgtst/.gitignore index fa7cadc..f4621f2 100644 --- a/programs/cmdlgtst/.gitignore +++ b/programs/cmdlgtst/.gitignore @@ -1,3 +1,2 @@ /about.ico /cmdlgr.res -/cmdlgtst diff --git a/programs/control/.gitignore b/programs/control/.gitignore deleted file mode 100644 index 8a32ae2..0000000 --- a/programs/control/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/control diff --git a/programs/eject/.gitignore b/programs/eject/.gitignore deleted file mode 100644 index 1f14634..0000000 --- a/programs/eject/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/eject diff --git a/programs/expand/.gitignore b/programs/expand/.gitignore deleted file mode 100644 index 757a202..0000000 --- a/programs/expand/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/expand diff --git a/programs/explorer/.gitignore b/programs/explorer/.gitignore deleted file mode 100644 index 3dd7bab..0000000 --- a/programs/explorer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/explorer diff --git a/programs/hh/.gitignore b/programs/hh/.gitignore deleted file mode 100644 index ba30b9c..0000000 --- a/programs/hh/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/hh diff --git a/programs/icinfo/.gitignore b/programs/icinfo/.gitignore deleted file mode 100644 index 7392049..0000000 --- a/programs/icinfo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/icinfo diff --git a/programs/iexplore/.gitignore b/programs/iexplore/.gitignore deleted file mode 100644 index 0e0d7ca..0000000 --- a/programs/iexplore/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/iexplore diff --git a/programs/make_progs b/programs/make_progs index b689808..e854ed9 100755 --- a/programs/make_progs +++ b/programs/make_progs @@ -187,3 +187,27 @@ EOF close NEWMAKE; rename "Makefile.in.new", "Makefile.in"; printf "Successfully updated Makefile.in\n"; + +################################################################ +# .gitignore file + +open GITIGNORE, ">.gitignore.new" or die "cannot create .gitignore.new"; +print GITIGNORE "# Automatically generated by make_dlls; DO NOT EDIT!!\n"; + +my @ignores = +( + "/Makeprog.rules", + "/wineapploader", + "/winelauncher", +); + +foreach my $dir (sort keys %alldirs) +{ + push @ignores, "$dir/$dir"; +} + +print GITIGNORE join("\n", sort @ignores) . "\n"; + +close GITIGNORE; +rename ".gitignore.new", ".gitignore"; +printf "Successfully updated .gitignore\n"; diff --git a/programs/msiexec/.gitignore b/programs/msiexec/.gitignore index 0dd572f..7bf2122 100644 --- a/programs/msiexec/.gitignore +++ b/programs/msiexec/.gitignore @@ -1,3 +1,2 @@ -/msiexec /msiexec.ico /rsrc.res diff --git a/programs/notepad/.gitignore b/programs/notepad/.gitignore index 0259bda..2a51044 100644 --- a/programs/notepad/.gitignore +++ b/programs/notepad/.gitignore @@ -1,2 +1 @@ -/notepad /rsrc.res diff --git a/programs/oleview/.gitignore b/programs/oleview/.gitignore index 4be2a55..57b12b5 100644 --- a/programs/oleview/.gitignore +++ b/programs/oleview/.gitignore @@ -1,3 +1,2 @@ -/oleview /rsrc.res /toolbar.bmp diff --git a/programs/progman/.gitignore b/programs/progman/.gitignore index 4e6cd2e..2a51044 100644 --- a/programs/progman/.gitignore +++ b/programs/progman/.gitignore @@ -1,2 +1 @@ -/progman /rsrc.res diff --git a/programs/regedit/.gitignore b/programs/regedit/.gitignore index a76cda5..aa199d6 100644 --- a/programs/regedit/.gitignore +++ b/programs/regedit/.gitignore @@ -2,7 +2,6 @@ /computer.ico /folder.ico /folderopen.ico -/regedit /regedit.ico /rsrc.res /string.ico diff --git a/programs/regsvr32/.gitignore b/programs/regsvr32/.gitignore index 40b9e1e..06e1265 100644 --- a/programs/regsvr32/.gitignore +++ b/programs/regsvr32/.gitignore @@ -1,2 +1 @@ -/regsvr32 /regsvr32.res diff --git a/programs/rpcss/.gitignore b/programs/rpcss/.gitignore deleted file mode 100644 index c5ab3e6..0000000 --- a/programs/rpcss/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/rpcss diff --git a/programs/rundll32/.gitignore b/programs/rundll32/.gitignore deleted file mode 100644 index 5d4d128..0000000 --- a/programs/rundll32/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/rundll32 diff --git a/programs/start/.gitignore b/programs/start/.gitignore index 239d61c..2a51044 100644 --- a/programs/start/.gitignore +++ b/programs/start/.gitignore @@ -1,2 +1 @@ /rsrc.res -/start diff --git a/programs/taskmgr/.gitignore b/programs/taskmgr/.gitignore index f0e2786..4457658 100644 --- a/programs/taskmgr/.gitignore +++ b/programs/taskmgr/.gitignore @@ -1,5 +1,4 @@ /font.bmp -/taskmgr /taskmgr.ico /taskmgr.res /trayicon.bmp diff --git a/programs/uninstaller/.gitignore b/programs/uninstaller/.gitignore index a79fd3a..910c476 100644 --- a/programs/uninstaller/.gitignore +++ b/programs/uninstaller/.gitignore @@ -1,3 +1,2 @@ /rsrc.res -/uninstaller /uninstaller.ico diff --git a/programs/view/.gitignore b/programs/view/.gitignore index ed6ee4d..84a7c2d 100644 --- a/programs/view/.gitignore +++ b/programs/view/.gitignore @@ -1,2 +1 @@ -/view /viewrc.res diff --git a/programs/wcmd/.gitignore b/programs/wcmd/.gitignore index 40ac2f9..98f93ea 100644 --- a/programs/wcmd/.gitignore +++ b/programs/wcmd/.gitignore @@ -1,3 +1,2 @@ -/wcmd /wcmd.ico /wcmdrc.res diff --git a/programs/wineboot/.gitignore b/programs/wineboot/.gitignore deleted file mode 100644 index 02334bc..0000000 --- a/programs/wineboot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/wineboot diff --git a/programs/winebrowser/.gitignore b/programs/winebrowser/.gitignore deleted file mode 100644 index 05bbedf..0000000 --- a/programs/winebrowser/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winebrowser diff --git a/programs/winecfg/.gitignore b/programs/winecfg/.gitignore index 78f927a..b996cdd 100644 --- a/programs/winecfg/.gitignore +++ b/programs/winecfg/.gitignore @@ -1,4 +1,3 @@ /idb_checkbox.bmp /idb_wine.bmp -/winecfg /winecfg.res diff --git a/programs/wineconsole/.gitignore b/programs/wineconsole/.gitignore index 52435c9..7f01abd 100644 --- a/programs/wineconsole/.gitignore +++ b/programs/wineconsole/.gitignore @@ -1,2 +1 @@ -/wineconsole /wineconsole_res.res diff --git a/programs/winedbg/.gitignore b/programs/winedbg/.gitignore index f000570..f920a23 100644 --- a/programs/winedbg/.gitignore +++ b/programs/winedbg/.gitignore @@ -1,5 +1,4 @@ /dbg.tab.c /dbg.tab.h /lex.yy.c -/winedbg /winedbg.man diff --git a/programs/winefile/.gitignore b/programs/winefile/.gitignore index a6ce9ff..537475c 100644 --- a/programs/winefile/.gitignore +++ b/programs/winefile/.gitignore @@ -2,5 +2,4 @@ /images.bmp /rsrc.res /toolbar.bmp -/winefile /winefile.ico diff --git a/programs/winemenubuilder/.gitignore b/programs/winemenubuilder/.gitignore deleted file mode 100644 index b8bbf5c..0000000 --- a/programs/winemenubuilder/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winemenubuilder diff --git a/programs/winemine/.gitignore b/programs/winemine/.gitignore index f97effe..bcef963 100644 --- a/programs/winemine/.gitignore +++ b/programs/winemine/.gitignore @@ -2,5 +2,4 @@ /leds.bmp /mines.bmp /rsrc.res -/winemine /winemine.ico diff --git a/programs/winepath/.gitignore b/programs/winepath/.gitignore deleted file mode 100644 index 790d7bd..0000000 --- a/programs/winepath/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winepath diff --git a/programs/winetest/.gitignore b/programs/winetest/.gitignore index 309abfb..7d0effb 100644 --- a/programs/winetest/.gitignore +++ b/programs/winetest/.gitignore @@ -1,5 +1,4 @@ /dist.res /tests.rc /wine.ico -/winetest /winetest.res diff --git a/programs/winevdm/.gitignore b/programs/winevdm/.gitignore deleted file mode 100644 index edeb542..0000000 --- a/programs/winevdm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winevdm diff --git a/programs/winhelp/.gitignore b/programs/winhelp/.gitignore index 5128fe5..e5e7bff 100644 --- a/programs/winhelp/.gitignore +++ b/programs/winhelp/.gitignore @@ -1,3 +1,2 @@ /lex.yy.c /rsrc.res -/winhelp diff --git a/programs/winver/.gitignore b/programs/winver/.gitignore deleted file mode 100644 index 147ca3e..0000000 --- a/programs/winver/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/winver diff --git a/programs/wordpad/.gitignore b/programs/wordpad/.gitignore index 538e2ef..57b12b5 100644 --- a/programs/wordpad/.gitignore +++ b/programs/wordpad/.gitignore @@ -1,3 +1,2 @@ /rsrc.res /toolbar.bmp -/wordpad

1 0

Alexandre Julliard : Take advantage of the recursive nature of . gitignore for Makefile entries.
by Alexandre Julliard 11 Jul '06

11 Jul '06

1 0

Alexandre Julliard : make_dlls: Generate the .gitignore file.
by Alexandre Julliard 11 Jul '06

11 Jul '06

Module: wine Branch: refs/heads/master Commit: 38daf97abfe5af805bc1aa953236eb9efa220d8c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38daf97abfe5af805bc1aa9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 10 20:52:13 2006 +0200 make_dlls: Generate the .gitignore file. --- dlls/.gitignore | 1 + dlls/make_dlls | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/.gitignore b/dlls/.gitignore index 206de98..a768d59 100644 --- a/dlls/.gitignore +++ b/dlls/.gitignore @@ -1,3 +1,4 @@ +# Automatically generated by make_dlls; DO NOT EDIT!! /Makedll.rules /Makeimplib.rules /Maketest.rules diff --git a/dlls/make_dlls b/dlls/make_dlls index 3f60d94..31a0fa3 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -351,3 +351,31 @@ EOF close NEWMAKE; rename "Makefile.in.new", "Makefile.in"; printf "Successfully updated Makefile.in\n"; + +################################################################ +# .gitignore file + +open GITIGNORE, ">.gitignore.new" or die "cannot create .gitignore.new"; +print GITIGNORE "# Automatically generated by make_dlls; DO NOT EDIT!!\n"; + +my @ignores = +( + "/Makedll.rules", + "/Makeimplib.rules", + "/Maketest.rules", +); + +foreach my $mod (sort @lib_symlinks) +{ + push @ignores, "/$importlibs{$mod}.def"; +} +foreach my $mod (sort keys %directories) +{ + next unless defined $altnames{$mod}; + push @ignores, map { "/" . $_ . "16"; } @{$altnames{$mod}}; +} +print GITIGNORE join("\n", sort @ignores) . "\n"; + +close GITIGNORE; +rename ".gitignore.new", ".gitignore"; +printf "Successfully updated .gitignore\n";

1 0

appdb/. appimage.php
by WineHQ 11 Jul '06

11 Jul '06

ChangeSet ID: 26404 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/10 22:48:40 Modified files: . : appimage.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Clean up appimage code removing a bunch of redundant code and removing a query for each image that is actually output to the browser Patch: http://cvs.winehq.org/patch.py?id=26404 Old revision New revision Changes Path 1.27 1.28 +19 -47 appdb/appimage.php Index: appdb/appimage.php diff -u -p appdb/appimage.php:1.27 appdb/appimage.php:1.28 --- appdb/appimage.php:1.27 11 Jul 2006 3:48:40 -0000 +++ appdb/appimage.php 11 Jul 2006 3:48:40 -0000 @@ -28,59 +28,31 @@ header("Pragma: "); if(!$_SESSION['current']->canViewImage($aClean['iId'])) util_show_error_page_and_exit("Insufficient privileges."); -if ($aClean['sREQUEST_METHOD']='HEAD') +$oScreenshot = new Screenshot($aClean['iId']); +$fImage = fopen(appdb_fullpath("data/screenshots/".$oScreenshot->sUrl), "rb"); + +/* if we can open the image we should get its last modified time and read */ +/* a few bytes from its header information and close it */ +if($fImage) { - /* WARNING! optimization of logic in include/screenshots.php */ - if (sscanf($aClean['iId'],"%d", &$iId) < 1) - util_show_error_page_and_exit("Bad parameter"); - - $hResult = query_parameters("SELECT id, url FROM appData - WHERE id = '?' - AND type = 'image' LIMIT 1", $iId); - $fImage = 0; - if($hResult) - { - $oRow = mysql_fetch_object($hResult); - - /* we need to use the url field from appData, this is the name of the file */ - /* in the filesystem */ - $fImage = fopen(appdb_fullpath("data/screenshots/".$oRow->url), "rb"); - } - - /* if the query failed or if we didn't find the image, we should */ - /* report a 404 to the browser */ - if(!$hResult || !$fImage) - { - header("404 No such image"); - exit; - } $fstat_val = fstat($fImage); $iModTime = $fstat_val['mtime']; - $sMagic = fread($fImage,8); + $sMagic = fread($fImage, 8); /* read 8 bytes from the header, that lets us idenfity the type of + image without loading it */ fclose($fImage); /* don't leave the fopened image open */ - /* identify what kind of image this is, if we can't identify it */ - /* we should report that its a bad image */ - if (strcmp("\x89PNG\r\n\x1A\n",$sMagic)==0) - { - header("Content-Type: image/png"); - } else if (preg_match("^\xD8\xFF^",$sMagic)) { - header("Content-Type: image/jpeg"); - } else { - header("500 Bad image format"); - exit; - } - header("Cache-Control: public"); - header("Expires: "); - header("Last-Modified: ".fHttpDate($iModTime)); } -$oScreenshot = new Screenshot($aClean['iId']); - -/* at this point, we know that .../screenshots/$oScreenshot->sUrl and - * .../screenshots/thumbnails/$oScreenshot->sUrl both exist as normally - * they would both be created at the same time. */ -$fstat_val = stat(appdb_fullpath("data/screenshots/".$oScreenshot->sUrl)); -$iModTime = $fstat_val['mtime']; +/* identify what kind of image this is, if we can't identify it */ +/* we should report that its a bad image */ +if (strcmp("\x89PNG\r\n\x1A\n", $sMagic)==0) +{ + header("Content-Type: image/png"); +} else if (preg_match("^\xD8\xFF^", $sMagic)) { + header("Content-Type: image/jpeg"); +} else { + header("500 Bad image format"); + exit; +} header("Cache-Control: public"); header("Expires: ");

1 0

appdb/include util.php
by WineHQ 11 Jul '06

11 Jul '06

ChangeSet ID: 26403 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/10 22:47:00 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove unused lookupVendorName() Patch: http://cvs.winehq.org/patch.py?id=26403 Old revision New revision Changes Path 1.70 1.71 +0 -12 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.70 appdb/include/util.php:1.71 --- appdb/include/util.php:1.70 11 Jul 2006 3:47: 0 -0000 +++ appdb/include/util.php 11 Jul 2006 3:47: 0 -0000 @@ -274,18 +274,6 @@ function getNumberOfBugLinks() return 0; } -function lookupVendorName($vendorId) -{ - $sResult = query_parameters("SELECT * FROM vendor ". - "WHERE vendorId = '?'", - $vendorId); - if(!$sResult || mysql_num_rows($sResult) != 1) - return "Unknown vendor"; - - $vendor = mysql_fetch_object($sResult); - return $vendor->vendorName; -} - /* used by outputTopXRowAppsFromRating() to reduce duplicated code */ function outputTopXRow($oRow) {

1 0

appdb/include util.php
by WineHQ 11 Jul '06

11 Jul '06

ChangeSet ID: 26402 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/10 22:41:57 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Speed up outputTopXRowAppsFromRating() by earlying out if we have enough applications to fill our required amount. This saves a database query for each top X table. Also rename $num_apps to $iNum_apps Patch: http://cvs.winehq.org/patch.py?id=26402 Old revision New revision Changes Path 1.69 1.70 +8 -5 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.69 appdb/include/util.php:1.70 --- appdb/include/util.php:1.69 11 Jul 2006 3:41:57 -0000 +++ appdb/include/util.php 11 Jul 2006 3:41:57 -0000 @@ -301,11 +301,11 @@ function outputTopXRow($oRow) } /* Output the rows for the Top-X tables on the main page */ -function outputTopXRowAppsFromRating($rating, $num_apps) +function outputTopXRowAppsFromRating($rating, $iNum_apps) { /* clean the input values so we can continue to use query_appdb() */ $rating = mysql_real_escape_string($rating); - $num_apps = mysql_real_escape_string($num_apps); + $iNum_apps = mysql_real_escape_string($iNum_apps); /* list of appIds we've already output, so we don't output */ /* them again when filling in any empty spots in the list */ @@ -318,14 +318,17 @@ function outputTopXRowAppsFromRating($ra GROUP BY appVotes.appId ORDER BY c DESC LIMIT ?"; - $hResult = query_parameters($sQuery, $rating, $num_apps); - $num_apps-=mysql_num_rows($hResult); /* take away the rows we are outputting here */ + $hResult = query_parameters($sQuery, $rating, $iNum_apps); + $iNum_apps-=mysql_num_rows($hResult); /* take away the rows we are outputting here */ while($oRow = mysql_fetch_object($hResult)) { array_push($appIdArray, $oRow->appId); /* keep track of the apps we've already output */ outputTopXRow($oRow); } + /* if we have no more app entries we should stop now and save ourselves a query */ + if(!$iNum_apps) return; + /* if we have any empty spots in the list, get these from applications with images */ $sQuery = "SELECT DISTINCT appVersion.appId as appId, appVersion.versionId FROM appVersion, appData @@ -338,7 +341,7 @@ function outputTopXRowAppsFromRating($ra foreach($appIdArray as $key=>$value) $sQuery.="AND appVersion.appId != '".$value."' "; - $sQuery.=" LIMIT $num_apps"; + $sQuery.=" LIMIT $iNum_apps"; /* get the list that will fill the empty spots */ $hResult = query_appdb($sQuery);

1 0

appdb/admin adminTestResults.php
by WineHQ 11 Jul '06

11 Jul '06

ChangeSet ID: 26401 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/10 22:39:18 Modified files: admin : adminTestResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a 'back' link at the top of the page. Switch to using html_back_link() to keep the displayed text uniform, we were missing the '<<' before 'Back' Patch: http://cvs.winehq.org/patch.py?id=26401 Old revision New revision Changes Path 1.12 1.13 +4 -2 appdb/admin/adminTestResults.php Index: appdb/admin/adminTestResults.php diff -u -p appdb/admin/adminTestResults.php:1.12 appdb/admin/adminTestResults.php:1.13 --- appdb/admin/adminTestResults.php:1.12 11 Jul 2006 3:39:18 -0000 +++ appdb/admin/adminTestResults.php 11 Jul 2006 3:39:18 -0000 @@ -73,6 +73,7 @@ if ($aClean['sSub']) apidb_header("Edit testing results for ".$sVersionInfo); break; } + echo '<form name="sQform" action="'.$_SERVER['PHP_SELF'].'" method="post" enctype="multipart/form-data">',"\n"; // View Testing Details echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; @@ -100,6 +101,8 @@ if ($aClean['sSub']) echo "submitter to let them know the item was deleted.</p>\n\n"; echo "</td></tr></table></div>\n\n"; + echo html_back_link(1, $_SERVER['PHP_SELF']); + $oTest->OutputEditor(); echo html_frame_start("Reply text", "90%", "", 0); echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; @@ -131,8 +134,7 @@ if ($aClean['sSub']) echo '</form>',"\n"; echo html_frame_end(); - echo '<a href="'.$_SERVER['PHP_SELF'].'">Back</a>'; - + echo html_back_link(1, $_SERVER['PHP_SELF']); } else {

1 0