Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 18027: Port the system message queue WM_MOUSEDOWN coalesce fix from win32k rewrite branch.
by navaraf＠svn.reactos.com 24 Sep '05

24 Sep '05

Port the system message queue WM_MOUSEDOWN coalesce fix from win32k rewrite branch. Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-09-24 17:08:13 UTC (rev 18026) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-09-24 17:34:09 UTC (rev 18027) @@ -42,7 +42,6 @@ static ULONG SystemMessageQueueHead = 0; static ULONG SystemMessageQueueTail = 0; static ULONG SystemMessageQueueCount = 0; -static ULONG SystemMessageQueueMouseMove = -1; static KSPIN_LOCK SystemMessageQueueLock; static ULONG volatile HardwareMessageQueueStamp = 0; @@ -148,45 +147,54 @@ { LARGE_INTEGER LargeTickCount; KIRQL OldIrql; - ULONG mmov = (ULONG)-1; + ULONG Prev; - KeQueryTickCount(&LargeTickCount); - Msg->time = LargeTickCount.u.LowPart; - IntLockSystemMessageQueue(OldIrql); - /* only insert WM_MOUSEMOVE messages if not already in system message queue */ - if(Msg->message == WM_MOUSEMOVE) - mmov = SystemMessageQueueMouseMove; + /* + * Bail out if the queue is full. FIXME: We should handle this case + * more gracefully. + */ - if(mmov != (ULONG)-1) + if (SystemMessageQueueCount == SYSTEM_MESSAGE_QUEUE_SIZE) { - /* insert message at the queue head */ - while (mmov != SystemMessageQueueHead ) - { - ULONG prev = mmov ? mmov - 1 : SYSTEM_MESSAGE_QUEUE_SIZE - 1; - ASSERT((LONG) mmov >= 0); - ASSERT(mmov < SYSTEM_MESSAGE_QUEUE_SIZE); - SystemMessageQueue[mmov] = SystemMessageQueue[prev]; - mmov = prev; - } - SystemMessageQueue[SystemMessageQueueHead] = *Msg; + IntUnLockSystemMessageQueue(OldIrql); + return; } - else + + KeQueryTickCount(&LargeTickCount); + Msg->time = LargeTickCount.u.LowPart; + + /* + * If we got WM_MOUSEMOVE and there are already messages in the + * system message queue, check if the last message is mouse move + * and if it is then just overwrite it. + */ + + if (Msg->message == WM_MOUSEMOVE && SystemMessageQueueCount) { - if (SystemMessageQueueCount == SYSTEM_MESSAGE_QUEUE_SIZE) + if (SystemMessageQueueTail == 0) + Prev = SYSTEM_MESSAGE_QUEUE_SIZE - 1; + else + Prev = SystemMessageQueueTail - 1; + if (SystemMessageQueue[Prev].message == WM_MOUSEMOVE) { - IntUnLockSystemMessageQueue(OldIrql); - return; + SystemMessageQueueTail = Prev; + SystemMessageQueueCount--; } - SystemMessageQueue[SystemMessageQueueTail] = *Msg; - if(Msg->message == WM_MOUSEMOVE) - SystemMessageQueueMouseMove = SystemMessageQueueTail; - SystemMessageQueueTail = - (SystemMessageQueueTail + 1) % SYSTEM_MESSAGE_QUEUE_SIZE; - SystemMessageQueueCount++; } + + /* + * Actually insert the message into the system message queue. + */ + + SystemMessageQueue[SystemMessageQueueTail] = *Msg; + SystemMessageQueueTail = + (SystemMessageQueueTail + 1) % SYSTEM_MESSAGE_QUEUE_SIZE; + SystemMessageQueueCount++; + IntUnLockSystemMessageQueue(OldIrql); + KeSetEvent(&HardwareMessageEvent, IO_NO_INCREMENT, FALSE); } @@ -583,11 +591,6 @@ } IntLockSystemMessageQueue(OldIrql); } - /* - * we could set this to -1 conditionally if we find one, but - * this is more efficient and just as effective. - */ - SystemMessageQueueMouseMove = -1; HardwareMessageQueueStamp++; IntUnLockSystemMessageQueue(OldIrql);

1 0

[weiden] 18026: implemented RegCopyTreeW() (untested!)
by weiden＠svn.reactos.com 24 Sep '05

24 Sep '05

