Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 48005: [LIB/RTL] - Get rid of some unneeded assignment, cast and a variable.
by akhaldi＠svn.reactos.org 12 Jul '10

12 Jul '10

Author: akhaldi Date: Mon Jul 12 14:50:31 2010 New Revision: 48005 URL: http://svn.reactos.org/svn/reactos?rev=48005&view=rev Log: [LIB/RTL] - Get rid of some unneeded assignment, cast and a variable. Modified: trunk/reactos/lib/rtl/critical.c trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=480… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Mon Jul 12 14:50:31 2010 @@ -65,9 +65,9 @@ } DPRINT("Created Event: %p \n", hNewEvent); - if ((hEvent = (HANDLE)_InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, - (PVOID)hNewEvent, - 0))) { + if (_InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, + (PVOID)hNewEvent, + 0)) { /* Some just created an event */ DPRINT("Closing already created event: %p\n", hNewEvent); Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=48005&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Mon Jul 12 14:50:31 2010 @@ -394,7 +394,6 @@ ULONG size) { ULONG reqsize = 0, mark = 0, dep = 0, deplen; - RTL_PATH_TYPE type; LPWSTR ins_str = NULL; LPCWSTR ptr; const UNICODE_STRING* cd; @@ -409,7 +408,7 @@ //cd = &((PCURDIR)&NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->CurrentDirectory.DosPath)->DosPath; cd = &NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->CurrentDirectory.DosPath; - switch (type = RtlDetermineDosPathNameType_U(name)) + switch (RtlDetermineDosPathNameType_U(name)) { case RtlPathTypeUncAbsolute: /* \\foo */ ptr = skip_unc_prefix( name );

1 0

[dreimer] 48004: Reapply the idea of r44368. Remove the "kernel32" library reference in all .rbuild files of user-mode modules, because this one is already added by "mingw_common". Add SuperFinder XT to rapps.
by dreimer＠svn.reactos.org 12 Jul '10

12 Jul '10

Author: dreimer Date: Mon Jul 12 10:35:11 2010 New Revision: 48004 URL: http://svn.reactos.org/svn/reactos?rev=48004&view=rev Log: Reapply the idea of r44368. Remove the "kernel32" library reference in all .rbuild files of user-mode modules, because this one is already added by "mingw_common". Add SuperFinder XT to rapps. Added: trunk/reactos/base/applications/rapps/rapps/superfinder.txt (with props) Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rbuild trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild trunk/reactos/dll/directx/msvidctl/msvidctl.rbuild trunk/reactos/dll/win32/batt/batt.rbuild trunk/reactos/dll/win32/ole32/ole32.rbuild Added: trunk/reactos/base/applications/rapps/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/superfinder.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/superfinder.txt [iso-8859-1] Mon Jul 12 10:35:11 2010 @@ -1,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Super Finder XT +Version = 1.6.2.1 +Licence = Freeware +Description = A fast and feature rich search Aapplication. +Size = 4.5MB +Category = 12 +URLSite = http://fsl.sytes.net/ssearchxt.html +URLDownload = http://fsl.sytes.net/releases/setup_SuperFinderXT.exe +CDPath = none + +[Section.0407] +Description = Eine schnelle und effektive Suchanwendung. Propchange: trunk/reactos/base/applications/rapps/rapps/superfinder.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/liccpa/liccpa.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/liccpa.rbui… ============================================================================== --- trunk/reactos/dll/cpl/liccpa/liccpa.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/liccpa/liccpa.rbuild [iso-8859-1] Mon Jul 12 10:35:11 2010 @@ -3,7 +3,6 @@ <module name="liccpa" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_LICCPA}" installbase="system32" installname="liccpa.cpl" unicode="yes"> <importlibrary definition="liccpa.def" /> <include base="liccpa">.</include> - <library>kernel32</library> <library>advapi32</library> <library>user32</library> <library>comctl32</library> Modified: trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/bdaplgin/bdapl… ============================================================================== --- trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/bdaplgin/bdaplgin.rbuild [iso-8859-1] Mon Jul 12 10:35:11 2010 @@ -6,7 +6,6 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <include base="bdaplgin">.</include> <library>ntdll</library> - <library>kernel32</library> <library>advapi32</library> <library>ole32</library> <library>advapi32</library> Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild [iso-8859-1] Mon Jul 12 10:35:11 2010 @@ -6,7 +6,6 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <include base="ksproxy">.</include> <library>ntdll</library> - <library>kernel32</library> <library>advapi32</library> <library>ole32</library> <library>setupapi</library> Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/msdvbn… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild [iso-8859-1] Mon Jul 12 10:35:11 2010 @@ -6,7 +6,6 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <include base="msdvbnp">.</include> <library>ntdll</library> - <library>kernel32</library> <library>advapi32</library> <library>ole32</library> <library>advapi32</library> Modified: trunk/reactos/dll/directx/msvidctl/msvidctl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msvidctl/msvid… ============================================================================== --- trunk/reactos/dll/directx/msvidctl/msvidctl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msvidctl/msvidctl.rbuild [iso-8859-1] Mon Jul 12 10:35:11 2010 @@ -6,7 +6,6 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <include base="msvidctl">.</include> <library>ntdll</library> - <library>kernel32</library> <library>advapi32</library> <library>ole32</library> <library>advapi32</library> Modified: trunk/reactos/dll/win32/batt/batt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/batt.rbuild… ============================================================================== --- trunk/reactos/dll/win32/batt/batt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/batt/batt.rbuild [iso-8859-1] Mon Jul 12 10:35:11 2010 @@ -2,7 +2,6 @@ <importlibrary definition="batt.spec" /> <include base="batt">.</include> <library>setupapi</library> - <library>kernel32</library> <library>ntdll</library> <file>batt.c</file> <file>batt.rc</file> Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Mon Jul 12 10:35:11 2010 @@ -20,7 +20,6 @@ <library>ole32_irot_client</library> <library>ole32_proxy</library> <library>rpcrt4</library> - <library>kernel32</library> <library>ntdll</library> <library>uuid</library> <library>pseh</library>

1 0

[gadamopoulos] 48003: [kernel32] -Revert r42201 [user32] -Fix atom usage. Create a local copy of atom.c that calls the wineserver to manage user atoms. Wine code assumes that kernel32 will use the same global atom table with win32k (and this is how windows really work) However reactos doesn't do it and as a result some functions use atoms created by kernel32 and some created by win32k. To solve this issue, user32 parts that use kernel32 atoms will use kernel32 atom functions and the parts that u
by gadamopoulos＠svn.reactos.org 12 Jul '10

12 Jul '10

