Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 66741: [SHELL32] * Disable the hardcoded part of the File menu. It provided no useful function and couldn't be localized. It can be reintroduced later when it is done properly.
by dquintana＠svn.reactos.org 16 Mar '15

16 Mar '15

Author: dquintana Date: Mon Mar 16 18:58:37 2015 New Revision: 66741 URL: http://svn.reactos.org/svn/reactos?rev=66741&view=rev Log: [SHELL32] * Disable the hardcoded part of the File menu. It provided no useful function and couldn't be localized. It can be reintroduced later when it is done properly. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon Mar 16 18:58:37 2015 @@ -1067,6 +1067,8 @@ } } +#if 0 + /* FIXME/TODO: Reenable when they implemented AND localizable (not hardcoded). */ /* Insert This item at the beginning of the menu. */ _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM + 4, MFT_STRING, L"Properties", MFS_DISABLED); @@ -1075,13 +1077,20 @@ _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM + 1, MFT_STRING, L"Create Shortcut", MFS_DISABLED); _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, L"New", MFS_ENABLED); +#endif HMENU menubase = BuildFileMenu(); if (menubase) { int count = ::GetMenuItemCount(menubase); - - for (int i = 0; i < count; i++) + int count2 = ::GetMenuItemCount(hSubMenu); + + if (count2 > 0 && count > 0) + { + _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); + } + + for (int i = count-1; i >= 0; i--) { WCHAR label[128]; @@ -1096,10 +1105,9 @@ mii.fType |= MFT_RADIOCHECK; - ::InsertMenuItemW(hSubMenu, IDM_MYFILEITEM, FALSE, &mii); + ::InsertMenuItemW(hSubMenu, 0, TRUE, &mii); } - _InsertMenuItemW(hSubMenu, IDM_MYFILEITEM, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); ::DestroyMenu(menubase); }

1 0

[fireball] 66740: [ARWINSS] - Bring missing GDI Object Manager defines into gdiobj.c. - Add missing ime.h include into win32k.h
by fireball＠svn.reactos.org 16 Mar '15

16 Mar '15

Author: fireball Date: Mon Mar 16 17:09:59 2015 New Revision: 66740 URL: http://svn.reactos.org/svn/reactos?rev=66740&view=rev Log: [ARWINSS] - Bring missing GDI Object Manager defines into gdiobj.c. - Add missing ime.h include into win32k.h Modified: branches/arwinss/arwinss/server/gre/gdiobj.c branches/arwinss/arwinss/server/include/win32k.h Modified: branches/arwinss/arwinss/server/gre/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/gre/gdio… ============================================================================== --- branches/arwinss/arwinss/server/gre/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/gre/gdiobj.c [iso-8859-1] Mon Mar 16 17:09:59 2015 @@ -28,6 +28,50 @@ DPRINT("%s:%i: Delay\n", __FILE__, __LINE__); \ KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay) +/* GDI handle table can hold 0x10000 handles */ +#define GDI_HANDLE_COUNT 0x10000 +#define GDI_GLOBAL_PROCESS (0x0) +#define GDI_CFONT_MAX 16 + +/* Handle Masks and shifts */ +#define GDI_ENTRY_STOCK_MASK 0x00000080 +#define GDI_ENTRY_REUSE_MASK 0x0000ff00 +#define GDI_ENTRY_REUSE_INC 0x00000100 +#define GDI_ENTRY_BASETYPE_MASK 0x001f0000 +#define GDI_ENTRY_FLAGS_MASK 0xff000000 +#define GDI_ENTRY_REUSECNT_SHIFT 8 +#define GDI_ENTRY_UPPER_SHIFT 16 + +/* Handle macros */ +#define GDI_HANDLE_CREATE(i, t) \ + ((HANDLE)(((i) & GDI_HANDLE_INDEX_MASK) | ((t) & GDI_HANDLE_TYPE_MASK))) + +#define GDI_HANDLE_GET_INDEX(h) \ + (((ULONG_PTR)(h)) & GDI_HANDLE_INDEX_MASK) + +#define GDI_HANDLE_GET_TYPE(h) \ + (((ULONG_PTR)(h)) & GDI_HANDLE_TYPE_MASK) + +#define GDI_HANDLE_IS_TYPE(h, t) \ + ((t) == (((ULONG_PTR)(h)) & GDI_HANDLE_TYPE_MASK)) + +#define GDI_HANDLE_IS_STOCKOBJ(h) \ + (0 != (((ULONG_PTR)(h)) & GDI_HANDLE_STOCK_MASK)) + +#define GDI_HANDLE_SET_STOCKOBJ(h) \ + ((h) = (HANDLE)(((ULONG_PTR)(h)) | GDI_HANDLE_STOCK_MASK)) + +#define GDI_HANDLE_GET_UPPER(h) \ + (((ULONG_PTR)(h)) & GDI_HANDLE_UPPER_MASK) + +#define GDI_HANDLE_GET_REUSECNT(h) \ + (((ULONG_PTR)(h)) >> GDI_HANDLE_REUSECNT_SHIFT) + +#define GDI_ENTRY_GET_REUSECNT(e) \ + ((((ULONG_PTR)(e)) & GDI_ENTRY_REUSE_MASK) >> GDI_ENTRY_REUSECNT_SHIFT) + +#define GDI_OBJECT_GET_TYPE_INDEX(t) \ + ((t & GDI_HANDLE_BASETYPE_MASK) >> GDI_HANDLE_BASETYPE_SHIFT) #include "gdidbg.c" /* static */ /* FIXME: -fno-unit-at-a-time breaks this */ Modified: branches/arwinss/arwinss/server/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/include/… ============================================================================== --- branches/arwinss/arwinss/server/include/win32k.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/include/win32k.h [iso-8859-1] Mon Mar 16 17:09:59 2015 @@ -39,6 +39,7 @@ #include <wincon.h> #define _NOCSECT_TYPE #include <ddrawi.h> +#include <imm.h> /* SEH Support with PSEH */ #include <pseh/pseh2.h>

1 0

[fireball] 66739: [ARWINSS] - Fix SetLogonNotify and SetWindowStationUser stubs.
by fireball＠svn.reactos.org 16 Mar '15

16 Mar '15

Author: fireball Date: Mon Mar 16 17:08:44 2015 New Revision: 66739 URL: http://svn.reactos.org/svn/reactos?rev=66739&view=rev Log: [ARWINSS] - Fix SetLogonNotify and SetWindowStationUser stubs. Modified: branches/arwinss/arwinss/client/user32/csr.c branches/arwinss/arwinss/client/user32/misc.c branches/arwinss/arwinss/client/user32/user32.spec Modified: branches/arwinss/arwinss/client/user32/csr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/c… ============================================================================== --- branches/arwinss/arwinss/client/user32/csr.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/csr.c [iso-8859-1] Mon Mar 16 17:08:44 2015 @@ -117,7 +117,7 @@ */ BOOL WINAPI -SetLogonNotifyWindow (HWND Wnd, HWINSTA WinSta) +SetLogonNotifyWindow (HWND Wnd) { #if 0 /* Maybe we should call NtUserSetLogonNotifyWindow and let that one inform CSRSS??? */ Modified: branches/arwinss/arwinss/client/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/m… ============================================================================== --- branches/arwinss/arwinss/client/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/misc.c [iso-8859-1] Mon Mar 16 17:08:44 2015 @@ -202,9 +202,9 @@ /*********************************************************************** * SetWindowStationUser (USER32.@) */ -DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2) -{ - FIXME("(0x%08x,0x%08x),stub!\n",x1,x2); +DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2,DWORD x3,DWORD x4) +{ + FIXME("(0x%08x,0x%08x,0x%08x,0x%08x),stub!\n",x1,x2,x3,x4); return 1; } Modified: branches/arwinss/arwinss/client/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/u… ============================================================================== --- branches/arwinss/arwinss/client/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/user32.spec [iso-8859-1] Mon Mar 16 17:08:44 2015 @@ -631,7 +631,7 @@ @ stdcall SetKeyboardState(ptr) @ stdcall SetLastErrorEx(long long) @ stdcall SetLayeredWindowAttributes(ptr long long long) -@ stdcall SetLogonNotifyWindow(long long) +@ stdcall SetLogonNotifyWindow(long) @ stdcall SetMenu(long long) @ stdcall SetMenuContextHelpId(long long) @ stdcall SetMenuDefaultItem(long long long) @@ -676,7 +676,7 @@ @ stdcall SetWindowPlacement(long ptr) @ stdcall SetWindowPos(long long long long long long long) @ stdcall SetWindowRgn(long long long) -@ stdcall SetWindowStationUser(long long) +@ stdcall SetWindowStationUser(long long long long) @ stdcall SetWindowText(long str) SetWindowTextA @ stdcall SetWindowTextA(long str) @ stdcall SetWindowTextW(long wstr)

1 0

[fireball] 66738: [WIN32K] - Delete macros referring to non-existing GDIOBJ_FreeObj and GDIOBJ_FreeObjByHandle.
by fireball＠svn.reactos.org 16 Mar '15

16 Mar '15

