Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 42651: Fixed rtl lib, and got back some deleted stuff by sync.
by pschweitzer＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: pschweitzer Date: Thu Aug 13 12:30:12 2009 New Revision: 42651 URL: http://svn.reactos.org/svn/reactos?rev=42651&view=rev Log: Fixed rtl lib, and got back some deleted stuff by sync. Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c branches/pierre-fsd/lib/rtl/nls.c Modified: branches/pierre-fsd/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/dos8dot3.c?r… ============================================================================== --- branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/dos8dot3.c [iso-8859-1] Thu Aug 13 12:30:12 2009 @@ -11,11 +11,6 @@ #define NDEBUG #include <debug.h> - -/* GLOBALS *******************************************************************/ - -extern BOOLEAN NlsMbOemCodePageTag; -extern PUSHORT NlsOemLeadByteInfo; /* CONSTANTS *****************************************************************/ @@ -274,29 +269,20 @@ for (i = 0; i < AnsiName->Length; i++) { - /* First make sure the character it's not the Lead DBCS */ - if (NlsMbOemCodePageTag && NlsOemLeadByteInfo[(UCHAR)AnsiName->Buffer[i]]) + switch (AnsiName->Buffer[i]) { - if (i == AnsiName->Length - 1) return FALSE; - i++; - } - else - { - switch (AnsiName->Buffer[i]) - { - case ' ': - /* leading/trailing spaces not allowed */ - if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; - GotSpace = TRUE; - break; - case '.': - if (Dot != -1) return FALSE; - Dot = i; - break; - default: - if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; - break; - } + case ' ': + /* leading/trailing spaces not allowed */ + if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; + GotSpace = TRUE; + break; + case '.': + if (Dot != -1) return FALSE; + Dot = i; + break; + default: + if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; + break; } } /* check file part is shorter than 8, extension shorter than 3 Modified: branches/pierre-fsd/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/nls.c?rev=42… ============================================================================== --- branches/pierre-fsd/lib/rtl/nls.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/nls.c [iso-8859-1] Thu Aug 13 12:30:12 2009 @@ -31,8 +31,9 @@ PWCHAR NlsOemToUnicodeTable = NULL; PCHAR NlsUnicodeToOemTable =NULL; PWCHAR NlsDbcsUnicodeToOemTable = NULL; -PUSHORT NlsOemLeadByteInfo = NULL; /* exported */ - +PUSHORT _NlsOemLeadByteInfo = NULL; /* exported */ + +#define NlsOemLeadByteInfo _NlsOemLeadByteInfo #define INIT_FUNCTION /* FUNCTIONS *****************************************************************/

1 0