Author: gadamopoulos Date: Mon Jul 12 10:10:10 2010 New Revision: 48003 URL: http://svn.reactos.org/svn/reactos?rev=48003&view=rev Log: [kernel32] -Revert r42201 [user32] -Fix atom usage. Create a local copy of atom.c that calls the wineserver to manage user atoms. Wine code assumes that kernel32 will use the same global atom table with win32k (and this is how windows really work) However reactos doesn't do it and as a result some functions use atoms created by kernel32 and some created by win32k. To solve this issue, user32 parts that use kernel32 atoms will use kernel32 atom functions and the parts that use win32k atoms will use the local user atom functions Added: branches/arwinss/reactos/dll/win32/user32/atom.c - copied, changed from r47977, branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c Modified: branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c branches/arwinss/reactos/dll/win32/user32/class.c branches/arwinss/reactos/dll/win32/user32/message.c branches/arwinss/reactos/dll/win32/user32/property.c branches/arwinss/reactos/dll/win32/user32/spy.c branches/arwinss/reactos/dll/win32/user32/user32.rbuild branches/arwinss/reactos/dll/win32/user32/user_private.h Modified: branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… ============================================================================== --- branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Mon Jul 12 10:10:10 2010 @@ -10,7 +10,6 @@ <library>pseh</library> <library>normalize</library> <library>ntdll</library> - <library>win32ksys</library> <define name="_KERNEL32_" /> <redefine name="_WIN32_WINNT">0x0600</redefine> <dependency>errcodes</dependency> Modified: branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… ============================================================================== --- branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c [iso-8859-1] Mon Jul 12 10:10:10 2010 @@ -8,7 +8,6 @@ /* INCLUDES ******************************************************************/ #include <k32.h> -#include "wine/server.h" #define NDEBUG #include <debug.h> @@ -16,206 +15,6 @@ /* GLOBALS *******************************************************************/ PRTL_ATOM_TABLE BaseLocalAtomTable = NULL; - -/* DEAR GOD, FORGIVE ME ******************************************************/ - -#define MAX_ATOM_LEN 255 - -/****************************************************************** - * is_integral_atom - * Returns STATUS_SUCCESS if integral atom and 'pAtom' is filled - * STATUS_INVALID_PARAMETER if 'atomstr' is too long - * STATUS_MORE_ENTRIES otherwise - */ -static NTSTATUS is_integral_atom( LPCWSTR atomstr, size_t len, RTL_ATOM* pAtom ) -{ - RTL_ATOM atom; - - if (HIWORD( atomstr )) - { - const WCHAR* ptr = atomstr; - if (!len) return STATUS_OBJECT_NAME_INVALID; - - if (*ptr++ == '#') - { - atom = 0; - while (ptr < atomstr + len && *ptr >= '0' && *ptr <= '9') - { - atom = atom * 10 + *ptr++ - '0'; - } - if (ptr > atomstr + 1 && ptr == atomstr + len) goto done; - } - if (len > MAX_ATOM_LEN) return STATUS_INVALID_PARAMETER; - return STATUS_MORE_ENTRIES; - } - else atom = LOWORD( atomstr ); -done: - if (!atom || atom >= MAXINTATOM) return STATUS_INVALID_PARAMETER; - *pAtom = atom; - return STATUS_SUCCESS; -} - -/****************************************************************** - * integral_atom_name (internal) - * - * Helper for fetching integral (local/global) atoms names. - */ -static ULONG integral_atom_name(WCHAR* buffer, ULONG len, RTL_ATOM atom) -{ - static const WCHAR fmt[] = {'#','%','u',0}; - WCHAR tmp[16]; - int ret; - - ret = swprintf( tmp, fmt, atom ); - if (!len) return ret * sizeof(WCHAR); - if (len <= ret) ret = len - 1; - memcpy( buffer, tmp, ret * sizeof(WCHAR) ); - buffer[ret] = 0; - return ret * sizeof(WCHAR); -} - -/************************************************* - * Global handle table management - *************************************************/ - -/****************************************************************** - * NtAddAtom (NTDLL.@) - */ -NTSTATUS WINAPI WineNtAddAtom( const WCHAR* name, ULONG length, RTL_ATOM* atom ) -{ - NTSTATUS status; - - status = is_integral_atom( name, length / sizeof(WCHAR), atom ); - if (status == STATUS_MORE_ENTRIES) - { - SERVER_START_REQ( add_atom ) - { - wine_server_add_data( req, name, length ); - req->table = 0; - status = wine_server_call( req ); - *atom = reply->atom; - } - SERVER_END_REQ; - } - //TRACE( "%s -> %x\n", - // debugstr_wn(name, length/sizeof(WCHAR)), status == STATUS_SUCCESS ? *atom : 0 ); - return status; -} - -/****************************************************************** - * NtDeleteAtom (NTDLL.@) - */ -NTSTATUS WINAPI WineNtDeleteAtom(RTL_ATOM atom) -{ - NTSTATUS status; - - SERVER_START_REQ( delete_atom ) - { - req->atom = atom; - req->table = 0; - status = wine_server_call( req ); - } - SERVER_END_REQ; - return status; -} - -/****************************************************************** - * NtFindAtom (NTDLL.@) - */ -NTSTATUS WINAPI WineNtFindAtom( const WCHAR* name, ULONG length, RTL_ATOM* atom ) -{ - NTSTATUS status; - - status = is_integral_atom( name, length / sizeof(WCHAR), atom ); - if (status == STATUS_MORE_ENTRIES) - { - SERVER_START_REQ( find_atom ) - { - wine_server_add_data( req, name, length ); - req->table = 0; - status = wine_server_call( req ); - *atom = reply->atom; - } - SERVER_END_REQ; - } - //TRACE( "%s -> %x\n", - // debugstr_wn(name, length/sizeof(WCHAR)), status == STATUS_SUCCESS ? *atom : 0 ); - return status; -} - -/****************************************************************** - * NtQueryInformationAtom (NTDLL.@) - */ -NTSTATUS WINAPI WineNtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS class, - PVOID ptr, ULONG size, PULONG psize ) -{ - NTSTATUS status; - - switch (class) - { - case AtomBasicInformation: - { - ULONG name_len; - ATOM_BASIC_INFORMATION* abi = ptr; - - if (size < sizeof(ATOM_BASIC_INFORMATION)) - return STATUS_INVALID_PARAMETER; - name_len = size - sizeof(ATOM_BASIC_INFORMATION); - - if (atom < MAXINTATOM) - { - if (atom) - { - abi->NameLength = integral_atom_name( abi->Name, name_len, atom ); - status = (name_len) ? STATUS_SUCCESS : STATUS_BUFFER_TOO_SMALL; - //abi->ReferenceCount = 1; - //abi->Pinned = 1; - } - else status = STATUS_INVALID_PARAMETER; - } - else - { - SERVER_START_REQ( get_atom_information ) - { - req->atom = atom; - req->table = 0; - if (name_len) wine_server_set_reply( req, abi->Name, name_len ); - status = wine_server_call( req ); - if (status == STATUS_SUCCESS) - { - name_len = wine_server_reply_size( reply ); - if (name_len) - { - abi->NameLength = name_len; - abi->Name[name_len / sizeof(WCHAR)] = '\0'; - } - else - { - name_len = reply->total; - abi->NameLength = name_len; - status = STATUS_BUFFER_TOO_SMALL; - } - //abi->ReferenceCount = reply->count; - //abi->Pinned = reply->pinned; - } - else name_len = 0; - } - SERVER_END_REQ; - } - //TRACE( "%x -> %s (%u)\n", - // atom, debugstr_wn(abi->Name, abi->NameLength / sizeof(WCHAR)), - // status ); - if (psize) - *psize = sizeof(ATOM_BASIC_INFORMATION) + name_len; - } - break; - default: - DPRINT1( "Unsupported class %u\n", class ); - status = STATUS_INVALID_INFO_CLASS; - break; - } - return status; -} /* FUNCTIONS *****************************************************************/ @@ -239,11 +38,6 @@ UNICODE_STRING UnicodeString; PUNICODE_STRING AtomNameString; ATOM Atom = INVALID_ATOM; - - if (Unicode) - DPRINT("InternalAddAtom local %d name %S\n", Local, AtomName); - else - DPRINT("InternalAddAtom local %d name %s\n", Local, AtomName); /* Check if it's an integer atom */ if ((ULONG_PTR)AtomName <= 0xFFFF) @@ -315,7 +109,7 @@ else { /* Do a global add */ - Status = WineNtAddAtom(AtomNameString->Buffer, + Status = NtAddAtom(AtomNameString->Buffer, AtomNameString->Length, &Atom); } @@ -345,11 +139,6 @@ UNICODE_STRING UnicodeString; PUNICODE_STRING AtomNameString; ATOM Atom = INVALID_ATOM; - - if (Unicode) - DPRINT("InternalFindAtom local %d name %S\n", Local, AtomName); - else - DPRINT("InternalFindAtom local %d name %s\n", Local, AtomName); /* Check if it's an integer atom */ if ((ULONG_PTR)AtomName <= 0xFFFF) @@ -431,7 +220,7 @@ else { /* Call the global function */ - Status = WineNtFindAtom(AtomNameString->Buffer, + Status = NtFindAtom(AtomNameString->Buffer, AtomNameString->Length, &Atom); } @@ -458,8 +247,6 @@ { NTSTATUS Status; - DPRINT("InternalDeleteAtom local %d atom %x\n", Local, Atom); - /* Validate it */ if (Atom >= MAXINTATOM) { @@ -472,7 +259,7 @@ else { /* Delete it globall */ - Status = WineNtDeleteAtom(Atom); + Status = NtDeleteAtom(Atom); } /* Check for success */ @@ -506,8 +293,6 @@ ULONG AtomNameLength; PATOM_BASIC_INFORMATION AtomInfo; - DPRINT("InternalGetAtomName local %d atom %x size %x\n", Local, Atom, Size); - /* Normalize the size as not to overflow */ if (!Unicode && Size > 0x7000) Size = 0x7000; @@ -567,7 +352,7 @@ } /* Query the name */ - Status = WineNtQueryInformationAtom(Atom, + Status = NtQueryInformationAtom(Atom, AtomBasicInformation, AtomInfo, AtomInfoLength, @@ -635,11 +420,6 @@ SetLastErrorByStatus(Status); } - if (Unicode) - DPRINT("InternalGetAtomName name %S\n", AtomName); - else - DPRINT("InternalGetAtomName name %s\n", AtomName); - /* Return length */ return RetVal; } Copied: branches/arwinss/reactos/dll/win32/user32/atom.c (from r47977, branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/kernel32/misc/atom.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/atom.c [iso-8859-1] Mon Jul 12 10:10:10 2010 @@ -7,15 +7,18 @@ */ /* INCLUDES ******************************************************************/ -#include <k32.h> + + +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/ntndk.h> +#include "wine/debug.h" #include "wine/server.h" -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -PRTL_ATOM_TABLE BaseLocalAtomTable = NULL; +WINE_DEFAULT_DEBUG_CHANNEL(useratom); + +#define SetLastErrorByStatus(__S__) \ + ((void)SetLastError(RtlNtStatusToDosError(__S__))) /* DEAR GOD, FORGIVE ME ******************************************************/ @@ -58,7 +61,7 @@ /****************************************************************** * integral_atom_name (internal) * - * Helper for fetching integral (local/global) atoms names. + * Helper for fetching integral atoms names. */ static ULONG integral_atom_name(WCHAR* buffer, ULONG len, RTL_ATOM atom) { @@ -210,7 +213,7 @@ } break; default: - DPRINT1( "Unsupported class %u\n", class ); + ERR( "Unsupported class %u\n", class ); status = STATUS_INVALID_INFO_CLASS; break; } @@ -219,19 +222,9 @@ /* FUNCTIONS *****************************************************************/ -PVOID +ATOM WINAPI -InternalInitAtomTable(VOID) -{ - /* Create or return the local table */ - if (!BaseLocalAtomTable) RtlCreateAtomTable(0, &BaseLocalAtomTable); - return BaseLocalAtomTable; -} - -ATOM -WINAPI -InternalAddAtom(BOOLEAN Local, - BOOLEAN Unicode, +InternalAddAtom(BOOLEAN Unicode, LPCSTR AtomName) { NTSTATUS Status; @@ -241,9 +234,9 @@ ATOM Atom = INVALID_ATOM; if (Unicode) - DPRINT("InternalAddAtom local %d name %S\n", Local, AtomName); + WARN("InternalAddAtom name %S\n", AtomName); else - DPRINT("InternalAddAtom local %d name %s\n", Local, AtomName); + WARN("InternalAddAtom name %s\n", AtomName); /* Check if it's an integer atom */ if ((ULONG_PTR)AtomName <= 0xFFFF) @@ -304,21 +297,10 @@ } } - /* Check if we're doing local add */ - if (Local) - { - /* Do a local add */ - Status = RtlAddAtomToAtomTable(InternalInitAtomTable(), - AtomNameString->Buffer, - &Atom); - } - else - { - /* Do a global add */ - Status = WineNtAddAtom(AtomNameString->Buffer, - AtomNameString->Length, - &Atom); - } + /* Do a global add */ + Status = WineNtAddAtom(AtomNameString->Buffer, + AtomNameString->Length, + &Atom); /* Check for failure */ if (!NT_SUCCESS(Status)) SetLastErrorByStatus(Status); @@ -336,9 +318,7 @@ ATOM WINAPI -InternalFindAtom(BOOLEAN Local, - BOOLEAN Unicode, - LPCSTR AtomName) +InternalFindAtom(BOOLEAN Unicode,LPCSTR AtomName) { NTSTATUS Status; ANSI_STRING AnsiString; @@ -347,9 +327,9 @@ ATOM Atom = INVALID_ATOM; if (Unicode) - DPRINT("InternalFindAtom local %d name %S\n", Local, AtomName); + WARN("InternalFindAtom name %S\n", AtomName); else - DPRINT("InternalFindAtom local %d name %s\n", Local, AtomName); + WARN("InternalFindAtom name %s\n", AtomName); /* Check if it's an integer atom */ if ((ULONG_PTR)AtomName <= 0xFFFF) @@ -360,7 +340,7 @@ { /* Fail, atom number too large */ SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - DPRINT1("Invalid atom\n"); + ERR("Invalid atom\n"); } /* Return it */ @@ -405,37 +385,27 @@ /* Check for failure */ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed\n"); + ERR("Failed\n"); SetLastErrorByStatus(Status); return Atom; } } - /* Check if we're doing local lookup */ - if (Local) - { - /* Do a local lookup */ - Status = RtlLookupAtomInAtomTable(InternalInitAtomTable(), - AtomNameString->Buffer, - &Atom); + /* Do a global search */ + if (!AtomNameString->Length) + { + /* This is illegal in win32 */ + ERR("No name given\n"); + Status = STATUS_OBJECT_NAME_NOT_FOUND; } else { - /* Do a global search */ - if (!AtomNameString->Length) - { - /* This is illegal in win32 */ - DPRINT1("No name given\n"); - Status = STATUS_OBJECT_NAME_NOT_FOUND; - } - else - { - /* Call the global function */ - Status = WineNtFindAtom(AtomNameString->Buffer, - AtomNameString->Length, - &Atom); - } - } + /* Call the global function */ + Status = WineNtFindAtom(AtomNameString->Buffer, + AtomNameString->Length, + &Atom); + } + /* Check for failure */ if (!NT_SUCCESS(Status)) SetLastErrorByStatus(Status); @@ -453,27 +423,17 @@ ATOM WINAPI -InternalDeleteAtom(BOOLEAN Local, - ATOM Atom) +InternalDeleteAtom(ATOM Atom) { NTSTATUS Status; - DPRINT("InternalDeleteAtom local %d atom %x\n", Local, Atom); + WARN("InternalDeleteAtom atom %x\n", Atom); /* Validate it */ if (Atom >= MAXINTATOM) { - /* Check if it's a local delete */ - if (Local) - { - /* Delete it locally */ - Status = RtlDeleteAtomFromAtomTable(InternalInitAtomTable(), Atom); - } - else - { - /* Delete it globall */ - Status = WineNtDeleteAtom(Atom); - } + /* Delete it globall */ + Status = WineNtDeleteAtom(Atom); /* Check for success */ if (!NT_SUCCESS(Status)) @@ -490,8 +450,7 @@ UINT WINAPI -InternalGetAtomName(BOOLEAN Local, - BOOLEAN Unicode, +InternalGetAtomName(BOOLEAN Unicode, ATOM Atom, LPSTR AtomName, DWORD Size) @@ -506,7 +465,7 @@ ULONG AtomNameLength; PATOM_BASIC_INFORMATION AtomInfo; - DPRINT("InternalGetAtomName local %d atom %x size %x\n", Local, Atom, Size); + WARN("InternalGetAtomName atom %x size %x\n", Atom, Size); /* Normalize the size as not to overflow */ if (!Unicode && Size > 0x7000) Size = 0x7000; @@ -523,62 +482,32 @@ return 0; } - /* Check if this is a global query */ - if (Local) - { - /* Set the query length */ - AtomNameLength = Size * sizeof(WCHAR); - - /* If it's unicode, just keep the name */ - if (Unicode) - { - AtomNameString = (PWSTR)AtomName; - } - else - { - /* Allocate memory for the ansi buffer */ - TempBuffer = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - AtomNameLength); - AtomNameString = TempBuffer; - } - - /* Query the name */ - Status = RtlQueryAtomInAtomTable(InternalInitAtomTable(), - Atom, - NULL, - NULL, - AtomNameString, - &AtomNameLength); - } - else - { - /* We're going to do a global query, so allocate a buffer */ - AtomInfoLength = sizeof(ATOM_BASIC_INFORMATION) + - (Size * sizeof(WCHAR)); - AtomInfo = TempBuffer = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - AtomInfoLength); - - if (!AtomInfo) - { - SetLastErrorByStatus(STATUS_NO_MEMORY); - return 0; - } - - /* Query the name */ - Status = WineNtQueryInformationAtom(Atom, - AtomBasicInformation, - AtomInfo, - AtomInfoLength, - &AtomInfoLength); - if (NT_SUCCESS(Status)) - { - /* Success. Update the length and get the name */ - AtomNameLength = (ULONG)AtomInfo->NameLength; - AtomNameString = AtomInfo->Name; - } - } + /* We're going to do a global query, so allocate a buffer */ + AtomInfoLength = sizeof(ATOM_BASIC_INFORMATION) + + (Size * sizeof(WCHAR)); + AtomInfo = TempBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + AtomInfoLength); + + if (!AtomInfo) + { + SetLastErrorByStatus(STATUS_NO_MEMORY); + return 0; + } + + /* Query the name */ + Status = WineNtQueryInformationAtom(Atom, + AtomBasicInformation, + AtomInfo, + AtomInfoLength, + &AtomInfoLength); + if (NT_SUCCESS(Status)) + { + /* Success. Update the length and get the name */ + AtomNameLength = (ULONG)AtomInfo->NameLength; + AtomNameString = AtomInfo->Name; + } + /* Check for global success */ if (NT_SUCCESS(Status)) @@ -631,14 +560,14 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - DPRINT("Failed: %lx\n", Status); + WARN("Failed: %lx\n", Status); SetLastErrorByStatus(Status); } if (Unicode) - DPRINT("InternalGetAtomName name %S\n", AtomName); + WARN("InternalGetAtomName name %S\n", AtomName); else - DPRINT("InternalGetAtomName name %s\n", AtomName); + WARN("InternalGetAtomName name %s\n", AtomName); /* Return length */ return RetVal; @@ -650,170 +579,71 @@ * @implemented */ ATOM -WINAPI -GlobalAddAtomA(LPCSTR lpString) -{ - return InternalAddAtom(FALSE, FALSE, lpString); +UserAddAtomA(LPCSTR lpString) +{ + return InternalAddAtom(FALSE, lpString); } /* * @implemented */ ATOM -WINAPI -GlobalAddAtomW(LPCWSTR lpString) -{ - return InternalAddAtom(FALSE, TRUE, (LPSTR)lpString); +UserAddAtomW(LPCWSTR lpString) +{ + return InternalAddAtom(TRUE, (LPSTR)lpString); } /* * @implemented */ ATOM -WINAPI -GlobalDeleteAtom(ATOM nAtom) -{ - return InternalDeleteAtom(FALSE, nAtom); +UserDeleteAtom(ATOM nAtom) +{ + return InternalDeleteAtom(nAtom); } /* * @implemented */ ATOM -WINAPI -GlobalFindAtomA(LPCSTR lpString) -{ - return InternalFindAtom(FALSE, FALSE, lpString); +UserFindAtomA(LPCSTR lpString) +{ + return InternalFindAtom(FALSE, lpString); } /* * @implemented */ ATOM -WINAPI -GlobalFindAtomW(LPCWSTR lpString) -{ - return InternalFindAtom(FALSE, TRUE, (LPSTR)lpString); +UserFindAtomW(LPCWSTR lpString) +{ + return InternalFindAtom(TRUE, (LPSTR)lpString); } /* * @implemented */ UINT -WINAPI -GlobalGetAtomNameA(ATOM nAtom, +UserGetAtomNameA(ATOM nAtom, LPSTR lpBuffer, int nSize) { - return InternalGetAtomName(FALSE, FALSE, nAtom, lpBuffer, (DWORD)nSize); + return InternalGetAtomName(FALSE, nAtom, lpBuffer, (DWORD)nSize); } /* * @implemented */ UINT -WINAPI -GlobalGetAtomNameW(ATOM nAtom, +UserGetAtomNameW(ATOM nAtom, LPWSTR lpBuffer, int nSize) { - return InternalGetAtomName(FALSE, - TRUE, + return InternalGetAtomName(TRUE, nAtom, (LPSTR)lpBuffer, (DWORD)nSize); } -/* - * @implemented - */ -BOOL -WINAPI -InitAtomTable(DWORD nSize) -{ - /* Normalize size */ - if (nSize < 4 || nSize > 511) nSize = 37; - - DPRINT("Here\n"); - return NT_SUCCESS(RtlCreateAtomTable(nSize, &BaseLocalAtomTable)); -} - -/* - * @implemented - */ -ATOM -WINAPI -AddAtomA(LPCSTR lpString) -{ - return InternalAddAtom(TRUE, FALSE, lpString); -} - -/* - * @implemented - */ -ATOM -WINAPI -AddAtomW(LPCWSTR lpString) -{ - return InternalAddAtom(TRUE, TRUE, (LPSTR)lpString); -} - -/* - * @implemented - */ -ATOM -WINAPI -DeleteAtom(ATOM nAtom) -{ - return InternalDeleteAtom(TRUE, nAtom); -} - -/* - * @implemented - */ -ATOM -WINAPI -FindAtomA(LPCSTR lpString) -{ - return InternalFindAtom(TRUE, FALSE, lpString); -} - -/* - * @implemented - */ -ATOM -WINAPI -FindAtomW(LPCWSTR lpString) -{ - return InternalFindAtom(TRUE, TRUE, (LPSTR)lpString); - -} - -/* - * @implemented - */ -UINT -WINAPI -GetAtomNameA(ATOM nAtom, - LPSTR lpBuffer, - int nSize) -{ - return InternalGetAtomName(TRUE, FALSE, nAtom, lpBuffer, (DWORD)nSize); -} - -/* - * @implemented - */ -UINT -WINAPI -GetAtomNameW(ATOM nAtom, - LPWSTR lpBuffer, - int nSize) -{ - return InternalGetAtomName(TRUE, - TRUE, - nAtom, - (LPSTR)lpBuffer, - (DWORD)nSize); -} + /* EOF */ Modified: branches/arwinss/reactos/dll/win32/user32/class.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/class.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/class.c [iso-8859-1] Mon Jul 12 10:10:10 2010 @@ -316,7 +316,7 @@ classPtr->atomName = get_int_atom_value( name ); if (!classPtr->atomName && name) strcpyW( classPtr->name, name ); - else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, sizeof(classPtr->name)/sizeof(WCHAR) ); + else UserGetAtomNameW( classPtr->atomName, classPtr->name, sizeof(classPtr->name)/sizeof(WCHAR) ); SERVER_START_REQ( create_class ) { @@ -908,7 +908,7 @@ if (!set_server_info( hwnd, offset, newval, size )) break; retval = class->atomName; class->atomName = newval; - GlobalGetAtomNameW( newval, class->name, sizeof(class->name)/sizeof(WCHAR) ); + UserGetAtomNameW( newval, class->name, sizeof(class->name)/sizeof(WCHAR) ); break; case GCL_CBCLSEXTRA: /* cannot change this one */ SetLastError( ERROR_INVALID_PARAMETER ); @@ -974,7 +974,7 @@ { WCHAR tmpbuf[MAX_ATOM_LEN + 1]; - ret = GlobalGetAtomNameW( GetClassLongW( hwnd, GCW_ATOM ), tmpbuf, MAX_ATOM_LEN + 1 ); + ret = UserGetAtomNameW( GetClassLongW( hwnd, GCW_ATOM ), tmpbuf, MAX_ATOM_LEN + 1 ); if (ret) { ret = min(count - 1, ret); @@ -1173,7 +1173,7 @@ } pClassEntry->hInst = class->hInstance; pClassEntry->wNext++; - GlobalGetAtomNameA( class->atomName, pClassEntry->szClassName, + UserGetAtomNameA( class->atomName, pClassEntry->szClassName, sizeof(pClassEntry->szClassName) ); return TRUE; } Modified: branches/arwinss/reactos/dll/win32/user32/message.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] Mon Jul 12 10:10:10 2010 @@ -3919,7 +3919,7 @@ */ UINT WINAPI RegisterWindowMessageA( LPCSTR str ) { - UINT ret = GlobalAddAtomA(str); + UINT ret = UserAddAtomA(str); TRACE("%s, ret=%x\n", str, ret); return ret; } @@ -3930,7 +3930,7 @@ */ UINT WINAPI RegisterWindowMessageW( LPCWSTR str ) { - UINT ret = GlobalAddAtomW(str); + UINT ret = UserAddAtomW(str); TRACE("%s ret=%x\n", debugstr_w(str), ret); return ret; } Modified: branches/arwinss/reactos/dll/win32/user32/property.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] Mon Jul 12 10:10:10 2010 @@ -223,7 +223,7 @@ for (i = 0; i < count; i++) { char string[ATOM_BUFFER_SIZE]; - if (!GlobalGetAtomNameA( list[i].atom, string, ATOM_BUFFER_SIZE )) continue; + if (!UserGetAtomNameA( list[i].atom, string, ATOM_BUFFER_SIZE )) continue; if (!(ret = func( hwnd, string, (HANDLE)(ULONG_PTR)list[i].data, lParam ))) break; } HeapFree( GetProcessHeap(), 0, list ); @@ -245,7 +245,7 @@ for (i = 0; i < count; i++) { WCHAR string[ATOM_BUFFER_SIZE]; - if (!GlobalGetAtomNameW( list[i].atom, string, ATOM_BUFFER_SIZE )) continue; + if (!UserGetAtomNameW( list[i].atom, string, ATOM_BUFFER_SIZE )) continue; if (!(ret = func( hwnd, string, (HANDLE)(ULONG_PTR)list[i].data, lParam ))) break; } HeapFree( GetProcessHeap(), 0, list ); Modified: branches/arwinss/reactos/dll/win32/user32/spy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/spy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/spy.c [iso-8859-1] Mon Jul 12 10:10:10 2010 @@ -2148,7 +2148,7 @@ if (sp_e->msgnum >= 0xc000) { - if (GlobalGetAtomNameA( sp_e->msgnum, sp_e->msg_name+1, sizeof(sp_e->msg_name)-2 )) + if (UserGetAtomNameA( sp_e->msgnum, sp_e->msg_name+1, sizeof(sp_e->msg_name)-2 )) { sp_e->msg_name[0] = '\"'; strcat( sp_e->msg_name, "\"" ); Modified: branches/arwinss/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Mon Jul 12 10:10:10 2010 @@ -17,6 +17,7 @@ <library>win32ksys</library> <library>pseh</library> + <file>atom.c</file> <file>button.c</file> <file>caret.c</file> <file>class.c</file> Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] Mon Jul 12 10:10:10 2010 @@ -258,6 +258,14 @@ LRESULT lReturn, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern int SPY_Init(void) DECLSPEC_HIDDEN; +extern ATOM UserAddAtomA(LPCSTR lpString); +extern ATOM UserAddAtomW(LPCWSTR lpString); +extern ATOM UserDeleteAtom(ATOM nAtom); +extern ATOM UserFindAtomA(LPCSTR lpString); +extern ATOM UserFindAtomW(LPCWSTR lpString); +extern UINT UserGetAtomNameA(ATOM nAtom, LPSTR lpBuffer, int nSize); +extern UINT UserGetAtomNameW(ATOM nAtom, LPWSTR lpBuffer, int nSize); + #include "pshpack1.h" typedef struct

