Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[rharabien] 54110: [NOTEPAD] - Characters in ANSI windows are fixed so finally mark notepad as unicode

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 13 14:02:21 2011 New Revision: 54110 URL: http://svn.reactos.org/svn/reactos?rev=54110&view=rev Log: [NOTEPAD] - Characters in ANSI windows are fixed so finally mark notepad as unicode Modified: trunk/reactos/base/applications/notepad/CMakeLists.txt Modified: trunk/reactos/base/applications/notepad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/CMakeLists.txt [iso-8859-1] Thu Oct 13 14:02:21 2011 @@ -10,7 +10,7 @@ add_executable(notepad ${SOURCE}) -set_module_type(notepad win32gui) +set_module_type(notepad win32gui UNICODE) add_importlibs(notepad user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32) add_pch(notepad notepad.h) add_cd_file(TARGET notepad DESTINATION reactos/system32 FOR all)

12 years, 11 months

[rharabien] 54109: [USER32|WIN32K] - Convert wParam in WM_*CHAR messages to ANSI in GetMessageA instead of win32k. Fixes wrong characters used in cmake notepad which is ANSI.

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 13 14:01:01 2011 New Revision: 54109 URL: http://svn.reactos.org/svn/reactos?rev=54109&view=rev Log: [USER32|WIN32K] - Convert wParam in WM_*CHAR messages to ANSI in GetMessageA instead of win32k. Fixes wrong characters used in cmake notepad which is ANSI. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Thu Oct 13 14:01:01 2011 @@ -1703,6 +1703,28 @@ } +static VOID +IntConvertMsgToAnsi(LPMSG lpMsg) +{ + CHAR ch[2]; + WCHAR wch[2]; + + switch (lpMsg->message) + { + case WM_CHAR: + case WM_DEADCHAR: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: + case WM_MENUCHAR: + wch[0] = LOWORD(lpMsg->wParam); + wch[1] = HIWORD(lpMsg->wParam); + ch[0] = ch[1] = 0; + WideCharToMultiByte(CP_THREAD_ACP, 0, wch, 2, ch, 2, NULL, NULL); + lpMsg->wParam = MAKEWPARAM(ch[0] | (ch[1] << 8), 0); + break; + } +} + /* * @implemented */ @@ -1725,6 +1747,8 @@ { return Res; } + + IntConvertMsgToAnsi(lpMsg); return Res; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Thu Oct 13 14:01:01 2011 @@ -1030,15 +1030,7 @@ for (i = 0; i < cch; ++i) { TRACE("Msg: %x '%lc' (%04x) %08x\n", NewMsg.message, wch[i], wch[i], NewMsg.lParam); - if (pWnd->Unicode) - NewMsg.wParam = wch[i]; - else - { - CHAR ch; - if (!NT_SUCCESS(RtlUnicodeToMultiByteN(&ch, sizeof(ch), NULL, &wch[i], sizeof(wch[i])))) - WARN("RtlUnicodeToMultiByteN failed!\n"); - NewMsg.wParam = ch; - } + NewMsg.wParam = wch[i]; MsqPostMessage(pti->MessageQueue, &NewMsg, FALSE, QS_KEY); } bResult = TRUE;

12 years, 11 months

[khornicek] 54108: fix build

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Oct 13 13:38:22 2011 New Revision: 54108 URL: http://svn.reactos.org/svn/reactos?rev=54108&view=rev Log: fix build Modified: trunk/rostests/apitests/gdi32/gdi32_apitest.rbuild Modified: trunk/rostests/apitests/gdi32/gdi32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/gdi32_apit… ============================================================================== --- trunk/rostests/apitests/gdi32/gdi32_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/gdi32_apitest.rbuild [iso-8859-1] Thu Oct 13 13:38:22 2011 @@ -15,6 +15,7 @@ <file>CombineTransform.c</file> <file>CreateBitmapIndirect.c</file> <file>CreateCompatibleDC.c</file> + <file>CreateDIBitmap.c</file> <file>CreateFont.c</file> <file>CreateFontIndirect.c</file> <file>CreatePen.c</file>

12 years, 11 months

