Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 62224: [RosApps|WineFile] - update some resource files, please review and update them.
by jimtabor＠svn.reactos.org 17 Feb '14

17 Feb '14

Author: jimtabor Date: Mon Feb 17 04:18:52 2014 New Revision: 62224 URL: http://svn.reactos.org/svn/reactos?rev=62224&view=rev Log: [RosApps|WineFile] - update some resource files, please review and update them. Modified: trunk/rosapps/applications/winfile/Cs.rc trunk/rosapps/applications/winfile/Da.rc trunk/rosapps/applications/winfile/De.rc trunk/rosapps/applications/winfile/En.rc trunk/rosapps/applications/winfile/Es.rc trunk/rosapps/applications/winfile/Fr.rc trunk/rosapps/applications/winfile/It.rc trunk/rosapps/applications/winfile/Ja.rc trunk/rosapps/applications/winfile/Ko.rc trunk/rosapps/applications/winfile/Lt.rc trunk/rosapps/applications/winfile/Nl.rc trunk/rosapps/applications/winfile/No.rc trunk/rosapps/applications/winfile/Pl.rc trunk/rosapps/applications/winfile/Pt.rc trunk/rosapps/applications/winfile/Ro.rc trunk/rosapps/applications/winfile/Ru.rc trunk/rosapps/applications/winfile/Si.rc trunk/rosapps/applications/winfile/Sv.rc trunk/rosapps/applications/winfile/Tr.rc trunk/rosapps/applications/winfile/Uk.rc Modified: trunk/rosapps/applications/winfile/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Cs.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Cs.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Cs.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -194,5 +194,8 @@ IDS_COL_ATTR "Atributy" IDS_COL_SEC "Zabezpeèení" - IDS_FREE_SPACE_FMT "%s z %s volného" -} + IDS_FREE_SPACE_FMT "%1 z %2 volného" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Da.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Da.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Da.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -241,5 +241,8 @@ IDS_COL_ATTR "Attributter" IDS_COL_SEC "Sikkerhed" - IDS_FREE_SPACE_FMT "%s af %s ledig" -} + IDS_FREE_SPACE_FMT "%1 af %2 ledig" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/De.rc… ============================================================================== --- trunk/rosapps/applications/winfile/De.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/De.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -241,5 +241,8 @@ IDS_COL_ATTR "Attribute" IDS_COL_SEC "Sicherheit" - IDS_FREE_SPACE_FMT "%s von %s frei" -} + IDS_FREE_SPACE_FMT "%1 von %2 frei" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/En.rc… ============================================================================== --- trunk/rosapps/applications/winfile/En.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/En.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -243,5 +243,8 @@ IDS_COL_ATTR "Attributes" IDS_COL_SEC "Security" - IDS_FREE_SPACE_FMT "%s of %s free" -} + IDS_FREE_SPACE_FMT "%1 of %2 free" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Es.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Es.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Es.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -241,5 +241,8 @@ IDS_COL_ATTR "Atributos" IDS_COL_SEC "Seguridad" - IDS_FREE_SPACE_FMT "%s de %s libre" -} + IDS_FREE_SPACE_FMT "%1 de %2 libre" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Fr.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Fr.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Fr.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -248,5 +248,8 @@ IDS_COL_ATTR "Attributs" IDS_COL_SEC "SÃ©curitÃ©" - IDS_FREE_SPACE_FMT "%s sur %s libre" -} + IDS_FREE_SPACE_FMT "%1 sur %2 libre" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/It.rc… ============================================================================== --- trunk/rosapps/applications/winfile/It.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/It.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -248,5 +248,8 @@ IDS_COL_ATTR "Attributi" IDS_COL_SEC "Sicurezza" - IDS_FREE_SPACE_FMT "liberi %s di %s" -} + IDS_FREE_SPACE_FMT "liberi %1 di %2" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ja.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ja.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ja.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -246,5 +246,8 @@ IDS_COL_ATTR "å±æ§" IDS_COL_SEC "ã»ãã¥ãªãã£" - IDS_FREE_SPACE_FMT "%s of %s free" -} + IDS_FREE_SPACE_FMT "%1 of %2 free" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ko.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ko.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ko.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -245,5 +245,8 @@ IDS_COL_ATTR "¼Ó¼º" IDS_COL_SEC "º¸¾È" - IDS_FREE_SPACE_FMT "%s of %s »ç¿ë°¡´É" -} + IDS_FREE_SPACE_FMT "%1 of %2 »ç¿ë°¡´É" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Lt.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Lt.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Lt.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -244,5 +244,8 @@ IDS_COL_ATTR "PoÅ¾ymiai" IDS_COL_SEC "Saugumas" - IDS_FREE_SPACE_FMT "%s iÅ¡ %s laisva" -} + IDS_FREE_SPACE_FMT "%1 iÅ¡ %2 laisva" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Nl.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Nl.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Nl.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -242,5 +242,8 @@ IDS_COL_ATTR "Attributen" IDS_COL_SEC "Beveiliging" - IDS_FREE_SPACE_FMT "%s van %s vrij" -} + IDS_FREE_SPACE_FMT "%1 van %2 vrij" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/No.rc… ============================================================================== --- trunk/rosapps/applications/winfile/No.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/No.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -241,5 +241,8 @@ IDS_COL_ATTR "Attributter" IDS_COL_SEC "Sikkerhet" - IDS_FREE_SPACE_FMT "%s av %s ledig" -} + IDS_FREE_SPACE_FMT "%1 av %2 ledig" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Pl.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Pl.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Pl.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -243,5 +243,8 @@ IDS_COL_ATTR "Atrybuty" IDS_COL_SEC "Prawa dostêpu" - IDS_FREE_SPACE_FMT "%s z %s wolne" -} + IDS_FREE_SPACE_FMT "%1 z %2 wolne" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Pt.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Pt.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Pt.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -488,5 +488,8 @@ IDS_COL_ATTR "Atributos" IDS_COL_SEC "SeguranÃ§a" - IDS_FREE_SPACE_FMT "%s de %s livre" -} + IDS_FREE_SPACE_FMT "%1 de %2 livre" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ro.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ro.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ro.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -52,11 +52,7 @@ MENUITEM "CÄ&utare...", 104 MENUITEM "&Selectare fiÈiere...", 116 MENUITEM SEPARATOR -#ifndef _NO_EXTENSIONS - MENUITEM "Ãnc&hide\Alt+X", ID_FILE_EXIT -#else MENUITEM "Ãnc&hide", ID_FILE_EXIT -#endif } POPUP "&Disc" { @@ -245,5 +241,8 @@ IDS_COL_ATTR "Atribute" IDS_COL_SEC "Securitate" - IDS_FREE_SPACE_FMT "%s din %s liber" -} + IDS_FREE_SPACE_FMT "%1 din %2 liber" + IDS_UNIT_KB "ko" + IDS_UNIT_MB "Mo" + IDS_UNIT_GB "Go" +} Modified: trunk/rosapps/applications/winfile/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ru.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ru.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ru.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -244,5 +244,8 @@ IDS_COL_ATTR "ÐÑÑÐ¸Ð±ÑÑÑ" IDS_COL_SEC "ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ" - IDS_FREE_SPACE_FMT "%s Ð¸Ð· %s ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾" -} + IDS_FREE_SPACE_FMT "%1 Ð¸Ð· %2 ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾" + IDS_UNIT_KB "ÐZÐQ" + IDS_UNIT_MB "Ð\ÐQ" + IDS_UNIT_GB "ÐSÐQ" +} Modified: trunk/rosapps/applications/winfile/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Si.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Si.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Si.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -243,5 +243,8 @@ IDS_COL_ATTR "Attributi" IDS_COL_SEC "Varnost" - IDS_FREE_SPACE_FMT "Prosto: %s od %s" -} + IDS_FREE_SPACE_FMT "Prosto: %1 od %2" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Sv.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Sv.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Sv.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -243,5 +243,8 @@ IDS_COL_ATTR "Attribut" IDS_COL_SEC "Säkerhet" - IDS_FREE_SPACE_FMT "%s av %s ledigt" -} + IDS_FREE_SPACE_FMT "%1 av %2 ledigt" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Tr.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Tr.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Tr.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -241,5 +241,8 @@ IDS_COL_ATTR "Özellikler" IDS_COL_SEC "Güvenlik" - IDS_FREE_SPACE_FMT "%s / %s boþ" -} + IDS_FREE_SPACE_FMT "%1 / %2 boþ" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +} Modified: trunk/rosapps/applications/winfile/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Uk.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Uk.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Uk.rc [iso-8859-1] Mon Feb 17 04:18:52 2014 @@ -247,5 +247,8 @@ IDS_COL_ATTR "ÐÑÑÐ¸Ð±ÑÑÐ¸" IDS_COL_SEC "ÐÐµÐ·Ð¿ÐµÐºÐ°" - IDS_FREE_SPACE_FMT "%s Ð· %s Ð²ÑÐ»ÑÐ½Ð¾" -} + IDS_FREE_SPACE_FMT "%1 Ð· %2 Ð²ÑÐ»ÑÐ½Ð¾" + IDS_UNIT_KB "kB" + IDS_UNIT_MB "MB" + IDS_UNIT_GB "GB" +}