1 0

[pschweitzer] 48002: [NTOSKRNL] Merging some stuff from pierre-fsd/arty-newcc branches: - Implemented FsRtlDissectDbcs(), FsRtlIsDbcsInExpression(), FsRtlIsFatDbcsLegal(), FsRtlIsHpfsDbcsLegal() - Implemented FsRtlIsNameInExpressionPrivate() - Rewritten FsRtlIsNameInExpression() - Updated comments About FsRtlIsNameInExpressionPrivate(), it comes with a fix there isn't in branch, which avoids reading string more than its own length, and this helps getting rid of a workaround later in code.
by pschweitzer＠svn.reactos.org 11 Jul '10

11 Jul '10

Author: pschweitzer Date: Sun Jul 11 21:31:14 2010 New Revision: 48002 URL: http://svn.reactos.org/svn/reactos?rev=48002&view=rev Log: [NTOSKRNL] Merging some stuff from pierre-fsd/arty-newcc branches: - Implemented FsRtlDissectDbcs(), FsRtlIsDbcsInExpression(), FsRtlIsFatDbcsLegal(), FsRtlIsHpfsDbcsLegal() - Implemented FsRtlIsNameInExpressionPrivate() - Rewritten FsRtlIsNameInExpression() - Updated comments About FsRtlIsNameInExpressionPrivate(), it comes with a fix there isn't in branch, which avoids reading string more than its own length, and this helps getting rid of a workaround later in code. Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sun Jul 11 21:31:14 2010 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/fsrtl/name.c * PURPOSE: Provides DBCS parsing and other support routines for FSDs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -45,19 +46,67 @@ OUT PANSI_STRING FirstPart, OUT PANSI_STRING RemainingPart) { - KeBugCheck(FILE_SYSTEM); + ULONG FirstPosition, i; + ULONG SkipFirstSlash = 0; + + /* Zero the strings before continuing */ + RtlZeroMemory(FirstPart, sizeof(ANSI_STRING)); + RtlZeroMemory(RemainingPart, sizeof(ANSI_STRING)); + + /* Just quit if the string is empty */ + if (!Name.Length) return; + + /* Find first backslash */ + FirstPosition = Name.Length; + for (i = 0; i < Name.Length; i++) + { + /* First make sure the character it's not the Lead DBCS */ + if (FsRtlIsLeadDbcsCharacter(Name.Buffer[i])) + { + i++; + } + /* If we found one... */ + else if (Name.Buffer[i] == '\\') + { + /* If it begins string, just notice it and continue */ + if (i == 0) + { + SkipFirstSlash = 1; + } + else + { + /* Else, save its position and break out of the loop */ + FirstPosition = i; + break; + } + } + } + + /* Set up the first result string */ + FirstPart->Buffer = Name.Buffer + SkipFirstSlash; + FirstPart->Length = (FirstPosition - SkipFirstSlash); + FirstPart->MaximumLength = FirstPart->Length; + + /* And second one, if necessary */ + if (FirstPosition < (Name.Length)) + { + RemainingPart->Buffer = Name.Buffer + FirstPosition + 1; + RemainingPart->Length = Name.Length - (FirstPosition + 1); + RemainingPart->MaximumLength = RemainingPart->Length; + } } /*++ * @name FsRtlDoesDbcsContainWildCards * @implemented * - * FILLME + * Returns TRUE if the given DbcsName contains wildcards such as *, ?, + * ANSI_DOS_STAR, ANSI_DOS_DOT, and ANSI_DOS_QM * * @param Name - * FILLME - * - * @return None + * The Name to check + * + * @return TRUE if there are wildcards, FALSE otherwise * * @remarks None * @@ -89,17 +138,17 @@ /*++ * @name FsRtlIsDbcsInExpression - * @unimplemented - * - * FILLME + * @implemented + * + * Check if the Name string is in the Expression string. * * @param Expression - * FILLME + * The string in which we've to find Name. It can contains wildcards * * @param Name - * FILLME - * - * @return None + * The string to find. It cannot contain wildcards. + * + * @return TRUE if Name is found in Expression, FALSE otherwise * * @remarks None * @@ -109,27 +158,74 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, IN PANSI_STRING Name) { - KeBugCheck(FILE_SYSTEM); + ULONG ExpressionPosition, NamePosition, MatchingChars = 0; + + ASSERT(!FsRtlDoesDbcsContainWildCards(Name)); + + /* One can't be null, both can be */ + if (!Expression->Length || !Name->Length) + { + return !(Expression->Length ^ Name->Length); + } + + for (ExpressionPosition = 0; ExpressionPosition < Expression->Length; ExpressionPosition++) + { + if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[MatchingChars]) || + (Expression->Buffer[ExpressionPosition] == '?') || + (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) || + (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT && + (Name->Buffer[MatchingChars] == '.' || Name->Buffer[MatchingChars] == '0'))) + { + MatchingChars++; + } + else if (Expression->Buffer[ExpressionPosition] == '*') + { + MatchingChars = Name->Length; + } + else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) + { + for (NamePosition = MatchingChars; NamePosition < Name->Length; NamePosition++) + { + if (Name->Buffer[NamePosition] == '.') + { + MatchingChars = NamePosition; + break; + } + } + } + else + { + MatchingChars = 0; + } + if (MatchingChars == Name->Length) + { + return TRUE; + } + } + return FALSE; } /*++ * @name FsRtlIsFatDbcsLegal - * @unimplemented - * - * FILLME + * @implemented + * + * Returns TRUE if the given DbcsName is a valid FAT filename (in 8.3) * * @param DbcsName - * FILLME + * The filename to check. It can also contains pathname. * * @param WildCardsPermissible - * FILLME + * If this is set to FALSE and if filename contains wildcard, the function + * will fail * * @param PathNamePermissible - * FILLME + * If this is set to FALSE and if the filename comes with a pathname, the + * function will fail * * @param LeadingBackslashPermissible - * FILLME + * If this is set to FALSE and if the filename starts with a backslash, the + * function will fail * * @return TRUE if the DbcsName is legal, FALSE otherwise * @@ -143,27 +239,130 @@ IN BOOLEAN PathNamePermissible, IN BOOLEAN LeadingBackslashPermissible) { - KeBugCheck(FILE_SYSTEM); - return FALSE; + ANSI_STRING FirstPart, RemainingPart, Name; + BOOLEAN LastDot; + ULONG i; + + /* Just quit if the string is empty */ + if (!DbcsName.Length) + return FALSE; + + /* DbcsName wasn't supposed to be started with \ */ + if (!LeadingBackslashPermissible && DbcsName.Buffer[0] == '\\') + return FALSE; + /* DbcsName was allowed to be started with \, but now, remove it */ + else if (LeadingBackslashPermissible && DbcsName.Buffer[0] == '\\') + { + DbcsName.Buffer = DbcsName.Buffer + 1; + DbcsName.Length = DbcsName.Length - 1; + DbcsName.MaximumLength = DbcsName.MaximumLength - 1; + } + + /* Extract first part of the DbcsName to work on */ + FsRtlDissectDbcs(DbcsName, &FirstPart, &RemainingPart); + while (FirstPart.Length > 0) + { + /* Reset dots count */ + LastDot = FALSE; + + /* Accept special filename if wildcards are allowed */ + if (WildCardsPermissible && (FirstPart.Length == 1 || FirstPart.Length == 2) && FirstPart.Buffer[0] == '.') + { + if (FirstPart.Length == 2) + { + if (FirstPart.Buffer[1] == '.') + { + goto EndLoop; + } + } + else + { + goto EndLoop; + } + } + + /* Filename must be 8.3 filename */ + if (FirstPart.Length < 3 || FirstPart.Length > 12) + return FALSE; + + /* Now, we will parse the filename to find everything bad in */ + for (i = 0; i < FirstPart.Length; i++) + { + /* First make sure the character it's not the Lead DBCS */ + if (FsRtlIsLeadDbcsCharacter(FirstPart.Buffer[i])) + { + if (i == (FirstPart.Length) - 1) + return FALSE; + i++; + } + /* Then check for bad characters */ + else if (!FsRtlIsAnsiCharacterLegalFat(FirstPart.Buffer[i], WildCardsPermissible)) + { + return FALSE; + } + else if (FirstPart.Buffer[i] == '.') + { + /* Filename can only contain one dot */ + if (LastDot) + return FALSE; + + LastDot = TRUE; + + /* We mustn't have spaces before dot or at the end of the filename + * and no dot at the beginning of the filename */ + if ((i == (FirstPart.Length) - 1) || i == 0) + return FALSE; + + if (i > 0) + if (FirstPart.Buffer[i - 1] == ' ') + return FALSE; + + /* Filename must be 8.3 filename and not 3.8 filename */ + if ((FirstPart.Length - 1) - i > 3) + return FALSE; + } + } + + /* Filename mustn't finish with a space */ + if (FirstPart.Buffer[FirstPart.Length - 1] == ' ') + return FALSE; + + EndLoop: + /* Preparing next loop */ + Name.Buffer = RemainingPart.Buffer; + Name.Length = RemainingPart.Length; + Name.MaximumLength = RemainingPart.MaximumLength; + + /* Call once again our dissect function */ + FsRtlDissectDbcs(Name, &FirstPart, &RemainingPart); + + /* We found a pathname, it wasn't allowed */ + if (FirstPart.Length > 0 && !PathNamePermissible) + return FALSE; + } + return TRUE; } /*++ * @name FsRtlIsHpfsDbcsLegal - * @unimplemented - * - * FILLME + * @implemented + * + * Returns TRUE if the given DbcsName is a valid HPFS filename * * @param DbcsName - * FILLME + * The filename to check. It can also contains pathname. * * @param WildCardsPermissible - * FILLME + * If this is set to FALSE and if filename contains wildcard, the function + * will fail * * @param PathNamePermissible - * FILLME + * If this is set to FALSE and if the filename comes with a pathname, the + * function will fail * * @param LeadingBackslashPermissible - * FILLME + * If this is set to FALSE and if the filename starts with a backslash, the + * function will fail * * @return TRUE if the DbcsName is legal, FALSE otherwise * @@ -177,6 +376,82 @@ IN BOOLEAN PathNamePermissible, IN BOOLEAN LeadingBackslashPermissible) { - KeBugCheck(FILE_SYSTEM); - return FALSE; + ANSI_STRING FirstPart, RemainingPart, Name; + ULONG i; + + /* Just quit if the string is empty */ + if (!DbcsName.Length) + return FALSE; + + /* DbcsName wasn't supposed to be started with \ */ + if (!LeadingBackslashPermissible && DbcsName.Buffer[0] == '\\') + return FALSE; + /* DbcsName was allowed to be started with \, but now, remove it */ + else if (LeadingBackslashPermissible && DbcsName.Buffer[0] == '\\') + { + DbcsName.Buffer = DbcsName.Buffer + 1; + DbcsName.Length = DbcsName.Length - 1; + DbcsName.MaximumLength = DbcsName.MaximumLength - 1; + } + + /* Extract first part of the DbcsName to work on */ + FsRtlDissectDbcs(DbcsName, &FirstPart, &RemainingPart); + while (FirstPart.Length > 0) + { + /* Accept special filename if wildcards are allowed */ + if (WildCardsPermissible && (FirstPart.Length == 1 || FirstPart.Length == 2) && FirstPart.Buffer[0] == '.') + { + if (FirstPart.Length == 2) + { + if (FirstPart.Buffer[1] == '.') + { + goto EndLoop; + } + } + else + { + goto EndLoop; + } + } + + /* Filename must be 255 bytes maximum */ + if (FirstPart.Length > 255) + return FALSE; + + /* Now, we will parse the filename to find everything bad in */ + for (i = 0; i < FirstPart.Length; i++) + { + /* First make sure the character it's not the Lead DBCS */ + if (FsRtlIsLeadDbcsCharacter(FirstPart.Buffer[i])) + { + if (i == (FirstPart.Length) - 1) + return FALSE; + i++; + } + /* Then check for bad characters */ + else if (!!FsRtlIsAnsiCharacterLegalHpfs(FirstPart.Buffer[i], WildCardsPermissible)) + { + return FALSE; + } + } + + /* Filename mustn't finish with a space or a dot */ + if ((FirstPart.Buffer[FirstPart.Length - 1] == ' ') || + (FirstPart.Buffer[FirstPart.Length - 1] == '.')) + return FALSE; + + EndLoop: + /* Preparing next loop */ + Name.Buffer = RemainingPart.Buffer; + Name.Length = RemainingPart.Length; + Name.MaximumLength = RemainingPart.MaximumLength; + + /* Call once again our dissect function */ + FsRtlDissectDbcs(Name, &FirstPart, &RemainingPart); + + /* We found a pathname, it wasn't allowed */ + if (FirstPart.Length > 0 && !PathNamePermissible) + return FALSE; + } + return TRUE; } Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Jul 11 21:31:14 2010 @@ -5,6 +5,7 @@ * PURPOSE: Provides name parsing and other support routines for FSDs * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Filip Navara (navaraf(a)reactos.org) + * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -13,27 +14,96 @@ #define NDEBUG #include <debug.h> +/* PRIVATE FUNCTIONS *********************************************************/ +BOOLEAN +NTAPI +FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression, + IN PUNICODE_STRING Name, + IN BOOLEAN IgnoreCase, + IN PWCHAR UpcaseTable OPTIONAL) +{ + ULONG i = 0, j, k = 0; + + ASSERT(!FsRtlDoesNameContainWildCards(Name)); + + while (i < Name->Length / sizeof(WCHAR) && k < Expression->Length / sizeof(WCHAR)) + { + if ((Expression->Buffer[k] == (IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i])) || + (Expression->Buffer[k] == L'?') || (Expression->Buffer[k] == DOS_QM) || + (Expression->Buffer[k] == DOS_DOT && (Name->Buffer[i] == L'.' || Name->Buffer[i] == L'0'))) + { + i++; + k++; + } + else if (Expression->Buffer[k] == L'*') + { + if (k < Expression->Length / sizeof(WCHAR)) + { + if (Expression->Buffer[k+1] != L'*' && Expression->Buffer[k+1] != L'?' && + Expression->Buffer[k+1] != DOS_DOT && Expression->Buffer[k+1] != DOS_QM && + Expression->Buffer[k+1] != DOS_STAR) + { + while ((IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i]) != Expression->Buffer[k+1] && + i <= Name->Length / sizeof(WCHAR)) i++; + } + else + { + if (!(Expression->Buffer[k+1] != DOS_DOT && (Name->Buffer[i] == L'.' || Name->Buffer[i] == L'0'))) + { + i++; + } + } + } + else + { + i = Name->Length / sizeof(WCHAR); + } + k++; + } + else if (Expression->Buffer[k] == DOS_STAR) + { + j = i; + while (j <= Name->Length / sizeof(WCHAR)) + { + if (Name->Buffer[j] == L'.') + { + i = j; + } + j++; + } + k++; + } + else + { + i++; + k = 0; + } + } + + return (k == Expression->Length / sizeof(WCHAR)); +} + /* PUBLIC FUNCTIONS **********************************************************/ /*++ * @name FsRtlAreNamesEqual * @implemented * - * FILLME + * Compare two strings to check if they match * * @param Name1 - * FILLME + * First unicode string to compare * * @param Name2 - * FILLME + * Second unicode string to compare * * @param IgnoreCase - * FILLME + * If TRUE, Case will be ignored when comparing strings * * @param UpcaseTable - * FILLME - * - * @return None + * Table for upcase letters. If NULL is given, system one will be used + * + * @return TRUE if the strings are equal * * @remarks From Bo Branten's ntifs.h v25. * @@ -188,7 +258,7 @@ * @name FsRtlDoesNameContainWildCards * @implemented * - * FILLME + * Checks if the given string contains WildCards * * @param Name * Pointer to a UNICODE_STRING containing Name to examine @@ -224,13 +294,21 @@ * @name FsRtlIsNameInExpression * @implemented * - * FILLME - * - * @param DeviceObject - * FILLME - * - * @param Irp - * FILLME + * Check if the Name string is in the Expression string. + * + * @param Expression + * The string in which we've to find Name. It can contain wildcards. + * If IgnoreCase is set to TRUE, this string MUST BE uppercase. + * + * @param Name + * The string to find. It cannot contain wildcards + * + * @param IgnoreCase + * If set to TRUE, case will be ignore with upcasing both strings + * + * @param UpcaseTable + * If not NULL, and if IgnoreCase is set to TRUE, it will be used to + * upcase the both strings * * @return TRUE if Name is in Expression, FALSE otherwise * @@ -246,80 +324,31 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - USHORT ExpressionPosition, NamePosition; - UNICODE_STRING TempExpression, TempName; - - ExpressionPosition = 0; - NamePosition = 0; - while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - NamePosition < (Name->Length / sizeof(WCHAR))) - { - if (Expression->Buffer[ExpressionPosition] == L'*') - { - ExpressionPosition++; - if (ExpressionPosition == (Expression->Length / sizeof(WCHAR))) - { - return TRUE; - } - while (NamePosition < (Name->Length / sizeof(WCHAR))) - { - TempExpression.Length = - TempExpression.MaximumLength = - Expression->Length - (ExpressionPosition * sizeof(WCHAR)); - TempExpression.Buffer = Expression->Buffer + ExpressionPosition; - TempName.Length = - TempName.MaximumLength = - Name->Length - (NamePosition * sizeof(WCHAR)); - TempName.Buffer = Name->Buffer + NamePosition; - /* FIXME: Rewrite to get rid of recursion */ - if (FsRtlIsNameInExpression(&TempExpression, &TempName, - IgnoreCase, UpcaseTable)) - { - return TRUE; - } - NamePosition++; - } - } - else - { - /* FIXME: Take UpcaseTable into account! */ - if (Expression->Buffer[ExpressionPosition] == L'?' || - (IgnoreCase && - RtlUpcaseUnicodeChar(Expression->Buffer[ExpressionPosition]) == - RtlUpcaseUnicodeChar(Name->Buffer[NamePosition])) || - (!IgnoreCase && - Expression->Buffer[ExpressionPosition] == - Name->Buffer[NamePosition])) - { - NamePosition++; - ExpressionPosition++; - } - else - { - return FALSE; - } - } - } - - /* Handle matching of "f0_*.*" expression to "f0_000" file name. */ - if (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - Expression->Buffer[ExpressionPosition] == L'.') - { - while (ExpressionPosition < (Expression->Length / sizeof(WCHAR)) && - (Expression->Buffer[ExpressionPosition] == L'.' || - Expression->Buffer[ExpressionPosition] == L'*' || - Expression->Buffer[ExpressionPosition] == L'?')) - { - ExpressionPosition++; - } - } - - if (ExpressionPosition == (Expression->Length / sizeof(WCHAR)) && - NamePosition == (Name->Length / sizeof(WCHAR))) - { - return TRUE; - } - - return FALSE; -} - + BOOLEAN Result; + NTSTATUS Status; + UNICODE_STRING IntName; + + if (IgnoreCase && !UpcaseTable) + { + Status = RtlUpcaseUnicodeString(&IntName, Name, TRUE); + if (Status != STATUS_SUCCESS) + { + ExRaiseStatus(Status); + } + Name = &IntName; + IgnoreCase = FALSE; + } + else + { + IntName.Buffer = NULL; + } + + Result = FsRtlIsNameInExpressionPrivate(Expression, Name, IgnoreCase, UpcaseTable); + + if (IntName.Buffer != NULL) + { + RtlFreeUnicodeString(&IntName); + } + + return Result; +}

