Ros-diffs December 2011

ros-diffs@reactos.org

16 participants
242 discussions

[ion] 54646: [RTL]: Implement, and export, RtlDosSearchPath_Ustr as well as RtlGetFullPathName_UstrEx. RtlGetFullPathName_U is still old code but it seems good enough for now, and isn't the next ta...
by ion＠svn.reactos.org 14 Dec '11

14 Dec '11

Author: ion Date: Wed Dec 14 03:55:54 2011 New Revision: 54646 URL: http://svn.reactos.org/svn/reactos?rev=54646&view=rev Log: [RTL]: Implement, and export, RtlDosSearchPath_Ustr as well as RtlGetFullPathName_UstrEx. RtlGetFullPathName_U is still old code but it seems good enough for now, and isn't the next target. Nothing calls this code yet (SearchPathW soon will), this is just an implementation commit. Code was tested to boot to 3rd stage after SearchPath modification, which is the next target (step 2). After which, the only code in the loader paths that uses legacy path APIs will be the create process path, the third and final step. Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] Wed Dec 14 03:55:54 2011 @@ -574,7 +574,7 @@ @ stdcall RtlDosPathNameToRelativeNtPathName_U(ptr ptr ptr ptr) // CHECKME //@ stdcall RtlDosPathNameToRelativeNtPathName_U_WithStatus @ stdcall RtlDosSearchPath_U(wstr wstr wstr long ptr ptr) -//@ stdcall RtlDosSearchPath_Ustr +@ stdcall RtlDosSearchPath_Ustr(long ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RtlDowncaseUnicodeChar(long) @ stdcall RtlDowncaseUnicodeString(ptr ptr long) @ stdcall RtlDumpResource(ptr) @@ -664,7 +664,7 @@ @ stdcall RtlGetFirstRange(ptr ptr ptr) //@ stdcall RtlGetFrame @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) -//@ stdcall RtlGetFullPathName_UstrEx +@ stdcall RtlGetFullPathName_UstrEx(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetLastNtStatus() @ stdcall RtlGetLastWin32Error() Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Wed Dec 14 03:55:54 2011 @@ -572,7 +572,7 @@ @ stdcall RtlDosPathNameToRelativeNtPathName_U(ptr ptr ptr ptr) ; CHECKME ;@ stdcall RtlDosPathNameToRelativeNtPathName_U_WithStatus @ stdcall RtlDosSearchPath_U(wstr wstr wstr long ptr ptr) -;@ stdcall RtlDosSearchPath_Ustr +@ stdcall RtlDosSearchPath_Ustr(long ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RtlDowncaseUnicodeChar(long) @ stdcall RtlDowncaseUnicodeString(ptr ptr long) @ stdcall RtlDumpResource(ptr) @@ -662,7 +662,7 @@ @ stdcall RtlGetFirstRange(ptr ptr ptr) ;@ stdcall RtlGetFrame @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) -;@ stdcall RtlGetFullPathName_UstrEx +@ stdcall RtlGetFullPathName_UstrEx(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetLastNtStatus() @ stdcall RtlGetLastWin32Error() Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Wed Dec 14 03:55:54 2011 @@ -2481,6 +2481,20 @@ IN ULONG BufferSize, OUT PWSTR Buffer, OUT PWSTR *PartName +); + +ULONG +NTAPI +RtlDosSearchPath_Ustr( + IN ULONG Flags, + IN PUNICODE_STRING PathString, + IN PUNICODE_STRING FileNameString, + IN PUNICODE_STRING ExtensionString, + IN PUNICODE_STRING CallerBuffer, + IN OUT PUNICODE_STRING DynamicString OPTIONAL, + OUT PUNICODE_STRING* FullNameOut OPTIONAL, + OUT PULONG FilePartSize OPTIONAL, + OUT PULONG LengthNeeded OPTIONAL ); NTSYSAPI Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=54646&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Wed Dec 14 03:55:54 2011 @@ -890,7 +890,7 @@ Length = CurDir->DosPath.Length / sizeof(WCHAR); ASSERT((CurDirName != NULL) && (Length > 0)); - /* + /* * DosPath.Buffer should always have a trailing slash. There is an assert * below which checks for this. * @@ -1615,6 +1615,725 @@ /* * @implemented */ +ULONG +NTAPI +RtlGetFullPathName_UstrEx(IN PUNICODE_STRING FileName, + IN PUNICODE_STRING StaticString, + IN PUNICODE_STRING DynamicString, + IN PUNICODE_STRING *StringUsed, + IN PSIZE_T FilePartSize, + OUT PBOOLEAN NameInvalid, + OUT RTL_PATH_TYPE* PathType, + OUT PULONG LengthNeeded) +{ + NTSTATUS Status; + PWCHAR StaticBuffer; + PCWCH ShortName; + ULONG Length; + USHORT StaticLength; + UNICODE_STRING TempDynamicString; + + /* Initialize all our locals */ + ShortName = NULL; + StaticBuffer = NULL; + TempDynamicString.Buffer = NULL; + + /* Initialize the input parameters */ + if (StringUsed) *StringUsed = NULL; + if (LengthNeeded) *LengthNeeded = 0; + if (FilePartSize) *FilePartSize = 0; + + /* Check for invalid parameters */ + if ((DynamicString) && !(StringUsed) && (StaticString)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Check if we did not get an input string */ + if (!StaticString) + { + /* Allocate one */ + StaticLength = MAX_PATH * sizeof(WCHAR); + StaticBuffer = RtlpAllocateStringMemory(MAX_PATH * sizeof(WCHAR), TAG_USTR); + if (!StaticBuffer) return STATUS_NO_MEMORY; + } + else + { + /* Use the one we received */ + StaticBuffer = StaticString->Buffer; + StaticLength = StaticString->MaximumLength; + } + + /* Call the lower-level function */ + Length = RtlGetFullPathName_Ustr(FileName, + StaticLength, + StaticBuffer, + &ShortName, + NameInvalid, + PathType); + DPRINT("Length: %d StaticBuffer: %S\n", Length, StaticBuffer); + if (!Length) + { + /* Fail if it failed */ + DbgPrint("%s(%d) - RtlGetFullPathName_Ustr() returned 0\n", + __FUNCTION__, + __LINE__); + Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + + /* Check if it fits inside our static string */ + if ((StaticString) && (Length < StaticLength)) + { + /* Set the final length */ + StaticString->Length = Length; + + /* Set the file part size */ + if (FilePartSize) *FilePartSize = ShortName ? (ShortName - StaticString->Buffer) : 0; + + /* Return the static string if requested */ + if (StringUsed) *StringUsed = StaticString; + + /* We are done with success */ + Status = STATUS_SUCCESS; + goto Quickie; + } + + /* Did we not have an input dynamic string ?*/ + if (!DynamicString) + { + /* Return the length we need */ + if (LengthNeeded) *LengthNeeded = Length; + + /* And fail such that the caller can try again */ + Status = STATUS_BUFFER_TOO_SMALL; + goto Quickie; + } + + /* Check if it fits in our static buffer */ + if ((StaticBuffer) && (Length < StaticLength)) + { + /* NULL-terminate it */ + StaticBuffer[Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* Set the settings for the dynamic string the caller sent */ + DynamicString->MaximumLength = StaticLength; + DynamicString->Length = Length; + DynamicString->Buffer = StaticBuffer; + + /* Set the part size */ + if (FilePartSize) *FilePartSize = ShortName ? (ShortName - StaticBuffer) : 0; + + /* Return the dynamic string if requested */ + if (StringUsed) *StringUsed = DynamicString; + + /* Do not free the static buffer on exit, and return success */ + StaticBuffer = NULL; + Status = STATUS_SUCCESS; + goto Quickie; + } + + /* Now try again under the PEB lock */ + RtlAcquirePebLock(); + Length = RtlGetFullPathName_Ustr(FileName, + StaticLength, + StaticBuffer, + &ShortName, + NameInvalid, + PathType); + if (!Length) + { + /* It failed */ + DbgPrint("%s line %d: RtlGetFullPathName_Ustr() returned 0\n", + __FUNCTION__, __LINE__); + Status = STATUS_OBJECT_NAME_INVALID; + goto Release; + } + + /* Check if it fits inside our static string now */ + if ((StaticString) && (Length < StaticLength)) + { + /* Set the final length */ + StaticString->Length = Length; + + /* Set the file part size */ + if (FilePartSize) *FilePartSize = ShortName ? (ShortName - StaticString->Buffer) : 0; + + /* Return the static string if requested */ + if (StringUsed) *StringUsed = StaticString; + + /* We are done with success */ + Status = STATUS_SUCCESS; + goto Release; + } + + /* Check if the path won't even fit in a real string */ + if ((Length + sizeof(WCHAR)) > UNICODE_STRING_MAX_BYTES) + { + /* Name is way too long, fail */ + Status = STATUS_NAME_TOO_LONG; + goto Release; + } + + /* Allocate the string to hold the path name now */ + TempDynamicString.Buffer = RtlpAllocateStringMemory(Length + sizeof(WCHAR), + TAG_USTR); + if (!TempDynamicString.Buffer) + { + /* Out of memory, fail */ + Status = STATUS_NO_MEMORY; + goto Release; + } + + /* Add space for a NULL terminator, and now check the full path */ + TempDynamicString.MaximumLength = Length + sizeof(UNICODE_NULL); + Length = RtlGetFullPathName_Ustr(FileName, + Length, + TempDynamicString.Buffer, + &ShortName, + NameInvalid, + PathType); + if (!Length) + { + /* Some path error, so fail out */ + DbgPrint("%s line %d: RtlGetFullPathName_Ustr() returned 0\n", + __FUNCTION__, __LINE__); + Status = STATUS_OBJECT_NAME_INVALID; + goto Release; + } + + /* It should fit in the string we just allocated */ + ASSERT(Length < (TempDynamicString.MaximumLength - sizeof(WCHAR))); + if (Length > TempDynamicString.MaximumLength) + { + /* This is really weird and would mean some kind of race */ + Status = STATUS_INTERNAL_ERROR; + goto Release; + } + + /* Return the file part size */ + if (FilePartSize) *FilePartSize = ShortName ? (ShortName - TempDynamicString.Buffer) : 0; + + /* Terminate the whole string now */ + TempDynamicString.Buffer[Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* Finalize the string and return it to the user */ + DynamicString->Buffer = TempDynamicString.Buffer; + DynamicString->Length = Length; + DynamicString->MaximumLength = TempDynamicString.MaximumLength; + if (StringUsed) *StringUsed = DynamicString; + + /* Return success and make sure we don't free the buffer on exit */ + TempDynamicString.Buffer = NULL; + Status = STATUS_SUCCESS; + +Release: + /* Release the PEB lock */ + RtlReleasePebLock(); + +Quickie: + /* Free any buffers we should be freeing */ + DPRINT("Status: %lx %S %S\n", Status, StaticBuffer, TempDynamicString.Buffer); + if ((StaticBuffer) && (StaticBuffer != StaticString->Buffer)) + { + RtlpFreeMemory(StaticBuffer, TAG_USTR); + } + if (TempDynamicString.Buffer) + { + RtlpFreeMemory(TempDynamicString.Buffer, TAG_USTR); + } + + /* Print out any unusual errors */ + if ((NT_ERROR(Status)) && + (Status != STATUS_NO_SUCH_FILE) && (Status != STATUS_BUFFER_TOO_SMALL)) + { + DbgPrint("RTL: %s - failing on filename %wZ with status %08lx\n", + __FUNCTION__, FileName, Status); + } + + /* Return, we're all done */ + return Status; +} + +/* + * @implemented + */ +ULONG +NTAPI +RtlDosSearchPath_Ustr(IN ULONG Flags, + IN PUNICODE_STRING PathString, + IN PUNICODE_STRING FileNameString, + IN PUNICODE_STRING ExtensionString, + IN PUNICODE_STRING CallerBuffer, + IN OUT PUNICODE_STRING DynamicString OPTIONAL, + OUT PUNICODE_STRING* FullNameOut OPTIONAL, + OUT PULONG FilePartSize OPTIONAL, + OUT PULONG LengthNeeded OPTIONAL) +{ + WCHAR StaticCandidateBuffer[MAX_PATH]; + UNICODE_STRING StaticCandidateString; + NTSTATUS Status; + RTL_PATH_TYPE PathType; + PWCHAR p, End, CandidateEnd, SegmentEnd; + ULONG SegmentSize, NamePlusExtLength, PathSize, MaxPathSize = 0, WorstCaseLength, ByteCount; + USHORT ExtensionLength = 0; + PUNICODE_STRING FullIsolatedPath; + DPRINT("DOS Path Search: %lx %wZ %wZ %wZ %wZ %wZ\n", + Flags, PathString, FileNameString, ExtensionString, CallerBuffer, DynamicString); + + /* Initialize the input string */ + RtlInitEmptyUnicodeString(&StaticCandidateString, + StaticCandidateBuffer, + sizeof(StaticCandidateBuffer)); + + /* Initialize optional arguments */ + if (FullNameOut) *FullNameOut = NULL; + if (FilePartSize) *FilePartSize = 0; + if (DynamicString) + { + DynamicString->Length = DynamicString->MaximumLength = 0; + DynamicString->Buffer = NULL; + } + + /* Check for invalid parameters */ + if ((Flags & ~7) || + !(PathString) || + !(FileNameString) || + ((CallerBuffer) && (DynamicString) && !(FullNameOut))) + { + /* Fail */ + DbgPrint("%s: Invalid parameters passed\n", __FUNCTION__); + Status = STATUS_INVALID_PARAMETER; + goto Quickie; + } + + /* First check what kind of path this is */ + PathType = RtlDetermineDosPathNameType_Ustr(FileNameString); + + /* Check if the caller wants to prevent relative .\ and ..\ paths */ + if ((Flags & 2) && + (PathType == RtlPathTypeRelative) && + (FileNameString->Length >= (2 * sizeof(WCHAR))) && + (FileNameString->Buffer[0] == L'.') && + ((IS_PATH_SEPARATOR(FileNameString->Buffer[1])) || + ((FileNameString->Buffer[1] == L'.') && + ((FileNameString->Length >= (3 * sizeof(WCHAR))) && + (IS_PATH_SEPARATOR(FileNameString->Buffer[2])))))) + { + /* Yes, and this path is like that, so make it seem unknown */ + PathType = RtlPathTypeUnknown; + } + + /* Now check relative vs non-relative paths */ + if (PathType == RtlPathTypeRelative) + { + /* Does the caller want SxS? */ + if (Flags & 1) + { + /* Apply the SxS magic */ + FullIsolatedPath = NULL; + Status = RtlDosApplyFileIsolationRedirection_Ustr(TRUE, + FileNameString, + ExtensionString, + CallerBuffer, + DynamicString, + &FullIsolatedPath, + NULL, + FilePartSize, + LengthNeeded); + if (NT_SUCCESS(Status)) + { + /* We found the SxS path, return it */ + if (FullNameOut) *FullNameOut = FullIsolatedPath; + goto Quickie; + } + else if (Status != STATUS_SXS_KEY_NOT_FOUND) + { + /* Critical SxS error, fail */ + DbgPrint("%s: Failing because call to " + "RtlDosApplyIsolationRedirection_Ustr(%wZ) failed with " + "status 0x%08lx\n", + __FUNCTION__, + FileNameString, + Status); + goto Quickie; + } + } + + /* No SxS key found, or not requested, check if there's an extension */ + if (ExtensionString) + { + /* Save the extension length, and check if there's a file name */ + ExtensionLength = ExtensionString->Length; + if (FileNameString->Length) + { + /* Start parsing the file name */ + End = &FileNameString->Buffer[FileNameString->Length / sizeof(WCHAR)]; + while (End > FileNameString->Buffer) + { + /* If we find a path separator, there's no extension */ + if (IS_PATH_SEPARATOR(*--End)) break; + + /* Otherwise, did we find an extension dot? */ + if (*End == L'.') + { + /* Ignore what the caller sent it, use the filename's */ + ExtensionString = NULL; + ExtensionLength = 0; + break; + } + } + } + } + + /* Check if we got a path */ + if (PathString->Length) + { + /* Start parsing the path name, looking for path separators */ + End = &PathString->Buffer[PathString->Length / sizeof(WCHAR)]; + p = End; + while ((p > PathString->Buffer) && (*--p == L';')) + { + /* This is the size of the path -- handle a trailing slash */ + PathSize = End - p - 1; + if ((PathSize) && !(IS_PATH_SEPARATOR(*(End - 1)))) PathSize++; + + /* Check if we found a bigger path than before */ + if (PathSize > MaxPathSize) MaxPathSize = PathSize; + + /* Keep going with the path after this path separator */ + End = p; + } + + /* This is the trailing path, run the same code as above */ + PathSize = End - p; + if ((PathSize) && !(IS_PATH_SEPARATOR(*(End - 1)))) PathSize++; + if (PathSize > MaxPathSize) MaxPathSize = PathSize; + + /* Finally, convert the largest path size into WCHAR */ + MaxPathSize *= sizeof(WCHAR); + } + + /* Use the extension, the file name, and the largest path as the size */ + WorstCaseLength = ExtensionLength + + FileNameString->Length + + MaxPathSize + + sizeof(UNICODE_NULL); + if (WorstCaseLength > UNICODE_STRING_MAX_BYTES) + { + /* It has to fit in a registry string, if not, fail here */ + DbgPrint("%s returning STATUS_NAME_TOO_LONG because the computed " + "worst case file name length is %Iu bytes\n", + __FUNCTION__, + WorstCaseLength); + Status = STATUS_NAME_TOO_LONG; + goto Quickie; + } + + /* Scan the path now, to see if we can find the file */ + p = PathString->Buffer; + End = &p[PathString->Length / sizeof(WCHAR)]; + while (p < End) + { + /* Find out where this path ends */ + for (SegmentEnd = p; + ((SegmentEnd != End) && (*SegmentEnd != L';')); + SegmentEnd++); + + /* Compute the size of this path */ + ByteCount = SegmentSize = (SegmentEnd - p) * sizeof(WCHAR); + + /* Handle trailing slash if there isn't one */ + if ((SegmentSize) && !(IS_PATH_SEPARATOR(*(SegmentEnd - 1)))) + { + /* Add space for one */ + SegmentSize += sizeof(OBJ_NAME_PATH_SEPARATOR); + } + + /* Now check if our initial static buffer is too small */ + if (StaticCandidateString.MaximumLength < + (SegmentSize + ExtensionLength + FileNameString->Length)) + { + /* At this point we should've been using our static buffer */ + ASSERT(StaticCandidateString.Buffer == StaticCandidateBuffer); + if (StaticCandidateString.Buffer != StaticCandidateBuffer) + { + /* Something is really messed up if this was the dynamic string */ + DbgPrint("%s: internal error #1; " + "CandidateString.Buffer = %p; " + "StaticCandidateBuffer = %p\n", + __FUNCTION__, + StaticCandidateString.Buffer, + StaticCandidateBuffer); + Status = STATUS_INTERNAL_ERROR; + goto Quickie; + } + + /* We checked before that the maximum possible size shoudl fit! */ + ASSERT((SegmentSize + FileNameString->Length + ExtensionLength) < + UNICODE_STRING_MAX_BYTES); + if ((SegmentSize + ExtensionLength + FileNameString->Length) > + (UNICODE_STRING_MAX_BYTES - sizeof(WCHAR))) + { + /* For some reason it's not fitting anymore. Something messed up */ + DbgPrint("%s: internal error #2; SegmentSize = %u, " + "FileName->Length = %u, DefaultExtensionLength = %u\n", + __FUNCTION__, + SegmentSize, + FileNameString->Length, + ExtensionLength); + Status = STATUS_INTERNAL_ERROR; + goto Quickie; + } + + /* Now allocate the dynamic string */ + StaticCandidateString.MaximumLength = FileNameString->Length + + WorstCaseLength; + StaticCandidateString.Buffer = RtlpAllocateStringMemory(WorstCaseLength, + TAG_USTR); + if (!StaticCandidateString.Buffer) + { + /* Out of memory, fail */ + DbgPrint("%s: Unable to allocate %u byte buffer for path candidate\n", + __FUNCTION__, + StaticCandidateString.MaximumLength); + Status = STATUS_NO_MEMORY; + goto Quickie; + } + } + + /* Copy the path in the string */ + RtlCopyMemory(StaticCandidateString.Buffer, p, ByteCount); + + /* Get to the end of the string, and add the trailing slash if missing */ + CandidateEnd = &StaticCandidateString.Buffer[ByteCount / sizeof(WCHAR)]; + if ((SegmentSize) && (SegmentSize != ByteCount)) + { + *CandidateEnd++ = OBJ_NAME_PATH_SEPARATOR; + } + + /* Copy the filename now */ + RtlCopyMemory(CandidateEnd, + FileNameString->Buffer, + FileNameString->Length); + CandidateEnd += (FileNameString->Length / sizeof(WCHAR)); + + /* Check if there was an extension */ + if (ExtensionString) + { + /* Copy the extension too */ + RtlCopyMemory(CandidateEnd, + ExtensionString->Buffer, + ExtensionString->Length); + CandidateEnd += (ExtensionString->Length / sizeof(WCHAR)); + } + + /* We are done, terminate it */ + *CandidateEnd = UNICODE_NULL; + + /* Now set the final length of the string so it becomes valid */ + StaticCandidateString.Length = (CandidateEnd - + StaticCandidateString.Buffer) * + sizeof(WCHAR); + + /* Check if this file exists */ + DPRINT("BUFFER: %S\n", StaticCandidateString.Buffer); + if (RtlDoesFileExists_UEx(StaticCandidateString.Buffer, FALSE)) + { + /* Awesome, it does, now get the full path */ + Status = RtlGetFullPathName_UstrEx(&StaticCandidateString, + CallerBuffer, + DynamicString, + (PUNICODE_STRING*)FullNameOut, + FilePartSize, + NULL, + &PathType, + LengthNeeded); + if (!(NT_SUCCESS(Status)) && + ((Status != STATUS_NO_SUCH_FILE) && + (Status != STATUS_BUFFER_TOO_SMALL))) + { + DbgPrint("%s: Failing because we thought we found %wZ on " + "the search path, but RtlGetfullPathNameUStrEx() " + "returned %08lx\n", + __FUNCTION__, + Status); + } + DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); + goto Quickie; + } + else + { + /* Otherwise, move to the next path */ + if (SegmentEnd != End) + { + /* Handle the case of the path separator trailing */ + p = SegmentEnd + 1; + } + else + { + p = SegmentEnd; + } + } + } + + /* Loop finished and we didn't break out -- fail */ + Status = STATUS_NO_SUCH_FILE; + } + else + { + /* We have a full path, so check if it does exist */ + DPRINT("%wZ\n", FileNameString); + if (!RtlDoesFileExists_UstrEx(FileNameString, TRUE)) + { + /* It doesn't exist, did we have an extension? */ + if (!(ExtensionString) || !(ExtensionString->Length)) + { + /* No extension, so just fail */ + Status = STATUS_NO_SUCH_FILE; + goto Quickie; + } + + /* There was an extension, check if the filename already had one */ + if (!(Flags & 4) && (FileNameString->Length)) + { + /* Parse the filename */ + p = FileNameString->Buffer; + End = &p[FileNameString->Length / sizeof(WCHAR)]; + while (End > p) + { + /* If there's a path separator, there's no extension */ + if (IS_PATH_SEPARATOR(*--End)) break; + + /* Othwerwise, did we find an extension dot? */ + if (*End == L'.') + { + /* File already had an extension, so fail */ + Status = STATUS_NO_SUCH_FILE; + goto Quickie; + } + } + } + + /* So there is an extension, we'll try again by adding it */ + NamePlusExtLength = FileNameString->Length + + ExtensionString->Length + + sizeof(UNICODE_NULL); + if (NamePlusExtLength > UNICODE_STRING_MAX_BYTES) + { + /* It won't fit in any kind of valid string, so fail */ + DbgPrint("%s: Failing because filename plus extension (%Iu bytes) is too big\n", + __FUNCTION__, + NamePlusExtLength); + Status = STATUS_NAME_TOO_LONG; + goto Quickie; + } + + /* Fill it fit in our temporary string? */ + if (NamePlusExtLength > StaticCandidateString.MaximumLength) + { + /* It won't fit anymore, allocate a dynamic string for it */ + StaticCandidateString.MaximumLength = NamePlusExtLength; + StaticCandidateString.Buffer = RtlpAllocateStringMemory(NamePlusExtLength, + TAG_USTR); + if (!StaticCandidateString.Buffer) + { + /* Ran out of memory, so fail */ + DbgPrint("%s: Failing because allocating the dynamic filename buffer failed\n", + __FUNCTION__); + Status = STATUS_NO_MEMORY; + goto Quickie; + } + } + + /* Copy the filename */ + RtlCopyMemory(StaticCandidateString.Buffer, + FileNameString->Buffer, + FileNameString->Length); + + /* Copy the extension */ + RtlCopyMemory(&StaticCandidateString.Buffer[FileNameString->Length / sizeof(WCHAR)], + ExtensionString->Buffer, + ExtensionString->Length); + + /* Now NULL-terminate */ + StaticCandidateString.Buffer[StaticCandidateString.Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* Finalize the length of the string to make it valid */ + StaticCandidateString.Length = FileNameString->Length + ExtensionString->Length; + DPRINT("SB: %wZ\n", &StaticCandidateString); + + /* And check if this file now exists */ + if (!RtlDoesFileExists_UstrEx(&StaticCandidateString, TRUE)) + { + /* Still no joy, fail out */ + Status = STATUS_NO_SUCH_FILE; + goto Quickie; + } + + /* File was found, get the final full path */ + Status = RtlGetFullPathName_UstrEx(&StaticCandidateString, + CallerBuffer, + DynamicString, + (PUNICODE_STRING*)FullNameOut, + FilePartSize, + NULL, + &PathType, + LengthNeeded); + if (!(NT_SUCCESS(Status)) && (Status != STATUS_NO_SUCH_FILE)) + { + DbgPrint("%s: Failing on \"%wZ\" because RtlGetfullPathNameUStrEx() " + "failed with status %08lx\n", + __FUNCTION__, + &StaticCandidateString, + Status); + } + DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); + } + else + { + /* File was found on the first try, get the final full path */ + Status = RtlGetFullPathName_UstrEx(FileNameString, + CallerBuffer, + DynamicString, + (PUNICODE_STRING*)FullNameOut, + FilePartSize, + NULL, + &PathType, + LengthNeeded); + if (!(NT_SUCCESS(Status)) && + ((Status != STATUS_NO_SUCH_FILE) && + (Status != STATUS_BUFFER_TOO_SMALL))) + { + DbgPrint("%s: Failing because RtlGetfullPathNameUStrEx() on %wZ " + "failed with status %08lx\n", + __FUNCTION__, + FileNameString, + Status); + } + DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); + } + } + +Quickie: + /* Anything that was not an error, turn into STATUS_SUCCESS */ + if (NT_SUCCESS(Status)) Status = STATUS_SUCCESS; + + /* Check if we had a dynamic string */ + if ((StaticCandidateString.Buffer) && + (StaticCandidateString.Buffer != StaticCandidateBuffer)) + { + /* Free it */ + RtlFreeUnicodeString(&StaticCandidateString); + } + + /* Return the status */ + return Status; +} + +/* + * @implemented + */ BOOLEAN NTAPI RtlDoesFileExists_U(IN PCWSTR FileName)

