Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[jimtabor] 40305: - Implement NtUserProcessConnect. Moving to client information format for User32. PPROCESSINFO and PTHREADINFO are references not user land structures. - Added and removed structure types. - Tested with old AbiWord, FireFox and explorer.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Apr 1 02:02:29 2009 New Revision: 40305 URL: http://svn.reactos.org/svn/reactos?rev=40305&view=rev Log: - Implement NtUserProcessConnect. Moving to client information format for User32. PPROCESSINFO and PTHREADINFO are references not user land structures. - Added and removed structure types. - Tested with old AbiWord, FireFox and explorer. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Wed Apr 1 02:02:29 2009 @@ -48,17 +48,15 @@ LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); BOOL FASTCALL IsMetaFile(HDC); -extern PPROCESSINFO g_pi; -extern PPROCESSINFO g_kpi; +extern ULONG_PTR g_ulSharedDelta; extern PSERVERINFO g_psi; static __inline PVOID SharedPtrToUser(PVOID Ptr) { ASSERT(Ptr != NULL); - ASSERT(g_pi != NULL); - ASSERT(g_pi->UserHeapDelta != 0); - return (PVOID)((ULONG_PTR)Ptr - g_pi->UserHeapDelta); + ASSERT(g_ulSharedDelta != 0); + return (PVOID)((ULONG_PTR)Ptr - g_ulSharedDelta); } static __inline PVOID @@ -88,9 +86,8 @@ SharedPtrToKernel(PVOID Ptr) { ASSERT(Ptr != NULL); - ASSERT(g_pi != NULL); - ASSERT(g_pi->UserHeapDelta != 0); - return (PVOID)((ULONG_PTR)Ptr + g_pi->UserHeapDelta); + ASSERT(g_ulSharedDelta != 0); + return (PVOID)((ULONG_PTR)Ptr + g_ulSharedDelta); } static __inline BOOL @@ -120,3 +117,4 @@ PWINDOW FASTCALL ValidateHwndNoErr(HWND hwnd); VOID FASTCALL GetConnected(VOID); BOOL FASTCALL DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi); +BOOL FASTCALL TestWindowProcess(PWINDOW); Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Wed Apr 1 02:02:29 2009 @@ -7,15 +7,13 @@ static ULONG User32TlsIndex; HINSTANCE User32Instance; + PUSER_HANDLE_TABLE gHandleTable = NULL; PUSER_HANDLE_ENTRY gHandleEntries = NULL; -PPROCESSINFO g_pi = NULL; /* User Mode Pointer */ -PPROCESSINFO g_kpi = NULL; /* Kernel Mode Pointer */ PSERVERINFO g_psi = NULL; +ULONG_PTR g_ulSharedDelta; + WCHAR szAppInit[KEY_LENGTH]; - -PPROCESSINFO -GetW32ProcessInfo(VOID); PUSER32_THREAD_DATA User32GetThreadData() @@ -216,6 +214,8 @@ BOOL Init(VOID) { + USERCONNECT UserCon; + /* Set up the kernel callbacks. */ NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_WINDOWPROC] = (PVOID)User32CallWindowProcFromKernel; @@ -230,11 +230,15 @@ NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_EVENTPROC] = (PVOID)User32CallEventProcFromKernel; - g_pi = GetW32ProcessInfo(); - g_kpi = SharedPtrToKernel(g_pi); - g_psi = SharedPtrToUser(g_pi->psi); - gHandleTable = SharedPtrToUser(g_pi->UserHandleTable); + NtUserProcessConnect( NtCurrentProcess(), + &UserCon, + sizeof(USERCONNECT)); + + g_ulSharedDelta = UserCon.siClient.ulSharedDelta; + g_psi = SharedPtrToUser(UserCon.siClient.psi); + gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); + //ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); /* Allocate an index for user32 thread local data. */ User32TlsIndex = TlsAlloc(); @@ -324,19 +328,20 @@ FASTCALL GetConnected(VOID) { - PPROCESSINFO pi; + USERCONNECT UserCon; if ((PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo == NULL) NtUserGetThreadState(THREADSTATE_GETTHREADINFO); - if (g_pi && g_kpi && g_psi) return; - - pi = GetW32ProcessInfo(); - if (!g_pi) g_pi = pi; - if (!g_kpi) g_kpi = SharedPtrToKernel(pi); - if (!g_psi) g_psi = SharedPtrToUser(pi->psi); - if (!g_psi) { WARN("Global Share Information has not been initialized!\n"); } - if (!gHandleTable) gHandleTable = SharedPtrToUser(pi->UserHandleTable); - if (!gHandleEntries) gHandleEntries = SharedPtrToUser(gHandleTable->handles); - -} + if (g_psi) return; + + NtUserProcessConnect( NtCurrentProcess(), + &UserCon, + sizeof(USERCONNECT)); + + g_ulSharedDelta = UserCon.siClient.ulSharedDelta; + g_psi = SharedPtrToUser(UserCon.siClient.psi); + gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); + gHandleEntries = SharedPtrToUser(gHandleTable->handles); +// ERR("2 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); +} Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Wed Apr 1 02:02:29 2009 @@ -118,21 +118,6 @@ } return ti; -} - -PPROCESSINFO -GetW32ProcessInfo(VOID) -{ - PW32THREADINFO ti; - PPROCESSINFO pi = NULL; - - ti = GetW32ThreadInfo(); - if (ti != NULL) - { - pi = ti->pi; - } - - return pi; } @@ -279,6 +264,17 @@ } else return TRUE; +} + +BOOL +FASTCALL +TestWindowProcess(PWINDOW Wnd) +{ + if (Wnd->ti == (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) + return TRUE; + else + return (NtUserQueryWindow(Wnd->hdr.Handle, QUERY_WINDOW_UNIQUE_PROCESS_ID) == + (DWORD)NtCurrentTeb()->ClientId.UniqueProcess ); } BOOL @@ -435,7 +431,7 @@ ValidateCallProc(HANDLE hCallProc) { PCALLPROC CallProc = ValidateHandle(hCallProc, VALIDATE_TYPE_CALLPROC); - if (CallProc != NULL && CallProc->pi == g_kpi) + if (CallProc != NULL ) //&& CallProc->pi == g_kpi) return CallProc; return NULL; Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Apr 1 02:02:29 2009 @@ -1126,7 +1126,7 @@ _SEH2_TRY { - if (Wnd->pi != g_kpi) + if (TestWindowProcess( Wnd))// if (Wnd->pi != g_kpi) { if (nMaxCount > 0) { @@ -1216,7 +1216,7 @@ _SEH2_TRY { - if (Wnd->pi != g_kpi) + if (TestWindowProcess( Wnd)) //if (Wnd->pi != g_kpi) { if (nMaxCount > 0) { Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Apr 1 02:02:29 2009 @@ -347,8 +347,6 @@ UINT RegisteredSysClasses : 1; - PSERVERINFO psi; - } PROCESSINFO, *PPROCESSINFO; #define CTI_INSENDMESSAGE 0x0002 @@ -413,7 +411,6 @@ PHOOK phkCurrent; ULONG fsHooks; CALLBACKWND CallbackWnd; - ULONG Win32ClientInfo; DWORD dwHookCurrent; INT cInDDEMLCallback; PCLIENTTHREADINFO pClientThreadInfo; @@ -426,7 +423,8 @@ HKL hKL; USHORT CodePage; USHORT achDbcsCF; - ULONG Win32ClientInfo3[35]; + MSG msgDbcsCB; + ULONG Win32ClientInfo3[29]; } CLIENTINFO, *PCLIENTINFO; /* Make sure it fits exactly into the TEB */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Apr 1 02:02:29 2009 @@ -188,6 +188,20 @@ } /* PRIVATE FUNCTIONS **********************************************************/ + +PVOID +FASTCALL +DesktopAlloc(PDESKTOP DesktopObject, SIZE_T Size) +{ + return RtlAllocateHeap(DesktopObject->pheapDesktop, HEAP_NO_SERIALIZE, Size); +} + +BOOL +FASTCALL +DesktopFree(PDESKTOP DesktopObject, PVOID HeapBase) +{ + return RtlFreeHeap(DesktopObject->pheapDesktop, HEAP_NO_SERIALIZE, HeapBase); +} NTSTATUS FASTCALL @@ -1772,6 +1786,7 @@ { ti->Desktop = NULL; } + GetWin32ClientInfo()->pDeskInfo = NULL; } GetWin32ClientInfo()->ulClientDelta = 0; @@ -1846,14 +1861,16 @@ /* create a W32THREADINFO structure if not already done, or update it */ ti = GetW32ThreadInfo(); + GetWin32ClientInfo()->ulClientDelta = DesktopHeapGetUserDelta(); if (ti != NULL) { if (ti->Desktop == NULL) { - ti->Desktop = DesktopObject->DesktopInfo; + ti->Desktop = DesktopObject->DesktopInfo; + GetWin32ClientInfo()->pDeskInfo = + (PVOID)((ULONG_PTR)ti->Desktop - GetWin32ClientInfo()->ulClientDelta); } } - GetWin32ClientInfo()->ulClientDelta = DesktopHeapGetUserDelta(); return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Wed Apr 1 02:02:29 2009 @@ -109,6 +109,9 @@ W32Thread = ((PTHREADINFO)Thread->Tcb.Win32Thread); ASSERT(W32Thread != NULL); W32Thread->Hooks |= HOOKID_TO_FLAG(HookId); + + GetWin32ClientInfo()->fsHooks = W32Thread->Hooks; + if (W32Thread->ThreadInfo != NULL) W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; } @@ -220,6 +223,9 @@ W32Thread = ((PTHREADINFO)Hook->Thread->Tcb.Win32Thread); ASSERT(W32Thread != NULL); W32Thread->Hooks &= ~HOOKID_TO_FLAG(Hook->HookId); + + GetWin32ClientInfo()->fsHooks = W32Thread->Hooks; + if (W32Thread->ThreadInfo != NULL) W32Thread->ThreadInfo->Hooks = W32Thread->Hooks; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Wed Apr 1 02:02:29 2009 @@ -460,7 +460,6 @@ pi->hUserHeap = W32Process->HeapMappings.KernelMapping; pi->UserHeapDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping - (ULONG_PTR)W32Process->HeapMappings.UserMapping; - pi->psi = gpsi; if (InterlockedCompareExchangePointer(&W32Process->ProcessInfo, pi, @@ -525,9 +524,9 @@ ProbeForWrite(Teb, sizeof(TEB), sizeof(ULONG)); - + // FIXME PLEASE! it's a ref pointer and not user data! Use ClientThreadInfo! Teb->Win32ThreadInfo = UserHeapAddressToUser(W32Thread->ThreadInfo); - ci->pClientThreadInfo = &ti->ClientThreadInfo; + ci->pClientThreadInfo = &ti->ClientThreadInfo; // FIXME! } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Wed Apr 1 02:02:29 2009 @@ -884,8 +884,33 @@ PUSERCONNECT pUserConnect, DWORD Size) { - UNIMPLEMENTED; - return 0; + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("NtUserProcessConnect\n"); + if (pUserConnect && ( Size == sizeof(USERCONNECT) )) + { + UserEnterShared(); + GetW32ThreadInfo(); + PPROCESSINFO ppi = GetW32ProcessInfo(); + _SEH2_TRY + { + pUserConnect->siClient.psi = gpsi; + pUserConnect->siClient.aheList = ppi->UserHandleTable; + pUserConnect->siClient.ulSharedDelta = ppi->UserHeapDelta; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + } + DPRINT("NtUserPC SI 0x%x : HT 0x%x : D 0x%x\n", gpsi, ppi->UserHandleTable, ppi->UserHeapDelta); + UserLeave(); + return Status; + } + return STATUS_UNSUCCESSFUL; } DWORD

15 years, 8 months

[janderwald] 40304: - Revert 40296 - This will not work for REG_DWORD

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Mar 31 20:38:52 2009 New Revision: 40304 URL: http://svn.reactos.org/svn/reactos?rev=40304&view=rev Log: - Revert 40296 - This will not work for REG_DWORD Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue Mar 31 20:38:52 2009 @@ -4225,11 +4225,11 @@ RtlUnicodeStringToAnsiString(&AnsiString, &Value, FALSE); - *lpcbValue = ValueSize / sizeof(WCHAR); + *lpcbValue = ValueSize; } else if (lpcbValue != NULL) { - *lpcbValue = ValueSize / sizeof(WCHAR); + *lpcbValue = ValueSize; } }

15 years, 8 months

[jmorlan] 40303: Fix some incorrect lengths in ConInString (Bug 4085); also make sure result is nul-terminated.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Tue Mar 31 08:06:47 2009 New Revision: 40303 URL: http://svn.reactos.org/svn/reactos?rev=40303&view=rev Log: Fix some incorrect lengths in ConInString (Bug 4085); also make sure result is nul-terminated. Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Tue Mar 31 08:06:47 2009 @@ -88,15 +88,14 @@ VOID ConInString (LPTSTR lpInput, DWORD dwLength) { DWORD dwOldMode; - DWORD dwRead; + DWORD dwRead = 0; HANDLE hFile; LPTSTR p; - DWORD i; PCHAR pBuf; #ifdef _UNICODE - pBuf = (PCHAR)cmd_alloc(dwLength); + pBuf = (PCHAR)cmd_alloc(dwLength - 1); #else pBuf = lpInput; #endif @@ -106,13 +105,13 @@ SetConsoleMode (hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); - ReadFile (hFile, (PVOID)pBuf, dwLength, &dwRead, NULL); + ReadFile (hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); #ifdef _UNICODE - MultiByteToWideChar( InputCodePage, 0, pBuf, dwLength + 1, lpInput, dwLength + 1); + MultiByteToWideChar(InputCodePage, 0, pBuf, dwRead, lpInput, dwLength - 1); + cmd_free(pBuf); #endif - p = lpInput; - for (i = 0; i < dwRead; i++, p++) + for (p = lpInput; *p; p++) { if (*p == _T('\x0d')) { @@ -120,10 +119,6 @@ break; } } - -#ifdef _UNICODE - cmd_free(pBuf); -#endif SetConsoleMode (hFile, dwOldMode); }

15 years, 8 months

[gedmurphy] 40302: partially revert to slightly broken Wine code for now

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Mar 31 02:41:53 2009 New Revision: 40302 URL: http://svn.reactos.org/svn/reactos?rev=40302&view=rev Log: partially revert to slightly broken Wine code for now Modified: trunk/reactos/dll/win32/shell32/iconcache.c Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Tue Mar 31 02:41:53 2009 @@ -429,49 +429,25 @@ ilMask, 100, 100); - if (ShellSmallIconList) - { - /* Load the document icon, which is used as the default if an icon isn't found. */ - hSm = (HICON)LoadImageW(shell32_hInstance, - MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), - IMAGE_ICON, - cx_small, - cy_small, - LR_SHARED | LR_DEFAULTCOLOR); - if (!hSm) - { - ERR("Failed to load IDI_SHELL_DOCUMENT icon!\n"); - return FALSE; - } - } - ShellBigIconList = ImageList_Create(cx_large, cy_large, ilMask, 100, 100); - if (!ShellBigIconList) - { - hLg = (HICON)LoadImageW(shell32_hInstance, - MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), - IMAGE_ICON, - cx_large, - cy_large, - LR_SHARED | LR_DEFAULTCOLOR); - if (!hLg) + /* Load the document icon, which is used as the default if an icon isn't found. */ + hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), + IMAGE_ICON, cx_small, cy_small, LR_SHARED); + hLg = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), + IMAGE_ICON, cx_large, cy_large, LR_SHARED); + + if (!hSm || !hLg) { - ERR("Failed to load IDI_SHELL_DOCUMENT icon!\n"); - DestroyIcon(hSm); - return FALSE; + FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); + return FALSE; } - } - - - SIC_IconAppend(swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); - SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); - - DestroyIcon(hSm); - DestroyIcon(hLg); + + SIC_IconAppend (swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); + SIC_IconAppend (swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList);

15 years, 8 months

[cgutman] 40301: - Move the buffer size validation before writing to the buffer - Change the status to STATUS_BUFFER_TOO_SMALL

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Mar 31 02:32:37 2009 New Revision: 40301 URL: http://svn.reactos.org/svn/reactos?rev=40301&view=rev Log: - Move the buffer size validation before writing to the buffer - Change the status to STATUS_BUFFER_TOO_SMALL Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Tue Mar 31 02:32:37 2009 @@ -674,6 +674,14 @@ PTA_IP_ADDRESS Address; PCONNECTION_ENDPOINT Endpoint = NULL; + + if (MmGetMdlByteCount(Irp->MdlAddress) < + (FIELD_OFFSET(TDI_ADDRESS_INFO, Address.Address[0].Address) + + sizeof(TDI_ADDRESS_IP))) { + TI_DbgPrint(MID_TRACE, ("MDL buffer too small.\n")); + return STATUS_BUFFER_TOO_SMALL; + } + AddressInfo = (PTDI_ADDRESS_INFO)MmGetSystemAddressForMdl(Irp->MdlAddress); Address = (PTA_IP_ADDRESS)&AddressInfo->Address; @@ -711,13 +719,6 @@ return STATUS_INVALID_PARAMETER; } - if (MmGetMdlByteCount(Irp->MdlAddress) < - (FIELD_OFFSET(TDI_ADDRESS_INFO, Address.Address[0].Address) + - sizeof(TDI_ADDRESS_IP))) { - TI_DbgPrint(MID_TRACE, ("MDL buffer too small.\n")); - return STATUS_BUFFER_OVERFLOW; - } - return STATUS_SUCCESS; } @@ -727,6 +728,13 @@ PADDRESS_FILE AddrFile; PCONNECTION_ENDPOINT Endpoint = NULL; + if (MmGetMdlByteCount(Irp->MdlAddress) < + (FIELD_OFFSET(TDI_CONNECTION_INFORMATION, RemoteAddress) + + sizeof(PVOID))) { + TI_DbgPrint(MID_TRACE, ("MDL buffer too small (ptr).\n")); + return STATUS_BUFFER_TOO_SMALL; + } + AddressInfo = (PTDI_CONNECTION_INFORMATION) MmGetSystemAddressForMdl(Irp->MdlAddress); @@ -748,13 +756,6 @@ if (!Endpoint) { TI_DbgPrint(MID_TRACE, ("No connection object.\n")); return STATUS_INVALID_PARAMETER; - } - - if (MmGetMdlByteCount(Irp->MdlAddress) < - (FIELD_OFFSET(TDI_CONNECTION_INFORMATION, RemoteAddress) + - sizeof(PVOID))) { - TI_DbgPrint(MID_TRACE, ("MDL buffer too small (ptr).\n")); - return STATUS_BUFFER_OVERFLOW; } return TCPGetSockAddress( Endpoint, AddressInfo->RemoteAddress, TRUE );

15 years, 8 months

[cgutman] 40300: - Validate the output buffer size before writing to it - Fix some potential memory leaks - Lock the FCB in AfdCloseSocket

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Mar 31 02:20:12 2009 New Revision: 40300 URL: http://svn.reactos.org/svn/reactos?rev=40300&view=rev Log: - Validate the output buffer size before writing to it - Fix some potential memory leaks - Lock the FCB in AfdCloseSocket Modified: trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Tue Mar 31 02:20:12 2009 @@ -154,8 +154,10 @@ if (NT_SUCCESS(Status)) { - RtlCopyMemory(Irp->UserBuffer, ConnInfo->RemoteAddress, TaLengthOfTransportAddress - (ConnInfo->RemoteAddress)); + if (IrpSp->Parameters.DeviceIoControl.OutputBufferLength >= TaLengthOfTransportAddress(ConnInfo->RemoteAddress)) + RtlCopyMemory(Irp->UserBuffer, ConnInfo->RemoteAddress, TaLengthOfTransportAddress(ConnInfo->RemoteAddress)); + else + Status = STATUS_BUFFER_TOO_SMALL; } } } Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Tue Mar 31 02:20:12 2009 @@ -215,7 +215,21 @@ FCB->LocalAddress->Address[0].AddressType ); if( !FCB->ListenIrp.ConnectionReturnInfo || !FCB->ListenIrp.ConnectionCallInfo ) + { + if (FCB->ListenIrp.ConnectionReturnInfo) + { + ExFreePool(FCB->ListenIrp.ConnectionReturnInfo); + FCB->ListenIrp.ConnectionReturnInfo = NULL; + } + + if (FCB->ListenIrp.ConnectionCallInfo) + { + ExFreePool(FCB->ListenIrp.ConnectionCallInfo); + FCB->ListenIrp.ConnectionCallInfo = NULL; + } + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); + } FCB->State = SOCKET_STATE_LISTENING; @@ -229,6 +243,9 @@ if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; + + if (NT_SUCCESS(Status)) + FCB->NeedsNewListen = FALSE; AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); @@ -298,7 +315,21 @@ FCB->LocalAddress->Address[0].AddressType ); if( !FCB->ListenIrp.ConnectionReturnInfo || !FCB->ListenIrp.ConnectionCallInfo ) + { + if (FCB->ListenIrp.ConnectionReturnInfo) + { + ExFreePool(FCB->ListenIrp.ConnectionReturnInfo); + FCB->ListenIrp.ConnectionReturnInfo = NULL; + } + + if (FCB->ListenIrp.ConnectionCallInfo) + { + ExFreePool(FCB->ListenIrp.ConnectionCallInfo); + FCB->ListenIrp.ConnectionCallInfo = NULL; + } + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); + } Status = TdiListen( &FCB->ListenIrp.InFlightRequest, FCB->Connection.Object, Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Tue Mar 31 02:20:12 2009 @@ -142,11 +142,14 @@ /* Allocate our backup buffer */ FCB->Recv.Window = ExAllocatePool( NonPagedPool, FCB->Recv.Size ); if( !FCB->Recv.Window ) Status = STATUS_NO_MEMORY; - FCB->Send.Window = ExAllocatePool( NonPagedPool, FCB->Send.Size ); - if( !FCB->Send.Window ) { - if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); - Status = STATUS_NO_MEMORY; - } + if( NT_SUCCESS(Status) ) + { + FCB->Send.Window = ExAllocatePool( NonPagedPool, FCB->Send.Size ); + if( !FCB->Send.Window ) { + if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); + Status = STATUS_NO_MEMORY; + } + } /* A datagram socket is always sendable */ FCB->PollState |= AFD_EVENT_SEND; PollReeval( FCB->DeviceExt, FCB->FileObject ); @@ -235,6 +238,8 @@ AFD_DbgPrint(MID_TRACE, ("AfdClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + AFD_DbgPrint(MID_TRACE,("FCB %x\n", FCB)); FCB->PollState |= AFD_EVENT_CLOSE; @@ -244,11 +249,13 @@ if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect ); FileObject->FsContext = NULL; + SocketStateUnlock( FCB ); + DestroySocket( FCB ); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); AFD_DbgPrint(MID_TRACE, ("Returning success.\n"));

15 years, 8 months

[gedmurphy] 40299: - Show the underline menu cues when pressing the alt key - Load user preferences on userinit - Add the effects dialog to desk.cpl - Patch by Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com) - Quickly reviewed by Thomas and I, applied a few bug fixes to the patch See issue #3901 for more details.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Mar 31 01:21:41 2009 New Revision: 40299 URL: http://svn.reactos.org/svn/reactos?rev=40299&view=rev Log: - Show the underline menu cues when pressing the alt key - Load user preferences on userinit - Add the effects dialog to desk.cpl - Patch by Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com) - Quickly reviewed by Thomas and I, applied a few bug fixes to the patch See issue #3901 for more details. Added: trunk/reactos/dll/cpl/desk/effappdlg.c (with props) Modified: trunk/reactos/base/system/userinit/userinit.c trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/appearance.h trunk/reactos/dll/cpl/desk/desk.rbuild trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/include/reactos/win32k/ntusrtyp.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -30,6 +30,7 @@ #include <shlwapi.h> #include "resource.h" #include <wine/debug.h> +#include <win32k/ntusrtyp.h> WINE_DEFAULT_DEBUG_CHANNEL(userinit); @@ -535,6 +536,61 @@ WARN("RegOpenKeyEx() failed with error %lu\n", rc); } +static VOID SetUserPreference(UINT uiAction,BOOL bValue,UINT fWinIni) +{ + DWORD dwvalue = bValue; + SystemParametersInfo(uiAction, 0, (PVOID)&dwvalue, fWinIni); +} + +static VOID SetUserPreferences(VOID) +{ + HKEY hKey; + DWORD Type, Size; + LONG rc; + USERPREFERENCESMASK Preferences; + + TRACE("()\n"); + + rc = RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_DESKTOP, + 0, KEY_QUERY_VALUE, &hKey); + if (rc == ERROR_SUCCESS) + { + Size = sizeof(USERPREFERENCESMASK); + ERR("USERPREFERENCESMASK size: %d\n",Size); + + rc = RegQueryValueEx(hKey, + L"UserPreferencesMask", + NULL, + &Type, + (LPBYTE)&Preferences, + &Size); + if (rc == ERROR_SUCCESS && Type == REG_BINARY) + { + SetUserPreference(SPI_SETUIEFFECTS, Preferences.bUiEffects, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETACTIVEWINDOWTRACKING, Preferences.bActiveWindowTracking, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETMENUANIMATION, Preferences.bMenuAnimation, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETCOMBOBOXANIMATION, Preferences.bComboBoxAnimation, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETLISTBOXSMOOTHSCROLLING, Preferences.bListBoxSmoothScrolling, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETGRADIENTCAPTIONS, Preferences.bGradientCaptions, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETKEYBOARDCUES, Preferences.bKeyboardCues, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETACTIVEWNDTRKZORDER, Preferences.bActiveWndTrkZorder, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETHOTTRACKING, Preferences.bHotTracking, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETMENUFADE, Preferences.bMenuFade, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETSELECTIONFADE, Preferences.bSelectionFade, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETTOOLTIPANIMATION, Preferences.bTooltipAnimation, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETTOOLTIPFADE, Preferences.bTooltipFade, SPIF_SENDCHANGE); + SetUserPreference(SPI_SETCURSORSHADOW, Preferences.bCursorShadow, SPIF_SENDCHANGE); + } + else + { + ERR("No User Preferences set in registry or incorrect type (error %lu)\n", rc); + } + RegCloseKey(hKey); + } + else + WARN("RegOpenKeyEx() failed with error %lu\n", rc); +} + static VOID SetUserSettings(VOID) { @@ -543,6 +599,7 @@ SetUserSysColors(); SetUserMetrics(); SetUserWallpaper(); + SetUserPreferences(); } typedef DWORD (WINAPI *PCMP_REPORT_LOGON)(DWORD, DWORD); Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -127,6 +127,19 @@ g->Theme.lfFont[FONT_INFO] = NonClientMetrics.lfStatusFont; g->Theme.lfFont[FONT_DIALOG] = NonClientMetrics.lfMessageFont; SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &g->Theme.lfFont[FONT_ICON], 0); + + /* Effects */ + /* "Use the following transition effect for menus and tooltips" */ + SystemParametersInfo(SPI_GETMENUANIMATION, sizeof(BOOL), &g->Theme.Effects.bMenuAnimation, 0); + SystemParametersInfo(SPI_GETMENUFADE, sizeof(BOOL), &g->Theme.Effects.bMenuFade, 0); + /* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings + * Just keep them in sync for now: + */ + g->Theme.Effects.bTooltipAnimation = g->Theme.Effects.bMenuAnimation; + g->Theme.Effects.bTooltipFade = g->Theme.Effects.bMenuFade; + + /* "Hide underlined letters for keyboard navigation until I press the Alt key" */ + SystemParametersInfo(SPI_GETKEYBOARDCUES, sizeof(BOOL), &g->Theme.Effects.bKeyboardCues, 0); } @@ -206,6 +219,12 @@ return Ret; } +static VOID +_UpdateUserPref(UINT SpiGet,UINT SpiSet,BOOL *pbFlag) +{ + SystemParametersInfo(SpiSet, 0, (PVOID)pbFlag, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); +} +#define UPDATE_USERPREF(NAME,pbFlag) _UpdateUserPref(SPI_GET ## NAME, SPI_SET ## NAME, pbFlag) static VOID ApplyTheme(GLOBALS* g) @@ -333,6 +352,27 @@ RegCloseKey(hKey); } + + /* Effects, save only when needed: */ + /* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings + * Just keep them in sync for now. + */ + g->Theme.Effects.bTooltipAnimation = g->Theme.Effects.bMenuAnimation; + g->Theme.Effects.bTooltipFade = g->Theme.Effects.bMenuFade; + UPDATE_USERPREF(KEYBOARDCUES, &g->Theme.Effects.bKeyboardCues); + //UPDATE_USERPREF(ACTIVEWINDOWTRACKING, &g->Theme.Effects.bActiveWindowTracking); + UPDATE_USERPREF(MENUANIMATION, &g->Theme.Effects.bMenuAnimation); + //UPDATE_USERPREF(COMBOBOXANIMATION, &g->Theme.Effects.bComboBoxAnimation); + //UPDATE_USERPREF(LISTBOXSMOOTHSCROLLING, &g->Theme.Effects.bListBoxSmoothScrolling); + //UPDATE_USERPREF(GRADIENTCAPTIONS, &g->Theme.Effects.bGradientCaptions); + //UPDATE_USERPREF(ACTIVEWNDTRKZORDER, &g->Theme.Effects.bActiveWndTrkZorder); + //UPDATE_USERPREF(HOTTRACKING, &g->Theme.Effects.bHotTracking); + UPDATE_USERPREF(MENUFADE, &g->Theme.Effects.bMenuFade); + //UPDATE_USERPREF(SELECTIONFADE, &g->Theme.Effects.bSelectionFade); + UPDATE_USERPREF(TOOLTIPANIMATION, &g->Theme.Effects.bTooltipAnimation); + UPDATE_USERPREF(TOOLTIPFADE, &g->Theme.Effects.bTooltipFade); + //UPDATE_USERPREF(CURSORSHADOW, &g->Theme.Effects.bCursorShadow); + //UPDATE_USERPREF(UIEFFECTS, &g->Theme.Effects.bUiEffects); /* Save ThemeId */ Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"), 0, KEY_ALL_ACCESS, &hKey); if (Result == ERROR_SUCCESS) @@ -462,6 +502,19 @@ case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_APPEARANCE_EFFECTS: + DialogBoxParam(hApplet, (LPCTSTR)IDD_EFFAPPEARANCE, + hwndDlg, EffAppearanceDlgProc, (LPARAM)g); + + /* Was anything changed in the effects appearance dialog? */ + if (memcmp(&g->Theme, &g->ThemeAdv, sizeof(THEME)) != 0) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + g->Theme = g->ThemeAdv; + g->Theme.bHasChanged = TRUE; + } + break; + case IDC_APPEARANCE_ADVANCED: DialogBoxParam(hApplet, (LPCTSTR)IDD_ADVAPPEARANCE, hwndDlg, AdvAppearanceDlgProc, (LPARAM)g); Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.h [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -30,6 +30,28 @@ #define MAX_TEMPLATENAMELENTGH 80 /* Some typedefs for appearance */ + +/* Most (but not all) fields below correspond to HKCU\Control Panel\Desktop\UserPreferencesMask */ +typedef struct +{ + BOOL bActiveWindowTracking; + BOOL bMenuAnimation; + BOOL bComboBoxAnimation; + BOOL bListBoxSmoothScrolling; + BOOL bGradientCaptions; + BOOL bKeyboardCues; + BOOL bActiveWndTrkZorder; + BOOL bHotTracking; + BOOL bMenuFade; + BOOL bSelectionFade; + BOOL bTooltipAnimation; + BOOL bTooltipFade; + BOOL bCursorShadow; + BOOL bUiEffects; + BOOL bFontSmoothing; + UINT uiFontSmoothingType; +} EFFECTS; + typedef struct { COLORREF crColor[NUM_COLORS]; @@ -39,6 +61,7 @@ BOOL bFlatMenus; BOOL bHasChanged; BOOL bIsCustom; + EFFECTS Effects; } THEME; typedef struct @@ -87,5 +110,8 @@ /* prototypes for appearance.c */ INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -/* prototypes for advappearancedlg.c */ +/* prototypes for advappdlg.c */ INT_PTR CALLBACK AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +/* prototypes for effappdlg.c */ +INT_PTR CALLBACK EffAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/dll/cpl/desk/desk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rbuild?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.rbuild [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -27,6 +27,7 @@ <file>preview.c</file> <file>screensaver.c</file> <file>advappdlg.c</file> + <file>effappdlg.c</file> <file>settings.c</file> <file>monslctl.c</file> <file>general.c</file> Added: trunk/reactos/dll/cpl/desk/effappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/effappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/effappdlg.c (added) +++ trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -1,0 +1,137 @@ +/* $Id: effappdlg.c 24836 2007-02-12 03:12:56Z tkreuzer $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Display Control Panel + * FILE: dll/cpl/desk/effappdlg.c + * PURPOSE: Effects appearance dialog + * + * PROGRAMMER: Jan Roeloffzen (jroeloffzen[at]hotmail[dot]com) + * + */ + +#include "desk.h" +#include "appearance.h" + +/* Update all the controls with the current values for the selected screen element */ +static VOID +UpdateControls(HWND hwndDlg, GLOBALS *g) +{ + WPARAM state; + state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATION, BM_GETCHECK, 0, 0); + g->ThemeAdv.Effects.bMenuAnimation = (state == BST_CHECKED) ? TRUE : FALSE; + EnableWindow(GetDlgItem(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE), g->ThemeAdv.Effects.bMenuAnimation); + + //A boolean as an index for a 2-value list: + SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_SETCURSEL, (WPARAM)g->ThemeAdv.Effects.bMenuFade, 0); + + state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_GETCHECK, 0, 0); + g->ThemeAdv.Effects.bKeyboardCues = (state == BST_CHECKED) ? FALSE : TRUE; +} + + +static VOID +SaveCurrentValues(HWND hwndDlg, GLOBALS *g) +{ +} + +static VOID +AddToCombo(HWND hwndDlg, INT From, INT To, INT Combo) +{ + INT iElement, iListIndex, i=0; + TCHAR tstrText[80]; + + for (iElement = From; iElement<=To; iElement++) + { + LoadString(hApplet, iElement, (LPTSTR)tstrText, 80); + iListIndex = SendDlgItemMessage(hwndDlg, Combo, CB_ADDSTRING, 0, (LPARAM)tstrText); + SendDlgItemMessage(hwndDlg, Combo, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)i++ ); + } +} + +/* Initialize the effects appearance dialog */ +static VOID +EffAppearanceDlg_Init(HWND hwndDlg, GLOBALS *g) +{ + WPARAM state; + + /* Copy the current theme values */ + g->ThemeAdv = g->Theme; + + AddToCombo(hwndDlg, IDS_SLIDEEFFECT, IDS_FADEEFFECT, IDC_EFFAPPEARANCE_ANIMATIONTYPE); + + state = g->ThemeAdv.Effects.bMenuAnimation ? BST_CHECKED : BST_UNCHECKED; + SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATION, BM_SETCHECK, state, 0); + + state = g->ThemeAdv.Effects.bKeyboardCues ? BST_UNCHECKED : BST_CHECKED; + SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_SETCHECK, state, 0); + + /* Update the controls */ + UpdateControls(hwndDlg, g); +} + + +static VOID +EffAppearanceDlg_CleanUp(HWND hwndDlg, GLOBALS* g) +{ +} + +INT_PTR CALLBACK +EffAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + GLOBALS* g; + + g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + g = (GLOBALS*)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)g); + EffAppearanceDlg_Init(hwndDlg, g); + break; + + case WM_DESTROY: + EffAppearanceDlg_CleanUp(hwndDlg, g); + break; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + SaveCurrentValues(hwndDlg, g); + EndDialog(hwndDlg, 0); + break; + + case IDCANCEL: + g->ThemeAdv = g->Theme; + EndDialog(hwndDlg, 0); + break; + + case IDC_EFFAPPEARANCE_ANIMATION: + case IDC_EFFAPPEARANCE_KEYBOARDCUES: + if (HIWORD(wParam) == BN_CLICKED) + { + UpdateControls(hwndDlg, g); + } + break; + + case IDC_EFFAPPEARANCE_ANIMATIONTYPE: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + SaveCurrentValues(hwndDlg, g); + g->ThemeAdv.Effects.bMenuFade = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_GETCURSEL, 0, 0); + UpdateControls(hwndDlg, g); + } + break; + + default: + return FALSE; + } + break; + + default: + return FALSE; + } + + return TRUE; +} Propchange: trunk/reactos/dll/cpl/desk/effappdlg.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -57,7 +57,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Ðàçöâåòêà", IDC_STATIC, 7, 140, 64, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Îùå", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Îùå", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -96,6 +97,30 @@ PUSHBUTTON "Îòêàç", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "Äîáðå", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 @@ -153,6 +178,18 @@ MENUITEM "&Ðàçïîçíàâàíå", ID_MENU_IDENTIFY MENUITEM "&Ñâîéñòâà", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -60,7 +60,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Poloka:", IDC_STATIC, 7, 159, 26, 9 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Upøesnit", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Upøesnit", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -99,6 +100,30 @@ PUSHBUTTON "Storno", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -156,6 +181,18 @@ MENUITEM "&Identifikovat", ID_MENU_IDENTIFY MENUITEM "&Vlastnosti", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Farbschema:", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Erweitert", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Erweitert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -92,6 +93,30 @@ PUSHBUTTON "Abbrechen", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -149,6 +174,18 @@ MENUITEM "&Identifizieren", ID_MENU_IDENTIFY MENUITEM "&Eigenschaften", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Óõíäõáóìüò ÷ñùìÜôùí", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Ãéá ðñï÷ùñçìÝíïõò", IDC_APPEARANCE_ADVANCED, 178, 150, 68, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Ãéá ðñï÷ùñçìÝíïõò", IDC_APPEARANCE_ADVANCED, 178, 170, 68, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -92,6 +93,30 @@ PUSHBUTTON "¢êõñï", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -149,6 +174,18 @@ MENUITEM "&Áíáãíþñçóç", ID_MENU_IDENTIFY MENUITEM "Éäéüôçôåò", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -55,7 +55,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Ad&vanced...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,6 +95,30 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 @@ -151,6 +176,18 @@ MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "P&roperties", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -61,7 +61,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Combinación de colores", IDC_STATIC, 7, 140, 90, 7 //84 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Avanzado", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Avanzado", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -100,6 +101,30 @@ PUSHBUTTON "Cancelar", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "Aceptar", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -157,6 +182,18 @@ MENUITEM "&Identificar", ID_MENU_IDENTIFY MENUITEM "P&ropiedades", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -56,7 +56,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Modèle de couleurs", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Avancé", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Avancé", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -95,6 +96,30 @@ PUSHBUTTON "Annuler", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -152,6 +177,18 @@ MENUITEM "&Identifier", ID_MENU_IDENTIFY MENUITEM "P&ropriétés", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -54,7 +54,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -93,6 +94,30 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -150,6 +175,18 @@ MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "P&roperties", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "SkemaWarna", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Lanjutan", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Lanjutan", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -92,6 +93,30 @@ PUSHBUTTON "Batal", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -149,6 +174,18 @@ MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "P&roperties", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Schema dei colori", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Avanzato", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effetti...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "A&vanzato...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -92,6 +93,30 @@ PUSHBUTTON "Annulla", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -149,6 +174,18 @@ MENUITEM "&Identifica", ID_MENU_IDENTIFY MENUITEM "P&roprietà", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -92,6 +93,30 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -149,6 +174,18 @@ MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "P&roperties", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -55,7 +55,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Kleurenschema:", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Geavan&ceerd", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effecten...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Geavan&ceerd...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,6 +95,30 @@ PUSHBUTTON "Annuleren", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 305, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effecten" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "De volgende overgangseffecten voor men&u's en knopinfo gebruiken:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "Randen van letter&s vloeiend op het scherm weergeven, en wel als volgt:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "&Grote pictogrammen gebruiken",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Sch&aduw onder menu's weergeven",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "De in&houd van het venster tijdens het slepen weergeven",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "Onderstreepte letters voor toetsenbordnavigatie &verbergen tot ALT wordt ingedrukt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Annuleren", IDCANCEL, 246, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 192, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -151,6 +176,18 @@ MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "P&roperties", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Overvloeien" + IDS_FADEEFFECT "Schuiven" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standaard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -55,7 +55,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Fargevalg", IDC_STATIC, 7, 140, 64, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -94,6 +95,30 @@ PUSHBUTTON "Avbryt", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 @@ -151,6 +176,18 @@ MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "E&genskaper", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -63,7 +63,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Schemat kolorów", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Zaawansowane", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Zaawansowane", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -102,6 +103,30 @@ PUSHBUTTON "Anuluj", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -159,6 +184,18 @@ MENUITEM "&Identyfikuj", ID_MENU_IDENTIFY MENUITEM "W&³aciwoci", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -53,7 +53,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Öâåòîâàÿ ñõåìà:", IDC_STATIC, 7, 139, 154, 10 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 155, 200 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 168, 150, 70, 14 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Äîïîëíèòåëüíî", IDC_APPEARANCE_ADVANCED, 168, 170, 70, 14 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -92,6 +93,30 @@ PUSHBUTTON "Îòìåíà", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 249, 197 @@ -149,6 +174,18 @@ MENUITEM "Îïð&åäåëåíèå", ID_MENU_IDENTIFY MENUITEM "Ñâî&éñòâà", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -63,7 +63,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "&Farebná schéma:", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Spresni", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Spresni", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -102,6 +103,30 @@ PUSHBUTTON "Zrui", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 @@ -159,6 +184,18 @@ MENUITEM "&Identifikova", ID_MENU_IDENTIFY MENUITEM "Vl&astnosti", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -56,7 +56,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Advanced", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -95,6 +96,30 @@ PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -152,6 +177,18 @@ MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "P&roperties", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -61,7 +61,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Êîë³ðíà ñõåìà", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Äîäàòêîâî", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "Äîäàòêîâî", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -100,6 +101,30 @@ PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -157,6 +182,18 @@ MENUITEM "&Âèçíà÷åííÿ", ID_MENU_IDENTIFY MENUITEM "Â&ëàñòèâîñò³", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -61,7 +61,8 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "É«²Ê·½°¸:", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "¸ß¼¶", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "¸ß¼¶", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 @@ -100,6 +101,30 @@ PUSHBUTTON "È¡Ïû", IDCANCEL, 191, 220, 50, 14 DEFPUSHBUTTON "È·¶¨", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 + CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 + CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 @@ -157,6 +182,18 @@ MENUITEM "±êÊ¶(&I)", ID_MENU_IDENTIFY MENUITEM "ÊôÐÔ(&R)", ID_MENU_PROPERTIES END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "ClearType" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -23,6 +23,7 @@ #define IDD_APPEARANCE 102 #define IDD_SETTINGS 103 #define IDD_ADVAPPEARANCE 104 +#define IDD_EFFAPPEARANCE 105 #define IDD_ADVANCED_GENERAL 200 /* Background Page */ @@ -162,6 +163,22 @@ #define IDS_APPLY_FAILED 3500 #define IDS_APPLY_NEEDS_RESTART 3501 +/* Effects Appearance Dialog */ +#define IDC_EFFAPPEARANCE_KEYBOARDCUES 3601 +#define IDC_EFFAPPEARANCE_ANIMATION 3602 +#define IDC_EFFAPPEARANCE_ANIMATIONTYPE 3603 +#define IDC_EFFAPPEARANCE_SMOOTHING 3604 +#define IDC_EFFAPPEARANCE_SMOOTHINGTYPE 3605 +#define IDC_EFFAPPEARANCE_LARGEICONS 3606 +#define IDC_EFFAPPEARANCE_SETDROPSHADOW 3607 +#define IDC_EFFAPPEARANCE_DRAGFULLWINDOWS 3608 + +#define IDS_SLIDEEFFECT 3701 +#define IDS_FADEEFFECT 3702 + +#define IDS_STANDARDEFFECT 3711 +#define IDS_CLEARTYPEEFFECT 3712 + /* Advanced General Dialog */ #define IDC_FONTSIZE_COMBO 5000 #define IDC_FONTSIZE_COSTOM 5001 Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -1394,10 +1394,15 @@ { if (HIWORD(lParam) & KEYDATA_ALT) { + HWND top = GetAncestor(hWnd, GA_ROOT); /* if( HIWORD(lParam) & ~KEYDATA_PREVSTATE ) */ if ( (wParam == VK_MENU || wParam == VK_LMENU || wParam == VK_RMENU) && !iMenuSysKey ) + { iMenuSysKey = 1; + /* mimic behaviour of XP, sending a WM_SYSCOMMAND when pressing <alt> */ + SendMessageW( top, WM_SYSCOMMAND, SC_KEYMENU, 0L ); + } else iMenuSysKey = 0; @@ -1405,7 +1410,6 @@ if (wParam == VK_F4) /* Try to close the window */ { - HWND top = GetAncestor(hWnd, GA_ROOT); if (!(GetClassLongW(top, GCL_STYLE) & CS_NOCLOSE)) { if (bUnicode) @@ -1629,7 +1633,7 @@ case WM_CHANGEUISTATE: { - BOOL AlwaysShowCues = TRUE; + BOOL AlwaysShowCues = FALSE; WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); PWINDOW Wnd; @@ -1711,7 +1715,7 @@ case WM_UPDATEUISTATE: { BOOL Change = TRUE; - BOOL AlwaysShowCues = TRUE; + BOOL AlwaysShowCues = FALSE; WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); PWINDOW Wnd; Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -2408,6 +2408,14 @@ if (lpMsg->lParam & (1 << 29)) SendMessageW(hDlg, WM_CHANGEUISTATE, MAKEWPARAM(UIS_CLEAR, UISF_HIDEACCEL | UISF_HIDEFOCUS), 0); break; + + case WM_SYSCOMMAND: + /* If the ALT key is being pressed display the keyboard cues */ + if (lpMsg->wParam == SC_KEYMENU) + { + SendMessageW(hDlg, WM_CHANGEUISTATE, MAKEWPARAM(UIS_CLEAR, UISF_HIDEACCEL | UISF_HIDEFOCUS), 0); + } + break; } TranslateMessage( lpMsg ); Modified: trunk/reactos/include/reactos/win32k/ntusrtyp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntusrtyp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntusrtyp.h [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -20,6 +20,27 @@ RECT r; HBRUSH hBrush; } PATRECT, * PPATRECT; + +/* Bitfields for UserpreferencesMask SPI_ values (with defaults) */ +/* See also http://technet.microsoft.com/nl-nl/library/cc957204(en-us).aspx */ +typedef struct { + DWORD bActiveWindowTracking:1; //0 SPI_GETACTIVEWINDOWTRACKING + DWORD bMenuAnimation:1; //1 SPI_GETMENUANIMATION + DWORD bComboBoxAnimation:1; //1 SPI_GETCOMBOBOXANIMATION + DWORD bListBoxSmoothScrolling:1; //1 SPI_GETLISTBOXSMOOTHSCROLLING + DWORD bGradientCaptions:1; //1 SPI_GETGRADIENTCAPTIONS + DWORD bKeyboardCues:1; //0 SPI_GETKEYBOARDCUES + DWORD bActiveWndTrkZorder:1; //0 SPI_GETACTIVEWNDTRKZORDER + DWORD bHotTracking:1; //1 SPI_GETHOTTRACKING + DWORD bReserved1:1; //0 Reserved + DWORD bMenuFade:1; //1 SPI_GETMENUFADE + DWORD bSelectionFade:1; //1 SPI_GETSELECTIONFADE + DWORD bTooltipAnimation:1; //1 SPI_GETTOOLTIPANIMATION + DWORD bTooltipFade:1; //1 SPI_GETTOOLTIPFADE + DWORD bCursorShadow:1; //1 SPI_GETCURSORSHADOW + DWORD bReserved2:17; //0 Reserved + DWORD bUiEffects:1; //1 SPI_GETUIEFFECTS +} USERPREFERENCESMASK, *PUSERPREFERENCESMASK; /* Structures for reading icon/cursor files and resources */ #pragma pack(push,1) Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -34,7 +34,15 @@ HANDLE ShellWindow; HANDLE ShellListView; + /* Effects */ + BOOL FontSmoothing; /* enable */ + UINT FontSmoothingType; /* 1:Standard,2:ClearType */ + /* FIXME: Big Icons (SPI_GETICONMETRICS?) */ + BOOL DropShadow; + BOOL DragFullWindows; BOOL FlatMenu; + USERPREFERENCESMASK UserPreferences; + /* ScreenSaver */ BOOL ScreenSaverRunning; UINT ScreenSaverTimeOut; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -13,6 +13,7 @@ #define NDEBUG #include <debug.h> +#include <winsta.h> VOID FASTCALL IntGetFontMetricSetting(LPWSTR lpValueName, PLOGFONTW font) @@ -45,8 +46,12 @@ } } -VOID -IntWriteSystemParametersSettings(PUNICODE_STRING SubKeyName, PUNICODE_STRING KeyName, ULONG Type, PVOID Data, ULONG DataSize) +static NTSTATUS FASTCALL +IntWriteSystemParametersSettings(PUNICODE_STRING SubKeyName, + PUNICODE_STRING KeyName, + ULONG Type, + PVOID Data, + ULONG DataSize) { UNICODE_STRING KeyPath; NTSTATUS Status; @@ -56,14 +61,14 @@ /* Get a handle to the current users settings */ Status = RtlFormatCurrentUserKeyPath(&KeyPath); if(!NT_SUCCESS(Status)) - return; + return Status; InitializeObjectAttributes(&ObjectAttributes, &KeyPath, OBJ_CASE_INSENSITIVE, NULL, NULL); /* Open the HKCU key */ Status = ZwOpenKey(&CurrentUserKey, KEY_WRITE, &ObjectAttributes); RtlFreeUnicodeString(&KeyPath); if(!NT_SUCCESS(Status)) - return; + return Status; /* Open up the settings to read the values */ @@ -76,9 +81,90 @@ ZwSetValueKey(KeyHandle, KeyName, 0, Type, Data, DataSize); ZwClose(KeyHandle); } + return Status; } - +#if 0 +/* not used at the moment */ +/* FIXME: currently only supporting known DataSize */ +static NTSTATUS FASTCALL +IntReadSystemParametersSettings(PUNICODE_STRING SubKeyName, + PUNICODE_STRING KeyName, + ULONG Type, + PVOID Data, + ULONG DataSize) +{ + UNICODE_STRING KeyPath; + ULONG Length, ReqLength; + NTSTATUS Status; + HANDLE CurrentUserKey, KeyHandle; + OBJECT_ATTRIBUTES KeyAttributes, ObjectAttributes; + PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; + + /* Get a handle to the current users settings */ + Status = RtlFormatCurrentUserKeyPath(&KeyPath); + if(!NT_SUCCESS(Status)) { + return Status; + } + + InitializeObjectAttributes(&ObjectAttributes, &KeyPath, OBJ_CASE_INSENSITIVE, NULL, NULL); + /* Open the HKCU key */ + Status = ZwOpenKey(&CurrentUserKey, KEY_READ, &ObjectAttributes); + if(!NT_SUCCESS(Status)) { + RtlFreeUnicodeString(&KeyPath); + return Status; + } + RtlFreeUnicodeString(&KeyPath); + + /* Open up the settings to read the values */ + InitializeObjectAttributes(&KeyAttributes, SubKeyName, OBJ_CASE_INSENSITIVE, CurrentUserKey, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_READ, &KeyAttributes); + ZwClose(CurrentUserKey); + RtlFreeUnicodeString(&KeyPath); + if(!NT_SUCCESS(Status)) { + return Status; + } + + Length = sizeof(KEY_VALUE_PARTIAL_INFORMATION)+DataSize; + KeyValuePartialInfo = ExAllocatePoolWithTag(PagedPool, Length, TAG_WINSTA); + if(KeyValuePartialInfo) { + Status = ZwQueryValueKey(KeyHandle, KeyName, KeyValuePartialInformation, (PVOID)KeyValuePartialInfo, Length, &ReqLength); + if(NT_SUCCESS(Status)) { + RtlCopyMemory(Data, KeyValuePartialInfo->Data, DataSize); + } else { + } + ExFreePoolWithTag(KeyValuePartialInfo, TAG_WINSTA); + } else { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + ZwClose(KeyHandle); + + return Status; +} +#endif + +static ULONG FASTCALL +IntUpdateUserPreferencesMask(PWINSTATION_OBJECT WinStaObject, UINT fWinIni) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING SubKeyName = RTL_CONSTANT_STRING(L"Control Panel\\Desktop"); + UNICODE_STRING UserPreferencesMask = RTL_CONSTANT_STRING(L"UserPreferencesMask"); + + if (fWinIni & SPIF_UPDATEINIFILE) + { + Status = IntWriteSystemParametersSettings( + &SubKeyName, + &UserPreferencesMask, + REG_BINARY, + &WinStaObject->UserPreferences, + sizeof(USERPREFERENCESMASK)); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Registry update of UserPreferencesMask failed (%0X)\n",Status); + } + } + return Status; +} ULONG FASTCALL IntSystemParametersInfo( @@ -147,13 +233,11 @@ *(PBOOL)pvParam = FALSE; break; - - - case SPI_GETKEYBOARDCUES: - /* FIXME: Implement this, don't just return constant */ - *(PBOOL)pvParam = FALSE; - break; - + case SPI_SETKEYBOARDCUES: + case SPI_SETMENUANIMATION: + case SPI_SETMENUFADE: + case SPI_SETTOOLTIPANIMATION: + case SPI_SETTOOLTIPFADE: case SPI_SETDOUBLECLKWIDTH: case SPI_SETDOUBLECLKHEIGHT: case SPI_SETDOUBLECLICKTIME: @@ -169,6 +253,11 @@ case SPI_SETMOUSEBUTTONSWAP: /* We will change something, so set the flag here */ bChanged = TRUE; + case SPI_GETKEYBOARDCUES: + case SPI_GETMENUANIMATION: + case SPI_GETMENUFADE: + case SPI_GETTOOLTIPANIMATION: + case SPI_GETTOOLTIPFADE: case SPI_GETDESKWALLPAPER: case SPI_GETWHEELSCROLLLINES: case SPI_GETWHEELSCROLLCHARS: @@ -198,7 +287,44 @@ { case SPI_GETKEYBOARDCUES: ASSERT(pvParam); - *((BOOL*)pvParam) = TRUE; + *((BOOL*)pvParam) = (BOOL)WinStaObject->UserPreferences.bKeyboardCues; + break; + case SPI_GETMENUANIMATION: + ASSERT(pvParam); + *((BOOL*)pvParam) = (BOOL)WinStaObject->UserPreferences.bMenuAnimation; + break; + case SPI_GETMENUFADE: + ASSERT(pvParam); + *((BOOL*)pvParam) = (BOOL)WinStaObject->UserPreferences.bMenuFade; + break; + case SPI_GETTOOLTIPANIMATION: + ASSERT(pvParam); + *((BOOL*)pvParam) = (BOOL)WinStaObject->UserPreferences.bTooltipAnimation; + break; + case SPI_GETTOOLTIPFADE: + ASSERT(pvParam); + *((BOOL*)pvParam) = (BOOL)WinStaObject->UserPreferences.bTooltipFade; + break; + case SPI_SETKEYBOARDCUES: + WinStaObject->UserPreferences.bKeyboardCues = (BOOL)pvParam; + IntUpdateUserPreferencesMask(WinStaObject,fWinIni); + break; + case SPI_SETMENUANIMATION: + WinStaObject->UserPreferences.bMenuAnimation = (BOOL)pvParam; + IntUpdateUserPreferencesMask(WinStaObject,fWinIni); + break; + case SPI_SETMENUFADE: + WinStaObject->UserPreferences.bMenuFade = (BOOL)pvParam; + IntUpdateUserPreferencesMask(WinStaObject,fWinIni); + break; + case SPI_SETTOOLTIPANIMATION: + WinStaObject->UserPreferences.bTooltipAnimation = (BOOL)pvParam; + IntUpdateUserPreferencesMask(WinStaObject,fWinIni); + break; + case SPI_SETTOOLTIPFADE: + WinStaObject->UserPreferences.bTooltipFade = (BOOL)pvParam; + IntUpdateUserPreferencesMask(WinStaObject,fWinIni); + break; case SPI_GETFLATMENU: ASSERT(pvParam); *((UINT*)pvParam) = WinStaObject->FlatMenu; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Tue Mar 31 01:21:41 2009 @@ -556,6 +556,21 @@ WindowStationObject->ScreenSaverActive = FALSE; WindowStationObject->ScreenSaverTimeOut = 10; WindowStationObject->SystemCursor = CurInfo; + + RtlZeroMemory(&WindowStationObject->UserPreferences, sizeof(USERPREFERENCESMASK)); + /* Set all fields with default value = 1 : */ + WindowStationObject->UserPreferences.bMenuAnimation = 1; + WindowStationObject->UserPreferences.bComboBoxAnimation = 1; + WindowStationObject->UserPreferences.bListBoxSmoothScrolling = 1; + WindowStationObject->UserPreferences.bGradientCaptions = 1; + WindowStationObject->UserPreferences.bHotTracking = 1; + WindowStationObject->UserPreferences.bMenuFade = 1; + WindowStationObject->UserPreferences.bSelectionFade = 1; + WindowStationObject->UserPreferences.bMenuFade = 1; + WindowStationObject->UserPreferences.bTooltipAnimation = 1; + WindowStationObject->UserPreferences.bTooltipFade = 1; + WindowStationObject->UserPreferences.bCursorShadow = 1; + WindowStationObject->UserPreferences.bUiEffects = 1; /* END FIXME loading from register */

15 years, 8 months

[gedmurphy] 40298: fix wine's code a little better

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Mar 30 23:28:39 2009 New Revision: 40298 URL: http://svn.reactos.org/svn/reactos?rev=40298&view=rev Log: fix wine's code a little better Modified: trunk/reactos/dll/win32/shell32/iconcache.c Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Mon Mar 30 23:28:39 2009 @@ -438,6 +438,11 @@ cx_small, cy_small, LR_SHARED | LR_DEFAULTCOLOR); + if (!hSm) + { + ERR("Failed to load IDI_SHELL_DOCUMENT icon!\n"); + return FALSE; + } } ShellBigIconList = ImageList_Create(cx_large, @@ -445,7 +450,7 @@ ilMask, 100, 100); - if (!ShellSmallIconList) + if (!ShellBigIconList) { hLg = (HICON)LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), @@ -453,16 +458,20 @@ cx_large, cy_large, LR_SHARED | LR_DEFAULTCOLOR); + if (!hLg) + { + ERR("Failed to load IDI_SHELL_DOCUMENT icon!\n"); + DestroyIcon(hSm); + return FALSE; + } } - if (!hSm || !hLg) - { - FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); - return FALSE; - } SIC_IconAppend(swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); + + DestroyIcon(hSm); + DestroyIcon(hLg); TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList);

15 years, 8 months

[gedmurphy] 40297: Create the system and device imagelists with the correct bpp Do the same with the explorer stuff

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Mar 30 23:08:16 2009 New Revision: 40297 URL: http://svn.reactos.org/svn/reactos?rev=40297&view=rev Log: Create the system and device imagelists with the correct bpp Do the same with the explorer stuff Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/shell32/iconcache.c Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Mon Mar 30 23:08:16 2009 @@ -152,7 +152,30 @@ MainFrameBase::MainFrameBase(HWND hwnd) : super(hwnd) { - _himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_MASK|ILC_COLOR24, 2, 0); + HDC hDC = GetDC(NULL); + if (hDC) + { + DWORD ilMask; + INT bpp = GetDeviceCaps(hDC, BITSPIXEL); + ReleaseDC(NULL, hDC); + + if (bpp <= 4) + ilMask = ILC_COLOR4; + else if (bpp <= 8) + ilMask = ILC_COLOR8; + else if (bpp <= 16) + ilMask = ILC_COLOR16; + else if (bpp <= 24) + ilMask = ILC_COLOR24; + else if (bpp <= 32) + ilMask = ILC_COLOR32; + else + ilMask = ILC_COLOR; + + ilMask |= ILC_MASK; + + _himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ilMask, 2, 0); + } _hMenuFrame = GetMenu(hwnd); _hMenuWindow = GetSubMenu(_hMenuFrame, GetMenuItemCount(_hMenuFrame)-3); Modified: trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellbrowser.cpp [iso-8859-1] Mon Mar 30 23:08:16 2009 @@ -58,8 +58,31 @@ _cur_dir = NULL; - _himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_MASK|ILC_COLOR24, 2, 0); - ImageList_SetBkColor(_himl, GetSysColor(COLOR_WINDOW)); + HDC hDC = GetDC(NULL); + if (hDC) + { + INT bpp = GetDeviceCaps(hDC, BITSPIXEL); + ReleaseDC(NULL, hDC); + + DWORD ilMask; + if (bpp <= 4) + ilMask = ILC_COLOR4; + else if (bpp <= 8) + ilMask = ILC_COLOR8; + else if (bpp <= 16) + ilMask = ILC_COLOR16; + else if (bpp <= 24) + ilMask = ILC_COLOR24; + else if (bpp <= 32) + ilMask = ILC_COLOR32; + else + ilMask = ILC_COLOR; + + ilMask |= ILC_MASK; + + _himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ilMask, 2, 0); + ImageList_SetBkColor(_himl, GetSysColor(COLOR_WINDOW)); + } } ShellBrowser::~ShellBrowser() Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c [iso-8859-1] Mon Mar 30 23:08:16 2009 @@ -480,10 +480,12 @@ else { struct ClassImageList *list = NULL; + HDC hDC; DWORD RequiredSize; + DWORD ilMask, bkColor; HICON hIcon; DWORD size; - INT i; + INT i, bpp; /* Get list of all class GUIDs in given computer */ ret = SetupDiBuildClassInfoListExW( @@ -529,11 +531,38 @@ /* Prepare a HIMAGELIST */ InitCommonControls(); - ClassImageListData->ImageList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 100, 10); + + hDC = GetDC(NULL); + if (!hDC) + goto cleanup; + + bpp = GetDeviceCaps(hDC, BITSPIXEL); + ReleaseDC(NULL, hDC); + + if (bpp <= 4) + ilMask = ILC_COLOR4; + else if (bpp <= 8) + ilMask = ILC_COLOR8; + else if (bpp <= 16) + ilMask = ILC_COLOR16; + else if (bpp <= 24) + ilMask = ILC_COLOR24; + else if (bpp <= 32) + ilMask = ILC_COLOR32; + else + ilMask = ILC_COLOR; + + ilMask |= ILC_MASK; + + ClassImageListData->ImageList = ImageList_Create(16, 16, ilMask, 100, 10); if (!ClassImageListData->ImageList) goto cleanup; ClassImageListData->Reserved = (ULONG_PTR)list; + + /* For some reason, Windows sets the list background to COLOR_WINDOW */ + bkColor = GetSysColor(COLOR_WINDOW); + ImageList_SetBkColor(ClassImageListData->ImageList, bkColor); /* Now, we "simply" need to load icons associated with all class guids, * and put their index in the image list in the IconIndexes array */ Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] Mon Mar 30 23:08:16 2009 @@ -10,6 +10,7 @@ <library>uuid</library> <library>wine</library> <library>ntdll</library> + <library>gdi32</library> <library>comctl32</library> <library>kernel32</library> <library>advapi32</library> Modified: trunk/reactos/dll/win32/shell32/iconcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.c [iso-8859-1] Mon Mar 30 23:08:16 2009 @@ -375,51 +375,98 @@ */ BOOL SIC_Initialize(void) { - HICON hSm, hLg; - int cx_small, cy_small; - int cx_large, cy_large; - - cx_small = GetSystemMetrics(SM_CXSMICON); - cy_small = GetSystemMetrics(SM_CYSMICON); - cx_large = GetSystemMetrics(SM_CXICON); - cy_large = GetSystemMetrics(SM_CYICON); - - TRACE("\n"); - - if (sic_hdpa) /* already initialized?*/ - return TRUE; - - sic_hdpa = DPA_Create(16); - - if (!sic_hdpa) - { - return(FALSE); - } - - ShellSmallIconList = ImageList_Create(cx_small,cy_small,ILC_COLOR32|ILC_MASK,0,0x20); - ShellBigIconList = ImageList_Create(cx_large,cy_large,ILC_COLOR32|ILC_MASK,0,0x20); - - ImageList_SetBkColor(ShellSmallIconList, CLR_NONE); - ImageList_SetBkColor(ShellBigIconList, CLR_NONE); - - /* Load the document icon, which is used as the default if an icon isn't found. */ - hSm = (HICON)LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), - IMAGE_ICON, cx_small, cy_small, LR_SHARED); - hLg = (HICON)LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT), - IMAGE_ICON, cx_large, cy_large, LR_SHARED); - - if (!hSm || !hLg) - { - FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); - return FALSE; - } - - SIC_IconAppend (swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); - SIC_IconAppend (swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); - - TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList); - - return TRUE; + HICON hSm = NULL, hLg = NULL; + INT cx_small, cy_small; + INT cx_large, cy_large; + HDC hDC; + INT bpp; + DWORD ilMask; + + TRACE("Entered SIC_Initialize\n"); + + if (sic_hdpa) /* already initialized?*/ + { + return TRUE; + } + + sic_hdpa = DPA_Create(16); + if (!sic_hdpa) + { + return FALSE; + } + + hDC = GetDC(NULL); + if (!hDC) + { + return FALSE; + } + + bpp = GetDeviceCaps(hDC, BITSPIXEL); + ReleaseDC(NULL, hDC); + + if (bpp <= 4) + ilMask = ILC_COLOR4; + else if (bpp <= 8) + ilMask = ILC_COLOR8; + else if (bpp <= 16) + ilMask = ILC_COLOR16; + else if (bpp <= 24) + ilMask = ILC_COLOR24; + else if (bpp <= 32) + ilMask = ILC_COLOR32; + else + ilMask = ILC_COLOR; + + ilMask |= ILC_MASK; + + cx_small = GetSystemMetrics(SM_CXSMICON); + cy_small = GetSystemMetrics(SM_CYSMICON); + cx_large = GetSystemMetrics(SM_CXICON); + cy_large = GetSystemMetrics(SM_CYICON); + + ShellSmallIconList = ImageList_Create(cx_small, + cy_small, + ilMask, + 100, + 100); + if (ShellSmallIconList) + { + /* Load the document icon, which is used as the default if an icon isn't found. */ + hSm = (HICON)LoadImageW(shell32_hInstance, + MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), + IMAGE_ICON, + cx_small, + cy_small, + LR_SHARED | LR_DEFAULTCOLOR); + } + + ShellBigIconList = ImageList_Create(cx_large, + cy_large, + ilMask, + 100, + 100); + if (!ShellSmallIconList) + { + hLg = (HICON)LoadImageW(shell32_hInstance, + MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT), + IMAGE_ICON, + cx_large, + cy_large, + LR_SHARED | LR_DEFAULTCOLOR); + } + + if (!hSm || !hLg) + { + FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); + return FALSE; + } + + SIC_IconAppend(swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0); + SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0); + + TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList); + + return TRUE; } /************************************************************************* * SIC_Destroy

15 years, 8 months

[janderwald] 40296: - Return correct byte size - Fixes 3 wine test failures

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Mar 30 21:19:43 2009 New Revision: 40296 URL: http://svn.reactos.org/svn/reactos?rev=40296&view=rev Log: - Return correct byte size - Fixes 3 wine test failures Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Mon Mar 30 21:19:43 2009 @@ -4225,11 +4225,11 @@ RtlUnicodeStringToAnsiString(&AnsiString, &Value, FALSE); - *lpcbValue = ValueSize; + *lpcbValue = ValueSize / sizeof(WCHAR); } else if (lpcbValue != NULL) { - *lpcbValue = ValueSize; + *lpcbValue = ValueSize / sizeof(WCHAR); } }

15 years, 8 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 March 2009