Ros-diffs May 2016

ros-diffs@reactos.org

18 participants
260 discussions

[cwittich] 71340: [REGSRV32] accept '-' as command line delimiter symbol as well
by cwittich＠svn.reactos.org 16 May '16

16 May '16

Author: cwittich Date: Mon May 16 07:17:45 2016 New Revision: 71340 URL: http://svn.reactos.org/svn/reactos?rev=71340&view=rev Log: [REGSRV32] accept '-' as command line delimiter symbol as well Modified: trunk/reactos/base/system/regsvr32/regsvr32.c Modified: trunk/reactos/base/system/regsvr32/regsvr32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… ============================================================================== --- trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/regsvr32.c [iso-8859-1] Mon May 16 07:17:45 2016 @@ -292,7 +292,7 @@ // Find all arguments starting with a slash (/) for (i = 1; i < argc; i++) { - if (*argv[i] == _T('/')) { + if (*argv[i] == _T('/') || *argv[i] == '-') { switch (argv[i][1]) { case _T('u'): case _T('U'):

1 0

[hbelusca] 71339: [NTOS][NDK][RTL]: Move the SEM_xxx flags and their corresponding RTL flags around so that they can be accessed in kernel code. I'll need them soon.
by hbelusca＠svn.reactos.org 15 May '16

15 May '16

Author: hbelusca Date: Sun May 15 22:40:34 2016 New Revision: 71339 URL: http://svn.reactos.org/svn/reactos?rev=71339&view=rev Log: [NTOS][NDK][RTL]: Move the SEM_xxx flags and their corresponding RTL flags around so that they can be accessed in kernel code. I'll need them soon. Modified: trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/sdk/include/ndk/rtltypes.h trunk/reactos/sdk/lib/rtl/error.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=71… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sun May 15 22:40:34 2016 @@ -13,9 +13,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -/* FIXME: From winbase.h... what to do? */ -#define SEM_NOALIGNMENTFAULTEXCEPT 0x04 /* Debugging Level */ ULONG PspTraceLevel = 0; Modified: trunk/reactos/sdk/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtltypes.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtltypes.h [iso-8859-1] Sun May 15 22:40:34 2016 @@ -61,6 +61,19 @@ // End of Exception List // #define EXCEPTION_CHAIN_END ((PEXCEPTION_REGISTRATION_RECORD)-1) + +// +// Thread Error Mode Flags +// +/* Also defined in psdk/winbase.h */ +#define SEM_FAILCRITICALERRORS 0x0001 +#define SEM_NOGPFAULTERRORBOX 0x0002 +#define SEM_NOALIGNMENTFAULTEXCEPT 0x0004 +#define SEM_NOOPENFILEERRORBOX 0x8000 + +#define RTL_SEM_FAILCRITICALERRORS (SEM_FAILCRITICALERRORS << 4) +#define RTL_SEM_NOGPFAULTERRORBOX (SEM_NOGPFAULTERRORBOX << 4) +#define RTL_SEM_NOALIGNMENTFAULTEXCEPT (SEM_NOALIGNMENTFAULTEXCEPT << 4) // // Range and Range List Flags Modified: trunk/reactos/sdk/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/error.c?rev=71… ============================================================================== --- trunk/reactos/sdk/lib/rtl/error.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/error.c [iso-8859-1] Sun May 15 22:40:34 2016 @@ -24,10 +24,6 @@ #define NDEBUG #include <debug.h> - -#define RTL_SEM_FAILCRITICALERRORS (SEM_FAILCRITICALERRORS << 4) -#define RTL_SEM_NOGPFAULTERRORBOX (SEM_NOGPFAULTERRORBOX << 4) -#define RTL_SEM_NOALIGNMENTFAULTEXCEPT (SEM_NOALIGNMENTFAULTEXCEPT << 4) struct error_table {

1 0