[janderwald] 42650: [SPLITTER] - Implement Splitter (WIP)
by janderwald＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: janderwald Date: Thu Aug 13 12:05:42 2009 New Revision: 42650 URL: http://svn.reactos.org/svn/reactos?rev=42650&view=rev Log: [SPLITTER] - Implement Splitter (WIP) Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c [iso-8859-1] Thu Aug 13 12:05:42 2009 @@ -14,7 +14,48 @@ IN PKSFILTER Filter, IN PKSPROCESSPIN_INDEXENTRY ProcessPinsIndex) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + ULONG Index; + PKSPROCESSPIN CurPin, Pin; + BOOLEAN PendingFrames = FALSE; + + if (ProcessPinsIndex->Count) + { + /* check if there are outstanding frames */ + for(Index = 1; Index < ProcessPinsIndex->Count; Index++) + { + /* get current pin */ + CurPin = ProcessPinsIndex->Pins[Index]; + + if (CurPin->BytesAvailable && CurPin->Pin->DeviceState == KSSTATE_RUN) + { + /* pin has pending frames + * to keep all pins synchronized, every pin has to wait untill each chained pin has send its frames downwards + */ + PendingFrames = TRUE; + } + } + } + + if (!PendingFrames && ProcessPinsIndex->Count) + { + /* get first pin */ + Pin = ProcessPinsIndex->Pins[0]; + + /* check if there is new data available */ + if (Pin->BytesAvailable) + { + for(Index = 1; Index < ProcessPinsIndex->Count; Index++) + { + /* get current pin */ + CurPin = ProcessPinsIndex->Pins[Index]; + + /* copy the frame to pin */ + RtlMoveMemory(CurPin->Data, Pin->Data, Pin->BytesAvailable); + CurPin->BytesUsed = Pin->BytesAvailable; + } + } + } + /* done */ + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c [iso-8859-1] Thu Aug 13 12:05:42 2009 @@ -14,8 +14,45 @@ IN PKSPIN Pin, IN PIRP Irp) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSFILTER Filter; + PKSPIN FirstPin; + PPIN_CONTEXT PinContext; + + /* first get the parent filter */ + Filter = KsPinGetParentFilter(Pin); + + /* now get first child pin */ + FirstPin = KsFilterGetFirstChildPin(Filter, Pin->Id); + + /* sanity check */ + ASSERT(FirstPin); + + if (FirstPin != Pin) + { + /* a previous pin already exists */ + if (RtlCompareMemory(FirstPin->ConnectionFormat, Pin->ConnectionFormat, Pin->ConnectionFormat->FormatSize) != Pin->ConnectionFormat->FormatSize) + { + /* each instantiated pin must have the same connection format */ + return STATUS_INVALID_PARAMETER; + } + } + + /* allocate pin context */ + PinContext = ExAllocatePool(NonPagedPool, sizeof(PIN_CONTEXT)); + if (!PinContext) + return STATUS_INSUFFICIENT_RESOURCES; + + /* store pin context */ + Pin->Context = PinContext; + + /* clear pin context */ + RtlZeroMemory(PinContext, sizeof(PIN_CONTEXT)); + + /* FIXME + * check allocator framing and apply to all pins + */ + + return STATUS_SUCCESS; } NTSTATUS @@ -24,8 +61,14 @@ IN PKSPIN Pin, IN PIRP Irp) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + /* is there a context */ + if (Pin->Context) + { + /* free pin context */ + ExFreePool(Pin->Context); + } + + return STATUS_SUCCESS; } VOID @@ -33,7 +76,22 @@ PinReset( IN PKSPIN Pin) { - UNIMPLEMENTED + PKSFILTER Filter; + + /* sanity check */ + ASSERT(Pin->Context); + + /* clear pin context */ + RtlZeroMemory(Pin->Context, sizeof(PIN_CONTEXT)); + + /* get parent filter */ + Filter = KsPinGetParentFilter(Pin); + + /* sanity check */ + ASSERT(Filter); + + /* attempt processing */ + KsFilterAttemptProcessing(Filter, TRUE); } NTSTATUS @@ -43,8 +101,25 @@ IN KSSTATE ToState, IN KSSTATE FromState) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSFILTER Filter; + + /* should the pin stop */ + if (ToState == KSSTATE_STOP) + { + /* clear pin context */ + RtlZeroMemory(Pin->Context, sizeof(PIN_CONTEXT)); + } + + /* get parent filter */ + Filter = KsPinGetParentFilter(Pin); + + /* sanity check */ + ASSERT(Filter); + + /* attempt processing */ + KsFilterAttemptProcessing(Filter, TRUE); + + return STATUS_SUCCESS; } NTSTATUS @@ -54,8 +129,49 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSFILTER Filter; + PKSPIN Pin, FirstPin; + PFILE_OBJECT FileObject; + NTSTATUS Status; + ULONG BytesReturned; + + /* first get the pin */ + Pin = KsGetPinFromIrp(Irp); + + /* sanity check */ + ASSERT(Pin); + + /* get parent filter */ + Filter = KsPinGetParentFilter(Pin); + + /* acquire filter control mutex */ + KsFilterAcquireControl(Filter); + + /* get first pin */ + FirstPin = KsFilterGetFirstChildPin(Filter, Pin->Id); + + /* get connected pin of first pin */ + FileObject = KsPinGetConnectedPinFileObject(FirstPin); + + if (!FileObject) + { + /* no pin connected */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* perform request */ + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)Request, sizeof(KSPROPERTY), Data, sizeof(KSAUDIO_POSITION), &BytesReturned); + + /* store result size */ + Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); + } + + /* release control */ + KsFilterReleaseControl(Filter); + + /* done */ + return Status; } NTSTATUS @@ -70,7 +186,54 @@ OUT PVOID Data OPTIONAL, OUT PULONG DataSize) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - + PKSPIN FirstPin; + NTSTATUS Status; + + /* get first pin */ + FirstPin = KsFilterGetFirstChildPin((PKSFILTER)Context, Pin->PinId); + + /* sanity check */ + ASSERT(FirstPin); + + /* check for matching dataformat */ + if (!IsEqualGUIDAligned(&FirstPin->ConnectionFormat->SubFormat, &DataRange->SubFormat) || + !IsEqualGUIDAligned(&FirstPin->ConnectionFormat->Specifier, &DataRange->Specifier) || + !IsEqualGUIDAligned(&GUID_NULL, &DataRange->SubFormat) || + !IsEqualGUIDAligned(&GUID_NULL, &DataRange->Specifier)) + { + /* no match */ + return STATUS_NO_MATCH; + } + + + if (DataBufferSize) + { + /* there is output buffer */ + if (DataBufferSize >= FirstPin->ConnectionFormat->FormatSize) + { + /* copy dataformat */ + RtlMoveMemory(Data, FirstPin->ConnectionFormat, FirstPin->ConnectionFormat->FormatSize); + + /* store output length */ + *DataSize = FirstPin->ConnectionFormat->FormatSize; + + Status = STATUS_SUCCESS; + } + else + { + /* buffer too small */ + Status = STATUS_BUFFER_TOO_SMALL; + } + } + else + { + /* store output length */ + *DataSize = FirstPin->ConnectionFormat->FormatSize; + + Status = STATUS_BUFFER_OVERFLOW; + } + + /* done */ + return Status; +} + Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h [iso-8859-1] Thu Aug 13 12:05:42 2009 @@ -58,4 +58,13 @@ OUT PVOID Data OPTIONAL, OUT PULONG DataSize); + + +typedef struct +{ + ULONG BytesAvailable; + ULONG BytesProcessed; +}PIN_CONTEXT, *PPIN_CONTEXT; + + #endif Modified: trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c [iso-8859-1] Thu Aug 13 12:05:42 2009 @@ -12,6 +12,8 @@ const GUID KSPROPSETID_Audio = {0x45FFAAA0, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; const GUID KSCATEGORY_AUDIO_SPLITTER = {0x9EA331FA, 0xB91B, 0x45F8, {0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE}}; const GUID KSNAME_Filter = {0x9b365890, 0x165f, 0x11d0, {0xa1, 0x95, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4}}; +const GUID GUID_NULL = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; + KSPROPERTY_ITEM PinPropertyTable[] =