implemented RegCopyTreeW() (untested!) Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-09-24 13:19:25 UTC (rev 18025) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-09-24 17:08:13 UTC (rev 18026) @@ -319,10 +319,294 @@ } +static NTSTATUS +RegpCopyTree(IN HKEY hKeySrc, + IN HKEY hKeyDest) +{ + typedef struct + { + LIST_ENTRY ListEntry; + HANDLE hKeySrc; + HANDLE hKeyDest; + } REGP_COPY_KEYS, *PREGP_COPY_KEYS; + + LIST_ENTRY copyQueueHead; + PREGP_COPY_KEYS copyKeys, newCopyKeys; + union + { + KEY_VALUE_FULL_INFORMATION *KeyValue; + KEY_NODE_INFORMATION *KeyNode; + PVOID Buffer; + } Info; + ULONG Index, BufferSizeRequired, BufferSize = 0x200; + NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status2 = STATUS_SUCCESS; + + InitializeListHead(&copyQueueHead); + + Info.Buffer = RtlAllocateHeap(ProcessHeap, + 0, + BufferSize); + if (Info.Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + copyKeys = RtlAllocateHeap(ProcessHeap, + 0, + sizeof(REGP_COPY_KEYS)); + if (copyKeys != NULL) + { + copyKeys->hKeySrc = hKeySrc; + copyKeys->hKeyDest = hKeyDest; + InsertHeadList(&copyQueueHead, + &copyKeys->ListEntry); + + /* FIXME - copy security from hKeySrc to hKeyDest or just for the subkeys? */ + + do + { + copyKeys = CONTAINING_RECORD(copyQueueHead.Flink, + REGP_COPY_KEYS, + ListEntry); + + /* enumerate all values and copy them */ + Index = 0; + for (;;) + { + Status2 = NtEnumerateValueKey(copyKeys->hKeySrc, + Index, + KeyValueFullInformation, + Info.KeyValue, + BufferSize, + &BufferSizeRequired); + if (NT_SUCCESS(Status2)) + { + UNICODE_STRING ValueName; + PVOID Data; + + /* don't use RtlInitUnicodeString as the string is not NULL-terminated! */ + ValueName.Length = Info.KeyValue->NameLength; + ValueName.MaximumLength = ValueName.Length; + ValueName.Buffer = Info.KeyValue->Name; + + Data = (PVOID)((ULONG_PTR)Info.KeyValue + Info.KeyValue->DataOffset); + + Status2 = NtSetValueKey(copyKeys->hKeyDest, + &ValueName, + Info.KeyValue->TitleIndex, + Info.KeyValue->Type, + Data, + Info.KeyValue->DataLength); + + /* don't break, let's try to copy as many values as possible */ + if (!NT_SUCCESS(Status2) && NT_SUCCESS(Status)) + { + Status = Status2; + } + + Index++; + } + else if (Status2 == STATUS_BUFFER_OVERFLOW) + { + PVOID Buffer; + + ASSERT(BufferSize < BufferSizeRequired); + + Buffer = RtlReAllocateHeap(ProcessHeap, + 0, + Info.Buffer, + BufferSizeRequired); + if (Buffer != NULL) + { + Info.Buffer = Buffer; + /* try again */ + } + else + { + /* don't break, let's try to copy as many values as possible */ + Status2 = STATUS_INSUFFICIENT_RESOURCES; + Index++; + + if (NT_SUCCESS(Status)) + { + Status = Status2; + } + } + } + else + { + /* break to avoid an infinite loop in case of denied access or + other errors! */ + if (Status2 != STATUS_NO_MORE_ENTRIES && NT_SUCCESS(Status)) + { + Status = Status2; + } + + break; + } + } + + /* enumerate all subkeys and open and enqueue them */ + Index = 0; + for (;;) + { + Status2 = NtEnumerateKey(copyKeys->hKeySrc, + Index, + KeyNodeInformation, + Info.KeyNode, + BufferSize, + &BufferSizeRequired); + if (NT_SUCCESS(Status2)) + { + HANDLE KeyHandle, NewKeyHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING SubKeyName, ClassName; + + /* don't use RtlInitUnicodeString as the string is not NULL-terminated! */ + SubKeyName.Length = Info.KeyNode->NameLength; + SubKeyName.MaximumLength = SubKeyName.Length; + SubKeyName.Buffer = Info.KeyNode->Name; + ClassName.Length = Info.KeyNode->ClassLength; + ClassName.MaximumLength = ClassName.Length; + ClassName.Buffer = (PWSTR)((ULONG_PTR)Info.KeyNode + Info.KeyNode->ClassOffset); + + /* open the subkey with sufficient rights */ + + InitializeObjectAttributes(&ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE, + copyKeys->hKeySrc, + NULL); + + Status2 = NtOpenKey(&KeyHandle, + KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + &ObjectAttributes); + if (NT_SUCCESS(Status2)) + { + /* FIXME - attempt to query the security information */ + + InitializeObjectAttributes(&ObjectAttributes, + &SubKeyName, + OBJ_CASE_INSENSITIVE, + copyKeys->hKeyDest, + NULL); + + Status2 = NtCreateKey(&NewKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + Info.KeyNode->TitleIndex, + &ClassName, + 0, + NULL); + if (NT_SUCCESS(Status2)) + { + newCopyKeys = RtlAllocateHeap(ProcessHeap, + 0, + sizeof(REGP_COPY_KEYS)); + if (newCopyKeys != NULL) + { + /* save the handles and enqueue the subkey */ + newCopyKeys->hKeySrc = KeyHandle; + newCopyKeys->hKeyDest = NewKeyHandle; + InsertTailList(&copyQueueHead, + &newCopyKeys->ListEntry); + } + else + { + NtClose(KeyHandle); + NtClose(NewKeyHandle); + + Status2 = STATUS_INSUFFICIENT_RESOURCES; + goto GoNextKey; + } + } + else + { + NtClose(KeyHandle); + } + } + +GoNextKey: + if (!NT_SUCCESS(Status2) && NT_SUCCESS(Status)) + { + Status = Status2; + } + + Index++; + } + else if (Status2 == STATUS_BUFFER_OVERFLOW) + { + PVOID Buffer; + + ASSERT(BufferSize < BufferSizeRequired); + + Buffer = RtlReAllocateHeap(ProcessHeap, + 0, + Info.Buffer, + BufferSizeRequired); + if (Buffer != NULL) + { + Info.Buffer = Buffer; + /* try again */ + } + else + { + /* don't break, let's try to copy as many keys as possible */ + Status2 = STATUS_INSUFFICIENT_RESOURCES; + Index++; + + if (NT_SUCCESS(Status)) + { + Status = Status2; + } + } + } + else + { + /* break to avoid an infinite loop in case of denied access or + other errors! */ + if (Status2 != STATUS_NO_MORE_ENTRIES && NT_SUCCESS(Status)) + { + Status = Status2; + } + + break; + } + } + + /* close the handles and remove the entry from the list */ + if (copyKeys->hKeySrc != hKeySrc) + { + NtClose(copyKeys->hKeySrc); + } + if (copyKeys->hKeyDest != hKeyDest) + { + NtClose(copyKeys->hKeyDest); + } + + RemoveEntryList(&copyKeys->ListEntry); + + RtlFreeHeap(ProcessHeap, + 0, + copyKeys); + } while (!IsListEmpty(&copyQueueHead)); + } + else + Status = STATUS_INSUFFICIENT_RESOURCES; + + RtlFreeHeap(ProcessHeap, + 0, + Info.Buffer); + + return Status; +} + + /*********************************************************************** * * RegCopyTreeW * - * @unimplemented + * @implemented */ LONG STDCALL RegCopyTreeW(IN HKEY hKeySrc, @@ -361,7 +645,7 @@ NULL); Status = NtOpenKey(&SubKeyHandle, - KEY_READ, + KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { @@ -373,8 +657,8 @@ else CurKey = KeyHandle; - /* FIXME - copy all keys and values recursively */ - Status = STATUS_NOT_IMPLEMENTED; + Status = RegpCopyTree(CurKey, + hKeyDest); if (SubKeyHandle != NULL) { @@ -1135,7 +1419,7 @@ NtClose(delKeys->KeyHandle); } - if (!NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* don't break, let's try to delete as many keys as possible */ Status = Status2;

1 0

[hpoussin] 18025: If device instance id is not unique, prepend information from parent bus device
by hpoussin＠svn.reactos.com 24 Sep '05

24 Sep '05

If device instance id is not unique, prepend information from parent bus device Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-09-24 11:43:23 UTC (rev 18024) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-09-24 13:19:25 UTC (rev 18025) @@ -1294,6 +1294,7 @@ HANDLE InstanceKey = NULL; UNICODE_STRING ValueName; DEVICE_CAPABILITIES DeviceCapabilities; + PKEY_VALUE_PARTIAL_INFORMATION ParentPrefixIdInformation = NULL; DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode, Context); DPRINT("PDO 0x%p\n", DeviceNode->PhysicalDeviceObject); @@ -1351,6 +1352,69 @@ DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); } + DPRINT("Sending IRP_MN_QUERY_CAPABILITIES to device stack\n"); + + Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities); + if (!NT_SUCCESS(Status)) + { + DPRINT("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status); + } + + DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCapabilities + 4); + + if (!DeviceCapabilities.UniqueID) + { + /* Device has not a unique ID. We need to prepend parent bus unique identifier */ + DPRINT("Instance ID is not unique\n"); + if (DeviceNode->Parent->InstancePath.Length > 0) + { + /* Parent device node exists */ + HANDLE hKey; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + ULONG KeyNameBufferLength; + PWSTR KeyNameBuffer = NULL; + + KeyNameBufferLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MAX_PATH * sizeof(WCHAR); + ParentPrefixIdInformation = ExAllocatePool(PagedPool, KeyNameBufferLength + sizeof(WCHAR)); + KeyNameBuffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); + if (ParentPrefixIdInformation && KeyNameBuffer) + { + /* Memory is allocated, let's try to read registry settings */ + wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + wcscat(KeyNameBuffer, DeviceNode->Parent->InstancePath.Buffer); + RtlInitUnicodeString(&KeyName, KeyNameBuffer); + InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); + Status = ZwOpenKey(&hKey, KEY_READ, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + RtlInitUnicodeString(&ValueName, L"ParentIdPrefix"); + Status = ZwQueryValueKey( + hKey, &ValueName, + KeyValuePartialInformation, ParentPrefixIdInformation, + KeyNameBufferLength, &KeyNameBufferLength); + if (NT_SUCCESS(Status)) + { + /* NULL-terminate the string, as we have allocated enough place for it */ + ((PWSTR)ParentPrefixIdInformation->Data)[ParentPrefixIdInformation->Data Length / sizeof(WCHAR)] = 0; + } + else + { + ExFreePool(ParentPrefixIdInformation); + ParentPrefixIdInformation = NULL; + } + ZwClose(hKey); + } + else + { + ExFreePool(ParentPrefixIdInformation); + ParentPrefixIdInformation = NULL; + } + } + ExFreePool(KeyNameBuffer); + } + } + DPRINT("Sending IRP_MN_QUERY_ID.BusQueryInstanceID to device stack\n"); Stack.Parameters.QueryId.IdType = BusQueryInstanceID; @@ -1363,6 +1427,13 @@ { /* Append the instance id string */ wcscat(InstancePath, L"\\"); + if (ParentPrefixIdInformation && ParentPrefixIdInformation->Type == REG_SZ) + { + /* Add information from parent bus device to InstancePath */ + wcscat(InstancePath, (PWSTR)ParentPrefixIdInformation->Data); + if (*(PWSTR)IoStatusBlock.Information) + wcscat(InstancePath, L"&"); + } wcscat(InstancePath, (PWSTR)IoStatusBlock.Information); /* @@ -1374,21 +1445,8 @@ { DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status); } + ExFreePool(ParentPrefixIdInformation); - Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities); - if (!NT_SUCCESS(Status)) - { - DPRINT("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status); - } - - DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCapabilities + 4); - - if (!DeviceCapabilities.UniqueID) - { - DPRINT("Instance ID is not unique\n"); - /* FIXME: Add information from parent bus driver to InstancePath */ - } - if (!RtlCreateUnicodeString(&DeviceNode->InstancePath, InstancePath)) { DPRINT("No resources\n");

1 0

[gdalsnes] 18024: uncomment and add mutex asserts
by gdalsnes＠svn.reactos.com 24 Sep '05

24 Sep '05

uncomment and add mutex asserts Modified: trunk/reactos/ntoskrnl/ex/fmutex.c _____ Modified: trunk/reactos/ntoskrnl/ex/fmutex.c --- trunk/reactos/ntoskrnl/ex/fmutex.c 2005-09-24 09:30:43 UTC (rev 18023) +++ trunk/reactos/ntoskrnl/ex/fmutex.c 2005-09-24 11:43:23 UTC (rev 18024) @@ -21,7 +21,11 @@ VOID FASTCALL ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) { - //ASSERT(FastMutex->Owner != KeGetCurrentThread()); + ASSERT(KeGetCurrentThread() == NULL || FastMutex->Owner != KeGetCurrentThread()); + ASSERT(KeGetCurrentIrql() == APC_LEVEL || + KeGetCurrentThread() == NULL || + KeGetCurrentThread()->KernelApcDisable); + InterlockedIncrementUL(&FastMutex->Contention); while (InterlockedExchange(&FastMutex->Count, 0) == 0) { @@ -41,7 +45,11 @@ VOID FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex) { - //ASSERT(FastMutex->Owner == KeGetCurrentThread()); + ASSERT(KeGetCurrentThread() == NULL || FastMutex->Owner == KeGetCurrentThread()); + ASSERT(KeGetCurrentIrql() == APC_LEVEL || + KeGetCurrentThread() == NULL || + KeGetCurrentThread()->KernelApcDisable); + FastMutex->Owner = NULL; InterlockedExchange(&FastMutex->Count, 1); if (FastMutex->Contention > 0)

1 0

[ekohl] 18023: - Implement CM_Get_Device_List_Size_ExW
by ekohl＠svn.reactos.com 24 Sep '05

24 Sep '05

- Implement CM_Get_Device_List_Size_ExW Modified: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2005-09-24 02:50:02 UTC (rev 18022) +++ trunk/reactos/include/idl/pnp.idl 2005-09-24 09:30:43 UTC (rev 18023) @@ -49,6 +49,17 @@ [out] unsigned long *RequiredLength, [in] DWORD Flags); +// CONFIGRET PNP_GetDeviceList(handle_t BindingHandle, +// [in, unique, string] wchar_t *Filter, +// [out, string, size_is(*Length)] unsigned char *Buffer +// [in, out] unsigned long *Length, +// [in] DWORD Flags); + + CONFIGRET PNP_GetDeviceListSize(handle_t BindingHandle, + [in, unique, string] wchar_t *Filter, + [out] unsigned long *Length, + [in] DWORD Flags); + CONFIGRET PNP_GetDepth(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, [out] unsigned long *Depth, _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-09-24 02:50:02 UTC (rev 18022) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-09-24 09:30:43 UTC (rev 18023) @@ -128,7 +128,18 @@ #define CM_DELETE_CLASS_SUBKEYS 0x00000001 #define CM_DELETE_CLASS_BITS 0x00000001 +/* ulFlags for CM_Get_Device_ID_List and CM_Get_Device_ID_List_Size */ +#define CM_GETIDLIST_FILTER_NONE (0x00000000) +#define CM_GETIDLIST_FILTER_ENUMERATOR (0x00000001) +#define CM_GETIDLIST_FILTER_SERVICE (0x00000002) +#define CM_GETIDLIST_FILTER_EJECTRELATIONS (0x00000004) +#define CM_GETIDLIST_FILTER_REMOVALRELATIONS (0x00000008) +#define CM_GETIDLIST_FILTER_POWERRELATIONS (0x00000010) +#define CM_GETIDLIST_FILTER_BUSRELATIONS (0x00000020) +#define CM_GETIDLIST_DONOTGENERATE (0x10000040) +#define CM_GETIDLIST_FILTER_BITS (0x1000007F) + CONFIGRET WINAPI CM_Connect_MachineA( PCSTR, PHMACHINE ); CONFIGRET WINAPI CM_Connect_MachineW( PCWSTR, PHMACHINE ); #define CM_Connect_Machine WINELIB_NAME_AW(CM_Connect_Machine) _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-24 02:50:02 UTC (rev 18022) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-24 09:30:43 UTC (rev 18023) @@ -1195,9 +1195,34 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExW( PULONG pulLen, PCWSTR pszFilter, ULONG ulFlags, HMACHINE hMachine) { + RPC_BINDING_HANDLE BindingHandle = NULL; + FIXME("%p %s %ld %lx\n", pulLen, debugstr_w(pszFilter), ulFlags, hMachine); - *pulLen = 2; - return CR_SUCCESS; + + if (pulLen == NULL) + return CR_INVALID_POINTER; + + if (ulFlags & ~CM_GETIDLIST_FILTER_BITS) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + *pulLen = 0; + + return PNP_GetDeviceListSize(BindingHandle, + (LPWSTR)pszFilter, + pulLen, + ulFlags); } _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-09-24 02:50:02 UTC (rev 18022) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-09-24 09:30:43 UTC (rev 18023) @@ -303,6 +303,21 @@ CONFIGRET +PNP_GetDeviceListSize(handle_t BindingHandle, + wchar_t *Filter, + unsigned long *Length, + DWORD Flags) +{ + DPRINT("PNP_GetDeviceListSize() called\n"); + + /* FIXME */ + *Length = 2; + + return CR_SUCCESS; +} + + +CONFIGRET PNP_GetDepth(handle_t BindingHandle, wchar_t *DeviceInstance, unsigned long *Depth, @@ -635,6 +650,22 @@ CONFIGRET +PNP_CreateKey(handle_t BindingHandle, + wchar_t *SubKey, + unsigned long samDesired, + unsigned long Flags) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT("PNP_CreateKey() called\n"); + + DPRINT("PNP_CreateKey() done (returns %lx)\n", ret); + + return ret; +} + + +CONFIGRET PNP_GetClassName(handle_t BindingHandle, wchar_t *ClassGuid, wchar_t *Buffer,