[rharabien] 54107: [WIN32K] - Right ALT on some keyboard sends LCONTROL and RALT key events - Shift has never extended bit in key messages - Fixes about 32 user32:input winetest - Don't allow to re...

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu Oct 13 13:23:57 2011 New Revision: 54107 URL: http://svn.reactos.org/svn/reactos?rev=54107&view=rev Log: [WIN32K] - Right ALT on some keyboard sends LCONTROL and RALT key events - Shift has never extended bit in key messages - Fixes about 32 user32:input winetest - Don't allow to register hotkeys with special keys combinations (eg. WIN key) - Set last error in RegisterHotKey if hotkey is already registered Modified: trunk/reactos/subsystems/win32/win32k/include/hotkey.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/hotkey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hotkey.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/hotkey.h [iso-8859-1] Thu Oct 13 13:23:57 2011 @@ -1,22 +1,25 @@ #pragma once -typedef struct _HOT_KEY_ITEM +typedef struct _HOT_KEY { - LIST_ENTRY ListEntry; - struct _ETHREAD *Thread; - HWND hWnd; - int id; - UINT fsModifiers; - UINT vk; -} HOT_KEY_ITEM, *PHOT_KEY_ITEM; + struct _ETHREAD *pThread; + HWND hWnd; + UINT fsModifiers; + UINT vk; + INT id; + struct _HOT_KEY *pNext; +} HOT_KEY, *PHOT_KEY; -#define IDHOT_REACTOS (-9) +/* Special Hot Keys */ +#define IDHK_F12 -5 +#define IDHK_SHIFTF12 -6 +#define IDHK_WINKEY -7 +#define IDHK_REACTOS -8 INIT_FUNCTION NTSTATUS NTAPI InitHotkeyImpl(VOID); -PHOT_KEY_ITEM FASTCALL IsHotKey(UINT fsModifiers, WORD wVk); VOID FASTCALL UnregisterWindowHotKeys(PWND Window); -VOID FASTCALL UnregisterThreadHotKeys(struct _ETHREAD *Thread); +VOID FASTCALL UnregisterThreadHotKeys(struct _ETHREAD *pThread); BOOL NTAPI co_UserProcessHotKeys(WORD wVk, BOOL bIsDown); UINT FASTCALL DefWndGetHotKey(HWND hwnd); INT FASTCALL DefWndSetHotKey(PWND pWnd, WPARAM wParam); Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Thu Oct 13 13:23:57 2011 @@ -33,17 +33,12 @@ /* Scan Codes */ #define SC_KEY_UP 0x8000 /* lParam bits */ -#define LP_EXT_BIT (KF_EXTENDED<<16) #define LP_DO_NOT_CARE_BIT (1<<25) // for GetKeyNameText -#define LP_DLGMODE (KF_DLGMODE<<16) -#define LP_MENUMODE (KF_MENUMODE<<16) -#define LP_CONTEXT_BIT (KF_ALTDOWN<<16) -#define LP_PREV_STATE_BIT (KF_REPEAT<<16) -#define LP_TRANSITION_BIT (KF_UP<<16) INIT_FUNCTION NTSTATUS NTAPI InitInputImpl(VOID); INIT_FUNCTION NTSTATUS NTAPI InitKeyboardImpl(VOID); +VOID NTAPI UserInitKeyboard(HANDLE hKeyboardDevice); PKBL W32kGetDefaultKeyLayout(VOID); VOID NTAPI UserProcessKeyboardInput(PKEYBOARD_INPUT_DATA pKeyInput); BOOL NTAPI UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c [iso-8859-1] Thu Oct 13 13:23:57 2011 @@ -19,7 +19,13 @@ /* GLOBALS *******************************************************************/ -LIST_ENTRY gHotkeyList; +/* Hardcoded hotkeys. See http://ivanlef0u.fr/repo/windoz/VI20051005.html */ +/* thread hwnd modifiers vk id next */ +HOT_KEY hkF12 = {NULL, NULL, 0, VK_F12, IDHK_F12, NULL}; +HOT_KEY hkShiftF12 = {NULL, NULL, MOD_SHIFT, VK_F12, IDHK_SHIFTF12, &hkF12}; +HOT_KEY hkWinKey = {NULL, NULL, MOD_WIN, 0, IDHK_WINKEY, &hkShiftF12}; + +PHOT_KEY gphkFirst = &hkWinKey; /* FUNCTIONS *****************************************************************/ @@ -28,19 +34,14 @@ NTAPI InitHotkeyImpl(VOID) { - InitializeListHead(&gHotkeyList); - return STATUS_SUCCESS; } -#if 0 //not used -NTSTATUS FASTCALL +/*NTSTATUS FASTCALL CleanupHotKeys(VOID) { - return STATUS_SUCCESS; -} -#endif +}*/ /* * IntGetModifiers @@ -69,151 +70,235 @@ return fModifiers; } +/* + * UnregisterWindowHotKeys + * + * Removes hotkeys registered by specified window on its cleanup + */ VOID FASTCALL -UnregisterWindowHotKeys(PWND Window) -{ - PHOT_KEY_ITEM HotKeyItem, tmp; - - LIST_FOR_EACH_SAFE(HotKeyItem, tmp, &gHotkeyList, HOT_KEY_ITEM, ListEntry) - { - if (HotKeyItem->hWnd == Window->head.h) - { - RemoveEntryList(&HotKeyItem->ListEntry); - ExFreePool(HotKeyItem); - } - } -} - +UnregisterWindowHotKeys(PWND pWnd) +{ + PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst; + HWND hWnd = pWnd->head.h; + + while (pHotKey) + { + /* Save next ptr for later use */ + phkNext = pHotKey->pNext; + + /* Should we delete this hotkey? */ + if (pHotKey->hWnd == hWnd) + { + /* Update next ptr for previous hotkey and free memory */ + *pLink = phkNext; + ExFreePoolWithTag(pHotKey, USERTAG_HOTKEY); + } + else /* This hotkey will stay, use its next ptr */ + pLink = &pHotKey->pNext; + + /* Move to the next entry */ + pHotKey = phkNext; + } +} + +/* + * UnregisterThreadHotKeys + * + * Removes hotkeys registered by specified thread on its cleanup + */ VOID FASTCALL -UnregisterThreadHotKeys(struct _ETHREAD *Thread) -{ - PHOT_KEY_ITEM HotKeyItem, tmp; - - LIST_FOR_EACH_SAFE(HotKeyItem, tmp, &gHotkeyList, HOT_KEY_ITEM, ListEntry) - { - if (HotKeyItem->Thread == Thread) - { - RemoveEntryList(&HotKeyItem->ListEntry); - ExFreePool(HotKeyItem); - } - } - -} - -PHOT_KEY_ITEM FASTCALL +UnregisterThreadHotKeys(struct _ETHREAD *pThread) +{ + PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst; + + while (pHotKey) + { + /* Save next ptr for later use */ + phkNext = pHotKey->pNext; + + /* Should we delete this hotkey? */ + if (pHotKey->pThread == pThread) + { + /* Update next ptr for previous hotkey and free memory */ + *pLink = phkNext; + ExFreePoolWithTag(pHotKey, USERTAG_HOTKEY); + } + else /* This hotkey will stay, use its next ptr */ + pLink = &pHotKey->pNext; + + /* Move to the next entry */ + pHotKey = phkNext; + } +} + +/* + * IsHotKey + * + * Checks if given key and modificators have corresponding hotkey + */ +static PHOT_KEY FASTCALL IsHotKey(UINT fsModifiers, WORD wVk) { - PHOT_KEY_ITEM pHotKeyItem; - - LIST_FOR_EACH(pHotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) - { - if (pHotKeyItem->fsModifiers == fsModifiers && pHotKeyItem->vk == wVk) - { - return pHotKeyItem; - } + PHOT_KEY pHotKey = gphkFirst; + + while (pHotKey) + { + if (pHotKey->fsModifiers == fsModifiers && + pHotKey->vk == wVk) + { + /* We have found it */ + return pHotKey; + } + + /* Move to the next entry */ + pHotKey = pHotKey->pNext; } return NULL; } /* - * IntKeyboardSendWinKeyMsg - * - * Sends syscommand to shell, when WIN key is pressed + * SendSysCmdMsg + * + * Sends syscommand to specified window */ static VOID NTAPI -IntKeyboardSendWinKeyMsg() +SendSysCmdMsg(HWND hWnd, WPARAM Cmd, LPARAM lParam) { PWND pWnd; MSG Msg; - - if (!(pWnd = UserGetWindowObject(InputWindowStation->ShellWindow))) - { - ERR("Couldn't find window to send Windows key message!\n"); + LARGE_INTEGER LargeTickCount; + + /* Get ptr to given window */ + pWnd = UserGetWindowObject(hWnd); + if (!pWnd) + { + WARN("Invalid window!\n"); return; } - Msg.hwnd = InputWindowStation->ShellWindow; + /* Prepare WM_SYSCOMMAND message */ + Msg.hwnd = hWnd; Msg.message = WM_SYSCOMMAND; - Msg.wParam = SC_TASKLIST; - Msg.lParam = 0; - - /* The QS_HOTKEY is just a guess */ - MsqPostMessage(pWnd->head.pti->MessageQueue, &Msg, FALSE, QS_HOTKEY); -} - + Msg.wParam = Cmd; + Msg.lParam = lParam; + KeQueryTickCount(&LargeTickCount); + Msg.time = MsqCalculateMessageTime(&LargeTickCount); + Msg.pt = gpsi->ptCursor; + + /* Post message to window */ + MsqPostMessage(pWnd->head.pti->MessageQueue, &Msg, FALSE, QS_POSTMESSAGE); +} + +/* + * co_UserProcessHotKeys + * + * Sends WM_HOTKEY message if given keys are hotkey + */ BOOL NTAPI co_UserProcessHotKeys(WORD wVk, BOOL bIsDown) { UINT fModifiers; - PHOT_KEY_ITEM pHotKey; + PHOT_KEY pHotKey; + + if (wVk == VK_SHIFT || wVk == VK_CONTROL || wVk == VK_MENU || + wVk == VK_LWIN || wVk == VK_RWIN) + { + /* Those keys are specified by modifiers */ + wVk = 0; + } /* Check if it is a hotkey */ fModifiers = IntGetModifiers(gafAsyncKeyState); pHotKey = IsHotKey(fModifiers, wVk); if (pHotKey) { - if (bIsDown) - { - TRACE("Hot key pressed (hWnd %lx, id %d)\n", pHotKey->hWnd, pHotKey->id); - MsqPostHotKeyMessage(pHotKey->Thread, - pHotKey->hWnd, - (WPARAM)pHotKey->id, - MAKELPARAM((WORD)fModifiers, wVk)); + /* Process hotkey if it is key up event */ + if (!bIsDown) + { + TRACE("Hot key pressed (hWnd %p, id %d)\n", pHotKey->hWnd, pHotKey->id); + + /* WIN and F12 keys are hardcoded here. See: http://ivanlef0u.fr/repo/windoz/VI20051005.html */ + if (pHotKey == &hkWinKey) + SendSysCmdMsg(InputWindowStation->ShellWindow, SC_TASKLIST, 0); + else if (pHotKey == &hkF12 || pHotKey == &hkShiftF12) + { + //co_ActivateDebugger(); // FIXME + } + else if (pHotKey->id == IDHK_REACTOS && !pHotKey->pThread) // FIXME: those hotkeys doesn't depend on RegisterHotKey + { + SendSysCmdMsg(pHotKey->hWnd, SC_HOTKEY, (LPARAM)pHotKey->hWnd); + } + else + { + MsqPostHotKeyMessage(pHotKey->pThread, + pHotKey->hWnd, + (WPARAM)pHotKey->id, + MAKELPARAM((WORD)fModifiers, wVk)); + } } return TRUE; /* Don't send any message */ } - if ((wVk == VK_LWIN || wVk == VK_RWIN) && fModifiers == 0) - IntKeyboardSendWinKeyMsg(); - return FALSE; } -// -// Get/SetHotKey message support. -// +/* + * DefWndGetHotKey + * + * GetHotKey message support + */ UINT FASTCALL -DefWndGetHotKey(HWND hwnd) -{ - PHOT_KEY_ITEM HotKeyItem; - - ERR("DefWndGetHotKey\n"); - - if (IsListEmpty(&gHotkeyList)) return 0; - - LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) - { - if (HotKeyItem->hWnd == hwnd && - HotKeyItem->id == IDHOT_REACTOS) - { - return MAKELONG(HotKeyItem->vk, HotKeyItem->fsModifiers); - } - } +DefWndGetHotKey(HWND hWnd) +{ + PHOT_KEY pHotKey = gphkFirst; + + WARN("DefWndGetHotKey\n"); + + while (pHotKey) + { + if (pHotKey->hWnd == hWnd && pHotKey->id == IDHK_REACTOS) + { + /* We have found it */ + return MAKELONG(pHotKey->vk, pHotKey->fsModifiers); + } + + /* Move to the next entry */ + pHotKey = pHotKey->pNext; + } + return 0; } +/* + * DefWndSetHotKey + * + * SetHotKey message support + */ INT FASTCALL DefWndSetHotKey(PWND pWnd, WPARAM wParam) { UINT fsModifiers, vk; - PHOT_KEY_ITEM HotKeyItem; + PHOT_KEY pHotKey, *pLink; HWND hWnd; - BOOL HaveSameWnd = FALSE; - INT Ret = 1; - - ERR("DefWndSetHotKey wParam 0x%x\n", wParam); + INT iRet = 1; + + WARN("DefWndSetHotKey wParam 0x%x\n", wParam); // A hot key cannot be associated with a child window. - if (pWnd->style & WS_CHILD) return 0; + if (pWnd->style & WS_CHILD) + return 0; // VK_ESCAPE, VK_SPACE, and VK_TAB are invalid hot keys. if (LOWORD(wParam) == VK_ESCAPE || LOWORD(wParam) == VK_SPACE || - LOWORD(wParam) == VK_TAB) return -1; + LOWORD(wParam) == VK_TAB) + { + return -1; + } vk = LOWORD(wParam); fsModifiers = HIWORD(wParam); @@ -221,62 +306,68 @@ if (wParam) { - LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) - { - if (HotKeyItem->fsModifiers == fsModifiers && - HotKeyItem->vk == vk && - HotKeyItem->id == IDHOT_REACTOS) + pHotKey = gphkFirst; + while (pHotKey) + { + if (pHotKey->fsModifiers == fsModifiers && + pHotKey->vk == vk && + pHotKey->id == IDHK_REACTOS) { - if (HotKeyItem->hWnd != hWnd) - Ret = 2; // Another window already has the same hot key. + if (pHotKey->hWnd != hWnd) + iRet = 2; // Another window already has the same hot key. break; } - } - } - - LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) - { - if (HotKeyItem->hWnd == hWnd && - HotKeyItem->id == IDHOT_REACTOS) - { - HaveSameWnd = TRUE; + + /* Move to the next entry */ + pHotKey = pHotKey->pNext; + } + } + + pHotKey = gphkFirst; + pLink = &gphkFirst; + while (pHotKey) + { + if (pHotKey->hWnd == hWnd && + pHotKey->id == IDHK_REACTOS) + { + /* This window has already hotkey registered */ break; } - } - - if (HaveSameWnd) - { - if (wParam == 0) - { // Setting wParam to NULL removes the hot key associated with a window. - UnregisterWindowHotKeys(pWnd); - } - else - { /* A window can only have one hot key. If the window already has a hot key - associated with it, the new hot key replaces the old one. */ - HotKeyItem->fsModifiers = fsModifiers; - HotKeyItem->vk = vk; - } - } - else // - { - if (wParam == 0) - return 1; // Do nothing, exit. - - HotKeyItem = ExAllocatePoolWithTag(PagedPool, sizeof(HOT_KEY_ITEM), USERTAG_HOTKEY); - if (HotKeyItem == NULL) - { - return 0; - } - - HotKeyItem->Thread = pWnd->head.pti->pEThread; - HotKeyItem->hWnd = hWnd; - HotKeyItem->id = IDHOT_REACTOS; // Don't care, these hot keys are unrelated to the hot keys set by RegisterHotKey. - HotKeyItem->fsModifiers = fsModifiers; - HotKeyItem->vk = vk; - - InsertHeadList(&gHotkeyList, &HotKeyItem->ListEntry); - } - return Ret; + + /* Move to the next entry */ + pLink = &pHotKey->pNext; + pHotKey = pHotKey->pNext; + } + + if (wParam) + { + if (!pHotKey) + { + /* Create new hotkey */ + pHotKey = ExAllocatePoolWithTag(PagedPool, sizeof(HOT_KEY), USERTAG_HOTKEY); + if (pHotKey == NULL) + return 0; + + pHotKey->hWnd = hWnd; + pHotKey->id = IDHK_REACTOS; // Don't care, these hot keys are unrelated to the hot keys set by RegisterHotKey + pHotKey->pNext = gphkFirst; + gphkFirst = pHotKey; + } + + /* A window can only have one hot key. If the window already has a + hot key associated with it, the new hot key replaces the old one. */ + pHotKey->pThread = NULL; + pHotKey->fsModifiers = fsModifiers; + pHotKey->vk = vk; + } + else if (pHotKey) + { + /* Remove hotkey */ + *pLink = pHotKey->pNext; + ExFreePoolWithTag(pHotKey, USERTAG_HOTKEY); + } + + return iRet; } /* SYSCALLS *****************************************************************/ @@ -288,88 +379,110 @@ UINT fsModifiers, UINT vk) { - PHOT_KEY_ITEM HotKeyItem; - PWND Window; - PETHREAD HotKeyThread; - DECLARE_RETURN(BOOL); + PHOT_KEY pHotKey; + PWND pWnd; + PETHREAD pHotKeyThread; + BOOL bRet = FALSE; TRACE("Enter NtUserRegisterHotKey\n"); + + if (fsModifiers & ~(MOD_ALT|MOD_CONTROL|MOD_SHIFT|MOD_WIN)) //FIXME: does win2k3 supports MOD_NOREPEAT? + { + WARN("Invalid modifiers: %x\n", fsModifiers); + EngSetLastError(ERROR_INVALID_FLAGS); + return 0; + } + UserEnterExclusive(); + /* Find hotkey thread */ if (hWnd == NULL) { - HotKeyThread = PsGetCurrentThread(); + pHotKeyThread = PsGetCurrentThread(); } else { - if(!(Window = UserGetWindowObject(hWnd))) - { - RETURN( FALSE); - } - HotKeyThread = Window->head.pti->pEThread; + pWnd = UserGetWindowObject(hWnd); + if (!pWnd) + goto cleanup; + + pHotKeyThread = pWnd->head.pti->pEThread; } /* Check for existing hotkey */ if (IsHotKey(fsModifiers, vk)) { - RETURN( FALSE); - } - - HotKeyItem = ExAllocatePoolWithTag(PagedPool, sizeof(HOT_KEY_ITEM), USERTAG_HOTKEY); - if (HotKeyItem == NULL) - { - RETURN( FALSE); - } - - HotKeyItem->Thread = HotKeyThread; - HotKeyItem->hWnd = hWnd; - HotKeyItem->id = id; - HotKeyItem->fsModifiers = fsModifiers; - HotKeyItem->vk = vk; - - InsertHeadList(&gHotkeyList, &HotKeyItem->ListEntry); - - RETURN( TRUE); - -CLEANUP: - TRACE("Leave NtUserRegisterHotKey, ret=%i\n", _ret_); + EngSetLastError(ERROR_HOTKEY_ALREADY_REGISTERED); + WARN("Hotkey already exists\n"); + goto cleanup; + } + + /* Create new hotkey */ + pHotKey = ExAllocatePoolWithTag(PagedPool, sizeof(HOT_KEY), USERTAG_HOTKEY); + if (pHotKey == NULL) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + pHotKey->pThread = pHotKeyThread; + pHotKey->hWnd = hWnd; + pHotKey->fsModifiers = fsModifiers; + pHotKey->vk = vk; + pHotKey->id = id; + + /* Insert hotkey to the global list */ + pHotKey->pNext = gphkFirst; + gphkFirst = pHotKey; + + bRet = TRUE; + +cleanup: + TRACE("Leave NtUserRegisterHotKey, ret=%i\n", bRet); UserLeave(); - END_CLEANUP; + return bRet; } BOOL APIENTRY NtUserUnregisterHotKey(HWND hWnd, int id) { - PHOT_KEY_ITEM HotKeyItem; - PWND Window; - DECLARE_RETURN(BOOL); + PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst; + PWND pWnd; + BOOL bRet = FALSE; TRACE("Enter NtUserUnregisterHotKey\n"); UserEnterExclusive(); - if(!(Window = UserGetWindowObject(hWnd))) - { - RETURN( FALSE); - } - - LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) - { - if (HotKeyItem->hWnd == hWnd && HotKeyItem->id == id) - { - RemoveEntryList(&HotKeyItem->ListEntry); - ExFreePoolWithTag(HotKeyItem, USERTAG_HOTKEY); - - RETURN( TRUE); - } - } - - RETURN( FALSE); - -CLEANUP: - TRACE("Leave NtUserUnregisterHotKey, ret=%i\n", _ret_); + pWnd = UserGetWindowObject(hWnd); + if (!pWnd) + goto cleanup; + + while (pHotKey) + { + /* Save next ptr for later use */ + phkNext = pHotKey->pNext; + + /* Should we delete this hotkey? */ + if (pHotKey->hWnd == hWnd && pHotKey->id == id) + { + /* Update next ptr for previous hotkey and free memory */ + *pLink = phkNext; + ExFreePoolWithTag(pHotKey, USERTAG_HOTKEY); + + bRet = TRUE; + } + else /* This hotkey will stay, use its next ptr */ + pLink = &pHotKey->pNext; + + /* Move to the next entry */ + pHotKey = phkNext; + } + +cleanup: + TRACE("Leave NtUserUnregisterHotKey, ret=%i\n", bRet); UserLeave(); - END_CLEANUP; + return bRet; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu Oct 13 13:23:57 2011 @@ -332,6 +332,8 @@ FILE_SYNCHRONOUS_IO_ALERT); } while (!NT_SUCCESS(Status)); + UserInitKeyboard(ghKeyboardDevice); + /* Not sure if converting this thread to a win32 thread is such a great idea. Since we're posting keyboard messages to the focus window message queue, we'll be (indirectly) doing sendmessage @@ -355,22 +357,19 @@ KeSetPriorityThread(&PsGetCurrentThread()->Tcb, LOW_REALTIME_PRIORITY + 3); - //IntKeyboardGetIndicatorTrans(ghKeyboardDevice, - // &IndicatorTrans); - for (;;) { /* * Wait to start input. */ - TRACE( "Keyboard Input Thread Waiting for start event\n" ); + TRACE("Keyboard Input Thread Waiting for start event\n"); Status = KeWaitForSingleObject(&InputThreadsStart, 0, KernelMode, TRUE, NULL); - TRACE( "Keyboard Input Thread Starting...\n" ); + TRACE("Keyboard Input Thread Starting...\n"); /* * Receive and process keyboard input. */ @@ -390,16 +389,16 @@ NULL, NULL); - if(Status == STATUS_ALERTED && !InputThreadsRunning) + if (Status == STATUS_ALERTED && !InputThreadsRunning) { break; } - if(Status == STATUS_PENDING) + if (Status == STATUS_PENDING) { NtWaitForSingleObject(ghKeyboardDevice, FALSE, NULL); Status = Iosb.Status; } - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ERR("Win32K: Failed to read from keyboard.\n"); return; //(Status); @@ -427,7 +426,7 @@ UserLeave(); } - TRACE( "KeyboardInput Thread Stopped...\n" ); + TRACE("KeyboardInput Thread Stopped...\n"); } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Thu Oct 13 13:23:57 2011 @@ -11,8 +11,9 @@ DBG_DEFAULT_CHANNEL(UserKbd); BYTE gafAsyncKeyState[256 * 2 / 8]; // 2 bits per key -BYTE gafAsyncKeyStateRecentDown[256 / 8]; // 1 bit per key +static BYTE gafAsyncKeyStateRecentDown[256 / 8]; // 1 bit per key static PKEYBOARD_INDICATOR_TRANSLATION gpKeyboardIndicatorTrans = NULL; +static KEYBOARD_INDICATOR_PARAMETERS gIndicators = {0, 0}; /* FUNCTIONS *****************************************************************/ @@ -97,42 +98,85 @@ static NTSTATUS APIENTRY IntKeyboardUpdateLeds(HANDLE hKeyboardDevice, + WORD wVk, WORD wScanCode, - BOOL bEnabled, - PKEYBOARD_INDICATOR_TRANSLATION pIndicatorTrans) + BOOL bEnabled) { NTSTATUS Status; UINT i; - static KEYBOARD_INDICATOR_PARAMETERS Indicators; + USHORT LedFlag = 0; IO_STATUS_BLOCK Block; - if (!pIndicatorTrans) + if (!gpKeyboardIndicatorTrans) return STATUS_NOT_SUPPORTED; - for (i = 0; i < pIndicatorTrans->NumberOfIndicatorKeys; i++) - { - if (pIndicatorTrans->IndicatorList[i].MakeCode == wScanCode) - { - if (bEnabled) - Indicators.LedFlags |= pIndicatorTrans->IndicatorList[i].IndicatorFlags; - else - Indicators.LedFlags = ~pIndicatorTrans->IndicatorList[i].IndicatorFlags; - - /* Update the lights on the hardware */ - Status = NtDeviceIoControlFile(hKeyboardDevice, - NULL, - NULL, - NULL, - &Block, - IOCTL_KEYBOARD_SET_INDICATORS, - &Indicators, sizeof(Indicators), - NULL, 0); - - return Status; - } + switch (wVk) + { + case VK_CAPITAL: LedFlag = KEYBOARD_CAPS_LOCK_ON; break; + case VK_NUMLOCK: LedFlag = KEYBOARD_NUM_LOCK_ON; break; + case VK_SCROLL: LedFlag = KEYBOARD_SCROLL_LOCK_ON; break; + default: + for (i = 0; i < gpKeyboardIndicatorTrans->NumberOfIndicatorKeys; i++) + { + if (gpKeyboardIndicatorTrans->IndicatorList[i].MakeCode == wScanCode) + { + LedFlag = gpKeyboardIndicatorTrans->IndicatorList[i].IndicatorFlags; + break; + } + } + } + + if (LedFlag) + { + if (bEnabled) + gIndicators.LedFlags |= LedFlag; + else + gIndicators.LedFlags = ~LedFlag; + + /* Update the lights on the hardware */ + Status = NtDeviceIoControlFile(hKeyboardDevice, + NULL, + NULL, + NULL, + &Block, + IOCTL_KEYBOARD_SET_INDICATORS, + &gIndicators, sizeof(gIndicators), + NULL, 0); + + return Status; } return STATUS_SUCCESS; +} + +/* + * UserInitKeyboard + * + * Initializes keyboard indicators translation and their state + */ +VOID NTAPI +UserInitKeyboard(HANDLE hKeyboardDevice) +{ + NTSTATUS Status; + IO_STATUS_BLOCK Block; + + IntKeyboardGetIndicatorTrans(hKeyboardDevice, &gpKeyboardIndicatorTrans); + + Status = NtDeviceIoControlFile(hKeyboardDevice, + NULL, + NULL, + NULL, + &Block, + IOCTL_KEYBOARD_QUERY_INDICATORS, + NULL, 0, + &gIndicators, sizeof(gIndicators)); + + SET_KEY_LOCKED(gafAsyncKeyState, VK_CAPITAL, + gIndicators.LedFlags & KEYBOARD_CAPS_LOCK_ON); + SET_KEY_LOCKED(gafAsyncKeyState, VK_NUMLOCK, + gIndicators.LedFlags & KEYBOARD_NUM_LOCK_ON); + SET_KEY_LOCKED(gafAsyncKeyState, VK_SCROLL, + gIndicators.LedFlags & KEYBOARD_SCROLL_LOCK_ON); } /* @@ -185,30 +229,6 @@ default: return wVk; - } -} - -/* - * IntGetVkOtherSide - * - * Gets other side of vk: right -> left, left -> right - */ -static -WORD -IntGetVkOtherSide(WORD wVk) -{ - switch (wVk) - { - case VK_LSHIFT: return VK_RSHIFT; - case VK_RSHIFT: return VK_LSHIFT; - - case VK_LCONTROL: return VK_RCONTROL; - case VK_RCONTROL: return VK_LCONTROL; - - case VK_LMENU: return VK_RMENU; - case VK_RMENU: return VK_LMENU; - - default: return wVk; } } @@ -239,24 +259,6 @@ } /* - * IntGetShiftBit - * - * Search the keyboard layout modifiers table for the shift bit - */ -static -DWORD FASTCALL -IntGetShiftBit(PKBDTABLES pKbdTbl, WORD wVk) -{ - unsigned i; - - for (i = 0; pKbdTbl->pCharModifiers->pVkToBit[i].Vk; i++) - if (pKbdTbl->pCharModifiers->pVkToBit[i].Vk == wVk) - return pKbdTbl->pCharModifiers->pVkToBit[i].ModBits; - - return 0; -} - -/* * IntGetModBits * * Gets layout specific modification bits, for example KBDSHIFT, KBDCTRL, KBDALT @@ -272,10 +274,6 @@ for (i = 0; pKbdTbl->pCharModifiers->pVkToBit[i].Vk; i++) if (IS_KEY_DOWN(pKeyState, pKbdTbl->pCharModifiers->pVkToBit[i].Vk)) dwModBits |= pKbdTbl->pCharModifiers->pVkToBit[i].ModBits; - - /* Handle Alt+Gr */ - if ((pKbdTbl->fLocaleFlags & KLLF_ALTGR) && IS_KEY_DOWN(pKeyState, VK_RMENU)) - dwModBits |= IntGetShiftBit(pKbdTbl, VK_CONTROL); /* Don't use KBDCTRL here */ TRACE("Current Mod Bits: %lx\n", dwModBits); @@ -616,20 +614,6 @@ } /* - * co_IntKeyboardSendAltKeyMsg - * - * Sends syscommand enabling window menu - */ -static -VOID NTAPI -co_IntKeyboardSendAltKeyMsg() -{ - FIXME("co_IntKeyboardSendAltKeyMsg\n"); - //co_MsqPostKeyboardMessage(WM_SYSCOMMAND,SC_KEYMENU,0); // This sends everything into a msg loop! -} - - -/* * UpdateAsyncKeyState * * Updates gafAsyncKeyState array @@ -651,26 +635,40 @@ SET_KEY_DOWN(gafAsyncKeyState, wVk, FALSE); } -LRESULT -co_CallLowLevelKeyboardHook(CONST MSG *pMsg, BOOL bInjected, DWORD dwExtraInfo) +/* + * co_CallLowLevelKeyboardHook + * + * Calls WH_KEYBOARD_LL hook + */ +static LRESULT +co_CallLowLevelKeyboardHook(WORD wVk, WORD wScanCode, DWORD dwFlags, BOOL bInjected, DWORD dwTime, DWORD dwExtraInfo) { KBDLLHOOKSTRUCT KbdHookData; - - KbdHookData.vkCode = pMsg->wParam; - KbdHookData.scanCode = HIWORD(pMsg->lParam) & 0xFF; + UINT uMsg; + + KbdHookData.vkCode = wVk; + KbdHookData.scanCode = wScanCode; KbdHookData.flags = 0; - if (pMsg->lParam & LP_EXT_BIT) + if (dwFlags & KEYEVENTF_EXTENDEDKEY) KbdHookData.flags |= LLKHF_EXTENDED; if (IS_KEY_DOWN(gafAsyncKeyState, VK_MENU)) KbdHookData.flags |= LLKHF_ALTDOWN; - if (pMsg->message == WM_KEYUP || pMsg->message == WM_SYSKEYUP) + if (dwFlags & KEYEVENTF_KEYUP) KbdHookData.flags |= LLKHF_UP; if (bInjected) KbdHookData.flags |= LLKHF_INJECTED; - KbdHookData.time = pMsg->time; + KbdHookData.time = dwTime; KbdHookData.dwExtraInfo = dwExtraInfo; - return co_HOOK_CallHooks(WH_KEYBOARD_LL, HC_ACTION, pMsg->message, (LPARAM) &KbdHookData); + /* Note: it doesnt support WM_SYSKEYUP */ + if (dwFlags & KEYEVENTF_KEYUP) + uMsg = WM_KEYUP; + else if (IS_KEY_DOWN(gafAsyncKeyState, VK_MENU) && !IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL)) + uMsg = WM_SYSKEYDOWN; + else + uMsg = WM_KEYDOWN; + + return co_HOOK_CallHooks(WH_KEYBOARD_LL, HC_ACTION, uMsg, (LPARAM)&KbdHookData); } /* @@ -678,19 +676,141 @@ * * Process keyboard input from input devices and SendInput API */ +BOOL NTAPI +ProcessKeyEvent(WORD wVk, WORD wScanCode, DWORD dwFlags, BOOL bInjected, DWORD dwTime, DWORD dwExtraInfo) +{ + WORD wSimpleVk = 0, wFixedVk, wVk2; + PUSER_MESSAGE_QUEUE pFocusQueue; + BOOL bExt = (dwFlags & KEYEVENTF_EXTENDEDKEY) ? TRUE : FALSE; + BOOL bIsDown = (dwFlags & KEYEVENTF_KEYUP) ? FALSE : TRUE; + BOOL bPacket = (dwFlags & KEYEVENTF_UNICODE) ? TRUE : FALSE; + BOOL bWasSimpleDown = FALSE, bPostMsg = TRUE, bIsSimpleDown; + MSG Msg; + static BOOL bMenuDownRecently = FALSE; + + /* Get virtual key without shifts (VK_(L|R)* -> VK_*) */ + wSimpleVk = IntSimplifyVk(wVk); + bWasSimpleDown = IS_KEY_DOWN(gafAsyncKeyState, wSimpleVk); + + /* Update key without shifts */ + wVk2 = IntFixVk(wSimpleVk, !bExt); + bIsSimpleDown = bIsDown || IS_KEY_DOWN(gafAsyncKeyState, wVk2); + UpdateAsyncKeyState(wSimpleVk, bIsSimpleDown); + + if (bIsDown) + { + /* Update keyboard LEDs */ + IntKeyboardUpdateLeds(ghKeyboardDevice, + wSimpleVk, + wScanCode, + IS_KEY_LOCKED(gafAsyncKeyState, wSimpleVk)); + } + + /* Call WH_KEYBOARD_LL hook */ + if (co_CallLowLevelKeyboardHook(wVk, wScanCode, dwFlags, bInjected, dwTime, dwExtraInfo)) + { + ERR("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", + Msg.message, Msg.wParam, Msg.lParam); + bPostMsg = FALSE; + } + + /* Check if this is a hotkey */ + if (co_UserProcessHotKeys(wSimpleVk, bIsDown)) + bPostMsg = FALSE; + + wFixedVk = IntFixVk(wSimpleVk, bExt); /* LSHIFT + EXT = RSHIFT */ + if (wSimpleVk == VK_SHIFT) /* shift can't be extended */ + bExt = FALSE; + + /* If it is F10 or ALT is down and CTRL is up, it's a system key */ + if (wVk == VK_F10 || + (wSimpleVk == VK_MENU && bMenuDownRecently) || + (IS_KEY_DOWN(gafAsyncKeyState, VK_MENU) && + !IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL))) + { + bMenuDownRecently = FALSE; // reset + if (bIsDown) + { + Msg.message = WM_SYSKEYDOWN; + if (wSimpleVk == VK_MENU) + { + // Note: If only LALT is pressed WM_SYSKEYUP is generated instead of WM_KEYUP + bMenuDownRecently = TRUE; + } + } + else + Msg.message = WM_SYSKEYUP; + } + else + { + bMenuDownRecently = FALSE; + if (bIsDown) + Msg.message = WM_KEYDOWN; + else + Msg.message = WM_KEYUP; + } + + /* Update async state of not simplified vk here. + See user32_apitest:GetKeyState */ + UpdateAsyncKeyState(wFixedVk, bIsDown); + + /* Alt-Tab/Esc Check. Use FocusQueue or RIT Queue */ + if (bIsSimpleDown && !bWasSimpleDown && + IS_KEY_DOWN(gafAsyncKeyState, VK_MENU) && + !IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL) && + (wVk == VK_ESCAPE || wVk == VK_TAB)) + { + TRACE("Alt-Tab/Esc Pressed wParam %x\n",Msg.wParam); + } + + /* If we have a focus queue, post a keyboard message */ + pFocusQueue = IntGetFocusMessageQueue(); + if (pFocusQueue && bPostMsg) + { + /* Init message */ + Msg.hwnd = pFocusQueue->FocusWindow; + Msg.wParam = wFixedVk & 0xFF; /* Note: it's simplified by msg queue */ + Msg.lParam = MAKELPARAM(1, wScanCode); + Msg.time = dwTime; + Msg.pt = gpsi->ptCursor; + + /* If it is VK_PACKET, high word of wParam is used for wchar */ + if (!bPacket) + { + if (bExt) + Msg.lParam |= KF_EXTENDED << 16; + if (IS_KEY_DOWN(gafAsyncKeyState, VK_MENU)) + Msg.lParam |= KF_ALTDOWN << 16; + if (bWasSimpleDown) + Msg.lParam |= KF_REPEAT << 16; + if (!bIsDown) + Msg.lParam |= KF_UP << 16; + /* FIXME: set KF_DLGMODE and KF_MENUMODE when needed */ + if (pFocusQueue->QF_flags & QF_DIALOGACTIVE) + Msg.lParam |= KF_DLGMODE << 16; + if (pFocusQueue->MenuOwner)//pFocusQueue->MenuState) // MenuState needs a start flag... + Msg.lParam |= KF_MENUMODE << 16; + } + + /* Post a keyboard message */ + TRACE("Posting keyboard msg %u wParam 0x%x lParam 0x%x\n", Msg.message, Msg.wParam, Msg.lParam); + MsqPostMessage(pFocusQueue, &Msg, TRUE, QS_KEY); + } + + return TRUE; +} + BOOL NTAPI UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected) { - WORD wScanCode, wVk, wSimpleVk = 0, wVkOtherSide, wSysKey; + WORD wScanCode, wVk; PKBL pKbl = NULL; PKBDTABLES pKbdTbl; PUSER_MESSAGE_QUEUE pFocusQueue; struct _ETHREAD *pFocusThread; LARGE_INTEGER LargeTickCount; + DWORD dwTime; BOOL bExt = (pKbdInput->dwFlags & KEYEVENTF_EXTENDEDKEY) ? TRUE : FALSE; - BOOL bIsDown = (pKbdInput->dwFlags & KEYEVENTF_KEYUP) ? FALSE : TRUE; - BOOL bWasDown = FALSE, bPostMsg = TRUE; - MSG Msg; /* Find the target thread whose locale is in effect */ pFocusQueue = IntGetFocusMessageQueue(); @@ -713,7 +833,7 @@ pKbdTbl = pKbl->KBTables; /* Note: wScan field is always used */ - wScanCode = pKbdInput->wScan & 0x7F; + wScanCode = pKbdInput->wScan; if (pKbdInput->dwFlags & KEYEVENTF_UNICODE) { @@ -723,6 +843,7 @@ } else { + wScanCode &= 0x7F; if (pKbdInput->dwFlags & KEYEVENTF_SCANCODE) { /* Don't ignore invalid scan codes */ @@ -733,129 +854,26 @@ else { wVk = pKbdInput->wVk & 0xFF; - - /* LSHIFT + EXT = RSHIFT */ - wVk = IntSimplifyVk(wVk); - wVk = IntFixVk(wVk, bExt); - } - - /* Get virtual key without shifts (VK_(L|R)* -> VK_*) */ - wSimpleVk = IntSimplifyVk(wVk); - wVkOtherSide = IntGetVkOtherSide(wVk); - bWasDown = IS_KEY_DOWN(gafAsyncKeyState, wSimpleVk); - - if (co_UserProcessHotKeys(wSimpleVk, bIsDown)) - bPostMsg = FALSE; - - /* Update key without shifts */ - UpdateAsyncKeyState(wSimpleVk, bIsDown || IS_KEY_DOWN(gafAsyncKeyState, wVkOtherSide)); - } - - /* If it is F10 or ALT is down and CTRL is up, it's a system key */ - wSysKey = (pKbdTbl->fLocaleFlags & KLLF_ALTGR) ? VK_LMENU : VK_MENU; - if (wVk == VK_F10 || - //uVkNoShift == VK_MENU || // FIXME: If only LALT is pressed WM_SYSKEYUP is generated instead of WM_KEYUP - (IS_KEY_DOWN(gafAsyncKeyState, wSysKey) && // FIXME - !IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL))) - { - if (bIsDown) - Msg.message = WM_SYSKEYDOWN; - else - Msg.message = WM_SYSKEYUP; - } - else - { - if (bIsDown) - Msg.message = WM_KEYDOWN; - else - Msg.message = WM_KEYUP; - } - - /* Init hwnd and lParam */ - Msg.hwnd = pFocusQueue->FocusWindow; - Msg.lParam = MAKELPARAM(1, wScanCode); - - /* If it is VK_PACKET, high word of wParam is used for wchar */ - if (!(pKbdInput->dwFlags & KEYEVENTF_UNICODE)) - { - if (bExt) - Msg.lParam |= LP_EXT_BIT; - if (IS_KEY_DOWN(gafAsyncKeyState, VK_MENU)) - Msg.lParam |= LP_CONTEXT_BIT; - if (bWasDown) - Msg.lParam |= LP_PREV_STATE_BIT; - if (!bIsDown) - Msg.lParam |= LP_TRANSITION_BIT; - } - - /* FIXME: set KF_DLGMODE and KF_MENUMODE when needed */ - if ( pFocusQueue && pFocusQueue->QF_flags & QF_DIALOGACTIVE ) - Msg.lParam |= LP_DLGMODE; - if ( pFocusQueue && pFocusQueue->MenuOwner )//pFocusQueue->MenuState ) // MenuState needs a start flag... - Msg.lParam |= LP_MENUMODE; - - /* Init wParam and cursor position */ - Msg.wParam = wVk; // Note: it's simplified by msg queue - Msg.pt = gpsi->ptCursor; + } + } /* If time is given, use it */ if (pKbdInput->time) - Msg.time = pKbdInput->time; + dwTime = pKbdInput->time; else { KeQueryTickCount(&LargeTickCount); - Msg.time = MsqCalculateMessageTime(&LargeTickCount); - } - - if (!(pKbdInput->dwFlags & KEYEVENTF_UNICODE)) - { - if (bIsDown) - { - /* Update keyboard LEDs */ - if (!gpKeyboardIndicatorTrans) - IntKeyboardGetIndicatorTrans(ghKeyboardDevice, &gpKeyboardIndicatorTrans); - if (gpKeyboardIndicatorTrans) - IntKeyboardUpdateLeds(ghKeyboardDevice, - wScanCode, - IS_KEY_LOCKED(gafAsyncKeyState, wVk), - gpKeyboardIndicatorTrans); - } - - /* Call hook */ - if (co_CallLowLevelKeyboardHook(&Msg, bInjected, pKbdInput->dwExtraInfo)) - { - ERR("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", - Msg.message, Msg.wParam, Msg.lParam); - bPostMsg = FALSE; - } - - /* Update async state of not simplified vk here. - See user32_apitest:GetKeyState */ - UpdateAsyncKeyState(wVk, bIsDown); - - /* Support VK_*MENU keys */ - if (!bIsDown && wSimpleVk == VK_MENU && !IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL)) - co_IntKeyboardSendAltKeyMsg(); - } - - /* Alt-Tab/Esc Check. Use FocusQueue or RIT Queue */ - if (!(pKbdInput->dwFlags & KEYEVENTF_KEYUP) && - HIWORD(Msg.lParam) & KF_ALTDOWN && - ( Msg.wParam == VK_ESCAPE || Msg.wParam == VK_TAB ) ) - { - TRACE("Alt-Tab/Esc Pressed wParam %x\n",Msg.wParam); - } - - /* If we have a focus queue, post a keyboard message */ - if (pFocusQueue && bPostMsg) - { - /* Post a keyboard message */ - TRACE("Posting keyboard msg %u wParam 0x%x lParam 0x%x\n", Msg.message, Msg.wParam, Msg.lParam); - //co_MsqPostKeyboardMessage(Msg.message, Msg.wParam, Msg.lParam, bInjected); - MsqPostMessage(pFocusQueue, &Msg, TRUE, QS_KEY); - } - - return TRUE; + dwTime = MsqCalculateMessageTime(&LargeTickCount); + } + + if (wVk == VK_RMENU && (pKbdTbl->fLocaleFlags & KLLF_ALTGR)) + { + /* For AltGr keyboards RALT generates CTRL events */ + ProcessKeyEvent(VK_LCONTROL, 0, pKbdInput->dwFlags & KEYEVENTF_KEYUP, bInjected, dwTime, 0); + } + + /* Finally process this key */ + return ProcessKeyEvent(wVk, wScanCode, pKbdInput->dwFlags, bInjected, dwTime, pKbdInput->dwExtraInfo); } /* @@ -1102,7 +1120,7 @@ UINT ret = 0; TRACE("Enter NtUserMapVirtualKeyEx\n"); - UserEnterExclusive(); + UserEnterShared(); if (!dwhkl) { @@ -1188,7 +1206,7 @@ } RtlZeroMemory(pwszBuff, sizeof(WCHAR) * cchBuff); - UserEnterShared(); + UserEnterExclusive(); // Note: we modify wchDead static variable if (dwhkl) pKbl = UserHklToKbl(dwhkl); @@ -1227,7 +1245,7 @@ PTHREADINFO pti; DWORD i, cchKeyName, dwRet = 0; WORD wScanCode = (lParam >> 16) & 0xFF; - BOOL bExtKey = (lParam & LP_EXT_BIT) ? TRUE : FALSE; + BOOL bExtKey = (HIWORD(lParam) & KF_EXTENDED) ? TRUE : FALSE; PKBDTABLES pKbdTbl; VSC_LPWSTR *pKeyNames = NULL; CONST WCHAR *pKeyName = NULL; @@ -1235,6 +1253,8 @@ TRACE("Enter NtUserGetKeyNameText\n"); + UserEnterShared(); + /* Get current keyboard layout */ pti = PsGetCurrentThreadWin32Thread(); pKbdTbl = pti ? pti->KeyboardLayout->KBTables : 0; @@ -1242,10 +1262,8 @@ if (!pKbdTbl || cchSize < 1) { ERR("Invalid parameter\n"); - return 0; - } - - UserEnterShared(); + goto cleanup; + } /* "Do not care" flag */ if(lParam & LP_DO_NOT_CARE_BIT) @@ -1309,6 +1327,7 @@ EngSetLastError(ERROR_INVALID_PARAMETER); } +cleanup: UserLeave(); TRACE("Leave NtUserGetKeyNameText, ret=%i\n", dwRet); return dwRet; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Oct 13 13:23:57 2011 @@ -663,10 +663,10 @@ id = wParam; // Check for hot keys unrelated to the hot keys set by RegisterHotKey. Mesg.hwnd = hWnd; - Mesg.message = id != IDHOT_REACTOS ? WM_HOTKEY : WM_SYSCOMMAND; - Mesg.wParam = id != IDHOT_REACTOS ? wParam : SC_HOTKEY; - Mesg.lParam = id != IDHOT_REACTOS ? lParam : (LPARAM)hWnd; - Type = id != IDHOT_REACTOS ? QS_HOTKEY : QS_POSTMESSAGE; + Mesg.message = id != IDHK_REACTOS ? WM_HOTKEY : WM_SYSCOMMAND; + Mesg.wParam = id != IDHK_REACTOS ? wParam : SC_HOTKEY; + Mesg.lParam = id != IDHK_REACTOS ? lParam : (LPARAM)hWnd; + Type = id != IDHK_REACTOS ? QS_HOTKEY : QS_POSTMESSAGE; KeQueryTickCount(&LargeTickCount); Mesg.time = MsqCalculateMessageTime(&LargeTickCount); Mesg.pt = gpsi->ptCursor;