1 0

[dgorbachev] 54645: [TRANSLATION] Add Romanian translation for BrowseUI, update many older translations. Patch by Stefan Fulea. Bug #6765.
by dgorbachev＠svn.reactos.org 14 Dec '11

14 Dec '11

Author: dgorbachev Date: Wed Dec 14 00:53:58 2011 New Revision: 54645 URL: http://svn.reactos.org/svn/reactos?rev=54645&view=rev Log: [TRANSLATION] Add Romanian translation for BrowseUI, update many older translations. Patch by Stefan Fulea. Bug #6765. Added: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc trunk/reactos/base/applications/msconfig/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/dll/cpl/access/lang/ro-RO.rc trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc trunk/reactos/dll/win32/aclui/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc trunk/reactos/dll/win32/modemui/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msports/lang/ro-RO.rc trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc trunk/reactos/dll/win32/netid/lang/ro-RO.rc trunk/reactos/dll/win32/netshell/lang/ro-RO.rc trunk/reactos/dll/win32/newdev/lang/ro-RO.rc trunk/reactos/dll/win32/rasdlg/lang/ro-RO.rc trunk/reactos/dll/win32/serialui/lang/ro-RO.rc trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/msconfig/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/dll/cpl/access/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… Modified: trunk/reactos/dll/win32/aclui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/ro-RO… Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Added: trunk/reactos/dll/win32/browseui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/ro… Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/modemui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/ro-… Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… Modified: trunk/reactos/dll/win32/msports/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/lang/ro-… Modified: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ro-… Modified: trunk/reactos/dll/win32/netid/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ro-RO… Modified: trunk/reactos/dll/win32/netshell/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ro… Modified: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R… Modified: trunk/reactos/dll/win32/rasdlg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/ro-R… Modified: trunk/reactos/dll/win32/serialui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/ro… Modified: trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/ro… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-…

1 0

[dgorbachev] 54644: [TRANSLATION] Sync translated files with English files.
by dgorbachev＠svn.reactos.org 13 Dec '11

13 Dec '11

