Ros-diffs July 2012

ros-diffs@reactos.org

14 participants
193 discussions

[jimtabor] 56838: [User32] - Sync up with wine NCActivate.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jul 5 21:39:21 2012 New Revision: 56838 URL: http://svn.reactos.org/svn/reactos?rev=56838&view=rev Log: [User32] - Sync up with wine NCActivate. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c trunk/reactos/win32ss/user/user32/windows/nonclient.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Thu Jul 5 21:39:21 2012 @@ -18,7 +18,7 @@ LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active); LRESULT DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect); -LRESULT DefWndNCActivate(HWND hWnd, WPARAM wParam); +LRESULT DefWndNCActivate(HWND hWnd, WPARAM wParam, LPARAM lParam); LRESULT DefWndNCHitTest(HWND hWnd, POINT Point); LRESULT DefWndNCLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam); LRESULT DefWndNCLButtonDblClk(HWND hWnd, WPARAM wParam, LPARAM lParam); @@ -1053,7 +1053,7 @@ case WM_NCACTIVATE: { - return DefWndNCActivate(hWnd, wParam); + return DefWndNCActivate(hWnd, wParam, lParam); } case WM_NCHITTEST: Modified: trunk/reactos/win32ss/user/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/nonclient.c [iso-8859-1] Thu Jul 5 21:39:21 2012 @@ -495,7 +495,7 @@ if (hRgn != HRGN_WINDOW) DeleteObject(hRgn); // We use DCX_KEEPCLIPRGN - return 0; + return 0; // For WM_NCPAINT message, return 0. } LRESULT @@ -652,9 +652,35 @@ } LRESULT -DefWndNCActivate(HWND hWnd, WPARAM wParam) -{ - DefWndNCPaint(hWnd, HRGN_WINDOW, wParam); +DefWndNCActivate(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + PWND Wnd = ValidateHwnd(hWnd); + + if (!Wnd) return 0; + + /* Lotus Notes draws menu descriptions in the caption of its main + * window. When it wants to restore original "system" view, it just + * sends WM_NCACTIVATE message to itself. Any optimizations here in + * attempt to minimize redrawings lead to a not restored caption. + */ + if (wParam) + NtUserxSetWindowState(Wnd, WNDSACTIVEFRAME); + else + NtUserxClearWindowState(Wnd, WNDSACTIVEFRAME); + + if (Wnd->state & WNDS_NONCPAINT) + return 0; + + /* This isn't documented but is reproducible in at least XP SP2 and + * Outlook 2007 depends on it + */ + // MSDN: + // If this parameter is set to -1, DefWindowProc does not repaint the + // nonclient area to reflect the state change. + if (lParam != -1) + { + DefWndNCPaint(hWnd, HRGN_WINDOW, wParam); + } return TRUE; } @@ -930,6 +956,7 @@ { if (GetMessageW(&Msg, 0, WM_MOUSEFIRST, WM_MOUSELAST) <= 0) break; + if (CallMsgFilterW( &Msg, MSGF_MAX )) continue; if (Msg.message == WM_LBUTTONUP) break; @@ -948,7 +975,7 @@ ReleaseCapture(); ReleaseDC(hWnd, WindowDC); if (Pressed) - SendMessageW(hWnd, WM_SYSCOMMAND, SCMsg, 0); + SendMessageW(hWnd, WM_SYSCOMMAND, SCMsg, MAKELONG(Msg.pt.x,Msg.pt.y)); }

12 years, 2 months