12 years, 11 months

[tkreuzer] 54106: [GDI32_APITEST] - Add tests for CreateDIBitmap - more tests for AddFontResource, GetPixel, SetSysColors

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Oct 13 12:52:25 2011 New Revision: 54106 URL: http://svn.reactos.org/svn/reactos?rev=54106&view=rev Log: [GDI32_APITEST] - Add tests for CreateDIBitmap - more tests for AddFontResource, GetPixel, SetSysColors Added: trunk/rostests/apitests/gdi32/CreateDIBitmap.c (with props) Modified: trunk/rostests/apitests/gdi32/AddFontResource.c trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/GetPixel.c trunk/rostests/apitests/gdi32/SetSysColors.c trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/AddFontResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontRes… ============================================================================== --- trunk/rostests/apitests/gdi32/AddFontResource.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/AddFontResource.c [iso-8859-1] Thu Oct 13 12:52:25 2011 @@ -87,6 +87,36 @@ result = AddFontResourceA(szFileNameA); ok(result == 0, "AddFontResourceA succeeded, result=%d\n", result); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError()=%ld\n", GetLastError()); + + + GetCurrentDirectoryA(MAX_PATH, szFileNameA); + strcpy(szFileNameFont1A, szFileNameA); + strcat(szFileNameFont1A, "\\testdata\\test.pfm"); + + strcpy(szFileNameFont2A, szFileNameA); + strcat(szFileNameFont2A, "\\testdata\\test.pfb"); + + SetLastError(ERROR_SUCCESS); + + sprintf(szFileNameA,"%s|%s", szFileNameFont1A, szFileNameFont2A); + result = AddFontResourceA(szFileNameA); + ok(result == 1, "AddFontResourceA(\"%s|%s\") failed, result=%d\n", + szFileNameFont1A, szFileNameFont2A, result); + ok(GetLastError() == ERROR_SUCCESS, "GetLastError()=%ld\n", GetLastError()); + + sprintf(szFileNameA,"%s | %s", szFileNameFont1A, szFileNameFont2A); + result = AddFontResourceA(szFileNameA); + ok(result == 0, "AddFontResourceA(\"%s | %s\") succeeded, result=%d\n", + szFileNameFont1A, szFileNameFont2A, result); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError()=%ld\n", GetLastError()); + + sprintf(szFileNameA,"%s|%s", szFileNameFont2A, szFileNameFont1A); + result = AddFontResourceA(szFileNameA); + ok(result == 0, "AddFontResourceA(\"%s|%s\") succeeded, result=%d\n", + szFileNameFont2A, szFileNameFont1A, result); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError()=%ld\n", GetLastError()); + + } START_TEST(AddFontResource) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Thu Oct 13 12:52:25 2011 @@ -8,6 +8,7 @@ CombineTransform.c CreateBitmapIndirect.c CreateCompatibleDC.c + CreateDIBitmap.c CreateFont.c CreateFontIndirect.c CreatePen.c Added: trunk/rostests/apitests/gdi32/CreateDIBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBitmap.c (added) +++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Thu Oct 13 12:52:25 2011 @@ -1,0 +1,77 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for CreateDIBitmap + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +void +Test_CreateDIBitmap1(void) +{ + BITMAPINFO bmi; + HBITMAP hbmp; + BITMAP bitmap; + ULONG bits[128] = {0}; + BYTE rlebits[] = {2, 0, 0, 0, 2, 1, 0, 1}; + HDC hdc; + int ret; + + hdc = GetDC(0); + + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = 2; + bmi.bmiHeader.biHeight = 2; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 16; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biSizeImage = 0; + bmi.bmiHeader.biXPelsPerMeter = 1; + bmi.bmiHeader.biYPelsPerMeter = 1; + bmi.bmiHeader.biClrUsed = 0; + bmi.bmiHeader.biClrImportant = 0; + + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, bits, &bmi, DIB_RGB_COLORS); + ok(hbmp != 0, "failed\n"); + + ret = GetObject(hbmp, sizeof(bitmap), &bitmap); + ok(ret != 0, "failed\n"); + ok(bitmap.bmType == 0, "\n"); + ok(bitmap.bmWidth == 2, "\n"); + ok(bitmap.bmHeight == 2, "\n"); + ok(bitmap.bmWidthBytes == 8, "bmWidthBytes = %ld\n", bitmap.bmWidthBytes); + ok(bitmap.bmPlanes == 1, "\n"); + ok(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), "\n"); + ok(bitmap.bmBits == 0, "\n"); + + SetLastError(0); + bmi.bmiHeader.biCompression = BI_RLE8; + bmi.bmiHeader.biBitCount = 8; + bmi.bmiHeader.biSizeImage = 8; + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_INIT, rlebits, &bmi, DIB_RGB_COLORS); + ok(hbmp != 0, "failed\n"); + ok(GetLastError() == 0, "GetLastError() == %ld\n", GetLastError()); + + ret = GetObject(hbmp, sizeof(bitmap), &bitmap); + ok(ret != 0, "failed\n"); + ok(bitmap.bmType == 0, "\n"); + ok(bitmap.bmWidth == 2, "\n"); + ok(bitmap.bmHeight == 2, "\n"); + ok(bitmap.bmWidthBytes == 8, "bmWidthBytes = %ld\n", bitmap.bmWidthBytes); + ok(bitmap.bmPlanes == 1, "\n"); + ok(bitmap.bmBitsPixel == GetDeviceCaps(hdc, BITSPIXEL), "\n"); + ok(bitmap.bmBits == 0, "\n"); + + +} + + + +START_TEST(CreateDIBitmap) +{ + Test_CreateDIBitmap1(); +} + Propchange: trunk/rostests/apitests/gdi32/CreateDIBitmap.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/GetPixel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetPixel.c… ============================================================================== --- trunk/rostests/apitests/gdi32/GetPixel.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetPixel.c [iso-8859-1] Thu Oct 13 12:52:25 2011 @@ -28,6 +28,13 @@ color = GetPixel(hdc, 1, 0); ok(color == 0, "Wrong color at 1,0 : 0x%08x\n", (UINT)color); + SetBkColor(hdc, 0x12345678); + SetTextColor(hdc, 0x87654321); + color = GetPixel(hdc, 0, 0); + ok(color == 0xFFFFFF, "Wrong color at 0,0 : 0x%08x\n", (UINT)color); + color = GetPixel(hdc, 1, 0); + ok(color == 0, "Wrong color at 1,0 : 0x%08x\n", (UINT)color); + hbmp = SelectObject(hdc, hbmp); DeleteObject(hbmp); DeleteDC(hdc); Modified: trunk/rostests/apitests/gdi32/SetSysColors.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetSysColo… ============================================================================== --- trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetSysColors.c [iso-8859-1] Thu Oct 13 12:52:25 2011 @@ -26,21 +26,21 @@ nElements[i] = i; crOldColors[i] = GetSysColor(i); } - + for (i = 0; i < NUM_SYSCOLORS+1; i++) crColors[i] = RGB(i, 255-i, i*3); nElements[NUM_SYSCOLORS] = nElements[0]; - + SetLastError(0xdeadbeef); ok(SetSysColors(-1, nElements, crColors) == FALSE, "Expected FALSE, got TRUE\n"); - ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_NOACCESS, got %ld\n", GetLastError()); ok(SetSysColors(0, nElements, crColors) == TRUE, "Expected TRUE, got FALSE\n"); ok(SetSysColors(0, NULL, crColors) == TRUE, "Expected TRUE, got FALSE\n"); ok(SetSysColors(0, nElements, NULL) == TRUE, "Expected TRUE, got FALSE\n"); ok(SetSysColors(1, NULL, crColors) == FALSE, "Expected FALSE, got TRUE\n"); - ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_NOACCESS, got %ld\n", GetLastError()); ok(SetSysColors(1, nElements, NULL) == FALSE, "Expected FALSE, got TRUE\n"); - ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_NOACCESS, got %ld\n", GetLastError()); ok(SetSysColors(1, nElements, crColors) == TRUE, "Expected TRUE, got FALSE\n"); ok(SetSysColors(NUM_SYSCOLORS, nElements, crColors) == TRUE, "Expected TRUE, got FALSE\n"); for (i = 0; i < NUM_SYSCOLORS; i++) Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Thu Oct 13 12:52:25 2011 @@ -11,6 +11,7 @@ extern void func_CombineTransform(void); extern void func_CreateBitmapIndirect(void); extern void func_CreateCompatibleDC(void); +extern void func_CreateDIBitmap(void); extern void func_CreateFont(void); extern void func_CreateFontIndirect(void); extern void func_CreatePen(void); @@ -59,6 +60,7 @@ { "CombineTransform", func_CombineTransform }, { "CreateBitmapIndirect", func_CreateBitmapIndirect }, { "CreateCompatibleDC", func_CreateCompatibleDC }, + { "CreateDIBitmap", func_CreateDIBitmap }, { "CreateFont", func_CreateFont }, { "CreateFontIndirect", func_CreateFontIndirect }, { "CreatePen", func_CreatePen },

