Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[pschweitzer] 63045: [FASTFAT] Properly handle files at root. CORE-8125 #resolve

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Apr 29 18:25:02 2014 New Revision: 63045 URL: http://svn.reactos.org/svn/reactos?rev=63045&view=rev Log: [FASTFAT] Properly handle files at root. CORE-8125 #resolve Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Tue Apr 29 18:25:02 2014 @@ -584,7 +584,7 @@ --idx; } - if (idx > 0) + if (idx > 0 || PathNameU.Buffer[0] == L'\\') { /* We don't want to include / in the name */ FileNameLen = PathNameU.Length - ((idx + 1) * sizeof(WCHAR));

10 years, 7 months

[dquintana] 63044: [RSHELL] [SHELL32] * Move the IID_NULL_PPV_ARG macro to the shobj_undoc header, next to the (also ros-specific) IID_PPV_ARG macro, so that it can be used elsewhere. [SHELL32] * M...

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Apr 29 11:14:29 2014 New Revision: 63044 URL: http://svn.reactos.org/svn/reactos?rev=63044&view=rev Log: [RSHELL] [SHELL32] * Move the IID_NULL_PPV_ARG macro to the shobj_undoc header, next to the (also ros-specific) IID_PPV_ARG macro, so that it can be used elsewhere. [SHELL32] * Make use of IID_NULL_PPV_ARG in all the calls to GetUIObjectOf, and fix one instance of mismatched riid/pointer. CORE-7330 Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/dll/win32/shell32/folders.cpp branches/shell-experiments/dll/win32/shell32/iconcache.cpp branches/shell-experiments/dll/win32/shell32/pidl.cpp branches/shell-experiments/dll/win32/shell32/shell32_main.cpp branches/shell-experiments/dll/win32/shell32/shelllink.cpp branches/shell-experiments/dll/win32/shell32/shlexec.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp branches/shell-experiments/include/psdk/shlobj_undoc.h Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -1358,8 +1358,6 @@ CComPtr<IContextMenu> contextMenu = NULL; LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(dwData); -#define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) - hr = m_shellFolder->GetUIObjectOf(GetToolbar(), 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &contextMenu)); if (FAILED_UNEXPECTEDLY(hr)) { Modified: branches/shell-experiments/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -235,7 +235,7 @@ hr = SHGetDesktopFolder(&psfDesktop); if (SUCCEEDED(hr)) - hr = psfDesktop->BindToObject(pSimplePidl, NULL, IID_IShellFolder2, (void**) &psfRecycleBin); + hr = psfDesktop->BindToObject(pSimplePidl, NULL, IID_PPV_ARG(IShellFolder2, &psfRecycleBin)); if (SUCCEEDED(hr)) hr = psfRecycleBin->EnumObjects(NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &EnumIDList); @@ -379,7 +379,7 @@ if (SUCCEEDED(SHGetDesktopFolder(&dsf))) { - HRESULT hr = dsf->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*)&pidl, IID_IShellLinkW, NULL, (LPVOID *)&psl); + HRESULT hr = dsf->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*) &pidl, IID_NULL_PPV_ARG(IShellLinkW, &psl)); if (SUCCEEDED(hr)) { Modified: branches/shell-experiments/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/iconcache.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -745,7 +745,7 @@ TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small"); - if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_IExtractIconW, 0, (void **)&ei))) + if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW, &ei)))) { if (SUCCEEDED(ei->GetIconLocation(uFlags, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))) { Modified: branches/shell-experiments/dll/win32/shell32/pidl.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/pidl.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -686,8 +686,7 @@ CComPtr<IDataObject> pDataObj; HRESULT hr; - hr = lpsf->GetUIObjectOf(0, 1, &pidlSimple, - IID_IDataObject, 0, (LPVOID*)&pDataObj); + hr = lpsf->GetUIObjectOf(0, 1, &pidlSimple, IID_NULL_PPV_ARG(IDataObject, &pDataObj)); if (SUCCEEDED(hr)) { STGMEDIUM medium; Modified: branches/shell-experiments/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -566,7 +566,7 @@ /* get the iconlocation */ if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION )) { - UINT uDummy,uFlags; + UINT uFlags; if (flags & SHGFI_USEFILEATTRIBUTES) { @@ -602,8 +602,7 @@ else { hr = psfParent->GetUIObjectOf(0, 1, - (LPCITEMIDLIST*)&pidlLast, IID_IExtractIconW, - &uDummy, (LPVOID*)&pei); + (LPCITEMIDLIST*)&pidlLast, IID_NULL_PPV_ARG(IExtractIconW, &pei)); if (SUCCEEDED(hr)) { hr = pei->GetIconLocation(uGilFlags, Modified: branches/shell-experiments/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shelllink.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -1140,7 +1140,7 @@ { CComPtr<IExtractIconA> pei; - hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconA, NULL, (LPVOID*)&pei); + hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IExtractIconA, &pei)); if (SUCCEEDED(hr)) hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, NULL); @@ -1410,7 +1410,7 @@ { CComPtr<IExtractIconW> pei; - hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconW, NULL, (LPVOID*)&pei); + hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IExtractIconW, &pei)); if (SUCCEEDED(hr)) hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, &wFlags); @@ -2179,7 +2179,7 @@ if (SUCCEEDED(hr)) { - hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IDropTarget, NULL, (LPVOID*)&mDropTarget); + hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IDropTarget, &mDropTarget)); if (SUCCEEDED(hr)) hr = mDropTarget->DragEnter(pDataObject, dwKeyState, pt, pdwEffect); Modified: branches/shell-experiments/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlexec.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -1228,8 +1228,7 @@ if (FAILED(r)) goto end; - shf->GetUIObjectOf(NULL, 1, &pidllast, - IID_IDataObject, NULL, (LPVOID*) &dataobj); + shf->GetUIObjectOf(NULL, 1, &pidllast, IID_NULL_PPV_ARG(IDataObject, &dataobj)); end: if (pidl != sei->lpIDList) Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -1708,7 +1708,7 @@ DWORD dwAttributes = SFGAO_CANLINK; DWORD dwEffect = DROPEFFECT_COPY | DROPEFFECT_MOVE; - if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, (LPCITEMIDLIST*)m_apidl, IID_IDataObject, 0, (LPVOID *)&pda))) + if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, (LPCITEMIDLIST*)m_apidl, IID_NULL_PPV_ARG(IDataObject, &pda)))) { IDropSource * pds = (IDropSource *)this; /* own DropSource interface */ @@ -2678,8 +2678,7 @@ SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem); /* ... and bind m_pCurDropTarget to the IDropTarget interface of an UIObject of this object */ - hr = m_pSFParent->GetUIObjectOf(m_hWndList, 1, - (LPCITEMIDLIST*)&lvItem.lParam, IID_IDropTarget, NULL, (LPVOID*)&m_pCurDropTarget); + hr = m_pSFParent->GetUIObjectOf(m_hWndList, 1, (LPCITEMIDLIST*)&lvItem.lParam, IID_NULL_PPV_ARG(IDropTarget, &m_pCurDropTarget)); } /* If anything failed, m_pCurDropTarget should be NULL now, which ought to be a save state. */ Modified: branches/shell-experiments/include/psdk/shlobj_undoc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… ============================================================================== --- branches/shell-experiments/include/psdk/shlobj_undoc.h [iso-8859-1] (original) +++ branches/shell-experiments/include/psdk/shlobj_undoc.h [iso-8859-1] Tue Apr 29 11:14:29 2014 @@ -27,9 +27,11 @@ #endif /* defined(__cplusplus) */ #ifdef __cplusplus -#define IID_PPV_ARG(Itype, ppType) IID_##Itype, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) +# define IID_PPV_ARG(Itype, ppType) IID_##Itype, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) +# define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, reinterpret_cast<void**>((static_cast<Itype**>(ppType))) #else -#define IID_PPV_ARG(Itype, ppType) IID_##Itype, (void**)(ppType) +# define IID_PPV_ARG(Itype, ppType) IID_##Itype, (void**)(ppType) +# define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, (void**)(ppType) #endif /*****************************************************************************