1 0

[janderwald] 42649: [KS] - Check if irp was allocated - Unimplement KsPinGetConnectedPinFileObject
by janderwald＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: janderwald Date: Thu Aug 13 11:54:51 2009 New Revision: 42649 URL: http://svn.reactos.org/svn/reactos?rev=42649&view=rev Log: [KS] - Check if irp was allocated - Unimplement KsPinGetConnectedPinFileObject Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Thu Aug 13 11:54:51 2009 @@ -1147,6 +1147,13 @@ /* create the irp */ Irp = IoBuildDeviceIoControlRequest(IoControl, DeviceObject, InBuffer, InSize, OutBuffer, OutSize, FALSE, &Event, &IoStatusBlock); + + if (!Irp) + { + /* no memory to allocate the irp */ + return STATUS_INSUFFICIENT_RESOURCES; + } + /* HACK */ IoStack = IoGetNextIrpStackLocation(Irp); Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Thu Aug 13 11:54:51 2009 @@ -384,16 +384,14 @@ } /* - @implemented + @unimplemented */ PFILE_OBJECT NTAPI KsPinGetConnectedPinFileObject( IN PKSPIN Pin) { - IKsPinImpl * This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); - - return This->FileObject; + return NULL; } /* @@ -1188,8 +1186,12 @@ This->ObjectHeader->Unknown = (PUNKNOWN)&This->lpVtbl; This->ObjectHeader->ObjectType = (PVOID)&This->Pin; - /* now inform the driver to create a new pin */ - Status = Descriptor->Dispatch->Create(&This->Pin, Irp); + /* does the driver have a pin dispatch */ + if (Descriptor->Dispatch && Descriptor->Dispatch->Create) + { + /* now inform the driver to create a new pin */ + Status = Descriptor->Dispatch->Create(&This->Pin, Irp); + } if (!NT_SUCCESS(Status) && Status != STATUS_PENDING) {

1 0