[hbelusca] 71338: [NTOS][USERSRV]: Both hard-error message box options "OptionOkNoWait" and "OptionCancelTryContinue" are valid!
by hbelusca＠svn.reactos.org 15 May '16

15 May '16

Author: hbelusca Date: Sun May 15 22:32:17 2016 New Revision: 71338 URL: http://svn.reactos.org/svn/reactos?rev=71338&view=rev Log: [NTOS][USERSRV]: Both hard-error message box options "OptionOkNoWait" and "OptionCancelTryContinue" are valid! Modified: trunk/reactos/ntoskrnl/ex/harderr.c trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Sun May 15 22:32:17 2016 @@ -552,6 +552,8 @@ case OptionYesNo: case OptionYesNoCancel: case OptionShutdownSystem: + case OptionOkNoWait: + case OptionCancelTryContinue: break; /* Anything else is invalid */ Modified: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] Sun May 15 22:32:17 2016 @@ -473,10 +473,23 @@ case OptionShutdownSystem: Type = MB_RETRYCANCEL; // FIXME??? break; + case OptionOkNoWait: + /* + * This gives a balloon notification. + * See rostests/kmtests/ntos_ex/ExHardError.c + */ + Type = MB_YESNO; // FIXME! + break; + case OptionCancelTryContinue: + Type = MB_CANCELTRYCONTINUE; + break; /* Anything else is invalid */ default: + { + DPRINT1("Unknown ValidResponseOptions = %d\n", ValidResponseOptions); return ResponseNotHandled; + } } /* Set severity */

1 0

[hbelusca] 71337: [USERSRV]: Code formatting.
by hbelusca＠svn.reactos.org 15 May '16

15 May '16

Author: hbelusca Date: Sun May 15 22:29:23 2016 New Revision: 71337 URL: http://svn.reactos.org/svn/reactos?rev=71337&view=rev Log: [USERSRV]: Code formatting. Modified: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c Modified: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] Sun May 15 22:29:23 2016 @@ -104,7 +104,7 @@ return Status; } - ClientFileNameU->Length = wcslen(ClientFileNameU->Buffer)*sizeof(wchar_t); + ClientFileNameU->Length = wcslen(ClientFileNameU->Buffer) * sizeof(WCHAR); DPRINT("ClientFileNameU=\'%wZ\'\n", &ClientFileNameU); return STATUS_SUCCESS; @@ -160,7 +160,6 @@ &ParamStringU, sizeof(ParamStringU), NULL); - if (!NT_SUCCESS(Status)) break; @@ -271,7 +270,6 @@ LANG_NEUTRAL, Message->Status, &MessageResource); - if (NT_SUCCESS(Status)) { if (MessageResource->Flags) @@ -347,8 +345,10 @@ { Parameters[0] = Parameters[1]; Parameters[1] = Parameters[3]; - if (Parameters[2]) Parameters[2] = (ULONG_PTR)L"written"; - else Parameters[2] = (ULONG_PTR)L"read"; + if (Parameters[2]) + Parameters[2] = (ULONG_PTR)L"written"; + else + Parameters[2] = (ULONG_PTR)L"read"; MessageResource = NULL; } else if (ExceptionCode == STATUS_IN_PAGE_ERROR) @@ -373,7 +373,6 @@ LANG_NEUTRAL, ExceptionCode, &MessageResource); - if (NT_SUCCESS(Status)) { if (FormatA.Buffer) RtlFreeUnicodeString(&FormatU); @@ -453,30 +452,31 @@ /* Set the message box type */ switch (ValidResponseOptions) { - case OptionAbortRetryIgnore: - Type = MB_ABORTRETRYIGNORE; - break; - case OptionOk: - Type = MB_OK; - break; - case OptionOkCancel: - Type = MB_OKCANCEL; - break; - case OptionRetryCancel: - Type = MB_RETRYCANCEL; - break; - case OptionYesNo: - Type = MB_YESNO; - break; - case OptionYesNoCancel: - Type = MB_YESNOCANCEL; - break; - case OptionShutdownSystem: - Type = MB_RETRYCANCEL; // FIXME??? - break; + case OptionAbortRetryIgnore: + Type = MB_ABORTRETRYIGNORE; + break; + case OptionOk: + Type = MB_OK; + break; + case OptionOkCancel: + Type = MB_OKCANCEL; + break; + case OptionRetryCancel: + Type = MB_RETRYCANCEL; + break; + case OptionYesNo: + Type = MB_YESNO; + break; + case OptionYesNoCancel: + Type = MB_YESNOCANCEL; + break; + case OptionShutdownSystem: + Type = MB_RETRYCANCEL; // FIXME??? + break; + /* Anything else is invalid */ - default: - return ResponseNotHandled; + default: + return ResponseNotHandled; } /* Set severity */ @@ -515,9 +515,6 @@ IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG Message) { -#if DBG - PCSR_PROCESS ProcessData = ThreadData->Process; -#endif ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING TextU, CaptionU; @@ -525,8 +522,9 @@ HANDLE hProcess; ULONG Size; + ASSERT(ThreadData->Process != NULL); + /* Default to not handled */ - ASSERT(ProcessData != NULL); Message->Response = ResponseNotHandled; /* Make sure we don't have too many parameters */ @@ -541,7 +539,6 @@ PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, &ObjectAttributes, &Message->h.ClientId); - if (!NT_SUCCESS(Status)) { DPRINT1("NtOpenProcess failed with code: %lx\n", Status);