12 years, 11 months

[khornicek] 54105: [SYSSETUP] Allow creating of shortcuts with icon indexes != 0. [EXPLORER] Shuffle the resources a bit so icons with indexes 0 and 1 match those in windows explorer. See issue #65...

by khornicek＠svn.reactos.org

Author: khornicek Date: Thu Oct 13 12:38:24 2011 New Revision: 54105 URL: http://svn.reactos.org/svn/reactos?rev=54105&view=rev Log: [SYSSETUP] Allow creating of shortcuts with icon indexes != 0. [EXPLORER] Shuffle the resources a bit so icons with indexes 0 and 1 match those in windows explorer. See issue #6544 for more details. Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc trunk/reactos/base/shell/explorer/resource.h trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc [iso-8859-1] Thu Oct 13 12:38:24 2011 @@ -151,7 +151,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_REACTOS ICON DISCARDABLE "res/reactos.ico" +IDI_COMPUTER ICON DISCARDABLE "res/computer.ico" IDI_EXPLORER ICON DISCARDABLE "res/explorer.ico" IDI_STARTMENU ICON DISCARDABLE "res/startmenu.ico" IDI_LOGOFF ICON DISCARDABLE "res/logoff.ico" @@ -173,7 +173,7 @@ IDI_SEARCH_DOC ICON DISCARDABLE "res/search-doc.ico" IDI_PRINTER ICON DISCARDABLE "res/printer.ico" IDI_NETWORK ICON DISCARDABLE "res/network.ico" -IDI_COMPUTER ICON DISCARDABLE "res/computer.ico" +IDI_REACTOS ICON DISCARDABLE "res/reactos.ico" IDI_SPEAKER ICON DISCARDABLE "res/speaker.ico" IDI_DOT ICON DISCARDABLE "res/dot.ico" IDI_DOT_TRANS ICON DISCARDABLE "res/dot_trans.ico" Modified: trunk/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour… ============================================================================== --- trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] Thu Oct 13 12:38:24 2011 @@ -2,7 +2,6 @@ // Microsoft Developer Studio generated include file. // Used by explorer_intres.rc // -#define IDI_COMPUTER 0 #define IDS_TITLE 1 #define MANIFEST_RESOURCE_ID 1 #define IDS_START 2 @@ -53,7 +52,7 @@ #define IDS_NAMECOLUMN 47 #define IDS_PATHCOLUMN 48 #define IDS_MENUCOLUMN 49 -#define IDI_REACTOS 100 +#define IDI_COMPUTER 100 #define IDI_EXPLORER 101 #define IDI_STARTMENU 102 #define IDB_TOOLBAR 103 @@ -92,6 +91,7 @@ #define IDI_SEARCH_DOC 146 #define IDI_PRINTER 147 #define IDI_NETWORK 148 +#define IDI_REACTOS 149 #define IDM_DESKTOPBAR 150 #define IDM_VOLUME 151 #define IDM_NOTIFYAREA 152 Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Thu Oct 13 12:38:24 2011 @@ -120,7 +120,7 @@ static BOOL -CreateShortcut(int csidl, LPCTSTR folder, UINT nIdName, LPCTSTR command, UINT nIdTitle, BOOL bCheckExistence) +CreateShortcut(int csidl, LPCTSTR folder, UINT nIdName, LPCTSTR command, UINT nIdTitle, BOOL bCheckExistence, INT iIconNr) { TCHAR path[MAX_PATH]; TCHAR exeName[MAX_PATH]; @@ -193,7 +193,7 @@ return FALSE; // FIXME: we should pass 'command' straight in here, but shell32 doesn't expand it - return SUCCEEDED(CreateShellLink(path, exeName, _T(""), lpWorkingDir, NULL, 0, title)); + return SUCCEEDED(CreateShellLink(path, exeName, _T(""), lpWorkingDir, exeName, iIconNr, title)); } @@ -752,59 +752,59 @@ CoInitialize(NULL); /* Create desktop shortcuts */ - CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE, 0); /* Create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE); - CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\rapps.exe"), IDS_CMT_DOWNLOADER, TRUE); + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, TRUE, 1); + CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\rapps.exe"), IDS_CMT_DOWNLOADER, TRUE, 0); /* Create administrative tools startmenu shortcuts */ - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("%SystemRoot%\\system32\\servman.exe"), IDS_CMT_SERVMAN, TRUE); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("%SystemRoot%\\system32\\devmgmt.exe"), IDS_CMT_DEVMGMT, TRUE); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_EVENTVIEW, _T("%SystemRoot%\\system32\\eventvwr.exe"), IDS_CMT_EVENTVIEW, TRUE); - CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_MSCONFIG, _T("%SystemRoot%\\system32\\msconfig.exe"), IDS_CMT_MSCONFIG, TRUE); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_SERVICE, _T("%SystemRoot%\\system32\\servman.exe"), IDS_CMT_SERVMAN, TRUE, 0); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_DEVICE, _T("%SystemRoot%\\system32\\devmgmt.exe"), IDS_CMT_DEVMGMT, TRUE, 0); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_EVENTVIEW, _T("%SystemRoot%\\system32\\eventvwr.exe"), IDS_CMT_EVENTVIEW, TRUE, 0); + CreateShortcut(CSIDL_COMMON_ADMINTOOLS, NULL, IDS_SHORT_MSCONFIG, _T("%SystemRoot%\\system32\\msconfig.exe"), IDS_CMT_MSCONFIG, TRUE, 0); /* Create and fill Accessories subfolder */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_PAINT, _T("%SystemRoot%\\system32\\mspaint.exe"), IDS_CMT_PAINT, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_PAINT, _T("%SystemRoot%\\system32\\mspaint.exe"), IDS_CMT_PAINT, TRUE, 0); } /* Create System Tools subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_TOOLS, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_DXDIAG, _T("%SystemRoot%\\system32\\dxdiag.exe"), IDS_CMT_DXDIAG, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CHARMAP, _T("%SystemRoot%\\system32\\charmap.exe"), IDS_CMT_CHARMAP, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_REGEDIT, _T("%SystemRoot%\\regedit.exe"), IDS_CMT_REGEDIT, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_DXDIAG, _T("%SystemRoot%\\system32\\dxdiag.exe"), IDS_CMT_DXDIAG, TRUE, 0); } /* Create Accessibility subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_ACCESSIBILITY, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MAGNIFY, _T("%SystemRoot%\\system32\\magnify.exe"), IDS_CMT_MAGNIFY, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MAGNIFY, _T("%SystemRoot%\\system32\\magnify.exe"), IDS_CMT_MAGNIFY, TRUE, 0); } /* Create Entertainment subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_SYS_ENTERTAINMENT, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MPLAY32, _T("%SystemRoot%\\system32\\mplay32.exe"), IDS_CMT_MPLAY32, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNDVOL32, _T("%SystemRoot%\\system32\\sndvol32.exe"), IDS_CMT_SNDVOL32, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNDREC32, _T("%SystemRoot%\\system32\\sndrec32.exe"), IDS_CMT_SNDREC32, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MPLAY32, _T("%SystemRoot%\\system32\\mplay32.exe"), IDS_CMT_MPLAY32, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNDVOL32, _T("%SystemRoot%\\system32\\sndvol32.exe"), IDS_CMT_SNDVOL32, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNDREC32, _T("%SystemRoot%\\system32\\sndrec32.exe"), IDS_CMT_SNDREC32, TRUE, 0); } /* Create Games subfolder and fill if the exe is available */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_GAMES, szFolder, sizeof(szFolder)/sizeof(szFolder[0]))) { - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SOLITAIRE, _T("%SystemRoot%\\system32\\sol.exe"), IDS_CMT_SOLITAIRE, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WINEMINE, _T("%SystemRoot%\\system32\\winmine.exe"), IDS_CMT_WINEMINE, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SPIDER, _T("%SystemRoot%\\system32\\spider.exe"), IDS_CMT_SPIDER, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SOLITAIRE, _T("%SystemRoot%\\system32\\sol.exe"), IDS_CMT_SOLITAIRE, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WINEMINE, _T("%SystemRoot%\\system32\\winmine.exe"), IDS_CMT_WINEMINE, TRUE, 0); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SPIDER, _T("%SystemRoot%\\system32\\spider.exe"), IDS_CMT_SPIDER, TRUE, 0); } CoUninitialize();

