Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 75134: [NTOS]: Avoid initializing variables within if-conditions.
by hbelusca＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: hbelusca Date: Mon Jun 19 16:30:17 2017 New Revision: 75134 URL: http://svn.reactos.org/svn/reactos?rev=75134&view=rev Log: [NTOS]: Avoid initializing variables within if-conditions. Modified: trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Mon Jun 19 16:30:17 2017 @@ -405,7 +405,8 @@ } /* Make sure there really is a string */ - if ((StringLength = LocalName.Length)) + StringLength = LocalName.Length; + if (StringLength) { /* Check that the size is a valid WCHAR multiple */ if ((StringLength & (sizeof(WCHAR) - 1)) ||

1 0

[hbelusca] 75133: [NTOS]: Revert the pool tag change from r75128, and explain in comment why we cannot actually use it.
by hbelusca＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: hbelusca Date: Mon Jun 19 16:29:44 2017 New Revision: 75133 URL: http://svn.reactos.org/svn/reactos?rev=75133&view=rev Log: [NTOS]: Revert the pool tag change from r75128, and explain in comment why we cannot actually use it. Modified: trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Mon Jun 19 16:29:44 2017 @@ -351,8 +351,19 @@ /* We know this is a pool-allocation if the size doesn't match */ if (Name->MaximumLength != OBP_NAME_LOOKASIDE_MAX_SIZE) { - /* Free it from the pool */ - ExFreePoolWithTag(Buffer, OB_NAME_TAG); + /* + * Free it from the pool. + * + * We cannot use here ExFreePoolWithTag(..., OB_NAME_TAG); , because + * the object name may have been massaged during operation by different + * object parse routines. If the latter ones have to resolve a symbolic + * link (e.g. as is done by CmpParseKey() and CmpGetSymbolicLink()), + * the original object name is freed and re-allocated from the pool, + * possibly with a different pool tag. At the end of the day, the new + * object name can be reallocated and completely different, but we + * should still be able to free it! + */ + ExFreePool(Buffer); } else {

1 0

[hbelusca] 75132: [NTOS]: Fix typos.
by hbelusca＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: hbelusca Date: Mon Jun 19 15:26:08 2017 New Revision: 75132 URL: http://svn.reactos.org/svn/reactos?rev=75132&view=rev Log: [NTOS]: Fix typos. Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/include/internal/ps_x.h Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Mon Jun 19 15:26:08 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/include/internal/ob_x.h -* PURPOSE: Intenral Inlined Functions for the Object Manager +* PURPOSE: Internal Inlined Functions for the Object Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h [iso-8859-1] Mon Jun 19 15:26:08 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/include/internal/ps_x.h -* PURPOSE: Intenral Inlined Functions for the Process Manager +* PURPOSE: Internal Inlined Functions for the Process Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Thomas Weidenmueller (w3seek(a)reactos.org) */

1 0

[mjansen] 75131: [APPSHIM_APITEST] Addendum to r75041, add a missed line.
by mjansen＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: mjansen Date: Mon Jun 19 15:24:05 2017 New Revision: 75131 URL: http://svn.reactos.org/svn/reactos?rev=75131&view=rev Log: [APPSHIM_APITEST] Addendum to r75041, add a missed line. Modified: trunk/rostests/apitests/appshim/dispmode.c Modified: trunk/rostests/apitests/appshim/dispmode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/appshim/dispmode… ============================================================================== --- trunk/rostests/apitests/appshim/dispmode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/appshim/dispmode.c [iso-8859-1] Mon Jun 19 15:24:05 2017 @@ -436,6 +436,7 @@ if (ret) { test_one(tests[n].name, tests[n].reason, tests[n].pre, tests[n].post, tests[n].second); + tests[n].unhook(dll); } else {

1 0