Author: fireball Date: Mon Mar 16 17:05:56 2015 New Revision: 66738 URL: http://svn.reactos.org/svn/reactos?rev=66738&view=rev Log: [WIN32K] - Delete macros referring to non-existing GDIOBJ_FreeObj and GDIOBJ_FreeObjByHandle. Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/color.h trunk/reactos/win32ss/gdi/ntgdi/path.h trunk/reactos/win32ss/gdi/ntgdi/region.h Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Mon Mar 16 17:05:56 2015 @@ -97,8 +97,6 @@ #define BR_CACHED_ENGINE 0x00040000 #define BR_CACHED_IS_SOLID 0x80000000 -#define BRUSH_FreeBrush(pBrush) GDIOBJ_FreeObj((POBJ)pBrush, GDIObjType_BRUSH_TYPE) -#define BRUSH_FreeBrushByHandle(hBrush) GDIOBJ_FreeObjByHandle((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH) #define BRUSH_ShareLockBrush(hBrush) ((PBRUSH)GDIOBJ_ShareLockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH)) #define BRUSH_ShareUnlockBrush(pBrush) GDIOBJ_vDereferenceObject((POBJ)pBrush) Modified: trunk/reactos/win32ss/gdi/ntgdi/color.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/color.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/color.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/color.h [iso-8859-1] Mon Mar 16 17:05:56 2015 @@ -16,8 +16,6 @@ #define COLORSPACEOBJ_AllocCS() ((PCOLORSPACE) GDIOBJ_AllocObj(GDIObjType_ICMLCS_TYPE)) #define COLORSPACEOBJ_AllocCSWithHandle() ((PCOLORSPACE) GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_COLORSPACE, sizeof(COLORSPACE))) -#define COLORSPACEOBJ_FreeCS(pCS) GDIOBJ_FreeObj((POBJ)pCS, GDIObjType_ICMLCS_TYPE) -#define COLORSPACEOBJ_FreeCSByHandle(hCS) GDIOBJ_FreeObjByHandle((HGDIOBJ)hCS, GDI_OBJECT_TYPE_COLORSPACE) #define COLORSPACEOBJ_LockCS(hCS) ((PCOLORSPACE)GDIOBJ_LockObject((HGDIOBJ)hCS, GDIObjType_ICMLCS_TYPE)) #define COLORSPACEOBJ_UnlockCS(pCS) GDIOBJ_vUnlockObject((POBJ)pCS) Modified: trunk/reactos/win32ss/gdi/ntgdi/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] Mon Mar 16 17:05:56 2015 @@ -44,8 +44,6 @@ #define PATH_AllocPath() ((PPATH) GDIOBJ_AllocObj(GDIObjType_PATH_TYPE)) #define PATH_AllocPathWithHandle() ((PPATH) GDIOBJ_AllocObjWithHandle (GDI_OBJECT_TYPE_PATH, sizeof(PATH))) -#define PATH_FreePath(pPath) GDIOBJ_FreeObj((POBJ)pPath, GDIObjType_PATH_TYPE) -#define PATH_FreeExtPathByHandle(hPath) GDIOBJ_FreeObjByHandle((HGDIOBJ) hPath, GDI_OBJECT_TYPE_PATH) #define PATH_LockPath(hPath) ((PPATH)GDIOBJ_ShareLockObj((HGDIOBJ)hPath, GDI_OBJECT_TYPE_PATH)) #define PATH_UnlockPath(pPath) GDIOBJ_vDereferenceObject((POBJ)pPath) Modified: trunk/reactos/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] Mon Mar 16 17:05:56 2015 @@ -22,9 +22,6 @@ extern HRGN hrgnDefault; /* Functions ******************************************************************/ - -#define REGION_FreeRgn(pRgn) GDIOBJ_FreeObj((POBJ)pRgn, GDIObjType_RGN_TYPE) -#define REGION_FreeRgnByHandle(hRgn) GDIOBJ_FreeObjByHandle((HGDIOBJ)hRgn, GDI_OBJECT_TYPE_REGION) PREGION FASTCALL REGION_AllocRgnWithHandle(INT n); PREGION FASTCALL REGION_AllocUserRgnWithHandle(INT n);

1 0

[gadamopoulos] 66737: [RSHELL] - Implement sorting shell menu items - Patch by David Quintana
by gadamopoulos＠svn.reactos.org 16 Mar '15

16 Mar '15

Author: gadamopoulos Date: Mon Mar 16 16:30:24 2015 New Revision: 66737 URL: http://svn.reactos.org/svn/reactos?rev=66737&view=rev Log: [RSHELL] - Implement sorting shell menu items - Patch by David Quintana Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Mon Mar 16 16:30:24 2015 @@ -1273,62 +1273,88 @@ { } +int CALLBACK PidlListSort(void* item1, void* item2, LPARAM lParam) +{ + IShellFolder * psf = (IShellFolder*) lParam; + PCUIDLIST_RELATIVE pidl1 = (PCUIDLIST_RELATIVE) item1; + PCUIDLIST_RELATIVE pidl2 = (PCUIDLIST_RELATIVE) item2; + HRESULT hr = psf->CompareIDs(0, pidl1, pidl2); + if (FAILED(hr)) + { + // No way to cancel, so sort to equal. + return 0; + } + return (int)(short)LOWORD(hr); +} + HRESULT CMenuSFToolbar::FillToolbar(BOOL clearFirst) { HRESULT hr; - int i = 0; - PWSTR MenuString; - - IEnumIDList * eidl; - m_shellFolder->EnumObjects(GetToolbar(), SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); + + CComPtr<IEnumIDList> eidl; + hr = m_shellFolder->EnumObjects(GetToolbar(), SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + HDPA dpaSort = DPA_Create(10); LPITEMIDLIST item = NULL; hr = eidl->Next(1, &item, NULL); while (hr == S_OK) { + if (m_menuBand->_CallCBWithItemPidl(item, 0x10000000, 0, 0) == S_FALSE) + { + DPA_AppendPtr(dpaSort, ILClone(item)); + } + + hr = eidl->Next(1, &item, NULL); + } + + // If no items were added, show the "empty" placeholder + if (DPA_GetPtrCount(dpaSort) == 0) + { + return AddPlaceholder(); + } + + TRACE("FillToolbar added %d items to the DPA\n", DPA_GetPtrCount(dpaSort)); + + DPA_Sort(dpaSort, PidlListSort, (LPARAM) m_shellFolder.p); + + for (int i = 0; i<DPA_GetPtrCount(dpaSort);) + { + PWSTR MenuString; + INT index = 0; INT indexOpen = 0; - if (m_menuBand->_CallCBWithItemPidl(item, 0x10000000, 0, 0) == S_FALSE) - { - STRRET sr = { STRRET_CSTR, { 0 } }; - - hr = m_shellFolder->GetDisplayNameOf(item, SIGDN_NORMALDISPLAY, &sr); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - StrRetToStr(&sr, NULL, &MenuString); - - index = SHMapPIDLToSystemImageListIndex(m_shellFolder, item, &indexOpen); - - LPCITEMIDLIST itemc = item; - - SFGAOF attrs = SFGAO_FOLDER; - hr = m_shellFolder->GetAttributesOf(1, &itemc, &attrs); - - DWORD_PTR dwData = reinterpret_cast<DWORD_PTR>(ILClone(item)); - - // Fetch next item already, so we know if the current one is the last - hr = eidl->Next(1, &item, NULL); - - AddButton(++i, MenuString, attrs & SFGAO_FOLDER, index, dwData, hr != S_OK); - - CoTaskMemFree(MenuString); - } - else - { - // Fetch next item here also - hr = eidl->Next(1, &item, NULL); - } - } - ILFree(item); - - // If no items were added, show the "empty" placeholder - if (i == 0) - { - return AddPlaceholder(); - } - + STRRET sr = { STRRET_CSTR, { 0 } }; + + item = (LPITEMIDLIST)DPA_GetPtr(dpaSort, i); + + hr = m_shellFolder->GetDisplayNameOf(item, SIGDN_NORMALDISPLAY, &sr); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + StrRetToStr(&sr, NULL, &MenuString); + + index = SHMapPIDLToSystemImageListIndex(m_shellFolder, item, &indexOpen); + + LPCITEMIDLIST itemc = item; + + SFGAOF attrs = SFGAO_FOLDER; + hr = m_shellFolder->GetAttributesOf(1, &itemc, &attrs); + + DWORD_PTR dwData = reinterpret_cast<DWORD_PTR>(item); + + // Fetch next item already, so we know if the current one is the last + i++; + + AddButton(i, MenuString, attrs & SFGAO_FOLDER, index, dwData, i >= DPA_GetPtrCount(dpaSort)); + + CoTaskMemFree(MenuString); + } + + DPA_Destroy(dpaSort); return hr; }

1 0

[khornicek] 66736: [RAPPS] - adjust the settings dialog layout (by Stefan Fulea) CORE-9377 - disable the proxy settings input boxes if default/no proxy is selected - update the czech translation
by khornicek＠svn.reactos.org 16 Mar '15

16 Mar '15