12 years, 11 months

[jimtabor] 54104: [Win32k] - Restore global class operations. [ComCtl32] - Use local class since this has higher priority over all global classes. [Themes] - Tested with XP Luna and two others. Run...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Oct 13 11:57:38 2011 New Revision: 54104 URL: http://svn.reactos.org/svn/reactos?rev=54104&view=rev Log: [Win32k] - Restore global class operations. [ComCtl32] - Use local class since this has higher priority over all global classes. [Themes] - Tested with XP Luna and two others. Rune and another Luna. Modified: trunk/reactos/dll/win32/comctl32/theming.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/dll/win32/comctl32/theming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theming… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theming.c [iso-8859-1] Thu Oct 13 11:57:38 2011 @@ -119,7 +119,7 @@ static const WCHAR refDataPropName[] = { 'C','C','3','2','T','h','e','m','i','n','g','D','a','t','a',0 }; - if (!IsThemeActive()) return; + if (!IsThemeActive()) return; // If so, un-register the class then register it again. atSubclassProp = GlobalAddAtomW (subclassPropName); atRefDataProp = GlobalAddAtomW (refDataPropName); @@ -133,8 +133,7 @@ GetClassInfoExW (NULL, subclasses[i].className, &class); originalProcs[i] = class.lpfnWndProc; class.lpfnWndProc = subclassProcs[i]; - class.style |= CS_GLOBALCLASS; - class.hInstance = COMCTL32_hModule; + class.hInstance = COMCTL32_hModule; // Always set the instance so it can be found again. if (!class.lpfnWndProc) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Thu Oct 13 11:57:38 2011 @@ -1291,9 +1291,8 @@ if (lpwcx->style & CS_GLOBALCLASS) { - /* HACK: allow global classes to be re-registered*/ Class = IntFindClass( ClassAtom, - lpwcx->hInstance, + NULL, &pi->pclsPublicList, NULL);