10 years, 7 months

[tfaber] 63043: [FIND] - Fix missing explicit -A.... by using -W functions instead. Spotted by Christoph and Timo.

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Apr 29 08:51:17 2014 New Revision: 63043 URL: http://svn.reactos.org/svn/reactos?rev=63043&view=rev Log: [FIND] - Fix missing explicit -A.... by using -W functions instead. Spotted by Christoph and Timo. Modified: trunk/reactos/base/applications/cmdutils/find/find.c Modified: trunk/reactos/base/applications/cmdutils/find/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/find.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/find/find.c [iso-8859-1] Tue Apr 29 08:51:17 2014 @@ -125,11 +125,12 @@ void usage (void) { - char szUsage[4096]; - - LoadStringA (GetModuleHandle (NULL), IDS_USAGE, szUsage, sizeof(szUsage) / sizeof(szUsage[0])); - CharToOemA (szUsage, szUsage); - fputs (szUsage, stdout); + WCHAR wszUsage[4096]; + char oemUsage[4096]; + + LoadStringW (GetModuleHandleW (NULL), IDS_USAGE, wszUsage, sizeof(wszUsage) / sizeof(wszUsage[0])); + CharToOemW (wszUsage, oemUsage); + fputs (oemUsage, stdout); } @@ -139,7 +140,8 @@ { char *opt, *needle = NULL; int ret = 0; - char szMessage[4096]; + WCHAR wszMessage[4096]; + char oemMessage[4096]; int invert_search = 0; /* flag to invert the search */ int count_lines = 0; /* flag to whether/not count lines */ @@ -216,9 +218,9 @@ { /* We were not able to find a file. Display a message and set the exit status. */ - LoadStringA (GetModuleHandle (NULL), IDS_NO_SUCH_FILE, szMessage, sizeof(szMessage) / sizeof(szMessage[0])); - CharToOemA (szMessage, szMessage); - fprintf (stderr, szMessage, *argv); + LoadStringW (GetModuleHandleW (NULL), IDS_NO_SUCH_FILE, wszMessage, sizeof(wszMessage) / sizeof(wszMessage[0])); + CharToOemW (wszMessage, oemMessage); + fprintf (stderr, oemMessage, *argv); } else { @@ -235,9 +237,9 @@ } else { - LoadString (GetModuleHandle (NULL), IDS_CANNOT_OPEN, szMessage, sizeof(szMessage) / sizeof(szMessage[0])); - CharToOemA (szMessage, szMessage); - fprintf (stderr, szMessage, + LoadStringW (GetModuleHandleW (NULL), IDS_CANNOT_OPEN, wszMessage, sizeof(wszMessage) / sizeof(wszMessage[0])); + CharToOemW (wszMessage, oemMessage); + fprintf (stderr, oemMessage, finddata.name); } }

