Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[ekohl] 65846: [USETUP] AddPartitionToDisk: Initialize DiskEntry pointer for existing partition entries.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 27 10:15:32 2014 New Revision: 65846 URL: http://svn.reactos.org/svn/reactos?rev=65846&view=rev Log: [USETUP] AddPartitionToDisk: Initialize DiskEntry pointer for existing partition entries. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Dec 27 10:15:32 2014 @@ -542,6 +542,8 @@ return; } + PartEntry->DiskEntry = DiskEntry; + PartEntry->StartSector.QuadPart = (ULONGLONG)PartitionInfo->StartingOffset.QuadPart / DiskEntry->BytesPerSector; PartEntry->SectorCount.QuadPart = (ULONGLONG)PartitionInfo->PartitionLength.QuadPart / DiskEntry->BytesPerSector;

9 years, 10 months

[jimtabor] 65845: [Win32ss] - Add header for Ime information. Setup support for Ime types and hot keys. - Finish keyboard processing changes and call Imm process key for callback to user mode.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 27 06:59:29 2014 New Revision: 65845 URL: http://svn.reactos.org/svn/reactos?rev=65845&view=rev Log: [Win32ss] - Add header for Ime information. Setup support for Ime types and hot keys. - Finish keyboard processing changes and call Imm process key for callback to user mode. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/user/ntuser/ime.c trunk/reactos/win32ss/user/ntuser/input.h trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/user/winsrv/winsrv.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -1097,6 +1097,26 @@ #define CURSORF_SECRET 0x0080 #define CURSORF_LINKED 0x0100 #define CURSORF_CURRENT 0x0200 + +typedef struct tagIMEINFOEX +{ + HKL hkl; + IMEINFO ImeInfo; + WCHAR wszUIClass[16]; + ULONG fdwInitConvMode; + INT fInitOpen; + INT fLoadFlag; + DWORD dwProdVersion; + DWORD dwImeWinVersion; + WCHAR wszImeDescription[50]; + WCHAR wszImeFile[80]; + struct + { + INT fSysWow64Only:1; + INT fCUASLayer:1; + }; +} IMEINFOEX, *PIMEINFOEX; + DWORD NTAPI @@ -2149,7 +2169,7 @@ DWORD NTAPI NtUserGetImeInfoEx( - DWORD dwUnknown1, + PIMEINFOEX pImeInfoEx, DWORD dwUnknown2); DWORD @@ -2929,7 +2949,7 @@ DWORD NTAPI NtUserSetImeInfoEx( - DWORD dwUnknown1); + PIMEINFOEX pImeInfoEx); DWORD NTAPI Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=65845&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -59,6 +59,7 @@ #include <prntfont.h> #define _NOCSECT_TYPE #include <ddrawi.h> +#include <imm.h> /* SEH support with PSEH */ #include <pseh/pseh2.h> Modified: trunk/reactos/win32ss/user/ntuser/ime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ime.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ime.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ime.c [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -7,7 +7,34 @@ */ #include <win32k.h> -//DBG_DEFAULT_CHANNEL(UserMisc); +DBG_DEFAULT_CHANNEL(UserMisc); + + +UINT FASTCALL +IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + PKL pKbdLayout; + + ASSERT_REFS_CO(pWnd); + + if ( Msg == WM_KEYDOWN || + Msg == WM_SYSKEYDOWN || + Msg == WM_KEYUP || + Msg == WM_SYSKEYUP ) + { + //Vk = wParam & 0xff; + pKbdLayout = pWnd->head.pti->KeyboardLayout; + if (pKbdLayout == NULL) return 0; + // + if (!(gpsi->dwSRVIFlags & SRVINFO_IMM32)) return 0; + // need ime.h! + } + // Call User32: + // Anything but BOOL! + //ImmRet = co_IntImmProcessKey(UserHMGetHandle(pWnd), pKbdLayout->hkl, Vk, lParam, HotKey); + FIXME(" is UNIMPLEMENTED.\n"); + return 0; +} DWORD @@ -82,7 +109,7 @@ DWORD APIENTRY NtUserGetImeInfoEx( - DWORD dwUnknown1, + PIMEINFOEX pImeInfoEx, DWORD dwUnknown2) { STUB; @@ -103,7 +130,7 @@ DWORD APIENTRY NtUserSetImeInfoEx( - DWORD dwUnknown1) + PIMEINFOEX pImeInfoEx) { STUB; return 0; Modified: trunk/reactos/win32ss/user/ntuser/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -35,7 +35,7 @@ UINT iBaseCharset; USHORT CodePage; WCHAR wchDiacritic; - //PIMEINFOEX piiex; + PIMEINFOEX piiex; } KL, *PKL; typedef struct _ATTACHINFO @@ -81,6 +81,11 @@ VOID NTAPI UserProcessMouseInput(PMOUSE_INPUT_DATA pMouseInputData); BOOL NTAPI UserSendMouseInput(MOUSEINPUT *pMouseInput, BOOL bInjected); +/* IMM */ +UINT FASTCALL IntImmProcessKey(PUSER_MESSAGE_QUEUE, PWND, UINT, WPARAM, LPARAM); + +extern DWORD gSystemFS; +extern UINT gSystemCPCharSet; extern HANDLE ghKeyboardDevice; extern PTHREADINFO ptiRawInput; extern BYTE gafAsyncKeyState[256 * 2 / 8]; // 2 bits per key 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] Sat Dec 27 06:59:29 2014 @@ -16,6 +16,8 @@ PKL gspklBaseLayout = NULL; PKBDFILE gpkfList = NULL; +DWORD gSystemFS = 0; +UINT gSystemCPCharSet = 0; typedef PVOID (*PFN_KBDLAYERDESCRIPTOR)(VOID); @@ -247,6 +249,13 @@ pKl->CodePage = CP_ACP; } + // Set initial system character set and font signature. + if (gSystemFS == 0) + { + gSystemCPCharSet = pKl->iBaseCharset; + gSystemFS = pKl->dwFontSigs; + } + return pKl; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -1028,8 +1028,13 @@ NTSTATUS FASTCALL co_MsqSendMessage(PTHREADINFO ptirec, - HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, - UINT uTimeout, BOOL Block, INT HookMessage, + HWND Wnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uTimeout, + BOOL Block, + INT HookMessage, ULONG_PTR *uResult) { PTHREADINFO pti; @@ -1790,8 +1795,14 @@ EVENTMSG Event; USER_REFERENCE_ENTRY Ref; PWND pWnd; + UINT ImmRet; BOOL Ret = TRUE; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + + if (Msg->message == VK_PACKET) + { + pti->wchInjected = HIWORD(Msg->wParam); + } if (Msg->message == WM_KEYDOWN || Msg->message == WM_SYSKEYDOWN || Msg->message == WM_KEYUP || Msg->message == WM_SYSKEYUP) @@ -1863,6 +1874,22 @@ Ret = FALSE; } + + if ( pWnd && Ret && *RemoveMessages && Msg->message == WM_KEYDOWN && !(pti->TIF_flags & TIF_DISABLEIME)) + { + if ( (ImmRet = IntImmProcessKey(pti->MessageQueue, pWnd, Msg->message, Msg->wParam, Msg->lParam)) ) + { + if ( ImmRet & (IPHK_HOTKEY|IPHK_SKIPTHISKEY) ) + { + ImmRet = 0; + } + if ( ImmRet & IPHK_PROCESSBYIME ) + { + Msg->wParam = VK_PROCESSKEY; + } + } + } + if (pWnd) UserDerefObjectCo(pWnd); return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -53,6 +53,7 @@ extern BOOL RegisteredSysClasses; typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; +typedef struct tagMENUSTATE MENUSTATE, *PMENUSTATE; #include <pshpack1.h> // FIXME: Move to ntuser.h @@ -105,6 +106,7 @@ HDESK hdesk; UINT cPaintsReady; /* Count of paints pending. */ UINT cTimersReady; /* Count of timers pending. */ + PMENUSTATE pMenuState; DWORD dwExpWinVer; DWORD dwCompatFlags; DWORD dwCompatFlags2; @@ -125,7 +127,8 @@ /* Queue of messages posted to the queue. */ LIST_ENTRY PostedMessagesListHead; // mlPost - UINT fsChangeBitsRemoved; + WORD fsChangeBitsRemoved; + WCHAR wchInjected; UINT cWindows; UINT cVisWindows; LIST_ENTRY aphkStart[NB_HOOKS]; Modified: trunk/reactos/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -21,6 +21,7 @@ #include <winbase.h> #include <wingdi.h> #include <winuser.h> +#include <imm.h> /* Undocumented user definitions */ #include <undocuser.h>