12 years, 11 months

[khornicek] 54103: [GDI32] Partial winesync to reduce code duplication and fix a crash in gdi32 font winetest.

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Oct 12 23:07:22 2011 New Revision: 54103 URL: http://svn.reactos.org/svn/reactos?rev=54103&view=rev Log: [GDI32] Partial winesync to reduce code duplication and fix a crash in gdi32 font winetest. Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Wed Oct 12 23:07:22 2011 @@ -127,6 +127,50 @@ return strW; } +static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT pByteLen) +{ + INT i, count = lastChar - firstChar + 1; + UINT c; + LPSTR str; + + if (count <= 0) + return NULL; + + switch (GdiGetCodePage(hdc)) + { + case 932: + case 936: + case 949: + case 950: + case 1361: + if (lastChar > 0xffff) + return NULL; + if ((firstChar ^ lastChar) > 0xff) + return NULL; + break; + default: + if (lastChar > 0xff) + return NULL; + break; + } + + str = HeapAlloc(GetProcessHeap(), 0, count * 2 + 1); + if (str == NULL) + return NULL; + + for(i = 0, c = firstChar; c <= lastChar; i++, c++) + { + if (c > 0xff) + str[i++] = (BYTE)(c >> 8); + str[i] = (BYTE)c; + } + str[i] = '\0'; + + *pByteLen = i; + + return str; +} + VOID FASTCALL NewTextMetricW2A(NEWTEXTMETRICA *tma, NEWTEXTMETRICW *tmw) { @@ -627,21 +671,16 @@ LPINT lpBuffer ) { - INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1); + INT wlen, count = 0; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; DPRINT("GetCharWidthsA\n"); - if(count <= 0) return FALSE; - - str = HeapAlloc(GetProcessHeap(), 0, count+1); + + str = FONT_GetCharsByRangeA(hdc, iFirstChar, iLastChar, &count); if (!str) return FALSE; - - for(i = 0; i < count; i++) - str[i] = (BYTE)(iFirstChar + i); - str[i] = '\0'; wstr = FONT_mbtowc(hdc, str, count+1, &wlen, NULL); if (!wstr) @@ -675,20 +714,16 @@ LPINT lpBuffer ) { - INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1); + INT wlen, count = 0; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; DPRINT("GetCharWidths32A\n"); - if(count <= 0) return FALSE; - - str = HeapAlloc(GetProcessHeap(), 0, count+1); + + str = FONT_GetCharsByRangeA(hdc, iFirstChar, iLastChar, &count); if (!str) return FALSE; - for(i = 0; i < count; i++) - str[i] = (BYTE)(iFirstChar + i); - str[i] = '\0'; wstr = FONT_mbtowc(hdc, str, count+1, &wlen, NULL); if (!wstr) @@ -722,20 +757,16 @@ PFLOAT pxBuffer ) { - INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1); + INT wlen, count = 0; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; DPRINT("GetCharWidthsFloatA\n"); - if(count <= 0) return FALSE; - - str = HeapAlloc(GetProcessHeap(), 0, count+1); + + str = FONT_GetCharsByRangeA(hdc, iFirstChar, iLastChar, &count); if (!str) return FALSE; - for(i = 0; i < count; i++) - str[i] = (BYTE)(iFirstChar + i); - str[i] = '\0'; wstr = FONT_mbtowc(hdc, str, count+1, &wlen, NULL); if (!wstr) @@ -758,25 +789,21 @@ APIENTRY GetCharABCWidthsA( HDC hdc, - UINT uFirstChar, - UINT uLastChar, + UINT iFirstChar, + UINT iLastChar, LPABC lpabc ) { - INT i, wlen, count = (INT)(uLastChar - uFirstChar + 1); + INT wlen, count = 0; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; DPRINT("GetCharABCWidthsA\n"); - if(count <= 0) return FALSE; - - str = HeapAlloc(GetProcessHeap(), 0, count+1); + + str = FONT_GetCharsByRangeA(hdc, iFirstChar, iLastChar, &count); if (!str) return FALSE; - for(i = 0; i < count; i++) - str[i] = (BYTE)(uFirstChar + i); - str[i] = '\0'; wstr = FONT_mbtowc(hdc, str, count+1, &wlen, NULL); if (!wstr) @@ -810,21 +837,16 @@ LPABCFLOAT lpABCF ) { - INT i, wlen, count = (INT)(iLastChar - iFirstChar + 1); + INT wlen, count = 0; LPSTR str; LPWSTR wstr; BOOL ret = TRUE; DPRINT("GetCharABCWidthsFloatA\n"); - if (count <= 0) return FALSE; - - str = HeapAlloc(GetProcessHeap(), 0, count+1); + + str = FONT_GetCharsByRangeA(hdc, iFirstChar, iLastChar, &count); if (!str) return FALSE; - - for(i = 0; i < count; i++) - str[i] = (BYTE)(iFirstChar + i); - str[i] = '\0'; wstr = FONT_mbtowc( hdc, str, count+1, &wlen, NULL ); if (!wstr)