[jimtabor] 56837: [User32] - Add support for LB_GETLISTBOXINFO and LBS_NODATA. Fix unknown wide char in draw.c.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jul 5 21:34:16 2012 New Revision: 56837 URL: http://svn.reactos.org/svn/reactos?rev=56837&view=rev Log: [User32] - Add support for LB_GETLISTBOXINFO and LBS_NODATA. Fix unknown wide char in draw.c. Modified: trunk/reactos/win32ss/user/user32/controls/listbox.c trunk/reactos/win32ss/user/user32/windows/draw.c Modified: trunk/reactos/win32ss/user/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/listbox.c [iso-8859-1] Thu Jul 5 21:34:16 2012 @@ -27,9 +27,9 @@ * If you discover missing features, or bugs, please note them below. * * TODO: - * - GetListBoxInfo() - * - LB_GETLISTBOXINFO - * - LBS_NODATA + * - GetListBoxInfo() ReactOS + * - LB_GETLISTBOXINFO ReactOS + * - LBS_NODATA ReactOS */ #include <user32.h> @@ -2523,6 +2523,14 @@ if (descr->style & LBS_EXTENDEDSEL) descr->style |= LBS_MULTIPLESEL; if (descr->style & LBS_MULTICOLUMN) descr->style &= ~LBS_OWNERDRAWVARIABLE; if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT; + + //// ReactOS + /* A no-data list box must also have the LBS_OWNERDRAWFIXED style, but must + not have the LBS_SORT or LBS_HASSTRINGS style. */ + if ( descr->style & LBS_NODATA && + (!(descr->style & LBS_OWNERDRAWFIXED) || descr->style & (LBS_HASSTRINGS|LBS_SORT) ) ) + descr->style &= ~LBS_NODATA; + //// descr->item_height = LISTBOX_SetFont( descr, 0 ); if (descr->style & LBS_OWNERDRAWFIXED) @@ -3001,9 +3009,11 @@ LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); return LB_OKAY; - case LB_GETLISTBOXINFO: - FIXME("LB_GETLISTBOXINFO: stub!\n"); - return 0; + case LB_GETLISTBOXINFO: //// ReactOS + if (descr->style & LBS_MULTICOLUMN) + return descr->column_width; + else + return descr->nb_items; case WM_DESTROY: return LISTBOX_Destroy( descr ); Modified: trunk/reactos/win32ss/user/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/draw.c [iso-8859-1] Thu Jul 5 21:34:16 2012 @@ -1,4 +1,4 @@ -ï»¿/* +/* * ReactOS User32 Library * - Various drawing functions *

12 years, 2 months

[jimtabor] 56836: [Win32k] - Move window check to the API interface.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jul 5 21:30:23 2012 New Revision: 56836 URL: http://svn.reactos.org/svn/reactos?rev=56836&view=rev Log: [Win32k] - Move window check to the API interface. Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Thu Jul 5 21:30:23 2012 @@ -845,6 +845,7 @@ /* If we have a focus queue, post a keyboard message */ pFocusQueue = IntGetFocusMessageQueue(); + TRACE("ProcessKeyEvent Q 0x%p Focus pWnd 0x%p\n",pFocusQueue, pFocusQueue ? pFocusQueue->spwndFocus : 0); if (bIsDown && wVk == VK_SNAPSHOT) { if (pFocusQueue && @@ -1062,7 +1063,6 @@ WCHAR wch[3] = { 0 }; MSG NewMsg = { 0 }; PKBDTABLES pKbdTbl; - PWND pWnd; LARGE_INTEGER LargeTickCount; BOOL bResult = FALSE; @@ -1077,14 +1077,7 @@ return FALSE; } - pWnd = UserGetWindowObject(lpMsg->hwnd); - if (!pWnd) // Must have a window! - { - ERR("No Window for Translate.\n"); - return FALSE; - } - - pti = pWnd->head.pti; + pti = PsGetCurrentThreadWin32Thread(); if (!pti->KeyboardLayout) { Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Thu Jul 5 21:30:23 2012 @@ -2116,12 +2116,12 @@ return Res; } - BOOL APIENTRY NtUserTranslateMessage(LPMSG lpMsg, UINT flags) { MSG SafeMsg; BOOL Ret; + PWND pWnd; _SEH2_TRY { @@ -2136,9 +2136,16 @@ _SEH2_END; UserEnterExclusive(); - - Ret = IntTranslateKbdMessage(&SafeMsg, flags); - + pWnd = UserGetWindowObject(SafeMsg.hwnd); + if (pWnd) // Must have a window! + { + Ret = IntTranslateKbdMessage(&SafeMsg, flags); + } + else + { + ERR("No Window for Translate. hwnd 0x%p Msg %d\n",SafeMsg.hwnd,SafeMsg.message); + Ret = FALSE; + } UserLeave(); return Ret;