9 years, 10 months

[jimtabor] 65844: [w32knapi] - Add Imm.h.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 27 06:33:48 2014 New Revision: 65844 URL: http://svn.reactos.org/svn/reactos?rev=65844&view=rev Log: [w32knapi] - Add Imm.h. Modified: trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] Sat Dec 27 06:33:48 2014 @@ -16,6 +16,7 @@ #include <winddi.h> #include <ddrawi.h> #include <prntfont.h> +#include <imm.h> /* Public Win32K Headers */ #include <ntusrtyp.h>

9 years, 10 months

[jimtabor] 65843: [Include] - Add mod switch for SAS hotkey support. - Add ImmProcessKey return flags, works the same as ImmProcessHotKey for WinCE.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 27 04:18:17 2014 New Revision: 65843 URL: http://svn.reactos.org/svn/reactos?rev=65843&view=rev Log: [Include] - Add mod switch for SAS hotkey support. - Add ImmProcessKey return flags, works the same as ImmProcessHotKey for WinCE. Modified: trunk/reactos/include/reactos/undocuser.h Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Sat Dec 27 04:18:17 2014 @@ -107,12 +107,21 @@ #define LN_MESSAGE_BEEP 0x9 #define LN_START_SCREENSAVE 0xA +// From WinCE 6.0 Imm.h SDK +// Returns for ImmProcessHotKey +#define IPHK_HOTKEY 0x0001 +#define IPHK_PROCESSBYIME 0x0002 +#define IPHK_CHECKCTRL 0x0004 +#define IPHK_SKIPTHISKEY 0x0010 + // // Undocumented flags for DrawCaptionTemp // #define DC_NOSENDMSG 0x2000 #define STARTF_SCRNSAVER 0x80000000 + +#define MOD_WINLOGON_SAS 0x8000 #define CW_USEDEFAULT16 ((short)0x8000)

9 years, 10 months