1 0

[gadamopoulos] 48001: [win32k] - Implement RosGdiExtFloodFill
by gadamopoulos＠svn.reactos.org 11 Jul '10

11 Jul '10

Author: gadamopoulos Date: Sun Jul 11 19:38:37 2010 New Revision: 48001 URL: http://svn.reactos.org/svn/reactos?rev=48001&view=rev Log: [win32k] - Implement RosGdiExtFloodFill Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sun Jul 11 19:38:37 2010 @@ -347,8 +347,14 @@ BOOL CDECL RosDrv_ExtFloodFill( NTDRV_PDEVICE *physDev, INT x, INT y, COLORREF color, UINT fillType ) { - UNIMPLEMENTED; - return FALSE; + POINT ptPixel; + + /* Transform to device coordinates */ + ptPixel.x = x; ptPixel.y = y; + + LPtoDP(physDev->hUserDC, &ptPixel, 1); + + return RosGdiExtFloodFill(physDev->hKernelDC, ptPixel.x, ptPixel.y, color, fillType); } BOOL CDECL RosDrv_ExtTextOut( NTDRV_PDEVICE *physDev, INT x, INT y, UINT flags, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Sun Jul 11 19:38:37 2010 @@ -44,11 +44,32 @@ return 0; } -BOOL APIENTRY RosGdiExtFloodFill( HDC physDev, INT x, INT y, COLORREF color, - UINT fillType ) -{ - UNIMPLEMENTED; - return FALSE; +BOOL APIENTRY RosGdiExtFloodFill( HDC hDC, INT XStart, INT YStart, COLORREF Color, + UINT FillType ) +{ + PDC dc; + BOOL Ret; + POINTL Pt; + + /* Get a pointer to the DC */ + dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + /* Add DC origin */ + Pt.x = XStart + dc->rcVport.left + dc->rcDcRect.left; + Pt.y = YStart + dc->rcVport.top + dc->rcDcRect.top; + + /* Call GRE routine */ + Ret = GreFloodFill(dc, &Pt, Color, FillType); + + /* Release the object */ + DC_UnlockDc(dc); + return Ret; + } BOOL APIENTRY RosGdiExtTextOut( HDC physDev, INT x, INT y, UINT flags, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Sun Jul 11 19:38:37 2010 @@ -9,6 +9,9 @@ /* INCLUDES ******************************************************************/ #include <win32k.h> +#include "object.h" +#include "handle.h" +#include "user.h" #define NDEBUG #include <debug.h> @@ -141,6 +144,51 @@ } } +BOOL NTAPI GreFloodFill( PDC dc, POINTL *Pt, COLORREF Color, UINT FillType ) +{ + SURFACE *psurf = NULL; + HPALETTE hpal; + PPALETTE ppal; + EXLATEOBJ exlo; + BOOL Ret = FALSE; + RECTL DestRect; + ULONG ConvColor; + rectangle_t r; + + Ret = point_in_region(dc->Clipping, Pt->x, Pt->y); + if (!Ret) + return FALSE; + + get_region_extents(dc->Clipping ,&r); + + DestRect.bottom = r.bottom; + DestRect.left = r.left; + DestRect.right = r.right; + DestRect.top = r.top; + + psurf = dc->dclevel.pSurface; + if (!psurf) + return FALSE; + + hpal = dc->dclevel.pSurface->hDIBPalette; + if (!hpal) hpal = pPrimarySurface->devinfo.hpalDefault; + ppal = PALETTE_ShareLockPalette(hpal); + + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, ppal, 0, 0xffffff, 0); + + /* Only solid fills supported for now + * How to support pattern brushes and non standard surfaces (not offering dib functions): + * Version a (most likely slow): call DrvPatBlt for every pixel + * Version b: create a flood mask and let MaskBlt blit a masked brush */ + ConvColor = XLATEOBJ_iXlate(&exlo.xlo, Color); + Ret = DIB_XXBPP_FloodFillSolid(&psurf->SurfObj, &dc->eboFill.BrushObject, &DestRect, Pt, ConvColor, FillType); + + EXLATEOBJ_vCleanup(&exlo); + PALETTE_ShareUnlockPalette(ppal); + + return Ret; +} + BOOLEAN NTAPI RECTL_bIntersectRect(RECTL* prclDst, const RECTL* prcl1, const RECTL* prcl2) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Sun Jul 11 19:38:37 2010 @@ -238,6 +238,9 @@ const POINT *ptPoints, INT count); +BOOL NTAPI +GreFloodFill( PDC dc, POINTL *Pt, COLORREF Color, UINT FillType ); + BOOLEAN NTAPI RECTL_bIntersectRect(RECTL* prclDst, const RECTL* prcl1, const RECTL* prcl2);