1 0

[gadamopoulos] 62223: [rshell] - CMenuBand: Fix the size of the separators by setting iBitmap to 0 (which acts as the width of the separator). - CMenuDeskBar: Create the window only in CMenuDeskBar...
by gadamopoulos＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: gadamopoulos Date: Sun Feb 16 21:53:21 2014 New Revision: 62223 URL: http://svn.reactos.org/svn/reactos?rev=62223&view=rev Log: [rshell] - CMenuBand: Fix the size of the separators by setting iBitmap to 0 (which acts as the width of the separator). - CMenuDeskBar: Create the window only in CMenuDeskBar::SetClient and not in SetSite. Greatly simplify SetSite. Make sure that WS_EX_TOPMOST isn't removed when we call SetWindowPos Do not forward requests for the SID_SMenuPopup service to the taskbar as this causes the menu band to capture the mouse for the taskbar and not the desk bar Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sun Feb 16 21:53:21 2014 @@ -940,14 +940,14 @@ HRESULT CMenuStaticToolbar::FillToolbar() { int i; - PWSTR MenuString; - int ic = GetMenuItemCount(m_hmenu); for (i = 0; i < ic; i++) { MENUITEMINFOW info; TBBUTTON tbb = { 0 }; + PWSTR MenuString = NULL; + tbb.fsState = TBSTATE_ENABLED; tbb.fsStyle = 0; @@ -961,24 +961,24 @@ if (!AllocAndGetMenuString(m_hmenu, i, &MenuString)) return E_OUTOFMEMORY; tbb.fsStyle |= BTNS_DROPDOWN; + tbb.iString = (INT_PTR) MenuString; + tbb.idCommand = info.wID; + + SMINFO sminfo; + if (info.wID >= 0 && SUCCEEDED(m_menuBand->CallCBWithId(info.wID, SMC_GETINFO, 0, (LPARAM) &sminfo))) + { + tbb.iBitmap = sminfo.iIcon; + } } else { - MenuString = L""; tbb.fsStyle |= BTNS_SEP; } - tbb.idCommand = info.wID; - tbb.iString = (INT_PTR) MenuString; - - SMINFO sminfo; - if (info.wID >= 0 && SUCCEEDED(m_menuBand->CallCBWithId(info.wID, SMC_GETINFO, 0, (LPARAM) &sminfo))) - { - tbb.iBitmap = sminfo.iIcon; - } - SendMessageW(m_hwnd, TB_ADDBUTTONS, 1, (LPARAM) (LPTBBUTTON) &tbb); - HeapFree(GetProcessHeap(), 0, MenuString); + + if (MenuString) + HeapFree(GetProcessHeap(), 0, MenuString); } return S_OK; Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Sun Feb 16 21:53:21 2014 @@ -160,8 +160,6 @@ COM_INTERFACE_ENTRY_IID(IID_IBanneredBar, IBanneredBar) COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject) END_COM_MAP() - - HRESULT _CreateDeskBarWindow(); }; extern "C" @@ -456,40 +454,6 @@ { } -HRESULT CMenuDeskBar::_CreateDeskBarWindow() -{ - HRESULT hr; - HWND ownerWindow = NULL; - - if (m_Site) - { - CComPtr<IOleWindow> oleWindow; - - hr = m_Site->QueryInterface(IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); - if (FAILED(hr)) - return hr; - - hr = oleWindow->GetWindow(&ownerWindow); - if (FAILED(hr)) - return hr; - - if (!::IsWindow(ownerWindow)) - return E_FAIL; - } - - // FIXME - if (m_hWnd) - { - SetWindowLongPtr(m_hWnd, GWLP_HWNDPARENT, (LONG_PTR)ownerWindow); - } - else - { - Create(ownerWindow); - } - - return S_OK; -} - HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetWindow(HWND *lphwnd) { if (lphwnd == NULL) @@ -547,6 +511,11 @@ if (m_Site == NULL) return E_FAIL; + if (IsEqualGUID(guidService,SID_SMenuPopup)) + { + return this->QueryInterface(riid, ppvObject); + } + return IUnknown_QueryService(m_Site, guidService, riid, ppvObject); } @@ -589,7 +558,7 @@ if (m_hWnd == NULL) { - _CreateDeskBarWindow(); + Create(NULL); } hResult = punkClient->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(&m_Client)); @@ -623,30 +592,9 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetSite(IUnknown *pUnkSite) { - HRESULT hr; - CComPtr<IOleWindow> oleWindow; - HWND ownerWindow = NULL; - - if (m_Site) - { - if (m_hWnd != NULL) - { - DestroyWindow(); - } - m_Site.Release(); - } - - if (pUnkSite == NULL) - { - return S_OK; - } - - // get window handle of parent - hr = pUnkSite->QueryInterface(IID_PPV_ARG(IUnknown, &m_Site)); - if (FAILED(hr)) - return hr; - - return _CreateDeskBarWindow(); + m_Site = pUnkSite; + + return S_OK; } HRESULT STDMETHODCALLTYPE CMenuDeskBar::GetSite(REFIID riid, void **ppvSite) @@ -822,7 +770,7 @@ int cx = rc.right; int cy = rc.bottom; - this->SetWindowPos(NULL, x, y, cx, cy, SWP_SHOWWINDOW); + this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW); // HACK: The bar needs to be notified of the size AFTER it is shown. // Quick & dirty way of getting it done.

