Release 960302
Sat Mar 2 18:19:06 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Fixed SCROLL_THUMB painting fixes from Alex Korobka to store the
current tracking window.
* [files/file.c]
Fixed two file descriptor leaks in FILE_OpenFile().
* [if1632/relay32.c] [loader/module.c] [loader/pe_image.c]
[tools/build.c]
Replaced LOADEDFILEINFO structure by OFSTRUCT.
* [memory/atom.c]
Reload the pointer to the atom table in ATOM_GetTable() and
ATOM_AddAtom() in case the LOCAL_Alloc() calls caused the table to
move in linear memory.
Fri Mar 1 11:57:13 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [include/callback.h]
Added support for CallWordBreakProc().
* [controls/edit.c]
New caret handling (really efficient / fast).
Implemented EM_SETWORDBREAKPROC and EM_GETWORDBREAKPROC.
Fixed EM_SETFONT so it now also creates a proper new caret.
Wed Feb 28 22:03:34 1996 Daniel Schepler <daniel@frobnitz.wustl.edu>
* [controls/desktop.c] [misc/main.c] [windows/event.c] [windows/win.c]
Added WM_DELETE protocol to top-level windows.
* [controls/scroll.c]
Fixed a problem which caused slow scrolling to continue uncontrollably.
* [misc/exec.c]
Implemented ExitWindows().
* [windows/win.c]
Set top-level owned windows to be transient.
Wed Feb 28 19:13:22 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* [programs/progman/*]
Added a program manager.
Wed Feb 28 18:38:01 1996 Duncan C Thomson <duncan@spd.eee.strath.ac.uk>
* [resources/sysres_Eo.c]
Added support for Esperanto [Eo] language.
Wed Feb 28 00:23:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
Added EndDialog, GetDlgItem, GetDlgItemInt, SetDlgItemInt,
* [win32/init.c]
Added task.h to includes. GetModuleHandleA() - return hInstance
if called with NULL parameter. Freecell needs this. NOTE this
may indicate a problem with differentiation between hModule and
hInstance within Wine.
* [win32/resource.c]
FindResource32() and LoadResource32() - Removed #if 0's around
conversion from hInstance to hModule. See remarks above.
* [win32/string32.c]
WIN32_UniLen() - removed stray semicolon.
Tue Feb 27 21:05:18 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/caret.c]
Set blink rate with call to GetProfileInt().
* [rc/winerc.c]
In new_style(), made initial flag settings WS_CHILD | WS_VISIBLE
instead of 0. This seems to correspond to Borland's defaults, and
the flags can be unset by using the (rather obtuse) "| NOT WS_CHILD"
or "| NOT WS_VISIBLE" technique in the *.rc file.
* [win32/time.c]
In GetLocalTime() and GetSystemTime(), used tv_sec field of result
returned by gettimeofday() instead of making second call to
time(). This eliminates clock jitter if the seconds change
between the two calls (rare, but possible).
* [include/wintypes.h]
Added "#define _far" and "#define _pascal".
* [windows/win.c]
Added function GetDesktopHwnd().
* [include/xmalloc.h]
Removed the '#ifdef HAVE_STDLIB_H' structure, since it seemed to
have been removed from 'configure', and was causing redefinition
warnings.
Tue Feb 27 19:31:11 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/winpos.c]
Added RDW_ALLCHILDREN flag in SetWindowPos (handling SWP_FRAMECHANGED)
to force a repaint when setting menu bars with different rows.
Sun Feb 25 21:15:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/syscolors.c] [controls/scroll.c]
Fixed DrawFocusRect pen and SCROLL_THUMB painting.
1996-03-02 20:34:10 +01:00
|
|
|
/*
|
|
|
|
* Program Manager
|
|
|
|
*
|
|
|
|
* Copyright 1996 Ulrich Schmid
|
|
|
|
*/
|
|
|
|
|
1997-01-01 18:29:55 +01:00
|
|
|
#include "windows.h"
|
Release 960302
Sat Mar 2 18:19:06 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Fixed SCROLL_THUMB painting fixes from Alex Korobka to store the
current tracking window.
* [files/file.c]
Fixed two file descriptor leaks in FILE_OpenFile().
* [if1632/relay32.c] [loader/module.c] [loader/pe_image.c]
[tools/build.c]
Replaced LOADEDFILEINFO structure by OFSTRUCT.
* [memory/atom.c]
Reload the pointer to the atom table in ATOM_GetTable() and
ATOM_AddAtom() in case the LOCAL_Alloc() calls caused the table to
move in linear memory.
Fri Mar 1 11:57:13 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [include/callback.h]
Added support for CallWordBreakProc().
* [controls/edit.c]
New caret handling (really efficient / fast).
Implemented EM_SETWORDBREAKPROC and EM_GETWORDBREAKPROC.
Fixed EM_SETFONT so it now also creates a proper new caret.
Wed Feb 28 22:03:34 1996 Daniel Schepler <daniel@frobnitz.wustl.edu>
* [controls/desktop.c] [misc/main.c] [windows/event.c] [windows/win.c]
Added WM_DELETE protocol to top-level windows.
* [controls/scroll.c]
Fixed a problem which caused slow scrolling to continue uncontrollably.
* [misc/exec.c]
Implemented ExitWindows().
* [windows/win.c]
Set top-level owned windows to be transient.
Wed Feb 28 19:13:22 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* [programs/progman/*]
Added a program manager.
Wed Feb 28 18:38:01 1996 Duncan C Thomson <duncan@spd.eee.strath.ac.uk>
* [resources/sysres_Eo.c]
Added support for Esperanto [Eo] language.
Wed Feb 28 00:23:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
Added EndDialog, GetDlgItem, GetDlgItemInt, SetDlgItemInt,
* [win32/init.c]
Added task.h to includes. GetModuleHandleA() - return hInstance
if called with NULL parameter. Freecell needs this. NOTE this
may indicate a problem with differentiation between hModule and
hInstance within Wine.
* [win32/resource.c]
FindResource32() and LoadResource32() - Removed #if 0's around
conversion from hInstance to hModule. See remarks above.
* [win32/string32.c]
WIN32_UniLen() - removed stray semicolon.
Tue Feb 27 21:05:18 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/caret.c]
Set blink rate with call to GetProfileInt().
* [rc/winerc.c]
In new_style(), made initial flag settings WS_CHILD | WS_VISIBLE
instead of 0. This seems to correspond to Borland's defaults, and
the flags can be unset by using the (rather obtuse) "| NOT WS_CHILD"
or "| NOT WS_VISIBLE" technique in the *.rc file.
* [win32/time.c]
In GetLocalTime() and GetSystemTime(), used tv_sec field of result
returned by gettimeofday() instead of making second call to
time(). This eliminates clock jitter if the seconds change
between the two calls (rare, but possible).
* [include/wintypes.h]
Added "#define _far" and "#define _pascal".
* [windows/win.c]
Added function GetDesktopHwnd().
* [include/xmalloc.h]
Removed the '#ifdef HAVE_STDLIB_H' structure, since it seemed to
have been removed from 'configure', and was causing redefinition
warnings.
Tue Feb 27 19:31:11 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/winpos.c]
Added RDW_ALLCHILDREN flag in SetWindowPos (handling SWP_FRAMECHANGED)
to force a repaint when setting menu bars with different rows.
Sun Feb 25 21:15:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/syscolors.c] [controls/scroll.c]
Fixed DrawFocusRect pen and SCROLL_THUMB painting.
1996-03-02 20:34:10 +01:00
|
|
|
#include "progman.h"
|
|
|
|
|
|
|
|
#define MALLOCHUNK 1000
|
|
|
|
|
|
|
|
#define GET_USHORT(buffer, i)\
|
|
|
|
(((BYTE)((buffer)[(i)]) + 0x100 * (BYTE)((buffer)[(i)+1])))
|
|
|
|
#define GET_SHORT(buffer, i)\
|
|
|
|
(((BYTE)((buffer)[(i)]) + 0x100 * (signed char)((buffer)[(i)+1])))
|
|
|
|
#define PUT_SHORT(buffer, i, s)\
|
|
|
|
(((buffer)[(i)] = (s) & 0xff, (buffer)[(i)+1] = ((s) >> 8) & 0xff))
|
|
|
|
|
|
|
|
static BOOL GRPFILE_ReadFileToBuffer(LPCSTR, HLOCAL*, INT*);
|
|
|
|
static HLOCAL GRPFILE_ScanGroup(LPCSTR, INT, LPCSTR, BOOL);
|
|
|
|
static HLOCAL GRPFILE_ScanProgram(LPCSTR, INT, LPCSTR, INT,
|
|
|
|
LPCSTR, HLOCAL,LPCSTR);
|
|
|
|
static BOOL GRPFILE_DoWriteGroupFile(HFILE file, GROUP *group);
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
*
|
|
|
|
* GRPFILE_ModifyFileName
|
|
|
|
*
|
|
|
|
* Change extension `.grp' to `.gr'
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VOID GRPFILE_ModifyFileName(LPSTR lpszNewName, LPCSTR lpszOrigName,
|
|
|
|
INT nSize, BOOL bModify)
|
|
|
|
{
|
|
|
|
lstrcpyn(lpszNewName, lpszOrigName, nSize);
|
|
|
|
lpszNewName[nSize-1] = '\0';
|
|
|
|
if (!bModify) return;
|
|
|
|
if (!lstrcmpi(lpszNewName + strlen(lpszNewName) - 4, ".grp"))
|
|
|
|
lpszNewName[strlen(lpszNewName) - 1] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
*
|
|
|
|
* GRPFILE_ReadGroupFile
|
|
|
|
*/
|
|
|
|
|
|
|
|
HLOCAL GRPFILE_ReadGroupFile(LPCSTR lpszPath)
|
|
|
|
{
|
|
|
|
CHAR szPath_gr[MAX_PATHNAME_LEN];
|
|
|
|
BOOL bFileNameModified = FALSE;
|
|
|
|
OFSTRUCT dummy;
|
|
|
|
HLOCAL hBuffer, hGroup;
|
|
|
|
INT size;
|
|
|
|
|
|
|
|
/* if `.gr' file exists use that */
|
|
|
|
GRPFILE_ModifyFileName(szPath_gr, lpszPath, MAX_PATHNAME_LEN, TRUE);
|
|
|
|
if (OpenFile(szPath_gr, &dummy, OF_EXIST) != HFILE_ERROR)
|
|
|
|
{
|
|
|
|
lpszPath = szPath_gr;
|
|
|
|
bFileNameModified = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the whole file into a buffer */
|
|
|
|
if (!GRPFILE_ReadFileToBuffer(lpszPath, &hBuffer, &size))
|
|
|
|
{
|
1996-03-31 18:40:13 +02:00
|
|
|
MAIN_MessageBoxIDS_s(IDS_GRPFILE_READ_ERROR_s, lpszPath, IDS_ERROR, MB_YESNO);
|
Release 960302
Sat Mar 2 18:19:06 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Fixed SCROLL_THUMB painting fixes from Alex Korobka to store the
current tracking window.
* [files/file.c]
Fixed two file descriptor leaks in FILE_OpenFile().
* [if1632/relay32.c] [loader/module.c] [loader/pe_image.c]
[tools/build.c]
Replaced LOADEDFILEINFO structure by OFSTRUCT.
* [memory/atom.c]
Reload the pointer to the atom table in ATOM_GetTable() and
ATOM_AddAtom() in case the LOCAL_Alloc() calls caused the table to
move in linear memory.
Fri Mar 1 11:57:13 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [include/callback.h]
Added support for CallWordBreakProc().
* [controls/edit.c]
New caret handling (really efficient / fast).
Implemented EM_SETWORDBREAKPROC and EM_GETWORDBREAKPROC.
Fixed EM_SETFONT so it now also creates a proper new caret.
Wed Feb 28 22:03:34 1996 Daniel Schepler <daniel@frobnitz.wustl.edu>
* [controls/desktop.c] [misc/main.c] [windows/event.c] [windows/win.c]
Added WM_DELETE protocol to top-level windows.
* [controls/scroll.c]
Fixed a problem which caused slow scrolling to continue uncontrollably.
* [misc/exec.c]
Implemented ExitWindows().
* [windows/win.c]
Set top-level owned windows to be transient.
Wed Feb 28 19:13:22 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* [programs/progman/*]
Added a program manager.
Wed Feb 28 18:38:01 1996 Duncan C Thomson <duncan@spd.eee.strath.ac.uk>
* [resources/sysres_Eo.c]
Added support for Esperanto [Eo] language.
Wed Feb 28 00:23:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
Added EndDialog, GetDlgItem, GetDlgItemInt, SetDlgItemInt,
* [win32/init.c]
Added task.h to includes. GetModuleHandleA() - return hInstance
if called with NULL parameter. Freecell needs this. NOTE this
may indicate a problem with differentiation between hModule and
hInstance within Wine.
* [win32/resource.c]
FindResource32() and LoadResource32() - Removed #if 0's around
conversion from hInstance to hModule. See remarks above.
* [win32/string32.c]
WIN32_UniLen() - removed stray semicolon.
Tue Feb 27 21:05:18 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/caret.c]
Set blink rate with call to GetProfileInt().
* [rc/winerc.c]
In new_style(), made initial flag settings WS_CHILD | WS_VISIBLE
instead of 0. This seems to correspond to Borland's defaults, and
the flags can be unset by using the (rather obtuse) "| NOT WS_CHILD"
or "| NOT WS_VISIBLE" technique in the *.rc file.
* [win32/time.c]
In GetLocalTime() and GetSystemTime(), used tv_sec field of result
returned by gettimeofday() instead of making second call to
time(). This eliminates clock jitter if the seconds change
between the two calls (rare, but possible).
* [include/wintypes.h]
Added "#define _far" and "#define _pascal".
* [windows/win.c]
Added function GetDesktopHwnd().
* [include/xmalloc.h]
Removed the '#ifdef HAVE_STDLIB_H' structure, since it seemed to
have been removed from 'configure', and was causing redefinition
warnings.
Tue Feb 27 19:31:11 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/winpos.c]
Added RDW_ALLCHILDREN flag in SetWindowPos (handling SWP_FRAMECHANGED)
to force a repaint when setting menu bars with different rows.
Sun Feb 25 21:15:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/syscolors.c] [controls/scroll.c]
Fixed DrawFocusRect pen and SCROLL_THUMB painting.
1996-03-02 20:34:10 +01:00
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Interpret buffer */
|
|
|
|
hGroup = GRPFILE_ScanGroup(LocalLock(hBuffer), size,
|
|
|
|
lpszPath, bFileNameModified);
|
1996-03-31 18:40:13 +02:00
|
|
|
if (!hGroup)
|
|
|
|
MAIN_MessageBoxIDS_s(IDS_GRPFILE_READ_ERROR_s, lpszPath, IDS_ERROR, MB_YESNO);
|
Release 960302
Sat Mar 2 18:19:06 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Fixed SCROLL_THUMB painting fixes from Alex Korobka to store the
current tracking window.
* [files/file.c]
Fixed two file descriptor leaks in FILE_OpenFile().
* [if1632/relay32.c] [loader/module.c] [loader/pe_image.c]
[tools/build.c]
Replaced LOADEDFILEINFO structure by OFSTRUCT.
* [memory/atom.c]
Reload the pointer to the atom table in ATOM_GetTable() and
ATOM_AddAtom() in case the LOCAL_Alloc() calls caused the table to
move in linear memory.
Fri Mar 1 11:57:13 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [include/callback.h]
Added support for CallWordBreakProc().
* [controls/edit.c]
New caret handling (really efficient / fast).
Implemented EM_SETWORDBREAKPROC and EM_GETWORDBREAKPROC.
Fixed EM_SETFONT so it now also creates a proper new caret.
Wed Feb 28 22:03:34 1996 Daniel Schepler <daniel@frobnitz.wustl.edu>
* [controls/desktop.c] [misc/main.c] [windows/event.c] [windows/win.c]
Added WM_DELETE protocol to top-level windows.
* [controls/scroll.c]
Fixed a problem which caused slow scrolling to continue uncontrollably.
* [misc/exec.c]
Implemented ExitWindows().
* [windows/win.c]
Set top-level owned windows to be transient.
Wed Feb 28 19:13:22 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* [programs/progman/*]
Added a program manager.
Wed Feb 28 18:38:01 1996 Duncan C Thomson <duncan@spd.eee.strath.ac.uk>
* [resources/sysres_Eo.c]
Added support for Esperanto [Eo] language.
Wed Feb 28 00:23:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
Added EndDialog, GetDlgItem, GetDlgItemInt, SetDlgItemInt,
* [win32/init.c]
Added task.h to includes. GetModuleHandleA() - return hInstance
if called with NULL parameter. Freecell needs this. NOTE this
may indicate a problem with differentiation between hModule and
hInstance within Wine.
* [win32/resource.c]
FindResource32() and LoadResource32() - Removed #if 0's around
conversion from hInstance to hModule. See remarks above.
* [win32/string32.c]
WIN32_UniLen() - removed stray semicolon.
Tue Feb 27 21:05:18 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/caret.c]
Set blink rate with call to GetProfileInt().
* [rc/winerc.c]
In new_style(), made initial flag settings WS_CHILD | WS_VISIBLE
instead of 0. This seems to correspond to Borland's defaults, and
the flags can be unset by using the (rather obtuse) "| NOT WS_CHILD"
or "| NOT WS_VISIBLE" technique in the *.rc file.
* [win32/time.c]
In GetLocalTime() and GetSystemTime(), used tv_sec field of result
returned by gettimeofday() instead of making second call to
time(). This eliminates clock jitter if the seconds change
between the two calls (rare, but possible).
* [include/wintypes.h]
Added "#define _far" and "#define _pascal".
* [windows/win.c]
Added function GetDesktopHwnd().
* [include/xmalloc.h]
Removed the '#ifdef HAVE_STDLIB_H' structure, since it seemed to
have been removed from 'configure', and was causing redefinition
warnings.
Tue Feb 27 19:31:11 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/winpos.c]
Added RDW_ALLCHILDREN flag in SetWindowPos (handling SWP_FRAMECHANGED)
to force a repaint when setting menu bars with different rows.
Sun Feb 25 21:15:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/syscolors.c] [controls/scroll.c]
Fixed DrawFocusRect pen and SCROLL_THUMB painting.
1996-03-02 20:34:10 +01:00
|
|
|
|
|
|
|
LocalFree(hBuffer);
|
|
|
|
|
|
|
|
return(hGroup);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
*
|
|
|
|
* GRPFILE_ReadFileToBuffer
|
|
|
|
*/
|
|
|
|
|
|
|
|
static BOOL GRPFILE_ReadFileToBuffer(LPCSTR path, HLOCAL *phBuffer,
|
|
|
|
INT *piSize)
|
|
|
|
{
|
|
|
|
INT len, size;
|
|
|
|
LPSTR buffer;
|
|
|
|
HLOCAL hBuffer, hNewBuffer;
|
|
|
|
HFILE file;
|
|
|
|
|
|
|
|
file=_lopen(path, OF_READ);
|
|
|
|
if (file == HFILE_ERROR) return FALSE;
|
|
|
|
|
|
|
|
size = 0;
|
|
|
|
hBuffer = LocalAlloc(LMEM_FIXED, size + MALLOCHUNK + 1);
|
|
|
|
if (!hBuffer) return FALSE;
|
|
|
|
buffer = LocalLock(hBuffer);
|
|
|
|
|
|
|
|
while ((len = _lread(file, buffer + size, MALLOCHUNK))
|
|
|
|
== MALLOCHUNK)
|
|
|
|
{
|
|
|
|
size += len;
|
|
|
|
hNewBuffer = LocalReAlloc(hBuffer, size + MALLOCHUNK + 1,
|
|
|
|
LMEM_FIXED);
|
|
|
|
if (!hNewBuffer)
|
|
|
|
{
|
|
|
|
LocalFree(hBuffer);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
hBuffer = hNewBuffer;
|
|
|
|
buffer = LocalLock(hBuffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
_lclose(file);
|
|
|
|
|
|
|
|
if (len == HFILE_ERROR)
|
|
|
|
{
|
|
|
|
LocalFree(hBuffer);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
size += len;
|
|
|
|
buffer[size] = 0;
|
|
|
|
|
|
|
|
*phBuffer = hBuffer;
|
|
|
|
*piSize = size;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GRPFILE_ScanGroup
|
|
|
|
*/
|
|
|
|
|
|
|
|
static HLOCAL GRPFILE_ScanGroup(LPCSTR buffer, INT size,
|
|
|
|
LPCSTR lpszGrpFile,
|
|
|
|
BOOL bModifiedFileName)
|
|
|
|
{
|
|
|
|
HLOCAL hGroup;
|
|
|
|
INT i, seqnum;
|
|
|
|
LPCSTR extension;
|
|
|
|
LPCSTR lpszName;
|
|
|
|
INT x, y, width, height, iconx, icony, nCmdShow;
|
|
|
|
INT number_of_programs;
|
|
|
|
BOOL bOverwriteFileOk;
|
|
|
|
|
|
|
|
if (buffer[0] != 'P' || buffer[1] != 'M') return(0);
|
|
|
|
if (buffer[2] == 'C' && buffer[3] == 'C')
|
|
|
|
/* original with checksum */
|
|
|
|
bOverwriteFileOk = FALSE;
|
|
|
|
else if (buffer[2] == 'X' && buffer[3] == 'X')
|
|
|
|
/* modified without checksum */
|
|
|
|
bOverwriteFileOk = TRUE;
|
|
|
|
else return(0);
|
|
|
|
|
|
|
|
/* checksum = GET_USHORT(buffer, 4) (ignored) */
|
|
|
|
|
|
|
|
extension = buffer + GET_USHORT(buffer, 6);
|
|
|
|
if (extension == buffer + size) extension = 0;
|
|
|
|
else if (extension + 6 > buffer + size) return(0);
|
|
|
|
|
|
|
|
nCmdShow = GET_USHORT(buffer, 8);
|
|
|
|
x = GET_SHORT(buffer, 10);
|
|
|
|
y = GET_SHORT(buffer, 12);
|
|
|
|
width = GET_USHORT(buffer, 14);
|
|
|
|
height = GET_USHORT(buffer, 16);
|
|
|
|
iconx = GET_SHORT(buffer, 18);
|
|
|
|
icony = GET_SHORT(buffer, 20);
|
|
|
|
lpszName = buffer + GET_USHORT(buffer, 22);
|
|
|
|
if (lpszName >= buffer + size) return(0);
|
|
|
|
|
|
|
|
/* unknown bytes 24 - 31 ignored */
|
Release 961215
Sun Dec 15 16:18:15 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [graphics/x11drv/bitblt.c]
Fixed BITBLT_StretchImage for partially covered or inverted
bitmaps.
* [objects/dib.c]
Fixed the upside-down bitmap problem.
Sat Dec 14 02:49:57 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
IsMenu and RemoveMenu added (use existing Win16 functions).
* [include/windows.h]
Corrections to BITMAPINFOHEADER structure.
* [loader/module.c] [if1632/kernel32.spec]
New function GetModuleFileName32A (heavily based on original
Win16 version).
* [loader/pe_image.c]
Hack to allow files with short PE header to be loaded (e.g.
COMDLG32.DLL from Win32s).
* [misc/winsock_async.c]
#if out EIDRM case (not present in FreeBSD).
* [tools/build.c]
Remove trailing comments from .s files generated by build
as these break assembly when not run through pre-processor.
* [windows/graphics.c] [if1632/gdi32.spec]
New function Polyline32 - based on original Polyline. Needs
metafile support adding still.
Fri Dec 13 13:04:06 1996 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [win32/findfile.c] [if1632/kernel.spec]
FindFirstFile32A(): Use dos current directory for drive prefixes.
FindNextFile32A(): Fill in file attribute information.
Implement FindFirstFile16, FindNextFile16, FindClose16.
* [files/drive.c]
GetCurrentDirectory32A - Fix problem with null 3rd character in
string.
Tue Dec 10 14:49:07 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/painting.c][windows/message.c]
Don't use linked lists to call SendMessage(), for it might destroy
the current listentry.
* [misc/registry.c]
Fixed temporary file saving (rename doesn't work across
partitions).
* [files/*.c]
GetFullPathName*,GetDriveType32A fixed, CreateDirectoryEx*,
GetVolumeInformation32W fixed.
* [win32/process.c][if1632/kernel.spec][if1632/kernel32.spec]
LoadLibrary* updated to new naming std., *32W added.
* [win32/console.c] [include/wincon.h]
Additions for NT commandline executables.
* [if1632/advapi32.spec][if1632/kernel32.spec][win32/init.c]
GetUserName32W added, GetComputerName32W added,
GetStartupInfo32W added, GetSystemInfo updated to NT standard.
* [windows/msgbox.c][misc/shell.c][windows/graphics.c]
MessageBox32W, ShellAbout32W, CommandLineToArgvW, Polygon32 added.
* [misc/crtdll.c][include/crtdll.h][if1632/crtdll.spec][misc/ntdll.c]
[if1632/ntdll.spec]
Lot of new unicode functions added (needed for NT).
* [loader/pe_image.c]
NtCurrentTeb added.
Tue Dec 10 22:39:33 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/keyboard.c]
Rewrote function TranslateAccelerator().
Mon Dec 9 14:52:13 1996 Slaven Rezic <eserte@cs.tu-berlin.de>
* [windows/defwnd.c]
DEFWND_SetText(): Set icon name.
Sun Dec 8 23:30:00 1996 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [loader/signal.c] [misc/winsock.c] [misc/winsock_async.c]
[if1632/winsock.spec]
IPC resource cleanup, bugfixes.
* [windows/dialog.c] [windows/defdlg.c]
More DefDlgProc() fixes.
Sun Dec 8 14:01:42 1996 Vadim Strizhevsky <striv@ms.com>
* [misc/clipboard.c] [objects/font.c] [win32/init.c]
[win32/newfns.c] [windows/graphics.c]
Added a few WIN32 functions which needed to run some win32
accessories. Clock should now work almost as well as 16 bit version.
Add: RegisterClipboardFormat32W GetTextExtentExPoint32*
GetModuleHandleW, DisableThreadLibraryCalls (empty stub),
Polygon32
Fix: Polygon16 possible memory leak on error return.
1996-12-15 20:45:59 +01:00
|
|
|
/*
|
|
|
|
Unknown bytes should be:
|
|
|
|
wLogPixelsX = GET_SHORT(buffer, 24);
|
|
|
|
wLogPixelsY = GET_SHORT(buffer, 26);
|
|
|
|
byBitsPerPixel = byte at 28;
|
|
|
|
byPlanes = byte at 29;
|
|
|
|
wReserved = GET_SHORT(buffer, 30);
|
|
|
|
*/
|
Release 960302
Sat Mar 2 18:19:06 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Fixed SCROLL_THUMB painting fixes from Alex Korobka to store the
current tracking window.
* [files/file.c]
Fixed two file descriptor leaks in FILE_OpenFile().
* [if1632/relay32.c] [loader/module.c] [loader/pe_image.c]
[tools/build.c]
Replaced LOADEDFILEINFO structure by OFSTRUCT.
* [memory/atom.c]
Reload the pointer to the atom table in ATOM_GetTable() and
ATOM_AddAtom() in case the LOCAL_Alloc() calls caused the table to
move in linear memory.
Fri Mar 1 11:57:13 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [include/callback.h]
Added support for CallWordBreakProc().
* [controls/edit.c]
New caret handling (really efficient / fast).
Implemented EM_SETWORDBREAKPROC and EM_GETWORDBREAKPROC.
Fixed EM_SETFONT so it now also creates a proper new caret.
Wed Feb 28 22:03:34 1996 Daniel Schepler <daniel@frobnitz.wustl.edu>
* [controls/desktop.c] [misc/main.c] [windows/event.c] [windows/win.c]
Added WM_DELETE protocol to top-level windows.
* [controls/scroll.c]
Fixed a problem which caused slow scrolling to continue uncontrollably.
* [misc/exec.c]
Implemented ExitWindows().
* [windows/win.c]
Set top-level owned windows to be transient.
Wed Feb 28 19:13:22 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* [programs/progman/*]
Added a program manager.
Wed Feb 28 18:38:01 1996 Duncan C Thomson <duncan@spd.eee.strath.ac.uk>
* [resources/sysres_Eo.c]
Added support for Esperanto [Eo] language.
Wed Feb 28 00:23:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
Added EndDialog, GetDlgItem, GetDlgItemInt, SetDlgItemInt,
* [win32/init.c]
Added task.h to includes. GetModuleHandleA() - return hInstance
if called with NULL parameter. Freecell needs this. NOTE this
may indicate a problem with differentiation between hModule and
hInstance within Wine.
* [win32/resource.c]
FindResource32() and LoadResource32() - Removed #if 0's around
conversion from hInstance to hModule. See remarks above.
* [win32/string32.c]
WIN32_UniLen() - removed stray semicolon.
Tue Feb 27 21:05:18 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/caret.c]
Set blink rate with call to GetProfileInt().
* [rc/winerc.c]
In new_style(), made initial flag settings WS_CHILD | WS_VISIBLE
instead of 0. This seems to correspond to Borland's defaults, and
the flags can be unset by using the (rather obtuse) "| NOT WS_CHILD"
or "| NOT WS_VISIBLE" technique in the *.rc file.
* [win32/time.c]
In GetLocalTime() and GetSystemTime(), used tv_sec field of result
returned by gettimeofday() instead of making second call to
time(). This eliminates clock jitter if the seconds change
between the two calls (rare, but possible).
* [include/wintypes.h]
Added "#define _far" and "#define _pascal".
* [windows/win.c]
Added function GetDesktopHwnd().
* [include/xmalloc.h]
Removed the '#ifdef HAVE_STDLIB_H' structure, since it seemed to
have been removed from 'configure', and was causing redefinition
warnings.
Tue Feb 27 19:31:11 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/winpos.c]
Added RDW_ALLCHILDREN flag in SetWindowPos (handling SWP_FRAMECHANGED)
to force a repaint when setting menu bars with different rows.
Sun Feb 25 21:15:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/syscolors.c] [controls/scroll.c]
Fixed DrawFocusRect pen and SCROLL_THUMB painting.
1996-03-02 20:34:10 +01:00
|
|
|
|
|
|
|
hGroup = GROUP_AddGroup(lpszName, lpszGrpFile, nCmdShow, x, y,
|
|
|
|
width, height, iconx, icony,
|
|
|
|
bModifiedFileName, bOverwriteFileOk,
|
|
|
|
TRUE);
|
|
|
|
if (!hGroup) return(0);
|
|
|
|
|
|
|
|
number_of_programs = GET_USHORT(buffer, 32);
|
|
|
|
if (2 * number_of_programs + 34 > size) return(0);
|
|
|
|
for (i=0, seqnum=0; i < number_of_programs; i++, seqnum++)
|
|
|
|
{
|
|
|
|
LPCSTR program_ptr = buffer + GET_USHORT(buffer, 34 + 2*i);
|
|
|
|
if (program_ptr + 24 > buffer + size) return(0);
|
|
|
|
if (!GET_USHORT(buffer, 34 + 2*i)) continue;
|
|
|
|
if (!GRPFILE_ScanProgram(buffer, size, program_ptr, seqnum,
|
|
|
|
extension, hGroup, lpszGrpFile))
|
|
|
|
{
|
|
|
|
GROUP_DeleteGroup(hGroup);
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME shouldn't be necessary */
|
|
|
|
GROUP_ShowGroupWindow(hGroup);
|
|
|
|
|
|
|
|
return hGroup;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* GRPFILE_ScanProgram
|
|
|
|
*/
|
|
|
|
|
|
|
|
static HLOCAL GRPFILE_ScanProgram(LPCSTR buffer, INT size,
|
|
|
|
LPCSTR program_ptr, INT seqnum,
|
|
|
|
LPCSTR extension, HLOCAL hGroup,
|
|
|
|
LPCSTR lpszGrpFile)
|
|
|
|
{
|
|
|
|
INT icontype;
|
|
|
|
HICON hIcon;
|
|
|
|
LPCSTR lpszName, lpszCmdLine, lpszIconFile, lpszWorkDir;
|
|
|
|
LPCSTR iconinfo_ptr, iconANDbits_ptr, iconXORbits_ptr;
|
|
|
|
INT x, y, nIconIndex, iconANDsize, iconXORsize;
|
|
|
|
INT nHotKey, nCmdShow;
|
|
|
|
CURSORICONINFO iconinfo;
|
|
|
|
|
|
|
|
x = GET_SHORT(program_ptr, 0);
|
|
|
|
y = GET_SHORT(program_ptr, 2);
|
|
|
|
nIconIndex = GET_USHORT(program_ptr, 4);
|
|
|
|
|
|
|
|
/* FIXME is this correct ?? */
|
|
|
|
icontype = GET_USHORT(program_ptr, 6);
|
|
|
|
switch (icontype)
|
|
|
|
{
|
|
|
|
default:
|
1996-03-31 18:40:13 +02:00
|
|
|
MAIN_MessageBoxIDS_s(IDS_UNKNOWN_FEATURE_s, lpszGrpFile,
|
|
|
|
IDS_WARNING, MB_OK);
|
Release 960302
Sat Mar 2 18:19:06 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Fixed SCROLL_THUMB painting fixes from Alex Korobka to store the
current tracking window.
* [files/file.c]
Fixed two file descriptor leaks in FILE_OpenFile().
* [if1632/relay32.c] [loader/module.c] [loader/pe_image.c]
[tools/build.c]
Replaced LOADEDFILEINFO structure by OFSTRUCT.
* [memory/atom.c]
Reload the pointer to the atom table in ATOM_GetTable() and
ATOM_AddAtom() in case the LOCAL_Alloc() calls caused the table to
move in linear memory.
Fri Mar 1 11:57:13 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [include/callback.h]
Added support for CallWordBreakProc().
* [controls/edit.c]
New caret handling (really efficient / fast).
Implemented EM_SETWORDBREAKPROC and EM_GETWORDBREAKPROC.
Fixed EM_SETFONT so it now also creates a proper new caret.
Wed Feb 28 22:03:34 1996 Daniel Schepler <daniel@frobnitz.wustl.edu>
* [controls/desktop.c] [misc/main.c] [windows/event.c] [windows/win.c]
Added WM_DELETE protocol to top-level windows.
* [controls/scroll.c]
Fixed a problem which caused slow scrolling to continue uncontrollably.
* [misc/exec.c]
Implemented ExitWindows().
* [windows/win.c]
Set top-level owned windows to be transient.
Wed Feb 28 19:13:22 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* [programs/progman/*]
Added a program manager.
Wed Feb 28 18:38:01 1996 Duncan C Thomson <duncan@spd.eee.strath.ac.uk>
* [resources/sysres_Eo.c]
Added support for Esperanto [Eo] language.
Wed Feb 28 00:23:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
Added EndDialog, GetDlgItem, GetDlgItemInt, SetDlgItemInt,
* [win32/init.c]
Added task.h to includes. GetModuleHandleA() - return hInstance
if called with NULL parameter. Freecell needs this. NOTE this
may indicate a problem with differentiation between hModule and
hInstance within Wine.
* [win32/resource.c]
FindResource32() and LoadResource32() - Removed #if 0's around
conversion from hInstance to hModule. See remarks above.
* [win32/string32.c]
WIN32_UniLen() - removed stray semicolon.
Tue Feb 27 21:05:18 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/caret.c]
Set blink rate with call to GetProfileInt().
* [rc/winerc.c]
In new_style(), made initial flag settings WS_CHILD | WS_VISIBLE
instead of 0. This seems to correspond to Borland's defaults, and
the flags can be unset by using the (rather obtuse) "| NOT WS_CHILD"
or "| NOT WS_VISIBLE" technique in the *.rc file.
* [win32/time.c]
In GetLocalTime() and GetSystemTime(), used tv_sec field of result
returned by gettimeofday() instead of making second call to
time(). This eliminates clock jitter if the seconds change
between the two calls (rare, but possible).
* [include/wintypes.h]
Added "#define _far" and "#define _pascal".
* [windows/win.c]
Added function GetDesktopHwnd().
* [include/xmalloc.h]
Removed the '#ifdef HAVE_STDLIB_H' structure, since it seemed to
have been removed from 'configure', and was causing redefinition
warnings.
Tue Feb 27 19:31:11 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/winpos.c]
Added RDW_ALLCHILDREN flag in SetWindowPos (handling SWP_FRAMECHANGED)
to force a repaint when setting menu bars with different rows.
Sun Feb 25 21:15:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/syscolors.c] [controls/scroll.c]
Fixed DrawFocusRect pen and SCROLL_THUMB painting.
1996-03-02 20:34:10 +01:00
|
|
|
case 0x048c:
|
|
|
|
iconXORsize = GET_USHORT(program_ptr, 8);
|
|
|
|
iconANDsize = GET_USHORT(program_ptr, 10) / 8;
|
|
|
|
iconinfo_ptr = buffer + GET_USHORT(program_ptr, 12);
|
|
|
|
iconXORbits_ptr = buffer + GET_USHORT(program_ptr, 14);
|
|
|
|
iconANDbits_ptr = buffer + GET_USHORT(program_ptr, 16);
|
|
|
|
iconinfo.ptHotSpot.x = GET_USHORT(iconinfo_ptr, 0);
|
|
|
|
iconinfo.ptHotSpot.y = GET_USHORT(iconinfo_ptr, 2);
|
|
|
|
iconinfo.nWidth = GET_USHORT(iconinfo_ptr, 4);
|
|
|
|
iconinfo.nHeight = GET_USHORT(iconinfo_ptr, 6);
|
|
|
|
iconinfo.nWidthBytes = GET_USHORT(iconinfo_ptr, 8);
|
|
|
|
iconinfo.bPlanes = GET_USHORT(iconinfo_ptr, 10);
|
|
|
|
iconinfo.bBitsPerPixel = GET_USHORT(iconinfo_ptr, 11);
|
|
|
|
break;
|
|
|
|
case 0x000c:
|
|
|
|
iconANDsize = GET_USHORT(program_ptr, 8);
|
|
|
|
iconXORsize = GET_USHORT(program_ptr, 10);
|
|
|
|
iconinfo_ptr = buffer + GET_USHORT(program_ptr, 12);
|
|
|
|
iconANDbits_ptr = buffer + GET_USHORT(program_ptr, 14);
|
|
|
|
iconXORbits_ptr = buffer + GET_USHORT(program_ptr, 16);
|
|
|
|
iconinfo.ptHotSpot.x = GET_USHORT(iconinfo_ptr, 0);
|
|
|
|
iconinfo.ptHotSpot.y = GET_USHORT(iconinfo_ptr, 2);
|
|
|
|
iconinfo.nWidth = GET_USHORT(iconinfo_ptr, 4);
|
|
|
|
iconinfo.nHeight = GET_USHORT(iconinfo_ptr, 6);
|
|
|
|
iconinfo.nWidthBytes = GET_USHORT(iconinfo_ptr, 8) * 8;
|
|
|
|
iconinfo.bPlanes = GET_USHORT(iconinfo_ptr, 10);
|
|
|
|
iconinfo.bBitsPerPixel = GET_USHORT(iconinfo_ptr, 11);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (iconANDbits_ptr + iconANDsize > buffer + size ||
|
|
|
|
iconXORbits_ptr + iconXORsize > buffer + size) return(0);
|
|
|
|
|
|
|
|
hIcon = CreateCursorIconIndirect(Globals.hInstance, &iconinfo,
|
|
|
|
(LPSTR)iconANDbits_ptr,
|
|
|
|
(LPSTR)iconXORbits_ptr);
|
|
|
|
|
|
|
|
lpszName = buffer + GET_USHORT(program_ptr, 18);
|
|
|
|
lpszCmdLine = buffer + GET_USHORT(program_ptr, 20);
|
|
|
|
lpszIconFile = buffer + GET_USHORT(program_ptr, 22);
|
|
|
|
if (iconinfo_ptr + 6 > buffer + size ||
|
|
|
|
lpszName > buffer + size ||
|
|
|
|
lpszCmdLine > buffer + size ||
|
|
|
|
lpszIconFile > buffer + size) return(0);
|
|
|
|
|
|
|
|
/* Scan Extensions */
|
|
|
|
lpszWorkDir = "";
|
|
|
|
nHotKey = 0;
|
|
|
|
nCmdShow = SW_SHOWNORMAL;
|
|
|
|
if (extension)
|
|
|
|
{
|
|
|
|
LPCSTR ptr = extension;
|
|
|
|
while (ptr + 6 <= buffer + size)
|
|
|
|
{
|
|
|
|
UINT type = GET_USHORT(ptr, 0);
|
|
|
|
UINT number = GET_USHORT(ptr, 2);
|
|
|
|
UINT skip = GET_USHORT(ptr, 4);
|
|
|
|
|
|
|
|
if (number == seqnum)
|
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case 0x8000:
|
|
|
|
if (ptr + 10 > buffer + size) return(0);
|
|
|
|
if (ptr[6] != 'P' || ptr[7] != 'M' ||
|
|
|
|
ptr[8] != 'C' || ptr[9] != 'C') return(0);
|
|
|
|
break;
|
|
|
|
case 0x8101:
|
|
|
|
lpszWorkDir = ptr + 6;
|
|
|
|
break;
|
|
|
|
case 0x8102:
|
|
|
|
if (ptr + 8 > buffer + size) return(0);
|
|
|
|
nHotKey = GET_USHORT(ptr, 6);
|
|
|
|
break;
|
|
|
|
case 0x8103:
|
|
|
|
if (ptr + 8 > buffer + size) return(0);
|
|
|
|
nCmdShow = GET_USHORT(ptr, 6);
|
|
|
|
break;
|
|
|
|
default:
|
1996-03-31 18:40:13 +02:00
|
|
|
MAIN_MessageBoxIDS_s(IDS_UNKNOWN_FEATURE_s,
|
|
|
|
lpszGrpFile, IDS_WARNING, MB_OK);
|
Release 960302
Sat Mar 2 18:19:06 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Fixed SCROLL_THUMB painting fixes from Alex Korobka to store the
current tracking window.
* [files/file.c]
Fixed two file descriptor leaks in FILE_OpenFile().
* [if1632/relay32.c] [loader/module.c] [loader/pe_image.c]
[tools/build.c]
Replaced LOADEDFILEINFO structure by OFSTRUCT.
* [memory/atom.c]
Reload the pointer to the atom table in ATOM_GetTable() and
ATOM_AddAtom() in case the LOCAL_Alloc() calls caused the table to
move in linear memory.
Fri Mar 1 11:57:13 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [include/callback.h]
Added support for CallWordBreakProc().
* [controls/edit.c]
New caret handling (really efficient / fast).
Implemented EM_SETWORDBREAKPROC and EM_GETWORDBREAKPROC.
Fixed EM_SETFONT so it now also creates a proper new caret.
Wed Feb 28 22:03:34 1996 Daniel Schepler <daniel@frobnitz.wustl.edu>
* [controls/desktop.c] [misc/main.c] [windows/event.c] [windows/win.c]
Added WM_DELETE protocol to top-level windows.
* [controls/scroll.c]
Fixed a problem which caused slow scrolling to continue uncontrollably.
* [misc/exec.c]
Implemented ExitWindows().
* [windows/win.c]
Set top-level owned windows to be transient.
Wed Feb 28 19:13:22 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* [programs/progman/*]
Added a program manager.
Wed Feb 28 18:38:01 1996 Duncan C Thomson <duncan@spd.eee.strath.ac.uk>
* [resources/sysres_Eo.c]
Added support for Esperanto [Eo] language.
Wed Feb 28 00:23:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
Added EndDialog, GetDlgItem, GetDlgItemInt, SetDlgItemInt,
* [win32/init.c]
Added task.h to includes. GetModuleHandleA() - return hInstance
if called with NULL parameter. Freecell needs this. NOTE this
may indicate a problem with differentiation between hModule and
hInstance within Wine.
* [win32/resource.c]
FindResource32() and LoadResource32() - Removed #if 0's around
conversion from hInstance to hModule. See remarks above.
* [win32/string32.c]
WIN32_UniLen() - removed stray semicolon.
Tue Feb 27 21:05:18 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/caret.c]
Set blink rate with call to GetProfileInt().
* [rc/winerc.c]
In new_style(), made initial flag settings WS_CHILD | WS_VISIBLE
instead of 0. This seems to correspond to Borland's defaults, and
the flags can be unset by using the (rather obtuse) "| NOT WS_CHILD"
or "| NOT WS_VISIBLE" technique in the *.rc file.
* [win32/time.c]
In GetLocalTime() and GetSystemTime(), used tv_sec field of result
returned by gettimeofday() instead of making second call to
time(). This eliminates clock jitter if the seconds change
between the two calls (rare, but possible).
* [include/wintypes.h]
Added "#define _far" and "#define _pascal".
* [windows/win.c]
Added function GetDesktopHwnd().
* [include/xmalloc.h]
Removed the '#ifdef HAVE_STDLIB_H' structure, since it seemed to
have been removed from 'configure', and was causing redefinition
warnings.
Tue Feb 27 19:31:11 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/winpos.c]
Added RDW_ALLCHILDREN flag in SetWindowPos (handling SWP_FRAMECHANGED)
to force a repaint when setting menu bars with different rows.
Sun Feb 25 21:15:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/syscolors.c] [controls/scroll.c]
Fixed DrawFocusRect pen and SCROLL_THUMB painting.
1996-03-02 20:34:10 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!skip) break;
|
|
|
|
ptr += skip;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return (PROGRAM_AddProgram(hGroup, hIcon, lpszName, x, y,
|
|
|
|
lpszCmdLine, lpszIconFile,
|
|
|
|
nIconIndex, lpszWorkDir,
|
|
|
|
nHotKey, nCmdShow));
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
*
|
|
|
|
* GRPFILE_WriteGroupFile
|
|
|
|
*/
|
|
|
|
|
|
|
|
BOOL GRPFILE_WriteGroupFile(HLOCAL hGroup)
|
|
|
|
{
|
|
|
|
CHAR szPath[MAX_PATHNAME_LEN];
|
|
|
|
GROUP *group = LocalLock(hGroup);
|
|
|
|
OFSTRUCT dummy;
|
|
|
|
HFILE file;
|
|
|
|
BOOL ret;
|
|
|
|
|
|
|
|
GRPFILE_ModifyFileName(szPath, LocalLock(group->hGrpFile),
|
|
|
|
MAX_PATHNAME_LEN,
|
|
|
|
group->bFileNameModified);
|
|
|
|
|
|
|
|
/* Try not to overwrite original files */
|
|
|
|
|
|
|
|
/* group->bOverwriteFileOk == TRUE only if a file has the modified format */
|
|
|
|
if (!group->bOverwriteFileOk &&
|
|
|
|
OpenFile(szPath, &dummy, OF_EXIST) != HFILE_ERROR)
|
|
|
|
{
|
|
|
|
/* Original file exists, try `.gr' extension */
|
|
|
|
GRPFILE_ModifyFileName(szPath, LocalLock(group->hGrpFile),
|
|
|
|
MAX_PATHNAME_LEN, TRUE);
|
|
|
|
if (OpenFile(szPath, &dummy, OF_EXIST) != HFILE_ERROR)
|
|
|
|
{
|
|
|
|
/* File exists. Do not overwrite */
|
1996-03-31 18:40:13 +02:00
|
|
|
MAIN_MessageBoxIDS_s(IDS_FILE_NOT_OVERWRITTEN_s, szPath,
|
|
|
|
IDS_INFO, MB_OK);
|
Release 960302
Sat Mar 2 18:19:06 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Fixed SCROLL_THUMB painting fixes from Alex Korobka to store the
current tracking window.
* [files/file.c]
Fixed two file descriptor leaks in FILE_OpenFile().
* [if1632/relay32.c] [loader/module.c] [loader/pe_image.c]
[tools/build.c]
Replaced LOADEDFILEINFO structure by OFSTRUCT.
* [memory/atom.c]
Reload the pointer to the atom table in ATOM_GetTable() and
ATOM_AddAtom() in case the LOCAL_Alloc() calls caused the table to
move in linear memory.
Fri Mar 1 11:57:13 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [include/callback.h]
Added support for CallWordBreakProc().
* [controls/edit.c]
New caret handling (really efficient / fast).
Implemented EM_SETWORDBREAKPROC and EM_GETWORDBREAKPROC.
Fixed EM_SETFONT so it now also creates a proper new caret.
Wed Feb 28 22:03:34 1996 Daniel Schepler <daniel@frobnitz.wustl.edu>
* [controls/desktop.c] [misc/main.c] [windows/event.c] [windows/win.c]
Added WM_DELETE protocol to top-level windows.
* [controls/scroll.c]
Fixed a problem which caused slow scrolling to continue uncontrollably.
* [misc/exec.c]
Implemented ExitWindows().
* [windows/win.c]
Set top-level owned windows to be transient.
Wed Feb 28 19:13:22 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* [programs/progman/*]
Added a program manager.
Wed Feb 28 18:38:01 1996 Duncan C Thomson <duncan@spd.eee.strath.ac.uk>
* [resources/sysres_Eo.c]
Added support for Esperanto [Eo] language.
Wed Feb 28 00:23:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
Added EndDialog, GetDlgItem, GetDlgItemInt, SetDlgItemInt,
* [win32/init.c]
Added task.h to includes. GetModuleHandleA() - return hInstance
if called with NULL parameter. Freecell needs this. NOTE this
may indicate a problem with differentiation between hModule and
hInstance within Wine.
* [win32/resource.c]
FindResource32() and LoadResource32() - Removed #if 0's around
conversion from hInstance to hModule. See remarks above.
* [win32/string32.c]
WIN32_UniLen() - removed stray semicolon.
Tue Feb 27 21:05:18 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/caret.c]
Set blink rate with call to GetProfileInt().
* [rc/winerc.c]
In new_style(), made initial flag settings WS_CHILD | WS_VISIBLE
instead of 0. This seems to correspond to Borland's defaults, and
the flags can be unset by using the (rather obtuse) "| NOT WS_CHILD"
or "| NOT WS_VISIBLE" technique in the *.rc file.
* [win32/time.c]
In GetLocalTime() and GetSystemTime(), used tv_sec field of result
returned by gettimeofday() instead of making second call to
time(). This eliminates clock jitter if the seconds change
between the two calls (rare, but possible).
* [include/wintypes.h]
Added "#define _far" and "#define _pascal".
* [windows/win.c]
Added function GetDesktopHwnd().
* [include/xmalloc.h]
Removed the '#ifdef HAVE_STDLIB_H' structure, since it seemed to
have been removed from 'configure', and was causing redefinition
warnings.
Tue Feb 27 19:31:11 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/winpos.c]
Added RDW_ALLCHILDREN flag in SetWindowPos (handling SWP_FRAMECHANGED)
to force a repaint when setting menu bars with different rows.
Sun Feb 25 21:15:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/syscolors.c] [controls/scroll.c]
Fixed DrawFocusRect pen and SCROLL_THUMB painting.
1996-03-02 20:34:10 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
/* Inform about the modified file name */
|
1996-03-31 18:40:13 +02:00
|
|
|
if (IDCANCEL ==
|
|
|
|
MAIN_MessageBoxIDS_s(IDS_SAVE_GROUP_AS_s, szPath, IDS_INFO,
|
|
|
|
MB_OKCANCEL | MB_ICONINFORMATION))
|
Release 960302
Sat Mar 2 18:19:06 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Fixed SCROLL_THUMB painting fixes from Alex Korobka to store the
current tracking window.
* [files/file.c]
Fixed two file descriptor leaks in FILE_OpenFile().
* [if1632/relay32.c] [loader/module.c] [loader/pe_image.c]
[tools/build.c]
Replaced LOADEDFILEINFO structure by OFSTRUCT.
* [memory/atom.c]
Reload the pointer to the atom table in ATOM_GetTable() and
ATOM_AddAtom() in case the LOCAL_Alloc() calls caused the table to
move in linear memory.
Fri Mar 1 11:57:13 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [include/callback.h]
Added support for CallWordBreakProc().
* [controls/edit.c]
New caret handling (really efficient / fast).
Implemented EM_SETWORDBREAKPROC and EM_GETWORDBREAKPROC.
Fixed EM_SETFONT so it now also creates a proper new caret.
Wed Feb 28 22:03:34 1996 Daniel Schepler <daniel@frobnitz.wustl.edu>
* [controls/desktop.c] [misc/main.c] [windows/event.c] [windows/win.c]
Added WM_DELETE protocol to top-level windows.
* [controls/scroll.c]
Fixed a problem which caused slow scrolling to continue uncontrollably.
* [misc/exec.c]
Implemented ExitWindows().
* [windows/win.c]
Set top-level owned windows to be transient.
Wed Feb 28 19:13:22 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* [programs/progman/*]
Added a program manager.
Wed Feb 28 18:38:01 1996 Duncan C Thomson <duncan@spd.eee.strath.ac.uk>
* [resources/sysres_Eo.c]
Added support for Esperanto [Eo] language.
Wed Feb 28 00:23:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
Added EndDialog, GetDlgItem, GetDlgItemInt, SetDlgItemInt,
* [win32/init.c]
Added task.h to includes. GetModuleHandleA() - return hInstance
if called with NULL parameter. Freecell needs this. NOTE this
may indicate a problem with differentiation between hModule and
hInstance within Wine.
* [win32/resource.c]
FindResource32() and LoadResource32() - Removed #if 0's around
conversion from hInstance to hModule. See remarks above.
* [win32/string32.c]
WIN32_UniLen() - removed stray semicolon.
Tue Feb 27 21:05:18 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/caret.c]
Set blink rate with call to GetProfileInt().
* [rc/winerc.c]
In new_style(), made initial flag settings WS_CHILD | WS_VISIBLE
instead of 0. This seems to correspond to Borland's defaults, and
the flags can be unset by using the (rather obtuse) "| NOT WS_CHILD"
or "| NOT WS_VISIBLE" technique in the *.rc file.
* [win32/time.c]
In GetLocalTime() and GetSystemTime(), used tv_sec field of result
returned by gettimeofday() instead of making second call to
time(). This eliminates clock jitter if the seconds change
between the two calls (rare, but possible).
* [include/wintypes.h]
Added "#define _far" and "#define _pascal".
* [windows/win.c]
Added function GetDesktopHwnd().
* [include/xmalloc.h]
Removed the '#ifdef HAVE_STDLIB_H' structure, since it seemed to
have been removed from 'configure', and was causing redefinition
warnings.
Tue Feb 27 19:31:11 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/winpos.c]
Added RDW_ALLCHILDREN flag in SetWindowPos (handling SWP_FRAMECHANGED)
to force a repaint when setting menu bars with different rows.
Sun Feb 25 21:15:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/syscolors.c] [controls/scroll.c]
Fixed DrawFocusRect pen and SCROLL_THUMB painting.
1996-03-02 20:34:10 +01:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
/* Warn about the incompatibility */
|
|
|
|
CHAR msg[MAX_PATHNAME_LEN + 200];
|
|
|
|
wsprintf(msg,
|
|
|
|
"Group files written by this DRAFT Program Manager "
|
|
|
|
"cannot be read by the Microsoft Program Manager!!\n"
|
|
|
|
"Are you sure to write %s?", szPath);
|
|
|
|
if (IDOK != MessageBox(Globals.hMainWnd, msg, "WARNING",
|
|
|
|
MB_OKCANCEL | MB_DEFBUTTON2)) return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME */
|
|
|
|
if (OpenFile(szPath, &dummy, OF_EXIST) == HFILE_ERROR)
|
|
|
|
{
|
|
|
|
CHAR msg[MAX_PATHNAME_LEN + 200];
|
|
|
|
wsprintf(msg, "Cause of a bug you must now touch the file %s\n", szPath);
|
|
|
|
MessageBox(Globals.hMainWnd, msg, "", MB_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Open file */
|
|
|
|
file = _lopen(szPath, OF_WRITE);
|
|
|
|
if (file != HFILE_ERROR)
|
|
|
|
{
|
|
|
|
ret = GRPFILE_DoWriteGroupFile(file, group);
|
|
|
|
_lclose(file);
|
|
|
|
}
|
|
|
|
else ret = FALSE;
|
|
|
|
|
1996-03-31 18:40:13 +02:00
|
|
|
if (!ret)
|
|
|
|
MAIN_MessageBoxIDS_s(IDS_FILE_WRITE_ERROR_s, szPath, IDS_ERROR, MB_OK);
|
Release 960302
Sat Mar 2 18:19:06 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/scroll.c]
Fixed SCROLL_THUMB painting fixes from Alex Korobka to store the
current tracking window.
* [files/file.c]
Fixed two file descriptor leaks in FILE_OpenFile().
* [if1632/relay32.c] [loader/module.c] [loader/pe_image.c]
[tools/build.c]
Replaced LOADEDFILEINFO structure by OFSTRUCT.
* [memory/atom.c]
Reload the pointer to the atom table in ATOM_GetTable() and
ATOM_AddAtom() in case the LOCAL_Alloc() calls caused the table to
move in linear memory.
Fri Mar 1 11:57:13 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [include/callback.h]
Added support for CallWordBreakProc().
* [controls/edit.c]
New caret handling (really efficient / fast).
Implemented EM_SETWORDBREAKPROC and EM_GETWORDBREAKPROC.
Fixed EM_SETFONT so it now also creates a proper new caret.
Wed Feb 28 22:03:34 1996 Daniel Schepler <daniel@frobnitz.wustl.edu>
* [controls/desktop.c] [misc/main.c] [windows/event.c] [windows/win.c]
Added WM_DELETE protocol to top-level windows.
* [controls/scroll.c]
Fixed a problem which caused slow scrolling to continue uncontrollably.
* [misc/exec.c]
Implemented ExitWindows().
* [windows/win.c]
Set top-level owned windows to be transient.
Wed Feb 28 19:13:22 1996 Ulrich Schmid <uschmid@mail.hh.provi.de>
* [programs/progman/*]
Added a program manager.
Wed Feb 28 18:38:01 1996 Duncan C Thomson <duncan@spd.eee.strath.ac.uk>
* [resources/sysres_Eo.c]
Added support for Esperanto [Eo] language.
Wed Feb 28 00:23:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/user32.spec]
Added EndDialog, GetDlgItem, GetDlgItemInt, SetDlgItemInt,
* [win32/init.c]
Added task.h to includes. GetModuleHandleA() - return hInstance
if called with NULL parameter. Freecell needs this. NOTE this
may indicate a problem with differentiation between hModule and
hInstance within Wine.
* [win32/resource.c]
FindResource32() and LoadResource32() - Removed #if 0's around
conversion from hInstance to hModule. See remarks above.
* [win32/string32.c]
WIN32_UniLen() - removed stray semicolon.
Tue Feb 27 21:05:18 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [windows/caret.c]
Set blink rate with call to GetProfileInt().
* [rc/winerc.c]
In new_style(), made initial flag settings WS_CHILD | WS_VISIBLE
instead of 0. This seems to correspond to Borland's defaults, and
the flags can be unset by using the (rather obtuse) "| NOT WS_CHILD"
or "| NOT WS_VISIBLE" technique in the *.rc file.
* [win32/time.c]
In GetLocalTime() and GetSystemTime(), used tv_sec field of result
returned by gettimeofday() instead of making second call to
time(). This eliminates clock jitter if the seconds change
between the two calls (rare, but possible).
* [include/wintypes.h]
Added "#define _far" and "#define _pascal".
* [windows/win.c]
Added function GetDesktopHwnd().
* [include/xmalloc.h]
Removed the '#ifdef HAVE_STDLIB_H' structure, since it seemed to
have been removed from 'configure', and was causing redefinition
warnings.
Tue Feb 27 19:31:11 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/winpos.c]
Added RDW_ALLCHILDREN flag in SetWindowPos (handling SWP_FRAMECHANGED)
to force a repaint when setting menu bars with different rows.
Sun Feb 25 21:15:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/syscolors.c] [controls/scroll.c]
Fixed DrawFocusRect pen and SCROLL_THUMB painting.
1996-03-02 20:34:10 +01:00
|
|
|
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
*
|
|
|
|
* GRPFILE_CalculateSizes
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VOID GRPFILE_CalculateSizes(PROGRAM *program,
|
|
|
|
INT *Progs, INT *Icons)
|
|
|
|
{
|
|
|
|
CURSORICONINFO *iconinfo = LocalLock(program->hIcon);
|
|
|
|
INT sizeXor = iconinfo->nHeight * iconinfo->nWidthBytes;
|
|
|
|
INT sizeAnd = iconinfo->nHeight * ((iconinfo->nWidth + 15) / 16 * 2);
|
|
|
|
|
|
|
|
*Progs += 24;
|
|
|
|
*Progs += lstrlen(LocalLock(program->hName)) + 1;
|
|
|
|
*Progs += lstrlen(LocalLock(program->hCmdLine)) + 1;
|
|
|
|
*Progs += lstrlen(LocalLock(program->hIconFile)) + 1;
|
|
|
|
|
|
|
|
*Icons += 12; /* IconInfo */
|
|
|
|
*Icons += sizeAnd;
|
|
|
|
*Icons += sizeXor;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
*
|
|
|
|
* GRPFILE_DoWriteGroupFile
|
|
|
|
*/
|
|
|
|
|
|
|
|
static BOOL GRPFILE_DoWriteGroupFile(HFILE file, GROUP *group)
|
|
|
|
{
|
|
|
|
BYTE buffer[34];
|
|
|
|
HLOCAL hProgram;
|
|
|
|
INT NumProg, Title, Progs, Icons, Extension;
|
|
|
|
INT CurrProg, CurrIcon, nCmdShow, ptr, seqnum;
|
|
|
|
BOOL need_extension;
|
|
|
|
LPCSTR lpszTitle = LocalLock(group->hName);
|
|
|
|
|
|
|
|
/* Calculate offsets */
|
|
|
|
NumProg = 0;
|
|
|
|
Icons = 0;
|
|
|
|
Extension = 0;
|
|
|
|
need_extension = FALSE;
|
|
|
|
hProgram = group->hPrograms;
|
|
|
|
while(hProgram)
|
|
|
|
{
|
|
|
|
PROGRAM *program = LocalLock(hProgram);
|
|
|
|
LPCSTR lpszWorkDir = LocalLock(program->hWorkDir);
|
|
|
|
|
|
|
|
NumProg++;
|
|
|
|
GRPFILE_CalculateSizes(program, &Icons, &Extension);
|
|
|
|
|
|
|
|
/* Set a flag if an extension is needed */
|
|
|
|
if (lpszWorkDir[0] || program->nHotKey ||
|
|
|
|
program->nCmdShow != SW_SHOWNORMAL) need_extension = TRUE;
|
|
|
|
|
|
|
|
hProgram = program->hNext;
|
|
|
|
}
|
|
|
|
Title = 34 + NumProg * 2;
|
|
|
|
Progs = Title + lstrlen(lpszTitle) + 1;
|
|
|
|
Icons += Progs;
|
|
|
|
Extension += Icons;
|
|
|
|
|
|
|
|
/* Header */
|
|
|
|
buffer[0] = 'P';
|
|
|
|
buffer[1] = 'M';
|
|
|
|
#if 0
|
|
|
|
buffer[2] = 'C'; /* Original magic number */
|
|
|
|
buffer[3] = 'C';
|
|
|
|
#else
|
|
|
|
buffer[2] = 'X'; /* Modified magic number: no checksum */
|
|
|
|
buffer[3] = 'X';
|
|
|
|
#endif
|
|
|
|
PUT_SHORT(buffer, 4, 0); /* Checksum ignored */
|
|
|
|
PUT_SHORT(buffer, 6, Extension);
|
|
|
|
/* Update group->nCmdShow */
|
|
|
|
if (IsIconic(group->hWnd)) nCmdShow = SW_SHOWMINIMIZED;
|
|
|
|
else if (IsZoomed(group->hWnd)) nCmdShow = SW_SHOWMAXIMIZED;
|
|
|
|
else nCmdShow = SW_SHOWNORMAL;
|
|
|
|
PUT_SHORT(buffer, 8, nCmdShow);
|
|
|
|
PUT_SHORT(buffer, 10, group->x);
|
|
|
|
PUT_SHORT(buffer, 12, group->y);
|
|
|
|
PUT_SHORT(buffer, 14, group->width);
|
|
|
|
PUT_SHORT(buffer, 16, group->height);
|
|
|
|
PUT_SHORT(buffer, 18, group->iconx);
|
|
|
|
PUT_SHORT(buffer, 20, group->icony);
|
|
|
|
PUT_SHORT(buffer, 22, Title);
|
|
|
|
PUT_SHORT(buffer, 24, 0x0020); /* unknown */
|
|
|
|
PUT_SHORT(buffer, 26, 0x0020); /* unknown */
|
|
|
|
PUT_SHORT(buffer, 28, 0x0108); /* unknown */
|
|
|
|
PUT_SHORT(buffer, 30, 0x0000); /* unknown */
|
|
|
|
PUT_SHORT(buffer, 32, NumProg);
|
|
|
|
|
|
|
|
if (HFILE_ERROR == _lwrite(file, buffer, 34)) return FALSE;
|
|
|
|
|
|
|
|
/* Program table */
|
|
|
|
CurrProg = Progs;
|
|
|
|
CurrIcon = Icons;
|
|
|
|
hProgram = group->hPrograms;
|
|
|
|
while(hProgram)
|
|
|
|
{
|
|
|
|
PROGRAM *program = LocalLock(hProgram);
|
|
|
|
|
|
|
|
PUT_SHORT(buffer, 0, CurrProg);
|
|
|
|
if (HFILE_ERROR == _lwrite(file, buffer, 2)) return FALSE;
|
|
|
|
|
|
|
|
GRPFILE_CalculateSizes(program, &CurrProg, &CurrIcon);
|
|
|
|
hProgram = program->hNext;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Title */
|
|
|
|
if (HFILE_ERROR == _lwrite(file, lpszTitle, lstrlen(lpszTitle) + 1))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
/* Program entries */
|
|
|
|
CurrProg = Progs;
|
|
|
|
CurrIcon = Icons;
|
|
|
|
hProgram = group->hPrograms;
|
|
|
|
while(hProgram)
|
|
|
|
{
|
|
|
|
PROGRAM *program = LocalLock(hProgram);
|
|
|
|
CURSORICONINFO *iconinfo = LocalLock(program->hIcon);
|
|
|
|
LPCSTR Name = LocalLock(program->hName);
|
|
|
|
LPCSTR CmdLine = LocalLock(program->hCmdLine);
|
|
|
|
LPCSTR IconFile = LocalLock(program->hIconFile);
|
|
|
|
INT sizeXor = iconinfo->nHeight * iconinfo->nWidthBytes;
|
|
|
|
INT sizeAnd = iconinfo->nHeight * ((iconinfo->nWidth + 15) / 16 * 2);
|
|
|
|
|
|
|
|
PUT_SHORT(buffer, 0, program->x);
|
|
|
|
PUT_SHORT(buffer, 2, program->y);
|
|
|
|
PUT_SHORT(buffer, 4, program->nIconIndex);
|
|
|
|
PUT_SHORT(buffer, 6, 0x048c); /* unknown */
|
|
|
|
PUT_SHORT(buffer, 8, sizeXor);
|
|
|
|
PUT_SHORT(buffer, 10, sizeAnd * 8);
|
|
|
|
PUT_SHORT(buffer, 12, CurrIcon);
|
|
|
|
PUT_SHORT(buffer, 14, CurrIcon + 12 + sizeAnd);
|
|
|
|
PUT_SHORT(buffer, 16, CurrIcon + 12);
|
|
|
|
ptr = CurrProg + 24;
|
|
|
|
PUT_SHORT(buffer, 18, ptr);
|
|
|
|
ptr += lstrlen(Name) + 1;
|
|
|
|
PUT_SHORT(buffer, 20, ptr);
|
|
|
|
ptr += lstrlen(CmdLine) + 1;
|
|
|
|
PUT_SHORT(buffer, 22, ptr);
|
|
|
|
|
|
|
|
if (HFILE_ERROR == _lwrite(file, buffer, 24) ||
|
|
|
|
HFILE_ERROR == _lwrite(file, Name, lstrlen(Name) + 1) ||
|
|
|
|
HFILE_ERROR == _lwrite(file, CmdLine, lstrlen(CmdLine) + 1) ||
|
|
|
|
HFILE_ERROR == _lwrite(file, IconFile, lstrlen(IconFile) + 1))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
GRPFILE_CalculateSizes(program, &CurrProg, &CurrIcon);
|
|
|
|
hProgram = program->hNext;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Icons */
|
|
|
|
hProgram = group->hPrograms;
|
|
|
|
while(hProgram)
|
|
|
|
{
|
|
|
|
PROGRAM *program = LocalLock(hProgram);
|
|
|
|
CURSORICONINFO *iconinfo = LocalLock(program->hIcon);
|
|
|
|
SEGPTR XorBits, AndBits;
|
|
|
|
INT sizeXor = iconinfo->nHeight * iconinfo->nWidthBytes;
|
|
|
|
INT sizeAnd = iconinfo->nHeight * ((iconinfo->nWidth + 15) / 16 * 2);
|
|
|
|
DumpIcon(LocalLock(program->hIcon), 0, &XorBits, &AndBits);
|
|
|
|
|
|
|
|
PUT_SHORT(buffer, 0, iconinfo->ptHotSpot.x);
|
|
|
|
PUT_SHORT(buffer, 2, iconinfo->ptHotSpot.y);
|
|
|
|
PUT_SHORT(buffer, 4, iconinfo->nWidth);
|
|
|
|
PUT_SHORT(buffer, 6, iconinfo->nHeight);
|
|
|
|
PUT_SHORT(buffer, 8, iconinfo->nWidthBytes);
|
|
|
|
buffer[10] = iconinfo->bPlanes;
|
|
|
|
buffer[11] = iconinfo->bBitsPerPixel;
|
|
|
|
|
|
|
|
if (HFILE_ERROR == _lwrite(file, buffer, 12) ||
|
|
|
|
HFILE_ERROR == _lwrite(file, AndBits, sizeAnd) ||
|
|
|
|
HFILE_ERROR == _lwrite(file, XorBits, sizeXor)) return FALSE;
|
|
|
|
|
|
|
|
hProgram = program->hNext;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (need_extension)
|
|
|
|
{
|
|
|
|
/* write `PMCC' extension */
|
|
|
|
PUT_SHORT(buffer, 0, 0x8000);
|
|
|
|
PUT_SHORT(buffer, 2, 0xffff);
|
|
|
|
PUT_SHORT(buffer, 4, 0x000a);
|
|
|
|
buffer[6] = 'P', buffer[7] = 'M';
|
|
|
|
buffer[8] = 'C', buffer[9] = 'C';
|
|
|
|
if (HFILE_ERROR == _lwrite(file, buffer, 10)) return FALSE;
|
|
|
|
|
|
|
|
seqnum = 0;
|
|
|
|
hProgram = group->hPrograms;
|
|
|
|
while(hProgram)
|
|
|
|
{
|
|
|
|
PROGRAM *program = LocalLock(hProgram);
|
|
|
|
LPCSTR lpszWorkDir = LocalLock(program->hWorkDir);
|
|
|
|
|
|
|
|
/* Working directory */
|
|
|
|
if (lpszWorkDir[0])
|
|
|
|
{
|
|
|
|
PUT_SHORT(buffer, 0, 0x8101);
|
|
|
|
PUT_SHORT(buffer, 2, seqnum);
|
|
|
|
PUT_SHORT(buffer, 4, 7 + lstrlen(lpszWorkDir));
|
|
|
|
if (HFILE_ERROR == _lwrite(file, buffer, 6) ||
|
|
|
|
HFILE_ERROR == _lwrite(file, lpszWorkDir, lstrlen(lpszWorkDir) + 1))
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Hot key */
|
|
|
|
if (program->nHotKey)
|
|
|
|
{
|
|
|
|
PUT_SHORT(buffer, 0, 0x8102);
|
|
|
|
PUT_SHORT(buffer, 2, seqnum);
|
|
|
|
PUT_SHORT(buffer, 4, 8);
|
|
|
|
PUT_SHORT(buffer, 6, program->nHotKey);
|
|
|
|
if (HFILE_ERROR == _lwrite(file, buffer, 8)) return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Show command */
|
|
|
|
if (program->nCmdShow)
|
|
|
|
{
|
|
|
|
PUT_SHORT(buffer, 0, 0x8103);
|
|
|
|
PUT_SHORT(buffer, 2, seqnum);
|
|
|
|
PUT_SHORT(buffer, 4, 8);
|
|
|
|
PUT_SHORT(buffer, 6, program->nCmdShow);
|
|
|
|
if (HFILE_ERROR == _lwrite(file, buffer, 8)) return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
seqnum++;
|
|
|
|
hProgram = program->hNext;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write `End' extension */
|
|
|
|
PUT_SHORT(buffer, 0, 0xffff);
|
|
|
|
PUT_SHORT(buffer, 2, 0xffff);
|
|
|
|
PUT_SHORT(buffer, 4, 0x0000);
|
|
|
|
if (HFILE_ERROR == _lwrite(file, buffer, 6)) return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Local Variables: */
|
|
|
|
/* c-file-style: "GNU" */
|
|
|
|
/* End: */
|