Ros-dev May 2009

ros-dev@reactos.org

36 participants
34 discussions

Wineconf 2009

by Steven Edwards

Hi, I just wanted to let everyone know that Wineconf 2009 is going to be held in Holland on Nov 6-8th. I am of course planning on attending and Fireball said that he might as well. If any ReactOS developers are interested in going and don't have the resources, speak up and perhaps some of the users and advocates that follow ReactOS development would be willing to contribute $5 or $10 to the Foundation on your behalf. Information (what little there is currently) is here: http://wiki.winehq.org/WineConf2009 The ReactOS foundation Donation page is here http://www.reactos.org/en/foundation_donate.html Also while there has been some heated exchanges with Wine and ReactOS developers in the past, we do get quite a lot in terms of code from them so if your interested in helping them out, you can donate to the Wine Development Fund, which will help pay for Wine developers to attend. The donation link is on the main page of Winehq.org Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

15 years, 3 months

Development plans for May

by Aleksey Bragin

Hi, as we earlier discussed, there is an idea to make 0.3.10 a "hardware- compatibility" release. There is a full list of 0.3.10 milestones bugs linked from our roadmap page, but here are some possible directions for work: - USB support for keyboard and mouse devices. Right now, it needs fixing the rare crash during booting (bug is bugzilled, comment explaining how to solve the problem is attached, some investigation remains), and more testing on real hardware. - Uniata support: it solves many problems at once, such as a stupid 8Gb limit which is a nonsense for a 2009-year operating system, and Serial ATA support, which greatly enhances possible ReactOS usability (along with the first item of this list). I use it in my builds everyday for more than a month, it works very good. Problems: VirtualBox CDROM support (it doesn't recognize it), on my realhardware it also experiences similar problems. Bug is also bugzilled, a lot of debug logs attached, so everyone can participate. - Common NICs support: Cameron is doing great work, testers too. There are some outstanding problems, which you can see from http:// www.reactos.org/wiki/index.php/Supported_Hardware/Network_cards - Sound support: Johannes knows best, but getting any progress with sound by 0.3.10 release date is greatly appreciated. - Videocards support: Olaf performs some tesitng and bugreporting. Third party drivers support is rather weak, http://www.reactos.org/ wiki/index.php/Supported_Hardware/Video_cards , and usually is limited by VMWare's video driver which is being one of the most supported through the ReactOS development history. Besides of that, Olaf is organizing the Golden Apps testing, so that we won't discover regressions occasionally or by the time the release is branched and everyone is awaiting, but instead that's going to happen on a periodical basis, and he's going to manage this process with help of our fellow testers. Target 0.3.10 release date is month from now on - that means, somewhere in the end of May. Certainly, if our goals aren't met, the release is going to be rescheduled and that's it, but, I'd like to ask to concentrate on the above problems first. They are hard to solve when every problem is being approached by one person, but with a common effort they aren't going to be a problem. Any new developers - welcome! There are very definite goals, enough of information, so please feel free to join and help. With the best regards, Aleksey Bragin.

15 years, 6 months

Re: [ros-dev] [ros-diffs] [spetreolle] 41204: ChangeDisplaySettingsA and ChangeDisplaySettingsW should reset dmDriverExtra to 0.

by Ged

This seems very strange -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of spetreolle(a)svn.reactos.org Sent: 30 May 2009 13:23 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [spetreolle] 41204: ChangeDisplaySettingsA and ChangeDisplaySettingsW should reset dmDriverExtra to 0. Author: spetreolle Date: Sat May 30 16:23:20 2009 New Revision: 41204 URL: http://svn.reactos.org/svn/reactos?rev=41204&view=rev Log: ChangeDisplaySettingsA and ChangeDisplaySettingsW should reset dmDriverExtra to 0. Modified: trunk/reactos/dll/win32/user32/misc/display.c Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/disp… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] Sat May 30 16:23:20 2009 @@ -493,7 +493,10 @@ LPDEVMODEA lpDevMode, DWORD dwflags) { - return ChangeDisplaySettingsExA ( NULL, lpDevMode, NULL, dwflags, 0 ); + LONG Status = ChangeDisplaySettingsExA ( NULL, lpDevMode, NULL, dwflags, 0 ); + if(lpDevMode) + lpDevMode->dmDriverExtra = 0; + return Status; } @@ -533,5 +536,8 @@ LPDEVMODEW lpDevMode, DWORD dwflags) { - return ChangeDisplaySettingsExW ( NULL, lpDevMode, NULL, dwflags, 0 ); -} + LONG Status = ChangeDisplaySettingsExW ( NULL, lpDevMode, NULL, dwflags, 0 ); + if(lpDevMode) + lpDevMode->dmDriverExtra = 0; + return Status; +}

15 years, 6 months

Re: [ros-dev] [ros-diffs] [dgorbachev] 41153: Do not assign twice to the same variable.

by Ged

Did you mean to remove IRP_MJ_CLEANUP? -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of dgorbachev(a)svn.reactos.org Sent: 27 May 2009 21:27 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [dgorbachev] 41153: Do not assign twice to the same variable. Author: dgorbachev Date: Thu May 28 00:27:09 2009 New Revision: 41153 URL: http://svn.reactos.org/svn/reactos?rev=41153&view=rev Log: Do not assign twice to the same variable. Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.c trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciide/pciide.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciide/pciide.c [iso-8859-1] Thu May 28 00:27:09 2009 @@ -104,7 +104,7 @@ ControllerProperties->SupportedTransferMode[0][0] = ControllerProperties->SupportedTransferMode[0][1] = ControllerProperties->SupportedTransferMode[1][0] = - ControllerProperties->SupportedTransferMode[1][0] = + ControllerProperties->SupportedTransferMode[1][1] = PIO_MODE0 | PIO_MODE1 | PIO_MODE2 | PIO_MODE3 | PIO_MODE4 | SWDMA_MODE0 | SWDMA_MODE1 | SWDMA_MODE2 | MWDMA_MODE0 | MWDMA_MODE1 | MWDMA_MODE2 | Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Thu May 28 00:27:09 2009 @@ -1082,7 +1082,6 @@ DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)RawDispatch;

15 years, 7 months

Re: [ros-dev] [ros-diffs] [dchapyshev] 41115: - Stubimplement SPI_GETFONTSMOOTHINGTYPE/SPI_SETFONTSMOOTHINGTYPE

by Timo Kreuzer

Ok before you go on in this area, I am currently working on a complete rewrite of sysparams stuff. It should hopefully be ready this week and should fix almost all winetests and additional tests in this area. Regards, Timo dchapyshev(a)svn.reactos.org schrieb: > Author: dchapyshev > Date: Mon May 25 17:08:57 2009 > New Revision: 41115 > > URL: http://svn.reactos.org/svn/reactos?rev=41115&view=rev > Log: > - Stubimplement SPI_GETFONTSMOOTHINGTYPE/SPI_SETFONTSMOOTHINGTYPE > > Modified: > trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Mon May 25 17:08:57 2009 > @@ -699,6 +699,22 @@ > { > ASSERT(pvParam); > *((BOOL*)pvParam) = IntIsFontRenderingEnabled(); > + break; > + } > + case SPI_SETFONTSMOOTHINGTYPE: > + { > + if (*((UINT*)pvParam) == FE_FONTSMOOTHINGCLEARTYPE) > + { > + DPRINT1("ReactOS does not support ClearType smoothing but it is returned TRUE\n"); > + } > + bChanged = TRUE; > + break; > + } > + case SPI_GETFONTSMOOTHINGTYPE: > + { > + /* We do not support ClearType. Only standard smoothing */ > + DPRINT1("ReactOS does not support ClearType smoothing. Returned FE_FONTSMOOTHINGSTANDARD\n"); > + *((UINT*)pvParam) = FE_FONTSMOOTHINGSTANDARD; > break; > } > case SPI_GETICONTITLELOGFONT: > > >

15 years, 7 months

Re: [ros-dev] [ros-diffs] [dchapyshev] 41113: - Disable Wow64* functions for x86 build

by Timo Kreuzer

BTW: there's a way to do this in normal spec files. It would be @ stdcall -arch=x86_64 Wow64EnableWow64FsRedirection(long) i386, x86_64, sparc, alpha and powerpc are supported Multiple architectures can be sperated with comma. Timo dchapyshev(a)svn.reactos.org schrieb: > Author: dchapyshev > Date: Mon May 25 15:01:16 2009 > New Revision: 41113 > > URL: http://svn.reactos.org/svn/reactos?rev=41113&view=rev > Log: > - Disable Wow64* functions for x86 build > > Modified: > trunk/reactos/dll/win32/kernel32/kernel32.pspec > > Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Mon May 25 15:01:16 2009 > @@ -950,9 +950,11 @@ > @ stdcall WaitNamedPipeW (wstr long) > @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) > @ stdcall WinExec(str long) > +#ifdef _M_AMD64 > @ stdcall Wow64EnableWow64FsRedirection(long) > @ stdcall Wow64DisableWow64FsRedirection(long) > @ stdcall Wow64RevertWow64FsRedirection(long) > +#endif > @ stdcall WriteConsoleA(long ptr long ptr ptr) > @ stdcall WriteConsoleInputA(long ptr long ptr) > @ stdcall WriteConsoleInputVDMA(long long long long) > > >

15 years, 7 months

WineHQ vs ReactOS Winetest Comparator.WIRECo

by victor martinez

Hi.. I have had an idea which i want to share with you, so we can discuss if it is interesting or stupid enough. Right now we have a Winetests comparator called TestMan thanks to the efforts of Colin and Lone_Rifle. This script compares the Winetest results of different revisions. It is really helpful to find regressions(Thanks Lone_rifle to be supervising them from time to time :) ). My idea is about creating/adding a new script which compares the winetest results of a ReactOS revision vs the result of the WineHQ winetests. Of course just in those functions/modules that we have full-synced with Wine. Why? Lets imagine that our Wininit:FTP functions are synced(as they are).That means that the code of those functions are the same in Wine and in ReactOS. That means that Bugs present in that code will be present in ReactOS too.These could be called the Expected bugs.ReactOS should fail in these tests since Wine functions are bugged: call them Expected Fails. But sometimes ReactOS is showing more fails than the Expected Fails( in synced code).Why? Well, these synced functions use other deeper functions which arent synced with Wine and which is own ReactOS code.And, of course,which can have Bugs.If these deeper functions arent working properlly then affects the synced functions which uses them and then you will see extra tests failing. Lets give a small example. Wininit:FTP is synced with Wine. WineHQ reports 6 failures : http://test.winehq.org/data/b175a43fb8439a33a686512935597d4c43c19733/wine_w… ReactOS latest rev reports 19 failures: http://79.99.5.181/testman/detail.php?id=141321 These 13 extra failures arent expected.We expect just 6 Expected Fails (which seems to be related with Bugs in Wine code), so this 13 extra failures are related with deeper functions (which are ReactOS own code). So the New Script would check the failures in WineHQ and in ReactOS rev and warn when the number of failures is higher than the number of Expected failures,showing also the differences, so the New Script can easily point our Devs towards ReactOS bugs, helping he "hunting" giving "clues" to them. If my reasoning is wrong,or i am missing something,please tell me. :) How much useful would be this Script?Is it interesting enough for Developing purposes?or Is it a waste of time/efforts? Note: The ie is Bugzilled.It´s curious,since doing a small Timing trick you can have the 6 Expected Fails instead the 19 failures. http://www.reactos.org/bugzilla/show_bug.cgi?id=4533 Vicmarcal _________________________________________________________________ ¡Acelera con la Fórmula 1! Juega y demuestra lo que sabes con MSN Deportes http://msn.es.predictorpro.com/grand-prix/overview.aspx?season=8