[mjansen] 75130: [SHELL32] Partially sync shlexec with wine staging 2.9 CORE-13362 CORE-13407
by mjansen＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: mjansen Date: Mon Jun 19 15:04:20 2017 New Revision: 75130 URL: http://svn.reactos.org/svn/reactos?rev=75130&view=rev Log: [SHELL32] Partially sync shlexec with wine staging 2.9 CORE-13362 CORE-13407 Modified: trunk/reactos/dll/win32/shell32/shlexec.cpp Modified: trunk/reactos/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] Mon Jun 19 15:04:20 2017 @@ -1209,6 +1209,7 @@ { UINT_PTR retval = SE_ERR_NOASSOC; WCHAR old_dir[1024]; + WCHAR res[MAX_PATH]; TRACE("File %s, Dir %s\n", debugstr_w(lpFile), debugstr_w(lpDirectory)); @@ -1222,7 +1223,9 @@ SetCurrentDirectoryW(lpDirectory); } - retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, lpResult, MAX_PATH, NULL, NULL, NULL, NULL); + retval = SHELL_FindExecutable(lpDirectory, lpFile, wszOpen, res, MAX_PATH, NULL, NULL, NULL, NULL); + if (retval > 32) + strcpyW(lpResult, res); TRACE("returning %s\n", debugstr_w(lpResult)); if (lpDirectory) @@ -1409,6 +1412,7 @@ if (!dataobj) { ERR("failed to get data object\n"); + r = E_FAIL; goto end; } @@ -1663,7 +1667,6 @@ DWORD error_code; error_code = GetLastError(); - if (retval == SE_ERR_NOASSOC) LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg) / sizeof(WCHAR)); else @@ -1676,6 +1679,26 @@ (va_list*)msgArguments); MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); +} + +static WCHAR *expand_environment( const WCHAR *str ) +{ + WCHAR *buf; + DWORD len; + + len = ExpandEnvironmentStringsW(str, NULL, 0); + if (!len) return NULL; + + buf = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!buf) return NULL; + + len = ExpandEnvironmentStringsW(str, buf, len); + if (!len) + { + HeapFree(GetProcessHeap(), 0, buf); + return NULL; + } + return buf; } /************************************************************************* @@ -1721,17 +1744,16 @@ wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen * sizeof(WCHAR)); *wszApplicationName = '\0'; } - else if (*sei_tmp.lpFile == '\"') - { - DWORD l = strlenW(sei_tmp.lpFile + 1); - if(l >= dwApplicationNameLen) - dwApplicationNameLen = l + 1; + else if (*sei_tmp.lpFile == '\"' && sei_tmp.lpFile[(len = strlenW(sei_tmp.lpFile))-1] == '\"') + { + if(len-1 >= dwApplicationNameLen) + dwApplicationNameLen = len; wszApplicationName = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwApplicationNameLen * sizeof(WCHAR)); - memcpy(wszApplicationName, sei_tmp.lpFile + 1, (l + 1)*sizeof(WCHAR)); - - if (wszApplicationName[l-1] == L'\"') - wszApplicationName[l-1] = L'\0'; + memcpy(wszApplicationName, sei_tmp.lpFile + 1, len * sizeof(WCHAR)); + + if(len > 2) + wszApplicationName[len-2] = '\0'; appKnownSingular = TRUE; TRACE("wszApplicationName=%s\n", debugstr_w(wszApplicationName)); @@ -1809,6 +1831,27 @@ TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName)); } + if (sei_tmp.fMask & SEE_MASK_DOENVSUBST) + { + WCHAR *tmp; + + tmp = expand_environment(sei_tmp.lpFile); + if (!tmp) + { + return FALSE; + } + HeapFree(GetProcessHeap(), 0, wszApplicationName); + sei_tmp.lpFile = wszApplicationName = tmp; + + tmp = expand_environment(sei_tmp.lpDirectory); + if (!tmp) + { + return FALSE; + } + if (wszDir != dirBuffer) HeapFree(GetProcessHeap(), 0, wszDir); + sei_tmp.lpDirectory = wszDir = tmp; + } + if (ERROR_SUCCESS == ShellExecute_FromContextMenu(&sei_tmp)) { sei->hInstApp = (HINSTANCE) 33; @@ -1870,7 +1913,6 @@ } HeapFree(GetProcessHeap(), 0, wszApplicationName); - dwApplicationNameLen = lstrlenW(buf) + 1; wszApplicationName = buf; sei_tmp.lpFile = wszApplicationName; } @@ -1884,7 +1926,6 @@ ExpandEnvironmentStringsW(sei_tmp.lpFile, buf, len + 1); HeapFree(GetProcessHeap(), 0, wszApplicationName); - dwApplicationNameLen = len + 1; wszApplicationName = buf; /* appKnownSingular unmodified */ @@ -1931,7 +1972,7 @@ { end = ++src; - while(isspace(*src)) + while(isspaceW(*src)) ++src; } else

1 0

[gadamopoulos] 75129: [ATL] -Add a new template called CComQIIDPtr and its partner I_ID macro. Its purpose is to be a gcc compatible version of CComQIPtr. -CComQIIDPtr<I_ID(Itype)> is the gcc compa...
by gadamopoulos＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: gadamopoulos Date: Mon Jun 19 14:52:51 2017 New Revision: 75129 URL: http://svn.reactos.org/svn/reactos?rev=75129&view=rev Log: [ATL] -Add a new template called CComQIIDPtr and its partner I_ID macro. Its purpose is to be a gcc compatible version of CComQIPtr. -CComQIIDPtr<I_ID(Itype)> is the gcc compatible version of CComQIPtr<Itype> - WARNING: this is not tested yet. Modified: trunk/reactos/sdk/lib/atl/atlcomcli.h Modified: trunk/reactos/sdk/lib/atl/atlcomcli.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlcomcli.h?re… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlcomcli.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlcomcli.h [iso-8859-1] Mon Jun 19 14:52:51 2017 @@ -149,6 +149,66 @@ }; +//CComQIIDPtr<I_ID(Itype)> is the gcc compatible version of CComQIPtr<Itype> +#define I_ID(Itype) Itype,IID_##Itype + +template <class T, const IID* piid> +class CComQIIDPtr : + public CComPtr<T> +{ +public: + CComQIIDPtr() + { + } + CComQIIDPtr(_Inout_opt_ T* lp) : + CComPtr<T>(lp) + { + } + CComQIIDPtr(_Inout_ const CComQIIDPtr<T,piid>& lp): + CComPtr<T>(lp.p) + { + } + CComQIIDPtr(_Inout_opt_ IUnknown* lp) + { + if (lp != NULL) + { + if (FAILED(lp->QueryInterface(*piid, (void **)&this.p))) + this.p = NULL; + } + } + T *operator = (T *lp) + { + if (this.p != NULL) + this.p->Release(); + this.p = lp; + if (this.p != NULL) + this.p->AddRef(); + return *this; + } + + T *operator = (const CComQIIDPtr<T,piid> &lp) + { + if (this.p != NULL) + this.p->Release(); + this.p = lp.p; + if (this.p != NULL) + this.p->AddRef(); + return *this; + } + + T * operator=(IUnknown* lp) + { + if (this.p != NULL) + this.p->Release(); + + if (FAILED(lp->QueryInterface(*piid, (void **)&this.p))) + this.p = NULL; + + return *this; + } +}; + + class CComBSTR { public:

1 0

[hbelusca] 75128: [NTOS]: Minor fixes: - Use NULL instead of 'zero' for setting a handle / pointer to NULL; - Don't hardcode an array size; fix a comment; - Use ExFreePoolWithTag(); - Whitespace fix.
by hbelusca＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: hbelusca Date: Mon Jun 19 14:48:59 2017 New Revision: 75128 URL: http://svn.reactos.org/svn/reactos?rev=75128&view=rev Log: [NTOS]: Minor fixes: - Use NULL instead of 'zero' for setting a handle / pointer to NULL; - Don't hardcode an array size; fix a comment; - Use ExFreePoolWithTag(); - Whitespace fix. Modified: trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Mon Jun 19 14:48:59 2017 @@ -352,7 +352,7 @@ if (Name->MaximumLength != OBP_NAME_LOOKASIDE_MAX_SIZE) { /* Free it from the pool */ - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, OB_NAME_TAG); } else { @@ -556,7 +556,7 @@ /* Clear the string */ RtlInitEmptyUnicodeString(ObjectName, NULL, 0); - /* He can't have specified a Root Directory */ + /* It cannot have specified a Root Directory */ if (ObjectCreateInfo->RootDirectory) { Status = STATUS_OBJECT_NAME_INVALID; @@ -1247,7 +1247,7 @@ ASSERT(LocalObjectType->Index != 0); - if (LocalObjectType->Index < 32) + if (LocalObjectType->Index < RTL_NUMBER_OF(ObpObjectTypes)) { /* It fits, insert it */ ObpObjectTypes[LocalObjectType->Index - 1] = LocalObjectType; Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Mon Jun 19 14:48:59 2017 @@ -1290,7 +1290,7 @@ if (Process->Win32Process == OldWin32Process) { /* Yes, so reset the win32 process to NULL */ - Process->Win32Process = 0; + Process->Win32Process = NULL; } else { Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=75128… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Mon Jun 19 14:48:59 2017 @@ -208,7 +208,7 @@ NTSTATUS NTAPI -SepCaptureSecurityQualityOfService(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, +SepCaptureSecurityQualityOfService(IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, IN KPROCESSOR_MODE AccessMode, IN POOL_TYPE PoolType, IN BOOLEAN CaptureIfKernel,

1 0