1 0

[cwittich] 62222: [ws2_32_new] always return "WinSock 2.0" as windows does (verified on windows 8) fix a typo
by cwittich＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: cwittich Date: Sun Feb 16 21:20:51 2014 New Revision: 62222 URL: http://svn.reactos.org/svn/reactos?rev=62222&view=rev Log: [ws2_32_new] always return "WinSock 2.0" as windows does (verified on windows 8) fix a typo Modified: trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c trunk/reactos/dll/win32/ws2_32_new/src/startup.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] Sun Feb 16 21:20:51 2014 @@ -44,13 +44,13 @@ /* TLS Allocation */ if (GlobalTlsIndex == TLS_OUT_OF_INDEXES) - { - GlobalTlsIndex = TlsAlloc(); - if (GlobalTlsIndex == TLS_OUT_OF_INDEXES) - { - return FALSE; - } - } + { + GlobalTlsIndex = TlsAlloc(); + if (GlobalTlsIndex == TLS_OUT_OF_INDEXES) + { + return FALSE; + } + } /* Initialize some critical sections */ WsCreateStartupSynchronization(); Modified: trunk/reactos/dll/win32/ws2_32_new/src/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] Sun Feb 16 21:20:51 2014 @@ -165,7 +165,7 @@ /* We support Winsock 2.2 */ lpWSAData->wHighVersion = MAKEWORD(2,2); - lstrcpy(lpWSAData->szDescription, "WinSock 2.2"); + lstrcpy(lpWSAData->szDescription, "WinSock 2.0"); lstrcpy(lpWSAData->szSystemStatus, "Running"); /* @@ -183,7 +183,7 @@ lpWSAData->iMaxUdpDg = 0; } - /* Enter the startup syncronization lock */ + /* Enter the startup synchronization lock */ WsStartupLock(); /* Now setup all our objects */