[jimtabor] 65842: [Win32k] - Move IME from stubs into its own file. Add flags and types to main header. - Later, how to add Ime.h from mingw (tested it and works) and not effect VC++ ? VC SDK has I...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 27 03:00:09 2014 New Revision: 65842 URL: http://svn.reactos.org/svn/reactos?rev=65842&view=rev Log: [Win32k] - Move IME from stubs into its own file. Add flags and types to main header. - Later, how to add Ime.h from mingw (tested it and works) and not effect VC++ ? VC SDK has Ime.h. - Getting ready for Window Class update based on current wine tests. Added: trunk/reactos/win32ss/user/ntuser/ime.c - copied, changed from r65841, trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sat Dec 27 03:00:09 2014 @@ -116,6 +116,7 @@ user/ntuser/hook.c user/ntuser/hotkey.c user/ntuser/input.c + user/ntuser/ime.c user/ntuser/keyboard.c user/ntuser/kbdlayout.c user/ntuser/menu.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Dec 27 03:00:09 2014 @@ -6,6 +6,9 @@ struct _DESKTOP; struct _WND; struct tagPOPUPMENU; +#ifndef HIMC +typedef HANDLE HIMC; +#endif #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 */ @@ -679,7 +682,7 @@ /* Size of the extra data associated with the window. */ ULONG cbwndExtra; struct _WND *spwndLastActive; - //HIMC hImc; // Input context associated with this window. + HIMC hImc; // Input context associated with this window. LONG dwUserData; PVOID pActCtx; //PD3DMATRIX pTransForm; @@ -863,6 +866,8 @@ #define COLOR_LAST COLOR_MENUBAR #define MAX_MB_STRINGS 11 +#define SRVINFO_DBCSENABLED 0x0002 +#define SRVINFO_IMM32 0x0004 #define SRVINFO_APIHOOK 0x0010 #define SRVINFO_METRICS 0x0020 #define SRVINFO_KBDPREF 0x0080 @@ -1613,7 +1618,7 @@ NTAPI NtUserCheckImeHotKey( DWORD dwUnknown1, - DWORD dwUnknown2); + LPARAM dwUnknown2); HWND NTAPI NtUserChildWindowFromPointEx( Copied: trunk/reactos/win32ss/user/ntuser/ime.c (from r65841, trunk/reactos/win32ss/user/ntuser/ntstubs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ime.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ime.c [iso-8859-1] Sat Dec 27 03:00:09 2014 @@ -1,172 +1,14 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem - * PURPOSE: Native User stubs - * FILE: subsystems/win32/win32k/ntuser/ntstubs.c + * PURPOSE: Input Method Editor and Input Method Manager support + * FILE: win32ss/user/ntuser/ime.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include <win32k.h> -DBG_DEFAULT_CHANNEL(UserMisc); +//DBG_DEFAULT_CHANNEL(UserMisc); -DWORD -APIENTRY -NtUserAssociateInputContext( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB - return 0; -} - -// -// Works like BitBlt, http://msdn.microsoft.com/en-us/library/ms532278(VS.85).aspx -// -BOOL -APIENTRY -NtUserBitBltSysBmp( - HDC hdc, - INT nXDest, - INT nYDest, - INT nWidth, - INT nHeight, - INT nXSrc, - INT nYSrc, - DWORD dwRop ) -{ - BOOL Ret = FALSE; - UserEnterExclusive(); - - Ret = NtGdiBitBlt( hdc, - nXDest, - nYDest, - nWidth, - nHeight, - hSystemBM, - nXSrc, - nYSrc, - dwRop, - 0, - 0); - - UserLeave(); - return Ret; -} - -DWORD -APIENTRY -NtUserBuildHimcList( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserDdeGetQualityOfService( - IN HWND hwndClient, - IN HWND hWndServer, - OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserDdeInitialize( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserDdeSetQualityOfService( - IN HWND hwndClient, - IN PSECURITY_QUALITY_OF_SERVICE pqosNew, - OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserDragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1 -) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserDrawAnimatedRects( - HWND hwnd, - INT idAni, - RECT *lprcFrom, - RECT *lprcTo) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserEvent( - DWORD Unknown0) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserExcludeUpdateRgn( - HDC hDC, - HWND hWnd) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserGetAltTabInfo( - HWND hwnd, - INT iItem, - PALTTABINFO pati, - LPWSTR pszItemText, - UINT cchItemText, - BOOL Ansi) -{ - STUB - - return 0; -} DWORD APIENTRY @@ -175,116 +17,6 @@ DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserImpersonateDdeClientWindow( - HWND hWndClient, - HWND hWndServer) -{ - STUB - - return 0; -} - -NTSTATUS -APIENTRY -NtUserInitializeClientPfnArrays( - PPFNCLIENT pfnClientA, - PPFNCLIENT pfnClientW, - PPFNCLIENTWORKER pfnClientWorker, - HINSTANCE hmodUser) -{ - NTSTATUS Status = STATUS_SUCCESS; - TRACE("Enter NtUserInitializeClientPfnArrays User32 0x%p\n", hmodUser); - - if (ClientPfnInit) return Status; - - UserEnterExclusive(); - - _SEH2_TRY - { - ProbeForRead( pfnClientA, sizeof(PFNCLIENT), 1); - ProbeForRead( pfnClientW, sizeof(PFNCLIENT), 1); - ProbeForRead( pfnClientWorker, sizeof(PFNCLIENTWORKER), 1); - RtlCopyMemory(&gpsi->apfnClientA, pfnClientA, sizeof(PFNCLIENT)); - RtlCopyMemory(&gpsi->apfnClientW, pfnClientW, sizeof(PFNCLIENT)); - RtlCopyMemory(&gpsi->apfnClientWorker, pfnClientWorker, sizeof(PFNCLIENTWORKER)); - - //// FIXME: HAX! Temporary until server side is finished. - //// Copy the client side procs for now. - RtlCopyMemory(&gpsi->aStoCidPfn, pfnClientW, sizeof(gpsi->aStoCidPfn)); - - hModClient = hmodUser; - ClientPfnInit = TRUE; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status =_SEH2_GetExceptionCode(); - } - _SEH2_END - - if (!NT_SUCCESS(Status)) - { - ERR("Failed reading Client Pfns from user space.\n"); - SetLastNtError(Status); - } - - UserLeave(); - return Status; -} - -DWORD -APIENTRY -NtUserInitTask( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7, - DWORD Unknown8, - DWORD Unknown9, - DWORD Unknown10, - DWORD Unknown11) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserMNDragLeave(VOID) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserMNDragOver( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserModifyUserStartupInfoFlags( - DWORD Unknown0, - DWORD Unknown1) { STUB @@ -303,51 +35,6 @@ return 0; } -DWORD -APIENTRY -NtUserQueryUserCounters( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserRegisterTasklist( - DWORD Unknown0) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserSetConsoleReserveKeys( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserSetDbgTag( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} DWORD APIENTRY @@ -363,249 +50,16 @@ return 0; } - -DWORD -APIENTRY -NtUserSetRipFlags( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserSetSysColors( - int cElements, - IN CONST INT *lpaElements, - IN CONST COLORREF *lpaRgbValues, - FLONG Flags) -{ - DWORD Ret = TRUE; - - if (cElements == 0) - return TRUE; - - /* We need this check to prevent overflow later */ - if ((ULONG)cElements >= 0x40000000) - { - EngSetLastError(ERROR_NOACCESS); - return FALSE; - } - - UserEnterExclusive(); - - _SEH2_TRY - { - ProbeForRead(lpaElements, cElements * sizeof(INT), 1); - ProbeForRead(lpaRgbValues, cElements * sizeof(COLORREF), 1); - - IntSetSysColors(cElements, lpaElements, lpaRgbValues); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Ret = FALSE; - } - _SEH2_END; - - if (Ret) - { - UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); - - UserRedrawDesktop(); - } - - UserLeave(); - return Ret; -} - -DWORD -APIENTRY -NtUserUpdateInputContext( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserUpdateInstance( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserUserHandleGrantAccess( - IN HANDLE hUserHandle, - IN HANDLE hJob, - IN BOOL bGrant) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserWaitForMsgAndEvent( - DWORD Unknown0) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserWin32PoolAllocationStats( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserYieldTask(VOID) -{ - STUB - - return 0; -} - - DWORD APIENTRY NtUserCheckImeHotKey( - DWORD dwUnknown1, - DWORD dwUnknown2) + DWORD VirtualKey, + LPARAM lParam) { STUB; return 0; } -NTSTATUS -APIENTRY -NtUserConsoleControl( - IN CONSOLECONTROL ConsoleCtrl, - IN PVOID ConsoleCtrlInfo, - IN ULONG ConsoleCtrlInfoLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - - /* Allow only Console Server to perform this operation (via CSRSS) */ - if (PsGetCurrentProcess() != gpepCSRSS) - return STATUS_ACCESS_DENIED; - - UserEnterExclusive(); - - switch (ConsoleCtrl) - { - case GuiConsoleWndClassAtom: - { - if (ConsoleCtrlInfoLength != sizeof(ATOM)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - _SEH2_TRY - { - ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1); - gaGuiConsoleWndClass = *(ATOM*)ConsoleCtrlInfo; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - break; - } - - case ConsoleMakePalettePublic: - { - HPALETTE hPalette; - - if (ConsoleCtrlInfoLength != sizeof(HPALETTE)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - _SEH2_TRY - { - ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1); - hPalette = *(HPALETTE*)ConsoleCtrlInfo; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - /* Make the palette handle public */ - GreSetObjectOwnerEx(hPalette, - GDI_OBJ_HMGR_PUBLIC, - GDIOBJFLAG_IGNOREPID); - - break; - } - - case ConsoleAcquireDisplayOwnership: - { - ERR("NtUserConsoleControl - ConsoleAcquireDisplayOwnership is UNIMPLEMENTED\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - default: - ERR("Calling invalid control %lu in NtUserConsoleControl\n", ConsoleCtrl); - Status = STATUS_INVALID_INFO_CLASS; - break; - } - - UserLeave(); - - return Status; -} - -DWORD -APIENTRY -NtUserCreateInputContext( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserDestroyInputContext( - DWORD dwUnknown1) -{ - STUB; - return 0; -} DWORD APIENTRY @@ -635,247 +89,6 @@ return 0; } -DWORD -APIENTRY -NtUserGetRawInputBuffer( - PRAWINPUT pData, - PUINT pcbSize, - UINT cbSizeHeader) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRawInputData( - HRAWINPUT hRawInput, - UINT uiCommand, - LPVOID pData, - PUINT pcbSize, - UINT cbSizeHeader) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRawInputDeviceInfo( - HANDLE hDevice, - UINT uiCommand, - LPVOID pData, - PUINT pcbSize -) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRawInputDeviceList( - PRAWINPUTDEVICELIST pRawInputDeviceList, - PUINT puiNumDevices, - UINT cbSize) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRegisteredRawInputDevices( - PRAWINPUTDEVICE pRawInputDevices, - PUINT puiNumDevices, - UINT cbSize) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserHardErrorControl( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB; - return 0; -} - -BOOL -NTAPI -NtUserNotifyProcessCreate( - HANDLE NewProcessId, - HANDLE ParentThreadId, - ULONG dwUnknown, - ULONG CreateFlags) -{ - STUB; - return FALSE; -} - -NTSTATUS -APIENTRY -NtUserProcessConnect( - IN HANDLE ProcessHandle, - OUT PUSERCONNECT pUserConnect, - IN ULONG Size) -{ - NTSTATUS Status; - PEPROCESS Process = NULL; - PPROCESSINFO W32Process; - - TRACE("NtUserProcessConnect\n"); - - if ( pUserConnect == NULL || - Size != sizeof(*pUserConnect) ) - { - return STATUS_UNSUCCESSFUL; - } - - /* Get the process object the user handle was referencing */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - *PsProcessType, - UserMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - UserEnterShared(); - - /* Get Win32 process information */ - W32Process = PsGetProcessWin32Process(Process); - - _SEH2_TRY - { - // FIXME: Check that pUserConnect->ulVersion == USER_VERSION; - - ProbeForWrite(pUserConnect, sizeof(*pUserConnect), sizeof(PVOID)); - pUserConnect->siClient.psi = gpsi; - pUserConnect->siClient.aheList = gHandleTable; - pUserConnect->siClient.ulSharedDelta = - (ULONG_PTR)W32Process->HeapMappings.KernelMapping - - (ULONG_PTR)W32Process->HeapMappings.UserMapping; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - SetLastNtError(Status); - - UserLeave(); - - /* Dereference the process object */ - ObDereferenceObject(Process); - - return Status; -} - -NTSTATUS -APIENTRY -NtUserQueryInformationThread(IN HANDLE ThreadHandle, - IN USERTHREADINFOCLASS ThreadInformationClass, - OUT PVOID ThreadInformation, - IN ULONG ThreadInformationLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - PETHREAD Thread; - - /* Allow only CSRSS to perform this operation */ - if (PsGetCurrentProcess() != gpepCSRSS) - return STATUS_ACCESS_DENIED; - - UserEnterExclusive(); - - /* Get the Thread */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_QUERY_INFORMATION, - *PsThreadType, - UserMode, - (PVOID)&Thread, - NULL); - if (!NT_SUCCESS(Status)) goto Quit; - - switch (ThreadInformationClass) - { - default: - { - STUB; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - } - - ObDereferenceObject(Thread); - -Quit: - UserLeave(); - return Status; -} - -DWORD -APIENTRY -NtUserQueryInputContext( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserRealInternalGetMessage( - LPMSG lpMsg, - HWND hWnd, - UINT wMsgFilterMin, - UINT wMsgFilterMax, - UINT wRemoveMsg, - BOOL bGMSG) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserRealWaitMessageEx( - DWORD dwWakeMask, - UINT uTimeout) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserRegisterRawInputDevices( - IN PCRAWINPUTDEVICE pRawInputDevices, - IN UINT uiNumDevices, - IN UINT cbSize) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserResolveDesktop( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} DWORD APIENTRY @@ -896,260 +109,6 @@ return 0; } -DWORD -APIENTRY -NtUserSetInformationProcess( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} - -NTSTATUS -APIENTRY -NtUserSetInformationThread(IN HANDLE ThreadHandle, - IN USERTHREADINFOCLASS ThreadInformationClass, - IN PVOID ThreadInformation, - IN ULONG ThreadInformationLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - PETHREAD Thread; - HANDLE CsrPortHandle; - - /* Allow only CSRSS to perform this operation */ - if (PsGetCurrentProcess() != gpepCSRSS) - return STATUS_ACCESS_DENIED; - - UserEnterExclusive(); - - /* Get the Thread */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_SET_INFORMATION, - *PsThreadType, - UserMode, - (PVOID)&Thread, - NULL); - if (!NT_SUCCESS(Status)) goto Quit; - - switch (ThreadInformationClass) - { - case UserThreadInitiateShutdown: - { - ERR("Shutdown initiated\n"); - STUB; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - case UserThreadEndShutdown: - { - ERR("Shutdown ended\n"); - STUB; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - case UserThreadCsrApiPort: - { - ERR("Set CSR API Port for Win32k\n"); - - if (ThreadInformationLength != sizeof(HANDLE)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - Status = STATUS_SUCCESS; - _SEH2_TRY - { - ProbeForRead(ThreadInformation, sizeof(HANDLE), sizeof(PVOID)); - CsrPortHandle = *(PHANDLE)ThreadInformation; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (NT_SUCCESS(Status)) - { - Status = InitCsrApiPort(CsrPortHandle); - } - break; - } - - default: - { - STUB; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - } - - ObDereferenceObject(Thread); - -Quit: - UserLeave(); - return Status; -} - -DWORD -APIENTRY -NtUserSetThreadLayoutHandles( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserSoundSentry(VOID) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserTestForInteractiveUser( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -/* http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ -DWORD -APIENTRY -NtUserCalcMenuBar( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserPaintMenuBar( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5, - DWORD dwUnknown6) -{ - STUB; - return 0; -} - - -DWORD -APIENTRY -NtUserRemoteConnect( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserRemoteRedrawRectangle( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserRemoteRedrawScreen(VOID) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserRemoteStopScreenUpdates(VOID) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserCtxDisplayIOCtl( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -DWORD -APIENTRY -NtUserDrawMenuBarTemp( - HWND hWnd, - HDC hDC, - PRECT hRect, - HMENU hMenu, - HFONT hFont) -{ - /* We'll use this function just for caching the menu bar */ - STUB - return 0; -} - -/* - * FillWindow: Called from User; Dialog, Edit and ListBox procs during a WM_ERASEBKGND. - */ -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserFillWindow(HWND hWndPaint, - HWND hWndPaint1, - HDC hDC, - HBRUSH hBrush) -{ - STUB - - return 0; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserLockWindowUpdate(HWND hWnd) -{ - STUB - - return 0; -} - -/* - * @unimplemented - */ DWORD APIENTRY NtUserSetImeOwnerWindow(DWORD Unknown0, DWORD Unknown1) @@ -1159,172 +118,5 @@ return 0; } -BOOL -APIENTRY -NtUserGetLayeredWindowAttributes( - HWND hwnd, - COLORREF *pcrKey, - BYTE *pbAlpha, - DWORD *pdwFlags) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserSetLayeredWindowAttributes(HWND hwnd, - COLORREF crKey, - BYTE bAlpha, - DWORD dwFlags) -{ - STUB; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtUserUpdateLayeredWindow( - HWND hwnd, - HDC hdcDst, - POINT *pptDst, - SIZE *psize, - HDC hdcSrc, - POINT *pptSrc, - COLORREF crKey, - BLENDFUNCTION *pblend, - DWORD dwFlags, - RECT *prcDirty) -{ - STUB - - return 0; -} - -/* - * NtUserResolveDesktopForWOW - * - * Status - * @unimplemented - */ - -DWORD APIENTRY -NtUserResolveDesktopForWOW(DWORD Unknown0) -{ - STUB - return 0; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserEndMenu(VOID) -{ - STUB - - return 0; -} - -/* - * @implemented - */ -/* NOTE: unused function */ -BOOL APIENTRY -NtUserTrackPopupMenuEx( - HMENU hMenu, - UINT fuFlags, - int x, - int y, - HWND hWnd, - LPTPMPARAMS lptpm) -{ - STUB - - return FALSE; -} - -DWORD APIENTRY -NtUserQuerySendMessage(DWORD Unknown0) -{ - STUB; - - return 0; -} - -/* - * @unimplemented - */ -DWORD APIENTRY -NtUserAlterWindowStyle(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return(0); -} - -/* - * NtUserSetWindowStationUser - * - * Status - * @unimplemented - */ - -DWORD APIENTRY -NtUserSetWindowStationUser( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - STUB - - return 0; -} - -BOOL APIENTRY NtUserAddClipboardFormatListener( - HWND hwnd -) -{ - STUB; - return FALSE; -} - -BOOL APIENTRY NtUserRemoveClipboardFormatListener( - HWND hwnd -) -{ - STUB; - return FALSE; -} - -BOOL APIENTRY NtUserGetUpdatedClipboardFormats( - PUINT lpuiFormats, - UINT cFormats, - PUINT pcFormatsOut -) -{ - STUB; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtUserSetSystemCursor( - HCURSOR hcur, - DWORD id) -{ - return FALSE; -} /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Sat Dec 27 03:00:09 2014 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Native User stubs - * FILE: subsystems/win32/win32k/ntuser/ntstubs.c + * FILE: win32ss/user/ntuser/ntstubs.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ @@ -162,19 +162,6 @@ LPWSTR pszItemText, UINT cchItemText, BOOL Ansi) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserGetImeHotKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) { STUB @@ -293,18 +280,6 @@ DWORD APIENTRY -NtUserNotifyIMEStatus( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return 0; -} - -DWORD -APIENTRY NtUserQueryUserCounters( DWORD Unknown0, DWORD Unknown1, @@ -348,21 +323,6 @@ return 0; } - -DWORD -APIENTRY -NtUserSetImeHotKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - STUB - - return 0; -} - DWORD APIENTRY @@ -490,17 +450,6 @@ STUB return 0; -} - - -DWORD -APIENTRY -NtUserCheckImeHotKey( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - STUB; - return 0; } NTSTATUS @@ -602,34 +551,6 @@ APIENTRY NtUserDestroyInputContext( DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserDisableThreadIme( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetAppImeLevel( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetImeInfoEx( - DWORD dwUnknown1, - DWORD dwUnknown2) { STUB; return 0; @@ -879,25 +800,6 @@ DWORD APIENTRY -NtUserSetAppImeLevel( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserSetImeInfoEx( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY NtUserSetInformationProcess( DWORD dwUnknown1, DWORD dwUnknown2, @@ -1141,18 +1043,6 @@ */ BOOL APIENTRY NtUserLockWindowUpdate(HWND hWnd) -{ - STUB - - return 0; -} - -/* - * @unimplemented - */ -DWORD APIENTRY -NtUserSetImeOwnerWindow(DWORD Unknown0, - DWORD Unknown1) { STUB

