Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[cgutman] 35102: - Revert the rest of r35080 - The memory is freed in AfdAccept
by cgutman＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: cgutman Date: Mon Aug 4 10:19:23 2008 New Revision: 35102 URL: http://svn.reactos.org/svn/reactos?rev=35102&view=rev Log: - Revert the rest of r35080 - The memory is freed in AfdAccept Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Mon Aug 4 10:19:23 2008 @@ -131,12 +131,11 @@ PLIST_ENTRY PendingIrp = RemoveHeadList( &FCB->PendingIrpList[FUNCTION_PREACCEPT] ); PLIST_ENTRY PendingConn = FCB->PendingConnections.Flink; - Qelt = CONTAINING_RECORD( PendingConn, AFD_TDI_OBJECT_QELT, ListEntry ); SatisfyPreAccept ( CONTAINING_RECORD( PendingIrp, IRP, Tail.Overlay.ListEntry ), - Qelt ); - ExFreePool( Qelt ); + CONTAINING_RECORD( PendingConn, AFD_TDI_OBJECT_QELT, + ListEntry ) ); } FCB->NeedsNewListen = TRUE;

1 0

[cgutman] 35101: - Revert part of r35080
by cgutman＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: cgutman Date: Mon Aug 4 10:16:44 2008 New Revision: 35101 URL: http://svn.reactos.org/svn/reactos?rev=35101&view=rev Log: - Revert part of r35080 Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Mon Aug 4 10:16:44 2008 @@ -513,8 +513,6 @@ AFD_DbgPrint(MID_TRACE,("Completing\n")); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } - - ExFreePool( DatagramRecv ); } if( !IsListEmpty( &FCB->DatagramList ) ) {

1 0

[janderwald] 35100: - implement executing control panel item by its CLSID - should make applets like folder options, antivir(not a true applet) start
by janderwald＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: janderwald Date: Mon Aug 4 09:54:53 2008 New Revision: 35100 URL: http://svn.reactos.org/svn/reactos?rev=35100&view=rev Log: - implement executing control panel item by its CLSID - should make applets like folder options, antivir(not a true applet) start Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo… ============================================================================== --- trunk/reactos/dll/win32/shell32/cpanelfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/cpanelfolder.c [iso-8859-1] Mon Aug 4 09:54:53 2008 @@ -984,6 +984,45 @@ return IUnknown_Release(This->pUnkOuter); } +HRESULT +ExecuteAppletFromCLSID(LPOLESTR pOleStr) +{ + WCHAR szCmd[MAX_PATH]; + WCHAR szExpCmd[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + WCHAR szBuffer[90] = { 'C', 'L', 'S', 'I', 'D', '\\', 0 }; + DWORD dwType, dwSize; + + wcscpy(&szBuffer[6], pOleStr); + wcscat(szBuffer, L"\\shell\\open\\command"); + + dwSize = sizeof(szCmd); + if (RegGetValueW(HKEY_CLASSES_ROOT, szBuffer, NULL, RRF_RT_REG_SZ, &dwType, (PVOID)szCmd, &dwSize) != ERROR_SUCCESS) + { + ERR("RegGetValueW failed with %u\n", GetLastError()); + return E_FAIL; + } + +#if 0 + if (dwType != RRF_RT_REG_SZ && dwType != RRF_RT_REG_EXPAND_SZ) + return E_FAIL; +#endif + + if (!ExpandEnvironmentStringsW(szCmd, szExpCmd, sizeof(szExpCmd)/sizeof(WCHAR))) + return E_FAIL; + + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + if (!CreateProcessW(NULL, szExpCmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + return E_FAIL; + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + return S_OK; +} + + static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LPSHELLEXECUTEINFOW psei) { static const WCHAR wCplopen[] = {'c','p','l','o','p','e','n','\0'}; @@ -994,18 +1033,33 @@ WCHAR path[MAX_PATH]; WCHAR params[MAX_PATH]; BOOL ret; + HRESULT hr; int l; TRACE("(%p)->execute(%p)\n", This, psei); if (!psei) - return E_INVALIDARG; + return E_INVALIDARG; pcpanel = _ILGetCPanelPointer(ILFindLastID(psei->lpIDList)); if (!pcpanel) - return E_INVALIDARG; - + { + LPOLESTR pOleStr; + + IID * iid = _ILGetGUIDPointer(ILFindLastID(psei->lpIDList)); + if (!iid) + return E_INVALIDARG; + if (StringFromCLSID(iid, &pOleStr) == S_OK) + { + + hr = ExecuteAppletFromCLSID(pOleStr); + CoTaskMemFree(pOleStr); + return hr; + } + + return E_INVALIDARG; + } path[0] = '\"'; /* Return value from MultiByteToWideChar includes terminating NUL, which * compensates for the starting double quote we just put in */ @@ -1025,9 +1079,9 @@ ret = ShellExecuteExW(&sei_tmp); if (ret) - return S_OK; + return S_OK; else - return S_FALSE; + return S_FALSE; } static const IShellExecuteHookWVtbl vt_ShellExecuteHookW =

1 0