12 years, 11 months

[jimtabor] 54102: [Rtl] - Replace RtlQueryInformationActiveActivationContext and set it based on wine.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 12 22:48:01 2011 New Revision: 54102 URL: http://svn.reactos.org/svn/reactos?rev=54102&view=rev Log: [Rtl] - Replace RtlQueryInformationActiveActivationContext and set it based on wine. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=54102… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Wed Oct 12 22:48:01 2011 @@ -23,8 +23,6 @@ #include <wine/unicode.h> BOOLEAN RtlpNotAllowingMultipleActivation; - -#define QUERY_ACTCTX_FLAG_ACTIVE (0x00000001) #define ACTCTX_FLAGS_ALL (\ ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID |\ @@ -2673,6 +2671,22 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +RtlQueryInformationActiveActivationContext(ULONG ulInfoClass, + PVOID pvBuffer, + SIZE_T cbBuffer OPTIONAL, + SIZE_T *pcbWrittenOrRequired OPTIONAL) +{ + return RtlQueryInformationActivationContext(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, + NULL, + NULL, + ulInfoClass, + pvBuffer, + cbBuffer, + pcbWrittenOrRequired); +} + #define FIND_ACTCTX_RETURN_FLAGS 0x00000002 #define FIND_ACTCTX_RETURN_ASSEMBLY_METADATA 0x00000004 #define FIND_ACTCTX_VALID_MASK (FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX | FIND_ACTCTX_RETURN_FLAGS | FIND_ACTCTX_RETURN_ASSEMBLY_METADATA)