Author: khornicek Date: Mon Mar 16 15:34:00 2015 New Revision: 66736 URL: http://svn.reactos.org/svn/reactos?rev=66736&view=rev Log: [RAPPS] - adjust the settings dialog layout (by Stefan Fulea) CORE-9377 - disable the proxy settings input boxes if default/no proxy is selected - update the czech translation Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sq-AL.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/rapps/settingsdlg.c Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -56,7 +56,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 254, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 254, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" FONT 8, "MS Shell Dlg" @@ -70,16 +70,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "ÐÐ·&Ð±Ð¾Ñ", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "Ð¡Ð»ÐµÐ´ ÑÐ»Ð°Ð³Ð°Ð½Ðµ, Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ Ð´Ð° ÑÐµ Ð¸Ð·ÑÑÐ¸Ð²Ð°Ñ", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "ÐÐ¾Ð´ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ð¾", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 116, 180, 60, 14 - PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "ÐÐ¾Ð´ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ð¾", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 116, 195, 60, 14 + PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -57,7 +57,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "NastavenÃ" FONT 8, "MS Shell Dlg" @@ -71,16 +71,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&ProchÃ¡zet...", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Smazat instalÃ¡tor programu po dokonÄenÃ instalace", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "VÃ½chozÃ", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Storno", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "SystÃ©movÃ© nastavenÃ proxy", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Bez proxy serveru", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "NepouÅ¾Ãvat pro", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "VÃ½chozÃ", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Storno", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Einstellungen" FONT 8, "MS Shell Dlg" @@ -66,16 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&WÃ¤hlen", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Installer nach Programminstallation lÃ¶schen", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "Proxy Einstellungen des Systems verwenden", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 160, 10 - CONTROL "Direkt (Kein Proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "Kein Proxy", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "Vorgabe", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "Proxy Einstellungen des Systems verwenden", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direkt (Kein Proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Kein Proxy", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Vorgabe", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Settings" FONT 8, "MS Shell Dlg" @@ -66,16 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Delete program installer after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -55,7 +55,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ajustes" FONT 8, "MS Shell Dlg" @@ -69,16 +69,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Seleccionar", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Borrar el instalador del programa tras su instalaciÃ³n", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "Por defecto", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "Aceptar", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Por defecto", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "Aceptar", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Configuration" FONT 8, "MS Shell Dlg" @@ -66,16 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&SÃ©lectionner", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Supprimer l'installateur du programme aprÃ¨s l'installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "Par dÃ©faut", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "Accepter", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Annuler", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Par dÃ©faut", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "Accepter", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -54,7 +54,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "××××¨××ª" FONT 8, "MS Shell Dlg" @@ -68,16 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "×××¨", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "×××§ ××ª ×§×××¥ ×××ª×§× × ××××¨ ×¡××× ×××ª×§× ×", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "××¨××¨×ª ××××", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "×××©××¨", IDOK, 116, 180, 60, 14 - PUSHBUTTON "×××××", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "××¨××¨×ª ××××", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "×××©××¨", IDOK, 116, 195, 60, 14 + PUSHBUTTON "×××××", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" @@ -66,16 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Scegli", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Rimuovere la procedura di installazione dopo l'uso", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "Predefiniti", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Annulla", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Predefiniti", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Annulla", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "è¨å®" FONT 9, "MS UI Gothic" @@ -66,16 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "é¸æ(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "ã¤ã³ã¹ãã¼ã«å¾ã«ããã°ã©ã ã®ã¤ã³ã¹ãã¼ã©ãåé¤ãã(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "ããã©ã«ã", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "ããã©ã«ã", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Settings" FONT 8, "MS Shell Dlg" @@ -66,16 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -60,7 +60,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" @@ -73,17 +73,17 @@ LTEXT "Katalog dla pobranych plikÃ³w:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "&Wybierz", IDC_CHOOSE, 187, 85, 50, 14 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL AUTOCHECKBOX "&UsuÅ instalatory programÃ³w po ich zainstalowaniu", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "DomyÅlne", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "DomyÅlne", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -54,7 +54,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ConfiguraÃ§Ãµes" FONT 8, "MS Shell Dlg" @@ -67,17 +67,17 @@ LTEXT "Pasta de download:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Escolher", IDC_CHOOSE, 187, 85, 50, 14 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL AUTOCHECKBOX "&Deletar instalador apÃ³s a instalaÃ§Ã£o do programa", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "PadrÃ£o", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "PadrÃ£o", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -58,30 +58,30 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "PreferinÈe" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Generale", -1, 4, 2, 240, 61 AUTOCHECKBOX "&PÄstreazÄ poziÈia ferestrei", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&ActualizeazÄ la pornire lista programelor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12 + AUTOCHECKBOX "Actualizea&zÄ la pornire lista programelor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12 AUTOCHECKBOX "&MenÈine jurnal de instalare/dezinstalare a programelor", IDC_LOG_ENABLED, 15, 46, 219, 12 GROUPBOX "DescÄrcÄri", -1, 4, 65, 240, 51 LTEXT "Dosarul pentru descÄrcÄri:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Spe&cificareâ¦", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "Èt&erge aplicaÈia de instalare dupÄ instalarea programului", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Implicite", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "Con&firmÄ", IDOK, 116, 180, 60, 14 - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "Configur&aÈia mandatar din sistem", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Di&rect (fÄrÄ mandatar)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Man&datar", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "excepÈie pentru", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "&Implicite", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "Con&firmÄ", IDOK, 116, 195, 60, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ" FONT 8, "MS Shell Dlg" @@ -66,16 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Ð&ÑÐ±ÑÐ°ÑÑ", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Ð£Ð´Ð°Ð»ÑÑÑ Ð¸Ð½ÑÑÐ°Ð»Ð»ÑÑÐ¾ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼ Ð¿Ð¾ÑÐ»Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -57,7 +57,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Nastavenia" FONT 8, "MS Shell Dlg" @@ -71,16 +71,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&VybraÅ¥", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&ZmazaÅ¥ inÅ¡talaÄnÃ© programy po nainÅ¡talovanÃ", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "PredvolenÃ©", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "PredvolenÃ©", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -56,7 +56,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Konfigurime" FONT 8, "MS Shell Dlg" @@ -70,16 +70,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Zgjedh", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "Fshi instaluesit e programeve pas instalimit", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "Parazgjedhur", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Anulo", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Parazgjedhur", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Anulo", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -59,7 +59,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "InstÃ¤llningar" FONT 8, "MS Shell Dlg" @@ -73,16 +73,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&VÃ¤lj", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Ta bort programinstallerare efter installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "Standard", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Standard", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -54,7 +54,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ayarlar" FONT 8, "MS Shell Dlg" @@ -68,16 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&SeÃ§", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Kurulumdan Sonra Ä°zlencenin Kurulum KÃ¼tÃ¼ÄÃ¼nÃ¼ Sil", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "Ãn TanÄ±mlÄ±lar", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "Tamam", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Ä°ptal", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Ãn TanÄ±mlÄ±lar", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "Tamam", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -60,7 +60,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ" FONT 8, "MS Shell Dlg" @@ -74,16 +74,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&ÐÐ±ÑÐ°ÑÐ¸", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&ÐÐ¸Ð´Ð°Ð»ÑÑÐ¸ ÑÐ½ÑÑÐ°Ð»ÑÑÐ¾ÑÐ¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ Ð¿ÑÑÐ»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 195, 60, 14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -54,7 +54,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "è®¾ç½®" FONT 8, "MS Shell Dlg" @@ -68,16 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "éæ©(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "å¨å®è£å®ç¨åºåå é¤å®è£ç¨åº(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "ç¼ºç", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "ç¡®å®", IDOK, 116, 180, 60, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "ç¼ºç", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "ç¡®å®", IDOK, 116, 195, 60, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -54,7 +54,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 215 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "è¨å®" FONT 8, "MS Shell Dlg" @@ -68,16 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "é¸æ(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "å¨å®è£å®ç¨å¼å¾åªé¤å®è£ç¨å¼(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Proxy", -1, 4, 116, 240, 61 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 - CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 - EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL - LTEXT "No proxy for", -1, 122, 160, 42, 8 - EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL - PUSHBUTTON "é è¨", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 - PUSHBUTTON "ç¢ºå®", IDOK, 116, 180, 60, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 181, 180, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 76 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 + EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "No proxy for", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + PUSHBUTTON "é è¨", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 + PUSHBUTTON "ç¢ºå®", IDOK, 116, 195, 60, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 181, 195, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… ============================================================================== --- trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] Mon Mar 16 15:34:00 2015 @@ -60,6 +60,12 @@ CheckRadioButton(hDlg, IDC_PROXY_DEFAULT, IDC_USE_PROXY, IDC_PROXY_DEFAULT+Info->Proxy); + if(IDC_PROXY_DEFAULT + Info->Proxy == IDC_USE_PROXY) + { + EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), TRUE); + } + SetWindowTextW(GetDlgItem(hDlg, IDC_PROXY_SERVER), Info->szProxyServer); SetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), Info->szNoProxyFor); } @@ -103,14 +109,20 @@ case IDC_PROXY_DEFAULT: NewSettingsInfo.Proxy = 0; + EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), FALSE); break; case IDC_NO_PROXY: NewSettingsInfo.Proxy = 1; + EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), FALSE); break; case IDC_USE_PROXY: NewSettingsInfo.Proxy = 2; + EnableWindow(GetDlgItem(hDlg, IDC_PROXY_SERVER), TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), TRUE); break; case IDC_DEFAULT_SETTINGS:

1 0

[hbelusca] 66735: [BOOTDATA] - Remove hardcoded registry values: CurrentVersion, CSDVersion and CurrentBuildNumber from HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion. They are computed and stor...
by hbelusca＠svn.reactos.org 16 Mar '15

16 Mar '15