10 years, 7 months

[aandrejevic] 63042: [BASESRV] Implement BaseSrvDisconnect and BaseSrvCleanupVdmRecords, which will remove VDM console and DOS records which have been left behind by a terminated ntvdm process. Imp...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Apr 29 00:41:48 2014 New Revision: 63042 URL: http://svn.reactos.org/svn/reactos?rev=63042&view=rev Log: [BASESRV] Implement BaseSrvDisconnect and BaseSrvCleanupVdmRecords, which will remove VDM console and DOS records which have been left behind by a terminated ntvdm process. Implement the "VDM voodoo" in BaseSrvCreateProcess. It's supposed to store the process ID of the VDM in the VDM console record. Fix minor bugs. Add function declarations to the header file. Modified: branches/ntvdm/subsystems/win/basesrv/init.c branches/ntvdm/subsystems/win/basesrv/proc.c branches/ntvdm/subsystems/win/basesrv/vdm.c branches/ntvdm/subsystems/win/basesrv/vdm.h Modified: branches/ntvdm/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/in… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/init.c [iso-8859-1] Tue Apr 29 00:41:48 2014 @@ -570,6 +570,14 @@ LoadedServerDll->SharedSection = BaseStaticServerData; } +VOID +NTAPI +BaseSrvDisconnect(PCSR_PROCESS Process) +{ + /* Cleanup the VDM console records */ + BaseSrvCleanupVdmRecords(HandleToUlong(Process->ClientId.UniqueProcess)); +} + CSR_SERVER_DLL_INIT(ServerDllInitialization) { /* Setup the DLL Object */ @@ -582,7 +590,7 @@ #endif LoadedServerDll->SizeOfProcessData = 0; LoadedServerDll->ConnectCallback = NULL; - LoadedServerDll->DisconnectCallback = NULL; + LoadedServerDll->DisconnectCallback = BaseSrvDisconnect; LoadedServerDll->ShutdownProcessCallback = NULL; BaseSrvDllInstance = LoadedServerDll->ServerHandle; Modified: branches/ntvdm/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/pr… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/proc.c [iso-8859-1] Tue Apr 29 00:41:48 2014 @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include "basesrv.h" +#include "vdm.h" #define NDEBUG #include <debug.h> @@ -167,7 +168,30 @@ /* FIXME: Should notify user32 */ - /* FIXME: VDM vodoo */ + /* Check if this is a VDM process */ + if (CreateProcessRequest->VdmBinaryType) + { + PVDM_CONSOLE_RECORD ConsoleRecord; + + if (CreateProcessRequest->VdmTask != 0) + { + /* Get the console record using the task ID */ + Status = GetConsoleRecordBySessionId(CreateProcessRequest->VdmTask, + &ConsoleRecord); + } + else + { + /* Get the console record using the console handle */ + Status = BaseSrvGetConsoleRecord(CreateProcessRequest->hVDM, + &ConsoleRecord); + } + + /* Check if it failed */ + if (!NT_SUCCESS(Status)) return Status; + + /* Store the process ID of the VDM in the console record */ + ConsoleRecord->ProcessId = HandleToUlong(CreateProcessRequest->ClientId.UniqueProcess); + } /* Return the result of this operation */ return Status; Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Tue Apr 29 00:41:48 2014 @@ -203,7 +203,7 @@ return Status; } -VOID BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo) +VOID NTAPI BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo) { /* Free the allocated structure members */ if (CommandInfo->CmdLine != NULL) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo->CmdLine); @@ -219,6 +219,61 @@ RtlFreeHeap(BaseSrvHeap, 0, CommandInfo); } +VOID NTAPI BaseSrvCleanupVdmRecords(ULONG ProcessId) +{ + PLIST_ENTRY i; + PVDM_CONSOLE_RECORD ConsoleRecord = NULL; + PVDM_DOS_RECORD DosRecord; + + /* Enter the critical section */ + RtlEnterCriticalSection(&DosCriticalSection); + + /* Search for a record that has the same process handle */ + for (i = VDMConsoleListHead.Flink; i != &VDMConsoleListHead; i = i->Flink) + { + ConsoleRecord = CONTAINING_RECORD(i, VDM_CONSOLE_RECORD, Entry); + + if (ConsoleRecord->ProcessId == ProcessId) + { + /* Cleanup the DOS records */ + while (ConsoleRecord->DosListHead.Flink != &ConsoleRecord->DosListHead) + { + DosRecord = CONTAINING_RECORD(ConsoleRecord->DosListHead.Flink, + VDM_DOS_RECORD, + Entry); + + /* Set the event and close it */ + NtSetEvent(DosRecord->ServerEvent, NULL); + NtClose(DosRecord->ServerEvent); + + /* Remove the DOS entry */ + if (DosRecord->CommandInfo) BaseSrvFreeVDMInfo(DosRecord->CommandInfo); + RemoveEntryList(&DosRecord->Entry); + RtlFreeHeap(BaseSrvHeap, 0, DosRecord); + } + + if (ConsoleRecord->CurrentDirs != NULL) + { + /* Free the current directories */ + RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord->CurrentDirs); + ConsoleRecord->CurrentDirs = NULL; + ConsoleRecord->CurDirsLength = 0; + } + + /* Close the event handle */ + if (ConsoleRecord->ServerEvent) NtClose(ConsoleRecord->ServerEvent); + + /* Remove the console record */ + i = i->Blink; + RemoveEntryList(&ConsoleRecord->Entry); + RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord); + } + } + + /* Leave the critical section */ + RtlLeaveCriticalSection(&DosCriticalSection); +} + BOOLEAN NTAPI BaseSrvCopyCommand(PBASE_CHECK_VDM CheckVdmRequest, PVDM_DOS_RECORD DosRecord) { BOOLEAN Success = FALSE; @@ -367,7 +422,7 @@ } NTSTATUS NTAPI BaseSrvFillCommandInfo(PVDM_COMMAND_INFO CommandInfo, - PBASE_GET_NEXT_VDM_COMMAND Message) + PBASE_GET_NEXT_VDM_COMMAND Message) { /* Copy the data */ Message->iTask = CommandInfo->TaskId; Modified: branches/ntvdm/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] Tue Apr 29 00:41:48 2014 @@ -23,6 +23,7 @@ HANDLE ProcessHandle; HANDLE ServerEvent; HANDLE ClientEvent; + ULONG ProcessId; ULONG ReenterCount; PCHAR CurrentDirs; ULONG CurDirsLength; @@ -43,6 +44,17 @@ /* FUNCTIONS ******************************************************************/ NTSTATUS NTAPI BaseSrvGetConsoleRecord(HANDLE ConsoleHandle, PVDM_CONSOLE_RECORD *Record); +NTSTATUS NTAPI GetConsoleRecordBySessionId(ULONG TaskId, PVDM_CONSOLE_RECORD *Record); +ULONG NTAPI GetNextDosSesId(VOID); +BOOLEAN NTAPI BaseSrvIsVdmAllowed(VOID); +NTSTATUS NTAPI BaseSrvCreatePairWaitHandles(PHANDLE ServerEvent, PHANDLE ClientEvent); +VOID NTAPI BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo); +VOID NTAPI BaseSrvCleanupVdmRecords(ULONG ProcessId); +BOOLEAN NTAPI BaseSrvCopyCommand(PBASE_CHECK_VDM CheckVdmRequest, PVDM_DOS_RECORD DosRecord); +NTSTATUS NTAPI BaseSrvFillCommandInfo( + PVDM_COMMAND_INFO CommandInfo, + PBASE_GET_NEXT_VDM_COMMAND Message +); VOID NTAPI BaseInitializeVDM(VOID); #endif // __VDM_H__