[dchapyshev] 35099: - Update Russian translation
by dchapyshev＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: dchapyshev Date: Mon Aug 4 09:20:16 2008 New Revision: 35099 URL: http://svn.reactos.org/svn/reactos?rev=35099&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc [iso-8859-1] Mon Aug 4 09:20:16 2008 @@ -5,24 +5,24 @@ CAPTION "Ñêîðîñòü" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ïîâòîð ââîäèìîãî ñèìâîëà", -1, 5, 5, 230, 150 - ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 - LTEXT "&Çàäåðæêà ïåðåä íà÷àëîì ïîâòîðà:", -1, 40, 15, 160, 10 - LTEXT "Äëèííåå", -1, 25, 30, 28, 10 - LTEXT "Êîðî÷å", -1, 200, 30, 25, 10 - CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 + GROUPBOX "Ïîâòîð ââîäèìîãî ñèìâîëà", -1, 5, 5, 236, 150 + ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 20, 15, 15 + LTEXT "&Çàäåðæêà ïåðåä íà÷àëîì ïîâòîðà:", -1, 51, 20, 160, 10 + LTEXT "Äëèííåå", -1, 50, 42, 35, 11 + LTEXT "Êîðî÷å", -1, 190, 42, 33, 10 + CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 84, 35, 102, 17 ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 - LTEXT "&Ñêîðîñòü ïîâòîðà:", -1, 40, 70, 100, 10 - LTEXT "Íèæå", -1, 40, 85, 20, 10 - LTEXT "Âûøå", -1, 200, 85, 20, 10 - CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 - LTEXT "&×òîáû ïðîâåðèòü ñêîðîñòü ïîâòîðà, ïîìåñòèòå êóðñîð â ïîëå, íàæìèòå ëþáóþ êëàâèøó è íå îòïóñêàéòå åå:", -1, 15, 105, 200, 22 - EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 130, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "×àñòîòà ìåðöàíèÿ êóðñîðà", -1, 5, 165, 230, 50 - LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 185, 1, 8 - LTEXT "Íèæå", -1, 40, 185, 30, 10 - LTEXT "Âûøå", -1, 200, 185, 30, 10 - CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 185, 130, 17 + LTEXT "&Ñêîðîñòü ïîâòîðà:", -1, 51, 70, 100, 10 + LTEXT "Íèæå", -1, 60, 91, 22, 10 + LTEXT "Âûøå", -1, 191, 91, 22, 10 + CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 84, 85, 102, 17 + LTEXT "&×òîáû ïðîâåðèòü ñêîðîñòü ïîâòîðà, ïîìåñòèòå êóðñîð â ïîëå, íàæìèòå ëþáóþ êëàâèøó è íå îòïóñêàéòå åå:", -1, 15, 105, 216, 22 + EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 130, 213, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "×àñòîòà ìåðöàíèÿ êóðñîðà", -1, 5, 160, 236, 50 + LTEXT "", IDC_TEXT_CURSOR_BLINK, 23, 180, 1, 8 + LTEXT "Íèæå", -1, 45, 180, 30, 10 + LTEXT "Âûøå", -1, 205, 180, 30, 10 + CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 70, 180, 130, 17 END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 @@ -32,17 +32,17 @@ BEGIN END -IDD_CLICK_LOCK DIALOGEX 0, 0, 246, 100 +IDD_CLICK_LOCK DIALOGEX 0, 0, 234, 100 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU CAPTION "Çàëèïàíèå êëàâèø" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Êîðî÷å", -1, 35, 50, 30, 10 - LTEXT "Äëèííåå", -1, 140, 50, 30, 10 - CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 50, 70, 17 - PUSHBUTTON "&OK", IDOK, 120, 75, 50, 15 - PUSHBUTTON "&Îòìåíà", IDCANCEL, 175, 75, 50, 15 - LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,60,15,170,30 + LTEXT "Êîðî÷å", -1, 60, 50, 30, 10 + LTEXT "Äîëüøå", -1, 165, 50, 30, 10 + CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 50, 70, 17 + PUSHBUTTON "&OK", IDOK, 120, 79, 50, 15 + PUSHBUTTON "&Îòìåíà", IDCANCEL, 177, 79, 50, 15 + LTEXT "&Âûáåðèòå, êàê äîëãî ñëåäóåò óäåðæèâàòü íàæàòîé êíîïêó ìûøè èëè òðåêáîëà äëÿ òîãî, ÷òîáû ñðàáîòàëî çàëèïàíèå.",-1,60,15,170,30 ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 15, 15, 15, 15 END @@ -51,20 +51,20 @@ CAPTION "Êíîïêè ìûøè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Êîíôèãóðàöèÿ êíîïîê", -1, 5, 5, 230, 70 - CHECKBOX "&Îáìåíÿòü íàçíà÷åíèå êíîïîê", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE - LTEXT "Íàçíà÷àåò ïðàâóþ êíîïêó äëÿ âûïîëíåíèÿ òàêèõ îñíîâíûõ ôóíêöèé, êàê âûáîð è ïåðåòàñêèâàíèå. ×àñòî èñïîëüçóåòñÿ òåìè, êòî ðàáîòàåò ìûøüþ ëåâîé ðóêîé.", -1, 10, 30, 150, 30 - GROUPBOX "Ñêîðîñòü âûïîëíåíèÿ äâîéíîãî ùåë÷êà", -1, 5, 75, 230, 70 - LTEXT "Ñäåëàéòå äâîéíîé ùåë÷îê ïî ýòîìó çíà÷êó. Åñëè ïàïêà íå îòêðûâàåòñÿ èëè íå çàêðûâàåòñÿ, âûáåðèòå áîëåå íèçêóþ ñêîðîñòü.", -1, 10, 85, 150, 30 - LTEXT "&Ñêîðîñòü: Íèæå", -1, 10, 120, 90, 8 - LTEXT "Âûøå", -1, 140, 120, 30, 8 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 67, 121, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE - GROUPBOX "Çàëèïàíèå êíîïêè ìûøè", -1, 5, 150, 230, 70 - CHECKBOX "&Âêëþ÷èòü çàëèïàíèå", IDC_CHECK_CLICK_LOCK, 10, 160, 84, 20 - PUSHBUTTON "&Ïàðàìåòðû...", IDC_BUTTON_CLICK_LOCK, 170, 160, 55, 14 - LTEXT "Ïîçâîëÿåò âûïîëíÿòü âûäåëåíèå è ïåðåòàñêèâàíèå áåç óäåðæèâàíèÿ êíîïêè íàæàòîé. Äëÿ âêëþ÷åíèÿ íåíàäîëãî çàäåðæèòå êíîïêó ìûøè â íàæàòîì ïîëîæåíèè. Äëÿ îñâîáîæäåíèÿ ñíîâà ñäåëàéòå ùåë÷îê.", -1, 10, 180, 200, 30 + GROUPBOX "Êîíôèãóðàöèÿ êíîïîê", -1, 5, 5, 236, 70 + CHECKBOX "&Îáìåíÿòü íàçíà÷åíèå êíîïîê", IDC_SWAP_MOUSE_BUTTONS, 14, 17, 140, 10 + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 176, 16, 58, 51, WS_EX_STATICEDGE + LTEXT "Íàçíà÷àåò ïðàâóþ êíîïêó äëÿ âûïîëíåíèÿ òàêèõ îñíîâíûõ ôóíêöèé, êàê âûáîð è ïåðåòàñêèâàíèå. ×àñòî èñïîëüçóåòñÿ òåìè, êòî ðàáîòàåò ìûøüþ ëåâîé ðóêîé.", -1, 12, 30, 150, 38 + GROUPBOX "Ñêîðîñòü âûïîëíåíèÿ äâîéíîãî ùåë÷êà", -1, 5, 79, 236, 70 + LTEXT "Ñäåëàéòå äâîéíîé ùåë÷îê ïî ýòîìó çíà÷êó. Åñëè ïàïêà íå îòêðûâàåòñÿ èëè íå çàêðûâàåòñÿ, âûáåðèòå áîëåå íèçêóþ ñêîðîñòü.", -1, 12, 89, 160, 35 + LTEXT "&Ñêîðîñòü: Íèæå", -1, 12, 124, 61, 10 + LTEXT "Âûøå", -1, 146, 124, 24, 10 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 71, 125, 70, 17 + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 176, 90, 58, 51, WS_EX_STATICEDGE + GROUPBOX "Çàëèïàíèå êíîïêè ìûøè", -1, 5, 153, 236, 70 + CHECKBOX "&Âêëþ÷èòü çàëèïàíèå", IDC_CHECK_CLICK_LOCK, 14, 164, 99, 17 + PUSHBUTTON "&Ïàðàìåòðû...", IDC_BUTTON_CLICK_LOCK, 173, 165, 55, 14 + LTEXT "Ïîçâîëÿåò âûïîëíÿòü âûäåëåíèå è ïåðåòàñêèâàíèå áåç óäåðæèâàíèÿ êíîïêè íàæàòîé. Äëÿ âêëþ÷åíèÿ íåíàäîëãî çàäåðæèòå êíîïêó ìûøè â íàæàòîì ïîëîæåíèè. Äëÿ îñâîáîæäåíèÿ ñíîâà ñäåëàéòå ùåë÷îê.", -1, 12, 183, 222, 36 END IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 @@ -72,27 +72,27 @@ CAPTION "Óêàçàòåëè" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ñõåìà", -1, 5, 5, 170, 45 - COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 160, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Ñîõðàíèòü &êàê...", IDC_BUTTON_SAVEAS_SCHEME, 60, 30, 65, 15 - PUSHBUTTON "&Óäàëèòü", IDC_BUTTON_DELETE_SCHEME, 130, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE + GROUPBOX "Ñõåìà", -1, 5, 5, 183, 45 + COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 172, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Ñîõðàíèòü &êàê...", IDC_BUTTON_SAVEAS_SCHEME, 58, 30, 70, 14 + PUSHBUTTON "&Óäàëèòü", IDC_BUTTON_DELETE_SCHEME, 132, 30, 50, 14 + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 195, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Íàñòðîéêà", -1, 5, 60, 40, 10 - LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY - CHECKBOX "Âêëþ÷èòü &òåíü óêàçàòåëÿ", IDC_CHECK_DROP_SHADOW, 5, 203, 105, 10 - PUSHBUTTON "&Ïî óìîë÷àíèþ", IDC_BUTTON_USE_DEFAULT_CURSOR, 115, 200, 60, 15 - PUSHBUTTON "&Îáçîð", IDC_BUTTON_BROWSE_CURSOR, 180, 200, 55, 15 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 235, 125, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY + CHECKBOX "Âêëþ÷èòü &òåíü óêàçàòåëÿ", IDC_CHECK_DROP_SHADOW, 5, 203, 108, 10 + PUSHBUTTON "&Ïî óìîë÷àíèþ", IDC_BUTTON_USE_DEFAULT_CURSOR, 116, 200, 64, 14 + PUSHBUTTON "&Îáçîð", IDC_BUTTON_BROWSE_CURSOR, 185, 200, 55, 14 END -IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 75 +IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 200, 65 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU CAPTION "Ñîõðàíåíèå ñõåìû" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Íàçâàíèå ñîõðàíÿåìîé ñõåìû óêàçàòåëåé ìûøè:", -1, 5, 5, 100, 10 - EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "&OK", IDOK, 60, 45, 50, 15 - PUSHBUTTON "&Îòìåíà", IDCANCEL, 115, 45, 50, 15 + LTEXT "Íàçâàíèå ñîõðàíÿåìîé ñõåìû óêàçàòåëåé ìûøè:", -1, 5, 5, 190, 10 + EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 18, 190, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&OK", IDOK, 90, 45, 50, 15 + PUSHBUTTON "&Îòìåíà", IDCANCEL, 145, 45, 50, 15 END @@ -101,28 +101,28 @@ CAPTION "Ïàðàìåòðû óêàçàòåëÿ" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ïåðåìåùåíèå", -1, 5, 5, 230, 60 + GROUPBOX "Ïåðåìåùåíèå", -1, 5, 5, 236, 60 LTEXT "&Çàäàéòå ñêîðîñòü äâèæåíèå óêàçàòåëÿ:", -1, 60, 15, 150, 10 LTEXT "Íèæå", -1, 60, 30, 20, 10 CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Âûøå", -1, 170, 30, 20, 10 - ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 + ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 15, 18, 15, 15 CHECKBOX "&Âêëþ÷èòü ïîâûøåííóþ òî÷íîñòü óñòàíîâêè óêàçàòåëÿ", IDC_CHECK_POINTER_PRECISION, 20, 50, 205, 10 - GROUPBOX "Èñõîäíîå ïîëîæåíèå â äèàëîãîâîì îêíå", -1, 5, 65, 230, 40 + GROUPBOX "Èñõîäíîå ïîëîæåíèå â äèàëîãîâîì îêíå", -1, 5, 71, 236, 42 CHECKBOX "&Íà êíîïêå, âûáèðàåìîé ïî óìîë÷àíèþ", - IDC_CHECK_SNAP_TO, 40, 82, 170, 20, BS_MULTILINE | BS_TOP - ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 15, 75, 15, 15 - GROUPBOX "Âèäèìîñòü", -1, 5, 105, 230, 95 - CHECKBOX "&Îòîáðàæàòü ñëåä óêàçàòåëÿ ìûøè", IDC_CHECK_POINTER_TRAIL, 40, 115, 135, 10 - LTEXT "Êîðî÷å", IDC_TEXT_TRAIL_SHORT, 54, 130, 30, 10 - LTEXT "Äëèííåå", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 - ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 115, 15, 15 - CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 82, 130, 70, 17 - CHECKBOX "&Ñêðûâàòü óêàçàòåëü âî âðåìÿ ââîäà ñ êëàâèàòóðû", IDC_CHECK_HIDE_POINTER, 40, 150, 190, 20 - ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 + IDC_CHECK_SNAP_TO, 44, 88, 170, 20, BS_MULTILINE | BS_TOP + ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 15, 83, 15, 15 + GROUPBOX "Âèäèìîñòü", -1, 5, 118, 236, 104 + CHECKBOX "&Îòîáðàæàòü ñëåä óêàçàòåëÿ ìûøè", IDC_CHECK_POINTER_TRAIL, 44, 135, 135, 10 + LTEXT "Êîðî÷å", IDC_TEXT_TRAIL_SHORT, 54, 149, 30, 10 + LTEXT "Äëèííåå", IDC_TEXT_TRAIL_LONG, 160, 149, 30, 10 + ICON IDI_MOUSE_TRAILS, IDC_ICON_POINTER_TRAIL, 15, 134, 15, 15 + CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 82, 146, 70, 17 + CHECKBOX "&Ñêðûâàòü óêàçàòåëü âî âðåìÿ ââîäà ñ êëàâèàòóðû", IDC_CHECK_HIDE_POINTER, 44, 164, 190, 20 + ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 167, 15, 15 CHECKBOX "Îáîçíà÷àòü ïîëî&æåíèå óêàçàòåëÿ ïðè íàæàòèè CTRL", - IDC_CHECK_SHOW_POINTER, 40, 175, 170, 20, BS_MULTILINE | BS_TOP - ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 + IDC_CHECK_SHOW_POINTER, 44, 197, 186, 20, BS_MULTILINE | BS_TOP + ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 194, 15, 15 END IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 @@ -130,9 +130,9 @@ CAPTION "Êîëåñèêî" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Ïðîêðóòêà", -1, 5, 5, 230, 80 - ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32 - LTEXT "Ïîâîðîò êîëåñèêà íà îäèí ùåë÷îê ñëóæèò äëÿ ïðîêðóòêè:", -1, 20, 15, 212, 10 + GROUPBOX "Ïðîêðóòêà", -1, 5, 5, 236, 80 + ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 28, 32, 32 + LTEXT "Ïîâîðîò êîëåñèêà íà îäèí ùåë÷îê ñëóæèò äëÿ ïðîêðóòêè:", -1, 20, 17, 212, 10 RADIOBUTTON "íà óêàçàííîå êîëè÷åñòâî &ñòðîê:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "íà îäèí &ýêðàí", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 56, 12, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP

1 0

[jmorlan] 35098: - cmd_label: If a label is given on the command line, don't truncate it to only 12 characters; NTFS supports up to 32. Also, use _tcsncat, since _tcsncpy won't always nul-terminate. - Don't show the old volume information if a label was given on the command line. (Bug 3621) - If setting the label was unsuccessful, give an error message.
by jmorlan＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: jmorlan Date: Mon Aug 4 09:16:01 2008 New Revision: 35098 URL: http://svn.reactos.org/svn/reactos?rev=35098&view=rev Log: - cmd_label: If a label is given on the command line, don't truncate it to only 12 characters; NTFS supports up to 32. Also, use _tcsncat, since _tcsncpy won't always nul-terminate. - Don't show the old volume information if a label was given on the command line. (Bug 3621) - If setting the label was unsuccessful, give an error message. Modified: trunk/reactos/base/shell/cmd/label.c Modified: trunk/reactos/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/label.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/label.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/label.c [iso-8859-1] Mon Aug 4 09:16:01 2008 @@ -57,7 +57,7 @@ szRootPath[0] = szCurPath[0]; } - _tcsncpy (szLabel, param, 12); + _tcsncat(szLabel, param, 79); /* check root path */ if (!IsValidPathName (szRootPath)) @@ -67,30 +67,35 @@ return 1; } - GetVolumeInformation(szRootPath, szOldLabel, 80, &dwSerialNr, - NULL, NULL, NULL, 0); - - /* print drive info */ - if (szOldLabel[0] != _T('\0')) - { - ConOutResPrintf(STRING_LABEL_HELP2, _totupper(szRootPath[0]), szOldLabel); - } - else - { - ConOutResPrintf(STRING_LABEL_HELP3, _totupper(szRootPath[0])); - } - - /* print the volume serial number */ - ConOutResPrintf(STRING_LABEL_HELP4, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); - if (szLabel[0] == _T('\0')) { + GetVolumeInformation(szRootPath, szOldLabel, 80, &dwSerialNr, + NULL, NULL, NULL, 0); + + /* print drive info */ + if (szOldLabel[0] != _T('\0')) + { + ConOutResPrintf(STRING_LABEL_HELP2, _totupper(szRootPath[0]), szOldLabel); + } + else + { + ConOutResPrintf(STRING_LABEL_HELP3, _totupper(szRootPath[0])); + } + + /* print the volume serial number */ + ConOutResPrintf(STRING_LABEL_HELP4, HIWORD(dwSerialNr), LOWORD(dwSerialNr)); + ConOutResPuts(STRING_LABEL_HELP5); ConInString(szLabel, 80); } - SetVolumeLabel(szRootPath, szLabel); + if (!SetVolumeLabel(szRootPath, szLabel)) + { + ConOutFormatMessage(GetLastError()); + nErrorLevel = 1; + return 1; + } return 0; }

1 0

[janderwald] 35097: - remove debugging msgbox - fix default menu item state
by janderwald＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: janderwald Date: Mon Aug 4 08:47:11 2008 New Revision: 35097 URL: http://svn.reactos.org/svn/reactos?rev=35097&view=rev Log: - remove debugging msgbox - fix default menu item state Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo… ============================================================================== --- trunk/reactos/dll/win32/shell32/cpanelfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/cpanelfolder.c [iso-8859-1] Mon Aug 4 08:47:11 2008 @@ -1187,11 +1187,11 @@ { if (Count) { - _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_SEPARATOR, NULL, MFS_DEFAULT); + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_SEPARATOR, NULL, MFS_ENABLED); } szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; - _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED); Count++; } return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); @@ -1205,12 +1205,8 @@ IContextMenu2 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - WCHAR szBuffer[100]; SHELLEXECUTEINFOW sei; ICPanelImpl *This = impl_from_IContextMenu(iface); - - sprintfW(szBuffer, L"verb %p\n", lpcmi->lpVerb); - MessageBoxW(NULL, szBuffer, L"invoke", MB_OK); if (lpcmi->lpVerb == MAKEINTRESOURCE(1)) {

1 0