Author: hbelusca Date: Mon Mar 16 03:14:16 2015 New Revision: 66735 URL: http://svn.reactos.org/svn/reactos?rev=66735&view=rev Log: [BOOTDATA] - Remove hardcoded registry values: CurrentVersion, CSDVersion and CurrentBuildNumber from HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion. They are computed and stored there by the kernel. - All the versioning is controlled by the two values: CSDReleaseType and CSDVersion in HKLM\SYSTEM\CurrentControlSet\Control\Windows. Currently we target SP1. [NTDLL] The lpVersionInformation->szCSDVersion string should not be built by RtlGetVersion, but instead retrieved from the Peb->CSDVersion string that in turn is initialized by the NTDLL PE Loader. Normally this is a App-Compatibility-dependent string, but for now we somewhat hardcode it (it is built using the actual Peb->OSCSDVersion number). [RTL]: Rename some variables "à la NT" and use adequate types (but no code changes otherwise). [NTOS] - Fix PsGetVersion that should use the CmCSDVersionString variable. This API also returns TRUE if we are in checked build mode (the high byte of NtBuildNumber is flagged). - The kernel should initialize the CurrentVersion, CSDVersion and CurrentBuildNumber registry values (and few other ones) from the two main CSDReleaseType and CSDVersion values. - Fix the ReactOS-specific version+revision display in SOS mode. CORE-6611 CORE-7889 CORE-8877 Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/ntdll/rtl/version.c trunk/reactos/lib/rtl/version.c trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -154,9 +154,6 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",,0x00000012 ; Version Information -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00000000,"5.2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00000000,"Service Pack 2" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00000000,"3790" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","InstallDate",0x00010003,0 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","ProductName",2,"ReactOS" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","RegDone",0x00000002,"" Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -1220,6 +1220,7 @@ ; but we can also report as Workstation if some application needs it. HKLM,"SYSTEM\CurrentControlSet\Control\ReactOS\Settings\Version","ReportAsWorkstation",0x00010001,0x00000000 ; Some installers check for SP1 +HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDReleaseType",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000100 HKLM,"SYSTEM\CurrentControlSet\Control\SecurityProviders","SecurityProviders",2,"schannel.dll" Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -1775,7 +1775,7 @@ /* Check if we failed */ if (!NT_SUCCESS(Status)) { - /* Aassume System32 */ + /* Assume System32 */ LdrpKnownDllObjectDirectory = NULL; RtlInitUnicodeString(&LdrpKnownDllPath, StringBuffer); LdrpKnownDllPath.Length -= sizeof(WCHAR); @@ -2069,6 +2069,40 @@ ProcessExecuteFlags, &ExecuteOptions, sizeof(ULONG)); + + // FIXME: Should be done by Application Compatibility features, + // by reading the registry, etc... + // For now, this is the old code from ntdll!RtlGetVersion(). + RtlInitEmptyUnicodeString(&Peb->CSDVersion, NULL, 0); + if (((Peb->OSCSDVersion >> 8) & 0xFF) != 0) + { + WCHAR szCSDVersion[128]; + ULONG i; + ULONG Length = ARRAYSIZE(szCSDVersion) - 1; + i = _snwprintf(szCSDVersion, Length, + L"Service Pack %d", + ((Peb->OSCSDVersion >> 8) & 0xFF)); + if (i < 0) + { + /* Null-terminate if it was overflowed */ + szCSDVersion[Length] = UNICODE_NULL; + } + + Length *= sizeof(WCHAR); + Peb->CSDVersion.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + Length + sizeof(UNICODE_NULL)); + if (Peb->CSDVersion.Buffer) + { + Peb->CSDVersion.Length = Length; + Peb->CSDVersion.MaximumLength = Length + sizeof(UNICODE_NULL); + + RtlCopyMemory(Peb->CSDVersion.Buffer, + szCSDVersion, + Peb->CSDVersion.MaximumLength); + Peb->CSDVersion.Buffer[Peb->CSDVersion.Length / sizeof(WCHAR)] = UNICODE_NULL; + } + } /* Check if we had Shim Data */ if (OldShimData) Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -204,6 +204,7 @@ /* Zero it out */ RtlInitEmptyUnicodeString(StringIn, NULL, 0); } + BOOLEAN NTAPI LdrpCallInitRoutine(IN PDLL_INIT_ROUTINE EntryPoint, Modified: trunk/reactos/dll/ntdll/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -69,26 +69,26 @@ } /********************************************************************** - * NAME EXPORTED - * RtlGetNtProductType + * NAME EXPORTED + * RtlGetNtProductType * * DESCRIPTION - * Retrieves the OS product type. + * Retrieves the OS product type. * * ARGUMENTS - * ProductType Pointer to the product type variable. + * ProductType Pointer to the product type variable. * * RETURN VALUE - * TRUE if successful, otherwise FALSE + * TRUE if successful, otherwise FALSE * * NOTE - * ProductType can be one of the following values: - * 1 Workstation (WinNT) - * 2 Server (LanmanNT) - * 3 Advanced Server (ServerNT) + * ProductType can be one of the following values: + * 1 Workstation (WinNT) + * 2 Server (LanmanNT) + * 3 Advanced Server (ServerNT) * * REVISIONS - * 2000-08-10 ekohl + * 2000-08-10 ekohl * * @implemented */ @@ -100,53 +100,53 @@ } /********************************************************************** - * NAME EXPORTED - * RtlGetNtVersionNumbers + * NAME EXPORTED + * RtlGetNtVersionNumbers * * DESCRIPTION - * Get the version numbers of the run time library. + * Get the version numbers of the run time library. * * ARGUMENTS - * pdwMajorVersion [OUT] Destination for the Major version - * pdwMinorVersion [OUT] Destination for the Minor version - * pdwBuildNumber [OUT] Destination for the Build version + * pMajorVersion [OUT] Destination for the Major version + * pMinorVersion [OUT] Destination for the Minor version + * pBuildNumber [OUT] Destination for the Build version * * RETURN VALUE - * Nothing. + * Nothing. * * NOTES - * - Introduced in Windows XP (NT 5.1) - * - Since this call didn't exist before XP, we report at least the version - * 5.1. This fixes the loading of msvcrt.dll as released with XP Home, - * which fails in DLLMain() if the major version isn't 5. + * - Introduced in Windows XP (NT 5.1) + * - Since this call didn't exist before XP, we report at least the version + * 5.1. This fixes the loading of msvcrt.dll as released with XP Home, + * which fails in DLLMain() if the major version isn't 5. * * @implemented */ VOID NTAPI -RtlGetNtVersionNumbers(OUT LPDWORD pdwMajorVersion, - OUT LPDWORD pdwMinorVersion, - OUT LPDWORD pdwBuildNumber) +RtlGetNtVersionNumbers(OUT PULONG pMajorVersion, + OUT PULONG pMinorVersion, + OUT PULONG pBuildNumber) { PPEB pPeb = NtCurrentPeb(); - if (pdwMajorVersion) - { - *pdwMajorVersion = pPeb->OSMajorVersion < 5 ? 5 : pPeb->OSMajorVersion; - } - - if (pdwMinorVersion) + if (pMajorVersion) + { + *pMajorVersion = pPeb->OSMajorVersion < 5 ? 5 : pPeb->OSMajorVersion; + } + + if (pMinorVersion) { if ( (pPeb->OSMajorVersion < 5) || ((pPeb->OSMajorVersion == 5) && (pPeb->OSMinorVersion < 1)) ) - *pdwMinorVersion = 1; + *pMinorVersion = 1; else - *pdwMinorVersion = pPeb->OSMinorVersion; - } - - if (pdwBuildNumber) + *pMinorVersion = pPeb->OSMinorVersion; + } + + if (pBuildNumber) { /* Windows really does this! */ - *pdwBuildNumber = (0xF0000000 | pPeb->OSBuildNumber); + *pBuildNumber = (0xF0000000 | pPeb->OSBuildNumber); } } @@ -157,50 +157,51 @@ NTSTATUS NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) { - LONG i, MaxLength; - - if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || - lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) - { - PPEB Peb = NtCurrentPeb(); - - lpVersionInformation->dwMajorVersion = Peb->OSMajorVersion; - lpVersionInformation->dwMinorVersion = Peb->OSMinorVersion; - lpVersionInformation->dwBuildNumber = Peb->OSBuildNumber; - lpVersionInformation->dwPlatformId = Peb->OSPlatformId; - RtlZeroMemory(lpVersionInformation->szCSDVersion, sizeof(lpVersionInformation->szCSDVersion)); - - if(((Peb->OSCSDVersion >> 8) & 0xFF) != 0) - { - MaxLength = (sizeof(lpVersionInformation->szCSDVersion) / sizeof(lpVersionInformation->szCSDVersion[0])) - 1; - i = _snwprintf(lpVersionInformation->szCSDVersion, - MaxLength, - L"Service Pack %d", - ((Peb->OSCSDVersion >> 8) & 0xFF)); - if (i < 0) - { - /* Null-terminate if it was overflowed */ - lpVersionInformation->szCSDVersion[MaxLength] = L'\0'; - } - } - - if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) - { - PRTL_OSVERSIONINFOEXW InfoEx = (PRTL_OSVERSIONINFOEXW)lpVersionInformation; - InfoEx->wServicePackMajor = (Peb->OSCSDVersion >> 8) & 0xFF; - InfoEx->wServicePackMinor = Peb->OSCSDVersion & 0xFF; - InfoEx->wSuiteMask = SharedUserData->SuiteMask & 0xFFFF; - InfoEx->wProductType = SharedUserData->NtProductType; - InfoEx->wReserved = 0; - - /* HACK: ReactOS specific changes, see bug-reports CORE-6611 and CORE-4620 (aka. #5003) */ - SetRosSpecificInfo(InfoEx); - } - - return STATUS_SUCCESS; - } - - return STATUS_INVALID_PARAMETER; + ULONG Length; + PPEB Peb = NtCurrentPeb(); + + if (lpVersionInformation->dwOSVersionInfoSize != sizeof(RTL_OSVERSIONINFOW) && + lpVersionInformation->dwOSVersionInfoSize != sizeof(RTL_OSVERSIONINFOEXW)) + { + return STATUS_INVALID_PARAMETER; + } + + lpVersionInformation->dwMajorVersion = Peb->OSMajorVersion; + lpVersionInformation->dwMinorVersion = Peb->OSMinorVersion; + lpVersionInformation->dwBuildNumber = Peb->OSBuildNumber; + lpVersionInformation->dwPlatformId = Peb->OSPlatformId; + RtlZeroMemory(lpVersionInformation->szCSDVersion, sizeof(lpVersionInformation->szCSDVersion)); + + /* If we have a CSD version string, initialized by Application Compatibility... */ + if (Peb->CSDVersion.Length && Peb->CSDVersion.Buffer && Peb->CSDVersion.Buffer[0] != UNICODE_NULL) + { + /* ... copy it... */ + Length = min(wcslen(Peb->CSDVersion.Buffer), ARRAYSIZE(lpVersionInformation->szCSDVersion) - 1); + wcsncpy(lpVersionInformation->szCSDVersion, Peb->CSDVersion.Buffer, Length); + } + else + { + /* ... otherwise we just null-terminate it */ + Length = 0; + } + + /* Always null-terminate the user CSD version string */ + lpVersionInformation->szCSDVersion[Length] = UNICODE_NULL; + + if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) + { + PRTL_OSVERSIONINFOEXW InfoEx = (PRTL_OSVERSIONINFOEXW)lpVersionInformation; + InfoEx->wServicePackMajor = (Peb->OSCSDVersion >> 8) & 0xFF; + InfoEx->wServicePackMinor = Peb->OSCSDVersion & 0xFF; + InfoEx->wSuiteMask = SharedUserData->SuiteMask & 0xFFFF; + InfoEx->wProductType = SharedUserData->NtProductType; + InfoEx->wReserved = 0; + + /* HACK: ReactOS specific changes, see bug-reports CORE-6611 and CORE-4620 (aka. #5003) */ + SetRosSpecificInfo(InfoEx); + } + + return STATUS_SUCCESS; } /* EOF */ Modified: trunk/reactos/lib/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/version.c?rev=6673… ============================================================================== --- trunk/reactos/lib/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/version.c [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -22,14 +22,14 @@ /* FUNCTIONS ****************************************************************/ -static BYTE -RtlpVerGetCondition(IN ULONGLONG dwlConditionMask, - IN DWORD dwTypeBitMask); +static UCHAR +RtlpVerGetCondition(IN ULONGLONG ConditionMask, + IN ULONG TypeMask); static BOOLEAN -RtlpVerCompare(ULONG left, ULONG right, UCHAR condition) -{ - switch (condition) +RtlpVerCompare(ULONG left, ULONG right, UCHAR Condition) +{ + switch (Condition) { case VER_EQUAL: return (left == right); @@ -56,9 +56,9 @@ IN ULONG TypeMask, IN ULONGLONG ConditionMask) { + NTSTATUS Status; RTL_OSVERSIONINFOEXW ver; - NTSTATUS status; - BOOLEAN comparison; + BOOLEAN Comparison; /* FIXME: - Check the following special case on Windows (various versions): @@ -68,17 +68,17 @@ */ ver.dwOSVersionInfoSize = sizeof(ver); - status = RtlGetVersion((PRTL_OSVERSIONINFOW)&ver); - if (status != STATUS_SUCCESS) return status; + Status = RtlGetVersion((PRTL_OSVERSIONINFOW)&ver); + if (Status != STATUS_SUCCESS) return Status; if (!TypeMask || !ConditionMask) return STATUS_INVALID_PARAMETER; if (TypeMask & VER_PRODUCT_TYPE) { - comparison = RtlpVerCompare(ver.wProductType, + Comparison = RtlpVerCompare(ver.wProductType, VersionInfo->wProductType, RtlpVerGetCondition(ConditionMask, VER_PRODUCT_TYPE)); - if (!comparison) + if (!Comparison) return STATUS_REVISION_MISMATCH; } @@ -105,19 +105,19 @@ if (TypeMask & VER_PLATFORMID) { - comparison = RtlpVerCompare(ver.dwPlatformId, + Comparison = RtlpVerCompare(ver.dwPlatformId, VersionInfo->dwPlatformId, RtlpVerGetCondition(ConditionMask, VER_PLATFORMID)); - if (!comparison) + if (!Comparison) return STATUS_REVISION_MISMATCH; } if (TypeMask & VER_BUILDNUMBER) { - comparison = RtlpVerCompare(ver.dwBuildNumber, + Comparison = RtlpVerCompare(ver.dwBuildNumber, VersionInfo->dwBuildNumber, RtlpVerGetCondition(ConditionMask, VER_BUILDNUMBER)); - if (!comparison) + if (!Comparison) return STATUS_REVISION_MISMATCH; } @@ -130,79 +130,79 @@ * operator for VER_MAJORVERSION supersedes the others for VER_MINORVERSION, * VER_SERVICEPACKMAJOR and VER_SERVICEPACKMINOR). */ - BYTE condition = RtlpVerGetCondition(ConditionMask, TypeMask); - - comparison = TRUE; + UCHAR Condition = RtlpVerGetCondition(ConditionMask, TypeMask); + + Comparison = TRUE; if (TypeMask & VER_MAJORVERSION) { - comparison = RtlpVerCompare(ver.dwMajorVersion, + Comparison = RtlpVerCompare(ver.dwMajorVersion, VersionInfo->dwMajorVersion, - condition); + Condition); do_next_check = (ver.dwMajorVersion == VersionInfo->dwMajorVersion) && - ((condition != VER_EQUAL) || comparison); + ((Condition != VER_EQUAL) || Comparison); } if ((TypeMask & VER_MINORVERSION) && do_next_check) { - comparison = RtlpVerCompare(ver.dwMinorVersion, + Comparison = RtlpVerCompare(ver.dwMinorVersion, VersionInfo->dwMinorVersion, - condition); + Condition); do_next_check = (ver.dwMinorVersion == VersionInfo->dwMinorVersion) && - ((condition != VER_EQUAL) || comparison); + ((Condition != VER_EQUAL) || Comparison); } if ((TypeMask & VER_SERVICEPACKMAJOR) && do_next_check) { - comparison = RtlpVerCompare(ver.wServicePackMajor, + Comparison = RtlpVerCompare(ver.wServicePackMajor, VersionInfo->wServicePackMajor, - condition); + Condition); do_next_check = (ver.wServicePackMajor == VersionInfo->wServicePackMajor) && - ((condition != VER_EQUAL) || comparison); + ((Condition != VER_EQUAL) || Comparison); } if ((TypeMask & VER_SERVICEPACKMINOR) && do_next_check) { - comparison = RtlpVerCompare(ver.wServicePackMinor, + Comparison = RtlpVerCompare(ver.wServicePackMinor, VersionInfo->wServicePackMinor, - condition); - } - - if (!comparison) + Condition); + } + + if (!Comparison) return STATUS_REVISION_MISMATCH; } return STATUS_SUCCESS; } -static BYTE -RtlpVerGetCondition(IN ULONGLONG dwlConditionMask, - IN DWORD dwTypeBitMask) -{ - BYTE bConditionMask = 0; - - if (dwTypeBitMask & VER_PRODUCT_TYPE) - bConditionMask |= dwlConditionMask >> (7 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_SUITENAME) - bConditionMask |= dwlConditionMask >> (6 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_PLATFORMID) - bConditionMask |= dwlConditionMask >> (3 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_BUILDNUMBER) - bConditionMask |= dwlConditionMask >> (2 * VER_NUM_BITS_PER_CONDITION_MASK); +static UCHAR +RtlpVerGetCondition(IN ULONGLONG ConditionMask, + IN ULONG TypeMask) +{ + UCHAR Condition = 0; + + if (TypeMask & VER_PRODUCT_TYPE) + Condition |= ConditionMask >> (7 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_SUITENAME) + Condition |= ConditionMask >> (6 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_PLATFORMID) + Condition |= ConditionMask >> (3 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_BUILDNUMBER) + Condition |= ConditionMask >> (2 * VER_NUM_BITS_PER_CONDITION_MASK); /* * We choose here the lexicographical order on the 4D space * {(Major ; Minor ; SP Major ; SP Minor)} to select the * appropriate comparison operator. * Therefore the following 'else if' instructions must be in this order. */ - else if (dwTypeBitMask & VER_MAJORVERSION) - bConditionMask |= dwlConditionMask >> (1 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_MINORVERSION) - bConditionMask |= dwlConditionMask >> (0 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_SERVICEPACKMAJOR) - bConditionMask |= dwlConditionMask >> (5 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_SERVICEPACKMINOR) - bConditionMask |= dwlConditionMask >> (4 * VER_NUM_BITS_PER_CONDITION_MASK); - - bConditionMask &= VER_CONDITION_MASK; - - return bConditionMask; + else if (TypeMask & VER_MAJORVERSION) + Condition |= ConditionMask >> (1 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_MINORVERSION) + Condition |= ConditionMask >> (0 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_SERVICEPACKMAJOR) + Condition |= ConditionMask >> (5 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_SERVICEPACKMINOR) + Condition |= ConditionMask >> (4 * VER_NUM_BITS_PER_CONDITION_MASK); + + Condition &= VER_CONDITION_MASK; + + return Condition; } /* @@ -210,39 +210,39 @@ */ ULONGLONG NTAPI -VerSetConditionMask(IN ULONGLONG dwlConditionMask, - IN DWORD dwTypeBitMask, - IN BYTE bConditionMask) +VerSetConditionMask(IN ULONGLONG ConditionMask, + IN ULONG TypeMask, + IN UCHAR Condition) { ULONGLONG ullCondMask; - if (dwTypeBitMask == 0) - return dwlConditionMask; - - bConditionMask &= VER_CONDITION_MASK; - - if (bConditionMask == 0) - return dwlConditionMask; - - ullCondMask = bConditionMask; - if (dwTypeBitMask & VER_PRODUCT_TYPE) - dwlConditionMask |= ullCondMask << (7 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_SUITENAME) - dwlConditionMask |= ullCondMask << (6 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_SERVICEPACKMAJOR) - dwlConditionMask |= ullCondMask << (5 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_SERVICEPACKMINOR) - dwlConditionMask |= ullCondMask << (4 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_PLATFORMID) - dwlConditionMask |= ullCondMask << (3 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_BUILDNUMBER) - dwlConditionMask |= ullCondMask << (2 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_MAJORVERSION) - dwlConditionMask |= ullCondMask << (1 * VER_NUM_BITS_PER_CONDITION_MASK); - else if (dwTypeBitMask & VER_MINORVERSION) - dwlConditionMask |= ullCondMask << (0 * VER_NUM_BITS_PER_CONDITION_MASK); - - return dwlConditionMask; + if (TypeMask == 0) + return ConditionMask; + + Condition &= VER_CONDITION_MASK; + + if (Condition == 0) + return ConditionMask; + + ullCondMask = Condition; + if (TypeMask & VER_PRODUCT_TYPE) + ConditionMask |= ullCondMask << (7 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_SUITENAME) + ConditionMask |= ullCondMask << (6 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_SERVICEPACKMAJOR) + ConditionMask |= ullCondMask << (5 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_SERVICEPACKMINOR) + ConditionMask |= ullCondMask << (4 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_PLATFORMID) + ConditionMask |= ullCondMask << (3 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_BUILDNUMBER) + ConditionMask |= ullCondMask << (2 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_MAJORVERSION) + ConditionMask |= ullCondMask << (1 * VER_NUM_BITS_PER_CONDITION_MASK); + else if (TypeMask & VER_MINORVERSION) + ConditionMask |= ullCondMask << (0 * VER_NUM_BITS_PER_CONDITION_MASK); + + return ConditionMask; } /* EOF */ Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -699,6 +699,14 @@ }, { + L"Windows", + L"CSDReleaseType", + &CmNtCSDReleaseType, + NULL, + NULL + }, + + { L"Nls\\Language", L"Default", CmDefaultLanguageId, Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -2079,27 +2079,30 @@ NTAPI CmpSetVersionData(VOID) { + NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; UNICODE_STRING ValueName; UNICODE_STRING ValueData; + ANSI_STRING TempString; HANDLE SoftwareKeyHandle = NULL; HANDLE MicrosoftKeyHandle = NULL; HANDLE WindowsNtKeyHandle = NULL; HANDLE CurrentVersionKeyHandle = NULL; - WCHAR Buffer[128]; - NTSTATUS Status; - - /* Open the 'CurrentVersion' key */ - RtlInitUnicodeString(&KeyName, - L"\\REGISTRY\\MACHINE\\SOFTWARE"); - + WCHAR Buffer[128]; // Buffer large enough to contain a full ULONG in decimal representation, + // and the full 'CurrentType' string. + + /* + * Open the 'HKLM\Software\Microsoft\Windows NT\CurrentVersion' key + * (create the intermediate subkeys if needed). + */ + + RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE\\SOFTWARE"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateKey(&SoftwareKeyHandle, KEY_CREATE_SUB_KEY, &ObjectAttributes, @@ -2113,16 +2116,12 @@ return; } - /* Open the 'CurrentVersion' key */ - RtlInitUnicodeString(&KeyName, - L"Microsoft"); - + RtlInitUnicodeString(&KeyName, L"Microsoft"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, SoftwareKeyHandle, NULL); - Status = NtCreateKey(&MicrosoftKeyHandle, KEY_CREATE_SUB_KEY, &ObjectAttributes, @@ -2133,19 +2132,15 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create key %wZ (Status: %08lx)\n", &KeyName, Status); - goto done; - } - - /* Open the 'CurrentVersion' key */ - RtlInitUnicodeString(&KeyName, - L"Windows NT"); - + goto Quit; + } + + RtlInitUnicodeString(&KeyName, L"Windows NT"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, MicrosoftKeyHandle, NULL); - Status = NtCreateKey(&WindowsNtKeyHandle, KEY_CREATE_SUB_KEY, &ObjectAttributes, @@ -2156,19 +2151,15 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create key %wZ (Status: %08lx)\n", &KeyName, Status); - goto done; - } - - /* Open the 'CurrentVersion' key */ - RtlInitUnicodeString(&KeyName, - L"CurrentVersion"); - + goto Quit; + } + + RtlInitUnicodeString(&KeyName, L"CurrentVersion"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, WindowsNtKeyHandle, NULL); - Status = NtCreateKey(&CurrentVersionKeyHandle, KEY_CREATE_SUB_KEY | KEY_SET_VALUE, &ObjectAttributes, @@ -2179,30 +2170,22 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create key %wZ (Status: %08lx)\n", &KeyName, Status); - goto done; - } - - /* Set the 'CurrentType' value */ - RtlInitUnicodeString(&ValueName, - L"CurrentType"); - -#ifdef CONFIG_SMP - wcscpy(Buffer, L"Multiprocessor"); -#else - wcscpy(Buffer, L"Uniprocessor"); -#endif - - wcscat(Buffer, L" "); - -#if (DBG == 1) - wcscat(Buffer, L"Checked"); -#else - wcscat(Buffer, L"Free"); -#endif - - RtlInitUnicodeString(&ValueData, - Buffer); - + goto Quit; + } + + /* Set the 'CurrentVersion' value */ + RtlInitUnicodeString(&ValueName, L"CurrentVersion"); + NtSetValueKey(CurrentVersionKeyHandle, + &ValueName, + 0, + REG_SZ, + CmVersionString.Buffer, + CmVersionString.Length + sizeof(WCHAR)); + + /* Set the 'CurrentBuildNumber' value */ + RtlInitUnicodeString(&ValueName, L"CurrentBuildNumber"); + RtlInitEmptyUnicodeString(&ValueData, Buffer, sizeof(Buffer)); + RtlIntegerToUnicodeString(NtBuildNumber & 0xFFFF, 10, &ValueData); NtSetValueKey(CurrentVersionKeyHandle, &ValueName, 0, @@ -2210,7 +2193,88 @@ ValueData.Buffer, ValueData.Length + sizeof(WCHAR)); -done:; + /* Set the 'BuildLab' value */ + RtlInitUnicodeString(&ValueName, L"BuildLab"); + RtlInitAnsiString(&TempString, NtBuildLab); + Status = RtlAnsiStringToUnicodeString(&ValueData, &TempString, FALSE); + if (NT_SUCCESS(Status)) + { + NtSetValueKey(CurrentVersionKeyHandle, + &ValueName, + 0, + REG_SZ, + ValueData.Buffer, + ValueData.Length + sizeof(WCHAR)); + } + + /* Set the 'CurrentType' value */ + RtlInitUnicodeString(&ValueName, L"CurrentType"); + + swprintf(Buffer, L"%s %s", +#ifdef CONFIG_SMP + L"Multiprocessor" +#else + L"Uniprocessor" +#endif + , +#if (DBG == 1) + L"Checked" +#else + L"Free" +#endif + ); + RtlInitUnicodeString(&ValueData, Buffer); + NtSetValueKey(CurrentVersionKeyHandle, + &ValueName, + 0, + REG_SZ, + ValueData.Buffer, + ValueData.Length + sizeof(WCHAR)); + + /* Set the 'CSDVersion' value */ + RtlInitUnicodeString(&ValueName, L"CSDVersion"); + if (CmCSDVersionString.Length != 0) + { + NtSetValueKey(CurrentVersionKeyHandle, + &ValueName, + 0, + REG_SZ, + CmCSDVersionString.Buffer, + CmCSDVersionString.Length + sizeof(WCHAR)); + } + else + { + NtDeleteValueKey(CurrentVersionKeyHandle, &ValueName); + } + + /* Set the 'CSDBuildNumber' value */ + RtlInitUnicodeString(&ValueName, L"CSDBuildNumber"); + if (CmNtSpBuildNumber != 0) + { + RtlInitEmptyUnicodeString(&ValueData, Buffer, sizeof(Buffer)); + RtlIntegerToUnicodeString(CmNtSpBuildNumber, 10, &ValueData); + NtSetValueKey(CurrentVersionKeyHandle, + &ValueName, + 0, + REG_SZ, + ValueData.Buffer, + ValueData.Length + sizeof(WCHAR)); + } + else + { + NtDeleteValueKey(CurrentVersionKeyHandle, &ValueName); + } + + /* Set the 'SystemRoot' value */ + RtlInitUnicodeString(&ValueName, L"SystemRoot"); + NtSetValueKey(CurrentVersionKeyHandle, + &ValueName, + 0, + REG_SZ, + NtSystemRoot.Buffer, + NtSystemRoot.Length + sizeof(WCHAR)); + +Quit: /* Close the keys */ if (CurrentVersionKeyHandle != NULL) NtClose(CurrentVersionKeyHandle); Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=667… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -41,9 +41,9 @@ /* NT Version Info */ ULONG NtMajorVersion = VER_PRODUCTMAJORVERSION; ULONG NtMinorVersion = VER_PRODUCTMINORVERSION; -#if DBG +#if DBG /* Checked Build */ ULONG NtBuildNumber = VER_PRODUCTBUILD | 0xC0000000; -#else +#else /* Free Build */ ULONG NtBuildNumber = VER_PRODUCTBUILD; #endif @@ -920,10 +920,10 @@ ULONG PerfMemUsed; PLDR_DATA_TABLE_ENTRY NtosEntry; PMESSAGE_RESOURCE_ENTRY MsgEntry; - ANSI_STRING CsdString; + ANSI_STRING CSDString; size_t Remaining = 0; PCHAR RcEnd = NULL; - CHAR VersionBuffer [65]; + CHAR VersionBuffer[65]; /* Validate Loader */ if (!ExpIsLoaderValid(LoaderBlock)) @@ -1076,17 +1076,11 @@ /* Setup initial system settings */ CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector); - /* Load static defaults for Service Pack 1 and add our SVN revision */ - /* Format of CSD : SPMajor - SPMinor */ - CmNtCSDVersion = 0x100 | (KERNEL_VERSION_BUILD_HEX << 16); - CmNtCSDReleaseType = 0; - - /* Set Service Pack data for Service Pack 1 */ + /* Set the Service Pack Number and add it to the CSD Version number if needed */ CmNtSpBuildNumber = VER_PRODUCTBUILD_QFE; - if (!(CmNtCSDVersion & 0xFFFF0000)) - { - /* Check the release type */ - if (CmNtCSDReleaseType == 1) CmNtSpBuildNumber |= VER_PRODUCTBUILD_QFE << 16; + if (((CmNtCSDVersion & 0xFFFF0000) == 0) && (CmNtCSDReleaseType == 1)) + { + CmNtCSDVersion |= (VER_PRODUCTBUILD_QFE << 16); } /* Add loaded CmNtGlobalFlag value */ @@ -1140,22 +1134,22 @@ if (NT_SUCCESS(Status)) { /* Setup the string */ - RtlInitAnsiString(&CsdString, (PCHAR)MsgEntry->Text); + RtlInitAnsiString(&CSDString, (PCHAR)MsgEntry->Text); /* Remove trailing newline */ - while ((CsdString.Length > 0) && - ((CsdString.Buffer[CsdString.Length - 1] == '\r') || - (CsdString.Buffer[CsdString.Length - 1] == '\n'))) + while ((CSDString.Length > 0) && + ((CSDString.Buffer[CSDString.Length - 1] == '\r') || + (CSDString.Buffer[CSDString.Length - 1] == '\n'))) { /* Skip the trailing character */ - CsdString.Length--; + CSDString.Length--; } /* Fill the buffer with version information */ Status = RtlStringCbPrintfA(Buffer, sizeof(Buffer), "%Z %u%c", - &CsdString, + &CSDString, (CmNtCSDVersion & 0xFF00) >> 8, (CmNtCSDVersion & 0xFF) ? 'A' + (CmNtCSDVersion & 0xFF) - 1 : @@ -1197,7 +1191,7 @@ } /* Check if we have an RC number */ - if (CmNtCSDVersion & 0xFFFF0000) + if ((CmNtCSDVersion & 0xFFFF0000) && (CmNtCSDReleaseType == 1)) { /* Check if we have no version data yet */ if (!(*Buffer)) @@ -1223,10 +1217,12 @@ } /* Add the version format string */ + /* ReactOS specific: Append also the revision number */ Status = RtlStringCbPrintfA(RcEnd, Remaining, - "r%u", - /*(CmNtCSDVersion & 0xFFFF0000) >> 16*/ + "v.%u" + " r%u", + (CmNtCSDVersion & 0xFFFF0000) >> 16, KERNEL_VERSION_BUILD_HEX); if (!NT_SUCCESS(Status)) { @@ -1236,9 +1232,9 @@ } /* Now setup the final string */ - RtlInitAnsiString(&CsdString, Buffer); + RtlInitAnsiString(&CSDString, Buffer); Status = RtlAnsiStringToUnicodeString(&CmCSDVersionString, - &CsdString, + &CSDString, TRUE); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -9,9 +9,6 @@ extern ULONG ExpLastTimeZoneBias; extern POBJECT_TYPE ExEventPairObjectType; extern POBJECT_TYPE _ExEventObjectType, _ExSemaphoreObjectType; -extern ULONG NtBuildNumber; -extern ULONG NtMajorVersion; -extern ULONG NtMinorVersion; extern FAST_MUTEX ExpEnvironmentLock; extern ERESOURCE ExpFirmwareTableResource; extern LIST_ENTRY ExpFirmwareTableProviderListHead; @@ -20,9 +17,8 @@ extern ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; extern ULONG ExpUnicodeCaseTableDataOffset; extern PVOID ExpNlsSectionPointer; -extern CHAR NtBuildLab[]; -extern ULONG CmNtCSDVersion; extern ULONG NtGlobalFlag; +extern UNICODE_STRING NtSystemRoot; extern ULONG ExpInitializationPhase; extern ULONG ExpAltTimeZoneBias; extern LIST_ENTRY ExSystemLookasideListHead; @@ -32,6 +28,19 @@ extern LIST_ENTRY ExpPagedLookasideListHead; extern KSPIN_LOCK ExpNonPagedLookasideListLock; extern KSPIN_LOCK ExpPagedLookasideListLock; + +/* + * NT/Cm Version Info variables + */ +extern ULONG NtMajorVersion; +extern ULONG NtMinorVersion; +extern ULONG NtBuildNumber; +extern ULONG CmNtSpBuildNumber; +extern ULONG CmNtCSDVersion; +extern ULONG CmNtCSDReleaseType; +extern UNICODE_STRING CmVersionString; +extern UNICODE_STRING CmCSDVersionString; +extern CHAR NtBuildLab[]; #ifdef _WIN64 #define HANDLE_LOW_BITS (PAGE_SHIFT - 4) Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -30,7 +30,6 @@ POBJECT_TYPE IoDeviceObjectType = NULL; POBJECT_TYPE IoFileObjectType = NULL; extern POBJECT_TYPE IoControllerObjectType; -extern UNICODE_STRING NtSystemRoot; BOOLEAN IoCountOperations = TRUE; ULONG IoReadOperationCount = 0; LARGE_INTEGER IoReadTransferCount = {{0, 0}}; Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=66… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Mon Mar 16 03:14:16 2015 @@ -43,7 +43,7 @@ PVOID PspSystemDllEntryPoint; UNICODE_STRING PsNtDllPathName = - RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\ntdll.dll"); + RTL_CONSTANT_STRING(L"\\SystemRoot\\System32\\ntdll.dll"); PHANDLE_TABLE PspCidTable; @@ -658,28 +658,23 @@ */ BOOLEAN NTAPI -PsGetVersion(IN PULONG MajorVersion OPTIONAL, - IN PULONG MinorVersion OPTIONAL, - IN PULONG BuildNumber OPTIONAL, - IN PUNICODE_STRING CSDVersion OPTIONAL) +PsGetVersion(OUT PULONG MajorVersion OPTIONAL, + OUT PULONG MinorVersion OPTIONAL, + OUT PULONG BuildNumber OPTIONAL, + OUT PUNICODE_STRING CSDVersion OPTIONAL) { if (MajorVersion) *MajorVersion = NtMajorVersion; if (MinorVersion) *MinorVersion = NtMinorVersion; - if (BuildNumber) *BuildNumber = NtBuildNumber; + if (BuildNumber ) *BuildNumber = NtBuildNumber & 0x3FFF; if (CSDVersion) { - CSDVersion->Length = 0; - CSDVersion->MaximumLength = 0; - CSDVersion->Buffer = NULL; -#if 0 CSDVersion->Length = CmCSDVersionString.Length; - CSDVersion->MaximumLength = CmCSDVersionString.Maximum; + CSDVersion->MaximumLength = CmCSDVersionString.MaximumLength; CSDVersion->Buffer = CmCSDVersionString.Buffer; -#endif - } - - /* Check the High word */ + } + + /* Return TRUE if this is a Checked Build */ return (NtBuildNumber >> 28) == 0xC; }

