Release 960811
Sun Aug 11 13:00:20 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [include/acconfig.h] [tools/build.c]
Added check for underscore on external symbols.
* [memory/selector.c] [memory/global.c]
Fixed FreeSelector() to free only one selector.
Added SELECTOR_FreeBlock() to free an array of selectors.
* [objects/color.c]
Fixed a bug in COLOR_ToLogical() that caused GetPixel() to fail on
hi-color displays.
* [tools/build.c] [if1632/crtdll.spec]
Added 'extern' type, used for external variables or functions.
* [windows/winpos.c]
Allow de-activating a window in WINPOS_ChangeActiveWindow().
* [windows/winproc.c]
Added 32-to-16 translation for button messages.
Fixed WINPROC_GetPtr() to avoid crashes on 32-bit procedures that
happen to be valid SEGPTRs.
Sat Aug 10 18:22:25 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/message.c]
Removed a FIXME in MSG_PeekHardwareMsg(): produces correct
data for the JOURNALRECORD-hook (using EVENTMSG16 structure).
* [if1632/gdi.spec] [include/windows.h] [objects/metafile.c]
Introduced undocumented API function IsValidMetaFile(), plus a
minor fix in last patch of CopyMetaFile().
* [objects/gdiobj.c]
Removed a FIXME in IsGDIObject(): added magic word check.
Sun Aug 10 18:10:10 1996 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [controls/statuswin.c]
First pass at implementing the StatusWindow class.
* [include/commctrl.h]
Header file for common controls.
* [controls/widgets.c]
Added InitCommonControls().
* [if1632/comctl32.spec]
Add DrawStatusTextA, CreateStatusWindowA, InitCommonControls.
* [win32/findfile.c] [if1632/kernel32.spec]
Add FindNextFile32A, FindClose.
Modified FindFirstFile32A so it works with FindNextFile32A.
* [include/winbase.h]
Fixed WIN32_FIND_DATA structure member names.
Sat Aug 10 09:00:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/scroll.c]
Changed scrolling routines to benefit from DCE code update.
Thu Aug 8 18:05:09 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/file.c]
SearchPath* could get NULL for lastpart argument.
* [if1632/build-spec.txt] [documentation/debugging]
Varargs documentation added, debugging hints updated.
* [if1632/crtdll.spec][misc/crtdll.c][misc/Makefile.in]
Started to implement CRTDLL.
* [if1632/wsock32.spec]
Some thunks to standard libc functions (structures have the same
elements, but perhaps wrong offset due to packing).
* [include/kernel32.h][include/windows.h][win32/*.c][loader/main.c]
Merged kernel32.h into windows.h.
* [misc/lstr.c]
Enhanced FormatMessage().
* [misc/main.c] [if1632/kernel.spec] [include/windows.h]
GetVersion() updated to new naming standard.
Changed language handling to support language ids.
* [misc/shell.c]
Enhanced FindExecutable, so it finds files in the search path too.
* [win32/environment.c]
GetCommandLine* updated.
* [loader/resource.c] [loader/pe_resource.c]
FindResourceEx32* added.
Loading of messagetables added.
Language handling now uses Wine default language id.
diff --git a/windows/winpos.c b/windows/winpos.c
index 9e1a9cc..c6132bb 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -866,6 +866,7 @@
WND *wndTemp = WIN_FindWndPtr(hwndActive);
CBTACTIVATESTRUCT16 *cbtStruct;
WORD wIconized=0;
+ HANDLE hNewActiveQueue;
/* FIXME: When proper support for cooperative multitasking is in place
* hActiveQ will be global
@@ -874,10 +875,10 @@
HANDLE hActiveQ = 0;
/* paranoid checks */
- if( !hWnd || hWnd == GetDesktopWindow() || hWnd == hwndActive )
+ if( hWnd == GetDesktopWindow() || hWnd == hwndActive )
return 0;
- if( GetTaskQueue(0) != wndPtr->hmemTaskQ )
+ if (wndPtr && (GetTaskQueue(0) != wndPtr->hmemTaskQ))
return 0;
if( wndTemp )
@@ -918,7 +919,7 @@
hwndActive = hWnd;
/* send palette messages */
- if( SendMessage16( hWnd, WM_QUERYNEWPALETTE, 0, 0L) )
+ if (hWnd && SendMessage16( hWnd, WM_QUERYNEWPALETTE, 0, 0L))
SendMessage16((HWND16)-1, WM_PALETTEISCHANGING, (WPARAM)hWnd, 0L );
/* if prev wnd is minimized redraw icon title
@@ -932,7 +933,7 @@
*/
/* managed windows will get ConfigureNotify event */
- if (!(wndPtr->dwStyle & WS_CHILD) && !(wndPtr->flags & WIN_MANAGED))
+ if (wndPtr && !(wndPtr->dwStyle & WS_CHILD) && !(wndPtr->flags & WIN_MANAGED))
{
/* check Z-order and bring hWnd to the top */
for (wndTemp = WIN_GetDesktop()->child; wndTemp; wndTemp = wndTemp->next)
@@ -941,18 +942,18 @@
if( wndTemp != wndPtr )
SetWindowPos(hWnd, HWND_TOP, 0,0,0,0,
SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE );
+ if( !IsWindow(hWnd) ) return 0;
}
- if( !IsWindow(hWnd) ) return 0;
-
if (hwndPrevActive)
{
wndTemp = WIN_FindWndPtr( hwndPrevActive );
if (wndTemp) hActiveQ = wndTemp->hmemTaskQ;
}
+ hNewActiveQueue = wndPtr ? wndPtr->hmemTaskQ : 0;
/* send WM_ACTIVATEAPP if necessary */
- if (hActiveQ != wndPtr->hmemTaskQ)
+ if (hActiveQ != hNewActiveQueue)
{
WND **list, **ppWnd;
@@ -964,7 +965,7 @@
if (!IsWindow( (*ppWnd)->hwndSelf )) continue;
if ((*ppWnd)->hmemTaskQ != hActiveQ) continue;
SendMessage16( (*ppWnd)->hwndSelf, WM_ACTIVATEAPP,
- 0, QUEUE_GetQueueTask(wndPtr->hmemTaskQ) );
+ 0, QUEUE_GetQueueTask(hNewActiveQueue) );
}
HeapFree( SystemHeap, 0, list );
}
@@ -975,7 +976,7 @@
{
/* Make sure that the window still exists */
if (!IsWindow( (*ppWnd)->hwndSelf )) continue;
- if ((*ppWnd)->hmemTaskQ != wndPtr->hmemTaskQ) continue;
+ if ((*ppWnd)->hmemTaskQ != hNewActiveQueue) continue;
SendMessage16( (*ppWnd)->hwndSelf, WM_ACTIVATEAPP,
1, QUEUE_GetQueueTask( hActiveQ ) );
}
@@ -984,19 +985,22 @@
if (!IsWindow(hWnd)) return 0;
}
- /* walk up to the first unowned window */
- wndTemp = wndPtr;
- while (wndTemp->owner) wndTemp = wndTemp->owner;
- /* and set last active owned popup */
- wndTemp->hwndLastActive = hWnd;
+ if (hWnd)
+ {
+ /* walk up to the first unowned window */
+ wndTemp = wndPtr;
+ while (wndTemp->owner) wndTemp = wndTemp->owner;
+ /* and set last active owned popup */
+ wndTemp->hwndLastActive = hWnd;
- wIconized = HIWORD(wndTemp->dwStyle & WS_MINIMIZE);
- SendMessage16( hWnd, WM_NCACTIVATE, TRUE, 0 );
- SendMessage32A( hWnd, WM_ACTIVATE,
+ wIconized = HIWORD(wndTemp->dwStyle & WS_MINIMIZE);
+ SendMessage16( hWnd, WM_NCACTIVATE, TRUE, 0 );
+ SendMessage32A( hWnd, WM_ACTIVATE,
MAKEWPARAM( (fMouse) ? WA_CLICKACTIVE : WA_ACTIVE, wIconized),
(LPARAM)hwndPrevActive );
- if( !IsWindow(hWnd) ) return 0;
+ if( !IsWindow(hWnd) ) return 0;
+ }
/* change focus if possible */
if( fChangeFocus && GetFocus() )
@@ -1024,6 +1028,8 @@
{
WND *wndPtr = WIN_FindWndPtr(hWnd);
+ if (!hWnd) return WINPOS_SetActiveWindow( 0, mouseMsg, TRUE );
+
if( !wndPtr ) return FALSE;
/* child windows get WM_CHILDACTIVATE message */