[janderwald] 35096: - create a resource string for "create link" - implement a custom context menu for the control panel items - action "create link is not yet implemented
by janderwald＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: janderwald Date: Mon Aug 4 08:43:10 2008 New Revision: 35096 URL: http://svn.reactos.org/svn/reactos?rev=35096&view=rev Log: - create a resource string for "create link" - implement a custom context menu for the control panel items - action "create link is not yet implemented Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/cpanelfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/cpanelfo… ============================================================================== --- trunk/reactos/dll/win32/shell32/cpanelfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/cpanelfolder.c [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" +#include "wine/config.h" #include "wine/port.h" #include <stdlib.h> @@ -63,23 +63,32 @@ const IPersistFolder2Vtbl *lpVtblPersistFolder2; const IShellExecuteHookWVtbl *lpVtblShellExecuteHookW; const IShellExecuteHookAVtbl *lpVtblShellExecuteHookA; - + const IContextMenu2Vtbl *lpVtblContextMenu; IUnknown *pUnkOuter; /* used for aggregation */ /* both paths are parsible from the desktop */ LPITEMIDLIST pidlRoot; /* absolute pidl */ int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ + LPCITEMIDLIST *apidl; + UINT cidl; } ICPanelImpl; static const IShellFolder2Vtbl vt_ShellFolder2; static const IPersistFolder2Vtbl vt_PersistFolder2; static const IShellExecuteHookWVtbl vt_ShellExecuteHookW; static const IShellExecuteHookAVtbl vt_ShellExecuteHookA; +static const IContextMenu2Vtbl vt_ContextMenu; static inline ICPanelImpl *impl_from_IPersistFolder2( IPersistFolder2 *iface ) { return (ICPanelImpl *)((char*)iface - FIELD_OFFSET(ICPanelImpl, lpVtblPersistFolder2)); } + +static inline ICPanelImpl *impl_from_IContextMenu( IContextMenu2 *iface ) +{ + return (ICPanelImpl *)((char*)iface - FIELD_OFFSET(ICPanelImpl, lpVtblContextMenu)); +} + static inline ICPanelImpl *impl_from_IShellExecuteHookW( IShellExecuteHookW *iface ) { @@ -105,6 +114,7 @@ #define _IShellExecuteHookW_(This) (IShellExecuteHookW*)&(This->lpVtblShellExecuteHookW) #define _IShellExecuteHookA_(This) (IShellExecuteHookA*)&(This->lpVtblShellExecuteHookA) + /*********************************************************************** * IShellFolder [ControlPanel] implementation */ @@ -135,10 +145,13 @@ return E_OUTOFMEMORY; sf->ref = 0; + sf->apidl = NULL; + sf->cidl = 0; sf->lpVtbl = &vt_ShellFolder2; sf->lpVtblPersistFolder2 = &vt_PersistFolder2; sf->lpVtblShellExecuteHookW = &vt_ShellExecuteHookW; sf->lpVtblShellExecuteHookA = &vt_ShellExecuteHookA; + sf->lpVtblContextMenu = &vt_ContextMenu; sf->pidlRoot = _ILCreateControlPanel(); /* my qualified pidl */ sf->pUnkOuter = pUnkOuter ? pUnkOuter : _IUnknown_ (sf); @@ -611,7 +624,10 @@ *ppvOut = NULL; if (IsEqualIID(riid, &IID_IContextMenu) &&(cidl >= 1)) { - hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj); + pObj = (IUnknown*)(&This->lpVtblContextMenu); + This->apidl = apidl; + This->cidl = cidl; + IUnknown_AddRef(pObj); } else if (IsEqualIID(riid, &IID_IDataObject) &&(cidl >= 1)) { pObj = (LPUNKNOWN) IDataObject_Constructor(hwndOwner, This->pidlRoot, apidl, cidl); hr = S_OK; @@ -1100,3 +1116,178 @@ IShellExecuteHookA_fnRelease, IShellExecuteHookA_fnExecute }; + +/************************************************************************** +* IContextMenu2 Implementation +*/ + +/************************************************************************ + * ICPanel_IContextMenu_QueryInterface + */ +static HRESULT WINAPI ICPanel_IContextMenu2_QueryInterface(IContextMenu2 * iface, REFIID iid, LPVOID * ppvObject) +{ + ICPanelImpl *This = impl_from_IContextMenu(iface); + + TRACE("(%p)\n", This); + + return IUnknown_QueryInterface(_IUnknown_(This), iid, ppvObject); +} + +/************************************************************************ + * ICPanel_IContextMenu_AddRef + */ +static ULONG WINAPI ICPanel_IContextMenu2_AddRef(IContextMenu2 * iface) +{ + ICPanelImpl *This = impl_from_IContextMenu(iface); + + TRACE("(%p)->(count=%u)\n", This, This->ref); + + return IUnknown_AddRef(_IUnknown_(This)); +} + +/************************************************************************ + * ICPanel_IContextMenu_Release + */ +static ULONG WINAPI ICPanel_IContextMenu2_Release(IContextMenu2 * iface) +{ + ICPanelImpl *This = impl_from_IContextMenu(iface); + + TRACE("(%p)->(count=%u)\n", This, This->ref); + + return IUnknown_Release(_IUnknown_(This)); +} + +/************************************************************************** +* ICPanel_IContextMenu_QueryContextMenu() +*/ +static HRESULT WINAPI ICPanel_IContextMenu2_QueryContextMenu( + IContextMenu2 *iface, + HMENU hMenu, + UINT indexMenu, + UINT idCmdFirst, + UINT idCmdLast, + UINT uFlags) +{ + char szBuffer[30] = {0}; + ULONG Count = 1; + + ICPanelImpl *This = impl_from_IContextMenu(iface); + + TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", + This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + + if (LoadStringA(shell32_hInstance, IDS_OPEN, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); + Count++; + } + + if (LoadStringA(shell32_hInstance, IDS_CREATELINK, szBuffer, sizeof(szBuffer)/sizeof(char))) + { + if (Count) + { + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_SEPARATOR, NULL, MFS_DEFAULT); + } + szBuffer[(sizeof(szBuffer)/sizeof(char))-1] = L'\0'; + + _InsertMenuItem(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT); + Count++; + } + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count); +} + + +/************************************************************************** +* ICPanel_IContextMenu_InvokeCommand() +*/ +static HRESULT WINAPI ICPanel_IContextMenu2_InvokeCommand( + IContextMenu2 *iface, + LPCMINVOKECOMMANDINFO lpcmi) +{ + WCHAR szBuffer[100]; + SHELLEXECUTEINFOW sei; + ICPanelImpl *This = impl_from_IContextMenu(iface); + + sprintfW(szBuffer, L"verb %p\n", lpcmi->lpVerb); + MessageBoxW(NULL, szBuffer, L"invoke", MB_OK); + + if (lpcmi->lpVerb == MAKEINTRESOURCE(1)) + { + ZeroMemory(&sei, sizeof(sei)); + sei.cbSize = sizeof(sei); + sei.fMask = SEE_MASK_INVOKEIDLIST; + sei.lpIDList = ILCombine(This->pidlRoot, This->apidl[0]); + sei.hwnd = lpcmi->hwnd; + sei.nShow = SW_SHOWNORMAL; + sei.lpVerb = L"open"; + ShellExecuteExW(&sei); + if (sei.hInstApp <= (HINSTANCE)32) + return E_FAIL; + } + else if (lpcmi->lpVerb == MAKEINTRESOURCE(2)) + { + /* FIXME + * retrieve CSIDL_DESKTOPDIRECTORY path, + * retrieve name from pidl and create a link there + */ + FIXME("implement shortcuthandling\n"); + return NOERROR; + } + + + TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); + + return S_OK; +} + +/************************************************************************** + * ICPanel_IContextMenu_GetCommandString() + * + */ +static HRESULT WINAPI ICPanel_IContextMenu2_GetCommandString( + IContextMenu2 *iface, + UINT_PTR idCommand, + UINT uFlags, + UINT* lpReserved, + LPSTR lpszName, + UINT uMaxNameLen) +{ + ICPanelImpl *This = impl_from_IContextMenu(iface); + + TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + + + FIXME("unknown command string\n"); + return E_FAIL; +} + + + +/************************************************************************** +* ICPanel_IContextMenu_HandleMenuMsg() +*/ +static HRESULT WINAPI ICPanel_IContextMenu2_HandleMenuMsg( + IContextMenu2 *iface, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + ICPanelImpl *This = impl_from_IContextMenu(iface); + + TRACE("ICPanel_IContextMenu_HandleMenuMsg (%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam); + + return E_NOTIMPL; +} + +static const IContextMenu2Vtbl vt_ContextMenu = +{ + ICPanel_IContextMenu2_QueryInterface, + ICPanel_IContextMenu2_AddRef, + ICPanel_IContextMenu2_Release, + ICPanel_IContextMenu2_QueryContextMenu, + ICPanel_IContextMenu2_InvokeCommand, + ICPanel_IContextMenu2_GetCommandString, + ICPanel_IContextMenu2_HandleMenuMsg +}; + Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -611,6 +611,7 @@ IDS_VIEW_DETAILS "&Ïîäðîáåí" IDS_SELECT "Èçáîð" IDS_OPEN "Îòâàðÿíå" + IDS_CREATELINK "Ñúçäàâàíå íà &âðúçêà" IDS_CREATEFOLDER_DENIED "Ñúçäàâàíåòî íà íîâà ïàïêà å íåâúçìîæíî: íåäîñòàòú÷íè ïðàâà." IDS_CREATEFOLDER_CAPTION "Ãðåøêà ïðè ñúçäàâàíå íà íîâà ïàïêà" Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,7 +608,7 @@ IDS_VIEW_DETAILS "&Details" IDS_SELECT "Select" IDS_OPEN "Open" - + IDS_CREATELINK "Create &Link" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" IDS_DELETEITEM_CAPTION "Confirm file deletion" Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -610,6 +610,7 @@ IDS_VIEW_DETAILS "&Podrobnosti" IDS_SELECT "Vybrat" IDS_OPEN "Otevøít" + IDS_CREATELINK "Vytvoøit zástupc&e" IDS_CREATEFOLDER_DENIED "Nelze vytvoøit novou sloku, protoe pøístup byl odepøen." IDS_CREATEFOLDER_CAPTION "Chyba pøi pokusu vytvoøit nový adresáø" Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,6 +608,7 @@ IDS_VIEW_DETAILS "&Details" IDS_SELECT "Select" IDS_OPEN "Open" + IDS_CREATELINK "Create &Link" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -610,6 +610,7 @@ IDS_VIEW_DETAILS "&Details" IDS_SELECT "Auswählen" IDS_OPEN "Öffnen" + IDS_CREATELINK "&Verknüpfung erstellen" IDS_CREATEFOLDER_DENIED "Es konnte kein neues Verzeichnis erstellt werden: Zugriff verweigert." IDS_CREATEFOLDER_CAPTION "Es trat ein Fehler beim Erstellen eines neuen Verzeichnisses auf." Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,6 +608,7 @@ IDS_VIEW_DETAILS "Ë&åðôïìÝñåéåò" IDS_SELECT "ÅðéëïãÞ" IDS_OPEN "¢íïéãìá" + IDS_CREATELINK "Äçìéïõñãßá &óõíôüìåõóçò" IDS_CREATEFOLDER_DENIED "Äåí Þôáí äõíáôÞ ç äçìéïõñãßá ôïõ öáêÝëïõ: Äåí åðéôñÝðåôáé ç ðñüóâáóç." IDS_CREATEFOLDER_CAPTION "ÓöÜëìá êáôÜ ôçí äçìéïõñãßá íÝïõ öáêÝëïõ" Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,6 +608,7 @@ IDS_VIEW_DETAILS "&Details" IDS_SELECT "Select" IDS_OPEN "Open" + IDS_CREATELINK "Create &Link" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -609,6 +609,7 @@ IDS_VIEW_DETAILS "&Details" IDS_SELECT "Select" IDS_OPEN "Open" + IDS_CREATELINK "Create &Link" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -610,6 +610,7 @@ IDS_VIEW_DETAILS "&Detalles" IDS_SELECT "Seleccionar" IDS_OPEN "Abrir" + IDS_CREATELINK "C&rear acceso directo" IDS_CREATEFOLDER_DENIED "No se puede crear nueva carpeta: Permiso denegado." IDS_CREATEFOLDER_CAPTION "Error durante la creación de una nueva carpeta" Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,6 +608,7 @@ IDS_VIEW_DETAILS "&Tiedot" IDS_SELECT "Valitse" IDS_OPEN "Avaa" + IDS_CREATELINK "Lu&o Linkki" IDS_CREATEFOLDER_DENIED "Uutta kansiota ei voitu luoda: Oikeudet eivät riitä." IDS_CREATEFOLDER_CAPTION "Virhe luotaessa uutta kansiota" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -612,6 +612,7 @@ IDS_VIEW_DETAILS "&Détails" IDS_SELECT "Sélectionner" IDS_OPEN "Ouvrir" + IDS_CREATELINK "Créer un &lien" IDS_CREATEFOLDER_DENIED "Impossible de créer le nouveau dossier : permission refusée." IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier" Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -611,6 +611,7 @@ IDS_VIEW_DETAILS "Részletek" IDS_SELECT "Kiválaszt" IDS_OPEN "Megnyit" + IDS_CREATELINK "Parancsikon létrehozása" IDS_CREATEFOLDER_DENIED "Nem hozható létre új mappa: Nincs hozzá engedélyed." IDS_CREATEFOLDER_CAPTION "Hiba a mappa létrehozásakor" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -609,6 +609,7 @@ IDS_VIEW_DETAILS "&Dettagli" IDS_SELECT "Selezione" IDS_OPEN "Apri" + IDS_CREATELINK "&Crea Collegamento" IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: Accesso negato." IDS_CREATEFOLDER_CAPTION "Errore durante la creazione della cartella" Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,6 +608,7 @@ IDS_VIEW_DETAILS "Ú×(&D)" IDS_SELECT "Ið" IDS_OPEN "J" + IDS_CREATELINK "V[gJbgÌì¬(&L)" IDS_CREATEFOLDER_DENIED "Vµ¢tH_ðì¬Å«Ü¹ñÅµ½: ANZX ª èÜ¹ñB" IDS_CREATEFOLDER_CAPTION "Vµ¢tH_Ìì¬ÉG[ª¶µÜµ½" Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,6 +608,7 @@ IDS_VIEW_DETAILS "&Details" IDS_SELECT "Select" IDS_OPEN "Open" + IDS_CREATELINK "Create &Link" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,6 +608,7 @@ IDS_VIEW_DETAILS "&Details" IDS_SELECT "Select" IDS_OPEN "Open" + IDS_CREATELINK "Create &Link" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -587,6 +587,7 @@ IDS_VIEW_DETAILS "&Detaljer" IDS_SELECT "Velg" IDS_OPEN "Åpne" + IDS_CREATELINK "&Opprett snarvei" IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." IDS_CREATEFOLDER_CAPTION "Klarte ikke opprette ny mappe" Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -614,6 +614,7 @@ IDS_VIEW_DETAILS "&Szczegó³y" IDS_SELECT "Zaznacz" IDS_OPEN "Otwórz" + IDS_CREATELINK "Utwórz &Skrót" IDS_CREATEFOLDER_DENIED "Nie mogê utworzyæ nowego katalogu: Brak dostêpu." IDS_CREATEFOLDER_CAPTION "B³¹d przy tworzeniu nowego katalogu." Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -610,6 +610,7 @@ IDS_VIEW_DETAILS "&Detalhes" IDS_SELECT "Selecionar" IDS_OPEN "Abrir" + IDS_CREATELINK "Criar a&talho" IDS_CREATEFOLDER_DENIED "Não pode criar nova pasta: Permissão negada." IDS_CREATEFOLDER_CAPTION "Erro durante a criação da nova pasta" Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -610,6 +610,7 @@ IDS_VIEW_DETAILS "&Detalhes" IDS_SELECT "Seleccionar" IDS_OPEN "Abrir" + IDS_CREATELINK "Create &Link" IDS_CREATEFOLDER_DENIED "Não é possível criar nova pasta: Permissão negada." IDS_CREATEFOLDER_CAPTION "Erro durante a criação da nova pasta" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -607,6 +607,7 @@ IDS_VIEW_DETAILS "&Ïîäðîáíî" IDS_SELECT "&Âûáðàòü" IDS_OPEN "&Îòêðûòü" + IDS_CREATELINK "Ñîçäàòü &ÿðëûê" IDS_CREATEFOLDER_DENIED "Íåâîçìîæíî ñîçäàòü ïàïêó - íåò ïîëíîìî÷èé." IDS_CREATEFOLDER_CAPTION "Îøèáêà âî âðåìÿ ñîçäàíèÿ ïàïêè" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -614,6 +614,7 @@ IDS_VIEW_DETAILS "&Podrobnosti" IDS_SELECT "Vybra" IDS_OPEN "Otvori" + IDS_CREATELINK "Vytvori o&dkaz" IDS_CREATEFOLDER_DENIED "Nie je moné vytvori nový prieèinok: Prístup zamietnutý." IDS_CREATEFOLDER_CAPTION "Chyba poèas vytvárania nového prieèinka" Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,6 +608,7 @@ IDS_VIEW_DETAILS "&Details" IDS_SELECT "Select" IDS_OPEN "Open" + IDS_CREATELINK "Create &Link" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,6 +608,7 @@ IDS_VIEW_DETAILS "&Details" IDS_SELECT "Select" IDS_OPEN "Open" + IDS_CREATELINK "Create &Link" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -608,6 +608,7 @@ IDS_VIEW_DETAILS "&Ayrýntýlý" IDS_SELECT "Seç" IDS_OPEN "Aç" + IDS_CREATELINK "Kýsayol O&luþtur" IDS_CREATEFOLDER_DENIED "Yeni dizin oluþturulamýyor: Eriþim engellendi." IDS_CREATEFOLDER_CAPTION "Dizin oluþturma sýrasýnda hata" Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -600,6 +600,7 @@ IDS_DESKTOP "Ðîáî÷èé ñò³ë" IDS_MYCOMPUTER "Ì³é Êîìï'þòåð" IDS_RECYCLEBIN_FOLDER_NAME "Êîøèê" + IDS_CONTROLPANEL "Ïàíåëü êåðóâàííÿ" /* context menus */ IDS_VIEW_LARGE "&Âåëèê³ çíà÷êè" @@ -608,7 +609,7 @@ IDS_VIEW_DETAILS "&Ïîäðîáèö³" IDS_SELECT "Âè&áðàòè" IDS_OPEN "Â³&äêðèòè" - IDS_CONTROLPANEL "Ïàíåëü êåðóâàííÿ" + IDS_CREATELINK "Ñòâîðèòè &ÿðëèê" IDS_CREATEFOLDER_DENIED "Íå âäàëîñÿ ñòâîðèòè íîâó ïàïêó: Â³äìîâà ó äîñòóï³." IDS_CREATEFOLDER_CAPTION "Ïîìèëêà ïðè ñòâîðåíí³ íîâî¿ ïàïêè" Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -597,6 +597,7 @@ IDS_VIEW_DETAILS "ÏêÏ¸ÐÅÏ¢(&D)" IDS_SELECT "Select" IDS_OPEN "Open" + IDS_CREATELINK "´´½¨¿ì½Ý·½Ê½(&L)" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -609,6 +609,7 @@ IDS_VIEW_DETAILS "&Details" IDS_SELECT "Select" IDS_OPEN "Open" + IDS_CREATELINK "Create &Link" IDS_CREATEFOLDER_DENIED "Unable to create new Folder: Permission denied." IDS_CREATEFOLDER_CAPTION "Error during creation of a new folder" Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Aug 4 08:43:10 2008 @@ -141,6 +141,8 @@ #define IDS_PLAY_VERB 305 #define IDS_PREVIEW_VERB 306 #define IDS_FILE_FOLDER 307 +#define IDS_CREATELINK 308 + /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964