12 years, 11 months

[jimtabor] 54101: [Win32k] - Support Active SxS for the window structures.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 12 22:46:07 2011 New Revision: 54101 URL: http://svn.reactos.org/svn/reactos?rev=54101&view=rev Log: [Win32k] - Support Active SxS for the window structures. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Oct 12 22:46:07 2011 @@ -5,7 +5,6 @@ typedef struct _THREADINFO *PTHREADINFO; struct _DESKTOP; struct _WND; - #define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ #define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ @@ -247,6 +246,7 @@ { HWND hWnd; struct _WND *pWnd; + PVOID pActCtx; } CALLBACKWND, *PCALLBACKWND; #define CI_TRANSACTION 0x00000001 @@ -284,7 +284,7 @@ UCHAR achDbcsCF[2]; MSG msgDbcsCB; LPDWORD lpdwRegisteredClasses; - ULONG Win32ClientInfo3[27]; + ULONG Win32ClientInfo3[26]; /* It's just a pointer reference not to be used w the structure in user space. */ PPROCESSINFO ppi; } CLIENTINFO, *PCLIENTINFO; @@ -591,7 +591,7 @@ struct _WND *spwndLastActive; //HIMC hImc; // Input context associated with this window. LONG dwUserData; - //PACTIVATION_CONTEXT pActCtx; + PVOID pActCtx; //PD3DMATRIX pTransForm; struct _WND *spwndClipboardListener; DWORD ExStyle2; Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Wed Oct 12 22:46:07 2011 @@ -47,7 +47,7 @@ BOOL FASTCALL IntShowOwnedPopups( PWND owner, BOOL fShow ); LRESULT FASTCALL IntDefWindowProc( PWND Window, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL Ansi); VOID FASTCALL IntNotifyWinEvent(DWORD, PWND, LONG, LONG, DWORD); -PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW*, PUNICODE_STRING, PLARGE_STRING); +PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW*, PUNICODE_STRING, PLARGE_STRING, PVOID); BOOL FASTCALL IntEnableWindow(HWND,BOOL); DWORD FASTCALL GetNCHitEx(PWND pWnd, POINT pt); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Wed Oct 12 22:46:07 2011 @@ -87,7 +87,7 @@ // This will help user space programs speed up read access with the window object. // static VOID -IntSetTebWndCallback (HWND * hWnd, PWND * pWnd) +IntSetTebWndCallback (HWND * hWnd, PWND * pWnd, PVOID * pActCtx) { HWND hWndS = *hWnd; PWND Window = UserGetWindowObject(*hWnd); @@ -95,18 +95,21 @@ *hWnd = ClientInfo->CallbackWnd.hWnd; *pWnd = ClientInfo->CallbackWnd.pWnd; + *pActCtx = ClientInfo->CallbackWnd.pActCtx; ClientInfo->CallbackWnd.hWnd = hWndS; ClientInfo->CallbackWnd.pWnd = DesktopHeapAddressToUser(Window); + ClientInfo->CallbackWnd.pActCtx = Window->pActCtx; } static VOID -IntRestoreTebWndCallback (HWND hWnd, PWND pWnd) +IntRestoreTebWndCallback (HWND hWnd, PWND pWnd, PVOID pActCtx) { PCLIENTINFO ClientInfo = GetWin32ClientInfo(); ClientInfo->CallbackWnd.hWnd = hWnd; ClientInfo->CallbackWnd.pWnd = pWnd; + ClientInfo->CallbackWnd.pActCtx = pActCtx; } /* FUNCTIONS *****************************************************************/ @@ -227,7 +230,7 @@ LRESULT Result) { SENDASYNCPROC_CALLBACK_ARGUMENTS Arguments; - PVOID ResultPointer; + PVOID ResultPointer, pActCtx; PWND pWnd; ULONG ResultLength; NTSTATUS Status; @@ -238,7 +241,7 @@ Arguments.Context = CompletionCallbackContext; Arguments.Result = Result; - IntSetTebWndCallback (&hWnd, &pWnd); + IntSetTebWndCallback (&hWnd, &pWnd, &pActCtx); UserLeaveCo(); @@ -250,7 +253,7 @@ UserEnterCo(); - IntRestoreTebWndCallback (hWnd, pWnd); + IntRestoreTebWndCallback (hWnd, pWnd, pActCtx); if (!NT_SUCCESS(Status)) { @@ -271,7 +274,7 @@ WINDOWPROC_CALLBACK_ARGUMENTS StackArguments; PWINDOWPROC_CALLBACK_ARGUMENTS Arguments; NTSTATUS Status; - PVOID ResultPointer; + PVOID ResultPointer, pActCtx; PWND pWnd; ULONG ResultLength; ULONG ArgumentLength; @@ -304,7 +307,7 @@ ResultPointer = NULL; ResultLength = ArgumentLength; - IntSetTebWndCallback (&Wnd, &pWnd); + IntSetTebWndCallback (&Wnd, &pWnd, &pActCtx); UserLeaveCo(); @@ -328,7 +331,7 @@ UserEnterCo(); - IntRestoreTebWndCallback (Wnd, pWnd); + IntRestoreTebWndCallback (Wnd, pWnd, pActCtx); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Oct 12 22:46:07 2011 @@ -1060,7 +1060,7 @@ Cs.lpszName = (LPCWSTR) &WindowName; Cs.lpszClass = (LPCWSTR) &ClassName; - pWndDesktop = co_UserCreateWindowEx(&Cs, &ClassName, &WindowName); + pWndDesktop = co_UserCreateWindowEx(&Cs, &ClassName, &WindowName, NULL); if (!pWnd) { ERR("Failed to create Desktop window handle\n"); @@ -1088,7 +1088,7 @@ Cs.lpszName = (LPCWSTR) &WindowName; Cs.lpszClass = (LPCWSTR) &ClassName; - pWnd = co_UserCreateWindowEx(&Cs, &ClassName, &WindowName); + pWnd = co_UserCreateWindowEx(&Cs, &ClassName, &WindowName, NULL); if (!pWnd) { ERR("Failed to create Message window handle\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Oct 12 22:46:07 2011 @@ -1557,7 +1557,8 @@ PLARGE_STRING WindowName, PCLS Class, PWND ParentWindow, - PWND OwnerWindow) + PWND OwnerWindow, + PVOID acbiBuffer) { PWND pWnd = NULL; HWND hWnd; @@ -1642,6 +1643,7 @@ pWnd->style = Cs->style & ~WS_VISIBLE; pWnd->ExStyle = Cs->dwExStyle; pWnd->cbwndExtra = pWnd->pcls->cbwndExtra; + pWnd->pActCtx = acbiBuffer; IntReferenceMessageQueue(pWnd->head.pti->MessageQueue); if (pWnd->spwndParent != NULL && Cs->hwndParent != 0) @@ -1835,7 +1837,8 @@ PWND FASTCALL co_UserCreateWindowEx(CREATESTRUCTW* Cs, PUNICODE_STRING ClassName, - PLARGE_STRING WindowName) + PLARGE_STRING WindowName, + PVOID acbiBuffer) { PWND Window = NULL, ParentWindow = NULL, OwnerWindow; HWND hWnd, hWndParent, hWndOwner, hwndInsertAfter; @@ -1914,7 +1917,8 @@ WindowName, Class, ParentWindow, - OwnerWindow); + OwnerWindow, + acbiBuffer); if(!Window) { ERR("IntCreateWindow failed!\n"); @@ -2347,7 +2351,7 @@ UserEnterExclusive(); /* Call the internal function */ - pwnd = co_UserCreateWindowEx(&Cs, &ustrClassName, plstrWindowName); + pwnd = co_UserCreateWindowEx(&Cs, &ustrClassName, plstrWindowName, acbiBuffer); if(!pwnd) {

12 years, 11 months

← Newer
1
...
15
16
17
18
19
20
21
...
37
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 October 2011