[janderwald] 42648: - Implement IPortDMus_fnNewRegistryKey
by janderwald＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: janderwald Date: Thu Aug 13 11:53:13 2009 New Revision: 42648 URL: http://svn.reactos.org/svn/reactos?rev=42648&view=rev Log: - Implement IPortDMus_fnNewRegistryKey Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] Thu Aug 13 11:53:13 2009 @@ -219,6 +219,12 @@ } } + /* Initialize port object */ + This->pMiniport = Miniport; + This->pMiniportMidi = MidiMiniport; + This->pDeviceObject = DeviceObject; + This->bInitialized = TRUE; + if (Miniport) { /* initialize IMiniportDMus */ @@ -226,6 +232,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IMiniportDMus_Init failed with %x\n", Status); + This->bInitialized = FALSE; return Status; } @@ -235,6 +242,7 @@ { DPRINT1("failed to get description\n"); Miniport->lpVtbl->Release(Miniport); + This->bInitialized = FALSE; return Status; } @@ -249,6 +257,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IMiniportMidi_Init failed with %x\n", Status); + This->bInitialized = FALSE; return Status; } @@ -258,6 +267,7 @@ { DPRINT1("failed to get description\n"); MidiMiniport->lpVtbl->Release(MidiMiniport); + This->bInitialized = FALSE; return Status; } @@ -290,6 +300,7 @@ else MidiMiniport->lpVtbl->Release(MidiMiniport); + This->bInitialized = FALSE; return Status; } @@ -298,12 +309,6 @@ /* register service group */ This->ServiceGroup = ServiceGroup; } - - /* Initialize port object */ - This->pMiniport = Miniport; - This->pMiniportMidi = MidiMiniport; - This->pDeviceObject = DeviceObject; - This->bInitialized = TRUE; /* check if it supports IPinCount interface */ Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IPinCount, (PVOID*)&PinCount); @@ -346,7 +351,16 @@ DPRINT("IPortDMus_fnNewRegistryKey called w/o initialized\n"); return STATUS_UNSUCCESSFUL; } - return STATUS_UNSUCCESSFUL; + + return PcNewRegistryKey(OutRegistryKey, + OuterUnknown, + RegistryKeyType, + DesiredAccess, + This->pDeviceObject, + NULL,//FIXME + ObjectAttributes, + CreateOptions, + Disposition); } VOID

1 0

[sginsberg] 42647: - Re-disallow warnings for gdi32, user32 and lsasrv
by sginsberg＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: sginsberg Date: Thu Aug 13 11:34:37 2009 New Revision: 42647 URL: http://svn.reactos.org/svn/reactos?rev=42647&view=rev Log: - Re-disallow warnings for gdi32, user32 and lsasrv Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/user32/user32.rbuild Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Thu Aug 13 11:34:37 2009 @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll" allowwarnings="true"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll"> <importlibrary definition="gdi32.spec" /> <include base="gdi32">include</include> <define name="LANGPACK" /> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Thu Aug 13 11:34:37 2009 @@ -1,4 +1,4 @@ -<module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll" unicode="yes" allowwarnings="true"> +<module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll" unicode="yes"> <importlibrary definition="lsasrv.spec" /> <include base="lsasrv">.</include> <include base="lsa_server">.</include> Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Thu Aug 13 11:34:37 2009 @@ -1,4 +1,4 @@ -<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll" allowwarnings="true"> +<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll"> <importlibrary definition="user32.pspec" /> <include base="user32">.</include> <include base="user32">include</include>

1 0

