Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[gdalsnes] 18488: RtlInitUnicodeString is only legal with nullterminated strings and also the string in initialized manually below...

by gdalsnes＠svn.reactos.com

RtlInitUnicodeString is only legal with nullterminated strings and also the string in initialized manually below... Modified: trunk/reactos/lib/user32/windows/clipboard.c _____ Modified: trunk/reactos/lib/user32/windows/clipboard.c --- trunk/reactos/lib/user32/windows/clipboard.c 2005-10-15 21:41:48 UTC (rev 18487) +++ trunk/reactos/lib/user32/windows/clipboard.c 2005-10-16 01:22:18 UTC (rev 18488) @@ -105,10 +105,11 @@ SetLastError(ERROR_OUTOFMEMORY); return 0; } - RtlInitUnicodeString(&FormatName, lpBuffer); + FormatName.Length = 0; FormatName.MaximumLength = cchMaxCount * sizeof(WCHAR); FormatName.Buffer = lpBuffer; + Length = NtUserGetClipboardFormatName(format, &FormatName, cchMaxCount); DPRINT("GetClipboardFormatNameA(%x): %S\n", format, lpBuffer); HEAP_strcpyWtoA(lpszFormatName, lpBuffer, Length);

19 years

[hbirr] 18487: Allocated buffers from non paged pool for all user buffers.

by hbirr＠svn.reactos.com