1 0

[spetreolle] 48000: Properly skip known crasher in gdi32:metafile test. Commit 48k dedicated to dreimer
by spetreolle＠svn.reactos.org 11 Jul '10

11 Jul '10

Author: spetreolle Date: Sun Jul 11 19:11:51 2010 New Revision: 48000 URL: http://svn.reactos.org/svn/reactos?rev=48000&view=rev Log: Properly skip known crasher in gdi32:metafile test. Commit 48k dedicated to dreimer Modified: trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sun Jul 11 19:11:51 2010 @@ -1427,16 +1427,14 @@ const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); - skip("skipping match_emf_record(), bug 5392\n"); -// trace("%s: EMF record %u, size %u/record %u, size %u\n", -// desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); +#if 1 + skip("skipping match_emf_record(), bug 5393\n"); +#else + trace("%s: EMF record %u, size %u/record %u, size %u\n", + desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); -// if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; - - trace("%s: EMF record %u, size %u/record %u, size %u\n", - desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); - if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; +#endif /* We have already bailed out if iType or nSize don't match */ offset1 += emr1->nSize;

1 0

[spetreolle] 47999: Implement _osplatform Import _makepath_s and _wmakepath_s from Wine. Passes msvcrt data and dir tests.
by spetreolle＠svn.reactos.org 11 Jul '10