10 years, 8 months

[hbelusca] 63041: [CSRSRV] When the CsrProcessCreateNewGroup (~= CREATE_NEW_PROCESS_GROUP) flag is set, it means that we are creating a new process group leader, and not the reverse :P

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Apr 28 23:09:09 2014 New Revision: 63041 URL: http://svn.reactos.org/svn/reactos?rev=63041&view=rev Log: [CSRSRV] When the CsrProcessCreateNewGroup (~= CREATE_NEW_PROCESS_GROUP) flag is set, it means that we are creating a new process group leader, and not the reverse :P Modified: branches/ntvdm/subsystems/win32/csrsrv/procsup.c Modified: branches/ntvdm/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win32/csrsrv/p… ============================================================================== --- branches/ntvdm/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Mon Apr 28 23:09:09 2014 @@ -605,15 +605,18 @@ } /* Check if CreateProcess got CREATE_NEW_PROCESS_GROUP */ - if ((Flags & CsrProcessCreateNewGroup) == 0) - { - /* Create new data */ + if (Flags & CsrProcessCreateNewGroup) + { + /* + * We create the process group leader of a new process group, therefore + * its process group ID and sequence number are its own ones. + */ CsrProcess->ProcessGroupId = HandleToUlong(ClientId->UniqueProcess); CsrProcess->ProcessGroupSequence = CsrProcess->SequenceNumber; } else { - /* Copy it from the current process */ + /* Inherit the process group ID and sequence number from the current process */ CsrProcess->ProcessGroupId = CurrentProcess->ProcessGroupId; CsrProcess->ProcessGroupSequence = CurrentProcess->ProcessGroupSequence; }

10 years, 8 months