1 0

[dchapyshev] 35095: - Update & fix Russian translation
by dchapyshev＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: dchapyshev Date: Mon Aug 4 07:41:25 2008 New Revision: 35095 URL: http://svn.reactos.org/svn/reactos?rev=35095&view=rev Log: - Update & fix Russian translation Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Mon Aug 4 07:41:25 2008 @@ -8,10 +8,10 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Âàñ ïðèâåòñòâóåò ïðîãðàììà óñòàíîâêè ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 - LTEXT "Óñòàíîâêó ReactOS íóæíî ïðîèçâîäèòü òîëüêî çàãðóçèâøèñü ñ ýòîãî äèñêà! "\ - "Ïîñëå ïåðåçàïóñêà Âàøåãî êîìïüþòåðà âûáåðèòå çàãðóçêó ñ CD è íà÷íèòå"\ - "óñòàíîâêó ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Íàæìèòå êëàâèøó Çàâåðøèòü äëÿ âûõîäà.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Óñòàíîâêó ReactOS ìîæíî ïðîèçâîäèòü òîëüêî çàãðóçèâøèñü ñ ýòîãî äèñêà! "\ + "Ïîñëå ïåðåçàïóñêà êîìïüþòåðà âûáåðèòå çàãðóçêó ñ CD è íà÷íèòå"\ + " óñòàíîâêó ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Íàæìèòå êíîïêó ""Çàâåðøèòü"" äëÿ âûõîäà.", IDC_STATIC, 115, 169, 195, 17 END IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -24,7 +24,7 @@ CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 CONTROL "Ðàñêëàäêà êëàâèàòóðû:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 - LTEXT "Äëÿ âûáîðà òèïà óñòàíîâêè íàæìèòå Ïðîäîëæèòü.", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Äëÿ âûáîðà òèïà óñòàíîâêè íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,297, 10 END IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -32,10 +32,10 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Âèä óñòàíîâêè", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - CONTROL "Èíñòàëÿöèÿ ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 - CONTROL "Âîññòàíîâèòü èëè ìîäèôèöèðîâàòü óñòàíîâëåííûé ðàíåå ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå Ïðîäîëæèòü.", IDC_STATIC, 10, 180 ,297, 10 + CONTROL "Òèï óñòàíîâêè", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Óñòàíîâêà ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Âîññòàíîâèòü èëè èçìåíèòü óñòàíîâëåííûé ðàíåå ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -50,7 +50,7 @@ CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 LTEXT "Êëàâèàòóðà:", IDC_STATIC, 20,55, 80, 10 CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 - LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå Ïðîäîëæèòü.", IDC_STATIC, 10, 180 ,277, 20 + LTEXT "Äëÿ óñòàíîâêè óñòðîéñòâ íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -58,12 +58,12 @@ CAPTION "Óñòàíîâêà ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + CONTROL "Ðàçäåëû äëÿ óñòàíîâêè ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL PUSHBUTTON "&Ñîçäàòü", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Óäàëèòü", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "&Äîïîëíèòåëüíûå óñòàíîâêè...", IDC_PARTMOREOPTS, 218,155,80,15 - LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå Ïðîäîëæèòü.", IDC_STATIC, 10, 180 ,277, 20 + PUSHBUTTON "&Äîïîëíèòåëüíûå ïàðàìåòðû...", IDC_PARTMOREOPTS, 176,155,122,15 + LTEXT "Äëÿ íà÷àëà óñòàíîâêè íàæìèòå ""Äàëåå"".", IDC_STATIC, 10, 180 ,277, 20 END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 @@ -72,12 +72,12 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Áàçîâûé êàòàëîã", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 - EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + EDITTEXT IDC_PATH, 10,12,283,14, WS_VISIBLE CONTROL "Óñòàíîâêà çàãðóç÷èêà", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 - CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,49,278,11 + CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,60,278,11 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -95,34 +95,34 @@ IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Îêîí÷àíèå óñòàíîâêè ReactOS" +CAPTION "Çàâåðøåíèå óñòàíîâêè ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Îêîí÷àíèå ïåðâîãî ýòàïà óñòàíîâêè ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Çàâåðøåíèå ïåðâîãî ýòàïà óñòàíîâêè ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Ïåðâûé ýòàï óñòàíîâêè ReactOS çàêîí÷åí.", IDC_STATIC, 20, 50, 277, 10 - LTEXT "Ïîñëå íàæàòèÿ êëàâèøè Çàêîí÷èòü Âàø êîìïüþòåð áóäåò ïåðåçàãðóæåí.", IDC_STATIC, 20, 80, 277, 10 + LTEXT "Ïîñëå íàæàòèÿ êëàâèøè ""Çàâåðøèòü"" âàø êîìïüþòåð áóäåò ïåðåçàãðóæåí.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Âû ìîæåòå óáðàòü óñòàíîâî÷íûé äèñê. Äëÿ ïåðåçàãðóçêè êîìïüþòåðà "\ - "íàæìèòå êëàâèøó Çàêîí÷èòü.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Âû ìîæåòå èçâëå÷ü óñòàíîâî÷íûé äèñê. Äëÿ ïåðåçàãðóçêè êîìïüþòåðà "\ + "íàæìèòå êëàâèøó ""Çàâåðøèòü"".", IDC_STATIC, 10, 176, 297, 20 END STRINGTABLE BEGIN - IDS_LANGTITLE "Âûáîð ßçûêà" + IDS_LANGTITLE "Âûáîð ÿçûêà" IDS_LANGSUBTITLE "Âûáåðèòå ÿçûê ïî óìîë÷àíèþ â ñèñòåìå." IDS_TYPETITLE "Âàñ ïðèâåòñòâóåò ïðîãðàììà óñòàíîâêè ReactOS" - IDS_TYPESUBTITLE "Âûáåðèòå âèä óñòàíîâêè." + IDS_TYPESUBTITLE "Âûáåðèòå òèï óñòàíîâêè." IDS_DEVICETITLE "Óñòàíîâêà áàçîâûõ óñòðîéñòâ" IDS_DEVICESUBTITLE "Íàñòðîéêà ïàðàìåòðîâ ýêðàíà è êëàâèàòóðû." IDS_DRIVETITLE "Âûáîð ðàñïîëîæåíèÿ íà äèñêå è ñèñòåìíîãî êàòàëîãà" - IDS_DRIVESUBTITLE "Ïðèãîòîâèòü ðàçäåë äèñêà, ñèñòåìíûé êàòàëîã è çàãðóç÷èê." - IDS_PROCESSTITLE "Ïðèãîòîâèòü ðàçäåë äèñêà, êîïèðîâàòü ôàéëû è ñèñòåìó" - IDS_PROCESSSUBTITLE "Ñîçäàòü ðàçäåë íà äèñêå, êîïèðîâàòü ôàéëû, óñòàíîâèòü çàãðóç÷èê" + IDS_DRIVESUBTITLE "Ïîäãîòîâêà ðàçäåëà äèñêà, ñèñòåìíîãî êàòàëîãà è çàãðóç÷èêà." + IDS_PROCESSTITLE "Ïîäãîòîâêà ðàçäåëà äèñêà, êîïèðîâàíèå ñèñòåìíûõ ôàéëîâ" + IDS_PROCESSSUBTITLE "Ñîçäàíèå ðàçäåëà íà äèñêå, êîïèðîâàíèå ôàéëîâ, óñòàíîâêà çàãðóç÷èêà" IDS_RESTARTTITLE "Ïåðâûé ýòàï óñòàíîâêè çàêîí÷åí" IDS_RESTARTSUBTITLE "Ïåðâûé ýòàï çàêîí÷åí, äëÿ ïðîäîëæåíèÿ òðåáóåòñÿ ïåðåçàãðóçêà" - IDS_ABORTSETUP "Åùå íå ïîëíîñòüáþ óñòàíîâëåí ReactOS íà êîìïüþòåð. Åñëè Âû çàêðîåòå ïðîãðàììó óñòàíîâêè ñåé÷àñ, â äàëüíåéøåì âàì ïðèäåòñÿ ïîâòîðèòü óñòàíîâêó ReactOS ïîëíîñòüþ. Âû óâåðåíû â íåîáõîäèìîñòè çàêðûòèÿ?" - IDS_ABORTSETUP2 "Ïðåêðàòèòü óñòàíîâêó?" + IDS_ABORTSETUP "ReactOS óñòàíîâëåí íà êîìïüþòåð íå ïîëíîñòüþ. Åñëè âû çàêðîåòå ïðîãðàììó óñòàíîâêè ñåé÷àñ, â äàëüíåéøåì âàì ïðèäåòñÿ ïîâòîðèòü óñòàíîâêó ReactOS. Âû óâåðåíû, ÷òî íåîáõîäèìî ïðåðâàòü óñòàíîâêó?" + IDS_ABORTSETUP2 "Ïðåðâàòü óñòàíîâêó?" END /* EOF */