12 years, 2 months

[tfaber] 56835: [REGEDIT] - Improve permission acquirement for loading/unloading hives. Patch by Hermes Belusca See issue #7159 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Jul 5 20:47:18 2012 New Revision: 56835 URL: http://svn.reactos.org/svn/reactos?rev=56835&view=rev Log: [REGEDIT] - Improve permission acquirement for loading/unloading hives. Patch by Hermes Belusca See issue #7159 for more details. Modified: trunk/reactos/base/applications/regedit/framewnd.c Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Thu Jul 5 20:47:18 2012 @@ -330,12 +330,10 @@ lpszPrivilegeName, &tp.Privileges[0].Luid)) { - bRet = AdjustTokenPrivileges(hToken, - FALSE, - &tp, - sizeof(tp), - NULL, - NULL); + bRet = AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL); + + if (GetLastError() == ERROR_NOT_ALL_ASSIGNED) + bRet = FALSE; } CloseHandle(hToken); @@ -374,16 +372,10 @@ { LONG regLoadResult; - /* Enable the required privileges */ - EnablePrivilege(SE_BACKUP_NAME, NULL, TRUE); + /* Enable the 'restore' privilege, load the hive, disable the privilege */ EnablePrivilege(SE_RESTORE_NAME, NULL, TRUE); - - /* Load the hive */ regLoadResult = RegLoadKey(hRootKey, xPath, ofn.lpstrFile); - - /* Disable the privileges */ EnablePrivilege(SE_RESTORE_NAME, NULL, FALSE); - EnablePrivilege(SE_BACKUP_NAME, NULL, FALSE); if(regLoadResult == ERROR_SUCCESS) { @@ -418,16 +410,10 @@ /* load and set the caption and flags for dialog */ LoadString(hInst, IDS_UNLOAD_HIVE, Caption, COUNT_OF(Caption)); - /* Enable the required privileges */ - EnablePrivilege(SE_BACKUP_NAME, NULL, TRUE); + /* Enable the 'restore' privilege, unload the hive, disable the privilege */ EnablePrivilege(SE_RESTORE_NAME, NULL, TRUE); - - /* Unload the hive */ regUnloadResult = RegUnLoadKey(hRootKey, pszKeyPath); - - /* Disable the privileges */ EnablePrivilege(SE_RESTORE_NAME, NULL, FALSE); - EnablePrivilege(SE_BACKUP_NAME, NULL, FALSE); if(regUnloadResult == ERROR_SUCCESS) {

12 years, 2 months

[jimtabor] 56834: [Win32k] - Add keyboard cue and combo list box signing.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jul 5 19:14:21 2012 New Revision: 56834 URL: http://svn.reactos.org/svn/reactos?rev=56834&view=rev Log: [Win32k] - Add keyboard cue and combo list box signing. Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c trunk/reactos/win32ss/user/ntuser/sysparams.h Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Thu Jul 5 19:14:21 2012 @@ -301,6 +301,14 @@ /* Update SystemMetrics */ InitMetrics(); + + if (gbSpiInitialized && gpsi) + { + if (gspv.bKbdPref) gpsi->dwSRVIFlags |= SRVINFO_KBDPREF; + if (SPITESTPREF(UPM_KEYBOARDCUES)) gpsi->PUSIFlags |= PUSIF_KEYBOARDCUES; + if (SPITESTPREF(UPM_COMBOBOXANIMATION)) gpsi->PUSIFlags |= PUSIF_COMBOBOXANIMATION; + if (SPITESTPREF(UPM_LISTBOXSMOOTHSCROLLING)) gpsi->PUSIFlags |= PUSIF_LISTBOXSMOOTHSCROLLING; + } } BOOL Modified: trunk/reactos/win32ss/user/ntuser/sysparams.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.h [iso-8859-1] Thu Jul 5 19:14:21 2012 @@ -190,4 +190,4 @@ extern BOOL g_PaintDesktopVersion; BOOL InitSysParams(); - +#define SPITESTPREF(x) (gspv.dwUserPrefMask & x ? 1 : 0)

12 years, 2 months