Author: dgorbachev Date: Tue Dec 13 13:37:08 2011 New Revision: 54644 URL: http://svn.reactos.org/svn/reactos?rev=54644&view=rev Log: [TRANSLATION] Sync translated files with English files. Removed: trunk/reactos/base/setup/reactos/lang/id-ID.rc trunk/reactos/base/setup/reactos/lang/ja-JP.rc trunk/reactos/base/setup/reactos/lang/lt-LT.rc trunk/reactos/base/setup/reactos/lang/nl-NL.rc trunk/reactos/base/setup/reactos/lang/sv-SE.rc trunk/reactos/base/setup/reactos/lang/th-TH.rc trunk/reactos/base/setup/reactos/lang/zh-CN.rc Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ja-JP.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/pt-BR.rc trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/lang/zh-CN.rc trunk/reactos/base/applications/charmap/lang/el-GR.rc trunk/reactos/base/applications/charmap/lang/it-IT.rc trunk/reactos/base/applications/charmap/lang/ro-RO.rc trunk/reactos/base/applications/charmap/lang/sk-SK.rc trunk/reactos/base/applications/charmap/lang/sv-SE.rc trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc trunk/reactos/base/applications/dxdiag/lang/de-DE.rc trunk/reactos/base/applications/dxdiag/lang/es-ES.rc trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc trunk/reactos/base/applications/dxdiag/lang/no-NO.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc trunk/reactos/base/applications/games/solitaire/lang/en-US.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc trunk/reactos/base/applications/games/solitaire/lang/hu-HU.rc trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/applications/games/solitaire/lang/sv-SE.rc trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc trunk/reactos/base/applications/games/solitaire/lang/zh-TW.rc trunk/reactos/base/applications/games/spider/lang/bg-BG.rc trunk/reactos/base/applications/games/spider/lang/de-DE.rc trunk/reactos/base/applications/games/spider/lang/en-US.rc trunk/reactos/base/applications/games/spider/lang/es-ES.rc trunk/reactos/base/applications/games/spider/lang/fr-FR.rc trunk/reactos/base/applications/games/spider/lang/hu-HU.rc trunk/reactos/base/applications/games/spider/lang/it-IT.rc trunk/reactos/base/applications/games/spider/lang/ja-JP.rc trunk/reactos/base/applications/games/spider/lang/nl-NL.rc trunk/reactos/base/applications/games/spider/lang/pl-PL.rc trunk/reactos/base/applications/games/spider/lang/pt-BR.rc trunk/reactos/base/applications/games/spider/lang/ro-RO.rc trunk/reactos/base/applications/games/spider/lang/ru-RU.rc trunk/reactos/base/applications/games/spider/lang/sv-SE.rc trunk/reactos/base/applications/games/spider/lang/uk-UA.rc trunk/reactos/base/applications/games/spider/lang/zh-CN.rc trunk/reactos/base/applications/games/spider/lang/zh-TW.rc trunk/reactos/base/applications/kbswitch/lang/pt-BR.rc trunk/reactos/base/applications/kbswitch/lang/ro-RO.rc trunk/reactos/base/applications/logoff/lang/pt-BR.rc trunk/reactos/base/applications/logoff/lang/ro-RO.rc trunk/reactos/base/applications/magnify/lang/es-ES.rc trunk/reactos/base/applications/mplay32/lang/pt-BR.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/sv-SE.rc trunk/reactos/base/applications/msconfig/lang/bg-BG.rc trunk/reactos/base/applications/msconfig/lang/ca-ES.rc trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc trunk/reactos/base/applications/msconfig/lang/de-DE.rc trunk/reactos/base/applications/msconfig/lang/el-GR.rc trunk/reactos/base/applications/msconfig/lang/en-US.rc trunk/reactos/base/applications/msconfig/lang/es-ES.rc trunk/reactos/base/applications/msconfig/lang/fr-FR.rc trunk/reactos/base/applications/msconfig/lang/hu-HU.rc trunk/reactos/base/applications/msconfig/lang/id-ID.rc trunk/reactos/base/applications/msconfig/lang/it-IT.rc trunk/reactos/base/applications/msconfig/lang/ko-KR.rc trunk/reactos/base/applications/msconfig/lang/nl-NL.rc trunk/reactos/base/applications/msconfig/lang/no-NO.rc trunk/reactos/base/applications/msconfig/lang/pl-PL.rc trunk/reactos/base/applications/msconfig/lang/pt-BR.rc trunk/reactos/base/applications/msconfig/lang/ro-RO.rc trunk/reactos/base/applications/msconfig/lang/ru-RU.rc trunk/reactos/base/applications/msconfig/lang/sk-SK.rc trunk/reactos/base/applications/msconfig/lang/sv-SE.rc trunk/reactos/base/applications/msconfig/lang/th-TH.rc trunk/reactos/base/applications/msconfig/lang/uk-UA.rc trunk/reactos/base/applications/msconfig/lang/zh-CN.rc trunk/reactos/base/applications/msconfig/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mstsc/lang/fr-FR.rc trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/da-DK.rc trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/el-GR.rc trunk/reactos/base/applications/notepad/lang/es-ES.rc trunk/reactos/base/applications/notepad/lang/eu-ES.rc trunk/reactos/base/applications/notepad/lang/fi-FI.rc trunk/reactos/base/applications/notepad/lang/fr-FR.rc trunk/reactos/base/applications/notepad/lang/hu-HU.rc trunk/reactos/base/applications/notepad/lang/hy-AM.rc trunk/reactos/base/applications/notepad/lang/id-ID.rc trunk/reactos/base/applications/notepad/lang/it-IT.rc trunk/reactos/base/applications/notepad/lang/lt-LT.rc trunk/reactos/base/applications/notepad/lang/nl-NL.rc trunk/reactos/base/applications/notepad/lang/no-NO.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pt-PT.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/sk-SK.rc trunk/reactos/base/applications/notepad/lang/sl-SI.rc trunk/reactos/base/applications/notepad/lang/sv-SE.rc trunk/reactos/base/applications/notepad/lang/th-TH.rc trunk/reactos/base/applications/notepad/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-TW.rc trunk/reactos/base/applications/sndrec32/lang/de-DE.rc trunk/reactos/base/applications/sndrec32/lang/es-ES.rc trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc trunk/reactos/base/applications/taskmgr/lang/da-DK.rc trunk/reactos/base/applications/taskmgr/lang/de-DE.rc trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/es-ES.rc trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc trunk/reactos/base/applications/taskmgr/lang/id-ID.rc trunk/reactos/base/applications/taskmgr/lang/it-IT.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc trunk/reactos/base/applications/taskmgr/lang/no-NO.rc trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/base/setup/vmwinst/lang/da-DK.rc trunk/reactos/base/setup/vmwinst/lang/de-DE.rc trunk/reactos/base/setup/vmwinst/lang/es-ES.rc trunk/reactos/base/setup/vmwinst/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/base/system/format/lang/lt-LT.rc trunk/reactos/base/system/format/lang/ru-RU.rc trunk/reactos/base/system/format/lang/uk-UA.rc trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc trunk/reactos/base/system/regsvr32/lang/lt-LT.rc trunk/reactos/base/system/regsvr32/lang/pl-PL.rc trunk/reactos/base/system/regsvr32/lang/ro-RO.rc trunk/reactos/base/system/regsvr32/lang/ru-RU.rc trunk/reactos/base/system/regsvr32/lang/uk-UA.rc trunk/reactos/base/system/rundll32/lang/lt-LT.rc trunk/reactos/base/system/rundll32/lang/pl-PL.rc trunk/reactos/base/system/rundll32/lang/ru-RU.rc trunk/reactos/base/system/rundll32/lang/uk-UA.rc trunk/reactos/base/system/rundll32/rundll32.c trunk/reactos/base/system/subst/lang/pl-PL.rc trunk/reactos/base/system/subst/lang/uk-UA.rc trunk/reactos/base/system/userinit/lang/lt-LT.rc trunk/reactos/base/system/userinit/lang/pl-PL.rc trunk/reactos/base/system/userinit/lang/ru-RU.rc trunk/reactos/base/system/userinit/lang/uk-UA.rc trunk/reactos/boot/freeldr/fdebug/lang/bg-BG.rc trunk/reactos/boot/freeldr/fdebug/lang/cs-CZ.rc trunk/reactos/boot/freeldr/fdebug/lang/de-DE.rc trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc trunk/reactos/boot/freeldr/fdebug/lang/en-US.rc trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc trunk/reactos/boot/freeldr/fdebug/lang/fr-FR.rc trunk/reactos/boot/freeldr/fdebug/lang/hu-HU.rc trunk/reactos/boot/freeldr/fdebug/lang/id-ID.rc trunk/reactos/boot/freeldr/fdebug/lang/it-IT.rc trunk/reactos/boot/freeldr/fdebug/lang/ja-JP.rc trunk/reactos/boot/freeldr/fdebug/lang/no-NO.rc trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/sv-SE.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/dxdiag/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/kbswitch/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/kbswitch/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/logoff/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/logoff/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/magnify/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mplay32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mplay32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mstsc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/sndrec32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Removed: trunk/reactos/base/setup/reactos/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/id… Removed: trunk/reactos/base/setup/reactos/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ja… Removed: trunk/reactos/base/setup/reactos/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/lt… Removed: trunk/reactos/base/setup/reactos/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/nl… Removed: trunk/reactos/base/setup/reactos/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sv… Removed: trunk/reactos/base/setup/reactos/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/th… Removed: trunk/reactos/base/setup/reactos/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… Modified: trunk/reactos/base/setup/vmwinst/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/da… Modified: trunk/reactos/base/setup/vmwinst/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/de… Modified: trunk/reactos/base/setup/vmwinst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/es… Modified: trunk/reactos/base/setup/vmwinst/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/ro… Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/base/system/format/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/lt… Modified: trunk/reactos/base/system/format/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/ru… Modified: trunk/reactos/base/system/format/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/uk… Modified: trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… Modified: trunk/reactos/base/system/subst/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/pl-… Modified: trunk/reactos/base/system/subst/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/uk-… Modified: trunk/reactos/base/system/userinit/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/boot/freeldr/fdebug/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/b… Modified: trunk/reactos/boot/freeldr/fdebug/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/c… Modified: trunk/reactos/boot/freeldr/fdebug/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/d… Modified: trunk/reactos/boot/freeldr/fdebug/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/e… Modified: trunk/reactos/boot/freeldr/fdebug/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/e… Modified: trunk/reactos/boot/freeldr/fdebug/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/e… Modified: trunk/reactos/boot/freeldr/fdebug/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/f… Modified: trunk/reactos/boot/freeldr/fdebug/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/h… Modified: trunk/reactos/boot/freeldr/fdebug/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/i… Modified: trunk/reactos/boot/freeldr/fdebug/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/i… Modified: trunk/reactos/boot/freeldr/fdebug/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/j… Modified: trunk/reactos/boot/freeldr/fdebug/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/n… Modified: trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/p… Modified: trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… Modified: trunk/reactos/boot/freeldr/fdebug/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… Modified: trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/s… Modified: trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/t… Modified: trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/u… Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…

1 0

[fireball] 54643: [MSAFD] - Handle SO_SNDBUF in WSPSetSockOpt so that it doesn't fall through to wshtcpip and result in "unknown level: 65536". - Added more trace messages. See issue #5477 for more...
by fireball＠svn.reactos.org 12 Dec '11

12 Dec '11

Author: fireball Date: Mon Dec 12 22:31:09 2011 New Revision: 54643 URL: http://svn.reactos.org/svn/reactos?rev=54643&view=rev Log: [MSAFD] - Handle SO_SNDBUF in WSPSetSockOpt so that it doesn't fall through to wshtcpip and result in "unknown level: 65536". - Added more trace messages. See issue #5477 for more details. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Dec 12 22:31:09 2011 @@ -2203,7 +2203,19 @@ sizeof(struct linger)); return 0; + case SO_SNDBUF: + if (optlen < sizeof(DWORD)) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + + /* TODO: The total per-socket buffer space reserved for sends */ + AFD_DbgPrint(MIN_TRACE,("Setting send buf to %x is not implemented yet\n", optval)); + return 0; + default: + AFD_DbgPrint(MIN_TRACE,("Unknown optname %x\n", optname)); break; } }

1 0

[ekohl] 54642: [ADVAPI32] ReportEventA/W: Strings must be passed to ElfrReportEventA/W as a pointer to an array of PANSI_STRINGs instead of a pointer to an array of ANSI_STRINGs. Now, strings appea...
by ekohl＠svn.reactos.org 12 Dec '11

12 Dec '11

Author: ekohl Date: Mon Dec 12 21:54:20 2011 New Revision: 54642 URL: http://svn.reactos.org/svn/reactos?rev=54642&view=rev Log: [ADVAPI32] ReportEventA/W: Strings must be passed to ElfrReportEventA/W as a pointer to an array of PANSI_STRINGs instead of a pointer to an array of ANSI_STRINGs. Now, strings appear in the event viewer. Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c [iso-8859-1] Mon Dec 12 21:54:20 2011 @@ -940,7 +940,7 @@ IN LPVOID lpRawData) { NTSTATUS Status; - ANSI_STRING *Strings; + PANSI_STRING *Strings; ANSI_STRING ComputerName; WORD i; CHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; @@ -951,8 +951,8 @@ wNumStrings, dwDataSize, lpStrings, lpRawData); Strings = HeapAlloc(GetProcessHeap(), - 0, - wNumStrings * sizeof(ANSI_STRING)); + HEAP_ZERO_MEMORY, + wNumStrings * sizeof(PANSI_STRING)); if (!Strings) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -960,7 +960,15 @@ } for (i = 0; i < wNumStrings; i++) - RtlInitAnsiString(&Strings[i], lpStrings[i]); + { + Strings[i] = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(ANSI_STRING)); + if (Strings[i]) + { + RtlInitAnsiString(Strings[i], lpStrings[i]); + } + } dwSize = MAX_COMPUTERNAME_LENGTH + 1; GetComputerNameA(szComputerName, &dwSize); @@ -975,9 +983,9 @@ dwEventID, wNumStrings, dwDataSize, - (PRPC_STRING) &ComputerName, + (PRPC_STRING)&ComputerName, lpUserSid, - (PRPC_STRING*) &Strings, + (PRPC_STRING*)Strings, lpRawData, 0, NULL, @@ -988,6 +996,12 @@ Status = I_RpcMapWin32Status(RpcExceptionCode()); } RpcEndExcept; + + for (i = 0; i < wNumStrings; i++) + { + if (Strings[i] != NULL) + HeapFree(GetProcessHeap(), 0, Strings[i]); + } HeapFree(GetProcessHeap(), 0, Strings); @@ -1027,7 +1041,7 @@ IN LPVOID lpRawData) { NTSTATUS Status; - UNICODE_STRING *Strings; + PUNICODE_STRING *Strings; UNICODE_STRING ComputerName; WORD i; WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; @@ -1039,7 +1053,7 @@ Strings = HeapAlloc(GetProcessHeap(), 0, - wNumStrings * sizeof(UNICODE_STRING)); + wNumStrings * sizeof(PUNICODE_STRING)); if (!Strings) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1047,7 +1061,15 @@ } for (i = 0; i < wNumStrings; i++) - RtlInitUnicodeString(&Strings[i], lpStrings[i]); + { + Strings[i] = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(ANSI_STRING)); + if (Strings[i]) + { + RtlInitUnicodeString(Strings[i], lpStrings[i]); + } + } dwSize = MAX_COMPUTERNAME_LENGTH + 1; GetComputerNameW(szComputerName, &dwSize); @@ -1062,9 +1084,9 @@ dwEventID, wNumStrings, dwDataSize, - (PRPC_UNICODE_STRING) &ComputerName, + (PRPC_UNICODE_STRING)&ComputerName, lpUserSid, - (PRPC_UNICODE_STRING*) &Strings, + (PRPC_UNICODE_STRING*)Strings, lpRawData, 0, NULL, @@ -1076,6 +1098,12 @@ } RpcEndExcept; + for (i = 0; i < wNumStrings; i++) + { + if (Strings[i] != NULL) + HeapFree(GetProcessHeap(), 0, Strings[i]); + } + HeapFree(GetProcessHeap(), 0, Strings); if (!NT_SUCCESS(Status))

1 0

[rharabien] 54641: [WIN32K] - Formatting. No code changes.
by rharabien＠svn.reactos.org 11 Dec '11

11 Dec '11