[dquintana] 63040: [BROWSEUI] [SHELL32] * Make use of IID_PPV_ARG (part 2).

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Apr 28 21:59:02 2014 New Revision: 63040 URL: http://svn.reactos.org/svn/reactos?rev=63040&view=rev Log: [BROWSEUI] [SHELL32] * Make use of IID_PPV_ARG (part 2). Modified: branches/shell-experiments/dll/win32/browseui/bandproxy.cpp branches/shell-experiments/dll/win32/browseui/bandsite.cpp branches/shell-experiments/dll/win32/browseui/basebar.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp branches/shell-experiments/dll/win32/shell32/folders.cpp branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp branches/shell-experiments/dll/win32/shell32/folders/fs.cpp branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp branches/shell-experiments/dll/win32/shell32/shellole.cpp branches/shell-experiments/dll/win32/shell32/shlexec.cpp branches/shell-experiments/dll/win32/shell32/startmenu.cpp Modified: branches/shell-experiments/dll/win32/browseui/bandproxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/bandproxy.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/bandproxy.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -47,7 +47,7 @@ if (FAILED(hResult)) return hResult; hResult = serviceProvider->QueryService( - SID_IWebBrowserApp, IID_IWebBrowser2, reinterpret_cast<void **>(&webBrowser)); + SID_IWebBrowserApp, IID_PPV_ARG(IWebBrowser2, &webBrowser)); if (FAILED(hResult)) return hResult; *browser = webBrowser.Detach(); Modified: branches/shell-experiments/dll/win32/browseui/bandsite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/bandsite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/bandsite.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -283,16 +283,16 @@ if (punk == NULL || fRebarWindow == NULL) return E_FAIL; - hRet = punk->QueryInterface(IID_IDeskBand, reinterpret_cast<PVOID *>(&DeskBand)); + hRet = punk->QueryInterface(IID_PPV_ARG(IDeskBand, &DeskBand)); if (!SUCCEEDED(hRet) || DeskBand == NULL) goto Cleanup; - hRet = punk->QueryInterface(IID_IObjectWithSite, reinterpret_cast<PVOID *>(&ObjWithSite)); + hRet = punk->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ObjWithSite)); if (!SUCCEEDED(hRet) || ObjWithSite == NULL) goto Cleanup; - hRet = punk->QueryInterface(IID_IOleWindow, reinterpret_cast<PVOID *>(&OleWindow)); + hRet = punk->QueryInterface(IID_PPV_ARG(IOleWindow, &OleWindow)); if (!SUCCEEDED(hRet) || OleWindow == NULL) goto Cleanup; - hRet = punk->QueryInterface(IID_IWinEventHandler, reinterpret_cast<PVOID *>(&WndEvtHandler)); + hRet = punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &WndEvtHandler)); if (!SUCCEEDED(hRet) || WndEvtHandler == NULL) goto Cleanup; @@ -627,7 +627,7 @@ fOleWindow.Release(); - hRet = pUnk->QueryInterface(IID_IOleWindow, (PVOID *)&fOleWindow); + hRet = pUnk->QueryInterface(IID_PPV_ARG(IOleWindow, &fOleWindow)); if (FAILED(hRet)) return E_FAIL; Modified: branches/shell-experiments/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/basebar.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -430,21 +430,6 @@ LRESULT CBaseBar::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { -/* CComPtr<IOleWindow> oleWindow; - RECT clientRect; - HRESULT hResult; - - if (fClientWindow == NULL && fClient.p != NULL) - { - hResult = fClient->QueryInterface(IID_IOleWindow, (void **)&oleWindow); - hResult = oleWindow->GetWindow(&fClientWindow); - } - if (fClientWindow != NULL) - { - GetClientRect(&clientRect); - ::SetWindowPos(fClientWindow, NULL, clientRect.left, clientRect.top, clientRect.right - clientRect.left - GetSystemMetrics(SM_CXFRAME), - clientRect.bottom - clientRect.top, SWP_NOOWNERZORDER | SWP_NOZORDER); - }*/ return 0; } Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -621,8 +621,7 @@ #if 1 hResult = ::CreateBrandBand(IID_PPV_ARG(IUnknown, logoBar)); #else - hResult = CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, - reinterpret_cast<void **>(logoBar)); + hResult = CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, logoBar)); #endif if (FAILED(hResult)) return hResult; @@ -647,8 +646,7 @@ #if 1 hResult = ::CreateAddressBand(IID_PPV_ARG(IUnknown, toolsBar)); #else - hResult = CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, - reinterpret_cast<void **>(toolsBar)); + hResult = CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, toolsBar)); #endif if (FAILED(hResult)) return hResult; @@ -1403,8 +1401,7 @@ case gForwardCommandID: newMenu = CreatePopupMenu(); hResult = fSite->QueryInterface(IID_PPV_ARG(IServiceProvider, &serviceProvider)); - hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_IBrowserService, - reinterpret_cast<void **>(&browserService)); + hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->InsertMenuEntries(browserService, newMenu, 0, 1, 9, TLMENUF_FORE); hResult = browserService->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -743,11 +743,11 @@ return E_FAIL; #if 0 - hResult = CoCreateInstance(CLSID_InternetToolbar, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void **)&fClientBars[BIInternetToolbar].clientBar); + hResult = CoCreateInstance(CLSID_InternetToolbar, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &fClientBars[BIInternetToolbar].clientBar)); if (FAILED(hResult)) return hResult; #else - hResult = CreateInternetToolbar(IID_IUnknown, (void **)&fClientBars[BIInternetToolbar].clientBar); + hResult = CreateInternetToolbar(IID_PPV_ARG(IUnknown, &fClientBars[BIInternetToolbar].clientBar)); if (FAILED(hResult)) return hResult; #endif @@ -903,8 +903,7 @@ STRRET L108; HRESULT hResult; - hResult = SHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, - reinterpret_cast<void **>(&parentFolder), &childPIDL); + hResult = SHBindToFolderIDListParent(NULL, pidl, &IID_PPV_ARG(IShellFolder, &parentFolder), &childPIDL); hResult = parentFolder->GetDisplayNameOf(childPIDL, uFlags, &L108); StrRetToBufW(&L108, childPIDL, pszBuf, cchBuf); if (rgfInOut) @@ -1137,8 +1136,7 @@ hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar); if (FAILED(hResult)) return hResult; - hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, - reinterpret_cast<void **>(&newBand)); + hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &newBand)); if (FAILED(hResult)) return hResult; hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); @@ -1218,7 +1216,7 @@ m_PropSheet.phpage = m_psp; #if 0 - hResult = CoCreateInstance(CLSID_GlobalFolderSettings, NULL, CLSCTX_INPROC_SERVER, IID_IGlobalFolderSettings, (void **)&globalSettings); + hResult = CoCreateInstance(CLSID_GlobalFolderSettings, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IGlobalFolderSettings, &globalSettings)); if (FAILED(hResult)) return E_FAIL; hResult = globalSettings->Get(&shellState, sizeof(shellState)); @@ -1601,8 +1599,7 @@ { if (fCurrentShellView.p != NULL) { - hResult = fCurrentShellView->QueryInterface(IID_IOleCommandTarget, - reinterpret_cast<void **>(&commandTarget)); + hResult = fCurrentShellView->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &commandTarget)); if (SUCCEEDED(hResult) && commandTarget.p != NULL) return commandTarget->QueryStatus(NULL, 1, prgCmds, pCmdText); } Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -1185,7 +1185,7 @@ return hr; } - hr = lpSV->GetItemObject(SVGIO_SELECTION, IID_IDataObject, (LPVOID*)&pDataObj); + hr = lpSV->GetItemObject(SVGIO_SELECTION, IID_PPV_ARG(IDataObject, &pDataObj)); if (SUCCEEDED(hr)) { hr = OleSetClipboard(pDataObj); Modified: branches/shell-experiments/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -119,7 +119,7 @@ { CLSIDFromString(szValue, &clsid); - dwResult = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (LPVOID*)&Overlay); + dwResult = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellIconOverlayIdentifier, &Overlay)); if (dwResult == S_OK) { Handlers[NumIconOverlayHandlers] = Overlay; Modified: branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/admintools.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -303,11 +303,15 @@ if (IsEqualIID (riid, IID_IContextMenu)) { - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder *)this, NULL, 0, NULL, (IContextMenu **)&pObj); + IContextMenu * pCm = NULL; + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, 0, NULL, &pCm); + pObj = pCm; } else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) { - hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); + IDataObject * pDo = NULL; + hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, &pDo); + pObj = pDo; } else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) { @@ -325,13 +329,15 @@ } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { - hr = this->QueryInterface(IID_IDropTarget, (LPVOID *)&pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) { pidl = ILCombine (pidlRoot, apidl[0]); - hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*)&pObj); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, reinterpret_cast<LPVOID*>(&pObj)); SHFree (pidl); } else Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -651,9 +651,12 @@ else if (IsEqualIID (riid, IID_IDropTarget)) { /* only interested in attempting to bind to shell folders, not files, semicolon intentionate */ - if (cidl == 1 && SUCCEEDED(hr = this->_GetDropTarget(apidl[0], (LPVOID*)&pObj))); - else - hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj); + if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) + { + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; + } } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) @@ -1474,7 +1477,7 @@ if (SUCCEEDED(hr)) { IDropTarget *pDT; - hr = this->BindToObject(pidl, NULL, IID_IDropTarget, (LPVOID*)&pDT); + hr = this->BindToObject(pidl, NULL, IID_PPV_ARG(IDropTarget, &pDT)); CoTaskMemFree(pidl); if (SUCCEEDED(hr)) SHSimulateDrop(pDT, pDataObject, dwKeyState, NULL, pdwEffect); @@ -1515,7 +1518,7 @@ if (SUCCEEDED(hr)) { IShellFolder *psf; - hr = this->BindToObject(pidlNext, NULL, IID_IShellFolder, (LPVOID*)&psf); + hr = this->BindToObject(pidlNext, NULL, IID_PPV_ARG(IShellFolder, &psf)); CoTaskMemFree(pidlNext); if (SUCCEEDED(hr)) { Modified: branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/fonts.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -422,7 +422,9 @@ } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { - hr = this->QueryInterface(IID_IDropTarget, (LPVOID *) & pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else hr = E_NOINTERFACE; Modified: branches/shell-experiments/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -474,11 +474,16 @@ { *ppvOut = NULL; - if (IsEqualIID (riid, IID_IContextMenu) && (cidl >= 1)) - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)this, NULL, 0, NULL, (IContextMenu**)&pObj); + if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) + { + IContextMenu * pCm = NULL; + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, 0, NULL, &pCm); + pObj = pCm; + } else if (IsEqualIID (riid, IID_IDataObject)) { - if (cidl >= 1) { + if (cidl >= 1) + { hr = IDataObject_Constructor (hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); } else @@ -503,9 +508,12 @@ else if (IsEqualIID (riid, IID_IDropTarget)) { /* only interested in attempting to bind to shell folders, not files (except exe), so if we fail, rebind to root */ - if (cidl == 1 && SUCCEEDED(hr = this->_GetDropTarget(apidl[0], (LPVOID*)&pObj))); - else - hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj); + if (cidl != 1 || FAILED(hr = this->_GetDropTarget(apidl[0], (LPVOID*) &pObj))) + { + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; + } } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) @@ -1529,7 +1537,7 @@ } else { - hr = psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfFrom); + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom)); if (FAILED(hr)) { ERR("no IShellFolder\n"); @@ -1549,7 +1557,7 @@ WCHAR wszPath[MAX_PATH]; WCHAR wszTarget[MAX_PATH]; - hr = this->QueryInterface(IID_IPersistFolder2, (LPVOID *) &ppf2); + hr = this->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); if (SUCCEEDED(hr)) { hr = ppf2->GetCurFolder(&targetpidl); @@ -1691,7 +1699,7 @@ return E_FAIL; } - hr = this->QueryInterface(IID_IPersistFolder2, (LPVOID *) &ppf2); + hr = this->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); if (SUCCEEDED(hr)) { hr = ppf2->GetCurFolder(&targetpidl); Modified: branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/mycomp.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -462,8 +462,9 @@ } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { - hr = this->QueryInterface(IID_IDropTarget, - (LPVOID *) &pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) Modified: branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -115,7 +115,7 @@ if (SUCCEEDED(hr)) { - hr = psfDesktop->BindToObject(pidl, NULL, IID_IDropTarget, (LPVOID*) &mFSDropTarget); + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IDropTarget, &mFSDropTarget)); CoTaskMemFree(pidl); if (FAILED(hr)) ERR("Error Binding"); @@ -388,12 +388,15 @@ if (IsEqualIID (riid, IID_IContextMenu)) { - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder *)this, NULL, 0, NULL, (IContextMenu**)&pObj); + IContextMenu * pCm = NULL; + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, 0, NULL, &pCm); + pObj = pCm; } else if (IsEqualIID (riid, IID_IDataObject) && (cidl >= 1)) { - hr = IDataObject_Constructor( hwndOwner, - pidlRoot, apidl, cidl, (IDataObject **)&pObj); + IDataObject * pDo = NULL; + hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, &pDo); + pObj = pDo; } else if (IsEqualIID (riid, IID_IExtractIconA) && (cidl == 1)) { @@ -411,7 +414,9 @@ } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { - hr = this->QueryInterface (IID_IDropTarget, (LPVOID *)&pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else if ((IsEqualIID(riid, IID_IShellLinkW) || IsEqualIID(riid, IID_IShellLinkA)) && (cidl == 1)) Modified: branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/netplaces.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -244,11 +244,15 @@ if (IsEqualIID(riid, IID_IContextMenu) && (cidl >= 1)) { - hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)this, NULL, 0, NULL, (IContextMenu**)&pObj); + IContextMenu * pCm = NULL; + hr = CDefFolderMenu_Create2(pidlRoot, hwndOwner, cidl, apidl, static_cast<IShellFolder*>(this), NULL, 0, NULL, &pCm); + pObj = pCm; } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) { - hr = IDataObject_Constructor (hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); + IDataObject * pDo = NULL; + hr = IDataObject_Constructor (hwndOwner, pidlRoot, apidl, cidl, &pDo); + pObj = pDo; } else if (IsEqualIID(riid, IID_IExtractIconA) && (cidl == 1)) { @@ -266,7 +270,9 @@ } else if (IsEqualIID(riid, IID_IDropTarget) && (cidl >= 1)) { - hr = this->QueryInterface(IID_IDropTarget, (LPVOID *) & pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else hr = E_NOINTERFACE; Modified: branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -622,7 +622,9 @@ } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl == 1)) { - hr = this->QueryInterface(IID_IDropTarget, (LPVOID *) & pObj); + IDropTarget * pDt = NULL; + hr = this->QueryInterface(IID_PPV_ARG(IDropTarget, &pDt)); + pObj = pDt; } else hr = E_NOINTERFACE; @@ -1531,7 +1533,7 @@ } else { - hr = psfDesktop->BindToObject(pidl, NULL, IID_IShellFolder, (LPVOID*)&psfFrom); + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfFrom)); if (FAILED(hr)) { ERR("no IShellFolder\n"); Modified: branches/shell-experiments/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellole.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -146,7 +146,7 @@ FreeLibrary( hLibrary ); hres = E_ACCESSDENIED; goto end; - } else if (! SUCCEEDED(hres = DllGetClassObject(*myclsid, IID_IClassFactory, (LPVOID*)&pcf))) { + } else if (! SUCCEEDED(hres = DllGetClassObject(*myclsid, IID_PPV_ARG(IClassFactory, &pcf)))) { TRACE("GetClassObject failed 0x%08x\n", hres); goto end; } Modified: branches/shell-experiments/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlexec.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -1252,7 +1252,7 @@ TRACE("%p %p\n", obj, sei); - r = obj->QueryInterface(IID_IContextMenu, (LPVOID*) &cm); + r = obj->QueryInterface(IID_PPV_ARG(IContextMenu, &cm)); if (FAILED(r)) return r; @@ -1342,7 +1342,7 @@ if (FAILED(r)) goto end; - r = obj->QueryInterface(IID_IObjectWithSite, (LPVOID*) &ows); + r = obj->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ows)); if (FAILED(r)) goto end; Modified: branches/shell-experiments/dll/win32/shell32/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/startmenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/startmenu.cpp [iso-8859-1] Mon Apr 28 21:59:02 2014 @@ -117,7 +117,7 @@ if (pBandSiteObj == NULL) return E_OUTOFMEMORY; - hr = pBandSiteObj->QueryInterface(IID_IBandSite, (VOID**)&m_pBandSite); + hr = pBandSiteObj->QueryInterface(IID_PPV_ARG(IBandSite, &m_pBandSite)); if (FAILED(hr)) return NULL;