[sginsberg] 42646: - Make gdi32 compile warning free under msvc
by sginsberg＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: sginsberg Date: Thu Aug 13 11:29:48 2009 New Revision: 42646 URL: http://svn.reactos.org/svn/reactos?rev=42646&view=rev Log: - Make gdi32 compile warning free under msvc Modified: trunk/reactos/dll/win32/gdi32/objects/printdrv.c Modified: trunk/reactos/dll/win32/gdi32/objects/printdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pr… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/printdrv.c [iso-8859-1] Thu Aug 13 11:29:48 2009 @@ -197,31 +197,31 @@ if (hModWinSpoolDrv) { - fpAbortPrinter = GetProcAddress(hModWinSpoolDrv, "AbortPrinter"); - fpClosePrinter = GetProcAddress(hModWinSpoolDrv, "ClosePrinter"); - fpCloseSpoolFileHandle = GetProcAddress(hModWinSpoolDrv, "CloseSpoolFileHandle"); + fpAbortPrinter = (PVOID)GetProcAddress(hModWinSpoolDrv, "AbortPrinter"); + fpClosePrinter = (PVOID)GetProcAddress(hModWinSpoolDrv, "ClosePrinter"); + fpCloseSpoolFileHandle = (PVOID)GetProcAddress(hModWinSpoolDrv, "CloseSpoolFileHandle"); fpCommitSpoolData = (PVOID)GetProcAddress(hModWinSpoolDrv, "CommitSpoolData"); - // fpConnectToLd64In32Server = GetProcAddress(hModWinSpoolDrv, (LPCSTR)224); + // fpConnectToLd64In32Server = (PVOID)GetProcAddress(hModWinSpoolDrv, (LPCSTR)224); fpDocumentEvent = (PVOID)GetProcAddress(hModWinSpoolDrv,"DocumentEvent"); fpDocumentPropertiesW = (PVOID)GetProcAddress(hModWinSpoolDrv, "DocumentPropertiesW"); - fpEndDocPrinter = GetProcAddress(hModWinSpoolDrv, "EndDocPrinter"); - fpEndPagePrinter = GetProcAddress(hModWinSpoolDrv, "EndPagePrinter"); - fpGetPrinterW = GetProcAddress( hModWinSpoolDrv,"GetPrinterW"); - fpGetPrinterDriverW = GetProcAddress(hModWinSpoolDrv,"GetPrinterDriverW"); + fpEndDocPrinter = (PVOID)GetProcAddress(hModWinSpoolDrv, "EndDocPrinter"); + fpEndPagePrinter = (PVOID)GetProcAddress(hModWinSpoolDrv, "EndPagePrinter"); + fpGetPrinterW = (PVOID)GetProcAddress( hModWinSpoolDrv,"GetPrinterW"); + fpGetPrinterDriverW = (PVOID)GetProcAddress(hModWinSpoolDrv,"GetPrinterDriverW"); fpGetSpoolFileHandle = (PVOID)GetProcAddress(hModWinSpoolDrv, "GetSpoolFileHandle"); - fpIsValidDevmodeW = GetProcAddress(hModWinSpoolDrv, "IsValidDevmodeW"); - fpOpenPrinterW = GetProcAddress(hModWinSpoolDrv, "OpenPrinterW"); - fpQueryColorProfile = GetProcAddress(hModWinSpoolDrv,"QueryColorProfile"); + fpIsValidDevmodeW = (PVOID)GetProcAddress(hModWinSpoolDrv, "IsValidDevmodeW"); + fpOpenPrinterW = (PVOID)GetProcAddress(hModWinSpoolDrv, "OpenPrinterW"); + fpQueryColorProfile = (PVOID)GetProcAddress(hModWinSpoolDrv,"QueryColorProfile"); fpQueryRemoteFonts = (PVOID)GetProcAddress(hModWinSpoolDrv, "QueryRemoteFonts"); fpQuerySpoolMode = (PVOID)GetProcAddress(hModWinSpoolDrv, "QuerySpoolMode"); - fpReadPrinter = GetProcAddress(hModWinSpoolDrv, "ReadPrinter"); - fpResetPrinterW = GetProcAddress(hModWinSpoolDrv, "ResetPrinterW"); - fpSeekPrinter = GetProcAddress(hModWinSpoolDrv, "SeekPrinter"); - fpSplDriverUnloadComplete = GetProcAddress(hModWinSpoolDrv, "SplDriverUnloadComplete"); - fpSplReadPrinter = GetProcAddress(hModWinSpoolDrv, (LPCSTR)205); + fpReadPrinter = (PVOID)GetProcAddress(hModWinSpoolDrv, "ReadPrinter"); + fpResetPrinterW = (PVOID)GetProcAddress(hModWinSpoolDrv, "ResetPrinterW"); + fpSeekPrinter = (PVOID)GetProcAddress(hModWinSpoolDrv, "SeekPrinter"); + fpSplDriverUnloadComplete = (PVOID)GetProcAddress(hModWinSpoolDrv, "SplDriverUnloadComplete"); + fpSplReadPrinter = (PVOID)GetProcAddress(hModWinSpoolDrv, (LPCSTR)205); fpStartDocDlgW = (PVOID)GetProcAddress(hModWinSpoolDrv, "StartDocDlgW"); fpStartDocPrinterW = (PVOID)GetProcAddress(hModWinSpoolDrv, "StartDocPrinterW"); - fpStartPagePrinter = GetProcAddress(hModWinSpoolDrv, "StartPagePrinter"); + fpStartPagePrinter = (PVOID)GetProcAddress(hModWinSpoolDrv, "StartPagePrinter"); if ( !fpAbortPrinter || !fpClosePrinter ||

1 0