Author: rharabien Date: Sun Dec 11 20:09:53 2011 New Revision: 54641 URL: http://svn.reactos.org/svn/reactos?rev=54641&view=rev Log: [WIN32K] - Formatting. No code changes. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Sun Dec 11 20:09:53 2011 @@ -29,46 +29,46 @@ LPSIZE psize, UINT flOpts) { - PDC pdc; - PDC_ATTR pdcattr; - BOOL Result; - PTEXTOBJ TextObj; - - if (!cwc) - { - psize->cx = 0; - psize->cy = 0; - return TRUE; - } - - pdc = DC_LockDc(hDC); - if (!pdc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - pdcattr = pdc->pdcattr; - - TextObj = RealizeFontInit(pdcattr->hlfntNew); - if ( TextObj ) - { - Result = TextIntGetTextExtentPoint( pdc, - TextObj, - lpwsz, - cwc, - 0, - NULL, - 0, - psize, - flOpts); - TEXTOBJ_UnlockText(TextObj); - } - else - Result = FALSE; - - DC_UnlockDc(pdc); - return Result; + PDC pdc; + PDC_ATTR pdcattr; + BOOL Result; + PTEXTOBJ TextObj; + + if (!cwc) + { + psize->cx = 0; + psize->cy = 0; + return TRUE; + } + + pdc = DC_LockDc(hDC); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + pdcattr = pdc->pdcattr; + + TextObj = RealizeFontInit(pdcattr->hlfntNew); + if ( TextObj ) + { + Result = TextIntGetTextExtentPoint( pdc, + TextObj, + lpwsz, + cwc, + 0, + NULL, + 0, + psize, + flOpts); + TEXTOBJ_UnlockText(TextObj); + } + else + Result = FALSE; + + DC_UnlockDc(pdc); + return Result; } @@ -89,72 +89,72 @@ LPSIZE pSize, FLONG fl) { - PDC pdc; - PDC_ATTR pdcattr; - BOOL Result; - PTEXTOBJ TextObj; - - if ( (!String && Count ) || !pSize ) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if ( !Count ) - { - if ( Fit ) Fit = 0; - return TRUE; - } - - pdc = DC_LockDc(hDC); - if (NULL == pdc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - pdcattr = pdc->pdcattr; - - TextObj = RealizeFontInit(pdcattr->hlfntNew); - if ( TextObj ) - { - Result = TextIntGetTextExtentPoint( pdc, - TextObj, - String, - Count, - MaxExtent, - (LPINT)Fit, - (LPINT)Dx, - pSize, - fl); - TEXTOBJ_UnlockText(TextObj); - } - else - Result = FALSE; - - DC_UnlockDc(pdc); - return Result; + PDC pdc; + PDC_ATTR pdcattr; + BOOL Result; + PTEXTOBJ TextObj; + + if ( (!String && Count ) || !pSize ) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if ( !Count ) + { + if ( Fit ) Fit = 0; + return TRUE; + } + + pdc = DC_LockDc(hDC); + if (NULL == pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + pdcattr = pdc->pdcattr; + + TextObj = RealizeFontInit(pdcattr->hlfntNew); + if ( TextObj ) + { + Result = TextIntGetTextExtentPoint( pdc, + TextObj, + String, + Count, + MaxExtent, + (LPINT)Fit, + (LPINT)Dx, + pSize, + fl); + TEXTOBJ_UnlockText(TextObj); + } + else + Result = FALSE; + + DC_UnlockDc(pdc); + return Result; } DWORD APIENTRY NtGdiGetCharSet(HDC hDC) { - PDC Dc; - PDC_ATTR pdcattr; - DWORD cscp; - // If here, update everything! - Dc = DC_LockDc(hDC); - if (!Dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return 0; - } - cscp = ftGdiGetTextCharsetInfo(Dc,NULL,0); - pdcattr = Dc->pdcattr; - pdcattr->iCS_CP = cscp; - pdcattr->ulDirty_ &= ~DIRTY_CHARSET; - DC_UnlockDc( Dc ); - return cscp; + PDC Dc; + PDC_ATTR pdcattr; + DWORD cscp; + // If here, update everything! + Dc = DC_LockDc(hDC); + if (!Dc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return 0; + } + cscp = ftGdiGetTextCharsetInfo(Dc, NULL, 0); + pdcattr = Dc->pdcattr; + pdcattr->iCS_CP = cscp; + pdcattr->ulDirty_ &= ~DIRTY_CHARSET; + DC_UnlockDc( Dc ); + return cscp; } BOOL @@ -163,37 +163,37 @@ OUT LPRASTERIZER_STATUS praststat, IN ULONG cjBytes) { - NTSTATUS Status = STATUS_SUCCESS; - RASTERIZER_STATUS rsSafe; - - if (praststat && cjBytes) - { - if ( cjBytes >= sizeof(RASTERIZER_STATUS) ) cjBytes = sizeof(RASTERIZER_STATUS); - if ( ftGdiGetRasterizerCaps(&rsSafe)) - { - _SEH2_TRY - { - ProbeForWrite( praststat, - sizeof(RASTERIZER_STATUS), - 1); - RtlCopyMemory(praststat, &rsSafe, cjBytes ); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - return TRUE; - } - } - return FALSE; + NTSTATUS Status = STATUS_SUCCESS; + RASTERIZER_STATUS rsSafe; + + if (praststat && cjBytes) + { + if ( cjBytes >= sizeof(RASTERIZER_STATUS) ) cjBytes = sizeof(RASTERIZER_STATUS); + if ( ftGdiGetRasterizerCaps(&rsSafe)) + { + _SEH2_TRY + { + ProbeForWrite( praststat, + sizeof(RASTERIZER_STATUS), + 1); + RtlCopyMemory(praststat, &rsSafe, cjBytes ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + + return TRUE; + } + } + return FALSE; } INT @@ -203,49 +203,49 @@ OUT OPTIONAL LPFONTSIGNATURE lpSig, IN DWORD dwFlags) { - PDC Dc; - INT Ret; - FONTSIGNATURE fsSafe; - PFONTSIGNATURE pfsSafe = &fsSafe; - NTSTATUS Status = STATUS_SUCCESS; - - Dc = DC_LockDc(hdc); - if (!Dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return DEFAULT_CHARSET; - } - - if (!lpSig) pfsSafe = NULL; - - Ret = HIWORD(ftGdiGetTextCharsetInfo( Dc, pfsSafe, dwFlags)); - - if (lpSig) - { - if (Ret == DEFAULT_CHARSET) - RtlZeroMemory(pfsSafe, sizeof(FONTSIGNATURE)); - - _SEH2_TRY - { - ProbeForWrite( lpSig, - sizeof(FONTSIGNATURE), - 1); - RtlCopyMemory(lpSig, pfsSafe, sizeof(FONTSIGNATURE)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return DEFAULT_CHARSET; - } - } - DC_UnlockDc(Dc); - return Ret; + PDC Dc; + INT Ret; + FONTSIGNATURE fsSafe; + PFONTSIGNATURE pfsSafe = &fsSafe; + NTSTATUS Status = STATUS_SUCCESS; + + Dc = DC_LockDc(hdc); + if (!Dc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return DEFAULT_CHARSET; + } + + if (!lpSig) pfsSafe = NULL; + + Ret = HIWORD(ftGdiGetTextCharsetInfo( Dc, pfsSafe, dwFlags)); + + if (lpSig) + { + if (Ret == DEFAULT_CHARSET) + RtlZeroMemory(pfsSafe, sizeof(FONTSIGNATURE)); + + _SEH2_TRY + { + ProbeForWrite( lpSig, + sizeof(FONTSIGNATURE), + 1); + RtlCopyMemory(lpSig, pfsSafe, sizeof(FONTSIGNATURE)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return DEFAULT_CHARSET; + } + } + DC_UnlockDc(Dc); + return Ret; } @@ -268,145 +268,145 @@ IN FLONG fl ) { - PDC dc; - PDC_ATTR pdcattr; - LPWSTR String; - SIZE Size; - NTSTATUS Status; - BOOLEAN Result; - INT Fit; - LPINT Dx; - PTEXTOBJ TextObj; - - /* FIXME: Handle fl */ - - if (0 == Count) - { - Size.cx = 0; - Size.cy = 0; - Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - return TRUE; - } - - String = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), GDITAG_TEXT); - if (NULL == String) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - if (NULL != UnsafeDx) - { - Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), GDITAG_TEXT); - if (NULL == Dx) - { - ExFreePoolWithTag(String, GDITAG_TEXT); - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - } - else - { - Dx = NULL; - } - - Status = MmCopyFromCaller(String, UnsafeString, Count * sizeof(WCHAR)); - if (! NT_SUCCESS(Status)) - { - if (NULL != Dx) - { - ExFreePoolWithTag(Dx, GDITAG_TEXT); - } - ExFreePoolWithTag(String, GDITAG_TEXT); - SetLastNtError(Status); - return FALSE; - } - - dc = DC_LockDc(hDC); - if (NULL == dc) - { - if (NULL != Dx) - { - ExFreePoolWithTag(Dx, GDITAG_TEXT); - } - ExFreePoolWithTag(String, GDITAG_TEXT); - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - pdcattr = dc->pdcattr; - TextObj = RealizeFontInit(pdcattr->hlfntNew); - if ( TextObj ) - { - Result = TextIntGetTextExtentPoint( dc, - TextObj, - String, - Count, - MaxExtent, - NULL == UnsafeFit ? NULL : &Fit, - Dx, - &Size, - fl); - TEXTOBJ_UnlockText(TextObj); - } - else - Result = FALSE; - DC_UnlockDc(dc); - - ExFreePoolWithTag(String, GDITAG_TEXT); - if (! Result) - { - if (NULL != Dx) - { - ExFreePoolWithTag(Dx, GDITAG_TEXT); - } - return FALSE; - } - - if (NULL != UnsafeFit) - { - Status = MmCopyToCaller(UnsafeFit, &Fit, sizeof(INT)); - if (! NT_SUCCESS(Status)) - { - if (NULL != Dx) - { - ExFreePoolWithTag(Dx, GDITAG_TEXT); - } - SetLastNtError(Status); - return FALSE; - } - } - - if (NULL != UnsafeDx) - { - Status = MmCopyToCaller(UnsafeDx, Dx, Count * sizeof(INT)); - if (! NT_SUCCESS(Status)) - { - if (NULL != Dx) - { - ExFreePoolWithTag(Dx, GDITAG_TEXT); - } - SetLastNtError(Status); - return FALSE; - } - } - if (NULL != Dx) - { - ExFreePoolWithTag(Dx,GDITAG_TEXT); - } - - Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE)); - if (! NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - return TRUE; + PDC dc; + PDC_ATTR pdcattr; + LPWSTR String; + SIZE Size; + NTSTATUS Status; + BOOLEAN Result; + INT Fit; + LPINT Dx; + PTEXTOBJ TextObj; + + /* FIXME: Handle fl */ + + if (0 == Count) + { + Size.cx = 0; + Size.cy = 0; + Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE)); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + return TRUE; + } + + String = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), GDITAG_TEXT); + if (NULL == String) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + if (NULL != UnsafeDx) + { + Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), GDITAG_TEXT); + if (NULL == Dx) + { + ExFreePoolWithTag(String, GDITAG_TEXT); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + else + { + Dx = NULL; + } + + Status = MmCopyFromCaller(String, UnsafeString, Count * sizeof(WCHAR)); + if (! NT_SUCCESS(Status)) + { + if (NULL != Dx) + { + ExFreePoolWithTag(Dx, GDITAG_TEXT); + } + ExFreePoolWithTag(String, GDITAG_TEXT); + SetLastNtError(Status); + return FALSE; + } + + dc = DC_LockDc(hDC); + if (NULL == dc) + { + if (NULL != Dx) + { + ExFreePoolWithTag(Dx, GDITAG_TEXT); + } + ExFreePoolWithTag(String, GDITAG_TEXT); + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + pdcattr = dc->pdcattr; + TextObj = RealizeFontInit(pdcattr->hlfntNew); + if ( TextObj ) + { + Result = TextIntGetTextExtentPoint( dc, + TextObj, + String, + Count, + MaxExtent, + NULL == UnsafeFit ? NULL : &Fit, + Dx, + &Size, + fl); + TEXTOBJ_UnlockText(TextObj); + } + else + Result = FALSE; + DC_UnlockDc(dc); + + ExFreePoolWithTag(String, GDITAG_TEXT); + if (! Result) + { + if (NULL != Dx) + { + ExFreePoolWithTag(Dx, GDITAG_TEXT); + } + return FALSE; + } + + if (NULL != UnsafeFit) + { + Status = MmCopyToCaller(UnsafeFit, &Fit, sizeof(INT)); + if (! NT_SUCCESS(Status)) + { + if (NULL != Dx) + { + ExFreePoolWithTag(Dx, GDITAG_TEXT); + } + SetLastNtError(Status); + return FALSE; + } + } + + if (NULL != UnsafeDx) + { + Status = MmCopyToCaller(UnsafeDx, Dx, Count * sizeof(INT)); + if (! NT_SUCCESS(Status)) + { + if (NULL != Dx) + { + ExFreePoolWithTag(Dx, GDITAG_TEXT); + } + SetLastNtError(Status); + return FALSE; + } + } + if (NULL != Dx) + { + ExFreePoolWithTag(Dx, GDITAG_TEXT); + } + + Status = MmCopyToCaller(UnsafeSize, &Size, sizeof(SIZE)); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + + return TRUE; } @@ -423,7 +423,7 @@ LPSIZE psize, UINT flOpts) { - return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, 0, NULL, NULL, psize, flOpts); + return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, 0, NULL, NULL, psize, flOpts); } BOOL @@ -432,23 +432,23 @@ int BreakExtra, int BreakCount) { - PDC pDc; - PDC_ATTR pdcattr; - - pDc = DC_LockDc(hDC); - if (!pDc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - pdcattr = pDc->pdcattr; - - pdcattr->lBreakExtra = BreakExtra; - pdcattr->cBreak = BreakCount; - - DC_UnlockDc(pDc); - return TRUE; + PDC pDc; + PDC_ATTR pdcattr; + + pDc = DC_LockDc(hDC); + if (!pDc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + pdcattr = pDc->pdcattr; + + pdcattr->lBreakExtra = BreakExtra; + pdcattr->cBreak = BreakCount; + + DC_UnlockDc(pDc); + return TRUE; } @@ -462,53 +462,53 @@ IN BOOL bAliasName ) { - PDC Dc; - PDC_ATTR pdcattr; - HFONT hFont; - PTEXTOBJ TextObj; - NTSTATUS Status; - INT fLen, ret; - - /* FIXME: Handle bAliasName */ - - Dc = DC_LockDc(hDC); - if (Dc == NULL) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - pdcattr = Dc->pdcattr; - hFont = pdcattr->hlfntNew; - DC_UnlockDc(Dc); - - TextObj = RealizeFontInit(hFont); - ASSERT(TextObj != NULL); - fLen = wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName) + 1; - - if (FaceName != NULL) - { - Count = min(Count, fLen); - Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - TEXTOBJ_UnlockText(TextObj); - SetLastNtError(Status); - return 0; - } - /* Terminate if we copied only part of the font name */ - if (Count > 0 && Count < fLen) - { - FaceName[Count - 1] = '\0'; - } - ret = Count; - } - else - { - ret = fLen; - } - - TEXTOBJ_UnlockText(TextObj); - return ret; + PDC Dc; + PDC_ATTR pdcattr; + HFONT hFont; + PTEXTOBJ TextObj; + NTSTATUS Status; + INT fLen, ret; + + /* FIXME: Handle bAliasName */ + + Dc = DC_LockDc(hDC); + if (Dc == NULL) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + pdcattr = Dc->pdcattr; + hFont = pdcattr->hlfntNew; + DC_UnlockDc(Dc); + + TextObj = RealizeFontInit(hFont); + ASSERT(TextObj != NULL); + fLen = wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName) + 1; + + if (FaceName != NULL) + { + Count = min(Count, fLen); + Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + TEXTOBJ_UnlockText(TextObj); + SetLastNtError(Status); + return 0; + } + /* Terminate if we copied only part of the font name */ + if (Count > 0 && Count < fLen) + { + FaceName[Count - 1] = '\0'; + } + ret = Count; + } + else + { + ret = fLen; + } + + TEXTOBJ_UnlockText(TextObj); + return ret; } W32KAPI @@ -520,33 +520,33 @@ IN ULONG cj ) { - TMW_INTERNAL Tmwi; - NTSTATUS Status = STATUS_SUCCESS; - - if ( cj <= sizeof(TMW_INTERNAL) ) - { - if (ftGdiGetTextMetricsW(hDC,&Tmwi)) - { - _SEH2_TRY - { - ProbeForWrite(pUnsafeTmwi, cj, 1); - RtlCopyMemory(pUnsafeTmwi,&Tmwi,cj); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - return TRUE; - } - } - return FALSE; + TMW_INTERNAL Tmwi; + NTSTATUS Status = STATUS_SUCCESS; + + if ( cj <= sizeof(TMW_INTERNAL) ) + { + if (ftGdiGetTextMetricsW(hDC, &Tmwi)) + { + _SEH2_TRY + { + ProbeForWrite(pUnsafeTmwi, cj, 1); + RtlCopyMemory(pUnsafeTmwi, &Tmwi, cj); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + return TRUE; + } + } + return FALSE; } /* EOF */

1 0

[janderwald] 54640: [PORTCLS] - Add support for IDrmPort, IDrmPort2 - more debug traces
by janderwald＠svn.reactos.org 11 Dec '11

11 Dec '11

Author: janderwald Date: Sun Dec 11 10:51:37 2011 New Revision: 54640 URL: http://svn.reactos.org/svn/reactos?rev=54640&view=rev Log: [PORTCLS] - Add support for IDrmPort, IDrmPort2 - more debug traces Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -58,6 +58,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + if (IsEqualGUIDAligned(refiid, IID_IUnregisterPhysicalConnection) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { @@ -65,6 +67,12 @@ PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; + } + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CUnregisterPhysicalConnection::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); } return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -73,6 +73,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + DPRINT("CInterruptSync::QueryInterface: this %p\n", this); if (IsEqualGUIDAligned(refiid, IID_IInterruptSync) || @@ -83,7 +85,13 @@ return STATUS_SUCCESS; } - DPRINT("CInterruptSync::QueryInterface: this %p UNKNOWN interface requested\n", this); + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CInterruptSync::QueryInterface: no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); + } + return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -137,22 +137,27 @@ PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } + else if (IsEqualGUIDAligned(refiid, IID_IPortEvents)) + { + *Output = PVOID(PPORTEVENTS(this)); + PUNKNOWN(*Output)->AddRef(); + return STATUS_SUCCESS; + } else if (IsEqualGUIDAligned(refiid, IID_ISubdevice)) { *Output = PVOID(PSUBDEVICE(this)); PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } - else if (IsEqualGUIDAligned(refiid, IID_IPortEvents)) - { - *Output = PVOID(PPORTEVENTS(this)); - PUNKNOWN(*Output)->AddRef(); - return STATUS_SUCCESS; - } else if (IsEqualGUIDAligned(refiid, IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); } + else if (IsEqualGUIDAligned(refiid, IID_IDrmPort) || + IsEqualGUIDAligned(refiid, IID_IDrmPort2)) + { + return NewIDrmPort((PDRMPORT2*)Output); + } else if (IsEqualGUIDAligned(refiid, IID_IUnregisterSubdevice)) { return NewIUnregisterSubdevice((PUNREGISTERSUBDEVICE*)Output); @@ -164,7 +169,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("IPortTopology_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("IPortTopology_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -179,7 +179,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -32,7 +32,7 @@ Status = pUnknown->QueryInterface(IID_IAdapterPowerManagement, (PVOID*)&pPower); if (!NT_SUCCESS(Status)) { - DPRINT("PcRegisterAdapterPowerManagement no IAdapterPowerManagement interface %x\n", Status); + DPRINT1("PcRegisterAdapterPowerManagement no IAdapterPowerManagement interface %x\n", Status); DeviceExt->AdapterPowerManagement = NULL; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -54,6 +54,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + DPRINT("CRegistryKey::QueryInterface entered\n"); if (IsEqualGUIDAligned(refiid, IID_IRegistryKey) || IsEqualGUIDAligned(refiid, IID_IUnknown)) @@ -63,7 +65,12 @@ return STATUS_SUCCESS; } - DPRINT("IRegistryKey_QueryInterface: This %p\n", this); + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CRegistryKey::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); + } + return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -69,7 +69,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("IResourceList_QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("IResourceList_QueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -91,7 +91,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT("CServiceGroup::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT1("CServiceGroup::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -47,12 +47,20 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + if (IsEqualGUIDAligned(refiid, IID_IUnregisterSubdevice) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PUNREGISTERSUBDEVICE(this)); PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; + } + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); } return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/version.cpp [iso-8859-1] Sun Dec 11 10:51:37 2011 @@ -60,6 +60,8 @@ IN REFIID refiid, OUT PVOID* Output) { + UNICODE_STRING GuidString; + if (IsEqualGUIDAligned(refiid, IID_IPortClsVersion) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { @@ -67,6 +69,13 @@ PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } + + if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) + { + DPRINT1("CPortClsVersion::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + RtlFreeUnicodeString(&GuidString); + } + return STATUS_UNSUCCESSFUL; }

1 0