1 0

[gdalsnes] 18022: -include/ndk/rtltypes.h: add MAX_ATOM_LEN define
by gdalsnes＠svn.reactos.com 24 Sep '05

24 Sep '05

-include/ndk/rtltypes.h: add MAX_ATOM_LEN define -win32k: remove some NtUser syscalls and merge some NtUser syscalls -crt/include/internal/file.h: correct spelling -RtlAddAtomToAtomTable: check for max atom len -RtlQueryAtomInAtomTable: fix bug. somehow lock wasnt always released. -fix/reword windows classes impl. based on Wine. All but 2 winetests pass. -ntoskrnl/rtl/atom.c: add fixme about global atom table -remove desktop object lock -dont link windows into the class object -co_IntShellHookNotify: safely send notify messages -misc win32k reorg/cleanup Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/lib/crt/include/internal/file.h Modified: trunk/reactos/lib/rtl/atom.c Modified: trunk/reactos/lib/user32/windows/caret.c Modified: trunk/reactos/lib/user32/windows/class.c Modified: trunk/reactos/lib/user32/windows/paint.c Modified: trunk/reactos/lib/user32/windows/window.c Modified: trunk/reactos/ntoskrnl/rtl/atom.c Modified: trunk/reactos/subsys/win32k/include/class.h Modified: trunk/reactos/subsys/win32k/include/desktop.h Modified: trunk/reactos/subsys/win32k/include/win32.h Modified: trunk/reactos/subsys/win32k/include/window.h Modified: trunk/reactos/subsys/win32k/main/dllmain.c Modified: trunk/reactos/subsys/win32k/ntuser/caret.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/include/ndk/rtltypes.h 2005-09-24 02:50:02 UTC (rev 18022) @@ -107,6 +107,8 @@ #define NLS_MB_OEM_CODE_PAGE_TAG NlsMbOemCodePageTag #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo +#define MAX_ATOM_LEN 255 /* TCHARS not including nullterm */ + /* List Macros */ static __inline VOID _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/include/win32k/ntuser.h 2005-09-24 02:50:02 UTC (rev 18022) @@ -212,7 +212,6 @@ #define TWOPARAM_ROUTINE_UNKNOWN 0x54 #define TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS 0x55 #define TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW 0x56 -#define TWOPARAM_ROUTINE_VALIDATERGN 0x57 #define TWOPARAM_ROUTINE_SETWNDCONTEXTHLPID 0x58 #define TWOPARAM_ROUTINE_SETCARETPOS 0x60 #define TWOPARAM_ROUTINE_GETWINDOWINFO 0x61 @@ -894,11 +893,6 @@ DWORD Unknown0, DWORD Unknown1); -BOOL -STDCALL -NtUserHideCaret( - HWND hWnd); - DWORD STDCALL NtUserImpersonateDdeClientWindow( @@ -935,21 +929,7 @@ LPWSTR lpString, INT nMaxCount); -DWORD -STDCALL -NtUserInvalidateRect( -HWND hWnd, -CONST RECT *lpRect, -BOOL bErase); -DWORD -STDCALL - NtUserInvalidateRgn( - HWND hWnd, - HRGN hRgn, - BOOL bErase); - - BOOL STDCALL NtUserIsClipboardFormatAvailable( @@ -1575,7 +1555,8 @@ BOOL STDCALL NtUserShowCaret( - HWND hWnd); + HWND hWnd, + BOOL bShow); DWORD STDCALL @@ -1681,9 +1662,6 @@ DWORD Unknown1, DWORD Unknown2); -BOOL STDCALL -NtUserUpdateWindow( HWND hWnd ); - DWORD STDCALL NtUserUpdateLayeredWindow( @@ -1715,10 +1693,6 @@ NtUserValidateHandleSecure( DWORD Unknown0); -VOID STDCALL -NtUserValidateRect(HWND Wnd, const RECT* Rect); - - DWORD STDCALL NtUserVkKeyScanEx( _____ Modified: trunk/reactos/lib/crt/include/internal/file.h --- trunk/reactos/lib/crt/include/internal/file.h 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/lib/crt/include/internal/file.h 2005-09-24 02:50:02 UTC (rev 18022) @@ -102,7 +102,7 @@ #define fdinfo_bucket_idx(i) ((i) >> FDINFO_ENTRIES_PER_BUCKET_SHIFT) /* get position inside a bucket (0-31) from an fd */ #define fdinfo_bucket_entry_idx(i) ((i) & (FDINFO_ENTRIES_PER_BUCKET - 1)) -/* get bucket ptr. (ptr. to fist fdinfo inside a bucket) from an fd */ +/* get bucket ptr. (ptr. to first fdinfo inside a bucket) from an fd */ #define fdinfo_bucket(i) ( __pioinfo[fdinfo_bucket_idx(i)]) /* get fdinfo ptr. from an fd */ #define fdinfo(i) (fdinfo_bucket(i) + fdinfo_bucket_entry_idx(i)) _____ Modified: trunk/reactos/lib/rtl/atom.c --- trunk/reactos/lib/rtl/atom.c 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/lib/rtl/atom.c 2005-09-24 02:50:02 UTC (rev 18022) @@ -347,6 +347,12 @@ if (HashLink != NULL) { ULONG AtomNameLen = wcslen(AtomName); + + if (AtomNameLen > MAX_ATOM_LEN) + { + Status = STATUS_INVALID_PARAMETER; + goto end; + } Entry = RtlpAllocAtomTableEntry(sizeof(RTL_ATOM_TABLE_ENTRY) - sizeof(Entry->Name) + @@ -390,7 +396,7 @@ Status = STATUS_OBJECT_NAME_INVALID; } } - +end: RtlpUnlockAtomTable(AtomTable); return Status; @@ -592,6 +598,8 @@ PULONG NameLength) { ULONG Length; + BOOL Unlock = FALSE; + union { /* A RTL_ATOM_TABLE_ENTRY has a "WCHAR Name[1]" entry at the end. @@ -616,6 +624,7 @@ else { RtlpLockAtomTable(AtomTable); + Unlock = TRUE; Entry = RtlpGetAtomEntry(AtomTable, (ULONG)((USHORT)Atom - 0xC000)); @@ -676,10 +685,7 @@ Status = STATUS_INVALID_HANDLE; } - if (NULL != Entry && Entry != &NumberEntry.AtomTableEntry) - { - RtlpUnlockAtomTable(AtomTable); - } + if (Unlock) RtlpUnlockAtomTable(AtomTable); return Status; } _____ Modified: trunk/reactos/lib/user32/windows/caret.c --- trunk/reactos/lib/user32/windows/caret.c 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/lib/user32/windows/caret.c 2005-09-24 02:50:02 UTC (rev 18022) @@ -108,7 +108,7 @@ BOOL STDCALL HideCaret(HWND hWnd) { - return (BOOL)NtUserHideCaret(hWnd); + return NtUserShowCaret(hWnd, FALSE); } @@ -139,7 +139,7 @@ BOOL STDCALL ShowCaret(HWND hWnd) { - return (BOOL)NtUserShowCaret(hWnd); + return NtUserShowCaret(hWnd, TRUE); } /* EOF */ _____ Modified: trunk/reactos/lib/user32/windows/class.c --- trunk/reactos/lib/user32/windows/class.c 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/lib/user32/windows/class.c 2005-09-24 02:50:02 UTC (rev 18022) @@ -87,7 +87,14 @@ w.lpszMenuName = (LPCWSTR)&str2; w.lpszClassName = (LPCWSTR)&str3; + + /* get info about system classes? */ + if (!hInst) hInst = User32Instance; + retval = (BOOL)NtUserGetClassInfo(hInst, str, &w, TRUE, 0); + + w.hInstance = (hInst == User32Instance) ? 0 : hInst; + if ( !IS_ATOM(str) ) HEAP_free(str); _____ Modified: trunk/reactos/lib/user32/windows/paint.c --- trunk/reactos/lib/user32/windows/paint.c 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/lib/user32/windows/paint.c 2005-09-24 02:50:02 UTC (rev 18022) @@ -157,7 +157,7 @@ CONST RECT *lpRect, BOOL bErase) { - return NtUserInvalidateRect( hWnd, lpRect, bErase ); + return RedrawWindow( hWnd, lpRect, 0, RDW_INVALIDATE | (bErase ? RDW_ERASE : 0) ); } @@ -171,7 +171,7 @@ HRGN hRgn, BOOL bErase) { - return NtUserInvalidateRgn( hWnd, hRgn, bErase ); + return RedrawWindow(hWnd, NULL, hRgn, RDW_INVALIDATE | (bErase ? RDW_ERASE : 0) ); } @@ -224,7 +224,7 @@ UpdateWindow( HWND hWnd) { - return NtUserUpdateWindow( hWnd ); + return RedrawWindow( hWnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); } @@ -237,6 +237,8 @@ HWND hWnd, CONST RECT *lpRect) { + /* FIXME: should RDW_NOCHILDREN be included too? Ros used to, + but Wine dont so i removed it... */ return RedrawWindow(hWnd, lpRect, 0, RDW_VALIDATE); } @@ -250,7 +252,9 @@ HWND hWnd, HRGN hRgn) { - return NtUserValidateRgn(hWnd, hRgn); + /* FIXME: should RDW_NOCHILDREN be included too? Ros used to, + but Wine dont so i removed it... */ + return RedrawWindow( hWnd, NULL, hRgn, RDW_VALIDATE ); } _____ Modified: trunk/reactos/lib/user32/windows/window.c --- trunk/reactos/lib/user32/windows/window.c 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/lib/user32/windows/window.c 2005-09-24 02:50:02 UTC (rev 18022) @@ -221,7 +221,7 @@ nHeight, hWndParent, hMenu, - hInstance, + hInstance, lpParam, SW_SHOW, FALSE); @@ -304,7 +304,7 @@ nHeight, hWndParent, hMenu, - hInstance, + hInstance, lpParam, SW_SHOW, TRUE); _____ Modified: trunk/reactos/ntoskrnl/rtl/atom.c --- trunk/reactos/ntoskrnl/rtl/atom.c 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/ntoskrnl/rtl/atom.c 2005-09-24 02:50:02 UTC (rev 18022) @@ -14,6 +14,7 @@ #define NDEBUG #include <internal/debug.h> + /* PROTOTYPES ****************************************************************/ static PRTL_ATOM_TABLE RtlpGetGlobalAtomTable(VOID); @@ -38,6 +39,12 @@ /* GLOBALS *******************************************************************/ +/* FIXME: this is WRONG! The global atom table should live in the WinSta struct + * and accessed thru win32k callouts. + * NOTE: There is a session/win32k global atom table also, but its private to + * win32k. Its used for RegisterWindowMessage() and for window classes. + * -Gunnar + */ static PRTL_ATOM_TABLE GlobalAtomTable = NULL; /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/subsys/win32k/include/class.h --- trunk/reactos/subsys/win32k/include/class.h 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/subsys/win32k/include/class.h 2005-09-24 02:50:02 UTC (rev 18022) @@ -7,6 +7,7 @@ typedef struct _WNDCLASS_OBJECT { UINT cbSize; + LONG refs; /* windows using this class (is 0 after class creation) */ UINT style; WNDPROC lpfnWndProcA; WNDPROC lpfnWndProcW; @@ -21,10 +22,8 @@ HICON hIconSm; BOOL Unicode; BOOL Global; - LIST_ENTRY ListEntry; + LIST_ENTRY ListEntry; /* linked into owning process */ PCHAR ExtraData; - /* list of windows */ - LIST_ENTRY ClassWindowsListHead; } WNDCLASS_OBJECT, *PWNDCLASS_OBJECT; NTSTATUS FASTCALL @@ -33,24 +32,26 @@ NTSTATUS FASTCALL CleanupClassImpl(VOID); -#define ClassDereferenceObject(ClassObj) \ - ObmDereferenceObject(ClassObj) +void FASTCALL DestroyProcessClasses(PW32PROCESS Process ); -BOOL FASTCALL -ClassReferenceClassByAtom( - PWNDCLASS_OBJECT* Class, +inline VOID FASTCALL +ClassDerefObject(PWNDCLASS_OBJECT Class); + +inline VOID FASTCALL +ClassRefObject(PWNDCLASS_OBJECT Class); + +PWNDCLASS_OBJECT FASTCALL +ClassGetClassByAtom( RTL_ATOM Atom, HINSTANCE hInstance); -BOOL FASTCALL -ClassReferenceClassByName( - PWNDCLASS_OBJECT *Class, +PWNDCLASS_OBJECT FASTCALL +ClassGetClassByName( LPCWSTR ClassName, HINSTANCE hInstance); -BOOL FASTCALL -ClassReferenceClassByNameOrAtom( - PWNDCLASS_OBJECT *Class, +PWNDCLASS_OBJECT FASTCALL +ClassGetClassByNameOrAtom( LPCWSTR ClassNameOrAtom, HINSTANCE hInstance); _____ Modified: trunk/reactos/subsys/win32k/include/desktop.h --- trunk/reactos/subsys/win32k/include/desktop.h 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/subsys/win32k/include/desktop.h 2005-09-24 02:50:02 UTC (rev 18022) @@ -11,7 +11,7 @@ CSHORT Type; CSHORT Size; LIST_ENTRY ListEntry; - KSPIN_LOCK Lock; + UNICODE_STRING Name; /* Pointer to the associated window station. */ struct _WINSTATION_OBJECT *WindowStation; _____ Modified: trunk/reactos/subsys/win32k/include/win32.h --- trunk/reactos/subsys/win32k/include/win32.h 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/subsys/win32k/include/win32.h 2005-09-24 02:50:02 UTC (rev 18022) @@ -22,7 +22,7 @@ typedef struct _W32PROCESS { - LIST_ENTRY ClassListHead; + LIST_ENTRY ClassList; LIST_ENTRY MenuListHead; FAST_MUTEX PrivateFontListLock; LIST_ENTRY PrivateFontListHead; _____ Modified: trunk/reactos/subsys/win32k/include/window.h --- trunk/reactos/subsys/win32k/include/window.h 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/subsys/win32k/include/window.h 2005-09-24 02:50:02 UTC (rev 18022) @@ -28,8 +28,6 @@ { /* Pointer to the window class. */ PWNDCLASS_OBJECT Class; - /* entry in the window list of the class object */ - LIST_ENTRY ClassListEntry; /* Extended style. */ DWORD ExStyle; /* Window name. */ _____ Modified: trunk/reactos/subsys/win32k/main/dllmain.c --- trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-09-24 02:50:02 UTC (rev 18022) @@ -70,7 +70,7 @@ { DPRINT("Creating W32 process PID:%d at IRQ level: %lu\n", Process->UniqueProcessId, KeGetCurrentIrql()); - InitializeListHead(&Win32Process->ClassListHead); + InitializeListHead(&Win32Process->ClassList); InitializeListHead(&Win32Process->MenuListHead); @@ -99,8 +99,10 @@ IntCleanupCurIcons(Process, Win32Process); IntEngCleanupDriverObjs(Process, Win32Process); CleanupMonitorImpl(); + + /* no process windows should exist at this point, or the function will assert! */ + DestroyProcessClasses(Win32Process); - GDI_CleanupForProcess(Process); co_IntGraphicsCheck(FALSE); _____ Modified: trunk/reactos/subsys/win32k/ntuser/caret.c --- trunk/reactos/subsys/win32k/ntuser/caret.c 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/subsys/win32k/ntuser/caret.c 2005-09-24 02:50:02 UTC (rev 18022) @@ -9,17 +9,24 @@ * 10/15/2003 Created */ +/* INCLUDES ******************************************************************/ + #include <w32k.h> #define NDEBUG #include <debug.h> +/* DEFINES *****************************************************************/ + #define MIN_CARETBLINKRATE 100 #define MAX_CARETBLINKRATE 10000 #define DEFAULT_CARETBLINKRATE 530 #define CARET_REGKEY L"\\Registry\\User\\.Default\\Control Panel\\Desktop" #define CARET_VALUENAME L"CursorBlinkRate" +/* FUNCTIONS *****************************************************************/ + +static BOOL FASTCALL co_IntHideCaret(PTHRDCARETINFO CaretInfo) { @@ -69,6 +76,7 @@ return TRUE; } +static UINT FASTCALL IntQueryCaretBlinkRate(VOID) { @@ -134,6 +142,7 @@ return (UINT)Val; } +static UINT FASTCALL IntGetCaretBlinkTime(VOID) { @@ -158,6 +167,7 @@ return Ret; } + BOOL FASTCALL co_IntSetCaretPos(int X, int Y) { @@ -197,6 +207,8 @@ return FALSE; } +#if 0 //unused +static VOID FASTCALL co_IntDrawCaret(HWND hWnd) { @@ -210,9 +222,79 @@ ThreadQueue->CaretInfo->Showing = 1; } } +#endif +BOOL FASTCALL co_UserHideCaret(PWINDOW_OBJECT Window OPTIONAL) +{ + PUSER_MESSAGE_QUEUE ThreadQueue; + + if (Window) ASSERT_REFS_CO(Window); + + if(Window && Window->OwnerThread != PsGetCurrentThread()) + { + SetLastWin32Error(ERROR_ACCESS_DENIED); + return FALSE; + } + + ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue; + + if(Window && ThreadQueue->CaretInfo->hWnd != Window->hSelf) + { + SetLastWin32Error(ERROR_ACCESS_DENIED); + return FALSE; + } + + if(ThreadQueue->CaretInfo->Visible) + { + IntKillTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, TRUE); + + co_IntHideCaret(ThreadQueue->CaretInfo); + ThreadQueue->CaretInfo->Visible = 0; + ThreadQueue->CaretInfo->Showing = 0; + } + + return TRUE; +} + + +BOOL FASTCALL co_UserShowCaret(PWINDOW_OBJECT Window OPTIONAL) +{ + PUSER_MESSAGE_QUEUE ThreadQueue; + + if (Window) ASSERT_REFS_CO(Window); + + if(Window && Window->OwnerThread != PsGetCurrentThread()) + { + SetLastWin32Error(ERROR_ACCESS_DENIED); + return FALSE; + } + + ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue; + + if(Window && ThreadQueue->CaretInfo->hWnd != Window->hSelf) + { + SetLastWin32Error(ERROR_ACCESS_DENIED); + return FALSE; + } + + if(!ThreadQueue->CaretInfo->Visible) + { + ThreadQueue->CaretInfo->Visible = 1; + if(!ThreadQueue->CaretInfo->Showing) + { + co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); + } + IntSetTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TRUE); + } + + return TRUE; +} + + +/* SYSCALLS *****************************************************************/ + BOOL STDCALL NtUserCreateCaret( @@ -317,110 +399,15 @@ } -BOOL FASTCALL co_UserHideCaret(PWINDOW_OBJECT Window OPTIONAL) -{ - PUSER_MESSAGE_QUEUE ThreadQueue; - if (Window) ASSERT_REFS_CO(Window); - - if(Window && Window->OwnerThread != PsGetCurrentThread()) - { - SetLastWin32Error(ERROR_ACCESS_DENIED); - return FALSE; - } - - ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue; - - if(Window && ThreadQueue->CaretInfo->hWnd != Window->hSelf) - { - SetLastWin32Error(ERROR_ACCESS_DENIED); - return FALSE; - } - - if(ThreadQueue->CaretInfo->Visible) - { - IntKillTimer((Window ? Window->hSelf : 0), IDCARETTIMER, TRUE); - - co_IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; - } - - return TRUE; -} - - BOOL STDCALL -NtUserHideCaret(HWND hWnd OPTIONAL) +NtUserShowCaret(HWND hWnd OPTIONAL, BOOL bShow) { PWINDOW_OBJECT Window = NULL; DECLARE_RETURN(BOOL); BOOL ret; - DPRINT("Enter NtUserHideCaret\n"); - UserEnterExclusive(); - - if(hWnd && !(Window = UserGetWindowObject(hWnd))) - { - RETURN(FALSE); - } - - if (Window) UserRefObjectCo(Window); - ret = co_UserHideCaret(Window); - if (Window) UserDerefObjectCo(Window); - - RETURN(ret); - -CLEANUP: - DPRINT("Leave NtUserHideCaret, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - -BOOL FASTCALL co_UserShowCaret(PWINDOW_OBJECT Window OPTIONAL) -{ - PUSER_MESSAGE_QUEUE ThreadQueue; - - if (Window) ASSERT_REFS_CO(Window); - - if(Window && Window->OwnerThread != PsGetCurrentThread()) - { - SetLastWin32Error(ERROR_ACCESS_DENIED); - return FALSE; - } - - ThreadQueue = (PUSER_MESSAGE_QUEUE)PsGetWin32Thread()->MessageQueue; - - if(Window && ThreadQueue->CaretInfo->hWnd != Window->hSelf) - { - SetLastWin32Error(ERROR_ACCESS_DENIED); - return FALSE; - } - - if(!ThreadQueue->CaretInfo->Visible) - { - ThreadQueue->CaretInfo->Visible = 1; - if(!ThreadQueue->CaretInfo->Showing) - { - co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - } - IntSetTimer((Window ? Window->hSelf : 0), IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TRUE); - } - - return TRUE; -} - - -BOOL -STDCALL -NtUserShowCaret(HWND hWnd OPTIONAL) -{ - PWINDOW_OBJECT Window = NULL; - DECLARE_RETURN(BOOL); - BOOL ret; - DPRINT("Enter NtUserShowCaret\n"); UserEnterExclusive(); @@ -430,7 +417,12 @@ } if (Window) UserRefObjectCo(Window); - ret = co_UserShowCaret(Window); + + if (bShow) + ret = co_UserShowCaret(Window); + else + ret = co_UserHideCaret(Window); + if (Window) UserDerefObjectCo(Window); RETURN(ret); _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-23 21:46:54 UTC (rev 18021) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-24 02:50:02 UTC (rev 18022) @@ -47,434 +47,222 @@ return(STATUS_SUCCESS); } -BOOL FASTCALL -ClassReferenceClassByAtom( - PWNDCLASS_OBJECT* Class, - RTL_ATOM Atom, - HINSTANCE hInstance) + +/* return TRUE if class became destroyed */ +inline VOID FASTCALL +ClassDerefObject(PWNDCLASS_OBJECT Class) { - PWNDCLASS_OBJECT Current, BestMatch = NULL; - PLIST_ENTRY CurrentEntry; - PW32PROCESS Process = PsGetWin32Process(); + ASSERT(Class->refs >= 1); + Class->refs--; +} - CurrentEntry = Process->ClassListHead.Flink; - while (CurrentEntry != &Process->ClassListHead) - { - Current = CONTAINING_RECORD(CurrentEntry, WNDCLASS_OBJECT, ListEntry); - if (Current->Atom == Atom && (hInstance == NULL || Current->hInstance == hInstance)) - { - *Class = Current; - ObmReferenceObject(Current); - return TRUE; - } +inline VOID FASTCALL +ClassRefObject(PWNDCLASS_OBJECT Class) +{ + ASSERT(Class->refs >= 0); + Class->refs++; +} - if (Current->Atom == Atom && Current->Global) - BestMatch = Current; - CurrentEntry = CurrentEntry->Flink; - } +VOID FASTCALL DestroyClass(PWNDCLASS_OBJECT Class) +{ + PWINSTATION_OBJECT WinSta; + WinSta = PsGetWin32Thread()->Desktop->WindowStation; + + ASSERT(Class->refs == 0); + RemoveEntryList(&Class->ListEntry); + //FIXME: release ATOM + RtlDeleteAtomFromAtomTable(WinSta->AtomTable, Class->Atom); + ExFreePool(Class); +} - if (BestMatch != NULL) - { - *Class = BestMatch; - ObmReferenceObject(BestMatch); - return TRUE; - } - return FALSE; -} - -BOOL FASTCALL -ClassReferenceClassByName( - PWNDCLASS_OBJECT *Class, - LPCWSTR ClassName, - HINSTANCE hInstance) +/* clean all process classes. all process windows must cleaned first!! */ +void FASTCALL DestroyProcessClasses(PW32PROCESS Process ) { - PWINSTATION_OBJECT WinStaObject; - NTSTATUS Status; - BOOL Found; - RTL_ATOM ClassAtom; + PWNDCLASS_OBJECT Class; - if (!ClassName || !PsGetWin32Thread()->Desktop) - return FALSE; - - WinStaObject = PsGetWin32Thread()->Desktop->WindowStation; - - Status = RtlLookupAtomInAtomTable( - WinStaObject->AtomTable, - (LPWSTR)ClassName, - &ClassAtom); - - if (!NT_SUCCESS(Status)) + while (!IsListEmpty(&Process->ClassList)) { - DPRINT1("Failed to lookup class atom!\n"); - return FALSE; + Class = CONTAINING_RECORD(RemoveHeadList(&Process->ClassList), WNDCLASS_OBJECT, ListEntry); + DestroyClass(Class); } - - Found = ClassReferenceClassByAtom(Class, ClassAtom, hInstance); - - return Found; } -BOOL FASTCALL -ClassReferenceClassByNameOrAtom( - PWNDCLASS_OBJECT *Class, - LPCWSTR ClassNameOrAtom, - HINSTANCE hInstance) -{ - BOOL Found; - if (IS_ATOM(ClassNameOrAtom)) - Found = ClassReferenceClassByAtom(Class, (RTL_ATOM)((ULONG_PTR)ClassNameOrAtom), hInstance); - else - Found = ClassReferenceClassByName(Class, ClassNameOrAtom, hInstance); - return Found; -} -DWORD STDCALL -NtUserGetClassInfo( - HINSTANCE hInstance, - LPCWSTR lpClassName, - LPWNDCLASSEXW lpWndClassEx, - BOOL Ansi, - DWORD unknown3) +PWNDCLASS_OBJECT FASTCALL +ClassGetClassByAtom(RTL_ATOM Atom, HINSTANCE hInstance) { PWNDCLASS_OBJECT Class; - RTL_ATOM Atom; - DECLARE_RETURN(DWORD); + PW32PROCESS Process = PsGetWin32Process(); - if (IS_ATOM(lpClassName)) - DPRINT("NtUserGetClassInfo - %x (%lx)\n", lpClassName, hInstance); - else - DPRINT("NtUserGetClassInfo - %S (%lx)\n", lpClassName, hInstance); + LIST_FOR_EACH(Class, &Process->ClassList, WNDCLASS_OBJECT, ListEntry) + { + if (Class->Atom != Atom) continue; - UserEnterExclusive(); - - if (!ClassReferenceClassByNameOrAtom(&Class, lpClassName, hInstance)) - { - SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); - RETURN(0); + if (!hInstance || Class->Global || Class->hInstance == hInstance) return Class; } + + return NULL; +} - lpWndClassEx->cbSize = sizeof(WNDCLASSEXW); - lpWndClassEx->style = Class->style; - if (Ansi) - lpWndClassEx->lpfnWndProc = Class->lpfnWndProcA; - else - lpWndClassEx->lpfnWndProc = Class->lpfnWndProcW; - lpWndClassEx->cbClsExtra = Class->cbClsExtra; - lpWndClassEx->cbWndExtra = Class->cbWndExtra; - /* This is not typo, we're really not going to use Class->hInstance here. */ - lpWndClassEx->hInstance = hInstance; - lpWndClassEx->hIcon = Class->hIcon; - lpWndClassEx->hCursor = Class->hCursor; - lpWndClassEx->hbrBackground = Class->hbrBackground; - if (Class->lpszMenuName.MaximumLength) - RtlCopyUnicodeString((PUNICODE_STRING)lpWndClassEx->lpszMenuName, &Class->lpszMenuName); - else - lpWndClassEx->lpszMenuName = Class->lpszMenuName.Buffer; - lpWndClassEx->lpszClassName = lpClassName; - lpWndClassEx->hIconSm = Class->hIconSm; - Atom = Class->Atom; - ObmDereferenceObject(Class); - - RETURN(Atom); - -CLEANUP: - DPRINT("Leave NtUserGetClassInfo, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - -ULONG FASTCALL -IntGetClassName(struct _WINDOW_OBJECT *WindowObject, LPWSTR lpClassName, - ULONG nMaxCount) +PWNDCLASS_OBJECT FASTCALL +ClassGetClassByName(LPCWSTR ClassName, HINSTANCE hInstance) { - ULONG Length; - LPWSTR Name; - PWINSTATION_OBJECT WinStaObject; + PWINSTATION_OBJECT WinSta; NTSTATUS Status; + RTL_ATOM Atom; - if(!PsGetWin32Thread()->Desktop) - { - return 0; - } + if (!ClassName || !PsGetWin32Thread()->Desktop) + return FALSE; - WinStaObject = PsGetWin32Thread()->Desktop->WindowStation; + WinSta = PsGetWin32Thread()->Desktop->WindowStation; - Length = 0; - Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable, - WindowObject->Class->Atom, NULL, NULL, - NULL, &Length); - Length += sizeof(WCHAR); - Name = ExAllocatePoolWithTag(PagedPool, Length, TAG_STRING); - Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable, - WindowObject->Class->Atom, NULL, NULL, - Name, &Length); + Status = RtlLookupAtomInAtomTable( + WinSta->AtomTable, + (LPWSTR)ClassName, + &Atom); + if (!NT_SUCCESS(Status)) { - DPRINT("IntGetClassName: RtlQueryAtomInAtomTable failed\n"); - return 0; + DPRINT1("Failed to lookup class atom!\n"); + return FALSE; } - Length /= sizeof(WCHAR); - if (Length > nMaxCount) - { - Length = nMaxCount; - } - wcsncpy(lpClassName, Name, Length); - /* FIXME: Check buffer size before doing this! */ - *(lpClassName + Length) = 0; - ExFreePool(Name); - return Length; + return ClassGetClassByAtom(Atom, hInstance); } -DWORD STDCALL -NtUserGetClassName ( - HWND hWnd, - LPWSTR lpClassName, - ULONG nMaxCount) -{ - PWINDOW_OBJECT Window; - DECLARE_RETURN(DWORD); - UserEnterShared(); - DPRINT("Enter NtUserGetClassName\n"); - - if (!(Window = UserGetWindowObject(hWnd))) - { - RETURN(0); - } - - RETURN( IntGetClassName(Window, lpClassName, nMaxCount)); - -CLEANUP: - DPRINT("Leave NtUserGetClassName, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - -DWORD STDCALL -NtUserGetWOWClass(DWORD Unknown0, - DWORD Unknown1) +PWNDCLASS_OBJECT FASTCALL +ClassGetClassByNameOrAtom(LPCWSTR ClassNameOrAtom, HINSTANCE hInstance) { - UNIMPLEMENTED; - return(0); + if (!ClassNameOrAtom) return NULL; + + if (IS_ATOM(ClassNameOrAtom)) + return ClassGetClassByAtom((RTL_ATOM)((ULONG_PTR)ClassNameOrAtom), hInstance); + else + return ClassGetClassByName(ClassNameOrAtom, hInstance); } -PWNDCLASS_OBJECT FASTCALL -IntCreateClass( + +static +BOOL FASTCALL +IntRegisterClass( CONST WNDCLASSEXW *lpwcx, DWORD Flags, WNDPROC wpExtra, PUNICODE_STRING MenuName, RTL_ATOM Atom) { - PWNDCLASS_OBJECT ClassObject; + PWNDCLASS_OBJECT Class; ULONG objectSize; BOOL Global; - Global = (Flags & REGISTERCLASS_SYSTEM) || (lpwcx->style & CS_GLOBALCLASS) ? TRUE : FALSE; + ASSERT(lpwcx); + ASSERT(Atom); [truncated at 1000 lines; 1785 more skipped]