1 0

[cgutman] 66734: [IP] - Don't select disconnected interfaces as default - Only count prefix matches of non-zero length - Fixes connectivity with multiple NICs when one or more is disconnected
by cgutman＠svn.reactos.org 16 Mar '15

16 Mar '15

Author: cgutman Date: Mon Mar 16 00:52:02 2015 New Revision: 66734 URL: http://svn.reactos.org/svn/reactos?rev=66734&view=rev Log: [IP] - Don't select disconnected interfaces as default - Only count prefix matches of non-zero length - Fixes connectivity with multiple NICs when one or more is disconnected Modified: trunk/reactos/lib/drivers/ip/network/interface.c Modified: trunk/reactos/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/int… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] Mon Mar 16 00:52:02 2015 @@ -134,6 +134,11 @@ A2S(Address), A2S(Prefix))); #endif + /* Don't report matches for empty prefixes */ + if (Length == 0) { + return FALSE; + } + /* Check that initial integral bytes match */ while (Length > 8) { if (*pAddress++ != *pPrefix++) @@ -152,37 +157,48 @@ { KIRQL OldIrql; ULONG Index = 0; + ULONG IfStatus; IF_LIST_ITER(CurrentIF); TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); /* DHCP hack: Always return the adapter without an IP address */ ForEachInterface(CurrentIF) { - if (CurrentIF->Context) { - if (AddrIsUnspecified(&CurrentIF->Unicast)) { - TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + if (CurrentIF->Context && AddrIsUnspecified(&CurrentIF->Unicast)) { + TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + if (NT_SUCCESS(GetInterfaceConnectionStatus(CurrentIF, &IfStatus)) && + (IfStatus == MIB_IF_OPER_STATUS_OPERATIONAL)) { return CurrentIF; } + TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); } } EndFor(CurrentIF); /* Try to continue from the next adapter */ ForEachInterface(CurrentIF) { - if (CurrentIF->Context) { - if (Index++ == NextDefaultAdapter) { + if (CurrentIF->Context && (Index++ == NextDefaultAdapter)) { + TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + if (NT_SUCCESS(GetInterfaceConnectionStatus(CurrentIF, &IfStatus)) && + (IfStatus == MIB_IF_OPER_STATUS_OPERATIONAL)) { NextDefaultAdapter++; - TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); return CurrentIF; } + TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); } } EndFor(CurrentIF); /* No luck, so we'll choose the first adapter this time */ + Index = 0; ForEachInterface(CurrentIF) { if (CurrentIF->Context) { - NextDefaultAdapter = 1; + Index++; TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); - return CurrentIF; + if (NT_SUCCESS(GetInterfaceConnectionStatus(CurrentIF, &IfStatus)) && + (IfStatus == MIB_IF_OPER_STATUS_OPERATIONAL)) { + NextDefaultAdapter = Index; + return CurrentIF; + } + TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); } } EndFor(CurrentIF);