[spetreolle] 54639: [WIN32K] Fix MSVC build.
by spetreolle＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: spetreolle Date: Sat Dec 10 21:30:17 2011 New Revision: 54639 URL: http://svn.reactos.org/svn/reactos?rev=54639&view=rev Log: [WIN32K] Fix MSVC build. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Dec 10 21:30:17 2011 @@ -622,7 +622,7 @@ } } return 0; -} +} LRESULT FASTCALL IntDispatchMessage(PMSG pMsg) @@ -632,6 +632,7 @@ LRESULT retval = 0; PTHREADINFO pti; PWND Window = NULL; + HRGN hrgn; if (pMsg->hwnd) { @@ -705,7 +706,7 @@ { Window->state2 &= ~WNDS2_WMPAINTSENT; /* send a WM_NCPAINT and WM_ERASEBKGND if the non-client area is still invalid */ - HRGN hrgn = IntSysCreateRectRgn( 0, 0, 0, 0 ); + hrgn = IntSysCreateRectRgn( 0, 0, 0, 0 ); co_UserGetUpdateRgn( Window, hrgn, TRUE ); GreDeleteObject(hrgn); } @@ -1447,7 +1448,7 @@ &Result)) { Result = ((ULONG_PTR)-1); - } + } return Result; } /* MSDN: @@ -1528,7 +1529,7 @@ { ERR("SMWCB: Internal Message!\n"); Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); - if (uResult) *uResult = Result; + if (uResult) *uResult = Result; RETURN( TRUE); } @@ -1616,7 +1617,7 @@ /* This HACK function posts a message if the destination's message queue belongs to another thread, otherwise it sends the message. It does not support broadcast - messages! + messages! */ LRESULT FASTCALL co_IntPostOrSendMessage( HWND hWnd,

1 0

[jimtabor] 54638: - missed this file.
by jimtabor＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: jimtabor Date: Sat Dec 10 07:46:10 2011 New Revision: 54638 URL: http://svn.reactos.org/svn/reactos?rev=54638&view=rev Log: - missed this file. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat Dec 10 07:46:10 2011 @@ -745,7 +745,7 @@ LRESULT DefWndHandleSysCommand(HWND hWnd, WPARAM wParam, LPARAM lParam) { - WINDOWPLACEMENT wp; +// WINDOWPLACEMENT wp; POINT Pt; LRESULT lResult; @@ -763,30 +763,24 @@ case SC_SIZE: DefWndDoSizeMove(hWnd, wParam); break; - case SC_MINIMIZE: - wp.length = sizeof(WINDOWPLACEMENT); - if(GetWindowPlacement(hWnd, &wp)) - { - wp.showCmd = SW_MINIMIZE; - SetWindowPlacement(hWnd, &wp); - } + case SC_MINIMIZE: + if (hWnd == GetActiveWindow()) + ShowOwnedPopups(hWnd,FALSE); + ShowWindow( hWnd, SW_MINIMIZE ); break; - case SC_MAXIMIZE: - wp.length = sizeof(WINDOWPLACEMENT); - if(GetWindowPlacement(hWnd, &wp)) - { - wp.showCmd = SW_MAXIMIZE; - SetWindowPlacement(hWnd, &wp); - } + + case SC_MAXIMIZE: + if (IsIconic(hWnd) && hWnd == GetActiveWindow()) + ShowOwnedPopups(hWnd,TRUE); + ShowWindow( hWnd, SW_MAXIMIZE ); break; - case SC_RESTORE: - wp.length = sizeof(WINDOWPLACEMENT); - if(GetWindowPlacement(hWnd, &wp)) - { - wp.showCmd = SW_RESTORE; - SetWindowPlacement(hWnd, &wp); - } + + case SC_RESTORE: + if (IsIconic(hWnd) && hWnd == GetActiveWindow()) + ShowOwnedPopups(hWnd,TRUE); + ShowWindow( hWnd, SW_RESTORE ); break; + case SC_CLOSE: return SendMessageW(hWnd, WM_CLOSE, 0, 0); // case SC_DEFAULT:

1 0

[jimtabor] 54637: [Win32k|User32] - Fix Get/SetWindowPlacement and everything related. Which exposed the scroll bar over write issue, it's not refreshing the client window when it is maximized. Nex...
by jimtabor＠svn.reactos.org 10 Dec '11

10 Dec '11