Allocated buffers from non paged pool for all user buffers. Modified: trunk/reactos/ntoskrnl/io/plugplay.c _____ Modified: trunk/reactos/ntoskrnl/io/plugplay.c --- trunk/reactos/ntoskrnl/io/plugplay.c 2005-10-15 21:17:52 UTC (rev 18486) +++ trunk/reactos/ntoskrnl/io/plugplay.c 2005-10-15 21:41:48 UTC (rev 18487) @@ -388,30 +388,126 @@ } +static NTSTATUS +IopCaptureUnicodeString(PUNICODE_STRING DstName, PUNICODE_STRING SrcName) +{ + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING Name; + Name.Buffer = NULL; + _SEH_TRY + { + Name.Length = SrcName->Length; + Name.MaximumLength = SrcName->MaximumLength; + if (Name.Length > Name.MaximumLength) + { + Status = STATUS_INVALID_PARAMETER; + _SEH_LEAVE; + } + if (Name.MaximumLength) + { + ProbeForRead(SrcName->Buffer, + Name.MaximumLength, + sizeof(WCHAR)); + Name.Buffer = ExAllocatePool(NonPagedPool, Name.MaximumLength); + if (Name.Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + _SEH_LEAVE; + } + memcpy(Name.Buffer, SrcName->Buffer, Name.MaximumLength); + } + *DstName = Name; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status) && Name.Buffer) + { + ExFreePool(Name.Buffer); + } + return Status; +} static NTSTATUS IopGetDeviceProperty(PPLUGPLAY_CONTROL_PROPERTY_DATA PropertyData) { PDEVICE_OBJECT DeviceObject = NULL; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING DeviceInstance; + ULONG BufferSize; + ULONG Property = 0; + PVOID Buffer; DPRINT("IopGetDeviceProperty() called\n"); DPRINT("Device name: %wZ\n", &PropertyData->DeviceInstance); + Status = IopCaptureUnicodeString(&DeviceInstance, &PropertyData->DeviceInstance); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + _SEH_TRY + { + Property = PropertyData->Property; + BufferSize = PropertyData->BufferSize; + ProbeForWrite(PropertyData->Buffer, + BufferSize, + sizeof(UCHAR)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePool(DeviceInstance.Buffer); + return Status; + } + /* Get the device object */ DeviceObject = IopGetDeviceObjectFromDeviceInstance(&PropertyData->DeviceInstance); + ExFreePool(DeviceInstance.Buffer); if (DeviceObject == NULL) + { return STATUS_NO_SUCH_DEVICE; + } + Buffer = ExAllocatePool(NonPagedPool, BufferSize); + if (Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = IoGetDeviceProperty(DeviceObject, - PropertyData->Property, - PropertyData->BufferSize, - PropertyData->Buffer, - &PropertyData->BufferSize); + Property, + BufferSize, + Buffer, + &BufferSize); ObDereferenceObject(DeviceObject); + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { + memcpy(Buffer, PropertyData->Buffer, BufferSize); + PropertyData->BufferSize = BufferSize; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + ExFreePool(Buffer); return Status; } @@ -423,29 +519,61 @@ PDEVICE_OBJECT DeviceObject = NULL; PDEVICE_NODE DeviceNode = NULL; PDEVICE_NODE RelatedDeviceNode; + UNICODE_STRING TargetDeviceInstance; + NTSTATUS Status = STATUS_SUCCESS; + ULONG Relation = 0; + ULONG MaximumLength = 0; DPRINT("IopGetRelatedDevice() called\n"); DPRINT("Device name: %wZ\n", &RelatedDeviceData->TargetDeviceInstance); + Status = IopCaptureUnicodeString(&TargetDeviceInstance, &RelatedDeviceData->TargetDeviceInstance); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + _SEH_TRY + { + Relation = RelatedDeviceData->Relation; + MaximumLength = RelatedDeviceData->RelatedDeviceInstance.MaximumLength; + ProbeForWrite(RelatedDeviceData->RelatedDeviceInstance.Buffer, + MaximumLength, + sizeof(WCHAR)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePool(TargetDeviceInstance.Buffer); + return Status; + } + RtlInitUnicodeString(&RootDeviceName, L"HTREE\\ROOT\\0"); - if (RtlEqualUnicodeString(&RelatedDeviceData->TargetDeviceInstance, + if (RtlEqualUnicodeString(&TargetDeviceInstance, &RootDeviceName, TRUE)) { DeviceNode = IopRootDeviceNode; + ExFreePool(TargetDeviceInstance.Buffer); } else { /* Get the device object */ - DeviceObject = IopGetDeviceObjectFromDeviceInstance(&RelatedDeviceData->TargetDeviceIns tance); + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&TargetDeviceInstance); + ExFreePool(TargetDeviceInstance.Buffer); if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; } - switch (RelatedDeviceData->Relation) + switch (Relation) { case PNP_GET_PARENT_DEVICE: RelatedDeviceNode = DeviceNode->Parent; @@ -478,8 +606,7 @@ return STATUS_NO_SUCH_DEVICE; } - if (RelatedDeviceNode->InstancePath.Length > - RelatedDeviceData->RelatedDeviceInstance.MaximumLength) + if (RelatedDeviceNode->InstancePath.Length > MaximumLength) { if (DeviceObject) { @@ -490,11 +617,18 @@ } /* Copy related device instance name */ - RtlCopyMemory(RelatedDeviceData->RelatedDeviceInstance.Buffer, - RelatedDeviceNode->InstancePath.Buffer, - RelatedDeviceNode->InstancePath.Length); - RelatedDeviceData->RelatedDeviceInstance.Length = - RelatedDeviceNode->InstancePath.Length; + _SEH_TRY + { + RtlCopyMemory(RelatedDeviceData->RelatedDeviceInstance.Buffer, + RelatedDeviceNode->InstancePath.Buffer, + RelatedDeviceNode->InstancePath.Length); + RelatedDeviceData->RelatedDeviceInstance.Length = RelatedDeviceNode->InstancePath.Length; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; if (DeviceObject != NULL) { @@ -503,7 +637,7 @@ DPRINT("IopGetRelatedDevice() done\n"); - return STATUS_SUCCESS; + return Status; } @@ -512,29 +646,65 @@ { PDEVICE_OBJECT DeviceObject; PDEVICE_NODE DeviceNode; + ULONG Operation = 0; + ULONG DeviceStatus = 0; + ULONG DeviceProblem = 0; + UNICODE_STRING DeviceInstance; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("IopDeviceStatus() called\n"); DPRINT("Device name: %wZ\n", &StatusData->DeviceInstance); + Status = IopCaptureUnicodeString(&DeviceInstance, &StatusData->DeviceInstance); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + _SEH_TRY + { + Operation = StatusData->Operation; + if (Operation == PNP_SET_DEVICE_STATUS) + { + DeviceStatus = StatusData->DeviceStatus; + DeviceProblem = StatusData->DeviceProblem; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + if (DeviceInstance.Buffer) + { + ExFreePool(DeviceInstance.Buffer); + } + return Status; + } + /* Get the device object */ DeviceObject = IopGetDeviceObjectFromDeviceInstance(&StatusData->DeviceInstance); + ExFreePool(DeviceInstance.Buffer); if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; DeviceNode = ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->Devic eNode; - switch (StatusData->Operation) + switch (Operation) { case PNP_GET_DEVICE_STATUS: DPRINT("Get status data\n"); - StatusData->DeviceStatus = DeviceNode->Flags; - StatusData->DeviceProblem = DeviceNode->Problem; + DeviceStatus = DeviceNode->Flags; + DeviceProblem = DeviceNode->Problem; break; case PNP_SET_DEVICE_STATUS: DPRINT("Set status data\n"); - DeviceNode->Flags = StatusData->DeviceStatus; - DeviceNode->Problem = StatusData->DeviceProblem; + DeviceNode->Flags = DeviceStatus; + DeviceNode->Problem = DeviceProblem; break; case PNP_CLEAR_DEVICE_STATUS: @@ -544,7 +714,21 @@ ObDereferenceObject(DeviceObject); - return STATUS_SUCCESS; + if (Operation == PNP_GET_DEVICE_STATUS) + { + _SEH_TRY + { + StatusData->DeviceStatus = DeviceStatus; + StatusData->DeviceProblem = DeviceProblem; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + return Status; } @@ -553,12 +737,21 @@ { PDEVICE_OBJECT DeviceObject; PDEVICE_NODE DeviceNode; + UNICODE_STRING DeviceInstance; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("IopGetDeviceDepth() called\n"); DPRINT("Device name: %wZ\n", &DepthData->DeviceInstance); + Status = IopCaptureUnicodeString(&DeviceInstance, &DepthData->DeviceInstance); + if (!NT_SUCCESS(Status)) + { + return Status; + } + /* Get the device object */ DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DepthData->DeviceInstance); + ExFreePool(DeviceInstance.Buffer); if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; @@ -568,7 +761,17 @@ ObDereferenceObject(DeviceObject); - return STATUS_SUCCESS; + _SEH_TRY + { + DepthData->Depth = DeviceNode->Level; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + return Status; } @@ -577,13 +780,21 @@ { PDEVICE_OBJECT DeviceObject; PDEVICE_NODE DeviceNode; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING DeviceInstance; DPRINT("IopResetDevice() called\n"); DPRINT("Device name: %wZ\n", &ResetDeviceData->DeviceInstance); + Status = IopCaptureUnicodeString(&DeviceInstance, &ResetDeviceData->DeviceInstance); + if (!NT_SUCCESS(Status)) + { + return Status; + } + /* Get the device object */ - DeviceObject = IopGetDeviceObjectFromDeviceInstance(&ResetDeviceData->DeviceInstance); + DeviceObject = IopGetDeviceObjectFromDeviceInstance(&DeviceInstance); + ExFreePool(DeviceInstance.Buffer); if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE;

19 years

[cwittich] 18486: * added a lot of stack-size information to *.def files

by cwittich＠svn.reactos.com

* added a lot of stack-size information to *.def files * added one more stub to secur32 Modified: trunk/reactos/lib/secur32/secur32.def Modified: trunk/reactos/lib/secur32/sspi.c Modified: trunk/reactos/lib/security/security.def _____ Modified: trunk/reactos/lib/secur32/secur32.def --- trunk/reactos/lib/secur32/secur32.def 2005-10-15 19:34:53 UTC (rev 18485) +++ trunk/reactos/lib/secur32/secur32.def 2005-10-15 21:17:52 UTC (rev 18486) @@ -7,52 +7,53 @@ LsaLookupAuthenticationPackage@12 LsaFreeReturnBuffer@4 LsaCallAuthenticationPackage@28 -;@AcceptSecurityContext -;@AcquireCredentialsHandleA -;@AcquireCredentialsHandleW +;AcceptSecurityContext@36 +;AcquireCredentialsHandleA@36 +;AcquireCredentialsHandleW@36 ;@AddCredentialsA ;@AddCredentialsW ;@AddSecurityPackageA ;@AddSecurityPackageW -;@ApplyControlToken -;@CompleteAuthToken +;ApplyControlTokenA@8 +;ApplyControlTokenW@8 +;CompleteAuthToken@8 ;@CredMarshalTargetInfo ;@CredUnmarshalTargetInfo -;@DecryptMessage -;@DeleteSecurityContext +;DecryptMessage@16 +;DeleteSecurityContext@4 ;@DeleteSecurityPackageA ;@DeleteSecurityPackageW -;@EncryptMessage -;@EnumerateSecurityPackagesA@8 +;EncryptMessage@16 +EnumerateSecurityPackagesA@8 EnumerateSecurityPackagesW@8 ;@ExportSecurityContext FreeContextBuffer@4 -;@FreeCredentialsHandle +;FreeCredentialsHandle@4 GetComputerObjectNameA@12 GetComputerObjectNameW@12 ;GetSecurityUserInfo GetUserNameExA@12 GetUserNameExW@12 -;@ImpersonateSecurityContext +;ImpersonateSecurityContext@4 ;@ImportSecurityContextA ;@ImportSecurityContextW ;@InitSecurityInterfaceA ;@InitSecurityInterfaceW -;@InitializeSecurityContextA -;@InitializeSecurityContextW +;InitializeSecurityContextA@48 +;InitializeSecurityContextW@48 LsaEnumerateLogonSessions@8 LsaGetLogonSessionData@8 LsaRegisterPolicyChangeNotification@8 LsaUnregisterPolicyChangeNotification@8 -;@MakeSignature -;@QueryContextAttributesA -;@QueryContextAttributesW -;@QueryCredentialsAttributesA -;@QueryCredentialsAttributesW +;MakeSignature@16 +;QueryContextAttributesA@12 +;QueryContextAttributesW@12 +;QueryCredentialsAttributesA@12 +;QueryCredentialsAttributesW@12 ;@QuerySecurityContextToken ;@QuerySecurityPackageInfoA ;@QuerySecurityPackageInfoW -;@RevertSecurityContext +;RevertSecurityContext@4 ;@SaslAcceptSecurityContext ;@SaslEnumerateProfilesA ;@SaslEnumerateProfilesW @@ -72,7 +73,7 @@ ;SecpTranslateNameEx ;@SetContextAttributesA ;@SetContextAttributesW -;@TranslateNameA -;@TranslateNameW +;TranslateNameA@20 +;TranslateNameW@20 ;UnsealMessage -;@VerifySignature +;VerifySignature@16 _____ Modified: trunk/reactos/lib/secur32/sspi.c --- trunk/reactos/lib/secur32/sspi.c 2005-10-15 19:34:53 UTC (rev 18485) +++ trunk/reactos/lib/secur32/sspi.c 2005-10-15 21:17:52 UTC (rev 18486) @@ -23,6 +23,16 @@ return ERROR_CALL_NOT_IMPLEMENTED; } +SECURITY_STATUS +WINAPI +EnumerateSecurityPackagesA( + PULONG pulong, + PSecPkgInfoA* psecpkginfoa + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} SECURITY_STATUS WINAPI _____ Modified: trunk/reactos/lib/security/security.def --- trunk/reactos/lib/security/security.def 2005-10-15 19:34:53 UTC (rev 18485) +++ trunk/reactos/lib/security/security.def 2005-10-15 21:17:52 UTC (rev 18486) @@ -7,52 +7,53 @@ LsaLookupAuthenticationPackage(a)12=SECUR32.LsaLookupAuthenticationPackage LsaFreeReturnBuffer(a)4=SECUR32.LsaFreeReturnBuffer LsaCallAuthenticationPackage(a)28=SECUR32.LsaCallAuthenticationPackage -;(a)AcceptSecurityContext=SECUR32.AcceptSecurityContext -;(a)AcquireCredentialsHandleA=SECUR32.AcquireCredentialsHandleA -;(a)AcquireCredentialsHandleW=SECUR32.AcquireCredentialsHandleW +;AcceptSecurityContext(a)36=SECUR32.AcceptSecurityContext +;AcquireCredentialsHandleA(a)36=SECUR32.AcquireCredentialsHandleA +;AcquireCredentialsHandleW(a)36=SECUR32.AcquireCredentialsHandleW ;(a)AddCredentialsA=SECUR32.AddCredentialsA ;(a)AddCredentialsW=SECUR32.AddCredentialsW ;(a)AddSecurityPackageA=SECUR32.AddSecurityPackageA ;(a)AddSecurityPackageW=SECUR32.AddSecurityPackageW -;(a)ApplyControlToken=SECUR32.ApplyControlToken -;(a)CompleteAuthToken=SECUR32.CompleteAuthToken +;ApplyControlTokenA(a)8=SECUR32.ApplyControlTokenA +;ApplyControlTokenW(a)8=SECUR32.ApplyControlTokenW +;CompleteAuthToken(a)8=SECUR32.CompleteAuthToken ;(a)CredMarshalTargetInfo=SECUR32.CredMarshalTargetInfo ;(a)CredUnmarshalTargetInfo=SECUR32.CredUnmarshalTargetInfo -;(a)DecryptMessage=SECUR32.DecryptMessage -;(a)DeleteSecurityContext=SECUR32.DeleteSecurityContext +;DecryptMessage(a)16=SECUR32.DecryptMessage +;DeleteSecurityContext(a)4=SECUR32.DeleteSecurityContext ;(a)DeleteSecurityPackageA=SECUR32.DeleteSecurityPackageA ;(a)DeleteSecurityPackageW=SECUR32.DeleteSecurityPackageW -;(a)EncryptMessage=SECUR32.EncryptMessage -;EnumerateSecurityPackagesA(a)8=SECUR32.EnumerateSecurityPackagesA +;EncryptMessage(a)16=SECUR32.EncryptMessage +EnumerateSecurityPackagesA(a)8=SECUR32.EnumerateSecurityPackagesA EnumerateSecurityPackagesW(a)8=SECUR32.EnumerateSecurityPackagesW ;(a)ExportSecurityContext=SECUR32.ExportSecurityContext FreeContextBuffer(a)4=SECUR32.FreeContextBuffer -;(a)FreeCredentialsHandle=SECUR32.FreeCredentialsHandle +;FreeCredentialsHandle(a)4=SECUR32.FreeCredentialsHandle GetComputerObjectNameA(a)12=SECUR32.GetComputerObjectNameA GetComputerObjectNameW(a)12=SECUR32.GetComputerObjectNameW ;GetSecurityUserInfo=SECUR32.GetSecurityUserInfo GetUserNameExA(a)12=SECUR32.GetUserNameExA GetUserNameExW(a)12=SECUR32.GetUserNameExW -;(a)ImpersonateSecurityContext=SECUR32.ImpersonateSecurityContext +;ImpersonateSecurityContext(a)4=SECUR32.ImpersonateSecurityContext ;(a)ImportSecurityContextA=SECUR32.ImportSecurityContextA ;(a)ImportSecurityContextW=SECUR32.ImportSecurityContextW ;(a)InitSecurityInterfaceA=SECUR32.InitSecurityInterfaceA ;(a)InitSecurityInterfaceW=SECUR32.InitSecurityInterfaceW -;(a)InitializeSecurityContextA=SECUR32.InitializeSecurityContextA -;(a)InitializeSecurityContextW=SECUR32.InitializeSecurityContextW +;InitializeSecurityContextA(a)48=SECUR32.InitializeSecurityContextA +;InitializeSecurityContextW(a)48=SECUR32.InitializeSecurityContextW LsaEnumerateLogonSessions(a)8=SECUR32.LsaEnumerateLogonSessions LsaGetLogonSessionData(a)8=SECUR32.LsaGetLogonSessionData LsaRegisterPolicyChangeNotification(a)8=SECUR32.LsaRegisterPolicyChangeNot ification LsaUnregisterPolicyChangeNotification(a)8=SECUR32.LsaUnregisterPolicyChang eNotification -;(a)MakeSignature=SECUR32.MakeSignature -;(a)QueryContextAttributesA=SECUR32.QueryContextAttributesA -;(a)QueryContextAttributesW=SECUR32.QueryContextAttributesW -;(a)QueryCredentialsAttributesA=SECUR32.QueryCredentialsAttributesA -;(a)QueryCredentialsAttributesW=SECUR32.QueryCredentialsAttributesW +;MakeSignature(a)16=SECUR32.MakeSignature +;QueryContextAttributesA(a)12=SECUR32.QueryContextAttributesA +;QueryContextAttributesW(a)12=SECUR32.QueryContextAttributesW +;QueryCredentialsAttributesA(a)12=SECUR32.QueryCredentialsAttributesA +;QueryCredentialsAttributesW(a)12=SECUR32.QueryCredentialsAttributesW ;(a)QuerySecurityContextToken=SECUR32.QuerySecurityContextToken ;(a)QuerySecurityPackageInfoA=SECUR32.QuerySecurityPackageInfoA ;(a)QuerySecurityPackageInfoW=SECUR32.QuerySecurityPackageInfoW -;(a)RevertSecurityContext=SECUR32.RevertSecurityContext +;RevertSecurityContext(a)4=SECUR32.RevertSecurityContext ;(a)SaslAcceptSecurityContext=SECUR32.SaslAcceptSecurityContext ;(a)SaslEnumerateProfilesA=SECUR32.SaslEnumerateProfilesA ;(a)SaslEnumerateProfilesW=SECUR32.SaslEnumerateProfilesW @@ -72,7 +73,7 @@ ;SecpTranslateNameEx=SECUR32.SecpTranslateNameEx ;(a)SetContextAttributesA=SECUR32.SetContextAttributesA ;(a)SetContextAttributesW=SECUR32.SetContextAttributesW -;(a)TranslateNameA=SECUR32.TranslateNameA -;(a)TranslateNameW=SECUR32.TranslateNameW +;TranslateNameA(a)20=SECUR32.TranslateNameA +;TranslateNameW(a)20=SECUR32.TranslateNameW ;UnsealMessage=SECUR32.UnsealMessage -;(a)VerifySignature=SECUR32.VerifySignature +;VerifySignature(a)16=SECUR32.VerifySignature

19 years

[ekohl] 18485: - CreateServiceW: Calculate the Dependency length.

by ekohl＠svn.reactos.com

- CreateServiceW: Calculate the Dependency length. - Implement NotifyBootConfigStatus. Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-10-15 16:39:22 UTC (rev 18484) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-10-15 19:34:53 UTC (rev 18485) @@ -416,7 +416,7 @@ ;MakeAbsoluteSD2 MakeSelfRelativeSD@12 MapGenericMask(a)8=NTDLL.RtlMapGenericMask -;NotifyBootConfigStatus@4 +NotifyBootConfigStatus@4 NotifyChangeEventLog@8 ObjectCloseAuditAlarmA@12 ObjectCloseAuditAlarmW@12 _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-10-15 16:39:22 UTC (rev 18484) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-10-15 19:34:53 UTC (rev 18485) @@ -263,13 +263,31 @@ SC_HANDLE hService = NULL; DWORD dwError; HKEY hEnumKey, hKey; + DWORD dwDependenciesLength = 0; + DWORD dwLength; + LPWSTR lpStr; DPRINT1("CreateServiceW() called\n"); + /* Calculate the Dependencies length*/ + if (lpDependencies != NULL) + { + lpStr = (LPWSTR)lpDependencies; + while (*lpStr) + { + dwLength = wcslen(lpStr) + 1; + dwDependenciesLength += dwLength; + lpStr = lpStr + dwLength; + } + dwDependenciesLength++; + } + + /* FIXME: Encrypt the password */ + +#if 0 HandleBind(); /* Call to services.exe using RPC */ -#if 0 dwError = ScmrCreateServiceW(BindingHandle, (unsigned int)hSCManager, (LPWSTR)lpServiceName, @@ -281,8 +299,8 @@ (LPWSTR)lpBinaryPathName, (LPWSTR)lpLoadOrderGroup, lpdwTagId, - NULL, /* FIXME: lpDependencies */ - 0, /* FIXME: dwDependenciesLength */ + lpDependencies, + dwDependenciesLength, (LPWSTR)lpServiceStartName, NULL, /* FIXME: lpPassword */ 0, /* FIXME: dwPasswordLength */ @@ -991,9 +1009,7 @@ { DWORD dwError; -#if 0 - DPRINT("UnlockServiceDatabase(%x)\n", hSCManager); -#endif + DPRINT("UnlockServiceDatabase(%x)\n", ScLock); HandleBind(); @@ -1011,11 +1027,40 @@ } +/********************************************************************** + * NotifyBootConfigStatus + * + * @implemented + */ +BOOL STDCALL +NotifyBootConfigStatus(BOOL BootAcceptable) +{ + DWORD dwError; + + DPRINT1("NotifyBootConfigStatus()\n"); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrNotifyBootConfigStatus(BindingHandle, + BootAcceptable); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("NotifyBootConfigStatus() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; +} + + void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } + void __RPC_USER midl_user_free(void __RPC_FAR * ptr) { HeapFree(GetProcessHeap(), 0, ptr);

19 years

[hbirr] 18484: Fixed the definition of PDEV_INSTALL_W.

by hbirr＠svn.reactos.com

Fixed the definition of PDEV_INSTALL_W. Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-10-15 16:37:34 UTC (rev 18483) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-10-15 16:39:22 UTC (rev 18484) @@ -875,7 +875,7 @@ return ret; } -typedef BOOL (*PDEV_INSTALL_W)(HWND, HINSTANCE, LPCWSTR, INT); +typedef BOOL (WINAPI *PDEV_INSTALL_W)(HWND, HINSTANCE, LPCWSTR, INT); static BOOL InstallDevice(PCWSTR DeviceInstance)

19 years

[mf] 18483: Winefile:

by mf＠svn.reactos.com

Winefile: - fix item background color for non-white windows background - fix drive size output: wsprintf() -> _stprintf() - declare COLOR_SELECTION_TXT Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.h _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-10-15 14:26:53 UTC (rev 18482) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-10-15 16:37:34 UTC (rev 18483) @@ -2832,12 +2832,21 @@ float fBytes = (float)bytes; +#ifdef __WINE__ /* work around for incorrect implementation of wsprintf()/_stprintf() in WINE */ if (bytes >= 1073741824) /* 1 GB */ wsprintf(buffer, sFmtGB, fBytes/1073741824.f+.5f); else if (bytes >= 1048576) /* 1 MB */ wsprintf(buffer, sFmtMB, fBytes/1048576.f+.5f); else if (bytes >= 1024) /* 1 kB */ wsprintf(buffer, sFmtkB, fBytes/1024.f+.5f); +#else + if (bytes >= 1073741824) /* 1 GB */ + _stprintf(buffer, sFmtGB, fBytes/1073741824.f+.5f); + else if (bytes >= 1048576) /* 1 MB */ + _stprintf(buffer, sFmtMB, fBytes/1048576.f+.5f); + else if (bytes >= 1024) /* 1 kB */ + _stprintf(buffer, sFmtkB, fBytes/1024.f+.5f); +#endif else _stprintf(buffer, sLongNumFmt, bytes); } @@ -3218,10 +3227,10 @@ textcolor = RGB(0,0,0); if (dis->itemState & ODS_FOCUS) { - textcolor = RGB(255,255,255); + textcolor = COLOR_SELECTION_TXT; bkcolor = COLOR_SELECTION; } else { - bkcolor = RGB(255,255,255); + bkcolor = GetSysColor(COLOR_WINDOW); } hbrush = CreateSolidBrush(bkcolor); @@ -3430,7 +3439,7 @@ HPEN lastPen; HPEN hpen; - if (!(GetVersion() & 0x80000000)) { /* Windows NT? */ + if (!(GetVersion() & 0x80000000)) { /* Windows NT or higher? */ LOGBRUSH lb = {PS_SOLID, RGB(255,255,255)}; hpen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, 0); } else _____ Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-10-15 14:26:53 UTC (rev 18482) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-10-15 16:37:34 UTC (rev 18483) @@ -101,6 +101,7 @@ #define COLOR_COMPRESSED RGB(0,0,255) #define COLOR_SELECTION RGB(0,0,128) +#define COLOR_SELECTION_TXT RGB(255,255,255) #ifdef _NO_EXTENSIONS #define COLOR_SPLITBAR WHITE_BRUSH

19 years

[hbirr] 18482: Merge from trunk.

by hbirr＠svn.reactos.com

Merge from trunk. Don't use alloca in a macro, which may be used in a loop. This does fix bug #805. Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/include/object.h Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/accelerator.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/caret.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/class.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/focus.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/message.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/misc.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/msgqueue.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/painting.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/scrollbar.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/vis.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/winpos.c Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/color.c _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/include/object.h --- branches/ros-branch-0_2_8/reactos/subsys/win32k/include/object.h 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/include/object.h 2005-10-15 14:26:53 UTC (rev 18482) @@ -90,20 +90,18 @@ ASSERT(_obj_ == ref->obj); \ \ } -#define UserRefObjectCo(_obj_) \ +#define UserRefObjectCo(_obj_, _ref_) \ { \ PW32THREAD t; \ - PUSER_REFERENCE_ENTRY ref; \ \ ASSERT(_obj_); \ t = PsGetWin32Thread(); \ ASSERT(t); \ - ref = (PUSER_REFERENCE_ENTRY)_alloca(sizeof(USER_REFERENCE_ENTRY)); \ - ASSERT(ref); \ - ref->obj = _obj_; \ + ASSERT(_ref_); \ + (_ref_)->obj = _obj_; \ ObmReferenceObject(_obj_); \ \ - PushEntryList(&t->ReferencesList, &ref->Entry); \ + PushEntryList(&t->ReferencesList, &(_ref_)->Entry); \ \ } _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/accelerator.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/accelerator.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/accelerator.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -433,6 +433,7 @@ PWINDOW_OBJECT Window = NULL; PACCELERATOR_TABLE Accel = NULL; ULONG i; + USER_REFERENCE_ENTRY AccelRef, WindowRef; DECLARE_RETURN(int); DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p)\n", @@ -458,14 +459,14 @@ RETURN( 0); } - UserRefObjectCo(Accel); + UserRefObjectCo(Accel, &AccelRef); if (!(Window = UserGetWindowObject(hWnd))) { RETURN( 0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &WindowRef); /* FIXME: Associate AcceleratorTable with the current thread */ _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/caret.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/caret.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/caret.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -405,6 +405,7 @@ NtUserShowCaret(HWND hWnd OPTIONAL, BOOL bShow) { PWINDOW_OBJECT Window = NULL; + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(BOOL); BOOL ret; @@ -416,7 +417,7 @@ RETURN(FALSE); } - if (Window) UserRefObjectCo(Window); + if (Window) UserRefObjectCo(Window, &Ref); if (bShow) ret = co_UserShowCaret(Window); _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/class.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/class.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/class.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -566,6 +566,7 @@ { PWINDOW_OBJECT Window; LONG Ret; + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(DWORD); DPRINT("Enter NtUserSetClassLong\n"); @@ -576,7 +577,7 @@ RETURN(0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Ret = IntGetClassLong(Window, Offset, Ansi); co_IntSetClassLong(Window, Offset, dwNewLong, Ansi); _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/focus.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/focus.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/focus.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -61,12 +61,13 @@ VOID FASTCALL co_IntSendActivateMessages(HWND hWndPrev, HWND hWnd, BOOL MouseActivate) { + USER_REFERENCE_ENTRY Ref; PWINDOW_OBJECT Window; if ((Window = UserGetWindowObject(hWnd))) { - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); /* Send palette messages */ if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) @@ -218,6 +219,7 @@ { HWND Top; PWINDOW_OBJECT TopWindow; + USER_REFERENCE_ENTRY Ref; ASSERT_REFS_CO(Window); @@ -231,7 +233,7 @@ Top = IntFindChildWindowToOwner(DesktopWindow, Window); if((TopWnd = UserGetWindowObject(Top))) { - UserRefObjectCo(TopWnd); + UserRefObjectCo(TopWnd, &Ref); Ret = co_IntMouseActivateWindow(TopWnd); UserDerefObjectCo(TopWnd); @@ -246,7 +248,7 @@ if (!TopWindow) return FALSE; /* TMN: Check return valud from this function? */ - UserRefObjectCo(TopWindow); + UserRefObjectCo(TopWindow, &Ref); co_IntSetForegroundAndFocusWindow(TopWindow, Window, TRUE); @@ -386,6 +388,7 @@ HWND STDCALL NtUserSetActiveWindow(HWND hWnd) { + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(HWND); DPRINT("Enter NtUserSetActiveWindow(%x)\n", hWnd); @@ -412,7 +415,7 @@ RETURN( 0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); hWndPrev = co_IntSetActiveWindow(Window); UserDerefObjectCo(Window); @@ -503,6 +506,7 @@ PUSER_MESSAGE_QUEUE ThreadQueue; HWND hWndPrev; PWINDOW_OBJECT TopWnd; + USER_REFERENCE_ENTRY Ref; ASSERT_REFS_CO(Window); @@ -523,7 +527,7 @@ if (TopWnd && TopWnd->hSelf != UserGetActiveWindow()) { // PWINDOW_OBJECT WndTops = UserGetWindowObject(hWndTop); - UserRefObjectCo(TopWnd); + UserRefObjectCo(TopWnd, &Ref); co_IntSetActiveWindow(TopWnd); UserDerefObjectCo(TopWnd); } @@ -547,6 +551,7 @@ NtUserSetFocus(HWND hWnd) { PWINDOW_OBJECT Window; + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(HWND); HWND ret; @@ -558,7 +563,7 @@ RETURN(NULL); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ret = co_UserSetFocus(Window); UserDerefObjectCo(Window); _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/message.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/message.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/message.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -547,6 +547,7 @@ co_IntTranslateMouseMessage(PUSER_MESSAGE_QUEUE ThreadQueue, LPMSG Msg, USHORT *HitTest, BOOL Remove) { PWINDOW_OBJECT Window; + USER_REFERENCE_ENTRY Ref, DesktopRef; if(!(Window = UserGetWindowObject(Msg->hwnd))) { @@ -554,7 +555,7 @@ return TRUE; } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); if(ThreadQueue == Window->MessageQueue && ThreadQueue->CaptureWindow != Window->hSelf) @@ -572,7 +573,7 @@ { PWINDOW_OBJECT Wnd; - UserRefObjectCo(DesktopWindow); + UserRefObjectCo(DesktopWindow, &DesktopRef); co_WinPosWindowFromPoint(DesktopWindow, Window->MessageQueue, &Msg->pt, &Wnd); if(Wnd) @@ -664,6 +665,7 @@ PUSER_MESSAGE_QUEUE ThreadQueue; PUSER_MESSAGE Message; BOOL Present, RemoveMessages; + USER_REFERENCE_ENTRY Ref; /* The queues and order in which they are checked are documented in the MSDN article on GetMessage() */ @@ -772,7 +774,7 @@ { USHORT HitTest; - UserRefObjectCo(MsgWindow); + UserRefObjectCo(MsgWindow, &Ref); if(co_IntTranslateMouseMessage(ThreadQueue, &Msg->Msg, &HitTest, TRUE)) /* FIXME - check message filter again, if the message doesn't match anymore, @@ -972,6 +974,7 @@ UINT Size; USER_MESSAGE Msg; DECLARE_RETURN(BOOL); +// USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetMessage\n"); UserEnterExclusive(); @@ -982,7 +985,7 @@ RETURN(-1); } -// if (Window) UserRefObjectCo(Window); +// if (Window) UserRefObjectCo(Window, &Ref); if (MsgFilterMax < MsgFilterMin) { @@ -1357,6 +1360,7 @@ LPARAM lParamPacked; PW32THREAD Win32Thread; DECLARE_RETURN(LRESULT); + USER_REFERENCE_ENTRY Ref; /* FIXME: Call hooks. */ if (!(Window = UserGetWindowObject(hWnd))) @@ -1364,7 +1368,7 @@ RETURN( FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Win32Thread = PsGetWin32Thread(); _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/misc.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/misc.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/misc.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -689,6 +689,7 @@ { BOOL Ret = 0; PWINDOW_OBJECT Window; + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(BOOLEAN); DPRINT("Enter NtUserCallHwndLock\n"); @@ -698,7 +699,7 @@ { RETURN( FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); /* FIXME: Routine can be 0x53 - 0x5E */ switch (Routine) _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/msgqueue.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/msgqueue.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/msgqueue.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -468,6 +468,7 @@ PVOID WaitObjects[2]; NTSTATUS WaitStatus; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; if( !IntGetScreenDC() || PsGetWin32Thread()->MessageQueue == W32kGetPrimitiveMessageQueue() ) @@ -495,7 +496,7 @@ DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); - if (DesktopWindow) UserRefObjectCo(DesktopWindow);//can DesktopWindow be NULL? + if (DesktopWindow) UserRefObjectCo(DesktopWindow, &Ref);//can DesktopWindow be NULL? /* Process messages in the message queue itself. */ IntLockHardwareMessageQueue(MessageQueue); _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/painting.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/painting.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/painting.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -295,7 +295,8 @@ Window = UserGetWindowObject(*phWnd); if (Window && (Window->Style & WS_VISIBLE)) { - UserRefObjectCo(Window); + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Window, &Ref); co_IntPaintWindows(Window, Flags); UserDerefObjectCo(Window); } @@ -722,6 +723,7 @@ PROSRGNDATA Rgn; NTSTATUS Status; DECLARE_RETURN(HDC); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserBeginPaint\n"); UserEnterExclusive(); @@ -731,7 +733,7 @@ RETURN( NULL); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); co_UserHideCaret(Window); @@ -828,6 +830,7 @@ { PWINDOW_OBJECT Window; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserEndPaint\n"); UserEnterExclusive(); @@ -839,7 +842,7 @@ UserReleaseDC(Window, lPs->hdc, TRUE); - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); co_UserShowCaret(Window); UserDerefObjectCo(Window); @@ -894,6 +897,7 @@ DECLARE_RETURN(INT); PWINDOW_OBJECT Window; INT ret; + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetUpdateRgn\n"); UserEnterExclusive(); @@ -903,7 +907,7 @@ RETURN(ERROR); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ret = co_UserGetUpdateRgn(Window, hRgn, bErase); UserDerefObjectCo(Window); @@ -975,7 +979,8 @@ if (bErase && !IntGdiIsEmptyRect(&Rect)) { - UserRefObjectCo(Window); + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Window, &Ref); co_UserRedrawWindow(Window, NULL, NULL, RDW_ERASENOW | RDW_NOCHILDREN); UserDerefObjectCo(Window); } @@ -1013,6 +1018,7 @@ NTSTATUS Status; PWINDOW_OBJECT Wnd; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserRedrawWindow\n"); UserEnterExclusive(); @@ -1034,7 +1040,7 @@ } } - UserRefObjectCo(Wnd); + UserRefObjectCo(Wnd, &Ref); Status = co_UserRedrawWindow(Wnd, NULL == lprcUpdate ? NULL : &SafeUpdateRect, hrgnUpdate, flags); @@ -1206,6 +1212,7 @@ BOOL bOwnRgn = TRUE; NTSTATUS Status; DECLARE_RETURN(DWORD); + USER_REFERENCE_ENTRY Ref, CaretRef; DPRINT("Enter NtUserScrollWindowEx\n"); UserEnterExclusive(); @@ -1216,7 +1223,7 @@ Window = NULL; /* prevent deref at cleanup */ RETURN( ERROR); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); IntGetClientRect(Window, &rc); @@ -1292,6 +1299,7 @@ RECT r, dummy; POINT ClientOrigin; PWINDOW_OBJECT Wnd; + USER_REFERENCE_ENTRY WndRef; IntGetClientOrigin(Window, &ClientOrigin); for (i = 0; List[i]; i++) @@ -1307,7 +1315,7 @@ if (! UnsafeRect || IntGdiIntersectRect(&dummy, &r, &rc)) { - UserRefObjectCo(Wnd); + UserRefObjectCo(Wnd, &WndRef); co_WinPosSetWindowPos(Wnd, 0, r.left + dx, r.top + dy, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOREDRAW); @@ -1329,7 +1337,7 @@ if ((CaretWnd = UserGetWindowObject(hwndCaret))) { - UserRefObjectCo(CaretWnd); + UserRefObjectCo(CaretWnd, &CaretRef); co_IntSetCaretPos(caretrc.left + dx, caretrc.top + dy); co_UserShowCaret(CaretWnd); _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/scrollbar.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/scrollbar.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/scrollbar.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -548,6 +548,7 @@ PWINDOW_OBJECT Window; BOOL Ret; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetScrollBarInfo\n"); UserEnterExclusive(); @@ -564,7 +565,7 @@ RETURN(FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Ret = co_IntGetScrollBarInfo(Window, idObject, &sbi); UserDerefObjectCo(Window); @@ -595,6 +596,7 @@ DWORD sz; BOOL Ret; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetScrollInfo\n"); UserEnterExclusive(); @@ -619,7 +621,7 @@ RETURN(FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Ret = co_IntGetScrollInfo(Window, fnBar, &psi); UserDerefObjectCo(Window); @@ -650,6 +652,7 @@ PSCROLLBARINFO InfoV = NULL, InfoH = NULL; BOOL Chg = FALSE; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserEnableScrollBar\n"); UserEnterExclusive(); @@ -658,7 +661,7 @@ { RETURN(FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); if(wSBflags == SB_CTL) { @@ -732,6 +735,7 @@ NTSTATUS Status; LONG Obj; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserSetScrollBarInfo\n"); UserEnterExclusive(); @@ -740,7 +744,7 @@ { RETURN( FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Obj = SBOBJ_TO_SBID(idObject); if(!SBID_IS_VALID(Obj)) @@ -792,6 +796,7 @@ NTSTATUS Status; SCROLLINFO ScrollInfo; DECLARE_RETURN(DWORD); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserSetScrollInfo\n"); UserEnterExclusive(); @@ -800,7 +805,7 @@ { RETURN( 0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Status = MmCopyFromCaller(&ScrollInfo, lpsi, sizeof(SCROLLINFO) - sizeof(ScrollInfo.nTrackPos)); if(!NT_SUCCESS(Status)) @@ -892,6 +897,7 @@ PWINDOW_OBJECT Window; DECLARE_RETURN(DWORD); DWORD ret; + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserShowScrollBar\n"); UserEnterExclusive(); @@ -901,7 +907,7 @@ RETURN(0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ret = co_UserShowScrollBar(Window, wBar, bShow); UserDerefObjectCo(Window); _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/vis.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/vis.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/vis.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -151,6 +151,7 @@ { HRGN Temp; PWINDOW_OBJECT Parent; + USER_REFERENCE_ENTRY Ref; ASSERT_REFS_CO(Window); @@ -164,7 +165,7 @@ Window->WindowRect.left - Parent->ClientRect.left, Window->WindowRect.top - Parent->ClientRect.top); - UserRefObjectCo(Parent); + UserRefObjectCo(Parent, &Ref); co_UserRedrawWindow(Parent, NULL, Temp, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/window.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -239,7 +239,8 @@ Window = UserGetWindowObject(hWnd); if (Window) { -// UserRefObjectCo(Window); +// USER_REFERENCE_ENTRY Ref; +// UserRefObjectCo(Window, &Ref); if (!IntGetOwner(Window) && !IntGetParent(Window)) { @@ -569,7 +570,7 @@ PW32THREAD WThread; PLIST_ENTRY Current; PWINDOW_OBJECT Wnd; - + USER_REFERENCE_ENTRY Ref; WThread = Thread->Tcb.Win32Thread; while (!IsListEmpty(&WThread->WindowListHead)) @@ -588,7 +589,7 @@ //ASSERT(co_UserDestroyWindow(Wnd)); - UserRefObjectCo(Wnd);//faxme: temp hack?? + UserRefObjectCo(Wnd, &Ref);//faxme: temp hack?? if (!co_UserDestroyWindow(Wnd)) { DPRINT1("Unable to destroy window 0x%x at thread cleanup... This is _VERY_ bad!\n", Wnd); @@ -1355,6 +1356,7 @@ BOOL MenuChanged; DECLARE_RETURN(HWND); BOOL HasOwner; + USER_REFERENCE_ENTRY ParentRef, Ref; ParentWindowHandle = PsGetWin32Thread()->Desktop->DesktopWindow; OwnerWindowHandle = NULL; @@ -1388,7 +1390,7 @@ // { ParentWindow = UserGetWindowObject(ParentWindowHandle); - if (ParentWindow) UserRefObjectCo(ParentWindow); + if (ParentWindow) UserRefObjectCo(ParentWindow, &ParentRef); // } // else // { @@ -1441,7 +1443,7 @@ RETURN( (HWND)0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ObDereferenceObject(WinSta); @@ -2118,8 +2120,8 @@ if (IntWndBelongsToThread(Child, PsGetWin32Thread())) { - - UserRefObjectCo(Child);//temp hack? + USER_REFERENCE_ENTRY ChildRef; + UserRefObjectCo(Child, &ChildRef);//temp hack? co_UserDestroyWindow(Child); UserDerefObjectCo(Child);//temp hack? @@ -2165,6 +2167,7 @@ PWINDOW_OBJECT Window; DECLARE_RETURN(BOOLEAN); BOOLEAN ret; + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserDestroyWindow\n"); UserEnterExclusive(); @@ -2174,7 +2177,7 @@ RETURN(FALSE); } - UserRefObjectCo(Window);//faxme: dunno if win should be reffed during destroy.. + UserRefObjectCo(Window, &Ref);//faxme: dunno if win should be reffed during destroy.. ret = co_UserDestroyWindow(Window); UserDerefObjectCo(Window);//faxme: dunno if win should be reffed during destroy.. @@ -2778,6 +2781,7 @@ { PWINDOW_OBJECT Wnd = NULL, WndParent = NULL, WndOldParent; HWND hWndOldParent = NULL; + USER_REFERENCE_ENTRY Ref, ParentRef; if (IntIsBroadcastHwnd(hWndChild) || IntIsBroadcastHwnd(hWndNewParent)) { @@ -2811,8 +2815,8 @@ return( NULL); } - UserRefObjectCo(Wnd); - UserRefObjectCo(WndParent); + UserRefObjectCo(Wnd, &Ref); + UserRefObjectCo(WndParent, &ParentRef); WndOldParent = co_IntSetParent(Wnd, WndParent); @@ -2930,6 +2934,7 @@ PWINSTATION_OBJECT WinStaObject; PWINDOW_OBJECT WndShell; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserSetShellWindowEx\n"); UserEnterExclusive(); @@ -2985,7 +2990,7 @@ RETURN( FALSE); } - UserRefObjectCo(WndShell); + UserRefObjectCo(WndShell, &Ref); co_WinPosSetWindowPos(WndShell, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); WinStaObject->ShellWindow = hwndShell; @@ -3876,7 +3881,9 @@ if (Changed && Repaint) { - UserRefObjectCo(Window); + USER_REFERENCE_ENTRY Ref; + + UserRefObjectCo(Window, &Ref); co_WinPosSetWindowPos(Window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED); @@ -3917,6 +3924,7 @@ WINDOWPLACEMENT Safepl; NTSTATUS Status; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserSetWindowPlacement\n"); UserEnterExclusive(); @@ -3936,7 +3944,7 @@ RETURN( FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); if ((Window->Style & (WS_MAXIMIZE | WS_MINIMIZE)) == 0) { @@ -3982,6 +3990,7 @@ DECLARE_RETURN(BOOL); PWINDOW_OBJECT Window; BOOL ret; + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserSetWindowPos\n"); UserEnterExclusive(); @@ -3991,7 +4000,7 @@ RETURN(FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ret = co_WinPosSetWindowPos(Window, hWndInsertAfter, X, Y, cx, cy, uFlags); UserDerefObjectCo(Window); @@ -4114,7 +4123,8 @@ if(bRedraw) { - UserRefObjectCo(Window); + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Window, &Ref); co_UserRedrawWindow(Window, NULL, NULL, RDW_INVALIDATE); UserDerefObjectCo(Window); } @@ -4137,6 +4147,7 @@ PWINDOW_OBJECT Window; BOOL ret; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserShowWindow\n"); UserEnterExclusive(); @@ -4146,7 +4157,7 @@ RETURN(FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ret = co_WinPosShowWindow(Window, nCmdShow); UserDerefObjectCo(Window); @@ -4206,6 +4217,7 @@ HWND Ret; PWINDOW_OBJECT DesktopWindow = NULL, Window = NULL; DECLARE_RETURN(HWND); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserWindowFromPoint\n"); UserEnterExclusive(); @@ -4219,7 +4231,7 @@ //hmm... threads live on desktops thus we have a reference on the desktop and indirectly the desktop window //its possible this referencing is useless, thou it shouldnt hurt... - UserRefObjectCo(DesktopWindow); + UserRefObjectCo(DesktopWindow, &Ref); Hit = co_WinPosWindowFromPoint(DesktopWindow, PsGetWin32Thread()->MessageQueue, &pt, &Window); _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/winpos.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/winpos.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/winpos.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -149,6 +149,7 @@ { PWINDOW_OBJECT WndTo = NULL; HWND Fg; + USER_REFERENCE_ENTRY Ref; ASSERT_REFS_CO(Window); @@ -176,7 +177,7 @@ done: - if (WndTo) UserRefObjectCo(WndTo); + if (WndTo) UserRefObjectCo(WndTo, &Ref); Fg = UserGetForegroundWindow(); if ((!Fg || Window->hSelf == Fg) && WndTo)//fixme: ok if WndTo is NULL?? @@ -224,7 +225,8 @@ if((WndChild->Style & WS_MINIMIZE) != 0 ) { - UserRefObjectCo(WndChild); + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(WndChild, &Ref); co_WinPosSetWindowPos(WndChild, 0, x + UserGetSystemMetrics(SM_CXBORDER), y - yspacing - UserGetSystemMetrics(SM_CYBORDER) @@ -709,7 +711,8 @@ if ((Wnd->Style & WS_POPUP) && UserGetWindow(List[i], GW_OWNER) == hWnd) { - UserRefObjectCo(Wnd); + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Wnd, &Ref); co_WinPosSetWindowPos(Wnd, hWndInsertAfter, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOSENDCHANGING); @@ -1530,6 +1533,7 @@ { PWINDOW_OBJECT Current; HWND *List, *phWnd; + USER_REFERENCE_ENTRY Ref; ASSERT_REFS_CO(ScopeWin); @@ -1572,7 +1576,7 @@ break; } - UserRefObjectCo(Current); + UserRefObjectCo(Current, &Ref); if (OnlyHitTests && (Current->MessageQueue == OnlyHitTests)) { @@ -1657,6 +1661,7 @@ MINMAXINFO SafeMinMax; NTSTATUS Status; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetMinMaxInfo\n"); UserEnterExclusive(); @@ -1666,7 +1671,7 @@ RETURN( FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Size.x = Window->WindowRect.left; Size.y = Window->WindowRect.top; _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/color.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/color.c 2005-10-15 13:22:13 UTC (rev 18481) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/objects/color.c 2005-10-15 14:26:53 UTC (rev 18482) @@ -638,6 +638,7 @@ { PWINDOW_OBJECT Wnd; BOOL calledFromUser, ret; + USER_REFERENCE_ENTRY Ref; calledFromUser = UserIsEntered(); @@ -657,7 +658,7 @@ return FALSE; } - UserRefObjectCo(Wnd); + UserRefObjectCo(Wnd, &Ref); ret = co_UserRedrawWindow(Wnd, NULL, 0, RDW_INVALIDATE); UserDerefObjectCo(Wnd);

19 years

[hbirr] 18481: Don't use alloca in a macro, which may be used in a loop. This does fix bug #805.

by hbirr＠svn.reactos.com

Don't use alloca in a macro, which may be used in a loop. This does fix bug #805. Modified: trunk/reactos/subsys/win32k/include/object.h Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsys/win32k/ntuser/caret.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/focus.c Modified: trunk/reactos/subsys/win32k/ntuser/message.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsys/win32k/ntuser/painting.c Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsys/win32k/ntuser/vis.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c Modified: trunk/reactos/subsys/win32k/objects/color.c _____ Modified: trunk/reactos/subsys/win32k/include/object.h --- trunk/reactos/subsys/win32k/include/object.h 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/include/object.h 2005-10-15 13:22:13 UTC (rev 18481) @@ -90,20 +90,18 @@ ASSERT(_obj_ == ref->obj); \ \ } -#define UserRefObjectCo(_obj_) \ +#define UserRefObjectCo(_obj_, _ref_) \ { \ PW32THREAD t; \ - PUSER_REFERENCE_ENTRY ref; \ \ ASSERT(_obj_); \ t = PsGetWin32Thread(); \ ASSERT(t); \ - ref = (PUSER_REFERENCE_ENTRY)_alloca(sizeof(USER_REFERENCE_ENTRY)); \ - ASSERT(ref); \ - ref->obj = _obj_; \ + ASSERT(_ref_); \ + (_ref_)->obj = _obj_; \ ObmReferenceObject(_obj_); \ \ - PushEntryList(&t->ReferencesList, &ref->Entry); \ + PushEntryList(&t->ReferencesList, &(_ref_)->Entry); \ \ } _____ Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c --- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -433,6 +433,7 @@ PWINDOW_OBJECT Window = NULL; PACCELERATOR_TABLE Accel = NULL; ULONG i; + USER_REFERENCE_ENTRY AccelRef, WindowRef; DECLARE_RETURN(int); DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p)\n", @@ -458,14 +459,14 @@ RETURN( 0); } - UserRefObjectCo(Accel); + UserRefObjectCo(Accel, &AccelRef); if (!(Window = UserGetWindowObject(hWnd))) { RETURN( 0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &WindowRef); /* FIXME: Associate AcceleratorTable with the current thread */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/caret.c --- trunk/reactos/subsys/win32k/ntuser/caret.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/caret.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -405,6 +405,7 @@ NtUserShowCaret(HWND hWnd OPTIONAL, BOOL bShow) { PWINDOW_OBJECT Window = NULL; + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(BOOL); BOOL ret; @@ -416,7 +417,7 @@ RETURN(FALSE); } - if (Window) UserRefObjectCo(Window); + if (Window) UserRefObjectCo(Window, &Ref); if (bShow) ret = co_UserShowCaret(Window); _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -547,6 +547,7 @@ { PWINDOW_OBJECT Window; LONG Ret; + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(DWORD); DPRINT("Enter NtUserSetClassLong\n"); @@ -557,7 +558,7 @@ RETURN(0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Ret = IntGetClassLong(Window, Offset, Ansi); co_IntSetClassLong(Window, Offset, dwNewLong, Ansi); _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -61,12 +61,13 @@ VOID FASTCALL co_IntSendActivateMessages(HWND hWndPrev, HWND hWnd, BOOL MouseActivate) { + USER_REFERENCE_ENTRY Ref; PWINDOW_OBJECT Window; if ((Window = UserGetWindowObject(hWnd))) { - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); /* Send palette messages */ if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) @@ -218,6 +219,7 @@ { HWND Top; PWINDOW_OBJECT TopWindow; + USER_REFERENCE_ENTRY Ref; ASSERT_REFS_CO(Window); @@ -231,7 +233,7 @@ Top = IntFindChildWindowToOwner(DesktopWindow, Window); if((TopWnd = UserGetWindowObject(Top))) { - UserRefObjectCo(TopWnd); + UserRefObjectCo(TopWnd, &Ref); Ret = co_IntMouseActivateWindow(TopWnd); UserDerefObjectCo(TopWnd); @@ -246,7 +248,7 @@ if (!TopWindow) return FALSE; /* TMN: Check return valud from this function? */ - UserRefObjectCo(TopWindow); + UserRefObjectCo(TopWindow, &Ref); co_IntSetForegroundAndFocusWindow(TopWindow, Window, TRUE); @@ -386,6 +388,7 @@ HWND STDCALL NtUserSetActiveWindow(HWND hWnd) { + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(HWND); DPRINT("Enter NtUserSetActiveWindow(%x)\n", hWnd); @@ -412,7 +415,7 @@ RETURN( 0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); hWndPrev = co_IntSetActiveWindow(Window); UserDerefObjectCo(Window); @@ -503,6 +506,7 @@ PUSER_MESSAGE_QUEUE ThreadQueue; HWND hWndPrev; PWINDOW_OBJECT TopWnd; + USER_REFERENCE_ENTRY Ref; ASSERT_REFS_CO(Window); @@ -523,7 +527,7 @@ if (TopWnd && TopWnd->hSelf != UserGetActiveWindow()) { // PWINDOW_OBJECT WndTops = UserGetWindowObject(hWndTop); - UserRefObjectCo(TopWnd); + UserRefObjectCo(TopWnd, &Ref); co_IntSetActiveWindow(TopWnd); UserDerefObjectCo(TopWnd); } @@ -547,6 +551,7 @@ NtUserSetFocus(HWND hWnd) { PWINDOW_OBJECT Window; + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(HWND); HWND ret; @@ -558,7 +563,7 @@ RETURN(NULL); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ret = co_UserSetFocus(Window); UserDerefObjectCo(Window); _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -547,6 +547,7 @@ co_IntTranslateMouseMessage(PUSER_MESSAGE_QUEUE ThreadQueue, LPMSG Msg, USHORT *HitTest, BOOL Remove) { PWINDOW_OBJECT Window; + USER_REFERENCE_ENTRY Ref, DesktopRef; if(!(Window = UserGetWindowObject(Msg->hwnd))) { @@ -554,7 +555,7 @@ return TRUE; } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); if(ThreadQueue == Window->MessageQueue && ThreadQueue->CaptureWindow != Window->hSelf) @@ -572,7 +573,7 @@ { PWINDOW_OBJECT Wnd; - UserRefObjectCo(DesktopWindow); + UserRefObjectCo(DesktopWindow, &DesktopRef); co_WinPosWindowFromPoint(DesktopWindow, Window->MessageQueue, &Msg->pt, &Wnd); if(Wnd) @@ -664,6 +665,7 @@ PUSER_MESSAGE_QUEUE ThreadQueue; PUSER_MESSAGE Message; BOOL Present, RemoveMessages; + USER_REFERENCE_ENTRY Ref; /* The queues and order in which they are checked are documented in the MSDN article on GetMessage() */ @@ -772,7 +774,7 @@ { USHORT HitTest; - UserRefObjectCo(MsgWindow); + UserRefObjectCo(MsgWindow, &Ref); if(co_IntTranslateMouseMessage(ThreadQueue, &Msg->Msg, &HitTest, TRUE)) /* FIXME - check message filter again, if the message doesn't match anymore, @@ -972,6 +974,7 @@ UINT Size; USER_MESSAGE Msg; DECLARE_RETURN(BOOL); +// USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetMessage\n"); UserEnterExclusive(); @@ -982,7 +985,7 @@ RETURN(-1); } -// if (Window) UserRefObjectCo(Window); +// if (Window) UserRefObjectCo(Window, &Ref); if (MsgFilterMax < MsgFilterMin) { @@ -1357,6 +1360,7 @@ LPARAM lParamPacked; PW32THREAD Win32Thread; DECLARE_RETURN(LRESULT); + USER_REFERENCE_ENTRY Ref; /* FIXME: Call hooks. */ if (!(Window = UserGetWindowObject(hWnd))) @@ -1364,7 +1368,7 @@ RETURN( FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Win32Thread = PsGetWin32Thread(); _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -689,6 +689,7 @@ { BOOL Ret = 0; PWINDOW_OBJECT Window; + USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(BOOLEAN); DPRINT("Enter NtUserCallHwndLock\n"); @@ -698,7 +699,7 @@ { RETURN( FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); /* FIXME: Routine can be 0x53 - 0x5E */ switch (Routine) _____ Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c --- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -477,6 +477,7 @@ PVOID WaitObjects[2]; NTSTATUS WaitStatus; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; if( !IntGetScreenDC() || PsGetWin32Thread()->MessageQueue == W32kGetPrimitiveMessageQueue() ) @@ -504,7 +505,7 @@ DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); - if (DesktopWindow) UserRefObjectCo(DesktopWindow);//can DesktopWindow be NULL? + if (DesktopWindow) UserRefObjectCo(DesktopWindow, &Ref);//can DesktopWindow be NULL? /* Process messages in the message queue itself. */ IntLockHardwareMessageQueue(MessageQueue); _____ Modified: trunk/reactos/subsys/win32k/ntuser/painting.c --- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -295,7 +295,8 @@ Window = UserGetWindowObject(*phWnd); if (Window && (Window->Style & WS_VISIBLE)) { - UserRefObjectCo(Window); + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Window, &Ref); co_IntPaintWindows(Window, Flags); UserDerefObjectCo(Window); } @@ -722,6 +723,7 @@ PROSRGNDATA Rgn; NTSTATUS Status; DECLARE_RETURN(HDC); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserBeginPaint\n"); UserEnterExclusive(); @@ -731,7 +733,7 @@ RETURN( NULL); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); co_UserHideCaret(Window); @@ -828,6 +830,7 @@ { PWINDOW_OBJECT Window; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserEndPaint\n"); UserEnterExclusive(); @@ -839,7 +842,7 @@ UserReleaseDC(Window, lPs->hdc, TRUE); - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); co_UserShowCaret(Window); UserDerefObjectCo(Window); @@ -894,6 +897,7 @@ DECLARE_RETURN(INT); PWINDOW_OBJECT Window; INT ret; + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetUpdateRgn\n"); UserEnterExclusive(); @@ -903,7 +907,7 @@ RETURN(ERROR); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ret = co_UserGetUpdateRgn(Window, hRgn, bErase); UserDerefObjectCo(Window); @@ -975,7 +979,8 @@ if (bErase && !IntGdiIsEmptyRect(&Rect)) { - UserRefObjectCo(Window); + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Window, &Ref); co_UserRedrawWindow(Window, NULL, NULL, RDW_ERASENOW | RDW_NOCHILDREN); UserDerefObjectCo(Window); } @@ -1013,6 +1018,7 @@ NTSTATUS Status; PWINDOW_OBJECT Wnd; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserRedrawWindow\n"); UserEnterExclusive(); @@ -1034,7 +1040,7 @@ } } - UserRefObjectCo(Wnd); + UserRefObjectCo(Wnd, &Ref); Status = co_UserRedrawWindow(Wnd, NULL == lprcUpdate ? NULL : &SafeUpdateRect, hrgnUpdate, flags); @@ -1206,6 +1212,7 @@ BOOL bOwnRgn = TRUE; NTSTATUS Status; DECLARE_RETURN(DWORD); + USER_REFERENCE_ENTRY Ref, CaretRef; DPRINT("Enter NtUserScrollWindowEx\n"); UserEnterExclusive(); @@ -1216,7 +1223,7 @@ Window = NULL; /* prevent deref at cleanup */ RETURN( ERROR); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); IntGetClientRect(Window, &rc); @@ -1292,6 +1299,7 @@ RECT r, dummy; POINT ClientOrigin; PWINDOW_OBJECT Wnd; + USER_REFERENCE_ENTRY WndRef; IntGetClientOrigin(Window, &ClientOrigin); for (i = 0; List[i]; i++) @@ -1307,7 +1315,7 @@ if (! UnsafeRect || IntGdiIntersectRect(&dummy, &r, &rc)) { - UserRefObjectCo(Wnd); + UserRefObjectCo(Wnd, &WndRef); co_WinPosSetWindowPos(Wnd, 0, r.left + dx, r.top + dy, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOREDRAW); @@ -1329,7 +1337,7 @@ if ((CaretWnd = UserGetWindowObject(hwndCaret))) { - UserRefObjectCo(CaretWnd); + UserRefObjectCo(CaretWnd, &CaretRef); co_IntSetCaretPos(caretrc.left + dx, caretrc.top + dy); co_UserShowCaret(CaretWnd); _____ Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c --- trunk/reactos/subsys/win32k/ntuser/scrollbar.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/scrollbar.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -548,6 +548,7 @@ PWINDOW_OBJECT Window; BOOL Ret; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetScrollBarInfo\n"); UserEnterExclusive(); @@ -564,7 +565,7 @@ RETURN(FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Ret = co_IntGetScrollBarInfo(Window, idObject, &sbi); UserDerefObjectCo(Window); @@ -595,6 +596,7 @@ DWORD sz; BOOL Ret; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetScrollInfo\n"); UserEnterExclusive(); @@ -619,7 +621,7 @@ RETURN(FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Ret = co_IntGetScrollInfo(Window, fnBar, &psi); UserDerefObjectCo(Window); @@ -650,6 +652,7 @@ PSCROLLBARINFO InfoV = NULL, InfoH = NULL; BOOL Chg = FALSE; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserEnableScrollBar\n"); UserEnterExclusive(); @@ -658,7 +661,7 @@ { RETURN(FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); if(wSBflags == SB_CTL) { @@ -732,6 +735,7 @@ NTSTATUS Status; LONG Obj; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserSetScrollBarInfo\n"); UserEnterExclusive(); @@ -740,7 +744,7 @@ { RETURN( FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Obj = SBOBJ_TO_SBID(idObject); if(!SBID_IS_VALID(Obj)) @@ -792,6 +796,7 @@ NTSTATUS Status; SCROLLINFO ScrollInfo; DECLARE_RETURN(DWORD); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserSetScrollInfo\n"); UserEnterExclusive(); @@ -800,7 +805,7 @@ { RETURN( 0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Status = MmCopyFromCaller(&ScrollInfo, lpsi, sizeof(SCROLLINFO) - sizeof(ScrollInfo.nTrackPos)); if(!NT_SUCCESS(Status)) @@ -892,6 +897,7 @@ PWINDOW_OBJECT Window; DECLARE_RETURN(DWORD); DWORD ret; + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserShowScrollBar\n"); UserEnterExclusive(); @@ -901,7 +907,7 @@ RETURN(0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ret = co_UserShowScrollBar(Window, wBar, bShow); UserDerefObjectCo(Window); _____ Modified: trunk/reactos/subsys/win32k/ntuser/vis.c --- trunk/reactos/subsys/win32k/ntuser/vis.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/vis.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -151,6 +151,7 @@ { HRGN Temp; PWINDOW_OBJECT Parent; + USER_REFERENCE_ENTRY Ref; ASSERT_REFS_CO(Window); @@ -164,7 +165,7 @@ Window->WindowRect.left - Parent->ClientRect.left, Window->WindowRect.top - Parent->ClientRect.top); - UserRefObjectCo(Parent); + UserRefObjectCo(Parent, &Ref); co_UserRedrawWindow(Parent, NULL, Temp, RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -239,7 +239,8 @@ Window = UserGetWindowObject(hWnd); if (Window) { -// UserRefObjectCo(Window); +// USER_REFERENCE_ENTRY Ref; +// UserRefObjectCo(Window, &Ref); if (!IntGetOwner(Window) && !IntGetParent(Window)) { @@ -569,7 +570,7 @@ PW32THREAD WThread; PLIST_ENTRY Current; PWINDOW_OBJECT Wnd; - + USER_REFERENCE_ENTRY Ref; WThread = Thread->Tcb.Win32Thread; while (!IsListEmpty(&WThread->WindowListHead)) @@ -588,7 +589,7 @@ //ASSERT(co_UserDestroyWindow(Wnd)); - UserRefObjectCo(Wnd);//faxme: temp hack?? + UserRefObjectCo(Wnd, &Ref);//faxme: temp hack?? if (!co_UserDestroyWindow(Wnd)) { DPRINT1("Unable to destroy window 0x%x at thread cleanup... This is _VERY_ bad!\n", Wnd); @@ -1355,6 +1356,7 @@ BOOL MenuChanged; DECLARE_RETURN(HWND); BOOL HasOwner; + USER_REFERENCE_ENTRY ParentRef, Ref; ParentWindowHandle = PsGetWin32Thread()->Desktop->DesktopWindow; OwnerWindowHandle = NULL; @@ -1388,7 +1390,7 @@ // { ParentWindow = UserGetWindowObject(ParentWindowHandle); - if (ParentWindow) UserRefObjectCo(ParentWindow); + if (ParentWindow) UserRefObjectCo(ParentWindow, &ParentRef); // } // else // { @@ -1441,7 +1443,7 @@ RETURN( (HWND)0); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ObDereferenceObject(WinSta); @@ -2118,8 +2120,8 @@ if (IntWndBelongsToThread(Child, PsGetWin32Thread())) { - - UserRefObjectCo(Child);//temp hack? + USER_REFERENCE_ENTRY ChildRef; + UserRefObjectCo(Child, &ChildRef);//temp hack? co_UserDestroyWindow(Child); UserDerefObjectCo(Child);//temp hack? @@ -2165,6 +2167,7 @@ PWINDOW_OBJECT Window; DECLARE_RETURN(BOOLEAN); BOOLEAN ret; + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserDestroyWindow\n"); UserEnterExclusive(); @@ -2174,7 +2177,7 @@ RETURN(FALSE); } - UserRefObjectCo(Window);//faxme: dunno if win should be reffed during destroy.. + UserRefObjectCo(Window, &Ref);//faxme: dunno if win should be reffed during destroy.. ret = co_UserDestroyWindow(Window); UserDerefObjectCo(Window);//faxme: dunno if win should be reffed during destroy.. @@ -2778,6 +2781,7 @@ { PWINDOW_OBJECT Wnd = NULL, WndParent = NULL, WndOldParent; HWND hWndOldParent = NULL; + USER_REFERENCE_ENTRY Ref, ParentRef; if (IntIsBroadcastHwnd(hWndChild) || IntIsBroadcastHwnd(hWndNewParent)) { @@ -2811,8 +2815,8 @@ return( NULL); } - UserRefObjectCo(Wnd); - UserRefObjectCo(WndParent); + UserRefObjectCo(Wnd, &Ref); + UserRefObjectCo(WndParent, &ParentRef); WndOldParent = co_IntSetParent(Wnd, WndParent); @@ -2930,6 +2934,7 @@ PWINSTATION_OBJECT WinStaObject; PWINDOW_OBJECT WndShell; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserSetShellWindowEx\n"); UserEnterExclusive(); @@ -2985,7 +2990,7 @@ RETURN( FALSE); } - UserRefObjectCo(WndShell); + UserRefObjectCo(WndShell, &Ref); co_WinPosSetWindowPos(WndShell, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE); WinStaObject->ShellWindow = hwndShell; @@ -3876,7 +3881,9 @@ if (Changed && Repaint) { - UserRefObjectCo(Window); + USER_REFERENCE_ENTRY Ref; + + UserRefObjectCo(Window, &Ref); co_WinPosSetWindowPos(Window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED); @@ -3917,6 +3924,7 @@ WINDOWPLACEMENT Safepl; NTSTATUS Status; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserSetWindowPlacement\n"); UserEnterExclusive(); @@ -3936,7 +3944,7 @@ RETURN( FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); if ((Window->Style & (WS_MAXIMIZE | WS_MINIMIZE)) == 0) { @@ -3982,6 +3990,7 @@ DECLARE_RETURN(BOOL); PWINDOW_OBJECT Window; BOOL ret; + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserSetWindowPos\n"); UserEnterExclusive(); @@ -3991,7 +4000,7 @@ RETURN(FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ret = co_WinPosSetWindowPos(Window, hWndInsertAfter, X, Y, cx, cy, uFlags); UserDerefObjectCo(Window); @@ -4114,7 +4123,8 @@ if(bRedraw) { - UserRefObjectCo(Window); + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Window, &Ref); co_UserRedrawWindow(Window, NULL, NULL, RDW_INVALIDATE); UserDerefObjectCo(Window); } @@ -4137,6 +4147,7 @@ PWINDOW_OBJECT Window; BOOL ret; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserShowWindow\n"); UserEnterExclusive(); @@ -4146,7 +4157,7 @@ RETURN(FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); ret = co_WinPosShowWindow(Window, nCmdShow); UserDerefObjectCo(Window); @@ -4206,6 +4217,7 @@ HWND Ret; PWINDOW_OBJECT DesktopWindow = NULL, Window = NULL; DECLARE_RETURN(HWND); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserWindowFromPoint\n"); UserEnterExclusive(); @@ -4219,7 +4231,7 @@ //hmm... threads live on desktops thus we have a reference on the desktop and indirectly the desktop window //its possible this referencing is useless, thou it shouldnt hurt... - UserRefObjectCo(DesktopWindow); + UserRefObjectCo(DesktopWindow, &Ref); Hit = co_WinPosWindowFromPoint(DesktopWindow, PsGetWin32Thread()->MessageQueue, &pt, &Window); _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -149,6 +149,7 @@ { PWINDOW_OBJECT WndTo = NULL; HWND Fg; + USER_REFERENCE_ENTRY Ref; ASSERT_REFS_CO(Window); @@ -176,7 +177,7 @@ done: - if (WndTo) UserRefObjectCo(WndTo); + if (WndTo) UserRefObjectCo(WndTo, &Ref); Fg = UserGetForegroundWindow(); if ((!Fg || Window->hSelf == Fg) && WndTo)//fixme: ok if WndTo is NULL?? @@ -224,7 +225,8 @@ if((WndChild->Style & WS_MINIMIZE) != 0 ) { - UserRefObjectCo(WndChild); + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(WndChild, &Ref); co_WinPosSetWindowPos(WndChild, 0, x + UserGetSystemMetrics(SM_CXBORDER), y - yspacing - UserGetSystemMetrics(SM_CYBORDER) @@ -709,7 +711,8 @@ if ((Wnd->Style & WS_POPUP) && UserGetWindow(List[i], GW_OWNER) == hWnd) { - UserRefObjectCo(Wnd); + USER_REFERENCE_ENTRY Ref; + UserRefObjectCo(Wnd, &Ref); co_WinPosSetWindowPos(Wnd, hWndInsertAfter, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOSENDCHANGING); @@ -1530,6 +1533,7 @@ { PWINDOW_OBJECT Current; HWND *List, *phWnd; + USER_REFERENCE_ENTRY Ref; ASSERT_REFS_CO(ScopeWin); @@ -1572,7 +1576,7 @@ break; } - UserRefObjectCo(Current); + UserRefObjectCo(Current, &Ref); if (OnlyHitTests && (Current->MessageQueue == OnlyHitTests)) { @@ -1657,6 +1661,7 @@ MINMAXINFO SafeMinMax; NTSTATUS Status; DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; DPRINT("Enter NtUserGetMinMaxInfo\n"); UserEnterExclusive(); @@ -1666,7 +1671,7 @@ RETURN( FALSE); } - UserRefObjectCo(Window); + UserRefObjectCo(Window, &Ref); Size.x = Window->WindowRect.left; Size.y = Window->WindowRect.top; _____ Modified: trunk/reactos/subsys/win32k/objects/color.c --- trunk/reactos/subsys/win32k/objects/color.c 2005-10-15 12:40:30 UTC (rev 18480) +++ trunk/reactos/subsys/win32k/objects/color.c 2005-10-15 13:22:13 UTC (rev 18481) @@ -638,6 +638,7 @@ { PWINDOW_OBJECT Wnd; BOOL calledFromUser, ret; + USER_REFERENCE_ENTRY Ref; calledFromUser = UserIsEntered(); @@ -657,7 +658,7 @@ return FALSE; } - UserRefObjectCo(Wnd); + UserRefObjectCo(Wnd, &Ref); ret = co_UserRedrawWindow(Wnd, NULL, 0, RDW_INVALIDATE); UserDerefObjectCo(Wnd);

19 years

[greatlrd] 18480: Japanese translation by tsk email tsk_n@mail.goo.ne.jp

by greatlrd＠svn.reactos.com

Japanese translation by tsk email tsk_n(a)mail.goo.ne.jp Added: trunk/reactos/subsys/system/regedit/Ja.rc Modified: trunk/reactos/subsys/system/regedit/clb/clb.rc Added: trunk/reactos/subsys/system/regedit/clb/clb_Ja.rc Modified: trunk/reactos/subsys/system/regedit/rsrc.rc _____ Added: trunk/reactos/subsys/system/regedit/Ja.rc --- trunk/reactos/subsys/system/regedit/Ja.rc 2005-10-15 12:26:40 UTC (rev 18479) +++ trunk/reactos/subsys/system/regedit/Ja.rc 2005-10-15 12:40:30 UTC (rev 18480) @@ -0,0 +1,380 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * AUTHOR: Robert Dickenson + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL + +/* + * Menu + */ + +IDC_REGEDIT MENU DISCARDABLE +BEGIN + POPUP "âtâ@âCâï(&F)" + BEGIN + MENUITEM "âîâWâXâgâè âGâfâBâ^é?ÅIù?(&X)", ID_REGISTRY_EXIT + END + POPUP "âwâïâv(&H)" + BEGIN + MENUITEM "âoü[âWâçâôÅ¯ò±(&A)...", ID_HELP_ABOUT + END +END + +IDR_REGEDIT_MENU MENU DISCARDABLE +BEGIN + POPUP "âîâWâXâgâè(&R)" + BEGIN + MENUITEM "âîâWâXâgâè âtâ@âCâïé?âCâôâ|ü[âg(&I)...", ID_REGISTRY_IMPORTREGISTRYFILE + + MENUITEM "âîâWâXâgâè âtâ@âCâïé?âGâNâXâ|ü[âg(&E)...", ID_REGISTRY_EXPORTREGISTRYFILE + + MENUITEM SEPARATOR + MENUITEM "âlâbâgâÅü[âN âîâWâXâgâèéÍé?É?æ?(&C)...", ID_REGISTRY_CONNECTNETWORKREGISTRY + + MENUITEM "âlâbâgâÅü[âN âîâWâXâgâèé?ÉÏÆf(&D)...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY + , GRAYED + MENUITEM SEPARATOR + MENUITEM "ê¾ì³(&P)\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "âîâWâXâgâè âGâfâBâ^é?ÅIù?(&X)", ID_REGISTRY_EXIT + END + POPUP "òÊÅW(&E)" + BEGIN + MENUITEM "ÅCÉ?(&M)", ID_EDIT_MODIFY + MENUITEM SEPARATOR + POPUP "ÉVïK(&N)" + BEGIN + MENUITEM "âLü[(&K)", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "òÂÄÜù±Æl(&S)", ID_EDIT_NEW_STRINGVALUE + MENUITEM "âoâCâiâèÆl(&B)", ID_EDIT_NEW_BINARYVALUE + MENUITEM "DWORD Æl(&D)", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM SEPARATOR + MENUITEM "âAâNâZâXïûë?(&P)...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "ìÝÅ£(&D)\tDel", ID_EDIT_DELETE + MENUITEM "û?æOé?ò¤ìX(&R)", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "âLü[û?é?âRâsü[(&C)", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "îfì§(&F)\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "Äféîfì§(&X)\tF3", ID_EDIT_FINDNEXT, GRAYED + END + POPUP "ò\\Äª(&V)" + BEGIN + MENUITEM "âXâeü[â^âX âoü[(&B)", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "ï½èEé?ò¤ìX(&L)", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "ì?ÉVé?Å¯ò±é?ìXÉV(&R)\tF5", ID_VIEW_REFRESH + END + POPUP "é¿ïCé?ô³éÞ(&F)" + BEGIN + MENUITEM "é¿ïCé?ô³éÞé?ÆÃë?(&A)", ID_FAVOURITES_ADDTOFAVOURITES + , GRAYED + MENUITEM "é¿ïCé?ô³éÞé?ìÝÅ£(&R)", ID_FAVOURITES_REMOVEFAVOURITE + , GRAYED + END + POPUP "âwâïâv(&H)" + BEGIN + MENUITEM "âgâsâbâNé?îfì§(&H)\tF1", ID_HELP_HELPTOPICS + MENUITEM SEPARATOR + MENUITEM "âoü[âWâçâôÅ¯ò±(&A)", ID_HELP_ABOUT + END +END + +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "ÅCÉ?(&M)", ID_EDIT_MODIFY + MENUITEM "âoâCâiâè âfü[â^é?ÅCÉ?", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "ìÝÅ£(&D)\tDel", ID_EDIT_DELETE + MENUITEM "û?æOé?ò¤ìX(&R)", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "ÉVïK(&N)" + BEGIN + MENUITEM "âLü[(&K)", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "òÂÄÜù±Æl(&S)", ID_EDIT_NEW_STRINGVALUE + MENUITEM "âoâCâiâèÆl(&B)", ID_EDIT_NEW_BINARYVALUE + MENUITEM "DWORD Æl(&D)", ID_EDIT_NEW_DWORDVALUE + END + END + POPUP "" + BEGIN + MENUITEM "ôWèJéÀéÚ/ò?éÂéÚ", ID_TREE_EXPANDBRANCH + POPUP "ÉVïK(&N)" + BEGIN + MENUITEM "âLü[(&K)", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "òÂÄÜù±Æl(&S)", ID_EDIT_NEW_STRINGVALUE + MENUITEM "âoâCâiâèÆl(&B)", ID_EDIT_NEW_BINARYVALUE + MENUITEM "DWORD Æl(&D)", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "îfì§(&F)", ID_EDIT_FIND, GRAYED + MENUITEM "ìÝÅ£(&D)", ID_TREE_DELETE + MENUITEM "û?æOé?ò¤ìX(&R)", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "âLü[û?é?âRâsü[(&C)", ID_EDIT_COPYKEYNAME, GRAYED + END +END + + +/* + * Dialog + */ + +IDD_EDIT_STRING DIALOG 32, 24, 252, 84 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "òÂÄÜù±é?òÊÅW" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "Ælé?û?æO(&N):",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Ælé?âfü[â^(&V):",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,142,64,50,14 + PUSHBUTTON "âLâââôâZâï",IDCANCEL,196,64,50,14 +END + +IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "òíÉöìsòÂÄÜù±é?òÊÅW" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "Ælé?û?æO(&N):",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Ælé?âfü[â^(&V):",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "âLâââôâZâï",IDCANCEL,196,154,50,14 +END + +IDD_EDIT_BIN_DATA DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "âoâCâiâèÆlé?òÊÅW" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "Ælé?û?æO(&N):",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Ælé?âfü[â^(&V):",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "âLâââôâZâï",IDCANCEL,196,154,50,14 +END + + +IDD_EDIT_DWORD DIALOG 32, 24, 252, 104 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "DWORD Ælé?òÊÅW" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "Ælé?û?æO(&N):",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Ælé?âfü[â^(&V):",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL + GROUPBOX "ò\\ïLé?è¯Éö",IDC_STATIC,130,35,116,39 + AUTORADIOBUTTON "16 Éi(&H)",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP + AUTORADIOBUTTON "10 Éi(&D)",IDC_FORMAT_DEC,141,59,60,10 + DEFPUSHBUTTON "OK",IDOK,142,82,50,14 + PUSHBUTTON "âLâââôâZâï",IDCANCEL,196,82,50,14 +END + +/* + * String Table + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LIST_COLUMN_NAME "û?æO" + IDS_LIST_COLUMN_TYPE "ÄÝùÌ" + IDS_LIST_COLUMN_DATA "âfü[â^" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "âîâWâXâgâè âGâfâBâ^" + IDC_REGEDIT "REGEDIT" + IDC_REGEDIT_FRAME "REGEDIT_FRAME" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_MENU "âîâWâXâgâèæSæ?é?ÄgùpéÀéÚâRâ}âôâhé?éÀüB" + ID_EDIT_MENU "ÆléÔâLü[éòÊÅWéÀéÚâRâ}âôâhé?éÀüB" + ID_VIEW_MENU "âîâWâXâgâè âEâBâôâhâEéâJâXâ^â}âCâYéÀéÚâRâ}âôâhé?éÀüB" + ID_FAVOURITES_MENU "òpö?é?Ägùpé?éÛéÚâLü[é? âAâNâZâïéÀéÚâRâ}âôâhé?éÀüB" + ID_HELP_MENU "âwâïâvéãâîâWâXâgâè âGâfâBâ^é?âoü[âWâçâôÅ¯ò ±éò\\ÄªéÀéÚâRâ}âôâhé?éÀüB" + ID_EDIT_NEW_MENU "ÉVéÁéóâLü[éÔÆléìýÉ¼éÀéÚâRâ}âôâhé?éÀüB" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_EDIT_MODIFY "Ælé?âfü[â^éò¤ìXéÁé?éÀüB" + ID_EDIT_NEW_KEY "ÉVéÁéóâLü[éÆÃë?éÁé?éÀüB" + ID_EDIT_NEW_STRINGVALUE "ÉVéÁéóòÂÄÜù±ÆléÆÃë?éÁé?éÀüB" + ID_EDIT_NEW_BINARYVALUE "ÉVéÁéóâoâCâiâèÆléÆÃë?éÁé?éÀüB" + ID_EDIT_NEW_DWORDVALUE "ÉVéÁéóòíÉöìsòÂÄÜù±ÆléÆÃë?éÁé?éÀüB" + ID_REGISTRY_IMPORTREGISTRYFILE "âeâLâXâg âtâ@âCâïéâîâWâXâgâèé? âCâôâ|ü[âgéÁé?éÀüB" + ID_REGISTRY_EXPORTREGISTRYFILE + "âîâWâXâgâèé?êÛòöé?é¢é?æSæ?éâeâLâXâg âtâ@âCâïé?âGâNâXâ|ü[âgéÁé?éÀüB" + ID_REGISTRY_CONNECTNETWORKREGISTRY + "âèâéü[âg âRâôâsâàü[â^é?âîâWâXâgâèé?É?æ?éÁé ?éÀüB" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + "âèâéü[âg âRâôâsâàü[â^é?âîâWâXâgâèéÉÏÆféÁé ?éÀüB" + ID_REGISTRY_PRINT "âîâWâXâgâèé?êÛòöé?é¢é?æSæ?éê¾ì³éÁé?éÀüB" +/* ID_HELP_HELPTOPICS "âîâWâXâgâè âGâfâBâ^é?âwâïâvéèJé½é?éÀüB" */ + ID_HELP_ABOUT "âvâìâOâëâÇé?Å¯ò±üAâoü[âWâçâôöÈìåé¿ éµéÐÆÿìýîáéò\\ÄªéÁé?éÀüB" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_EXIT "âîâWâXâgâè âGâfâBâ^éÅIù?éÁé?éÀüB" + ID_FAVOURITES_ADDTOFAVOURITES "é¿ïCé?ô³éÞé?êÛùùé?âLü[éÆÃë?éÁé? éÀüB" + ID_FAVOURITES_REMOVEFAVOURITE "é¿ïCé?ô³éÞé?êÛùùé®éþâLü[éìÝÅ£éÁé? éÀüB" + ID_VIEW_STATUSBAR "âXâeü[â^âX âoü[é?ò\\Äª/ö±ò\\ÄªéÉÏéÞæÍéªé? éÀüB" + ID_VIEW_SPLIT "2 é?é?âpâlâïé?ï½èEé?ê?Æuéò¤ìXéÁé?éÀüB" + ID_VIEW_REFRESH "âEâBâôâhâEé?ôÓùeéì?ÉVé?Å¯ò±é?ìXÉVéÁé? éÀüB" + ID_EDIT_DELETE "æIæö?ê?éìÝÅ£éÁé?éÀüB" + ID_EDIT_RENAME "û?æOéò¤ìXéÁé?éÀüB" + ID_EDIT_COPYKEYNAME "æIæé?éÛé¢âLü[û?éâNâèâbâvâ{ü[âhé? âRâsü[éÁé?éÀüB" + ID_EDIT_FIND "âLü[üAÆlüAâfü[â^é?Æåé?âeâLâXâgéîfì§éÁé? éÀüB" + ID_EDIT_FINDNEXT "æOë±éãô»éÂÅîÅé?Äfé?ìÇû?éîfì§éÁé?éÀüB" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "âGâëü[" + IDS_WARNING "îxìÉ" + IDS_BAD_VALUE "'%s' é?ÆléÅãë´é?é½é?é?é±üB" + IDS_UNSUPPORTED_TYPE "é?é?ÄÝùÌé?âLü[é?òÊÅWé?é½é?é?é± (%ld)üB" + IDS_TOO_BIG_VALUE "Ælé¬æÕé½éÀé¼é?éÀ (%ld)üB" + IDS_MULTI_SZ_EMPTY_STRING "REG_MULTI_SZ î^é?âfü[â^é?ï¾öÆòÂÄÜù±éè? éÌé?éãé?é?é½é?é?é±üB\nâîâWâXâgâè âGâfâBâ^é?îfÅoéÁé¢ï¾öÆòÂÄÜù±éìÝÅ£éÁé? éÀüB" + IDS_QUERY_DELETE_KEY_ONE "é?é?âLü[éìÝÅ£éÁé?éÓéµéÙéÁéóé?éÀé®?" + IDS_QUERY_DELETE_KEY_MORE "é?éÛéþé?âLü[ééÀéÎé?ìÝÅ£éÁé? éÓéµéÙéÁéóé?éÀé®?" + IDS_QUERY_DELETE_KEY_CONFIRM "âLü[é?ìÝÅ£é?èmöF" + IDS_QUERY_DELETE_ONE "é?é?ÆléìÝÅ£éÁé?éÓéµéÙéÁéóé?éÀé®?" + IDS_QUERY_DELETE_MORE "é?éÛéþé?ÆlééÀéÎé?ìÝÅ£éÁé?éÓéµéÙéÁéóé? éÀé®?" + IDS_QUERY_DELETE_CONFIRM "Ælé?ìÝÅ£é?èmöF" + IDS_ERR_DELVAL_CAPTION "Ælé?ìÝÅ£ééÀéÚéãé½é?âGâëü[é¬ö¡ÉÂéÁé?éÁé¢ üB" + IDS_ERR_DELETEVALUE "ÄwÆÞé?éÛé¢Ælé?éÀéÎé?éìÝÅ£é?é½é?é?é±!" + IDS_ERR_RENVAL_CAPTION "Ælé?û?æOéò¤ìXéÀéÚéãé½é?âGâëü[é¬ö¡ÉÂéÁé? éÁé¢üB" + IDS_ERR_RENVAL_TOEMPTY "%s é?û?æOéò¤ìXé?é½é?é?é±üBÄwÆÞé?éÛé¢Ælé?û ?æOé?é?òÂÄÜé¬è?é?éÛé?éóé?é?é±üBò?é?û?æOé?éÔéÞÆ?éÁé?é¡é¥é?éóüB" + IDS_NEW_KEY "ÉVéÁéóâLü[ #%d" + IDS_NEW_VALUE "ÉVéÁéóÆl #%d" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(ÆÀé? 0 é?âoâCâiâèÆl)" + IDS_DEFAULT_VALUE_NAME "(è¨ÆÞÆl)" + IDS_VALUE_NOT_SET "(Ælé?É¦ÆÞé?éÁ)" + IDS_UNKNOWN_TYPE "ÄÝùÌòsû¥: (0x%lx)" + IDS_MY_COMPUTER "â}âC âRâôâsâàü[â^" + IDS_IMPORT_REG_FILE "âîâWâXâgâè âtâ@âCâïé?âCâôâ|ü[âg" + IDS_EXPORT_REG_FILE "âîâWâXâgâè âtâ@âCâïé?âGâNâXâ|ü[âg" + IDS_INVALID_DWORD "(û?î°é? DWORD Æl)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "ôoÿ^âtâ@âCâï" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_REGEDIT4 "Win9x/NT4 ôoÿ^âtâ@âCâï (REGEDIT4)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "éÀéÎé?é?âtâ@âCâï (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "âtâï âRâôâgâìü[âï" + IDS_ACCESS_READ "ôÃé¦ÄµéÞ" + IDS_ACCESS_QUERYVALUE "Ælé?Åãë´" + IDS_ACCESS_SETVALUE "Ælé?É¦ÆÞ" + IDS_ACCESS_CREATESUBKEY "âTâuâLü[é?ìýÉ¼" + IDS_ACCESS_ENUMERATESUBKEYS "âTâuâLü[é?ù±ïô" + IDS_ACCESS_NOTIFY "Æ?Æm" + IDS_ACCESS_CREATELINK "âèâôâNé?ìýÉ¼" + IDS_ACCESS_DELETE "ìÝÅ£" + IDS_ACCESS_WRITEDAC "DAC é?Åæé½ì×é¦" + IDS_ACCESS_WRITEOWNER "ÅèùLÄÊé?Åæé½ì×é¦" + IDS_ACCESS_READCONTROL "ôÃé¦ÄµéÞÉºîõ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "é?é?âLü[é?é¦" + IDS_INHERIT_THISKEYANDSUBKEYS "é?é?âLü[éãâTâuâLü[" + IDS_INHERIT_SUBKEYSONLY "âTâuâLü[é?é¦" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "ôWèJéÀéÚ(&E)" + IDS_COLLAPSE "É?éÞÅ¶éÌ(&C)" + IDS_GOTO_SUGGESTED_KEY "'%s' éÍê?ô«éÀéÚ(&G)" +END + +/*****************************************************************/ + + +/* + * Dialog + */ + +IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 370, 50 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 9, "MS UI Gothic" +BEGIN + GROUPBOX "âGâNâXâ|ü[âgö?ê?",IDC_STATIC,2,0,366,48 + CONTROL "éÀéÎé ?(&A)",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "æIæé?éÛé¢ òöò¬(&E)",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 +END + +IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "â_âCâAâìâO" +FONT 9, "MS UI Gothic" +BEGIN + DEFPUSHBUTTON "OK",IDOK,130,7,50,14 + PUSHBUTTON "âLâââôâZâï",IDCANCEL,130,24,50,14 +END + + +/* + * TEXTINCLUDE + */ + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + + + +/* + * String Table + */ + +/* + *STRINGTABLE DISCARDABLE + *BEGIN + * ID_HELP_HELPTOPICS "âîâWâXâgâè âGâfâBâ^é?âwâïâvéèJé½é?éÀüB" + * ID_HELP_ABOUT "âvâìâOâëâÇé?Å¯ò±üAâoü[âWâçâôöÈìåé¿ éµéÐÆÿìýîáéò\\ÄªéÁé?éÀüB" + *END + */ + +/*****************************************************************/ Property changes on: trunk/reactos/subsys/system/regedit/Ja.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/regedit/clb/clb.rc --- trunk/reactos/subsys/system/regedit/clb/clb.rc 2005-10-15 12:26:40 UTC (rev 18479) +++ trunk/reactos/subsys/system/regedit/clb/clb.rc 2005-10-15 12:40:30 UTC (rev 18480) @@ -9,4 +9,4 @@ #include <reactos/version.rc> #include "clb_En.rc" - +#include "clb_Ja.rc" _____ Added: trunk/reactos/subsys/system/regedit/clb/clb_Ja.rc --- trunk/reactos/subsys/system/regedit/clb/clb_Ja.rc 2005-10-15 12:26:40 UTC (rev 18479) +++ trunk/reactos/subsys/system/regedit/clb/clb_Ja.rc 2005-10-15 12:40:30 UTC (rev 18480) @@ -0,0 +1,27 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL + +IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ù±âèâXâg â{âbâNâXé?î`Ä«" +FONT 9, "MS UI Gothic", 0, 0, 0x0 +BEGIN + GROUPBOX "ù±âèâXâg â{âbâNâXé?î`Ä«", -1, 6, 7, 158, 71 + CHECKBOX "òWÅÇ(&S)", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "ï½èEÉ³(&B)", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "ò?éÎæÍéª(&O)", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Æ?Æm(&Y)", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "ÉéÆ?âXâNâìü[âï âoü[(&E)", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "òíÉöæIæ(&M)", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "ègÆúæIæ(&X)", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "â|âbâvâAâEâgî®ÅoéÁ(&P)", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "âoâlÄ«é?ù±(&S)", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "è¯û{î`Ä«", -1, 6, 80, 158, 34 + CHECKBOX "ë?Äï(&V)", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "û?î°(&D)", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "âOâïü[âv(&G)", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "â^âuòØ(&T)", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "âLâââôâZâï", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "ö±âXâNâìü[âïé?û?î°(&D)", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +END + Property changes on: trunk/reactos/subsys/system/regedit/clb/clb_Ja.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/regedit/rsrc.rc --- trunk/reactos/subsys/system/regedit/rsrc.rc 2005-10-15 12:26:40 UTC (rev 18479) +++ trunk/reactos/subsys/system/regedit/rsrc.rc 2005-10-15 12:40:30 UTC (rev 18480) @@ -33,6 +33,7 @@ #include "Es.rc" #include "Fr.rc" #include "It.rc" +#include "Ja.rc" #include "Nl.rc" #include "Pt.rc" #include "Ru.rc"

19 years

[greatlrd] 18479: Japanese translation by tsk email tsk_n@mail.goo.ne.jp

by greatlrd＠svn.reactos.com

Japanese translation by tsk email tsk_n(a)mail.goo.ne.jp Added: trunk/reactos/subsys/ntvdm/Ja.rc Modified: trunk/reactos/subsys/ntvdm/ntvdm.rc _____ Added: trunk/reactos/subsys/ntvdm/Ja.rc --- trunk/reactos/subsys/ntvdm/Ja.rc 2005-10-15 12:21:12 UTC (rev 18478) +++ trunk/reactos/subsys/ntvdm/Ja.rc 2005-10-15 12:26:40 UTC (rev 18479) @@ -0,0 +1,13 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "ReactOS Virtual DOS Machine support.\n" +STRING_PromptMsg, "ïNô«éÀéÚé?é? r<cr> éüAâVâââbâgâ_âEâôéÀéÚé?é? s<cr> éüAìíéÀé«ÅIù?é?é?éÚé?é? q<cr> éô³ù?éÁé?é¡é¥é?éóüB" +} Property changes on: trunk/reactos/subsys/ntvdm/Ja.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/ntvdm/ntvdm.rc --- trunk/reactos/subsys/ntvdm/ntvdm.rc 2005-10-15 12:21:12 UTC (rev 18478) +++ trunk/reactos/subsys/ntvdm/ntvdm.rc 2005-10-15 12:26:40 UTC (rev 18479) @@ -8,3 +8,4 @@ #include "En.rc" #include "De.rc" +#include "Ja.rc"

19 years

← Newer
1
...
41
42
43
44
45
46
47
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005