[ros-diffs] [mjansen] 72061: [ATL][ATL_APITEST] Implement / Improve CString, based upon the code that was already there. CORE-11579 #resolve Add code + tests for: Conversion of A->W and W->A, equality
Author: mjansen
Date: Sat Jul 30 19:07:43 2016
New Revision: 72061
URL: http://svn.reactos.org/svn/reactos?rev=72061=rev
Log:
[ATL][ATL_APITEST] Implement / Improve CString, based upon the code that was
already there. CORE-11579 #resolve
Add code + tests for:
Conversion of A->W and W->A, equality operators, MakeLower, MakeUpper, Find,
FindOneOf, ReverseFind, Compare, Mid, Left, Right, Format, Replace, Trim,
TrimLeft, TrimRight.
Added:
trunk/rostests/apitests/atl/CString.cpp (with props)
trunk/rostests/apitests/atl/CString.inl (with props)
Modified:
trunk/reactos/sdk/lib/atl/atlsimpstr.h
trunk/reactos/sdk/lib/atl/atlstr.h
trunk/reactos/sdk/lib/atl/cstringt.h
trunk/rostests/apitests/atl/CMakeLists.txt
trunk/rostests/apitests/atl/testlist.c
Modified: trunk/reactos/sdk/lib/atl/atlsimpstr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlsimpstr.h?rev=72061=72060=72061=diff
==
--- trunk/reactos/sdk/lib/atl/atlsimpstr.h [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/atl/atlsimpstr.h [iso-8859-1] Sat Jul 30
19:07:43 2016
@@ -200,6 +200,28 @@
return *this;
}
+CSimpleStringT& operator=(_In_ const CSimpleStringT& strSrc)
+{
+CStringData* pData = GetData();
+CStringData* pNewData = strSrc.GetData();
+
+if (pNewData != pData)
+{
+if (!pData->IsLocked() && (pNewData->pStringMgr ==
pData->pStringMgr))
+{
+pNewData = CloneData(pNewData);
+pData->Release();
+Attach(pNewData);
+}
+else
+{
+SetString(strSrc.GetString(), strSrc.GetLength());
+}
+}
+
+return *this;
+}
+
CSimpleStringT& operator+=(_In_ const CSimpleStringT& strSrc)
{
Append(strSrc);
@@ -495,7 +517,7 @@
if (pOldData->IsShared())
{
Fork(nLength);
-ATLASSERT(FALSE);
+//ATLASSERT(FALSE);
}
else if (pOldData->nAllocLength < nLength)
{
Modified: trunk/reactos/sdk/lib/atl/atlstr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlstr.h?rev=72061=72060=72061=diff
==
--- trunk/reactos/sdk/lib/atl/atlstr.h [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/atl/atlstr.h [iso-8859-1] Sat Jul 30 19:07:43 2016
@@ -124,6 +124,12 @@
typedef CStringT< wchar_t, StrTraitATL< wchar_t, ChTraitsCRT > >
CAtlStringW;
+typedef CStringT< char, StrTraitATL< char, ChTraitsCRT > > CAtlStringA;
+
+
+typedef CAtlStringW CStringW;
+typedef CAtlStringA CStringA;
+
}
Modified: trunk/reactos/sdk/lib/atl/cstringt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/cstringt.h?rev=72061=72060=72061=diff
==
--- trunk/reactos/sdk/lib/atl/cstringt.h[iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/atl/cstringt.h[iso-8859-1] Sat Jul 30
19:07:43 2016
@@ -28,14 +28,28 @@
static int __cdecl GetBaseTypeLength(_In_z_ LPCWSTR pszSource) throw()
{
-return ::WideCharToMultiByte(_AtlGetConversionACP(), 0, pszSource, -1,
NULL, 0, NULL, NULL) - 1;
+if (pszSource == NULL) return -1;
+return static_cast(wcslen(pszSource));
+}
+
+static int __cdecl GetBaseTypeLength(_In_z_ LPCSTR pszSource) throw()
+{
+if (pszSource == NULL) return 0;
+return ::MultiByteToWideChar(_AtlGetConversionACP(), 0, pszSource, -1,
NULL, 0) - 1;
}
static int __cdecl GetBaseTypeLength(
_In_reads_(nLength) LPCWSTR pszSource,
_In_ int nLength) throw()
{
-return ::WideCharToMultiByte(_AtlGetConversionACP(), 0, pszSource,
nLength, NULL, 0, NULL, NULL);
+return nLength;
+}
+
+static int __cdecl GetBaseTypeLength(
+_In_reads_(nLength) LPCSTR pszSource,
+_In_ int nLength) throw()
+{
+return ::MultiByteToWideChar(_AtlGetConversionACP(), 0, pszSource,
nLength, NULL, 0);
}
static void __cdecl ConvertToBaseType(
@@ -49,8 +63,197 @@
wmemcpy(pszDest, pszSrc, nSrcLength);
}
+
+static void __cdecl ConvertToBaseType(
+_Out_writes_(nDestLength) LPWSTR pszDest,
+_In_ int nDestLength,
+_In_ LPCSTR pszSrc,
+_In_ int nSrcLength = -1)
+{
+if (nSrcLength == -1)
+nSrcLength = 1 + GetBaseTypeLength(pszSrc);
+
+::MultiByteToWideChar(_AtlGetConversionACP(), 0, pszSrc, nSrcLength,
pszDest, nDestLength);
+}
+
+static void __cdecl MakeLower(
+_Out_writes_(nSrcLength) LPWSTR pszSource,
+_In_ int nSrcLength)
+{
+::CharLowerBuffW(pszSource, nSrcLength);
+}
+
+static void __cdecl MakeUpper(
+
[ros-diffs] [hbelusca] 72060: [SCSIPORT]: Port Dmitry's fix from r72059 to our scsiport driver too. I'm wondering how "difficult" it would be to have some kind of scsiport library to be shared between
Author: hbelusca
Date: Sat Jul 30 16:20:41 2016
New Revision: 72060
URL: http://svn.reactos.org/svn/reactos?rev=72060=rev
Log:
[SCSIPORT]: Port Dmitry's fix from r72059 to our scsiport driver too. I'm
wondering how "difficult" it would be to have some kind of scsiport library to
be shared between the driver and freeldr's.
Modified:
trunk/reactos/drivers/storage/scsiport/scsiport.c
Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/scsiport.c?rev=72060=72059=72060=diff
==
--- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sat Jul 30
16:20:41 2016
@@ -674,7 +674,6 @@
else
{
/* Nothing */
-*Length = 0;
PhysicalAddress.QuadPart = (LONGLONG)(SP_UNINITIALIZED_VALUE);
}
[ros-diffs] [ekohl] 72058: [SOLITAIRE] Add Portuguese/Brazillian translation. Patch by Lucas Raziel. CORE-11665 #resolve #comment Thanks a lot!
Author: ekohl Date: Sat Jul 30 14:09:58 2016 New Revision: 72058 URL: http://svn.reactos.org/svn/reactos?rev=72058=rev Log: [SOLITAIRE] Add Portuguese/Brazillian translation. Patch by Lucas Raziel. CORE-11665 #resolve #comment Thanks a lot! Added: trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc (with props) Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc Added: trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc?rev=72058 == --- trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc [iso-8859-1] Sat Jul 30 14:09:58 2016 @@ -0,0 +1,86 @@ +/* Portuguese translation of solitaire by Lucas Raziel (Oldcpv3) (raziellu...@hotmail.com) */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Opções" +FONT 8, "MS Shell Dlg" +BEGIN +GROUPBOX "Cartas", -1, 7, 7, 90, 40 +AUTORADIOBUTTON " Carta", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP +AUTORADIOBUTTON "ês Cartas", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 +GROUPBOX "Pontuação", -1, 100, 7, 75, 53 +AUTORADIOBUTTON "ão", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP +AUTORADIOBUTTON "", IDC_OPT_VEGAS, 107, 32, 60, 10 +AUTORADIOBUTTON "", IDC_OPT_NOSCORE, 107, 45, 60, 10 +AUTOCHECKBOX " Tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP +AUTOCHECKBOX "B de Status", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP +AUTOCHECKBOX "Manter a pontuação", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 +PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 345, 185 +CAPTION "Selecionar Cartas" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN +CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71 +CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71 +CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71 +CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71 +CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71 +CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71 +CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71 +CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71 +CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71 +CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71 +CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71 +CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71 +DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14 +PUSHBUTTON "Cancel", IDCANCEL, 176, 165, 54, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN +IDS_SOL_NAME "Paciência" +IDS_SOL_ABOUT "Paciência por J Brown\n\nCardLib versão 1.0." +IDS_SOL_QUIT "Sair do jogo Atual?" +IDS_SOL_WIN "Parabéns, Você ganhou!" +IDS_SOL_DEAL "Jogar de Novo?" +IDS_SOL_SCORE "Pontuação: %d" +IDS_SOL_TIME "Tempo: %d" +END + +/* Menus */ + +IDR_MENU1 MENU +BEGIN +POPUP "" +BEGIN +MENUITEM " Jogo\tF2", IDM_GAME_NEW +MENUITEM SEPARATOR +MENUITEM "Baralho...", IDM_GAME_DECK +MENUITEM "ções...", IDM_GAME_OPTIONS +MENUITEM SEPARATOR +MENUITEM "", IDM_GAME_EXIT +END +POPUP "" +BEGIN +MENUITEM "údo\tF1", IDM_HELP_CONTENTS +MENUITEM "", IDM_HELP_ABOUT +END +END + +/* Accelerators */ + +IDR_ACCELERATOR1 ACCELERATORS +BEGIN +VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT +VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END Propchange: trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc -- svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/rsrc.rc?rev=72058=72057=72058=diff == --- trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] Sat Jul 30 14:09:58 2016 @@ -69,6 +69,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_BR +#include "lang/pt-BR.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif
[ros-diffs] [pschweitzer] 72056: [FASTFAT] Fix a FIXME
Author: pschweitzer
Date: Sat Jul 30 12:53:09 2016
New Revision: 72056
URL: http://svn.reactos.org/svn/reactos?rev=72056=rev
Log:
[FASTFAT]
Fix a FIXME
Modified:
trunk/reactos/drivers/filesystems/fastfat/fsctl.c
Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat/fsctl.c?rev=72056=72055=72056=diff
==
--- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Jul 30
12:53:09 2016
@@ -445,7 +445,6 @@
Status = VfatMountDevice(DeviceExt, DeviceToMount);
if (!NT_SUCCESS(Status))
{
-/* FIXME: delete device object */
goto ByeBye;
}
[ros-diffs] [gadamopoulos] 72055: [BROWSEUI] - Move handling of DISPID_NAVIGATECOMPLETE2 event from CAddressBand to CAddressEditBox as the todo comments say it should be. - Remove the todo entries tha
Author: gadamopoulos
Date: Sat Jul 30 12:47:39 2016
New Revision: 72055
URL: http://svn.reactos.org/svn/reactos?rev=72055=rev
Log:
[BROWSEUI]
- Move handling of DISPID_NAVIGATECOMPLETE2 event from CAddressBand to
CAddressEditBox as the todo comments say it should be.
- Remove the todo entries that are complete.
- Remove IDispatch from CAddressBand as it is not really needed. Now
CAddressBand takes care only of positioning and handling the button while
CAddressEditBox does all the parsing and interaction with the browser.
Modified:
trunk/reactos/dll/win32/browseui/addressband.cpp
trunk/reactos/dll/win32/browseui/addressband.h
trunk/reactos/dll/win32/browseui/addresseditbox.cpp
Modified: trunk/reactos/dll/win32/browseui/addressband.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/addressband.cpp?rev=72055=72054=72055=diff
==
--- trunk/reactos/dll/win32/browseui/addressband.cpp[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/addressband.cpp[iso-8859-1] Sat Jul 30
12:47:39 2016
@@ -29,11 +29,8 @@
/*
TODO:
-Add command handler for show/hide Go button to OnWinEvent
Add tooltip notify handler
**Properly implement GetBandInfo
- **Add correct text to Go button
- **Implement TranslateAcceleratorIO
Implement Exec
Implement QueryService
Implement Load
@@ -46,7 +43,6 @@
fGoButton = NULL;
fComboBox = NULL;
fGoButtonShown = false;
-fAdviseCookie = 0;
}
CAddressBand::~CAddressBand()
@@ -103,7 +99,6 @@
HRESULT STDMETHODCALLTYPE CAddressBand::SetSite(IUnknown *pUnkSite)
{
-CComPtrbrowserService;
CComPtr shellService;
HWNDparentWindow;
HWNDcombobox;
@@ -112,7 +107,6 @@
if (pUnkSite == NULL)
{
-hResult = AtlUnadvise(fSite, DIID_DWebBrowserEvents, fAdviseCookie);
fSite.Release();
return S_OK;
}
@@ -170,13 +164,6 @@
fGoButtonShown = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet
Explorer\\Main", L"ShowGoButton", FALSE, TRUE);
if (fGoButtonShown)
CreateGoButton();
-
-// take advice to watch events
-hResult = IUnknown_QueryService(pUnkSite, SID_SShellBrowser,
IID_PPV_ARG(IBrowserService, ));
-if (SUCCEEDED(hResult))
-{
-hResult = AtlAdvise(browserService, static_cast(this),
DIID_DWebBrowserEvents, );
-}
return hResult;
}
@@ -398,108 +385,6 @@
return E_NOTIMPL;
}
-HRESULT STDMETHODCALLTYPE CAddressBand::GetTypeInfoCount(UINT *pctinfo)
-{
-return E_NOTIMPL;
-}
-
-HRESULT STDMETHODCALLTYPE CAddressBand::GetTypeInfo(UINT iTInfo, LCID lcid,
ITypeInfo **ppTInfo)
-{
-return E_NOTIMPL;
-}
-
-HRESULT STDMETHODCALLTYPE CAddressBand::GetIDsOfNames(REFIID riid, LPOLESTR
*rgszNames, UINT cNames,
-LCID lcid, DISPID *rgDispId)
-{
-return E_NOTIMPL;
-}
-
-HRESULT STDMETHODCALLTYPE CAddressBand::Invoke(DISPID dispIdMember, REFIID
riid, LCID lcid, WORD wFlags,
-DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT
*puArgErr)
-{
-CComPtr isb;
-CComPtr sf;
-HRESULT hr;
-INT indexClosed, indexOpen, itemExists, oldIndex;
-DWORD result;
-COMBOBOXEXITEMW item;
-PIDLIST_ABSOLUTE absolutePIDL;
-LPCITEMIDLIST pidlChild;
-LPITEMIDLIST pidlPrevious;
-STRRET ret;
-WCHAR buf[4096];
-
-if (pDispParams == NULL)
-return E_INVALIDARG;
-
-switch (dispIdMember)
-{
-case DISPID_NAVIGATECOMPLETE2:
-case DISPID_DOCUMENTCOMPLETE:
-
-oldIndex = SendMessage(m_hWnd, CB_GETCURSEL, 0, 0);
-
-itemExists = FALSE;
-pidlPrevious = NULL;
-
-ZeroMemory(, sizeof(item));
-item.mask = CBEIF_LPARAM;
-item.iItem = 0;
-if (SendMessage(m_hWnd, CBEM_GETITEM, 0,
reinterpret_cast()))
-{
-pidlPrevious = reinterpret_cast(item.lParam);
-if (pidlPrevious)
-itemExists = TRUE;
-}
-
-hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser,
IID_PPV_ARG(IBrowserService, ));
-if (FAILED_UNEXPECTEDLY(hr))
-return hr;
-isb->GetPidl();
-
-SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, ),
);
-
-sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR |
SHGDN_FORPARSING, );
-
-StrRetToBufW(, pidlChild, buf, 4095);
-
-indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild,
);
-
-item.mask = CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_TEXT |
CBEIF_LPARAM;
-item.iItem = 0;
-item.iImage = indexClosed;
-item.iSelectedImage = indexOpen;
-item.pszText = buf;
-item.lParam = reinterpret_cast(absolutePIDL);
-
-if (itemExists)
-{
-result = SendMessage(m_hWnd, CBEM_SETITEM, 0,
reinterpret_cast());
-
[ros-diffs] [jimtabor] 72054: [NtUser] - Fix hang while inputting mouse message. Fix CORE-9998.
Author: jimtabor
Date: Sat Jul 30 12:32:28 2016
New Revision: 72054
URL: http://svn.reactos.org/svn/reactos?rev=72054=rev
Log:
[NtUser]
- Fix hang while inputting mouse message. Fix CORE-9998.
Modified:
trunk/reactos/win32ss/user/ntuser/msgqueue.c
Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgqueue.c?rev=72054=72053=72054=diff
==
--- trunk/reactos/win32ss/user/ntuser/msgqueue.c[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/msgqueue.c[iso-8859-1] Sat Jul 30
12:32:28 2016
@@ -1891,6 +1891,16 @@
return 1;
}
+/* check whether message is in the range of mouse messages */
+static inline BOOL is_mouse_message( UINT message )
+{
+return ( //( message >= WM_NCMOUSEFIRST && message <= WM_NCMOUSELAST )
|| This seems to break tests...
+ ( message >= WM_MOUSEFIRST && message <= WM_MOUSELAST ) ||
+ ( message >= WM_XBUTTONDOWN && message <= WM_XBUTTONDBLCLK ) ||
+ ( message >= WM_MBUTTONDOWN && message <= WM_MBUTTONDBLCLK ) ||
+ ( message >= WM_LBUTTONDOWN && message <= WM_RBUTTONDBLCLK ) );
+}
+
BOOL APIENTRY
co_MsqPeekHardwareMessage(IN PTHREADINFO pti,
IN BOOL Remove,
@@ -1946,7 +1956,7 @@
if ( ( !Window || // 1
( Window == PWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) ||
// 2
( Window != PWND_BOTTOM && Window->head.h ==
CurrentMessage->Msg.hwnd ) || // 3
-( CurrentMessage->Msg.message == WM_MOUSEMOVE ) ) && // Null
window for mouse moves.
+( is_mouse_message(CurrentMessage->Msg.message) ) ) && // Null
window for anything mouse.
( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) &&
CurrentMessage->QS_Flags & QSflags ) ||
( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh
>= CurrentMessage->Msg.message ) ) )
{
[ros-diffs] [gadamopoulos] 72053: [BROWSEUI] - Use the _CreateInstance postfix for all functions that instantiate a class. - Move the the CreateInstance functions of the exported classes to browseui.h
Author: gadamopoulos
Date: Sat Jul 30 11:53:16 2016
New Revision: 72053
URL: http://svn.reactos.org/svn/reactos?rev=72053=rev
Log:
[BROWSEUI]
- Use the _CreateInstance postfix for all functions that instantiate a class.
- Move the the CreateInstance functions of the exported classes to browseui.h
where we can select uniformly which built in classes we use.
Added:
trunk/reactos/dll/win32/browseui/browseui.h (with props)
Modified:
trunk/reactos/dll/win32/browseui/addressband.cpp
trunk/reactos/dll/win32/browseui/addresseditbox.cpp
trunk/reactos/dll/win32/browseui/bandproxy.cpp
trunk/reactos/dll/win32/browseui/basebar.cpp
trunk/reactos/dll/win32/browseui/basebarsite.cpp
trunk/reactos/dll/win32/browseui/brandband.cpp
trunk/reactos/dll/win32/browseui/explorerband.cpp
trunk/reactos/dll/win32/browseui/explorerband.h
trunk/reactos/dll/win32/browseui/internettoolbar.cpp
trunk/reactos/dll/win32/browseui/internettoolbar.h
trunk/reactos/dll/win32/browseui/precomp.h
trunk/reactos/dll/win32/browseui/shellbrowser.cpp
trunk/reactos/dll/win32/browseui/toolsband.cpp
trunk/reactos/dll/win32/browseui/travellog.cpp
Modified: trunk/reactos/dll/win32/browseui/addressband.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/addressband.cpp?rev=72053=72052=72053=diff
==
--- trunk/reactos/dll/win32/browseui/addressband.cpp[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/addressband.cpp[iso-8859-1] Sat Jul 30
11:53:16 2016
@@ -27,8 +27,6 @@
#include
#include
-HRESULT CreateAddressEditBox(REFIID riid, void **ppv);
-
/*
TODO:
Add command handler for show/hide Go button to OnWinEvent
@@ -155,19 +153,9 @@
fEditControl = reinterpret_cast(SendMessage(CBEM_GETEDITCONTROL, 0,
0));
fComboBox = reinterpret_cast(SendMessage(CBEM_GETCOMBOCONTROL, 0,
0));
-#if 1
-hResult = CoCreateInstance(CLSID_AddressEditBox, NULL,
CLSCTX_INPROC_SERVER,
-IID_PPV_ARG(IAddressEditBox, ));
-#else
-hResult = E_FAIL;
-#endif
-if (FAILED_UNEXPECTEDLY(hResult))
-{
-// instantiate new version
-hResult = CreateAddressEditBox(IID_PPV_ARG(IAddressEditBox,
));
-if (FAILED_UNEXPECTEDLY(hResult))
-return hResult;
-}
+hResult = CAddressEditBox_CreateInstance(IID_PPV_ARG(IAddressEditBox,
));
+if (FAILED_UNEXPECTEDLY(hResult))
+return hResult;
hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IShellService,
));
if (FAILED_UNEXPECTEDLY(hResult))
@@ -642,11 +630,6 @@
return 0;
}
-HRESULT CreateAddressBand(REFIID riid, void **ppv)
-{
-return ShellObjectCreator(riid, ppv);
-}
-
void CAddressBand::CreateGoButton()
{
const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } };
Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/addresseditbox.cpp?rev=72053=72052=72053=diff
==
--- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Sat Jul 30
11:53:16 2016
@@ -330,8 +330,3 @@
{
return E_NOTIMPL;
}
-
-HRESULT CreateAddressEditBox(REFIID riid, void **ppv)
-{
-return ShellObjectCreator(riid, ppv);
-}
Modified: trunk/reactos/dll/win32/browseui/bandproxy.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandproxy.cpp?rev=72053=72052=72053=diff
==
--- trunk/reactos/dll/win32/browseui/bandproxy.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/bandproxy.cpp [iso-8859-1] Sat Jul 30
11:53:16 2016
@@ -125,8 +125,3 @@
{
return E_NOTIMPL;
}
-
-HRESULT CreateBandProxy(REFIID riid, void **ppv)
-{
-return ShellObjectCreator(riid, ppv);
-}
Modified: trunk/reactos/dll/win32/browseui/basebar.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar.cpp?rev=72053=72052=72053=diff
==
--- trunk/reactos/dll/win32/browseui/basebar.cpp[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/basebar.cpp[iso-8859-1] Sat Jul 30
11:53:16 2016
@@ -548,7 +548,7 @@
return 0;
}
-HRESULT CreateBaseBar(REFIID riid, void **ppv, BOOL vertical)
+HRESULT CBaseBar_CreateInstance(REFIID riid, void **ppv, BOOL vertical)
{
return ShellObjectCreatorInit(vertical, riid, ppv);
}
Modified: trunk/reactos/dll/win32/browseui/basebarsite.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebarsite.cpp?rev=72053=72052=72053=diff
==
---
[ros-diffs] [dchapyshev] 72052: [USER32] - Add missing NULL-pointer checkes in rect functions - Small coding-style fixes
Author: dchapyshev
Date: Sat Jul 30 11:31:33 2016
New Revision: 72052
URL: http://svn.reactos.org/svn/reactos?rev=72052=rev
Log:
[USER32]
- Add missing NULL-pointer checkes in rect functions
- Small coding-style fixes
Modified:
trunk/reactos/win32ss/user/user32/windows/rect.c
Modified: trunk/reactos/win32ss/user/user32/windows/rect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/windows/rect.c?rev=72052=72051=72052=diff
==
--- trunk/reactos/win32ss/user/user32/windows/rect.c[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/rect.c[iso-8859-1] Sat Jul 30
11:31:33 2016
@@ -41,11 +41,12 @@
CopyRect(LPRECT lprcDst,
CONST RECT *lprcSrc)
{
-if(lprcDst == NULL || lprcSrc == NULL)
-return(FALSE);
+if (lprcDst == NULL || lprcSrc == NULL)
+return FALSE;
*lprcDst = *lprcSrc;
-return(TRUE);
+
+return TRUE;
}
@@ -74,11 +75,15 @@
int dx,
int dy)
{
+if (rect == NULL)
+return FALSE;
+
rect->left -= dx;
rect->top -= dy;
rect->right += dx;
rect->bottom += dy;
-return(TRUE);
+
+return TRUE;
}
@@ -91,6 +96,9 @@
CONST RECT *lprcSrc1,
CONST RECT *lprcSrc2)
{
+if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL)
+return FALSE;
+
if (IsRectEmpty(lprcSrc1) || IsRectEmpty(lprcSrc2) ||
lprcSrc1->left >= lprcSrc2->right ||
lprcSrc2->left >= lprcSrc1->right ||
@@ -98,13 +106,15 @@
lprcSrc2->top >= lprcSrc1->bottom)
{
SetRectEmpty(lprcDst);
-return(FALSE);
-}
+return FALSE;
+}
+
lprcDst->left = max(lprcSrc1->left, lprcSrc2->left);
lprcDst->right = min(lprcSrc1->right, lprcSrc2->right);
lprcDst->top = max(lprcSrc1->top, lprcSrc2->top);
lprcDst->bottom = min(lprcSrc1->bottom, lprcSrc2->bottom);
-return(TRUE);
+
+return TRUE;
}
@@ -115,7 +125,10 @@
WINAPI
IsRectEmpty(CONST RECT *lprc)
{
-return((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom));
+if (lprc == NULL)
+return TRUE;
+
+return ((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom));
}
@@ -128,14 +141,15 @@
int dx,
int dy)
{
-if(rect == NULL)
-return(FALSE);
+if (rect == NULL)
+return FALSE;
rect->left += dx;
rect->top += dy;
rect->right += dx;
rect->bottom += dy;
-return(TRUE);
+
+return TRUE;
}
@@ -147,6 +161,9 @@
PtInRect(CONST RECT *lprc,
POINT pt)
{
+if (lprc == NULL)
+return FALSE;
+
return((pt.x >= lprc->left) && (pt.x < lprc->right) &&
(pt.y >= lprc->top) && (pt.y < lprc->bottom));
}
@@ -159,7 +176,7 @@
int xRight,
int yBottom)
{
-if (!lprc)
+if (lprc == NULL)
return FALSE;
lprc->left = xLeft;
@@ -178,8 +195,12 @@
WINAPI
SetRectEmpty(LPRECT lprc)
{
+if (lprc == NULL)
+return FALSE;
+
lprc->left = lprc->right = lprc->top = lprc->bottom = 0;
-return(TRUE);
+
+return TRUE;
}
@@ -194,13 +215,13 @@
{
RECT tempRect;
-if(lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL)
-return(FALSE);
-
-if(!IntersectRect(, lprcSrc1, lprcSrc2))
+if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL)
+return FALSE;
+
+if (!IntersectRect(, lprcSrc1, lprcSrc2))
{
*lprcDst = *lprcSrc1;
-return(TRUE);
+return TRUE;
}
if (EqualRect(, lprcSrc1))
@@ -211,22 +232,22 @@
*lprcDst = *lprcSrc1;
-if(lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom)
-{
-if(lprcDst->left == tempRect.left)
+if (lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom)
+{
+if (lprcDst->left == tempRect.left)
lprcDst->left = tempRect.right;
-else if(lprcDst->right == tempRect.right)
+else if (lprcDst->right == tempRect.right)
lprcDst->right = tempRect.left;
}
-else if(lprcDst->left == tempRect.left && lprcDst->right == tempRect.right)
-{
-if(lprcDst->top == tempRect.top)
+else if (lprcDst->left == tempRect.left && lprcDst->right ==
tempRect.right)
+{
+if (lprcDst->top == tempRect.top)
lprcDst->top = tempRect.bottom;
-else if(lprcDst->bottom == tempRect.bottom)
+else if (lprcDst->bottom == tempRect.bottom)
lprcDst->bottom = tempRect.top;
}
-return(TRUE);
+return TRUE;
}
@@ -239,12 +260,15 @@
CONST RECT *lprcSrc1,
CONST RECT *lprcSrc2)
{
+if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL)
+return FALSE;
+
if (IsRectEmpty(lprcSrc1))
{
if (IsRectEmpty(lprcSrc2))
{
SetRectEmpty(lprcDst);
-
