Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 37245: - Fix build.
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Fri Nov 7 12:20:18 2008 New Revision: 37245 URL: http://svn.reactos.org/svn/reactos?rev=37245&view=rev Log: - Fix build. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Fri Nov 7 12:20:18 2008 @@ -9206,7 +9206,7 @@ * IN PDRIVER_CANCEL CancelRoutine) */ #define IoSetCancelRoutine( Irp, NewCancelRoutine ) ( \ - InterlockedExchange( (PLONG)&(Irp)->CancelRoutine, (LONG)(NewCancelRoutine) ) ) + (PDRIVER_CANCEL)InterlockedExchange( (PLONG)&(Irp)->CancelRoutine, (LONG)(NewCancelRoutine) ) ) /*

1 0

[fireball] 37244: - Add missing definitions to headers. - Do not use "with tag" when freeing the system buffer, because drivers are allowed to re-allocate their own buffer, which may have a different tag.
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Fri Nov 7 11:40:44 2008 New Revision: 37244 URL: http://svn.reactos.org/svn/reactos?rev=37244&view=rev Log: - Add missing definitions to headers. - Do not use "with tag" when freeing the system buffer, because drivers are allowed to re-allocate their own buffer, which may have a different tag. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=37… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Fri Nov 7 11:40:44 2008 @@ -1639,6 +1639,65 @@ PVOID TableContext; } RTL_GENERIC_TABLE, *PRTL_GENERIC_TABLE; +typedef struct _UNICODE_PREFIX_TABLE_ENTRY +{ + CSHORT NodeTypeCode; + CSHORT NameLength; + struct _UNICODE_PREFIX_TABLE_ENTRY *NextPrefixTree; + struct _UNICODE_PREFIX_TABLE_ENTRY *CaseMatch; + RTL_SPLAY_LINKS Links; + PUNICODE_STRING Prefix; +} UNICODE_PREFIX_TABLE_ENTRY, *PUNICODE_PREFIX_TABLE_ENTRY; + +typedef struct _UNICODE_PREFIX_TABLE +{ + CSHORT NodeTypeCode; + CSHORT NameLength; + PUNICODE_PREFIX_TABLE_ENTRY NextPrefixTree; + PUNICODE_PREFIX_TABLE_ENTRY LastNextEntry; +} UNICODE_PREFIX_TABLE, *PUNICODE_PREFIX_TABLE; + +NTSYSAPI +VOID +NTAPI +RtlInitializeUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable +); + +NTSYSAPI +BOOLEAN +NTAPI +RtlInsertUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN PUNICODE_STRING Prefix, + IN PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry +); + +NTSYSAPI +VOID +NTAPI +RtlRemoveUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN PUNICODE_PREFIX_TABLE_ENTRY PrefixTableEntry +); + +NTSYSAPI +PUNICODE_PREFIX_TABLE_ENTRY +NTAPI +RtlFindUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN PUNICODE_STRING FullName, + IN ULONG CaseInsensitiveIndex +); + +NTSYSAPI +PUNICODE_PREFIX_TABLE_ENTRY +NTAPI +RtlNextUnicodePrefix ( + IN PUNICODE_PREFIX_TABLE PrefixTable, + IN BOOLEAN Restart +); + #undef PRTL_GENERIC_COMPARE_ROUTINE #undef PRTL_GENERIC_ALLOCATE_ROUTINE #undef PRTL_GENERIC_FREE_ROUTINE Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Fri Nov 7 11:40:44 2008 @@ -9205,12 +9205,11 @@ * IN PIRP Irp, * IN PDRIVER_CANCEL CancelRoutine) */ -#define IoSetCancelRoutine(_Irp, \ - _CancelRoutine) \ - ((PDRIVER_CANCEL) InterlockedExchangePointer( \ - (PVOID *) &(_Irp)->CancelRoutine, (PVOID) (_CancelRoutine))) - -/* +#define IoSetCancelRoutine( Irp, NewCancelRoutine ) ( \ + InterlockedExchange( (PLONG)&(Irp)->CancelRoutine, (LONG)(NewCancelRoutine) ) ) + + + /* * VOID * IoSetCompletionRoutine( * IN PIRP Irp, Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Fri Nov 7 11:40:44 2008 @@ -286,7 +286,7 @@ if (Irp->Flags & IRP_DEALLOCATE_BUFFER) { /* Deallocate it */ - ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); + ExFreePool(Irp->AssociatedIrp.SystemBuffer); } } @@ -976,7 +976,7 @@ Irp->Cancel = TRUE; /* Clear the cancel routine and get the old one */ - CancelRoutine = IoSetCancelRoutine(Irp, NULL); + CancelRoutine = (PVOID)IoSetCancelRoutine(Irp, NULL); if (CancelRoutine) { /* We had a routine, make sure the IRP isn't completed */