11 Jul '10

Author: spetreolle Date: Sun Jul 11 16:25:30 2010 New Revision: 47999 URL: http://svn.reactos.org/svn/reactos?rev=47999&view=rev Log: Implement _osplatform Import _makepath_s and _wmakepath_s from Wine. Passes msvcrt data and dir tests. Added: trunk/reactos/lib/sdk/crt/stdlib/makepath_s.c (with props) trunk/reactos/lib/sdk/crt/stdlib/wmakpath_s.c (with props) Modified: trunk/reactos/dll/win32/msvcrt/dllmain.c trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/misc/environ.c Modified: trunk/reactos/dll/win32/msvcrt/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/dllmain.c [iso-8859-1] Sun Jul 11 16:25:30 2010 @@ -35,6 +35,7 @@ extern void FreeEnvironment(char **environment); extern void _atexit_cleanup(void); +extern unsigned int _osplatform; extern unsigned int _osver; extern unsigned int _winminor; extern unsigned int _winmajor; @@ -72,6 +73,7 @@ _winver = (osvi.dwMajorVersion << 8) | osvi.dwMinorVersion; _winmajor = osvi.dwMajorVersion; _winminor = osvi.dwMinorVersion; + _osplatform = osvi.dwPlatformId; _osver = osvi.dwBuildNumber; hHeap = HeapCreate(0, 100000, 0); if (hHeap == NULL) Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sun Jul 11 16:25:30 2010 @@ -597,7 +597,7 @@ @ cdecl _ltow(long ptr long) # stub _ltow_s @ cdecl _makepath(ptr str str str str) -# stub _makepath_s +@ cdecl _makepath_s(ptr long str str str str) # stub _malloc_dbg @ cdecl _matherr(ptr) @ cdecl _mbbtombc(long) @@ -756,7 +756,7 @@ @ cdecl _onexit(ptr) @ varargs _open(str long) @ cdecl _open_osfhandle(long long) -# stub _osplatform +@ extern _osplatform _osplatform @ extern _osver _osver @ stub _outp #(long long) @ stub _outpd #(long long) @@ -1086,7 +1086,7 @@ # stub _winput_s @ extern _winver @ cdecl _wmakepath(wstr wstr wstr wstr wstr) -# stub _wmakepath_s +@ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) @ cdecl _wmkdir(wstr) @ cdecl _wmktemp(wstr) # stub _wmktemp_s Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sun Jul 11 16:25:30 2010 @@ -329,6 +329,7 @@ <file>gcvt.c</file> <file>getenv.c</file> <file>makepath.c</file> + <file>makepath_s.c</file> <file>mbtowc.c</file> <file>mbstowcs.c</file> <file>obsol.c</file> @@ -341,6 +342,7 @@ <file>wputenv.c</file> <file>wsenv.c</file> <file>wmakpath.c</file> + <file>wmakpath_s.c</file> </directory> <directory name="string"> <if property="ARCH" value="i386"> Modified: trunk/reactos/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/environ.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/environ.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/environ.c [iso-8859-1] Sun Jul 11 16:25:30 2010 @@ -11,6 +11,7 @@ #include <string.h> +unsigned int _osplatform = 0; unsigned int _osver = 0; unsigned int _winminor = 0; unsigned int _winmajor = 0; Added: trunk/reactos/lib/sdk/crt/stdlib/makepath_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/makepat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/makepath_s.c (added) +++ trunk/reactos/lib/sdk/crt/stdlib/makepath_s.c [iso-8859-1] Sun Jul 11 16:25:30 2010 @@ -1,0 +1,120 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: See COPYING in the top level directory + * FILE: lib/sdk/crt/stdlib/makepath_s.c + * PURPOSE: Creates a path + * PROGRAMMERS: Wine team + * Copyright 1996,1998 Marcus Meissner + * Copyright 1996 Jukka Iivonen + * Copyright 1997,2000 Uwe Bonnes + * Copyright 2000 Jon Griffiths + * + */ + +#include <precomp.h> +#include <stdlib.h> +#include <string.h> + +/********************************************************************* + * _makepath_s (MSVCRT.@) + * + * Safe version of _makepath. + */ +int CDECL _makepath_s(char *path, size_t size, const char *drive, + const char *directory, const char *filename, + const char *extension) +{ + char *p = path; + + if (!path || !size) + { + *_errno() = EINVAL; + return EINVAL; + } + + if (drive && drive[0]) + { + if (size <= 2) + goto range; + + *p++ = drive[0]; + *p++ = ':'; + size -= 2; + } + + if (directory && directory[0]) + { + unsigned int len = strlen(directory); + unsigned int needs_separator = directory[len - 1] != '/' && directory[len - 1] != '\\'; + unsigned int copylen = min(size - 1, len); + + if (size < 2) + goto range; + + memmove(p, directory, copylen); + + if (size <= len) + goto range; + + p += copylen; + size -= copylen; + + if (needs_separator) + { + if (size < 2) + goto range; + + *p++ = '\\'; + size -= 1; + } + } + + if (filename && filename[0]) + { + unsigned int len = strlen(filename); + unsigned int copylen = min(size - 1, len); + + if (size < 2) + goto range; + + memmove(p, filename, copylen); + + if (size <= len) + goto range; + + p += len; + size -= len; + } + + if (extension && extension[0]) + { + unsigned int len = strlen(extension); + unsigned int needs_period = extension[0] != '.'; + unsigned int copylen; + + if (size < 2) + goto range; + + if (needs_period) + { + *p++ = '.'; + size -= 1; + } + + copylen = min(size - 1, len); + memcpy(p, extension, copylen); + + if (size <= len) + goto range; + + p += copylen; + } + + *p = '\0'; + return 0; + +range: + path[0] = '\0'; + *_errno() = ERANGE; + return ERANGE; +} Propchange: trunk/reactos/lib/sdk/crt/stdlib/makepath_s.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/stdlib/wmakpath_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/wmakpat… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/wmakpath_s.c (added) +++ trunk/reactos/lib/sdk/crt/stdlib/wmakpath_s.c [iso-8859-1] Sun Jul 11 16:25:30 2010 @@ -1,0 +1,121 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: See COPYING in the top level directory + * FILE: lib/sdk/crt/stdlib/wmakpath_s.c + * PURPOSE: Creates a path + * PROGRAMMERS: Wine team + * Copyright 1996,1998 Marcus Meissner + * Copyright 1996 Jukka Iivonen + * Copyright 1997,2000 Uwe Bonnes + * Copyright 2000 Jon Griffiths + * + */ + +#include <precomp.h> +#include <stdlib.h> +#include <string.h> + +/********************************************************************* + * _wmakepath_s (MSVCRT.@) + * + * Safe version of _wmakepath. + */ +int CDECL _wmakepath_s(wchar_t *path, size_t size, const wchar_t *drive, + const wchar_t *directory, const wchar_t *filename, + const wchar_t *extension) +{ + wchar_t *p = path; + + if (!path || !size) + { + *_errno() = EINVAL; + return EINVAL; + } + + if (drive && drive[0]) + { + if (size <= 2) + goto range; + + *p++ = drive[0]; + *p++ = ':'; + size -= 2; + } + + if (directory && directory[0]) + { + unsigned int len = strlenW(directory); + unsigned int needs_separator = directory[len - 1] != '/' && directory[len - 1] != '\\'; + unsigned int copylen = min(size - 1, len); + + if (size < 2) + goto range; + + memmove(p, directory, copylen * sizeof(wchar_t)); + + if (size <= len) + goto range; + + p += copylen; + size -= copylen; + + if (needs_separator) + { + if (size < 2) + goto range; + + *p++ = '\\'; + size -= 1; + } + } + + if (filename && filename[0]) + { + unsigned int len = strlenW(filename); + unsigned int copylen = min(size - 1, len); + + if (size < 2) + goto range; + + memmove(p, filename, copylen * sizeof(wchar_t)); + + if (size <= len) + goto range; + + p += len; + size -= len; + } + + if (extension && extension[0]) + { + unsigned int len = strlenW(extension); + unsigned int needs_period = extension[0] != '.'; + unsigned int copylen; + + if (size < 2) + goto range; + + if (needs_period) + { + *p++ = '.'; + size -= 1; + } + + copylen = min(size - 1, len); + memcpy(p, extension, copylen * sizeof(wchar_t)); + + if (size <= len) + goto range; + + p += copylen; + } + + *p = '\0'; + return 0; + +range: + path[0] = '\0'; + *_errno() = ERANGE; + return ERANGE; +} + Propchange: trunk/reactos/lib/sdk/crt/stdlib/wmakpath_s.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 47998: [ADVAPI32] Move event tracing functions to the proper file.
by ekohl＠svn.reactos.org 11 Jul '10