Author: jimtabor Date: Sat Dec 10 07:41:56 2011 New Revision: 54637 URL: http://svn.reactos.org/svn/reactos?rev=54637&view=rev Log: [Win32k|User32] - Fix Get/SetWindowPlacement and everything related. Which exposed the scroll bar over write issue, it's not refreshing the client window when it is maximized. Next thing to fix. - Fix ShowWindowAsync, now restore and minimize all works. This is based on wine but in reality it's based on Windows queuing event messages used in server side internal calls. Also this patch includes the server side hooking points. - Removed one ugly API. - Fixes bug 6239, 6739 and client window restore from maximize and the incremental crawling down issue when parent window is minimized then restored. Modified: trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/dll/win32/user32/windows/winpos.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db trunk/reactos/subsystems/win32/win32k/w32ksvc.h Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/input.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -557,8 +557,6 @@ BYTE bScan, DWORD dwFlags, ULONG_PTR dwExtraInfo) - - { INPUT Input; Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -959,6 +959,13 @@ PWND Wnd = ValidateHwnd(hWnd); if (!Wnd) return FALSE; + if (Wnd->style & WS_MINIMIZED) + { + lpRect->left = lpRect->top = 0; + lpRect->right = GetSystemMetrics(SM_CXMINIMIZED); + lpRect->bottom = GetSystemMetrics(SM_CYMINIMIZED); + return TRUE; + } if ( hWnd != GetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP ) { /* lpRect->left = lpRect->top = 0; Modified: trunk/reactos/dll/win32/user32/windows/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/winpos.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -68,26 +68,110 @@ if (!SetActiveWindow( hwndTo )) SetActiveWindow(0); } - +#define EMPTYPOINT(pt) ((pt).x == -1 && (pt).y == -1) UINT WINAPI -WinPosGetMinMaxInfo(HWND hWnd, POINT* MaxSize, POINT* MaxPos, - POINT* MinTrack, POINT* MaxTrack) -{ - MINMAXINFO MinMax; - - if(NtUserGetMinMaxInfo(hWnd, &MinMax, TRUE)) - { - MinMax.ptMaxTrackSize.x = max(MinMax.ptMaxTrackSize.x, - MinMax.ptMinTrackSize.x); - MinMax.ptMaxTrackSize.y = max(MinMax.ptMaxTrackSize.y, - MinMax.ptMinTrackSize.y); - - if (MaxSize) *MaxSize = MinMax.ptMaxSize; - if (MaxPos) *MaxPos = MinMax.ptMaxPosition; - if (MinTrack) *MinTrack = MinMax.ptMinTrackSize; - if (MaxTrack) *MaxTrack = MinMax.ptMaxTrackSize; - } +WinPosGetMinMaxInfo(HWND hwnd, POINT* maxSize, POINT* maxPos, + POINT* minTrack, POINT* maxTrack) +{ + MINMAXINFO MinMax; + HMONITOR monitor; + INT xinc, yinc; + LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG adjustedStyle; + LONG exstyle = GetWindowLongW( hwnd, GWL_EXSTYLE ); + RECT rc; + WND *win; + + /* Compute default values */ + + GetWindowRect(hwnd, &rc); + MinMax.ptReserved.x = rc.left; + MinMax.ptReserved.y = rc.top; + + if ((style & WS_CAPTION) == WS_CAPTION) + adjustedStyle = style & ~WS_BORDER; /* WS_CAPTION = WS_DLGFRAME | WS_BORDER */ + else + adjustedStyle = style; + + GetClientRect(GetAncestor(hwnd,GA_PARENT), &rc); + AdjustWindowRectEx(&rc, adjustedStyle, ((style & WS_POPUP) && GetMenu(hwnd)), exstyle); + + xinc = -rc.left; + yinc = -rc.top; + + MinMax.ptMaxSize.x = rc.right - rc.left; + MinMax.ptMaxSize.y = rc.bottom - rc.top; + if (style & (WS_DLGFRAME | WS_BORDER)) + { + MinMax.ptMinTrackSize.x = GetSystemMetrics(SM_CXMINTRACK); + MinMax.ptMinTrackSize.y = GetSystemMetrics(SM_CYMINTRACK); + } + else + { + MinMax.ptMinTrackSize.x = 2 * xinc; + MinMax.ptMinTrackSize.y = 2 * yinc; + } + MinMax.ptMaxTrackSize.x = GetSystemMetrics(SM_CXMAXTRACK); + MinMax.ptMaxTrackSize.y = GetSystemMetrics(SM_CYMAXTRACK); + MinMax.ptMaxPosition.x = -xinc; + MinMax.ptMaxPosition.y = -yinc; + + if ((win = ValidateHwnd( hwnd )) )//&& win != WND_DESKTOP && win != WND_OTHER_PROCESS) + { + if (!EMPTYPOINT(win->InternalPos.MaxPos)) MinMax.ptMaxPosition = win->InternalPos.MaxPos; + } + + SendMessageW( hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax ); + + /* if the app didn't change the values, adapt them for the current monitor */ + + if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) + { + RECT rc_work; + MONITORINFO mon_info; + + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + + rc_work = mon_info.rcMonitor; + + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + rc_work = mon_info.rcWork; + } + + if (MinMax.ptMaxSize.x == GetSystemMetrics(SM_CXSCREEN) + 2 * xinc && + MinMax.ptMaxSize.y == GetSystemMetrics(SM_CYSCREEN) + 2 * yinc) + { + MinMax.ptMaxSize.x = (rc_work.right - rc_work.left) + 2 * xinc; + MinMax.ptMaxSize.y = (rc_work.bottom - rc_work.top) + 2 * yinc; + } + if (MinMax.ptMaxPosition.x == -xinc && MinMax.ptMaxPosition.y == -yinc) + { + MinMax.ptMaxPosition.x = rc_work.left - xinc; + MinMax.ptMaxPosition.y = rc_work.top - yinc; + } + } + + /* Some sanity checks */ + + TRACE("%d %d / %d %d / %d %d / %d %d\n", + MinMax.ptMaxSize.x, MinMax.ptMaxSize.y, + MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y, + MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y, + MinMax.ptMinTrackSize.x, MinMax.ptMinTrackSize.y); + MinMax.ptMaxTrackSize.x = max( MinMax.ptMaxTrackSize.x, + MinMax.ptMinTrackSize.x ); + MinMax.ptMaxTrackSize.y = max( MinMax.ptMaxTrackSize.y, + MinMax.ptMinTrackSize.y ); + + if (maxSize) *maxSize = MinMax.ptMaxSize; + if (maxPos) *maxPos = MinMax.ptMaxPosition; + if (minTrack) *minTrack = MinMax.ptMinTrackSize; + if (maxTrack) *maxTrack = MinMax.ptMaxTrackSize; + return 0; //FIXME: what does it return? } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -132,6 +132,7 @@ WCHAR szDesktopName[1]; } DESKTOPINFO, *PDESKTOPINFO; +#define CTI_THREADSYSLOCK 0x0001 #define CTI_INSENDMESSAGE 0x0002 typedef struct _CLIENTTHREADINFO @@ -566,6 +567,9 @@ #define WS_EX2_HASOVERLAY 0X00000200 #define WS_EX2_CONSOLEWINDOW 0X00000400 #define WS_EX2_CHILDNOACTIVATE 0X00000800 + +#define WPF_MININIT 0x0008 +#define WPF_MAXINIT 0x0010 typedef struct _WND { @@ -622,10 +626,10 @@ RECT NormalRect; POINT IconPos; POINT MaxPos; + UINT flags; // WPF_ flags. } InternalPos; UINT Unicode : 1; // !(WNDS_ANSICREATOR|WNDS_ANSIWINDOWPROC) ? - /* Indicates whether the window is derived from a system class */ UINT InternalPosInitialized : 1; UINT HideFocus : 1; // WS_EX_UISTATEFOCUSRECTHIDDEN ? UINT HideAccel : 1; // WS_EX_UISTATEKBACCELHIDDEN ? @@ -3213,8 +3217,8 @@ typedef struct tagKMDDELPARAM { - UINT_PTR uiLo; - UINT_PTR uiHi; + UINT_PTR uiLo; + UINT_PTR uiHi; } KMDDELPARAM, *PKMDDELPARAM; @@ -3257,13 +3261,6 @@ HMENU hMenu, UINT fByPos, UINT gmdiFlags); - -BOOL -NTAPI -NtUserGetMinMaxInfo( - HWND hwnd, - MINMAXINFO *MinMaxInfo, - BOOL SendMessage); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -141,6 +141,13 @@ #define QF_TRACKMOUSEFIRING 0x00080000 #define QF_CAPTURELOCKED 0x00100000 #define QF_ACTIVEWNDTRACKING 0x00200000 + +/* internal messages codes */ +enum internal_event_message +{ + WM_ASYNC_SHOWWINDOW = 0x80000000, + WM_ASYNC_SETWINDOWPOS +}; BOOL FASTCALL MsqIsHung(PUSER_MESSAGE_QUEUE MessageQueue); VOID CALLBACK HungAppSysTimerProc(HWND,UINT,UINT_PTR,DWORD); Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -54,4 +54,3 @@ void FASTCALL co_WinPosSendSizeMove(PWND Window); PWND FASTCALL co_WinPosWindowFromPoint(PWND ScopeWin, POINT *WinPoint, USHORT* HitTest); VOID FASTCALL co_WinPosActivateOtherWindow(PWND Window); -VOID FASTCALL WinPosInitInternalPos(PWND WindowObject, POINT *pt, RECTL *RestoreRect); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -99,6 +99,7 @@ if (message >= 8*sizeof(message_pointer_flags)) return FALSE; return (message_pointer_flags[message / 32] & SET(message)) != 0; } +#undef SET #define MMS_SIZE_WPARAM -1 #define MMS_SIZE_WPARAMWCHAR -2 @@ -590,6 +591,39 @@ co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); } +static LRESULT handle_internal_message( PWND pWnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + LRESULT lRes; + + if (!pWnd || + pWnd == IntGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP + pWnd == IntGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + return 0; + + ERR("Internal Event Msg %p\n",msg); + + switch(msg) + { + case WM_ASYNC_SHOWWINDOW: + return co_WinPosShowWindow( pWnd, wparam ); + case WM_ASYNC_SETWINDOWPOS: + { + PWINDOWPOS winpos = (PWINDOWPOS)lparam; + if (!winpos) return 0; + lRes = co_WinPosSetWindowPos( pWnd, + winpos->hwndInsertAfter, + winpos->x, + winpos->y, + winpos->cx, + winpos->cy, + winpos->flags); + ExFreePoolWithTag(winpos, USERTAG_SWP); + return lRes; + } + } + return 0; +} + LRESULT FASTCALL IntDispatchMessage(PMSG pMsg) { @@ -648,6 +682,13 @@ // Need a window! if ( !Window ) return 0; + if (pMsg->message == WM_PAINT) Window->state |= WNDS_PAINTNOTPROCESSED; + + if ( Window->state & WNDS_SERVERSIDEWINDOWPROC ) + { + TRACE("Dispatch: Server Side Window Procedure\n"); + } + /* Since we are doing a callback on the same thread right away, there is no need to copy the lparam to kernel mode and then back to usermode. We just pretend it isn't a pointer */ @@ -662,6 +703,7 @@ if (pMsg->message == WM_PAINT) { + Window->state2 &= ~WNDS2_WMPAINTSENT; /* send a WM_NCPAINT and WM_ERASEBKGND if the non-client area is still invalid */ HRGN hrgn = IntSysCreateRectRgn( 0, 0, 0, 0 ); co_UserGetUpdateRgn( Window, hrgn, TRUE ); @@ -1096,7 +1138,7 @@ PWND DesktopWindow; ULONG i; - DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + DesktopWindow = UserGetDesktopWindow(); List = IntWinListChildren(DesktopWindow); if (List != NULL) @@ -1104,6 +1146,13 @@ UserPostMessage(DesktopWindow->head.h, Msg, wParam, lParam); for (i = 0; List[i]; i++) { + PWND pwnd = UserGetWindowObject(List[i]); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || // Also need pwnd->pcls->atomClassName == gaOleMainThreadWndClass + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + UserPostMessage(List[i], Msg, wParam, lParam); } ExFreePoolWithTag(List, USERTAG_WINDOWLIST); @@ -1144,7 +1193,6 @@ } return TRUE; } - LRESULT FASTCALL co_IntSendMessage( HWND hWnd, @@ -1175,7 +1223,7 @@ INT lParamBufferSize; LPARAM lParamPacked; PTHREADINFO Win32Thread; - ULONG_PTR Result = 0; + ULONG_PTR Hi, Lo, Result = 0; DECLARE_RETURN(LRESULT); USER_REFERENCE_ENTRY Ref; @@ -1188,8 +1236,7 @@ Win32Thread = PsGetCurrentThreadWin32Thread(); - - if ( NULL != Win32Thread && + if ( Win32Thread && Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { if (Win32Thread->TIF_flags & TIF_INCLEANUP) @@ -1198,23 +1245,44 @@ RETURN( FALSE); } + if (Msg & 0x80000000) + { + ERR("SMTS: Internal Message!\n"); + Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); + if (uResult) *uResult = Result; + RETURN( TRUE); + } + + // Only happens when calling the client! IntCallWndProc( Window, hWnd, Msg, wParam, lParam); + if ( Window->state & WNDS_SERVERSIDEWINDOWPROC ) + { + TRACE("SMT: Server Side Window Procedure\n"); + IoGetStackLimits(&Lo, &Hi); + // Handle it here. Safeguard against excessive recursions. + if (((ULONG_PTR)&uResult - Lo) < 4096 ) + { + ERR("Server Callback Exceeded Stack!\n"); + RETURN( FALSE); + } + /* Return after server side call, IntCallWndProcRet will not be called. */ + } /* See if this message type is present in the table */ MsgMemoryEntry = FindMsgMemory(Msg); if (NULL == MsgMemoryEntry) { - lParamBufferSize = -1; + lParamBufferSize = -1; } else { - lParamBufferSize = MsgMemorySize(MsgMemoryEntry, wParam, lParam); + lParamBufferSize = MsgMemorySize(MsgMemoryEntry, wParam, lParam); } if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam, FALSE))) { - ERR("Failed to pack message parameters\n"); - RETURN( FALSE); + ERR("Failed to pack message parameters\n"); + RETURN( FALSE); } Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, @@ -1229,13 +1297,14 @@ *uResult = Result; } - IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) { ERR("Failed to unpack message parameters\n"); RETURN( TRUE); } + + // Only happens when calling the client! + IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); RETURN( TRUE); } @@ -1283,7 +1352,7 @@ EngSetLastError(ERROR_TIMEOUT); RETURN( FALSE); } - else if (! NT_SUCCESS(Status)) + else if (!NT_SUCCESS(Status)) { SetLastNtError(Status); RETURN( FALSE); @@ -1309,20 +1378,23 @@ HWND *Children; HWND *Child; - if (HWND_BROADCAST != hWnd) + if (hWnd != HWND_BROADCAST && hWnd != HWND_TOPMOST) { return co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, uFlags, uTimeout, uResult); } - DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + DesktopWindow = UserGetDesktopWindow(); if (NULL == DesktopWindow) { - EngSetLastError(ERROR_INTERNAL_ERROR); - return 0; - } - - /* Send message to the desktop window too! */ - co_IntSendMessageTimeoutSingle(DesktopWindow->head.h, Msg, wParam, lParam, uFlags, uTimeout, uResult); + EngSetLastError(ERROR_INTERNAL_ERROR); + return 0; + } + + if (hWnd != HWND_TOPMOST) + { + /* Send message to the desktop window too! */ + co_IntSendMessageTimeoutSingle(DesktopWindow->head.h, Msg, wParam, lParam, uFlags, uTimeout, uResult); + } Children = IntWinListChildren(DesktopWindow); if (NULL == Children) @@ -1332,7 +1404,26 @@ for (Child = Children; NULL != *Child; Child++) { - co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); + if (hWnd == HWND_TOPMOST) + { + DesktopWindow = UserGetWindowObject(*Child); + if (DesktopWindow && DesktopWindow->ExStyle & WS_EX_TOPMOST) + { + ERR("HWND_TOPMOST Found\n"); + co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); + } + } + else + { + PWND pwnd = UserGetWindowObject(*Child); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + co_IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult); + } } ExFreePool(Children); @@ -1347,13 +1438,16 @@ LPARAM lParam) { ULONG_PTR Result = 0; - co_IntSendMessageWithCallBack(hWnd, - Msg, - wParam, - lParam, - NULL, - 0, - &Result); + if (!co_IntSendMessageWithCallBack( hWnd, + Msg, + wParam, + lParam, + NULL, + 0, + &Result)) + { + Result = ((ULONG_PTR)-1); + } return Result; } /* MSDN: @@ -1430,7 +1524,20 @@ RETURN(FALSE); } + if (Msg & 0x80000000) + { + ERR("SMWCB: Internal Message!\n"); + Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); + if (uResult) *uResult = Result; + RETURN( TRUE); + } + IntCallWndProc( Window, hWnd, Msg, wParam, lParam); + + if ( Window->state & WNDS_SERVERSIDEWINDOWPROC ) + { + TRACE("SMWCB: Server Side Window Procedure\n"); + } Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, !Window->Unicode, @@ -1505,9 +1612,12 @@ END_CLEANUP; } -/* This function posts a message if the destination's message queue belongs to -another thread, otherwise it sends the message. It does not support broadcast -messages! */ + +/* + This HACK function posts a message if the destination's message queue belongs to + another thread, otherwise it sends the message. It does not support broadcast + messages! +*/ LRESULT FASTCALL co_IntPostOrSendMessage( HWND hWnd, UINT Msg, @@ -1561,7 +1671,7 @@ MSG KernelModeMsg; PMSGMEMORY MsgMemoryEntry; - if (HWND_BROADCAST != hWnd) + if (hWnd != HWND_BROADCAST && hWnd != HWND_TOPMOST) { Window = UserGetWindowObject(hWnd); if ( !Window ) @@ -1641,7 +1751,7 @@ PWND DesktopWindow; ULONG i; - DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); + DesktopWindow = UserGetDesktopWindow(); List = IntWinListChildren(DesktopWindow); if (List != NULL) @@ -1649,21 +1759,22 @@ UserSendNotifyMessage(DesktopWindow->head.h, Msg, wParam, lParam); for (i = 0; List[i]; i++) { - Ret = UserSendNotifyMessage(List[i], Msg, wParam, lParam); + PWND pwnd = UserGetWindowObject(List[i]); + if (!pwnd) continue; + + if ( pwnd->fnid == FNID_MENU || + pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_SWITCH] ) + continue; + + Ret = UserSendNotifyMessage(List[i], Msg, wParam, lParam); } ExFreePool(List); } } else { - ULONG_PTR lResult = 0; - Ret = co_IntSendMessageWithCallBack( hWnd, - Msg, - wParam, - lParam, - NULL, - 0, - &lResult); + Ret = co_IntSendMessageNoWait( hWnd, Msg, wParam, lParam); + if (-1 == (int) Ret || !Ret) Ret = FALSE; } return Ret; } @@ -2255,7 +2366,7 @@ ULONG i; UINT fuFlags; - pwndDesk = UserGetWindowObject(IntGetDesktopWindow()); + pwndDesk = UserGetDesktopWindow(); List = IntWinListChildren(pwndDesk); if (parm.flags & BSF_QUERY) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -1043,21 +1043,6 @@ /* * @unimplemented */ -DWORD APIENTRY -NtUserSetInternalWindowPos( - HWND hwnd, - UINT showCmd, - LPRECT rect, - LPPOINT pt) -{ - STUB - - return 0; -} - -/* - * @unimplemented - */ BOOL APIENTRY NtUserSetLayeredWindowAttributes(HWND hwnd, COLORREF crKey, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -1261,51 +1261,6 @@ Wnd->spwndPrev = Wnd->spwndNext = NULL; } - -BOOL -FASTCALL -IntGetWindowPlacement(PWND Wnd, WINDOWPLACEMENT *lpwndpl) -{ - POINT Size; - - if (!Wnd) return FALSE; - - if(lpwndpl->length != sizeof(WINDOWPLACEMENT)) - { - return FALSE; - } - - lpwndpl->flags = 0; - if (0 == (Wnd->style & WS_VISIBLE)) - { - lpwndpl->showCmd = SW_HIDE; - } - else if (0 != (Wnd->state2 & WNDS2_MAXIMIZEBUTTONDOWN) || - 0 != (Wnd->style & WS_MAXIMIZE)) - { - lpwndpl->showCmd = SW_MAXIMIZE; - } - else if (0 != (Wnd->style & WS_MINIMIZE)) - { - lpwndpl->showCmd = SW_MINIMIZE; - } - else if (0 != (Wnd->style & WS_VISIBLE)) - { - lpwndpl->showCmd = SW_SHOWNORMAL; - } - - Size.x = Wnd->rcWindow.left; - Size.y = Wnd->rcWindow.top; - WinPosInitInternalPos(Wnd, &Size, - &Wnd->rcWindow); - - lpwndpl->rcNormalPosition = Wnd->InternalPos.NormalRect; - lpwndpl->ptMinPosition = Wnd->InternalPos.IconPos; - lpwndpl->ptMaxPosition = Wnd->InternalPos.MaxPos; - - return TRUE; -} - /* FUNCTIONS *****************************************************************/ @@ -3019,80 +2974,6 @@ } -/* - * @implemented - */ -DWORD APIENTRY -NtUserGetInternalWindowPos( HWND hWnd, - LPRECT rectWnd, - LPPOINT ptIcon) -{ - PWND Window; - DWORD Ret = 0; - BOOL Hit = FALSE; - WINDOWPLACEMENT wndpl; - - UserEnterShared(); - - if (!(Window = UserGetWindowObject(hWnd))) - { - Hit = FALSE; - goto Exit; - } - - _SEH2_TRY - { - if(rectWnd) - { - ProbeForWrite(rectWnd, - sizeof(RECT), - 1); - } - if(ptIcon) - { - ProbeForWrite(ptIcon, - sizeof(POINT), - 1); - } - - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Hit = TRUE; - } - _SEH2_END; - - wndpl.length = sizeof(WINDOWPLACEMENT); - - if (IntGetWindowPlacement(Window, &wndpl) && !Hit) - { - _SEH2_TRY - { - if (rectWnd) - { - RtlCopyMemory(rectWnd, &wndpl.rcNormalPosition , sizeof(RECT)); - } - if (ptIcon) - { - RtlCopyMemory(ptIcon, &wndpl.ptMinPosition, sizeof(POINT)); - } - - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Hit = TRUE; - } - _SEH2_END; - - if (!Hit) Ret = wndpl.showCmd; - } -Exit: - UserLeave(); - return Ret; -} - DWORD APIENTRY NtUserGetListBoxInfo( @@ -3596,82 +3477,6 @@ } /* - * @implemented - */ -BOOL APIENTRY -NtUserGetWindowPlacement(HWND hWnd, - WINDOWPLACEMENT *lpwndpl) -{ - PWND Wnd; - POINT Size; - WINDOWPLACEMENT Safepl; - NTSTATUS Status; - DECLARE_RETURN(BOOL); - - TRACE("Enter NtUserGetWindowPlacement\n"); - UserEnterShared(); - - if (!(Wnd = UserGetWindowObject(hWnd))) - { - RETURN( FALSE); - } - - Status = MmCopyFromCaller(&Safepl, lpwndpl, sizeof(WINDOWPLACEMENT)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - if(Safepl.length != sizeof(WINDOWPLACEMENT)) - { - RETURN( FALSE); - } - - Safepl.flags = 0; - if (0 == (Wnd->style & WS_VISIBLE)) - { - Safepl.showCmd = SW_HIDE; - } - else if ((0 != (Wnd->state2 & WNDS2_MAXIMIZEBUTTONDOWN) || - 0 != (Wnd->style & WS_MAXIMIZE)) && - 0 == (Wnd->style & WS_MINIMIZE)) - { - Safepl.showCmd = SW_SHOWMAXIMIZED; - } - else if (0 != (Wnd->style & WS_MINIMIZE)) - { - Safepl.showCmd = SW_SHOWMINIMIZED; - } - else if (0 != (Wnd->style & WS_VISIBLE)) - { - Safepl.showCmd = SW_SHOWNORMAL; - } - - Size.x = Wnd->rcWindow.left; - Size.y = Wnd->rcWindow.top; - WinPosInitInternalPos(Wnd, &Size, - &Wnd->rcWindow); - - Safepl.rcNormalPosition = Wnd->InternalPos.NormalRect; - Safepl.ptMinPosition = Wnd->InternalPos.IconPos; - Safepl.ptMaxPosition = Wnd->InternalPos.MaxPos; - - Status = MmCopyToCaller(lpwndpl, &Safepl, sizeof(WINDOWPLACEMENT)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - - RETURN( TRUE); - -CLEANUP: - TRACE("Leave NtUserGetWindowPlacement, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - -/* QueryWindow based on KJK::Hyperion and James Tabor. 0 = QWUniqueProcessId @@ -3827,7 +3632,6 @@ END_CLEANUP; } - /* * @implemented */ @@ -3871,57 +3675,6 @@ UserLeave(); END_CLEANUP; } - -/* - * @implemented - */ -HWND APIENTRY -NtUserWindowFromPoint(LONG X, LONG Y) -{ - POINT pt; - HWND Ret; - PWND DesktopWindow = NULL, Window = NULL; - USHORT hittest; - DECLARE_RETURN(HWND); - USER_REFERENCE_ENTRY Ref; - - TRACE("Enter NtUserWindowFromPoint\n"); - UserEnterExclusive(); - - if ((DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()))) - { - //PTHREADINFO pti; - - pt.x = X; - pt.y = Y; - - //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, &Ref); - - //pti = PsGetCurrentThreadWin32Thread(); - Window = co_WinPosWindowFromPoint(DesktopWindow, &pt, &hittest); - - if(Window) - { - Ret = Window->head.h; - - RETURN( Ret); - } - } - - RETURN( NULL); - -CLEANUP: - if (Window) UserDereferenceObject(Window); - if (DesktopWindow) UserDerefObjectCo(DesktopWindow); - - TRACE("Leave NtUserWindowFromPoint, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; - -} - /* * NtUserDefSetText Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -24,6 +24,9 @@ (SWP_AGG_NOPOSCHANGE | SWP_FRAMECHANGED | SWP_HIDEWINDOW | SWP_SHOWWINDOW) #define EMPTYPOINT(pt) ((pt).x == -1 && (pt).y == -1) +#define PLACE_MIN 0x0001 +#define PLACE_MAX 0x0002 +#define PLACE_RECT 0x0004 /* FUNCTIONS *****************************************************************/ @@ -125,6 +128,25 @@ if (WndTo) UserDerefObjectCo(WndTo); } +BOOL +FASTCALL +WinPosShowIconTitle( PWND pWnd, BOOL bShow ) +{ + HICON hIcon; + if (!pWnd->pcls || pWnd->fnid == FNID_DESKTOP) return FALSE; + if (!hIcon) hIcon = pWnd->pcls->hIconSm; + if (!hIcon) hIcon = pWnd->pcls->hIcon; + if (!hIcon) return FALSE; + + if ( bShow ) + { + // FIXME: Draw ICON! + } + else if (hIcon) + return FALSE; + + return FALSE; +} UINT FASTCALL @@ -163,9 +185,13 @@ USER_REFERENCE_ENTRY Ref; UserRefObjectCo(Child, &Ref); - co_WinPosSetWindowPos(Child, 0, x + (xspacing - UserGetSystemMetrics(SM_CXICON)) / 2, - y - yspacing - UserGetSystemMetrics(SM_CYICON) / 2 - , 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + co_WinPosSetWindowPos( Child, + 0, + x + (xspacing - UserGetSystemMetrics(SM_CXICON)) / 2, + y - yspacing - UserGetSystemMetrics(SM_CYICON) / 2, + 0, + 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); UserDerefObjectCo(Child); @@ -186,64 +212,320 @@ static VOID FASTCALL WinPosFindIconPos(PWND Window, POINT *Pos) { - ERR("WinPosFindIconPos FIXME!\n"); + RECT rect, rectParent; + PWND pwndChild, pwndParent; + HRGN hrgn, tmp; + int xspacing, yspacing; + + pwndParent = Window->spwndParent; + if (pwndParent == UserGetDesktopWindow()) + { + /* ReactOS doesn't support iconic minimize to desktop */ + Pos->x = Pos->y = -32000; + return; + } + + IntGetClientRect( pwndParent, &rectParent ); + if ((Pos->x >= rectParent.left) && (Pos->x + UserGetSystemMetrics(SM_CXICON) < rectParent.right) && + (Pos->y >= rectParent.top) && (Pos->y + UserGetSystemMetrics(SM_CYICON) < rectParent.bottom)) + return; /* The icon already has a suitable position */ + + xspacing = UserGetSystemMetrics(SM_CXICONSPACING); + yspacing = UserGetSystemMetrics(SM_CYICONSPACING); + + /* Check if another icon already occupies this spot */ + /* FIXME: this is completely inefficient */ + + hrgn = IntSysCreateRectRgn( 0, 0, 0, 0 ); + tmp = IntSysCreateRectRgn( 0, 0, 0, 0 ); + for (pwndChild = pwndParent->spwndChild; pwndChild; pwndChild = pwndChild->spwndNext) + { + if (pwndChild == Window) continue; + if ((pwndChild->style & (WS_VISIBLE|WS_MINIMIZE)) != (WS_VISIBLE|WS_MINIMIZE)) + continue; + if ( pwndChild->spwndParent ) + { + PWND Parent = pwndChild->spwndParent; + rect.left = rect.top = 0; + rect.right = Parent->rcWindow.right - Parent->rcWindow.left; + rect.bottom = Parent->rcWindow.bottom - Parent->rcWindow.top; + NtGdiSetRectRgn( tmp, rect.left, rect.top, rect.right, rect.bottom ); + NtGdiCombineRgn( hrgn, hrgn, tmp, RGN_OR ); + } + } + GreDeleteObject( tmp ); + + for (rect.bottom = rectParent.bottom; rect.bottom >= yspacing; rect.bottom -= yspacing) + { + for (rect.left = rectParent.left; rect.left <= rectParent.right - xspacing; rect.left += xspacing) + { + rect.right = rect.left + xspacing; + rect.top = rect.bottom - yspacing; + if (!IntRectInRegion( hrgn, &rect )) + { + /* No window was found, so it's OK for us */ + Pos->x = rect.left + (xspacing - UserGetSystemMetrics(SM_CXICON)) / 2; + Pos->y = rect.top + (yspacing - UserGetSystemMetrics(SM_CYICON)) / 2; + GreDeleteObject( hrgn ); + return; + } + } + } + GreDeleteObject( hrgn ); + Pos->x = Pos->y = 0; + return; } VOID FASTCALL -WinPosInitInternalPos(PWND Wnd, POINT *pt, RECTL *RestoreRect) -{ - PWND Parent; - UINT XInc, YInc; +WinPosInitInternalPos(PWND Wnd, RECTL *RestoreRect) +{ + POINT Size; + RECTL Rect = *RestoreRect; + + if (Wnd->spwndParent != UserGetDesktopWindow()) + { + RECTL_vOffsetRect(&Rect, + -Wnd->spwndParent->rcClient.left, + -Wnd->spwndParent->rcClient.top); + } + + Size.x = Rect.left; + Size.y = Rect.top; if (!Wnd->InternalPosInitialized) { - RECTL WorkArea; - - Parent = Wnd->spwndParent; - if(Parent) - { - if(IntIsDesktopWindow(Parent)) - UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); + // FIXME: Use check point Atom.. + Wnd->InternalPos.flags = 0; + Wnd->InternalPos.MaxPos.x = Wnd->InternalPos.MaxPos.y = -1; + Wnd->InternalPos.IconPos.x = Wnd->InternalPos.IconPos.y = -1; + Wnd->InternalPos.NormalRect = Rect; + Wnd->InternalPosInitialized = TRUE; + } + + if (Wnd->style & WS_MINIMIZE) + { + Wnd->InternalPos.IconPos = Size; + Wnd->InternalPos.flags |= WPF_MININIT; + } + else if (Wnd->style & WS_MAXIMIZE) + { + Wnd->InternalPos.flags |= WPF_MAXINIT; + + if ( Wnd->spwndParent == Wnd->head.rpdesk->pDeskInfo->spwnd ) + { + if (Wnd->state & WNDS_MAXIMIZESTOMONITOR) + { + Wnd->InternalPos.flags &= ~WPF_MAXINIT; + Wnd->InternalPos.MaxPos.x = Wnd->InternalPos.MaxPos.y = -1; + } else - WorkArea = Parent->rcClient; + { + RECTL WorkArea; + PMONITOR pmonitor = IntMonitorFromRect(&Rect, MONITOR_DEFAULTTOPRIMARY ); + + // FIXME: support DPI aware, rcWorkDPI/Real etc.. + if (!(Wnd->style & WS_MAXIMIZEBOX) || (Wnd->state & WNDS_HASCAPTION) || pmonitor->cFullScreen) + WorkArea = pmonitor->rcMonitor; + else + WorkArea = pmonitor->rcWork; + + Wnd->InternalPos.MaxPos.x = Rect.left - WorkArea.left; + Wnd->InternalPos.MaxPos.y = Rect.top - WorkArea.top; + TRACE("WinPosIP 2 X %d Y %d\n",Wnd->InternalPos.MaxPos.x,Wnd->InternalPos.MaxPos.y); + } } else - UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); - - Wnd->InternalPos.NormalRect = Wnd->rcWindow; - IntGetWindowBorderMeasures(Wnd, &XInc, &YInc); - Wnd->InternalPos.MaxPos.x = WorkArea.left - XInc; - Wnd->InternalPos.MaxPos.y = WorkArea.top - YInc; - Wnd->InternalPos.IconPos.x = WorkArea.left; - Wnd->InternalPos.IconPos.y = WorkArea.bottom - UserGetSystemMetrics(SM_CYMINIMIZED); - - Wnd->InternalPosInitialized = TRUE; - } - if (Wnd->style & WS_MINIMIZE) - { - Wnd->InternalPos.IconPos = *pt; - } - else if (Wnd->style & WS_MAXIMIZE) - { - Wnd->InternalPos.MaxPos = *pt; - } - else if (RestoreRect != NULL) - { - Wnd->InternalPos.NormalRect = *RestoreRect; - } + Wnd->InternalPos.MaxPos = Size; + } + else + { + Wnd->InternalPos.NormalRect = Rect; + } +} + +BOOL +FASTCALL +IntGetWindowPlacement(PWND Wnd, WINDOWPLACEMENT *lpwndpl) +{ + if (!Wnd) return FALSE; + + if(lpwndpl->length != sizeof(WINDOWPLACEMENT)) + { + return FALSE; + } + + lpwndpl->flags = 0; + + WinPosInitInternalPos(Wnd, &Wnd->rcWindow); + + lpwndpl->showCmd = SW_HIDE; + + if ( Wnd->style & WS_MINIMIZE ) + lpwndpl->showCmd = SW_SHOWMINIMIZED; + else + lpwndpl->showCmd = ( Wnd->style & WS_MAXIMIZE ) ? SW_SHOWMAXIMIZED : SW_SHOWNORMAL ; + + lpwndpl->rcNormalPosition = Wnd->InternalPos.NormalRect; + + if (Wnd->InternalPos.flags & WPF_MININIT) // Return if it was set! + { + lpwndpl->ptMinPosition.x = Wnd->InternalPos.IconPos.x; + lpwndpl->ptMinPosition.y = Wnd->InternalPos.IconPos.y; + } + else + lpwndpl->ptMinPosition.x = lpwndpl->ptMinPosition.y = -1; + + if ( Wnd->InternalPos.flags & WPF_MAXINIT && // Return if set and not maximized to monitor! + !(Wnd->state & WNDS_MAXIMIZESTOMONITOR)) + { + lpwndpl->ptMaxPosition.x = Wnd->InternalPos.MaxPos.x; + lpwndpl->ptMaxPosition.y = Wnd->InternalPos.MaxPos.y; + } + else + lpwndpl->ptMaxPosition.x = lpwndpl->ptMaxPosition.y = -1; + + if ( Wnd->spwndParent == Wnd->head.rpdesk->pDeskInfo->spwnd && + !(Wnd->ExStyle & WS_EX_TOOLWINDOW)) + { + PMONITOR pmonitor = IntMonitorFromRect(&lpwndpl->rcNormalPosition, MONITOR_DEFAULTTOPRIMARY ); + + // FIXME: support DPI aware, rcWorkDPI/Real etc.. + if (Wnd->InternalPos.flags & WPF_MININIT) + { + lpwndpl->ptMinPosition.x -= (pmonitor->rcWork.left - pmonitor->rcMonitor.left); + lpwndpl->ptMinPosition.y -= (pmonitor->rcWork.top - pmonitor->rcMonitor.top); + } + RECTL_vOffsetRect(&lpwndpl->rcNormalPosition, + pmonitor->rcMonitor.left - pmonitor->rcWork.left, + pmonitor->rcMonitor.top - pmonitor->rcWork.top); + } + + if ( Wnd->InternalPos.flags & WPF_RESTORETOMAXIMIZED || Wnd->style & WS_MAXIMIZE ) + lpwndpl->flags |= WPF_RESTORETOMAXIMIZED; + + if ( ((Wnd->style & (WS_CHILD|WS_POPUP)) == WS_CHILD) && Wnd->InternalPos.flags & WPF_SETMINPOSITION) + lpwndpl->flags |= WPF_SETMINPOSITION; + + return TRUE; +} + +/* make sure the specified rect is visible on screen */ +static void make_rect_onscreen( RECT *rect ) +{ + PMONITOR pmonitor = IntMonitorFromRect( rect, MONITOR_DEFAULTTONEAREST ); // Wine uses this. + + // FIXME: support DPI aware, rcWorkDPI/Real etc.. + if (!pmonitor) return; + /* FIXME: map coordinates from rcWork to rcMonitor */ + if (rect->right <= pmonitor->rcWork.left) + { + rect->right += pmonitor->rcWork.left - rect->left; + rect->left = pmonitor->rcWork.left; + } + else if (rect->left >= pmonitor->rcWork.right) + { + rect->left += pmonitor->rcWork.right - rect->right; + rect->right = pmonitor->rcWork.right; + } + if (rect->bottom <= pmonitor->rcWork.top) + { + rect->bottom += pmonitor->rcWork.top - rect->top; + rect->top = pmonitor->rcWork.top; + } + else if (rect->top >= pmonitor->rcWork.bottom) + { + rect->top += pmonitor->rcWork.bottom - rect->bottom; + rect->bottom = pmonitor->rcWork.bottom; + } +} + +/* make sure the specified point is visible on screen */ +static void make_point_onscreen( POINT *pt ) +{ + RECT rect; + + RECTL_vSetRect( &rect, pt->x, pt->y, pt->x + 1, pt->y + 1 ); + make_rect_onscreen( &rect ); + pt->x = rect.left; + pt->y = rect.top; +} + +BOOL FASTCALL +IntSetWindowPlacement(PWND Wnd, WINDOWPLACEMENT *wpl, UINT Flags) +{ + BOOL sAsync; + UINT SWP_Flags; + + if ( Flags & PLACE_MIN) make_point_onscreen( &wpl->ptMinPosition ); + if ( Flags & PLACE_MAX) make_point_onscreen( &wpl->ptMaxPosition ); + if ( Flags & PLACE_RECT) make_rect_onscreen( &wpl->rcNormalPosition ); + + if (!Wnd || Wnd == Wnd->head.rpdesk->pDeskInfo->spwnd) return FALSE; + + if ( Flags & PLACE_MIN ) Wnd->InternalPos.IconPos = wpl->ptMinPosition; + if ( Flags & PLACE_MAX ) Wnd->InternalPos.MaxPos = wpl->ptMaxPosition; + if ( Flags & PLACE_RECT) Wnd->InternalPos.NormalRect = wpl->rcNormalPosition; + + SWP_Flags = SWP_NOZORDER | SWP_NOACTIVATE | ((wpl->flags & WPF_ASYNCWINDOWPLACEMENT) ? SWP_ASYNCWINDOWPOS : 0); + + if (Wnd->style & WS_MINIMIZE ) + { + if (Flags & PLACE_MIN) + { + co_WinPosSetWindowPos(Wnd, HWND_TOP, + wpl->ptMinPosition.x, wpl->ptMinPosition.y, 0, 0, + SWP_NOSIZE | SWP_Flags); + Wnd->InternalPos.flags |= WPF_MININIT; + } + } + else if (Wnd->style & WS_MAXIMIZE ) + { + if (Flags & PLACE_MAX) + { + co_WinPosSetWindowPos(Wnd, HWND_TOP, + wpl->ptMaxPosition.x, wpl->ptMaxPosition.y, 0, 0, + SWP_NOSIZE | SWP_Flags); + Wnd->InternalPos.flags |= WPF_MAXINIT; + } + } + else if (Flags & PLACE_RECT) + { + co_WinPosSetWindowPos(Wnd, HWND_TOP, + wpl->rcNormalPosition.left, wpl->rcNormalPosition.top, + wpl->rcNormalPosition.right - wpl->rcNormalPosition.left, + wpl->rcNormalPosition.bottom - wpl->rcNormalPosition.top, + SWP_Flags); + } + + sAsync = (Wnd->head.pti->MessageQueue != gptiCurrent->MessageQueue && wpl->flags & WPF_ASYNCWINDOWPLACEMENT); + + if ( sAsync ) + co_IntSendMessageNoWait( UserHMGetHandle(Wnd), WM_ASYNC_SHOWWINDOW, wpl->showCmd, 0 ); + else + co_WinPosShowWindow(Wnd, wpl->showCmd); + + if ( Wnd->style & WS_MINIMIZE && !sAsync ) + { + if ( wpl->flags & WPF_SETMINPOSITION ) + Wnd->InternalPos.flags |= WPF_SETMINPOSITION; + + if ( wpl->flags & WPF_RESTORETOMAXIMIZED ) + Wnd->InternalPos.flags |= WPF_RESTORETOMAXIMIZED; + } + return TRUE; } UINT FASTCALL co_WinPosMinMaximize(PWND Wnd, UINT ShowFlag, RECT* NewPos) { POINT Size; + WINDOWPLACEMENT wpl; UINT SwpFlags = 0; ASSERT_REFS_CO(Wnd); - Size.x = Wnd->rcWindow.left; - Size.y = Wnd->rcWindow.top; - WinPosInitInternalPos(Wnd, &Size, &Wnd->rcWindow); + wpl.length = sizeof(wpl); + IntGetWindowPlacement( Wnd, &wpl ); if (co_HOOK_CallHooks( WH_CBT, HCBT_MINMAX, (WPARAM)Wnd->head.h, ShowFlag)) { @@ -252,6 +534,8 @@ } if (Wnd->style & WS_MINIMIZE) { + if (ShowFlag == SW_MINIMIZE) return SWP_NOSIZE | SWP_NOMOVE; + if (!co_IntSendMessageNoWait(Wnd->head.h, WM_QUERYOPEN, 0, 0)) { return(SWP_NOSIZE | SWP_NOMOVE); @@ -264,18 +548,18 @@ { if (Wnd->style & WS_MAXIMIZE) { - Wnd->state2 |= WNDS2_MAXIMIZEBUTTONDOWN; + Wnd->InternalPos.flags |= WPF_RESTORETOMAXIMIZED; Wnd->style &= ~WS_MAXIMIZE; } else { - Wnd->state2 &= ~WNDS2_MAXIMIZEBUTTONDOWN; + Wnd->InternalPos.flags &= ~WPF_RESTORETOMAXIMIZED; } co_UserRedrawWindow(Wnd, NULL, 0, RDW_VALIDATE | RDW_NOERASE | RDW_NOINTERNALPAINT); Wnd->style |= WS_MINIMIZE; - WinPosFindIconPos(Wnd, &Wnd->InternalPos.IconPos); - RECTL_vSetRect(NewPos, Wnd->InternalPos.IconPos.x, Wnd->InternalPos.IconPos.y, + WinPosFindIconPos(Wnd, &wpl.ptMinPosition); + RECTL_vSetRect(NewPos, wpl.ptMinPosition.x, wpl.ptMinPosition.y, UserGetSystemMetrics(SM_CXMINIMIZED), UserGetSystemMetrics(SM_CYMINIMIZED)); SwpFlags |= SWP_NOCOPYBITS; @@ -284,17 +568,16 @@ case SW_MAXIMIZE: { - co_WinPosGetMinMaxInfo(Wnd, &Size, &Wnd->InternalPos.MaxPos, - NULL, NULL); + co_WinPosGetMinMaxInfo(Wnd, &Size, &wpl.ptMaxPosition, NULL, NULL); + TRACE("Maximize: %d,%d %dx%d\n", - Wnd->InternalPos.MaxPos.x, Wnd->InternalPos.MaxPos.y, Size.x, Size.y); + wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, Size.x, Size.y); if (Wnd->style & WS_MINIMIZE) { Wnd->style &= ~WS_MINIMIZE; } Wnd->style |= WS_MAXIMIZE; - RECTL_vSetRect(NewPos, Wnd->InternalPos.MaxPos.x, Wnd->InternalPos.MaxPos.y, - Size.x, Size.y); + RECTL_vSetRect(NewPos, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, Size.x, Size.y); break; } @@ -303,18 +586,17 @@ if (Wnd->style & WS_MINIMIZE) { Wnd->style &= ~WS_MINIMIZE; - if (Wnd->state2 & WNDS2_MAXIMIZEBUTTONDOWN) + if (Wnd->InternalPos.flags & WPF_RESTORETOMAXIMIZED) { - co_WinPosGetMinMaxInfo(Wnd, &Size, - &Wnd->InternalPos.MaxPos, NULL, NULL); + co_WinPosGetMinMaxInfo(Wnd, &Size, &wpl.ptMaxPosition, NULL, NULL); + Wnd->style |= WS_MAXIMIZE; - RECTL_vSetRect(NewPos, Wnd->InternalPos.MaxPos.x, - Wnd->InternalPos.MaxPos.y, Size.x, Size.y); + RECTL_vSetRect(NewPos, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, Size.x, Size.y); break; } else { - *NewPos = Wnd->InternalPos.NormalRect; + *NewPos = wpl.rcNormalPosition; NewPos->right -= NewPos->left; NewPos->bottom -= NewPos->top; break; @@ -327,8 +609,8 @@ return 0; } Wnd->style &= ~WS_MAXIMIZE; - Wnd->state2 &= ~WNDS2_MAXIMIZEBUTTONDOWN; - *NewPos = Wnd->InternalPos.NormalRect; + Wnd->InternalPos.flags &= ~WPF_RESTORETOMAXIMIZED; + *NewPos = wpl.rcNormalPosition; NewPos->right -= NewPos->left; NewPos->bottom -= NewPos->top; break; @@ -455,7 +737,7 @@ MinMax.ptMaxPosition.x = -xinc; MinMax.ptMaxPosition.y = -yinc; - if (!EMPTYPOINT(Window->InternalPos.MaxPos)) MinMax.ptMaxPosition = Window->InternalPos.MaxPos; + if (!EMPTYPOINT(Window->InternalPos.MaxPos)) MinMax.ptMaxPosition = Window->InternalPos.MaxPos; co_IntSendMessage(Window->head.h, WM_GETMINMAXINFO, 0, (LPARAM)&MinMax); @@ -946,6 +1228,7 @@ if ( Window->head.h == IntGetDesktopWindow() && Window->head.pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { + ERR("Desktop Window...\n"); return FALSE; } bPointerInWindow = IntPtInWindow(Window, gpsi->ptCursor.x, gpsi->ptCursor.y); @@ -1337,7 +1620,7 @@ ASSERT_REFS_CO(Window); *ClientRect = *WindowRect; - Result = co_IntSendMessageNoWait(Window->head.h, WM_NCCALCSIZE, FALSE, (LPARAM) ClientRect); + Result = co_IntSendMessage(Window->head.h, WM_NCCALCSIZE, FALSE, (LPARAM) ClientRect); FixClientRect(ClientRect, WindowRect); @@ -1347,7 +1630,11 @@ void FASTCALL co_WinPosSendSizeMove(PWND Wnd) { + RECTL Rect; + LPARAM lParam; WPARAM wParam = SIZE_RESTORED; + + IntGetClientRect(Wnd, &Rect); Wnd->state &= ~WNDS_SENDSIZEMOVEMSGS; if (Wnd->style & WS_MAXIMIZE) @@ -1359,14 +1646,14 @@ wParam = SIZE_MINIMIZED; } - co_IntSendMessageNoWait(Wnd->head.h, WM_SIZE, wParam, - MAKELONG(Wnd->rcClient.right - - Wnd->rcClient.left, - Wnd->rcClient.bottom - - Wnd->rcClient.top)); - co_IntSendMessageNoWait(Wnd->head.h, WM_MOVE, 0, - MAKELONG(Wnd->rcClient.left, - Wnd->rcClient.top)); + co_IntSendMessageNoWait(UserHMGetHandle(Wnd), WM_SIZE, wParam, MAKELONG(Rect.right-Rect.left, Rect.bottom-Rect.top)); + + if (Wnd->spwndParent == UserGetDesktopWindow()) // Wnd->spwndParent->fnid != FNID_DESKTOP ) + lParam = MAKELONG(Wnd->rcClient.left, Wnd->rcClient.top); + else + lParam = MAKELONG(Wnd->rcClient.left-Wnd->spwndParent->rcClient.left, Wnd->rcClient.top-Wnd->spwndParent->rcClient.top); + + co_IntSendMessageNoWait(UserHMGetHandle(Wnd), WM_MOVE, 0, lParam); IntEngWindowChanged(Wnd, WOC_RGN_CLIENT); } @@ -1454,7 +1741,7 @@ break; case SW_SHOWNOACTIVATE: - Wnd->state2 &= ~WNDS2_MAXIMIZEBUTTONDOWN; + Wnd->InternalPos.flags &= ~WPF_RESTORETOMAXIMIZED; //Swp |= SWP_NOZORDER; Swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* Fall through. */ @@ -1734,7 +2021,7 @@ return retvalue; } -BOOL FASTCALL IntEndDeferWindowPosEx( HDWP hdwp ) +BOOL FASTCALL IntEndDeferWindowPosEx( HDWP hdwp, BOOL sAsync ) { PSMWP pDWP; PCVR winpos; @@ -1764,13 +2051,30 @@ UserRefObjectCo(pwnd, &Ref); - res = co_WinPosSetWindowPos( pwnd, - winpos->pos.hwndInsertAfter, - winpos->pos.x, - winpos->pos.y, - winpos->pos.cx, - winpos->pos.cy, - winpos->pos.flags); + if ( sAsync ) + { + LRESULT lRes; + PWINDOWPOS ppos = ExAllocatePoolWithTag(PagedPool, sizeof(WINDOWPOS), USERTAG_SWP); + if ( ppos ) + { + *ppos = winpos->pos; + /* Yes it's a pointer inside Win32k! */ + lRes = co_IntSendMessageNoWait( winpos->pos.hwnd, WM_ASYNC_SETWINDOWPOS, 0, (LPARAM)ppos); + /* We handle this the same way as Event Hooks and Hooks. */ + if ( -1 == (int) lRes ) + { + ExFreePoolWithTag(ppos, USERTAG_SWP); + } + } + } + else + res = co_WinPosSetWindowPos( pwnd, + winpos->pos.hwndInsertAfter, + winpos->pos.x, + winpos->pos.y, + winpos->pos.cx, + winpos->pos.cy, + winpos->pos.flags); UserDerefObjectCo(pwnd); } @@ -1779,6 +2083,7 @@ UserDeleteObject(hdwp, otSMWP); return res; } + /* * @implemented @@ -1856,7 +2161,7 @@ BOOL Ret; TRACE("Enter NtUserEndDeferWindowPosEx\n"); UserEnterExclusive(); - Ret = IntEndDeferWindowPosEx(WinPosInfo); + Ret = IntEndDeferWindowPosEx(WinPosInfo, (BOOL)Unknown1); TRACE("Leave NtUserEndDeferWindowPosEx, ret=%i\n", Ret); UserLeave(); return Ret; @@ -1920,6 +2225,128 @@ return Ret; } +/* + * @implemented + */ +DWORD APIENTRY +NtUserGetInternalWindowPos( HWND hWnd, + LPRECT rectWnd, + LPPOINT ptIcon) +{ + PWND Window; + DWORD Ret = 0; + BOOL Hit = FALSE; + WINDOWPLACEMENT wndpl; + + UserEnterShared(); + + if (!(Window = UserGetWindowObject(hWnd))) + { + Hit = FALSE; + goto Exit; + } + + _SEH2_TRY + { + if(rectWnd) + { + ProbeForWrite(rectWnd, + sizeof(RECT), + 1); + } + if(ptIcon) + { + ProbeForWrite(ptIcon, + sizeof(POINT), + 1); + } + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Hit = TRUE; + } + _SEH2_END; + + wndpl.length = sizeof(WINDOWPLACEMENT); + + if (IntGetWindowPlacement(Window, &wndpl) && !Hit) + { + _SEH2_TRY + { + if (rectWnd) + { + RtlCopyMemory(rectWnd, &wndpl.rcNormalPosition , sizeof(RECT)); + } + if (ptIcon) + { + RtlCopyMemory(ptIcon, &wndpl.ptMinPosition, sizeof(POINT)); + } + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Hit = TRUE; + } + _SEH2_END; + + if (!Hit) Ret = wndpl.showCmd; + } +Exit: + UserLeave(); + return Ret; +} + +/* + * @implemented + */ +BOOL APIENTRY +NtUserGetWindowPlacement(HWND hWnd, + WINDOWPLACEMENT *lpwndpl) +{ + PWND Wnd; + WINDOWPLACEMENT Safepl; + NTSTATUS Status; + DECLARE_RETURN(BOOL); + + TRACE("Enter NtUserGetWindowPlacement\n"); + UserEnterShared(); + + if (!(Wnd = UserGetWindowObject(hWnd))) + { + RETURN( FALSE); + } + + Status = MmCopyFromCaller(&Safepl, lpwndpl, sizeof(WINDOWPLACEMENT)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( FALSE); + } + if(Safepl.length != sizeof(WINDOWPLACEMENT)) + { + RETURN( FALSE); + } + + IntGetWindowPlacement(Wnd, &Safepl); + + Status = MmCopyToCaller(lpwndpl, &Safepl, sizeof(WINDOWPLACEMENT)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( FALSE); + } + + RETURN( TRUE); + +CLEANUP: + TRACE("Leave NtUserGetWindowPlacement, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + DWORD APIENTRY NtUserMinMaximize( @@ -2085,8 +2512,9 @@ if (GreIsHandleValid(hRgn)) { hrgnCopy = IntSysCreateRectRgn(0, 0, 0, 0); - - NtGdiCombineRgn(hrgnCopy, hRgn, 0, RGN_COPY); + /* The coordinates of a window's window region are relative to the + upper-left corner of the window, not the client area of the window. */ + NtGdiCombineRgn( hrgnCopy, hRgn, 0, RGN_COPY); } else RETURN( 0); @@ -2095,9 +2523,6 @@ { hrgnCopy = NULL; } - - /* Delete the region passed by the caller */ - GreDeleteObject(hRgn); if (Window->hrgnClip) { @@ -2119,6 +2544,81 @@ CLEANUP: TRACE("Leave NtUserSetWindowRgn, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} + +/* + * @implemented + */ +DWORD APIENTRY +NtUserSetInternalWindowPos( + HWND hwnd, + UINT showCmd, + LPRECT lprect, + LPPOINT lppt) +{ + WINDOWPLACEMENT wndpl; + UINT flags; + PWND Wnd; + RECT rect; + POINT pt = {0}; + DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; + + TRACE("Enter NtUserSetWindowPlacement\n"); + UserEnterExclusive(); + + if (!(Wnd = UserGetWindowObject(hwnd)) || // FIXME: + Wnd == IntGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP + Wnd == IntGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + { + RETURN( FALSE); + } + + _SEH2_TRY + { + if (lppt) + { + ProbeForRead(lppt, sizeof(POINT), 1); + RtlCopyMemory(&pt, lppt, sizeof(POINT)); + } + if (lprect) + { + ProbeForRead(lprect, sizeof(RECT), 1); + RtlCopyMemory(&rect, lprect, sizeof(RECT)); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(RETURN( FALSE)); + } + _SEH2_END + + wndpl.length = sizeof(wndpl); + wndpl.showCmd = showCmd; + wndpl.flags = flags = 0; + + if ( lppt ) + { + flags |= PLACE_MIN; + wndpl.flags |= WPF_SETMINPOSITION; + wndpl.ptMinPosition = pt; + } + if ( lprect ) + { + flags |= PLACE_RECT; + wndpl.rcNormalPosition = rect; + } + + UserRefObjectCo(Wnd, &Ref); + IntSetWindowPlacement(Wnd, &wndpl, flags); + UserDerefObjectCo(Wnd); + RETURN(TRUE); + +CLEANUP: + TRACE("Leave NtUserSetWindowPlacement, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } @@ -2132,6 +2632,7 @@ { PWND Wnd; WINDOWPLACEMENT Safepl; + UINT Flags; DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; @@ -2162,25 +2663,10 @@ RETURN( FALSE); } + Flags = PLACE_MAX | PLACE_RECT; + if (Safepl.flags & WPF_SETMINPOSITION) Flags |= PLACE_MIN; UserRefObjectCo(Wnd, &Ref); - - if ((Wnd->style & (WS_MAXIMIZE | WS_MINIMIZE)) == 0) - { - co_WinPosSetWindowPos(Wnd, NULL, - Safepl.rcNormalPosition.left, Safepl.rcNormalPosition.top, - Safepl.rcNormalPosition.right - Safepl.rcNormalPosition.left, - Safepl.rcNormalPosition.bottom - Safepl.rcNormalPosition.top, - SWP_NOZORDER | SWP_NOACTIVATE); - } - - /* FIXME - change window status */ - co_WinPosShowWindow(Wnd, Safepl.showCmd); - - Wnd->InternalPosInitialized = TRUE; - Wnd->InternalPos.NormalRect = Safepl.rcNormalPosition; - Wnd->InternalPos.IconPos = Safepl.ptMinPosition; - Wnd->InternalPos.MaxPos = Safepl.ptMaxPosition; - + IntSetWindowPlacement(Wnd, &Safepl, Flags); UserDerefObjectCo(Wnd); RETURN(TRUE); @@ -2191,17 +2677,43 @@ } /* - * @unimplemented + * @implemented */ BOOL APIENTRY NtUserShowWindowAsync(HWND hWnd, LONG nCmdShow) { -#if 0 - STUB - return 0; -#else - return NtUserShowWindow(hWnd, nCmdShow); -#endif + PWND Window; + BOOL ret; + DECLARE_RETURN(BOOL); + USER_REFERENCE_ENTRY Ref; + + TRACE("Enter NtUserShowWindowAsync\n"); + UserEnterExclusive(); + + if (!(Window = UserGetWindowObject(hWnd)) || // FIXME: + Window == IntGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP + Window == IntGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + { + RETURN(FALSE); + } + + if ( nCmdShow > SW_MAX ) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + RETURN(FALSE); + } + + UserRefObjectCo(Window, &Ref); + ret = co_IntSendMessageNoWait( hWnd, WM_ASYNC_SHOWWINDOW, nCmdShow, 0 ); + UserDerefObjectCo(Window); + if (-1 == (int) ret || !ret) ret = FALSE; + + RETURN(ret); + +CLEANUP: + TRACE("Leave NtUserShowWindowAsync, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; } /* @@ -2243,56 +2755,54 @@ END_CLEANUP; } -//// Ugly NtUser API //// -BOOL -APIENTRY -NtUserGetMinMaxInfo( - HWND hWnd, - MINMAXINFO *MinMaxInfo, - BOOL SendMessage) -{ - POINT Size; - PWND Window = NULL; - MINMAXINFO SafeMinMax; - NTSTATUS Status; - BOOL ret; + +/* + * @implemented + */ +HWND APIENTRY +NtUserWindowFromPoint(LONG X, LONG Y) +{ + POINT pt; + HWND Ret; + PWND DesktopWindow = NULL, Window = NULL; + USHORT hittest; + DECLARE_RETURN(HWND); USER_REFERENCE_ENTRY Ref; - TRACE("Enter NtUserGetMinMaxInfo\n"); + TRACE("Enter NtUserWindowFromPoint\n"); UserEnterExclusive(); - if(!(Window = UserGetWindowObject(hWnd))) - { - ret = FALSE; - goto cleanup; - } - - UserRefObjectCo(Window, &Ref); - - Size.x = Window->rcWindow.left; - Size.y = Window->rcWindow.top; - WinPosInitInternalPos(Window, &Size, - &Window->rcWindow); - - co_WinPosGetMinMaxInfo(Window, &SafeMinMax.ptMaxSize, &SafeMinMax.ptMaxPosition, - &SafeMinMax.ptMinTrackSize, &SafeMinMax.ptMaxTrackSize); - - Status = MmCopyToCaller(MinMaxInfo, &SafeMinMax, sizeof(MINMAXINFO)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - ret = FALSE; - goto cleanup; - } - - ret = TRUE; - -cleanup: - if (Window) UserDerefObjectCo(Window); - - TRACE("Leave NtUserGetMinMaxInfo, ret=%i\n", ret); + if ((DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()))) + { + //PTHREADINFO pti; + + pt.x = X; + pt.y = Y; + + //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, &Ref); + + //pti = PsGetCurrentThreadWin32Thread(); + Window = co_WinPosWindowFromPoint(DesktopWindow, &pt, &hittest); + + if(Window) + { + Ret = Window->head.h; + + RETURN( Ret); + } + } + + RETURN( NULL); + +CLEANUP: + if (Window) UserDereferenceObject(Window); + if (DesktopWindow) UserDerefObjectCo(DesktopWindow); + + TRACE("Leave NtUserWindowFromPoint, ret=%i\n",_ret_); UserLeave(); - return ret; + END_CLEANUP; } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -683,7 +683,6 @@ # NtUserBuildMenuItemList 4 NtUserGetMenuDefaultItem 3 -NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 NtUserMenuInfo 3 NtUserMenuItemInfo 5 Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] Sat Dec 10 07:41:56 2011 @@ -683,7 +683,6 @@ SVC_(UserBuildMenuItemList, 4) SVC_(UserGetMenuDefaultItem, 3) -SVC_(UserGetMinMaxInfo, 3) SVC_(UserGetMonitorInfo, 2) SVC_(UserMenuInfo, 3) SVC_(UserMenuItemInfo, 5)

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2011