[jimtabor] 56833: [Win32SS] - Add callback to find character set information.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jul 4 23:16:17 2012 New Revision: 56833 URL: http://svn.reactos.org/svn/reactos?rev=56833&view=rev Log: [Win32SS] - Add callback to find character set information. Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/callback.h trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Wed Jul 4 23:16:17 2012 @@ -10,7 +10,8 @@ #define USER32_CALLBACK_LOADMENU (6) #define USER32_CALLBACK_CLIENTTHREADSTARTUP (7) #define USER32_CALLBACK_CLIENTLOADLIBRARY (8) -#define USER32_CALLBACK_MAXIMUM (8) +#define USER32_CALLBACK_GETCHARSETINFO (9) +#define USER32_CALLBACK_MAXIMUM (9) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -85,6 +86,12 @@ BOOL ApiHook; } CLIENT_LOAD_LIBRARY_ARGUMENTS, *PCLIENT_LOAD_LIBRARY_ARGUMENTS; +typedef struct _GET_CHARSET_INFO +{ + LCID Locale; + CHARSETINFO Cs; +} GET_CHARSET_INFO, *PGET_CHARSET_INFO; + NTSTATUS WINAPI User32CallWindowProcFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -103,4 +110,6 @@ User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallClientLoadLibraryFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallGetCharsetInfo(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=56833&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Wed Jul 4 23:16:17 2012 @@ -3,7 +3,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem - * FILE: subsystems/win32/win32k/pch.h + * FILE: win32ss/pch.h * PURPOSE: Main Win32K Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ @@ -63,6 +63,7 @@ #include <prntfont.h> #include <dde.h> #include <wincon.h> +#include <winnls.h> #define _NOCSECT_TYPE #include <ddrawi.h> Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Wed Jul 4 23:16:17 2012 @@ -824,4 +824,63 @@ return Status; } +BOOL +APIENTRY +co_IntGetCharsetInfo(LCID Locale, PCHARSETINFO pCs) +{ + NTSTATUS Status; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + PGET_CHARSET_INFO Common; + + ArgumentLength = sizeof(GET_CHARSET_INFO); + + Argument = IntCbAllocateMemory(ArgumentLength); + if (NULL == Argument) + { + ERR("GetCharsetInfo callback failed: out of memory\n"); + return 0; + } + Common = (PGET_CHARSET_INFO) Argument; + + Common->Locale = Locale; + + ResultPointer = NULL; + ResultLength = ArgumentLength; + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_GETCHARSETINFO, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + _SEH2_TRY + { + /* Need to copy into our local buffer */ + RtlMoveMemory(Argument, ResultPointer, ArgumentLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Failed to copy result from user mode!\n"); + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + UserEnterCo(); + + RtlCopyMemory(pCs, &Common->Cs, sizeof(CHARSETINFO)); + + IntCbFreeMemory(Argument); + + if (!NT_SUCCESS(Status)) + { + ERR("GetCharsetInfo Failed!!\n"); + return FALSE; + } + + return TRUE; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] Wed Jul 4 23:16:17 2012 @@ -61,3 +61,6 @@ BOOL Unload, BOOL ApiHook); +BOOL +APIENTRY +co_IntGetCharsetInfo(LCID Locale, PCHARSETINFO pCs); Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Wed Jul 4 23:16:17 2012 @@ -201,6 +201,8 @@ static PKL UserLoadKbdLayout(PUNICODE_STRING pwszKLID, HKL hKL) { + LCID lCid; + CHARSETINFO cs; PKL pKl; /* Create keyboard layout object */ @@ -223,6 +225,23 @@ ERR("UserLoadKbdFile(%wZ) failed!\n", pwszKLID); UserDeleteObject(pKl->head.h, otKBDlayout); return NULL; + } + + // Up to Language Identifiers.. + RtlUnicodeStringToInteger(pwszKLID, (ULONG)16, (PULONG)&lCid); + TRACE("Language Identifiers %wZ LCID 0x%x\n", pwszKLID, lCid); + if (co_IntGetCharsetInfo(lCid, &cs)) + { + pKl->iBaseCharset = cs.ciCharset; + pKl->dwFontSigs = cs.fs.fsCsb[0]; + pKl->CodePage = (USHORT)cs.ciACP; + TRACE("Charset %d Font Sig %d CodePage %d\n", pKl->iBaseCharset, pKl->dwFontSigs, pKl->CodePage); + } + else + { + pKl->iBaseCharset = ANSI_CHARSET; + pKl->dwFontSigs = FS_LATIN1; + pKl->CodePage = CP_ACP; } return pKl; Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Wed Jul 4 23:16:17 2012 @@ -283,7 +283,10 @@ pci->fsHooks = ptiCurrent->fsHooks; pci->dwTIFlags = ptiCurrent->TIF_flags; if (ptiCurrent->KeyboardLayout) + { pci->hKL = ptiCurrent->KeyboardLayout->hkl; + pci->CodePage = ptiCurrent->KeyboardLayout->CodePage; + } /* Assign a default window station and desktop to the process */ /* Do not try to open a desktop or window station before winlogon initializes */ Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Wed Jul 4 23:16:17 2012 @@ -219,6 +219,8 @@ (PVOID)User32CallClientThreadSetupFromKernel; KernelCallbackTable[USER32_CALLBACK_CLIENTLOADLIBRARY] = (PVOID)User32CallClientLoadLibraryFromKernel; + KernelCallbackTable[USER32_CALLBACK_GETCHARSETINFO] = + (PVOID)User32CallGetCharsetInfo; NtUserProcessConnect( NtCurrentProcess(), &UserCon, @@ -352,3 +354,16 @@ return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); } +NTSTATUS +WINAPI +User32CallGetCharsetInfo(PVOID Arguments, ULONG ArgumentLength) +{ + BOOL Ret; + PGET_CHARSET_INFO pgci = (PGET_CHARSET_INFO)Arguments; + + TRACE("GetCharsetInfo\n"); + + Ret = TranslateCharsetInfo((DWORD *)pgci->Locale, &pgci->Cs, TCI_SRCLOCALE); + + return ZwCallbackReturn(Arguments, ArgumentLength, Ret ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); +}