1 0

[akhaldi] 62221: [CMAKE] * Correctly sort the ntdll folder.
by akhaldi＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: akhaldi Date: Sun Feb 16 21:06:31 2014 New Revision: 62221 URL: http://svn.reactos.org/svn/reactos?rev=62221&view=rev Log: [CMAKE] * Correctly sort the ntdll folder. Modified: trunk/reactos/dll/CMakeLists.txt Modified: trunk/reactos/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/CMakeLists.txt?rev=622… ============================================================================== --- trunk/reactos/dll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/CMakeLists.txt [iso-8859-1] Sun Feb 16 21:06:31 2014 @@ -3,7 +3,7 @@ add_subdirectory(cpl) add_subdirectory(directx) add_subdirectory(keyboard) +add_subdirectory(ntdll) add_subdirectory(opengl) -add_subdirectory(ntdll) add_subdirectory(shellext) add_subdirectory(win32)

1 0

[tkreuzer] 62220: [FDC] Silence some debug prints
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 16:23:18 2014 New Revision: 62220 URL: http://svn.reactos.org/svn/reactos?rev=62220&view=rev Log: [FDC] Silence some debug prints Modified: trunk/reactos/drivers/storage/fdc/fdc/fdc.c Modified: trunk/reactos/drivers/storage/fdc/fdc/fdc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.c [iso-8859-1] Sun Feb 16 16:23:18 2014 @@ -30,7 +30,7 @@ PDEVICE_OBJECT Fdo = NULL; NTSTATUS Status; - DPRINT1("FdcAddDevice()\n"); + DPRINT("FdcAddDevice()\n"); ASSERT(DriverObject); ASSERT(Pdo); @@ -87,7 +87,7 @@ FdcCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("FdcCreate()\n"); + DPRINT("FdcCreate()\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = FILE_OPENED; @@ -104,7 +104,7 @@ FdcClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("FdcClose()\n"); + DPRINT("FdcClose()\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -123,7 +123,7 @@ { PCOMMON_DEVICE_EXTENSION Common = DeviceObject->DeviceExtension; - DPRINT1("FdcPnP()\n"); + DPRINT("FdcPnP()\n"); if (Common->IsFDO) { return FdcFdoPnp(DeviceObject, @@ -143,7 +143,7 @@ FdcPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("FdcPower()\n"); + DPRINT("FdcPower()\n"); return STATUS_UNSUCCESSFUL; } @@ -153,7 +153,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DPRINT1("FDC: DriverEntry()\n"); + DPRINT("FDC: DriverEntry()\n"); DriverObject->MajorFunction[IRP_MJ_CREATE] = FdcCreate; DriverObject->MajorFunction[IRP_MJ_CLOSE] = FdcClose;