1 0

[gedmurphy] 18021: First commit, mainly testing.
by gedmurphy＠svn.reactos.com 23 Sep '05

23 Sep '05

First commit, mainly testing. Cleanup code to follow ROS' coding style better Remove tabs and trailing whitespace. Modified: trunk/reactos/apps/utils/net/tracert/tracert.c Modified: trunk/reactos/apps/utils/net/tracert/tracert.h _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.c --- trunk/reactos/apps/utils/net/tracert/tracert.c 2005-09-23 21:08:57 UTC (rev 18020) +++ trunk/reactos/apps/utils/net/tracert/tracert.c 2005-09-23 21:46:54 UTC (rev 18021) @@ -1,4 +1,22 @@ -/* +/* + * ReactOS Win32 Applications + * Copyright (C) 2005 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. + */ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS traceroute utility * FILE: apps/utils/net/tracert/tracert.c @@ -29,7 +47,7 @@ /* * globals */ -SOCKET icmpSock; // socket descriptor +SOCKET icmpSock; // socket descriptor SOCKADDR_IN source, dest; // source and destination address info ECHO_REPLY_HEADER sendpacket; // ICMP echo packet IPv4_HEADER recvpacket; // return reveive packet @@ -38,7 +56,7 @@ LARGE_INTEGER TicksPerMs; // number of millisecs in relation to proc freq LARGE_INTEGER TicksPerUs; // number of microsecs in relation to proc freq LONGLONG lTimeStart; // send packet, timer start -LONGLONG lTimeEnd; // receive packet, timer end +LONGLONG lTimeEnd; // receive packet, timer end CHAR cHostname[256]; // target hostname CHAR cDestIP[18]; // target IP @@ -55,7 +73,7 @@ -/* +/* * * Parse command line parameters and set any options * @@ -63,35 +81,37 @@ BOOL ParseCmdline(int argc, char* argv[]) { int i; - - if (argc < 2) + + if (argc < 2) { Usage(); return FALSE; } - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - switch (argv[i][1]) { - case 'd': bResolveAddresses = FALSE; + for (i = 1; i < argc; i++) + { + if (argv[i][0] == '-') + { + switch (argv[i][1]) + { + case 'd': bResolveAddresses = FALSE; break; - case 'h': sscanf(argv[i+1], "%d", &iMaxHops); + case 'h': sscanf(argv[i+1], "%d", &iMaxHops); break; - case 'l': break; /* @unimplemented@ */ - case 'w': sscanf(argv[i+1], "%d", &iTimeOut); + case 'j': break; /* @unimplemented@ */ + case 'w': sscanf(argv[i+1], "%d", &iTimeOut); break; default: _tprintf(_T("%s is not a valid option.\n"), argv[i]); Usage(); return FALSE; } - } else { + } + else /* copy target address */ strncpy(cHostname, argv[i], 255); + } - } - } - return TRUE; } @@ -100,11 +120,11 @@ /* * * Driver function, controls the traceroute program - * + * */ -INT Driver(VOID) { - - INT i; +INT Driver(VOID) +{ + INT iHopCount = 1; // hop counter. default max is 30 INT iSeqNum = 0; // initialise packet sequence number INT iTTL = 1; // set initial packet TTL to 1 @@ -115,27 +135,29 @@ INT iNameInfoRet; // getnameinfo return value INT iPacketSize = PACKET_SIZE; // packet size WORD wHeaderLen; // header length - PECHO_REPLY_HEADER icmphdr; - - + PECHO_REPLY_HEADER icmphdr; + + //temps for getting host name CHAR cHost[256]; CHAR cServ[256]; CHAR *ip; - + /* setup winsock */ WSADATA wsaData; /* check for winsock 2 */ - if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) { + if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) + { #ifdef DBG _tprintf(_T("WSAStartup failed.\n")); #endif /* DBG */ exit(1); } - + + /* establish what timing method we can use */ SetupTimingMethod(); - + /* setup target info */ ResolveHostname(); @@ -145,11 +167,16 @@ iMaxHops > 1 ? _tprintf(_T("s:\n\n")) : _tprintf(_T(":\n\n")); /* run until we hit either max hops, or we recieve 3 echo replys */ - while ((iHopCount <= iMaxHops) && (bFoundTarget != TRUE)) { + while ((iHopCount <= iMaxHops) && (bFoundTarget != TRUE)) + { + INT i; + _tprintf(_T("%3d "), iHopCount); /* run 3 pings for each hop */ - for (i=0; i<3; i++) { - if (Setup(iTTL) != TRUE) { + for (i=0; i<3; i++) + { + if (Setup(iTTL) != TRUE) + { #ifdef DBG _tprintf(_T("error in Setup()\n")); #endif /* DBG */ @@ -157,71 +184,77 @@ exit(1); } PreparePacket(iPacketSize, iSeqNum); - if (SendPacket(iPacketSize) != SOCKET_ERROR) { + if (SendPacket(iPacketSize) != SOCKET_ERROR) + { /* loop until we get a good packet */ bAwaitPacket = TRUE; - while (bAwaitPacket) { + while (bAwaitPacket) + { /* Receive replies until we either get a successful * read, or a fatal error occurs. */ - if ((iRecieveReturn = ReceivePacket(iPacketSize)) < 0) { + if ((iRecieveReturn = ReceivePacket(iPacketSize)) < 0) + { /* check the sequence number in the packet * if it's bad, complain and wait for another packet * , otherwise break */ wHeaderLen = recvpacket.h_len * 4; icmphdr = (ECHO_REPLY_HEADER *)((char*)&recvpacket + wHeaderLen); - if (icmphdr->icmpheader.seq != iSeqNum) { + if (icmphdr->icmpheader.seq != iSeqNum) + { _tprintf(_T("bad sequence number!\n")); continue; - } else { + } + else break; - } } - + /* if RecievePacket timed out we don't bother decoding */ - if (iRecieveReturn != 1) { + if (iRecieveReturn != 1) + { iDecRes = DecodeResponse(iPacketSize, iSeqNum); - - switch (iDecRes) { + + switch (iDecRes) + { case 0 : bAwaitPacket = FALSE; /* time exceeded */ break; case 1 : bAwaitPacket = FALSE; /* echo reply */ - break; + break; case 2 : bAwaitPacket = FALSE; /* destination unreachable */ - break; -#ifdef DBG + break; +#ifdef DBG case -1 : - _tprintf(_T("recieved foreign packet\n")); + _tprintf(_T("recieved foreign packet\n")); break; - case -2 : - _tprintf(_T("error in DecodeResponse\n")); + case -2 : + _tprintf(_T("error in DecodeResponse\n")); break; - case -3 : - _tprintf(_T("unknown ICMP packet\n")); + case -3 : + _tprintf(_T("unknown ICMP packet\n")); break; #endif /* DBG */ default : break; } - } else { + } + else /* packet timed out. Don't wait for it again */ bAwaitPacket = FALSE; - } - } + } } iSeqNum++; _tprintf(_T(" ")); } - if(bResolveAddresses) { - /* gethostbyaddr() and getnameinfo() are + if(bResolveAddresses) + { + /* gethostbyaddr() and getnameinfo() are * unimplemented in ROS at present. - * Alex has advised he will be implementing gethostbyaddr - * but as it's depricieted and getnameinfo is much nicer, + * Alex has advised he will be implementing getnameinfo. * I've used that for the time being for testing in Windows*/ - + //ip = inet_addr(inet_ntoa(source.sin_addr)); //host = gethostbyaddr((char *)&ip, 4, 0); - + ip = inet_ntoa(source.sin_addr); iNameInfoRet = getnameinfo((SOCKADDR *)&source, @@ -231,30 +264,34 @@ cServ, 256, NI_NUMERICSERV); - if (iNameInfoRet == 0) { + if (iNameInfoRet == 0) + { /* if IP address resolved to a hostname, - * print the IP address after it */ - if (lstrcmpA(cHost, ip) != 0) { + * print the IP address after it */ + if (lstrcmpA(cHost, ip) != 0) _tprintf(_T("%s [%s]"), cHost, ip); - } else { + else _tprintf(_T("%s"), cHost); - } - } else { - _tprintf(_T("error: %d"), WSAGetLastError()); + } + else + { + _tprintf(_T("error: %d"), WSAGetLastError()); #ifdef DBG _tprintf(_T(" getnameinfo failed: %d"), iNameInfoRet); -#endif /* DBG */ +#endif /* DBG */ } - } else { + } + else _tprintf(_T("%s"), inet_ntoa(source.sin_addr)); - } + _tprintf(_T("\n")); /* check if we've arrived at the target */ - if (strcmp(cDestIP, inet_ntoa(source.sin_addr)) == 0) { + if (strcmp(cDestIP, inet_ntoa(source.sin_addr)) == 0) bFoundTarget = TRUE; - } else { + else + { iTTL++; iHopCount++; Sleep(500); @@ -262,37 +299,39 @@ } _tprintf(_T("\nTrace complete.\n")); WSACleanup(); - + return 0; } + /* * Establish if performance counters are available and * set up timing figures in relation to processor frequency. - * If performance counters are not available, we'll be using + * If performance counters are not available, we'll be using * gettickcount, so set the figures to 1 * */ VOID SetupTimingMethod(VOID) { LARGE_INTEGER PerformanceCounterFrequency; - + /* check if performance counters are available */ bUsePerformanceCounter = QueryPerformanceFrequency(&PerformanceCounterFrequency); - if (bUsePerformanceCounter) { + if (bUsePerformanceCounter) + { /* restrict execution to first processor on SMP systems */ - if (SetThreadAffinityMask(GetCurrentThread(), 1) == 0) { + if (SetThreadAffinityMask(GetCurrentThread(), 1) == 0) bUsePerformanceCounter = FALSE; - } - + TicksPerMs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000; TicksPerUs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000000; } - - if (!bUsePerformanceCounter) { + + if (!bUsePerformanceCounter) + { TicksPerMs.QuadPart = 1; TicksPerUs.QuadPart = 1; - } + } } @@ -300,7 +339,7 @@ * * Check for a hostname or dotted deciamal for our target. * If we have a hostname, resolve to an IP and store it, else - * just store the target IP address. Also set up other key + * just store the target IP address. Also set up other key * SOCKADDR_IN members needed for the connection. * */ @@ -308,28 +347,34 @@ { HOSTENT *hp; ULONG addr; - + memset(&dest, 0, sizeof(dest)); addr = inet_addr(cHostname); /* if address is not a dotted decimal */ - if (addr == INADDR_NONE) { + if (addr == INADDR_NONE) + { hp = gethostbyname(cHostname); - if (hp != 0) { + if (hp != 0) + { memcpy(&dest.sin_addr, hp->h_addr, hp->h_length); //dest.sin_addr = *((struct in_addr *)hp->h_addr); dest.sin_family = hp->h_addrtype; - } else { + } + else + { _tprintf(_T("Unable to resolve target system name %s.\n"), cHostname); WSACleanup(); exit(1); } - } else { + } + else + { dest.sin_addr.s_addr = addr; dest.sin_family = AF_INET; } /* copy destination IP address into a string */ - strcpy(cDestIP, inet_ntoa(dest.sin_addr)); + strcpy(cDestIP, inet_ntoa(dest.sin_addr)); } @@ -347,23 +392,26 @@ /* create raw socket */ icmpSock = WSASocket(AF_INET, SOCK_RAW, IPPROTO_ICMP, 0, 0, 0); - if (icmpSock == INVALID_SOCKET) { + if (icmpSock == INVALID_SOCKET) + { _tprintf(_T("Could not create socket : %d.\n"), WSAGetLastError()); - if (WSAGetLastError() == WSAEACCES) { + if (WSAGetLastError() == WSAEACCES) + { _tprintf(_T("\n\nYou must be an administrator to run this program!\n\n")); WSACleanup(); exit(1); - } + } return FALSE; } - + /* setup for TTL */ iSockRet = setsockopt(icmpSock, IPPROTO_IP, IP_TTL, (const char *)&iTTL, sizeof(iTTL)); - if (iSockRet == SOCKET_ERROR) { + if (iSockRet == SOCKET_ERROR) + { _tprintf(_T("TTL setsockopt failed : %d. \n"), WSAGetLastError()); return FALSE; } - + return TRUE; } @@ -374,7 +422,7 @@ * Calculate the packet checksum * */ -VOID PreparePacket(INT iPacketSize, INT iSeqNum) +VOID PreparePacket(INT iPacketSize, INT iSeqNum) { /* assemble ICMP echo request packet */ sendpacket.icmpheader.type = ECHO_REQUEST; @@ -399,7 +447,7 @@ { INT iSockRet; INT iPacketSize; - + iPacketSize = sizeof(ECHO_REPLY_HEADER) + datasize; #ifdef DBG @@ -415,16 +463,20 @@ 0, //flags (SOCKADDR *)&dest, //destination sizeof(dest)); //address length - - if (iSockRet == SOCKET_ERROR) { - if (WSAGetLastError() == WSAEACCES) { + + if (iSockRet == SOCKET_ERROR) + { + if (WSAGetLastError() == WSAEACCES) + { _tprintf(_T("\n\nYou must be an administrator to run this program!\n\n")); exit(1); WSACleanup(); - } else { + } + else + { #ifdef DBG _tprintf(_T("sendto failed %d\n"), WSAGetLastError()); -#endif /* DBG */ +#endif /* DBG */ return FALSE; } } @@ -441,7 +493,7 @@ /* * * Set up a timeout value and put the socket in a select poll. - * Wait until we recieve an IPv4 reply packet in reply to the ICMP + * Wait until we recieve an IPv4 reply packet in reply to the ICMP * echo request packet and get the time the packet was recieved. * If we don't recieve a packet, do some checking to establish why. * @@ -456,7 +508,7 @@ /* allow for a larger recv buffer to store ICMP TTL * exceed, IP header and orginal ICMP request */ - iPacketSize = MAX_REC_SIZE + datasize; + iPacketSize = MAX_REC_SIZE + datasize; iFromLen = sizeof(source); @@ -467,14 +519,15 @@ /* monitor icmpSock for incomming connections */ FD_ZERO(&readFDS); FD_SET(icmpSock, &readFDS); - + /* set timeout values */ timeVal.tv_sec = iTimeOut / 1000; timeVal.tv_usec = iTimeOut % 1000; - + iSelRet = select(0, &readFDS, NULL, NULL, &timeVal); - - if ((iSelRet != SOCKET_ERROR) && (iSelRet != 0)) { + + if ((iSelRet != SOCKET_ERROR) && (iSelRet != 0)) + { iSockRet = recvfrom(icmpSock, //socket (char *)&recvpacket, //buffer iPacketSize, //size of buffer @@ -482,25 +535,29 @@ (SOCKADDR *)&source, //source address &iFromLen); //pointer to address length /* get time packet was recieved */ - lTimeEnd = GetTime(); - /* if socket timed out */ - } else if (iSelRet == 0) { + lTimeEnd = GetTime(); + /* if socket timed out */ + } + else if (iSelRet == 0) + { _tprintf(_T(" * ")); return 1; - } else if (iSelRet == SOCKET_ERROR) { + } + else if (iSelRet == SOCKET_ERROR) + { _tprintf(_T("select() failed in sendPacket() %d\n"), WSAGetLastError()); - return -1; + return -1; } - - if (iSockRet == SOCKET_ERROR) { + + if (iSockRet == SOCKET_ERROR) + { _tprintf(_T("recvfrom failed: %d\n"), WSAGetLastError()); return -2; } #ifdef DBG - else { - _tprintf(_T("reveived %d bytes\n"), iSockRet); - } + else + _tprintf(_T("reveived %d bytes\n"), iSockRet); #endif /* DBG */ return 0; @@ -511,7 +568,7 @@ /* * * Cast the IPv4 packet to an echo reply and to a TTL exceed. - * Check the 'type' field to establish what was recieved, and + * Check the 'type' field to establish what was recieved, and * ensure the packet is related to the originating process. * It all is well, print the time taken for the round trip. * @@ -524,14 +581,17 @@ TTL_EXCEED_HEADER *TTLExceedHdr = (TTL_EXCEED_HEADER *)((char *)&recvpacket + header_len); /* Make sure the reply is ok */ - if (iPacketSize < header_len + ICMP_MIN_SIZE) { + if (iPacketSize < header_len + ICMP_MIN_SIZE) + { _tprintf(_T("too few bytes from %s\n"), inet_ntoa(dest.sin_addr)); return -2; - } - - switch (IcmpHdr->icmpheader.type) { + } + + switch (IcmpHdr->icmpheader.type) + { case TTL_EXCEEDED : - if (TTLExceedHdr->OrigIcmpHeader.id != (USHORT)GetCurrentProcessId()) { + if (TTLExceedHdr->OrigIcmpHeader.id != (USHORT)GetCurrentProcessId()) + { /* FIXME */ /* we've picked up a packet not related to this process * probably from another local program. We ignore it */ @@ -544,7 +604,8 @@ _tprintf(_T("%3Ld ms"), (lTimeEnd - lTimeStart) / TicksPerMs.QuadPart); return 0; case ECHO_REPLY : - if (IcmpHdr->icmpheader.id != (USHORT)GetCurrentProcessId()) { + if (IcmpHdr->icmpheader.id != (USHORT)GetCurrentProcessId()) + { /* FIXME */ /* we've picked up a packet not related to this process * probably from another local program. We ignore it */ @@ -562,7 +623,7 @@ default : /* unknown ICMP packet */ return -3; - } + } } @@ -573,17 +634,21 @@ * */ -LONG GetTime(VOID) +LONG GetTime(VOID) { LARGE_INTEGER Time; - - if (bUsePerformanceCounter) { - if (QueryPerformanceCounter(&Time) == 0) { + + if (bUsePerformanceCounter) + { + if (QueryPerformanceCounter(&Time) == 0) + { Time.u.LowPart = (DWORD)GetTickCount(); Time.u.HighPart = 0; return (LONGLONG)Time.u.LowPart; - } - } else { + } + } + else + { Time.u.LowPart = (DWORD)GetTickCount(); Time.u.HighPart = 0; return (LONGLONG)Time.u.LowPart; @@ -601,7 +666,8 @@ { DWORD dwSum = 0; - while (size > 1) { + while (size > 1) + { dwSum += *data++; size -= sizeof(USHORT); } @@ -623,13 +689,13 @@ */ VOID Usage(VOID) { - _tprintf(_T("\nUsage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name\n\n")); - _tprintf(_T("Options:\n")); - _tprintf(_T(" -d Do not resolve addresses to hostnames.\n")); - _tprintf(_T(" -h maximum_hops Maximum number of hops to search for target.\n")); - _tprintf(_T(" -j host-list Loose source route along host-list.\n")); - _tprintf(_T(" -w timeout Wait timeout milliseconds for each reply.\n\n")); - + _tprintf(_T("\nUsage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name\n\n" + "Options:\n" + " -d Do not resolve addresses to hostnames.\n" + " -h maximum_hops Maximum number of hops to search for target.\n" + " -j host-list Loose source route along host-list.\n" + " -w timeout Wait timeout milliseconds for each reply.\n\n")); + /* temp notes to stop user questions until getnameinfo/gethostbyaddr and getsockopt are implemented */ _tprintf(_T("NOTES\n-----\n" "- Setting TTL values is not currently supported in ReactOS, so the trace will\n" _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.h --- trunk/reactos/apps/utils/net/tracert/tracert.h 2005-09-23 21:08:57 UTC (rev 18020) +++ trunk/reactos/apps/utils/net/tracert/tracert.h 2005-09-23 21:46:54 UTC (rev 18021) @@ -16,16 +16,17 @@ #define ICMP_MIN_SIZE 8 #define ICMP_MAX_SIZE 65535 #define PACKET_SIZE 32 -/* we need this for packets which have the 'dont fragment' - * bit set, as they can get quite large otherwise +/* we need this for packets which have the 'dont fragment' + * bit set, as they can get quite large otherwise * (I've seen some reach 182 bytes */ -#define MAX_REC_SIZE 200 +#define MAX_REC_SIZE 200 /* pack the structures */ -#pragma pack(1) +#include <pshpack1.h> /* IPv4 Header, 20 bytes */ -typedef struct IPv4Header { +typedef struct IPv4Header +{ BYTE h_len:4; BYTE version:4; BYTE tos; @@ -40,7 +41,8 @@ } IPv4_HEADER, *PIPv4_HEADER; /* ICMP Header, 8 bytes */ -typedef struct ICMPHeader { +typedef struct ICMPHeader +{ BYTE type; BYTE code; USHORT checksum; @@ -49,20 +51,22 @@ } ICMP_HEADER, *PICMP_HEADER; /* ICMP Echo Reply Header, 12 bytes */ -typedef struct EchoReplyHeader { +typedef struct EchoReplyHeader +{ struct ICMPHeader icmpheader; - struct timeval timestamp; + struct timeval timestamp; } ECHO_REPLY_HEADER, *PECHO_REPLY_HEADER; /* ICMP Echo Reply Header, 12 bytes */ -typedef struct TTLExceedHeader { +typedef struct TTLExceedHeader +{ struct ICMPHeader icmpheader; struct IPv4Header ipheader; struct ICMPHeader OrigIcmpHeader; } TTL_EXCEED_HEADER, *PTTL_EXCEED_HEADER; /* return to normal */ -#pragma pack() +#include <poppack.h> /* function definitions */

1 0

[gvg] 18020: Fix RtlQueryAtomInAtomTable and add regression tests
by gvg＠svn.reactos.com 23 Sep '05

23 Sep '05

Fix RtlQueryAtomInAtomTable and add regression tests Modified: trunk/reactos/lib/rtl/atom.c Modified: trunk/reactos/regtests/winetests/ntdll/atom.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c _____ Modified: trunk/reactos/lib/rtl/atom.c --- trunk/reactos/lib/rtl/atom.c 2005-09-23 19:24:20 UTC (rev 18019) +++ trunk/reactos/lib/rtl/atom.c 2005-09-23 21:08:57 UTC (rev 18020) @@ -565,6 +565,23 @@ /* * @implemented + * + * This API is really messed up with regards to NameLength. If you pass in a + * valid buffer for AtomName, NameLength should be the size of the buffer + * (in bytes, not characters). So if you expect the string to be 6 char long, + * you need to allocate a buffer of 7 WCHARs and pass 14 for NameLength. + * The AtomName returned is always null terminated. If the NameLength you pass + * is smaller than 4 (4 would leave room for 1 character) the function will + * return with status STATUS_BUFFER_TOO_SMALL. If you pass more than 4, the + * return status will be STATUS_SUCCESS, even if the buffer is not large enough + * to hold the complete string. In that case, the string is silently truncated + * and made to fit in the provided buffer. On return NameLength is set to the + * number of bytes (but EXCLUDING the bytes for the null terminator) copied. + * So, if the string is 6 char long, you pass a buffer of 10 bytes, on return + * NameLength will be set to 8. + * If you pass in a NULL value for AtomName, the length of the string in bytes + * (again EXCLUDING the null terminator) is returned in NameLength, at least + * on Win2k, XP and ReactOS. NT4 will return 0 in that case. */ NTSTATUS STDCALL RtlQueryAtomInAtomTable(PRTL_ATOM_TABLE AtomTable, @@ -575,54 +592,35 @@ PULONG NameLength) { ULONG Length; + union + { + /* A RTL_ATOM_TABLE_ENTRY has a "WCHAR Name[1]" entry at the end. + * Make sure we reserve enough room to facilitate a 12 character name */ + RTL_ATOM_TABLE_ENTRY AtomTableEntry; + WCHAR StringBuffer[sizeof(RTL_ATOM_TABLE_ENTRY) / sizeof(WCHAR) + 12]; + } NumberEntry; PRTL_ATOM_TABLE_ENTRY Entry; NTSTATUS Status = STATUS_SUCCESS; if (Atom < 0xC000) { - if (RefCount != NULL) - { - *RefCount = 1; - } + /* Synthesize an entry */ + NumberEntry.AtomTableEntry.Atom = Atom; + NumberEntry.AtomTableEntry.NameLength = swprintf(NumberEntry.AtomTableEntry.Name, + L"#%lu", + (ULONG)Atom); + NumberEntry.AtomTableEntry.ReferenceCount = 1; + NumberEntry.AtomTableEntry.Flags = RTL_ATOM_IS_PINNED; + Entry = &NumberEntry.AtomTableEntry; + } + else + { + RtlpLockAtomTable(AtomTable); - if (PinCount != NULL) - { - *PinCount = 1; - } - - if ((AtomName != NULL) && (NameLength != NULL) && (NameLength > 0)) - { - WCHAR NameString[12]; - - Length = swprintf(NameString, L"#%lu", (ULONG)Atom) * sizeof(WCHAR); - - if (*NameLength < Length + sizeof(WCHAR)) - { - *NameLength = Length; - Status = STATUS_BUFFER_TOO_SMALL; - } - else - { - RtlCopyMemory(AtomName, - NameString, - Length); - AtomName[Length / sizeof(WCHAR)] = L'\0'; - *NameLength = Length; - } - } - else if (NameLength != NULL) - { - *NameLength = (Entry->NameLength + 1) * sizeof(WCHAR); - } - - return Status; + Entry = RtlpGetAtomEntry(AtomTable, + (ULONG)((USHORT)Atom - 0xC000)); } - RtlpLockAtomTable(AtomTable); - - Entry = RtlpGetAtomEntry(AtomTable, - (ULONG)((USHORT)Atom - 0xC000)); - if (Entry != NULL && Entry->Atom == (USHORT)Atom) { DPRINT("Atom name: %wZ\n", &Entry->Name); @@ -637,27 +635,40 @@ *PinCount = ((Entry->Flags & RTL_ATOM_IS_PINNED) != 0); } - if ((AtomName != NULL) && (NameLength != NULL)) + if (NULL != NameLength) { Length = Entry->NameLength * sizeof(WCHAR); - - if (*NameLength < Length + sizeof(WCHAR)) + if (NULL != AtomName) { - *NameLength = Length; - Status = STATUS_BUFFER_TOO_SMALL; + if (*NameLength < Length + sizeof(WCHAR)) + { + if (*NameLength < 4) + { + *NameLength = Length; + Status = STATUS_BUFFER_TOO_SMALL; + } + else + { + Length = *NameLength - sizeof(WCHAR); + } + } + if (NT_SUCCESS(Status)) + { + RtlCopyMemory(AtomName, + Entry->Name, + Length); + AtomName[Length / sizeof(WCHAR)] = L'\0'; + *NameLength = Length; + } } else { - RtlCopyMemory(AtomName, - Entry->Name, - Length); - AtomName[Length / sizeof(WCHAR)] = L'\0'; *NameLength = Length; } } - else if (NameLength != NULL) + else if (NULL != AtomName) { - *NameLength = (Entry->NameLength + 1) * sizeof(WCHAR); + Status = STATUS_INVALID_PARAMETER; } } else @@ -665,7 +676,10 @@ Status = STATUS_INVALID_HANDLE; } - RtlpUnlockAtomTable(AtomTable); + if (NULL != Entry && Entry != &NumberEntry.AtomTableEntry) + { + RtlpUnlockAtomTable(AtomTable); + } return Status; } _____ Modified: trunk/reactos/regtests/winetests/ntdll/atom.c --- trunk/reactos/regtests/winetests/ntdll/atom.c 2005-09-23 19:24:20 UTC (rev 18019) +++ trunk/reactos/regtests/winetests/ntdll/atom.c 2005-09-23 21:08:57 UTC (rev 18020) @@ -233,6 +233,19 @@ ok(res == STATUS_BUFFER_TOO_SMALL, "Got wrong retval, retval: %lx\n", res); ok((strlenW(testAtom1) * sizeof(WCHAR)) == Len, "Got wrong length %lx\n", Len); + res = pRtlQueryAtomInAtomTable(AtomTable, Atom1, NULL, NULL, NULL, &Len); + ok(!res, "Failed to retrieve atom length, retval: %lx\n", res); + ok(Len == strlenW(testAtom1) * sizeof(WCHAR), "Invalid atom length got %lu expected %u\n", + Len, strlenW(testAtom1) * sizeof(WCHAR)); + + Len = strlenW(testAtom1) * sizeof(WCHAR); + Name[strlenW(testAtom1)] = '*'; + res = pRtlQueryAtomInAtomTable(AtomTable, Atom1, NULL, NULL, Name, &Len); + ok(!res, "Failed with exactly long enough buffer, retval: %lx\n", res); + ok(Name[strlenW(testAtom1)] == '*', "Writing outside buffer\n"); + ok(0 == memcmp(Name, testAtom1, (strlenW(testAtom1) - 1) * sizeof(WCHAR)), + "We found wrong atom!!\n"); + res = pRtlPinAtomInAtomTable(AtomTable, Atom1); ok(!res, "Unable to pin atom in atom table, retval: %lx\n", res); _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-23 19:24:20 UTC (rev 18019) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-23 21:08:57 UTC (rev 18020) @@ -207,10 +207,13 @@ Length = 0; Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable, - WindowObject->Class->Atom, NULL, NULL, NULL, &Length); + WindowObject->Class->Atom, NULL, NULL, + NULL, &Length); + Length += sizeof(WCHAR); Name = ExAllocatePoolWithTag(PagedPool, Length, TAG_STRING); Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable, - WindowObject->Class->Atom, NULL, NULL, Name, &Length); + WindowObject->Class->Atom, NULL, NULL, + Name, &Length); if (!NT_SUCCESS(Status)) { DPRINT("IntGetClassName: RtlQueryAtomInAtomTable failed\n");

1 0

[weiden] 18019: imported shfolder.dll from WINE-20050830
by weiden＠svn.reactos.com 23 Sep '05

23 Sep '05

imported shfolder.dll from WINE-20050830 Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/shfolder/ Added: trunk/reactos/lib/shfolder/Makefile.in Added: trunk/reactos/lib/shfolder/shfolder.spec Added: trunk/reactos/lib/shfolder/shfolder.xml Added: trunk/reactos/lib/shfolder/shfolder_main.c Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-09-23 18:15:39 UTC (rev 18018) +++ trunk/reactos/baseaddress.xml 2005-09-23 19:24:20 UTC (rev 18019) @@ -57,6 +57,7 @@ <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> +<property name="BASEADDRESS_SHFOLDER" value="0x76780000" /> <property name="BASEADDRESS_NTMARTA" value="0x768A0000" /> <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" /> <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" /> _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-09-23 18:15:39 UTC (rev 18018) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-09-23 19:24:20 UTC (rev 18019) @@ -136,6 +136,7 @@ lib\setupapi\setupapi.dll 1 lib\shdocvw\shdocvw.dll 1 lib\shell32\shell32.dll 1 +lib\shfolder\shfolder.dll 1 lib\shlwapi\shlwapi.dll 1 lib\smdll\smdll.dll 1 lib\syssetup\syssetup.dll 1 _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-09-23 18:15:39 UTC (rev 18018) +++ trunk/reactos/lib/directory.xml 2005-09-23 19:24:20 UTC (rev 18019) @@ -224,6 +224,9 @@ <directory name="shell32"> <xi:include href="shell32/shell32.xml" /> </directory> +<directory name="shfolder"> + <xi:include href="shfolder/shfolder.xml" /> +</directory> <directory name="shlwapi"> <xi:include href="shlwapi/shlwapi.xml" /> </directory> _____ Added: trunk/reactos/lib/shfolder/Makefile.in --- trunk/reactos/lib/shfolder/Makefile.in 2005-09-23 18:15:39 UTC (rev 18018) +++ trunk/reactos/lib/shfolder/Makefile.in 2005-09-23 19:24:20 UTC (rev 18019) @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = shfolder.dll +IMPORTLIB = libshfolder.$(IMPLIBEXT) +IMPORTS = shell32 kernel32 + +C_SRCS = shfolder_main.c + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: trunk/reactos/lib/shfolder/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/shfolder/shfolder.spec --- trunk/reactos/lib/shfolder/shfolder.spec 2005-09-23 18:15:39 UTC (rev 18018) +++ trunk/reactos/lib/shfolder/shfolder.spec 2005-09-23 19:24:20 UTC (rev 18019) @@ -0,0 +1,2 @@ +@ stdcall SHGetFolderPathA(long long long long ptr) shell32.SHGetFolderPathA +@ stdcall SHGetFolderPathW(long long long long ptr) shell32.SHGetFolderPathW Property changes on: trunk/reactos/lib/shfolder/shfolder.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/shfolder/shfolder.xml --- trunk/reactos/lib/shfolder/shfolder.xml 2005-09-23 18:15:39 UTC (rev 18018) +++ trunk/reactos/lib/shfolder/shfolder.xml 2005-09-23 19:24:20 UTC (rev 18019) @@ -0,0 +1,10 @@ +<module name="shfolder" type="win32dll" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll"> + <importlibrary definition="shfolder.spec.def" /> + <include base="shfolder">.</include> + <include base="shfolder">include</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <library>shell32</library> + <file>shfolder_main.c</file> + <file>shfolder.spec</file> +</module> Property changes on: trunk/reactos/lib/shfolder/shfolder.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/lib/shfolder/shfolder_main.c --- trunk/reactos/lib/shfolder/shfolder_main.c 2005-09-23 18:15:39 UTC (rev 18018) +++ trunk/reactos/lib/shfolder/shfolder_main.c 2005-09-23 19:24:20 UTC (rev 18019) @@ -0,0 +1 @@ +/* nothing here yet */ Property changes on: trunk/reactos/lib/shfolder/shfolder_main.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-09-23 18:15:39 UTC (rev 18018) +++ trunk/reactos/media/doc/README.WINE 2005-09-23 19:24:20 UTC (rev 18019) @@ -64,6 +64,7 @@ reactos/lib/setupapi # Forked at Wine-20050524 reactos/lib/shell32 # Synced to Wine-20050830 reactos/lib/shdocvw # Synced to Wine-20050830 +reactos/lib/shfolder # Synced to Wine-20050830 reactos/lib/shlwapi # Synced to Wine-20050830 reactos/lib/twain # Out of sync reactos/lib/urlmon # Synced to Wine-20050830

1 0

[ion] 18018: fix identation bug in 18016
by ion＠svn.reactos.com 23 Sep '05

23 Sep '05

fix identation bug in 18016 Modified: trunk/reactos/subsys/system/notepad/main.c _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-23 16:31:06 UTC (rev 18017) +++ trunk/reactos/subsys/system/notepad/main.c 2005-09-23 18:15:39 UTC (rev 18018) @@ -376,12 +376,12 @@ while (GetMessage(&msg, 0, 0, 0)) { - if (!IsDialogMessage(Globals.hFindReplaceDlg, &msg) && - !TranslateAccelerator(Globals.hMainWnd, hAccel, &msg)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); + if (!IsDialogMessage(Globals.hFindReplaceDlg, &msg) && + !TranslateAccelerator(Globals.hMainWnd, hAccel, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } } - } return msg.wParam; }

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