Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[weiden] 16511: allocate enough memory for strings, lstrlenW returns the length of the string in characters, not bytes.

by weiden＠svn.reactos.com

allocate enough memory for strings, lstrlenW returns the length of the string in characters, not bytes. Modified: trunk/reactos/lib/setupapi/stringtable.c _____ Modified: trunk/reactos/lib/setupapi/stringtable.c --- trunk/reactos/lib/setupapi/stringtable.c 2005-07-08 16:37:07 UTC (rev 16510) +++ trunk/reactos/lib/setupapi/stringtable.c 2005-07-08 19:21:28 UTC (rev 16511) @@ -200,7 +200,7 @@ { if (pStringTable->pSlots[i] == NULL) { - pStringTable->pSlots[i] = MyMalloc(lstrlenW(lpString) + sizeof(WCHAR)); + pStringTable->pSlots[i] = MyMalloc((lstrlenW(lpString) + 1) * sizeof(WCHAR)); if (pStringTable->pSlots[i] == NULL) { TRACE("Couldn't allocate memory for a new string!\n"); @@ -276,7 +276,7 @@ { if (pSourceTable->pSlots[i] != NULL) { - length = lstrlenW(pSourceTable->pSlots[i]) + sizeof(WCHAR); + length = lstrlenW((pSourceTable->pSlots[i]) + 1) * sizeof(WCHAR); pDestinationTable->pSlots[i] = MyMalloc(length); if (pDestinationTable->pSlots[i] != NULL) { @@ -429,7 +429,7 @@ return FALSE; } - dwLength = lstrlenW(pStringTable->pSlots[dwId]) + sizeof(WCHAR); + dwLength = (lstrlenW(pStringTable->pSlots[dwId]) + 1) * sizeof(WCHAR); if (dwLength <= *lpBufferLength) { lstrcpyW(lpBuffer, pStringTable->pSlots[dwId]);

19 years, 3 months

[hyperion] 16510: PE loader: corrected an assertion (fixes bug reported by GvG), added a sanity check, return STATUS_INVALID_IMAGE_PROTECT in case of unrecognized PE signature (to match Windows behavior), removed evil STATUS_UNSUCCESSFUL, corrected successful return code

by hyperion＠svn.reactos.com

PE loader: corrected an assertion (fixes bug reported by GvG), added a sanity check, return STATUS_INVALID_IMAGE_PROTECT in case of unrecognized PE signature (to match Windows behavior), removed evil STATUS_UNSUCCESSFUL, corrected successful return code Memory manager: return STATUS_INVALID_IMAGE_NOT_MZ when no loader accepts the format (to match Windows behavior) Modified: trunk/reactos/ntoskrnl/mm/pe.c Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/mm/pe.c --- trunk/reactos/ntoskrnl/mm/pe.c 2005-07-08 12:16:47 UTC (rev 16509) +++ trunk/reactos/ntoskrnl/mm/pe.c 2005-07-08 16:37:07 UTC (rev 16510) @@ -216,7 +216,7 @@ ASSERT(Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize)); - ASSERT(FileHeaderSize >= sizeof(IMAGE_DOS_HEADER)); + ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); ASSERT(((UINT_PTR)FileHeader % TYPE_ALIGNMENT(IMAGE_DOS_HEADER)) == 0); #define DIE(ARGS_) { DPRINT ARGS_; goto l_Return; } @@ -227,6 +227,10 @@ /* DOS HEADER */ nStatus = STATUS_ROS_EXEFMT_UNKNOWN_FORMAT; + /* image too small to be an MZ executable */ + if(FileHeaderSize < sizeof(IMAGE_DOS_HEADER)) + DIE(("Too small to be an MZ executable, size is %lu\n", FileHeaderSize)); + /* no MZ signature */ if(pidhDosHeader->e_magic != IMAGE_DOS_SIGNATURE) DIE(("No MZ signature found, e_magic is %hX\n", pidhDosHeader->e_magic)); @@ -310,14 +314,16 @@ } /* invalid NT header */ + nStatus = STATUS_INVALID_IMAGE_PROTECT; + if(pinhNtHeader->Signature != IMAGE_NT_SIGNATURE) DIE(("The file isn't a PE executable, Signature is %X\n", pinhNtHeader->Signature)); + nStatus = STATUS_INVALID_IMAGE_FORMAT; + if(!Intsafe_AddULong32(&cbNtHeaderSize, pinhNtHeader->FileHeader.SizeOfOptionalHeader, FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader))) DIE(("The full NT header is too large\n")); - nStatus = STATUS_UNSUCCESSFUL; - /* the buffer doesn't contain the whole NT header */ if(cbReadSize < cbNtHeaderSize) DIE(("The file doesn't contain the full NT header\n")); @@ -721,7 +727,7 @@ *Flags |= EXEFMT_LOAD_ASSUME_SEGMENTS_PAGE_ALIGNED; /* Success */ - nStatus = STATUS_ROS_EXEFMT_LOADED_FORMAT & EXEFMT_LOADED_PE32; + nStatus = STATUS_ROS_EXEFMT_LOADED_FORMAT | EXEFMT_LOADED_PE32; l_Return: if(pBuffer) _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-07-08 12:16:47 UTC (rev 16509) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-07-08 16:37:07 UTC (rev 16510) @@ -3039,7 +3039,7 @@ */ if (Status == STATUS_ROS_EXEFMT_UNKNOWN_FORMAT) { - Status = STATUS_INVALID_IMAGE_FORMAT; + Status = STATUS_INVALID_IMAGE_NOT_MZ; ASSERT(!NT_SUCCESS(Status)); }

19 years, 3 months

[jimtabor] 16509: Implement NtUserGetAsyncKeyState and support for TrackMouseEvent.

by jimtabor＠svn.reactos.com

Implement NtUserGetAsyncKeyState and support for TrackMouseEvent. Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-07-08 12:15:07 UTC (rev 16508) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-07-08 12:16:47 UTC (rev 16509) @@ -35,6 +35,8 @@ #define NDEBUG #include <debug.h> +extern BYTE QueueKeyStateTable[]; + /* GLOBALS *******************************************************************/ static HANDLE MouseDeviceHandle; @@ -986,36 +988,42 @@ Msg.message = 0; if(mi->dwFlags & MOUSEEVENTF_LEFTDOWN) { + QueueKeyStateTable[VK_LBUTTON] |= 0xc0; Msg.message = SwapBtnMsg[0][SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; MsqInsertSystemMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) { + QueueKeyStateTable[VK_LBUTTON] &= ~0x80; Msg.message = SwapBtnMsg[1][SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; MsqInsertSystemMessage(&Msg); } if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) { + QueueKeyStateTable[VK_MBUTTON] |= 0xc0; Msg.message = WM_MBUTTONDOWN; CurInfo->ButtonsDown |= MK_MBUTTON; MsqInsertSystemMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) { + QueueKeyStateTable[VK_MBUTTON] &= ~0x80; Msg.message = WM_MBUTTONUP; CurInfo->ButtonsDown &= ~MK_MBUTTON; MsqInsertSystemMessage(&Msg); } if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) { + QueueKeyStateTable[VK_RBUTTON] |= 0xc0; Msg.message = SwapBtnMsg[0][!SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; MsqInsertSystemMessage(&Msg); } else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) { + QueueKeyStateTable[VK_RBUTTON] &= ~0x80; Msg.message = SwapBtnMsg[1][!SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; MsqInsertSystemMessage(&Msg); @@ -1033,12 +1041,14 @@ Msg.message = WM_XBUTTONDOWN; if(mi->mouseData & XBUTTON1) { + QueueKeyStateTable[VK_XBUTTON1] |= 0xc0; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); CurInfo->ButtonsDown |= XBUTTON1; MsqInsertSystemMessage(&Msg); } if(mi->mouseData & XBUTTON2) { + QueueKeyStateTable[VK_XBUTTON2] |= 0xc0; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); CurInfo->ButtonsDown |= XBUTTON2; MsqInsertSystemMessage(&Msg); @@ -1049,12 +1059,14 @@ Msg.message = WM_XBUTTONUP; if(mi->mouseData & XBUTTON1) { + QueueKeyStateTable[VK_XBUTTON1] &= 0x80; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); CurInfo->ButtonsDown &= ~XBUTTON1; MsqInsertSystemMessage(&Msg); } if(mi->mouseData & XBUTTON2) { + QueueKeyStateTable[VK_XBUTTON2] &= 0x80; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); CurInfo->ButtonsDown &= ~XBUTTON2; MsqInsertSystemMessage(&Msg); _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-08 12:15:07 UTC (rev 16508) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-07-08 12:16:47 UTC (rev 16509) @@ -331,6 +331,24 @@ return ret; } +DWORD +STDCALL +NtUserGetAsyncKeyState( + DWORD key) +{ + DWORD ret = 0; + + IntLockQueueState; + if( key < 0x100 ) { + ret = ((DWORD)(QueueKeyStateTable[key] & KS_DOWN_BIT) << 8 ) | + (QueueKeyStateTable[key] & KS_LOCK_BIT); + } + IntUnLockQueueState; + return ret; +} + + + int STDCALL ToUnicodeEx( UINT wVirtKey, UINT wScanCode, PBYTE lpKeyState, _____ Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-07-08 12:15:07 UTC (rev 16508) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-07-08 12:16:47 UTC (rev 16509) @@ -285,16 +285,6 @@ DWORD STDCALL -NtUserGetAsyncKeyState( - DWORD Unknown0) -{ - UNIMPLEMENTED - - return 0; -} - -DWORD -STDCALL NtUserGetComboBoxInfo( DWORD Unknown0, DWORD Unknown1)

19 years, 3 months

[jimtabor] 16508: Implement TrackMouseEvent.

by jimtabor＠svn.reactos.com

Implement TrackMouseEvent. Modified: trunk/reactos/lib/user32/misc/stubs.c Modified: trunk/reactos/lib/user32/windows/input.c _____ Modified: trunk/reactos/lib/user32/misc/stubs.c --- trunk/reactos/lib/user32/misc/stubs.c 2005-07-08 12:13:23 UTC (rev 16507) +++ trunk/reactos/lib/user32/misc/stubs.c 2005-07-08 12:15:07 UTC (rev 16508) @@ -111,19 +111,6 @@ */ BOOL STDCALL -TrackMouseEvent( - LPTRACKMOUSEEVENT lpEventTrack) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL UnregisterDeviceNotification( HDEVNOTIFY Handle) { _____ Modified: trunk/reactos/lib/user32/windows/input.c --- trunk/reactos/lib/user32/windows/input.c 2005-07-08 12:13:23 UTC (rev 16507) +++ trunk/reactos/lib/user32/windows/input.c 2005-07-08 12:15:07 UTC (rev 16508) @@ -30,6 +30,21 @@ #include <user32.h> +/* GLOBALS *******************************************************************/ + + +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; +static UINT_PTR timer; +static const INT iTimerInterval = 50; /* msec for timer interval */ + + /* FUNCTIONS *****************************************************************/ @@ -126,13 +141,12 @@ /* - * @unimplemented + * @implemented */ SHORT STDCALL GetAsyncKeyState(int vKey) { - UNIMPLEMENTED; - return 0; + return (SHORT) NtUserGetAsyncKeyState((DWORD) vKey); } @@ -656,4 +670,339 @@ NtUserSendInput(1, &Input, sizeof(INPUT)); } + +/********************************************************************** * + * get_key_state + */ +static WORD get_key_state(void) +{ + WORD ret = 0; + + if (GetSystemMetrics( SM_SWAPBUTTON )) + { + if (GetAsyncKeyState(VK_RBUTTON) & 0x80) ret |= MK_LBUTTON; + if (GetAsyncKeyState(VK_LBUTTON) & 0x80) ret |= MK_RBUTTON; + } + else + { + if (GetAsyncKeyState(VK_LBUTTON) & 0x80) ret |= MK_LBUTTON; + if (GetAsyncKeyState(VK_RBUTTON) & 0x80) ret |= MK_RBUTTON; + } + if (GetAsyncKeyState(VK_MBUTTON) & 0x80) ret |= MK_MBUTTON; + if (GetAsyncKeyState(VK_SHIFT) & 0x80) ret |= MK_SHIFT; + if (GetAsyncKeyState(VK_CONTROL) & 0x80) ret |= MK_CONTROL; + if (GetAsyncKeyState(VK_XBUTTON1) & 0x80) ret |= MK_XBUTTON1; + if (GetAsyncKeyState(VK_XBUTTON2) & 0x80) ret |= MK_XBUTTON2; + 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; + } + 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 { + 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; + } + } + } + } + + /* 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 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]; + } + } + + /* stop the timer if the tracking list is empty */ + if(iTrackMax == 0) { + KillTimer(0, timer); + timer = 0; + } +} + + +/********************************************************************** * + * TrackMouseEvent [USER32] + * + * Requests notification of mouse events + * + * During mouse tracking WM_MOUSEHOVER or WM_MOUSELEAVE events are posted + * to the hwnd specified in the ptme structure. After the event message + * is posted to the hwnd, the entry in the queue is removed. + * + * If the current hwnd isn't ptme->hwndTrack the TME_HOVER flag is completely + * ignored. The TME_LEAVE flag results in a WM_MOUSELEAVE message being posted + * immediately and the TME_LEAVE flag being ignored. + * + * PARAMS + * ptme [I,O] pointer to TRACKMOUSEEVENT information structure. + * + * RETURNS + * Success: non-zero + * Failure: zero + * + */ +/* + * @unimplemented + */ +BOOL +STDCALL +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); + + if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { + DPRINT("wrong TRACKMOUSEEVENT size from app\n"); + SetLastError(ERROR_INVALID_PARAMETER); /* FIXME not sure if this is correct */ + return FALSE; + } + + flags = ptme->dwFlags; + + /* if HOVER_DEFAULT was specified replace this with the systems current value */ + if(ptme->dwHoverTime == HOVER_DEFAULT) + SystemParametersInfoA(SPI_GETMOUSEHOVERTIME, 0, &(ptme->dwHoverTime), 0); + + 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 we aren't tracking on hover or leave remove this entry */ + if(!((TrackingList[i].tme.dwFlags & TME_HOVER) || + (TrackingList[i].tme.dwFlags & TME_LEAVE))) + { + TrackingList[i] = TrackingList[--iTrackMax]; + + if(iTrackMax == 0) { + 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; + } + + /* Adding new mouse event to the tracking list */ + TrackingList[iTrackMax].tme = *ptme; + + /* 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); + } + } + } + + return TRUE; +} + /* EOF */

19 years, 3 months

[jimtabor] 16507: Add defines for TrackMouseEvent.

by jimtabor＠svn.reactos.com

Add defines for TrackMouseEvent. Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-07-08 09:01:23 UTC (rev 16506) +++ trunk/reactos/w32api/include/winuser.h 2005-07-08 12:13:23 UTC (rev 16507) @@ -1441,6 +1441,8 @@ #define WM_NCXBUTTONDBLCLK 173 #endif #define WM_NCMOUSEMOVE 160 +#define WM_NCMOUSEHOVER 0x02A0 +#define WM_NCMOUSELEAVE 0x02A2 #define WM_NCPAINT 133 #define WM_NCRBUTTONDBLCLK 166 #define WM_NCRBUTTONDOWN 164 @@ -1954,6 +1956,7 @@ #define VK_OEM_CLEAR 0xFE #define TME_HOVER 1 #define TME_LEAVE 2 +#define TME_NONCLIENT 0x00000010 #define TME_QUERY 0x40000000 #define TME_CANCEL 0x80000000 #define HOVER_DEFAULT 0xFFFFFFFF

19 years, 3 months

[gvg] 16506: zebasoftis <zebasoftis@gmail.com>:

by gvg＠svn.reactos.com

zebasoftis <zebasoftis(a)gmail.com>: Polish Resource File for setupapi Added: trunk/reactos/lib/setupapi/Pl.rc Modified: trunk/reactos/lib/setupapi/setupapi.rc _____ Added: trunk/reactos/lib/setupapi/Pl.rc --- trunk/reactos/lib/setupapi/Pl.rc 2005-07-08 08:56:07 UTC (rev 16505) +++ trunk/reactos/lib/setupapi/Pl.rc 2005-07-08 09:01:23 UTC (rev 16506) @@ -0,0 +1,34 @@ +/* + * Polish resources for SETUPAPI + * + * Copyright 2005 Sebastian Gasiorek + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopiowanie plik¾w..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Anuluj", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Kopiuj pliki z:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Kopiuj pliki do:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Pl.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/setupapi.rc --- trunk/reactos/lib/setupapi/setupapi.rc 2005-07-08 08:56:07 UTC (rev 16505) +++ trunk/reactos/lib/setupapi/setupapi.rc 2005-07-08 09:01:23 UTC (rev 16506) @@ -33,6 +33,7 @@ #include "It.rc" #include "Ja.rc" #include "Nl.rc" +#include "Pl.rc" #include "Pt.rc" #include "Ru.rc" #include "Sv.rc"

19 years, 3 months

[gvg] 16505: zebasoftis <zebasoftis@gmail.com>:

by gvg＠svn.reactos.com

zebasoftis <zebasoftis(a)gmail.com>: Polish Resource File for user32 Added: trunk/reactos/lib/user32/Pl.rc Modified: trunk/reactos/lib/user32/user32.rc _____ Added: trunk/reactos/lib/user32/Pl.rc --- trunk/reactos/lib/user32/Pl.rc 2005-07-08 08:50:46 UTC (rev 16504) +++ trunk/reactos/lib/user32/Pl.rc 2005-07-08 08:56:07 UTC (rev 16505) @@ -0,0 +1,77 @@ +//Polish translation by Sebastian Gasiorek + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialogs +// + +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" +CAPTION "Wybieranie okna" +BEGIN + LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL + PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Anuluj", 2, 120, 120, 40, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menus +// + +EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + POPUP "DUMMY" + BEGIN + MENUITEM "&Cofnij", EM_UNDO + MENUITEM SEPARATOR + MENUITEM "&Wytnij", WM_CUT + MENUITEM "&Kopiuj", WM_COPY + MENUITEM "Wkl&ej", WM_PASTE + MENUITEM "&Usu±", WM_CLEAR + MENUITEM SEPARATOR + MENUITEM "Zaznacz w&szystko", EM_SETSEL + END +} + + +SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE +{ + MENUITEM "&Przywr¾c", 61728 + MENUITEM "Prz&enie£", 61456 + MENUITEM "&Rozmiar", 61440 + MENUITEM "&Minimalizuj", 61472 + MENUITEM "Mak&symalizuj", 61488 + MENUITEM SEPARATOR + MENUITEM "Zam&knij\tAlt-F4", 61536 +} + +/////////////////////////////////////////////////////////////////////// ////// +// +// Strings +// + +STRINGTABLE +{ + IDS_ERROR, "B??d" + IDS_OK, "OK" + IDS_CANCEL, "Anuluj" + IDS_ABORT, "&Przerwij" + IDS_RETRY, "&Pon¾w pr¾bÛ" + IDS_IGNORE, "&Ignoruj" + IDS_YES, "&Tak" + IDS_NO, "&Nie" + IDS_HELP, "Pomoc" + IDS_TRYAGAIN, "&Pon¾w pr¾bÛ" + IDS_CONTINUE, "&Kontynuuj" +} + +STRINGTABLE +{ + IDS_MDI_MOREWINDOWS, "&WiÛcej okien..." +} + Property changes on: trunk/reactos/lib/user32/Pl.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/user32/user32.rc --- trunk/reactos/lib/user32/user32.rc 2005-07-08 08:50:46 UTC (rev 16504) +++ trunk/reactos/lib/user32/user32.rc 2005-07-08 08:56:07 UTC (rev 16505) @@ -61,4 +61,5 @@ #include "En.rc" #include "Da.rc" #include "De.rc" +#include "Pl.rc" #include "Sv.rc"

19 years, 3 months

[gvg] 16504: zebasoftis <zebasoftis@gmail.com>

by gvg＠svn.reactos.com

zebasoftis <zebasoftis(a)gmail.com> Polish Resource File for desk.cpl Modified: trunk/reactos/lib/cpl/desk/desk.rc Added: trunk/reactos/lib/cpl/desk/pl.rc _____ Modified: trunk/reactos/lib/cpl/desk/desk.rc --- trunk/reactos/lib/cpl/desk/desk.rc 2005-07-08 02:06:33 UTC (rev 16503) +++ trunk/reactos/lib/cpl/desk/desk.rc 2005-07-08 08:50:46 UTC (rev 16504) @@ -12,9 +12,8 @@ IDC_DESK_ICON ICON "resources/applet.ico" -#include "cz.rc" #include "en.rc" +#include "cz.rc" #include "de.rc" +#include "pl.rc" #include "sv.rc" - - _____ Added: trunk/reactos/lib/cpl/desk/pl.rc --- trunk/reactos/lib/cpl/desk/pl.rc 2005-07-08 02:06:33 UTC (rev 16503) +++ trunk/reactos/lib/cpl/desk/pl.rc 2005-07-08 08:50:46 UTC (rev 16504) @@ -0,0 +1,105 @@ +// Polish language resource file (Sebastian Gasiorek, 2005-07-07) +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Pulpit" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,48,10, + 150,105,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,7,139,173,71 + LTEXT "Wybierz obraz do u?ycia jako tapeta pulpitu:", + IDC_STATIC,8,127,180,8 + PUSHBUTTON "&Przegl?daj...",IDC_BROWSE_BUTTON,187,175,50,14 + PUSHBUTTON "&Kolor...",IDC_COLOR_BUTTON,187,195,50,14 + LTEXT "Po?o?enie:",IDC_STATIC,187,138,36,8 + COMBOBOX IDC_PLACEMENT_COMBO,187,148,50,90,CBS_DROPDOWNLIST | + CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Wygaszacz ekranu" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Wygaszacz ekranu",IDC_SCREENS_DUMMY, 5, 7, 238, 176 + + LTEXT "Lista wygaszaczy ekranu:",IDC_STATIC,13, 24, 71, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 171, 109 + PUSHBUTTON "&Usu±",IDC_SCREENS_DELETE, 189,47,39,10 + PUSHBUTTON "&Dodaj",IDC_SCREENS_POWER_BUTTON, 190,34,39,10 + + PUSHBUTTON "&Ustawienia...",IDC_SCREENS_SETTINGS,140, 164, 48, 12,WS_GROUP + PUSHBUTTON "&Podgl?d",IDC_SCREENS_TESTSC,192, 164, 43, 12 + + CONTROL "Po wznowieniu wy£wietl &ekran powitalny.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 161, 119, 18 + + LTEXT "&Czekaj:",IDC_STATIC,13, 150, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 149, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,52, 149, 12, 12 + LTEXT "minut przed pokazaniem wygaszacza ekranu.",IDC_STATIC,70, 151, 147, 9 + + GROUPBOX "&Zasilanie monitora",IDC_SCREENS_DUMMY,5, 186, 238, 35 + LTEXT "Kliknij przycisk Zasilanie, aby dopasowaµ ustawienia zasilania dla monitora.", + IDC_STATIC,16, 199, 155, 19 + PUSHBUTTON "Z&asilanie",IDC_SCREENS_POWER_BUTTON,180, 202, 57, 12 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Wygl?d" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "To miejsce pozosta?o celowo puste",IDC_STATIC,66, + 110,112,8 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ustawienia" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ekran:",1820,3,140,30,8 + LTEXT "<brak>",IDC_SETTINGS_DEVICE,9,149,224,8 + GROUPBOX "&Rozdzielczo£µ ekranu",1818,3,160,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 30,170,58,17 + LTEXT "Mniej",1815,9,170,15,8,NOT WS_GROUP + LTEXT "WiÛcej",1816,93,170,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,190,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Jako£µ kolor¾w",1817,125,160,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,188,103,9 + PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,205,56,14 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Ekran" + IDS_CPLDESCRIPTION "Dostosowuje wygl?d pulpitu oraz wygaszacze." + + IDS_NONE "(Brak)" + IDS_CENTER "Do £rodka" + IDS_STRETCH "Rozci?gniÛcie" + IDS_TILE "S?siaduj?co" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 kolor¾w" + IDS_COLOR_8BIT "256 kolor¾w" + IDS_COLOR_16BIT "High Color (16 Bit¾w)" + IDS_COLOR_24BIT "True Color (24 Bit¾w)" + IDS_COLOR_32BIT "True Color (32 Bit¾w)" + IDS_PIXEL "%lux%lu pikseli" +END Property changes on: trunk/reactos/lib/cpl/desk/pl.rc ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

19 years, 3 months

[jimtabor] 16503: Kill debug messages.

by jimtabor＠svn.reactos.com

Kill debug messages. Modified: trunk/reactos/lib/user32/windows/hook.c _____ Modified: trunk/reactos/lib/user32/windows/hook.c --- trunk/reactos/lib/user32/windows/hook.c 2005-07-07 23:29:53 UTC (rev 16502) +++ trunk/reactos/lib/user32/windows/hook.c 2005-07-08 02:06:33 UTC (rev 16503) @@ -56,7 +56,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -66,7 +66,6 @@ { BOOL ret = FALSE; - UNIMPLEMENTED; if (nCode != HCBT_CREATEWND) ret = NtUserCallMsgFilter((LPMSG) lpMsg, nCode); else { @@ -112,7 +111,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -120,9 +119,7 @@ LPMSG lpMsg, int nCode) { - UNIMPLEMENTED; return NtUserCallMsgFilter((LPMSG) lpMsg, nCode); -// return FALSE; }

19 years, 3 months

[jimtabor] 16502: Add MIIM_BITMAP & MNS_CHECKORBMP support in menu. Based on Wine port.

by jimtabor＠svn.reactos.com

Add MIIM_BITMAP & MNS_CHECKORBMP support in menu. Based on Wine port. Modified: trunk/reactos/include/win32k/menu.h _____ Modified: trunk/reactos/include/win32k/menu.h --- trunk/reactos/include/win32k/menu.h 2005-07-07 23:10:35 UTC (rev 16501) +++ trunk/reactos/include/win32k/menu.h 2005-07-07 23:29:53 UTC (rev 16502) @@ -22,6 +22,7 @@ WORD Height; /* Height of the whole menu */ HWND WndOwner; /* window receiving the messages for ownerdraw */ BOOL TimeToHide; /* Request hiding when receiving a second click in the top-level menu item */ + SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP state */ } ROSMENUINFO, *PROSMENUINFO; /* (other FocusedItem values give the position of the focused item) */

19 years, 3 months

← Newer
1
...
39
40
41
42
43
44
45
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005