[gadamopoulos] 75127: [SHELL32] -Rename constructors from Class_Creator to Class_CreateInstance. Prepend the ones that are exported from rshell with RSHELL_. The reasoning is that rshell will alway...
by gadamopoulos＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: gadamopoulos Date: Mon Jun 19 14:27:51 2017 New Revision: 75127 URL: http://svn.reactos.org/svn/reactos?rev=75127&view=rev Log: [SHELL32] -Rename constructors from Class_Creator to Class_CreateInstance. Prepend the ones that are exported from rshell with RSHELL_. The reasoning is that rshell will always use our code but whether or not internal classes will be used in shellmenu lib will be controlled by preprocessor definitions in shellmenu.h [BROWSEUI] -Rename more constructors to use the _CreateInstance suffix. [RSHELL] - The functions that let rshell export some objects have the RSHELL_ postfix but they are not exported as such. [EXPLORER] - Rename _CStartMenu_Constructor to _CStartMenu_CreateInstance. Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/rshell.cpp trunk/reactos/base/shell/explorer/startmnu.cpp trunk/reactos/base/shell/rshell/misc.cpp trunk/reactos/base/shell/rshell/rshell.spec trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/dll/win32/browseui/explorerband.cpp trunk/reactos/dll/win32/browseui/explorerband.h trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp trunk/reactos/dll/win32/browseui/shellbars/CBandSiteMenu.cpp trunk/reactos/dll/win32/shell32/shell32.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.cpp trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -112,7 +112,7 @@ */ VOID InitRSHELL(VOID); -HRESULT WINAPI _CStartMenu_Constructor(REFIID riid, void **ppv); +HRESULT WINAPI _CStartMenu_CreateInstance(REFIID riid, void **ppv); HANDLE WINAPI _SHCreateDesktop(IShellDesktopTray *ShellDesk); BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop); DWORD WINAPI _WinList_Init(void); Modified: trunk/reactos/base/shell/explorer/rshell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/rshell… ============================================================================== --- trunk/reactos/base/shell/explorer/rshell.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/rshell.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -22,18 +22,18 @@ static HINSTANCE ghRShell = NULL; -typedef HRESULT(WINAPI * PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PSTARTMENU_CREATEINSTANCE)(REFIID riid, void **ppv); VOID InitRSHELL(VOID) { ghRShell = LoadLibraryW(L"rshell.dll"); } -HRESULT WINAPI _CStartMenu_Constructor(REFIID riid, void **ppv) -{ - if (ghRShell) - { - PSTARTMENU_CONSTRUCTOR func = (PSTARTMENU_CONSTRUCTOR)GetProcAddress(ghRShell, "CStartMenu_Constructor"); +HRESULT WINAPI _CStartMenu_CreateInstance(REFIID riid, void **ppv) +{ + if (ghRShell) + { + PSTARTMENU_CREATEINSTANCE func = (PSTARTMENU_CREATEINSTANCE)GetProcAddress(ghRShell, "CStartMenu_CreateInstance"); if (func) { return func(riid, ppv); Modified: trunk/reactos/base/shell/explorer/startmnu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm… ============================================================================== --- trunk/reactos/base/shell/explorer/startmnu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/startmnu.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -59,15 +59,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return NULL; -#if 0 - hr = CoCreateInstance(&CLSID_StartMenu, - NULL, - CLSCTX_INPROC_SERVER, - &IID_IMenuPopup, - (PVOID *)&pMp); -#else - hr = _CStartMenu_Constructor(IID_PPV_ARG(IMenuPopup, &pMp)); -#endif + hr = _CStartMenu_CreateInstance(IID_PPV_ARG(IMenuPopup, &pMp)); if (FAILED_UNEXPECTEDLY(hr)) return NULL; Modified: trunk/reactos/base/shell/rshell/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/misc.cpp… ============================================================================== --- trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/misc.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -56,11 +56,11 @@ { extern HINSTANCE shell32_hInstance; -HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv); -HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); -HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv); -HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv); -HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv); +HRESULT WINAPI RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv); +HRESULT WINAPI RSHELL_CMenuDeskBar_CreateInstance(REFIID riid, LPVOID *ppv); +HRESULT WINAPI RSHELL_CMenuSite_CreateInstance(REFIID riid, LPVOID *ppv); +HRESULT WINAPI RSHELL_CMenuBand_CreateInstance(REFIID riid, LPVOID *ppv); +HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); } DWORD WINAPI WinList_Init(void) @@ -226,19 +226,19 @@ *ppvObject = NULL; if (IsEqualCLSID(m_Clsid, CLSID_StartMenu)) - return CStartMenu_Constructor(riid, ppvObject); + return RSHELL_CStartMenu_CreateInstance(riid, ppvObject); if (IsEqualCLSID(m_Clsid, CLSID_MenuDeskBar)) - return CMenuDeskBar_Constructor(riid, ppvObject); + return RSHELL_CMenuDeskBar_CreateInstance(riid, ppvObject); if (IsEqualCLSID(m_Clsid, CLSID_MenuBand)) - return CMenuBand_Constructor(riid, ppvObject); + return RSHELL_CMenuBand_CreateInstance(riid, ppvObject); if (IsEqualCLSID(m_Clsid, CLSID_MenuBandSite)) - return CMenuSite_Constructor(riid, ppvObject); + return RSHELL_CMenuSite_CreateInstance(riid, ppvObject); if (IsEqualCLSID(m_Clsid, CLSID_MergedFolder)) - return CMergedFolder_Constructor(riid, ppvObject); + return RSHELL_CMergedFolder_CreateInstance(riid, ppvObject); return E_NOINTERFACE; } Modified: trunk/reactos/base/shell/rshell/rshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/rshell.s… ============================================================================== --- trunk/reactos/base/shell/rshell/rshell.spec [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/rshell.spec [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -2,13 +2,13 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ stdcall CStartMenu_Constructor(ptr ptr) -@ stdcall CMenuDeskBar_Constructor(ptr ptr); -@ stdcall CMenuSite_Constructor(ptr ptr); -@ stdcall CMenuBand_Constructor(ptr ptr); -@ stdcall CMergedFolder_Constructor(ptr ptr); -@ stdcall CBandSite_CreateInstance(ptr ptr ptr) -@ stdcall CBandSiteMenu_CreateInstance(ptr ptr) +@ stdcall CStartMenu_CreateInstance(ptr ptr) RSHELL_CStartMenu_CreateInstance +@ stdcall CMenuDeskBar_CreateInstance(ptr ptr) RSHELL_CMenuDeskBar_CreateInstance +@ stdcall CMenuSite_CreateInstance(ptr ptr) RSHELL_CMenuSite_CreateInstance +@ stdcall CMenuBand_CreateInstance(ptr ptr) RSHELL_CMenuBand_CreateInstance +@ stdcall CMergedFolder_CreateInstance(ptr ptr) RSHELL_CMergedFolder_CreateInstance +@ stdcall CBandSite_CreateInstance(ptr ptr ptr) RSHELL_CBandSite_CreateInstance +@ stdcall CBandSiteMenu_CreateInstance(ptr ptr) RSHELL_CBandSiteMenu_CreateInstance @ stdcall ShellDDEInit(long); @ stdcall SHCreateDesktop(ptr); @ stdcall SHDesktopMessageLoop(ptr); Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -75,8 +75,8 @@ #endif } -typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); -typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PMENUBAND_CREATEINSTANCE)(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PMERGEDFOLDER_CREATEINSTANCE)(REFIID riid, void **ppv); HRESULT CMergedFolder_CreateInstance(REFIID riid, void **ppv) { @@ -87,12 +87,12 @@ if (hRShell) { - PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) - GetProcAddress(hRShell, "CMergedFolder_Constructor"); - - if (pCMergedFolder_Constructor) + PMERGEDFOLDER_CREATEINSTANCE pCMergedFolder_CreateInstance = (PMERGEDFOLDER_CREATEINSTANCE) + GetProcAddress(hRShell, "CMergedFolder_CreateInstance"); + + if (pCMergedFolder_CreateInstance) { - return pCMergedFolder_Constructor(riid, ppv); + return pCMergedFolder_CreateInstance(riid, ppv); } } #endif @@ -109,7 +109,7 @@ if (hRShell) { - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); + PMENUBAND_CREATEINSTANCE func = (PMENUBAND_CREATEINSTANCE) GetProcAddress(hRShell, "CMenuBand_CreateInstance"); if (func) { return func(iid , ppv); Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -84,16 +84,6 @@ pShellFolder->Release(); } return hr; -} - -extern "C" -HRESULT WINAPI CExplorerBand_Constructor(REFIID riid, LPVOID *ppv) -{ -#ifdef __REACTOS__ - return ShellObjectCreator<CExplorerBand>(riid, ppv); -#else - return S_OK; -#endif } /* Modified: trunk/reactos/dll/win32/browseui/explorerband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -205,6 +205,3 @@ // MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus) END_MSG_MAP() }; - -extern "C" -HRESULT WINAPI CExplorerBand_Constructor(REFIID riid, LPVOID *ppv); Modified: trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellba… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbars/CBandSite.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -831,7 +831,7 @@ } extern "C" -HRESULT WINAPI CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv) +HRESULT WINAPI RSHELL_CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv) { return CBandSite::_CreatorClass::CreateInstance(pUnkOuter, riid, ppv); } Modified: trunk/reactos/dll/win32/browseui/shellbars/CBandSiteMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellba… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbars/CBandSiteMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbars/CBandSiteMenu.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -223,7 +223,7 @@ } extern "C" -HRESULT WINAPI CBandSiteMenu_CreateInstance(REFIID riid, void **ppv) +HRESULT WINAPI RSHELL_CBandSiteMenu_CreateInstance(REFIID riid, void **ppv) { return ShellObjectCreator<CBandSiteMenu>(riid, ppv); } Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -208,7 +208,7 @@ *ppv = NULL; if (pv != NULL) return CLASS_E_NOAGGREGATION; - return CStartMenu_Constructor(riid, ppv); + return RSHELL_CStartMenu_CreateInstance(riid, ppv); } }; }; Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -31,12 +31,6 @@ #undef UNIMPLEMENTED #define UNIMPLEMENTED TRACE("%s is UNIMPLEMENTED!\n", __FUNCTION__) - -extern "C" -HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv) -{ - return ShellObjectCreator<CMenuBand>(riid, ppv); -} CMenuBand::CMenuBand() : m_staticToolbar(NULL), @@ -1056,25 +1050,11 @@ CComPtr<IDeskBar> pDeskBar; // Create the necessary objects -#if USE_SYSTEM_MENUSITE - hr = CoCreateInstance(CLSID_MenuBandSite, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IBandSite, &pBandSite)); -#else - hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite)); -#endif + hr = CMenuSite_CreateInstance(IID_PPV_ARG(IBandSite, &pBandSite)); if (FAILED_UNEXPECTEDLY(hr)) return hr; -#if USE_SYSTEM_MENUDESKBAR - hr = CoCreateInstance(CLSID_MenuDeskBar, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IDeskBar, &pDeskBar)); -#else - hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); -#endif + hr = CMenuDeskBar_CreateInstance(IID_PPV_ARG(IDeskBar, &pDeskBar)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -1319,3 +1299,9 @@ UNIMPLEMENTED; return S_OK; } + +extern "C" +HRESULT WINAPI RSHELL_CMenuBand_CreateInstance(REFIID riid, LPVOID *ppv) +{ + return ShellObjectCreator<CMenuBand>(riid, ppv); +} Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuDeskBar.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -45,12 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar); -extern "C" -HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv) -{ - return ShellObjectCreator<CMenuDeskBar>(riid, ppv); -} - CMenuDeskBar::CMenuDeskBar() : m_Client(NULL), m_ClientWindow(NULL), @@ -852,3 +846,9 @@ SHSetWindowBits(m_hWnd, GWL_STYLE, mask, style); return S_OK; } + +extern "C" +HRESULT WINAPI RSHELL_CMenuDeskBar_CreateInstance(REFIID riid, LPVOID *ppv) +{ + return ShellObjectCreator<CMenuDeskBar>(riid, ppv); +} Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuSite.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -25,12 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(menusite); -extern "C" -HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv) -{ - return ShellObjectCreator<CMenuSite>(riid, ppv); -} - CMenuSite::CMenuSite() : m_DeskBarSite(NULL), m_BandObject(NULL), @@ -362,3 +356,9 @@ { return S_OK; } + +extern "C" +HRESULT WINAPI RSHELL_CMenuSite_CreateInstance(REFIID riid, LPVOID *ppv) +{ + return ShellObjectCreator<CMenuSite>(riid, ppv); +} Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -1467,7 +1467,7 @@ if (!pidl) return E_FAIL; - hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &shellMenu)); + hr = CMenuBand_CreateInstance(IID_PPV_ARG(IShellMenu, &shellMenu)); if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMergedFolder.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -383,12 +383,6 @@ //----------------------------------------------------------------------------- // CMergedFolder -extern "C" -HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv) -{ - return ShellObjectCreator<CMergedFolder>(riid, ppv); -} - CMergedFolder::CMergedFolder() : m_UserLocal(NULL), m_AllUsers(NULL), @@ -546,7 +540,7 @@ return hr; CComPtr<IAugmentedShellFolder> pasf; - hr = CMergedFolder_Constructor(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); + hr = CMergedFolder_CreateInstance(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -814,3 +808,9 @@ UNIMPLEMENTED; return E_NOTIMPL; } + +extern "C" +HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv) +{ + return ShellObjectCreator<CMergedFolder>(riid, ppv); +} Modified: trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CStartMenu.cpp [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -155,14 +155,7 @@ int csidl = 0; IShellMenu *pShellMenu; -#if USE_SYSTEM_MENUBAND - hr = CoCreateInstance(CLSID_MenuBand, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &pShellMenu)); -#else - hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); -#endif + hr = CMenuBand_CreateInstance(IID_PPV_ARG(IShellMenu, &pShellMenu)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -384,11 +377,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; -#if !USE_SYSTEM_MERGED_FOLDERS - hr = CMergedFolder_Constructor(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); -#else - hr = CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IAugmentedShellFolder, &pasf)); -#endif + hr = CMergedFolder_CreateInstance(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); if (FAILED_UNEXPECTEDLY(hr)) { *ppsfStartMenu = psfUserStartMenu.Detach(); @@ -426,7 +415,7 @@ extern "C" HRESULT WINAPI -CStartMenu_Constructor(REFIID riid, void **ppv) +RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv) { CComPtr<IShellMenu> pShellMenu; CComPtr<IBandSite> pBandSite; @@ -439,36 +428,15 @@ LPITEMIDLIST pidlPrograms; CComPtr<IShellFolder> psfPrograms; -#if USE_SYSTEM_MENUBAND - hr = CoCreateInstance(CLSID_MenuBand, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IShellMenu, &pShellMenu)); -#else - hr = CMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &pShellMenu)); -#endif - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - -#if USE_SYSTEM_MENUSITE - hr = CoCreateInstance(CLSID_MenuBandSite, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IBandSite, &pBandSite)); -#else - hr = CMenuSite_Constructor(IID_PPV_ARG(IBandSite, &pBandSite)); -#endif - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - -#if USE_SYSTEM_MENUDESKBAR - hr = CoCreateInstance(CLSID_MenuDeskBar, - NULL, - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IDeskBar, &pDeskBar)); -#else - hr = CMenuDeskBar_Constructor(IID_PPV_ARG(IDeskBar, &pDeskBar)); -#endif + hr = CMenuBand_CreateInstance(IID_PPV_ARG(IShellMenu, &pShellMenu)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = CMenuSite_CreateInstance(IID_PPV_ARG(IBandSite, &pBandSite)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = CMenuDeskBar_CreateInstance(IID_PPV_ARG(IDeskBar, &pDeskBar)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -476,6 +444,7 @@ hr = CComObject<CShellMenuCallback>::CreateInstance(&pCallback); if (FAILED_UNEXPECTEDLY(hr)) return hr; + pCallback->AddRef(); // CreateInstance returns object with 0 ref count */ pCallback->Initialize(pShellMenu, pBandSite, pDeskBar); Modified: trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/shellmenu.h [iso-8859-1] Mon Jun 19 14:27:51 2017 @@ -16,13 +16,6 @@ #pragma warning(disable:4244) // possible loss of data #pragma warning(disable:4512) // assignment operator could not be gernerated #endif - -#define USE_SYSTEM_MENUDESKBAR 0 -#define USE_SYSTEM_MENUSITE 0 -#define USE_SYSTEM_MENUBAND 0 -#define USE_SYSTEM_MERGED_FOLDERS 0 - -#define MERGE_FOLDERS 1 #include <stdio.h> #include <tchar.h> @@ -69,14 +62,45 @@ #pragma warning(pop) #endif +#define USE_SYSTEM_MENUDESKBAR 0 +#define USE_SYSTEM_MENUSITE 0 +#define USE_SYSTEM_MENUBAND 0 +#define USE_SYSTEM_MERGED_FOLDERS 0 + +#define MERGE_FOLDERS 1 + +#if USE_SYSTEM_MENUDESKBAR +#define CMenuDeskBar_CreateInstance(riid, ppv) (CoCreateInstance(CLSID_MenuDeskBar, NULL, CLSCTX_INPROC_SERVER,riid, ppv)) +#else +#define CMenuDeskBar_CreateInstance RSHELL_CMenuDeskBar_CreateInstance +#endif + +#if USE_SYSTEM_MENUBAND +#define CMenuBand_CreateInstance(riid, ppv) (CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER,riid, ppv)) +#else +#define CMenuBand_CreateInstance RSHELL_CMenuBand_CreateInstance +#endif + +#if USE_SYSTEM_MENUSITE +#define CMenuSite_CreateInstance(riid, ppv) (CoCreateInstance(CLSID_MenuBandSite, NULL, CLSCTX_INPROC_SERVER,riid, ppv)) +#else +#define CMenuSite_CreateInstance RSHELL_CMenuSite_CreateInstance +#endif + +#if USE_SYSTEM_MERGED_FOLDERS +#define CMergedFolder_CreateInstance(riid, ppv) (CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER,riid, ppv)) +#else +#define CMergedFolder_CreateInstance RSHELL_CMergedFolder_CreateInstance +#endif + extern "C" { extern HINSTANCE shell32_hInstance; -HRESULT WINAPI CStartMenu_Constructor(REFIID riid, void **ppv); -HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv); -HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv); -HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv); -HRESULT WINAPI CMergedFolder_Constructor(REFIID riid, LPVOID *ppv); +HRESULT WINAPI RSHELL_CStartMenu_CreateInstance(REFIID riid, void **ppv); +HRESULT WINAPI RSHELL_CMenuDeskBar_CreateInstance(REFIID riid, LPVOID *ppv); +HRESULT WINAPI RSHELL_CMenuSite_CreateInstance(REFIID riid, LPVOID *ppv); +HRESULT WINAPI RSHELL_CMenuBand_CreateInstance(REFIID riid, LPVOID *ppv); +HRESULT WINAPI RSHELL_CMergedFolder_CreateInstance(REFIID riid, LPVOID *ppv); }