1 0

[hbelusca] 71336: [NTOS]: Remove hardcoded constants; fix a comment; move some code around to reduce the level of code indentation.
by hbelusca＠svn.reactos.org 15 May '16

15 May '16

Author: hbelusca Date: Sun May 15 22:23:14 2016 New Revision: 71336 URL: http://svn.reactos.org/svn/reactos?rev=71336&view=rev Log: [NTOS]: Remove hardcoded constants; fix a comment; move some code around to reduce the level of code indentation. Modified: trunk/reactos/ntoskrnl/ex/harderr.c Modified: trunk/reactos/ntoskrnl/ex/harderr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Sun May 15 22:23:14 2016 @@ -148,7 +148,7 @@ if (!Thread->HardErrorsAreDisabled) { /* Check if we can't do errors anymore, and this is serious */ - if ((!ExReadyForErrors) && (NT_ERROR(ErrorStatus))) + if (!ExReadyForErrors && NT_ERROR(ErrorStatus)) { /* Use the system handler */ ExpSystemErrorHandler(ErrorStatus, @@ -162,7 +162,7 @@ /* Enable hard error processing if it is enabled for the process * or if the exception status forces it */ if ((Process->DefaultHardErrorProcessing & 1) || - (ErrorStatus & 0x10000000)) + (ErrorStatus & HARDERROR_OVERRIDE_ERRORMODE)) { /* Check if we have an exception port */ if (Process->ExceptionPort) @@ -186,80 +186,78 @@ if (Thread->HardErrorsAreDisabled) PortHandle = NULL; /* Now check if we have a port */ - if (PortHandle) - { - /* Check if this is the default process */ - if (Process == ExpDefaultErrorPortProcess) - { - /* We can't handle the error, check if this is critical */ - if (NT_ERROR(ErrorStatus)) - { - /* It is, invoke the system handler */ - ExpSystemErrorHandler(ErrorStatus, - NumberOfParameters, - UnicodeStringParameterMask, - Parameters, - (PreviousMode != KernelMode) ? TRUE: FALSE); - - /* If we survived, return to caller */ - *Response = ResponseReturnToCaller; - return STATUS_SUCCESS; - } - } - - /* Setup the LPC Message */ - Message->h.u1.Length = (sizeof(HARDERROR_MSG) << 16) | - (sizeof(HARDERROR_MSG) - sizeof(PORT_MESSAGE)); - Message->h.u2.ZeroInit = 0; - Message->h.u2.s2.Type = LPC_ERROR_EVENT; - Message->Status = ErrorStatus &~ 0x10000000; - Message->ValidResponseOptions = ValidResponseOptions; - Message->UnicodeStringParameterMask = UnicodeStringParameterMask; - Message->NumberOfParameters = NumberOfParameters; - KeQuerySystemTime(&Message->ErrorTime); - - /* Copy the parameters */ - if (Parameters) RtlMoveMemory(&Message->Parameters, - Parameters, - sizeof(ULONG_PTR) * NumberOfParameters); - - /* Send the LPC Message */ - Status = LpcRequestWaitReplyPort(PortHandle, - (PVOID)Message, - (PVOID)Message); - if (NT_SUCCESS(Status)) - { - /* Check what kind of response we got */ - if ((Message->Response != ResponseReturnToCaller) && - (Message->Response != ResponseNotHandled) && - (Message->Response != ResponseAbort) && - (Message->Response != ResponseCancel) && - (Message->Response != ResponseIgnore) && - (Message->Response != ResponseNo) && - (Message->Response != ResponseOk) && - (Message->Response != ResponseRetry) && - (Message->Response != ResponseYes) && - (Message->Response != ResponseTryAgain) && - (Message->Response != ResponseContinue)) - { - /* Reset to a default one */ - Message->Response = ResponseReturnToCaller; - } - - /* Set the response */ - *Response = Message->Response; - } - else - { - /* Set the response */ + if (PortHandle == NULL) + { + /* Just return to caller */ + *Response = ResponseReturnToCaller; + return STATUS_SUCCESS; + } + + /* Check if this is the default process */ + if (Process == ExpDefaultErrorPortProcess) + { + /* We can't handle the error, check if this is critical */ + if (NT_ERROR(ErrorStatus)) + { + /* It is, invoke the system handler */ + ExpSystemErrorHandler(ErrorStatus, + NumberOfParameters, + UnicodeStringParameterMask, + Parameters, + (PreviousMode != KernelMode) ? TRUE: FALSE); + + /* If we survived, return to caller */ *Response = ResponseReturnToCaller; - } + return STATUS_SUCCESS; + } + } + + /* Setup the LPC Message */ + Message->h.u1.Length = (sizeof(HARDERROR_MSG) << 16) | + (sizeof(HARDERROR_MSG) - sizeof(PORT_MESSAGE)); + Message->h.u2.ZeroInit = 0; + Message->h.u2.s2.Type = LPC_ERROR_EVENT; + Message->Status = ErrorStatus & ~HARDERROR_OVERRIDE_ERRORMODE; + Message->ValidResponseOptions = ValidResponseOptions; + Message->UnicodeStringParameterMask = UnicodeStringParameterMask; + Message->NumberOfParameters = NumberOfParameters; + KeQuerySystemTime(&Message->ErrorTime); + + /* Copy the parameters */ + if (Parameters) RtlMoveMemory(&Message->Parameters, + Parameters, + sizeof(ULONG_PTR) * NumberOfParameters); + + /* Send the LPC Message */ + Status = LpcRequestWaitReplyPort(PortHandle, + (PPORT_MESSAGE)Message, + (PPORT_MESSAGE)Message); + if (NT_SUCCESS(Status)) + { + /* Check what kind of response we got */ + if ((Message->Response != ResponseReturnToCaller) && + (Message->Response != ResponseNotHandled) && + (Message->Response != ResponseAbort) && + (Message->Response != ResponseCancel) && + (Message->Response != ResponseIgnore) && + (Message->Response != ResponseNo) && + (Message->Response != ResponseOk) && + (Message->Response != ResponseRetry) && + (Message->Response != ResponseYes) && + (Message->Response != ResponseTryAgain) && + (Message->Response != ResponseContinue)) + { + /* Reset to a default one */ + Message->Response = ResponseReturnToCaller; + } + + /* Set the response */ + *Response = Message->Response; } else { - /* Set defaults */ + /* Set the response */ *Response = ResponseReturnToCaller; - Status = STATUS_SUCCESS; } /* Return status */ @@ -687,7 +685,7 @@ * @implemented * * NtSetDefaultHardErrorPort is typically called only once. After call, - * kernel set BOOLEAN flag named _ExReadyForErrors to TRUE, and all other + * kernel set BOOLEAN flag named ExReadyForErrors to TRUE, and all other * tries to change default port are broken with STATUS_UNSUCCESSFUL error code * See: http://www.windowsitlibrary.com/Content/356/08/2.html * http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Error…