10 years, 8 months

[aandrejevic] 63039: [BASESRV] Don't update the state of the old DOS records if the DOS program executed another program.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Apr 28 20:51:59 2014 New Revision: 63039 URL: http://svn.reactos.org/svn/reactos?rev=63039&view=rev Log: [BASESRV] Don't update the state of the old DOS records if the DOS program executed another program. Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Mon Apr 28 20:51:59 2014 @@ -850,18 +850,20 @@ GetNextVdmCommandRequest->iTask = ConsoleRecord->SessionId; GetNextVdmCommandRequest->WaitObjectForVDM = NULL; - // HACK: I'm not sure if this should happen... - for (i = ConsoleRecord->DosListHead.Flink; i != &ConsoleRecord->DosListHead; i = i->Flink) - { - DosRecord = CONTAINING_RECORD(i, VDM_DOS_RECORD, Entry); - if (DosRecord->State == VDM_NOT_READY) + if (!(GetNextVdmCommandRequest->VDMState & VDM_NOT_READY)) + { + for (i = ConsoleRecord->DosListHead.Flink; i != &ConsoleRecord->DosListHead; i = i->Flink) { - /* If NTVDM is asking for a new command, it means these are done */ - DosRecord->State = VDM_READY; - - NtSetEvent(DosRecord->ServerEvent, NULL); - NtClose(DosRecord->ServerEvent); - DosRecord->ServerEvent = NULL; + DosRecord = CONTAINING_RECORD(i, VDM_DOS_RECORD, Entry); + if (DosRecord->State == VDM_NOT_READY) + { + /* If NTVDM is asking for a new command, it means these are done */ + DosRecord->State = VDM_READY; + + NtSetEvent(DosRecord->ServerEvent, NULL); + NtClose(DosRecord->ServerEvent); + DosRecord->ServerEvent = NULL; + } } }