1 0

[mjmartin] 37243: - Check for GetServiceConfig returning NULL, which occurs if entries for the service are not in registry.
by mjmartin＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: mjmartin Date: Fri Nov 7 07:39:11 2008 New Revision: 37243 URL: http://svn.reactos.org/svn/reactos?rev=37243&view=rev Log: - Check for GetServiceConfig returning NULL, which occurs if entries for the service are not in registry. Modified: trunk/reactos/base/applications/mscutils/servman/listview.c Modified: trunk/reactos/base/applications/mscutils/servman/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/listview.c [iso-8859-1] Fri Nov 7 07:39:11 2008 @@ -174,11 +174,14 @@ lpServiceConfig = GetServiceConfig(pService->lpServiceName); - switch (lpServiceConfig->dwStartType) + if (lpServiceConfig) { - case 2: StringId = IDS_SERVICES_AUTO; break; - case 3: StringId = IDS_SERVICES_MAN; break; - case 4: StringId = IDS_SERVICES_DIS; break; + switch (lpServiceConfig->dwStartType) + { + case 2: StringId = IDS_SERVICES_AUTO; break; + case 3: StringId = IDS_SERVICES_MAN; break; + case 4: StringId = IDS_SERVICES_DIS; break; + } } if (StringId)

1 0

[gedmurphy] 37242: fix return logic typo
by gedmurphy＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: gedmurphy Date: Fri Nov 7 06:58:33 2008 New Revision: 37242 URL: http://svn.reactos.org/svn/reactos?rev=37242&view=rev Log: fix return logic typo Modified: trunk/reactos/base/services/rpcss/service_main.c Modified: trunk/reactos/base/services/rpcss/service_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/servic… ============================================================================== --- trunk/reactos/base/services/rpcss/service_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/service_main.c [iso-8859-1] Fri Nov 7 06:58:33 2008 @@ -124,5 +124,5 @@ {NULL, NULL } }; - return (int)(StartServiceCtrlDispatcherW(ServiceTable) != 0); + return (int)(StartServiceCtrlDispatcherW(ServiceTable) != TRUE); }

1 0