1 0

[pschweitzer] 71335: [DHCPD] Plug leaks
by pschweitzer＠svn.reactos.org 15 May '16

15 May '16

Author: pschweitzer Date: Sun May 15 17:45:10 2016 New Revision: 71335 URL: http://svn.reactos.org/svn/reactos?rev=71335&view=rev Log: [DHCPD] Plug leaks Modified: trunk/rosapps/applications/net/dhcpd/src/display/display.c trunk/rosapps/applications/net/dhcpd/src/parsing/parser.c Modified: trunk/rosapps/applications/net/dhcpd/src/display/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/dhcpd/src… ============================================================================== --- trunk/rosapps/applications/net/dhcpd/src/display/display.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/dhcpd/src/display/display.c [iso-8859-1] Sun May 15 17:45:10 2016 @@ -56,6 +56,7 @@ break; } fprintf( stdout, "Message Type: %s \n", mtype ); + free( mtype ); return 0; } Modified: trunk/rosapps/applications/net/dhcpd/src/parsing/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/dhcpd/src… ============================================================================== --- trunk/rosapps/applications/net/dhcpd/src/parsing/parser.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/dhcpd/src/parsing/parser.c [iso-8859-1] Sun May 15 17:45:10 2016 @@ -209,6 +209,7 @@ if( find_lease( &dhcpl, dhcpm->xid, dhcpm->chaddr ) < 0 ) { fprintf( stdout, "No free leases! \n" ); + free( name ); return -1; } dhcpm->op = BOOTREPLY; @@ -281,6 +282,7 @@ sprintf( name, "%u.%u.%u.%u", (dhcpm->ciaddr &0xFF), ((dhcpm->ciaddr>>8)&0xFF), ((dhcpm->ciaddr>>16)&0xFF), ((dhcpm->ciaddr>>24)&0xFF)); display_dhcp_packet( dhcpm, dhcpo ); write_packet( dhcpm, name ); + free( name ); return -1; } dhcpm->siaddr = dhcpl.siaddr; @@ -339,6 +341,7 @@ display_dhcp_packet( dhcpm, dhcpo ); write_packet( dhcpm, name ); fprintf( stdout, "process_dhcp_packet [end]!\n"); + free( name ); return 0; }