10 years, 8 months

[pschweitzer] 63038: [FASTFAT] Fix typo.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Apr 28 20:33:57 2014 New Revision: 63038 URL: http://svn.reactos.org/svn/reactos?rev=63038&view=rev Log: [FASTFAT] Fix typo. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Mon Apr 28 20:33:57 2014 @@ -617,7 +617,7 @@ /* VfatOpenFile() doesn't like our name ends with \, so chomp it if there's one */ if (RelatedFileObject->FileName.Buffer[RelatedFileObject->FileName.Length / sizeof(WCHAR) - 1] == L'\\') { - Chomp = FALSE; + Chomp = TRUE; RelatedFileObject->FileName.Length -= sizeof(WCHAR); }

10 years, 8 months

[hbelusca] 63037: [CMD] GetConsoleAliasesLength returns a DWORD (and the len variable *is* a DWORD). Do not check for negative values. Patch by André Guibert de Bruet. CORE-7964 #resolve #comment F...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Apr 28 20:12:07 2014 New Revision: 63037 URL: http://svn.reactos.org/svn/reactos?rev=63037&view=rev Log: [CMD] GetConsoleAliasesLength returns a DWORD (and the len variable *is* a DWORD). Do not check for negative values. Patch by André Guibert de Bruet. CORE-7964 #resolve #comment Fixed in revision 63037, cheers! Modified: trunk/reactos/base/shell/cmd/alias.c Modified: trunk/reactos/base/shell/cmd/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/alias.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/alias.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/alias.c [iso-8859-1] Mon Apr 28 20:12:07 2014 @@ -58,7 +58,7 @@ DWORD len; len = GetConsoleAliasesLength(_T("cmd.exe")); - if (len <= 0) + if (len == 0) return; /* allocate memory for an extra \0 char to make parsing easier */

10 years, 8 months

[hbelusca] 63036: [CARDLIB] Use the proper Highlight pen to highlight the cards (for any cards game using the cardlib library). Patch by Victor Martinez Calvo. CORE-8118 #resolve #comment Committed...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Apr 28 20:00:02 2014 New Revision: 63036 URL: http://svn.reactos.org/svn/reactos?rev=63036&view=rev Log: [CARDLIB] Use the proper Highlight pen to highlight the cards (for any cards game using the cardlib library). Patch by Victor Martinez Calvo. CORE-8118 #resolve #comment Committed in revision 63036, thanks! Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp Modified: trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/cardlib/cardb… ============================================================================== --- trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/cardlib/cardbutton.cpp [iso-8859-1] Mon Apr 28 20:00:02 2014 @@ -75,7 +75,7 @@ if(fNormal) hOld = SelectObject(hdc, hhi); else - hOld = SelectObject(hdc, hhi); + hOld = SelectObject(hdc, hsh); MoveToEx(hdc, x, y+height, 0); LineTo(hdc, x, y);

10 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2014