1 0

[tkreuzer] 62219: [BASEADDRESSES] Partly revert 62119 to see whether that fixes the hybrid builder
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 14:57:36 2014 New Revision: 62219 URL: http://svn.reactos.org/svn/reactos?rev=62219&view=rev Log: [BASEADDRESSES] Partly revert 62119 to see whether that fixes the hybrid builder Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sun Feb 16 14:57:36 2014 @@ -1,9 +1,9 @@ set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c800000) # matches w2k3 FRE/CHK @ 0x7c800000 -set(baseaddress_user32 0x77e20000) # not relocatable, avoid conflicts with win -set(baseaddress_gdi32 0x77d80000) -set(baseaddress_advapi32 0x77c80000) -set(baseaddress_msvcrt 0x77b80000) +set(baseaddress_kernel32 0x77d80000) +set(baseaddress_msvcrt 0x77cd0000) +set(baseaddress_advapi32 0x77c20000) +set(baseaddress_gdi32 0x77bb0000) +set(baseaddress_user32 0x77a20000) set(baseaddress_dhcpcsvc 0x779d0000) set(baseaddress_dnsapi 0x77980000) set(baseaddress_icmp 0x77950000)

1 0

[tkreuzer] 62218: [TDI] Add stubs for TdiRegisterPnPHandlers and TdiDeregisterPnPHandlers
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 13:59:16 2014 New Revision: 62218 URL: http://svn.reactos.org/svn/reactos?rev=62218&view=rev Log: [TDI] Add stubs for TdiRegisterPnPHandlers and TdiDeregisterPnPHandlers Modified: trunk/reactos/drivers/network/tdi/misc/tdi.spec trunk/reactos/drivers/network/tdi/tdi/handler.c Modified: trunk/reactos/drivers/network/tdi/misc/tdi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/misc/t… ============================================================================== --- trunk/reactos/drivers/network/tdi/misc/tdi.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/misc/tdi.spec [iso-8859-1] Sun Feb 16 13:59:16 2014 @@ -27,6 +27,7 @@ @ stdcall TdiDeregisterDeviceObject(ptr) @ stdcall TdiDeregisterNetAddress(ptr) @ stdcall TdiDeregisterNotificationHandler(ptr) + @ stdcall TdiDeregisterPnPHandlers(ptr) @ stdcall TdiInitialize() @ stdcall TdiMapBuffer(ptr) @ stdcall TdiMapUserRequest(ptr ptr ptr) @@ -35,5 +36,6 @@ @ stdcall TdiRegisterDeviceObject(long long) @ stdcall TdiRegisterNetAddress(long ptr ptr ptr) @ stdcall TdiRegisterNotificationHandler(long long long) + @ stdcall TdiRegisterPnPHandlers(ptr long ptr) @ stdcall TdiReturnChainedReceives(ptr long) @ stdcall TdiUnmapBuffer(ptr) Modified: trunk/reactos/drivers/network/tdi/tdi/handler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi/ha… ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi/handler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/tdi/handler.c [iso-8859-1] Sun Feb 16 13:59:16 2014 @@ -3,6 +3,9 @@ */ #include "precomp.h" + +#define NDEBUG +#include <debug.h> /* * ClientEventChainedReceiveDatagram @@ -24,6 +27,7 @@ IN PVOID TsduDescriptor ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -45,6 +49,7 @@ IN PVOID TsduDescriptor ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -66,6 +71,7 @@ IN PVOID TsduDescriptor ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -89,6 +95,7 @@ OUT PIRP * AcceptIrp ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -110,6 +117,7 @@ IN ULONG DisconnectFlags ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -126,6 +134,7 @@ IN NTSTATUS Status ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -151,6 +160,7 @@ OUT PIRP * IoRequestPacket ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -173,6 +183,7 @@ OUT PIRP * IoRequestPacket ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -195,6 +206,7 @@ OUT PIRP * IoRequestPacket ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -212,7 +224,28 @@ IN ULONG BytesAvailable ) { - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +TdiRegisterPnPHandlers( + _In_ PTDI_CLIENT_INTERFACE_INFO ClientInterfaceInfo, + _In_ ULONG InterfaceInfoSize, + _Out_ HANDLE *BindingHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +TdiDeregisterPnPHandlers( + _In_ HANDLE BindingHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* EOF */