1 0

[mjansen] 71334: [COM_APITEST] Add ICurrentWorkingDirectory for CORE-9281
by mjansen＠svn.reactos.org 15 May '16

15 May '16

Author: mjansen Date: Sun May 15 14:45:01 2016 New Revision: 71334 URL: http://svn.reactos.org/svn/reactos?rev=71334&view=rev Log: [COM_APITEST] Add ICurrentWorkingDirectory for CORE-9281 Modified: trunk/rostests/apitests/com/browseui.c trunk/rostests/apitests/com/com_apitest.c Modified: trunk/rostests/apitests/com/browseui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r… ============================================================================== --- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Sun May 15 14:45:01 2016 @@ -51,6 +51,7 @@ { 0x0, &IID_IUnknown }, { 0x4, &IID_IACList2 }, { 0x4, &IID_IACList }, + { 0x8, &IID_ICurrentWorkingDirectory }, { 0xc, &IID_IShellService }, { 0x10, &IID_IPersistFolder }, } Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sun May 15 14:45:01 2016 @@ -97,6 +97,7 @@ { ID_NAME(IID_IContinue) }, { ID_NAME(IID_ICopyHookA), TRUE }, { ID_NAME(IID_ICopyHookW), TRUE }, + { ID_NAME(IID_ICurrentWorkingDirectory), TRUE }, { ID_NAME(IID_ICustomizeInfoTip) }, { ID_NAME(IID_IDVGetEnum), TRUE }, { ID_NAME(IID_IDataObject) },