1 0

[dchapyshev] 35094: - Update Russian translation
by dchapyshev＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: dchapyshev Date: Mon Aug 4 05:32:03 2008 New Revision: 35094 URL: http://svn.reactos.org/svn/reactos?rev=35094&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon Aug 4 05:32:03 2008 @@ -207,18 +207,18 @@ BEGIN ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 8, 35, 50, 10 - LTEXT "Folder", 14005, 68, 35, 160, 10 - LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "Òèï ôàéëà:", 14004, 8, 35, 50, 10 + LTEXT "Ïàïêà", 14005, 68, 35, 160, 10 + LTEXT "Ðàñïîëîæåíèå:", 14006, 8, 53, 50, 10 LTEXT "", 14007, 68, 53, 315, 10 - LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "Ðàçìåð:", 14008, 8, 72, 45, 10 LTEXT "", 14009, 68, 72, 315, 10 - LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "Ñîäåðæèò:", 14010, 8, 93, 45, 10 LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "Ñîçäàíî:", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 - AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 + AUTOCHECKBOX "&Òîëüêî ÷òåíèå", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Ñêðûòî", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -699,13 +699,13 @@ IDS_LNK_FILE "ßðëûê" IDS_SYS_FILE "Ñèñòåìíûé ôàéë" - IDS_OPEN_VERB "Open" - IDS_RUNAS_VERB "Run as " - IDS_EDIT_VERB "Edit" - IDS_FIND_VERB "Find" - IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" - - IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_OPEN_VERB "Îòêðûòü" + IDS_RUNAS_VERB "Çàïóñòèòü êàê " + IDS_EDIT_VERB "Èçìåíèòü" + IDS_FIND_VERB "Ïîèñê" + IDS_PRINT_VERB "Ïå÷àòü" + IDS_PLAY_VERB "Âîñïðîèçâåñòè" + IDS_PREVIEW_VERB "Ïðåäïðîñìîòð" + + IDS_FILE_FOLDER "%u ôàéëîâ, %u ïàïîê" +END