1 0

[hbelusca] 75126: [USER.EXE]: Add a *stub* user.exe to make the DirectX 9.0 installer happy (it searches user.exe for existence for no reason, and if it cannot find it, the installer bails out). (W...
by hbelusca＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: hbelusca Date: Mon Jun 19 14:24:48 2017 New Revision: 75126 URL: http://svn.reactos.org/svn/reactos?rev=75126&view=rev Log: [USER.EXE]: Add a *stub* user.exe to make the DirectX 9.0 installer happy (it searches user.exe for existence for no reason, and if it cannot find it, the installer bails out). (WARNING: This is in NO WAY our implementation of WoW16!!) Reported on https://www.reactos.org/forum/viewtopic.php?f=4&t=15576 , http://reactos.org/forum/viewtopic.php?f=4&t=16498 . This is not a ReactOS problem per se, because it also happens on Windows, as reported here: https://xpetips.wordpress.com/2009/09/18/installing-directx-9-0c-on-xpe/ and http://www.xpembedded.info/DirectX_v9_0c_and_finding_missing_components_.ht… . Added: trunk/reactos/subsystems/mvdm/wow16/CMakeLists.txt (with props) trunk/reactos/subsystems/mvdm/wow16/user/ trunk/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt (with props) trunk/reactos/subsystems/mvdm/wow16/user/user.c (with props) Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt Modified: trunk/reactos/subsystems/mvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/CMakeLists… ============================================================================== --- trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/CMakeLists.txt [iso-8859-1] Mon Jun 19 14:24:48 2017 @@ -10,4 +10,4 @@ add_subdirectory(samples) endif() add_subdirectory(vdmdbg) -#add_subdirectory(wow16) +add_subdirectory(wow16) Added: trunk/reactos/subsystems/mvdm/wow16/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/wow16/CMak… ============================================================================== --- trunk/reactos/subsystems/mvdm/wow16/CMakeLists.txt (added) +++ trunk/reactos/subsystems/mvdm/wow16/CMakeLists.txt [iso-8859-1] Mon Jun 19 14:24:48 2017 @@ -0,0 +1,2 @@ + +add_subdirectory(user) Propchange: trunk/reactos/subsystems/mvdm/wow16/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/wow16/user… ============================================================================== --- trunk/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt (added) +++ trunk/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt [iso-8859-1] Mon Jun 19 14:24:48 2017 @@ -0,0 +1,5 @@ + +add_executable(user user.c) +set_module_type(user win32gui ENTRYPOINT mainCRTStartup) +add_importlibs(user msvcrt kernel32) +add_cd_file(TARGET user DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/subsystems/mvdm/wow16/user/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/wow16/user/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/wow16/user… ============================================================================== --- trunk/reactos/subsystems/mvdm/wow16/user/user.c (added) +++ trunk/reactos/subsystems/mvdm/wow16/user/user.c [iso-8859-1] Mon Jun 19 14:24:48 2017 @@ -0,0 +1,25 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS-on-ReactOS-16bit (aka. RoR16 or WoW16) + * FILE: subsystems/mvdm/wow16/user.c + * PURPOSE: 16-bit USER stub module + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +/* PSDK Headers */ +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> + +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS ***********************************************************/ + +INT main(INT argc, const CHAR *argv[]) +{ + OutputDebugStringA("USER.EXE: stub\n"); + return 0; +} Propchange: trunk/reactos/subsystems/mvdm/wow16/user/user.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 75125: [PRINTING] - Implement GetPrinterDataA, GetPrinterDataExA, GetPrinterDataExW, GetPrinterDataW, SetPrinterDataA, SetPrinterDataExA, SetPrinterDataExW, SetPrinterDataW. They support a...
by cfinck＠svn.reactos.org 19 Jun '17

19 Jun '17

Author: cfinck Date: Mon Jun 19 14:18:19 2017 New Revision: 75125 URL: http://svn.reactos.org/svn/reactos?rev=75125&view=rev Log: [PRINTING] - Implement GetPrinterDataA, GetPrinterDataExA, GetPrinterDataExW, GetPrinterDataW, SetPrinterDataA, SetPrinterDataExA, SetPrinterDataExW, SetPrinterDataW. They support all features for Print Server and Printer Handles (minus security checks!) I've also added tests for them. - Store Printer data in SOFTWARE\Microsoft\Windows NT\CurrentVersion\Print\Printers instead of SYSTEM\CurrentControlSet\Control\Print\Printers and create a registry symlink from the former path to the new one just like Windows does. According to https://social.technet.microsoft.com/Forums/windowsserver/en-US/a683ab54-c4…, this is needed when having >900 printers to work around a size limit of the SYSTEM registry hive. And if Windows has both locations, we need both for compatibility anyway. - Add several settings which are queried by the new Printer Data APIs when working with Print Server Handles. - Store the job directory in the Windows-compatible "DefaultSpoolDirectory" setting and make use of it. - Revert the ASSERTs in LocalEnumPrinters again to let us verify the NULL pointer exceptions in localspl_apitest (thanks Serge! CORE-13433) - Translate ERROR_INVALID_NAME to ERROR_INVALID_PRINTER_NAME in all cases in OpenPrinterW (thanks Victor! CORE-13412) - Make EnumMonitorsW and EnumPortsW in spoolss more robust against failing Print Monitors. - Remove the wrong !phPrinter check in OpenPrinterW to make Print Server Handles work for real. - Fix error handling when memory allocation fails: HeapAlloc doesn't set last error, so it's just wrong to query or return it. One more item done from https://reactos.org/wiki/Printing ! This is all still a big Work-in-Progress, with many subtle bugs deep down in ReactOS, for which I need to open additional tickets. But I didn't want to make this commit even bigger.. Added: trunk/reactos/win32ss/printing/base/spoolss/printerdata.c (with props) trunk/reactos/win32ss/printing/providers/localspl/printerdata.c (with props) trunk/rostests/apitests/winspool/GetPrinterData.c (with props) Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/win32ss/printing/base/spoolss/CMakeLists.txt trunk/reactos/win32ss/printing/base/spoolss/main.c trunk/reactos/win32ss/printing/base/spoolss/memory.c trunk/reactos/win32ss/printing/base/spoolss/monitors.c trunk/reactos/win32ss/printing/base/spoolss/ports.c trunk/reactos/win32ss/printing/base/spoolss/printers.c trunk/reactos/win32ss/printing/base/spoolss/spoolss.spec trunk/reactos/win32ss/printing/base/spoolsv/printerdata.c trunk/reactos/win32ss/printing/base/winspool/printerdata.c trunk/reactos/win32ss/printing/base/winspool/printers.c trunk/reactos/win32ss/printing/base/winspool/printprocessors.c trunk/reactos/win32ss/printing/base/winspool/winspool.spec trunk/reactos/win32ss/printing/providers/localspl/CMakeLists.txt trunk/reactos/win32ss/printing/providers/localspl/jobs.c trunk/reactos/win32ss/printing/providers/localspl/main.c trunk/reactos/win32ss/printing/providers/localspl/monitors.c trunk/reactos/win32ss/printing/providers/localspl/ports.c trunk/reactos/win32ss/printing/providers/localspl/precomp.h trunk/reactos/win32ss/printing/providers/localspl/printers.c trunk/reactos/win32ss/printing/providers/localspl/printingthread.c trunk/reactos/win32ss/printing/providers/localspl/printprocessors.c trunk/reactos/win32ss/printing/providers/localspl/tools.c trunk/rostests/apitests/winspool/CMakeLists.txt trunk/rostests/apitests/winspool/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… Modified: trunk/reactos/win32ss/printing/base/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… Modified: trunk/reactos/win32ss/printing/base/spoolss/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… Modified: trunk/reactos/win32ss/printing/base/spoolss/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… Modified: trunk/reactos/win32ss/printing/base/spoolss/monitors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… Modified: trunk/reactos/win32ss/printing/base/spoolss/ports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… Added: trunk/reactos/win32ss/printing/base/spoolss/printerdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… Modified: trunk/reactos/win32ss/printing/base/spoolss/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… Modified: trunk/reactos/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… Modified: trunk/reactos/win32ss/printing/base/spoolsv/printerdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/spoo… Modified: trunk/reactos/win32ss/printing/base/winspool/printerdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… Modified: trunk/reactos/win32ss/printing/base/winspool/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… Modified: trunk/reactos/win32ss/printing/base/winspool/printprocessors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… Modified: trunk/reactos/win32ss/printing/base/winspool/winspool.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/base/wins… Modified: trunk/reactos/win32ss/printing/providers/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Modified: trunk/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Modified: trunk/reactos/win32ss/printing/providers/localspl/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Modified: trunk/reactos/win32ss/printing/providers/localspl/monitors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Modified: trunk/reactos/win32ss/printing/providers/localspl/ports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Modified: trunk/reactos/win32ss/printing/providers/localspl/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Added: trunk/reactos/win32ss/printing/providers/localspl/printerdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Modified: trunk/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Modified: trunk/reactos/win32ss/printing/providers/localspl/printingthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Modified: trunk/reactos/win32ss/printing/providers/localspl/printprocessors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Modified: trunk/reactos/win32ss/printing/providers/localspl/tools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/providers… Modified: trunk/rostests/apitests/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/CMakeLi… Added: trunk/rostests/apitests/winspool/GetPrinterData.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/GetPrin… Modified: trunk/rostests/apitests/winspool/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/testlis…

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