[jimtabor] 23390: Sync, patch from Vassily Tarasov bug 1658 : Implement GetUserObjectSecurity()and SetUserObjectSecurity()
by jimtabor＠svn.reactos.org
Author: jimtabor
Date: Mon Jul 31 10:01:09 2006
New Revision: 23390
URL: http://svn.reactos.org/svn/reactos?rev=23390&view=rev
Log:
Sync, patch from Vassily Tarasov bug 1658 : Implement GetUserObjectSecurity()and SetUserObjectSecurity()
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/misc.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/stubs.c
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/misc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/misc.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/misc.c Mon Jul 31 10:01:09 2006
@@ -146,3 +146,125 @@
return pi;
}
+
+
+/*
+ * GetUserObjectSecurity
+ *
+ * Retrieves security information for user object specified
+ * with handle 'hObject'. Descriptor returned in self-relative
+ * format.
+ *
+ * Arguments:
+ * 1) hObject - handle to an object to retrieve information for
+ * 2) pSecurityInfo - type of information to retrieve
+ * 3) pSecurityDescriptor - buffer which receives descriptor
+ * 4) dwLength - size, in bytes, of buffer 'pSecurityDescriptor'
+ * 5) pdwLengthNeeded - reseives actual size of descriptor
+ *
+ * Return Vaules:
+ * TRUE on success
+ * FALSE on failure, call GetLastError() for more information
+ */
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+GetUserObjectSecurity(
+ IN HANDLE hObject,
+ IN PSECURITY_INFORMATION pSecurityInfo,
+ OUT PSECURITY_DESCRIPTOR pSecurityDescriptor,
+ IN DWORD dwLength,
+ OUT PDWORD pdwLengthNeeded
+)
+{
+DWORD dwWin32Error;
+NTSTATUS Status;
+
+
+ Status = NtQuerySecurityObject(
+ hObject, // Object Handle
+ *pSecurityInfo, // Security Information
+ pSecurityDescriptor,// Security Descriptor
+ dwLength, // Buffer Length
+ pdwLengthNeeded // Actual Length
+ );
+
+ if ( ! NT_SUCCESS( Status ) ) {
+ dwWin32Error = RtlNtStatusToDosError( Status );
+ NtCurrentTeb()->LastErrorValue = dwWin32Error;
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+/*
+ * SetUserObjectSecurity
+ *
+ * Sets new security descriptor to user object specified by
+ * handle 'hObject'. Descriptor must be in self-relative format.
+ *
+ * Arguments:
+ * 1) hObject - handle to an object to set information for
+ * 2) pSecurityInfo - type of information to apply
+ * 3) pSecurityDescriptor - buffer which descriptor to set
+ *
+ * Return Vaules:
+ * TRUE on success
+ * FALSE on failure, call GetLastError() for more information
+ */
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+SetUserObjectSecurity(
+ IN HANDLE hObject,
+ IN PSECURITY_INFORMATION pSecurityInfo,
+ IN PSECURITY_DESCRIPTOR pSecurityDescriptor
+)
+{
+DWORD dwWin32Error;
+NTSTATUS Status;
+
+
+ Status = NtSetSecurityObject(
+ hObject, // Object Handle
+ *pSecurityInfo, // Security Information
+ pSecurityDescriptor // Security Descriptor
+ );
+
+ if ( ! NT_SUCCESS( Status ) ) {
+ dwWin32Error = RtlNtStatusToDosError( Status );
+ NtCurrentTeb()->LastErrorValue = dwWin32Error;
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+STDCALL
+EndTask(
+ HWND hWnd,
+ BOOL fShutDown,
+ BOOL fForce)
+{
+ SendMessageW(hWnd, WM_CLOSE, 0, 0);
+
+ if (IsWindow(hWnd))
+ {
+ if (fForce)
+ return DestroyWindow(hWnd);
+ else
+ return FALSE;
+ }
+
+ return TRUE;
+}
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/stubs.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/stubs.c Mon Jul 31 10:01:09 2006
@@ -147,31 +147,6 @@
DbgPrint("(%ld): stub\n", dwLevel);
}
-/* EOF */
-
-/*
- * @implemented
- */
-BOOL
-STDCALL
-EndTask(
- HWND hWnd,
- BOOL fShutDown,
- BOOL fForce)
-{
- SendMessageW(hWnd, WM_CLOSE, 0, 0);
-
- if (IsWindow(hWnd))
- {
- if (fForce)
- return DestroyWindow(hWnd);
- else
- return FALSE;
- }
-
- return TRUE;
-}
-
/*
* @unimplemented
@@ -271,37 +246,8 @@
return NtUserDragObject(hwnd1, hwnd2, u1, dw1, hc1);
}
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-GetUserObjectSecurity(
- HANDLE hObj,
- PSECURITY_INFORMATION pSIRequested,
- PSECURITY_DESCRIPTOR pSID,
- DWORD nLength,
- LPDWORD lpnLengthNeeded
- )
-{
- UNIMPLEMENTED;
- return FALSE;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-SetUserObjectSecurity(
- HANDLE hObj,
- PSECURITY_INFORMATION pSIRequested,
- PSECURITY_DESCRIPTOR pSID
- )
-{
- UNIMPLEMENTED;
- return FALSE;
-}
+
+
/*
* @unimplemented
18 years, 4 months
- 1
- 0
[jimtabor] 23389: Sync up Accel.c to head.
by jimtabor＠svn.reactos.org
Author: jimtabor
Date: Mon Jul 31 09:51:18 2006
New Revision: 23389
URL: http://svn.reactos.org/svn/reactos?rev=23389&view=rev
Log:
Sync up Accel.c to head.
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/accel.c
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/accel.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/accel.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/accel.c Mon Jul 31 09:51:18 2006
@@ -187,6 +187,9 @@
U32_ACCEL_CACHE_ENTRY ** ppEntry;
ULONG_PTR nUsage = 0;
+ if (!hAccel)
+ return FALSE;
+
EnterCriticalSection(&U32AccelCacheLock);
/* see if this accelerator table has been cached */
@@ -281,6 +284,8 @@
*/
HACCEL WINAPI CreateAcceleratorTableW(LPACCEL lpaccl, int cEntries)
{
+ if (!cEntries || !lpaccl) return (HACCEL)0;
+
return NtUserCreateAcceleratorTable(lpaccl, cEntries);
}
@@ -325,6 +330,8 @@
HACCEL WINAPI CreateAcceleratorTableA(LPACCEL lpaccl, int cEntries)
{
int i;
+
+ if (!cEntries || !lpaccl) return (HACCEL)0;
for(i = 0; i < cEntries; ++ i)
if(!lpaccl[i].fVirt)
18 years, 4 months
- 1
- 0
[jimtabor] 23388: Sync up Class.c to head.
by jimtabor＠svn.reactos.org
Author: jimtabor
Date: Mon Jul 31 09:48:26 2006
New Revision: 23388
URL: http://svn.reactos.org/svn/reactos?rev=23388&view=rev
Log:
Sync up Class.c to head.
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c Mon Jul 31 09:48:26 2006
@@ -11,6 +11,8 @@
#include <user32.h>
+#include <wine/debug.h>
+
extern BOOL ControlsInitialized;
/*
@@ -124,6 +126,11 @@
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
+ }
+
+ if ( hInstance == User32Instance )
+ {
+ hInstance = NULL;
}
w.cbSize = sizeof(w);
@@ -152,6 +159,11 @@
{
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
+ }
+
+ if ( hInstance == User32Instance )
+ {
+ hInstance = NULL;
}
w.cbSize = sizeof(w);
@@ -388,12 +400,12 @@
SmallIconHeight = GetSystemMetrics(SM_CYSMICON);
if (! GetIconInfo(StdIcon, &StdInfo))
{
- DbgPrint("Failed to get icon info for icon 0x%x\n", StdIcon);
+ DPRINT1("Failed to get icon info for icon 0x%x\n", StdIcon);
goto cleanup;
}
if (! GetObjectW(StdInfo.hbmMask, sizeof(BITMAP), &StdBitmapInfo))
{
- DbgPrint("Failed to get bitmap info for icon 0x%x bitmap 0x%x\n",
+ DPRINT1("Failed to get bitmap info for icon 0x%x bitmap 0x%x\n",
StdIcon, StdInfo.hbmColor);
goto cleanup;
}
@@ -410,71 +422,71 @@
hInfoDc = CreateICW(NULL, NULL, NULL, NULL);
if (NULL == hInfoDc)
{
- DbgPrint("Failed to create info DC\n");
+ DPRINT1("Failed to create info DC\n");
goto cleanup;
}
hSourceDc = CreateCompatibleDC(NULL);
if (NULL == hSourceDc)
{
- DbgPrint("Failed to create source DC\n");
+ DPRINT1("Failed to create source DC\n");
goto cleanup;
}
hDestDc = CreateCompatibleDC(NULL);
if (NULL == hDestDc)
{
- DbgPrint("Failed to create dest DC\n");
+ DPRINT1("Failed to create dest DC\n");
goto cleanup;
}
OldSourceBitmap = SelectObject(hSourceDc, StdInfo.hbmColor);
if (NULL == OldSourceBitmap)
{
- DbgPrint("Failed to select source color bitmap\n");
+ DPRINT1("Failed to select source color bitmap\n");
goto cleanup;
}
SmallInfo.hbmColor = CreateCompatibleBitmap(hInfoDc, SmallIconWidth,
SmallIconHeight);
if (NULL == SmallInfo.hbmColor)
{
- DbgPrint("Failed to create color bitmap\n");
+ DPRINT1("Failed to create color bitmap\n");
goto cleanup;
}
OldDestBitmap = SelectObject(hDestDc, SmallInfo.hbmColor);
if (NULL == OldDestBitmap)
{
- DbgPrint("Failed to select dest color bitmap\n");
+ DPRINT1("Failed to select dest color bitmap\n");
goto cleanup;
}
if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight,
hSourceDc, 0, 0, StdBitmapInfo.bmWidth,
StdBitmapInfo.bmHeight, SRCCOPY))
{
- DbgPrint("Failed to stretch color bitmap\n");
+ DPRINT1("Failed to stretch color bitmap\n");
goto cleanup;
}
if (NULL == SelectObject(hSourceDc, StdInfo.hbmMask))
{
- DbgPrint("Failed to select source mask bitmap\n");
+ DPRINT1("Failed to select source mask bitmap\n");
goto cleanup;
}
SmallInfo.hbmMask = CreateBitmap(SmallIconWidth, SmallIconHeight, 1, 1,
NULL);
if (NULL == SmallInfo.hbmMask)
{
- DbgPrint("Failed to create mask bitmap\n");
+ DPRINT1("Failed to create mask bitmap\n");
goto cleanup;
}
if (NULL == SelectObject(hDestDc, SmallInfo.hbmMask))
{
- DbgPrint("Failed to select dest mask bitmap\n");
+ DPRINT1("Failed to select dest mask bitmap\n");
goto cleanup;
}
if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight,
hSourceDc, 0, 0, StdBitmapInfo.bmWidth,
StdBitmapInfo.bmHeight, SRCCOPY))
{
- DbgPrint("Failed to stretch mask bitmap\n");
+ DPRINT1("Failed to stretch mask bitmap\n");
goto cleanup;
}
@@ -484,7 +496,7 @@
SmallIcon = CreateIconIndirect(&SmallInfo);
if (NULL == SmallIcon)
{
- DbgPrint("Failed to create icon\n");
+ DPRINT1("Failed to create icon\n");
goto cleanup;
}
18 years, 4 months
- 1
- 0
[jimtabor] 23387: Sync up changes for IntCallWndProcA/W and TrackMouseEvent.
by jimtabor＠svn.reactos.org
Author: jimtabor
Date: Mon Jul 31 09:44:22 2006
New Revision: 23387
URL: http://svn.reactos.org/svn/reactos?rev=23387&view=rev
Log:
Sync up changes for IntCallWndProcA/W and TrackMouseEvent.
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/input.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/message.c
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/input.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/input.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/input.c Mon Jul 31 09:44:22 2006
@@ -38,11 +38,10 @@
typedef struct __TRACKINGLIST {
TRACKMOUSEEVENT tme;
POINT pos; /* center of hover rectangle */
- INT iHoverTime; /* elapsed time the cursor has been inside of the hover rect */
} _TRACKINGLIST;
-static _TRACKINGLIST TrackingList[10];
-static int iTrackMax = 0;
+/* FIXME: move tracking stuff into a per thread data */
+static _TRACKINGLIST tracking_info;
static UINT_PTR timer;
static const INT iTimerInterval = 50; /* msec for timer interval */
@@ -715,113 +714,96 @@
return ret;
}
-
static void CALLBACK TrackMouseEventProc(HWND hwndUnused, UINT uMsg, UINT_PTR idEvent,
DWORD dwTime)
{
- int i = 0;
POINT pos;
POINT posClient;
HWND hwnd;
- INT nonclient;
INT hoverwidth = 0, hoverheight = 0;
RECT client;
GetCursorPos(&pos);
hwnd = WindowFromPoint(pos);
- SystemParametersInfoA(SPI_GETMOUSEHOVERWIDTH, 0, &hoverwidth, 0);
- SystemParametersInfoA(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0);
-
- /* loop through tracking events we are processing */
- while (i < iTrackMax) {
- if (TrackingList[i].tme.dwFlags & TME_NONCLIENT) {
- nonclient = 1;
+// SystemParametersInfoW(SPI_GETMOUSEHOVERWIDTH, 0, &hoverwidth, 0);
+ hoverwidth = 4;
+// SystemParametersInfoW(SPI_GETMOUSEHOVERHEIGHT, 0, &hoverheight, 0);
+ hoverheight = 4;
+
+ /* see if this tracking event is looking for TME_LEAVE and that the */
+ /* mouse has left the window */
+ if (tracking_info.tme.dwFlags & TME_LEAVE)
+ {
+ if (tracking_info.tme.hwndTrack != hwnd)
+ {
+ if (tracking_info.tme.dwFlags & TME_NONCLIENT)
+ PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0);
+ else
+ PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0);
+
+ /* remove the TME_LEAVE flag */
+ tracking_info.tme.dwFlags &= ~TME_LEAVE;
}
- else {
- nonclient = 0;
- }
-
- /* see if this tracking event is looking for TME_LEAVE and that the */
- /* mouse has left the window */
- if (TrackingList[i].tme.dwFlags & TME_LEAVE) {
- if (TrackingList[i].tme.hwndTrack != hwnd) {
- if (nonclient) {
- PostMessageA(TrackingList[i].tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0);
+ else
+ {
+ GetClientRect(hwnd, &client);
+ MapWindowPoints(hwnd, NULL, (LPPOINT)&client, 2);
+ if (PtInRect(&client, pos))
+ {
+ if (tracking_info.tme.dwFlags & TME_NONCLIENT)
+ {
+ PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0);
+ /* remove the TME_LEAVE flag */
+ tracking_info.tme.dwFlags &= ~TME_LEAVE;
}
- else {
- PostMessageA(TrackingList[i].tme.hwndTrack, WM_MOUSELEAVE, 0, 0);
- }
-
- /* remove the TME_LEAVE flag */
- TrackingList[i].tme.dwFlags ^= TME_LEAVE;
}
- else {
- GetClientRect(hwnd, &client);
- MapWindowPoints(hwnd, NULL, (LPPOINT)&client, 2);
- if(PtInRect(&client, pos)) {
- if (nonclient) {
- PostMessageA(TrackingList[i].tme.hwndTrack, WM_NCMOUSELEAVE, 0, 0);
- /* remove the TME_LEAVE flag */
- TrackingList[i].tme.dwFlags ^= TME_LEAVE;
- }
- }
- else {
- if (!nonclient) {
- PostMessageA(TrackingList[i].tme.hwndTrack, WM_MOUSELEAVE, 0, 0);
- /* remove the TME_LEAVE flag */
- TrackingList[i].tme.dwFlags ^= TME_LEAVE;
- }
+ else
+ {
+ if (!(tracking_info.tme.dwFlags & TME_NONCLIENT))
+ {
+ PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSELEAVE, 0, 0);
+ /* remove the TME_LEAVE flag */
+ tracking_info.tme.dwFlags &= ~TME_LEAVE;
}
}
}
-
- /* see if we are tracking hovering for this hwnd */
- if(TrackingList[i].tme.dwFlags & TME_HOVER) {
- /* add the timer interval to the hovering time */
- TrackingList[i].iHoverTime+=iTimerInterval;
-
- /* has the cursor moved outside the rectangle centered around pos? */
- if((abs(pos.x - TrackingList[i].pos.x) > (hoverwidth / 2.0))
- || (abs(pos.y - TrackingList[i].pos.y) > (hoverheight / 2.0)))
- {
- /* record this new position as the current position and reset */
- /* the iHoverTime variable to 0 */
- TrackingList[i].pos = pos;
- TrackingList[i].iHoverTime = 0;
- }
-
- /* has the mouse hovered long enough? */
- if(TrackingList[i].iHoverTime <= TrackingList[i].tme.dwHoverTime)
- {
- posClient.x = pos.x;
- posClient.y = pos.y;
- ScreenToClient(hwnd, &posClient);
- if (nonclient) {
- PostMessageW(TrackingList[i].tme.hwndTrack, WM_NCMOUSEHOVER,
- get_key_state(), MAKELPARAM( posClient.x, posClient.y ));
- }
- else {
- PostMessageW(TrackingList[i].tme.hwndTrack, WM_MOUSEHOVER,
- get_key_state(), MAKELPARAM( posClient.x, posClient.y ));
- }
-
- /* stop tracking mouse hover */
- TrackingList[i].tme.dwFlags ^= TME_HOVER;
- }
+ }
+
+ /* see if we are tracking hovering for this hwnd */
+ if (tracking_info.tme.dwFlags & TME_HOVER)
+ {
+ /* has the cursor moved outside the rectangle centered around pos? */
+ if ((abs(pos.x - tracking_info.pos.x) > (hoverwidth / 2.0)) ||
+ (abs(pos.y - tracking_info.pos.y) > (hoverheight / 2.0)))
+ {
+ /* record this new position as the current position and reset */
+ /* the iHoverTime variable to 0 */
+ tracking_info.pos = pos;
}
-
- /* see if we are still tracking TME_HOVER or TME_LEAVE for this entry */
- if((TrackingList[i].tme.dwFlags & TME_HOVER) ||
- (TrackingList[i].tme.dwFlags & TME_LEAVE)) {
- i++;
- } else { /* remove this entry from the tracking list */
- TrackingList[i] = TrackingList[--iTrackMax];
+ else
+ {
+ posClient.x = pos.x;
+ posClient.y = pos.y;
+ ScreenToClient(hwnd, &posClient);
+
+ if (tracking_info.tme.dwFlags & TME_NONCLIENT)
+ PostMessageW(tracking_info.tme.hwndTrack, WM_NCMOUSEHOVER,
+ get_key_state(), MAKELPARAM( posClient.x, posClient.y ));
+ else
+ PostMessageW(tracking_info.tme.hwndTrack, WM_MOUSEHOVER,
+ get_key_state(), MAKELPARAM( posClient.x, posClient.y ));
+
+ /* stop tracking mouse hover */
+ tracking_info.tme.dwFlags &= ~TME_HOVER;
}
}
/* stop the timer if the tracking list is empty */
- if(iTrackMax == 0) {
+ if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE)))
+ {
+ memset(&tracking_info, 0, sizeof(tracking_info));
+
KillTimer(0, timer);
timer = 0;
}
@@ -857,171 +839,77 @@
TrackMouseEvent(
LPTRACKMOUSEEVENT ptme)
{
- DWORD flags = 0;
- int i = 0;
- BOOL cancel = 0, hover = 0, leave = 0, query = 0, nonclient = 0, inclient = 0;
HWND hwnd;
POINT pos;
- RECT client;
-
-
- pos.x = 0;
- pos.y = 0;
- SetRectEmpty(&client);
-
- DPRINT("%lx, %lx, %p, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime);
+ DWORD hover_time;
+
+ TRACE("%lx, %lx, %p, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime);
if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) {
- DPRINT("wrong TRACKMOUSEEVENT size from app\n");
- SetLastError(ERROR_INVALID_PARAMETER); /* FIXME not sure if this is correct */
+ WARN("wrong TRACKMOUSEEVENT size from app\n");
+ SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
- flags = ptme->dwFlags;
+ /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */
+ if (ptme->dwFlags & TME_QUERY )
+ {
+ *ptme = tracking_info.tme;
+
+ return TRUE; /* return here, TME_QUERY is retrieving information */
+ }
+
+ if (!IsWindow(ptme->hwndTrack))
+ {
+ SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+ return FALSE;
+ }
+
+ hover_time = ptme->dwHoverTime;
/* if HOVER_DEFAULT was specified replace this with the systems current value */
- if(ptme->dwHoverTime == HOVER_DEFAULT)
- SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &(ptme->dwHoverTime), 0);
+ if (hover_time == HOVER_DEFAULT || hover_time == 0)
+// SystemParametersInfoW(SPI_GETMOUSEHOVERTIME, 0, &hover_time, 0);
+ hover_time = 400;
GetCursorPos(&pos);
hwnd = WindowFromPoint(pos);
- if ( flags & TME_CANCEL ) {
- flags &= ~ TME_CANCEL;
- cancel = 1;
- }
-
- if ( flags & TME_HOVER ) {
- flags &= ~ TME_HOVER;
- hover = 1;
- }
-
- if ( flags & TME_LEAVE ) {
- flags &= ~ TME_LEAVE;
- leave = 1;
- }
-
- if ( flags & TME_NONCLIENT ) {
- flags &= ~ TME_NONCLIENT;
- nonclient = 1;
- }
-
- /* fill the TRACKMOUSEEVENT struct with the current tracking for the given hwnd */
- if ( flags & TME_QUERY ) {
- flags &= ~ TME_QUERY;
- query = 1;
- i = 0;
-
- /* Find the tracking list entry with the matching hwnd */
- while((i < iTrackMax) && (TrackingList[i].tme.hwndTrack != ptme->hwndTrack)) {
- i++;
- }
-
- /* hwnd found, fill in the ptme struct */
- if(i < iTrackMax)
- *ptme = TrackingList[i].tme;
- else
- ptme->dwFlags = 0;
-
- return TRUE; /* return here, TME_QUERY is retrieving information */
- }
-
- if ( flags )
- DPRINT("Unknown flag(s) %08lx\n", flags );
-
- if(cancel) {
- /* find a matching hwnd if one exists */
- i = 0;
-
- while((i < iTrackMax) && (TrackingList[i].tme.hwndTrack != ptme->hwndTrack)) {
- i++;
- }
-
- if(i < iTrackMax) {
- TrackingList[i].tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL);
+ if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT))
+ FIXME("Unknown flag(s) %08lx\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT));
+
+ if (ptme->dwFlags & TME_CANCEL)
+ {
+ if (tracking_info.tme.hwndTrack == ptme->hwndTrack)
+ {
+ tracking_info.tme.dwFlags &= ~(ptme->dwFlags & ~TME_CANCEL);
/* if we aren't tracking on hover or leave remove this entry */
- if(!((TrackingList[i].tme.dwFlags & TME_HOVER) ||
- (TrackingList[i].tme.dwFlags & TME_LEAVE)))
+ if (!(tracking_info.tme.dwFlags & (TME_HOVER | TME_LEAVE)))
{
- TrackingList[i] = TrackingList[--iTrackMax];
-
- if(iTrackMax == 0) {
- KillTimer(0, timer);
- timer = 0;
- }
+ memset(&tracking_info, 0, sizeof(tracking_info));
+
+ KillTimer(0, timer);
+ timer = 0;
}
}
} else {
- /* see if hwndTrack isn't the current window */
- if(ptme->hwndTrack != hwnd) {
- if(leave) {
- if(nonclient) {
- PostMessageA(ptme->hwndTrack, WM_NCMOUSELEAVE, 0, 0);
- }
- else {
- PostMessageA(ptme->hwndTrack, WM_MOUSELEAVE, 0, 0);
- }
- }
- } else {
- GetClientRect(ptme->hwndTrack, &client);
- MapWindowPoints(ptme->hwndTrack, NULL, (LPPOINT)&client, 2);
- if(PtInRect(&client, pos)) {
- inclient = 1;
- }
- if(nonclient && inclient) {
- PostMessageA(ptme->hwndTrack, WM_NCMOUSELEAVE, 0, 0);
- return TRUE;
- }
- else if(!nonclient && !inclient) {
- PostMessageA(ptme->hwndTrack, WM_MOUSELEAVE, 0, 0);
- return TRUE;
- }
-
- /* See if this hwnd is already being tracked and update the tracking flags */
- for(i = 0; i < iTrackMax; i++) {
- if(TrackingList[i].tme.hwndTrack == ptme->hwndTrack) {
- TrackingList[i].tme.dwFlags = 0;
-
- if(hover) {
- TrackingList[i].tme.dwFlags |= TME_HOVER;
- TrackingList[i].tme.dwHoverTime = ptme->dwHoverTime;
- }
-
- if(leave)
- TrackingList[i].tme.dwFlags |= TME_LEAVE;
-
- if(nonclient)
- TrackingList[i].tme.dwFlags |= TME_NONCLIENT;
-
- /* reset iHoverTime as per winapi specs */
- TrackingList[i].iHoverTime = 0;
-
- return TRUE;
- }
- }
-
- /* if the tracking list is full return FALSE */
- if (iTrackMax == sizeof (TrackingList) / sizeof(*TrackingList)) {
- return FALSE;
- }
-
+ if (ptme->hwndTrack == hwnd)
+ {
/* Adding new mouse event to the tracking list */
- TrackingList[iTrackMax].tme = *ptme;
+ tracking_info.tme = *ptme;
+ tracking_info.tme.dwHoverTime = hover_time;
/* Initialize HoverInfo variables even if not hover tracking */
- TrackingList[iTrackMax].iHoverTime = 0;
- TrackingList[iTrackMax].pos = pos;
-
- iTrackMax++;
-
- if (!timer) {
- timer = SetTimer(0, 0, iTimerInterval, TrackMouseEventProc);
- }
+ tracking_info.pos = pos;
+
+ if (!timer)
+ timer = SetTimer(0, 0, hover_time, TrackMouseEventProc);
}
}
return TRUE;
+
}
/* EOF */
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/message.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/message.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/message.c Mon Jul 31 09:44:22 2006
@@ -9,8 +9,8 @@
*/
#include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
/* DDE message exchange
*
@@ -1141,6 +1141,12 @@
MSG UnicodeMsg;
LRESULT Result;
+ if (WndProc == NULL)
+ {
+ DPRINT1("IntCallWindowsProcW() called with WndProc = NULL!\n");
+ return FALSE;
+ }
+
if (IsAnsiProc)
{
UnicodeMsg.hwnd = hWnd;
@@ -1176,6 +1182,12 @@
MSG AnsiMsg;
MSG UnicodeMsg;
LRESULT Result;
+
+ if (WndProc == NULL)
+ {
+ DPRINT1("IntCallWindowsProcA() called with WndProc = NULL!\n");
+ return FALSE;
+ }
if (IsAnsiProc)
{
18 years, 4 months
- 1
- 0
[jimtabor] 23386: Sync menu changes.
by jimtabor＠svn.reactos.org
Author: jimtabor
Date: Mon Jul 31 09:18:08 2006
New Revision: 23386
URL: http://svn.reactos.org/svn/reactos?rev=23386&view=rev
Log:
Sync menu changes.
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/menu.h
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/defwnd.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/menu.c
branches/ros-branch-0_3_0/reactos/include/reactos/win32k/ntusrtyp.h
branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/menu.c
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/menu.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/menu.h (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/menu.h Mon Jul 31 09:18:08 2006
@@ -17,6 +17,6 @@
VOID
MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt);
VOID
-MenuTrackKbdMenuBar(HWND hWnd, ULONG wParam, ULONG Key);
+MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar);
#endif /* __LIB_USER32_INCLUDE_MENU_H */
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/defwnd.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/defwnd.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/defwnd.c Mon Jul 31 09:18:08 2006
@@ -766,9 +766,10 @@
LRESULT
-DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, POINT Pt)
+DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
{
WINDOWPLACEMENT wp;
+ POINT Pt;
switch (wParam & 0xfff0)
{
@@ -804,16 +805,24 @@
SendMessageA(hWnd, WM_CLOSE, 0, 0);
break;
case SC_MOUSEMENU:
- MenuTrackMouseMenuBar(hWnd, wParam & 0x000f, Pt);
+ {
+ Pt.x = (short)LOWORD(lParam);
+ Pt.y = (short)HIWORD(lParam);
+ MenuTrackMouseMenuBar(hWnd, wParam & 0x000f, Pt);
+ }
break;
case SC_KEYMENU:
- MenuTrackKbdMenuBar(hWnd, wParam, Pt.x);
+ MenuTrackKbdMenuBar(hWnd, wParam, (WCHAR)lParam);
break;
case SC_VSCROLL:
case SC_HSCROLL:
- DefWndTrackScrollBar(hWnd, wParam, Pt);
+ {
+ Pt.x = (short)LOWORD(lParam);
+ Pt.y = (short)HIWORD(lParam);
+ DefWndTrackScrollBar(hWnd, wParam, Pt);
+ }
break;
-
+
default:
/* FIXME: Implement */
UNIMPLEMENTED;
@@ -1305,13 +1314,7 @@
}
case WM_SYSCOMMAND:
- {
- POINT Pt;
- Pt.x = GET_X_LPARAM(lParam);
- Pt.y = GET_Y_LPARAM(lParam);
- return (DefWndHandleSysCommand(hWnd, wParam, Pt));
- }
-
+ return (DefWndHandleSysCommand(hWnd, wParam, lParam));
case WM_KEYDOWN:
if(wParam == VK_F10) iF10Key = VK_F10;
@@ -1539,7 +1542,23 @@
{
case WM_NCCREATE:
{
- return TRUE;
+ ANSI_STRING AnsiString;
+ UNICODE_STRING UnicodeString;
+ LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam;
+ /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP)
+ * may have child window IDs instead of window name */
+
+ if(cs->lpszName)
+ {
+ RtlInitAnsiString(&AnsiString, (LPSTR)cs->lpszName);
+ RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE);
+ NtUserDefSetText(hWnd, &UnicodeString);
+ RtlFreeUnicodeString(&UnicodeString);
+ }
+ else
+ NtUserDefSetText(hWnd, NULL);
+
+ return (1);
}
case WM_GETTEXTLENGTH:
@@ -1618,7 +1637,16 @@
{
case WM_NCCREATE:
{
- return TRUE;
+ UNICODE_STRING UnicodeString;
+ LPCREATESTRUCTW cs = (LPCREATESTRUCTW)lParam;
+ /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP)
+ * may have child window IDs instead of window name */
+
+ if(cs->lpszName)
+ RtlInitUnicodeString(&UnicodeString, (LPWSTR)cs->lpszName);
+
+ NtUserDefSetText( hWnd, (cs->lpszName ? &UnicodeString : NULL));
+ return (1);
}
case WM_GETTEXTLENGTH:
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/menu.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/menu.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/menu.c Mon Jul 31 09:18:08 2006
@@ -1,34 +1,12 @@
-/*
- * ReactOS kernel
- * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team
- *
- * Partly based on Wine code
- * Copyright 1993 Martin Ayotte
- * Copyright 1994 Alexandre Julliard
- * Copyright 1997 Morten Welinder
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
/* $Id$
*
+ * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll
- * FILE: lib/user32/windows/menu.c
+ * FILE: user32/windows/menu.c
* PURPOSE: Menus
- * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net)
- * UPDATE HISTORY:
- * 09-05-2001 CSH Created
+ *
+ * PROGRAMMERS: Casper S. Hornstrup
+ * James Tabor
*/
/* INCLUDES ******************************************************************/
@@ -62,6 +40,7 @@
(0 != ((MenuInfo)->Flags & MF_POPUP) && 0 != ((MenuInfo)->Flags & MF_SYSMENU))
#define IS_MAGIC_ITEM(Bmp) ((int) Bmp <12)
+#define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1))
#define MENU_ITEM_HBMP_SPACE (5)
#define MENU_BAR_ITEMS_SPACE (12)
@@ -138,6 +117,8 @@
static HBITMAP StdMnArrow = NULL;
static HBITMAP BmpSysMenu = NULL;
+static SIZE MenuCharSize;
+
/***********************************************************************
* MenuGetRosMenuInfo
*
@@ -155,7 +136,7 @@
/***********************************************************************
* MenuSetRosMenuInfo
*
- * Set full information about menu
+ * Set full information about menu
*/
static BOOL FASTCALL
MenuSetRosMenuInfo(PROSMENUINFO MenuInfo)
@@ -186,13 +167,16 @@
static BOOL FASTCALL
MenuGetRosMenuItemInfo(HMENU Menu, UINT Index, PROSMENUITEMINFO ItemInfo)
{
+ UINT Save_Mask = ItemInfo->fMask; /* Save the org mask bits. */
+
if (ItemInfo->dwTypeData != NULL)
{
HeapFree(GetProcessHeap(), 0, ItemInfo->dwTypeData);
}
+
ItemInfo->fMask = MIIM_BITMAP | MIIM_CHECKMARKS | MIIM_DATA | MIIM_FTYPE
- | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE;
+ | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE;
ItemInfo->dwTypeData = NULL;
if (! NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, FALSE))
@@ -217,14 +201,14 @@
return FALSE;
}
}
-
+ ItemInfo->fMask = Save_Mask;
return TRUE;
}
/***********************************************************************
* MenuSetRosMenuItemInfo
*
- * Set full information about a menu item
+ * Set selected information about a menu item, need to set the mask bits.
*/
static BOOL FASTCALL
MenuSetRosMenuItemInfo(HMENU Menu, UINT Index, PROSMENUITEMINFO ItemInfo)
@@ -234,12 +218,8 @@
if (MENU_ITEM_TYPE(ItemInfo->fType) == MF_STRING &&
ItemInfo->dwTypeData != NULL)
{
- ItemInfo->cch = wcslen(ItemInfo->dwTypeData);
+ ItemInfo->cch = strlenW(ItemInfo->dwTypeData);
}
- ItemInfo->fMask = MIIM_BITMAP | MIIM_CHECKMARKS | MIIM_DATA | MIIM_FTYPE
- | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE;
-
-
Ret = NtUserMenuItemInfo(Menu, Index, TRUE, ItemInfo, TRUE);
return Ret;
@@ -331,35 +311,51 @@
* Get the size of a bitmap item.
*/
static void FASTCALL
-MenuGetBitmapItemSize(UINT Id, DWORD Data, SIZE *Size)
+MenuGetBitmapItemSize(PROSMENUITEMINFO lpitem, SIZE *Size, HWND WndOwner)
{
BITMAP Bm;
- HBITMAP Bmp = (HBITMAP) Id;
+ HBITMAP Bmp = lpitem->hbmpItem;
Size->cx = Size->cy = 0;
/* check if there is a magic menu item associated with this item */
- if (0 != Id && IS_MAGIC_ITEM(Id))
- {
- switch((INT_PTR) LOWORD(Id))
- {
+ if (0 != Bmp && IS_MAGIC_ITEM((INT)(Bmp)))
+ {
+ switch((INT_PTR) Bmp)
+ {
+ case (INT_PTR)HBMMENU_CALLBACK:
+ {
+ MEASUREITEMSTRUCT measItem;
+ measItem.CtlType = ODT_MENU;
+ measItem.CtlID = 0;
+ measItem.itemID = lpitem->wID;
+ measItem.itemWidth = lpitem->Rect.right - lpitem->Rect.left;
+ measItem.itemHeight = lpitem->Rect.bottom - lpitem->Rect.top;
+ measItem.itemData = lpitem->dwItemData;
+ SendMessageW( WndOwner, WM_MEASUREITEM, lpitem->wID, (LPARAM)&measItem);
+ Size->cx = measItem.itemWidth;
+ Size->cy = measItem.itemHeight;
+ return;
+ }
+ break;
+
case (INT_PTR) HBMMENU_SYSTEM:
- if (0 != Data)
+ if (0 != lpitem->dwItemData)
{
- Bmp = (HBITMAP) Data;
+ Bmp = (HBITMAP) lpitem->dwItemData;
break;
}
/* fall through */
case (INT_PTR) HBMMENU_MBAR_RESTORE:
case (INT_PTR) HBMMENU_MBAR_MINIMIZE:
+ case (INT_PTR) HBMMENU_MBAR_CLOSE:
case (INT_PTR) HBMMENU_MBAR_MINIMIZE_D:
- case (INT_PTR) HBMMENU_MBAR_CLOSE:
case (INT_PTR) HBMMENU_MBAR_CLOSE_D:
/* FIXME: Why we need to subtract these magic values? */
+ /* to make them smaller than the menu bar? */
Size->cx = GetSystemMetrics(SM_CXSIZE) - 2;
Size->cy = GetSystemMetrics(SM_CYSIZE) - 4;
return;
- case (INT_PTR) HBMMENU_CALLBACK:
case (INT_PTR) HBMMENU_POPUP_CLOSE:
case (INT_PTR) HBMMENU_POPUP_RESTORE:
case (INT_PTR) HBMMENU_POPUP_MAXIMIZE:
@@ -383,30 +379,33 @@
* Draw a bitmap item.
*/
static void FASTCALL
-MenuDrawBitmapItem(HDC Dc, PROSMENUITEMINFO Item, const RECT *Rect, BOOL MenuBar)
+MenuDrawBitmapItem(HDC Dc, PROSMENUITEMINFO Item, const RECT *Rect,
+ HMENU hmenu, HWND WndOwner, UINT odaction, BOOL MenuBar)
{
BITMAP Bm;
DWORD Rop;
HDC DcMem;
- HBITMAP Bmp = (HBITMAP) Item->hbmpItem;
+ HBITMAP Bmp;
int w = Rect->right - Rect->left;
int h = Rect->bottom - Rect->top;
int BmpXoffset = 0;
int Left, Top;
+ HBITMAP hbmpToDraw = (HBITMAP) Item->hbmpItem;
+ Bmp = hbmpToDraw;
/* Check if there is a magic menu item associated with this item */
- if (IS_MAGIC_ITEM(Item->hbmpItem))
+ if (IS_MAGIC_ITEM(hbmpToDraw))
{
UINT Flags = 0;
RECT r;
r = *Rect;
- switch ((int) Item->hbmpItem)
+ switch ((INT_PTR)hbmpToDraw)
{
case (INT_PTR) HBMMENU_SYSTEM:
- if (NULL != Item->hbmpItem)
+ if (NULL != Item->dwTypeData)
{
- Bmp = Item->hbmpItem;
+ Bmp = (HBITMAP)Item->dwTypeData;
if (! GetObjectW(Bmp, sizeof(BITMAP), &Bm))
{
return;
@@ -414,6 +413,7 @@
}
else
{
+ if (!BmpSysMenu) BmpSysMenu = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CLOSE));
Bmp = BmpSysMenu;
if (! GetObjectW(Bmp, sizeof(BITMAP), &Bm))
{
@@ -442,6 +442,31 @@
Flags = DFCS_CAPTIONCLOSE | DFCS_INACTIVE;
break;
case (INT_PTR) HBMMENU_CALLBACK:
+ {
+ DRAWITEMSTRUCT drawItem;
+ POINT origorg;
+ drawItem.CtlType = ODT_MENU;
+ drawItem.CtlID = 0;
+ drawItem.itemID = Item->wID;
+ drawItem.itemAction = odaction;
+ drawItem.itemState = (Item->fState & MF_CHECKED)?ODS_CHECKED:0;
+ drawItem.itemState |= (Item->fState & MF_DEFAULT)?ODS_DEFAULT:0;
+ drawItem.itemState |= (Item->fState & MF_DISABLED)?ODS_DISABLED:0;
+ drawItem.itemState |= (Item->fState & MF_GRAYED)?ODS_GRAYED|ODS_DISABLED:0;
+ drawItem.itemState |= (Item->fState & MF_HILITE)?ODS_SELECTED:0;
+ drawItem.hwndItem = (HWND)hmenu;
+ drawItem.hDC = Dc;
+ drawItem.rcItem = *Rect;
+ drawItem.itemData = Item->dwItemData;
+ /* some applications make this assumption on the DC's origin */
+ SetViewportOrgEx( Dc, Item->Rect.left, Item->Rect.top, &origorg);
+ OffsetRect( &drawItem.rcItem, - Item->Rect.left, - Item->Rect.top);
+ SendMessageW( WndOwner, WM_DRAWITEM, 0, (LPARAM)&drawItem);
+ SetViewportOrgEx( Dc, origorg.x, origorg.y, NULL);
+ return;
+ }
+ break;
+
case (INT_PTR) HBMMENU_POPUP_CLOSE:
case (INT_PTR) HBMMENU_POPUP_RESTORE:
case (INT_PTR) HBMMENU_POPUP_MAXIMIZE:
@@ -471,8 +496,8 @@
/* handle fontsize > bitmap_height */
Top = (Bm.bmHeight < h) ? Rect->top + (h - Bm.bmHeight) / 2 : Rect->top;
Left = Rect->left;
- Rop = (0 != (Item->fState & MF_HILITE) && ! IS_MAGIC_ITEM(Item->hbmpItem)) ? NOTSRCCOPY : SRCCOPY;
- if (0 != (Item->fState & MF_HILITE) && IS_BITMAP_ITEM(Item->fType))
+ Rop= ((Item->fState & MF_HILITE) && !IS_MAGIC_BITMAP(hbmpToDraw)) ? NOTSRCCOPY : SRCCOPY;
+ if ((Item->fState & MF_HILITE) && Item->hbmpItem)
{
SetBkColor(Dc, GetSysColor(COLOR_HIGHLIGHT));
}
@@ -491,7 +516,9 @@
{
RECT Rect;
PWCHAR Text;
-
+ BOOL flat_menu = FALSE;
+ int bkgnd;
+
if (0 != (Item->fType & MF_SYSMENU))
{
if (! IsIconic(Wnd))
@@ -500,15 +527,17 @@
UserDrawSysMenuButton(Wnd, Dc, &Rect,
Item->fState & (MF_HILITE | MF_MOUSESELECT));
}
-
return;
}
+ SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0);
+ bkgnd = (MenuBar && flat_menu) ? COLOR_MENUBAR : COLOR_MENU;
+
/* Setup colors */
if (0 != (Item->fState & MF_HILITE))
{
- if (MenuBar)
+ if (MenuBar && !flat_menu)
{
SetTextColor(Dc, GetSysColor(COLOR_MENUTEXT));
SetBkColor(Dc, GetSysColor(COLOR_MENU));
@@ -536,10 +565,12 @@
{
SetTextColor(Dc, GetSysColor(COLOR_MENUTEXT));
}
- SetBkColor(Dc, GetSysColor(COLOR_MENU));
- }
-
- if (0 != (Item->fType & MF_OWNERDRAW))
+ SetBkColor(Dc, GetSysColor(bkgnd));
+ }
+
+ Rect = Item->Rect;
+
+ if (Item->fType & MF_OWNERDRAW)
{
/*
** Experimentation under Windows reveals that an owner-drawn
@@ -572,150 +603,13 @@
dis.itemAction = Action; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */
dis.hwndItem = (HWND) MenuInfo->Self;
dis.hDC = Dc;
- dis.rcItem = Item->Rect;
+ dis.rcItem = Rect;
DPRINT("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, "
"hwndItem=%p, hdc=%p, rcItem={%ld,%ld,%ld,%ld}\n", Wnd,
dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem,
dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right,
dis.rcItem.bottom);
SendMessageW(WndOwner, WM_DRAWITEM, 0, (LPARAM) &dis);
- /* Fall through to draw popup-menu arrow */
- }
-
- DPRINT("rect={%ld,%ld,%ld,%ld}\n", Item->Rect.left, Item->Rect.top,
- Item->Rect.right, Item->Rect.bottom);
-
- if (MenuBar && 0 != (Item->fType & MF_SEPARATOR))
- {
- return;
- }
-
- Rect = Item->Rect;
-
- if (0 == (Item->fType & MF_OWNERDRAW))
- {
- if (Item->fState & MF_HILITE)
- {
- if (MenuBar)
- {
- DrawEdge(Dc, &Rect, BDR_SUNKENOUTER, BF_RECT);
- }
- else
- {
- FillRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT));
- }
- }
- else
- {
- FillRect(Dc, &Rect, GetSysColorBrush(COLOR_MENU));
- }
- }
-
- SetBkMode(Dc, TRANSPARENT);
-
- if (0 == (Item->fType & MF_OWNERDRAW))
- {
- /* vertical separator */
- if (! MenuBar && 0 != (Item->fType & MF_MENUBARBREAK))
- {
- RECT rc = Rect;
- rc.top = 3;
- rc.bottom = Height - 3;
- DrawEdge(Dc, &rc, EDGE_ETCHED, BF_LEFT);
- }
-
- /* horizontal separator */
- if (0 != (Item->fType & MF_SEPARATOR))
- {
- RECT rc = Rect;
- rc.left++;
- rc.right--;
- rc.top += SEPARATOR_HEIGHT / 2;
- DrawEdge(Dc, &rc, EDGE_ETCHED, BF_TOP);
-
- return;
- }
- }
-
-#if 0
- /* helper lines for debugging */
- FrameRect(Dc, &Rect, GetStockObject(BLACK_BRUSH));
- SelectObject(Dc, SYSCOLOR_GetPen(COLOR_WINDOWFRAME));
- MoveToEx(Dc, Rect.left, (Rect.top + Rect.bottom) / 2, NULL);
- LineTo(Dc, Rect.right, (Rect.top + Rect.bottom) / 2);
-#endif
-
- if (! MenuBar)
- {
- INT y = Rect.top + Rect.bottom;
- UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK);
- UINT CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK);
-
- if (0 == (Item->fType & MF_OWNERDRAW))
- {
- /* Draw the check mark
- *
- * FIXME:
- * Custom checkmark bitmaps are monochrome but not always 1bpp.
- */
- HBITMAP bm = 0 != (Item->fState & MF_CHECKED) ? Item->hbmpChecked : Item->hbmpUnchecked;
- if (NULL != bm) /* we have a custom bitmap */
- {
- HDC DcMem = CreateCompatibleDC(Dc);
- SelectObject(DcMem, bm);
- BitBlt(Dc, Rect.left, (y - CheckBitmapHeight) / 2,
- CheckBitmapWidth, CheckBitmapHeight,
- DcMem, 0, 0, SRCCOPY);
- DeleteDC(DcMem);
- }
- else if (0 != (Item->fState & MF_CHECKED)) /* standard bitmaps */
- {
- RECT r;
- HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL);
- HDC DcMem = CreateCompatibleDC(Dc);
- SelectObject(DcMem, bm);
- SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight);
- DrawFrameControl(DcMem, &r, DFC_MENU,
- 0 != (Item->fType & MFT_RADIOCHECK) ?
- DFCS_MENUBULLET : DFCS_MENUCHECK);
- BitBlt(Dc, Rect.left, (y - r.bottom) / 2, r.right, r.bottom,
- DcMem, 0, 0, SRCCOPY );
- DeleteDC(DcMem);
- DeleteObject(bm);
- }
- if (Item->hbmpItem)
- {
- if (Item->hbmpItem == HBMMENU_CALLBACK)
- {
- DRAWITEMSTRUCT drawItem;
- POINT origorg;
- drawItem.CtlType = ODT_MENU;
- drawItem.CtlID = 0;
- drawItem.itemID = Item->wID;
- drawItem.itemAction = Action;
- drawItem.itemState = (Item->fState & MF_CHECKED)?ODS_CHECKED:0;
- drawItem.itemState |= (Item->fState & MF_DEFAULT)?ODS_DEFAULT:0;
- drawItem.itemState |= (Item->fState & MF_DISABLED)?ODS_DISABLED:0;
- drawItem.itemState |= (Item->fState & MF_GRAYED)?ODS_GRAYED|ODS_DISABLED:0;
- drawItem.itemState |= (Item->fState & MF_HILITE)?ODS_SELECTED:0;
- drawItem.hwndItem = (HWND) MenuInfo->Self;
- drawItem.hDC = Dc;
- drawItem.rcItem = Item->Rect;
- drawItem.itemData = Item->dwItemData;
- /* some applications make this assumption on the DC's origin */
- SetViewportOrgEx( Dc, Item->Rect.left, Item->Rect.top, &origorg);
- OffsetRect( &drawItem.rcItem, - Item->Rect.left, - Item->Rect.top);
- SendMessageW( WndOwner, WM_DRAWITEM, 0, (LPARAM)&drawItem);
- SetViewportOrgEx( Dc, origorg.x, origorg.y, NULL);
- }
- else
- {
- MenuDrawBitmapItem(Dc, Item, &Rect, MenuBar);
- return;
- }
- }
- }
-
/* Draw the popup-menu arrow */
if (0 != (Item->fType & MF_POPUP))
{
@@ -724,36 +618,180 @@
OrigBitmap = SelectObject(DcMem, StdMnArrow);
BitBlt(Dc, Rect.right - ArrowBitmapWidth - 1,
- (y - ArrowBitmapHeight) / 2,
+ ((Rect.top + Rect.bottom) - ArrowBitmapHeight) / 2,
ArrowBitmapWidth, ArrowBitmapHeight,
DcMem, 0, 0, SRCCOPY);
SelectObject(DcMem, OrigBitmap);
DeleteDC(DcMem);
}
-
+ return;
+ }
+
+ DPRINT("rect={%ld,%ld,%ld,%ld}\n", Item->Rect.left, Item->Rect.top,
+ Item->Rect.right, Item->Rect.bottom);
+
+ if (MenuBar && 0 != (Item->fType & MF_SEPARATOR))
+ {
+ return;
+ }
+
+ if (Item->fState & MF_HILITE)
+ {
+ if (flat_menu)
+ {
+ InflateRect (&Rect, -1, -1);
+ FillRect(Dc, &Rect, GetSysColorBrush(COLOR_MENUHILIGHT));
+ InflateRect (&Rect, 1, 1);
+ FrameRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT));
+ }
+ else
+ {
+ if (MenuBar)
+ {
+ DrawEdge(Dc, &Rect, BDR_SUNKENOUTER, BF_RECT);
+ }
+ else
+ {
+ FillRect(Dc, &Rect, GetSysColorBrush(COLOR_HIGHLIGHT));
+ }
+ }
+ }
+ else
+ {
+ FillRect(Dc, &Rect, GetSysColorBrush(bkgnd));
+ }
+
+ SetBkMode(Dc, TRANSPARENT);
+
+ /* vertical separator */
+ if (! MenuBar && 0 != (Item->fType & MF_MENUBARBREAK))
+ {
+ HPEN oldPen;
+ RECT rc = Rect;
+ rc.top = 3;
+ rc.bottom = Height - 3;
+ if (flat_menu)
+ {
+ oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) );
+ MoveToEx( Dc, rc.left, rc.top, NULL );
+ LineTo( Dc, rc.left, rc.bottom );
+ SelectObject( Dc, oldPen );
+ }
+ else
+ DrawEdge(Dc, &rc, EDGE_ETCHED, BF_LEFT);
+ }
+
+ /* horizontal separator */
+ if (0 != (Item->fType & MF_SEPARATOR))
+ {
+ HPEN oldPen;
+ RECT rc = Rect;
+ rc.left++;
+ rc.right--;
+ rc.top += SEPARATOR_HEIGHT / 2;
+ if (flat_menu)
+ {
+ oldPen = SelectObject( Dc, GetSysColorPen(COLOR_BTNSHADOW) );
+ MoveToEx( Dc, rc.left, rc.top, NULL );
+ LineTo( Dc, rc.right, rc.top );
+ SelectObject( Dc, oldPen );
+ }
+ else
+ DrawEdge(Dc, &rc, EDGE_ETCHED, BF_TOP);
+ return;
+ }
+
+#if 0
+ /* helper lines for debugging */
+ /* This is a very good test tool when hacking menus! (JT) 07/16/2006 */
+ FrameRect(Dc, &Rect, GetStockObject(BLACK_BRUSH));
+ SelectObject(Dc, GetSysColorPen(COLOR_WINDOWFRAME));
+ MoveToEx(Dc, Rect.left, (Rect.top + Rect.bottom) / 2, NULL);
+ LineTo(Dc, Rect.right, (Rect.top + Rect.bottom) / 2);
+#endif
+
+ if (! MenuBar)
+ {
+ INT y = Rect.top + Rect.bottom;
+ RECT Rc = Rect;
+ UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK);
+ UINT CheckBitmapHeight = GetSystemMetrics(SM_CYMENUCHECK);
+ int checked = FALSE;
+ /* Draw the check mark
+ *
+ * FIXME:
+ * Custom checkmark bitmaps are monochrome but not always 1bpp.
+ */
+ if( !(MenuInfo->dwStyle & MNS_NOCHECK))
+ {
+ HBITMAP bm = 0 != (Item->fState & MF_CHECKED) ? Item->hbmpChecked : Item->hbmpUnchecked;
+ if (NULL != bm) /* we have a custom bitmap */
+ {
+ HDC DcMem = CreateCompatibleDC(Dc);
+ SelectObject(DcMem, bm);
+ BitBlt(Dc, Rc.left, (y - CheckBitmapHeight) / 2,
+ CheckBitmapWidth, CheckBitmapHeight,
+ DcMem, 0, 0, SRCCOPY);
+ DeleteDC(DcMem);
+ checked = TRUE;
+ }
+ else if (0 != (Item->fState & MF_CHECKED)) /* standard bitmaps */
+ {
+ RECT r;
+ HBITMAP bm = CreateBitmap(CheckBitmapWidth, CheckBitmapHeight, 1, 1, NULL);
+ HDC DcMem = CreateCompatibleDC(Dc);
+ SelectObject(DcMem, bm);
+ SetRect( &r, 0, 0, CheckBitmapWidth, CheckBitmapHeight);
+ DrawFrameControl(DcMem, &r, DFC_MENU,
+ 0 != (Item->fType & MFT_RADIOCHECK) ?
+ DFCS_MENUBULLET : DFCS_MENUCHECK);
+ BitBlt(Dc, Rc.left, (y - r.bottom) / 2, r.right, r.bottom,
+ DcMem, 0, 0, SRCCOPY );
+ DeleteDC(DcMem);
+ DeleteObject(bm);
+ checked = TRUE;
+ }
+ }
+ if ((Item->hbmpItem)&& !( checked && (MenuInfo->dwStyle & MNS_CHECKORBMP)))
+ {
+ MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar);
+ }
+ /* Draw the popup-menu arrow */
+ if (0 != (Item->fType & MF_POPUP))
+ {
+ HDC DcMem = CreateCompatibleDC(Dc);
+ HBITMAP OrigBitmap;
+
+ OrigBitmap = SelectObject(DcMem, StdMnArrow);
+ BitBlt(Dc, Rect.right - ArrowBitmapWidth - 1,
+ (y - ArrowBitmapHeight) / 2,
+ ArrowBitmapWidth, ArrowBitmapHeight,
+ DcMem, 0, 0, SRCCOPY);
+ SelectObject(DcMem, OrigBitmap);
+ DeleteDC(DcMem);
+ }
+ Rect.left += 4;
+ if( !(MenuInfo->dwStyle & MNS_NOCHECK))
Rect.left += CheckBitmapWidth;
- Rect.right -= ArrowBitmapWidth;
+ Rect.right -= ArrowBitmapWidth;
}
- else if( Item->hbmpItem && !(Item->fType & MF_OWNERDRAW))
- { /* Draw the bitmap */
- MenuDrawBitmapItem(Dc, Item, &Rect, MenuBar);
+ else if (Item->hbmpItem) /* Draw the bitmap */
+ {
+ MenuDrawBitmapItem(Dc, Item, &Rect, MenuInfo->Self, WndOwner, Action, MenuBar);
}
-
- /* Done for owner-drawn */
- if (0 != (Item->fType & MF_OWNERDRAW))
- {
- return;
- }
-
- /* process text if present */
- if (!(Item->fType & MF_SYSMENU) && Item->dwTypeData)
- {
- register int i;
+
+ /* No bitmap - process text if present */
+ if (Item->Text)
+ {
+ register int i = 0;
HFONT FontOld = NULL;
UINT uFormat = MenuBar ? DT_CENTER | DT_VCENTER | DT_SINGLELINE
: DT_LEFT | DT_VCENTER | DT_SINGLELINE;
+ if( !(MenuInfo->dwStyle & MNS_CHECKORBMP))
+ Rect.left += MenuInfo->maxBmpSize.cx;
+
if (0 != (Item->fState & MFS_DEFAULT))
{
FontOld = SelectObject(Dc, hMenuFontBold);
@@ -771,13 +809,16 @@
}
Text = (PWCHAR) Item->dwTypeData;
- for (i = 0; L'\0' != Text[i]; i++)
+ if(Text)
+ {
+ for (i = 0; L'\0' != Text[i]; i++)
{
if (L'\t' == Text[i] || L'\b' == Text[i])
{
break;
}
}
+ }
if (0 != (Item->fState & MF_GRAYED))
{
@@ -790,6 +831,7 @@
}
SetTextColor(Dc, RGB(0x80, 0x80, 0x80));
}
+
DrawTextW(Dc, Text, i, &Rect, uFormat);
/* paint the shortcut text */
@@ -802,6 +844,7 @@
}
else
{
+ Rect.right = Item->XTab;
uFormat = DT_RIGHT | DT_VCENTER | DT_SINGLELINE;
}
@@ -823,7 +866,7 @@
{
SelectObject(Dc, FontOld);
}
- }
+ }
}
/***********************************************************************
@@ -853,7 +896,13 @@
PrevPen = SelectObject(Dc, GetStockObject(NULL_PEN));
if (NULL != PrevPen)
{
- DrawEdge(Dc, &Rect, EDGE_RAISED, BF_RECT);
+ BOOL flat_menu = FALSE;
+
+ SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0);
+ if (flat_menu)
+ FrameRect(Dc, &Rect, GetSysColorBrush(COLOR_BTNSHADOW));
+ else
+ DrawEdge(Dc, &Rect, EDGE_RAISED, BF_RECT);
/* draw menu items */
@@ -890,7 +939,7 @@
case WM_CREATE:
{
CREATESTRUCTW *cs = (CREATESTRUCTW *) lParam;
- SetWindowLongW(Wnd, 0, (LONG) cs->lpCreateParams);
+ SetWindowLongPtrW(Wnd, 0, (LONG) cs->lpCreateParams);
return 0;
}
@@ -901,7 +950,7 @@
{
PAINTSTRUCT ps;
BeginPaint(Wnd, &ps);
- MenuDrawPopupMenu(Wnd, ps.hdc, (HMENU)GetWindowLongW(Wnd, 0));
+ MenuDrawPopupMenu(Wnd, ps.hdc, (HMENU)GetWindowLongPtrW(Wnd, 0));
EndPaint(Wnd, &ps);
return 0;
}
@@ -920,23 +969,23 @@
case WM_SHOWWINDOW:
if (0 != wParam)
{
- if (0 == GetWindowLongW(Wnd, 0))
+ if (0 == GetWindowLongPtrW(Wnd, 0))
{
OutputDebugStringA("no menu to display\n");
}
}
else
{
- SetWindowLongW(Wnd, 0, 0);
+ SetWindowLongPtrW(Wnd, 0, 0);
}
break;
case MM_SETMENUHANDLE:
- SetWindowLongW(Wnd, 0, wParam);
+ SetWindowLongPtrW(Wnd, 0, wParam);
break;
case MM_GETMENUHANDLE:
- return GetWindowLongW(Wnd, 0);
+ return GetWindowLongPtrW(Wnd, 0);
default:
return DefWindowProcW(Wnd, Message, wParam, lParam);
@@ -962,7 +1011,7 @@
MENUITEMINFOW mii;
mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_STATE | MIIM_ID | MIIM_TYPE;
+ mii.fMask = MIIM_STATE | MIIM_ID | MIIM_FTYPE;
mii.fType = GET_DWORD(res);
res += sizeof(DWORD);
mii.fState = GET_DWORD(res);
@@ -974,7 +1023,7 @@
/* Align the text on a word boundary. */
res += (~((int)res - 1)) & 1;
mii.dwTypeData = (LPWSTR) res;
- res += (1 + wcslen(mii.dwTypeData)) * sizeof(WCHAR);
+ res += (1 + strlenW(mii.dwTypeData)) * sizeof(WCHAR);
/* Align the following fields on a dword boundary. */
res += (~((int)res - 1)) & 3;
@@ -995,8 +1044,6 @@
}
else if(!*mii.dwTypeData && !(mii.fType & MF_SEPARATOR))
{
- DbgPrint("WARN: Converting NULL menu item %04x, type %04x to SEPARATOR\n",
- mii.wID, mii.fType);
mii.fType |= MF_SEPARATOR;
}
InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii);
@@ -1039,7 +1086,7 @@
if(!unicode)
res += strlen(str) + 1;
else
- res += (wcslen((LPCWSTR)str) + 1) * sizeof(WCHAR);
+ res += (strlenW((LPCWSTR)str) + 1) * sizeof(WCHAR);
if (flags & MF_POPUP)
{
hSubMenu = CreatePopupMenu();
@@ -1139,9 +1186,12 @@
INT OrgX, INT OrgY, BOOL MenuBar)
{
PWCHAR p;
+ INT itemheight = 0;
UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK);
DPRINT("dc=%x owner=%x (%d,%d)\n", Dc, WndOwner, OrgX, OrgY);
+
+ MenuCharSize.cx = GdiGetCharDimensions( Dc, NULL, &MenuCharSize.cy );
SetRect(&ItemInfo->Rect, OrgX, OrgY, OrgX, OrgY);
@@ -1159,19 +1209,19 @@
mis.CtlID = 0;
mis.itemID = ItemInfo->wID;
mis.itemData = (DWORD)ItemInfo->dwItemData;
- mis.itemHeight = 0;
+ mis.itemHeight = HIWORD( GetDialogBaseUnits());
mis.itemWidth = 0;
SendMessageW(WndOwner, WM_MEASUREITEM, 0, (LPARAM) &mis);
- ItemInfo->Rect.right += mis.itemWidth;
+ /* Tests reveal that Windows ( Win95 thru WinXP) adds twice the average
+ * width of a menufont character to the width of an owner-drawn menu.
+ */
+ ItemInfo->Rect.right += mis.itemWidth + 2 * MenuCharSize.cx;
if (MenuBar)
{
- ItemInfo->Rect.right += MENU_BAR_ITEMS_SPACE;
-
/* under at least win95 you seem to be given a standard
height for the menu and the height value is ignored */
-
- ItemInfo->Rect.bottom += GetSystemMetrics(SM_CYMENU) - 1;
+ ItemInfo->Rect.bottom += GetSystemMetrics(SM_CYMENUSIZE);
}
else
{
@@ -1179,107 +1229,124 @@
}
DPRINT("id=%04x size=%dx%d\n", ItemInfo->wID, mis.itemWidth, mis.itemHeight);
- /* Fall through to get check/arrow width calculation. */
+ return;
}
if (0 != (ItemInfo->fType & MF_SEPARATOR))
{
ItemInfo->Rect.bottom += SEPARATOR_HEIGHT;
+ if( !MenuBar)
+ ItemInfo->Rect.right += ArrowBitmapWidth + MenuCharSize.cx;
return;
}
-
- if (0 != (ItemInfo->fType & MF_OWNERDRAW))
- {
- return;
- }
-
- if (! MenuBar)
+
+ ItemInfo->XTab = 0;
+
+ if (ItemInfo->hbmpItem)
{
- if (ItemInfo->hbmpItem)
+ SIZE Size;
+
+ if (!MenuBar) /* hbmpItem */
{
- if (ItemInfo->hbmpItem == HBMMENU_CALLBACK)
- {
- MEASUREITEMSTRUCT measItem;
- measItem.CtlType = ODT_MENU;
- measItem.CtlID = 0;
- measItem.itemID = ItemInfo->wID;
- measItem.itemWidth = ItemInfo->Rect.right - ItemInfo->Rect.left;
- measItem.itemHeight = ItemInfo->Rect.bottom - ItemInfo->Rect.top;
- measItem.itemData = ItemInfo->dwItemData;
- SendMessageW( WndOwner, WM_MEASUREITEM, ItemInfo->wID, (LPARAM)&measItem);
- ItemInfo->Rect.right = ItemInfo->Rect.left + measItem.itemWidth;
- if (MenuInfo->maxBmpSize.cx < abs(measItem.itemWidth) + MENU_ITEM_HBMP_SPACE ||
- MenuInfo->maxBmpSize.cy < abs(measItem.itemHeight))
- {
- MenuInfo->maxBmpSize.cx = abs(measItem.itemWidth) + MENU_ITEM_HBMP_SPACE;
- MenuInfo->maxBmpSize.cy = abs(measItem.itemHeight);
- MenuSetRosMenuInfo(MenuInfo);
- }
- }
- else
- {
- SIZE Size;
-
- MenuGetBitmapItemSize((int) ItemInfo->hbmpItem, (DWORD) ItemInfo->hbmpItem, &Size);
- ItemInfo->Rect.right += Size.cx;
- ItemInfo->Rect.bottom += Size.cy;
-
- /* Leave space for the sunken border */
- ItemInfo->Rect.right += 2;
- ItemInfo->Rect.bottom += 2;
-
- /* Special case: Minimize button doesn't have a space behind it. */
- if (ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE ||
- ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE_D)
- ItemInfo->Rect.right -= 1;
- }
- ItemInfo->Rect.right += 2 * CheckBitmapWidth;
+ MenuGetBitmapItemSize(ItemInfo, &Size, WndOwner );
+ /* Keep the size of the bitmap in callback mode to be able
+ * to draw it correctly */
+ ItemInfo->Rect.right = ItemInfo->Rect.left + Size.cx;
+ if (MenuInfo->maxBmpSize.cx < abs(Size.cx) + MENU_ITEM_HBMP_SPACE ||
+ MenuInfo->maxBmpSize.cy < abs(Size.cy))
+ {
+ MenuInfo->maxBmpSize.cx = abs(Size.cx) + MENU_ITEM_HBMP_SPACE;
+ MenuInfo->maxBmpSize.cy = abs(Size.cy);
+ }
+ MenuSetRosMenuInfo(MenuInfo);
+ ItemInfo->Rect.right += Size.cx + 2;
+ itemheight = Size.cy + 2;
+
+ if( !(MenuInfo->dwStyle & MNS_NOCHECK))
+ ItemInfo->Rect.right += 2 * CheckBitmapWidth;
+ ItemInfo->Rect.right += 4 + MenuCharSize.cx;
+ ItemInfo->XTab = ItemInfo->Rect.right;
+ ItemInfo->Rect.right += ArrowBitmapWidth;
}
- else
+ else /* hbmpItem & MenuBar */
{
- ItemInfo->Rect.right += 2 * CheckBitmapWidth;
- if (0 != (ItemInfo->fType & MF_POPUP))
- {
- ItemInfo->Rect.right += ArrowBitmapWidth;
- }
+ MenuGetBitmapItemSize(ItemInfo, &Size, WndOwner );
+ ItemInfo->Rect.right += Size.cx;
+ if( ItemInfo->Text) ItemInfo->Rect.right += 2;
+ itemheight = Size.cy;
+
+ /* Special case: Minimize button doesn't have a space behind it. */
+ if (ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE ||
+ ItemInfo->hbmpItem == (HBITMAP)HBMMENU_MBAR_MINIMIZE_D)
+ ItemInfo->Rect.right -= 1;
}
}
+ else if (!MenuBar)
+ {
+ if( !(MenuInfo->dwStyle & MNS_NOCHECK))
+ ItemInfo->Rect.right += CheckBitmapWidth;
+ ItemInfo->Rect.right += 4 + MenuCharSize.cx;
+ ItemInfo->XTab = ItemInfo->Rect.right;
+ ItemInfo->Rect.right += ArrowBitmapWidth;
+ }
/* it must be a text item - unless it's the system menu */
- if (0 == (ItemInfo->fType & MF_SYSMENU) && IS_STRING_ITEM(ItemInfo->fType))
- {
- SIZE Size;
-
- GetTextExtentPoint32W(Dc, (LPWSTR) ItemInfo->dwTypeData,
- wcslen((LPWSTR) ItemInfo->dwTypeData), &Size);
-
- ItemInfo->Rect.right += Size.cx;
- ItemInfo->Rect.bottom += max(Size.cy, GetSystemMetrics(SM_CYMENU) - 1);
- ItemInfo->XTab = 0;
-
- if (MenuBar)
- {
- ItemInfo->Rect.right += MENU_BAR_ITEMS_SPACE;
- }
- else if ((p = wcschr((LPWSTR) ItemInfo->dwTypeData, L'\t' )) != NULL)
- {
- /* Item contains a tab (only meaningful in popup menus) */
- GetTextExtentPoint32W(Dc, (LPWSTR) ItemInfo->dwTypeData,
- (int)(p - (LPWSTR) ItemInfo->dwTypeData), &Size);
- ItemInfo->XTab = CheckBitmapWidth + MENU_TAB_SPACE + Size.cx;
- ItemInfo->Rect.right += MENU_TAB_SPACE;
- }
- else
- {
- if (NULL != wcschr((LPWSTR) ItemInfo->dwTypeData, L'\b'))
- {
- ItemInfo->Rect.right += MENU_TAB_SPACE;
- }
- ItemInfo->XTab = ItemInfo->Rect.right - CheckBitmapWidth
- - ArrowBitmapWidth;
- }
- }
-
+ if (0 == (ItemInfo->fType & MF_SYSMENU) && ItemInfo->Text)
+ {
+ HFONT hfontOld = NULL;
+ RECT rc = ItemInfo->Rect;
+ LONG txtheight, txtwidth;
+
+ if ( ItemInfo->fState & MFS_DEFAULT )
+ {
+ hfontOld = SelectObject( Dc, hMenuFontBold );
+ }
+ if (MenuBar)
+ {
+ txtheight = DrawTextW( Dc, ItemInfo->dwTypeData, -1, &rc,
+ DT_SINGLELINE|DT_CALCRECT);
+ ItemInfo->Rect.right += rc.right - rc.left;
+ itemheight = max( max( itemheight, txtheight),
+ GetSystemMetrics( SM_CYMENU) - 1);
+ ItemInfo->Rect.right += 2 * MenuCharSize.cx;
+ }
+ else
+ {
+ if ((p = strchrW( ItemInfo->dwTypeData, '\t' )) != NULL)
+ {
+ RECT tmprc = rc;
+ LONG tmpheight;
+ int n = (int)( p - ItemInfo->dwTypeData);
+ /* Item contains a tab (only meaningful in popup menus) */
+ /* get text size before the tab */
+ txtheight = DrawTextW( Dc, ItemInfo->dwTypeData, n, &rc,
+ DT_SINGLELINE|DT_CALCRECT);
+ txtwidth = rc.right - rc.left;
+ p += 1; /* advance past the Tab */
+ /* get text size after the tab */
+ tmpheight = DrawTextW( Dc, p, -1, &tmprc, DT_SINGLELINE|DT_CALCRECT);
+ ItemInfo->XTab += txtwidth;
+ txtheight = max( txtheight, tmpheight);
+ txtwidth += MenuCharSize.cx + /* space for the tab */
+ tmprc.right - tmprc.left; /* space for the short cut */
+ }
+ else
+ {
+ txtheight = DrawTextW( Dc, ItemInfo->dwTypeData, -1, &rc,
+ DT_SINGLELINE|DT_CALCRECT);
+ txtwidth = rc.right - rc.left;
+ ItemInfo->XTab += txtwidth;
+ }
+ ItemInfo->Rect.right += 2 + txtwidth;
+ itemheight = max( itemheight, max( txtheight + 2, MenuCharSize.cy + 4));
+ }
+ if (hfontOld) SelectObject (Dc, hfontOld);
+ }
+ else if( MenuBar)
+ {
+ itemheight = max( itemheight, GetSystemMetrics(SM_CYMENU)-1);
+ }
+ ItemInfo->Rect.bottom += itemheight;
DPRINT("(%ld,%ld)-(%ld,%ld)\n", ItemInfo->Rect.left, ItemInfo->Rect.top, ItemInfo->Rect.right, ItemInfo->Rect.bottom);
}
@@ -1309,7 +1376,10 @@
Start = 0;
MaxX = 2 + 1;
- MenuInitRosMenuItemInfo(&ItemInfo);
+ MenuInfo->maxBmpSize.cx = 0;
+ MenuInfo->maxBmpSize.cy = 0;
+
+ MenuInitRosMenuItemInfo(&ItemInfo);
while (Start < MenuInfo->MenuItemCount)
{
OrgX = MaxX;
@@ -1331,7 +1401,6 @@
{
break;
}
-
MenuCalcItemSize(Dc, &ItemInfo, MenuInfo, WndOwner, OrgX, OrgY, FALSE);
if (! MenuSetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo))
{
@@ -1346,7 +1415,7 @@
}
MaxX = max(MaxX, ItemInfo.Rect.right);
OrgY = ItemInfo.Rect.bottom;
- if (IS_STRING_ITEM(ItemInfo.fType) && 0 != ItemInfo.XTab)
+ if ((ItemInfo.Text) && 0 != ItemInfo.XTab)
{
MaxTab = max(MaxTab, ItemInfo.XTab);
MaxTabWidth = max(MaxTabWidth, ItemInfo.Rect.right - ItemInfo.XTab);
@@ -1360,7 +1429,7 @@
if (MenuGetRosMenuItemInfo(MenuInfo->Self, Start, &ItemInfo))
{
ItemInfo.Rect.right = MaxX;
- if (IS_STRING_ITEM(ItemInfo.fType) && 0 != ItemInfo.XTab)
+ if ((ItemInfo.Text) && 0 != ItemInfo.XTab)
{
ItemInfo.XTab = MaxTab;
}
@@ -1413,6 +1482,10 @@
MaxY = Rect->top + 1;
Start = 0;
HelpPos = -1;
+
+ MenuInfo->maxBmpSize.cx = 0;
+ MenuInfo->maxBmpSize.cy = 0;
+
MenuInitRosMenuItemInfo(&ItemInfo);
while (Start < MenuInfo->MenuItemCount)
{
@@ -1468,7 +1541,8 @@
}
}
-/* FIXME: Is this really needed? */
+/* FIXME: Is this really needed? */ /*NO! it is not needed, why make the
+HBMMENU_MBAR_CLOSE, MINIMIZE & RESTORE, look the same size as the menu bar! */
#if 0
/* Finish the line (set all items to the largest height found) */
while (Start < i)
@@ -1481,7 +1555,7 @@
Start++;
}
#else
- Start = i;
+ Start = i; /* This works! */
#endif
}
@@ -1548,7 +1622,10 @@
ROSMENUITEMINFO ItemInfo;
UINT i;
HFONT FontOld = NULL;
-
+ BOOL flat_menu = FALSE;
+
+ SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0);
+
if (NULL == Menu)
{
Menu = GetMenu(Wnd);
@@ -1575,7 +1652,7 @@
Rect->bottom = Rect->top + MenuInfo.Height;
- FillRect(DC, Rect, GetSysColorBrush(COLOR_MENU));
+ FillRect(DC, Rect, GetSysColorBrush(flat_menu ? COLOR_MENUBAR : COLOR_MENU));
SelectObject(DC, GetSysColorPen(COLOR_3DFACE));
MoveToEx(DC, Rect->left, Rect->bottom, NULL);
@@ -1665,7 +1742,9 @@
SendMessageW(Wnd, WM_INITMENU, (WPARAM)Menu, 0);
- if (MenuGetRosMenuInfo(&MenuInfo, Menu) && 0 == MenuInfo.Height)
+ MenuGetRosMenuInfo(&MenuInfo, Menu);
+
+ if (0 == MenuInfo.Height)
{
/* app changed/recreated menu bar entries in WM_INITMENU
Recalculate menu sizes else clicks will not work */
@@ -1673,6 +1752,15 @@
SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED );
}
+ /* This makes the menus of applications built with Delphi work.
+ * It also enables menus to be displayed in more than one window,
+ * but there are some bugs left that need to be fixed in this case.
+ */
+ if(MenuInfo.Self == Menu)
+ {
+ MenuInfo.Wnd = Wnd;
+ MenuSetRosMenuInfo(&MenuInfo);
+ }
}
return TRUE;
@@ -1705,6 +1793,7 @@
MenuInitRosMenuItemInfo(&ItemInfo);
if (MenuGetRosMenuItemInfo(MenuInfo.Self, MenuInfo.FocusedItem, &ItemInfo))
{
+ ItemInfo.fMask |= MIIM_STATE;
ItemInfo.fState &= ~(MF_HILITE|MF_MOUSESELECT);
MenuSetRosMenuItemInfo(MenuInfo.Self, MenuInfo.FocusedItem, &ItemInfo);
}
@@ -1725,7 +1814,7 @@
if (GetSystemMetrics(SM_CXSCREEN ) < X + Width)
{
- if (0 != XAnchor)
+ if (0 != XAnchor && X >= Width - XAnchor)
{
X -= Width - XAnchor;
}
@@ -1741,7 +1830,7 @@
if (GetSystemMetrics(SM_CYSCREEN) < Y + Height)
{
- if (0 != YAnchor)
+ if (0 != YAnchor && Y >= Height + YAnchor)
{
Y -= Height + YAnchor;
}
@@ -1759,7 +1848,7 @@
/* NOTE: In Windows, top menu popup is not owned. */
MenuInfo.Wnd = CreateWindowExW(0, POPUPMENU_CLASS_ATOMW, NULL,
WS_POPUP, X, Y, Width, Height,
- WndOwner, 0, (HINSTANCE) GetWindowLongW(WndOwner, GWL_HINSTANCE),
+ WndOwner, 0, (HINSTANCE) GetWindowLongPtrW(WndOwner, GWLP_HINSTANCE),
(LPVOID) MenuInfo.Self);
if (NULL == MenuInfo.Wnd || ! MenuSetRosMenuInfo(&MenuInfo))
{
@@ -1870,12 +1959,12 @@
SelectObject(Dc, hMenuFont);
MenuInitRosMenuItemInfo(&ItemInfo);
-
/* Clear previous highlighted item */
if (NO_SELECTED_ITEM != MenuInfo->FocusedItem)
{
if (MenuGetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo))
{
+ ItemInfo.fMask |= MIIM_STATE;
ItemInfo.fState &= ~(MF_HILITE|MF_MOUSESELECT);
MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo);
}
@@ -1893,6 +1982,7 @@
{
if (0 == (ItemInfo.fType & MF_SEPARATOR))
{
+ ItemInfo.fMask |= MIIM_STATE;
ItemInfo.fState |= MF_HILITE;
MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo);
MenuDrawMenuItem(MenuInfo->Wnd, MenuInfo, WndOwner, Dc,
@@ -1927,7 +2017,6 @@
}
}
}
-
MenuCleanupRosMenuItemInfo(&ItemInfo);
ReleaseDC(MenuInfo->Wnd, Dc);
}
@@ -2047,7 +2136,7 @@
}
#if 0
mii.cbSize = sizeof(MENUITEMINFOW);
- mii.fMask = MIIM_STATE;
+ mii.fMask |= MIIM_STATE;
if((DefItem != SC_CLOSE) && GetMenuItemInfoW(Menu, DefItem, FALSE, &mii) &&
(mii.fState & (MFS_GRAYED | MFS_DISABLED)))
{
@@ -2122,7 +2211,7 @@
}
SelectObject(Dc, hMenuFont);
-
+ ItemInfo.fMask |= MIIM_STATE;
ItemInfo.fState |= MF_HILITE;
MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo);
MenuDrawMenuItem(MenuInfo->Wnd, MenuInfo, WndOwner, Dc, &ItemInfo, MenuInfo->Height,
@@ -2136,8 +2225,8 @@
ItemInfo.Rect = Rect;
}
+ ItemInfo.fMask |= MIIM_STATE;
ItemInfo.fState |= MF_MOUSESELECT;
-
MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo);
if (IS_SYSTEM_MENU(MenuInfo))
@@ -2156,9 +2245,10 @@
if (0 != (MenuInfo->Flags & MF_POPUP))
{
Rect.left += ItemInfo.Rect.right - GetSystemMetrics(SM_CXBORDER);
- Rect.top += ItemInfo.Rect.top;
+ Rect.top += ItemInfo.Rect.top - 3;
Rect.right = ItemInfo.Rect.left - ItemInfo.Rect.right + GetSystemMetrics(SM_CXBORDER);
- Rect.bottom = ItemInfo.Rect.top - ItemInfo.Rect.bottom;
+ Rect.bottom = ItemInfo.Rect.top - ItemInfo.Rect.bottom - 3 - 2
+ - GetSystemMetrics(SM_CYBORDER);
}
else
{
@@ -2198,6 +2288,7 @@
if (NULL != MenuInfo && NULL != TopPopup && NO_SELECTED_ITEM != MenuInfo->FocusedItem)
{
MenuInitRosMenuItemInfo(&ItemInfo);
+ ItemInfo.fMask |= MIIM_FTYPE | MIIM_STATE;
if (! MenuGetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo)
|| 0 == (ItemInfo.fType & MF_POPUP)
|| 0 == (ItemInfo.fState & MF_MOUSESELECT))
@@ -2206,6 +2297,7 @@
return;
}
ItemInfo.fState &= ~MF_MOUSESELECT;
+ ItemInfo.fMask |= MIIM_STATE;
MenuSetRosMenuItemInfo(MenuInfo->Self, MenuInfo->FocusedItem, &ItemInfo);
if (MenuGetRosMenuInfo(&SubMenuInfo, ItemInfo.hSubMenu))
{
@@ -3053,19 +3145,19 @@
}
if (! ForceMenuChar)
{
- Key = towupper(Key);
+ Key = toupperW(Key);
ItemInfo = Items;
for (i = 0; i < MenuInfo->MenuItemCount; i++, ItemInfo++)
{
- if (IS_STRING_ITEM(ItemInfo->fType) && NULL != ItemInfo->dwTypeData)
+ if ((ItemInfo->Text) && NULL != ItemInfo->dwTypeData)
{
WCHAR *p = (WCHAR *) ItemInfo->dwTypeData - 2;
do
{
- p = wcschr(p + 2, '&');
+ p = strchrW(p + 2, '&');
}
while (NULL != p && L'&' == p[1]);
- if (NULL != p && (towupper(p[1]) == Key))
+ if (NULL != p && (toupperW(p[1]) == Key))
{
return i;
}
@@ -3254,9 +3346,13 @@
fRemove = TRUE; /* Keyboard messages are always removed */
switch(Msg.message)
{
+ case WM_SYSKEYDOWN:
case WM_KEYDOWN:
switch(Msg.wParam)
{
+ case VK_MENU:
+ fEndMenu = TRUE;
+ break;
case VK_HOME:
case VK_END:
if (MenuGetRosMenuInfo(&MenuInfo, Mt.CurrentMenu))
@@ -3343,19 +3439,6 @@
}
break; /* WM_KEYDOWN */
- case WM_SYSKEYDOWN:
- switch (Msg.wParam)
- {
- DbgPrint("Menu.c WM_SYSKEYDOWN wPram %d\n",Msg.wParam);
- case VK_MENU:
- fEndMenu = TRUE;
- break;
- case VK_LMENU:
- fEndMenu = TRUE;
- break;
- }
- break; /* WM_SYSKEYDOWN */
-
case WM_CHAR:
case WM_SYSCHAR:
{
@@ -3401,7 +3484,9 @@
}
else
{
+ PeekMessageW( &Msg, 0, Msg.message, Msg.message, PM_REMOVE );
DispatchMessageW(&Msg);
+ continue;
}
if (! fEndMenu)
@@ -3458,7 +3543,7 @@
/* The return value is only used by TrackPopupMenu */
if (!(Flags & TPM_RETURNCMD)) return TRUE;
if (ExecutedMenuId < 0) ExecutedMenuId = 0;
- return ExecutedMenuId;
+ return ExecutedMenuId;
}
/***********************************************************************
@@ -3500,9 +3585,203 @@
VOID
-MenuTrackKbdMenuBar(HWND hWnd, ULONG wParam, ULONG Key)
-{
-}
+MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar)
+{
+ UINT uItem = NO_SELECTED_ITEM;
+ HMENU hTrackMenu;
+ ROSMENUINFO MenuInfo;
+ UINT wFlags = TPM_ENTERIDLEEX | TPM_LEFTALIGN | TPM_LEFTBUTTON;
+
+ DPRINT("hwnd %p wParam 0x%04x wChar 0x%04x\n", hWnd, wParam, wChar);
+
+ /* find window that has a menu */
+
+ while (!((GetWindowLongW( hWnd, GWL_STYLE ) &
+ (WS_CHILD | WS_POPUP)) != WS_CHILD))
+ if (!(hWnd = GetAncestor( hWnd, GA_PARENT ))) return;
+
+ /* check if we have to track a system menu */
+
+ hTrackMenu = GetMenu( hWnd );
+ if (!hTrackMenu || IsIconic(hWnd) || wChar == ' ' )
+ {
+ if (!(GetWindowLongW( hWnd, GWL_STYLE ) & WS_SYSMENU)) return;
+ hTrackMenu = NtUserGetSystemMenu(hWnd, FALSE);
+ uItem = 0;
+ wParam |= HTSYSMENU; /* prevent item lookup */
+ }
+
+ if (!IsMenu( hTrackMenu )) return;
+
+ MenuInitTracking( hWnd, hTrackMenu, FALSE, wFlags );
+
+ if (! MenuGetRosMenuInfo(&MenuInfo, hTrackMenu))
+ {
+ goto track_menu;
+ }
+
+ if( wChar && wChar != ' ' )
+ {
+ uItem = MenuFindItemByKey( hWnd, &MenuInfo, wChar, (wParam & HTSYSMENU) );
+ if ( uItem >= (UINT)(-2) )
+ {
+ if( uItem == (UINT)(-1) ) MessageBeep(0);
+ /* schedule end of menu tracking */
+ wFlags |= TF_ENDMENU;
+ goto track_menu;
+ }
+ }
+
+ MenuSelectItem( hWnd, &MenuInfo, uItem, TRUE, 0 );
+
+ if (wParam & HTSYSMENU)
+ {
+ /* prevent sysmenu activation for managed windows on Alt down/up */
+// if (GetPropA( hwnd, "__wine_x11_managed" ))
+ wFlags |= TF_ENDMENU; /* schedule end of menu tracking */
+ }
+ else
+ {
+ if( uItem == NO_SELECTED_ITEM )
+ MenuMoveSelection( hWnd, &MenuInfo, ITEM_NEXT );
+ else
+ PostMessageW( hWnd, WM_KEYDOWN, VK_DOWN, 0L );
+ }
+
+track_menu:
+ MenuTrackMenu( hTrackMenu, wFlags, 0, 0, hWnd, NULL );
+ MenuExitTracking( hWnd );
+
+}
+
+/*
+ * From MSDN:
+ * The MFT_BITMAP, MFT_SEPARATOR, and MFT_STRING values cannot be combined
+ * with one another. Also MFT_OWNERDRAW. Set fMask to MIIM_TYPE to use fType.
+ *
+ * Windows 2K/XP: fType is used only if fMask has a value of MIIM_FTYPE.
+ *
+ * MIIM_TYPE: Retrieves or sets the fType and dwTypeData members. Windows
+ * 2K/XP: MIIM_TYPE is replaced by MIIM_BITMAP, MIIM_FTYPE, and MIIM_STRING.
+ * MFT_STRING is replaced by MIIM_STRING.
+ * (So, I guess we should use MIIM_STRING only for strings?)
+ *
+ * MIIM_FTYPE: Windows 2K/Windows XP: Retrieves or sets the fType member.
+ *
+ * Based on wine, SetMenuItemInfo_common:
+ * 1) set MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP any one with MIIM_TYPE,
+ * it will result in a error.
+ * 2) set menu mask to MIIM_FTYPE and MFT_BITMAP ftype it will result in a error.
+ * These conditions are addressed in Win32k IntSetMenuItemInfo.
+ *
+ */
+static
+BOOL
+FASTCALL
+MenuSetItemData(
+ LPMENUITEMINFOW mii,
+ UINT Flags,
+ UINT_PTR IDNewItem,
+ LPCWSTR NewItem,
+ BOOL Unicode)
+{
+/*
+ * Let us assume MIIM_FTYPE is set and building a new menu item structure.
+ */
+ if(Flags & MF_BITMAP)
+ {
+ mii->fMask |= MIIM_BITMAP; /* Use the new way of seting hbmpItem.*/
+ mii->hbmpItem = (HBITMAP) NewItem;
+ mii->fType &= ~MFT_BITMAP; /* just incase, Kill the old way */
+ }
+ else if(Flags & MF_OWNERDRAW)
+ {
+ mii->fType |= MFT_OWNERDRAW;
+ mii->fMask |= MIIM_DATA;
+ mii->dwItemData = (DWORD) NewItem;
+ }
+ else if (Flags & MF_SEPARATOR)
+ {
+ mii->fType |= MFT_SEPARATOR;
+ }
+ else /* Default action MF_STRING. */
+ {
+ /* Item beginning with a backspace is a help item */
+ if (NewItem != NULL)
+ {
+ if (Unicode)
+ {
+ if (*NewItem == '\b')
+ {
+ mii->fType |= MF_HELP;
+ NewItem++;
+ }
+ }
+ else
+ {
+ LPCSTR NewItemA = (LPCSTR) NewItem;
+ if (*NewItemA == '\b')
+ {
+ mii->fType |= MF_HELP;
+ NewItemA++;
+ NewItem = (LPCWSTR) NewItemA;
+ }
+ }
+ }
+ mii->fMask |= MIIM_STRING;
+ mii->fType |= MFT_STRING; /* Zero */
+ mii->dwTypeData = (LPWSTR)NewItem;
+ if (Unicode)
+ mii->cch = (NULL == NewItem ? 0 : strlenW(NewItem));
+ else
+ mii->cch = (NULL == NewItem ? 0 : strlen((LPCSTR)NewItem));
+ mii->hbmpItem = NULL;
+ }
+
+ if(Flags & MF_RIGHTJUSTIFY) /* Same as MF_HELP */
+ {
+ mii->fType |= MFT_RIGHTJUSTIFY;
+ }
+
+ if(Flags & MF_MENUBREAK)
+ {
+ mii->fType |= MFT_MENUBREAK;
+ }
+ else if(Flags & MF_MENUBARBREAK)
+ {
+ mii->fType |= MFT_MENUBARBREAK;
+ }
+
+ if(Flags & MF_GRAYED)
+ {
+ mii->fState |= MFS_GRAYED;
+ mii->fMask |= MIIM_STATE;
+ }
+ else if(Flags & MF_DISABLED)
+ {
+ mii->fState |= MFS_DISABLED;
+ mii->fMask |= MIIM_STATE;
+ }
+ else /* default state */
+ {
+ mii->fState |= MFS_ENABLED;
+ mii->fMask |= MIIM_STATE;
+ }
+
+ if(Flags & MF_POPUP)
+ {
+ mii->fType |= MF_POPUP;
+ mii->fMask |= MIIM_SUBMENU;
+ mii->hSubMenu = (HMENU)IDNewItem;
+ }
+ else
+ {
+ mii->fMask |= MIIM_ID;
+ mii->wID = (UINT)IDNewItem;
+ }
+ return TRUE;
+}
+
/* FUNCTIONS *****************************************************************/
@@ -3583,6 +3862,7 @@
if (0 != (Items[i].fType & MF_MENUBARBREAK)) break;
if ( i >= idFirst && i <= idLast )
{
+ Items[i].fMask = MIIM_STATE | MIIM_FTYPE;
if ( i == idCheck)
{
Items[i].fType |= MFT_RADIOCHECK;
@@ -3806,8 +4086,9 @@
BOOL ByPosition,
LPMENUITEMINFOA mii)
{
+ MENUITEMINFOW miiW;
LPSTR AnsiBuffer;
- MENUITEMINFOW miiW;
+ INT Count;
if (mii->cbSize != sizeof(MENUITEMINFOA) &&
mii->cbSize != sizeof(MENUITEMINFOA) - sizeof(HBITMAP))
@@ -3816,45 +4097,49 @@
return FALSE;
}
- if ((mii->fMask & (MIIM_STRING | MIIM_TYPE)) == 0)
+ if(!(mii->fMask & (MIIM_TYPE | MIIM_STRING)))
{
/* No text requested, just pass on */
return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE);
}
+ AnsiBuffer = mii->dwTypeData;
+ Count = miiW.cch = mii->cch;
RtlCopyMemory(&miiW, mii, mii->cbSize);
- AnsiBuffer = mii->dwTypeData;
-
- if (AnsiBuffer != NULL)
+ miiW.dwTypeData = 0;
+
+ if (AnsiBuffer)
{
miiW.dwTypeData = RtlAllocateHeap(GetProcessHeap(), 0,
miiW.cch * sizeof(WCHAR));
- if (miiW.dwTypeData == NULL)
- return FALSE;
+ if (miiW.dwTypeData == NULL) return FALSE;
}
if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE))
{
- HeapFree(GetProcessHeap(), 0, miiW.dwTypeData);
+ if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
return FALSE;
}
- if (AnsiBuffer != NULL)
+ RtlCopyMemory(mii, &miiW, miiW.cbSize);
+
+ if (!AnsiBuffer || !Count)
{
- if (IS_STRING_ITEM(miiW.fType))
- {
- WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer,
+ if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
+ mii->dwTypeData = AnsiBuffer;
+ mii->cch = miiW.cch;
+ return TRUE;
+ }
+
+ if ((miiW.fMask & MIIM_STRING) || (IS_STRING_ITEM(miiW.fType)))
+ {
+ WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer,
mii->cch, NULL, NULL);
- }
- RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
}
- RtlCopyMemory(mii, &miiW, miiW.cbSize);
- if (AnsiBuffer)
- {
- mii->dwTypeData = AnsiBuffer;
- mii->cch = strlen(AnsiBuffer);
- }
+ RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
+ mii->dwTypeData = AnsiBuffer;
+ mii->cch = strlen(AnsiBuffer);
return TRUE;
}
@@ -3869,7 +4154,60 @@
BOOL ByPosition,
LPMENUITEMINFOW mii)
{
- return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE);
+ MENUITEMINFOW miiW;
+ LPWSTR String;
+ INT Count;
+
+ if (mii->cbSize != sizeof(MENUITEMINFOW) &&
+ mii->cbSize != sizeof(MENUITEMINFOW) - sizeof(HBITMAP))
+ {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+
+ if(!(mii->fMask & (MIIM_TYPE | MIIM_STRING)))
+ {
+ /* No text requested, just pass on */
+ return NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) mii, FALSE);
+ }
+
+ String = mii->dwTypeData;
+ Count = mii->cch;
+ RtlCopyMemory(&miiW, mii, mii->cbSize);
+ miiW.dwTypeData = 0;
+
+ if (String)
+ {
+ miiW.dwTypeData = RtlAllocateHeap(GetProcessHeap(), 0,
+ miiW.cch * sizeof(WCHAR));
+ if (miiW.dwTypeData == NULL) return FALSE;
+ }
+
+ if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE))
+ {
+ if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
+ return FALSE;
+ }
+
+ RtlCopyMemory(mii, &miiW, miiW.cbSize); // Okay to over write user data.
+
+ if (!String || !Count)
+ {
+ if (miiW.dwTypeData) RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
+ mii->dwTypeData = String; // may not be zero.
+ mii->cch = miiW.cch;
+ return TRUE;
+ }
+
+ if ((miiW.fMask & MIIM_STRING) || (IS_STRING_ITEM(miiW.fType)))
+ {
+ lstrcpynW( String, miiW.dwTypeData, Count );
+ }
+
+ RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData);
+ mii->dwTypeData = String;
+ mii->cch = strlenW(String);
+ return TRUE;
}
@@ -3898,10 +4236,9 @@
{
ROSMENUINFO MenuInfo;
ROSMENUITEMINFO mii;
-
+ memset( &mii, 0, sizeof(mii) );
mii.cbSize = sizeof(MENUITEMINFOW);
- mii.fMask = MIIM_STATE | MIIM_TYPE | MIIM_SUBMENU;
- mii.dwTypeData = NULL;
+ mii.fMask = MIIM_STATE | MIIM_FTYPE | MIIM_SUBMENU;
SetLastError(0);
if(NtUserMenuItemInfo(hMenu, uId, uFlags, &mii, FALSE))
@@ -3943,9 +4280,10 @@
UINT uFlag)
{
MENUITEMINFOA mii;
+ memset( &mii, 0, sizeof(mii) );
mii.dwTypeData = lpString;
- mii.fMask = MIIM_STRING;
- mii.fType = MF_STRING;
+ mii.fMask = MIIM_STRING | MIIM_FTYPE;
+ mii.fType = MFT_STRING;
mii.cbSize = sizeof(MENUITEMINFOA);
mii.cch = nMaxCount;
@@ -3969,8 +4307,10 @@
UINT uFlag)
{
MENUITEMINFOW miiW;
+ memset( &miiW, 0, sizeof(miiW) );
miiW.dwTypeData = lpString;
- miiW.fMask = MIIM_STRING;
+ miiW.fMask = MIIM_STRING | MIIM_FTYPE;
+ miiW.fType = MFT_STRING;
miiW.cbSize = sizeof(MENUITEMINFOW);
miiW.cch = nMaxCount;
@@ -4033,6 +4373,7 @@
{
return NtUserHiliteMenuItem(hwnd, hmenu, uItemHilite, uHilite);
}
+
/*
@@ -4048,64 +4389,19 @@
LPCSTR lpNewItem)
{
MENUITEMINFOA mii;
+ memset( &mii, 0, sizeof(mii) );
mii.cbSize = sizeof(MENUITEMINFOA);
- mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE;
- mii.fType = 0;
- mii.fState = MFS_ENABLED;
-
- if(uFlags & MF_BITMAP)
- {
- mii.fType |= MFT_BITMAP;
- mii.fMask |= MIIM_BITMAP;
- mii.hbmpItem = (HBITMAP) lpNewItem;
- }
- else if(uFlags & MF_OWNERDRAW)
- {
- mii.fType |= MFT_OWNERDRAW;
- mii.fMask |= MIIM_DATA;
- mii.dwItemData = (DWORD) lpNewItem;
- }
- else
- {
- mii.fMask |= MIIM_TYPE;
- mii.dwTypeData = (LPSTR)lpNewItem;
- mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem));
- }
-
- if(uFlags & MF_RIGHTJUSTIFY)
- {
- mii.fType |= MFT_RIGHTJUSTIFY;
- }
- if(uFlags & MF_MENUBREAK)
- {
- mii.fType |= MFT_MENUBREAK;
- }
- if(uFlags & MF_MENUBARBREAK)
- {
- mii.fType |= MFT_MENUBARBREAK;
- }
- if(uFlags & MF_DISABLED)
- {
- mii.fState |= MFS_DISABLED;
- }
- if(uFlags & MF_GRAYED)
- {
- mii.fState |= MFS_GRAYED;
- }
-
- if(uFlags & MF_POPUP)
- {
- mii.fType |= MF_POPUP;
- mii.fMask |= MIIM_SUBMENU;
- mii.hSubMenu = (HMENU)uIDNewItem;
- }
- else
- {
- mii.fMask |= MIIM_ID;
- mii.wID = (UINT)uIDNewItem;
- }
+ mii.fMask = MIIM_FTYPE;
+
+ MenuSetItemData((LPMENUITEMINFOW) &mii,
+ uFlags,
+ uIDNewItem,
+ (LPCWSTR) lpNewItem,
+ FALSE);
+
return InsertMenuItemA(hMenu, uPosition, (BOOL)((MF_BYPOSITION & uFlags) > 0), &mii);
}
+
/*
@@ -4128,11 +4424,17 @@
if((lpmii->cbSize == sizeof(MENUITEMINFOA)) ||
(lpmii->cbSize == sizeof(MENUITEMINFOA) - sizeof(HBITMAP)))
{
- RtlMoveMemory ( &mi, lpmii, lpmii->cbSize );
-
+ RtlCopyMemory ( &mi, lpmii, lpmii->cbSize );
+
+ if( lpmii->cbSize != sizeof( MENUITEMINFOW))
+ {
+ mi.cbSize = sizeof( MENUITEMINFOW);
+ mi.hbmpItem = NULL;
+ }
/* copy the text string */
- if((mi.fMask & (MIIM_TYPE | MIIM_STRING)) &&
- (MENU_ITEM_TYPE(mi.fType) == MF_STRING) && mi.dwTypeData)
+ if (((mi.fMask & MIIM_STRING) ||
+ ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING)))
+ && mi.dwTypeData != NULL)
{
Status = RtlCreateUnicodeStringFromAsciiz(&MenuText, (LPSTR)mi.dwTypeData);
if (!NT_SUCCESS (Status))
@@ -4144,7 +4446,6 @@
mi.cch = MenuText.Length / sizeof(WCHAR);
CleanHeap = TRUE;
}
-
res = NtUserInsertMenuItem(hMenu, uItem, fByPosition, &mi);
if ( CleanHeap ) RtlFreeUnicodeString ( &MenuText );
@@ -4167,7 +4468,6 @@
MENUITEMINFOW mi;
UNICODE_STRING MenuText;
BOOL res = FALSE;
- mi.hbmpItem = (HBITMAP)0;
/* while we could just pass 'lpmii' to win32k, we make a copy so that
if a bad user passes bad data, we crash his process instead of the
@@ -4176,18 +4476,22 @@
if((lpmii->cbSize == sizeof(MENUITEMINFOW)) ||
(lpmii->cbSize == sizeof(MENUITEMINFOW) - sizeof(HBITMAP)))
{
- memcpy(&mi, lpmii, lpmii->cbSize);
-
+ RtlCopyMemory(&mi, lpmii, lpmii->cbSize);
+
+ if( lpmii->cbSize != sizeof( MENUITEMINFOW))
+ {
+ mi.cbSize = sizeof( MENUITEMINFOW);
+ mi.hbmpItem = NULL;
+ }
/* copy the text string */
- if((mi.fMask & (MIIM_TYPE | MIIM_STRING)) &&
- (MENU_ITEM_TYPE(mi.fType) == MF_STRING) &&
- mi.dwTypeData != NULL)
+ if (((mi.fMask & MIIM_STRING) ||
+ ((mi.fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(mi.fType) == MF_STRING)))
+ && mi.dwTypeData != NULL)
{
RtlInitUnicodeString(&MenuText, (PWSTR)lpmii->dwTypeData);
mi.dwTypeData = MenuText.Buffer;
mi.cch = MenuText.Length / sizeof(WCHAR);
- };
-
+ }
res = NtUserInsertMenuItem(hMenu, uItem, fByPosition, &mi);
}
return res;
@@ -4207,62 +4511,16 @@
LPCWSTR lpNewItem)
{
MENUITEMINFOW mii;
+ memset( &mii, 0, sizeof(mii) );
mii.cbSize = sizeof(MENUITEMINFOW);
- mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE;
- mii.fType = 0;
- mii.fState = MFS_ENABLED;
-
- if(uFlags & MF_BITMAP)
- {
- mii.fType |= MFT_BITMAP;
- mii.fMask |= MIIM_BITMAP;
- mii.hbmpItem = (HBITMAP) lpNewItem;
- }
- else if(uFlags & MF_OWNERDRAW)
- {
- mii.fType |= MFT_OWNERDRAW;
- mii.fMask |= MIIM_DATA;
- mii.dwItemData = (DWORD) lpNewItem;
- }
- else
- {
- mii.fMask |= MIIM_TYPE;
- mii.dwTypeData = (LPWSTR)lpNewItem;
- mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem));
- }
-
- if(uFlags & MF_RIGHTJUSTIFY)
- {
- mii.fType |= MFT_RIGHTJUSTIFY;
- }
- if(uFlags & MF_MENUBREAK)
- {
- mii.fType |= MFT_MENUBREAK;
- }
- if(uFlags & MF_MENUBARBREAK)
- {
- mii.fType |= MFT_MENUBARBREAK;
- }
- if(uFlags & MF_DISABLED)
- {
- mii.fState |= MFS_DISABLED;
- }
- if(uFlags & MF_GRAYED)
- {
- mii.fState |= MFS_GRAYED;
- }
-
- if(uFlags & MF_POPUP)
- {
- mii.fType |= MF_POPUP;
- mii.fMask |= MIIM_SUBMENU;
- mii.hSubMenu = (HMENU)uIDNewItem;
- }
- else
- {
- mii.fMask |= MIIM_ID;
- mii.wID = (UINT)uIDNewItem;
- }
+ mii.fMask = MIIM_FTYPE;
+
+ MenuSetItemData( &mii,
+ uFlags,
+ uIDNewItem,
+ lpNewItem,
+ TRUE);
+
return InsertMenuItemW(hMenu, uPosition, (BOOL)((MF_BYPOSITION & uFlags) > 0), &mii);
}
@@ -4391,82 +4649,33 @@
UINT_PTR uIDNewItem,
LPCSTR lpNewItem)
{
+ ROSMENUINFO mi;
+ ROSMENUITEMINFO rmii;
MENUITEMINFOA mii;
memset( &mii, 0, sizeof(mii) );
mii.cbSize = sizeof(MENUITEMINFOA);
- mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE;
- mii.fType = 0;
- mii.fState = MFS_ENABLED;
-
- if(!GetMenuItemInfoA( hMnu,
- uPosition,
- (BOOL)(MF_BYPOSITION & uFlags),
- &mii)) return FALSE;
-
- if(uFlags & MF_BITMAP)
- {
- mii.fType |= MFT_BITMAP;
- mii.fMask |= MIIM_BITMAP;
- mii.hbmpItem = (HBITMAP) lpNewItem;
- }
- else if(uFlags & MF_OWNERDRAW)
- {
- mii.fType |= MFT_OWNERDRAW;
- mii.fMask |= MIIM_DATA;
- mii.dwItemData = (DWORD) lpNewItem;
- }
- else /* Default action MF_STRING. */
- {
- if(mii.dwTypeData != NULL)
- {
- HeapFree(GetProcessHeap(),0, mii.dwTypeData);
- }
- /* Item beginning with a backspace is a help item */
- if (*lpNewItem == '\b')
- {
- mii.fType |= MF_HELP;
- lpNewItem++;
- }
- mii.fMask |= MIIM_TYPE;
- mii.dwTypeData = (LPSTR)lpNewItem;
- mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem));
- }
-
- if(uFlags & MF_RIGHTJUSTIFY)
- {
- mii.fType |= MFT_RIGHTJUSTIFY;
- }
- if(uFlags & MF_MENUBREAK)
- {
- mii.fType |= MFT_MENUBREAK;
- }
- if(uFlags & MF_MENUBARBREAK)
- {
- mii.fType |= MFT_MENUBARBREAK;
- }
- if(uFlags & MF_DISABLED)
- {
- mii.fState |= MFS_DISABLED;
- }
- if(uFlags & MF_GRAYED)
- {
- mii.fState |= MFS_GRAYED;
- }
-
- if ((mii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (mii.hSubMenu != (HMENU)uIDNewItem))
- NtUserDestroyMenu( mii.hSubMenu ); /* ModifyMenu() spec */
-
- if(uFlags & MF_POPUP)
- {
- mii.fType |= MF_POPUP;
- mii.fMask |= MIIM_SUBMENU;
- mii.hSubMenu = (HMENU)uIDNewItem;
- }
- else
- {
- mii.fMask |= MIIM_ID;
- mii.wID = (UINT)uIDNewItem;
- }
+ mii.fMask = MIIM_FTYPE;
+
+ if (!MenuGetRosMenuInfo( &mi, hMnu )) return FALSE;
+
+ mi.Height = 0;
+
+ if (!MenuSetRosMenuInfo( &mi )) return FALSE;
+
+ MenuInitRosMenuItemInfo( &rmii );
+
+ if(!MenuGetRosMenuItemInfo( hMnu, uPosition, &rmii)) return FALSE;
+
+ if ((rmii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem))
+ NtUserDestroyMenu( rmii.hSubMenu ); /* ModifyMenu() spec */
+
+ MenuCleanupRosMenuItemInfo( &rmii );
+
+ MenuSetItemData((LPMENUITEMINFOW) &mii,
+ uFlags,
+ uIDNewItem,
+ (LPCWSTR) lpNewItem,
+ FALSE);
return SetMenuItemInfoA( hMnu,
uPosition,
@@ -4487,82 +4696,36 @@
UINT_PTR uIDNewItem,
LPCWSTR lpNewItem)
{
+ ROSMENUINFO mi;
+ ROSMENUITEMINFO rmii;
MENUITEMINFOW mii;
memset ( &mii, 0, sizeof(mii) );
mii.cbSize = sizeof(MENUITEMINFOW);
- mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE;
- mii.fState = MFS_ENABLED;
-
- if(!NtUserMenuItemInfo( hMnu,
- uPosition,
- (BOOL)(MF_BYPOSITION & uFlags),
- (PROSMENUITEMINFO) &mii,
- FALSE)) return FALSE;
-
- if(uFlags & MF_BITMAP)
- {
- mii.fType |= MFT_BITMAP;
- mii.fMask |= MIIM_BITMAP;
- mii.hbmpItem = (HBITMAP) lpNewItem;
- }
- else if(uFlags & MF_OWNERDRAW)
- {
- mii.fType |= MFT_OWNERDRAW;
- mii.fMask |= MIIM_DATA;
- mii.dwItemData = (DWORD) lpNewItem;
- }
- else
- {
- /*if(mii.dwTypeData != NULL)
- {
- HeapFree(GetProcessHeap(),0, mii.dwTypeData);
- }*/
- if (*lpNewItem == '\b')
- {
- mii.fType |= MF_HELP;
- lpNewItem++;
- }
- mii.fMask |= MIIM_TYPE;
- mii.dwTypeData = (LPWSTR)lpNewItem;
- mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem));
- }
-
- if(uFlags & MF_RIGHTJUSTIFY)
- {
- mii.fType |= MFT_RIGHTJUSTIFY;
- }
- if(uFlags & MF_MENUBREAK)
- {
- mii.fType |= MFT_MENUBREAK;
- }
- if(uFlags & MF_MENUBARBREAK)
- {
- mii.fType |= MFT_MENUBARBREAK;
- }
- if(uFlags & MF_DISABLED)
- {
- mii.fState |= MFS_DISABLED;
- }
- if(uFlags & MF_GRAYED)
- {
- mii.fState |= MFS_GRAYED;
- }
-
- if ((mii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (mii.hSubMenu != (HMENU)uIDNewItem))
- NtUserDestroyMenu( mii.hSubMenu );
-
- if(uFlags & MF_POPUP)
- {
- mii.fType |= MF_POPUP;
- mii.fMask |= MIIM_SUBMENU;
- mii.hSubMenu = (HMENU)uIDNewItem;
- }
- else
- {
- mii.fMask |= MIIM_ID;
- mii.wID = (UINT)uIDNewItem;
- }
-
+ mii.fMask = MIIM_FTYPE;
+
+ if (!MenuGetRosMenuInfo( &mi, hMnu )) return FALSE;
+
+ mi.Height = 0; // Force size recalculation.
+
+ if (!MenuSetRosMenuInfo( &mi )) return FALSE;
+
+ MenuInitRosMenuItemInfo( &rmii );
+
+ if(!MenuGetRosMenuItemInfo( hMnu, uPosition, &rmii)) return FALSE;
+
+ if ((rmii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (rmii.hSubMenu != (HMENU)uIDNewItem))
+ NtUserDestroyMenu( rmii.hSubMenu ); /* ModifyMenu() spec */
+
+ MenuCleanupRosMenuItemInfo( &rmii );
+
+ /* Init new data for this menu item */
+ MenuSetItemData( &mii,
+ uFlags,
+ uIDNewItem,
+ lpNewItem,
+ TRUE);
+
+ /* Now, make Win32k IntSetMenuItemInfo handle the changes to this menu item. */
return SetMenuItemInfoW( hMnu,
uPosition,
(BOOL)(MF_BYPOSITION & uFlags),
@@ -4641,7 +4804,9 @@
HBITMAP hBitmapChecked)
{
ROSMENUITEMINFO uItem;
-
+ memset ( &uItem, 0, sizeof(uItem) );
+ uItem.fMask = MIIM_STATE | MIIM_BITMAP;
+
if(!(NtUserMenuItemInfo(hMenu, uPosition,
(BOOL)(MF_BYPOSITION & uFlags), &uItem, FALSE))) return FALSE;
@@ -4673,16 +4838,35 @@
{
MENUITEMINFOW MenuItemInfoW;
UNICODE_STRING UnicodeString;
- ULONG Result;
+ NTSTATUS Status;
+ ULONG Result = FALSE;
RtlCopyMemory(&MenuItemInfoW, lpmii, min(lpmii->cbSize, sizeof(MENUITEMINFOW)));
- if ((MenuItemInfoW.fMask & (MIIM_TYPE | MIIM_STRING)) &&
- (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING) &&
- MenuItemInfoW.dwTypeData != NULL)
+ if( lpmii->cbSize != sizeof( MENUITEMINFOW))
{
- RtlCreateUnicodeStringFromAsciiz(&UnicodeString,
+ MenuItemInfoW.cbSize = sizeof( MENUITEMINFOW);
+ MenuItemInfoW.hbmpItem = NULL;
+ }
+/*
+ * MIIM_STRING == good
+ * MIIM_TYPE & MFT_STRING == good
+ * MIIM_STRING & MFT_STRING == good
+ * MIIM_STRING & MFT_OWNERSRAW == good
+ */
+ if (((MenuItemInfoW.fMask & MIIM_STRING) ||
+ ((MenuItemInfoW.fMask & MIIM_TYPE) &&
+ (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING)))
+ && MenuItemInfoW.dwTypeData != NULL)
+ {
+/* cch is ignored when the content of a menu item is set by calling SetMenuItemInfo. */
+ Status = RtlCreateUnicodeStringFromAsciiz(&UnicodeString,
(LPSTR)MenuItemInfoW.dwTypeData);
+ if (!NT_SUCCESS (Status))
+ {
+ SetLastError (RtlNtStatusToDosError(Status));
+ return FALSE;
+ }
MenuItemInfoW.dwTypeData = UnicodeString.Buffer;
MenuItemInfoW.cch = UnicodeString.Length / sizeof(WCHAR);
}
@@ -4715,15 +4899,27 @@
LPCMENUITEMINFOW lpmii)
{
MENUITEMINFOW MenuItemInfoW;
+ ULONG Result;
RtlCopyMemory(&MenuItemInfoW, lpmii, min(lpmii->cbSize, sizeof(MENUITEMINFOW)));
- if (0 != (MenuItemInfoW.fMask & MIIM_STRING))
+
+ if( lpmii->cbSize != sizeof( MENUITEMINFOW))
{
- MenuItemInfoW.cch = wcslen(MenuItemInfoW.dwTypeData);
+ MenuItemInfoW.cbSize = sizeof( MENUITEMINFOW);
+ MenuItemInfoW.hbmpItem = NULL;
}
- return NtUserMenuItemInfo(hMenu, uItem, fByPosition,
+ if (((MenuItemInfoW.fMask & MIIM_STRING) ||
+ ((MenuItemInfoW.fMask & MIIM_TYPE) &&
+ (MENU_ITEM_TYPE(MenuItemInfoW.fType) == MF_STRING)))
+ && MenuItemInfoW.dwTypeData != NULL)
+ {
+ MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData);
+ }
+ Result = NtUserMenuItemInfo(hMenu, uItem, fByPosition,
(PROSMENUITEMINFO)&MenuItemInfoW, TRUE);
+
+ return Result;
}
/*
@@ -4939,3 +5135,5 @@
return InsertMenuA(hMenu, cmd, flags, cmdInsert, lpszNewItem);
};
}
+
+
Modified: branches/ros-branch-0_3_0/reactos/include/reactos/win32k/ntusrtyp.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/includ…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/include/reactos/win32k/ntusrtyp.h (original)
+++ branches/ros-branch-0_3_0/reactos/include/reactos/win32k/ntusrtyp.h Mon Jul 31 09:18:08 2006
@@ -164,6 +164,7 @@
/* ----------- Extra ----------- */
RECT Rect; /* Item area (relative to menu window) */
UINT XTab; /* X position of text after Tab */
+ LPWSTR Text; /* Copy of the text pointer in MenuItem->Text */
} ROSMENUITEMINFO, *PROSMENUITEMINFO;
#endif
Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/menu.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/subsys…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/menu.c (original)
+++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/menu.c Mon Jul 31 09:18:08 2006
@@ -277,6 +277,7 @@
{
if(Menu)
{
+ PWINDOW_OBJECT Window;
PWINSTATION_OBJECT WindowStation;
NTSTATUS Status;
@@ -296,6 +297,14 @@
NULL);
if(NT_SUCCESS(Status))
{
+ if (Menu->MenuInfo.Wnd)
+ {
+ Window = UserGetWindowObject(Menu->MenuInfo.Wnd);
+ if (Window)
+ {
+ Window->IDMenu = 0;
+ }
+ }
ObmDeleteObject(Menu->MenuInfo.Self, otMenu);
ObDereferenceObject(WindowStation);
return TRUE;
@@ -683,6 +692,10 @@
{
NTSTATUS Status;
+ if(lpmii->fMask & (MIIM_FTYPE | MIIM_TYPE))
+ {
+ lpmii->fType = MenuItem->fType;
+ }
if(lpmii->fMask & MIIM_BITMAP)
{
lpmii->hbmpItem = MenuItem->hbmpItem;
@@ -696,10 +709,6 @@
{
lpmii->dwItemData = MenuItem->dwItemData;
}
- if(lpmii->fMask & (MIIM_FTYPE | MIIM_TYPE))
- {
- lpmii->fType = MenuItem->fType;
- }
if(lpmii->fMask & MIIM_ID)
{
lpmii->wID = MenuItem->wID;
@@ -712,7 +721,9 @@
{
lpmii->hSubMenu = MenuItem->hSubMenu;
}
- if (lpmii->fMask & (MIIM_STRING | MIIM_TYPE))
+
+ if ((lpmii->fMask & MIIM_STRING) ||
+ ((lpmii->fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(lpmii->fType) == MF_STRING)))
{
if (lpmii->dwTypeData == NULL)
{
@@ -735,6 +746,7 @@
{
lpmii->Rect = MenuItem->Rect;
lpmii->XTab = MenuItem->XTab;
+ lpmii->Text = MenuItem->Text.Buffer;
}
return TRUE;
@@ -752,36 +764,61 @@
}
if( lpmii->fType & ~fTypeMask)
{
- DPRINT("IntSetMenuItemInfo invalid fType flags %x\n", lpmii->fType & ~fTypeMask);
+ DbgPrint("IntSetMenuItemInfo invalid fType flags %x\n", lpmii->fType & ~fTypeMask);
lpmii->fMask &= ~(MIIM_TYPE | MIIM_FTYPE);
}
- if(lpmii->fMask & MIIM_BITMAP)
- {
- MenuItem->hbmpItem = lpmii->hbmpItem;
- }
- if(lpmii->fMask & MIIM_CHECKMARKS)
- {
- MenuItem->hbmpChecked = lpmii->hbmpChecked;
- MenuItem->hbmpUnchecked = lpmii->hbmpUnchecked;
- }
- if(lpmii->fMask & MIIM_DATA)
- {
- MenuItem->dwItemData = lpmii->dwItemData;
- }
- if(lpmii->fMask & (MIIM_FTYPE | MIIM_TYPE))
- {
+ if(lpmii->fMask & MIIM_TYPE)
+ {
+ if(lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP))
+ {
+ DbgPrint("IntSetMenuItemInfo: Invalid combination of fMask bits used\n");
+ /* this does not happen on Win9x/ME */
+ SetLastNtError( ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
/*
* Delete the menu item type when changing type from
* MF_STRING.
*/
if (MenuItem->fType != lpmii->fType &&
- MENU_ITEM_TYPE(MenuItem->fType) == MF_STRING)
+ MENU_ITEM_TYPE(MenuItem->fType) == MFT_STRING)
{
FreeMenuText(MenuItem);
RtlInitUnicodeString(&MenuItem->Text, NULL);
}
- MenuItem->fType &= ~MENU_ITEM_TYPE(MenuItem->fType);
- MenuItem->fType |= MENU_ITEM_TYPE(lpmii->fType);
+ if(lpmii->fType & MFT_BITMAP)
+ {
+// if(lpmii->hbmpItem)
+ MenuItem->hbmpItem = lpmii->hbmpItem;
+// else
+// { /* Win 9x/Me stuff */
+// MenuItem->hbmpItem = (HBITMAP)lpmii->dwTypeData;
+// }
+ }
+ MenuItem->fType |= lpmii->fType;
+ }
+ if (lpmii->fMask & MIIM_FTYPE )
+ {
+ if(( lpmii->fType & MFT_BITMAP))
+ {
+ DbgPrint("IntSetMenuItemInfo: Can not use FTYPE and MFT_BITMAP.\n");
+ SetLastNtError( ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+ MenuItem->fType |= lpmii->fType; /* Need to save all the flags, this fixed MFT_RIGHTJUSTIFY */
+ }
+ if(lpmii->fMask & MIIM_BITMAP)
+ {
+ MenuItem->hbmpItem = lpmii->hbmpItem;
+ }
+ if(lpmii->fMask & MIIM_CHECKMARKS)
+ {
+ MenuItem->hbmpChecked = lpmii->hbmpChecked;
+ MenuItem->hbmpUnchecked = lpmii->hbmpUnchecked;
+ }
+ if(lpmii->fMask & MIIM_DATA)
+ {
+ MenuItem->dwItemData = lpmii->dwItemData;
}
if(lpmii->fMask & MIIM_ID)
{
@@ -819,8 +856,9 @@
MenuItem->fType &= ~MF_POPUP;
}
}
- if ((lpmii->fMask & (MIIM_TYPE | MIIM_STRING)) &&
- (MENU_ITEM_TYPE(lpmii->fType) == MF_STRING))
+
+ if ((lpmii->fMask & MIIM_STRING) ||
+ ((lpmii->fMask & MIIM_TYPE) && (MENU_ITEM_TYPE(lpmii->fType) == MF_STRING)))
{
FreeMenuText(MenuItem);
@@ -860,6 +898,7 @@
{
MenuItem->Rect = lpmii->Rect;
MenuItem->XTab = lpmii->XTab;
+ lpmii->Text = MenuItem->Text.Buffer; /* Send back new allocated string or zero */
}
return TRUE;
@@ -1019,6 +1058,7 @@
mii.hSubMenu = CurItem->hSubMenu;
mii.Rect = CurItem->Rect;
mii.XTab = CurItem->XTab;
+ mii.Text = CurItem->Text.Buffer;
Status = MmCopyToCaller(Buf, &mii, sizeof(ROSMENUITEMINFO));
if (! NT_SUCCESS(Status))
@@ -1397,27 +1437,38 @@
{
PWINSTATION_OBJECT WinStaObject;
HANDLE Handle;
-
- NTSTATUS Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation,
+ NTSTATUS Status;
+ PEPROCESS CurrentProcess = PsGetCurrentProcess();
+
+ if (CsrProcess != CurrentProcess)
+ {
+ /*
+ * CsrProcess does not have a Win32WindowStation
+ *
+ */
+
+ Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation,
KernelMode,
0,
&WinStaObject);
- if (!NT_SUCCESS(Status))
- {
- DPRINT("Validation of window station handle (0x%X) failed\n",
- PsGetCurrentProcess()->Win32WindowStation);
- SetLastNtError(Status);
- return (HMENU)0;
- }
-
- IntCreateMenu(&Handle, !PopupMenu);
-
- ObDereferenceObject(WinStaObject);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("Validation of window station handle (0x%X) failed\n",
+ CurrentProcess->Win32WindowStation);
+ SetLastNtError(Status);
+ return (HMENU)0;
+ }
+ IntCreateMenu(&Handle, !PopupMenu);
+ ObDereferenceObject(WinStaObject);
+ }
+ else
+ {
+ IntCreateMenu(&Handle, !PopupMenu);
+ }
+
return (HMENU)Handle;
}
-
-
HMENU STDCALL
NtUserCreateMenu(BOOL PopupMenu)
18 years, 4 months
- 1
- 0
[jimtabor] 23385: Sync Gdi32.
by jimtabor＠svn.reactos.org
Author: jimtabor
Date: Mon Jul 31 08:54:21 2006
New Revision: 23385
URL: http://svn.reactos.org/svn/reactos?rev=23385&view=rev
Log:
Sync Gdi32.
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubs.c
branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubsa.c
branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubsw.c
branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/objects/font.c
branches/ros-branch-0_3_0/reactos/include/reactos/win32k/ntgdibad.h
branches/ros-branch-0_3_0/reactos/include/wingdi.h
branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/text.c
branches/ros-branch-0_3_0/reactos/tools/nci/w32ksvc.db
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubs.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubs.c Mon Jul 31 08:54:21 2006
@@ -251,9 +251,7 @@
HDC hDc
)
{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
+ return NtGdiGetSetTextCharExtra( hDc, 0, FALSE);
}
@@ -390,13 +388,11 @@
int
STDCALL
SetTextCharacterExtra(
- HDC a0,
- int a1
- )
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
+ HDC hDC,
+ int CharExtra
+ )
+{
+ return NtGdiGetSetTextCharExtra( hDC, CharExtra, TRUE);
}
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubsa.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubsa.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubsa.c Mon Jul 31 08:54:21 2006
@@ -32,22 +32,6 @@
return 0;
}
-/*
- * @unimplemented
- */
-UINT
-APIENTRY
-GetOutlineTextMetricsA(
- HDC hdc,
- UINT cbData,
- LPOUTLINETEXTMETRICA lpOTM
- )
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
/*
* @unimplemented
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubsw.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubsw.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/misc/stubsw.c Mon Jul 31 08:54:21 2006
@@ -40,22 +40,6 @@
#endif
}
-/*
- * @unimplemented
- */
-UINT
-APIENTRY
-GetOutlineTextMetricsW(
- HDC hdc,
- UINT cbData,
- LPOUTLINETEXTMETRICW lpOTM
- )
-{
- UNIMPLEMENTED;
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
/*
* @unimplemented
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/objects/font.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/objects/font.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/gdi32/objects/font.c Mon Jul 31 08:54:21 2006
@@ -14,6 +14,33 @@
#include <debug.h>
#define INITIAL_FAMILY_COUNT 64
+
+/***********************************************************************
+ * TEXTMETRIC conversion functions.
+ */
+static void FONT_TextMetricWToA(const TEXTMETRICW *ptmW, LPTEXTMETRICA ptmA )
+{
+ ptmA->tmHeight = ptmW->tmHeight;
+ ptmA->tmAscent = ptmW->tmAscent;
+ ptmA->tmDescent = ptmW->tmDescent;
+ ptmA->tmInternalLeading = ptmW->tmInternalLeading;
+ ptmA->tmExternalLeading = ptmW->tmExternalLeading;
+ ptmA->tmAveCharWidth = ptmW->tmAveCharWidth;
+ ptmA->tmMaxCharWidth = ptmW->tmMaxCharWidth;
+ ptmA->tmWeight = ptmW->tmWeight;
+ ptmA->tmOverhang = ptmW->tmOverhang;
+ ptmA->tmDigitizedAspectX = ptmW->tmDigitizedAspectX;
+ ptmA->tmDigitizedAspectY = ptmW->tmDigitizedAspectY;
+ ptmA->tmFirstChar = ptmW->tmFirstChar > 255 ? 255 : ptmW->tmFirstChar;
+ ptmA->tmLastChar = ptmW->tmLastChar > 255 ? 255 : ptmW->tmLastChar;
+ ptmA->tmDefaultChar = ptmW->tmDefaultChar > 255 ? 255 : ptmW->tmDefaultChar;
+ ptmA->tmBreakChar = ptmW->tmBreakChar > 255 ? 255 : ptmW->tmBreakChar;
+ ptmA->tmItalic = ptmW->tmItalic;
+ ptmA->tmUnderlined = ptmW->tmUnderlined;
+ ptmA->tmStruckOut = ptmW->tmStruckOut;
+ ptmA->tmPitchAndFamily = ptmW->tmPitchAndFamily;
+ ptmA->tmCharSet = ptmW->tmCharSet;
+}
static BOOL FASTCALL
MetricsCharConvert(WCHAR w, UCHAR *b)
@@ -538,6 +565,160 @@
return NtGdiGetGlyphOutline ( hdc, uChar, uFormat, lpgm, cbBuffer, lpvBuffer, (CONST LPMAT2)lpmat2, TRUE);
}
+
+/*
+ * @implemented
+ */
+UINT
+APIENTRY
+GetOutlineTextMetricsA(
+ HDC hdc,
+ UINT cbData,
+ LPOUTLINETEXTMETRICA lpOTM
+ )
+{
+ char buf[512], *ptr;
+ UINT ret, needed;
+ OUTLINETEXTMETRICW *lpOTMW = (OUTLINETEXTMETRICW *)buf;
+ OUTLINETEXTMETRICA *output = lpOTM;
+ INT left, len;
+
+ if((ret = GetOutlineTextMetricsW(hdc, 0, NULL)) == 0)
+ return 0;
+ if(ret > sizeof(buf))
+ lpOTMW = HeapAlloc(GetProcessHeap(), 0, ret);
+ GetOutlineTextMetricsW(hdc, ret, lpOTMW);
+
+ needed = sizeof(OUTLINETEXTMETRICA);
+ if(lpOTMW->otmpFamilyName)
+ needed += WideCharToMultiByte(CP_ACP, 0,
+ (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFamilyName), -1,
+ NULL, 0, NULL, NULL);
+ if(lpOTMW->otmpFaceName)
+ needed += WideCharToMultiByte(CP_ACP, 0,
+ (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFaceName), -1,
+ NULL, 0, NULL, NULL);
+ if(lpOTMW->otmpStyleName)
+ needed += WideCharToMultiByte(CP_ACP, 0,
+ (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpStyleName), -1,
+ NULL, 0, NULL, NULL);
+ if(lpOTMW->otmpFullName)
+ needed += WideCharToMultiByte(CP_ACP, 0,
+ (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFullName), -1,
+ NULL, 0, NULL, NULL);
+
+ if(!lpOTM) {
+ ret = needed;
+ goto end;
+ }
+
+ DPRINT("needed = %d\n", needed);
+ if(needed > cbData)
+ /* Since the supplied buffer isn't big enough, we'll alloc one
+ that is and memcpy the first cbData bytes into the lpOTM at
+ the end. */
+ output = HeapAlloc(GetProcessHeap(), 0, needed);
+
+ ret = output->otmSize = min(needed, cbData);
+ FONT_TextMetricWToA( &lpOTMW->otmTextMetrics, &output->otmTextMetrics );
+ output->otmFiller = 0;
+ output->otmPanoseNumber = lpOTMW->otmPanoseNumber;
+ output->otmfsSelection = lpOTMW->otmfsSelection;
+ output->otmfsType = lpOTMW->otmfsType;
+ output->otmsCharSlopeRise = lpOTMW->otmsCharSlopeRise;
+ output->otmsCharSlopeRun = lpOTMW->otmsCharSlopeRun;
+ output->otmItalicAngle = lpOTMW->otmItalicAngle;
+ output->otmEMSquare = lpOTMW->otmEMSquare;
+ output->otmAscent = lpOTMW->otmAscent;
+ output->otmDescent = lpOTMW->otmDescent;
+ output->otmLineGap = lpOTMW->otmLineGap;
+ output->otmsCapEmHeight = lpOTMW->otmsCapEmHeight;
+ output->otmsXHeight = lpOTMW->otmsXHeight;
+ output->otmrcFontBox = lpOTMW->otmrcFontBox;
+ output->otmMacAscent = lpOTMW->otmMacAscent;
+ output->otmMacDescent = lpOTMW->otmMacDescent;
+ output->otmMacLineGap = lpOTMW->otmMacLineGap;
+ output->otmusMinimumPPEM = lpOTMW->otmusMinimumPPEM;
+ output->otmptSubscriptSize = lpOTMW->otmptSubscriptSize;
+ output->otmptSubscriptOffset = lpOTMW->otmptSubscriptOffset;
+ output->otmptSuperscriptSize = lpOTMW->otmptSuperscriptSize;
+ output->otmptSuperscriptOffset = lpOTMW->otmptSuperscriptOffset;
+ output->otmsStrikeoutSize = lpOTMW->otmsStrikeoutSize;
+ output->otmsStrikeoutPosition = lpOTMW->otmsStrikeoutPosition;
+ output->otmsUnderscoreSize = lpOTMW->otmsUnderscoreSize;
+ output->otmsUnderscorePosition = lpOTMW->otmsUnderscorePosition;
+
+
+ ptr = (char*)(output + 1);
+ left = needed - sizeof(*output);
+
+ if(lpOTMW->otmpFamilyName) {
+ output->otmpFamilyName = (LPSTR)(ptr - (char*)output);
+ len = WideCharToMultiByte(CP_ACP, 0,
+ (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFamilyName), -1,
+ ptr, left, NULL, NULL);
+ left -= len;
+ ptr += len;
+ } else
+ output->otmpFamilyName = 0;
+
+ if(lpOTMW->otmpFaceName) {
+ output->otmpFaceName = (LPSTR)(ptr - (char*)output);
+ len = WideCharToMultiByte(CP_ACP, 0,
+ (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFaceName), -1,
+ ptr, left, NULL, NULL);
+ left -= len;
+ ptr += len;
+ } else
+ output->otmpFaceName = 0;
+
+ if(lpOTMW->otmpStyleName) {
+ output->otmpStyleName = (LPSTR)(ptr - (char*)output);
+ len = WideCharToMultiByte(CP_ACP, 0,
+ (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpStyleName), -1,
+ ptr, left, NULL, NULL);
+ left -= len;
+ ptr += len;
+ } else
+ output->otmpStyleName = 0;
+
+ if(lpOTMW->otmpFullName) {
+ output->otmpFullName = (LPSTR)(ptr - (char*)output);
+ len = WideCharToMultiByte(CP_ACP, 0,
+ (WCHAR*)((char*)lpOTMW + (int)lpOTMW->otmpFullName), -1,
+ ptr, left, NULL, NULL);
+ left -= len;
+ } else
+ output->otmpFullName = 0;
+
+ assert(left == 0);
+
+ if(output != lpOTM) {
+ memcpy(lpOTM, output, cbData);
+ HeapFree(GetProcessHeap(), 0, output);
+ }
+
+end:
+ if(lpOTMW != (OUTLINETEXTMETRICW *)buf)
+ HeapFree(GetProcessHeap(), 0, lpOTMW);
+
+ return ret;
+}
+
+
+/*
+ * @implemented
+ */
+UINT
+APIENTRY
+GetOutlineTextMetricsW(
+ HDC hdc,
+ UINT cbData,
+ LPOUTLINETEXTMETRICW lpOTM
+ )
+{
+ return NtGdiGetOutlineTextMetrics(hdc, cbData, lpOTM);
+}
/*
Modified: branches/ros-branch-0_3_0/reactos/include/reactos/win32k/ntgdibad.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/includ…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/include/reactos/win32k/ntgdibad.h (original)
+++ branches/ros-branch-0_3_0/reactos/include/reactos/win32k/ntgdibad.h Mon Jul 31 08:54:21 2006
@@ -682,6 +682,11 @@
/* Should be done in user-mode using shared GDI Objects. */
INT STDCALL NtGdiGetStretchBltMode(HDC hDC);
+/* Should be done in user-mode using shared GDI Objects. */
+INT
+STDCALL
+NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set);
+
/* Use NtGdiDoPalette with GdiPalSetSystemEntries. */
UINT
STDCALL
Modified: branches/ros-branch-0_3_0/reactos/include/wingdi.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/includ…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/include/wingdi.h (original)
+++ branches/ros-branch-0_3_0/reactos/include/wingdi.h Mon Jul 31 08:54:21 2006
@@ -1128,6 +1128,7 @@
#define TT_POLYGON_TYPE 24
#define TT_PRIM_LINE 1
#define TT_PRIM_QSPLINE 2
+#define TT_PRIM_CSPLINE 3
#define FONTMAPPER_MAX 10
#define ENHMETA_STOCK_OBJECT 0x80000000
#define WGL_FONT_LINES 0
Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/text.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/subsys…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/text.c (original)
+++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/objects/text.c Mon Jul 31 08:54:21 2006
@@ -29,6 +29,10 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include <freetype/tttables.h>
+#include <freetype/fttrigon.h>
+#include <freetype/ftglyph.h>
+#include <freetype/ftoutln.h>
+#include <freetype/ftwinfnt.h>
#define NDEBUG
#include <debug.h>
@@ -1973,42 +1977,7 @@
UINT LastChar,
LPABC abc)
{
- DPRINT1("NtGdiGetCharABCWidths Is unimplemented, keep going anyway\n");
- return 1;
-}
-
-BOOL
-STDCALL
-NtGdiGetCharABCWidthsFloat(HDC hDC,
- UINT FirstChar,
- UINT LastChar,
- LPABCFLOAT abcF)
-{
- UNIMPLEMENTED;
- return FALSE;
-}
-
-DWORD
-STDCALL
-NtGdiGetCharacterPlacement(HDC hDC,
- LPCWSTR String,
- int Count,
- int MaxExtent,
- LPGCP_RESULTSW Results,
- DWORD Flags)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
-BOOL
-STDCALL
-NtGdiGetCharWidth32(HDC hDC,
- UINT FirstChar,
- UINT LastChar,
- LPINT Buffer)
-{
- LPINT SafeBuffer;
+ LPABC SafeBuffer;
PDC dc;
PTEXTOBJ TextObj;
PFONTGDI FontGDI;
@@ -2016,6 +1985,7 @@
FT_CharMap charmap, found = NULL;
UINT i, glyph_index, BufferSize;
HFONT hFont = 0;
+ NTSTATUS Status;
if (LastChar < FirstChar)
{
@@ -2023,7 +1993,7 @@
return FALSE;
}
- BufferSize = (LastChar - FirstChar + 1) * sizeof(INT);
+ BufferSize = (LastChar - FirstChar + 1) * sizeof(ABC);
SafeBuffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT);
if (SafeBuffer == NULL)
{
@@ -2081,6 +2051,150 @@
FT_Set_Pixel_Sizes(face,
TextObj->logfont.lfWidth,
/* FIXME should set character height if neg */
+ (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight :
+ TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
+
+ for (i = FirstChar; i <= LastChar; i++)
+ {
+ int adv, lsb, bbx, left, right;
+
+ glyph_index = FT_Get_Char_Index(face, i);
+ FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
+
+ left = (INT)face->glyph->metrics.horiBearingX & -64;
+ right = (INT)((face->glyph->metrics.horiBearingX + face->glyph->metrics.width) + 63) & -64;
+ adv = (face->glyph->advance.x + 32) >> 6;
+
+// int test = (INT)(face->glyph->metrics.horiAdvance + 63) >> 6;
+// DPRINT1("Advance Wine %d and Advance Ros %d\n",test, adv ); /* It's the same!*/
+
+ lsb = left >> 6;
+ bbx = (right - left) >> 6;
+/*
+ DPRINT1("lsb %d and bbx %d\n", lsb, bbx );
+ */
+ SafeBuffer[i - FirstChar].abcA = lsb;
+ SafeBuffer[i - FirstChar].abcB = bbx;
+ SafeBuffer[i - FirstChar].abcC = adv - lsb - bbx;
+ }
+ IntUnLockFreeType;
+ TEXTOBJ_UnlockText(TextObj);
+ Status = MmCopyToCaller(abc, SafeBuffer, BufferSize);
+ if (! NT_SUCCESS(Status))
+ {
+ SetLastNtError(Status);
+ ExFreePool(SafeBuffer);
+ return FALSE;
+ }
+ ExFreePool(SafeBuffer);
+ DPRINT("NtGdiGetCharABCWidths Worked!\n");
+ return TRUE;
+}
+
+BOOL
+STDCALL
+NtGdiGetCharABCWidthsFloat(HDC hDC,
+ UINT FirstChar,
+ UINT LastChar,
+ LPABCFLOAT abcF)
+{
+ UNIMPLEMENTED;
+ return FALSE;
+}
+
+DWORD
+STDCALL
+NtGdiGetCharacterPlacement(HDC hDC,
+ LPCWSTR String,
+ int Count,
+ int MaxExtent,
+ LPGCP_RESULTSW Results,
+ DWORD Flags)
+{
+ UNIMPLEMENTED;
+ return 0;
+}
+
+BOOL
+STDCALL
+NtGdiGetCharWidth32(HDC hDC,
+ UINT FirstChar,
+ UINT LastChar,
+ LPINT Buffer)
+{
+ LPINT SafeBuffer;
+ PDC dc;
+ PTEXTOBJ TextObj;
+ PFONTGDI FontGDI;
+ FT_Face face;
+ FT_CharMap charmap, found = NULL;
+ UINT i, glyph_index, BufferSize;
+ HFONT hFont = 0;
+
+ if (LastChar < FirstChar)
+ {
+ SetLastWin32Error(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+
+ BufferSize = (LastChar - FirstChar + 1) * sizeof(INT);
+ SafeBuffer = ExAllocatePoolWithTag(PagedPool, BufferSize, TAG_GDITEXT);
+ if (SafeBuffer == NULL)
+ {
+ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+ return FALSE;
+ }
+
+ dc = DC_LockDc(hDC);
+ if (dc == NULL)
+ {
+ ExFreePool(SafeBuffer);
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return FALSE;
+ }
+ hFont = dc->w.hFont;
+ TextObj = TEXTOBJ_LockText(hFont);
+ DC_UnlockDc(dc);
+
+ if (TextObj == NULL)
+ {
+ ExFreePool(SafeBuffer);
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return FALSE;
+ }
+
+ FontGDI = ObjToGDI(TextObj->Font, FONT);
+
+ face = FontGDI->face;
+ if (face->charmap == NULL)
+ {
+ for (i = 0; i < face->num_charmaps; i++)
+ {
+ charmap = face->charmaps[i];
+ if (charmap->encoding != 0)
+ {
+ found = charmap;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ DPRINT1("WARNING: Could not find desired charmap!\n");
+ ExFreePool(SafeBuffer);
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return FALSE;
+ }
+
+ IntLockFreeType;
+ FT_Set_Charmap(face, found);
+ IntUnLockFreeType;
+ }
+
+ IntLockFreeType;
+ FT_Set_Pixel_Sizes(face,
+ TextObj->logfont.lfWidth,
+ /* FIXME should set character height if neg */
(TextObj->logfont.lfHeight < 0 ?
- TextObj->logfont.lfHeight :
TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
@@ -2117,6 +2231,44 @@
return 0;
}
+static
+void
+FTVectorToPOINTFX(FT_Vector *vec, POINTFX *pt)
+{
+ pt->x.value = vec->x >> 6;
+ pt->x.fract = (vec->x & 0x3f) << 10;
+ pt->x.fract |= ((pt->x.fract >> 6) | (pt->x.fract >> 12));
+ pt->y.value = vec->y >> 6;
+ pt->y.fract = (vec->y & 0x3f) << 10;
+ pt->y.fract |= ((pt->y.fract >> 6) | (pt->y.fract >> 12));
+ return;
+}
+
+/*
+ This function builds an FT_Fixed from a float. It puts the integer part
+ in the highest 16 bits and the decimal part in the lowest 16 bits of the FT_Fixed.
+ It fails if the integer part of the float number is greater than SHORT_MAX.
+*/
+static inline FT_Fixed FT_FixedFromFloat(float f)
+{
+ short value = f;
+ unsigned short fract = (f - value) * 0xFFFF;
+ return (FT_Fixed)((long)value << 16 | (unsigned long)fract);
+}
+
+/*
+ This function builds an FT_Fixed from a FIXED. It simply put f.value
+ in the highest 16 bits and f.fract in the lowest 16 bits of the FT_Fixed.
+*/
+static inline FT_Fixed FT_FixedFromFIXED(FIXED f)
+{
+ return (FT_Fixed)((long)f.value << 16 | (unsigned long)f.fract);
+}
+
+/*
+ * Based on WineEngGetGlyphOutline
+ *
+ */
ULONG
APIENTRY
NtGdiGetGlyphOutline(
@@ -2125,12 +2277,631 @@
IN UINT iFormat,
OUT LPGLYPHMETRICS pgm,
IN ULONG cjBuf,
- OUT OPTIONAL PVOID pvBuf,
+ OUT OPTIONAL PVOID UnsafeBuf,
IN LPMAT2 pmat2,
IN BOOL bIgnoreRotation)
{
- UNIMPLEMENTED;
- return 0;
+ static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)};
+ PDC dc;
+ PTEXTOBJ TextObj;
+ PFONTGDI FontGDI;
+ HFONT hFont = 0;
+ NTSTATUS Status;
+ GLYPHMETRICS gm;
+ ULONG Size;
+ FT_Face ft_face;
+ FT_UInt glyph_index;
+ DWORD width, height, pitch, needed = 0;
+ FT_Bitmap ft_bitmap;
+ FT_Error error;
+ INT left, right, top = 0, bottom = 0;
+ FT_Angle angle = 0;
+ FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH;
+ FLOAT eM11, widthRatio = 1.0;
+ FT_Matrix transMat = identityMat;
+ BOOL needsTransform = FALSE;
+ INT orientation;
+ LONG aveWidth;
+ INT adv, lsb, bbx; /* These three hold to widths of the unrotated chars */
+ OUTLINETEXTMETRICW *potm;
+ PVOID pvBuf = NULL;
+
+ DPRINT("%p, %d, %08x, %p, %08lx, %p, %p\n", hdc, wch, iFormat, pgm,
+ cjBuf, UnsafeBuf, pmat2);
+
+ dc = DC_LockDc(hdc);
+ if (!dc)
+ {
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return GDI_ERROR;
+ }
+ eM11 = dc->w.xformWorld2Vport.eM11;
+ hFont = dc->w.hFont;
+ TextObj = TEXTOBJ_LockText(hFont);
+ DC_UnlockDc(dc);
+ if (!TextObj)
+ {
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return GDI_ERROR;
+ }
+ FontGDI = ObjToGDI(TextObj->Font, FONT);
+ ft_face = FontGDI->face;
+
+ aveWidth = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.lfWidth: 0;
+ orientation = FT_IS_SCALABLE(ft_face) ? TextObj->logfont.lfOrientation: 0;
+
+ Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL);
+ potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT);
+ if (!potm)
+ {
+ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+ TEXTOBJ_UnlockText(TextObj);
+ return GDI_ERROR;
+ }
+ IntGetOutlineTextMetrics(FontGDI, Size, potm);
+
+ IntLockFreeType;
+
+ /* During testing, I never saw this used. In here just incase.*/
+ if (ft_face->charmap == NULL)
+ {
+ DPRINT("WARNING: No charmap selected!\n");
+ DPRINT("This font face has %d charmaps\n", ft_face->num_charmaps);
+ int n;
+ FT_CharMap found = 0, charmap;
+
+ for (n = 0; n < ft_face->num_charmaps; n++)
+ {
+ charmap = ft_face->charmaps[n];
+ DPRINT("found charmap encoding: %u\n", charmap->encoding);
+ if (charmap->encoding != 0)
+ {
+ found = charmap;
+ break;
+ }
+ }
+ if (!found)
+ {
+ DPRINT1("WARNING: Could not find desired charmap!\n");
+ }
+ error = FT_Set_Charmap(ft_face, found);
+ if (error)
+ {
+ DPRINT1("WARNING: Could not set the charmap!\n");
+ }
+ }
+
+// FT_Set_Pixel_Sizes(ft_face,
+// TextObj->logfont.lfWidth,
+ /* FIXME should set character height if neg */
+// (TextObj->logfont.lfHeight < 0 ? - TextObj->logfont.lfHeight :
+// TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
+
+ TEXTOBJ_UnlockText(TextObj);
+
+ if (iFormat & GGO_GLYPH_INDEX)
+ {
+ glyph_index = wch;
+ iFormat &= ~GGO_GLYPH_INDEX;
+ }
+ else glyph_index = FT_Get_Char_Index(ft_face, wch);
+
+ if (orientation || (iFormat != GGO_METRICS && iFormat != GGO_BITMAP) || aveWidth || pmat2)
+ load_flags |= FT_LOAD_NO_BITMAP;
+
+ error = FT_Load_Glyph(ft_face, glyph_index, load_flags);
+ if (error)
+ {
+ DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index);
+ IntUnLockFreeType;
+ if (potm) ExFreePool(potm);
+ return GDI_ERROR;
+ }
+ IntUnLockFreeType;
+
+ if (aveWidth && potm)
+ {
+ widthRatio = (FLOAT)aveWidth * eM11 /
+ (FLOAT) potm->otmTextMetrics.tmAveCharWidth;
+ }
+
+ left = (INT)(ft_face->glyph->metrics.horiBearingX * widthRatio) & -64;
+ right = (INT)((ft_face->glyph->metrics.horiBearingX +
+ ft_face->glyph->metrics.width) * widthRatio + 63) & -64;
+
+ adv = (INT)((ft_face->glyph->metrics.horiAdvance * widthRatio) + 63) >> 6;
+ lsb = left >> 6;
+ bbx = (right - left) >> 6;
+
+ DPRINT("Advance = %d, lsb = %d, bbx = %d\n",adv, lsb, bbx);
+
+ IntLockFreeType;
+
+ /* Scaling transform */
+ if (aveWidth)
+ {
+ FT_Matrix scaleMat;
+ DPRINT("Scaling Trans!\n");
+ scaleMat.xx = FT_FixedFromFloat(widthRatio);
+ scaleMat.xy = 0;
+ scaleMat.yx = 0;
+ scaleMat.yy = (1 << 16);
+ FT_Matrix_Multiply(&scaleMat, &transMat);
+ needsTransform = TRUE;
+ }
+
+ /* Slant transform */
+ if (potm->otmTextMetrics.tmItalic)
+ {
+ FT_Matrix slantMat;
+ DPRINT("Slant Trans!\n");
+ slantMat.xx = (1 << 16);
+ slantMat.xy = ((1 << 16) >> 2);
+ slantMat.yx = 0;
+ slantMat.yy = (1 << 16);
+ FT_Matrix_Multiply(&slantMat, &transMat);
+ needsTransform = TRUE;
+ }
+
+ /* Rotation transform */
+ if (orientation)
+ {
+ FT_Matrix rotationMat;
+ FT_Vector vecAngle;
+ DPRINT("Rotation Trans!\n");
+ angle = FT_FixedFromFloat((float)orientation / 10.0);
+ FT_Vector_Unit(&vecAngle, angle);
+ rotationMat.xx = vecAngle.x;
+ rotationMat.xy = -vecAngle.y;
+ rotationMat.yx = -rotationMat.xy;
+ rotationMat.yy = rotationMat.xx;
+ FT_Matrix_Multiply(&rotationMat, &transMat);
+ needsTransform = TRUE;
+ }
+
+ /* Extra transformation specified by caller */
+ if (pmat2)
+ {
+ FT_Matrix extraMat;
+ DPRINT("MAT2 Matrix Trans!\n");
+ extraMat.xx = FT_FixedFromFIXED(pmat2->eM11);
+ extraMat.xy = FT_FixedFromFIXED(pmat2->eM21);
+ extraMat.yx = FT_FixedFromFIXED(pmat2->eM12);
+ extraMat.yy = FT_FixedFromFIXED(pmat2->eM22);
+ FT_Matrix_Multiply(&extraMat, &transMat);
+ needsTransform = TRUE;
+ }
+
+ if (potm) ExFreePool(potm); /* It looks like we are finished with potm ATM.*/
+
+ if (!needsTransform)
+ {
+ DPRINT("No Need to be Transformed!\n");
+ top = (ft_face->glyph->metrics.horiBearingY + 63) & -64;
+ bottom = (ft_face->glyph->metrics.horiBearingY -
+ ft_face->glyph->metrics.height) & -64;
+ gm.gmCellIncX = adv;
+ gm.gmCellIncY = 0;
+ }
+ else
+ {
+ INT xc, yc;
+ FT_Vector vec;
+ for(xc = 0; xc < 2; xc++)
+ {
+ for(yc = 0; yc < 2; yc++)
+ {
+ vec.x = (ft_face->glyph->metrics.horiBearingX +
+ xc * ft_face->glyph->metrics.width);
+ vec.y = ft_face->glyph->metrics.horiBearingY -
+ yc * ft_face->glyph->metrics.height;
+ DPRINT("Vec %ld,%ld\n", vec.x, vec.y);
+ FT_Vector_Transform(&vec, &transMat);
+ if(xc == 0 && yc == 0)
+ {
+ left = right = vec.x;
+ top = bottom = vec.y;
+ }
+ else
+ {
+ if(vec.x < left) left = vec.x;
+ else if(vec.x > right) right = vec.x;
+ if(vec.y < bottom) bottom = vec.y;
+ else if(vec.y > top) top = vec.y;
+ }
+ }
+ }
+ left = left & -64;
+ right = (right + 63) & -64;
+ bottom = bottom & -64;
+ top = (top + 63) & -64;
+
+ DPRINT("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom);
+ vec.x = ft_face->glyph->metrics.horiAdvance;
+ vec.y = 0;
+ FT_Vector_Transform(&vec, &transMat);
+ gm.gmCellIncX = (vec.x+63) >> 6;
+ gm.gmCellIncY = -((vec.y+63) >> 6);
+ }
+ gm.gmBlackBoxX = (right - left) >> 6;
+ gm.gmBlackBoxY = (top - bottom) >> 6;
+ gm.gmptGlyphOrigin.x = left >> 6;
+ gm.gmptGlyphOrigin.y = top >> 6;
+
+ DPRINT("CX %d CY %d BBX %d BBY %d GOX %d GOY %d\n",
+ gm.gmCellIncX, gm.gmCellIncY,
+ gm.gmBlackBoxX, gm.gmBlackBoxY,
+ gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y);
+
+ IntUnLockFreeType;
+
+ if (pgm)
+ {
+ Status = MmCopyToCaller(pgm, &gm, sizeof(GLYPHMETRICS));
+ if (! NT_SUCCESS(Status))
+ {
+ SetLastWin32Error(ERROR_INVALID_PARAMETER);
+ return GDI_ERROR;
+ }
+ DPRINT("Copied GLYPHMETRICS to User!\n");
+ }
+
+ if (iFormat == GGO_METRICS)
+ {
+ DPRINT("GGO_METRICS Exit!\n");
+ return 1; /* FIXME */
+ }
+
+ if (ft_face->glyph->format != ft_glyph_format_outline && iFormat != GGO_BITMAP)
+ {
+ DPRINT1("loaded a bitmap\n");
+ return GDI_ERROR;
+ }
+
+ if (UnsafeBuf && cjBuf)
+ {
+ pvBuf = ExAllocatePoolWithTag(PagedPool, cjBuf, TAG_GDITEXT);
+ if (pvBuf == NULL)
+ {
+ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+ return GDI_ERROR;
+ }
+ RtlZeroMemory(pvBuf, cjBuf);
+ }
+
+
+ switch(iFormat)
+ {
+ case GGO_BITMAP:
+ width = gm.gmBlackBoxX;
+ height = gm.gmBlackBoxY;
+ pitch = ((width + 31) >> 5) << 2;
+ needed = pitch * height;
+
+ if(!pvBuf || !cjBuf) break;
+
+ switch(ft_face->glyph->format)
+ {
+ case ft_glyph_format_bitmap:
+ {
+ BYTE *src = ft_face->glyph->bitmap.buffer, *dst = pvBuf;
+ INT w = (ft_face->glyph->bitmap.width + 7) >> 3;
+ INT h = ft_face->glyph->bitmap.rows;
+ while(h--)
+ {
+ RtlCopyMemory(dst, src, w);
+ src += ft_face->glyph->bitmap.pitch;
+ dst += pitch;
+ }
+ break;
+ }
+
+ case ft_glyph_format_outline:
+ ft_bitmap.width = width;
+ ft_bitmap.rows = height;
+ ft_bitmap.pitch = pitch;
+ ft_bitmap.pixel_mode = ft_pixel_mode_mono;
+ ft_bitmap.buffer = pvBuf;
+
+ IntLockFreeType;
+ if(needsTransform)
+ {
+ FT_Outline_Transform(&ft_face->glyph->outline, &transMat);
+ }
+ FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom );
+ /* Note: FreeType will only set 'black' bits for us. */
+ RtlZeroMemory(pvBuf, needed);
+ FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap);
+ IntUnLockFreeType;
+ break;
+
+ default:
+ DPRINT1("loaded glyph format %x\n", ft_face->glyph->format);
+ if(pvBuf) ExFreePool(pvBuf);
+ return GDI_ERROR;
+ }
+ break;
+
+ case GGO_GRAY2_BITMAP:
+ case GGO_GRAY4_BITMAP:
+ case GGO_GRAY8_BITMAP:
+ {
+ unsigned int mult, row, col;
+ BYTE *start, *ptr;
+
+ width = gm.gmBlackBoxX;
+ height = gm.gmBlackBoxY;
+ pitch = (width + 3) / 4 * 4;
+ needed = pitch * height;
+
+ if(!pvBuf || !cjBuf) break;
+
+ ft_bitmap.width = width;
+ ft_bitmap.rows = height;
+ ft_bitmap.pitch = pitch;
+ ft_bitmap.pixel_mode = ft_pixel_mode_grays;
+ ft_bitmap.buffer = pvBuf;
+
+ IntLockFreeType;
+ if(needsTransform)
+ {
+ FT_Outline_Transform(&ft_face->glyph->outline, &transMat);
+ }
+ FT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom );
+ RtlZeroMemory(ft_bitmap.buffer, cjBuf);
+ FT_Outline_Get_Bitmap(library, &ft_face->glyph->outline, &ft_bitmap);
+ IntUnLockFreeType;
+
+ if(iFormat == GGO_GRAY2_BITMAP)
+ mult = 4;
+ else if(iFormat == GGO_GRAY4_BITMAP)
+ mult = 16;
+ else if(iFormat == GGO_GRAY8_BITMAP)
+ mult = 64;
+ else
+ {
+ ASSERT(0);
+ break;
+ }
+
+ start = pvBuf;
+ for(row = 0; row < height; row++)
+ {
+ ptr = start;
+ for(col = 0; col < width; col++, ptr++)
+ {
+ *ptr = (((int)*ptr) * mult + 128) / 256;
+ }
+ start += pitch;
+ }
+ break;
+ }
+
+ case GGO_NATIVE:
+ {
+ int contour, point = 0, first_pt;
+ FT_Outline *outline = &ft_face->glyph->outline;
+ TTPOLYGONHEADER *pph;
+ TTPOLYCURVE *ppc;
+ DWORD pph_start, cpfx, type;
+
+ if(cjBuf == 0) pvBuf = NULL; /* This is okay, need cjBuf to allocate. */
+
+ IntLockFreeType;
+ if (needsTransform && pvBuf) FT_Outline_Transform(outline, &transMat);
+
+ for(contour = 0; contour < outline->n_contours; contour++)
+ {
+ pph_start = needed;
+ pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed);
+ first_pt = point;
+ if(pvBuf)
+ {
+ pph->dwType = TT_POLYGON_TYPE;
+ FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart);
+ }
+ needed += sizeof(*pph);
+ point++;
+ while(point <= outline->contours[contour])
+ {
+ ppc = (TTPOLYCURVE *)((char *)pvBuf + needed);
+ type = (outline->tags[point] & FT_Curve_Tag_On) ?
+ TT_PRIM_LINE : TT_PRIM_QSPLINE;
+ cpfx = 0;
+ do
+ {
+ if(pvBuf)
+ FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]);
+ cpfx++;
+ point++;
+ } while(point <= outline->contours[contour] &&
+ (outline->tags[point] & FT_Curve_Tag_On) ==
+ (outline->tags[point-1] & FT_Curve_Tag_On));
+
+ /* At the end of a contour Windows adds the start point, but
+ only for Beziers */
+ if(point > outline->contours[contour] &&
+ !(outline->tags[point-1] & FT_Curve_Tag_On))
+ {
+ if(pvBuf)
+ FTVectorToPOINTFX(&outline->points[first_pt], &ppc->apfx[cpfx]);
+ cpfx++;
+ }
+ else if(point <= outline->contours[contour] &&
+ outline->tags[point] & FT_Curve_Tag_On)
+ {
+ /* add closing pt for bezier */
+ if(pvBuf)
+ FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]);
+ cpfx++;
+ point++;
+ }
+ if(pvBuf)
+ {
+ ppc->wType = type;
+ ppc->cpfx = cpfx;
+ }
+ needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX);
+ }
+ if(pvBuf) pph->cb = needed - pph_start;
+ }
+ IntUnLockFreeType;
+ break;
+ }
+ case GGO_BEZIER:
+ {
+ /* Convert the quadratic Beziers to cubic Beziers.
+ The parametric eqn for a cubic Bezier is, from PLRM:
+ r(t) = at^3 + bt^2 + ct + r0
+ with the control points:
+ r1 = r0 + c/3
+ r2 = r1 + (c + b)/3
+ r3 = r0 + c + b + a
+
+ A quadratic Beizer has the form:
+ p(t) = (1-t)^2 p0 + 2(1-t)t p1 + t^2 p2
+
+ So equating powers of t leads to:
+ r1 = 2/3 p1 + 1/3 p0
+ r2 = 2/3 p1 + 1/3 p2
+ and of course r0 = p0, r3 = p2
+ */
+
+ int contour, point = 0, first_pt;
+ FT_Outline *outline = &ft_face->glyph->outline;
+ TTPOLYGONHEADER *pph;
+ TTPOLYCURVE *ppc;
+ DWORD pph_start, cpfx, type;
+ FT_Vector cubic_control[4];
+ if(cjBuf == 0) pvBuf = NULL;
+
+ if (needsTransform && pvBuf)
+ {
+ IntLockFreeType;
+ FT_Outline_Transform(outline, &transMat);
+ IntUnLockFreeType;
+ }
+
+ for(contour = 0; contour < outline->n_contours; contour++)
+ {
+ pph_start = needed;
+ pph = (TTPOLYGONHEADER *)((char *)pvBuf + needed);
+ first_pt = point;
+ if(pvBuf)
+ {
+ pph->dwType = TT_POLYGON_TYPE;
+ FTVectorToPOINTFX(&outline->points[point], &pph->pfxStart);
+ }
+ needed += sizeof(*pph);
+ point++;
+ while(point <= outline->contours[contour])
+ {
+ ppc = (TTPOLYCURVE *)((char *)pvBuf + needed);
+ type = (outline->tags[point] & FT_Curve_Tag_On) ?
+ TT_PRIM_LINE : TT_PRIM_CSPLINE;
+ cpfx = 0;
+ do
+ {
+ if(type == TT_PRIM_LINE)
+ {
+ if(pvBuf)
+ FTVectorToPOINTFX(&outline->points[point], &ppc->apfx[cpfx]);
+ cpfx++;
+ point++;
+ }
+ else
+ {
+ /* Unlike QSPLINEs, CSPLINEs always have their endpoint
+ so cpfx = 3n */
+
+ /* FIXME: Possible optimization in endpoint calculation
+ if there are two consecutive curves */
+ cubic_control[0] = outline->points[point-1];
+ if(!(outline->tags[point-1] & FT_Curve_Tag_On))
+ {
+ cubic_control[0].x += outline->points[point].x + 1;
+ cubic_control[0].y += outline->points[point].y + 1;
+ cubic_control[0].x >>= 1;
+ cubic_control[0].y >>= 1;
+ }
+ if(point+1 > outline->contours[contour])
+ cubic_control[3] = outline->points[first_pt];
+ else
+ {
+ cubic_control[3] = outline->points[point+1];
+ if(!(outline->tags[point+1] & FT_Curve_Tag_On))
+ {
+ cubic_control[3].x += outline->points[point].x + 1;
+ cubic_control[3].y += outline->points[point].y + 1;
+ cubic_control[3].x >>= 1;
+ cubic_control[3].y >>= 1;
+ }
+ }
+ /* r1 = 1/3 p0 + 2/3 p1
+ r2 = 1/3 p2 + 2/3 p1 */
+ cubic_control[1].x = (2 * outline->points[point].x + 1) / 3;
+ cubic_control[1].y = (2 * outline->points[point].y + 1) / 3;
+ cubic_control[2] = cubic_control[1];
+ cubic_control[1].x += (cubic_control[0].x + 1) / 3;
+ cubic_control[1].y += (cubic_control[0].y + 1) / 3;
+ cubic_control[2].x += (cubic_control[3].x + 1) / 3;
+ cubic_control[2].y += (cubic_control[3].y + 1) / 3;
+ if(pvBuf)
+ {
+ FTVectorToPOINTFX(&cubic_control[1], &ppc->apfx[cpfx]);
+ FTVectorToPOINTFX(&cubic_control[2], &ppc->apfx[cpfx+1]);
+ FTVectorToPOINTFX(&cubic_control[3], &ppc->apfx[cpfx+2]);
+ }
+ cpfx += 3;
+ point++;
+ }
+ }
+ while(point <= outline->contours[contour] &&
+ (outline->tags[point] & FT_Curve_Tag_On) ==
+ (outline->tags[point-1] & FT_Curve_Tag_On));
+ /* At the end of a contour Windows adds the start point,
+ but only for Beziers and we've already done that.
+ */
+ if(point <= outline->contours[contour] &&
+ outline->tags[point] & FT_Curve_Tag_On)
+ {
+ /* This is the closing pt of a bezier, but we've already
+ added it, so just inc point and carry on */
+ point++;
+ }
+ if(pvBuf)
+ {
+ ppc->wType = type;
+ ppc->cpfx = cpfx;
+ }
+ needed += sizeof(*ppc) + (cpfx - 1) * sizeof(POINTFX);
+ }
+ if(pvBuf) pph->cb = needed - pph_start;
+ }
+ break;
+ }
+
+ default:
+ DPRINT1("Unsupported format %d\n", iFormat);
+ if(pvBuf) ExFreePool(pvBuf);
+ return GDI_ERROR;
+ }
+
+ if (pvBuf)
+ {
+ Status = MmCopyToCaller(UnsafeBuf, pvBuf, cjBuf);
+ if (! NT_SUCCESS(Status))
+ {
+ SetLastWin32Error(ERROR_INVALID_PARAMETER);
+ ExFreePool(pvBuf);
+ return GDI_ERROR;
+ }
+ DPRINT("NtGdiGetGlyphOutline K -> U worked!\n");
+ ExFreePool(pvBuf);
+ }
+
+ DPRINT("NtGdiGetGlyphOutline END and needed %d\n", needed);
+ return needed;
}
DWORD
@@ -2143,15 +2914,68 @@
return 0;
}
+/*
+ From "Undocumented Windows 2000 Secrets" Appendix B, Table B-2, page
+ 472, this is NtGdiGetOutlineTextMetricsInternalW.
+ */
UINT
STDCALL
NtGdiGetOutlineTextMetrics(HDC hDC,
UINT Data,
LPOUTLINETEXTMETRICW otm)
{
- UNIMPLEMENTED;
- return 0;
-}
+ PDC dc;
+ PTEXTOBJ TextObj;
+ PFONTGDI FontGDI;
+ HFONT hFont = 0;
+ ULONG Size;
+ OUTLINETEXTMETRICW *potm;
+ NTSTATUS Status;
+
+ dc = DC_LockDc(hDC);
+ if (dc == NULL)
+ {
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return 0;
+ }
+ hFont = dc->w.hFont;
+ TextObj = TEXTOBJ_LockText(hFont);
+ DC_UnlockDc(dc);
+ if (TextObj == NULL)
+ {
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return 0;
+ }
+ FontGDI = ObjToGDI(TextObj->Font, FONT);
+ TEXTOBJ_UnlockText(TextObj);
+ Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL);
+ if (!otm) return Size;
+ if (Size > Data)
+ {
+ SetLastWin32Error(ERROR_INSUFFICIENT_BUFFER);
+ return 0;
+ }
+ potm = ExAllocatePoolWithTag(PagedPool, Size, TAG_GDITEXT);
+ if (NULL == potm)
+ {
+ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
+ return 0;
+ }
+ IntGetOutlineTextMetrics(FontGDI, Size, potm);
+ if (otm)
+ {
+ Status = MmCopyToCaller(otm, potm, Size);
+ if (! NT_SUCCESS(Status))
+ {
+ SetLastWin32Error(ERROR_INVALID_PARAMETER);
+ ExFreePool(potm);
+ return 0;
+ }
+ }
+ ExFreePool(potm);
+ return Size;
+}
+
BOOL
APIENTRY
@@ -3104,4 +3928,25 @@
return sizeof(LOGFONTW);
}
+
+/* Remove this HAX! after the below function is done in GDI32.DLL! */
+INT
+STDCALL
+NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set)
+{
+ /* Ulta-Ugly Hax! */
+ INT Ret = 0x80000000;
+ DPRINT("TextCharacterExtra %d", CharExtra);
+ PDC dc = DC_LockDc ( hDC );
+ if (!dc)
+ {
+ SetLastWin32Error(ERROR_INVALID_HANDLE);
+ return Ret;
+ }
+ Ret = dc->w.charExtra;
+ if( Set ) dc->w.charExtra = CharExtra;
+ DC_UnlockDc(dc);
+ return (Ret);
+}
+
/* EOF */
Modified: branches/ros-branch-0_3_0/reactos/tools/nci/w32ksvc.db
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/tools/nci/w32ksvc.db (original)
+++ branches/ros-branch-0_3_0/reactos/tools/nci/w32ksvc.db Mon Jul 31 08:54:21 2006
@@ -150,6 +150,7 @@
NtGdiGetRelAbs 1
NtGdiGetRegionData 3
NtGdiGetRgnBox 2
+NtGdiGetSetTextCharExtra 3
NtGdiGetStockObject 1
NtGdiGetStretchBltMode 1
NtGdiGetSystemPaletteEntries 4
18 years, 4 months
- 1
- 0
[jimtabor] 23384: Syned up CreateWindowEx changes.
by jimtabor＠svn.reactos.org
Author: jimtabor
Date: Mon Jul 31 07:36:12 2006
New Revision: 23384
URL: http://svn.reactos.org/svn/reactos?rev=23384&view=rev
Log:
Syned up CreateWindowEx changes.
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/mdi.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c
branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/class.c Mon Jul 31 07:36:12 2006
@@ -388,12 +388,12 @@
SmallIconHeight = GetSystemMetrics(SM_CYSMICON);
if (! GetIconInfo(StdIcon, &StdInfo))
{
- DPRINT1("Failed to get icon info for icon 0x%x\n", StdIcon);
+ DbgPrint("Failed to get icon info for icon 0x%x\n", StdIcon);
goto cleanup;
}
if (! GetObjectW(StdInfo.hbmMask, sizeof(BITMAP), &StdBitmapInfo))
{
- DPRINT1("Failed to get bitmap info for icon 0x%x bitmap 0x%x\n",
+ DbgPrint("Failed to get bitmap info for icon 0x%x bitmap 0x%x\n",
StdIcon, StdInfo.hbmColor);
goto cleanup;
}
@@ -410,71 +410,71 @@
hInfoDc = CreateICW(NULL, NULL, NULL, NULL);
if (NULL == hInfoDc)
{
- DPRINT1("Failed to create info DC\n");
+ DbgPrint("Failed to create info DC\n");
goto cleanup;
}
hSourceDc = CreateCompatibleDC(NULL);
if (NULL == hSourceDc)
{
- DPRINT1("Failed to create source DC\n");
+ DbgPrint("Failed to create source DC\n");
goto cleanup;
}
hDestDc = CreateCompatibleDC(NULL);
if (NULL == hDestDc)
{
- DPRINT1("Failed to create dest DC\n");
+ DbgPrint("Failed to create dest DC\n");
goto cleanup;
}
OldSourceBitmap = SelectObject(hSourceDc, StdInfo.hbmColor);
if (NULL == OldSourceBitmap)
{
- DPRINT1("Failed to select source color bitmap\n");
+ DbgPrint("Failed to select source color bitmap\n");
goto cleanup;
}
SmallInfo.hbmColor = CreateCompatibleBitmap(hInfoDc, SmallIconWidth,
SmallIconHeight);
if (NULL == SmallInfo.hbmColor)
{
- DPRINT1("Failed to create color bitmap\n");
+ DbgPrint("Failed to create color bitmap\n");
goto cleanup;
}
OldDestBitmap = SelectObject(hDestDc, SmallInfo.hbmColor);
if (NULL == OldDestBitmap)
{
- DPRINT1("Failed to select dest color bitmap\n");
+ DbgPrint("Failed to select dest color bitmap\n");
goto cleanup;
}
if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight,
hSourceDc, 0, 0, StdBitmapInfo.bmWidth,
StdBitmapInfo.bmHeight, SRCCOPY))
{
- DPRINT1("Failed to stretch color bitmap\n");
+ DbgPrint("Failed to stretch color bitmap\n");
goto cleanup;
}
if (NULL == SelectObject(hSourceDc, StdInfo.hbmMask))
{
- DPRINT1("Failed to select source mask bitmap\n");
+ DbgPrint("Failed to select source mask bitmap\n");
goto cleanup;
}
SmallInfo.hbmMask = CreateBitmap(SmallIconWidth, SmallIconHeight, 1, 1,
NULL);
if (NULL == SmallInfo.hbmMask)
{
- DPRINT1("Failed to create mask bitmap\n");
+ DbgPrint("Failed to create mask bitmap\n");
goto cleanup;
}
if (NULL == SelectObject(hDestDc, SmallInfo.hbmMask))
{
- DPRINT1("Failed to select dest mask bitmap\n");
+ DbgPrint("Failed to select dest mask bitmap\n");
goto cleanup;
}
if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight,
hSourceDc, 0, 0, StdBitmapInfo.bmWidth,
StdBitmapInfo.bmHeight, SRCCOPY))
{
- DPRINT1("Failed to stretch mask bitmap\n");
+ DbgPrint("Failed to stretch mask bitmap\n");
goto cleanup;
}
@@ -484,7 +484,7 @@
SmallIcon = CreateIconIndirect(&SmallInfo);
if (NULL == SmallIcon)
{
- DPRINT1("Failed to create icon\n");
+ DbgPrint("Failed to create icon\n");
goto cleanup;
}
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/mdi.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/mdi.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/mdi.c Mon Jul 31 07:36:12 2006
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
* Notes: Fairly complete implementation.
* Also, Excel and WinWord do _not_ use MDI so if you're trying
@@ -84,15 +84,9 @@
#include <wine/debug.h>
-
WINE_DEFAULT_DEBUG_CHANNEL(mdi);
-#define MDI_MAXLISTLENGTH 0x40
#define MDI_MAXTITLELENGTH 0xa1
-
-#define MDI_NOFRAMEREPAINT 0
-#define MDI_REPAINTFRAMENOW 1
-#define MDI_REPAINTFRAME 2
#define WM_MDICALCCHILDSCROLL 0x10ac /* this is exactly what Windows uses */
@@ -107,29 +101,30 @@
typedef struct
{
UINT nActiveChildren;
- HWND hwndChildMaximized;
HWND hwndActiveChild;
+ HWND *child; /* array of tracked children */
+ HMENU hFrameMenu;
HMENU hWindowMenu;
UINT idFirstChild;
LPWSTR frameTitle;
UINT nTotalCreated;
UINT mdiFlags;
UINT sbRecalc; /* SB_xxx flags for scrollbar fixup */
+ HBITMAP hBmpClose; /* ReactOS modification */
} MDICLIENTINFO;
-static HBITMAP hBmpClose = 0;
+//static HBITMAP hBmpClose = 0;
/* ----------------- declarations ----------------- */
-static void MDI_UpdateFrameText( HWND, HWND, BOOL, LPCWSTR);
+static void MDI_UpdateFrameText( HWND, HWND, LPCWSTR);
static BOOL MDI_AugmentFrameMenu( HWND, HWND );
-static BOOL MDI_RestoreFrameMenu( HWND, HWND );
+static BOOL MDI_RestoreFrameMenu( HWND, HWND, HBITMAP );
static LONG MDI_ChildActivate( HWND, HWND );
+static LRESULT MDI_RefreshMenu(MDICLIENTINFO *);
static HWND MDI_MoreWindowsDialog(HWND);
-static void MDI_SwapMenuItems(HWND, UINT, UINT);
static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );
static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );
-
static
HWND* WIN_ListChildren (HWND hWndparent)
@@ -169,51 +164,25 @@
return pHwnd;
}
-
-
#ifdef __REACTOS__
void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
void WINAPI CalcChildScroll(HWND hwnd, INT scroll);
-
-BOOL CALLBACK MDI_GetChildByID_EnumProc (HWND hwnd, LPARAM lParam )
-{
- DWORD *control = (DWORD *)lParam;
- if(*control == GetWindowLongW( hwnd, GWL_ID ))
- {
- *control = (DWORD)hwnd;
- return FALSE;
- }
- return TRUE;
-}
#endif
/* -------- Miscellaneous service functions ----------
*
* MDI_GetChildByID
*/
-static HWND MDI_GetChildByID(HWND hwnd, UINT id)
-{
-#ifdef __REACTOS__
- DWORD Control = id;
- if (hwnd && !EnumChildWindows(hwnd, (WNDENUMPROC)&MDI_GetChildByID_EnumProc, (LPARAM)&Control))
- {
- return (HWND)Control;
+static HWND MDI_GetChildByID(HWND hwnd, UINT id, MDICLIENTINFO *ci)
+{
+ int i;
+
+ for (i = 0; ci->nActiveChildren; i++)
+ {
+ if (GetWindowLongPtrW( ci->child[i], GWLP_ID ) == id)
+ return ci->child[i];
}
return 0;
-#else
- HWND ret;
- HWND *win_array;
- int i;
-
- if (!(win_array = WIN_ListChildren( hwnd ))) return 0;
- for (i = 0; win_array[i]; i++)
- {
- if (GetWindowLongA( win_array[i], GWL_ID ) == id) break;
- }
- ret = win_array[i];
- HeapFree( GetProcessHeap(), 0, win_array );
- return ret;
-#endif
}
static void MDI_PostUpdate(HWND hwnd, MDICLIENTINFO* ci, WORD recalc)
@@ -233,11 +202,11 @@
const struct builtin_class_descr MDICLIENT_builtin_class =
{
L"MDIClient", /* name */
- 0, /* style */
- MDIClientWndProcW, /* procW */
- MDIClientWndProcA, /* procA */
- sizeof(MDICLIENTINFO *), /* extra */
- IDC_ARROW, /* cursor */
+ 0, /* style */
+ MDIClientWndProcW, /* procW */
+ MDIClientWndProcA, /* procA */
+ sizeof(MDICLIENTINFO), /* extra */
+ IDC_ARROW, /* cursor */
(HBRUSH)(COLOR_APPWORKSPACE+1) /* brush */
};
@@ -253,7 +222,7 @@
{
if (win == WND_OTHER_PROCESS)
{
- ERR( "client %p belongs to other process\n", client );
+ if (IsWindow(client)) ERR( "client %p belongs to other process\n", client );
return NULL;
}
if (win->cbWndExtra < sizeof(MDICLIENTINFO)) WARN( "%p is not an MDI client\n", client );
@@ -278,82 +247,6 @@
return TRUE;
}
-/**********************************************************************
- * MDI_MenuModifyItem
- */
-static void MDI_MenuModifyItem( HWND client, HWND hWndChild )
-{
- MDICLIENTINFO *clientInfo = get_client_info( client );
- WCHAR buffer[128];
- UINT n, id;
-
- if (!clientInfo || !clientInfo->hWindowMenu) return;
-
- id = GetWindowLongA( hWndChild, GWL_ID );
- if (id >= clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT) return;
- buffer[0] = '&';
- buffer[1] = '1' + id - clientInfo->idFirstChild;
- buffer[2] = ' ';
- GetWindowTextW( hWndChild, buffer + 3, sizeof(buffer)/sizeof(WCHAR) - 3 );
-
- n = GetMenuState(clientInfo->hWindowMenu, id, MF_BYCOMMAND);
- ModifyMenuW(clientInfo->hWindowMenu, id, MF_BYCOMMAND | MF_STRING, id, buffer );
- CheckMenuItem(clientInfo->hWindowMenu, id, n & MF_CHECKED);
-}
-
-/**********************************************************************
- * MDI_MenuDeleteItem
- */
-static BOOL MDI_MenuDeleteItem( HWND client, HWND hWndChild )
-{
- WCHAR buffer[128];
- static const WCHAR format[] = {'&','%','d',' ',0};
- MDICLIENTINFO *clientInfo = get_client_info( client );
- UINT index = 0,id,n;
-
- if( !clientInfo->nActiveChildren || !clientInfo->hWindowMenu )
- return FALSE;
-
- id = GetWindowLongA( hWndChild, GWL_ID );
- DeleteMenu(clientInfo->hWindowMenu,id,MF_BYCOMMAND);
-
- /* walk the rest of MDI children to prevent gaps in the id
- * sequence and in the menu child list */
-
- for( index = id+1; index <= clientInfo->nActiveChildren +
- clientInfo->idFirstChild; index++ )
- {
- HWND hwnd = MDI_GetChildByID(client,index);
- if (!hwnd)
- {
- TRACE("no window for id=%i\n",index);
- continue;
- }
-
- /* set correct id */
- SetWindowLongW( hwnd, GWL_ID, GetWindowLongW( hwnd, GWL_ID ) - 1 );
-
- n = wsprintfW(buffer, format ,index - clientInfo->idFirstChild);
- GetWindowTextW( hwnd, buffer + n, sizeof(buffer)/sizeof(WCHAR) - n );
-
- /* change menu if the current child is to be shown in the
- * "Windows" menu
- */
- if (index <= clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT)
- ModifyMenuW(clientInfo->hWindowMenu ,index ,MF_BYCOMMAND | MF_STRING,
- index - 1 , buffer );
- }
-
- /* We must restore the "More Windows..." option if there are enough children
- */
- if (clientInfo->nActiveChildren - 1 > MDI_MOREWINDOWSLIMIT)
- {
- WCHAR szTmp[50];
- LoadStringW(User32Instance, IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
- AppendMenuW(clientInfo->hWindowMenu, MF_STRING, clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT, szTmp);
- }
- return TRUE;
-}
/**********************************************************************
* MDI_GetWindow
@@ -401,21 +294,28 @@
*
* It seems that the default height is about 2/3 of the client rect
*/
-static void MDI_CalcDefaultChildPos( HWND hwnd, WORD n, LPPOINT lpPos, INT delta)
+void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id )
{
INT nstagger;
RECT rect;
- INT spacing = GetSystemMetrics(SM_CYCAPTION) +
- GetSystemMetrics(SM_CYFRAME) - 1;
-
- GetClientRect( hwnd, &rect );
+ INT spacing = GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYFRAME) - 1;
+
+ if (total < 0) /* we are called from CreateWindow */
+ {
+ MDICLIENTINFO *ci = get_client_info(hwndClient);
+ total = ci ? ci->nTotalCreated : 0;
+ *id = ci->idFirstChild + ci->nActiveChildren;
+ TRACE("MDI child id %04x\n", *id);
+ }
+
+ GetClientRect( hwndClient, &rect );
if( rect.bottom - rect.top - delta >= spacing )
rect.bottom -= delta;
nstagger = (rect.bottom - rect.top)/(3 * spacing);
lpPos[1].x = (rect.right - rect.left - nstagger * spacing);
lpPos[1].y = (rect.bottom - rect.top - nstagger * spacing);
- lpPos[0].x = lpPos[0].y = spacing * (n%(nstagger+1));
+ lpPos[0].x = lpPos[0].y = spacing * (total%(nstagger+1));
}
/**********************************************************************
@@ -426,7 +326,6 @@
{
MDICLIENTINFO *ci;
HWND hwndFrame = GetParent(hwnd);
- HMENU oldFrameMenu = GetMenu(hwndFrame);
TRACE("%p %p %p\n", hwnd, hmenuFrame, hmenuWindow);
@@ -444,8 +343,13 @@
if (!(ci = get_client_info( hwnd ))) return 0;
- if( ci->hwndChildMaximized && hmenuFrame && hmenuFrame!=oldFrameMenu )
- MDI_RestoreFrameMenu( GetParent(hwnd), ci->hwndChildMaximized );
+ if (hmenuFrame)
+ {
+ if (hmenuFrame == ci->hFrameMenu) return (LRESULT)hmenuFrame;
+
+ if (IsZoomed(ci->hwndActiveChild))
+ MDI_RestoreFrameMenu( hwndFrame, ci->hwndActiveChild, ci->hBmpClose );
+ }
if( hmenuWindow && hmenuWindow != ci->hWindowMenu )
{
@@ -454,267 +358,146 @@
/* Agent newsreader calls this function with ci->hWindowMenu == NULL */
if( ci->hWindowMenu && ci->nActiveChildren )
{
- INT j;
- LPWSTR buffer = NULL;
- MENUITEMINFOW mii;
- INT nbWindowsMenuItems; /* num of documents shown + "More Windows..." if present */
- INT i = GetMenuItemCount(ci->hWindowMenu) - 1;
- INT pos = GetMenuItemCount(hmenuWindow) + 1;
-
- AppendMenuA( hmenuWindow, MF_SEPARATOR, 0, NULL);
-
- if (ci->nActiveChildren <= MDI_MOREWINDOWSLIMIT)
- nbWindowsMenuItems = ci->nActiveChildren;
- else
- nbWindowsMenuItems = MDI_MOREWINDOWSLIMIT + 1;
-
- j = i - nbWindowsMenuItems + 1;
-
- for( ; i >= j ; i-- )
- {
- memset(&mii, 0, sizeof(mii));
- mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_CHECKMARKS | MIIM_DATA | MIIM_ID | MIIM_STATE
- | MIIM_SUBMENU | MIIM_TYPE | MIIM_BITMAP;
-
- GetMenuItemInfoW(ci->hWindowMenu, i, TRUE, &mii);
- if(mii.cch) { /* Menu is MFT_STRING */
- mii.cch++; /* add room for '\0' */
- buffer = HeapAlloc(GetProcessHeap(), 0,
- mii.cch * sizeof(WCHAR));
- mii.dwTypeData = buffer;
- GetMenuItemInfoW(ci->hWindowMenu, i, TRUE, &mii);
- }
- DeleteMenu(ci->hWindowMenu, i, MF_BYPOSITION);
- InsertMenuItemW(hmenuWindow, pos, TRUE, &mii);
- if(buffer) {
- HeapFree(GetProcessHeap(), 0, buffer);
- buffer = NULL;
- }
- }
- /* remove separator */
- DeleteMenu(ci->hWindowMenu, i, MF_BYPOSITION);
- }
- ci->hWindowMenu = hmenuWindow;
+ UINT nActiveChildren_old = ci->nActiveChildren;
+
+ /* Remove all items from old Window menu */
+ ci->nActiveChildren = 0;
+ MDI_RefreshMenu(ci);
+
+ ci->hWindowMenu = hmenuWindow;
+
+ /* Add items to the new Window menu */
+ ci->nActiveChildren = nActiveChildren_old;
+ MDI_RefreshMenu(ci);
+ }
+ else
+ ci->hWindowMenu = hmenuWindow;
}
if (hmenuFrame)
{
SetMenu(hwndFrame, hmenuFrame);
- if( hmenuFrame!=oldFrameMenu )
- {
- if( ci->hwndChildMaximized )
- MDI_AugmentFrameMenu( GetParent(hwnd), ci->hwndChildMaximized );
+ if( hmenuFrame != ci->hFrameMenu )
+ {
+ HMENU oldFrameMenu = ci->hFrameMenu;
+
+ ci->hFrameMenu = hmenuFrame;
+ if (IsZoomed(ci->hwndActiveChild) && (GetWindowLongW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE))
+ MDI_AugmentFrameMenu( hwndFrame, ci->hwndActiveChild );
+
return (LRESULT)oldFrameMenu;
}
}
else
{
- HMENU menu = GetMenu( GetParent(hwnd) );
- INT nItems = GetMenuItemCount(menu) - 1;
- UINT iId = GetMenuItemID(menu,nItems) ;
-
- if( !(iId == SC_RESTORE || iId == SC_CLOSE) )
- {
- /* SetMenu() may already have been called, meaning that this window
- * already has its menu. But they may have done a SetMenu() on
- * an MDI window, and called MDISetMenu() after the fact, meaning
- * that the "if" to this "else" wouldn't catch the need to
- * augment the frame menu.
- */
- if( ci->hwndChildMaximized )
- MDI_AugmentFrameMenu( GetParent(hwnd), ci->hwndChildMaximized );
- }
- }
+ /* SetMenu() may already have been called, meaning that this window
+ * already has its menu. But they may have done a SetMenu() on
+ * an MDI window, and called MDISetMenu() after the fact, meaning
+ * that the "if" to this "else" wouldn't catch the need to
+ * augment the frame menu.
+ */
+ if( IsZoomed(ci->hwndActiveChild) )
+ MDI_AugmentFrameMenu( hwndFrame, ci->hwndActiveChild );
+ }
+
return 0;
}
/**********************************************************************
* MDIRefreshMenu
*/
-static LRESULT MDIRefreshMenu( HWND hwnd, HMENU hmenuFrame,
- HMENU hmenuWindow)
-{
- HWND hwndFrame = GetParent(hwnd);
- HMENU oldFrameMenu = GetMenu(hwndFrame);
-
- TRACE("%p %p %p\n", hwnd, hmenuFrame, hmenuWindow);
-
- FIXME("partially function stub\n");
-
- return (LRESULT)oldFrameMenu;
+static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci)
+{
+ UINT i, count, visible, id;
+ WCHAR buf[MDI_MAXTITLELENGTH];
+
+ TRACE("children %u, window menu %p\n", ci->nActiveChildren, ci->hWindowMenu);
+
+ if (!ci->hWindowMenu)
+ return 0;
+
+ if (!IsMenu(ci->hWindowMenu))
+ {
+ WARN("Window menu handle %p is no more valid\n", ci->hWindowMenu);
+ return 0;
+ }
+
+ /* Windows finds the last separator in the menu, and if after it
+ * there is a menu item with MDI magic ID removes all existing
+ * menu items after it, and then adds visible MDI children.
+ */
+ count = GetMenuItemCount(ci->hWindowMenu);
+ for (i = 0; i < count; i++)
+ {
+ MENUITEMINFOW mii;
+
+ memset(&mii, 0, sizeof(mii));
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_TYPE;
+ if (GetMenuItemInfoW(ci->hWindowMenu, i, TRUE, &mii))
+ {
+ if (mii.fType & MF_SEPARATOR)
+ {
+ /* Windows checks only ID of the menu item */
+ memset(&mii, 0, sizeof(mii));
+ mii.cbSize = sizeof(mii);
+ mii.fMask = MIIM_ID;
+ if (GetMenuItemInfoW(ci->hWindowMenu, i + 1, TRUE, &mii))
+ {
+ if (mii.wID == ci->idFirstChild)
+ {
+ TRACE("removing %u items including separator\n", count - i);
+ while (RemoveMenu(ci->hWindowMenu, i, MF_BYPOSITION))
+ /* nothing */;
+
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ visible = 0;
+ for (i = 0; i < ci->nActiveChildren; i++)
+ {
+ if (GetWindowLongW(ci->child[i], GWL_STYLE) & WS_VISIBLE)
+ {
+ id = ci->idFirstChild + visible;
+
+ if (visible == MDI_MOREWINDOWSLIMIT)
+ {
+ LoadStringW(User32Instance, IDS_MDI_MOREWINDOWS, buf, sizeof(buf)/sizeof(WCHAR));
+ AppendMenuW(ci->hWindowMenu, MF_STRING, id, buf);
+ break;
+ }
+
+ if (!visible)
+ /* Visio expects that separator has id 0 */
+ AppendMenuW(ci->hWindowMenu, MF_SEPARATOR, 0, NULL);
+
+ visible++;
+
+ SetWindowLongPtrW(ci->child[i], GWLP_ID, id);
+
+ buf[0] = '&';
+ buf[1] = '0' + visible;
+ buf[2] = ' ';
+ InternalGetWindowText(ci->child[i], buf + 3, sizeof(buf)/sizeof(WCHAR) - 3);
+ TRACE("Adding %p, id %u %s\n", ci->child[i], id, debugstr_w(buf));
+ AppendMenuW(ci->hWindowMenu, MF_STRING, id, buf);
+
+ if (ci->child[i] == ci->hwndActiveChild)
+ CheckMenuItem(ci->hWindowMenu, id, MF_CHECKED);
+ }
+ else
+ TRACE("MDI child %p is not visible, skipping\n", ci->child[i]);
+ }
+
+ return (LRESULT)ci->hFrameMenu;
}
/* ------------------ MDI child window functions ---------------------- */
-
-
-/**********************************************************************
- * MDICreateChild
- */
-static HWND MDICreateChild( HWND parent, MDICLIENTINFO *ci,
- LPMDICREATESTRUCTA cs, BOOL unicode )
-{
- POINT pos[2];
- DWORD style = cs->style | (WS_CHILD | WS_CLIPSIBLINGS);
- HWND hwnd, hwndMax = 0;
- UINT wIDmenu = ci->idFirstChild + ci->nActiveChildren;
-#ifndef __REACTOS__
- WND *wndParent;
-#endif
- static const WCHAR lpstrDef[] = {'j','u','n','k','!',0};
-
- TRACE("origin %i,%i - dim %i,%i, style %08lx\n",
- cs->x, cs->y, cs->cx, cs->cy, cs->style);
- /* calculate placement */
- MDI_CalcDefaultChildPos(parent, ci->nTotalCreated++, pos, 0);
-
-#ifndef __REACTOS__
- if (cs->cx == CW_USEDEFAULT || cs->cx == CW_USEDEFAULT16 || !cs->cx) cs->cx = pos[1].x;
- if (cs->cy == CW_USEDEFAULT || cs->cy == CW_USEDEFAULT16 || !cs->cy) cs->cy = pos[1].y;
-
- if (cs->x == CW_USEDEFAULT || cs->x == CW_USEDEFAULT16)
-#else
- if (cs->cx == CW_USEDEFAULT || !cs->cx) cs->cx = pos[1].x;
- if (cs->cy == CW_USEDEFAULT || !cs->cy) cs->cy = pos[1].y;
-
- if (cs->x == CW_USEDEFAULT)
-#endif
- {
- cs->x = pos[0].x;
- cs->y = pos[0].y;
- }
-
- /* restore current maximized child */
- if( (style & WS_VISIBLE) && ci->hwndChildMaximized )
- {
- TRACE("Restoring current maximized child %p\n", ci->hwndChildMaximized);
- if( style & WS_MAXIMIZE )
- SendMessageW(parent, WM_SETREDRAW, FALSE, 0L);
- hwndMax = ci->hwndChildMaximized;
- ShowWindow( hwndMax, SW_SHOWNOACTIVATE );
- if( style & WS_MAXIMIZE )
- SendMessageW(parent, WM_SETREDRAW, TRUE, 0L);
- }
-
- if (ci->nActiveChildren <= MDI_MOREWINDOWSLIMIT)
- /* this menu is needed to set a check mark in MDI_ChildActivate */
- if (ci->hWindowMenu != 0)
- AppendMenuW(ci->hWindowMenu, MF_STRING, wIDmenu, lpstrDef);
-
- ci->nActiveChildren++;
-
- /* fix window style */
-#ifndef __REACTOS__
- wndParent = WIN_FindWndPtr( parent );
- if( !(wndParent->dwStyle & MDIS_ALLCHILDSTYLES) )
-#else
- if( !(GetWindowLong(parent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) )
-#endif
- {
- TRACE("MDIS_ALLCHILDSTYLES is missing, fixing window style\n");
- style &= (WS_CHILD | WS_CLIPSIBLINGS | WS_MINIMIZE | WS_MAXIMIZE |
- WS_CLIPCHILDREN | WS_DISABLED | WS_VSCROLL | WS_HSCROLL );
- style |= (WS_VISIBLE | WS_OVERLAPPEDWINDOW);
- }
-
-#ifndef __REACTOS__
- if( wndParent->flags & WIN_ISWIN32 )
-#endif
- {
-#ifndef __REACTOS__
- WIN_ReleaseWndPtr( wndParent );
-#endif
- if(unicode)
- {
- MDICREATESTRUCTW *csW = (MDICREATESTRUCTW *)cs;
- hwnd = CreateWindowW( csW->szClass, csW->szTitle, style,
- csW->x, csW->y, csW->cx, csW->cy, parent,
- (HMENU)wIDmenu, csW->hOwner, csW );
- }
- else
- hwnd = CreateWindowA( cs->szClass, cs->szTitle, style,
- cs->x, cs->y, cs->cx, cs->cy, parent,
- (HMENU)wIDmenu, cs->hOwner, cs );
- }
-#ifndef __REACTOS__
- else
- {
- MDICREATESTRUCT16 cs16;
- SEGPTR title, cls, seg_cs16;
-
- WIN_ReleaseWndPtr( wndParent );
- STRUCT32_MDICREATESTRUCT32Ato16( cs, &cs16 );
- cs16.szTitle = title = MapLS( cs->szTitle );
- cs16.szClass = cls = MapLS( cs->szClass );
- seg_cs16 = MapLS( &cs16 );
- hwnd = WIN_Handle32( CreateWindow16( cs->szClass, cs->szTitle, style,
- cs16.x, cs16.y, cs16.cx, cs16.cy,
- HWND_16(parent), (HMENU16)wIDmenu,
- cs16.hOwner, (LPVOID)seg_cs16 ));
- UnMapLS( seg_cs16 );
- UnMapLS( title );
- UnMapLS( cls );
- }
-#endif
-
- /* MDI windows are WS_CHILD so they won't be activated by CreateWindow */
-
- if (hwnd)
- {
- /* All MDI child windows have the WS_EX_MDICHILD style */
- SetWindowLongW( hwnd, GWL_EXSTYLE, GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_MDICHILD );
-
- /* If we have more than 9 windows, we must insert the new one at the
- * 9th position in order to see it in the "Windows" menu
- */
- if (ci->nActiveChildren > MDI_MOREWINDOWSLIMIT)
- MDI_SwapMenuItems( parent, GetWindowLongW( hwnd, GWL_ID ),
- ci->idFirstChild + MDI_MOREWINDOWSLIMIT - 1);
-
- MDI_MenuModifyItem(parent, hwnd);
-
- /* Have we hit the "More Windows..." limit? If so, we must
- * add a "More Windows..." option
- */
- if (ci->nActiveChildren == MDI_MOREWINDOWSLIMIT + 1)
- {
- WCHAR szTmp[50];
- LoadStringW(User32Instance, IDS_MDI_MOREWINDOWS, szTmp, sizeof(szTmp)/sizeof(szTmp[0]));
-
- ModifyMenuW(ci->hWindowMenu,
- ci->idFirstChild + MDI_MOREWINDOWSLIMIT,
- MF_BYCOMMAND | MF_STRING,
- ci->idFirstChild + MDI_MOREWINDOWSLIMIT,
- szTmp);
- }
-
- if( IsIconic(hwnd) && ci->hwndActiveChild )
- {
- TRACE("Minimizing created MDI child %p\n", hwnd);
- ShowWindow( hwnd, SW_SHOWMINNOACTIVE );
- }
- else
- {
- /* WS_VISIBLE is clear if a) the MDI client has
- * MDIS_ALLCHILDSTYLES style and 2) the flag is cleared in the
- * MDICreateStruct. If so the created window is not shown nor
- * activated.
- */
- if (IsWindowVisible(hwnd)) ShowWindow(hwnd, SW_SHOW);
- }
- TRACE("created child - %p\n",hwnd);
- }
- else
- {
- ci->nActiveChildren--;
- DeleteMenu(ci->hWindowMenu,wIDmenu,MF_BYCOMMAND);
- if( IsWindow(hwndMax) )
- ShowWindow(hwndMax, SW_SHOWMAXIMIZED);
- }
-
- return hwnd;
-}
/**********************************************************************
* MDI_ChildGetMinMaxInfo
@@ -746,29 +529,32 @@
* Note: SetWindowPos sends WM_CHILDACTIVATE to the child window that is
* being activated
*/
-static void MDI_SwitchActiveChild( HWND clientHwnd, HWND childHwnd,
- BOOL bNextWindow )
-{
- HWND hwndTo = 0;
- HWND hwndPrev = 0;
- MDICLIENTINFO *ci = get_client_info( clientHwnd );
-
- hwndTo = MDI_GetWindow(ci, childHwnd, bNextWindow, 0);
-
- TRACE("from %p, to %p\n",childHwnd,hwndTo);
-
- if ( !hwndTo ) return; /* no window to switch to */
+static void MDI_SwitchActiveChild( MDICLIENTINFO *ci, HWND hwndTo, BOOL activate )
+{
+ HWND hwndPrev;
hwndPrev = ci->hwndActiveChild;
+ TRACE("from %p, to %p\n", hwndPrev, hwndTo);
+
if ( hwndTo != hwndPrev )
{
- SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0,
- SWP_NOMOVE | SWP_NOSIZE );
-
- if( bNextWindow && hwndPrev )
- SetWindowPos( hwndPrev, HWND_BOTTOM, 0, 0, 0, 0,
- SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE );
+ BOOL was_zoomed = IsZoomed(hwndPrev);
+
+ if (was_zoomed)
+ {
+ /* restore old MDI child */
+ SendMessageW( hwndPrev, WM_SETREDRAW, FALSE, 0 );
+ ShowWindow( hwndPrev, SW_RESTORE );
+ SendMessageW( hwndPrev, WM_SETREDRAW, TRUE, 0 );
+
+ /* activate new MDI child */
+ SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE );
+ /* maximize new MDI child */
+ ShowWindow( hwndTo, SW_MAXIMIZE );
+ }
+ /* activate new MDI child */
+ SetWindowPos( hwndTo, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | (activate ? 0 : SWP_NOACTIVATE) );
}
}
@@ -776,39 +562,55 @@
/**********************************************************************
* MDIDestroyChild
*/
-static LRESULT MDIDestroyChild( HWND parent, MDICLIENTINFO *ci,
+static LRESULT MDIDestroyChild( HWND client, MDICLIENTINFO *ci,
HWND child, BOOL flagDestroy )
{
+ UINT i;
+
+ TRACE("# of managed children %u\n", ci->nActiveChildren);
+
if( child == ci->hwndActiveChild )
{
- MDI_SwitchActiveChild(parent, child, TRUE);
-
- if( child == ci->hwndActiveChild )
- {
- ShowWindow( child, SW_HIDE);
- if( child == ci->hwndChildMaximized )
+ HWND next = MDI_GetWindow(ci, child, TRUE, 0);
+ if (next)
+ MDI_SwitchActiveChild(ci, next, TRUE);
+ else
+ {
+ ShowWindow(child, SW_HIDE);
+ if (IsZoomed(child))
{
- HWND frame = GetParent(parent);
- MDI_RestoreFrameMenu( frame, child );
- ci->hwndChildMaximized = 0;
- MDI_UpdateFrameText( frame, parent, TRUE, NULL);
+ MDI_RestoreFrameMenu(GetParent(client), child, ci->hBmpClose);
+ MDI_UpdateFrameText(GetParent(client), client, NULL);
}
-
- MDI_ChildActivate(parent, 0);
- }
- }
-
- MDI_MenuDeleteItem(parent, child);
-
- ci->nActiveChildren--;
-
- TRACE("child destroyed - %p\n",child);
+ MDI_ChildActivate(client, 0);
+ }
+ }
+
+ for (i = 0; i < ci->nActiveChildren; i++)
+ {
+ if (ci->child[i] == child)
+ {
+ HWND *new_child = HeapAlloc(GetProcessHeap(), 0, (ci->nActiveChildren - 1) * sizeof(HWND));
+ memcpy(new_child, ci->child, i * sizeof(HWND));
+ if (i + 1 < ci->nActiveChildren)
+ memcpy(new_child + i, ci->child + i + 1, (ci->nActiveChildren - i - 1) * sizeof(HWND));
+ HeapFree(GetProcessHeap(), 0, ci->child);
+ ci->child = new_child;
+
+ ci->nActiveChildren--;
+ break;
+ }
+ }
+
+ SendMessageW(client, WM_MDIREFRESHMENU, 0, 0);
if (flagDestroy)
{
MDI_PostUpdate(GetParent(child), ci, SB_BOTH+1);
DestroyWindow(child);
}
+
+ TRACE("child destroyed - %p\n", child);
return 0;
}
@@ -816,100 +618,44 @@
/**********************************************************************
* MDI_ChildActivate
*
- * Note: hWndChild is NULL when last child is being destroyed
+ * Called in response to WM_CHILDACTIVATE, or when last MDI child
+ * is being deactivated.
*/
static LONG MDI_ChildActivate( HWND client, HWND child )
{
- MDICLIENTINFO *clientInfo = get_client_info( client );
- HWND prevActiveWnd = clientInfo->hwndActiveChild;
+ MDICLIENTINFO *clientInfo;
+ HWND prevActiveWnd, frame;
BOOL isActiveFrameWnd;
- if (child && (!IsWindowEnabled( child ))) return 0;
-
- /* Don't activate if it is already active. Might happen
- since ShowWindow DOES activate MDI children */
+ clientInfo = get_client_info( client );
+
if (clientInfo->hwndActiveChild == child) return 0;
TRACE("%p\n", child);
- isActiveFrameWnd = (GetActiveWindow() == GetParent(client));
+ frame = GetParent(client);
+ isActiveFrameWnd = (GetActiveWindow() == frame);
+ prevActiveWnd = clientInfo->hwndActiveChild;
/* deactivate prev. active child */
if(prevActiveWnd)
{
- SetWindowLongA( prevActiveWnd, GWL_STYLE,
- GetWindowLongA( prevActiveWnd, GWL_STYLE ) | WS_SYSMENU );
- SendMessageA( prevActiveWnd, WM_NCACTIVATE, FALSE, 0L );
- SendMessageA( prevActiveWnd, WM_MDIACTIVATE, (WPARAM)prevActiveWnd, (LPARAM)child);
- /* uncheck menu item */
- if( clientInfo->hWindowMenu )
- {
- UINT prevID = GetWindowLongA( prevActiveWnd, GWL_ID );
-
- if (prevID - clientInfo->idFirstChild < MDI_MOREWINDOWSLIMIT)
- CheckMenuItem( clientInfo->hWindowMenu, prevID, 0);
- else
- CheckMenuItem( clientInfo->hWindowMenu,
- clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT - 1, 0);
- }
- }
-
- /* set appearance */
- if (clientInfo->hwndChildMaximized && clientInfo->hwndChildMaximized != child)
- {
- INT cmd = SW_SHOWNORMAL;
-
- if( child )
- {
- UINT state = GetMenuState(GetSystemMenu(child, FALSE), SC_MAXIMIZE, MF_BYCOMMAND);
- if (state != 0xFFFFFFFF && (state & (MF_DISABLED | MF_GRAYED)))
- SendMessageW(clientInfo->hwndChildMaximized, WM_SYSCOMMAND, SC_RESTORE, 0);
- else
- cmd = SW_SHOWMAXIMIZED;
-
- clientInfo->hwndActiveChild = child;
- }
-
- ShowWindow( clientInfo->hwndActiveChild, cmd );
- }
-
+ SendMessageW( prevActiveWnd, WM_NCACTIVATE, FALSE, 0L );
+ SendMessageW( prevActiveWnd, WM_MDIACTIVATE, (WPARAM)prevActiveWnd, (LPARAM)child);
+ }
+
+ MDI_SwitchActiveChild( clientInfo, child, FALSE );
clientInfo->hwndActiveChild = child;
- /* check if we have any children left */
- if( !child )
- {
- if( isActiveFrameWnd )
- SetFocus( client );
- return 0;
- }
-
- /* check menu item */
- if( clientInfo->hWindowMenu )
- {
- UINT id = GetWindowLongA( child, GWL_ID );
- /* The window to be activated must be displayed in the "Windows" menu */
- if (id >= clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT)
- {
- MDI_SwapMenuItems( GetParent(child),
- id, clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT - 1);
- id = clientInfo->idFirstChild + MDI_MOREWINDOWSLIMIT - 1;
- MDI_MenuModifyItem( GetParent(child), child );
- }
-
- CheckMenuItem(clientInfo->hWindowMenu, id, MF_CHECKED);
- }
- /* bring active child to the top */
- SetWindowPos( child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
+ MDI_RefreshMenu(clientInfo);
if( isActiveFrameWnd )
{
- SendMessageA( child, WM_NCACTIVATE, TRUE, 0L);
- if( GetFocus() == client )
- SendMessageA( client, WM_SETFOCUS, (WPARAM)client, 0L );
- else
- SetFocus( client );
- }
- SendMessageA( child, WM_MDIACTIVATE, (WPARAM)prevActiveWnd, (LPARAM)child );
+ SendMessageW( child, WM_NCACTIVATE, TRUE, 0L);
+ SetFocus( client );
+ }
+
+ SendMessageW( child, WM_MDIACTIVATE, (WPARAM)prevActiveWnd, (LPARAM)child );
return TRUE;
}
@@ -922,7 +668,7 @@
{
HDC hDCSrc = CreateCompatibleDC(0);
HDC hDCDest = CreateCompatibleDC(hDCSrc);
- HBITMAP hbClose = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_CLOSE) );
+ HBITMAP hbClose = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_OLD_CLOSE) );
HBITMAP hbCopy;
HBITMAP hobjSrc, hobjDest;
@@ -949,9 +695,6 @@
return hbCopy;
}
-
-
-
/**********************************************************************
* MDICascade
*/
@@ -961,11 +704,8 @@
BOOL has_icons = FALSE;
int i, total;
-DbgPrint("MDICascade\n");
-
- if (ci->hwndChildMaximized)
- SendMessageA( client, WM_MDIRESTORE,
- (WPARAM)ci->hwndChildMaximized, 0);
+ if (IsZoomed(ci->hwndActiveChild))
+ SendMessageW(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0);
if (ci->nActiveChildren == 0) return 0;
@@ -997,7 +737,7 @@
TRACE("move %p to (%ld,%ld) size [%ld,%ld]\n",
win_array[i], pos[0].x, pos[0].y, pos[1].x, pos[1].y);
- MDI_CalcDefaultChildPos(client, n++, pos, delta);
+ MDI_CalcDefaultChildPos(client, n++, pos, delta, NULL);
SetWindowPos( win_array[i], 0, pos[0].x, pos[0].y, pos[1].x, pos[1].y,
SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER);
}
@@ -1017,10 +757,8 @@
int i, total;
BOOL has_icons = FALSE;
-DbgPrint("MDITile\n");
-
- if (ci->hwndChildMaximized)
- SendMessageA( client, WM_MDIRESTORE, (WPARAM)ci->hwndChildMaximized, 0);
+ if (IsZoomed(ci->hwndActiveChild))
+ SendMessageW(client, WM_MDIRESTORE, (WPARAM)ci->hwndActiveChild, 0);
if (ci->nActiveChildren == 0) return;
@@ -1131,9 +869,9 @@
(LPCWSTR)HBMMENU_MBAR_CLOSE : (LPCWSTR)HBMMENU_MBAR_CLOSE_D );
/* The system menu is replaced by the child icon */
- hIcon = (HICON)GetClassLongW(hChild, GCL_HICONSM);
+ hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICONSM);
if (!hIcon)
- hIcon = (HICON)GetClassLongW(hChild, GCL_HICON);
+ hIcon = (HICON)GetClassLongPtrW(hChild, GCLP_HICON);
if (!hIcon)
hIcon = LoadIconW(NULL, IDI_APPLICATION);
if (hIcon)
@@ -1184,7 +922,7 @@
/**********************************************************************
* MDI_RestoreFrameMenu
*/
-static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild )
+static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild, HBITMAP hBmpClose )
{
MENUITEMINFOW menuInfo;
HMENU menu = GetMenu( frame );
@@ -1193,6 +931,9 @@
TRACE("frame %p,child %p,nIt=%d,iId=%d\n",frame,hChild,nItems,iId);
+ if( !menu ) return 0;
+
+ /* if there is no system buttons then nothing to do */
if(!(iId == SC_RESTORE || iId == SC_CLOSE) )
return 0;
@@ -1211,15 +952,22 @@
RemoveMenu(menu,0,MF_BYPOSITION);
+ if ( (menuInfo.fType & MFT_BITMAP) &&
+ (menuInfo.dwTypeData != 0) &&
+ (menuInfo.dwTypeData != (LPWSTR)hBmpClose) )
+ {
+ DeleteObject(menuInfo.dwTypeData);
+ }
+
if ( menuInfo.hbmpItem != 0 )
- DeleteObject(menuInfo.hbmpItem);
-
+ DeleteObject(menuInfo.hbmpItem);
+
/* close */
- DeleteMenu(menu,GetMenuItemCount(menu) - 1,MF_BYPOSITION);
+ DeleteMenu(menu, SC_CLOSE, MF_BYCOMMAND);
/* restore */
- DeleteMenu(menu,GetMenuItemCount(menu) - 1,MF_BYPOSITION);
+ DeleteMenu(menu, SC_RESTORE, MF_BYCOMMAND);
/* minimize */
- DeleteMenu(menu,GetMenuItemCount(menu) - 1,MF_BYPOSITION);
+ DeleteMenu(menu, SC_MINIMIZE, MF_BYCOMMAND);
DrawMenuBar(frame);
@@ -1234,13 +982,12 @@
*
* Note: lpTitle can be NULL
*/
-static void MDI_UpdateFrameText( HWND frame, HWND hClient,
- BOOL repaint, LPCWSTR lpTitle )
+static void MDI_UpdateFrameText( HWND frame, HWND hClient, LPCWSTR lpTitle )
{
WCHAR lpBuffer[MDI_MAXTITLELENGTH+1];
MDICLIENTINFO *ci = get_client_info( hClient );
- TRACE("repaint %i, frameText %s\n", repaint, debugstr_w(lpTitle));
+ TRACE("frameText %s\n", debugstr_w(lpTitle));
if (!ci) return;
@@ -1253,14 +1000,14 @@
/* store new "default" title if lpTitle is not NULL */
if (lpTitle)
{
- if (ci->frameTitle) HeapFree( GetProcessHeap(), 0, ci->frameTitle );
+ HeapFree( GetProcessHeap(), 0, ci->frameTitle );
if ((ci->frameTitle = HeapAlloc( GetProcessHeap(), 0, (strlenW(lpTitle)+1)*sizeof(WCHAR))))
strcpyW( ci->frameTitle, lpTitle );
}
if (ci->frameTitle)
{
- if (ci->hwndChildMaximized)
+ if (IsZoomed(ci->hwndActiveChild) && IsWindowVisible(ci->hwndActiveChild))
{
/* combine frame title and child title if possible */
@@ -1273,7 +1020,7 @@
if( i_frame_text_length + 6 < MDI_MAXTITLELENGTH )
{
strcatW( lpBuffer, lpBracket );
- if (GetWindowTextW( ci->hwndChildMaximized, lpBuffer + i_frame_text_length + 4,
+ if (GetWindowTextW( ci->hwndActiveChild, lpBuffer + i_frame_text_length + 4,
MDI_MAXTITLELENGTH - i_frame_text_length - 5 ))
strcatW( lpBuffer, lpBracket2 );
else
@@ -1289,9 +1036,6 @@
lpBuffer[0] = '\0';
DefWindowProcW( frame, WM_SETTEXT, 0, (LPARAM)lpBuffer );
- if( repaint == MDI_REPAINTFRAME)
- SetWindowPos( frame, 0,0,0,0,0, SWP_FRAMECHANGED |
- SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER );
}
@@ -1306,11 +1050,16 @@
{
MDICLIENTINFO *ci = NULL;
- if (WM_NCCREATE != message
- && NULL == (ci = get_client_info(hwnd)))
+// TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
+
+ if (WM_NCCREATE != message && NULL == (ci = get_client_info(hwnd)))
{
return 0;
}
+
+#ifndef __REACTOS__
+ if (!(ci = get_client_info( hwnd ))) return 0;
+#endif
switch (message)
{
@@ -1319,19 +1068,20 @@
if (!(ci = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ci))))
return FALSE;
SetWindowLongPtrW( hwnd, 0, (LONG_PTR)ci );
+ ci->hBmpClose = 0;
return TRUE;
#endif
case WM_CREATE:
{
- RECT rect;
/* Since we are using only cs->lpCreateParams, we can safely
* cast to LPCREATESTRUCTA here */
LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam;
#ifndef __REACTOS__
WND *wndPtr = WIN_GetPtr( hwnd );
+
+ wndPtr->flags |= WIN_ISMDICLIENT;
#endif
-
/* Translation layer doesn't know what's in the cs->lpCreateParams
* so we have to keep track of what environment we're in. */
@@ -1339,10 +1089,9 @@
if( wndPtr->flags & WIN_ISWIN32 )
#endif
{
-#define ccs ((LPCLIENTCREATESTRUCT)cs->lpCreateParams)
+ LPCLIENTCREATESTRUCT ccs = (LPCLIENTCREATESTRUCT)cs->lpCreateParams;
ci->hWindowMenu = ccs->hWindowMenu;
ci->idFirstChild = ccs->idFirstChild;
-#undef ccs
}
#ifndef __REACTOS__
else
@@ -1353,42 +1102,30 @@
}
WIN_ReleasePtr( wndPtr );
#endif
-
- ci->hwndChildMaximized = 0;
+ ci->child = NULL;
ci->nActiveChildren = 0;
ci->nTotalCreated = 0;
ci->frameTitle = NULL;
ci->mdiFlags = 0;
- SetWindowLongW( hwnd, GWL_STYLE, GetWindowLongW(hwnd,GWL_STYLE) | WS_CLIPCHILDREN );
-
- if (!hBmpClose) hBmpClose = CreateMDIMenuBitmap();
-
- if (ci->hWindowMenu != 0)
- AppendMenuW( ci->hWindowMenu, MF_SEPARATOR, 0, NULL );
-
- GetClientRect( GetParent(hwnd), &rect);
- MoveWindow( hwnd, 0, 0, rect.right, rect.bottom, FALSE );
-
- MDI_UpdateFrameText( GetParent(hwnd), hwnd, MDI_NOFRAMEREPAINT, NULL);
-
- TRACE("Client created - hwnd = %p, idFirst = %u\n", hwnd, ci->idFirstChild );
+ ci->hFrameMenu = GetMenu(cs->hwndParent);
+
+ if (!ci->hBmpClose) ci->hBmpClose = CreateMDIMenuBitmap();
+
+ TRACE("Client created: hwnd %p, Window menu %p, idFirst = %04x\n",
+ hwnd, ci->hWindowMenu, ci->idFirstChild );
return 0;
}
case WM_DESTROY:
{
- INT nItems;
- if( ci->hwndChildMaximized )
- MDI_RestoreFrameMenu( GetParent(hwnd), ci->hwndChildMaximized);
- if((ci->hWindowMenu != 0) &&
- (nItems = GetMenuItemCount(ci->hWindowMenu)) > 0)
- {
- ci->idFirstChild = nItems - 1;
- ci->nActiveChildren++; /* to delete a separator */
- while( ci->nActiveChildren-- )
- DeleteMenu(ci->hWindowMenu,MF_BYPOSITION,ci->idFirstChild--);
- }
- if (ci->frameTitle) HeapFree( GetProcessHeap(), 0, ci->frameTitle );
+ if( IsZoomed(ci->hwndActiveChild) )
+ MDI_RestoreFrameMenu(GetParent(hwnd), ci->hwndActiveChild, ci->hBmpClose);
+
+ ci->nActiveChildren = 0;
+ MDI_RefreshMenu(ci);
+
+ HeapFree( GetProcessHeap(), 0, ci->child );
+ HeapFree( GetProcessHeap(), 0, ci->frameTitle );
#ifdef __REACTOS__
HeapFree( GetProcessHeap(), 0, ci );
SetWindowLongPtrW( hwnd, 0, 0 );
@@ -1397,16 +1134,45 @@
}
case WM_MDIACTIVATE:
- if( ci->hwndActiveChild != (HWND)wParam )
- SetWindowPos((HWND)wParam, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE);
+ {
+ MDI_SwitchActiveChild( ci, (HWND)wParam, TRUE );
return 0;
+ }
case WM_MDICASCADE:
return MDICascade(hwnd, ci);
case WM_MDICREATE:
if (lParam)
- return (LRESULT)MDICreateChild( hwnd, ci, (MDICREATESTRUCTA *)lParam, unicode );
+ {
+ HWND child;
+
+ if (unicode)
+ {
+ MDICREATESTRUCTW *csW = (MDICREATESTRUCTW *)lParam;
+ child = CreateWindowExW(WS_EX_MDICHILD, csW->szClass,
+ csW->szTitle, csW->style,
+ csW->x, csW->y, csW->cx, csW->cy,
+ hwnd, 0, csW->hOwner,
+ (LPVOID)csW->lParam);
+ }
+ else
+ {
+ MDICREATESTRUCTA *csA = (MDICREATESTRUCTA *)lParam;
+ child = CreateWindowExA(WS_EX_MDICHILD, csA->szClass,
+ csA->szTitle, csA->style,
+ csA->x, csA->y, csA->cx, csA->cy,
+ hwnd, 0, csA->hOwner,
+ (LPVOID)csA->lParam);
+ }
+
+ if (IsZoomed(ci->hwndActiveChild))
+ {
+ MDI_AugmentFrameMenu(GetParent(hwnd), child);
+ MDI_UpdateFrameText(GetParent(hwnd), hwnd, NULL);
+ }
+ return (LRESULT)child;
+ }
return 0;
case WM_MDIDESTROY:
@@ -1415,9 +1181,8 @@
#else
return MDIDestroyChild( hwnd, ci, (HWND)wParam, TRUE );
#endif
-
case WM_MDIGETACTIVE:
- if (lParam) *(BOOL *)lParam = (ci->hwndChildMaximized != 0);
+ if (lParam) *(BOOL *)lParam = IsZoomed(ci->hwndActiveChild);
return (LRESULT)ci->hwndActiveChild;
case WM_MDIICONARRANGE:
@@ -1432,12 +1197,15 @@
return 0;
case WM_MDINEXT: /* lParam != 0 means previous window */
+ {
#ifndef __REACTOS__
- MDI_SwitchActiveChild( hwnd, WIN_GetFullHandle( (HWND)wParam ), !lParam );
+ HWND next = MDI_GetWindow( ci, WIN_GetFullHandle( (HWND)wParam ), !lParam, 0 );
#else
- MDI_SwitchActiveChild( hwnd, (HWND)wParam, !lParam );
+ HWND next = MDI_GetWindow( ci, (HWND)wParam, !lParam, 0 );
#endif
+ MDI_SwitchActiveChild( ci, next, TRUE );
break;
+ }
case WM_MDIRESTORE:
SendMessageW( (HWND)wParam, WM_SYSCOMMAND, SC_RESTORE, 0);
@@ -1447,7 +1215,7 @@
return MDISetMenu( hwnd, (HMENU)wParam, (HMENU)lParam );
case WM_MDIREFRESHMENU:
- return MDIRefreshMenu( hwnd, (HMENU)wParam, (HMENU)lParam );
+ return MDI_RefreshMenu( ci );
case WM_MDITILE:
ci->mdiFlags |= MDIF_NEEDUPDATE;
@@ -1474,8 +1242,25 @@
break;
case WM_PARENTNOTIFY:
- if (LOWORD(wParam) == WM_LBUTTONDOWN)
- {
+ switch (LOWORD(wParam))
+ {
+ case WM_CREATE:
+ if (GetWindowLongW((HWND)lParam, GWL_EXSTYLE) & WS_EX_MDICHILD)
+ {
+ ci->nTotalCreated++;
+ ci->nActiveChildren++;
+
+ if (!ci->child)
+ ci->child = HeapAlloc(GetProcessHeap(), 0, sizeof(HWND));
+ else
+ ci->child = HeapReAlloc(GetProcessHeap(), 0, ci->child, sizeof(HWND) * ci->nActiveChildren);
+
+ ci->child[ci->nActiveChildren - 1] = (HWND)lParam;
+ }
+ break;
+
+ case WM_LBUTTONDOWN:
+ {
HWND child;
POINT pt;
pt.x = (short)LOWORD(lParam);
@@ -1486,11 +1271,14 @@
if( child && child != hwnd && child != ci->hwndActiveChild )
SetWindowPos(child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE );
+ break;
+ }
}
return 0;
case WM_SIZE:
- if( IsWindow(ci->hwndChildMaximized) )
+ if( IsWindow(ci->hwndActiveChild) && IsZoomed(ci->hwndActiveChild) &&
+ (GetWindowLongW(ci->hwndActiveChild, GWL_STYLE) & WS_VISIBLE) )
{
RECT rect;
@@ -1499,9 +1287,9 @@
rect.right = LOWORD(lParam);
rect.bottom = HIWORD(lParam);
- AdjustWindowRectEx(&rect, GetWindowLongA(ci->hwndChildMaximized,GWL_STYLE),
- 0, GetWindowLongA(ci->hwndChildMaximized,GWL_EXSTYLE) );
- MoveWindow(ci->hwndChildMaximized, rect.left, rect.top,
+ AdjustWindowRectEx(&rect, GetWindowLongA(ci->hwndActiveChild, GWL_STYLE),
+ 0, GetWindowLongA(ci->hwndActiveChild, GWL_EXSTYLE) );
+ MoveWindow(ci->hwndActiveChild, rect.left, rect.top,
rect.right - rect.left, rect.bottom - rect.top, 1);
}
else
@@ -1540,38 +1328,6 @@
return MDIClientWndProc_common( hwnd, message, wParam, lParam, TRUE );
}
-#ifndef __REACTOS__
-/***********************************************************************
- * DefFrameProc (USER.445)
- */
-LRESULT WINAPI DefFrameProc16( HWND16 hwnd, HWND16 hwndMDIClient,
- UINT16 message, WPARAM16 wParam, LPARAM lParam )
-{
- switch (message)
- {
- case WM_SETTEXT:
- lParam = (LPARAM)MapSL(lParam);
- /* fall through */
- case WM_COMMAND:
- case WM_NCACTIVATE:
- case WM_SETFOCUS:
- case WM_SIZE:
- return DefFrameProcA( WIN_Handle32(hwnd), WIN_Handle32(hwndMDIClient),
- message, wParam, lParam );
-
- case WM_NEXTMENU:
- {
- MDINEXTMENU next_menu;
- DefFrameProcW( WIN_Handle32(hwnd), WIN_Handle32(hwndMDIClient),
- message, wParam, (LPARAM)&next_menu );
- return MAKELONG( HMENU_16(next_menu.hmenuNext), HWND_16(next_menu.hwndNext) );
- }
- default:
- return DefWindowProc16(hwnd, message, wParam, lParam);
- }
-}
-#endif
-
/***********************************************************************
* DefFrameProcA (USER32.@)
*/
@@ -1587,7 +1343,7 @@
DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, NULL, 0 );
LPWSTR text = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, text, len );
- MDI_UpdateFrameText(hwnd, hwndMDIClient, MDI_REPAINTFRAME, text );
+ MDI_UpdateFrameText( hwnd, hwndMDIClient, text );
HeapFree( GetProcessHeap(), 0, text );
}
return 1; /* success. FIXME: check text length */
@@ -1611,6 +1367,8 @@
UINT message, WPARAM wParam, LPARAM lParam)
{
MDICLIENTINFO *ci = get_client_info( hwndMDIClient );
+
+// TRACE("%p %p %04x (%s) %08x %08lx\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
if (ci)
{
@@ -1623,7 +1381,7 @@
if (id < ci->idFirstChild || id >= ci->idFirstChild + ci->nActiveChildren)
{
if( (id - 0xf000) & 0xf00f ) break;
- if( !ci->hwndChildMaximized ) break;
+ if( !IsZoomed(ci->hwndActiveChild) ) break;
switch( id )
{
case SC_CLOSE:
@@ -1635,7 +1393,7 @@
case SC_NEXTWINDOW:
case SC_PREVWINDOW:
case SC_RESTORE:
- return SendMessageW( ci->hwndChildMaximized, WM_SYSCOMMAND,
+ return SendMessageW( ci->hwndActiveChild, WM_SYSCOMMAND,
wParam, lParam);
}
}
@@ -1647,7 +1405,7 @@
childHwnd = MDI_MoreWindowsDialog(hwndMDIClient);
else
/* User chose one of the windows listed in the "Windows" menu */
- childHwnd = MDI_GetChildByID(hwndMDIClient,id);
+ childHwnd = MDI_GetChildByID(hwndMDIClient, id, ci);
if( childHwnd )
SendMessageW( hwndMDIClient, WM_MDIACTIVATE, (WPARAM)childHwnd, 0 );
@@ -1660,7 +1418,7 @@
break;
case WM_SETTEXT:
- MDI_UpdateFrameText(hwnd, hwndMDIClient, MDI_REPAINTFRAME, (LPWSTR)lParam );
+ MDI_UpdateFrameText( hwnd, hwndMDIClient, (LPWSTR)lParam );
return 1; /* success. FIXME: check text length */
case WM_SETFOCUS:
@@ -1673,27 +1431,24 @@
case WM_NEXTMENU:
{
-/* FIXME */
-#ifndef __REACTOS__
MDINEXTMENU *next_menu = (MDINEXTMENU *)lParam;
- if (!IsIconic(hwnd) && ci->hwndActiveChild && !ci->hwndChildMaximized)
+ if (!IsIconic(hwnd) && ci->hwndActiveChild && !IsZoomed(ci->hwndActiveChild))
{
/* control menu is between the frame system menu and
* the first entry of menu bar */
- WND *wndPtr = WIN_GetPtr(hwnd);
+// WND *wndPtr = WIN_GetPtr(hwnd);
if( (wParam == VK_LEFT && GetMenu(hwnd) == next_menu->hmenuIn) ||
- (wParam == VK_RIGHT && GetSubMenu(wndPtr->hSysMenu, 0) == next_menu->hmenuIn) )
+ (wParam == VK_RIGHT && GetSubMenu(GetMenu(hwnd), 0) == next_menu->hmenuIn) )
{
- WIN_ReleasePtr(wndPtr);
- wndPtr = WIN_GetPtr(ci->hwndActiveChild);
- next_menu->hmenuNext = GetSubMenu(wndPtr->hSysMenu, 0);
+// WIN_ReleasePtr(wndPtr);
+// wndPtr = WIN_GetPtr(ci->hwndActiveChild);
+ next_menu->hmenuNext = GetSubMenu(GetMenu(ci->hwndActiveChild), 0);
next_menu->hwndNext = ci->hwndActiveChild;
}
- WIN_ReleasePtr(wndPtr);
+// WIN_ReleasePtr(wndPtr);
}
-#endif
return 0;
}
}
@@ -1702,49 +1457,6 @@
return DefWindowProcW( hwnd, message, wParam, lParam );
}
-
-#ifndef __REACTOS__
-/***********************************************************************
- * DefMDIChildProc (USER.447)
- */
-LRESULT WINAPI DefMDIChildProc16( HWND16 hwnd, UINT16 message,
- WPARAM16 wParam, LPARAM lParam )
-{
- switch (message)
- {
- case WM_SETTEXT:
- return DefMDIChildProcA( WIN_Handle32(hwnd), message, wParam, (LPARAM)MapSL(lParam) );
- case WM_MENUCHAR:
- case WM_CLOSE:
- case WM_SETFOCUS:
- case WM_CHILDACTIVATE:
- case WM_SYSCOMMAND:
- case WM_SETVISIBLE:
- case WM_SIZE:
- case WM_SYSCHAR:
- return DefMDIChildProcW( WIN_Handle32(hwnd), message, wParam, lParam );
- case WM_GETMINMAXINFO:
- {
- MINMAXINFO16 *mmi16 = (MINMAXINFO16 *)MapSL(lParam);
- MINMAXINFO mmi;
- STRUCT32_MINMAXINFO16to32( mmi16, &mmi );
- DefMDIChildProcW( WIN_Handle32(hwnd), message, wParam, (LPARAM)&mmi );
- STRUCT32_MINMAXINFO32to16( &mmi, mmi16 );
- return 0;
- }
- case WM_NEXTMENU:
- {
- MDINEXTMENU next_menu;
- DefMDIChildProcW( WIN_Handle32(hwnd), message, wParam, (LPARAM)&next_menu );
- return MAKELONG( HMENU_16(next_menu.hmenuNext), HWND_16(next_menu.hwndNext) );
- }
- default:
- return DefWindowProc16(hwnd, message, wParam, lParam);
- }
-}
-#endif
-
-
/***********************************************************************
* DefMDIChildProcA (USER32.@)
*/
@@ -1754,6 +1466,7 @@
HWND client = GetParent(hwnd);
MDICLIENTINFO *ci = get_client_info( client );
+// TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
#ifndef __REACTOS__
hwnd = WIN_GetFullHandle( hwnd );
#endif
@@ -1763,9 +1476,8 @@
{
case WM_SETTEXT:
DefWindowProcA(hwnd, message, wParam, lParam);
- MDI_MenuModifyItem( client, hwnd );
- if( ci->hwndChildMaximized == hwnd )
- MDI_UpdateFrameText( GetParent(client), client, MDI_REPAINTFRAME, NULL );
+ if( ci->hwndActiveChild == hwnd && IsZoomed(ci->hwndActiveChild) )
+ MDI_UpdateFrameText( GetParent(client), client, NULL );
return 1; /* success. FIXME: check text length */
case WM_GETMINMAXINFO:
@@ -1774,13 +1486,14 @@
case WM_SETFOCUS:
case WM_CHILDACTIVATE:
case WM_SYSCOMMAND:
+ case WM_SHOWWINDOW:
#ifndef __REACTOS__
case WM_SETVISIBLE:
#endif
- case WM_SHOWWINDOW:
case WM_SIZE:
case WM_NEXTMENU:
case WM_SYSCHAR:
+ case WM_DESTROY:
return DefMDIChildProcW( hwnd, message, wParam, lParam );
}
return DefWindowProcA(hwnd, message, wParam, lParam);
@@ -1796,18 +1509,18 @@
HWND client = GetParent(hwnd);
MDICLIENTINFO *ci = get_client_info( client );
+// TRACE("%p %04x (%s) %08x %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam);
#ifndef __REACTOS__
hwnd = WIN_GetFullHandle( hwnd );
-#endif
+#endif
if (!ci) return DefWindowProcW( hwnd, message, wParam, lParam );
switch (message)
{
case WM_SETTEXT:
DefWindowProcW(hwnd, message, wParam, lParam);
- MDI_MenuModifyItem( client, hwnd );
- if( ci->hwndChildMaximized == hwnd )
- MDI_UpdateFrameText( GetParent(client), client, MDI_REPAINTFRAME, NULL );
+ if( ci->hwndActiveChild == hwnd && IsZoomed(ci->hwndActiveChild) )
+ MDI_UpdateFrameText( GetParent(client), client, NULL );
return 1; /* success. FIXME: check text length */
case WM_GETMINMAXINFO:
@@ -1821,10 +1534,6 @@
SendMessageW( client, WM_MDIDESTROY, (WPARAM)hwnd, 0 );
return 0;
- case WM_SETFOCUS:
- if (ci->hwndActiveChild != hwnd) MDI_ChildActivate( client, hwnd );
- break;
-
case WM_CHILDACTIVATE:
MDI_ChildActivate( client, hwnd );
return 0;
@@ -1833,18 +1542,15 @@
switch( wParam )
{
case SC_MOVE:
- if( ci->hwndChildMaximized == hwnd) return 0;
+ if( ci->hwndActiveChild == hwnd && IsZoomed(ci->hwndActiveChild))
+ return 0;
break;
case SC_RESTORE:
case SC_MINIMIZE:
- SetWindowLongW( hwnd, GWL_STYLE,
- GetWindowLongW( hwnd, GWL_STYLE ) | WS_SYSMENU );
break;
case SC_MAXIMIZE:
- if (ci->hwndChildMaximized == hwnd)
+ if (ci->hwndActiveChild == hwnd && IsZoomed(ci->hwndActiveChild))
return SendMessageW( GetParent(client), message, wParam, lParam);
- SetWindowLongW( hwnd, GWL_STYLE,
- GetWindowLongW( hwnd, GWL_STYLE ) & ~WS_SYSMENU );
break;
case SC_NEXTWINDOW:
SendMessageW( client, WM_MDINEXT, 0, 0);
@@ -1855,73 +1561,48 @@
}
break;
+ case WM_SHOWWINDOW:
#ifndef __REACTOS__
case WM_SETVISIBLE:
#endif
- case WM_SHOWWINDOW:
- if( ci->hwndChildMaximized) ci->mdiFlags &= ~MDIF_NEEDUPDATE;
+ if (IsZoomed(ci->hwndActiveChild)) ci->mdiFlags &= ~MDIF_NEEDUPDATE;
else MDI_PostUpdate(client, ci, SB_BOTH+1);
break;
case WM_SIZE:
- if( ci->hwndActiveChild == hwnd && wParam != SIZE_MAXIMIZED )
- {
- ci->hwndChildMaximized = 0;
- MDI_RestoreFrameMenu( GetParent(client), hwnd );
- MDI_UpdateFrameText( GetParent(client), client, MDI_REPAINTFRAME, NULL );
- }
-
- if( wParam == SIZE_MAXIMIZED )
- {
- HWND hMaxChild = ci->hwndChildMaximized;
-
- if( hMaxChild == hwnd ) break;
- if( hMaxChild)
+ if( hwnd == ci->hwndActiveChild )
+ {
+ if( wParam == SIZE_MAXIMIZED )
{
- SendMessageW( hMaxChild, WM_SETREDRAW, FALSE, 0 );
- MDI_RestoreFrameMenu( GetParent(client), hMaxChild );
- ShowWindow( hMaxChild, SW_SHOWNOACTIVATE );
- SendMessageW( hMaxChild, WM_SETREDRAW, TRUE, 0 );
+ TRACE("maximizing child %p\n", hwnd );
+
+ MDI_AugmentFrameMenu( GetParent(client), hwnd );
}
- TRACE("maximizing child %p\n", hwnd );
-
- /* keep track of the maximized window. */
- ci->hwndChildMaximized = hwnd; /* !!! */
-
- /* The maximized window should also be the active window */
- MDI_ChildActivate( client, hwnd );
- MDI_AugmentFrameMenu( GetParent(client), hwnd );
- MDI_UpdateFrameText( GetParent(client), client, MDI_REPAINTFRAME, NULL );
- }
-
- if( wParam == SIZE_MINIMIZED )
- {
- HWND switchTo = MDI_GetWindow(ci, hwnd, TRUE, WS_MINIMIZE);
-
- if (switchTo) SendMessageW( switchTo, WM_CHILDACTIVATE, 0, 0);
- }
+ else
+ MDI_RestoreFrameMenu( GetParent(client), hwnd , ci->hBmpClose);
+ }
+
+ MDI_UpdateFrameText( GetParent(client), client, NULL );
+ MDI_RefreshMenu(ci);
MDI_PostUpdate(client, ci, SB_BOTH+1);
break;
case WM_NEXTMENU:
{
-/* FIXME */
-#ifndef __REACTOS__
MDINEXTMENU *next_menu = (MDINEXTMENU *)lParam;
HWND parent = GetParent(client);
if( wParam == VK_LEFT ) /* switch to frame system menu */
{
- WND *wndPtr = WIN_GetPtr( parent );
- next_menu->hmenuNext = GetSubMenu( wndPtr->hSysMenu, 0 );
- WIN_ReleasePtr( wndPtr );
+// WND *wndPtr = WIN_GetPtr( parent );
+ next_menu->hmenuNext = GetSubMenu( GetMenu(parent), 0 );
+// WIN_ReleasePtr( wndPtr );
}
if( wParam == VK_RIGHT ) /* to frame menu bar */
{
next_menu->hmenuNext = GetMenu(parent);
}
next_menu->hwndNext = parent;
-#endif
return 0;
}
@@ -1931,6 +1612,11 @@
SendMessageW( hwnd, WM_SYSCOMMAND, (WPARAM)SC_KEYMENU, (DWORD)VK_SPACE);
return 0;
}
+ break;
+
+ case WM_DESTROY:
+ /* Remove itself from the Window menu */
+ MDI_RefreshMenu(ci);
break;
}
return DefWindowProcW(hwnd, message, wParam, lParam);
@@ -1955,29 +1641,13 @@
HINSTANCE hInstance, /* [in] Handle to application instance */
LPARAM lParam) /* [in] Application-defined value */
{
- MDICLIENTINFO *pCi = get_client_info( hWndParent );
- MDICREATESTRUCTA cs;
-
- TRACE("(%s,%s,%ld,%d,%d,%d,%d,%p,%p,%ld)\n",
+ TRACE("(%s,%s,%08lx,%d,%d,%d,%d,%p,%p,%08lx)\n",
debugstr_a(lpClassName),debugstr_a(lpWindowName),dwStyle,X,Y,
nWidth,nHeight,hWndParent,hInstance,lParam);
- if (!pCi)
- {
- ERR("bad hwnd for MDI-client: %p\n", hWndParent);
- return 0;
- }
- cs.szClass=lpClassName;
- cs.szTitle=lpWindowName;
- cs.hOwner=hInstance;
- cs.x=X;
- cs.y=Y;
- cs.cx=nWidth;
- cs.cy=nHeight;
- cs.style=dwStyle;
- cs.lParam=lParam;
-
- return MDICreateChild(hWndParent, pCi, &cs, FALSE);
+ return CreateWindowExA(WS_EX_MDICHILD, lpClassName, lpWindowName,
+ dwStyle, X, Y, nWidth, nHeight, hWndParent,
+ 0, hInstance, (LPVOID)lParam);
}
/***********************************************************************
@@ -1999,29 +1669,13 @@
HINSTANCE hInstance, /* [in] Handle to application instance */
LPARAM lParam) /* [in] Application-defined value */
{
- MDICLIENTINFO *pCi = get_client_info( hWndParent );
- MDICREATESTRUCTW cs;
-
- TRACE("(%s,%s,%ld,%d,%d,%d,%d,%p,%p,%ld)\n",
+ TRACE("(%s,%s,%08lx,%d,%d,%d,%d,%p,%p,%08lx)\n",
debugstr_w(lpClassName), debugstr_w(lpWindowName), dwStyle, X, Y,
nWidth, nHeight, hWndParent, hInstance, lParam);
- if (!pCi)
- {
- ERR("bad hwnd for MDI-client: %p\n", hWndParent);
- return 0;
- }
- cs.szClass = lpClassName;
- cs.szTitle = lpWindowName;
- cs.hOwner = hInstance;
- cs.x = X;
- cs.y = Y;
- cs.cx = nWidth;
- cs.cy = nHeight;
- cs.style = dwStyle;
- cs.lParam = lParam;
-
- return MDICreateChild(hWndParent, pCi, (MDICREATESTRUCTA *)&cs, TRUE);
+ return CreateWindowExW(WS_EX_MDICHILD, lpClassName, lpWindowName,
+ dwStyle, X, Y, nWidth, nHeight, hWndParent,
+ 0, hInstance, (LPVOID)lParam);
}
/**********************************************************************
@@ -2072,24 +1726,26 @@
{
SCROLLINFO info;
RECT childRect, clientRect;
-#ifndef __REACTOS__
HWND *list;
-#else
WINDOWINFO WindowInfo;
- HWND hWndCurrent;
-#endif
- /* The rectangle returned by GetClientRect always has 0,0 as top left
- * because it is in client coordinates. The rectangles returned by
- * GetWindowRect are in screen coordinates to make this complicated.
- *
- * Apparently (in ReactOS at least) the rcClient returned by GetWindowInfo
- * is in screen coordinates too.
- */
GetClientRect( hwnd, &clientRect );
SetRectEmpty( &childRect );
-#ifndef __REACTOS__
+ /* The rectangle returned by GetClientRect always has 0,0 as top left
+ * because it is in client coordinates. The rectangles returned by
+ * GetWindowRect are in screen coordinates to make this complicated.
+ *
+ * Apparently (in ReactOS at least) the rcClient returned by GetWindowInfo
+ * is in screen coordinates too.
+ */
+ WindowInfo.cbSize = sizeof(WindowInfo);
+ if (!GetWindowInfo(hwnd, &WindowInfo))
+ {
+ ERR("Can't get window info\n");
+ return;
+ }
+
if ((list = WIN_ListChildren( hwnd )))
{
int i;
@@ -2104,50 +1760,23 @@
}
if (style & WS_VISIBLE)
{
- WND *pWnd = WIN_FindWndPtr( list[i] );
- UnionRect( &childRect, &pWnd->rectWindow, &childRect );
- WIN_ReleaseWndPtr( pWnd );
+ RECT rect;
+ GetWindowRect( list[i], &rect );
+ OffsetRect(&rect, -WindowInfo.rcClient.left,
+ -WindowInfo.rcClient.top);
+ UnionRect( &childRect, &rect, &childRect );
}
}
HeapFree( GetProcessHeap(), 0, list );
}
-#else
- WindowInfo.cbSize = sizeof(WindowInfo);
- if (!GetWindowInfo(hwnd, &WindowInfo))
- {
- ERR("Can't get window info\n");
- return;
- }
-
- hWndCurrent = GetWindow(hwnd, GW_CHILD);
- while (hWndCurrent != NULL)
- {
- DWORD style = GetWindowLongW( hWndCurrent, GWL_STYLE );
- if (style & WS_MAXIMIZE)
- {
- ShowScrollBar( hwnd, SB_BOTH, FALSE );
- return;
- }
- if (style & WS_VISIBLE)
- {
- RECT WindowRect;
-
- GetWindowRect( hWndCurrent, &WindowRect );
- OffsetRect(&WindowRect,
- -WindowInfo.rcClient.left,
- -WindowInfo.rcClient.top);
- UnionRect( &childRect, &WindowRect, &childRect );
- }
- hWndCurrent = GetWindow(hWndCurrent, GW_HWNDNEXT);
- }
-#endif
+ MapWindowPoints( 0, hwnd, (POINT *)&childRect, 2 );
UnionRect( &childRect, &clientRect, &childRect );
/* set common info values */
info.cbSize = sizeof(info);
info.fMask = SIF_POS | SIF_RANGE | SIF_PAGE;
- /* set the specific scrollbars*/
+ /* set the specific */
/* Note how we set nPos to 0 because we scroll the clients instead of
* the window, and we set nPage to 1 bigger than the clientRect because
* otherwise the scrollbar never disables. This causes a somewhat ugly
@@ -2310,32 +1939,15 @@
UINT i;
MDICLIENTINFO *ci = get_client_info( (HWND)lParam );
HWND hListBox = GetDlgItem(hDlg, MDI_IDC_LISTBOX);
- HWND *list, *sorted_list;
-
- if (!(list = WIN_ListChildren( (HWND)lParam ))) return TRUE;
- if (!(sorted_list = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY,
- sizeof(HWND) * ci->nActiveChildren )))
- {
- HeapFree( GetProcessHeap(), 0, list );
- return FALSE;
- }
-
- /* Fill the list, sorted by id... */
- for (i = 0; list[i]; i++)
- {
- UINT id = GetWindowLongW( list[i], GWL_ID ) - ci->idFirstChild;
- if (id < ci->nActiveChildren) sorted_list[id] = list[i];
- }
- HeapFree( GetProcessHeap(), 0, list );
for (i = 0; i < ci->nActiveChildren; i++)
{
- WCHAR buffer[128];
-
- if (!GetWindowTextW( sorted_list[i], buffer, sizeof(buffer)/sizeof(WCHAR) ))
+ WCHAR buffer[MDI_MAXTITLELENGTH];
+
+ if (!InternalGetWindowText( ci->child[i], buffer, sizeof(buffer)/sizeof(WCHAR) ))
continue;
SendMessageW(hListBox, LB_ADDSTRING, 0, (LPARAM)buffer );
- SendMessageW(hListBox, LB_SETITEMDATA, i, (LPARAM)sorted_list[i] );
+ SendMessageW(hListBox, LB_SETITEMDATA, i, (LPARAM)ci->child[i] );
length = strlenW(buffer); /* FIXME: should use GetTextExtentPoint */
if (length > widest)
widest = length;
@@ -2396,7 +2008,7 @@
if (hRes == 0)
return 0;
- hDlgTmpl = LoadResource(User32Instance, hRes);
+ hDlgTmpl = LoadResource(User32Instance, hRes );
if (hDlgTmpl == 0)
return 0;
@@ -2407,31 +2019,6 @@
return 0;
return (HWND) DialogBoxIndirectParamA(User32Instance,
- (LPDLGTEMPLATE) template,
+ (const DLGTEMPLATE*) template,
hwnd, MDI_MoreWindowsDlgProc, (LPARAM) hwnd);
}
-
-/*
- *
- * MDI_SwapMenuItems
- *
- * Will swap the menu IDs for the given 2 positions.
- * pos1 and pos2 are menu IDs
- *
- *
- */
-
-static void MDI_SwapMenuItems(HWND parent, UINT pos1, UINT pos2)
-{
- HWND *list;
- int i;
-
- if (!(list = WIN_ListChildren( parent ))) return;
- for (i = 0; list[i]; i++)
- {
- UINT id = GetWindowLongW( list[i], GWL_ID );
- if (id == pos1) SetWindowLongW( list[i], GWL_ID, pos2 );
- else if (id == pos2) SetWindowLongW( list[i], GWL_ID, pos1 );
- }
- HeapFree( GetProcessHeap(), 0, list );
-}
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/window.c Mon Jul 31 07:36:12 2006
@@ -10,14 +10,17 @@
*/
/* INCLUDES ******************************************************************/
-
+#define DEBUG
#include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
BOOL ControlsInitialized = FALSE;
LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active);
+void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id );
+
+#define CW_USEDEFAULT16 0x00008000
/* FUNCTIONS *****************************************************************/
@@ -137,6 +140,202 @@
return (BOOL)(hWnd);
}
+
+
+HWND STDCALL
+User32CreateWindowEx(DWORD dwExStyle,
+ LPCSTR lpClassName,
+ LPCSTR lpWindowName,
+ DWORD dwStyle,
+ int x,
+ int y,
+ int nWidth,
+ int nHeight,
+ HWND hWndParent,
+ HMENU hMenu,
+ HINSTANCE hInstance,
+ LPVOID lpParam,
+ BOOL Unicode)
+{
+ UNICODE_STRING WindowName;
+ UNICODE_STRING ClassName;
+ WNDCLASSEXA wceA;
+ WNDCLASSEXW wceW;
+ HWND Handle;
+ MDICREATESTRUCTA mdi;
+
+#if 0
+ DbgPrint("[window] User32CreateWindowEx style %d, exstyle %d, parent %d\n", dwStyle, dwExStyle, hWndParent);
+#endif
+
+ if (IS_ATOM(lpClassName))
+ {
+ RtlInitUnicodeString(&ClassName, NULL);
+ ClassName.Buffer = (LPWSTR)lpClassName;
+ }
+ else
+ {
+ if(Unicode)
+ RtlInitUnicodeString(&ClassName, (PCWSTR)lpClassName);
+ else
+ {
+ if (!RtlCreateUnicodeStringFromAsciiz(&(ClassName), (PCSZ)lpClassName))
+ {
+ SetLastError(ERROR_OUTOFMEMORY);
+ return (HWND)0;
+ }
+ }
+ }
+
+ /* Register built-in controls if not already done */
+ if (! ControlsInitialized)
+ {
+ ControlsInitialized = ControlsInit(ClassName.Buffer);
+ }
+
+ if (dwExStyle & WS_EX_MDICHILD)
+ {
+ POINT mPos[2];
+ UINT id = 0;
+ /* lpParams of WM_[NC]CREATE is different for MDI children.
+ * MDICREATESTRUCT members have the originally passed values.
+ *
+ * Note: we rely on the fact that MDICREATESTRUCTA and MDICREATESTRUCTW
+ * have the same layout.
+ */
+ mdi.szClass = (LPCSTR)lpClassName;
+ mdi.szTitle = (LPCSTR)lpWindowName;
+ mdi.hOwner = hInstance;
+ mdi.x = x;
+ mdi.y = y;
+ mdi.cx = nWidth;
+ mdi.cy = nHeight;
+ mdi.style = dwStyle;
+ mdi.lParam = (LPARAM)lpParam;
+
+ lpParam = (LPVOID)&mdi;
+
+ if (GetWindowLongW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES)
+ {
+ if (dwStyle & WS_POPUP)
+ {
+ DPRINT1("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n");
+ return(0);
+ }
+ dwStyle |= (WS_CHILD | WS_CLIPSIBLINGS);
+ }
+ else
+ {
+ dwStyle &= ~WS_POPUP;
+ dwStyle |= (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION |
+ WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX);
+ }
+
+ HWND top_child = GetWindow(hWndParent, GW_CHILD);
+
+ if (top_child)
+ {
+ /* Restore current maximized child */
+ if((dwStyle & WS_VISIBLE) && IsZoomed(top_child))
+ {
+ DPRINT("Restoring current maximized child %p\n", top_child);
+ SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 );
+ ShowWindow(top_child, SW_RESTORE);
+ SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 );
+ }
+ }
+
+ MDI_CalcDefaultChildPos(hWndParent, -1, mPos, 0, &id);
+
+ if (!(dwStyle & WS_POPUP)) hMenu = (HMENU)id;
+
+ if (dwStyle & (WS_CHILD | WS_POPUP))
+ {
+ if (x == CW_USEDEFAULT || x == CW_USEDEFAULT16)
+ {
+ x = mPos[0].x;
+ y = mPos[0].y;
+ }
+ if (nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16 || !nWidth)
+ nWidth = mPos[1].x;
+ if (nHeight == CW_USEDEFAULT || nHeight == CW_USEDEFAULT16 || !nHeight)
+ nHeight = mPos[1].y;
+ }
+ }
+
+ if (Unicode)
+ RtlInitUnicodeString(&WindowName, (PCWSTR)lpWindowName);
+ else
+ {
+ if (!RtlCreateUnicodeStringFromAsciiz(&WindowName, (PCSZ)lpWindowName))
+ {
+ if (!IS_ATOM(lpClassName))
+ {
+ RtlFreeUnicodeString(&ClassName);
+ }
+ SetLastError(ERROR_OUTOFMEMORY);
+ return (HWND)0;
+ }
+ }
+
+ if(!hMenu && (dwStyle & (WS_OVERLAPPEDWINDOW | WS_POPUP)))
+ {
+ if(Unicode)
+ {
+ wceW.cbSize = sizeof(WNDCLASSEXW);
+ if(GetClassInfoExW(hInstance, (LPCWSTR)lpClassName, &wceW) && wceW.lpszMenuName)
+ {DbgPrint("LoadingMenu 0x%p %d\n", wceW.lpszMenuName, IS_INTRESOURCE(wceW.lpszMenuName));
+ hMenu = LoadMenuW(hInstance, wceW.lpszMenuName);DbgPrint("Loaded menu: 0x%p\n", hMenu);
+ }
+ }
+ else
+ {
+ wceA.cbSize = sizeof(WNDCLASSEXA);
+ if(GetClassInfoExA(hInstance, lpClassName, &wceA) && wceA.lpszMenuName)
+ {
+ hMenu = LoadMenuA(hInstance, wceA.lpszMenuName);
+ }
+ }
+ }
+
+ Handle = NtUserCreateWindowEx(dwExStyle,
+ &ClassName,
+ &WindowName,
+ dwStyle,
+ x,
+ y,
+ nWidth,
+ nHeight,
+ hWndParent,
+ hMenu,
+ hInstance,
+ lpParam,
+ SW_SHOW,
+ FALSE);
+
+#if 0
+ DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle);
+#endif
+
+ if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD))
+ {
+ SendMessageW(hWndParent, WM_MDIREFRESHMENU, 0, 0);
+ SetWindowPos(Handle, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW |
+ SWP_NOMOVE | SWP_NOSIZE);
+ }
+
+ if(!Unicode)
+ {
+ RtlFreeUnicodeString(&WindowName);
+
+ if (!IS_ATOM(lpClassName))
+ {
+ RtlFreeUnicodeString(&ClassName);
+ }
+ }
+ return Handle;
+}
+
/*
* @implemented
@@ -155,89 +354,19 @@
HINSTANCE hInstance,
LPVOID lpParam)
{
- UNICODE_STRING WindowName;
- UNICODE_STRING ClassName;
- WNDCLASSEXA wce;
- HWND Handle;
-
-#if 0
- DbgPrint("[window] CreateWindowExA style %d, exstyle %d, parent %d\n", dwStyle, dwExStyle, hWndParent);
-#endif
-
- if (IS_ATOM(lpClassName))
- {
- RtlInitUnicodeString(&ClassName, NULL);
- ClassName.Buffer = (LPWSTR)lpClassName;
- }
- else
- {
- if (!RtlCreateUnicodeStringFromAsciiz(&(ClassName), (PCSZ)lpClassName))
- {
- SetLastError(ERROR_OUTOFMEMORY);
- return (HWND)0;
- }
- }
-
- /* Register built-in controls if not already done */
- if (! ControlsInitialized)
- {
- ControlsInitialized = ControlsInit(ClassName.Buffer);
- }
-
- if (dwExStyle & WS_EX_MDICHILD)
- {
- if (!IS_ATOM(lpClassName))
- RtlFreeUnicodeString(&ClassName);
- return CreateMDIWindowA(lpClassName, lpWindowName, dwStyle, x, y,
- nWidth, nHeight, hWndParent, hInstance, (LPARAM)lpParam);
- }
-
- if (!RtlCreateUnicodeStringFromAsciiz(&WindowName, (PCSZ)lpWindowName))
- {
- if (!IS_ATOM(lpClassName))
- {
- RtlFreeUnicodeString(&ClassName);
- }
- SetLastError(ERROR_OUTOFMEMORY);
- return (HWND)0;
- }
-
- if(!hMenu && (dwStyle & (WS_OVERLAPPEDWINDOW | WS_POPUP)))
- {
- wce.cbSize = sizeof(WNDCLASSEXA);
- if(GetClassInfoExA(hInstance, lpClassName, &wce) && wce.lpszMenuName)
- {
- hMenu = LoadMenuA(hInstance, wce.lpszMenuName);
- }
- }
-
- Handle = NtUserCreateWindowEx(dwExStyle,
- &ClassName,
- &WindowName,
- dwStyle,
- x,
- y,
- nWidth,
- nHeight,
- hWndParent,
- hMenu,
- hInstance,
- lpParam,
- SW_SHOW,
- FALSE);
-
-#if 0
- DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle);
-#endif
-
- RtlFreeUnicodeString(&WindowName);
-
- if (!IS_ATOM(lpClassName))
- {
- RtlFreeUnicodeString(&ClassName);
- }
-
- return Handle;
+ return User32CreateWindowEx(dwExStyle,
+ lpClassName,
+ lpWindowName,
+ dwStyle,
+ x,
+ y,
+ nWidth,
+ nHeight,
+ hWndParent,
+ hMenu,
+ hInstance,
+ lpParam,
+ FALSE);
}
@@ -258,60 +387,20 @@
HINSTANCE hInstance,
LPVOID lpParam)
{
- UNICODE_STRING WindowName;
- UNICODE_STRING ClassName;
- WNDCLASSEXW wce;
- HANDLE Handle;
-
- /* Register built-in controls if not already done */
- if (! ControlsInitialized)
- {
- ControlsInitialized = ControlsInit(lpClassName);
- }
-
- if (dwExStyle & WS_EX_MDICHILD)
- return CreateMDIWindowW(lpClassName, lpWindowName, dwStyle, x, y,
- nWidth, nHeight, hWndParent, hInstance, (LPARAM)lpParam);
-
- if (IS_ATOM(lpClassName))
- {
- RtlInitUnicodeString(&ClassName, NULL);
- ClassName.Buffer = (LPWSTR)lpClassName;
- }
- else
- {
- RtlInitUnicodeString(&ClassName, lpClassName);
- }
-
- RtlInitUnicodeString(&WindowName, lpWindowName);
-
- if(!hMenu && (dwStyle & (WS_OVERLAPPEDWINDOW | WS_POPUP)))
- {
- wce.cbSize = sizeof(WNDCLASSEXW);
- if(GetClassInfoExW(hInstance, lpClassName, &wce) && wce.lpszMenuName)
- {DbgPrint("LoadingMenu 0x%p %d\n", wce.lpszMenuName, IS_INTRESOURCE(wce.lpszMenuName));
- hMenu = LoadMenuW(hInstance, wce.lpszMenuName);DbgPrint("Loaded menu: 0x%p\n", hMenu);
- }
- }
-
- Handle = NtUserCreateWindowEx(dwExStyle,
- &ClassName,
- &WindowName,
- dwStyle,
- x,
- y,
- nWidth,
- nHeight,
- hWndParent,
- hMenu,
- hInstance,
- lpParam,
- SW_SHOW,
- TRUE);
-
- return (HWND)Handle;
-}
-
+ return User32CreateWindowEx(dwExStyle,
+ (LPCSTR) lpClassName,
+ (LPCSTR) lpWindowName,
+ dwStyle,
+ x,
+ y,
+ nWidth,
+ nHeight,
+ hWndParent,
+ hMenu,
+ hInstance,
+ lpParam,
+ TRUE);
+}
/*
* @unimplemented
Modified: branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/subsys…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c (original)
+++ branches/ros-branch-0_3_0/reactos/subsystems/win32/win32k/ntuser/window.c Mon Jul 31 07:36:12 2006
@@ -1439,7 +1439,8 @@
}
else if (hWndParent)
{
- if ((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD)
+ if (((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) ||
+ (dwExStyle & WS_EX_MDICHILD))
ParentWindowHandle = hWndParent;
else
{
@@ -1736,8 +1737,27 @@
Pos.y = rc.top;
}
- /* According to wine, the ShowMode is set to y if x == CW_USEDEFAULT(16) and
- y is something else */
+/*
+ According to wine, the ShowMode is set to y if x == CW_USEDEFAULT(16) and
+ y is something else. and Quote!
+ */
+
+/* Never believe Microsoft's documentation... CreateWindowEx doc says
+ * that if an overlapped window is created with WS_VISIBLE style bit
+ * set and the x parameter is set to CW_USEDEFAULT, the system ignores
+ * the y parameter. However, disassembling NT implementation (WIN32K.SYS)
+ * reveals that
+ *
+ * 1) not only it checks for CW_USEDEFAULT but also for CW_USEDEFAULT16
+ * 2) it does not ignore the y parameter as the docs claim; instead, it
+ * uses it as second parameter to ShowWindow() unless y is either
+ * CW_USEDEFAULT or CW_USEDEFAULT16.
+ *
+ * The fact that we didn't do 2) caused bogus windows pop up when wine
+ * was running apps that were using this obscure feature. Example -
+ * calc.exe that comes with Win98 (only Win98, it's different from
+ * the one that comes with Win95 and NT)
+ */
if(y != CW_USEDEFAULT && y != CW_USEDEFAULT16)
{
dwShowMode = y;
18 years, 4 months
- 1
- 0
[jimtabor] 23383: User32 synced up to 22634 no.2
by jimtabor＠svn.reactos.org
Author: jimtabor
Date: Mon Jul 31 07:07:47 2006
New Revision: 23383
URL: http://svn.reactos.org/svn/reactos?rev=23383&view=rev
Log:
User32 synced up to 22634 no.2
Added:
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Uk.rc
- copied unchanged from r22634, trunk/reactos/dll/win32/user32/Uk.rc
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/button.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/combo.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/edit.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/icontitle.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/listbox.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/regcontrol.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/scrollbar.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/static.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/dde_private.h
branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/user32.h
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/dde.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/ddeclient.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/ddeserver.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/desktop.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/display.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/dllmain.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/exit.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/exticon.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/misc.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/object.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/resources.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/strpool.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/stubs.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/timer.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/winhelp.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/winsta.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/wsprintf.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/accel.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/bitmap.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/caret.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/clipboard.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/cursor.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dc.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/defwnd.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dialog.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/draw.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/font.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/hook.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/icon.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/input.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/mdi.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/menu.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/messagebox.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/paint.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/prop.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/rect.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/text.c
branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/winpos.c
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/button.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/combo.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/edit.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/icontitle.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/listbox.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/regcontrol.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/scrollbar.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/controls/static.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/dde_private.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/include/user32.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/dde.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/ddeclient.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/ddeserver.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/desktop.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/display.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/dllmain.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/exit.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/exticon.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/misc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/object.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/resources.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/strpool.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/timer.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/winhelp.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/winsta.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/misc/wsprintf.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/accel.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/bitmap.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/caret.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/clipboard.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/cursor.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dc.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/defwnd.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/dialog.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/draw.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/font.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/hook.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/icon.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/input.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/mdi.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/menu.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/messagebox.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/paint.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/prop.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/rect.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/text.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/windows/winpos.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
18 years, 4 months
- 1
- 0
[jimtabor] 23382: User32 synced up to 22634
by jimtabor＠svn.reactos.org
Author: jimtabor
Date: Mon Jul 31 06:17:13 2006
New Revision: 23382
URL: http://svn.reactos.org/svn/reactos?rev=23382&view=rev
Log:
User32 synced up to 22634
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild
branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc
branches/ros-branch-0_3_0/reactos/include/dde.h
branches/ros-branch-0_3_0/reactos/include/ddeml.h
branches/ros-branch-0_3_0/reactos/include/winuser.h
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc Mon Jul 31 06:17:13 2006
@@ -8,7 +8,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Vælg Vindue"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc Mon Jul 31 06:17:13 2006
@@ -10,7 +10,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Fenster Auswählen"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc Mon Jul 31 06:17:13 2006
@@ -8,7 +8,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Select Window"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc Mon Jul 31 06:17:13 2006
@@ -8,7 +8,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Selecciones Ventana"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc Mon Jul 31 06:17:13 2006
@@ -12,7 +12,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Select Window"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc Mon Jul 31 06:17:13 2006
@@ -12,7 +12,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Select Window"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc Mon Jul 31 06:17:13 2006
@@ -8,7 +8,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Selecteer venster"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc Mon Jul 31 06:17:13 2006
@@ -10,7 +10,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Wybieranie okna"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc Mon Jul 31 06:17:13 2006
@@ -28,7 +28,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Välj fönster"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild Mon Jul 31 06:17:13 2006
@@ -14,6 +14,7 @@
<library>gdi32</library>
<library>kernel32</library>
<library>advapi32</library>
+ <library>imm32</library>
<directory name="include">
<pch>user32.h</pch>
</directory>
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/wi…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc Mon Jul 31 06:17:13 2006
@@ -73,3 +73,4 @@
#include "Sv.rc"
#include "Hu.rc"
#include "Es.rc"
+#include "Uk.rc"
Modified: branches/ros-branch-0_3_0/reactos/include/dde.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/includ…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/include/dde.h (original)
+++ branches/ros-branch-0_3_0/reactos/include/dde.h Mon Jul 31 06:17:13 2006
@@ -1,64 +1,90 @@
-#ifndef _DDE_H
-#define _DDE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
+/*****************************************************************************
+ * Copyright 1995, Technion, Israel Institute of Technology
+ * Electrical Eng, Software Lab.
+ * Author: Michael Veksler.
+ * Purpose: dde declarations
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *****************************************************************************
+ */
+#ifndef __WINE_DDE_H
+#define __WINE_DDE_H
+
+#include <windef.h>
#ifdef __cplusplus
extern "C" {
#endif
-#define WM_DDE_FIRST 0x03E0
-#define WM_DDE_INITIATE (WM_DDE_FIRST)
-#define WM_DDE_TERMINATE (WM_DDE_FIRST+1)
-#define WM_DDE_ADVISE (WM_DDE_FIRST+2)
-#define WM_DDE_UNADVISE (WM_DDE_FIRST+3)
-#define WM_DDE_ACK (WM_DDE_FIRST+4)
-#define WM_DDE_DATA (WM_DDE_FIRST+5)
-#define WM_DDE_REQUEST (WM_DDE_FIRST+6)
-#define WM_DDE_POKE (WM_DDE_FIRST+7)
-#define WM_DDE_EXECUTE (WM_DDE_FIRST+8)
-#define WM_DDE_LAST (WM_DDE_FIRST+8)
-#ifndef RC_INVOKED
-typedef struct {
- unsigned short bAppReturnCode:8,reserved:6,fBusy:1,fAck:1;
+#define WM_DDE_INITIATE 0x3E0
+#define WM_DDE_TERMINATE 0x3E1
+#define WM_DDE_ADVISE 0x3E2
+#define WM_DDE_UNADVISE 0x3E3
+#define WM_DDE_ACK 0x3E4
+#define WM_DDE_DATA 0x3E5
+#define WM_DDE_REQUEST 0x3E6
+#define WM_DDE_POKE 0x3E7
+#define WM_DDE_EXECUTE 0x3E8
+#define WM_DDE_LAST WM_DDE_EXECUTE
+#define WM_DDE_FIRST WM_DDE_INITIATE
+
+/* DDEACK: wStatus in WM_DDE_ACK message */
+typedef struct
+{
+ unsigned short bAppReturnCode:8, reserved:6, fBusy:1, fAck:1;
} DDEACK;
-typedef struct {
- unsigned short reserved:14,fDeferUpd:1,fAckReq:1;
- short cfFormat;
+
+/* DDEDATA: hData in WM_DDE_DATA message */
+typedef struct
+{
+ unsigned short unused:12, fResponse:1, fRelease:1, reserved:1, fAckReq:1;
+ short cfFormat;
+ BYTE Value[1]; /* undetermined array */
+} DDEDATA;
+
+/* DDEADVISE: hOptions in WM_DDE_ADVISE message */
+typedef struct
+{
+ unsigned short reserved:14, fDeferUpd:1, fAckReq:1;
+ short cfFormat;
} DDEADVISE;
-typedef struct {
- unsigned short unused:12,fResponse:1,fRelease:1,reserved:1,fAckReq:1;
- short cfFormat;
- BYTE Value[1];
-} DDEDATA;
-typedef struct {
- unsigned short unused:13,fRelease:1,fReserved:2;
- short cfFormat;
- BYTE Value[1];
+
+/* DDEPOKE: hData in WM_DDE_POKE message. */
+typedef struct
+{
+ unsigned short unused:13, fRelease:1, fReserved:2;
+ short cfFormat;
+ BYTE Value[1]; /* undetermined array */
} DDEPOKE;
-typedef struct {
- unsigned short unused:13,
- fRelease:1,
- fDeferUpd:1,
- fAckReq:1;
- short cfFormat;
-} DDELN;
-typedef struct {
- unsigned short unused:12,fAck:1,fRelease:1,fReserved:1,fAckReq:1;
- short cfFormat;
- BYTE rgb[1];
-} DDEUP;
-BOOL WINAPI DdeSetQualityOfService(HWND,const SECURITY_QUALITY_OF_SERVICE*,PSECURITY_QUALITY_OF_SERVICE);
-BOOL WINAPI ImpersonateDdeClientWindow(HWND,HWND);
-LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR);
-BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR);
-BOOL WINAPI FreeDDElParam(UINT,LPARAM);
-LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR);
-#endif
+BOOL WINAPI DdeSetQualityOfService(HWND hwndClient,
+ CONST SECURITY_QUALITY_OF_SERVICE *pqosNew,
+ PSECURITY_QUALITY_OF_SERVICE pqosPrev);
+
+BOOL WINAPI ImpersonateDdeClientWindow(HWND hWndClient, HWND hWndServer);
+
+/* lParam packing/unpacking API */
+
+LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR);
+BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR);
+BOOL WINAPI FreeDDElParam(UINT,LPARAM);
+LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR);
+
#ifdef __cplusplus
}
#endif
-#endif
+
+#endif /* __WINE_DDE_H */
Modified: branches/ros-branch-0_3_0/reactos/include/ddeml.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/includ…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/include/ddeml.h (original)
+++ branches/ros-branch-0_3_0/reactos/include/ddeml.h Mon Jul 31 06:17:13 2006
@@ -1,326 +1,377 @@
-#ifndef _DDEML_H
-#define _DDEML_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
+/*
+ * DDEML library definitions
+ *
+ * Copyright 1997 Alexandre Julliard
+ * Copyright 1997 Len White
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __WINE_DDEML_H
+#define __WINE_DDEML_H
#ifdef __cplusplus
extern "C" {
-#endif
-
-#define EXPENTRY CALLBACK
-#define CP_WINANSI 1004
-#define CP_WINUNICODE 1200
-#define XTYPF_NOBLOCK 2
-#define XTYPF_NODATA 4
-#define XTYPF_ACKREQ 8
-#define XCLASS_MASK 0xFC00
-#define XCLASS_BOOL 0x1000
-#define XCLASS_DATA 0x2000
-#define XCLASS_FLAGS 0x4000
-#define XCLASS_NOTIFICATION 0x8000
-#define XST_NULL 0
-#define XST_INCOMPLETE 1
-#define XST_CONNECTED 2
-#define XST_INIT1 3
-#define XST_INIT2 4
-#define XST_REQSENT 5
-#define XST_DATARCVD 6
-#define XST_POKESENT 7
-#define XST_POKEACKRCVD 8
-#define XST_EXECSENT 9
-#define XST_EXECACKRCVD 10
-#define XST_ADVSENT 11
-#define XST_UNADVSENT 12
-#define XST_ADVACKRCVD 13
-#define XST_UNADVACKRCVD 14
-#define XST_ADVDATASENT 15
-#define XST_ADVDATAACKRCVD 16
-#define XTYP_ERROR (XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_ADVDATA (16|XCLASS_FLAGS)
-#define XTYP_ADVREQ (32|XCLASS_DATA|XTYPF_NOBLOCK)
-#define XTYP_ADVSTART (0x30|XCLASS_BOOL)
-#define XTYP_ADVSTOP (0x0040|XCLASS_NOTIFICATION)
-#define XTYP_EXECUTE (0x0050|XCLASS_FLAGS)
-#define XTYP_CONNECT (0x0060|XCLASS_BOOL|XTYPF_NOBLOCK)
-#define XTYP_CONNECT_CONFIRM (0x0070|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_XACT_COMPLETE (0x0080|XCLASS_NOTIFICATION)
-#define XTYP_POKE (0x0090|XCLASS_FLAGS)
-#define XTYP_REGISTER (0x00A0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_REQUEST (0x00B0|XCLASS_DATA)
-#define XTYP_DISCONNECT (0x00C0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_UNREGISTER (0x00D0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_WILDCONNECT (0x00E0|XCLASS_DATA|XTYPF_NOBLOCK)
-#define XTYP_MASK 0xF0
-#define XTYP_SHIFT 4
-#define TIMEOUT_ASYNC 0xFFFFFFFF
+#endif /* defined(__cplusplus) */
+
+/* Codepage Constants
+ */
+
+#define CP_WINANSI 1004
+#define CP_WINUNICODE 1200
+
+/* DDE synchronisation constants
+ */
+
+#define MSGF_DDEMGR 0x8001
+
#define QID_SYNC 0xFFFFFFFF
-#define ST_CONNECTED 1
-#define ST_ADVISE 2
-#define ST_ISLOCAL 4
-#define ST_BLOCKED 8
-#define ST_CLIENT 16
-#define ST_TERMINATED 32
-#define ST_INLIST 64
-#define ST_BLOCKNEXT 128
-#define ST_ISSELF 256
-#define CADV_LATEACK 0xFFFF
-#define DMLERR_NO_ERROR 0
-#define DMLERR_FIRST 0x4000
-#define DMLERR_ADVACKTIMEOUT 0x4000
-#define DMLERR_BUSY 0x4001
-#define DMLERR_DATAACKTIMEOUT 0x4002
-#define DMLERR_DLL_NOT_INITIALIZED 0x4003
-#define DMLERR_DLL_USAGE 0x4004
-#define DMLERR_EXECACKTIMEOUT 0x4005
-#define DMLERR_INVALIDPARAMETER 0x4006
-#define DMLERR_LOW_MEMORY 0x4007
-#define DMLERR_MEMORY_ERROR 0x4008
-#define DMLERR_NOTPROCESSED 0x4009
-#define DMLERR_NO_CONV_ESTABLISHED 0x400a
-#define DMLERR_POKEACKTIMEOUT 0x400b
-#define DMLERR_POSTMSG_FAILED 0x400c
-#define DMLERR_REENTRANCY 0x400d
-#define DMLERR_SERVER_DIED 0x400e
-#define DMLERR_SYS_ERROR 0x400f
-#define DMLERR_UNADVACKTIMEOUT 0x4010
-#define DMLERR_UNFOUND_QUEUE_ID 0x4011
-#define DMLERR_LAST 0x4011
-#define DDE_FACK 0x8000
-#define DDE_FBUSY 0x4000
-#define DDE_FDEFERUPD 0x4000
-#define DDE_FACKREQ 0x8000
-#define DDE_FRELEASE 0x2000
-#define DDE_FREQUESTED 0x1000
-#define DDE_FAPPSTATUS 0x00ff
-#define DDE_FNOTPROCESSED 0
-#define DDE_FACKRESERVED (~(DDE_FACK|DDE_FBUSY|DDE_FAPPSTATUS))
-#define DDE_FADVRESERVED (~(DDE_FACKREQ|DDE_FDEFERUPD))
-#define DDE_FDATRESERVED (~(DDE_FACKREQ|DDE_FRELEASE|DDE_FREQUESTED))
-#define DDE_FPOKRESERVED (~DDE_FRELEASE)
-#define MSGF_DDEMGR 0x8001
-#define CBR_BLOCK ((HDDEDATA)0xffffffff)
-#define CBF_FAIL_SELFCONNECTIONS 0x1000
-#define CBF_FAIL_CONNECTIONS 0x2000
-#define CBF_FAIL_ADVISES 0x4000
-#define CBF_FAIL_EXECUTES 0x8000
-#define CBF_FAIL_POKES 0x10000
-#define CBF_FAIL_REQUESTS 0x20000
-#define CBF_FAIL_ALLSVRXACTIONS 0x3f000
-#define CBF_SKIP_CONNECT_CONFIRMS 0x40000
-#define CBF_SKIP_REGISTRATIONS 0x80000
-#define CBF_SKIP_UNREGISTRATIONS 0x100000
-#define CBF_SKIP_DISCONNECTS 0x200000
-#define CBF_SKIP_ALLNOTIFICATIONS 0x3c0000
-#define APPCMD_CLIENTONLY 0x10L
-#define APPCMD_FILTERINITS 0x20L
-#define APPCMD_MASK 0xFF0L
-#define APPCLASS_STANDARD 0
-#define APPCLASS_MASK 0xFL
-#define EC_ENABLEALL 0
-#define EC_ENABLEONE ST_BLOCKNEXT
-#define EC_DISABLE ST_BLOCKED
-#define EC_QUERYWAITING 2
-#define DNS_REGISTER 1
-#define DNS_UNREGISTER 2
-#define DNS_FILTERON 4
-#define DNS_FILTEROFF 8
-#define HDATA_APPOWNED 1
-#define MAX_MONITORS 4
-#define APPCLASS_MONITOR 1L
-#define XTYP_MONITOR (XCLASS_NOTIFICATION|XTYPF_NOBLOCK|0xF0)
-#define MF_HSZ_INFO 0x1000000
-#define MF_SENDMSGS 0x2000000
-#define MF_POSTMSGS 0x4000000
-#define MF_CALLBACKS 0x8000000
-#define MF_ERRORS 0x10000000
-#define MF_LINKS 0x20000000
-#define MF_CONV 0x40000000
-#define MF_MASK 0xFF000000
-#define MH_CREATE 1
-#define MH_KEEP 2
-#define MH_DELETE 3
-#define MH_CLEANUP 4
+
+/* Type variation for MS deliberate departures from ANSI standards
+ */
+
+#define EXPENTRY CALLBACK
+
+#define SZDDESYS_TOPIC TEXT("System")
+#define SZDDESYS_ITEM_TOPICS TEXT("Topics")
+#define SZDDESYS_ITEM_SYSITEMS TEXT("SysItems")
+#define SZDDESYS_ITEM_RTNMSG TEXT("ReturnMessage")
+#define SZDDESYS_ITEM_STATUS TEXT("Status")
+#define SZDDESYS_ITEM_FORMATS TEXT("Formats")
+#define SZDDESYS_ITEM_HELP TEXT("Help")
+#define SZDDE_ITEM_ITEMLIST TEXT("TopicItemList")
+
+/***************************************************
+
+ FLAGS Section - copied from Microsoft SDK as must be standard, probably Copyright Microsoft Corporation
+
+***************************************************/
+
+#define XST_NULL 0
+#define XST_INCOMPLETE 1
+#define XST_CONNECTED 2
+#define XST_INIT1 3
+#define XST_INIT2 4
+#define XST_REQSENT 5
+#define XST_DATARCVD 6
+#define XST_POKESENT 7
+#define XST_POKEACKRCVD 8
+#define XST_EXECSENT 9
+#define XST_EXECACKRCVD 10
+#define XST_ADVSENT 11
+#define XST_UNADVSENT 12
+#define XST_ADVACKRCVD 13
+#define XST_UNADVACKRCVD 14
+#define XST_ADVDATASENT 15
+#define XST_ADVDATAACKRCVD 16
+
+#define ST_CONNECTED 0x0001
+#define ST_ADVISE 0x0002
+#define ST_ISLOCAL 0x0004
+#define ST_BLOCKED 0x0008
+#define ST_CLIENT 0x0010
+#define ST_TERMINATED 0x0020
+#define ST_INLIST 0x0040
+#define ST_BLOCKNEXT 0x0080
+#define ST_ISSELF 0x0100
+
+/*
+ * DdeEnableCallback function codes
+ */
+
+#define EC_ENABLEALL 0
+#define EC_ENABLEONE ST_BLOCKNEXT
+#define EC_DISABLE ST_BLOCKED
+#define EC_QUERYWAITING 2
+
+/*
+ * Callback filter flags for use with standard apps.
+ */
+
+#define CBF_FAIL_SELFCONNECTIONS 0x00001000
+#define CBF_FAIL_CONNECTIONS 0x00002000
+#define CBF_FAIL_ADVISES 0x00004000
+#define CBF_FAIL_EXECUTES 0x00008000
+#define CBF_FAIL_POKES 0x00010000
+#define CBF_FAIL_REQUESTS 0x00020000
+#define CBF_FAIL_ALLSVRXACTIONS 0x0003f000
+
+#define CBF_SKIP_CONNECT_CONFIRMS 0x00040000
+#define CBF_SKIP_REGISTRATIONS 0x00080000
+#define CBF_SKIP_UNREGISTRATIONS 0x00100000
+#define CBF_SKIP_DISCONNECTS 0x00200000
+#define CBF_SKIP_ALLNOTIFICATIONS 0x003c0000
+
+#define CBR_BLOCK ((HDDEDATA)~0UL)
+
+/*
+ * Application command flags
+ */
+#define APPCMD_CLIENTONLY 0x00000010L
+#define APPCMD_FILTERINITS 0x00000020L
+#define APPCMD_MASK 0x00000FF0L
+
+/*
+ * Application classification flags
+ */
+
+#define APPCLASS_STANDARD 0x00000000L
+#define APPCLASS_MONITOR 0x00000001L
+#define APPCLASS_MASK 0x0000000FL
+
+/*
+ * Callback filter flags for use with MONITOR apps - 0 implies no monitor
+ * callbacks.
+ */
+#define MF_HSZ_INFO 0x01000000
+#define MF_SENDMSGS 0x02000000
+#define MF_POSTMSGS 0x04000000
+#define MF_CALLBACKS 0x08000000
+#define MF_ERRORS 0x10000000
+#define MF_LINKS 0x20000000
+#define MF_CONV 0x40000000
+
+#define MF_MASK 0xFF000000
+
+/*
+ * DdeNameService service name flags
+ */
+
+#define DNS_REGISTER 0x0001
+#define DNS_UNREGISTER 0x0002
+#define DNS_FILTERON 0x0004
+#define DNS_FILTEROFF 0x0008
+
+
+/****************************************************
+
+ End of Flags section
+
+****************************************************/
+
+/****************************************************
+
+ Message Types Section
+
+****************************************************/
+
+#define XTYPF_NOBLOCK 0x0002 /* CBR_NOBLOCK will not work */
+#define XTYPF_NODATA 0x0004 /* DDE_FDEFERUPD */
+#define XTYPF_ACKREQ 0x0008 /* DDE_FACKREQ */
+
+#define XCLASS_MASK 0xFC00
+#define XCLASS_BOOL 0x1000
+#define XCLASS_DATA 0x2000
+#define XCLASS_FLAGS 0x4000
+#define XCLASS_NOTIFICATION 0x8000
+
+#define XTYP_ERROR (0x0000 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
+#define XTYP_ADVDATA (0x0010 | XCLASS_FLAGS)
+#define XTYP_ADVREQ (0x0020 | XCLASS_DATA | XTYPF_NOBLOCK)
+#define XTYP_ADVSTART (0x0030 | XCLASS_BOOL)
+#define XTYP_ADVSTOP (0x0040 | XCLASS_NOTIFICATION)
+#define XTYP_EXECUTE (0x0050 | XCLASS_FLAGS)
+#define XTYP_CONNECT (0x0060 | XCLASS_BOOL | XTYPF_NOBLOCK)
+#define XTYP_CONNECT_CONFIRM (0x0070 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
+#define XTYP_XACT_COMPLETE (0x0080 | XCLASS_NOTIFICATION )
+#define XTYP_POKE (0x0090 | XCLASS_FLAGS)
+#define XTYP_REGISTER (0x00A0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
+#define XTYP_REQUEST (0x00B0 | XCLASS_DATA )
+#define XTYP_DISCONNECT (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
+#define XTYP_UNREGISTER (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
+#define XTYP_WILDCONNECT (0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK)
+
+#define XTYP_MASK 0x00F0
+#define XTYP_SHIFT 4
+
+#define TIMEOUT_ASYNC 0xFFFFFFFF
+
+#define CADV_LATEACK 0xFFFF
+
+/**************************************************
+
+ End of Message Types Section
+
+****************************************************/
+
+/*****************************************************
+
+ DDE Codes for wStatus field
+
+*****************************************************/
+
+#define DDE_FACK 0x8000
+#define DDE_FBUSY 0x4000
+#define DDE_FDEFERUPD 0x4000
+#define DDE_FACKREQ 0x8000
+#define DDE_FRELEASE 0x2000
+#define DDE_FREQUESTED 0x1000
+#define DDE_FAPPSTATUS 0x00FF
+#define DDE_FNOTPROCESSED 0x0000
+
+#define DDE_FACKRESERVED (~(DDE_FACK | DDE_FBUSY | DDE_FAPPSTATUS))
+#define DDE_FADVRESERVED (~(DDE_FACKREQ | DDE_FDEFERUPD))
+#define DDE_FDATRESERVED (~(DDE_FACKREQ | DDE_FRELEASE | DDE_FREQUESTED))
+#define DDE_FPOKRESERVED (~(DDE_FRELEASE))
+
+/*****************************************************
+
+ End of wStatus codes
+
+*****************************************************/
+
+/****************************************************
+
+ Return Codes section again copied from SDK as must be same
+
+*****************************************************/
+
+#define DMLERR_NO_ERROR 0 /* must be 0 */
+
+#define DMLERR_FIRST 0x4000
+
+#define DMLERR_ADVACKTIMEOUT 0x4000
+#define DMLERR_BUSY 0x4001
+#define DMLERR_DATAACKTIMEOUT 0x4002
+#define DMLERR_DLL_NOT_INITIALIZED 0x4003
+#define DMLERR_DLL_USAGE 0x4004
+#define DMLERR_EXECACKTIMEOUT 0x4005
+#define DMLERR_INVALIDPARAMETER 0x4006
+#define DMLERR_LOW_MEMORY 0x4007
+#define DMLERR_MEMORY_ERROR 0x4008
+#define DMLERR_NOTPROCESSED 0x4009
+#define DMLERR_NO_CONV_ESTABLISHED 0x400a
+#define DMLERR_POKEACKTIMEOUT 0x400b
+#define DMLERR_POSTMSG_FAILED 0x400c
+#define DMLERR_REENTRANCY 0x400d
+#define DMLERR_SERVER_DIED 0x400e
+#define DMLERR_SYS_ERROR 0x400f
+#define DMLERR_UNADVACKTIMEOUT 0x4010
+#define DMLERR_UNFOUND_QUEUE_ID 0x4011
+
+#define DMLERR_LAST 0x4011
+
+#define HDATA_APPOWNED 0x0001
+
+/*****************************************************
+
+ End of Return Codes and Microsoft section
+
+******************************************************/
+
+
DECLARE_HANDLE(HCONVLIST);
DECLARE_HANDLE(HCONV);
DECLARE_HANDLE(HSZ);
DECLARE_HANDLE(HDDEDATA);
-typedef HDDEDATA CALLBACK FNCALLBACK(UINT,UINT,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD);
-typedef HDDEDATA(CALLBACK *PFNCALLBACK)(UINT,UINT,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD);
-typedef struct tagHSZPAIR {
- HSZ hszSvc;
- HSZ hszTopic;
+
+
+
+/*******************************************************
+
+ API Entry Points
+
+*******************************************************/
+
+typedef HDDEDATA (CALLBACK *PFNCALLBACK)(UINT, UINT, HCONV, HSZ, HSZ,
+ HDDEDATA, ULONG_PTR, ULONG_PTR);
+
+/***************************************************
+
+ Externally visible data structures
+
+***************************************************/
+
+typedef struct tagHSZPAIR
+{
+ HSZ hszSvc;
+ HSZ hszTopic;
} HSZPAIR, *PHSZPAIR;
-typedef struct tagCONVCONTEXT {
- UINT cb;
- UINT wFlags;
- UINT wCountryID;
- int iCodePage;
- DWORD dwLangID;
- DWORD dwSecurity;
- SECURITY_QUALITY_OF_SERVICE qos;
-} CONVCONTEXT,*PCONVCONTEXT;
-typedef struct tagCONVINFO {
- DWORD cb;
- DWORD hUser;
- HCONV hConvPartner;
- HSZ hszSvcPartner;
- HSZ hszServiceReq;
- HSZ hszTopic;
- HSZ hszItem;
- UINT wFmt;
- UINT wType;
- UINT wStatus;
- UINT wConvst;
- UINT wLastError;
- HCONVLIST hConvList;
- CONVCONTEXT ConvCtxt;
- HWND hwnd;
- HWND hwndPartner;
-} CONVINFO,*PCONVINFO;
-typedef struct tagDDEML_MSG_HOOK_DATA {
- UINT uiLo;
- UINT uiHi;
- DWORD cbData;
- DWORD Data[8];
-} DDEML_MSG_HOOK_DATA;
-typedef struct tagMONHSZSTRUCTA {
- UINT cb;
- BOOL fsAction;
- DWORD dwTime;
- HSZ hsz;
- HANDLE hTask;
- CHAR str[1];
-} MONHSZSTRUCTA, *PMONHSZSTRUCTA;
-typedef struct tagMONHSZSTRUCTW {
- UINT cb;
- BOOL fsAction;
- DWORD dwTime;
- HSZ hsz;
- HANDLE hTask;
- WCHAR str[1];
-} MONHSZSTRUCTW, *PMONHSZSTRUCTW;
-typedef struct tagMONLINKSTRUCT {
- UINT cb;
- DWORD dwTime;
- HANDLE hTask;
- BOOL fEstablished;
- BOOL fNoData;
- HSZ hszSvc;
- HSZ hszTopic;
- HSZ hszItem;
- UINT wFmt;
- BOOL fServer;
- HCONV hConvServer;
- HCONV hConvClient;
-} MONLINKSTRUCT, *PMONLINKSTRUCT;
-typedef struct tagMONCONVSTRUCT {
- UINT cb;
- BOOL fConnect;
- DWORD dwTime;
- HANDLE hTask;
- HSZ hszSvc;
- HSZ hszTopic;
- HCONV hConvClient;
- HCONV hConvServer;
-} MONCONVSTRUCT, *PMONCONVSTRUCT;
-typedef struct tagMONCBSTRUCT {
- UINT cb;
- DWORD dwTime;
- HANDLE hTask;
- DWORD dwRet;
- UINT wType;
- UINT wFmt;
- HCONV hConv;
- HSZ hsz1;
- HSZ hsz2;
- HDDEDATA hData;
- ULONG_PTR dwData1;
- ULONG_PTR dwData2;
- CONVCONTEXT cc;
- DWORD cbData;
- DWORD Data[8];
-} MONCBSTRUCT, *PMONCBSTRUCT;
-typedef struct tagMONERRSTRUCT {
- UINT cb;
- UINT wLastError;
- DWORD dwTime;
- HANDLE hTask;
-} MONERRSTRUCT, *PMONERRSTRUCT;
-typedef struct tagMONMSGSTRUCT {
- UINT cb;
- HWND hwndTo;
- DWORD dwTime;
- HANDLE hTask;
- UINT wMsg;
- WPARAM wParam;
- LPARAM lParam;
- DDEML_MSG_HOOK_DATA dmhd;
-} MONMSGSTRUCT, *PMONMSGSTRUCT;
-
-BOOL WINAPI DdeAbandonTransaction(DWORD,HCONV,DWORD);
-PBYTE WINAPI DdeAccessData(HDDEDATA,PDWORD);
-HDDEDATA WINAPI DdeAddData(HDDEDATA,PBYTE,DWORD,DWORD);
-HDDEDATA WINAPI DdeClientTransaction(PBYTE,DWORD,HCONV,HSZ,UINT,UINT,DWORD,PDWORD);
-int WINAPI DdeCmpStringHandles(HSZ,HSZ);
-HCONV WINAPI DdeConnect(DWORD,HSZ,HSZ,PCONVCONTEXT);
+
+typedef struct tagCONVCONTEXT
+{
+ UINT cb;
+ UINT wFlags;
+ UINT wCountryID;
+ INT iCodePage;
+ DWORD dwLangID;
+ DWORD dwSecurity;
+} CONVCONTEXT, *PCONVCONTEXT;
+
+typedef struct tagCONVINFO
+{
+ DWORD cb;
+ DWORD hUser;
+ HCONV hConvPartner;
+ HSZ hszSvcPartner;
+ HSZ hszServiceReq;
+ HSZ hszTopic;
+ HSZ hszItem;
+ UINT wFmt;
+ UINT wType;
+ UINT wStatus;
+ UINT wConvst;
+ UINT wLastError;
+ HCONVLIST hConvList;
+ CONVCONTEXT ConvCtxt;
+ HWND hwnd;
+ HWND hwndPartner;
+} CONVINFO, *PCONVINFO;
+
+/* Interface Definitions */
+
+
+UINT WINAPI DdeInitializeA(LPDWORD,PFNCALLBACK,DWORD,DWORD);
+UINT WINAPI DdeInitializeW(LPDWORD,PFNCALLBACK,DWORD,DWORD);
+#define DdeInitialize WINELIB_NAME_AW(DdeInitialize)
+BOOL WINAPI DdeUninitialize(DWORD);
HCONVLIST WINAPI DdeConnectList(DWORD,HSZ,HSZ,HCONVLIST,PCONVCONTEXT);
-HDDEDATA WINAPI DdeCreateDataHandle(DWORD,PBYTE,DWORD,DWORD,HSZ,UINT,UINT);
-HSZ WINAPI DdeCreateStringHandleA(DWORD,LPSTR,int);
-HSZ WINAPI DdeCreateStringHandleW(DWORD,LPWSTR,int);
-BOOL WINAPI DdeDisconnect(HCONV);
-BOOL WINAPI DdeDisconnectList(HCONVLIST);
-BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT);
-BOOL WINAPI DdeFreeDataHandle(HDDEDATA);
-BOOL WINAPI DdeFreeStringHandle(DWORD,HSZ);
-DWORD WINAPI DdeGetData(HDDEDATA,PBYTE,DWORD,DWORD);
-UINT WINAPI DdeGetLastError(DWORD);
-BOOL WINAPI DdeImpersonateClient(HCONV);
-UINT WINAPI DdeInitializeA(PDWORD,PFNCALLBACK,DWORD,DWORD);
-UINT WINAPI DdeInitializeW(PDWORD,PFNCALLBACK,DWORD,DWORD);
-BOOL WINAPI DdeKeepStringHandle(DWORD,HSZ);
-HDDEDATA WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT);
-BOOL WINAPI DdePostAdvise(DWORD,HSZ,HSZ);
-UINT WINAPI DdeQueryConvInfo(HCONV,DWORD,PCONVINFO);
-HCONV WINAPI DdeQueryNextServer(HCONVLIST,HCONV);
-DWORD WINAPI DdeQueryStringA(DWORD,HSZ,LPSTR,DWORD,int);
-DWORD WINAPI DdeQueryStringW(DWORD,HSZ,LPWSTR,DWORD,int);
-HCONV WINAPI DdeReconnect(HCONV);
-BOOL WINAPI DdeSetUserHandle(HCONV,DWORD,DWORD);
-BOOL WINAPI DdeUnaccessData(HDDEDATA);
-BOOL WINAPI DdeUninitialize(DWORD);
-
-#ifdef UNICODE
-#define SZDDESYS_TOPIC L"System"
-#define SZDDESYS_ITEM_TOPICS L"Topics"
-#define SZDDESYS_ITEM_SYSITEMS L"SysItems"
-#define SZDDESYS_ITEM_RTNMSG L"ReturnMessage"
-#define SZDDESYS_ITEM_STATUS L"Status"
-#define SZDDESYS_ITEM_FORMATS L"Formats"
-#define SZDDESYS_ITEM_HELP L"Help"
-#define SZDDE_ITEM_ITEMLIST L"TopicItemList"
-#define MONHSZSTRUCT MONHSZSTRUCTA
-#define PMONHSZSTRUCT PMONHSZSTRUCTA
-#define DdeCreateStringHandle DdeCreateStringHandleW
-#define DdeInitialize DdeInitializeW
-#define DdeQueryString DdeQueryStringW
-#else
-#define SZDDESYS_TOPIC "System"
-#define SZDDESYS_ITEM_TOPICS "Topics"
-#define SZDDESYS_ITEM_SYSITEMS "SysItems"
-#define SZDDESYS_ITEM_RTNMSG "ReturnMessage"
-#define SZDDESYS_ITEM_STATUS "Status"
-#define SZDDESYS_ITEM_FORMATS "Formats"
-#define SZDDESYS_ITEM_HELP "Help"
-#define SZDDE_ITEM_ITEMLIST "TopicItemList"
-#define MONHSZSTRUCT MONHSZSTRUCTW
-#define PMONHSZSTRUCT PMONHSZSTRUCTW
-#define DdeCreateStringHandle DdeCreateStringHandleA
-#define DdeInitialize DdeInitializeA
-#define DdeQueryString DdeQueryStringA
-#endif
+HCONV WINAPI DdeQueryNextServer(HCONVLIST, HCONV);
+DWORD WINAPI DdeQueryStringA(DWORD, HSZ, LPSTR, DWORD, INT);
+DWORD WINAPI DdeQueryStringW(DWORD, HSZ, LPWSTR, DWORD, INT);
+#define DdeQueryString WINELIB_NAME_AW(DdeQueryString)
+BOOL WINAPI DdeDisconnectList(HCONVLIST);
+HCONV WINAPI DdeConnect(DWORD,HSZ,HSZ,PCONVCONTEXT);
+BOOL WINAPI DdeDisconnect(HCONV);
+HDDEDATA WINAPI DdeCreateDataHandle(DWORD,LPBYTE,DWORD,DWORD,HSZ,UINT,UINT);
+HCONV WINAPI DdeReconnect(HCONV);
+HSZ WINAPI DdeCreateStringHandleA(DWORD,LPCSTR,INT);
+HSZ WINAPI DdeCreateStringHandleW(DWORD,LPCWSTR,INT);
+#define DdeCreateStringHandle WINELIB_NAME_AW(DdeCreateStringHandle)
+BOOL WINAPI DdeFreeStringHandle(DWORD,HSZ);
+BOOL WINAPI DdeFreeDataHandle(HDDEDATA);
+BOOL WINAPI DdeKeepStringHandle(DWORD,HSZ);
+HDDEDATA WINAPI DdeClientTransaction(LPBYTE,DWORD,HCONV,HSZ,UINT,UINT,DWORD,LPDWORD);
+BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction);
+BOOL WINAPI DdeImpersonateClient(HCONV);
+BOOL WINAPI DdePostAdvise(DWORD,HSZ,HSZ);
+HDDEDATA WINAPI DdeAddData(HDDEDATA,LPBYTE,DWORD,DWORD);
+DWORD WINAPI DdeGetData(HDDEDATA,LPBYTE,DWORD,DWORD);
+LPBYTE WINAPI DdeAccessData(HDDEDATA,LPDWORD);
+BOOL WINAPI DdeUnaccessData(HDDEDATA);
+BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT);
+INT WINAPI DdeCmpStringHandles(HSZ,HSZ);
+BOOL WINAPI DdeSetUserHandle(HCONV,DWORD,DWORD);
+
+HDDEDATA WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT);
+UINT WINAPI DdeGetLastError(DWORD);
+UINT WINAPI DdeQueryConvInfo(HCONV,DWORD,PCONVINFO);
+
#ifdef __cplusplus
-}
-#endif
-#endif /* _DDEML_H */
+} /* extern "C" */
+#endif /* defined(__cplusplus) */
+
+#endif /* __WINE_DDEML_H */
Modified: branches/ros-branch-0_3_0/reactos/include/winuser.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/includ…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/include/winuser.h (original)
+++ branches/ros-branch-0_3_0/reactos/include/winuser.h Mon Jul 31 06:17:13 2006
@@ -306,6 +306,7 @@
#define SS_BLACKRECT 4
#define SS_CENTER 1
#define SS_CENTERIMAGE 512
+#define SS_EDITCONTROL 0x2000
#define SS_ENHMETAFILE 15
#define SS_ETCHEDFRAME 18
#define SS_ETCHEDHORZ 16
@@ -318,6 +319,7 @@
#define SS_NOPREFIX 128
#define SS_NOTIFY 256
#define SS_OWNERDRAW 0xd
+#define SS_REALSIZECONTROL 0x040
#define SS_REALSIZEIMAGE 0x800
#define SS_RIGHT 2
#define SS_RIGHTJUST 0x400
18 years, 4 months
- 1
- 0
[turner] 23381: Implement the reading and writing of pagefile settings. We should not longer have to edit it by hand in regedit. This works 100% flawlessly in win2k3 but has not been tested in ros yet. Patch by Christian Wallukat (cwallukat@gmx.at) and myself.
by turner＠svn.reactos.org
Author: turner
Date: Mon Jul 31 03:14:02 2006
New Revision: 23381
URL: http://svn.reactos.org/svn/reactos?rev=23381&view=rev
Log:
Implement the reading and writing of pagefile settings. We should not longer have to edit it by hand in regedit. This works 100% flawlessly in win2k3 but has not been tested in ros yet. Patch by Christian Wallukat (cwallukat(a)gmx.at) and myself.
Modified:
trunk/reactos/dll/cpl/sysdm/sysdm.rbuild
trunk/reactos/dll/cpl/sysdm/virtmem.c
Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/sysdm.rbuild (original)
+++ trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Mon Jul 31 03:14:02 2006
@@ -11,6 +11,7 @@
<library>user32</library>
<library>comctl32</library>
<library>netapi32</library>
+ <library>ntdll</library>
<file>advanced.c</file>
<file>computer.c</file>
<file>environment.c</file>
Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/virtmem.c (original)
+++ trunk/reactos/dll/cpl/sysdm/virtmem.c Mon Jul 31 03:14:02 2006
@@ -1,39 +1,735 @@
+/*
+* ReactOS
+* Copyright (C) 2004 ReactOS Team
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+/* $Id$
+*
+* PROJECT: ReactOS System Control Panel
+* FILE: lib/cpl/sysdm/virtmem.c
+* PURPOSE: pagefile settings
+* PROGRAMMER: Christian Wallukat cwallukat(at)gmx(dot)at
+*/
+
#include <windows.h>
#include <commctrl.h>
#include <stdlib.h>
#include <tchar.h>
-
#include "resource.h"
#include "sysdm.h"
-
-
-/* Environment dialog procedure */
-INT_PTR CALLBACK
-VirtMemDlgProc(HWND hwndDlg,
- UINT uMsg,
- WPARAM wParam,
- LPARAM lParam)
+#include <stdio.h>
+#include <winternl.h>
+
+
+
+//
+// An array of these structs will interally manage system page files
+//
+typedef struct _sPagefiles
{
- UNREFERENCED_PARAMETER(lParam);
- switch (uMsg)
- {
+ WCHAR szDrive[10];
+ INT nMinValue;
+ INT nMaxValue;
+ INT nUsed;
+} sPageFiles;
+
+
+
+//
+// At most there can be 32 drives, so only 32 page files
+//
+sPageFiles g_sPagefile[32];
+//
+// This is the number of drives that could have page files
+//
+INT g_nCount;
+//
+// Will save the user set action signal saving to the registry on exit
+//
+BOOL g_bSave;
+
+
+//
+// ReadRegSettings reads the page file settings from the regisrty
+//
+VOID ReadRegSettings(HWND hwndDlg);
+//
+// ParseMemSettings takes the regisrty string and create the internal page file array
+//
+VOID ParseMemSettings(TCHAR *szSettings, HWND hwndDlg);
+//
+// SaveSettings writes the paging file array to the registry
+//
+VOID SaveSettings(HWND hwndDlg);
+
+//
+// Callback function for messages for the windows
+//
+INT_PTR
+CALLBACK
+VirtMemDlgProc(HWND hwndDlg,
+ UINT uMsg,
+ WPARAM wParam,
+ LPARAM lParam)
+{
+ SYSTEM_PROCESS_INFORMATION siSysPInfo;
+ TCHAR szTemp[255];
+ INT nIndex = 0;
+
+ //
+ // We dont need to look at this part of the message
+ //
+ UNREFERENCED_PARAMETER(lParam);
+
+ switch (uMsg)
+ {
case WM_INITDIALOG:
- break;
+ {
+ //
+ // We dont save the changes until set is clicked
+ //
+ g_bSave = FALSE;
+ //
+ // We start with no page files
+ //
+ g_nCount = 0;
+ //
+ // Clear out the file pagefile
+ //
+ g_sPagefile[0].nMaxValue = 0;
+ g_sPagefile[0].nMinValue = 0;
+ g_sPagefile[0].nUsed = 0;
+
+ //
+ // Grad the system stats to get some page file into
+ //
+ NtQuerySystemInformation(SystemProcessInformation, &siSysPInfo, sizeof(SYSTEM_PROCESS_INFORMATION), NULL);
+
+ //
+ // Convert the pagefile usage to a string
+ //
+ _itow(siSysPInfo.PeakPagefileUsage, szTemp, 10);
+
+ //
+ // Set pagefle useage to its label
+ //
+ SendDlgItemMessage(hwndDlg, IDC_CURRENT, WM_SETTEXT, (WPARAM)0, (LPARAM)szTemp);
+
+ //
+ // Load the pagefile systems from the reg
+ //
+ ReadRegSettings(hwndDlg);
+ };
+ break;
case WM_COMMAND:
- switch (LOWORD(wParam))
- {
- case IDCANCEL:
- EndDialog(hwndDlg, 0);
- return TRUE;
- }
- break;
+ {
+ switch (LOWORD(wParam))
+ {
+ case IDCANCEL:
+ {
+ //
+ // If the user hits cancel we just close and dont save
+ //
+ EndDialog(hwndDlg, 0);
+ return TRUE;
+ };
+ break;
+
+
+ case IDOK:
+ {
+ //
+ // Check to make sure that the user hit set and we will save the settings
+ //
+ if(g_bSave == TRUE)
+ {
+ SaveSettings(hwndDlg);
+ };
+
+ //
+ // Close out the window
+ //
+ EndDialog(hwndDlg, 0);
+ };
+ break;
+
+
+ case IDC_PAGEFILELIST:
+ {
+ switch(HIWORD(wParam))
+ {
+ case LBN_SELCHANGE:
+ {
+ //
+ // Get the currently selected page file from the list box
+ //
+ nIndex = (INT)SendDlgItemMessage(hwndDlg, IDC_PAGEFILELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0);
+
+ //
+ // If the index is in our range then process that page file
+ //
+ if(nIndex < g_nCount)
+ {
+ //
+ // Convert the minvalue for the page file
+ //
+ _itow(g_sPagefile[nIndex].nMinValue, szTemp, 10);
+
+ //
+ // Set the min value to its textbox
+ //
+ SendDlgItemMessage(hwndDlg, IDC_INITIALSIZE, WM_SETTEXT, (WPARAM)0, (LPARAM)szTemp);
+
+ //
+ // Convert the max value of the page file to a string
+ //
+ _itow(g_sPagefile[nIndex].nMaxValue, szTemp, 10);
+
+ //
+ // Set the max value to its textbox
+ //
+ SendDlgItemMessage(hwndDlg, IDC_MAXSIZE, WM_SETTEXT, (WPARAM)0, (LPARAM)szTemp);
+
+ //
+ // Figure out what type of page file it is
+ //
+ if(g_sPagefile[nIndex].nMinValue == 0 && g_sPagefile[nIndex].nMaxValue == 0)
+ {
+ //
+ // There is either no page file or a system managed page file so we disable custom sizes
+ //
+ EnableWindow(GetDlgItem(hwndDlg, IDC_MAXSIZE), FALSE);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_INITIALSIZE), FALSE);
+ //
+ // Check to see if that drive is used for paging
+ //
+ if(g_sPagefile[nIndex].nUsed == 1)
+ {
+ //
+ // This is a system managed page file
+ //
+ SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)1, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+ }
+ else
+ {
+ //
+ // There is no page file on this drive
+ //
+ SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)1, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+ }
+ }
+ else
+ {
+ //
+ // THis is a custom sized page file
+ //
+ SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)1, (LPARAM)0);
+ //
+ // We need to allow the user to change the sizes
+ //
+ EnableWindow(GetDlgItem(hwndDlg, IDC_MAXSIZE), TRUE);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_INITIALSIZE), TRUE);
+ }
+ };
+ };
+ break;
+ };
+ };
+ break;
+
+
+ case IDC_NOPAGEFILE:
+ {
+ //
+ // Set the pagefile to no page file
+ //
+ SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)1, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+
+ //
+ // Disable the page file custom size boxes
+ //
+ EnableWindow(GetDlgItem(hwndDlg, IDC_MAXSIZE), FALSE);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_INITIALSIZE), FALSE);
+ };
+ break;
+
+ case IDC_SYSMANSIZE:
+ {
+ //
+ // User changed this to a system managed page file
+ //
+ SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)1, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+
+ //
+ // Disable the page file custom size boxes
+ //
+ EnableWindow(GetDlgItem(hwndDlg, IDC_MAXSIZE), FALSE);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_INITIALSIZE), FALSE);
+ };
+ break;
+
+ case IDC_CUSTOM:
+ {
+ //
+ // User changed this to a cutom sized page file
+ //
+ SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_SYSMANSIZE, BM_SETCHECK, (WPARAM)0, (LPARAM)0);
+ SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_SETCHECK, (WPARAM)1, (LPARAM)0);
+
+ //
+ // The user should be able to change the size of these files
+ //
+ EnableWindow(GetDlgItem(hwndDlg, IDC_MAXSIZE), TRUE);
+ EnableWindow(GetDlgItem(hwndDlg, IDC_INITIALSIZE), TRUE);
+ };
+ break;
+
+ case IDC_SET:
+ {
+ //
+ // The user hit set, so we are clear to save the settings when we are done
+ //
+ g_bSave = TRUE;
+
+ //
+ // Figure out which pagefile we are saving the settings too
+ //
+ nIndex = SendDlgItemMessage(hwndDlg, IDC_PAGEFILELIST, LB_GETCURSEL, (WPARAM)0, (LPARAM)0);
+
+ //
+ // Make sure it isnt out of our range
+ //
+ if(nIndex < g_nCount)
+ {
+ //
+ // Check to see what the current user input settings are
+ //
+ if(SendDlgItemMessage(hwndDlg, IDC_CUSTOM, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED)
+ {
+ //
+ // If custom is checked we need to get the min size
+ //
+ SendDlgItemMessage(hwndDlg, IDC_INITIALSIZE, WM_GETTEXT, (WPARAM)254, (LPARAM)szTemp);
+
+ //
+ // Convert the size to an int and save it
+ //
+ g_sPagefile[nIndex].nMinValue = _wtoi(szTemp);
+
+ //
+ // If custom is checked we need to get the max size
+ //
+ SendDlgItemMessage(hwndDlg, IDC_MAXSIZE, WM_GETTEXT, (WPARAM)254, (LPARAM)szTemp);
+
+ //
+ // If custom is checked we need to get the max size
+ //
+ g_sPagefile[nIndex].nMaxValue = _wtoi(szTemp);
+
+ }
+ else
+ {
+ //
+ // If it is no paging file or system then we set the sizes to zero
+ //
+ g_sPagefile[nIndex].nMinValue = g_sPagefile[nIndex].nMaxValue = 0;
+ }
+
+ //
+ // We check to see if this drive is used for a paging file anymore
+ //
+ g_sPagefile[nIndex].nUsed = (SendDlgItemMessage(hwndDlg, IDC_NOPAGEFILE, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_UNCHECKED);
+
+
+ //
+ // FIXME: Rebuild the paging list
+ //
+ };
+ };
+ break;
+ };
+ };
+ break;
case WM_NOTIFY:
- break;
- }
-
- return FALSE;
-}
+ {
+ };
+ break;
+ };
+
+ return FALSE;
+};
+
+
+VOID
+ReadRegSettings(HWND hwndDlg)
+{
+ HKEY hk = NULL;
+ DWORD dwType = 0x0;
+ DWORD dwDataSize = 0x0;
+ TCHAR szValue[2048];
+
+
+ //
+ // Open or create this key to read our settings
+ //
+ if(RegCreateKeyEx(HKEY_LOCAL_MACHINE,
+ _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"),
+ 0x0,
+ NULL,
+ REG_OPTION_NON_VOLATILE,
+ KEY_WRITE | KEY_READ,
+ NULL,
+ &hk,
+ NULL) == ERROR_SUCCESS)
+ {
+
+ //
+ // Get the size of the data
+ //
+ if(RegQueryValueEx(hk, _T("PagingFiles"), 0, &dwType, (PBYTE)NULL, &dwDataSize) == ERROR_SUCCESS)
+ {
+
+ //
+ // Read paging file settings from the regisrty
+ //
+ if(RegQueryValueEx(hk, _T("PagingFiles"), 0, &dwType, (PBYTE)(LPTSTR)szValue, &dwDataSize) == ERROR_SUCCESS)
+ {
+ //
+ // Parse our settings and set up controls accordingly
+ //
+ ParseMemSettings(szValue, hwndDlg);
+ }
+ else
+ {
+ //
+ // We had a problem :(
+ //
+ OutputDebugString(_T("Err read pagefile\n"));
+ };
+ }
+ else
+ {
+ //
+ // We had a problem :(
+ //
+ OutputDebugString(_T("Err open reg pagefile\n"));
+ };
+
+ //
+ // Close our key
+ //
+ RegCloseKey(hk);
+ };
+};
+
+
+VOID
+ParseMemSettings(TCHAR *szSettings, HWND hwndDlg)
+{
+ TCHAR szVolName[256];
+ TCHAR szDrive[25];
+ TCHAR szDrvLst[256];
+ TCHAR szTemp[256];
+ TCHAR szList[256];
+ INT nLastPos = 0;
+ INT nMinSize = 0;
+ INT nMaxSize = 0;
+ INT nTemp = 0;
+ BOOL bFound = FALSE;
+
+ g_nCount = 0;
+
+ //
+ // Clear out all our buffers
+ //
+ _wcsnset(szTemp, 0, sizeof(szTemp));
+ _wcsnset(szVolName, 0, sizeof(szVolName));
+ _wcsnset(szDrive, 0, sizeof(szDrive));
+ _wcsnset(szList, 0, sizeof(szList));
+
+ //
+ // Get a list of all the drives
+ //
+ GetLogicalDriveStrings(255, szDrvLst);
+
+ //
+ // Print out our drives and our reg string
+ //
+ OutputDebugString(szDrvLst);
+ OutputDebugString((TCHAR*)szSettings);
+
+ //
+ // Loop through all the drives
+ //
+ while(TRUE)
+ {
+ //
+ // Copy over the drive letter
+ //
+ wsprintf(szDrive, _T("%s"), szDrvLst + nLastPos);
+ nLastPos += 4;
+
+ //
+ // We should fixed and removeable drives, no network / cd
+ //
+ if(GetDriveType(szDrive) == DRIVE_FIXED || GetDriveType(szDrive) == DRIVE_REMOVABLE)
+ {
+ //
+ // Get some info about out drive
+ //
+ GetVolumeInformation(szDrive, (LPTSTR)szVolName, 255, NULL, NULL, NULL, NULL, 0);
+
+ //
+ // Cut off the Drive letter :
+ //
+ szDrive[2] = 0;
+
+ //
+ // Clear out our vars to prepare to walk page file setting string
+ //
+ nTemp = 0;
+ bFound = FALSE;
+
+ //
+ // Walk through the list of page files
+ //
+ while(TRUE)
+ {
+ //
+ // Copy over a page file setting for a drive skipping already processed ones
+ //
+ wsprintf(szTemp, _T("%s"), szSettings + nTemp);
+
+
+ //
+ // Check to see if the drive for the page file setting matches our current drive
+ //
+ if(!_tcsnicmp(szTemp,szDrive,1))
+ {
+ //
+ // Extract the min/max size from the string
+ //
+ nMinSize = (INT)(wcsstr(szTemp + 16, _T(" ")) - (szTemp + 16)) + 1;
+ nMaxSize = _wtoi(szTemp + 16 + nMinSize);
+ nMinSize = _wtoi(szTemp + 16);
+
+ //
+ // Fill in the page file settings in the internal array
+ //
+ g_sPagefile[g_nCount].nMaxValue = nMaxSize;
+ g_sPagefile[g_nCount].nMinValue = nMinSize;
+ g_sPagefile[g_nCount].nUsed = 1;
+ wsprintf(g_sPagefile[g_nCount].szDrive, _T("%s"), szDrive);
+
+ //
+ // Add up one more page file found
+ //
+ ++g_nCount;
+
+ //
+ // Indicate that we found a pagefile for this drive
+ //
+ bFound = TRUE;
+
+ break;
+ };
+
+ //
+ // Skip passed the just processed drive setting
+ //
+ nTemp += _tcslen(szSettings + nTemp) + 1;
+
+ //
+ // If we are done looking through the page file settings
+ // or found a matching setting then break out
+ //
+ if((_tcslen(szSettings + nTemp) <= 0) || (bFound == TRUE))
+ {
+ break;
+ };
+ };
+
+ //
+ // If we found a page file we make a string for the list box with the size
+ //
+ if(bFound == TRUE)
+ {
+ wsprintf(szList, _T("%s [%s] %i - %i"), szDrive, szVolName, nMinSize, nMaxSize);
+ }
+ else
+ {
+ //
+ // Otherwise we make a blank pagefile element to show no page file
+ //
+ g_sPagefile[g_nCount].nMaxValue = 0;
+ g_sPagefile[g_nCount].nMinValue = 0;
+ g_sPagefile[g_nCount].nUsed = 0;
+
+ //
+ // Copy over the drive for the blank page file element
+ //
+ wsprintf(g_sPagefile[g_nCount].szDrive, _T("%s"), szDrive);
+
+ //
+ // Add up one for the blank page file
+ //
+ ++g_nCount;
+
+ //
+ // We just show the name of the drive if there is no page file
+ //
+ wsprintf(szList, _T("%s [%s]"), szDrive, szVolName);
+ };
+
+ //
+ // Add our string to the page file list
+ //
+ SendDlgItemMessage(hwndDlg, IDC_PAGEFILELIST, LB_ADDSTRING, (WPARAM)NULL, (LPARAM)szList);
+
+ //
+ // Print out the newly added string
+ //
+ OutputDebugString(szList);
+ };
+
+ //
+ // Once all drive have finished being processed then we break out
+ //
+ if(_tcslen(szDrvLst + nLastPos) <= 0)
+ {
+ return;
+ };
+ };
+};
+
+
+void SaveSettings(HWND hwndDlg)
+{
+ HKEY hk = NULL;
+ TCHAR szValue[2048];
+ TCHAR szTemp[512];
+ INT nCount = 0;
+ INT nPos = 0;
+
+ //
+ // Clear out our buffers
+ //
+ _wcsnset(szValue, 0, sizeof(szValue));
+ _wcsnset(szTemp, 0, sizeof(szTemp));
+
+ //
+ // Go through all our internal pagefile records
+ //
+ for(nCount = 0; nCount < g_nCount; ++nCount)
+ {
+ //
+ // We only save it to the regisrty if is used
+ //
+ if(g_sPagefile[nCount].nUsed == 1)
+ {
+ //
+ // Clear out our temp buffer
+ //
+ _wcsnset(szTemp, 0, sizeof(szTemp));
+ //
+ // Copy the path and sizes to our temp buffer for the page file
+ //
+ wsprintf(szTemp, _T("%s\\pagefile.sys %i %i"), g_sPagefile[nCount].szDrive, g_sPagefile[nCount].nMinValue, g_sPagefile[nCount].nMaxValue);
+
+ //
+ // Add it to our overall regisrty string
+ //
+ _tcscat(szValue+nPos,szTemp);
+
+ //
+ // Record the positioon where the next string will be placed in the buffer
+ //
+ nPos += _tcslen(szTemp) + 1;
+ // Add our null chars in to seperate the page files(REG_MULTI_SZ string)
+ szValue[nPos - 1] = 0;
+ szValue[nPos] = 0;
+ };
+ };
+
+ //
+ // Now that we have page file setting string we open up the key to save it
+ //
+ if(RegCreateKeyEx(HKEY_LOCAL_MACHINE,
+ _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"),
+ 0x0,
+ NULL,
+ REG_OPTION_NON_VOLATILE,
+ KEY_ALL_ACCESS,
+ NULL,
+ &hk,
+ NULL) == ERROR_SUCCESS)
+ {
+ //
+ // We save our page file settings to the PagingFiles value
+ //
+ if (RegSetValueEx(hk,
+ _T("PagingFiles"),
+ 0,
+ REG_MULTI_SZ,
+ (LPBYTE) szValue,
+ (DWORD) (nPos+2)*sizeof(TCHAR)))
+ {
+ //
+ // We had a problem, so print out a message
+ //
+ OutputDebugString(_T("Could not save"));
+
+ //
+ // Get the error for our last operation
+ //
+ _ltow(GetLastError(), szValue, 10);
+
+ //
+ // Print out the error code
+ //
+ OutputDebugString(szValue);
+
+ }
+
+ //
+ // Close up the regisrty
+ //
+ RegCloseKey(hk);
+ }
+ else
+ {
+ //
+ // Print out an error that we couldnt open(create) the registry key.
+ //
+ OutputDebugString(_T("Could not open key"));
+ };
+};
+
/* EOF */
18 years, 4 months
- 1
- 0