- Wine-Devel - list.winehq.org

Fwd: patch for "GetFileTitleW: illegal call to GetFileTitleA" 3ed
by liu spider Jan. 18, 2003

Jan. 18, 2003

Thanks to Alexandre Julliard. He pointed out to me the right method, and I hope this patch is the correct one. ChangeLog: -dlls/commdlg/filetitle.c implemented GetFileTitleW GetFileTitleA now is a call to GetFileTitleW liuspider __________________________________________________ Do you Yahoo!? Yahoo! Mail Plus - Powerful. Affordable. Sign up now. http://mailplus.yahoo.com Index: dlls/commdlg/filetitle.c =================================================================== RCS file: /home/wine/wine/dlls/commdlg/filetitle.c,v retrieving revision 1.12 diff -u -r1.12 filetitle.c --- dlls/commdlg/filetitle.c 31 May 2002 23:25:45 -0000 1.12 +++ dlls/commdlg/filetitle.c 18 Jan 2003 14:13:02 -0000 @@ -3,6 +3,7 @@ * * Copyright 1994 Martin Ayotte * Copyright 1996 Albrecht Kleine + * Copyright 2003 liuspider * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,10 +25,10 @@ #include "winbase.h" #include "winnls.h" #include "commdlg.h" +#include "wine/unicode.h" +#include "winternl.h" #include "wine/debug.h" -#include "heap.h" /* Has to go */ - WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" @@ -38,19 +39,41 @@ */ short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf) { - int i, len; + int ret,totalW; + UNICODE_STRING strWFile; + LPWSTR lpWTitle; + totalW = cbBuf * sizeof(WCHAR); + RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile); + lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, totalW); + ret = GetFileTitleW(strWFile.Buffer, lpWTitle, totalW); + if (!ret){ + WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL ); + } + RtlFreeUnicodeString( &strWFile ); + RtlFreeHeap( GetProcessHeap(), 0, lpWTitle ); + return ret; +} + +/*********************************************************************** + * GetFileTitleW (COMDLG32.@) + * + */ +short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf) +{ + int i, len; + WCHAR brkpoint[] = {'*','[',']'}; TRACE("(%p %p %d); \n", lpFile, lpTitle, cbBuf); if(lpFile == NULL || lpTitle == NULL) return -1; - len = strlen(lpFile); + len = strlenW(lpFile); if (len == 0) return -1; - if(strpbrk(lpFile, "*[]")) + if(strpbrkW(lpFile, brkpoint)) return -1; len--; @@ -70,34 +93,14 @@ if(i == -1) i++; - TRACE("---> '%s' \n", &lpFile[i]); + TRACE("---> '%s' \n", debugstr_w(&lpFile[i])); - len = strlen(lpFile+i)+1; + len = strlenW(lpFile+i)+1; if(cbBuf < len) return len; - strncpy(lpTitle, &lpFile[i], len); + strncpyW(lpTitle, &lpFile[i], len); return 0; -} - - -/*********************************************************************** - * GetFileTitleW (COMDLG32.@) - * - */ -short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf) -{ - LPSTR file = HEAP_strdupWtoA(GetProcessHeap(), 0, lpFile); /* Has to go */ - LPSTR title = HeapAlloc(GetProcessHeap(), 0, cbBuf); - short ret; - - ret = GetFileTitleA(file, title, cbBuf); - - if (cbBuf > 0 && !MultiByteToWideChar( CP_ACP, 0, title, -1, lpTitle, cbBuf )) - lpTitle[cbBuf-1] = 0; - HeapFree(GetProcessHeap(), 0, file); - HeapFree(GetProcessHeap(), 0, title); - return ret; }

1 0

Running Wine with a Windows install
by Tom Wickline Jan. 18, 2003

Jan. 18, 2003

I have hit a small road block in updating the Packagers Guide and i'm in need of a little help here :) Section 3.3 : http://www.winehq.com/Docs/wine-pkg/pkg-winpartition.shtml Talks about useing files from an installation of the actual Microsoft Windows operating system. And as I dont have Windows on this box and I only have Win2000 on my second HD at this time I am not sure if this section is out of date. And what the differances between 9x and NT, 2K, XP are. So if you have Windows on your box or if you run Wine with Windows can you send me the path to the .dat files .ini file and system dlls ? In the future is this going to be done for the user by a config script ? One more question while im at it :)) I sent a patch to wine-patches about 6 hours ago and its still not listed how long does this take ? are the patches moderated before being posted ? Tom

1 0

Re: Implementation of "start.exe", take 3
by davep Jan. 18, 2003

Jan. 18, 2003

On Saturday 18 Jan 2003 08:44, Dan Kegel wrote: > Remaining issue I could use help with: > * multiline strings from resource file are displayed with extra newline > between lines in wine, but not in windows. To reproduce, build > either as winelib app or build under MSVC6, then run in wine; > usage message comes out double-spaced. Help! Use a backslash on the end of each line to escape the LF. Look at programs/wcmd/wcmdrc.rc for an example. Dave

1 0

how to make a proper .diff
by Tom Wickline Jan. 18, 2003

Jan. 18, 2003

Hi, I have what may be a stupid question but im going to ask it :) If im working on lets say packaging.sgml and I finish one section and make a diff against cvs. Then should I refresh my packaging.sgml from cvs and start on section #2 ? This is what I have done... Because if I keep working on the same file the diff grows and I would send the same patch over and over.. So I am doing this the correct way ? Tom

2 1

Implementation of "start.exe", take 3
by Dan Kegel Jan. 18, 2003

Jan. 18, 2003

Changes since take 2: * internationalized * can be built with MSVC6.0; resulting .exe works in both Windows and Wine * winelib app now installed by wineinstall * winedefault.reg now has entries needed to make 'start foo.txt' work Remaining issue I could use help with: * multiline strings from resource file are displayed with extra newline between lines in wine, but not in windows. To reproduce, build either as winelib app or build under MSVC6, then run in wine; usage message comes out double-spaced. Help! I suspect it's worth submitting to wine-patches until that issue is resolved. Again, to those who are confused why I didn't just use cygstart, cygstart's license seems to be an issue, and cygstart doesn't implement one of the four options in the real Windows start.exe, so I plowed ahead with my own version. We can add options from Cygstart later. - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045 Index: configure.ac =================================================================== RCS file: /home/wine/wine/configure.ac,v retrieving revision 1.122 diff -u -r1.122 configure.ac --- configure.ac 15 Jan 2003 00:50:48 -0000 1.122 +++ configure.ac 18 Jan 2003 08:11:26 -0000 @@ -1519,6 +1519,7 @@ programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile +programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile Index: winedefault.reg =================================================================== RCS file: /home/wine/wine/winedefault.reg,v retrieving revision 1.61 diff -u -r1.61 winedefault.reg --- winedefault.reg 19 Dec 2002 21:16:56 -0000 1.61 +++ winedefault.reg 18 Jan 2003 08:11:26 -0000 @@ -2838,3 +2838,18 @@ "LongDistanceRule"=" 8WFG" "Name"="Uzbekistan" "SameAreaRule"="G" + +# +# Entries to get ShellExecute to map .txt files to notepad +# + +[HKEY_CLASSES_ROOT\.txt] +@="txtfile" +"Content Type"="text/plain" + +[HKEY_CLASSES_ROOT\txtfile\shell\open\command] +@="C:\\WINDOWS\\NOTEPAD.EXE %1" + +[HKEY_CLASSES_ROOT\txtfile\shell\print\command] +@="C:\\WINDOWS\\NOTEPAD.EXE /p %1" + Index: programs/Makefile.in =================================================================== RCS file: /home/wine/wine/programs/Makefile.in,v retrieving revision 1.33 diff -u -r1.33 Makefile.in --- programs/Makefile.in 4 Jan 2003 02:52:05 -0000 1.33 +++ programs/Makefile.in 18 Jan 2003 08:11:26 -0000 @@ -19,6 +19,7 @@ regtest \ rpcss \ rundll32 \ + start \ uninstaller \ view \ wcmd \ @@ -43,6 +44,7 @@ regsvr32 \ rpcss \ rundll32 \ + start \ uninstaller \ wcmd \ wineboot \ @@ -73,6 +75,7 @@ # Symlinks to apps that we want to run from inside the source tree SYMLINKS = \ + start.exe \ rpcss.exe \ wcmd.exe \ wineconsole.exe \ @@ -136,6 +139,9 @@ winhelp.exe$(DLLEXT): winhelp/winhelp.exe$(DLLEXT) $(RM) $@ && $(LN_S) winhelp/winhelp.exe$(DLLEXT) $@ + +start.exe$(DLLEXT): start/start.exe$(DLLEXT) + $(RM) $@ && $(LN_S) start/start.exe$(DLLEXT) $@ wcmd/wcmd.exe$(DLLEXT): wcmd wineconsole/wineconsole.exe$(DLLEXT): wineconsole Index: tools/wineinstall =================================================================== RCS file: /home/wine/wine/tools/wineinstall,v retrieving revision 1.50 diff -u -r1.50 wineinstall --- tools/wineinstall 5 Dec 2002 19:05:44 -0000 1.50 +++ tools/wineinstall 18 Jan 2003 08:11:26 -0000 @@ -101,6 +101,7 @@ function create_windows_directories { for tdir in "$CROOT/windows" "$CROOT/windows/system" \ + "$CROOT/windows/command" \ "$CROOT/windows/Start Menu" "$CROOT/windows/Start Menu/Programs" \ "$CROOT/Program Files" "$CROOT/Program Files/Common Files" \ "$CROOT/windows/Profiles" "$CROOT/windows/Profiles/Administrator" \ @@ -129,6 +130,7 @@ #puts windows applications replacements to windows directories, #configures them function configure_wine_applications { + link_app start "$CROOT/windows/command/start.exe" link_app notepad "$CROOT/windows/notepad.exe" link_app regedit "$CROOT/windows/regedit.exe" link_app rundll32 "$CROOT/windows/rundll32.exe" --- /dev/null 2002-08-30 16:31:37.000000000 -0700 +++ programs/start/Makefile.in 2003-01-17 23:25:49.000000000 -0800 @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = start.exe +APPMODE = cui +IMPORTS = shell32 user32 + +C_SRCS = start.c + +RC_SRCS = rsrc.rc + +(a)MAKE_PROG_RULES@ + +### Dependencies: --- /dev/null 2002-08-30 16:31:37.000000000 -0700 +++ programs/start/start.c 2003-01-18 00:04:53.000000000 -0800 @@ -0,0 +1,190 @@ +/* + * Start a program using ShellExecuteEx, optionally wait for it to finish + * Compatible with Microsoft's "c:\windows\command\start.exe" + * + * Copyright 2003 Dan Kegel + * + * This program 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 program 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 program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <windows.h> +#include <winuser.h> +#include <stdio.h> +#include <stdlib.h> +#include <shlobj.h> + +#include "resources.h" + +/** + Output given message to stdout without formatting. +*/ +static void output(const char *message) +{ + DWORD count; + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), message, strlen(message), &count, NULL); +} + +/** + Output given message, + followed by ": ", + followed by description of given GetLastError() value to stdout, + followed by a trailing newline, + then terminate. +*/ +static void fatal_error(const char *msg, DWORD error_code) +{ + LPVOID lpMsgBuf; + int status; + + output(msg); + output(": "); + status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPTSTR) & lpMsgBuf, 0, NULL); + if (!status) { + output("FormatMessage failed\n"); + } else { + output(lpMsgBuf); + LocalFree((HLOCAL) lpMsgBuf); + output("\n"); + } + ExitProcess(1); +} + +/** + Output given message from string table, + followed by ": ", + followed by description of given GetLastError() value to stdout, + followed by a trailing newline, + then terminate. +*/ +static void fatal_string_error(int which, DWORD error_code) +{ + char msg[2048]; + + if (!LoadString(GetModuleHandle(NULL), which, + msg, sizeof(msg))) + fatal_error("LoadString failed", GetLastError()); + + fatal_error(msg, error_code); +} + +static void fatal_string(int which) +{ + char msg[2048]; + + if (!LoadString(GetModuleHandle(NULL), which, + msg, sizeof(msg))) + fatal_error("LoadString failed", GetLastError()); + + output(msg); + ExitProcess(1); +} + +static void usage() +{ + fatal_string(STRING_USAGE); +} + +static void license() +{ + fatal_string(STRING_LICENSE); +} + +int main(int argc, char *argv[]) +{ + char arguments[MAX_PATH]; + char *p; + SHELLEXECUTEINFO sei; + int argi; + + memset(&sei, 0, sizeof(sei)); + sei.cbSize = sizeof(sei); + sei.lpVerb = "open"; + sei.nShow = SW_SHOWNORMAL; + /* Dunno what these mean, but it looks like winMe's start uses them */ + sei.fMask = SEE_MASK_FLAG_DDEWAIT|SEE_MASK_FLAG_NO_UI; + + /* Canonical Microsoft commandline flag processing: + * flags start with /, are case insensitive, + * and may be run together in same word. + */ + for (argi=1; argi<argc; argi++) { + int ci; + + if (argv[argi][0] != '/') + break; + + /* Handle all options in this word */ + for (ci=0; argv[argi][ci]; ) { + /* Skip slash */ + ci++; + switch(argv[argi][ci]) { + case 'l': + case 'L': + license(); + break; /* notreached */ + case 'm': + case 'M': + if (argv[argi][ci+1] == 'a' || argv[argi][ci+1] == 'A') + sei.nShow = SW_SHOWMAXIMIZED; + else + sei.nShow = SW_SHOWMINIMIZED; + break; + case 'r': + case 'R': + /* sei.nShow = SW_SHOWNORMAL; */ + break; + case 'w': + case 'W': + sei.fMask |= SEE_MASK_NOCLOSEPROCESS; + break; + default: + printf("Option '%s' not recognized\n", argv[argi]+ci-1); + usage(); + } + /* Skip to next slash */ + while (argv[argi][ci] && (argv[argi][ci] != '/')) + ci++; + } + } + + if (argi == argc) + usage(); + + sei.lpFile = argv[argi++]; + + /* FIXME - prone to overflow */ + arguments[0] = 0; + for (p = arguments; argi < argc; argi++) + p += sprintf(p, " %s", argv[argi]); + + sei.lpParameters = arguments; + + if (!ShellExecuteEx(&sei)) + fatal_string_error(STRING_EXECFAIL, GetLastError()); + + if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { + DWORD exitcode; + DWORD waitcode; + waitcode = WaitForSingleObject(sei.hProcess, INFINITE); + if (waitcode) + fatal_error("WaitForSingleObject", GetLastError()); + if (!GetExitCodeProcess(sei.hProcess, &exitcode)) + fatal_error("GetExitCodeProcess", GetLastError()); + /* fixme: haven't tested whether exit code works properly */ + ExitProcess(exitcode); + } + + ExitProcess(0); +} --- /dev/null 2002-08-30 16:31:37.000000000 -0700 +++ programs/start/resources.h 2003-01-17 23:26:09.000000000 -0800 @@ -0,0 +1,3 @@ +#define STRING_USAGE 101 +#define STRING_LICENSE 102 +#define STRING_EXECFAIL 103 --- /dev/null 2002-08-30 16:31:37.000000000 -0700 +++ programs/start/En.rc 2003-01-17 23:26:09.000000000 -0800 @@ -0,0 +1,64 @@ +/* + * Start + * English Language Support + * + * Copyright 2003 Dan Kegel + * + * 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 + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(850) + +STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +{ +STRING_USAGE, "Start a program, or open a document in the program normally used for files with that suffix. \n\ +Usage: \n\ +start [options] program_filename [...] \n\ +start [options] document_filename \n\ + \n\ +Options: \n\ +/M[inimized] Start the program minimized. \n\ +/MAX[imized] Start the program maximized. \n\ +/R[estored] Start the program normally (neither minimized nor maximized). \n\ +/W[ait] Wait for started program to finish, then exit with its exit code. \n\ +/L Show end-user license. \n\ + \n\ +start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ +Start comes with ABSOLUTELY NO WARRANTY; for details run with /L option. \n\ +This is free software, and you are welcome to redistribute it \n\ +under certain conditions; run 'start /L' for details. \n\ +" + +STRING_LICENSE, "start.exe version 0.2 Copyright (C) 2003, Dan Kegel \n\ +This program is free software; you can redistribute it and/or \n\ +modify it under the terms of the GNU Lesser Public License \n\ +as published by the Free Software Foundation; either version 2.1 \n\ +of the License, or (at your option) any later version. \n\ + \n\ +This program is distributed in the hope that it will be useful, \n\ +but WITHOUT ANY WARRANTY; without even the implied warranty of \n\ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \n\ +GNU Lesser Public License for more details. \n\ + \n\ +You should have received a copy of the GNU Lesser Public License \n\ +along with this program; if not, write to the Free Software \n\ +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. \n\ + \n\ +See the COPYING.LIB file for license information. \n\ +" + +STRING_EXECFAIL "Application could not be started, or no application associated with the specified file.\nShellExecuteEx failed" +} --- /dev/null 2002-08-30 16:31:37.000000000 -0700 +++ programs/start/rsrc.rc 2003-01-17 23:26:09.000000000 -0800 @@ -0,0 +1,24 @@ +/* + * Copyright 2003 Dan Kegel + * + * 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 + */ + +#include <windows.h> +#include "resources.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "En.rc"

1 0

Re: * Hack * for Wine-20030115 DOSFS_Hash on Solaris 8 x86
by Andreas Mohr Jan. 18, 2003

Jan. 18, 2003

Hi ! On Fri, Jan 17, 2003 at 08:40:30PM -0500, John Wehle wrote: > wine photoed reports it can't find GIFIMP32.FLT (and friends) > which prevents images from being imported. The trace is: > > trace:dosfs:DOSFS_GetFullName L"C:\\PROGRA~1\\COMMON~1\\MICROS~1\\GRPHFLT\\GIFIM > P32.FLT" (last=0) > trace:dosfs:DOSFS_FindUnixName /dos,L"PROGRA~1\\COMMON~1\\MICROS~1\\GRPHFLT\\GIF > IMP32.FLT" > trace:dosfs:DOSFS_ToDosFCBFormat (L"PROGRA~1\\COMMON~1\\MICROS~1\\GRPHFLT\\GIFIM > P32.FLT", df621770) > trace:dosfs:DOSFS_OpenDir "/dos" > ... > trace:dosfs:DOSFS_ReadDir Read: long_name: L"Program Files", short_name: (null) > trace:dosfs:DOSFS_FindUnixName checking L"PROGRA~1 " L"PROG~FBU " > > What happens is DOSFS_Hash hashes "Program Files" in an unexpected fashion > which prevents DOSFS_FindUnixName from realizing it matches ""PROGRA~1 ". > > The enclosed * hack * allows wine photoed to load images. It is * not * > the correct answer. One possible approach is to modify DOSFS_OpenDir_Normal > to generate "proper" short names after it has read all the directory entries. Hmm, somehow I don't think this is a proper solution. The reasoning being that you probably have a Windows partition in your Wine install with that ~1 path buried somewhere in the registry or so. And IMHO if the registry contains such a setting (*from installation only* - a program most likely wouldn't create a ~1 .3 shortcut pathname on its own !), then we are SOL and probably should keep it like that instead of adding hacks that probably don't improve the code a whole lot. Instead, people should install the program via Wine, thus gaining "proper" registry keys with "proper" 8.3 *Wine* hashing during the install via Wine ! We simply don't seem to have a way to have a *fixed* mapping of long filenames to the ~1 shortcuts used in Windows; that's why we need our hashing. (someone correct me if I'm wrong about this issue !) Or maybe I'm wrong and we should indeed try to cope even with such a pretty hopeless situation. Oh, and I just realized that maybe yet another patch from you might get rejected ;-\ (although I'm grateful for the discussion about that issue) Andreas Mohr P.S.: Please CC me on followup discussions - I'm not on wine-devel currently.

1 0

Implementation of 'start', take 2
by Dan Kegel Jan. 18, 2003

Jan. 18, 2003

I had a look at cygstart, but it doesn't even try to be commandline-compatible with Microsoft's start.exe. Oh, well. I've verified that this implementation of start can do both start notepad and start foo.txt and that it obeys all the options obeyed by WindowsMe's start.exe. It also implements the /L option to print out the LGPL. (Do we have a convention for what this option, required by the LGPL, should be?) I'd rather compile it as a .exe rather than a winelib app - is there a way to do that in the Wine tree? Also, what do I have to do to cause the resulting .exe to end up as %windir%/command/start.exe, so it's in the same place as it is in real Microsoft Windows? BTW, to make 'start foo.txt' work, you need the registry entries [HKEY_CLASSES_ROOT\.txt] @="txtfile" "Content Type"="text/plain" [HKEY_CLASSES_ROOT\txtfile\shell\open\command] @="C:\\WINDOWS\\NOTEPAD.EXE %1" I verified that removing either of these on WinMe caused 'start foo.txt' to fail. I did not verify that, when you use the /w flag, the exit status of the subprocess is returned in the same way as it's done in Windows. Thanks, Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045 Index: configure.ac =================================================================== RCS file: /home/wine/wine/configure.ac,v retrieving revision 1.116 diff -u -r1.116 configure.ac --- configure.ac 4 Jan 2003 02:52:05 -0000 1.116 +++ configure.ac 18 Jan 2003 02:41:32 -0000 @@ -1497,6 +1497,7 @@ programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile +programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile Index: programs/Makefile.in =================================================================== RCS file: /home/wine/wine/programs/Makefile.in,v retrieving revision 1.33 diff -u -r1.33 Makefile.in --- programs/Makefile.in 4 Jan 2003 02:52:05 -0000 1.33 +++ programs/Makefile.in 18 Jan 2003 02:41:32 -0000 @@ -19,6 +19,7 @@ regtest \ rpcss \ rundll32 \ + start \ uninstaller \ view \ wcmd \ @@ -43,6 +44,7 @@ regsvr32 \ rpcss \ rundll32 \ + start \ uninstaller \ wcmd \ wineboot \ @@ -73,6 +75,7 @@ # Symlinks to apps that we want to run from inside the source tree SYMLINKS = \ + start.exe \ rpcss.exe \ wcmd.exe \ wineconsole.exe \ @@ -136,6 +139,9 @@ winhelp.exe$(DLLEXT): winhelp/winhelp.exe$(DLLEXT) $(RM) $@ && $(LN_S) winhelp/winhelp.exe$(DLLEXT) $@ + +start.exe$(DLLEXT): start/start.exe$(DLLEXT) + $(RM) $@ && $(LN_S) start/start.exe$(DLLEXT) $@ wcmd/wcmd.exe$(DLLEXT): wcmd wineconsole/wineconsole.exe$(DLLEXT): wineconsole --- /dev/null 2002-08-30 16:31:37.000000000 -0700 +++ programs/start/Makefile.in 2003-01-16 08:20:35.000000000 -0800 @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = start.exe +APPMODE = cui +IMPORTS = shell32 + +C_SRCS = start.c + +(a)MAKE_PROG_RULES@ + +### Dependencies: --- /dev/null 2002-08-30 16:31:37.000000000 -0700 +++ programs/start/start.c 2003-01-17 17:34:36.000000000 -0800 @@ -0,0 +1,199 @@ +/* + * Start a program using ShellExecuteEx, optionally wait for it to finish + * Compatible with Microsoft's "c:\windows\command\start.exe" + * + * Copyright 2003 Dan Kegel + * + * This program 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 program 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 program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" +#include "wine/debug.h" + +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> +#include <shlobj.h> + +#define VERSIONMSG "start.exe version 0.1 Copyright (C) 2003, Dan Kegel" + +/** + Output given message to stdout without formatting. +*/ +static void output(const char *message) +{ + DWORD count; + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), message, strlen(message), &count, NULL); +} + +/** + Output given message, + followed by ": ", + followed by description of given GetLastError() value to stdout, + followed by a trailing newline, + then terminate. +*/ +static void fatal_error(const char *msg, DWORD error_code) +{ + LPVOID lpMsgBuf; + int status; + + output(msg); + output(": "); + status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPTSTR) & lpMsgBuf, 0, NULL); + if (!status) { + output("FormatMessage failed\n"); + } else { + output(lpMsgBuf); + LocalFree((HLOCAL) lpMsgBuf); + output("\n"); + } + ExitProcess(1); +} + +static void usage() +{ + output("\ +Start a program, or open a document in the program normally used for files with that suffix.\n\ +Usage:\n\ +start [options] program_filename [...]\n\ +start [options] document_filename\n\ +\n\ +Options:\n\ +/M[inimized] Start the program minimized.\n\ +/MAX[imized] Start the program maximized.\n\ +/R[estored] Start the program normally (neither minimized nor maximized).\n\ +/W[ait] Wait for started program to finish, then exit with its exit code.\n\ +/L Show end-user license.\n\ +\n\ +" VERSIONMSG "\n\ +Start comes with ABSOLUTELY NO WARRANTY; for details run with /L option.\n\ +This is free software, and you are welcome to redistribute it\n\ +under certain conditions; run 'start /L' for details.\n\ +"); + ExitProcess(1); +} + +static void license() +{ + output("\ +" VERSIONMSG "\n\n\ +This program is free software; you can redistribute it and/or\n\ +modify it under the terms of the GNU Lesser Public License\n\ +as published by the Free Software Foundation; either version 2.1\n\ +of the License, or (at your option) any later version.\n\ +\n\ +This program is distributed in the hope that it will be useful,\n\ +but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ +GNU Lesser Public License for more details.\n\ +\n\ +You should have received a copy of the GNU Lesser Public License\n\ +along with this program; if not, write to the Free Software\n\ +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n\ +\n\ +See the COPYING.LIB file for license information.\n\ +"); + ExitProcess(1); +} + +int main(int argc, char *argv[]) +{ + char arguments[MAX_PATH]; + char *p; + SHELLEXECUTEINFO sei; + int argi; + + memset(&sei, 0, sizeof(sei)); + sei.cbSize = sizeof(sei); + sei.lpVerb = "open"; + sei.nShow = SW_SHOWNORMAL; + /* Dunno what these mean, but it looks like winMe's start uses them */ + sei.fMask = SEE_MASK_FLAG_DDEWAIT|SEE_MASK_FLAG_NO_UI; + + /* Canonical Microsoft commandline flag processing: + * flags start with /, are case insensitive, + * and may be run together in same word. + */ + for (argi=1; argi<argc; argi++) { + int ci; + + if (argv[argi][0] != '/') + break; + + /* Handle all options in this word */ + for (ci=0; argv[argi][ci]; ) { + /* Skip slash */ + ci++; + switch(argv[argi][ci]) { + case 'l': + case 'L': + license(); + break; /* notreached */ + case 'm': + case 'M': + if (argv[argi][ci+1] == 'a' || argv[argi][ci+1] == 'A') + sei.nShow = SW_SHOWMAXIMIZED; + else + sei.nShow = SW_SHOWMINIMIZED; + break; + case 'r': + case 'R': + /* sei.nShow = SW_SHOWNORMAL; */ + break; + case 'w': + case 'W': + sei.fMask |= SEE_MASK_NOCLOSEPROCESS; + break; + default: + printf("Option '%s' not recognized\n", argv[argi]+ci-1); + usage(); + } + /* Skip to next slash */ + while (argv[argi][ci] && (argv[argi][ci] != '/')) + ci++; + } + } + + if (argi == argc) + usage(); + + sei.lpFile = argv[argi++]; + + /* FIXME - prone to overflow */ + arguments[0] = 0; + for (p = arguments; argi < argc; argi++) + p += sprintf(p, " %s", argv[argi]); + + sei.lpParameters = arguments; + + if (!ShellExecuteEx(&sei)) { + fatal_error("Application could not be started, or no application associated with the specified file. ShellExecuteEx failed", GetLastError()); + } + + if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { + DWORD exitcode; + DWORD waitcode; + waitcode = WaitForSingleObject(sei.hProcess, INFINITE); + if (waitcode) + fatal_error("WaitForSingleObject", GetLastError()); + if (!GetExitCodeProcess(sei.hProcess, &exitcode)) + fatal_error("GetExitCodeProcess", GetLastError()); + /* fixme: haven't tested whether exit code works properly */ + ExitProcess(exitcode); + } + + ExitProcess(0); +}

2 3

Wine kernel acceleration module?
by Mathew McBride Jan. 18, 2003

Jan. 18, 2003

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I just installed Total Annililation the other day (without expansions), it ran quite fast even on the bigger maps (e.g Seven Islands) then installed the Core Contingency and Battle Tatics expansions, and it was as slow as a 486 (not implying that Wine processes everything at 66Mhz, but Total Annilihation is a game that likes chewing up memory). Most notably, the mouse is quite slow. If we implemented a kernel module (keep in mind, it would have to be enabled in the kernel and wine config file so it doesn't make wine directly attached to Linux, e.g so people can port it easier to other Unixes), would that help speed up some DirectX games? (as Linux display drivers don't implement DirectX functions). There are other ways, Bug 176 (http://bugs.winehq.com/show_bug.cgi?id=176) suggested implementing a SDL backend, which is not a bad idea, as SDL also has sound support and since it forwards to DirectX on Windows, gives us some idea on what functions we need to implement. Gavriel State of Transgaming developed a SDL driver (http://www.winehq.com/hypermail/wine-devel/2002/01/0519.html) (which also asks, has anyone successfully used a SDL game under Wine?). My system is a RH 7.3 with a lot of packages from the rawhide repository (namely glibc-2.3), XFree86 build from a recent (=< 4 days) CVS, Wine built from a 2 week old CVS sources, Duron (Thunderbird-cored) 800Mhz(a)840Mhz. - -- Mathew McBride matt(a)mcbridematt.dhs.org http://mcbridematt.dhs.org Jabber: mcbridematt on the jabber.org server -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iQCVAwUBPikHI5nKHiPoVMMhAQJp9wQAuFTcgW9aHfe52L/OcXtbLQfs+icGfrjD k95CRxxf8u/RYGxDEM2FBoJpG9K/tXLz1LlGryGCqOndNPIxWcUzz76sTpwgv8OK PTJYzonhfHBGsCMJ2RhBniurrJuzTDYhRtYOgiroYHJBnOITxGbxNWbKTy4KKCaT IZ8ahWhMM9o= =7S1V -----END PGP SIGNATURE-----

1 0

Re: * Hack * for Wine-20030115 DOSFS_Hash on Solaris 8 x86
by Marcus Meissner Jan. 18, 2003

Jan. 18, 2003

On Fri, Jan 17, 2003 at 08:40:30PM -0500, John Wehle wrote: > wine photoed reports it can't find GIFIMP32.FLT (and friends) > which prevents images from being imported. The trace is: > > trace:dosfs:DOSFS_GetFullName L"C:\\PROGRA~1\\COMMON~1\\MICROS~1\\GRPHFLT\\GIFIM > P32.FLT" (last=0) > trace:dosfs:DOSFS_FindUnixName /dos,L"PROGRA~1\\COMMON~1\\MICROS~1\\GRPHFLT\\GIF > IMP32.FLT" > trace:dosfs:DOSFS_ToDosFCBFormat (L"PROGRA~1\\COMMON~1\\MICROS~1\\GRPHFLT\\GIFIM > P32.FLT", df621770) > trace:dosfs:DOSFS_OpenDir "/dos" > ... > trace:dosfs:DOSFS_ReadDir Read: long_name: L"Program Files", short_name: (null) > trace:dosfs:DOSFS_FindUnixName checking L"PROGRA~1 " L"PROG~FBU " > > What happens is DOSFS_Hash hashes "Program Files" in an unexpected fashion > which prevents DOSFS_FindUnixName from realizing it matches ""PROGRA~1 ". > > The enclosed * hack * allows wine photoed to load images. It is * not * > the correct answer. One possible approach is to modify DOSFS_OpenDir_Normal > to generate "proper" short names after it has read all the directory entries. The proper idea is to install the program using WINE too, so you get the same hashes into the registry. Your hack will not work if 2 files hash to the same value. Ciao, Marcus

1 0

Re: Patch for Wine-20030115 GetFreeSpace on Solaris 8 x86
by Marcus Meissner Jan. 18, 2003

Jan. 18, 2003

On Fri, Jan 17, 2003 at 06:03:35PM -0500, John Wehle wrote: > wine ie5setup reports it can't determine the free disk space. > truss shows statfs failed with EOVERFLOW and sys/statfs.h > says: > > * Structure returned by statfs(2) and fstatfs(2). > * This structure and associated system calls have been replaced > * by statvfs(2) and fstatvfs(2) and will be removed from the system > * in a near-future release. > > This patch allows wine ie5setup to at least startup. A cleaner > patch would probably use an explict autoconf check for statvfs > in addition to checking for sys/vfs.h. > > ChangeLog: > > Fri Jan 17 18:02:37 EST 2003 John Wehle (john(a)feith.com) > > * files/drive.c (DRIVE_GetFreeSpace): Use statvfs > on systems which have sys/vfs.h. This will break on Linux, it has have sys/vfs.h but no statvfs. Better use an autoconf check for the 'statvfs' function and use the result. > + #ifdef HAVE_SYS_VFS_H Use #ifdef HAVE_STATVFS > + struct statvfs info; > + #else > struct statfs info; > + #endif > *** 1297,1305 **** > return 0; > } > > ! /* FIXME: add autoconf check for this */ > ! #if defined(__svr4__) || defined(_SCO_DS) || defined(__sun) > ! if (statfs( DOSDrives[drive].root, &info, 0, 0) < 0) > #else > if (statfs( DOSDrives[drive].root, &info) < 0) > #endif > --- 1301,1308 ---- > return 0; > } > > ! #ifdef HAVE_SYS_VFS_H Dito. > ! if (statvfs( DOSDrives[drive].root, &info) < 0) > #else Ciao, Marcus

1 0