1 0

[mjansen] 71333: [PSDK] Add missing ICurrentWorkingDirectory definition. CORE-9281
by mjansen＠svn.reactos.org 15 May '16

15 May '16

Author: mjansen Date: Sun May 15 10:31:15 2016 New Revision: 71333 URL: http://svn.reactos.org/svn/reactos?rev=71333&view=rev Log: [PSDK] Add missing ICurrentWorkingDirectory definition. CORE-9281 Modified: trunk/reactos/sdk/include/psdk/shlguid.h trunk/reactos/sdk/include/psdk/shlobj.h Modified: trunk/reactos/sdk/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/shlguid.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/shlguid.h [iso-8859-1] Sun May 15 10:31:15 2016 @@ -84,6 +84,7 @@ DEFINE_GUID(IID_IACList, 0x77A130B0,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); DEFINE_GUID(IID_IACList2, 0x470141A0,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); DEFINE_GUID(IID_IObjMgr, 0x00BB2761,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); +DEFINE_GUID(IID_ICurrentWorkingDirectory, 0x91956D21,0x9276,0x11D1,0x92,0x1A,0x00,0x60,0x97,0xDF,0x5B,0xD4); DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); #define SID_SProgressUI CLSID_ProgressDialog Modified: trunk/reactos/sdk/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/shlobj.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/shlobj.h [iso-8859-1] Sun May 15 10:31:15 2016 @@ -644,6 +644,30 @@ #define IObjMgr_Remove(p,a) (p)->lpVtbl->Remove(p,a) #endif +/* ICurrentWorkingDirectory interface */ +#define INTERFACE ICurrentWorkingDirectory +DECLARE_INTERFACE_(ICurrentWorkingDirectory,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + /*** ICurrentWorkingDirectory methods ***/ + STDMETHOD(GetDirectory)(THIS_ _Out_writes_(cchSize) PWSTR pwzPath, DWORD cchSize); + STDMETHOD(SetDirectory)(THIS_ _In_ PCWSTR pwzPath) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define ICurrentWorkingDirectory_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ICurrentWorkingDirectory_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ICurrentWorkingDirectory_Release(p) (p)->lpVtbl->Release(p) +/*** ICurrentWorkingDirectory methods ***/ +#define ICurrentWorkingDirectory_GetDirectory(p,a,b) (p)->lpVtbl->GetDirectory(p,a,b) +#define ICurrentWorkingDirectory_SetDirectory(p,a) (p)->lpVtbl->SetDirectory(p,a) +#endif + /* IACList interface */ #define INTERFACE IACList DECLARE_INTERFACE_(IACList,IUnknown)

1 0

[mjansen] 71332: [SHELL] Addendum to r71328, correct one german resource id.
by mjansen＠svn.reactos.org 15 May '16

15 May '16

Author: mjansen Date: Sun May 15 10:25:47 2016 New Revision: 71332 URL: http://svn.reactos.org/svn/reactos?rev=71332&view=rev Log: [SHELL] Addendum to r71328, correct one german resource id. Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Sun May 15 10:25:47 2016 @@ -413,7 +413,7 @@ AUTORADIOBUTTON "Jeden Ordner im &selben Fenster Ã¶ffnen", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 150, 10, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "&Jeden Ordner im eigenen Fenster Ã¶ffnen", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 150, 10 GROUPBOX "Markieren von Elementen", -1, 7, 110, 249, 60 - CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 + CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 AUTORADIOBUTTON "&Ãffnen durch &einfachen Klick (Markieren durch zeigen)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP AUTORADIOBUTTON "Symbolbeschriftungen wie im Br&owser unterstreichen", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10 AUTORADIOBUTTON "Symbolbeschriftungen nur beim Zeigen &unterstreichen", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10