9 years, 10 months

[hbelusca] 65841: Whitespace fix.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Dec 26 20:55:30 2014 New Revision: 65841 URL: http://svn.reactos.org/svn/reactos?rev=65841&view=rev Log: Whitespace fix. Modified: trunk/reactos/win32ss/user/ntuser/win32.h Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Fri Dec 26 20:55:30 2014 @@ -44,7 +44,7 @@ QSRosSendMessage, QSRosHotKey, QSRosEvent, -}QS_ROS_TYPES,*PQS_ROS_TYPES; +} QS_ROS_TYPES, *PQS_ROS_TYPES; extern BOOL ClientPfnInit; extern HINSTANCE hModClient; @@ -156,37 +156,37 @@ #define IntReferenceThreadInfo(pti) \ - InterlockedIncrement(&(pti)->RefCount) + InterlockedIncrement(&(pti)->RefCount) VOID UserDeleteW32Thread(PTHREADINFO); #define IntDereferenceThreadInfo(pti) \ - do { \ - if(InterlockedDecrement(&(pti)->RefCount) == 0) \ +do { \ + if (InterlockedDecrement(&(pti)->RefCount) == 0) \ { \ - ASSERT(((pti)->TIF_flags & (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)) == (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)); \ - UserDeleteW32Thread(pti); \ + ASSERT(((pti)->TIF_flags & (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)) == (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)); \ + UserDeleteW32Thread(pti); \ } \ - } while(0) +} while(0) #define IntReferenceProcessInfo(ppi) \ - InterlockedIncrement((volatile LONG*)(&(ppi)->RefCount)) + InterlockedIncrement((volatile LONG*)(&(ppi)->RefCount)) VOID UserDeleteW32Process(PPROCESSINFO); #define IntDereferenceProcessInfo(ppi) \ - do { \ - if(InterlockedDecrement((volatile LONG*)(&(ppi)->RefCount)) == 0) \ +do { \ + if (InterlockedDecrement((volatile LONG*)(&(ppi)->RefCount)) == 0) \ { \ - ASSERT(((ppi)->W32PF_flags & W32PF_TERMINATED) != 0); \ - UserDeleteW32Process(ppi); \ + ASSERT(((ppi)->W32PF_flags & W32PF_TERMINATED) != 0); \ + UserDeleteW32Process(ppi); \ } \ - } while(0) +} while(0) typedef struct _W32HEAP_USER_MAPPING { - struct _W32HEAP_USER_MAPPING *Next; + struct _W32HEAP_USER_MAPPING* Next; PVOID KernelMapping; PVOID UserMapping; ULONG_PTR Limit; @@ -212,63 +212,64 @@ typedef struct _W32PROCESS { - PEPROCESS peProcess; - DWORD RefCount; - ULONG W32PF_flags; - PKEVENT InputIdleEvent; - DWORD StartCursorHideTime; - struct _W32PROCESS * NextStart; - PVOID pDCAttrList; - PVOID pBrushAttrList; - DWORD W32Pid; - LONG GDIHandleCount; - LONG UserHandleCount; - PEX_PUSH_LOCK GDIPushLock; /* Locking Process during access to structure. */ - RTL_AVL_TABLE GDIEngUserMemAllocTable; /* Process AVL Table. */ - LIST_ENTRY GDIDcAttrFreeList; - LIST_ENTRY GDIBrushAttrFreeList; + PEPROCESS peProcess; + DWORD RefCount; + ULONG W32PF_flags; + PKEVENT InputIdleEvent; + DWORD StartCursorHideTime; + struct _W32PROCESS* NextStart; + PVOID pDCAttrList; + PVOID pBrushAttrList; + DWORD W32Pid; + LONG GDIHandleCount; + LONG UserHandleCount; + PEX_PUSH_LOCK GDIPushLock; /* Locking Process during access to structure. */ + RTL_AVL_TABLE GDIEngUserMemAllocTable; /* Process AVL Table. */ + LIST_ENTRY GDIDcAttrFreeList; + LIST_ENTRY GDIBrushAttrFreeList; } W32PROCESS, *PW32PROCESS; #define CLIBS 32 typedef struct _PROCESSINFO { - W32PROCESS; - PTHREADINFO ptiList; - PTHREADINFO ptiMainThread; - struct _DESKTOP* rpdeskStartup; - PCLS pclsPrivateList; - PCLS pclsPublicList; - PPROCESSINFO ppiNext; - INT cThreads; - HDESK hdeskStartup; - DWORD dwhmodLibLoadedMask; - HANDLE ahmodLibLoaded[CLIBS]; - struct _WINSTATION_OBJECT *prpwinsta; - HWINSTA hwinsta; - ACCESS_MASK amwinsta; - DWORD dwHotkey; - HMONITOR hMonitor; - struct _CURICON_OBJECT* pCursorCache; - LUID luidSession; - USERSTARTUPINFO usi; - PVOID pW32Job; - DWORD dwLayout; - DWORD dwRegisteredClasses; - /* ReactOS */ - FAST_MUTEX PrivateFontListLock; - LIST_ENTRY PrivateFontListHead; - FAST_MUTEX DriverObjListLock; - LIST_ENTRY DriverObjListHead; - struct tagKL* KeyboardLayout; // THREADINFO only - W32HEAP_USER_MAPPING HeapMappings; - struct _GDI_POOL *pPoolDcAttr; - struct _GDI_POOL *pPoolBrushAttr; - struct _GDI_POOL *pPoolRgnAttr; + W32PROCESS; + PTHREADINFO ptiList; + PTHREADINFO ptiMainThread; + struct _DESKTOP* rpdeskStartup; + PCLS pclsPrivateList; + PCLS pclsPublicList; + PPROCESSINFO ppiNext; + INT cThreads; + HDESK hdeskStartup; + DWORD dwhmodLibLoadedMask; + HANDLE ahmodLibLoaded[CLIBS]; + struct _WINSTATION_OBJECT* prpwinsta; + HWINSTA hwinsta; + ACCESS_MASK amwinsta; + DWORD dwHotkey; + HMONITOR hMonitor; + struct _CURICON_OBJECT* pCursorCache; + LUID luidSession; + USERSTARTUPINFO usi; + PVOID pW32Job; + DWORD dwLayout; + DWORD dwRegisteredClasses; + + /* ReactOS */ + FAST_MUTEX PrivateFontListLock; + LIST_ENTRY PrivateFontListHead; + FAST_MUTEX DriverObjListLock; + LIST_ENTRY DriverObjListHead; + struct tagKL* KeyboardLayout; // THREADINFO only + W32HEAP_USER_MAPPING HeapMappings; + struct _GDI_POOL* pPoolDcAttr; + struct _GDI_POOL* pPoolBrushAttr; + struct _GDI_POOL* pPoolRgnAttr; #if DBG - BYTE DbgChannelLevel[DbgChCount]; - DWORD DbgHandleCount[TYPE_CTYPES]; + BYTE DbgChannelLevel[DbgChCount]; + DWORD DbgHandleCount[TYPE_CTYPES]; #endif } PROCESSINFO; @@ -276,4 +277,3 @@ void NTAPI UserDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments); ULONG_PTR NTAPI UserDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult); #endif -

9 years, 10 months

[akhaldi] 65840: [DXDIAG] Fix tab content redraw problem. By Lee Schroeder. CORE-8734

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 26 14:33:14 2014 New Revision: 65840 URL: http://svn.reactos.org/svn/reactos?rev=65840&view=rev Log: [DXDIAG] Fix tab content redraw problem. By Lee Schroeder. CORE-8734 Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Fri Dec 26 14:33:14 2014 @@ -174,11 +174,11 @@ pContext->hTabCtrl = hTabCtrlWnd; /* create the dialogs */ - pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), pContext->hMainDialog, SystemPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[0]); - pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), pContext->hMainDialog, MusicPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[1]); - pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), pContext->hMainDialog, InputPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[2]); - pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), pContext->hMainDialog, NetworkPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[3]); - pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), pContext->hMainDialog, HelpPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[4]); + pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), pContext->hTabCtrl, SystemPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[0]); + pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), pContext->hTabCtrl, MusicPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[1]); + pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), pContext->hTabCtrl, InputPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[2]); + pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), pContext->hTabCtrl, NetworkPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[3]); + pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), pContext->hTabCtrl, HelpPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[4]); /* insert tab ctrl items */ InsertTabCtrlItem(hTabCtrlWnd, 0, MAKEINTRESOURCEW(IDS_SYSTEM_DIALOG)); @@ -311,7 +311,7 @@ hInst = hInstance; - DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); + DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); return 0; }

9 years, 10 months

[akhaldi] 65839: [FONTVIEW][MPLAY32][MSPAINT][TASKMGR] Chinese (zh-CN) translation update by Henry Tang Ih. CORE-8935

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 26 14:18:02 2014 New Revision: 65839 URL: http://svn.reactos.org/svn/reactos?rev=65839&view=rev Log: [FONTVIEW][MPLAY32][MSPAINT][TASKMGR] Chinese (zh-CN) translation update by Henry Tang Ih. CORE-8935 Modified: trunk/reactos/base/applications/fontview/lang/zh-CN.rc trunk/reactos/base/applications/mplay32/lang/zh-CN.rc trunk/reactos/base/applications/mspaint/lang/zh-CN.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc Modified: trunk/reactos/base/applications/fontview/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] Fri Dec 26 14:18:02 2014 @@ -10,10 +10,10 @@ STRINGTABLE BEGIN - IDS_INSTALL "Install" + IDS_INSTALL "å®è£" IDS_PRINT "åå°" IDS_STRING "ReactOS ç»ææäººä¸ä¸ªèªç±çæä½ç³»ç»ï¼1234567890" - IDS_OPEN "Open Font..." + IDS_OPEN "æå¼åä½æ¡£æ¡..." IDS_ERROR "éè¯¯" IDS_ERROR_NOMEM "æ²¡æè¶³å¤çååæ¥å®ææä½ã" IDS_ERROR_NOFONT "ï¼1ä¸æ¯ä¸ä¸ªææçåä½æ¡£æ¡ã" Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Fri Dec 26 14:18:02 2014 @@ -24,7 +24,7 @@ END POPUP "è®¾å¤(&D)" BEGIN - MENUITEM "å±æ§(%P)", IDM_DEVPROPS + MENUITEM "å±æ§(&P)", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "é³éæ§å¶(&V)", IDM_VOLUMECTL END Modified: trunk/reactos/base/applications/mspaint/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/zh-CN.rc [iso-8859-1] Fri Dec 26 14:18:02 2014 @@ -25,29 +25,29 @@ END POPUP "ç¼è¾(&E)" BEGIN - MENUITEM "æ¤é\tCtrl+Z", IDM_EDITUNDO - MENUITEM "éå\tCtrl+Y", IDM_EDITREDO - MENUITEM SEPARATOR - MENUITEM "åªå\tCtrl+X", IDM_EDITCUT - MENUITEM "å¤å¶\tCtrl+C", IDM_EDITCOPY - MENUITEM "ç²è´´\tCtrl+V", IDM_EDITPASTE - MENUITEM "å é¤éä¸åºå\tDel", IDM_EDITDELETESELECTION - MENUITEM "åè½¬éæ©", IDM_EDITINVERTSELECTION - MENUITEM "å¨é¨éæ©\tCtrl+A", IDM_EDITSELECTALL - MENUITEM SEPARATOR - MENUITEM "å¤å¶å°...", IDM_EDITCOPYTO - MENUITEM "ä»...ç²è´´", IDM_EDITPASTEFROM + MENUITEM "æ¤é(&U)\tCtrl+Z", IDM_EDITUNDO + MENUITEM "éå(&R)\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "åªå(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "å¤å¶(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "ç²è´´(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "å é¤éä¸åºå(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "åè½¬éæ©(&I)", IDM_EDITINVERTSELECTION + MENUITEM "å¨é¨éæ©(&A)\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "å¤å¶å°...(&O)", IDM_EDITCOPYTO + MENUITEM "ä»...ç²è´´(&F)", IDM_EDITPASTEFROM END POPUP "æ¥ç(&V)" BEGIN - MENUITEM "å·¥å·ç®±\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED - MENUITEM "è°è²æ¿\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED - MENUITEM "ç¶ææ ", IDM_VIEWSTATUSBAR, CHECKED - MENUITEM "æåå·¥å·æ ", IDM_FORMATICONBAR, CHECKED, GRAYED - MENUITEM SEPARATOR - POPUP "ç¼©æ¾" + MENUITEM "å·¥å·ç®±(&T)\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "è°è²æ¿(&C)\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "ç¶ææ (&S)", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "æåå·¥å·æ (&E)", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "ç¼©æ¾(&Z)" BEGIN - POPUP "ç¨æ·å®ä¹" + POPUP "ç¨æ·å®ä¹(&U)" BEGIN MENUITEM "12.5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 @@ -58,33 +58,33 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "æ¾ç¤ºç½æ ¼\tCtrl+G", IDM_VIEWSHOWGRID - MENUITEM "æ¾ç¤ºç¼©ç¥å¾", IDM_VIEWSHOWMINIATURE + MENUITEM "æ¾ç¤ºç½æ ¼(&G)\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "æ¾ç¤ºç¼©ç¥å¾(&H)", IDM_VIEWSHOWMINIATURE END - MENUITEM "å¨å±æ¾ç¤º\tCtrl+F", IDM_VIEWFULLSCREEN + MENUITEM "å¨å±æ¾ç¤º(&F)\tCtrl+F", IDM_VIEWFULLSCREEN END POPUP "å¾å(&I)" BEGIN - MENUITEM "æè½¬/éå...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "åªè£", IDM_IMAGECROP - MENUITEM "é¢è²åè½¬\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "å±æ§...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "æè½¬/éå...(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "æä¼¸/å¾æ...(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "åªè£(&C)", IDM_IMAGECROP + MENUITEM "é¢è²åè½¬(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "å±æ§...(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "å é¤å¾å\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "ä¸éæå¤ç", IDM_IMAGEDRAWOPAQUE + MENUITEM "ä¸éæå¤ç(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "é¢è²(&C)" BEGIN - MENUITEM "ç¼è¾è°è²æ¿...", IDM_COLORSEDITPALETTE - MENUITEM SEPARATOR - MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE - MENUITEM "Old palette", IDM_COLORSOLDPALETTE + MENUITEM "ç¼è¾è°è²æ¿...(&E)", IDM_COLORSEDITPALETTE + MENUITEM SEPARATOR + MENUITEM "æ°è°è²æ¿", IDM_COLORSMODERNPALETTE + MENUITEM "æ§è°è²æ¿", IDM_COLORSOLDPALETTE END POPUP "å¸®å©(&?)" BEGIN - MENUITEM "å¸®å©ä¸»é¢", IDM_HELPHELPTOPICS - MENUITEM SEPARATOR - MENUITEM "ä¿¡æ¯", IDM_HELPINFO + MENUITEM "å¸®å©ä¸»é¢(&H)", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "ä¿¡æ¯(&I)", IDM_HELPINFO END END @@ -117,9 +117,9 @@ CAPTION "æè½¬åéåå¾å" BEGIN GROUPBOX "æè½¬æéå", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 - AUTORADIOBUTTON "æ°´å¹³éå", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP - AUTORADIOBUTTON "åç´éå", IDD_MIRRORROTATERB2, 12, 30, 100, 10 - AUTORADIOBUTTON "æè½¬è§åº¦", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "æ°´å¹³éå(&H)", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "åç´éå(&V)", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "æè½¬è§åº¦(&R)", IDD_MIRRORROTATERB3, 12, 42, 100, 10 AUTORADIOBUTTON "&90Â°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED AUTORADIOBUTTON "&180Â°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED AUTORADIOBUTTON "&270Â°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED @@ -134,21 +134,21 @@ BEGIN EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "å®½åº¦ï¼", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 - LTEXT "é«åº¦ï¼", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "å®½åº¦(&W)ï¼", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "é«åº¦ï¼(&H)", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 LTEXT "æä»¶æ¥æï¼", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "æä»¶å¤§å°ï¼", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "åè¾¨çï¼", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "åè¾¨ç(&R)ï¼", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "ä¸å¯ç¨", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "ä¸å¯ç¨", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ä¸å¯ç¨", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 GROUPBOX "åä½", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "è±å¯¸", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "åç±³", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "åç´ ", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "è±å¯¸(&I)", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "åç±³(&M)", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "åç´ (&P)", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "é¢è²", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "é»ç½", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "å½©è²", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "é»ç½(&B)", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "å½©è²(&L)", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 DEFPUSHBUTTON "ç¡®å®", IDOK, 170, 8, 48, 14 PUSHBUTTON "åæ¶", IDCANCEL, 170, 24, 48, 14 PUSHBUTTON "ç¼ºç", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 @@ -157,9 +157,9 @@ IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Stretch and skew image" -BEGIN - GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 +CAPTION "æä¼¸åå¾æå¾ç" +BEGIN + GROUPBOX "æä¼¸", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 LTEXT "æ°´å¹³ï¼", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12 @@ -168,15 +168,15 @@ LTEXT "åç´ï¼", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "å¾æ", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 LTEXT "æ°´å¹³ï¼", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 + LTEXT "åº¦", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32 LTEXT "åç´ï¼", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 + LTEXT "åº¦", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 DEFPUSHBUTTON "ç¡®å®", IDOK, 170, 8, 48, 14 PUSHBUTTON "åæ¶", IDCANCEL, 170, 24, 48, 14 END @@ -210,8 +210,8 @@ IDS_SAVEFILTER "24 ä½ä½å¾æä»¶ (*.bmp;*.dib)\1*.bmp;*.dib\1" IDS_FILESIZE "%d åè" IDS_PRINTRES "%d x %d åç´ æ¯ç±³" - IDS_INTNUMBERS "Please enter integral numbers only!" - IDS_PERCENTAGE "The percentage must be between 1 and 500." - IDS_ANGLE "The angle must be between -89 and 89." - IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_INTNUMBERS "åªè¾å¥æ°åç§¯åï¼" + IDS_PERCENTAGE "ç¾åæ¯å¿é¡»å¨1è³500ä¹é´ã" + IDS_ANGLE "è¯¥è§åº¦å¿é¡»å¨-89ä¸89ä¹é´ã" + IDS_LOADERRORTEXT "è¯¥æä»¶ %s æ æ³å è½½ã" +END Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] Fri Dec 26 14:18:02 2014 @@ -52,17 +52,17 @@ MENUITEM "å±å (&C)", ID_WINDOWS_CASCADE MENUITEM "åç½®(&B)", ID_WINDOWS_BRINGTOFRONT END - POPUP "Sh&ut Down" - BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + POPUP "å³æº(%U)" + BEGIN + MENUITEM "å¾æº(&B)", ID_SHUTDOWN_STANDBY + MENUITEM "ä¼ç (&H)", ID_SHUTDOWN_HIBERNATE + MENUITEM "å³éçµæº(&U)", ID_SHUTDOWN_POWEROFF + MENUITEM "éæ°å¯å¨(&R)", ID_SHUTDOWN_REBOOT + MENUITEM "éåºç¨æ·(&L) %s", ID_SHUTDOWN_LOGOFF + MENUITEM "åæ¢ç¨æ·(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "éå®è®¡ç®æº(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "æå¼è¿æ¥(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "å¼¹åºè®¡ç®æº(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "å¸®å©(&H)" BEGIN