12 years, 2 months

[jimtabor] 56832: [Win32k] - Fix assert with WinSnap. Added support functions to be used later.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jul 4 22:59:27 2012 New Revision: 56832 URL: http://svn.reactos.org/svn/reactos?rev=56832&view=rev Log: [Win32k] - Fix assert with WinSnap. Added support functions to be used later. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/desktop.h trunk/reactos/win32ss/user/ntuser/hook.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Jul 4 22:59:27 2012 @@ -466,6 +466,23 @@ } // Only one Q can have active foreground even when there are more than one desktop. if (NewQueue) gpqForeground = pdo->ActiveMessageQueue; + else gpqForeground = NULL; +} + +PWND FASTCALL +IntGetThreadDesktopWindow(PTHREADINFO pti) +{ + if (!pti) pti = PsGetCurrentThreadWin32Thread(); + if (pti->pDeskInfo) return pti->pDeskInfo->spwnd; + return NULL; +} + +PWND FASTCALL co_GetDesktopWindow(PWND pWnd) +{ + if (pWnd->head.rpdesk && + pWnd->head.rpdesk->pDeskInfo) + return pWnd->head.rpdesk->pDeskInfo->spwnd; + return NULL; } HWND FASTCALL IntGetDesktopWindow(VOID) @@ -529,6 +546,21 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ + +LRESULT FASTCALL +DesktopWindowProc(PWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + switch (Msg) + { + case WM_NCCREATE: + if (!Wnd->fnid) + { + Wnd->fnid = FNID_DESKTOP; + } + return (LRESULT)TRUE; + } + return 0; +} HDC FASTCALL UserGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd) @@ -1335,16 +1367,17 @@ { PDESKTOP pdesk; NTSTATUS Status; - HDESK hdesk; - - TRACE("Enter NtUserOpenInputDesktop\n"); + HDESK hdesk = NULL; + + UserEnterExclusive(); + TRACE("Enter NtUserOpenInputDesktop InputDesktopHandle 0x%x\n",InputDesktopHandle); /* Get a pointer to the desktop object */ Status = IntValidateDesktopHandle(InputDesktopHandle, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { - TRACE("Validation of input desktop handle (0x%X) failed\n", InputDesktop); - return NULL; + ERR("Validation of input desktop handle (0x%X) failed\n", InputDesktopHandle); + goto Exit; } /* Create a new handle to the object */ @@ -1363,10 +1396,11 @@ { ERR("Failed to open input desktop object\n"); SetLastNtError(Status); - return NULL; - } - + goto Exit; + } +Exit: TRACE("NtUserOpenInputDesktop returning 0x%x\n",hdesk); + UserLeave(); return hdesk; } @@ -1397,15 +1431,12 @@ { PDESKTOP pdesk; NTSTATUS Status; - PTHREADINFO pti; DECLARE_RETURN(BOOL); - - pti = PsGetCurrentThreadWin32Thread(); TRACE("NtUserCloseDesktop called (0x%x)\n", hDesktop); UserEnterExclusive(); - if( hDesktop == pti->hdesk || hDesktop == pti->ppi->hdeskStartup) + if( hDesktop == gptiCurrent->hdesk || hDesktop == gptiCurrent->ppi->hdeskStartup) { ERR("Attempted to close thread desktop\n"); EngSetLastError(ERROR_BUSY); @@ -1526,7 +1557,7 @@ /* Set the global state. */ InputDesktop = pdesk; InputDesktopHandle = hdesk; - + TRACE("SwitchDesktop InputDesktopHandle 0x%x\n",InputDesktopHandle); ObDereferenceObject(pdesk); RETURN(TRUE); @@ -1780,6 +1811,13 @@ return FALSE; } + /* Desktop is being re-set so clear out foreground. */ + if (pti->rpdesk != pdesk && pti->MessageQueue == gpqForeground) + { + // Like above, there shouldn't be any windows, hooks or anything active on this threads desktop! + IntSetFocusMessageQueue(NULL); + } + /* Before doing the switch, map the new desktop heap and allocate the new pcti */ if(pdesk != NULL) { @@ -1846,6 +1884,8 @@ else { RtlZeroMemory(pctiNew, sizeof(CLIENTTHREADINFO)); + pci->fsHooks = pti->fsHooks; + pci->dwTIFlags = pti->TIF_flags; } } else Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Wed Jul 4 22:59:27 2012 @@ -275,4 +275,8 @@ return NULL; } +PWND FASTCALL IntGetThreadDesktopWindow(PTHREADINFO); +PWND FASTCALL co_GetDesktopWindow(PWND); + +LRESULT FASTCALL DesktopWindowProc(PWND, UINT, WPARAM, LPARAM); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Wed Jul 4 22:59:27 2012 @@ -1048,7 +1048,7 @@ pti->fsHooks &= ~HOOKID_TO_FLAG(HookId); _SEH2_TRY { - GetWin32ClientInfo()->fsHooks = pti->fsHooks; + pti->pClientInfo->fsHooks = pti->fsHooks; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1106,6 +1106,7 @@ } } pti->fsHooks = 0; + pti->pClientInfo->fsHooks = 0; } // Global search based on Thread and cleanup. if (pdo->pDeskInfo->fsHooks)

