Added winebrowser app that launches a Unix browser.
diff --git a/configure b/configure
index 70fc20e..dac9a28 100755
--- a/configure
+++ b/configure
@@ -18899,7 +18899,7 @@
MAKE_PROG_RULES=programs/Makeprog.rules
- ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/wined3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/msi/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrtd/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uxtheme/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile"
+ ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/wined3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/msi/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrtd/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uxtheme/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile"
cat >confcache <<\_ACEOF
@@ -19608,6 +19608,7 @@
"programs/view/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/view/Makefile" ;;
"programs/wcmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/wcmd/Makefile" ;;
"programs/wineboot/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/wineboot/Makefile" ;;
+ "programs/winebrowser/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/winebrowser/Makefile" ;;
"programs/winecfg/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/winecfg/Makefile" ;;
"programs/wineconsole/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/wineconsole/Makefile" ;;
"programs/winedbg/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/winedbg/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 03766cf..bcf1cc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1650,6 +1650,7 @@
programs/view/Makefile
programs/wcmd/Makefile
programs/wineboot/Makefile
+programs/winebrowser/Makefile
programs/winecfg/Makefile
programs/wineconsole/Makefile
programs/winedbg/Makefile
diff --git a/programs/Makefile.in b/programs/Makefile.in
index 88d4338..3f700d4 100644
--- a/programs/Makefile.in
+++ b/programs/Makefile.in
@@ -22,6 +22,7 @@
view \
wcmd \
wineboot \
+ winebrowser \
winecfg \
wineconsole \
winedbg \
@@ -50,6 +51,7 @@
uninstaller \
wcmd \
wineboot \
+ winebrowser \
winecfg \
wineconsole \
winedbg \
@@ -71,6 +73,7 @@
uninstaller \
wcmd \
wineboot \
+ winebrowser \
winecfg \
wineconsole \
winedbg \
@@ -99,6 +102,7 @@
view.exe \
wcmd.exe \
wineboot.exe \
+ winebrowser.exe \
winecfg.exe \
wineconsole.exe \
winedbg.exe \
@@ -208,6 +212,9 @@
wineboot.exe$(DLLEXT): wineboot/wineboot.exe$(DLLEXT)
$(RM) $@ && $(LN_S) wineboot/wineboot.exe$(DLLEXT) $@
+winebrowser.exe$(DLLEXT): winebrowser/winebrowser.exe$(DLLEXT)
+ $(RM) $@ && $(LN_S) winebrowser/winebrowser.exe$(DLLEXT) $@
+
winecfg.exe$(DLLEXT): winecfg/winecfg.exe$(DLLEXT)
$(RM) $@ && $(LN_S) winecfg/winecfg.exe$(DLLEXT) $@
@@ -259,6 +266,7 @@
view/view.exe$(DLLEXT): view
wcmd/wcmd.exe$(DLLEXT): wcmd
wineboot/wineboot.exe$(DLLEXT): wineboot
+winebrowser/winebrowser.exe$(DLLEXT): winebrowser
winecfg/winecfg.exe$(DLLEXT): winecfg
wineconsole/wineconsole.exe$(DLLEXT): wineconsole
winedbg/winedbg.exe$(DLLEXT): winedbg
diff --git a/programs/make_progs b/programs/make_progs
index 1c786c6..261d637 100755
--- a/programs/make_progs
+++ b/programs/make_progs
@@ -36,6 +36,7 @@
"uninstaller" => 1,
"wcmd" => 1,
"wineboot" => 1,
+ "winebrowser" => 1,
"winecfg" => 1,
"wineconsole" => 1,
"winedbg" => 1,
diff --git a/programs/winebrowser/.cvsignore b/programs/winebrowser/.cvsignore
new file mode 100644
index 0000000..96edf1a
--- /dev/null
+++ b/programs/winebrowser/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+winebrowser.exe.dbg.c
+winebrowser.exe.spec.c
diff --git a/programs/winebrowser/Makefile.in b/programs/winebrowser/Makefile.in
new file mode 100644
index 0000000..88f6061
--- /dev/null
+++ b/programs/winebrowser/Makefile.in
@@ -0,0 +1,14 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = winebrowser.exe
+APPMODE = cui
+IMPORTS = shell32 user32 advapi32 kernel32
+
+C_SRCS = \
+ main.c
+
+@MAKE_PROG_RULES@
+
+### Dependencies:
diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c
new file mode 100644
index 0000000..1323117
--- /dev/null
+++ b/programs/winebrowser/main.c
@@ -0,0 +1,94 @@
+/*
+ * winebrowser - winelib app to launch native OS browser
+ *
+ * Copyright (C) 2004 Chris Morgan
+ *
+ * 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
+ *
+ * NOTES:
+ * Winebrowser is a winelib application that will start the appropriate
+ * native browser up for a wine installation that lacks a windows browser.
+ * Thus you will be able to open urls via native mozilla if no browser
+ * has yet been installed in wine.
+ */
+
+#include "config.h"
+#include "wine/port.h"
+
+#include <windows.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+
+/*****************************************************************************
+ * Main entry point. This is a console application so we have a main() not a
+ * winmain().
+ */
+int main (int argc, char *argv[])
+{
+ const char *argv_new[3];
+ DWORD maxLength;
+ CHAR szBrowsers[256];
+ DWORD type;
+ CHAR *defaultBrowsers = "mozilla,netscape,konqueror,galeon,opera";
+ char *browser;
+ HKEY hkey;
+ LONG r;
+
+ /* ensure that mozilla or other browsers don't think the */
+ /* temp directory is "E:\\" */
+ unsetenv("TEMP");
+ unsetenv("TMP");
+
+ maxLength = sizeof(szBrowsers);
+
+ if(RegCreateKeyEx( HKEY_CURRENT_USER,
+ "Software\\Wine\\WineBrowser", 0, NULL,
+ REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL,
+ &hkey, NULL))
+ {
+ fprintf( stderr, "winebrowser: cannot create config key\n" );
+ return 1;
+ }
+
+ r = RegQueryValueExA( hkey, "Browsers", 0, &type, szBrowsers, &maxLength);
+ if(r != ERROR_SUCCESS)
+ {
+ /* set value to the default */
+ RegSetValueExA(hkey, "Browsers", 0, REG_SZ,
+ (LPBYTE)defaultBrowsers, lstrlen(defaultBrowsers) + 1);
+ strcpy( szBrowsers, defaultBrowsers );
+ }
+
+ RegCloseKey(hkey);
+
+
+ /* now go through the list of browsers until we run out or we find one that */
+ /* works */
+ browser = strtok(szBrowsers, ",");
+
+ while(browser)
+ {
+ argv_new[0] = browser;
+ argv_new[1] = argv[1];
+ argv_new[2] = NULL;
+
+ spawnvp(_P_OVERLAY, browser, argv_new); /* only returns on error */
+
+ browser = strtok(NULL, ","); /* grab the next browser */
+ }
+ fprintf( stderr, "winebrowser: could not find a browser to run\n" );
+ return 1;
+}
diff --git a/tools/wineinstall b/tools/wineinstall
index f6c9151..04663a6 100755
--- a/tools/wineinstall
+++ b/tools/wineinstall
@@ -145,6 +145,7 @@
link_app uninstaller "$CROOT/windows/uninstall.exe"
link_app winhelp "$CROOT/windows/winhelp.exe"
link_app winhelp "$CROOT/windows/winhlp32.exe"
+ link_app winebrowser "$CROOT/windows/winebrowser.exe"
}
# startup...
diff --git a/winedefault.reg b/winedefault.reg
index 44a61cb..9b29855 100644
--- a/winedefault.reg
+++ b/winedefault.reg
@@ -4610,6 +4610,9 @@
[HKEY_CLASSES_ROOT\txtfile\shell\print\command]
@="C:\\WINDOWS\\NOTEPAD.EXE /p %1"
+# Map requests to open "http" entries to winebroswer
+[HKEY_CLASSES_ROOT\http\shell\open\command]
+@="winebrowser %1"
#
# Entries for DirectShow