1 0

[tkreuzer] 62217: [NTOSKRNL] Improve MiRemoveMappedPtes to be able to unmap session mapped views.
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 13:56:36 2014 New Revision: 62217 URL: http://svn.reactos.org/svn/reactos?rev=62217&view=rev Log: [NTOSKRNL] Improve MiRemoveMappedPtes to be able to unmap session mapped views. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Feb 16 13:56:36 2014 @@ -2118,12 +2118,14 @@ IN PCONTROL_AREA ControlArea, IN PMMSUPPORT Ws) { - PMMPTE PointerPte;//, FirstPte; + PMMPTE PointerPte, ProtoPte;//, FirstPte; PMMPDE PointerPde, SystemMapPde; PMMPFN Pfn1, Pfn2; MMPTE PteContents; KIRQL OldIrql; DPRINT("Removing mapped view at: 0x%p\n", BaseAddress); + + ASSERT(Ws == NULL); /* Get the PTE and loop each one */ PointerPte = MiAddressToPte(BaseAddress); @@ -2175,8 +2177,15 @@ /* Windows ASSERT */ ASSERT((PteContents.u.Long == 0) || (PteContents.u.Soft.Prototype == 1)); - /* But not handled in ARM3 */ - ASSERT(PteContents.u.Soft.Prototype == 0); + /* Check if this is a prototype pointer PTE */ + if (PteContents.u.Soft.Prototype == 1) + { + /* Get the prototype PTE */ + ProtoPte = MiProtoPteToPte(&PteContents); + + /* We don't support anything else atm */ + ASSERT(ProtoPte->u.Long == 0); + } } /* Make the PTE into a zero PTE */

1 0

[ekohl] 62216: [INF] Fix broken string. I hate this Crimmson Editor "feature".
by ekohl＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: ekohl Date: Sun Feb 16 12:53:56 2014 New Revision: 62216 URL: http://svn.reactos.org/svn/reactos?rev=62216&view=rev Log: [INF] Fix broken string. I hate this Crimmson Editor "feature". Modified: trunk/reactos/media/inf/nettcpip.inf Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== Binary files - no diff available.

1 0

[ekohl] 62215: [INF] Make the type of the strings in the Parameters section Windows XP compatible. This fixes the kernel32 environ winetest.
by ekohl＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: ekohl Date: Sun Feb 16 12:49:07 2014 New Revision: 62215 URL: http://svn.reactos.org/svn/reactos?rev=62215&view=rev Log: [INF] Make the type of the strings in the Parameters section Windows XP compatible. This fixes the kernel32 environ winetest. Modified: trunk/reactos/media/inf/nettcpip.inf Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== Binary files - no diff available.

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