12 years, 2 months

[jimtabor] 56831: [Win32k] - Add zap active and focus call. Fix comments.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jul 4 22:51:16 2012 New Revision: 56831 URL: http://svn.reactos.org/svn/reactos?rev=56831&view=rev Log: [Win32k] - Add zap active and focus call. Fix comments. Modified: trunk/reactos/win32ss/user/ntuser/event.c trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/event.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] Wed Jul 4 22:51:16 2012 @@ -246,8 +246,8 @@ // Must be inside the event window. if ( (pEH->eventMin <= Event) && (pEH->eventMax >= Event)) { -// If all process || all thread || other thread same process -// If ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) + // if all process || all thread || other thread same process + // if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) if ( (!pEH->idProcess || pEH->idProcess == PtrToUint(pti->pEThread->Cid.UniqueProcess)) && (!(pEH->Flags & WINEVENT_SKIPOWNPROCESS) || pEH->head.pti->ppi != pti->ppi) && (!pEH->idThread || pEH->idThread == PtrToUint(pti->pEThread->Cid.UniqueThread)) && Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Wed Jul 4 22:51:16 2012 @@ -118,7 +118,16 @@ RETURN( (DWORD_PTR)IntReleaseCapture()); case NOPARAM_ROUTINE_LOADUSERAPIHOOK: - RETURN(UserLoadApiHook()); + RETURN(UserLoadApiHook()); + + case NOPARAM_ROUTINE_ZAPACTIVEANDFOUS: + { + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + ERR("Zapping the Active and Focus window out of the Queue!\n"); + pti->MessageQueue->spwndFocus = NULL; + pti->MessageQueue->spwndActive = NULL; + RETURN(0); + } default: ERR("Calling invalid routine number 0x%x in NtUserCallNoParam\n", Routine);