15 years, 7 months

Re: [ros-dev] Silverblade

by Olaf Siejka

Well mate, pity to hear that! As you well know, one cannot simply leave this project! So everyone`s gonna be glad to see you lurking around! Best regards

15 years, 7 months

Re: [ros-dev] [ros-diffs] [tkreuzer] 41106: MmGrowKernelStack: go back to the ASSERT and add a fixed check

by Alex Ionescu

Sorry for not replying to e-mails about this -- I was on vacation on a cruise. When I'm back to Montreal I'll write a driver to test if this is correct or not -- but definitely this is better. Best regards, Alex Ionescu On Mon, May 25, 2009 at 1:17 AM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Mon May 25 03:17:48 2009 > New Revision: 41106 > > URL: http://svn.reactos.org/svn/reactos?rev=41106&view=rev > Log: > MmGrowKernelStack: go back to the ASSERT and add a fixed check > > Modified: > trunk/reactos/ntoskrnl/mm/procsup.c > > Modified: trunk/reactos/ntoskrnl/mm/procsup.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Mon May 25 03:17:48 2009 > @@ -258,11 +258,15 @@ > { > PETHREAD Thread = PsGetCurrentThread(); > > - /* Make sure we have reserved space for our grow */ > - if (((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) > > - (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)) > - { > - return STATUS_NO_MEMORY; > + /* Make sure the stack did not overflow */ > + ASSERT(((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) <= > + (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); > + > + /* Check if we have reserved space for our grow */ > + if ((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit + > + KERNEL_STACK_SIZE > KERNEL_LARGE_STACK_SIZE) > + { > + return STATUS_STACK_OVERFLOW; > } > > /* > >

15 years, 7 months

Re: [ros-dev] [ros-diffs] [cwittich] 41093: sync RegQueryValueExA, RegQueryValueA, RegQueryValueW and RegSetValueExA to wine patch by Giannis Adamopoulos <johnyadams at hotmail dot com> See issue #4528 for more details.

by Ged

Is this really right? I haven't checked the call chain in Windows, but 'A' functions generally call their 'W' counterpart to do the work. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cwittich(a)svn.reactos.org Sent: 24 May 2009 09:45 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cwittich] 41093: sync RegQueryValueExA, RegQueryValueA, RegQueryValueW and RegSetValueExA to wine patch by Giannis Adamopoulos <johnyadams at hotmail dot com> See issue #4528 for more details. Author: cwittich Date: Sun May 24 12:45:05 2009 New Revision: 41093 URL: http://svn.reactos.org/svn/reactos?rev=41093&view=rev Log: sync RegQueryValueExA, RegQueryValueA, RegQueryValueW and RegSetValueExA to wine patch by Giannis Adamopoulos <johnyadams at hotmail dot com> See issue #4528 for more details. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sun May 24 12:45:05 2009 @@ -3964,110 +3964,96 @@ * * @implemented */ -LONG WINAPI -RegQueryValueExA(HKEY hKey, - LPCSTR lpValueName, - LPDWORD lpReserved, - LPDWORD lpType, - LPBYTE lpData, - LPDWORD lpcbData) -{ - UNICODE_STRING ValueName; - UNICODE_STRING ValueData; - ANSI_STRING AnsiString; - LONG ErrorCode; - DWORD Length; - DWORD Type; - - TRACE("hKey 0x%X lpValueName %s lpData 0x%X lpcbData %d\n", - hKey, lpValueName, lpData, lpcbData ? *lpcbData : 0); - - if (lpData != NULL && lpcbData == NULL) - { - return ERROR_INVALID_PARAMETER; - } - - if (lpData) - { - ValueData.Length = 0; - ValueData.MaximumLength = (*lpcbData + 1) * sizeof(WCHAR); - ValueData.Buffer = RtlAllocateHeap(ProcessHeap, - 0, - ValueData.MaximumLength); - if (!ValueData.Buffer) - { - return ERROR_OUTOFMEMORY; - } - } - else - { - ValueData.Buffer = NULL; - ValueData.Length = 0; - ValueData.MaximumLength = 0; - - if (lpcbData) - *lpcbData = 0; - } - - RtlCreateUnicodeStringFromAsciiz(&ValueName, - (LPSTR)lpValueName); - - Length = (lpcbData == NULL) ? 0 : *lpcbData * sizeof(WCHAR); - ErrorCode = RegQueryValueExW(hKey, - ValueName.Buffer, - lpReserved, - &Type, - (lpData == NULL) ? NULL : (LPBYTE)ValueData.Buffer, - &Length); - TRACE("ErrorCode %lu\n", ErrorCode); - RtlFreeUnicodeString(&ValueName); - - if (ErrorCode == ERROR_SUCCESS || - ErrorCode == ERROR_MORE_DATA) - { - if (lpType != NULL) - { - *lpType = Type; - } - - if ((Type == REG_SZ) || (Type == REG_MULTI_SZ) || (Type == REG_EXPAND_SZ)) - { - if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL) +LSTATUS WINAPI RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWORD reserved, LPDWORD type, + LPBYTE data, LPDWORD count ) +{ + NTSTATUS status; + ANSI_STRING nameA; + DWORD total_size, datalen = 0; + char buffer[256], *buf_ptr = buffer; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); + + TRACE("(%p,%s,%p,%p,%p,%p=%d)\n", + hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 ); + + if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; + + status = MapDefaultKey( (PHANDLE)&hkey, hkey); + if (!NT_SUCCESS(status)) + { + return RtlNtStatusToDosError(status); + } + + if (count) datalen = *count; + if (!data && count) *count = 0; + + /* this matches Win9x behaviour - NT sets *type to a random value */ + if (type) *type = REG_NONE; + + RtlInitAnsiString( &nameA, name ); + if ((status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString, + &nameA, FALSE ))) + return RtlNtStatusToDosError(status); + + status = NtQueryValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, + KeyValuePartialInformation, buffer, sizeof(buffer), &total_size ); + if (status && status != STATUS_BUFFER_OVERFLOW) goto done; + + /* we need to fetch the contents for a string type even if not requested, + * because we need to compute the length of the ASCII string. */ + if (data || is_string(info->Type)) + { + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW) + { + if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); + if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) { - RtlInitAnsiString(&AnsiString, NULL); - AnsiString.Buffer = (LPSTR)lpData; - AnsiString.MaximumLength = *lpcbData; - ValueData.Length = Length; - ValueData.MaximumLength = ValueData.Length + sizeof(WCHAR); - RtlUnicodeStringToAnsiString(&AnsiString, &ValueData, FALSE); + status = STATUS_NO_MEMORY; + goto done; } - - Length = Length / sizeof(WCHAR); - } - else if (ErrorCode == ERROR_SUCCESS && ValueData.Buffer != NULL) - { - if (*lpcbData < Length) + info = (KEY_VALUE_PARTIAL_INFORMATION *)buf_ptr; + status = NtQueryValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, + KeyValuePartialInformation, buf_ptr, total_size, &total_size ); + } + + if (status) goto done; + + if (is_string(info->Type)) + { + DWORD len; + + RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info_size), + total_size - info_size ); + if (data && len) { - ErrorCode = ERROR_MORE_DATA; + if (len > datalen) status = STATUS_BUFFER_OVERFLOW; + else + { + RtlUnicodeToMultiByteN( (char*)data, len, NULL, (WCHAR *)(buf_ptr + info_size), + total_size - info_size ); + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + if (len < datalen && data[len-1]) data[len] = 0; + } } - else - { - RtlMoveMemory(lpData, ValueData.Buffer, Length); - } - } - - if (lpcbData != NULL) - { - *lpcbData = Length; - } - } - - if (ValueData.Buffer != NULL) - { - RtlFreeHeap(ProcessHeap, 0, ValueData.Buffer); - } - - return ErrorCode; + total_size = len + info_size; + } + else if (data) + { + if (total_size - info_size > datalen) status = STATUS_BUFFER_OVERFLOW; + else memcpy( data, buf_ptr + info_size, total_size - info_size ); + } + } + else status = STATUS_SUCCESS; + + if (type) *type = info->Type; + if (count) *count = total_size - info_size; + + done: + if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); + return RtlNtStatusToDosError(status); } @@ -4098,7 +4084,6 @@ (count && data) ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; - //if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; status = MapDefaultKey(&hkey, hkeyorg); if (!NT_SUCCESS(status)) @@ -4162,93 +4147,27 @@ * * @implemented */ -LONG WINAPI -RegQueryValueA(HKEY hKey, - LPCSTR lpSubKey, - LPSTR lpValue, - PLONG lpcbValue) -{ - WCHAR SubKeyNameBuffer[MAX_PATH+1]; - UNICODE_STRING SubKeyName; - UNICODE_STRING Value; - ANSI_STRING AnsiString; - LONG ValueSize; - LONG ErrorCode; - - TRACE("hKey 0x%X lpSubKey %s lpValue %p lpcbValue %d\n", - hKey, lpSubKey, lpValue, lpcbValue ? *lpcbValue : 0); - - if (lpValue != NULL && - lpcbValue == NULL) - { - return ERROR_INVALID_PARAMETER; - } - - RtlInitUnicodeString(&SubKeyName, - NULL); - RtlInitUnicodeString(&Value, - NULL); - if (lpSubKey != NULL && - strlen(lpSubKey) != 0) - { - RtlInitAnsiString(&AnsiString, - (LPSTR)lpSubKey); - SubKeyName.Buffer = &SubKeyNameBuffer[0]; - SubKeyName.MaximumLength = sizeof(SubKeyNameBuffer); - RtlAnsiStringToUnicodeString(&SubKeyName, - &AnsiString, - FALSE); - } - - if (lpValue != NULL) - { - ValueSize = *lpcbValue * sizeof(WCHAR); - Value.MaximumLength = ValueSize; - Value.Buffer = RtlAllocateHeap(ProcessHeap, - 0, - ValueSize); - if (Value.Buffer == NULL) - { - return ERROR_OUTOFMEMORY; - } - } - else - { - ValueSize = 0; - } - - ErrorCode = RegQueryValueW(hKey, - (LPCWSTR)SubKeyName.Buffer, - Value.Buffer, - &ValueSize); - if (ErrorCode == ERROR_SUCCESS) - { - if (lpValue != NULL) - { - Value.Length = ValueSize; - RtlInitAnsiString(&AnsiString, - NULL); - AnsiString.Buffer = lpValue; - AnsiString.MaximumLength = *lpcbValue; - RtlUnicodeStringToAnsiString(&AnsiString, - &Value, - FALSE); - *lpcbValue = ValueSize; - } - else if (lpcbValue != NULL) - { - *lpcbValue = ValueSize; - } - } - - if (Value.Buffer != NULL) - { - RtlFreeHeap(ProcessHeap, - 0, - Value.Buffer); - } - - return ErrorCode; +LSTATUS WINAPI RegQueryValueA( HKEY hkey, LPCSTR name, LPSTR data, LPLONG count ) +{ + DWORD ret; + HKEY subkey = hkey; + + TRACE("(%p,%s,%p,%d)\n", hkey, debugstr_a(name), data, count ? *count : 0 ); + + if (name && name[0]) + { + if ((ret = RegOpenKeyA( hkey, name, &subkey )) != ERROR_SUCCESS) return ret; + } + ret = RegQueryValueExA( subkey, NULL, NULL, NULL, (LPBYTE)data, (LPDWORD)count ); + if (subkey != hkey) RegCloseKey( subkey ); + if (ret == ERROR_FILE_NOT_FOUND) + { + /* return empty string if default value not found */ + if (data) *data = 0; + if (count) *count = 1; + ret = ERROR_SUCCESS; + } + return ret; } @@ -4257,75 +4176,42 @@ * * @implemented */ -LONG WINAPI -RegQueryValueW(HKEY hKey, - LPCWSTR lpSubKey, - LPWSTR lpValue, - PLONG lpcbValue) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING SubKeyString; - HANDLE KeyHandle; - HANDLE RealKey; - LONG ErrorCode; - BOOL CloseRealKey; - NTSTATUS Status; - - TRACE("hKey 0x%X lpSubKey %S lpValue %p lpcbValue %d\n", - hKey, lpSubKey, lpValue, lpcbValue ? *lpcbValue : 0); - if (hKey == NULL) +LSTATUS WINAPI RegQueryValueW( HKEY hkey, LPCWSTR name, LPWSTR data, LPLONG count ) +{ + DWORD ret; + HKEY subkey = hkey; + + TRACE("(%p,%s,%p,%d)\n", hkey, debugstr_w(name), data, count ? *count : 0 ); + if (hkey == NULL) { return ERROR_INVALID_HANDLE; } - Status = MapDefaultKey(&KeyHandle, - hKey); - if (!NT_SUCCESS(Status)) - { - return RtlNtStatusToDosError(Status); - } - - if (lpSubKey != NULL && - wcslen(lpSubKey) != 0) - { - RtlInitUnicodeString(&SubKeyString, - (LPWSTR)lpSubKey); - InitializeObjectAttributes(&ObjectAttributes, - &SubKeyString, - OBJ_CASE_INSENSITIVE, - KeyHandle, - NULL); - Status = NtOpenKey(&RealKey, - KEY_QUERY_VALUE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - ErrorCode = RtlNtStatusToDosError(Status); - goto Cleanup; - } - - CloseRealKey = TRUE; - } - else - { - RealKey = hKey; - CloseRealKey = FALSE; - } - - ErrorCode = RegQueryValueExW(RealKey, - NULL, - NULL, - NULL, - (LPBYTE)lpValue, - (LPDWORD)lpcbValue); - if (CloseRealKey) - { - NtClose(RealKey); - } - -Cleanup: - ClosePredefKey(KeyHandle); - - return ErrorCode; + if (name && name[0]) + { + ret = RegOpenKeyW( hkey, name, &subkey); + if (ret != ERROR_SUCCESS) + { + return ret; + } + } + + ret = RegQueryValueExW( subkey, NULL, NULL, NULL, (LPBYTE)data, (LPDWORD)count ); + + if (subkey != hkey) + { + RegCloseKey( subkey ); + } + + if (ret == ERROR_FILE_NOT_FOUND) + { + /* return empty string if default value not found */ + if (data) + *data = 0; + if (count) + *count = sizeof(WCHAR); + ret = ERROR_SUCCESS; + } + return ret; } @@ -4806,86 +4692,43 @@ * * @implemented */ -LONG WINAPI -RegSetValueExA(HKEY hKey, - LPCSTR lpValueName, - DWORD Reserved, - DWORD dwType, - CONST BYTE* lpData, - DWORD cbData) -{ - UNICODE_STRING ValueName; - LPWSTR pValueName; - ANSI_STRING AnsiString; - UNICODE_STRING Data; - LONG ErrorCode; - LPBYTE pData; - DWORD DataSize; - - if (lpValueName != NULL && - strlen(lpValueName) != 0) - { - RtlCreateUnicodeStringFromAsciiz(&ValueName, - (PSTR)lpValueName); - } - else - { - ValueName.Buffer = NULL; - } - - pValueName = (LPWSTR)ValueName.Buffer; - - if (((dwType == REG_SZ) || - (dwType == REG_MULTI_SZ) || - (dwType == REG_EXPAND_SZ)) && - (cbData != 0)) - { - /* NT adds one if the caller forgot the NULL-termination character */ - if (lpData[cbData - 1] != '\0') - { - cbData++; - } - - RtlInitAnsiString(&AnsiString, - NULL); - AnsiString.Buffer = (PSTR)lpData; - AnsiString.Length = cbData - 1; - AnsiString.MaximumLength = cbData; - RtlAnsiStringToUnicodeString(&Data, - &AnsiString, - TRUE); - pData = (LPBYTE)Data.Buffer; - DataSize = cbData * sizeof(WCHAR); - } - else - { - RtlInitUnicodeString(&Data, - NULL); - pData = (LPBYTE)lpData; - DataSize = cbData; - } - - ErrorCode = RegSetValueExW(hKey, - pValueName, - Reserved, - dwType, - pData, - DataSize); - if (pValueName != NULL) - { - RtlFreeHeap(ProcessHeap, - 0, - ValueName.Buffer); - } - - if (Data.Buffer != NULL) - { - RtlFreeHeap(ProcessHeap, - 0, - Data.Buffer); - } - - return ErrorCode; +LSTATUS WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, + CONST BYTE *data, DWORD count ) +{ + ANSI_STRING nameA; + WCHAR *dataW = NULL; + NTSTATUS status; + + if (count && is_string(type)) + { + /* if user forgot to count terminating null, add it (yes NT does this) */ + if (data[count-1] && !data[count]) count++; + } + + status = MapDefaultKey( (PHANDLE)&hkey, hkey); + if (!NT_SUCCESS(status)) + { + return RtlNtStatusToDosError(status); + } + + if (is_string( type )) /* need to convert to Unicode */ + { + DWORD lenW; + RtlMultiByteToUnicodeSize( &lenW, (const char *)data, count ); + if (!(dataW = HeapAlloc( GetProcessHeap(), 0, lenW ))) return ERROR_OUTOFMEMORY; + RtlMultiByteToUnicodeN( dataW, lenW, NULL, (const char *)data, count ); + count = lenW; + data = (BYTE *)dataW; + } + + RtlInitAnsiString( &nameA, name ); + if (!(status = RtlAnsiStringToUnicodeString( &NtCurrentTeb()->StaticUnicodeString, + &nameA, FALSE ))) + { + status = NtSetValueKey( hkey, &NtCurrentTeb()->StaticUnicodeString, 0, type, (PVOID)data, count ); + } + HeapFree( GetProcessHeap(), 0, dataW ); + return RtlNtStatusToDosError( status ); }

15 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev May 2009