11 Jul '10

Author: ekohl Date: Sun Jul 11 12:05:35 2010 New Revision: 47998 URL: http://svn.reactos.org/svn/reactos?rev=47998&view=rev Log: [ADVAPI32] Move event tracing functions to the proper file. Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c trunk/reactos/dll/win32/advapi32/service/eventlog.c Modified: trunk/reactos/dll/win32/advapi32/misc/trace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/tr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/trace.c [iso-8859-1] Sun Jul 11 12:05:35 2010 @@ -135,4 +135,67 @@ if (pSessionHandle) *pSessionHandle = 0xcafe4242; return ERROR_SUCCESS; } + +/****************************************************************************** + * ControlTraceW [ADVAPI32.@] + * + * Control a givel event trace session + * + */ +ULONG WINAPI ControlTraceW( TRACEHANDLE hSession, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) +{ + FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_w(SessionName), Properties, control); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * ControlTraceA [ADVAPI32.@] + * + * See ControlTraceW. + * + */ +ULONG WINAPI ControlTraceA( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) +{ + FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_a(SessionName), Properties, control); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * EnableTrace [ADVAPI32.@] + */ +ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) +{ + FIXME("(%d, 0x%x, %d, %s, %s): stub\n", enable, flag, level, + debugstr_guid(guid), wine_dbgstr_longlong(hSession)); + + return ERROR_SUCCESS; +} + +/****************************************************************************** + * QueryAllTracesW [ADVAPI32.@] + * + * Query information for started event trace sessions + * + */ +ULONG WINAPI QueryAllTracesW( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) +{ + FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); + + if (psessioncount) *psessioncount = 0; + return ERROR_SUCCESS; +} + +/****************************************************************************** + * QueryAllTracesA [ADVAPI32.@] + * + * See QueryAllTracesW. + */ +ULONG WINAPI QueryAllTracesA( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) +{ + FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); + + if (psessioncount) *psessioncount = 0; + return ERROR_SUCCESS; +} + /* EOF */ 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] Sun Jul 11 12:05:35 2010 @@ -312,29 +312,6 @@ return TRUE; } -/****************************************************************************** - * ControlTraceW [ADVAPI32.@] - * - * Control a givel event trace session - * - */ -ULONG WINAPI ControlTraceW( TRACEHANDLE hSession, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) -{ - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_w(SessionName), Properties, control); - return ERROR_SUCCESS; -} - -/****************************************************************************** - * ControlTraceA [ADVAPI32.@] - * - * See ControlTraceW. - * - */ -ULONG WINAPI ControlTraceA( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties, ULONG control ) -{ - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(hSession), debugstr_a(SessionName), Properties, control); - return ERROR_SUCCESS; -} /****************************************************************************** * DeregisterEventSource [ADVAPI32.@] @@ -371,16 +348,6 @@ return TRUE; } -/****************************************************************************** - * EnableTrace [ADVAPI32.@] - */ -ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession ) -{ - FIXME("(%d, 0x%x, %d, %s, %s): stub\n", enable, flag, level, - debugstr_guid(guid), wine_dbgstr_longlong(hSession)); - - return ERROR_SUCCESS; -} /****************************************************************************** * GetEventLogInformation [ADVAPI32.@] @@ -739,32 +706,6 @@ return (HANDLE)LogHandle; } -/****************************************************************************** - * QueryAllTracesW [ADVAPI32.@] - * - * Query information for started event trace sessions - * - */ -ULONG WINAPI QueryAllTracesW( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) -{ - FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); - - if (psessioncount) *psessioncount = 0; - return ERROR_SUCCESS; -} - -/****************************************************************************** - * QueryAllTracesA [ADVAPI32.@] - * - * See QueryAllTracesW. - */ -ULONG WINAPI QueryAllTracesA( PEVENT_TRACE_PROPERTIES * parray, ULONG arraycount, PULONG psessioncount ) -{ - FIXME("(%p, %d, %p) stub\n", parray, arraycount, psessioncount); - - if (psessioncount) *psessioncount = 0; - return ERROR_SUCCESS; -} /****************************************************************************** * ReadEventLogA [ADVAPI32.@]

1 0

[ekohl] 47997: [ADVAPI32] Remove unused code.
by ekohl＠svn.reactos.org 11 Jul '10

11 Jul '10