[jimtabor] 42645: - Fix SetWndContextHlpId call.
by jimtabor＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: jimtabor Date: Thu Aug 13 07:18:18 2009 New Revision: 42645 URL: http://svn.reactos.org/svn/reactos?rev=42645&view=rev Log: - Fix SetWndContextHlpId call. Modified: trunk/reactos/dll/win32/user32/include/user32p.h Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Thu Aug 13 07:18:18 2009 @@ -41,7 +41,7 @@ (BOOL)NtUserCallTwoParam((DWORD)hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN) #define NtUserSetWindowContextHelpId(hWnd, dwContextHelpId) \ - (BOOL)NtUserCallTwoParam((DWORD)hwnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID) + (BOOL)NtUserCallHwndParam(hwnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID) #define NtUserSetCaretPos(X, Y) \ (BOOL)NtUserCallTwoParam((DWORD)X, (DWORD)Y, TWOPARAM_ROUTINE_SETCARETPOS)

1 0

[jimtabor] 42644: - Fix another NULL Wnd crash.
by jimtabor＠svn.reactos.org 13 Aug '09

13 Aug '09

Author: jimtabor Date: Thu Aug 13 06:17:23 2009 New Revision: 42644 URL: http://svn.reactos.org/svn/reactos?rev=42644&view=rev Log: - Fix another NULL Wnd crash. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Aug 13 06:17:23 2009 @@ -319,6 +319,8 @@ PCLIENTINFO ClientInfo = GetWin32ClientInfo(); PWND Wnd = WindowObject->Wnd; + if (!Wnd) return; + if (ClientInfo->CallbackWnd.pvWnd == DesktopHeapAddressToUser(WindowObject->Wnd)) { ClientInfo->CallbackWnd.hWnd = NULL;

1 0

[jimtabor] 42643: - Fix menu window callback. Only use it when the menu name is not null.
by jimtabor＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: jimtabor Date: Thu Aug 13 01:37:26 2009 New Revision: 42643 URL: http://svn.reactos.org/svn/reactos?rev=42643&view=rev Log: - Fix menu window callback. Only use it when the menu name is not null. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Thu Aug 13 01:37:26 2009 @@ -1,23 +1,4 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window classes @@ -694,7 +675,10 @@ Common->hModule = hModule; - RtlCopyMemory(&Common->MenuName, pMenuName->Buffer, pMenuName->Length); + if (pMenuName->Length) + RtlCopyMemory(&Common->MenuName, pMenuName->Buffer, pMenuName->Length); + else + RtlCopyMemory(&Common->MenuName, &pMenuName->Buffer, sizeof(WCHAR)); ResultPointer = NULL; ResultLength = sizeof(LRESULT); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Aug 13 01:37:26 2009 @@ -1837,12 +1837,19 @@ { if (hMenu) IntSetMenu(Window, hMenu, &MenuChanged); - else // Take it from the parent. + else if (Wnd->pcls->lpszMenuName) // Take it from the parent. { UNICODE_STRING MenuName; - - RtlInitUnicodeString( &MenuName, Wnd->pcls->lpszMenuName); - + if (IS_INTRESOURCE(Wnd->pcls->lpszMenuName)) + { + MenuName.Length = 0; + MenuName.MaximumLength = 0; + MenuName.Buffer = Wnd->pcls->lpszMenuName; + } + else + { + RtlInitUnicodeString( &MenuName, Wnd->pcls->lpszMenuName); + } hMenu = co_IntCallLoadMenu( Wnd->pcls->hModule, &MenuName); if (hMenu) IntSetMenu(Window, hMenu, &MenuChanged); }

1 0

[cgutman] 42642: - Don't access an uninitialized variable - Initialize the unicode string at the start of the function - Spotted by Amine Khaldi
by cgutman＠svn.reactos.org 12 Aug '09

12 Aug '09

Author: cgutman Date: Thu Aug 13 01:14:49 2009 New Revision: 42642 URL: http://svn.reactos.org/svn/reactos?rev=42642&view=rev Log: - Don't access an uninitialized variable - Initialize the unicode string at the start of the function - Spotted by Amine Khaldi Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Thu Aug 13 01:14:49 2009 @@ -850,6 +850,8 @@ ExAllocatePool(NonPagedPool, sizeof(KEY_BASIC_INFORMATION)); ULONG KbioLength = sizeof(KEY_BASIC_INFORMATION), ResultLength; + RtlInitUnicodeString( DeviceDesc, NULL ); + if( !Kbio ) return STATUS_INSUFFICIENT_RESOURCES; RtlInitUnicodeString @@ -904,8 +906,6 @@ } } - RtlInitUnicodeString( DeviceDesc, L"" ); - AppendUnicodeString( DeviceDesc, &TargetKeyName, FALSE ); NtClose( EnumKey ); ExFreePool( Kbio ); return STATUS_UNSUCCESSFUL;

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