Ros-diffs February 2016

ros-diffs@reactos.org

10 participants
155 discussions

[hbelusca] 70744: [WIN32K:NTUSER] - Cleanup window clipboard data while the window still exists and is not dereferenced. - When a window is about to be destroyed (just before we send the WM_DESTROY...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 14 18:41:49 2016 New Revision: 70744 URL: http://svn.reactos.org/svn/reactos?rev=70744&view=rev Log: [WIN32K:NTUSER] - Cleanup window clipboard data while the window still exists and is not dereferenced. - When a window is about to be destroyed (just before we send the WM_DESTROY message), if it is the current clipboard owner, make it release the clipboard. The WM_RENDERALLFORMATS message is then sent, and if needed, one WM_DRAWCLIPBOARD message. - Send a WM_DRAWCLIPBOARD message when SetClipboardViewer is called. WM_DRAWCLIPBOARD messages are sent as notifications to the corresponding windows. Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/clipboard.h trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sun Feb 14 18:41:49 2016 @@ -346,6 +346,43 @@ pWinSta->cNumClipFormats = 0; } +/* UserClipboardRelease is called from IntSendDestroyMsg in window.c */ +VOID FASTCALL +UserClipboardRelease(PWND pWindow) +{ + PWINSTATION_OBJECT pWinStaObj; + + pWinStaObj = IntGetWinStaForCbAccess(); + if (!pWinStaObj) + return; + + co_IntSendMessage(pWinStaObj->spwndClipOwner->head.h, WM_RENDERALLFORMATS, 0, 0); + + /* If the window being destroyed is the current clipboard owner... */ + if (pWindow == pWinStaObj->spwndClipOwner) + { + /* ... make it release the clipboard */ + pWinStaObj->spwndClipOwner = NULL; + } + + if (pWinStaObj->fClipboardChanged) + { + /* Add synthesized formats - they are rendered later */ + IntAddSynthesizedFormats(pWinStaObj); + + /* Notify viewer windows in chain */ + pWinStaObj->fClipboardChanged = FALSE; + if (pWinStaObj->spwndClipViewer) + { + TRACE("Clipboard: sending WM_DRAWCLIPBOARD to %p\n", pWinStaObj->spwndClipViewer->head.h); + // For 32-bit applications this message is sent as a notification + co_IntSendMessageNoWait(pWinStaObj->spwndClipViewer->head.h, WM_DRAWCLIPBOARD, 0, 0); + } + } + + ObDereferenceObject(pWinStaObj); +} + /* UserClipboardFreeWindow is called from co_UserFreeWindow in window.c */ VOID FASTCALL UserClipboardFreeWindow(PWND pWindow) @@ -356,17 +393,18 @@ if (!pWinStaObj) return; + if (pWindow == pWinStaObj->spwndClipOwner) + { + /* The owner window was destroyed */ + pWinStaObj->spwndClipOwner = NULL; + } + /* Check if clipboard is not locked by this window, if yes, unlock it */ if (pWindow == pWinStaObj->spwndClipOpen) { /* The window that opens the clipboard was destroyed */ pWinStaObj->spwndClipOpen = NULL; pWinStaObj->ptiClipLock = NULL; - } - if (pWindow == pWinStaObj->spwndClipOwner) - { - /* The owner window was destroyed */ - pWinStaObj->spwndClipOwner = NULL; } /* Remove window from window chain */ if (pWindow == pWinStaObj->spwndClipViewer) @@ -500,13 +538,13 @@ IntAddSynthesizedFormats(pWinStaObj); /* Notify viewer windows in chain */ + pWinStaObj->fClipboardChanged = FALSE; if (pWinStaObj->spwndClipViewer) { TRACE("Clipboard: sending WM_DRAWCLIPBOARD to %p\n", pWinStaObj->spwndClipViewer->head.h); - co_IntSendMessage(pWinStaObj->spwndClipViewer->head.h, WM_DRAWCLIPBOARD, 0, 0); + // For 32-bit applications this message is sent as a notification + co_IntSendMessageNoWait(pWinStaObj->spwndClipViewer->head.h, WM_DRAWCLIPBOARD, 0, 0); } - - pWinStaObj->fClipboardChanged = FALSE; } cleanup: @@ -629,6 +667,7 @@ if (pWinStaObj->spwndClipOwner) { TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p\n", pWinStaObj->spwndClipOwner->head.h); + // For 32-bit applications this message is sent as a notification co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); } @@ -1053,6 +1092,15 @@ /* Set new viewer window */ pWinStaObj->spwndClipViewer = pWindow; + /* Notify viewer windows in chain */ + pWinStaObj->fClipboardChanged = FALSE; + if (pWinStaObj->spwndClipViewer) + { + TRACE("Clipboard: sending WM_DRAWCLIPBOARD to %p\n", pWinStaObj->spwndClipViewer->head.h); + // For 32-bit applications this message is sent as a notification + co_IntSendMessageNoWait(pWinStaObj->spwndClipViewer->head.h, WM_DRAWCLIPBOARD, 0, 0); + } + cleanup: if (pWinStaObj) ObDereferenceObject(pWinStaObj); Modified: trunk/reactos/win32ss/user/ntuser/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.h [iso-8859-1] Sun Feb 14 18:41:49 2016 @@ -9,6 +9,9 @@ UINT APIENTRY UserEnumClipboardFormats(UINT uFormat); + +VOID FASTCALL +UserClipboardRelease(PWND pWindow); VOID FASTCALL UserClipboardFreeWindow(PWND pWindow); Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sun Feb 14 18:41:49 2016 @@ -424,10 +424,14 @@ } } - /* - * Send the WM_DESTROY to the window. - */ - + /* If the window being destroyed is the current clipboard owner... */ + if (ti->ppi->prpwinsta != NULL && Window == ti->ppi->prpwinsta->spwndClipOwner) + { + /* ... make it release the clipboard */ + UserClipboardRelease(Window); + } + + /* Send the WM_DESTROY to the window */ co_IntSendMessage(hWnd, WM_DESTROY, 0, 0); /* @@ -554,6 +558,8 @@ co_IntSendMessage(UserHMGetHandle(Window), WM_NCDESTROY, 0, 0); } + UserClipboardFreeWindow(Window); + DestroyTimersForWindow(ThreadData, Window); /* Unregister hot keys */ @@ -664,8 +670,6 @@ UserFreeWindowInfo(Window->head.pti, Window); UserDereferenceObject(Window); - - UserClipboardFreeWindow(Window); return 0; }

8 years, 8 months

[hbelusca] 70743: [WIN32K]: Some whitespace fixes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 14 18:26:23 2016 New Revision: 70743 URL: http://svn.reactos.org/svn/reactos?rev=70743&view=rev Log: [WIN32K]: Some whitespace fixes. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sun Feb 14 18:26:23 2016 @@ -394,8 +394,9 @@ if (Window) { - /* Look whether the focus is within the tree of windows we will - * be destroying. + /* + * Look whether the focus is within the tree of windows + * we will be destroying. */ // Rule #1 if ( ti->MessageQueue->spwndActive == Window || // Fixes CORE-106 RegSvr32 exit and return focus to CMD. @@ -433,7 +434,6 @@ * This WM_DESTROY message can trigger re-entrant calls to DestroyWindow * make sure that the window still exists when we come back. */ - if (IntIsWindow(hWnd)) { HWND* pWndArray; @@ -480,13 +480,12 @@ } /*********************************************************************** - * IntDestroyWindow + * co_UserFreeWindow * * Destroy storage associated to a window. "Internals" p.358 * - * This is the "functional" DestroyWindows function ei. all stuff - * done in CreateWindow is undone here and not in DestroyWindow:-P - + * This is the "functional" DestroyWindows function i.e. all stuff + * done in CreateWindow is undone here and not in DestroyWindow :-P */ LRESULT co_UserFreeWindow(PWND Window, PPROCESSINFO ProcessData, @@ -503,7 +502,7 @@ if(Window->state2 & WNDS2_INDESTROY) { - TRACE("Tried to call IntDestroyWindow() twice\n"); + TRACE("Tried to call co_UserFreeWindow() twice\n"); return 0; } Window->state2 |= WNDS2_INDESTROY; @@ -513,7 +512,7 @@ /* remove the window already at this point from the thread window list so we don't get into trouble when destroying the thread windows while we're still - in IntDestroyWindow() */ + in co_UserFreeWindow() */ RemoveEntryList(&Window->ThreadListEntry); BelongsToThreadData = IntWndBelongsToThread(Window, ThreadData); @@ -528,7 +527,7 @@ { if ((Child = IntGetWindowObject(*ChildHandle))) { - if(!IntWndBelongsToThread(Child, ThreadData)) + if (!IntWndBelongsToThread(Child, ThreadData)) { /* send WM_DESTROY messages to windows not belonging to the same thread */ co_IntSendMessage( UserHMGetHandle(Child), WM_ASYNC_DESTROYWINDOW, 0, 0 ); @@ -542,7 +541,7 @@ ExFreePoolWithTag(Children, USERTAG_WINDOWLIST); } - if(SendMessages) + if (SendMessages) { /* * Clear the update region to make sure no WM_PAINT messages will be @@ -551,7 +550,7 @@ co_UserRedrawWindow(Window, NULL, 0, RDW_VALIDATE | RDW_NOFRAME | RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_NOCHILDREN); - if(BelongsToThreadData) + if (BelongsToThreadData) co_IntSendMessage(UserHMGetHandle(Window), WM_NCDESTROY, 0, 0); } @@ -570,7 +569,7 @@ /* don't remove the WINDOWSTATUS_DESTROYING bit */ /* reset shell window handles */ - if(ThreadData->rpdesk) + if (ThreadData->rpdesk) { if (Window->head.h == ThreadData->rpdesk->rpwinstaParent->ShellWindow) ThreadData->rpdesk->rpwinstaParent->ShellWindow = NULL; @@ -617,8 +616,8 @@ Window->IDMenu = 0; } - if(Window->SystemMenu - && (Menu = UserGetMenuObject(Window->SystemMenu))) + if (Window->SystemMenu + && (Menu = UserGetMenuObject(Window->SystemMenu))) { IntDestroyMenuObject(Menu, TRUE); Window->SystemMenu = (HMENU)0; @@ -653,7 +652,7 @@ Window->head.pti->ppi); Window->pcls = NULL; - if(Window->hrgnClip) + if (Window->hrgnClip) { IntGdiSetRegionOwner(Window->hrgnClip, GDI_OBJ_HMGR_POWNED); GreDeleteObject(Window->hrgnClip); @@ -2674,7 +2673,6 @@ IntNotifyWinEvent(EVENT_OBJECT_DESTROY, Window, OBJID_WINDOW, CHILDID_SELF, 0); /* Send destroy messages */ - IntSendDestroyMsg(UserHMGetHandle(Window)); if (!IntIsWindow(UserHMGetHandle(Window)))

8 years, 8 months

[ekohl] 70742: [USERINIT] Set the keyboard layout properly.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 14 15:39:11 2016 New Revision: 70742 URL: http://svn.reactos.org/svn/reactos?rev=70742&view=rev Log: [USERINIT] Set the keyboard layout properly. Modified: trunk/reactos/base/system/userinit/livecd.c Modified: trunk/reactos/base/system/userinit/livecd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/livec… ============================================================================== --- trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] Sun Feb 14 15:39:11 2016 @@ -158,55 +158,6 @@ -1, (LPARAM)langSel); } - - -#if 0 -static -BOOL -GetLayoutID(LPWSTR szLayoutNum, LPWSTR szLCID) -{ - DWORD dwBufLen; - DWORD dwRes; - HKEY hKey; - WCHAR szTempLCID[9]; - - // Get the Layout ID - if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Keyboard Layout\\Preload", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - dwBufLen = sizeof(szTempLCID); - dwRes = RegQueryValueExW(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen); - - if (dwRes != ERROR_SUCCESS) - { - RegCloseKey(hKey); - return FALSE; - } - - RegCloseKey(hKey); - } - - // Look for a substitude of this layout - if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Keyboard Layout\\Substitutes", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - dwBufLen = sizeof(szTempLCID); - - if (RegQueryValueExW(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) - { - // No substitute found, then use the old LCID - wcscpy(szLCID, szTempLCID); - } - - RegCloseKey(hKey); - } - else - { - // Substitutes key couldn't be opened, so use the old LCID - wcscpy(szLCID, szTempLCID); - } - - return TRUE; -} -#endif static @@ -281,26 +232,23 @@ SetKeyboardLayout( HWND hwnd) { -#if 0 INT iCurSel; - PWSTR pszLCID; + ULONG ulLayoutId; HKL hKl; - WCHAR szLCID[9]; + WCHAR szLayoutId[9]; iCurSel = SendMessageW(hwnd, CB_GETCURSEL, 0, 0); if (iCurSel == CB_ERR) return; - pszLCID = (PWSTR)SendMessageW(hwnd, CB_GETITEMDATA, iCurSel, 0); - if (pszLCID == (PWSTR)CB_ERR) + ulLayoutId = (ULONG)SendMessageW(hwnd, CB_GETITEMDATA, iCurSel, 0); + if (ulLayoutId == (ULONG)CB_ERR) return; - if (GetLayoutID(pszLCID, szLCID)) - { - hKl = LoadKeyboardLayoutW(szLCID, KLF_ACTIVATE | KLF_SETFORPROCESS); - SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); - } -#endif + swprintf(szLayoutId, L"%08lx", ulLayoutId); + + hKl = LoadKeyboardLayoutW(szLayoutId, KLF_ACTIVATE | KLF_REPLACELANG | KLF_SETFORPROCESS); + SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); } @@ -610,9 +558,11 @@ /* Center the dialog window */ CenterWindow (hwndDlg); + /* Fill the language and keyboard layout lists */ CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST)); CreateKeyboardLayoutList(GetDlgItem(hwndDlg, IDC_LAYOUTLIST)); + /* Disable the 'Cancel' button*/ EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); return FALSE; @@ -675,7 +625,10 @@ if (NewLcid == (LCID)CB_ERR) break; + /* Set the locale for the current thread */ NtSetDefaultLocale(TRUE, NewLcid); + + /* Store the locale setings in the registry */ InitializeDefaultUserLocale(&NewLcid); SetKeyboardLayout(GetDlgItem(hwndDlg, IDC_LAYOUTLIST));

8 years, 9 months

[ekohl] 70741: [REGEDIT] Minor improvement of Russian translation. Patch by stacheldraht. CORE-10775 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 14 12:43:52 2016 New Revision: 70741 URL: http://svn.reactos.org/svn/reactos?rev=70741&view=rev Log: [REGEDIT] Minor improvement of Russian translation. Patch by stacheldraht. CORE-10775 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Sun Feb 14 12:43:52 2016 @@ -268,7 +268,7 @@ STRINGTABLE BEGIN - ID_REGISTRY_MENU "Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ ÑÐ°Ð±Ð¾ÑÑ Ñ ÑÐµÐ³Ð¸ÑÑÑÐ¾Ð¼ Ð² ÑÐµÐ»Ð¾Ð¼" + ID_REGISTRY_MENU "Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ ÑÐ°Ð±Ð¾ÑÑ Ñ ÑÐµÐµÑÑÑÐ¾Ð¼ Ð² ÑÐµÐ»Ð¾Ð¼" ID_EDIT_MENU "Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ Ð¸Ð»Ð¸ ÐºÐ»ÑÑÐµÐ¹" ID_VIEW_MENU "Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¾ÐºÐ½Ð° ÑÐµÐµÑÑÑÐ°" ID_FAVOURITES_MENU "Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð´Ð»Ñ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÐ°ÑÑÐ¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÐ¼ÑÐ¼ ÐºÐ»ÑÑÐ°Ð¼"

8 years, 9 months

[ekohl] 70740: [CHARMAP][CPL] Improve English string in ReactOS. Patch by Henry Tang Ih. CORE-10844 #resolve #comment Thank you very much!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 14 10:56:55 2016 New Revision: 70740 URL: http://svn.reactos.org/svn/reactos?rev=70740&view=rev Log: [CHARMAP][CPL] Improve English string in ReactOS. Patch by Henry Tang Ih. CORE-10844 #resolve #comment Thank you very much! Modified: trunk/reactos/base/applications/charmap/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/en-US.rc trunk/reactos/dll/cpl/timedate/lang/en-US.rc trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc Modified: trunk/reactos/base/applications/charmap/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/en-US.rc [iso-8859-1] Sun Feb 14 10:56:55 2016 @@ -4,18 +4,18 @@ FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE BEGIN - LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 + LTEXT "&Font:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS - PUSHBUTTON "Help", IDC_CMHELP, 249, 5, 35, 13 + PUSHBUTTON "&Help", IDC_CMHELP, 249, 5, 35, 13 CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 - LTEXT "Characters to copy:", IDC_STATIC, 6, 188, 66, 9 + LTEXT "Ch&aracters to copy:", IDC_STATIC, 6, 188, 66, 9 CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 - DEFPUSHBUTTON "Select", IDC_SELECT, 194, 186, 44, 13 - PUSHBUTTON "Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED - CONTROL "Advanced view", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | + DEFPUSHBUTTON "&Select", IDC_SELECT, 194, 186, 44, 13 + PUSHBUTTON "&Copy", IDC_COPY, 242, 186, 44, 13, WS_DISABLED + CONTROL "Ad&vanced view", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 END @@ -23,14 +23,14 @@ STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Charset:", IDC_STATIC, 8, 8, 48, 8 + LTEXT "Charse&t:", IDC_STATIC, 8, 8, 48, 8 COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Group by:", IDC_STATIC, 8, 28, 50, 8 + LTEXT "&Group by:", IDC_STATIC, 8, 28, 50, 8 COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Search", IDC_BUTTON_SEARCH, 200, 44, 50, 14 + PUSHBUTTON "Sea&rch", IDC_BUTTON_SEARCH, 200, 44, 50, 14 EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL - LTEXT "Search for:", IDC_STATIC, 8, 48, 42, 8 - LTEXT "Unicode:", IDC_STATIC, 200, 8, 30, 8 + LTEXT "S&earch for:", IDC_STATIC, 8, 48, 42, 8 + LTEXT "&Unicode:", IDC_STATIC, 200, 8, 30, 8 EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL END @@ -40,7 +40,7 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 - PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 + PUSHBUTTON "&Close", IDOK, 75, 162, 44, 15 ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc [iso-8859-1] Sun Feb 14 10:56:55 2016 @@ -55,12 +55,12 @@ GROUPBOX "Cursor options", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(13) LTEXT "Use the track bars to modify the blinking speed of the cursor and its width.", -1, PROPSHEETPADDING(2), LABELLINE(9) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(2) - CTEXT "Blinking speed:", -1, PROPSHEETPADDING(2), LABELLINE(12) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + CTEXT "Blinking s&peed:", -1, PROPSHEETPADDING(2), LABELLINE(12) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) LTEXT "None", -1, PROPSHEETPADDING(3), LABELLINE(14) + 2, PROPSHEETPADDING(6), LABELLINE(1) LTEXT "Fast", -1, PROPSHEETWIDTH - PROPSHEETPADDING(9), LABELLINE(14) + 2, PROPSHEETPADDING(6), LABELLINE(1) CONTROL "", IDC_CURSOR_BLINK_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, PROPSHEETPADDING(10), LABELLINE(14), PROPSHEETWIDTH - PROPSHEETPADDING(20), LABELLINE(2) - CTEXT "Cursor width:", -1, PROPSHEETPADDING(2), LABELLINE(17), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + CTEXT "Cursor &width:", -1, PROPSHEETPADDING(2), LABELLINE(17), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) LTEXT "Narrow", -1, PROPSHEETPADDING(3), LABELLINE(18) + 7, PROPSHEETPADDING(6), LABELLINE(1) LTEXT "Wide", -1, PROPSHEETWIDTH - PROPSHEETPADDING(9), LABELLINE(18) + 7, PROPSHEETPADDING(6), LABELLINE(1) CONTROL "", IDC_CURSOR_WIDTH_TRACK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, @@ -91,9 +91,9 @@ COMBOBOX IDC_RESET_COMBO, PROPSHEETPADDING(4), LABELLINE(4), PROPSHEETPADDING(10), LABELLINE(5), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP GROUPBOX "Notification", -1, PROPSHEETPADDING(1), LABELLINE(7) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) - AUTOCHECKBOX "Give warning message when turning a feature on", IDC_NOTIFICATION_MESSAGE, + AUTOCHECKBOX "&Give warning message when turning a feature on", IDC_NOTIFICATION_MESSAGE, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 - AUTOCHECKBOX "Make a sound when turning a feature on or off", IDC_NOTIFICATION_SOUND, + AUTOCHECKBOX "Make a &sound when turning a feature on or off", IDC_NOTIFICATION_SOUND, PROPSHEETPADDING(2), LABELLINE(10) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 GROUPBOX "SerialKey Devices", -1, PROPSHEETPADDING(1), LABELLINE(13) - 4, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(5) LTEXT "SerialKey devices allow alternative access to keyboard and mouse features.", @@ -176,11 +176,11 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Keyboard shortcut", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "The shortcut for High Contrast is: \nPress <Left Alt+Left Shift+Print Screen>.", + LTEXT "The shortcut for High Contrast is: \nPress <Left Alt + Left Shift + Print Screen>.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Use shortcut", IDC_CONTRAST_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 GROUPBOX "High Contrast Color Scheme", -1, PROPSHEETPADDING(1), LABELLINE(9), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(4) + PROPSHEETPADDING(1) - LTEXT "Current Color Scheme:", -1, PROPSHEETPADDING(2), LABELLINE(10) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) + LTEXT "&Current Color Scheme:", -1, PROPSHEETPADDING(2), LABELLINE(10) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH - 111, PROPSHEETHEIGHT - 21, 50, 14 @@ -193,7 +193,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Keyboard shortcut", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt+Left Shift+Num Lock>.", + LTEXT "The shortcut for Mouse Keys is: \nPress <Left Alt + Left Shift + Num Lock>.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Use shortcut", IDC_MOUSEKEYS_ACTIVATE_CHECK, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), 14 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] Sun Feb 14 10:56:55 2016 @@ -8,10 +8,10 @@ CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 80, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 - LTEXT "Select an image to use as your desktop wallpaper", IDC_STATIC, 8, 103, 230, 9 + LTEXT "Select an image to use as your des&ktop wallpaper", IDC_STATIC, 8, 103, 230, 9 PUSHBUTTON "&Browse...", IDC_BROWSE_BUTTON, 188, 114, 55, 15 PUSHBUTTON "&Color...", IDC_COLOR_BUTTON, 188, 177, 55, 15 - LTEXT "Placement", IDC_STATIC, 188, 138, 55, 9 + LTEXT "&Placement", IDC_STATIC, 188, 138, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -43,17 +43,17 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Visual Style", IDC_STATIC, 7, 130, 104, 9 + LTEXT "&Visual Style", IDC_STATIC, 7, 130, 104, 9 COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Colorscheme", IDC_STATIC, 7, 160, 104, 9 + LTEXT "&Color scheme", IDC_STATIC, 7, 160, 104, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Size", IDC_STATIC, 7, 190, 104, 9 + LTEXT "&Font size", IDC_STATIC, 7, 190, 104, 9 COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 - PUSHBUTTON "Ad&vanced...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 + PUSHBUTTON "A&dvanced...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 @@ -63,7 +63,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Element", 8, 5, 160, 50, 9 + LTEXT "&Element", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 @@ -74,12 +74,12 @@ CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP LTEXT "&2nd Color", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Font", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 + LTEXT "&Font", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Fontsize", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 + LTEXT "Font Si&ze", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL - LTEXT "Color", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9 + LTEXT "Colo&r", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE Modified: trunk/reactos/dll/cpl/intl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/en-US.rc [iso-8859-1] Sun Feb 14 10:56:55 2016 @@ -7,7 +7,7 @@ BEGIN GROUPBOX "Standards and formats", -1, 5, 5, 234, 162 LTEXT "This option affects how some programs format numbers, currencies, dates, and time.", -1, 14, 17, 220, 25 - LTEXT "Select an item to match its properties, or click Customize to choose your own formats:", -1, 14, 37, 220, 22 + LTEXT "&Select an item to match its properties, or click Customize to choose your own formats:", -1, 14, 37, 220, 22 COMBOBOX IDC_LANGUAGELIST, 14, 56, 160, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Customi&ze...", IDC_SETUP_BUTTON, 178, 56, 52, 13 LTEXT "Samples", -1, 14, 73, 70, 10 @@ -22,7 +22,7 @@ EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 89, 131, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 89, 146, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP GROUPBOX "Geographic location", -1, 5, 172, 234, 55 - LTEXT "Set up your location so that some services can supply you with local information; for example, news and weather reports.", -1, 14, 184, 210, 24 + LTEXT "Se&t up your location so that some services can supply you with local information; for example, news and weather reports.", -1, 14, 184, 210, 24 COMBOBOX IDC_LOCATION_COMBO, 14, 207, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END @@ -48,11 +48,11 @@ GROUPBOX "Language for non-Unicode programs", -1, 5, 5, 234, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 217, 160, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "This system setting enables non-Unicode programs to display menus and dialogs in their native language. It does not affect Unicode programs, but it does apply to all users of this computer.", -1, 14, 18, 223, 33 - LTEXT "Select a language to match the language version of the non-Unicode programs you want to use:", -1, 14, 55, 223, 18 - GROUPBOX "Code page conversion tables", -1, 5, 101, 234, 88 + LTEXT "&Select a language to match the language version of the non-Unicode programs you want to use:", -1, 14, 55, 223, 18 + GROUPBOX "&Code page conversion tables", -1, 5, 101, 234, 88 CONTROL "", IDC_CONV_TABLES, "SysListView32", LVS_REPORT | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP, 14, 114, 217, 70 GROUPBOX "Default user account settings", -1, 5, 193, 234, 32 - AUTOCHECKBOX "Apply all settings to the current user account and to the default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP + AUTOCHECKBOX "Apply all settings to the current user account and to the &default", IDC_APPLY_CUR_USER_DEF_PROFILE, 12, 201, 220, 22, BS_MULTILINE | BS_TOP END IDD_NUMBERSPAGE DIALOGEX 0, 0, 246, 234 @@ -140,30 +140,30 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Calendar", -1, 7, 7, 230, 74 - LTEXT "If year is typed as two digits, then assume it is a year between:", -1, 13, 18, 215, 8 + LTEXT "If year is typed as two digits, then assume it is a &year between:", -1, 13, 18, 215, 8 EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED LTEXT "and", -1, 55, 32, 17, 8 EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 - LTEXT "Calendar type:", -1, 13, 48, 56, 10 + LTEXT "&Calendar type:", -1, 13, 48, 56, 10 COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - LTEXT "Muslim Calendar:", -1, 13, 65, 60, 12 + LTEXT "&Muslim Calendar:", -1, 13, 65, 60, 12 COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 153, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - GROUPBOX "Short date format", -1, 7, 83, 230, 81 + GROUPBOX "Short date", -1, 7, 83, 230, 81 LTEXT "Sample:", -1, 13, 95, 63, 10 EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "Sample - right to left read:", -1, 13, 109, 60, 16 EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP | WS_DISABLED - LTEXT "Short format:", -1, 13, 131, 60, 10 + LTEXT "&Short date format:", -1, 13, 131, 60, 10 COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Date components separator:", -1, 13, 148, 113, 10 + LTEXT "&Date components separator:", -1, 13, 148, 113, 10 COMBOBOX IDC_SHRTDATESEP_COMBO, 180, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - GROUPBOX "Long date format", -1, 7, 167, 230, 64 + GROUPBOX "Long date", -1, 7, 167, 230, 64 LTEXT "Sample:", -1, 13, 179, 61, 10 EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP LTEXT "Sample - right to left read:", -1, 13, 193, 61, 16 EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 153, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP | WS_DISABLED - LTEXT "Long format:", -1, 13, 215, 60, 10 + LTEXT "&Long date format:", -1, 13, 215, 60, 10 COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 153, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE END Modified: trunk/reactos/dll/cpl/timedate/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/en-U… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/lang/en-US.rc [iso-8859-1] Sun Feb 14 10:56:55 2016 @@ -34,10 +34,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "Automatically synchronize with an Internet time server", + AUTOCHECKBOX "Automatically &synchronize with an Internet time server", IDC_AUTOSYNC, 11, 7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP LTEXT "Server:", IDC_SERVERTEXT, 34, 22, 28, 13 - PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + PUSHBUTTON "&Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 12, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 LTEXT "Synchronization can only occur when your computer is connected to the Internet.", -1, 12, 114, 225, 25 Modified: trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/en-US.rc [iso-8859-1] Sun Feb 14 10:56:55 2016 @@ -12,8 +12,8 @@ PUSHBUTTON "A&dd...", IDC_USERS_ADD, 87, 98, 50, 14 PUSHBUTTON "&Remove", IDC_USERS_REMOVE, 141, 98, 50, 14 PUSHBUTTON "Pr&operties", IDC_USERS_PROPERTIES, 195, 98, 50, 14 - AUTOCHECKBOX "Require user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED - PUSHBUTTON "Reset Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED + AUTOCHECKBOX "Re&quire user name and password on system startup.", IDC_USERS_STARTUP_REQUIRE, 10, 118, 200, 14, WS_DISABLED + PUSHBUTTON "R&eset Password", IDC_USERS_RESET, 165, 200, 80, 14, WS_DISABLED END IDD_GROUPS DIALOGEX 0, 0, 252, 223 Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/en… ============================================================================== --- trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/wined3dcfg/lang/en-US.rc [iso-8859-1] Sun Feb 14 10:56:55 2016 @@ -7,26 +7,26 @@ BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 GROUPBOX "Shaders", -1, 5, 25, 230, 80 - LTEXT "Enable GLSL:", -1, 15, 42, 120, 10 + LTEXT "&Enable GLSL:", -1, 15, 42, 120, 10 COMBOBOX IDC_GLSL, 135, 40, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Maximum GS Level:", -1, 15, 57, 120, 10 + LTEXT "Maximum &GS Level:", -1, 15, 57, 120, 10 COMBOBOX IDC_GSLEVEL, 135, 55, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Maximum PS Level:", -1, 15, 72, 120, 10 + LTEXT "Maximum &PS Level:", -1, 15, 72, 120, 10 COMBOBOX IDC_PSLEVEL, 135, 70, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Maximum VS Level:", -1, 15, 87, 120, 10 + LTEXT "Maximum &VS Level:", -1, 15, 87, 120, 10 COMBOBOX IDC_VSLEVEL, 135, 85, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST GROUPBOX "Rendering", -1, 5, 110, 230, 110 - LTEXT "Multisampling:", -1, 15, 127, 120, 10 + LTEXT "&Multisampling:", -1, 15, 127, 120, 10 COMBOBOX IDC_MULTISAMPLING, 135, 125, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Strict Draw Ordering:", -1, 15, 142, 120, 10 + LTEXT "&Strict Draw Ordering:", -1, 15, 142, 120, 10 COMBOBOX IDC_STRICTDRAWORDERING, 135, 140, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Offscreen Rendering:", -1, 15, 157, 120, 10 + LTEXT "&Offscreen Rendering:", -1, 15, 157, 120, 10 COMBOBOX IDC_OFFSCREEN, 135, 155, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Always Offscreen:", -1, 15, 172, 120, 10, SS_LEFT + LTEXT "Al&ways Offscreen:", -1, 15, 172, 120, 10, SS_LEFT COMBOBOX IDC_ALWAYSOFFSCREEN, 135, 170, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Video Memory Size:", -1, 15, 187, 120, 10, SS_LEFT + LTEXT "Video Memory Si&ze:", -1, 15, 187, 120, 10, SS_LEFT COMBOBOX IDC_VIDMEMSIZE, 135, 185, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "DirectDraw Renderer:", -1, 15, 202, 120, 10, SS_LEFT + LTEXT "&DirectDraw Renderer:", -1, 15, 202, 120, 10, SS_LEFT COMBOBOX IDC_DDRENDERER, 135, 200, 90, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST END

8 years, 9 months

[ekohl] 70739: [USERINIT] Update Simplified/Traditional Chinese Translation. Patch by Henry Tang Ih. CORE-10825 #resolve #comment Thank you very much!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 14 09:00:47 2016 New Revision: 70739 URL: http://svn.reactos.org/svn/reactos?rev=70739&view=rev Log: [USERINIT] Update Simplified/Traditional Chinese Translation. Patch by Henry Tang Ih. CORE-10825 #resolve #comment Thank you very much! Modified: trunk/reactos/base/system/userinit/lang/zh-CN.rc trunk/reactos/base/system/userinit/lang/zh-TW.rc Modified: trunk/reactos/base/system/userinit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/zh-CN.rc [iso-8859-1] Sun Feb 14 09:00:47 2016 @@ -8,15 +8,15 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "è¯è¨:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "é®çå¸å±:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + LTEXT "éæ©æ¨çè¯è¨åé®çå¸å±ï¼è¯·åå»ä¸ä¸æ¥ç»§ç»ã", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 - DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + DEFPUSHBUTTON "ä¸ä¸æ¥(&N)", IDOK, 205, 172, 50, 14 + PUSHBUTTON "åæ¶(&C)", IDCANCEL, 260, 172, 50, 14 END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 @@ -25,23 +25,23 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + DEFPUSHBUTTON "è¿è¡ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 130, 175, 21 LTEXT "", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 - PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + PUSHBUTTON "ä¸ä¸é¡µ(&P)", IDOK, 205, 172, 50, 14 + PUSHBUTTON "åæ¶(&C)", IDCANCEL, 260, 172, 50, 14 END STRINGTABLE BEGIN IDS_SHELL_FAIL "Userinit æ æ³å¯å¨å¤å£³ï¼\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_INSTALLER_FAIL "Userinit å¯å¨å®è£ç¨åºå¤±è´¥!\n" END STRINGTABLE BEGIN - IDS_SPAIN "Spanish (Spain)" + IDS_SPAIN "è¥¿ççè¯ (è¥¿çç)" END Modified: trunk/reactos/base/system/userinit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/zh-TW.rc [iso-8859-1] Sun Feb 14 09:00:47 2016 @@ -8,15 +8,15 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "èªè¨:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + RTEXT "éµç¤éç½®:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Select your language and keyboard layout and click Next to continue.", IDC_STATIC, 7, 152, 300, 8 + LTEXT "é¸ææ¨çèªè¨åéµç¤éç½®ï¼è«æä¸ä¸ä¸ä¸æ¥ç¹¼çºã", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 - DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + DEFPUSHBUTTON "ä¸ä¸æ¥(&N)", IDOK, 205, 172, 50, 14 + PUSHBUTTON "åæ¶(&C)", IDCANCEL, 260, 172, 50, 14 END IDD_STARTPAGE DIALOGEX 0, 0, 317, 193 @@ -25,23 +25,23 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 - PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21 + DEFPUSHBUTTON "éè¡ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21 + PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 130, 175, 21 LTEXT "", IDC_STATIC, 7, 152, 300, 8 GROUPBOX "", IDC_STATIC, 0, 165, 317, 1 - PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14 - PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14 + PUSHBUTTON "ä¸ä¸é (&P)", IDOK, 205, 172, 50, 14 + PUSHBUTTON "åæ¶(&C)", IDCANCEL, 260, 172, 50, 14 END STRINGTABLE BEGIN IDS_SHELL_FAIL "Userinit ç¡æ³ååå¤æ®¼ï¼\n" - IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n" + IDS_INSTALLER_FAIL "Userinit ååå®è£ç¨å¼å¤±æ!\n" END STRINGTABLE BEGIN - IDS_SPAIN "Spanish (Spain)" + IDS_SPAIN "è¥¿ççæ (è¥¿çç)" END

8 years, 9 months

[hbelusca] 70738: [CLIPBRD] - Avoid calling OpenClipboard with a NULL window handle. - Display the clipboard erasing confirmation message before actually opening and resetting its contents. [WIN32K...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 14 01:52:58 2016 New Revision: 70738 URL: http://svn.reactos.org/svn/reactos?rev=70738&view=rev Log: [CLIPBRD] - Avoid calling OpenClipboard with a NULL window handle. - Display the clipboard erasing confirmation message before actually opening and resetting its contents. [WIN32K] - Improve few comments. - In UserOpenClipboard, return success early in case the clipboard was already opened by the clipboard owner. Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/winutils.c trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sun Feb 14 01:52:58 2016 @@ -65,17 +65,21 @@ static void LoadClipboardDataFromFile(LPWSTR lpszFileName) { + if (MessageBoxRes(Globals.hMainWnd, Globals.hInstance, + STRING_DELETE_MSG, STRING_DELETE_TITLE, + MB_ICONWARNING | MB_YESNO) != IDYES) + { + return; + } + if (!OpenClipboard(Globals.hMainWnd)) { ShowLastWin32Error(Globals.hMainWnd); return; } - if (MessageBoxRes(Globals.hMainWnd, Globals.hInstance, STRING_DELETE_MSG, STRING_DELETE_TITLE, MB_ICONWARNING | MB_YESNO) == IDYES) - { - EmptyClipboard(); - ReadClipboardFile(lpszFileName); - } + EmptyClipboard(); + ReadClipboardFile(lpszFileName); CloseClipboard(); } @@ -227,10 +231,14 @@ case CMD_DELETE: { - if (MessageBoxRes(Globals.hMainWnd, Globals.hInstance, STRING_DELETE_MSG, STRING_DELETE_TITLE, MB_ICONWARNING | MB_YESNO) == IDYES) - { - DeleteClipboardContent(); - } + if (MessageBoxRes(Globals.hMainWnd, Globals.hInstance, + STRING_DELETE_MSG, STRING_DELETE_TITLE, + MB_ICONWARNING | MB_YESNO) != IDYES) + { + break; + } + + DeleteClipboardContent(); break; } @@ -272,10 +280,8 @@ PAINTSTRUCT ps; RECT rc; - if (!OpenClipboard(NULL)) - { - return; - } + if (!OpenClipboard(Globals.hMainWnd)) + return; hdc = BeginPaint(hWnd, &ps); GetClientRect(hWnd, &rc); Modified: trunk/reactos/base/applications/clipbrd/winutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] Sun Feb 14 01:52:58 2016 @@ -243,7 +243,7 @@ UINT uResult; HDC hDevContext; - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) { return GDI_ERROR; } Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sun Feb 14 01:52:58 2016 @@ -124,7 +124,7 @@ static BOOL FASTCALL IntIsClipboardOpenByMe(PWINSTATION_OBJECT pWinSta) { - /* Check if current thread has opened the clipboard */ + /* Check if the current thread has opened the clipboard */ return (pWinSta->ptiClipLock && pWinSta->ptiClipLock == PsGetCurrentThreadWin32Thread()); } @@ -386,7 +386,7 @@ if (!pWinStaObj) goto cleanup; - /* Check if clipboard has been opened */ + /* Check if the clipboard has been opened */ if (!IntIsClipboardOpenByMe(pWinStaObj)) { EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN); @@ -433,18 +433,22 @@ if (!pWinStaObj) goto cleanup; - if (pWinStaObj->ptiClipLock) - { - /* Clipboard is already opened */ - if (pWinStaObj->spwndClipOpen != pWindow) - { - ERR("Access denied!\n"); - EngSetLastError(ERROR_ACCESS_DENIED); - goto cleanup; - } - } - - /* Open clipboard */ + /* Check if we already opened the clipboard */ + if ((pWindow == pWinStaObj->spwndClipOpen) && IntIsClipboardOpenByMe(pWinStaObj)) + { + bRet = TRUE; + goto cleanup; + } + + /* If the clipboard was already opened by somebody else, bail out */ + if ((pWindow != pWinStaObj->spwndClipOpen) && pWinStaObj->ptiClipLock) + { + ERR("Access denied!\n"); + EngSetLastError(ERROR_ACCESS_DENIED); + goto cleanup; + } + + /* Open the clipboard */ pWinStaObj->spwndClipOpen = pWindow; pWinStaObj->ptiClipLock = PsGetCurrentThreadWin32Thread(); bRet = TRUE; @@ -478,7 +482,7 @@ if (!pWinStaObj) goto cleanup; - /* Check if clipboard has been opened */ + /* Check if the clipboard has been opened */ if (!IntIsClipboardOpenByMe(pWinStaObj)) { EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN); @@ -613,7 +617,7 @@ if (!pWinStaObj) return FALSE; - /* Check if clipboard has been opened */ + /* Check if the clipboard has been opened */ if (!IntIsClipboardOpenByMe(pWinStaObj)) { EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN); @@ -834,7 +838,7 @@ if (!pWinStaObj) goto cleanup; - /* Check if clipboard has been opened */ + /* Check if the clipboard has been opened */ if (!IntIsClipboardOpenByMe(pWinStaObj)) { EngSetLastError(ERROR_CLIPBOARD_NOT_OPEN);

8 years, 9 months

[hbelusca] 70737: [CLIPBRD] - Update the name of the application. [SHORTCUTS] - Add a clipboard viewer shortcut into the start menu (for boot and live-cd). CORE-10853 Translators, please review!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 13 23:54:42 2016 New Revision: 70737 URL: http://svn.reactos.org/svn/reactos?rev=70737&view=rev Log: [CLIPBRD] - Update the name of the application. [SHORTCUTS] - Add a clipboard viewer shortcut into the start menu (for boot and live-cd). CORE-10853 Translators, please review! Modified: trunk/reactos/base/applications/clipbrd/lang/de-DE.rc trunk/reactos/base/applications/clipbrd/lang/en-US.rc trunk/reactos/base/applications/clipbrd/lang/es-ES.rc trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc trunk/reactos/base/applications/clipbrd/lang/zh-CN.rc trunk/reactos/base/applications/clipbrd/lang/zh-TW.rc trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/base/applications/clipbrd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/de-DE.rc [iso-8859-1] Sat Feb 13 23:54:42 2016 @@ -32,7 +32,7 @@ STRINGTABLE BEGIN - STRING_CLIPBOARD "Zwischenablage" + STRING_CLIPBOARD "Clipboard Viewer" STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "Soll der Inhalt der Zwischenablage gelÃ¶scht werden?" STRING_DELETE_TITLE "Zwischenablage lÃ¶schen" Modified: trunk/reactos/base/applications/clipbrd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/en-US.rc [iso-8859-1] Sat Feb 13 23:54:42 2016 @@ -32,7 +32,7 @@ STRINGTABLE BEGIN - STRING_CLIPBOARD "Clipboard" + STRING_CLIPBOARD "Clipboard Viewer" STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "Clear contents of the Clipboard?" STRING_DELETE_TITLE "Clear Clipboard" Modified: trunk/reactos/base/applications/clipbrd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/es-ES.rc [iso-8859-1] Sat Feb 13 23:54:42 2016 @@ -34,7 +34,7 @@ STRINGTABLE BEGIN - STRING_CLIPBOARD "Portapapeles" + STRING_CLIPBOARD "Clipboard Viewer" STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "Â¿Borrar contenidos del Portapapeles?" STRING_DELETE_TITLE "Vaciar Portapapeles" Modified: trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc [iso-8859-1] Sat Feb 13 23:54:42 2016 @@ -32,7 +32,7 @@ STRINGTABLE BEGIN - STRING_CLIPBOARD "Presse-papiers" + STRING_CLIPBOARD "Visionneuse du Presse-papiers" STRING_CLIPFILE "ÃlÃ©ment du Presse-papiers" STRING_DELETE_MSG "Voulez-vous effacer le contenu du Presse-papiers ?" STRING_DELETE_TITLE "Effacer le Presse-papiers" Modified: trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc [iso-8859-1] Sat Feb 13 23:54:42 2016 @@ -33,7 +33,7 @@ STRINGTABLE BEGIN - STRING_CLIPBOARD "Clipboard" + STRING_CLIPBOARD "Clipboard Viewer" STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "EliminÄ conÈinutul din Clipboard?" STRING_DELETE_TITLE "CurÄÈÄ Clipboard" Modified: trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc [iso-8859-1] Sat Feb 13 23:54:42 2016 @@ -34,7 +34,7 @@ STRINGTABLE BEGIN - STRING_CLIPBOARD "Pano" + STRING_CLIPBOARD "Clipboard Viewer" STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "Pano iÃ§eriÄini sil?" STRING_DELETE_TITLE "Pano Sil" Modified: trunk/reactos/base/applications/clipbrd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/zh-CN.rc [iso-8859-1] Sat Feb 13 23:54:42 2016 @@ -34,7 +34,7 @@ STRINGTABLE BEGIN - STRING_CLIPBOARD "åªè´´æ¿" + STRING_CLIPBOARD "Clipboard Viewer" STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "æ¸é¤åªè´´æ¿çåå®¹å?" STRING_DELETE_TITLE "æ¸é¤åªè´´æ¿" Modified: trunk/reactos/base/applications/clipbrd/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/zh-TW.rc [iso-8859-1] Sat Feb 13 23:54:42 2016 @@ -34,7 +34,7 @@ STRINGTABLE BEGIN - STRING_CLIPBOARD "åªè²¼ç°¿" + STRING_CLIPBOARD "Clipboard Viewer" STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "æ¸é¤åªè²¼ç°¿çå§å®¹å?" STRING_DELETE_TITLE "æ¸é¤åªè²¼ç°¿" Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Sat Feb 13 23:54:42 2016 @@ -46,6 +46,8 @@ FOR livecd) endmacro(add_livecd_shortcut) +## NOTE: What would be nice is to create this list using /media/inf/shortcuts.inf +## and taking their default english translation! add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/livecd_start.cmd" DESTINATION "Profiles/Default User/My Documents" FOR livecd) add_livecd_shortcut("Command Prompt" cmd.exe "Profiles/All Users/Desktop") add_livecd_shortcut("Device Manager" devmgmt.exe "Profiles/All Users/Start Menu/Programs/Administrative Tools") @@ -67,6 +69,7 @@ add_livecd_shortcut("Spider Solitaire" spider.exe "Profiles/All Users/Start Menu/Programs/Games") add_livecd_shortcut("WineMine" winmine.exe "Profiles/All Users/Start Menu/Programs/Games") add_livecd_shortcut("Character Map" charmap.exe "Profiles/All Users/Start Menu/Programs/System Tools") +add_livecd_shortcut("Clipboard Viewer" clipbrd.exe "Profiles/All Users/Start Menu/Programs/System Tools") add_livecd_shortcut("Keyboard Layout Switcher" kbswitch.exe "Profiles/All Users/Start Menu/Programs/System Tools") add_livecd_shortcut("ReactX Diagnostic" dxdiag.exe "Profiles/All Users/Start Menu/Programs/System Tools") add_livecd_shortcut("Regedit" regedit.exe "Profiles/All Users/Start Menu/Programs/System Tools") Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Sat Feb 13 23:54:42 2016 @@ -40,6 +40,7 @@ [SystemToolsShortcuts] %SystemRoot%\system32\charmap.exe, %CHARMAP_TITLE%, %CHARMAP_DESC%, 0 +%SystemRoot%\system32\clipbrd.exe, %CLIPBRD_TITLE%, %CLIPBRD_DESC%, 0 %SystemRoot%\system32\kbswitch.exe, %KBSWITCH_TITLE%, %KBSWITCH_DESC%, 0 %SystemRoot%\regedit.exe, %REGEDIT_TITLE%, %REGEDIT_DESC%, 0 %SystemRoot%\system32\dxdiag.exe, %DXDIAG_TITLE%, %DXDIAG_DESC%, 0 @@ -98,6 +99,8 @@ MSPAINT_DESC=Launch Paint CHARMAP_TITLE=Character Map CHARMAP_DESC=Character Map +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Keyboard Layout Switcher REGEDIT_TITLE=Registry Editor @@ -159,6 +162,8 @@ MSPAINT_DESC=ÐÑÑÐºÐ°Ð½Ðµ Ð½Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð·Ð° ÑÐ¸ÑÑÐ²Ð°Ð½Ðµ CHARMAP_TITLE=ÐÐ½Ð°ÐºÐ¾Ð²Ð° ÑÐ°Ð±Ð»Ð¸ÑÐ° CHARMAP_DESC=ÐÐ½Ð°ÐºÐ¾Ð²Ð° ÑÐ°Ð±Ð»Ð¸ÑÐ° +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=ÐÑÐµÐ²ÐºÐ»ÑÑÐ²Ð°ÑÐµÐ» Ð½Ð° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ½Ð¸ÑÐµ Ð¿Ð¾Ð´ÑÐµÐ´Ð±Ð¸ KBSWITCH_DESC=ÐÑÐµÐ²ÐºÐ»ÑÑÐ²Ð°ÑÐµÐ» Ð½Ð° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ½Ð¸ÑÐµ Ð¿Ð¾Ð´ÑÐµÐ´Ð±Ð¸ REGEDIT_TITLE=ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° ÑÐµÐ³Ð¸ÑÑÑÑÐ° @@ -220,6 +225,8 @@ MSPAINT_DESC=Spustit MalovÃ¡nÃ CHARMAP_TITLE=Mapa znakÅ¯ CHARMAP_DESC=Spustit Mapu znakÅ¯ +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=PÅepÃnaÄ rozloÅ¾enÃ klÃ¡vesnice KBSWITCH_DESC=Spustit PÅepÃnaÄ rozloÅ¾enÃ klÃ¡vesnice REGEDIT_TITLE=Editor registru @@ -281,6 +288,8 @@ MSPAINT_DESC=Starte Paint CHARMAP_TITLE=Zeichentabelle CHARMAP_DESC=Zeichentabelle +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Tastaturlayout-Umschalter KBSWITCH_DESC=Tastaturlayout-Umschalter REGEDIT_TITLE=Registrierungseditor @@ -342,6 +351,8 @@ MSPAINT_DESC=Launch Paint CHARMAP_TITLE=Î Î¯Î½Î±ÎºÎ±Ï Î§Î±ÏÎ±ÎºÏÎ®ÏÏÎ½ CHARMAP_DESC=Î Î¯Î½Î±ÎºÎ±Ï Î§Î±ÏÎ±ÎºÏÎ®ÏÏÎ½ +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=ÎÎ»Î»Î±Î³Î® ÎÎ¹Î¬ÏÎ±Î¾Î·Ï Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î¯Î¿Ï KBSWITCH_DESC=ÎÎ»Î»Î±Î³Î® ÎÎ¹Î¬ÏÎ±Î¾Î·Ï Î Î»Î·ÎºÏÏÎ¿Î»Î¿Î³Î¯Î¿Ï REGEDIT_TITLE=ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï Î¼Î·ÏÏÏÎ¿Ï @@ -403,6 +414,8 @@ MSPAINT_DESC=Ejecuta un sencillo programa de ediciÃ³n de imÃ¡genes. CHARMAP_TITLE=Mapa de caracteres CHARMAP_DESC=Ejecuta el mapa de caracteres. +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Ajustes de distribuciÃ³n de teclado KBSWITCH_DESC=Cambia la distribuciÃ³n de teclas del equipo. REGEDIT_TITLE=Editor del Registro @@ -464,6 +477,8 @@ MSPAINT_DESC=Ava Paint CHARMAP_TITLE=Character Map CHARMAP_DESC=KirjamÃ¤rkide Tabel +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Klaviatuuriasetuse Muutmine REGEDIT_TITLE=Registriredaktor @@ -525,6 +540,8 @@ MSPAINT_DESC=Lancer Paint CHARMAP_TITLE=Table des CaractÃ¨res CHARMAP_DESC=Table des CaractÃ¨res +CLIPBRD_TITLE=Visionneuse du Presse-papiers +CLIPBRD_DESC=Visionneuse du Presse-papiers KBSWITCH_TITLE=SÃ©lecteur de configuration clavier KBSWITCH_DESC=SÃ©lecteur de configuration clavier REGEDIT_TITLE=Ãditeur de Registre @@ -586,6 +603,8 @@ MSPAINT_DESC=×¦×××¨ CHARMAP_TITLE=××¤×ª ×ª×××× CHARMAP_DESC=××¤×ª ××ª×××× +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Keyboard Layout Switcher REGEDIT_TITLE=×¢××¨× ××¨××©×× @@ -647,6 +666,8 @@ MSPAINT_DESC=Launch Paint CHARMAP_TITLE=CharMap CHARMAP_DESC=CharMap +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Keyboard Layout Switcher REGEDIT_TITLE=Registry Editor @@ -708,6 +729,8 @@ MSPAINT_DESC=Launch Paint CHARMAP_TITLE=CharMap CHARMAP_DESC=CharMap +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Keyboard Layout Switcher REGEDIT_TITLE=Editor Registri @@ -769,6 +792,8 @@ MSPAINT_DESC=Lancia Paint CHARMAP_TITLE=Mappa caratteri CHARMAP_DESC=Mappa dei caratteri +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Layout di tastiera KBSWITCH_DESC=Cambia il layout di tastiera REGEDIT_TITLE=Editor del registro @@ -830,6 +855,8 @@ MSPAINT_DESC=ãã¤ã³ããèµ·åãã¾ã CHARMAP_TITLE=æåã³ã¼ãè¡¨ CHARMAP_DESC=æåã³ã¼ãè¡¨ +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=ãã¼ãã¼ã ã¬ã¤ã¢ã¦ã åæ¿å¨ KBSWITCH_DESC=ãã¼ãã¼ãã¬ã¤ã¢ã¦ãåæ¿å¨ REGEDIT_TITLE=ã¬ã¸ã¹ããª ã¨ãã£ã¿ @@ -891,6 +918,8 @@ MSPAINT_DESC=Launch Paint CHARMAP_TITLE=CharMap CHARMAP_DESC=CharMap +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Keyboard Layout Switcher REGEDIT_TITLE=Registry Editor @@ -952,6 +981,8 @@ MSPAINT_DESC=Start Paint CHARMAP_TITLE=CharMap CHARMAP_DESC=Tegnkart +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Endre tastaturvalg REGEDIT_TITLE=Registerredigering @@ -1013,6 +1044,8 @@ MSPAINT_DESC=Uruchom Paint CHARMAP_TITLE=Tablica znakÃ³w CHARMAP_DESC=Tablica znakÃ³w +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Zmiana ukÅadu klawiatury KBSWITCH_DESC=Zmiana ukÅadu klawiatury REGEDIT_TITLE=Edytor rejestru @@ -1074,6 +1107,8 @@ MSPAINT_DESC=Iniciar Paint CHARMAP_TITLE=Character Map CHARMAP_DESC=Mapa de Caracteres +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Keyboard Layout Switcher KBSWITCH_DESC=Alterador de Layout de Teclado REGEDIT_TITLE=Editor do Registro @@ -1135,6 +1170,8 @@ MSPAINT_DESC=Editor de imagini elementar. CHARMAP_TITLE=HartÄ de caractere CHARMAP_DESC=Program de acces la toate caracterele disponibile. +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=Comutator aranjamente de tastaturÄ KBSWITCH_DESC=Program pentru comutarea aranjamentelor de tastaturÄ. REGEDIT_TITLE=Editor de registru @@ -1196,6 +1233,8 @@ MSPAINT_DESC=Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð¸ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ¸ÑÑÐ½ÐºÐ¾Ð². CHARMAP_TITLE=Ð¢Ð°Ð±Ð»Ð¸ÑÐ° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² CHARMAP_DESC=ÐÐ¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð²Ð²Ð¾Ð´Ð¸ÑÑ Ð¾ÑÑÑÑÑÑÐ²ÑÑÑÐ¸Ðµ Ð½Ð° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐµ Ð·Ð½Ð°ÐºÐ¸. +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=ÐÐµÑÐµÐºÐ»ÑÑÐ°ÑÐµÐ»Ñ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ KBSWITCH_DESC=ÐÐµÑÐµÐºÐ»ÑÑÐ°ÑÐµÐ»Ñ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ REGEDIT_TITLE=Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÐµÑÑÑÐ° @@ -1257,6 +1296,8 @@ MSPAINT_DESC=SpustiÅ¥ SkicÃ¡r CHARMAP_TITLE=Mapa znakov CHARMAP_DESC=Mapa znakov +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=PrepÃnaÄ rozloÅ¾enia klÃ¡vesnice KBSWITCH_DESC=PrepÃnaÄ rozloÅ¾enia klÃ¡vesnice REGEDIT_TITLE=Editor registrov @@ -1318,6 +1359,8 @@ MSPAINT_DESC=Paint'i baÅlat CHARMAP_TITLE=Damga EÅlem CHARMAP_DESC=Damga EÅlem'i baÅlat +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=DÃ¼Äme TakÄ±mÄ± DÃ¼zeni DeÄiÅtiricisi KBSWITCH_DESC=DÃ¼Äme TakÄ±mÄ± DÃ¼zeni DeÄiÅtiricisi REGEDIT_TITLE=DeÄer Defteri DÃ¼zenleyicisi @@ -1379,6 +1422,8 @@ MSPAINT_DESC=ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸ ÐÑÐ°ÑÑÑÐ½Ð¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Paint CHARMAP_TITLE=Ð¢Ð°Ð±Ð»Ð¸ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ² CHARMAP_DESC=Ð¢Ð°Ð±Ð»Ð¸ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ² +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=ÐÐµÑÐµÐ¼Ð¸ÐºÐ°Ñ ÑÐ¾Ð·ÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²ÑÐ°ÑÑÑÐ¸ KBSWITCH_DESC=ÐÐµÑÐµÐ¼Ð¸ÐºÐ°Ñ ÑÐ¾Ð·ÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²ÑÐ°ÑÑÑÐ¸ REGEDIT_TITLE=Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÑÑÑÑÑ @@ -1440,6 +1485,8 @@ MSPAINT_DESC=å¯å¨å°ç»å®¶ CHARMAP_TITLE=åç¬¦æ å°è¡¨ CHARMAP_DESC=åç¬¦æ å°è¡¨ +CLIPBRD_TITLE=Clipboard Viewer +CLIPBRD_DESC=Clipboard Viewer KBSWITCH_TITLE=é®çå¸å±åæ¢å¨ KBSWITCH_DESC=å¯å¨é®çå¸å±åæ¢å¨ REGEDIT_TITLE=æ³¨åè¡¨ç¼è¾å¨

8 years, 9 months

[hbelusca] 70736: [CLIPBRD] - Add clipboard file icon by Jared Smudde. - Open any clipboard data file given in the command line. [BOOTDATA] - Add registry entries for file extension .clp. CORE-1085...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 13 23:16:19 2016 New Revision: 70736 URL: http://svn.reactos.org/svn/reactos?rev=70736&view=rev Log: [CLIPBRD] - Add clipboard file icon by Jared Smudde. - Open any clipboard data file given in the command line. [BOOTDATA] - Add registry entries for file extension .clp. CORE-10853 #resolve #comment Support added in revision 70736. Added: trunk/reactos/base/applications/clipbrd/res/clpfile.ico (with props) Modified: trunk/reactos/base/applications/clipbrd/CMakeLists.txt trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/clipbrd.rc trunk/reactos/base/applications/clipbrd/lang/de-DE.rc trunk/reactos/base/applications/clipbrd/lang/en-US.rc trunk/reactos/base/applications/clipbrd/lang/es-ES.rc trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc trunk/reactos/base/applications/clipbrd/lang/zh-CN.rc trunk/reactos/base/applications/clipbrd/lang/zh-TW.rc trunk/reactos/base/applications/clipbrd/resources.h trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/base/applications/clipbrd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/CMakeLists.txt [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -2,9 +2,9 @@ list(APPEND SOURCE clipbrd.c cliputils.c - winutils.c fileutils.c scrollutils.c + winutils.c precomp.h) add_executable(clipbrd ${SOURCE} clipbrd.rc) Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -63,6 +63,23 @@ CloseClipboard(); } +static void LoadClipboardDataFromFile(LPWSTR lpszFileName) +{ + if (!OpenClipboard(Globals.hMainWnd)) + { + ShowLastWin32Error(Globals.hMainWnd); + return; + } + + if (MessageBoxRes(Globals.hMainWnd, Globals.hInstance, STRING_DELETE_MSG, STRING_DELETE_TITLE, MB_ICONWARNING | MB_YESNO) == IDYES) + { + EmptyClipboard(); + ReadClipboardFile(lpszFileName); + } + + CloseClipboard(); +} + static void LoadClipboardFromFile(void) { OPENFILENAMEW ofn; @@ -87,19 +104,7 @@ if (!GetOpenFileNameW(&ofn)) return; - if (!OpenClipboard(Globals.hMainWnd)) - { - ShowLastWin32Error(Globals.hMainWnd); - return; - } - - if (MessageBoxRes(Globals.hMainWnd, Globals.hInstance, STRING_DELETE_MSG, STRING_DELETE_TITLE, MB_ICONWARNING | MB_YESNO) == IDYES) - { - EmptyClipboard(); - ReadClipboardFile(szFileName); - } - - CloseClipboard(); + LoadClipboardDataFromFile(szFileName); } static void LoadClipboardFromDrop(HDROP hDrop) @@ -109,19 +114,7 @@ DragQueryFileW(hDrop, 0, szFileName, ARRAYSIZE(szFileName)); DragFinish(hDrop); - if (!OpenClipboard(Globals.hMainWnd)) - { - ShowLastWin32Error(Globals.hMainWnd); - return; - } - - if (MessageBoxRes(Globals.hMainWnd, Globals.hInstance, STRING_DELETE_MSG, STRING_DELETE_TITLE, MB_ICONWARNING | MB_YESNO) == IDYES) - { - EmptyClipboard(); - ReadClipboardFile(szFileName); - } - - CloseClipboard(); + LoadClipboardDataFromFile(szFileName); } static void SetDisplayFormat(UINT uFormat) @@ -169,7 +162,7 @@ DrawMenuBar(Globals.hMainWnd); } -void UpdateDisplayMenu(void) +static void UpdateDisplayMenu(void) { UINT uFormat; WCHAR szFormatName[MAX_FMT_NAME_LEN + 1]; @@ -258,7 +251,7 @@ WCHAR szTitle[MAX_STRING_LEN]; HICON hIcon; - hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCE(CLIP_ICON)); + hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCE(CLIPBRD_ICON)); LoadStringW(Globals.hInstance, STRING_CLIPBOARD, szTitle, ARRAYSIZE(szTitle)); ShellAboutW(Globals.hMainWnd, szTitle, 0, hIcon); DeleteObject(hIcon); @@ -346,6 +339,28 @@ { switch(uMsg) { + case WM_CREATE: + { + Globals.hMenu = GetMenu(hWnd); + Globals.hWndNext = SetClipboardViewer(hWnd); + UpdateDisplayMenu(); + SetDisplayFormat(0); + break; + } + + case WM_CLOSE: + { + DestroyWindow(hWnd); + break; + } + + case WM_DESTROY: + { + ChangeClipboardChain(hWnd, Globals.hWndNext); + PostQuitMessage(0); + break; + } + case WM_PAINT: { ClipboardPaintHandler(hWnd, uMsg, wParam, lParam); @@ -392,28 +407,6 @@ InvalidateRect(Globals.hMainWnd, NULL, TRUE); } - break; - } - - case WM_CREATE: - { - Globals.hMenu = GetMenu(hWnd); - Globals.hWndNext = SetClipboardViewer(hWnd); - UpdateDisplayMenu(); - SetDisplayFormat(0); - break; - } - - case WM_CLOSE: - { - DestroyWindow(hWnd); - break; - } - - case WM_DESTROY: - { - ChangeClipboardChain(hWnd, Globals.hWndNext); - PostQuitMessage(0); break; } @@ -534,7 +527,7 @@ wndclass.cbSize = sizeof(wndclass); wndclass.lpfnWndProc = MainWndProc; wndclass.hInstance = hInstance; - wndclass.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(CLIP_ICON)); + wndclass.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(CLIPBRD_ICON)); wndclass.hCursor = LoadCursorW(0, IDC_ARROW); wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndclass.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU); @@ -574,6 +567,10 @@ ShowLastWin32Error(Globals.hMainWnd); } + /* If the user provided a path to a clipboard data file, try to open it */ + if (lpCmdLine != NULL && *lpCmdLine) + LoadClipboardDataFromFile(lpCmdLine); + UpdateLinesToScroll(); while (GetMessageW(&msg, 0, 0, 0)) Modified: trunk/reactos/base/applications/clipbrd/clipbrd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.rc [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -8,7 +8,8 @@ #define REACTOS_STR_ORIGINAL_FILENAME "clipbrd.exe" #include <reactos/version.rc> -CLIP_ICON ICON "res/clipbrd.ico" +CLIPBRD_ICON ICON "res/clipbrd.ico" +CLPFILE_ICON ICON "res/clpfile.ico" #include <reactos/manifest_exe.rc> Modified: trunk/reactos/base/applications/clipbrd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/de-DE.rc [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -33,6 +33,7 @@ STRINGTABLE BEGIN STRING_CLIPBOARD "Zwischenablage" + STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "Soll der Inhalt der Zwischenablage gelÃ¶scht werden?" STRING_DELETE_TITLE "Zwischenablage lÃ¶schen" STRING_FORMAT_NT "Zwischenablagedateien fÃ¼r ReactOS (*.clp)" Modified: trunk/reactos/base/applications/clipbrd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/en-US.rc [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -33,6 +33,7 @@ STRINGTABLE BEGIN STRING_CLIPBOARD "Clipboard" + STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "Clear contents of the Clipboard?" STRING_DELETE_TITLE "Clear Clipboard" STRING_FORMAT_NT "Clipboard files for ReactOS (*.clp)" Modified: trunk/reactos/base/applications/clipbrd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/es-ES.rc [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -35,6 +35,7 @@ STRINGTABLE BEGIN STRING_CLIPBOARD "Portapapeles" + STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "Â¿Borrar contenidos del Portapapeles?" STRING_DELETE_TITLE "Vaciar Portapapeles" STRING_FORMAT_NT "Archivos de Portapapeles de ReactOS (*.clp)" Modified: trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -18,7 +18,7 @@ BEGIN MENUITEM "&Supprimer\tSuppr", CMD_DELETE END - POPUP "&Affichage" + POPUP "Affic&hage" BEGIN MENUITEM "&Automatique", CMD_AUTOMATIC END @@ -33,6 +33,7 @@ STRINGTABLE BEGIN STRING_CLIPBOARD "Presse-papiers" + STRING_CLIPFILE "ÃlÃ©ment du Presse-papiers" STRING_DELETE_MSG "Voulez-vous effacer le contenu du Presse-papiers ?" STRING_DELETE_TITLE "Effacer le Presse-papiers" STRING_FORMAT_NT "Fichiers du Presse-papiers ReactOS (*.clp)" Modified: trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/ro-RO.rc [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -34,6 +34,7 @@ STRINGTABLE BEGIN STRING_CLIPBOARD "Clipboard" + STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "EliminÄ conÈinutul din Clipboard?" STRING_DELETE_TITLE "CurÄÈÄ Clipboard" STRING_FORMAT_NT "FiÈiere clipboard pentru ReactOS (*.clp)" Modified: trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/tr-TR.rc [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -35,6 +35,7 @@ STRINGTABLE BEGIN STRING_CLIPBOARD "Pano" + STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "Pano iÃ§eriÄini sil?" STRING_DELETE_TITLE "Pano Sil" STRING_FORMAT_NT "ReactOS Ä°Ã§in Pano KÃ¼tÃ¼kleri (*.clp)" Modified: trunk/reactos/base/applications/clipbrd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/zh-CN.rc [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -35,6 +35,7 @@ STRINGTABLE BEGIN STRING_CLIPBOARD "åªè´´æ¿" + STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "æ¸é¤åªè´´æ¿çåå®¹å?" STRING_DELETE_TITLE "æ¸é¤åªè´´æ¿" STRING_FORMAT_NT "ReactOS çåªè´´æ¿æä»¶ (*.clp)" Modified: trunk/reactos/base/applications/clipbrd/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/zh-TW.rc [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -35,6 +35,7 @@ STRINGTABLE BEGIN STRING_CLIPBOARD "åªè²¼ç°¿" + STRING_CLIPFILE "Clipboard Element" STRING_DELETE_MSG "æ¸é¤åªè²¼ç°¿çå§å®¹å?" STRING_DELETE_TITLE "æ¸é¤åªè²¼ç°¿" STRING_FORMAT_NT "ReactOS çåªè²¼ç°¿æªæ¡ (*.clp)" Added: trunk/reactos/base/applications/clipbrd/res/clpfile.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/clipbrd/res/clpfile.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/clipbrd/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/resources.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/resources.h [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -1,38 +1,40 @@ #pragma once -#define MAIN_MENU 100 -#define CLIP_ICON 101 -#define ID_ACCEL 102 +#define CLIPBRD_ICON 100 +#define CLPFILE_ICON 101 +#define MAIN_MENU 102 +#define ID_ACCEL 103 -#define CMD_OPEN 100 -#define CMD_SAVE_AS 101 -#define CMD_EXIT 102 -#define CMD_DELETE 103 -#define CMD_HELP 105 -#define CMD_ABOUT 106 +#define CMD_OPEN 110 +#define CMD_SAVE_AS 111 +#define CMD_EXIT 112 +#define CMD_DELETE 113 +#define CMD_HELP 115 +#define CMD_ABOUT 116 #define CMD_AUTOMATIC 1000 -#define STRING_CLIPBOARD 100 -#define STRING_DELETE_MSG 101 -#define STRING_DELETE_TITLE 102 -#define STRING_FORMAT_NT 103 -#define STRING_FORMAT_GEN 104 +#define STRING_CLIPBOARD 120 +#define STRING_CLIPFILE 121 +#define STRING_DELETE_MSG 123 +#define STRING_DELETE_TITLE 124 +#define STRING_FORMAT_NT 125 +#define STRING_FORMAT_GEN 126 #define STRING_CF_UNKNOWN 200 #define STRING_CF_TEXT 201 #define STRING_CF_BITMAP 202 -#define STRING_CF_OEMTEXT 203 -#define STRING_CF_UNICODETEXT 204 -#define STRING_CF_DIB 205 -#define STRING_CF_LOCALE 206 -#define STRING_CF_ENHMETAFILE 207 -#define STRING_CF_METAFILEPICT 208 +#define STRING_CF_METAFILEPICT 203 +#define STRING_CF_SYLK 204 +#define STRING_CF_DIF 205 +#define STRING_CF_OEMTEXT 207 +#define STRING_CF_DIB 208 #define STRING_CF_PALETTE 209 -#define STRING_CF_DIBV5 210 -#define STRING_CF_SYLK 211 -#define STRING_CF_DIF 212 -#define STRING_CF_HDROP 213 +#define STRING_CF_UNICODETEXT 213 +#define STRING_CF_ENHMETAFILE 214 +#define STRING_CF_HDROP 215 +#define STRING_CF_LOCALE 216 +#define STRING_CF_DIBV5 217 #define ERROR_UNSUPPORTED_FORMAT 300 #define ERROR_INVALID_FILE_FORMAT 301 Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sat Feb 13 23:16:19 2016 @@ -22,6 +22,13 @@ HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}","",0x00000000,"Drive Property Page Extension" HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}\InProcServer32","",0x00000000,"shell32.dll" HKCR,"CLSID\{5F5295E0-429F-1069-A2E2-08002B30309D}\InProcServer32","ThreadingModel",0x00000000,"Apartment" + +; Clipboard Element +HKCR,".clp","",0x00000000,"clpfile" +HKCR,"clpfile","",0x00000000,"Clipboard Element" +HKCR,"clpfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\clipbrd.exe,-121" +HKCR,"clpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\clipbrd.exe,1" +HKCR,"clpfile\shell\open\command","",0x00000000,"clipbrd.exe %1" ; Rich Text Files HKCR,".rtf","",0x00000000,"rtffile"

8 years, 9 months

[hbelusca] 70735: [CLIPBRD]: Finish the implementation of clipboard write file support. There may be room for improvements. CORE-10852 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 13 20:57:39 2016 New Revision: 70735 URL: http://svn.reactos.org/svn/reactos?rev=70735&view=rev Log: [CLIPBRD]: Finish the implementation of clipboard write file support. There may be room for improvements. CORE-10852 #resolve Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/cliputils.c trunk/reactos/base/applications/clipbrd/cliputils.h trunk/reactos/base/applications/clipbrd/fileutils.c Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Feb 13 20:57:39 2016 @@ -193,7 +193,7 @@ uFormat = EnumClipboardFormats(0); while (uFormat) { - RetrieveClipboardFormatName(Globals.hInstance, uFormat, szFormatName, ARRAYSIZE(szFormatName)); + RetrieveClipboardFormatName(Globals.hInstance, uFormat, TRUE, szFormatName, ARRAYSIZE(szFormatName)); if (!IsClipboardFormatSupported(uFormat)) { Modified: trunk/reactos/base/applications/clipbrd/cliputils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] Sat Feb 13 20:57:39 2016 @@ -8,73 +8,61 @@ #include "precomp.h" -int GetPredefinedClipboardFormatName(HINSTANCE hInstance, UINT uFormat, LPWSTR lpszFormat, UINT cch) +static int +GetPredefinedClipboardFormatName(HINSTANCE hInstance, + UINT uFormat, + BOOL Unicode, + PVOID lpszFormat, + UINT cch) { + static + struct FORMAT_NAME + { + UINT uFormat; + UINT uResID; + } uFormatList[] = { + /* Table sorted in increasing order of CF_xxx values, please keep it this way! */ + {CF_TEXT , STRING_CF_TEXT }, // 1 + {CF_BITMAP , STRING_CF_BITMAP }, // 2 + {CF_METAFILEPICT, STRING_CF_METAFILEPICT}, // 3 + {CF_SYLK , STRING_CF_SYLK }, // 4 + {CF_DIF , STRING_CF_DIF }, // 5 + {CF_TIFF , 0/*STRING_CF_TIFF*/ }, // 6 + {CF_OEMTEXT , STRING_CF_OEMTEXT }, // 7 + {CF_DIB , STRING_CF_DIB }, // 8 + {CF_PALETTE , STRING_CF_PALETTE }, // 9 + {CF_PENDATA , 0/*STRING_CF_PENDATA*/ }, // 10 + {CF_RIFF , 0/*STRING_CF_RIFF*/ }, // 11 + {CF_WAVE , 0/*STRING_CF_WAVE*/ }, // 12 + {CF_UNICODETEXT , STRING_CF_UNICODETEXT }, // 13 + {CF_ENHMETAFILE , STRING_CF_ENHMETAFILE }, // 14 +#if(WINVER >= 0x0400) + {CF_HDROP , STRING_CF_HDROP }, // 15 + {CF_LOCALE , STRING_CF_LOCALE }, // 16 +#endif +#if(WINVER >= 0x0500) + {CF_DIBV5 , STRING_CF_DIBV5 }, // 17 +#endif + }; + switch (uFormat) { - case CF_TEXT: + case CF_TEXT: case CF_BITMAP: case CF_METAFILEPICT: + case CF_SYLK: case CF_DIF: // case CF_TIFF: + case CF_OEMTEXT: case CF_DIB: case CF_PALETTE: + // case CF_PENDATA: // case CF_RIFF: // case CF_WAVE: + case CF_UNICODETEXT: case CF_ENHMETAFILE: +#if(WINVER >= 0x0400) + case CF_HDROP: case CF_LOCALE: +#endif +#if(WINVER >= 0x0500) + case CF_DIBV5: +#endif { - return LoadStringW(hInstance, STRING_CF_TEXT, lpszFormat, cch); - } - - case CF_BITMAP: - { - return LoadStringW(hInstance, STRING_CF_BITMAP, lpszFormat, cch); - } - - case CF_OEMTEXT: - { - return LoadStringW(hInstance, STRING_CF_OEMTEXT, lpszFormat, cch); - } - - case CF_UNICODETEXT: - { - return LoadStringW(hInstance, STRING_CF_UNICODETEXT, lpszFormat, cch); - } - - case CF_DIB: - { - return LoadStringW(hInstance, STRING_CF_DIB, lpszFormat, cch); - } - - case CF_LOCALE: - { - return LoadStringW(hInstance, STRING_CF_LOCALE, lpszFormat, cch); - } - - case CF_ENHMETAFILE: - { - return LoadStringW(hInstance, STRING_CF_ENHMETAFILE, lpszFormat, cch); - } - - case CF_METAFILEPICT: - { - return LoadStringW(hInstance, STRING_CF_METAFILEPICT, lpszFormat, cch); - } - - case CF_PALETTE: - { - return LoadStringW(hInstance, STRING_CF_PALETTE, lpszFormat, cch); - } - - case CF_DIBV5: - { - return LoadStringW(hInstance, STRING_CF_DIBV5, lpszFormat, cch); - } - - case CF_SYLK: - { - return LoadStringW(hInstance, STRING_CF_SYLK, lpszFormat, cch); - } - - case CF_DIF: - { - return LoadStringW(hInstance, STRING_CF_DIF, lpszFormat, cch); - } - - case CF_HDROP: - { - return LoadStringW(hInstance, STRING_CF_HDROP, lpszFormat, cch); + if (Unicode) + return LoadStringW(hInstance, uFormatList[uFormat-1].uResID, (LPWSTR)lpszFormat, cch); + else + return LoadStringA(hInstance, uFormatList[uFormat-1].uResID, (LPSTR)lpszFormat, cch); } default: @@ -84,13 +72,24 @@ } } -void RetrieveClipboardFormatName(HINSTANCE hInstance, UINT uFormat, LPWSTR lpszFormat, UINT cch) +void +RetrieveClipboardFormatName(HINSTANCE hInstance, + UINT uFormat, + BOOL Unicode, + PVOID lpszFormat, + UINT cch) { - if (!GetPredefinedClipboardFormatName(hInstance, uFormat, lpszFormat, cch)) + if (!GetPredefinedClipboardFormatName(hInstance, uFormat, Unicode, lpszFormat, cch)) { - if (!GetClipboardFormatNameW(uFormat, lpszFormat, cch)) + if (Unicode) { - LoadStringW(hInstance, STRING_CF_UNKNOWN, lpszFormat, cch); + if (!GetClipboardFormatNameW(uFormat, (LPWSTR)lpszFormat, cch)) + LoadStringW(hInstance, STRING_CF_UNKNOWN, (LPWSTR)lpszFormat, cch); + } + else + { + if (!GetClipboardFormatNameA(uFormat, (LPSTR)lpszFormat, cch)) + LoadStringA(hInstance, STRING_CF_UNKNOWN, (LPSTR)lpszFormat, cch); } } } Modified: trunk/reactos/base/applications/clipbrd/cliputils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/cliputils.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/cliputils.h [iso-8859-1] Sat Feb 13 20:57:39 2016 @@ -6,8 +6,13 @@ * PROGRAMMERS: Ricardo Hanke */ -int GetPredefinedClipboardFormatName(HINSTANCE hInstance, UINT uFormat, LPWSTR lpszFormat, UINT cch); -void RetrieveClipboardFormatName(HINSTANCE hInstance, UINT uFormat, LPWSTR lpszFormat, UINT cch); +void +RetrieveClipboardFormatName(HINSTANCE hInstance, + UINT uFormat, + BOOL Unicode, + PVOID lpszFormat, + UINT cch); + void DeleteClipboardContent(void); UINT GetAutomaticClipboardFormat(void); BOOL IsClipboardFormatSupported(UINT uFormat); Modified: trunk/reactos/base/applications/clipbrd/fileutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] Sat Feb 13 20:57:39 2016 @@ -81,6 +81,39 @@ return TRUE; } +static BOOL ClipboardWriteMemory(HANDLE hFile, DWORD dwFormat, DWORD dwOffset, PDWORD pdwLength) +{ + HGLOBAL hData; + LPVOID lpData; + DWORD dwBytesWritten; + + hData = GetClipboardData(dwFormat); + if (!hData) + return FALSE; + + lpData = GlobalLock(hData); + if (!lpData) + return FALSE; + + *pdwLength = GlobalSize(hData); + + if (SetFilePointer(hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + GlobalUnlock(hData); + return FALSE; + } + + if (!WriteFile(hFile, lpData, *pdwLength, &dwBytesWritten, NULL)) + { + GlobalUnlock(hData); + return FALSE; + } + + GlobalUnlock(hData); + + return TRUE; +} + static BOOL ClipboardReadPalette(HANDLE hFile, DWORD dwOffset, DWORD dwLength) { LPLOGPALETTE lpPalette; @@ -286,7 +319,6 @@ SizeOfFormatHeader = sizeof(CLIPFORMATHEADER); pClipFileHeader = &ClipFileHeader; pClipFormatArray = &ClipFormatArray; - // MessageBox(Globals.hMainWnd, L"We have a Win3.11 clipboard file!", L"File format", 0); break; case CLIP_FMT_NT: @@ -295,7 +327,6 @@ SizeOfFormatHeader = sizeof(NTCLIPFORMATHEADER); pClipFileHeader = &NtClipFileHeader; pClipFormatArray = &NtClipFormatArray; - // MessageBox(Globals.hMainWnd, L"We have a WinNT clipboard file!", L"File format", 0); break; default: @@ -436,8 +467,6 @@ DWORD dwBytesWritten; int i; - WCHAR szFormatName[MAX_FMT_NAME_LEN]; - /* Create the file for write access */ hFile = CreateFileW(lpFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -457,7 +486,6 @@ SizeOfFormatHeader = sizeof(CLIPFORMATHEADER); pClipFileHeader = &ClipFileHeader; pClipFormatArray = &ClipFormatArray; - // MessageBox(Globals.hMainWnd, L"We write a Win3.11 clipboard file!", L"File format", 0); ClipFileHeader.wFileIdentifier = CLIP_FMT_31; // wFileIdentifier ClipFileHeader.wFormatCount = wFormatCount; @@ -469,7 +497,6 @@ SizeOfFormatHeader = sizeof(NTCLIPFORMATHEADER); pClipFileHeader = &NtClipFileHeader; pClipFormatArray = &NtClipFormatArray; - // MessageBox(Globals.hMainWnd, L"We write a WinNT clipboard file!", L"File format", 0); NtClipFileHeader.wFileIdentifier = CLIP_FMT_NT; // wFileIdentifier NtClipFileHeader.wFormatCount = wFormatCount; @@ -497,35 +524,43 @@ dwFormatID = EnumClipboardFormats(0); while (dwFormatID) { - if (i >= wFormatCount) assert(FALSE); // break; - - RetrieveClipboardFormatName(Globals.hInstance, dwFormatID, szFormatName, ARRAYSIZE(szFormatName)); - - // TODO: Copy the format name string into the format header, - // possibly converting into ANSI for Win3.1 format, and render - // in the file the different type of data. From the renderers - // we retrieve the real size of the data into 'dwLenData'. - /* TODO: Write the data stream at 'dwOffData' */ - dwLenData = 0; - - /* Write format data */ + if (i >= wFormatCount) + { + /* Must never happen! */ + assert(FALSE); + break; + } + + /* Write the clipboard data at the specified offset, and retrieve its length */ + if (!ClipboardWriteMemory(hFile, dwFormatID, dwOffData, &dwLenData)) + goto Cont; + + /* Write the format data header */ switch (wFileIdentifier) { case CLIP_FMT_31: + ZeroMemory(pClipFormatArray, sizeof(CLIPFORMATHEADER)); ((CLIPFORMATHEADER*)pClipFormatArray)->dwFormatID = dwFormatID; ((CLIPFORMATHEADER*)pClipFormatArray)->dwLenData = dwLenData; ((CLIPFORMATHEADER*)pClipFormatArray)->dwOffData = dwOffData; - // szName = ((CLIPFORMATHEADER*)pClipFormatArray)->szName; - ZeroMemory( ((CLIPFORMATHEADER*)pClipFormatArray)->szName , sizeof(((CLIPFORMATHEADER*)pClipFormatArray)->szName) ); + RetrieveClipboardFormatName(Globals.hInstance, + dwFormatID, + FALSE, + ((CLIPFORMATHEADER*)pClipFormatArray)->szName, + ARRAYSIZE(((CLIPFORMATHEADER*)pClipFormatArray)->szName)); break; case CLIP_FMT_NT: case CLIP_FMT_BK: + ZeroMemory(pClipFormatArray, sizeof(NTCLIPFORMATHEADER)); ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwFormatID = dwFormatID; ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwLenData = dwLenData; ((NTCLIPFORMATHEADER*)pClipFormatArray)->dwOffData = dwOffData; - // szName = ((NTCLIPFORMATHEADER*)pClipFormatArray)->szName; - ZeroMemory( ((NTCLIPFORMATHEADER*)pClipFormatArray)->szName , sizeof(((NTCLIPFORMATHEADER*)pClipFormatArray)->szName) ); + RetrieveClipboardFormatName(Globals.hInstance, + dwFormatID, + TRUE, + ((NTCLIPFORMATHEADER*)pClipFormatArray)->szName, + ARRAYSIZE(((NTCLIPFORMATHEADER*)pClipFormatArray)->szName)); break; } @@ -544,6 +579,7 @@ /* Adjust the offset for the next data stream */ dwOffData += dwLenData; +Cont: i++; dwFormatID = EnumClipboardFormats(dwFormatID); }

8 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2016