1 0

[hbelusca] 71331: [NTOS][MUP]: Use the correct constant for the PriorityBoost parameter in the IoCompleteRequest calls.
by hbelusca＠svn.reactos.org 15 May '16

15 May '16

Author: hbelusca Date: Sun May 15 00:18:44 2016 New Revision: 71331 URL: http://svn.reactos.org/svn/reactos?rev=71331&view=rev Log: [NTOS][MUP]: Use the correct constant for the PriorityBoost parameter in the IoCompleteRequest calls. Modified: trunk/reactos/drivers/filesystems/mup/mup.c trunk/reactos/ntoskrnl/fsrtl/notify.c Modified: trunk/reactos/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/mup/mu… ============================================================================== --- trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/mup/mup.c [iso-8859-1] Sun May 15 00:18:44 2016 @@ -1715,7 +1715,7 @@ Complete: /* In finally, complete the IRP for real! */ MasterQueryContext->Irp->IoStatus.Status = Status; - IofCompleteRequest(MasterQueryContext->Irp, IO_DISK_INCREMENT); + IoCompleteRequest(MasterQueryContext->Irp, IO_DISK_INCREMENT); MasterQueryContext->Irp = NULL; MupFreeMasterQueryContext(MasterQueryContext); Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Sun May 15 00:18:44 2016 @@ -191,7 +191,7 @@ /* Set appropriate status and complete */ Irp->IoStatus.Status = STATUS_CANCELLED; - IofCompleteRequest(Irp, EVENT_INCREMENT); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); /* If that notification isn't referenced any longer, drop it */ if (!InterlockedDecrement((PLONG)&(NotifyChange->ReferenceCount))) @@ -384,7 +384,7 @@ Completion: IoMarkIrpPending(Irp); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, EVENT_INCREMENT); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); } /* @@ -794,7 +794,7 @@ { IoMarkIrpPending(NotifyIrp); NotifyIrp->IoStatus.Status = STATUS_NOTIFY_CLEANUP; - IoCompleteRequest(NotifyIrp, EVENT_INCREMENT); + IoCompleteRequest(NotifyIrp, IO_DISK_INCREMENT); _SEH2_LEAVE; } @@ -807,14 +807,14 @@ { IoMarkIrpPending(NotifyIrp); NotifyIrp->IoStatus.Status = STATUS_NOTIFY_CLEANUP; - IoCompleteRequest(NotifyIrp, EVENT_INCREMENT); + IoCompleteRequest(NotifyIrp, IO_DISK_INCREMENT); } /* Or if it's about to be deleted, complete */ else if (NotifyChange->Flags & DELETE_IN_PROCESS) { IoMarkIrpPending(NotifyIrp); NotifyIrp->IoStatus.Status = STATUS_DELETE_PENDING; - IoCompleteRequest(NotifyIrp, EVENT_INCREMENT); + IoCompleteRequest(NotifyIrp, IO_DISK_INCREMENT); } /* Complete now if asked to (and not asked to notify later on) */ if ((NotifyChange->Flags & NOTIFY_IMMEDIATELY) && !(NotifyChange->Flags & NOTIFY_LATER)) @@ -822,7 +822,7 @@ NotifyChange->Flags &= ~NOTIFY_IMMEDIATELY; IoMarkIrpPending(NotifyIrp); NotifyIrp->IoStatus.Status = STATUS_NOTIFY_ENUM_DIR; - IoCompleteRequest(NotifyIrp, EVENT_INCREMENT); + IoCompleteRequest(NotifyIrp, IO_DISK_INCREMENT); } /* If no data yet, or asked to notify later on, handle */ else if (NotifyChange->DataLength == 0 || (NotifyChange->Flags & NOTIFY_LATER))

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2016