1 0

[fireball] 35093: - Implement read/write support via Native API. - Reorganize headers so that only vfatlib.h is included instead of hundred various different headers.
by fireball＠svn.reactos.org 04 Aug '08

04 Aug '08

Author: fireball Date: Mon Aug 4 05:00:32 2008 New Revision: 35093 URL: http://svn.reactos.org/svn/reactos?rev=35093&view=rev Log: - Implement read/write support via Native API. - Reorganize headers so that only vfatlib.h is included instead of hundred various different headers. Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c trunk/reactos/lib/fslib/vfatlib/check/check.c trunk/reactos/lib/fslib/vfatlib/check/common.c trunk/reactos/lib/fslib/vfatlib/check/fat.c trunk/reactos/lib/fslib/vfatlib/check/file.c trunk/reactos/lib/fslib/vfatlib/check/io.c trunk/reactos/lib/fslib/vfatlib/check/io.h trunk/reactos/lib/fslib/vfatlib/check/lfn.c Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/bo… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/boot.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/boot.c [iso-8859-1] Mon Aug 4 05:00:32 2008 @@ -5,14 +5,10 @@ /* FAT32, VFAT, Atari format support, and various fixes additions May 1998 * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ -#include <stdio.h> -#include <string.h> -#include <sys/types.h> - -#include "common.h" -#include "dosfsck.h" -#include "io.h" -#include "boot.h" +#include "vfatlib.h" + +#define NDEBUG +#include <debug.h> #define ROUND_TO_MULTIPLE(n,m) ((n) && (m) ? (n)+(m)-1-((n)-1)%(m) : 0) Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] Mon Aug 4 05:00:32 2008 @@ -6,20 +6,12 @@ * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <limits.h> +#include "vfatlib.h" #include <time.h> -#include <windows.h> - -#include "common.h" -#include "dosfsck.h" -#include "io.h" -#include "fat.h" -#include "file.h" -#include "lfn.h" -#include "check.h" + +#define NDEBUG +#include <debug.h> + static DOS_FILE *root; Modified: trunk/reactos/lib/fslib/vfatlib/check/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/co… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/common.c [iso-8859-1] Mon Aug 4 05:00:32 2008 @@ -6,13 +6,10 @@ * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <stdarg.h> -#include <errno.h> +#include "vfatlib.h" -#include "common.h" +#define NDEBUG +#include <debug.h> typedef struct _link { Modified: trunk/reactos/lib/fslib/vfatlib/check/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fa… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] Mon Aug 4 05:00:32 2008 @@ -6,16 +6,11 @@ * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -//#include <unistd.h> - -#include "common.h" -#include "dosfsck.h" -#include "io.h" -#include "check.h" -#include "fat.h" +#include "vfatlib.h" + +#define NDEBUG +#include <debug.h> + //#pragma warning(disable: 4018) Modified: trunk/reactos/lib/fslib/vfatlib/check/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fi… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] Mon Aug 4 05:00:32 2008 @@ -6,29 +6,10 @@ * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <ctype.h> -//#include <unistd.h> - -#define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h> */ -#define _LINUX_STRING_H_ /* hack to avoid inclusion of <linux/string.h>*/ -#define _LINUX_FS_H /* hack to avoid inclusion of <linux/fs.h> */ - -//#include <linux/version.h> -//#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -//# define __KERNEL__ -//# include <asm/types.h> -//# undef __KERNEL__ -//#endif - -#include "dosfsck.h" -#include "msdos_fs.h" - -#include "common.h" -#include "file.h" - +#include "vfatlib.h" + +#define NDEBUG +#include <debug.h> FDSC *fp_root = NULL; Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] Mon Aug 4 05:00:32 2008 @@ -11,35 +11,11 @@ /* FAT32, VFAT, Atari format support, and various fixes additions May 1998 * by Roman Hodek <Roman.Hodek(a)informatik.uni-erlangen.de> */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -//#include <unistd.h> -#include <sys/stat.h> -//#include <sys/ioctl.h> -#include <errno.h> -#include <fcntl.h> -#include <assert.h> -//#include <linux/fd.h> - - -#ifdef _WIN32 -#define _WIN32_WINNT 0x0400 -#include <windows.h> -#include <winioctl.h> -#define __LITTLE_ENDIAN 1234 -#define __BIG_ENDIAN 4321 -#define __BYTE_ORDER __LITTLE_ENDIAN -#define inline -#define __attribute__(x) -#define BLOCK_SIZE 512 -#endif - - -#include "dosfsck.h" -#include "common.h" -#include "io.h" - + +#include "vfatlib.h" + +#define NDEBUG +#include <debug.h> typedef struct _change { void *data; @@ -50,19 +26,19 @@ static CHANGE *changes,*last; -static int fd,did_change = 0; +static int did_change = 0; +static HANDLE fd; +static LARGE_INTEGER CurrentOffset; unsigned device_no; -static int WIN32open(const char *path, int oflag, ...); -#define open WIN32open -static int WIN32close(int fd); +static int WIN32close(HANDLE fd); #define close WIN32close -static int WIN32read(int fd, void *buf, unsigned int len); +static int WIN32read(HANDLE fd, void *buf, unsigned int len); #define read WIN32read -static int WIN32write(int fd, void *buf, unsigned int len); +static int WIN32write(HANDLE fd, void *buf, unsigned int len); #define write WIN32write -static loff_t WIN32llseek(int fd, loff_t offset, int whence); +static loff_t WIN32llseek(HANDLE fd, loff_t offset, int whence); #ifdef llseek #undef llseek #endif @@ -70,30 +46,34 @@ //static int is_device = 0; -void fs_open(char *path,int rw) -{ -#ifdef _WIN32 - static char dev_buf[] = "\\\\.\\X:"; -#else - struct stat stbuf; -#endif - - if (path[1] == ':' && path[2] == '\0') { - dev_buf[4] = path[0]; - path = dev_buf; -// is_device = 1; - } - - if ((fd = open(path,rw ? O_RDWR : O_RDONLY)) < 0) - pdie("open %s",path); +void fs_open(PUNICODE_STRING DriveRoot,int rw) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + InitializeObjectAttributes(&ObjectAttributes, + DriveRoot, + 0, + NULL, + NULL); + + Status = NtOpenFile(&fd, + FILE_GENERIC_READ | (rw ? FILE_GENERIC_WRITE : 0), + &ObjectAttributes, + &Iosb, + rw ? 0 : FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_ALERT); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenFile() failed with status 0x%.08x\n", Status); + return; + } + + CurrentOffset.QuadPart = 0LL; + changes = last = NULL; did_change = 0; - -#if 0 - if (fstat(fd,&stbuf) < 0) - pdie("fstat %s",path); - device_no = S_ISBLK(stbuf.st_mode) ? (stbuf.st_rdev >> 8) & 0xff : 0; -#endif } @@ -224,7 +204,6 @@ static void fs_flush(void) { CHANGE *this; - //int size; int old_write_immed = write_immed; /* Disable writes to the list now */ @@ -233,19 +212,8 @@ while (changes) { this = changes; changes = changes->next; -#if 0 - if (llseek(fd,this->pos,0) != this->pos) - fprintf(stderr,"Seek to %lld failed: %s\n Did not write %d bytes.\n", - (__int64)this->pos,strerror(errno),this->size); - else if ((size = write(fd,this->data,this->size)) < 0) - fprintf(stderr,"Writing %d bytes at %lld failed: %s\n",this->size, - (__int64)this->pos,strerror(errno)); - else if (size != this->size) - fprintf(stderr,"Wrote %d bytes instead of %d bytes at %lld." - "\n",size,this->size,(__int64)this->pos); -#else + fs_write(this->pos, this->size, this->data); -#endif free(this->data); free(this); @@ -283,163 +251,64 @@ /* tab-width: 8 */ /* End: */ - -#define O_SHORT_LIVED _O_SHORT_LIVED -//#define O_ACCMODE 3 -#define O_NONE 3 -#define O_BACKUP 0x10000 -#define O_SHARED 0x20000 - -static int WIN32open(const char *path, int oflag, ...) -{ - HANDLE fh; - DWORD desiredAccess = 0; - DWORD shareMode = 0; - DWORD creationDisposition = 0; - DWORD flagsAttributes = FILE_ATTRIBUTE_NORMAL; - SECURITY_ATTRIBUTES securityAttributes; - va_list ap; - int pmode; - int trunc = FALSE; - - securityAttributes.nLength = sizeof(securityAttributes); - securityAttributes.lpSecurityDescriptor = NULL; - securityAttributes.bInheritHandle = oflag & O_NOINHERIT ? FALSE : TRUE; - switch (oflag & O_ACCMODE) { - case O_RDONLY: - desiredAccess = GENERIC_READ; -// shareMode = FILE_SHARE_READ; - shareMode = FILE_SHARE_READ|FILE_SHARE_WRITE; // TMN: - break; - case O_WRONLY: - desiredAccess = GENERIC_WRITE; - shareMode = 0; - break; - case O_RDWR: - desiredAccess = GENERIC_READ|GENERIC_WRITE; - shareMode = 0; - break; - case O_NONE: - desiredAccess = 0; - shareMode = FILE_SHARE_READ|FILE_SHARE_WRITE; - } - if (oflag & O_APPEND) { - desiredAccess |= FILE_APPEND_DATA|SYNCHRONIZE; - shareMode = FILE_SHARE_READ|FILE_SHARE_WRITE; - } - if (oflag & O_SHARED) - shareMode |= FILE_SHARE_READ|FILE_SHARE_WRITE; - switch (oflag & (O_CREAT|O_EXCL|O_TRUNC)) { - case 0: - case O_EXCL: - creationDisposition = OPEN_EXISTING; - break; - case O_CREAT: - creationDisposition = OPEN_ALWAYS; - break; - case O_CREAT|O_EXCL: - case O_CREAT|O_TRUNC|O_EXCL: - creationDisposition = CREATE_NEW; - break; - case O_TRUNC: - case O_TRUNC|O_EXCL: - creationDisposition = TRUNCATE_EXISTING; - break; - case O_CREAT|O_TRUNC: - creationDisposition = OPEN_ALWAYS; - trunc = TRUE; - break; - } - if (oflag & O_CREAT) { - va_start(ap, oflag); - pmode = va_arg(ap, int); - va_end(ap); - if ((pmode & 0222) == 0) - flagsAttributes |= FILE_ATTRIBUTE_READONLY; - } - if (oflag & O_TEMPORARY) { - flagsAttributes |= FILE_FLAG_DELETE_ON_CLOSE; - desiredAccess |= DELETE; - } - if (oflag & O_SHORT_LIVED) - flagsAttributes |= FILE_ATTRIBUTE_TEMPORARY; - if (oflag & O_SEQUENTIAL) - flagsAttributes |= FILE_FLAG_SEQUENTIAL_SCAN; - else if (oflag & O_RANDOM) - flagsAttributes |= FILE_FLAG_RANDOM_ACCESS; - if (oflag & O_BACKUP) - flagsAttributes |= FILE_FLAG_BACKUP_SEMANTICS; - if ((fh = CreateFile(path, desiredAccess, shareMode, &securityAttributes, - creationDisposition, flagsAttributes, NULL)) == INVALID_HANDLE_VALUE) { - errno = GetLastError(); - return -1; - } - if (trunc) { - if (!SetEndOfFile(fh)) { - errno = GetLastError(); - CloseHandle(fh); - DeleteFile(path); - return -1; - } - } - return (int)fh; -} - -static int WIN32close(int fd) -{ - if (!CloseHandle((HANDLE)fd)) { - errno = GetLastError(); - return -1; - } - return 0; -} - -static int WIN32read(int fd, void *buf, unsigned int len) -{ - DWORD actualLen; - - if (!ReadFile((HANDLE)fd, buf, (DWORD)len, &actualLen, NULL)) { - errno = GetLastError(); - if (errno == ERROR_BROKEN_PIPE) - return 0; - else - return -1; - } - return (int)actualLen; -} - -static int WIN32write(int fd, void *buf, unsigned int len) -{ - DWORD actualLen; - - if (!WriteFile((HANDLE)fd, buf, (DWORD)len, &actualLen, NULL)) { - errno = GetLastError(); - return -1; - } - return (int)actualLen; -} - -static loff_t WIN32llseek(int fd, loff_t offset, int whence) -{ - long lo, hi; - DWORD err; - - lo = (long)(offset & 0xffffffff); - hi = (long)(offset >> 32); - lo = SetFilePointer((HANDLE)fd, lo, &hi, whence); - if (lo == 0xFFFFFFFF && (err = GetLastError()) != NO_ERROR) { - errno = err; - return -1; - } - return ((loff_t)hi << 32) | (__u32)lo; -} - -int fsctl(int fd, int code) -{ - DWORD ret; - if (!DeviceIoControl((HANDLE)fd, code, NULL, 0, NULL, 0, &ret, NULL)) { - errno = GetLastError(); - return -1; - } - return 0; -} +static int WIN32close(HANDLE FileHandle) +{ + if (!NT_SUCCESS(NtClose(FileHandle))) return -1; + + return 0; +} + +static int WIN32read(HANDLE FileHandle, void *buf, unsigned int len) +{ + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + buf, + len, + &CurrentOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtReadFile() failed (Status %lx)\n", Status); + return -1; + } + + CurrentOffset.QuadPart += len; + return (int)len; +} + +static int WIN32write(HANDLE FileHandle, void *buf, unsigned int len) +{ + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + buf, + len, + &CurrentOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + return -1; + } + + CurrentOffset.QuadPart += len; + return (int)len; +} + +static loff_t WIN32llseek(HANDLE fd, loff_t offset, int whence) +{ + CurrentOffset.QuadPart = (ULONGLONG)offset; + + return offset; +} Modified: trunk/reactos/lib/fslib/vfatlib/check/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.h [iso-8859-1] Mon Aug 4 05:00:32 2008 @@ -16,7 +16,7 @@ * sufficient (or even better :) for 64 bit offsets in the meantime */ #define llseek lseek -void fs_open(char *path,int rw); +void fs_open(PUNICODE_STRING DriveRoot,int rw); /* Opens the file system PATH. If RW is zero, the file system is opened read-only, otherwise, it is opened read-write. */ Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/lf… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] Mon Aug 4 05:00:32 2008 @@ -2,17 +2,12 @@ /* Written 1998 by Roman Hodek */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <limits.h> -#include <time.h> - -#include "common.h" -#include "io.h" -#include "dosfsck.h" -#include "lfn.h" -#include "file.h" +#include "vfatlib.h" + +#include <limits.h> // for INT_MAX definition + +#define NDEBUG +#include <debug.h> typedef struct { __u8 id; /* sequence number for slot */

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
86
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008