Author: ekohl Date: Sun Jul 11 09:45:54 2010 New Revision: 47997 URL: http://svn.reactos.org/svn/reactos?rev=47997&view=rev Log: [ADVAPI32] Remove unused code. Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Sun Jul 11 09:45:54 2010 @@ -133,100 +133,6 @@ { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, }; -static const WCHAR SE_CREATE_TOKEN_NAME_W[] = - { 'S','e','C','r','e','a','t','e','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_ASSIGNPRIMARYTOKEN_NAME_W[] = - { 'S','e','A','s','s','i','g','n','P','r','i','m','a','r','y','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_LOCK_MEMORY_NAME_W[] = - { 'S','e','L','o','c','k','M','e','m','o','r','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_INCREASE_QUOTA_NAME_W[] = - { 'S','e','I','n','c','r','e','a','s','e','Q','u','o','t','a','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_MACHINE_ACCOUNT_NAME_W[] = - { 'S','e','M','a','c','h','i','n','e','A','c','c','o','u','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_TCB_NAME_W[] = - { 'S','e','T','c','b','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SECURITY_NAME_W[] = - { 'S','e','S','e','c','u','r','i','t','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_TAKE_OWNERSHIP_NAME_W[] = - { 'S','e','T','a','k','e','O','w','n','e','r','s','h','i','p','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_LOAD_DRIVER_NAME_W[] = - { 'S','e','L','o','a','d','D','r','i','v','e','r','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYSTEM_PROFILE_NAME_W[] = - { 'S','e','S','y','s','t','e','m','P','r','o','f','i','l','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYSTEMTIME_NAME_W[] = - { 'S','e','S','y','s','t','e','m','t','i','m','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_PROF_SINGLE_PROCESS_NAME_W[] = - { 'S','e','P','r','o','f','i','l','e','S','i','n','g','l','e','P','r','o','c','e','s','s','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_INC_BASE_PRIORITY_NAME_W[] = - { 'S','e','I','n','c','r','e','a','s','e','B','a','s','e','P','r','i','o','r','i','t','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CREATE_PAGEFILE_NAME_W[] = - { 'S','e','C','r','e','a','t','e','P','a','g','e','f','i','l','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CREATE_PERMANENT_NAME_W[] = - { 'S','e','C','r','e','a','t','e','P','e','r','m','a','n','e','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_BACKUP_NAME_W[] = - { 'S','e','B','a','c','k','u','p','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_RESTORE_NAME_W[] = - { 'S','e','R','e','s','t','o','r','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SHUTDOWN_NAME_W[] = - { 'S','e','S','h','u','t','d','o','w','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_DEBUG_NAME_W[] = - { 'S','e','D','e','b','u','g','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_AUDIT_NAME_W[] = - { 'S','e','A','u','d','i','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYSTEM_ENVIRONMENT_NAME_W[] = - { 'S','e','S','y','s','t','e','m','E','n','v','i','r','o','n','m','e','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CHANGE_NOTIFY_NAME_W[] = - { 'S','e','C','h','a','n','g','e','N','o','t','i','f','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_REMOTE_SHUTDOWN_NAME_W[] = - { 'S','e','R','e','m','o','t','e','S','h','u','t','d','o','w','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_UNDOCK_NAME_W[] = - { 'S','e','U','n','d','o','c','k','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYNC_AGENT_NAME_W[] = - { 'S','e','S','y','n','c','A','g','e','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_ENABLE_DELEGATION_NAME_W[] = - { 'S','e','E','n','a','b','l','e','D','e','l','e','g','a','t','i','o','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_MANAGE_VOLUME_NAME_W[] = - { 'S','e','M','a','n','a','g','e','V','o','l','u','m','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_IMPERSONATE_NAME_W[] = - { 'S','e','I','m','p','e','r','s','o','n','a','t','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CREATE_GLOBAL_NAME_W[] = - { 'S','e','C','r','e','a','t','e','G','l','o','b','a','l','P','r','i','v','i','l','e','g','e',0 }; - -static const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1] = -{ - NULL, - NULL, - SE_CREATE_TOKEN_NAME_W, - SE_ASSIGNPRIMARYTOKEN_NAME_W, - SE_LOCK_MEMORY_NAME_W, - SE_INCREASE_QUOTA_NAME_W, - SE_MACHINE_ACCOUNT_NAME_W, - SE_TCB_NAME_W, - SE_SECURITY_NAME_W, - SE_TAKE_OWNERSHIP_NAME_W, - SE_LOAD_DRIVER_NAME_W, - SE_SYSTEM_PROFILE_NAME_W, - SE_SYSTEMTIME_NAME_W, - SE_PROF_SINGLE_PROCESS_NAME_W, - SE_INC_BASE_PRIORITY_NAME_W, - SE_CREATE_PAGEFILE_NAME_W, - SE_CREATE_PERMANENT_NAME_W, - SE_BACKUP_NAME_W, - SE_RESTORE_NAME_W, - SE_SHUTDOWN_NAME_W, - SE_DEBUG_NAME_W, - SE_AUDIT_NAME_W, - SE_SYSTEM_ENVIRONMENT_NAME_W, - SE_CHANGE_NOTIFY_NAME_W, - SE_REMOTE_SHUTDOWN_NAME_W, - SE_UNDOCK_NAME_W, - SE_SYNC_AGENT_NAME_W, - SE_ENABLE_DELEGATION_NAME_W, - SE_MANAGE_VOLUME_NAME_W, - SE_IMPERSONATE_NAME_W, - SE_CREATE_GLOBAL_NAME_W, -}; - /* Interface to ntmarta.dll ***************************************************/

1 0

[ekohl] 47996: [ADVAPI32/LSASRV] - Export LsaLookupPrivilegeName. - Move mockup code from advapi32 to lsasrv (LsaLookupSids --> LsarLookupSids). - Make LsaLookupSids call the server function LsarLookupSids.
by ekohl＠svn.reactos.org 11 Jul '10

11 Jul '10

Author: ekohl Date: Sun Jul 11 09:33:44 2010 New Revision: 47996 URL: http://svn.reactos.org/svn/reactos?rev=47996&view=rev Log: [ADVAPI32/LSASRV] - Export LsaLookupPrivilegeName. - Move mockup code from advapi32 to lsasrv (LsaLookupSids --> LsarLookupSids). - Make LsaLookupSids call the server function LsarLookupSids. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sun Jul 11 09:33:44 2010 @@ -373,7 +373,7 @@ @ stdcall LsaLookupNames(long long ptr ptr ptr) @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) @ stub LsaLookupPrivilegeDisplayName -@ stub LsaLookupPrivilegeName +@ stdcall LsaLookupPrivilegeName(ptr ptr ptr) @ stdcall LsaLookupPrivilegeValue(ptr ptr ptr) @ stdcall LsaLookupSids(ptr long ptr ptr ptr) @ stdcall LsaNtStatusToWinError(long) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Jul 11 09:33:44 2010 @@ -429,7 +429,7 @@ PRPC_UNICODE_STRING NameBuffer = NULL; NTSTATUS Status; - TRACE("(%p,%p,%p) stub\n", PolicyHandle, Value, Name); + TRACE("(%p,%p,%p)\n", PolicyHandle, Value, Name); RpcTryExcept { @@ -463,7 +463,7 @@ LUID Luid; NTSTATUS Status; - TRACE("(%p,%p,%p) stub\n", PolicyHandle, Name, Value); + TRACE("(%p,%p,%p)\n", PolicyHandle, Name, Value); RpcTryExcept { @@ -483,7 +483,7 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS WINAPI @@ -494,36 +494,49 @@ PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, PLSA_TRANSLATED_NAME *Names) { - static const UNICODE_STRING UserName = RTL_CONSTANT_STRING(L"Administrator"); - PLSA_REFERENCED_DOMAIN_LIST LocalDomains; - PLSA_TRANSLATED_NAME LocalNames; - - TRACE("(%p,%u,%p,%p,%p) stub\n", PolicyHandle, Count, Sids, + LSAPR_SID_ENUM_BUFFER SidEnumBuffer; + LSAPR_TRANSLATED_NAMES TranslatedNames; + ULONG MappedCount = 0; + NTSTATUS Status; + + TRACE("(%p,%u,%p,%p,%p)\n", PolicyHandle, Count, Sids, ReferencedDomains, Names); - WARN("LsaLookupSids(): stub. Always returning 'Administrator'\n"); - if (Count != 1) - return STATUS_NONE_MAPPED; - LocalDomains = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(LSA_TRANSLATED_SID)); - if (!LocalDomains) - return SCESTATUS_NOT_ENOUGH_RESOURCE; - LocalNames = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(LSA_TRANSLATED_NAME) + UserName.MaximumLength); - if (!LocalNames) - { - LsaFreeMemory(LocalDomains); - return SCESTATUS_NOT_ENOUGH_RESOURCE; - } - LocalDomains[0].Entries = 0; - LocalDomains[0].Domains = NULL; - LocalNames[0].Use = SidTypeWellKnownGroup; - LocalNames[0].Name.Buffer = (LPWSTR)((ULONG_PTR)(LocalNames) + sizeof(LSA_TRANSLATED_NAME)); - LocalNames[0].Name.Length = UserName.Length; - LocalNames[0].Name.MaximumLength = UserName.MaximumLength; - RtlCopyMemory(LocalNames[0].Name.Buffer, UserName.Buffer, UserName.MaximumLength); - - *ReferencedDomains = LocalDomains; - *Names = LocalNames; - return STATUS_SUCCESS; + if (Count == 0) + return STATUS_INVALID_PARAMETER; + + SidEnumBuffer.Entries = Count; + SidEnumBuffer.SidInfo = (PLSAPR_SID_INFORMATION)Sids; + + RpcTryExcept + { + *ReferencedDomains = NULL; + *Names = NULL; + + TranslatedNames.Entries = 0; + TranslatedNames.Names = NULL; + + Status = LsarLookupSids((LSAPR_HANDLE)PolicyHandle, + &SidEnumBuffer, + (PLSAPR_REFERENCED_DOMAIN_LIST *)ReferencedDomains, + &TranslatedNames, + LsapLookupWksta, + &MappedCount); + + *Names = (PLSA_TRANSLATED_NAME)TranslatedNames.Names; + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + if (TranslatedNames.Names != NULL) + { + MIDL_user_free(TranslatedNames.Names); + } + + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } /****************************************************************************** Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Jul 11 09:33:44 2010 @@ -347,8 +347,44 @@ LSAP_LOOKUP_LEVEL LookupLevel, DWORD *MappedCount) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + static const UNICODE_STRING UserName = RTL_CONSTANT_STRING(L"Administrator"); + PLSAPR_TRANSLATED_NAME OutputNames = NULL; + ULONG OutputNamesLength; + ULONG i; + + TRACE("LsarLookupSids(%p, %p, %p, %p, %d, %p)\n", + PolicyHandle, SidEnumBuffer, ReferencedDomains, TranslatedNames, + LookupLevel, MappedCount); + + TranslatedNames->Entries = SidEnumBuffer->Entries; + TranslatedNames->Names = NULL; + *ReferencedDomains = NULL; + + OutputNamesLength = SidEnumBuffer->Entries * sizeof(LSA_TRANSLATED_NAME); + OutputNames = MIDL_user_allocate(OutputNamesLength); + if (OutputNames == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(OutputNames, OutputNamesLength); + + for (i = 0; i < SidEnumBuffer->Entries; i++) + { + OutputNames[i].Use = SidTypeWellKnownGroup; + OutputNames[i].DomainIndex = 0; + OutputNames[i].Name.Buffer = MIDL_user_allocate(UserName.MaximumLength); + OutputNames[i].Name.Length = UserName.Length; + OutputNames[i].Name.MaximumLength = UserName.MaximumLength; + RtlCopyMemory(OutputNames[i].Name.Buffer, UserName.Buffer, UserName.MaximumLength); + } + + *MappedCount = SidEnumBuffer->Entries; + + TranslatedNames->Entries = SidEnumBuffer->Entries; + TranslatedNames->Names = OutputNames; + + return STATUS_SUCCESS; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs