Release 950522
Sun May 21 12:30:30 1995 Alexandre Julliard (julliard@sunsite.unc.edu)
* [debugger/hash.c] [debugger/info.c]
Added support for symbolic segmented addresses. Add symbols for all
built-in API entry points.
* [if1632/relay.c] [include/dlls.h]
Removed dll_table structure, as we now use the built-in module
structures.
* [if1632/relay.c] [loader/main.c]
Removed winestat option, as it was no longer very meaningful.
* [include/stackframe.h]
New macro MAKE_SEGPTR that creates a segmented pointer to a local
variable on the 32-bit stack.
* [loader/module.c]
Added support for multiple instances of an application.
Implemented LoadModule() and FreeModule().
* [loader/ne_image.c] [loader/task.c]
Moved initialisation of built-in DLLs to InitTask().
* [memory/global.c]
Implemented discardable blocks.
* [misc/file.c]
Search path of current executable in OpenFile().
Fixed bug with searching in Windows path.
* [misc/lstr.c]
Hard-coded translation tables for Ansi<->Oem.
* [misc/user.c]
Moved some global initializations to InitApp(), because they need
a task context to be performed.
* [objects/dc.c]
Handle R2_BLACK and R2_WHITE specially so that they work correctly
with palette displays.
* [tools/build.c]
Suppressed generation of the C file for DLL specs, because it's no
longer needed. Output all the assembly code directly to stdout.
Some changes to integrate Win32 support from Martin von Loewis.
* [windows/msgbox.c]
Moved message box code from misc/ to windows/.
Mon May 15 23:40:04 1995 Martin Ayotte (wine@trgcorp.mksinfo.qc.ca)
* [misc/audio.c] [misc/mcicda.c] [misc/mcianim.c] [misc/midi.c]
[misc/mmaux.c] [misc/mmsystem.c]
Modify code & use pointers conversion macros.
Make cdaudio & wave devices work again (only using some applets).
* [misc/profile.c]
Change getc() to fgetc() where needed.
Mon May 15 22:10:56 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [if1632/Imakefile]
added entries for the new files gdi32.spec, kernel32.spec,
user32.spec, shell32.spec and winprocs32.spec.
* [if1632/commdlg.spec][if1632/kernel.spec][if1632/shell.spec]
[if1632/storage.spec][if1632/system.spec][if1632/user.spec]
ChooseFont, RESERVED5, InternalExtractIcon: Marked as stubs
ExtractAssociatedIcon, DoEnvironmentSubst, DumpIcon:
stub implementations provided
marked storage.dll,storege.sys functions as stubs
* [include/pe_image.h]
Added structures WIN32_builtin and WIN32_function
* [include/peexe.h]
PE_Import_Directory: renamed reserved fields to
TimeDate, Forwarder, Thunk_List
* [include/winerror.h]
New file.
* [loader/main.c]
called RELAY32_Init
* [loader/pe_image.c]
xmmap: map BSS anonymous
dump_imports: renamed to fixup_imports, do the fixup of imported
symbols
PE_LoadImage: pass raw data size to xmmap
* [loader/resource.c]
DumpIcon: new function
* [misc/kernel32.c]
New file.
* [misc/main.c]
make stdout and stderr unbuffered
* [misc/shell.c]
DoEnvironmentSubst: new function
* [objects/font.c]
FONT_MatchFont: try oblique if there is no italic
* [rc/Imakefile][rc/parser.l]
yywrap: new function
Don't link with libfl.a on Linux
* [tools/build.c]
Added keywords stdcall, subsystem, base
GenerateForWin32: new function
BuildSpecFiles: call GenerateForWin32 if subsystem is win32
Mon May 15 10:38:14 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/listbox.c] [controls/combo.c] [windows/defwnd.c]
Minor fixes.
* [misc/message.c] [misc/main.c] [rc/sysres*.rc] [include/texts.h]
Rewrote message box handling.
* [windows/dialog.c]
Dialogs should be invisible until after WM_INITDIALOG is seent.
Don't switch to invisible dialog items on a TAB keypress.
* [windows/mdi.c]
Send WM_NCPAINT message in MDIRestoreChild().
* [windows/painting.c]
Fixed typo (&& -> &).
* [windows/message.c] [if1632/user.spec]
Implemented PostAppMessage().
* [windows/event.c]
SetCapture(0) should act like ReleaseCapture().
Tue May 9 11:55:52 1995 Eddie C. Dost (ecd@dressler.de)
* [Imakefile]
Changed CDEBUGFLAGS for systems running __ELF__ (temporarily)
Added ASFLAGS to exported variables.
* [debugger/readline/Imakefile]
Moved defines for libreadline from DEFINES to EXTRA_DEFINES
* [memory/local.c] [miscemu/int21.c]
Added some more debugging outputs.
Mon May 8 00:55:27 MET DST 1995 Dag Asheim (dash@ifi.uio.no)
* [misc/message.c]
Fixed a "FIXME" concerning norwegian translation.
Sun May 7 23:25:23 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [*/*]
Removed warnings in a couple of files and deleted some obsolete code.
* [controls/listbox.c]
Cleanup, speed improvements & lots of bug fixes.
* [controls/combo.c]
Mostly rewritten. This is still very buggy, but not quite as bad as
before.
* [include/commdlg.h] [misc/commdlg.c]
Removed the need for sysres.dll. Small bug fixes.
* [objects/oembitmap.c] [include/bitmaps/<many>] [include/windows.h]
[loader/library.c] [loader/main.c] [rc/sysres*.rc]
Removed sysres.dll and replaced the remaining bitmaps/icons with
XPM equivalents.
* [misc/message.c] [windows/nonclient.c] [misc/main.c]
[if1632/winprocs.spec]
"About Wine..." now brings up a standard ShellAbout() window with
the Wine icon and the list of contributors.
* [misc/shell.c]
Fixed ShellAbout()/AboutDialogProc() to show the right icon.
* [windows/event.c]
Small hack for non-alphanumeric keys: Dont't send the ascii value in
the WM_KEYDOWN message, but some unused code instead. Should be done
properly by sending different codes for each key. The edit control
used to get a VK_DELETE message each time the user typed '.'.
* [windows/class.c]
Removed a check for CS_GLOBALCLASS in CLASS_FindClassByName().
This used to be no problem, but breaks Resource Workshop in 950403.
* [objects/dib.c]
New diagnostic for a bug I've been encountering. If it shows up,
please report it.
Sun May 7 23:11:18 EDT 1995 William Magro (wmagro@tc.cornell.edu)
* [objects/color.c]
Handle situation when 'dc' exists, but palette mapping
does not. (Fixes kidpix2 demo.)
Sun May 7 03:32:00 1995 Charles M. Hannum (mycroft@mit.edu)
* [loader/ldt.c]
LDT_Print: Only show the number of entries that the kernel
returned. Make this work for NetBSD.
Fri May 5 02:53:26 1995 Charles M. Hannum (mycroft@mit.edu)
* [debugger/dbg.y] [include/wine.h] [loader/signal.c]
Modify cs and ds selector values for NetBSD-current.
* [debugger/debug.l]
$sp, $esp: Use RN_ESP_AT_SIGNAL rather than RN_ESP.
* [debugger/regpos.h]
Modify sigcontext format for NetBSD-current.
SC_ESP: Use RN_ESP_AT_SIGNAL rather than RN_ESP.
* [include/ldt.h]
SELECTOR_TO_ENTRY: Explicitly clear the top half of the selector
value, since only 16 bits of it may have been saved.
* [misc/winsocket.c]
Set structure packing with `#pragma pack' to accomodate
other/older compilers.
Tue May 2 18:15:01 1995 Paal Beyer (beyer@idt.unit.no)
* [misc/commdlg.c]
Fixed path-names so when changing directory the listboxes
changes too.
* [debugger/dbg.y debugger/debug.l wine.ini]
Added SymbolTableFile to wine.ini so symbols can be read
without standing in the directory containing wine.sym.
Added the possibility to specify full name of wine.sym from
the debugger prompt.
diff --git a/misc/shell.c b/misc/shell.c
index f6a8db6..bab7b02 100644
--- a/misc/shell.c
+++ b/misc/shell.c
@@ -6,11 +6,12 @@
#include <string.h>
#include <unistd.h>
#include "windows.h"
-#include "library.h"
#include "shell.h"
#include "neexe.h"
#include "selectors.h"
#include "../rc/sysres.h"
+#include "dlgs.h"
+#include "dialog.h"
#include "stddebug.h"
/* #define DEBUG_REG */
#include "debug.h"
@@ -312,7 +313,7 @@
*/
void DragAcceptFiles(HWND hWnd, BOOL b)
{
- dprintf_reg(stdnimp, "DragAcceptFiles : Empty Stub !!!\n");
+ fprintf(stdnimp, "DragAcceptFiles : Empty Stub !!!\n");
}
@@ -321,7 +322,7 @@
*/
void DragQueryFile(HDROP h, UINT u, LPSTR u2, UINT u3)
{
- dprintf_reg(stdnimp, "DragQueryFile : Empty Stub !!!\n");
+ fprintf(stdnimp, "DragQueryFile : Empty Stub !!!\n");
}
@@ -331,8 +332,7 @@
*/
void DragFinish(HDROP h)
{
- dprintf_reg(stdnimp, "DragFinish : Empty Stub !!!\n");
-
+ fprintf(stdnimp, "DragFinish : Empty Stub !!!\n");
}
@@ -341,7 +341,7 @@
*/
BOOL DragQueryPoint(HDROP h, POINT FAR *p)
{
- dprintf_reg(stdnimp, "DragQueryPoinyt : Empty Stub !!!\n");
+ fprintf(stdnimp, "DragQueryPoint : Empty Stub !!!\n");
return FALSE;
}
@@ -351,12 +351,14 @@
*/
HINSTANCE ShellExecute(HWND hWnd, LPCSTR lpOperation, LPCSTR lpFile, LPCSTR lpParameters, LPCSTR lpDirectory, int iShowCmd)
{
- dprintf_reg(stdnimp, "ShellExecute // hWnd=%04X\n", hWnd);
- dprintf_reg(stdnimp, "ShellExecute // lpOperation='%s'\n", lpOperation);
- dprintf_reg(stdnimp, "ShellExecute // lpFile='%s'\n", lpFile);
- dprintf_reg(stdnimp, "ShellExecute // lpParameters='%s'\n", lpParameters);
- dprintf_reg(stdnimp, "ShellExecute // lpDirectory='%s'\n", lpDirectory);
- dprintf_reg(stdnimp, "ShellExecute // iShowCmd=%04X\n", iShowCmd);
+ fprintf(stdnimp, "ShellExecute: empty stub\n");
+ return 2;
+ fprintf(stdnimp, "ShellExecute // hWnd=%04X\n", hWnd);
+ fprintf(stdnimp, "ShellExecute // lpOperation='%s'\n", lpOperation);
+ fprintf(stdnimp, "ShellExecute // lpFile='%s'\n", lpFile);
+ fprintf(stdnimp, "ShellExecute // lpParameters='%s'\n", lpParameters);
+ fprintf(stdnimp, "ShellExecute // lpDirectory='%s'\n", lpDirectory);
+ fprintf(stdnimp, "ShellExecute // iShowCmd=%04X\n", iShowCmd);
return 2; /* file not found */
}
@@ -366,58 +368,57 @@
*/
HINSTANCE FindExecutable(LPCSTR lpFile, LPCSTR lpDirectory, LPSTR lpResult)
{
- dprintf_reg(stdnimp, "FindExecutable : Empty Stub !!!\n");
+ fprintf(stdnimp, "FindExecutable : Empty Stub !!!\n");
return 0;
}
-char AppName[256], AppMisc[256];
-INT AboutDlgProc(HWND hWnd, WORD msg, WORD wParam, LONG lParam);
-
-/*************************************************************************
- * ShellAbout [SHELL.22]
- */
-INT ShellAbout(HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON hIcon)
-{
-/* fprintf(stderr, "ShellAbout ! (%s, %s)\n", szApp, szOtherStuff);*/
-
- if (szApp)
- strcpy(AppName, szApp);
- else
- *AppName = 0;
-
- if (szOtherStuff)
- strcpy(AppMisc, szOtherStuff);
- else
- *AppMisc = 0;
-
- return DialogBoxIndirectPtr( GetWindowWord(hWnd, GWW_HINSTANCE),
- sysres_DIALOG_SHELL_ABOUT_MSGBOX,
- hWnd, GetWndProcEntry16("AboutDlgProc"));
-}
-
+static char AppName[512], AppMisc[512];
/*************************************************************************
* AboutDlgProc [SHELL.33]
*/
INT AboutDlgProc(HWND hWnd, WORD msg, WORD wParam, LONG lParam)
{
- char temp[256];
+ switch(msg) {
+ case WM_INITDIALOG:
+ SendDlgItemMessage(hWnd,stc1,STM_SETICON,LOWORD(lParam),0);
+ SetWindowText(hWnd, AppName);
+ SetWindowText(GetDlgItem(hWnd,100), AppMisc);
+ return 1;
+
+ case WM_COMMAND:
+ switch (wParam) {
+ case IDOK:
+ EndDialog(hWnd, TRUE);
+ return TRUE;
+ }
+ break;
+ }
+ return FALSE;
+}
- switch(msg) {
- case WM_INITDIALOG:
- sprintf(temp, "About %s", AppName);
- SetWindowText(hWnd, temp);
- SetWindowText(GetDlgItem(hWnd,100), AppMisc );
- break;
-
- case WM_COMMAND:
- switch (wParam) {
- case IDOK:
- EndDialog(hWnd, TRUE);
- return TRUE;
- }
- }
- return FALSE;
+/*************************************************************************
+ * ShellAbout [SHELL.22]
+ */
+INT ShellAbout(HWND hWnd, LPCSTR szApp, LPCSTR szOtherStuff, HICON hIcon)
+{
+ if (szApp) {
+ sprintf(AppName, "About %s", szApp);
+ } else {
+ *AppName = 0;
+ }
+ if (szOtherStuff) {
+ strcpy(AppMisc, szOtherStuff);
+ } else {
+ *AppMisc = 0;
+ }
+ if (!hIcon) {
+ hIcon = LoadIcon(0,MAKEINTRESOURCE(OIC_WINEICON));
+ }
+ return DialogBoxIndirectParamPtr(GetWindowWord(hWnd, GWW_HINSTANCE),
+ sysres_DIALOG_SHELL_ABOUT_MSGBOX,
+ hWnd, GetWndProcEntry16("AboutDlgProc"),
+ hIcon);
}
/*************************************************************************
@@ -425,24 +426,23 @@
*/
HICON ExtractIcon(HINSTANCE hInst, LPCSTR lpszExeFileName, UINT nIconIndex)
{
- int count;
HICON hIcon = 0;
HINSTANCE hInst2 = hInst;
dprintf_reg(stddeb, "ExtractIcon(%04X, '%s', %d\n",
hInst, lpszExeFileName, nIconIndex);
if (lpszExeFileName != NULL) {
hInst2 = LoadLibrary(lpszExeFileName);
- }
+ }
if (hInst2 != 0 && nIconIndex == (UINT)-1) {
#if 0
count = GetRsrcCount(hInst2, NE_RSCTYPE_GROUP_ICON);
dprintf_reg(stddeb, "ExtractIcon // '%s' has %d icons !\n", lpszExeFileName, count);
return (HICON)count;
#endif
- }
+ }
if (hInst2 != hInst && hInst2 != 0) {
FreeLibrary(hInst2);
- }
+ }
return hIcon;
}
@@ -452,8 +452,20 @@
*/
HICON ExtractAssociatedIcon(HINSTANCE hInst,LPSTR lpIconPath, LPWORD lpiIcon)
{
- dprintf_reg(stdnimp, "ExtractAssociatedIcon : Empty Stub !!!\n");
- return 0;
+ dprintf_reg(stdnimp, "ExtractAssociatedIcon : Empty Stub !!!\n");
+ return 0;
+}
+
+/*************************************************************************
+ * DoEnvironmentSubst [SHELL.37]
+ * I couldn't find any reference, so even the number of bytes on the
+ * stack might be wrong
+ */
+WORD DoEnvironmentSubst(LPSTR a,WORD b,WORD c)
+{
+ printf(stderr, "DoEnvironmentSubst: Unknown argument count\n");
+ dprintf_reg(stdnimp, "DoEnvironmentSubst %x %x %x\n",a,b,c);
+ return 0;
}
/*************************************************************************
