Sun Oct 30 13:01:18 1994 Alexandre Julliard (julliard@lamisun.epfl.ch) * [controls/static.c] Bug fix for SS_ICON controls. * [if1632/Imakefile] Fixed call.o dependencies. * [objects/clipping.c] [objects/dc.c] Fixed visible region handling. hVisRgn is always non-null now. * [windows/dce.c] Bug fix in GetDCEx for CS_OWNDC windows. * [windows/nonclient.c] [windows/painting.c] Fixes to icon window drawing. * [windows/winpos.c] A few fixes in SetWindowPos(). Sun Oct 30 12:50:24 1994 Michael Patra <micky@marie.physik.tu-berlin.de> * [objects/bitblt.c] BitBlt(): BitBlt is now able to handle any raster operation. If the request can't be passed to XWindows directly, it's quite slow, though. * [*/*.c] [misc/main.c] Improvements of the system for handling debug messages. Options are now also loaded from /usr/lib/X11/app-defaults/Wine (insert *debugoptions: +xxx there if you want to have turn messages xxx on). * [controls/menu.c] DestroyMenu(): The whole window won't be destroyed as a sideeffect any longer. * [misc/file.c] OpenFile(): Fixed bug in searching in system/window-directory. Sun Oct 30 12:25:53 1994 Jimmy Tirtawangsa <j0t2527@tam2000.tamu.edu> * [include/windows.h] Bug fix for window related structures. DCB and COMSTAT are affected. They must be packed. * [misc/comm.c] Bug fix for COM ports: Dial and dialog window in terminal.exe now works. Non sequential COM assignments in wine.conf should not break now. Baudrate can be specified in wine.conf to overcome baudrate limitation in mswindow. See sample wine.ini * [include/comm.h] add baudrate field to DosDeviceStructre * [object/font.c] Bug fix for font assignment. Use pairs of foundry and family fontnames in X11 to correspond with window's fonts. Put font assignment ini wine.ini. * [wine.ini] Adding optional baudrate after port name in "serialports" section Add new section, "fonts". "default" is special key in "fonts" to match any unmatch window font. Oct 29, 94 (new address) wine@trgcorp.mksinfo.qc.ca (Martin Ayotte) * [if1632/relay.c] * [if1632/commdlg.spec] New file. * [misc/commdlg.c] New file. * [include/commdlg.h] New file. Begin of an emulated COMMDLG DLL, built-in for now. (BTW, if you want to switch between built-in & 16bits CommDlg, only thing you need to do is to put the real/dummy name in file relay.c) * [controls/scroll.c] * [controls/combo.c] * [controls/listbox.c] Few bug fixes and/or cosmetic. * [misc/audio.c] * [misc/mmaux.c] bug fixes and flags returned to emulate SB16. * [misc/midi.c] New file. skeleton for 'Midi' MMSYSTEM & MCI driver. * [misc/mcianim.c] New file. skeleton for 'Animation1' MCI driver. * [windows/win.c] Add new stub for GetLastActiveWindow(). Tue Oct 25 09:17:25 1994 Olaf Flebbe (flebbe@tat.physik.uni-tuebingen.de) * [if1632/call.S] [tools/build.c] Support for ELF format. (Not complete) Sun Oct 23 00:51:50 1994 Paul Falstad (pf@zoof) * [if1632/user.spec] Add stubs for ArrangeIconicWindows(), etc. * [if1632/kernel.spec] Add IsBad*Ptr() functions. * [loader/signal.c] Add test_memory(), for use with IsBad*Ptr(). * [windows/winpos.c] Add stubs for TileChildWindows(), etc. * [windows/win.c] IsWindow() shouldn't crash if it's given a bad handle. Add stub for GetLastActivePopup(). * [memory/global.c] Implement the IsBad*Ptr() functions. * [controls/listbox.c] Return the full longword of the item data in LB_GETITEMDATA. * [controls/edit.c] Don't let the user select an area past the end of the text. * [objects/text.c] In DrawText(), the code to delete crlfs also removed multiple consecutive newlines. Also, using DT_CALCRECT didn't return the right height, and the width wasn't returned at all. This caused MessageBoxes to be missing much of their text. * [windows/scroll.c] ScrollWindow[Ex] didn't work right with null LPRECT arguments. Fri Oct 21 21:47:19 1994 Paul Falstad (pf@zoof.cts.com) * [miscemu/int21.c] Fixed int21 0x42 handler to properly assemble 32-bit seek ptr. * [misc/property.c] Fixed inverted logic in EnumProps(), and changed CallBack16() call to use new arg format. * [windows/win.c] Fixed CallBack16() call in Enum[Child]Windows to use new arg format; this fixes crashes in enum procedures. Wed Oct 19 21:30:00 PDT 1994 martin@cs.csufresno.edu * [misc/clipboard.c] [windows/event.c] [windows/message.c] Added cut and paste between Wine and other X clients via the PRIMARY selection. Text only this time. * [controls/edit.c] EDIT_LineLength, EDIT_TextLine return 0 for lines after last one. * [windows/defwnd.c] Send WM_SYSCOMMAND to overlapped ancestor window, not the receiver of WM_SYSKEYDOWN Sat Oct 22 15:01:02 1994 Thomas Sandford <t.d.g.sandford@bradford.ac.uk> * [controls/edit.c] ClientWidth()/ClientHeight() macros: return 0 if size would be negative EDIT_StrLength(): takes unsigned char* instead of char* * [controls/listbox.c] ListBoxWndProc(): in "case WM_MOUSEMOVE" - set lphl at start of case instead of in each place required (it was omitted in some places causing problems!) * [controls/menu.c] MENU_CalcItemSize(): don't try to find size of a text item if the pointer is NULL * [include/heap.h] added definition of HEAP_LocalInit() * [include/msdos.h] removed buggy pointer() macro (use SAFEMAKEPTR() from segmem.h instead) * [loader/selector.c] IPCCopySelector(): added missing flags to shmget() call ? does this break linux - I added these flags in a previous patch but they were missing in the corresponding release ? * [loader/signal.c] win_fault(): added missing definitions of i, dump for those not running NetBSD or linux * [misc/dos_fs.c] DOS_GetCurrentDir(): made temp[] static so it can be safely returned * [miscemu/int21.c,int25.c,int26.c] Changed all invocations of pointer() to SAFEMAKEPTR(). Included segmem.h where necessary. * [windows/dialog.c] CreateDialogIndirectParam(): Changed HEAP_Init() call to HEAP_LocalInit(), removed redundant variables Sat Oct 22 00:29:41 MET 1994 Dag Asheim (dash@ifi.uio.no) * [loader/library.c] [loader/main.c] [loader/ne_image.c] [misc/exec.c] [miscemu/int10.c] [miscemu/int21.c] [objects/bitblt.c] [objects/metafile.c] Rewritten more printf's to use the new debugging system, and made wine less verbose per default. Use "-debugmsg +module" to get (almost) the same behavior as before.
387 lines
9 KiB
C
387 lines
9 KiB
C
/*
|
|
* Initialization-File Functions.
|
|
*
|
|
* Copyright (c) 1993 Miguel de Icaza
|
|
*
|
|
* 1/Dec o Corrected return values for Get*ProfileString
|
|
*
|
|
* o Now, if AppName == NULL in Get*ProfileString it returns a list
|
|
* of the KeyNames (as documented in the MS-SDK).
|
|
*
|
|
* o if KeyValue == NULL now clears the value in Get*ProfileString
|
|
*
|
|
* 20/Apr SL - I'm not sure where these definitions came from, but my SDK
|
|
* has a NULL KeyValue returning a list of KeyNames, and a NULL
|
|
* AppName undefined. I changed GetSetProfile to match. This makes
|
|
* PROGMAN.EXE do the right thing.
|
|
*/
|
|
|
|
static char Copyright [] = "Copyright (C) 1993 Miguel de Icaza";
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "wine.h"
|
|
#include "windows.h"
|
|
#include "prototypes.h"
|
|
#include "stddebug.h"
|
|
/* #define DEBUG_PROFILE */
|
|
/* #undef DEBUG_PROFILE */
|
|
#include "debug.h"
|
|
|
|
|
|
#define STRSIZE 255
|
|
#define xmalloc(x) malloc(x)
|
|
#define overflow (next == &CharBuffer [STRSIZE-1])
|
|
|
|
enum { FirstBrace, OnSecHeader, IgnoreToEOL, KeyDef, KeyValue };
|
|
|
|
typedef struct TKeys {
|
|
char *KeyName;
|
|
char *Value;
|
|
struct TKeys *link;
|
|
} TKeys;
|
|
|
|
typedef struct TSecHeader {
|
|
char *AppName;
|
|
TKeys *Keys;
|
|
struct TSecHeader *link;
|
|
} TSecHeader;
|
|
|
|
typedef struct TProfile {
|
|
char *FileName;
|
|
TSecHeader *Section;
|
|
struct TProfile *link;
|
|
} TProfile;
|
|
|
|
TProfile *Current = 0;
|
|
TProfile *Base = 0;
|
|
|
|
static TSecHeader *is_loaded (char *FileName)
|
|
{
|
|
TProfile *p = Base;
|
|
|
|
while (p){
|
|
if (!strcasecmp (FileName, p->FileName)){
|
|
Current = p;
|
|
return p->Section;
|
|
}
|
|
p = p->link;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static char *GetIniFileName(char *name)
|
|
{
|
|
char temp[256];
|
|
|
|
if (strchr(name, '/'))
|
|
return name;
|
|
|
|
if (strchr(name, '\\'))
|
|
return GetUnixFileName(name);
|
|
|
|
GetWindowsDirectory(temp, sizeof(temp) );
|
|
strcat(temp, "\\");
|
|
strcat(temp, name);
|
|
|
|
return GetUnixFileName(temp);
|
|
}
|
|
|
|
static TSecHeader *load (char *filename)
|
|
{
|
|
FILE *f;
|
|
int state;
|
|
TSecHeader *SecHeader = 0;
|
|
char CharBuffer [STRSIZE];
|
|
char *next, *file;
|
|
char c;
|
|
|
|
file = GetIniFileName(filename);
|
|
|
|
dprintf_profile(stddeb,"Load %s\n", file);
|
|
if ((f = fopen (file, "r"))==NULL)
|
|
return NULL;
|
|
|
|
dprintf_profile(stddeb,"Loading %s\n", file);
|
|
|
|
|
|
state = FirstBrace;
|
|
while ((c = getc (f)) != EOF){
|
|
if (c == '\r') /* Ignore Carriage Return */
|
|
continue;
|
|
|
|
switch (state){
|
|
|
|
case OnSecHeader:
|
|
if (c == ']' || overflow){
|
|
*next = '\0';
|
|
next = CharBuffer;
|
|
SecHeader->AppName = strdup (CharBuffer);
|
|
state = IgnoreToEOL;
|
|
dprintf_profile(stddeb,"%s: section %s\n", file, CharBuffer);
|
|
} else
|
|
*next++ = c;
|
|
break;
|
|
|
|
case IgnoreToEOL:
|
|
if (c == '\n'){
|
|
state = KeyDef;
|
|
next = CharBuffer;
|
|
}
|
|
break;
|
|
|
|
case FirstBrace:
|
|
case KeyDef:
|
|
if (c == '['){
|
|
TSecHeader *temp;
|
|
|
|
temp = SecHeader;
|
|
SecHeader = (TSecHeader *) xmalloc (sizeof (TSecHeader));
|
|
SecHeader->link = temp;
|
|
SecHeader->Keys = 0;
|
|
state = OnSecHeader;
|
|
next = CharBuffer;
|
|
break;
|
|
}
|
|
if (state == FirstBrace) /* On first pass, don't allow dangling keys */
|
|
break;
|
|
|
|
if (c == '\t')
|
|
break;
|
|
|
|
if (c == '\n' || c == ';' || overflow) /* Abort Definition */
|
|
next = CharBuffer;
|
|
|
|
if (c == ';')
|
|
{
|
|
state = IgnoreToEOL;
|
|
break;
|
|
}
|
|
|
|
if (c == '=' || overflow){
|
|
TKeys *temp;
|
|
|
|
temp = SecHeader->Keys;
|
|
while(next[-1]==' ')next--;
|
|
*next = '\0';
|
|
SecHeader->Keys = (TKeys *) xmalloc (sizeof (TKeys));
|
|
SecHeader->Keys->link = temp;
|
|
SecHeader->Keys->KeyName = strdup (CharBuffer);
|
|
state = KeyValue;
|
|
next = CharBuffer;
|
|
dprintf_profile(stddeb,"%s: key %s\n", file, CharBuffer);
|
|
} else
|
|
*next++ = c;
|
|
break;
|
|
|
|
case KeyValue:
|
|
if (overflow || c == '\n'){
|
|
*next = '\0';
|
|
SecHeader->Keys->Value = strdup (CharBuffer);
|
|
state = c == '\n' ? KeyDef : IgnoreToEOL;
|
|
next = CharBuffer;
|
|
dprintf_profile (stddeb, "[%s] (%s)=%s\n", SecHeader->AppName,
|
|
SecHeader->Keys->KeyName, SecHeader->Keys->Value);
|
|
} else
|
|
*next++ = c;
|
|
break;
|
|
|
|
} /* switch */
|
|
|
|
} /* while ((c = getc (f)) != EOF) */
|
|
return SecHeader;
|
|
}
|
|
|
|
static void new_key (TSecHeader *section, char *KeyName, char *Value)
|
|
{
|
|
TKeys *key;
|
|
|
|
key = (TKeys *) xmalloc (sizeof (TKeys));
|
|
key->KeyName = strdup (KeyName);
|
|
key->Value = strdup (Value);
|
|
key->link = section->Keys;
|
|
section->Keys = key;
|
|
}
|
|
|
|
static short GetSetProfile (int set, LPSTR AppName, LPSTR KeyName,
|
|
LPSTR Default, LPSTR ReturnedString, short Size,
|
|
LPSTR FileName)
|
|
|
|
{
|
|
TProfile *New;
|
|
TSecHeader *section;
|
|
TKeys *key;
|
|
|
|
/* Supposedly Default should NEVER be NULL. But sometimes it is. */
|
|
if (Default == NULL)
|
|
Default = "";
|
|
|
|
if (!(section = is_loaded (FileName))){
|
|
New = (TProfile *) xmalloc (sizeof (TProfile));
|
|
New->link = Base;
|
|
New->FileName = strdup (FileName);
|
|
New->Section = load (FileName);
|
|
Base = New;
|
|
section = New->Section;
|
|
Current = New;
|
|
}
|
|
/* Start search */
|
|
for (; section; section = section->link){
|
|
if (strcasecmp (section->AppName, AppName))
|
|
continue;
|
|
|
|
/* If no key value given, then list all the keys */
|
|
if ((!KeyName) && (!set)){
|
|
char *p = ReturnedString;
|
|
int left = Size - 2;
|
|
int slen;
|
|
|
|
dprintf_profile(stddeb,"GetSetProfile // KeyName == NULL, Enumeration !\n");
|
|
for (key = section->Keys; key; key = key->link){
|
|
if (left < 1) {
|
|
dprintf_profile(stddeb,"GetSetProfile // No more storage for enum !\n");
|
|
return (Size - 2);
|
|
}
|
|
slen = min(strlen(key->KeyName) + 1, left);
|
|
dprintf_profile(stddeb,"GetSetProfile // strncpy(%08X, %08X, %d);\n",
|
|
ReturnedString, key->Value, slen);
|
|
strncpy (p, key->KeyName, slen);
|
|
dprintf_profile(stddeb,"GetSetProfile // enum '%s' !\n", p);
|
|
left -= slen;
|
|
p += slen;
|
|
}
|
|
*p = '\0';
|
|
#ifdef DEBUG_PROFILE
|
|
printf("GetSetProfile // normal end of enum !\n");
|
|
#endif
|
|
return (Size - 2 - left);
|
|
}
|
|
for (key = section->Keys; key; key = key->link){
|
|
if (strcasecmp (key->KeyName, KeyName))
|
|
continue;
|
|
if (set){
|
|
free (key->Value);
|
|
key->Value = strdup (Default ? Default : "");
|
|
return 1;
|
|
}
|
|
ReturnedString [Size-1] = 0;
|
|
strncpy (ReturnedString, key->Value, Size-1);
|
|
return 1;
|
|
}
|
|
/* If Getting the information, then don't write the information
|
|
to the INI file, need to run a couple of tests with windog */
|
|
/* No key found */
|
|
if (set)
|
|
new_key (section, KeyName, Default);
|
|
else {
|
|
ReturnedString [Size-1] = 0;
|
|
strncpy (ReturnedString, Default, Size-1);
|
|
}
|
|
return 1;
|
|
}
|
|
/* Non existent section */
|
|
if (set){
|
|
section = (TSecHeader *) xmalloc (sizeof (TSecHeader));
|
|
section->AppName = strdup (AppName);
|
|
section->Keys = 0;
|
|
new_key (section, KeyName, Default);
|
|
section->link = Current->Section;
|
|
Current->Section = section;
|
|
} else {
|
|
ReturnedString [Size-1] = 0;
|
|
strncpy (ReturnedString, Default, Size-1);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
short GetPrivateProfileString (LPSTR AppName, LPSTR KeyName,
|
|
LPSTR Default, LPSTR ReturnedString,
|
|
short Size, LPSTR FileName)
|
|
{
|
|
int v;
|
|
|
|
dprintf_profile(stddeb,"GetPrivateProfileString ('%s', '%s', '%s', %08X, %d, %s\n",
|
|
AppName, KeyName, Default, ReturnedString, Size, FileName);
|
|
v = GetSetProfile (0,AppName,KeyName,Default,ReturnedString,Size,FileName);
|
|
if (AppName)
|
|
return strlen (ReturnedString);
|
|
else
|
|
return Size - v;
|
|
}
|
|
|
|
int GetProfileString (LPSTR AppName, LPSTR KeyName, LPSTR Default,
|
|
LPSTR ReturnedString, int Size)
|
|
{
|
|
return GetPrivateProfileString (AppName, KeyName, Default,
|
|
ReturnedString, Size, WIN_INI);
|
|
}
|
|
|
|
WORD GetPrivateProfileInt (LPSTR AppName, LPSTR KeyName, short Default,
|
|
LPSTR File)
|
|
{
|
|
static char IntBuf [6];
|
|
static char buf [6];
|
|
|
|
sprintf (buf, "%d", Default);
|
|
|
|
/* Check the exact semantic with the SDK */
|
|
GetPrivateProfileString (AppName, KeyName, buf, IntBuf, 6, File);
|
|
if (!strcasecmp (IntBuf, "true"))
|
|
return 1;
|
|
if (!strcasecmp (IntBuf, "yes"))
|
|
return 1;
|
|
return atoi (IntBuf);
|
|
}
|
|
|
|
WORD GetProfileInt (LPSTR AppName, LPSTR KeyName, int Default)
|
|
{
|
|
return GetPrivateProfileInt (AppName, KeyName, Default, WIN_INI);
|
|
}
|
|
|
|
BOOL WritePrivateProfileString (LPSTR AppName, LPSTR KeyName, LPSTR String,
|
|
LPSTR FileName)
|
|
{
|
|
return GetSetProfile (1, AppName, KeyName, String, "", 0, FileName);
|
|
}
|
|
|
|
BOOL WriteProfileString (LPSTR AppName, LPSTR KeyName, LPSTR String)
|
|
{
|
|
return (WritePrivateProfileString (AppName, KeyName, String, WIN_INI));
|
|
}
|
|
|
|
static void dump_keys (FILE *profile, TKeys *p)
|
|
{
|
|
if (!p)
|
|
return;
|
|
dump_keys (profile, p->link);
|
|
fprintf (profile, "%s=%s\r\n", p->KeyName, p->Value);
|
|
}
|
|
|
|
static void dump_sections (FILE *profile, TSecHeader *p)
|
|
{
|
|
if (!p)
|
|
return;
|
|
dump_sections (profile, p->link);
|
|
fprintf (profile, "\r\n[%s]\r\n", p->AppName);
|
|
dump_keys (profile, p->Keys);
|
|
}
|
|
|
|
static void dump_profile (TProfile *p)
|
|
{
|
|
FILE *profile;
|
|
|
|
if (!p)
|
|
return;
|
|
dump_profile (p->link);
|
|
if ((profile = fopen (GetIniFileName(p->FileName), "w")) != NULL){
|
|
dump_sections (profile, p->Section);
|
|
fclose (profile);
|
|
}
|
|
}
|
|
|
|
void sync_profiles (void)
|
|
{
|
|
dump_profile (Base);
|
|
}
|