1 0

[hbelusca] 66733: [NTOS]: "system32" --> "System32"
by hbelusca＠svn.reactos.org 16 Mar '15

16 Mar '15

Author: hbelusca Date: Mon Mar 16 00:25:32 2015 New Revision: 66733 URL: http://svn.reactos.org/svn/reactos?rev=66733&view=rev Log: [NTOS]: "system32" --> "System32" Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Mon Mar 16 00:25:32 2015 @@ -243,7 +243,7 @@ _In_ PUNICODE_STRING ServiceName) { UNICODE_STRING SystemRootString = RTL_CONSTANT_STRING(L"\\SystemRoot\\"); - UNICODE_STRING DriversPathString = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\drivers\\"); + UNICODE_STRING DriversPathString = RTL_CONSTANT_STRING(L"\\SystemRoot\\System32\\drivers\\"); UNICODE_STRING DotSysString = RTL_CONSTANT_STRING(L".sys"); UNICODE_STRING InputImagePath; Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Mon Mar 16 00:25:32 2015 @@ -3558,7 +3558,7 @@ /*!\brief Called when KDB is initialized * - * Reads the KDBinit file from the SystemRoot\system32\drivers\etc directory and executes it. + * Reads the KDBinit file from the SystemRoot\System32\drivers\etc directory and executes it. */ VOID KdbpCliInit() @@ -3574,7 +3574,7 @@ ULONG OldEflags; /* Initialize the object attributes */ - RtlInitUnicodeString(&FileName, L"\\SystemRoot\\system32\\drivers\\etc\\KDBinit"); + RtlInitUnicodeString(&FileName, L"\\SystemRoot\\System32\\drivers\\etc\\KDBinit"); InitializeObjectAttributes(&ObjectAttributes, &FileName, 0, NULL, NULL); /* Open the file */ @@ -3584,7 +3584,7 @@ FILE_NO_INTERMEDIATE_BUFFERING); if (!NT_SUCCESS(Status)) { - DPRINT("Could not open \\SystemRoot\\system32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); + DPRINT("Could not open \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); return; } @@ -3594,7 +3594,7 @@ if (!NT_SUCCESS(Status)) { ZwClose(hFile); - DPRINT("Could not query size of \\SystemRoot\\system32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); + DPRINT("Could not query size of \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); return; } FileSize = FileStdInfo.EndOfFile.u.LowPart; Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.cmake.c [iso-8859-1] Mon Mar 16 00:25:32 2015 @@ -599,7 +599,7 @@ // HACK: module dll names don't identify the real files UNICODE_STRING SystemRoot; UNICODE_STRING ModuleNameCopy; - RtlInitUnicodeString(&SystemRoot, L"\\SystemRoot\\system32\\Drivers\\"); + RtlInitUnicodeString(&SystemRoot, L"\\SystemRoot\\System32\\Drivers\\"); ModuleNameCopy.Length = 0; ModuleNameCopy.MaximumLength = LdrEntry->BaseDllName.MaximumLength + SystemRoot.MaximumLength;