9 years, 10 months

[akhaldi] 65838: [WINLOGON][USER32] SetLogonNotifyWindow has only one parameter. Spotted by Giannis Adamopoulos. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 26 14:06:23 2014 New Revision: 65838 URL: http://svn.reactos.org/svn/reactos?rev=65838&view=rev Log: [WINLOGON][USER32] SetLogonNotifyWindow has only one parameter. Spotted by Giannis Adamopoulos. CORE-8174 Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/include/reactos/undocuser.h trunk/reactos/win32ss/user/user32/misc/logon.c trunk/reactos/win32ss/user/user32/user32.spec Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Fri Dec 26 14:06:23 2014 @@ -1348,7 +1348,7 @@ } /* Register SAS window to receive SAS notifications */ - if (!SetLogonNotifyWindow(Session->SASWindow, Session->InteractiveWindowStation)) + if (!SetLogonNotifyWindow(Session->SASWindow)) { ERR("WL: Failed to register SAS window\n"); goto cleanup; Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Fri Dec 26 14:06:23 2014 @@ -124,7 +124,7 @@ #define SBRG_BOTTOMLEFTBTN 5 /* the bottom or left button */ BOOL WINAPI UpdatePerUserSystemParameters(DWORD dwReserved, BOOL bEnable); -BOOL WINAPI SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta); +BOOL WINAPI SetLogonNotifyWindow(HWND Wnd); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); DWORD_PTR WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD_PTR); Modified: trunk/reactos/win32ss/user/user32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/l… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/logon.c [iso-8859-1] Fri Dec 26 14:06:23 2014 @@ -78,7 +78,7 @@ */ BOOL WINAPI -SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta) +SetLogonNotifyWindow(HWND Wnd) { return NtUserSetLogonNotifyWindow(Wnd); } Modified: trunk/reactos/win32ss/user/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… ============================================================================== --- trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] Fri Dec 26 14:06:23 2014 @@ -609,7 +609,7 @@ @ stdcall SetKeyboardState(ptr) NtUserSetKeyboardState @ stdcall SetLastErrorEx(long long) @ stdcall SetLayeredWindowAttributes(ptr long long long) NtUserSetLayeredWindowAttributes -@ stdcall SetLogonNotifyWindow(long long) ; Direct call NtUserSetLogonNotifyWindow +@ stdcall SetLogonNotifyWindow(long) ; Direct call NtUserSetLogonNotifyWindow @ stdcall SetMenu(long long) @ stdcall SetMenuContextHelpId(long long) NtUserSetMenuContextHelpId @ stdcall SetMenuDefaultItem(long long long) NtUserSetMenuDefaultItem