[gedmurphy] 37241: Convert rpcss back to a service
by gedmurphy＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: gedmurphy Date: Fri Nov 7 06:49:51 2008 New Revision: 37241 URL: http://svn.reactos.org/svn/reactos?rev=37241&view=rev Log: Convert rpcss back to a service Added: trunk/reactos/base/services/rpcss/rpcss_ros.diff trunk/reactos/base/services/rpcss/service_main.c (with props) Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild trunk/reactos/base/services/rpcss/rpcss_main.c Modified: trunk/reactos/base/services/rpcss/rpcss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss.… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss.rbuild [iso-8859-1] Fri Nov 7 06:49:51 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe"> +<module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe" unicode="yes"> <include base="rpcss">.</include> <include base="rpcss" root="intermediate">.</include> <library>wine</library> @@ -9,9 +9,10 @@ <library>rpcrt4</library> <library>kernel32</library> <library>advapi32</library> - <file>rpcss_main.c</file> <file>epmp.c</file> <file>irotp.c</file> + <file>rpcss_main.c</file> + <file>service_main.c</file> <file>epm.idl</file> <file>irot.idl</file> <file>rpcss.rc</file> Modified: trunk/reactos/base/services/rpcss/rpcss_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] (original) +++ trunk/reactos/base/services/rpcss/rpcss_main.c [iso-8859-1] Fri Nov 7 06:49:51 2008 @@ -62,7 +62,7 @@ //extern HANDLE __wine_make_process_system(void); -static BOOL RPCSS_Initialize(void) +BOOL RPCSS_Initialize(void) { static unsigned short irot_protseq[] = IROT_PROTSEQ; static unsigned short irot_endpoint[] = IROT_ENDPOINT; @@ -116,7 +116,7 @@ /* returns false if we discover at the last moment that we aren't ready to terminate */ -static BOOL RPCSS_Shutdown(void) +BOOL RPCSS_Shutdown(void) { RpcMgmtStopServerListening(NULL); RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); @@ -127,6 +127,7 @@ return TRUE; } +#if 0 int main( int argc, char **argv ) { /* @@ -142,3 +143,4 @@ return 0; } +#endif Added: trunk/reactos/base/services/rpcss/rpcss_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/rpcss_… ============================================================================== --- trunk/reactos/base/services/rpcss/rpcss_ros.diff (added) +++ trunk/reactos/base/services/rpcss/rpcss_ros.diff [iso-8859-1] Fri Nov 7 06:49:51 2008 @@ -1,0 +1,35 @@ +Index: rpcss_main.c +=================================================================== +--- rpcss_main.c (revision 37240) ++++ rpcss_main.c (working copy) +@@ -62,7 +62,7 @@ + + //extern HANDLE __wine_make_process_system(void); + +-static BOOL RPCSS_Initialize(void) ++BOOL RPCSS_Initialize(void) + { + static unsigned short irot_protseq[] = IROT_PROTSEQ; + static unsigned short irot_endpoint[] = IROT_ENDPOINT; +@@ -116,7 +116,7 @@ + + /* returns false if we discover at the last moment that we + aren't ready to terminate */ +-static BOOL RPCSS_Shutdown(void) ++BOOL RPCSS_Shutdown(void) + { + RpcMgmtStopServerListening(NULL); + RpcServerUnregisterIf(epm_v3_0_s_ifspec, NULL, TRUE); +@@ -127,6 +127,7 @@ + return TRUE; + } + ++#if 0 + int main( int argc, char **argv ) + { + /* +@@ -142,3 +143,4 @@ + + return 0; + } ++#endif Added: trunk/reactos/base/services/rpcss/service_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/servic… ============================================================================== --- trunk/reactos/base/services/rpcss/service_main.c (added) +++ trunk/reactos/base/services/rpcss/service_main.c [iso-8859-1] Fri Nov 7 06:49:51 2008 @@ -1,0 +1,128 @@ +/* + * PROJECT: ReactOS Remote Procedure Call service + * LICENSE: GPL - See COPYING in the top level directory + * FILE: /base/services/rpcss/service_main.c + * PURPOSE: Service control code + * COPYRIGHT: Copyright 2008 Ged Murphy <gedmurphy(a)reactos.org> + * + */ + +#include "rpcss.h" + +BOOL RPCSS_Initialize(void); +BOOL RPCSS_Shutdown(void); + +static WCHAR ServiceName[] = L"RpcSs"; + +typedef struct _ServiceInfo +{ + SERVICE_STATUS servStatus; + SERVICE_STATUS_HANDLE hStatus; +} SERVICEINFO, *PSERVICEINFO; + + +static VOID +UpdateStatus(PSERVICEINFO pServInfo, + DWORD NewStatus, + DWORD Check) +{ + if (Check > 0) + { + pServInfo->servStatus.dwCheckPoint += Check; + } + else + { + pServInfo->servStatus.dwCheckPoint = Check; + } + + if (NewStatus > 0) + { + pServInfo->servStatus.dwCurrentState = NewStatus; + } + + SetServiceStatus(pServInfo->hStatus, &pServInfo->servStatus); +} + + +static BOOL +RunService(PSERVICEINFO pServInfo) +{ + return RPCSS_Initialize(); +} + +VOID WINAPI +ServerCtrlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + PSERVICEINFO pServInfo = (PSERVICEINFO)lpContext; + + switch (dwControl) + { + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + RPCSS_Shutdown(); + pServInfo->servStatus.dwWin32ExitCode = 0; + pServInfo->servStatus.dwWaitHint = 0; + UpdateStatus(pServInfo, SERVICE_STOP_PENDING, 1); + break; + + default: + break; + } +} + +VOID WINAPI +ServiceMain(DWORD argc, LPWSTR argv[]) +{ + SERVICEINFO servInfo; + HANDLE hThread; + DWORD dwThreadId; + + servInfo.servStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + servInfo.servStatus.dwCurrentState = SERVICE_STOPPED; + servInfo.servStatus.dwControlsAccepted = SERVICE_ACCEPT_SHUTDOWN; + servInfo.servStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; + servInfo.servStatus.dwServiceSpecificExitCode = 0; + servInfo.servStatus.dwCheckPoint = 0; + servInfo.servStatus.dwWaitHint = 1000; + + servInfo.hStatus = RegisterServiceCtrlHandlerExW(ServiceName, + (LPHANDLER_FUNCTION_EX)ServerCtrlHandler, + &servInfo); + if (!servInfo.hStatus) return; + + UpdateStatus(&servInfo, SERVICE_START_PENDING, 1); + + /* Create worker thread */ + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE)RunService, + &servInfo, + 0, + &dwThreadId); + if (!hThread) return; + + /* Set service status to running */ + UpdateStatus(&servInfo, SERVICE_RUNNING, 0); + + /* Wait until thread has terminated */ + WaitForSingleObject(hThread, INFINITE); + + CloseHandle(hThread); + + UpdateStatus(&servInfo, SERVICE_STOPPED, 0); +} + + +int wmain(int argc, LPWSTR argv []) +{ + SERVICE_TABLE_ENTRYW ServiceTable[] = + { + {ServiceName, ServiceMain}, + {NULL, NULL } + }; + + return (int)(StartServiceCtrlDispatcherW(ServiceTable) != 0); +} Propchange: trunk/reactos/base/services/rpcss/service_main.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 37240: - Sync ole32 to Wine-20081105 (matching rpcrt4 sync). Tested with two versions of FoxIt for bug #2361, it doesn't happen. Also tested with MS Office 2003 installation (which goes up to "Writing system registry values"). - Remove epm server building from rpcrt4, it belongs to rpcss.
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Fri Nov 7 05:00:30 2008 New Revision: 37240 URL: http://svn.reactos.org/svn/reactos?rev=37240&view=rev Log: - Sync ole32 to Wine-20081105 (matching rpcrt4 sync). Tested with two versions of FoxIt for bug #2361, it doesn't happen. Also tested with MS Office 2003 installation (which goes up to "Writing system registry values"). - Remove epm server building from rpcrt4, it belongs to rpcss. Added: trunk/reactos/dll/win32/ole32/comcat.c (with props) Modified: trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/dcom.idl trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/moniker.h trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole2nls.c trunk/reactos/dll/win32/ole32/ole2stubs.c trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/regsvr.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/usrmarshal.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… Added: trunk/reactos/dll/win32/ole32/comcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/comcat.c?r… Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… Modified: trunk/reactos/dll/win32/ole32/dcom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dcom.idl?r… Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Modified: trunk/reactos/dll/win32/ole32/moniker.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.h?… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Modified: trunk/reactos/dll/win32/ole32/ole2nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2nls.c?… Modified: trunk/reactos/dll/win32/ole32/ole2stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2stubs.… Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… Modified: trunk/reactos/dll/win32/ole32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/regsvr.c?r… Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb…