1 0

[dquintana] 66732: [NTOBJSHEX] * Implement support for column sorting in CompareIDs, for Name, Type, and Creation Date columns. The link target, and registry key contents are not sortable yet.
by dquintana＠svn.reactos.org 15 Mar '15

15 Mar '15

Author: dquintana Date: Sun Mar 15 18:17:27 2015 New Revision: 66732 URL: http://svn.reactos.org/svn/reactos?rev=66732&view=rev Log: [NTOBJSHEX] * Implement support for column sorting in CompareIDs, for Name, Type, and Creation Date columns. The link target, and registry key contents are not sortable yet. Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] Sun Mar 15 18:17:27 2015 @@ -33,9 +33,10 @@ enum NtObjectColumns { NTOBJECT_COLUMN_NAME = 0, - NTOBJECT_COLUMN_TYPE = 1, - NTOBJECT_COLUMN_CREATEDATE = 2, - NTOBJECT_COLUMN_LINKTARGET = 3, + NTOBJECT_COLUMN_TYPE, + NTOBJECT_COLUMN_CREATEDATE, + NTOBJECT_COLUMN_LINKTARGET, + NTOBJECT_COLUMN_END }; class CNtObjectFolderExtractIcon : @@ -293,14 +294,11 @@ HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, NtPidlEntry * second) { - if (LOWORD(lParam) != 0) - { - DbgPrint("Unsupported sorting mode.\n"); - return E_INVALIDARG; - } - - if (HIWORD(lParam) == SHCIDS_ALLFIELDS) - { + if ((lParam & 0xFFFF0000) == SHCIDS_ALLFIELDS) + { + if (lParam != 0) + return E_INVALIDARG; + int minsize = min(first->cb, second->cb); int ord = memcmp(second, first, minsize); @@ -312,42 +310,81 @@ if (second->cb < first->cb) return MAKE_HRESULT(0, 0, (USHORT) -1); } - else if (HIWORD(lParam) == SHCIDS_CANONICALONLY) - { - int minlength = min(first->entryNameLength, second->entryNameLength); - int ord = StrCmpNW(first->entryName, second->entryName, minlength); - - if (ord != 0) - return MAKE_HRESULT(0, 0, (USHORT) ord); - - if (second->entryNameLength > first->entryNameLength) - return MAKE_HRESULT(0, 0, (USHORT) 1); - if (second->entryNameLength < first->entryNameLength) - return MAKE_HRESULT(0, 0, (USHORT) -1); - } else { - bool f1 = (first->objectType == DIRECTORY_OBJECT) || (first->objectType == KEY_OBJECT); - bool f2 = (second->objectType == DIRECTORY_OBJECT) || (second->objectType == KEY_OBJECT); - - if (f1 && !f2) - return MAKE_HRESULT(0, 0, (USHORT) -1); - if (f2 && !f1) - return MAKE_HRESULT(0, 0, (USHORT) 1); - - int minlength = min(first->entryNameLength, second->entryNameLength); - int ord = StrCmpNW(first->entryName, second->entryName, minlength); - - if (ord != 0) - return MAKE_HRESULT(0, 0, (USHORT) ord); - - if (second->entryNameLength > first->entryNameLength) - return MAKE_HRESULT(0, 0, (USHORT) 1); - if (second->entryNameLength < first->entryNameLength) - return MAKE_HRESULT(0, 0, (USHORT) -1); - } - - return S_OK; + bool canonical = ((lParam & 0xFFFF0000) == SHCIDS_CANONICALONLY); + + switch (lParam & 0xFFFF) + { + case NTOBJECT_COLUMN_NAME: + { + bool f1 = (first->objectType == KEY_OBJECT) || (first->objectType == DIRECTORY_OBJECT); + bool f2 = (second->objectType == KEY_OBJECT) || (second->objectType == DIRECTORY_OBJECT); + + if (f1 && !f2) + return MAKE_HRESULT(0, 0, (USHORT) -1); + if (f2 && !f1) + return MAKE_HRESULT(0, 0, (USHORT) 1); + + if (canonical) + { + // Shortcut: avoid comparing contents if not necessary when the results are not for display. + if (second->entryNameLength > first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (second->entryNameLength < first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) -1); + } + + int minlength = min(first->entryNameLength, second->entryNameLength); + int ord = StrCmpNW(first->entryName, second->entryName, minlength); + + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + + if (!canonical) + { + if (second->entryNameLength > first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (second->entryNameLength < first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) -1); + } + + return S_OK; + } + case NTOBJECT_COLUMN_TYPE: + { + int ord = second->objectType - first->objectType; + if (ord > 0) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (ord < 0) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + return S_OK; + } + case NTOBJECT_COLUMN_CREATEDATE: + { + LONGLONG ord = second->objectInformation.CreateTime.QuadPart - first->objectInformation.CreateTime.QuadPart; + if (ord > 0) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (ord < 0) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + return S_OK; + } + case NTOBJECT_COLUMN_LINKTARGET: + { + // Can't sort by value + return E_INVALIDARG; + } + default: + { + DbgPrint("Unsupported sorting mode.\n"); + return E_INVALIDARG; + } + } + } + + return E_INVALIDARG; } HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, LPCITEMIDLIST pcidl) @@ -1226,6 +1263,12 @@ *pViewMode = FVM_DETAILS; return S_OK; } + case SFVM_COLUMNCLICK: + return S_FALSE; + case SFVM_BACKGROUNDENUM: + return S_OK; + case SFVM_DEFITEMCOUNT: + return m_PidlManager->GetCount((UINT*) lParam); } return E_NOTIMPL; } Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Sun Mar 15 18:17:27 2015 @@ -33,8 +33,9 @@ enum RegistryColumns { REGISTRY_COLUMN_NAME = 0, - REGISTRY_COLUMN_TYPE = 1, - REGISTRY_COLUMN_VALUE = 2, + REGISTRY_COLUMN_TYPE, + REGISTRY_COLUMN_VALUE, + REGISTRY_COLUMN_END }; class CRegistryFolderExtractIcon : @@ -289,14 +290,11 @@ HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, RegPidlEntry * second) { - if (LOWORD(lParam) != 0) - { - DbgPrint("Unsupported sorting mode.\n"); - return E_INVALIDARG; - } - - if (HIWORD(lParam) == SHCIDS_ALLFIELDS) - { + if ((lParam & 0xFFFF0000) == SHCIDS_ALLFIELDS) + { + if (lParam != 0) + return E_INVALIDARG; + int minsize = min(first->cb, second->cb); int ord = memcmp(second, first, minsize); @@ -308,42 +306,71 @@ if (second->cb < first->cb) return MAKE_HRESULT(0, 0, (USHORT) -1); } - else if (HIWORD(lParam) == SHCIDS_CANONICALONLY) - { - int minlength = min(first->entryNameLength, second->entryNameLength); - int ord = StrCmpNW(first->entryName, second->entryName, minlength); - - if (ord != 0) - return MAKE_HRESULT(0, 0, (USHORT) ord); - - if (second->entryNameLength > first->entryNameLength) - return MAKE_HRESULT(0, 0, (USHORT) 1); - if (second->entryNameLength < first->entryNameLength) - return MAKE_HRESULT(0, 0, (USHORT) -1); - } else { - bool f1 = (first->entryType == REG_ENTRY_KEY) || (first->entryType == REG_ENTRY_ROOT); - bool f2 = (second->entryType == REG_ENTRY_KEY) || (second->entryType == REG_ENTRY_ROOT); - - if (f1 && !f2) - return MAKE_HRESULT(0, 0, (USHORT) -1); - if (f2 && !f1) - return MAKE_HRESULT(0, 0, (USHORT) 1); - - int minlength = min(first->entryNameLength, second->entryNameLength); - int ord = StrCmpNW(first->entryName, second->entryName, minlength); - - if (ord != 0) - return MAKE_HRESULT(0, 0, (USHORT) ord); - - if (second->entryNameLength > first->entryNameLength) - return MAKE_HRESULT(0, 0, (USHORT) 1); - if (second->entryNameLength < first->entryNameLength) - return MAKE_HRESULT(0, 0, (USHORT) -1); - } - - return S_OK; + bool canonical = ((lParam & 0xFFFF0000) == SHCIDS_CANONICALONLY); + + switch (lParam & 0xFFFF) + { + case REGISTRY_COLUMN_NAME: + { + bool f1 = (first->entryType == REG_ENTRY_KEY) || (first->entryType == REG_ENTRY_ROOT); + bool f2 = (second->entryType == REG_ENTRY_KEY) || (second->entryType == REG_ENTRY_ROOT); + + if (f1 && !f2) + return MAKE_HRESULT(0, 0, (USHORT) -1); + if (f2 && !f1) + return MAKE_HRESULT(0, 0, (USHORT) 1); + + if (canonical) + { + // Shortcut: avoid comparing contents if not necessary when the results are not for display. + if (second->entryNameLength > first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (second->entryNameLength < first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) -1); + } + + int minlength = min(first->entryNameLength, second->entryNameLength); + int ord = StrCmpNW(first->entryName, second->entryName, minlength); + + if (ord != 0) + return MAKE_HRESULT(0, 0, (USHORT) ord); + + if (!canonical) + { + if (second->entryNameLength > first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (second->entryNameLength < first->entryNameLength) + return MAKE_HRESULT(0, 0, (USHORT) -1); + } + + return S_OK; + } + case REGISTRY_COLUMN_TYPE: + { + int ord = second->contentType - first->contentType; + if (ord > 0) + return MAKE_HRESULT(0, 0, (USHORT) 1); + if (ord < 0) + return MAKE_HRESULT(0, 0, (USHORT) -1); + + return S_OK; + } + case REGISTRY_COLUMN_VALUE: + { + // Can't sort by value + return E_INVALIDARG; + } + default: + { + DbgPrint("Unsupported sorting mode.\n"); + return E_INVALIDARG; + } + } + } + + return E_INVALIDARG; } HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, LPCITEMIDLIST pcidl) @@ -1262,6 +1289,12 @@ *pViewMode = FVM_DETAILS; return S_OK; } + case SFVM_COLUMNCLICK: + return S_FALSE; + case SFVM_BACKGROUNDENUM: + return S_OK; + case SFVM_DEFITEMCOUNT: + return m_PidlManager->GetCount((UINT*) lParam); } return E_NOTIMPL; }

1 0

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