Release 951212
Mon Dec 11 19:08:55 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [misc/lstr.c]
Replaced wine_strncpy() by a 32-bit version of lstrcpyn(), since
they do the same job.
* [tools/build.c]
Fixed __attribute__((stdcall)) to make it compile with gcc
versions under 2.7. Doesn't mean it will run OK though...
Sat Dec 09 13:22:58 1995 Cameron Heide <heide@ee.ualberta.ca>
* [include/kernel32.h] [include/winerror.h]
Added file attribute definitions and more error codes.
* [win32/error.c]
Added some rudimentary errno-to-Win32 error conversion
code.
* [win32/file.c]
Added to GetFileInformationByHandle, filled in some known
error codes, and switched to dprintf_win32.
* [win32/time.c]
Added GetLocalTime.
Fri Dec 8 14:37:39 1995 Jim Peterson <jspeter@birch.ee.vt.edu>
* [controls/combo.c]
Converted functions of the type LONG _(HWND,WORD,LONG) to the type
LRESULT _(HWND,WPARAM,LPARAM) where needed.
* [include/libres.h]
Restructured libres prototypes to closer match the windows API.
* [include/windows.h]
Changed several API prototypes' parameter types from 'short' to INT,
which is #defined as short in the emulator, but is a normal int in
WINELIB32. Also changed SEGPTR from DWORD to void* when WINELIB32.
(This creates a lot of warnings at library-compile time, but less
warnings at app-compile time. I'll remove the warnings soon.)
* [loader/resource.c]
Fixed parameter mismatch in call to LIBRES_FindResource(). Changed
various implementations of the LIBRES_* API functions.
* [loader/signal.c]
Deleted local 'i' from win_fault(), since it was unused.
* [objects/bitblt.c]
Mirrored changes to include/windows.h mentioned above.
* [toolkit/hello3.c]
Changed LoadMenuIndirect() call to LoadMenu() to test the new
resource registration technique.
* [toolkit/libres.c]
Removed definition of 'struct resource' and fixed bugs in the resource
implementation. Implemented LIBRES_FindResource.
* [windows/graphics.c]
Mirrored changes to include/windows.h mentioned above.
Thu Dec 7 23:15:56 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [controls/edit.c]
LOCAL_HeapExists: Changed parameter to HANDLE. For WineLib, return true
* [controls/listbox.c]
CreateListBoxStruct: Initialize HeapSel to 0 for WineLib
* [include/listbox.h]
change HeapSel from WORD to HANDLE
* [include/resource.h][rc/winerc.c]
struct ResourceTable: removed
struct resource: moved to header file
autoregister resources if supported by compiler
* [memory/local.h]
LOCAL_GetHeap: expect HANDLE rather than WORD
* [toolkit/Makefile.in]
Add ALLCFLAGS to make hello3
* [toolkit/heap.c]
LocalFree, HEAP_Free: handle 0 parameter gracefully
Wed Dec 06 15:34:23 1995 Greg Cooper <cooper@ima-inc.com>
* [misc/winsocket.c]
Fixed the msgsnd and msgrcv errors that winsock programs get.
Wed Dec 06 12:47:23 MET 1995 Sven Verdoolaege <skimo@dns.ufsia.ac.be>
* [if1632/kernel.spec]
Fixed _hread and _hwrite return type
* [if1632/relay32.c] [loader/pe_image.c]
Hacked loading of PE-dll's in
* [win32/advapi.c]
Added stubs for RegCreateKeyEx, RegSetValueEx, RegQueryValueEx
* [win32/file.c]
Added stubs for OpenFileMapping, CreateFileMapping, MapViewOfFileEx
* [win32/process.c]
Added stubs for CreateMutexA, ReleaseMutex, CreateEventA,
WaitForSingleObject, DuplicateHandle, GetCurrentProcess
Mon Dec 04 13:06:37 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [include/wine.h] [misc/lstr.c]
Define wine_strncpy(). This function does not pad the buffer with
zeroes like GNU strncpy(), which might break some Windows programs
that pass bogus size arguments.
* [loader/module.c]: GetModuleFileName(),
[misc/commdlg.c]: GetFileTitle(),
[misc/keyboard.c], [misc/lstr.c]: lstrcpyn(),
[misc/ole2nls.c], [misc/profile.c], [multimedia/mcistring.c],
[multimedia/mmsystem.c], [objects/font.c]:
Use wine_strncpy() where strings are returned to Windows programs.
* [objects/metafile.c]
PlayMetafile(): Clear the handle table before using it.
* [misc/shell.c] [misc/main.c]
Rename SHELL_RegCheckForRoot() to SHELL_Init() and call it from main().
* [misc/profile.c]
load(): Need to handle comments.
* [toolkit/libres.c]
Make it compile.
* [windows/nonclient.c]
Use MAKE_SEGPTR macro in two places where a user heap block used
to be allocated instead.
Sat Dec 02 16:43:43 1995 Ramon Garcia <ramon@ie3.clubs.etsit.upm.es>
* [windows/winpos.c]
In function SetWindowPos: do not redraw the parent of
a window if the specified window is placed on the top.
This avoids that ShowWindow(hwnd,1) hides hwnd instead
of showing it.
Sat Dec 02 11:00:00 1995 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/scroll.c]
Now it can scroll children along with the client region of parent
window. Tried to optimize update region calculation.
* [windows/mdi.c]
ScrollChildren function, more other features added. Basically
a rewrite.
* [windows/winpos.c] [windows/focus.c]
Reimplemented window activation and focus handling.
* [windows/nonclient.c]
Added new flag WIN_NCACTIVATED.
* [windows/message.c] [loader/task.c]
Small changes (to maintain linked list of message queues).
Wed Nov 29 15:51:48 1995 Daniel Schepler <daniel@shep13.wustl.edu>
* [include/options.h] [misc/main.c] [windows/defwnd.c]
[windows/event.c] [windows/nonclient.c] [windows/win.c] [Wine.man]
Implemented a -managed option to replace the standard Windows
frame of top-level windows with the window manager's decorations.
If a top-level window makes its own frame, this will still show
up, inside the window manager decorations (I believe ctl3dv2.dll
would do this, although I can't test this).
diff --git a/misc/shell.c b/misc/shell.c
index 86d60ee..5e1911c 100644
--- a/misc/shell.c
+++ b/misc/shell.c
@@ -25,48 +25,48 @@
static char RootKeyName[]=".classes", TopKeyName[] = "[top-null]";
/*************************************************************************
- * SHELL_RegCheckForRoot() internal use only
+ * SHELL_Init()
*/
-static LONG SHELL_RegCheckForRoot()
+BOOL SHELL_Init()
{
HKEY hNewKey;
-
- if (lphRootKey == NULL){
- hNewKey = GlobalAlloc(GMEM_MOVEABLE,sizeof(KEYSTRUCT));
- lphRootKey = (LPKEYSTRUCT) GlobalLock(hNewKey);
- if (lphRootKey == NULL) {
+
+ hNewKey = GlobalAlloc(GMEM_MOVEABLE,sizeof(KEYSTRUCT));
+ lphRootKey = (LPKEYSTRUCT) GlobalLock(hNewKey);
+ if (lphRootKey == NULL) {
printf("SHELL_RegCheckForRoot: Couldn't allocate root key!\n");
- return ERROR_OUTOFMEMORY;
- }
- lphRootKey->hKey = (HKEY)1;
- lphRootKey->lpSubKey = RootKeyName;
- lphRootKey->dwType = 0;
- lphRootKey->lpValue = NULL;
- lphRootKey->lpSubLvl = lphRootKey->lpNextKey = lphRootKey->lpPrevKey = NULL;
-
- hNewKey = GlobalAlloc(GMEM_MOVEABLE,sizeof(KEYSTRUCT));
- lphTopKey = (LPKEYSTRUCT) GlobalLock(hNewKey);
- if (lphTopKey == NULL) {
- printf("SHELL_RegCheckForRoot: Couldn't allocate top key!\n");
- return ERROR_OUTOFMEMORY;
- }
- lphTopKey->hKey = 0;
- lphTopKey->lpSubKey = TopKeyName;
- lphTopKey->dwType = 0;
- lphTopKey->lpValue = NULL;
- lphTopKey->lpSubLvl = lphRootKey;
- lphTopKey->lpNextKey = lphTopKey->lpPrevKey = NULL;
-
- dprintf_reg(stddeb,"SHELL_RegCheckForRoot: Root/Top created\n");
+ return FALSE;
}
- return ERROR_SUCCESS;
+ lphRootKey->hKey = (HKEY)1;
+ lphRootKey->lpSubKey = RootKeyName;
+ lphRootKey->dwType = 0;
+ lphRootKey->lpValue = NULL;
+ lphRootKey->lpSubLvl = lphRootKey->lpNextKey = lphRootKey->lpPrevKey = NULL;
+
+ hNewKey = GlobalAlloc(GMEM_MOVEABLE,sizeof(KEYSTRUCT));
+ lphTopKey = (LPKEYSTRUCT) GlobalLock(hNewKey);
+ if (lphTopKey == NULL) {
+ printf("SHELL_RegCheckForRoot: Couldn't allocate top key!\n");
+ return FALSE;
+ }
+ lphTopKey->hKey = 0;
+ lphTopKey->lpSubKey = TopKeyName;
+ lphTopKey->dwType = 0;
+ lphTopKey->lpValue = NULL;
+ lphTopKey->lpSubLvl = lphRootKey;
+ lphTopKey->lpNextKey = lphTopKey->lpPrevKey = NULL;
+
+ dprintf_reg(stddeb,"SHELL_RegCheckForRoot: Root/Top created\n");
+
+ return TRUE;
}
/* FIXME: the loading and saving of the registry database is rather messy.
* bad input (while reading) may crash wine.
*/
void
-_DumpLevel(FILE *f,LPKEYSTRUCT lpTKey,int tabs) {
+_DumpLevel(FILE *f,LPKEYSTRUCT lpTKey,int tabs)
+{
LPKEYSTRUCT lpKey;
lpKey=lpTKey->lpSubLvl;
@@ -86,7 +86,8 @@
}
static void
-_SaveKey(HKEY hKey,char *where) {
+_SaveKey(HKEY hKey,char *where)
+{
FILE *f;
LPKEYSTRUCT lpKey;
@@ -106,7 +107,8 @@
}
void
-SHELL_SaveRegistry(void) {
+SHELL_SaveRegistry(void)
+{
/* FIXME:
* -implement win95 additional keytypes here
* (HKEY_LOCAL_MACHINE,HKEY_CURRENT_USER or whatever)
@@ -117,7 +119,8 @@
#define BUFSIZE 256
void
-_LoadLevel(FILE *f,LPKEYSTRUCT lpKey,int tabsexp,char *buf) {
+_LoadLevel(FILE *f,LPKEYSTRUCT lpKey,int tabsexp,char *buf)
+{
int i;
char *s,*t;
HKEY hNewKey;
@@ -184,7 +187,8 @@
}
void
-_LoadKey(HKEY hKey,char *from) {
+_LoadKey(HKEY hKey,char *from)
+{
FILE *f;
LPKEYSTRUCT lpKey;
char buf[BUFSIZE]; /* FIXME: long enough? */
@@ -204,12 +208,8 @@
}
void
-SHELL_LoadRegistry(void) {
- DWORD dwRet;
-
- dwRet=SHELL_RegCheckForRoot();
- if (dwRet!=ERROR_SUCCESS)
- return;/*very bad magic, if we can't even allocate the rootkeys*/
+SHELL_LoadRegistry(void)
+{
_LoadKey((HKEY)HKEY_CLASSES_ROOT,"/tmp/winereg");
}
@@ -221,10 +221,7 @@
LPKEYSTRUCT lpKey,lpNextKey;
LPCSTR ptr;
char str[128];
- LONG dwRet;
- dwRet = SHELL_RegCheckForRoot();
- if (dwRet != ERROR_SUCCESS) return dwRet;
dprintf_reg(stddeb, "RegOpenKey(%08lX, %p='%s', %p)\n",
(DWORD)hKey, lpSubKey, lpSubKey, lphKey);
if (lphKey == NULL) return ERROR_INVALID_PARAMETER;
@@ -274,12 +271,9 @@
LPKEYSTRUCT lpNewKey;
LPKEYSTRUCT lpKey;
LPKEYSTRUCT lpPrevKey;
- LONG dwRet;
LPCSTR ptr;
char str[128];
- dwRet = SHELL_RegCheckForRoot();
- if (dwRet != ERROR_SUCCESS) return dwRet;
dprintf_reg(stddeb, "RegCreateKey(%08lX, '%s', %p)\n", (DWORD)hKey, lpSubKey, lphKey);
if (lphKey == NULL) return ERROR_INVALID_PARAMETER;
switch((DWORD)hKey) {
@@ -439,11 +433,8 @@
LONG RegEnumKey(HKEY hKey, DWORD dwSubKey, LPSTR lpBuf, DWORD dwSize)
{
LPKEYSTRUCT lpKey;
- LONG dwRet;
LONG len;
- dwRet = SHELL_RegCheckForRoot();
- if (dwRet != ERROR_SUCCESS) return dwRet;
dprintf_reg(stddeb, "RegEnumKey(%08lX, %ld)\n", (DWORD)hKey, dwSubKey);
if (lpBuf == NULL) return ERROR_INVALID_PARAMETER;
switch((DWORD)hKey) {
@@ -478,11 +469,12 @@
*/
void DragAcceptFiles(HWND hWnd, BOOL b)
{
- /* flips WS_EX_ACCEPTFILES bit according to the value of b (TRUE or FALSE) */
+ /* flips WS_EX_ACCEPTFILES bit according to the value of b */
+ dprintf_reg(stddeb,"DragAcceptFiles("NPFMT", %u) old exStyle %08lx\n",
+ hWnd,b,GetWindowLong(hWnd,GWL_EXSTYLE));
- dprintf_reg(stddeb,"DragAcceptFiles("NPFMT", %u) old exStyle %08lx\n",hWnd,b,GetWindowLong(hWnd,GWL_EXSTYLE));
-
- SetWindowLong(hWnd,GWL_EXSTYLE,GetWindowLong(hWnd,GWL_EXSTYLE) | b*(LONG)WS_EX_ACCEPTFILES);
+ SetWindowLong(hWnd,GWL_EXSTYLE,
+ GetWindowLong(hWnd,GWL_EXSTYLE) | b*(LONG)WS_EX_ACCEPTFILES);
}
@@ -491,42 +483,42 @@
*/
UINT DragQueryFile(HDROP hDrop, WORD wFile, LPSTR lpszFile, WORD wLength)
{
- /* hDrop is a global memory block allocated with GMEM_SHARE
- with DROPFILESTRUCT as a header and filenames following
- it, zero length filename is in the end */
-
- LPDROPFILESTRUCT lpDropFileStruct;
- LPSTR lpCurrent;
- WORD i;
-
- dprintf_reg(stddeb,"DragQueryFile("NPFMT", %i, %p, %u)\n",
- hDrop,wFile,lpszFile,wLength);
-
- lpDropFileStruct = (LPDROPFILESTRUCT) GlobalLock(hDrop);
- if(!lpDropFileStruct)
+ /* hDrop is a global memory block allocated with GMEM_SHARE
+ * with DROPFILESTRUCT as a header and filenames following
+ * it, zero length filename is in the end */
+
+ LPDROPFILESTRUCT lpDropFileStruct;
+ LPSTR lpCurrent;
+ WORD i;
+
+ dprintf_reg(stddeb,"DragQueryFile("NPFMT", %i, %p, %u)\n",
+ hDrop,wFile,lpszFile,wLength);
+
+ lpDropFileStruct = (LPDROPFILESTRUCT) GlobalLock(hDrop);
+ if(!lpDropFileStruct)
{
- dprintf_reg(stddeb,"DragQueryFile: unable to lock handle!\n");
- return 0;
+ dprintf_reg(stddeb,"DragQueryFile: unable to lock handle!\n");
+ return 0;
}
- lpCurrent = (LPSTR) lpDropFileStruct + lpDropFileStruct->wSize;
-
- i = 0;
- while(i++ < wFile)
+ lpCurrent = (LPSTR) lpDropFileStruct + lpDropFileStruct->wSize;
+
+ i = 0;
+ while (i++ < wFile)
{
- while(*lpCurrent++); /* skip filename */
- if(!*lpCurrent)
- return (wFile == 0xFFFF)? i : 0;
+ while (*lpCurrent++); /* skip filename */
+ if (!*lpCurrent)
+ return (wFile == 0xFFFF) ? i : 0;
}
-
- i = strlen(lpCurrent);
- if(!lpszFile) return i+1; /* needed buffer size */
-
- i = ( wLength > i)? i : wLength-1;
- strncpy(lpszFile,lpCurrent,i);
- lpszFile[i]='\0';
-
- GlobalUnlock(hDrop);
- return i;
+
+ i = strlen(lpCurrent);
+ if (!lpszFile) return i+1; /* needed buffer size */
+
+ i = (wLength > i) ? i : wLength-1;
+ strncpy(lpszFile, lpCurrent, i);
+ lpszFile[i] = '\0';
+
+ GlobalUnlock(hDrop);
+ return i;
}
@@ -535,7 +527,7 @@
*/
void DragFinish(HDROP h)
{
- GlobalFree((HGLOBAL)h);
+ GlobalFree((HGLOBAL)h);
}
@@ -544,16 +536,16 @@
*/
BOOL DragQueryPoint(HDROP hDrop, POINT FAR *p)
{
- LPDROPFILESTRUCT lpDropFileStruct;
- BOOL bRet;
+ LPDROPFILESTRUCT lpDropFileStruct;
+ BOOL bRet;
- lpDropFileStruct = (LPDROPFILESTRUCT) GlobalLock(hDrop);
+ lpDropFileStruct = (LPDROPFILESTRUCT) GlobalLock(hDrop);
- memcpy(p,&lpDropFileStruct->ptMousePos,sizeof(POINT));
- bRet = lpDropFileStruct->fInNonClientArea;
+ memcpy(p,&lpDropFileStruct->ptMousePos,sizeof(POINT));
+ bRet = lpDropFileStruct->fInNonClientArea;
- GlobalUnlock(hDrop);
- return bRet;
+ GlobalUnlock(hDrop);
+ return bRet;
}