1 0

[sginsberg] 37214: - Remove unnecessary typedef
by sginsberg＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: sginsberg Date: Wed Nov 5 20:06:02 2008 New Revision: 37214 URL: http://svn.reactos.org/svn/reactos?rev=37214&view=rev Log: - Remove unnecessary typedef Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] Wed Nov 5 20:06:02 2008 @@ -142,7 +142,7 @@ const Project& project; }; -typedef struct ModuleHandlerInformations +struct ModuleHandlerInformations { HostType DefaultHost; const char* cflags;

1 0

[sginsberg] 37213: - Fix an array overflow
by sginsberg＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: sginsberg Date: Wed Nov 5 19:00:24 2008 New Revision: 37213 URL: http://svn.reactos.org/svn/reactos?rev=37213&view=rev Log: - Fix an array overflow Modified: trunk/rosapps/applications/sysutils/ctm/ctm.c Modified: trunk/rosapps/applications/sysutils/ctm/ctm.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/ctm/… ============================================================================== --- trunk/rosapps/applications/sysutils/ctm/ctm.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/ctm/ctm.c [iso-8859-1] Wed Nov 5 19:00:24 2008 @@ -59,7 +59,7 @@ DWORD inConMode; DWORD outConMode; -DWORD columnRightPositions[5]; +DWORD columnRightPositions[6]; TCHAR lpSeparator[80]; TCHAR lpHeader[80]; TCHAR lpMemUnit[3];

1 0