12 years, 2 months

[jimtabor] 56830: [Win32k] - Fix debug and a spurious error during WinPos related tests.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jul 4 22:47:55 2012 New Revision: 56830 URL: http://svn.reactos.org/svn/reactos?rev=56830&view=rev Log: [Win32k] - Fix debug and a spurious error during WinPos related tests. Modified: trunk/reactos/win32ss/user/ntuser/windc.c Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Wed Jul 4 22:47:55 2012 @@ -362,8 +362,8 @@ } /* else // For Testing! { - DPRINT1("We have POWNER!!\n"); - if (Window->Dce) DPRINT1("We have POWNER with DCE!!\n"); + ERR("We have POWNER!!\n"); + if (Window->Dce) ERR("We have POWNER with DCE!!\n"); } */ if (Wnd->style & WS_CLIPSIBLINGS) @@ -837,7 +837,10 @@ } else { - CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); + if (!pDCE->hwndCurrent) + CurrentWindow = NULL; + else + CurrentWindow = UserGetWindowObject(pDCE->hwndCurrent); if (NULL == CurrentWindow) { pLE = pDCE->List.Flink;

12 years, 2 months

[jimtabor] 56829: [Gdi32] - Implement support for TCI_SRCLOCALE.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jul 4 22:44:52 2012 New Revision: 56829 URL: http://svn.reactos.org/svn/reactos?rev=56829&view=rev Log: [Gdi32] - Implement support for TCI_SRCLOCALE. Modified: trunk/reactos/include/psdk/wingdi.h trunk/reactos/win32ss/gdi/gdi32/objects/font.c Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Wed Jul 4 22:44:52 2012 @@ -952,6 +952,7 @@ #define TCI_SRCCHARSET 1 #define TCI_SRCCODEPAGE 2 #define TCI_SRCFONTSIG 3 +#define TCI_SRCLOCALE 4096 #if (_WIN32_WINNT >= 0x0500) #define SHADEBLENDCAPS 120 #define COLORMGMTCAPS 121 Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] Wed Jul 4 22:44:52 2012 @@ -1785,10 +1785,24 @@ case TCI_SRCCHARSET: while (index < MAXTCIINDEX && PtrToUlong(lpSrc) != FONT_tci[index].ciCharset) index++; break; + case TCI_SRCLOCALE: + { + LCID lCid = (LCID)PtrToUlong(lpSrc); + LOCALESIGNATURE LocSig; + INT Ret = GetLocaleInfoW(lCid, LOCALE_FONTSIGNATURE, (LPWSTR)&LocSig, 0); + if ( GetLocaleInfoW(lCid, LOCALE_FONTSIGNATURE, (LPWSTR)&LocSig, Ret)) + { + while (index < MAXTCIINDEX && !(LocSig.lsCsbDefault[0]>>index & 0x0001)) index++; + break; + } + } default: + GdiSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } if (index >= MAXTCIINDEX || FONT_tci[index].ciCharset == DEFAULT_CHARSET) return FALSE; + DPRINT("Index %d Charset %d CodePage %d FontSig %d\n", + index,FONT_tci[index].ciCharset,FONT_tci[index].ciACP,FONT_tci[index].fs.fsCsb[0]); memcpy(lpCs, &FONT_tci[index], sizeof(CHARSETINFO)); return TRUE; }

12 years, 2 months

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 2012