9 years, 10 months

[ekohl] 65837: [NOTEPAD] Fix check mark of the status bar menu item. Fix is based on mudheads patch. CORE-8297 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Dec 26 14:06:19 2014 New Revision: 65837 URL: http://svn.reactos.org/svn/reactos?rev=65837&view=rev Log: [NOTEPAD] Fix check mark of the status bar menu item. Fix is based on mudheads patch. CORE-8297 #resolve Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Fri Dec 26 14:06:19 2014 @@ -557,7 +557,11 @@ /* Let commdlg manage copy settings */ printer.nCopies = (WORD)PD_USEDEVMODECOPIES; - if (!PrintDlg(&printer)) return; + if (!PrintDlg(&printer)) + { + DeleteObject(font); + return; + } assert(printer.hDC != 0); @@ -568,7 +572,11 @@ di.lpszDatatype = NULL; di.fwType = 0; - if (StartDoc(printer.hDC, &di) <= 0) return; + if (StartDoc(printer.hDC, &di) <= 0) + { + DeleteObject(font); + return; + } /* Get the page dimensions in pixels. */ cWidthPels = GetDeviceCaps(printer.hDC, HORZRES); @@ -579,6 +587,8 @@ pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(TCHAR)); if (!pTemp) { + EndDoc(printer.hDC); + DeleteObject(font); ShowLastError(); return; } @@ -605,6 +615,11 @@ if (StartPage(printer.hDC) <= 0) { static const TCHAR failed[] = _T("StartPage failed"); static const TCHAR error[] = _T("Print Error"); + SelectObject(printer.hDC, old_font); + EndDoc(printer.hDC); + DeleteDC(printer.hDC); + HeapFree(GetProcessHeap(), 0, pTemp); + DeleteObject(font); MessageBox(Globals.hMainWnd, failed, error, MB_ICONEXCLAMATION); return; } @@ -644,9 +659,12 @@ } while (i<size); } + if (old_font != 0) + SelectObject(printer.hDC, old_font); EndDoc(printer.hDC); DeleteDC(printer.hDC); HeapFree(GetProcessHeap(), 0, pTemp); + DeleteObject(font); } VOID DIALOG_FilePrinterSetup(VOID) @@ -743,7 +761,7 @@ SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); } - // Set status bar visible or not accordind the the settings. + // Set status bar visiblity according to the settings. if (Globals.bWrapLongLines == TRUE || Globals.bShowStatusBar == FALSE) { @@ -758,7 +776,7 @@ } // Set check state in show status bar item. - if (Globals.bShowStatusBar == TRUE) + if (bStatusBarVisible) { CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_CHECKED); }

9 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
39
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 December 2014