[fireball] 37212: - Fix behavior of KeRundownQueue (save the next link before freeing it and use proper locking and enumeration code). - This fixes behavior of I/O completion ports (thanks to Stefan and Alex for testing, reporting and fixing).
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Wed Nov 5 18:03:04 2008 New Revision: 37212 URL: http://svn.reactos.org/svn/reactos?rev=37212&view=rev Log: - Fix behavior of KeRundownQueue (save the next link before freeing it and use proper locking and enumeration code). - This fixes behavior of I/O completion ports (thanks to Stefan and Alex for testing, reporting and fixing). Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/queue.c [iso-8859-1] Wed Nov 5 18:03:04 2008 @@ -436,8 +436,7 @@ NTAPI KeRundownQueue(IN PKQUEUE Queue) { - PLIST_ENTRY ListHead, NextEntry; - PLIST_ENTRY FirstEntry = NULL; + PLIST_ENTRY FirstEntry, NextEntry; PKTHREAD Thread; KIRQL OldIrql; ASSERT_QUEUE(Queue); @@ -446,34 +445,41 @@ /* Get the Dispatcher Lock */ OldIrql = KiAcquireDispatcherLock(); - - /* Make sure the list is not empty */ - if (!IsListEmpty(&Queue->EntryListHead)) - { - /* Remove it */ - FirstEntry = RemoveHeadList(&Queue->EntryListHead); - } - - /* Unlink threads and clear their Thread->Queue */ - ListHead = &Queue->ThreadListHead; - NextEntry = ListHead->Flink; - while (ListHead != NextEntry) - { - /* Get the Entry's Thread */ + + /* Check if the list is empty */ + FirstEntry = Queue->EntryListHead.Flink; + if (FirstEntry == &Queue->EntryListHead) + { + /* We won't return anything */ + FirstEntry = NULL; + } + else + { + /* Remove this entry */ + RemoveEntryList(&Queue->EntryListHead); + } + + /* Loop the list */ + while (!IsListEmpty(&Queue->ThreadListHead)) + { + /* Get the next entry */ + NextEntry = Queue->ThreadListHead.Flink; + + /* Get the associated thread */ Thread = CONTAINING_RECORD(NextEntry, KTHREAD, QueueListEntry); - /* Kill its Queue */ + /* Clear its queue */ Thread->Queue = NULL; /* Remove this entry */ RemoveEntryList(NextEntry); - - /* Get the next entry */ - NextEntry = NextEntry->Flink; - } - - /* Release the lock and return */ - KiReleaseDispatcherLock(OldIrql); + } + + /* Release the dispatcher lock */ + KiReleaseDispatcherLockFromDpcLevel(); + + /* Exit the dispatcher and return the first entry (if any) */ + KiExitDispatcher(OldIrql); return FirstEntry; }

1 0

[fireball] 37211: - Sync WRC to Wine-20081105 (a few nice bugfixes).
by fireball＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: fireball Date: Wed Nov 5 17:16:19 2008 New Revision: 37211 URL: http://svn.reactos.org/svn/reactos?rev=37211&view=rev Log: - Sync WRC to Wine-20081105 (a few nice bugfixes). Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/wrc/genres.c trunk/reactos/tools/wrc/lex.yy.c trunk/reactos/tools/wrc/newstruc.c trunk/reactos/tools/wrc/parser.h trunk/reactos/tools/wrc/parser.l trunk/reactos/tools/wrc/parser.tab.c trunk/reactos/tools/wrc/parser.tab.h trunk/reactos/tools/wrc/parser.y trunk/reactos/tools/wrc/readres.c trunk/reactos/tools/wrc/translation.c trunk/reactos/tools/wrc/utils.c trunk/reactos/tools/wrc/wrc.c trunk/reactos/tools/wrc/writeres.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/wrc/genres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/genres.c?rev=372… Modified: trunk/reactos/tools/wrc/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/lex.yy.c?rev=372… Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=3… Modified: trunk/reactos/tools/wrc/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.h?rev=372… Modified: trunk/reactos/tools/wrc/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.l?rev=372… Modified: trunk/reactos/tools/wrc/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.c?rev… Modified: trunk/reactos/tools/wrc/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.tab.h?rev… Modified: trunk/reactos/tools/wrc/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/parser.y?rev=372… Modified: trunk/reactos/tools/wrc/readres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/readres.c?rev=37… Modified: trunk/reactos/tools/wrc/translation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/translation.c?re… Modified: trunk/reactos/tools/wrc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/utils.c?rev=3721… Modified: trunk/reactos/tools/wrc/wrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.c?rev=37211&… Modified: trunk/reactos/tools/wrc/writeres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/writeres.c?rev=3…

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