Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[tfaber] 54314: [ADVAPI32][SERVICES] - Remove unnecessary casts, fix some const-ness, fix a DPRINT, some spacing
by tfaber＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: tfaber Date: Sun Nov 6 13:33:29 2011 New Revision: 54314 URL: http://svn.reactos.org/svn/reactos?rev=54314&view=rev Log: [ADVAPI32][SERVICES] - Remove unnecessary casts, fix some const-ness, fix a DPRINT, some spacing Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c trunk/reactos/base/system/services/services.h trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sun Nov 6 13:33:29 2011 @@ -94,7 +94,7 @@ DWORD ScmWriteDependencies(HKEY hServiceKey, - LPWSTR lpDependencies, + LPCWSTR lpDependencies, DWORD dwDependenciesLength) { DWORD dwError = ERROR_SUCCESS; @@ -103,7 +103,7 @@ DWORD dwLength; LPWSTR lpGroupDeps; LPWSTR lpServiceDeps; - LPWSTR lpSrc; + LPCWSTR lpSrc; LPWSTR lpDst; if (*lpDependencies == 0) Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Nov 6 13:33:29 2011 @@ -191,9 +191,9 @@ if (pServiceImage == NULL) { /* Create a new service image */ - pServiceImage = (PSERVICE_IMAGE)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(SERVICE_IMAGE) + ((wcslen(ImagePath.Buffer) + 1) * sizeof(WCHAR))); + pServiceImage = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SERVICE_IMAGE) + ((wcslen(ImagePath.Buffer) + 1) * sizeof(WCHAR))); if (pServiceImage == NULL) { dwError = ERROR_NOT_ENOUGH_MEMORY; @@ -366,7 +366,7 @@ DPRINT("Service: '%S'\n", lpServiceName); /* Allocate service entry */ - lpService = (SERVICE*)HeapAlloc(GetProcessHeap(), + lpService = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SERVICE) + ((wcslen(lpServiceName) + 1) * sizeof(WCHAR))); if (lpService == NULL) @@ -584,15 +584,17 @@ { /* Find the maximum subkey length so that we can allocate a buffer */ dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, - &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL); + &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL); if (!dwRet) { dwMaxSubkeyLen++; - if (dwMaxSubkeyLen > sizeof(szNameBuf)/sizeof(WCHAR)) + if (dwMaxSubkeyLen > sizeof(szNameBuf) / sizeof(WCHAR)) + { /* Name too big: alloc a buffer for it */ - lpszName = HeapAlloc(GetProcessHeap(), 0, dwMaxSubkeyLen*sizeof(WCHAR)); - - if(!lpszName) + lpszName = HeapAlloc(GetProcessHeap(), 0, dwMaxSubkeyLen * sizeof(WCHAR)); + } + + if (!lpszName) dwRet = ERROR_NOT_ENOUGH_MEMORY; else { @@ -835,7 +837,7 @@ BufferLength = sizeof(OBJECT_DIRECTORY_INFORMATION) + 2 * MAX_PATH * sizeof(WCHAR); - DirInfo = (OBJECT_DIRECTORY_INFORMATION*) HeapAlloc(GetProcessHeap(), + DirInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, BufferLength); @@ -942,9 +944,9 @@ PacketSize = sizeof(SCM_CONTROL_PACKET); PacketSize += (wcslen(Service->lpServiceName) + 1) * sizeof(WCHAR); - ControlPacket = (SCM_CONTROL_PACKET*)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - PacketSize); + ControlPacket = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + PacketSize); if (ControlPacket == NULL) { LeaveCriticalSection(&ControlServiceCriticalSection); @@ -1171,9 +1173,9 @@ } /* Allocate a control packet */ - ControlPacket = (SCM_CONTROL_PACKET*)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - PacketSize); + ControlPacket = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + PacketSize); if (ControlPacket == NULL) return ERROR_NOT_ENOUGH_MEMORY; Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Nov 6 13:33:29 2011 @@ -144,16 +144,16 @@ if (_wcsicmp(lpDatabaseName, SERVICES_FAILED_DATABASEW) == 0) { - DPRINT("Database %S, does not exist\n",lpDatabaseName); + DPRINT("Database %S, does not exist\n", lpDatabaseName); return ERROR_DATABASE_DOES_NOT_EXIST; } else if (_wcsicmp(lpDatabaseName, SERVICES_ACTIVE_DATABASEW) != 0) { - DPRINT("Invalid Database name %S.\n",lpDatabaseName); + DPRINT("Invalid Database name %S.\n", lpDatabaseName); return ERROR_INVALID_NAME; } - Ptr = (MANAGER_HANDLE*) HeapAlloc(GetProcessHeap(), + Ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MANAGER_HANDLE) + (wcslen(lpDatabaseName) + 1) * sizeof(WCHAR)); if (Ptr == NULL) @@ -175,7 +175,7 @@ { PSERVICE_HANDLE Ptr; - Ptr = (SERVICE_HANDLE*) HeapAlloc(GetProcessHeap(), + Ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SERVICE_HANDLE)); if (Ptr == NULL) @@ -629,7 +629,7 @@ &pcbBytesNeeded, &dwServicesReturned); - /* if pcbBytesNeeded returned a value then there are services running that are dependent on this service*/ + /* if pcbBytesNeeded returned a value then there are services running that are dependent on this service */ if (pcbBytesNeeded) { DPRINT("Deletion failed due to running dependencies.\n"); @@ -1400,9 +1400,9 @@ (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); /* Update the display name */ - lpDisplayNameW = (LPWSTR)HeapAlloc(GetProcessHeap(), - 0, - (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); + lpDisplayNameW = HeapAlloc(GetProcessHeap(), + 0, + (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); if (lpDisplayNameW == NULL) { dwError = ERROR_NOT_ENOUGH_MEMORY; @@ -2083,7 +2083,7 @@ *lpDisplayName != 0 && _wcsicmp(lpService->lpDisplayName, lpDisplayName) != 0) { - lpService->lpDisplayName = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, + lpService->lpDisplayName = HeapAlloc(GetProcessHeap(), 0, (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); if (lpService->lpDisplayName == NULL) { @@ -2212,7 +2212,7 @@ if (lpDependencies != NULL && *lpDependencies != 0) { dwError = ScmWriteDependencies(hServiceKey, - (LPWSTR)lpDependencies, + (LPCWSTR)lpDependencies, dwDependSize); if (dwError != ERROR_SUCCESS) goto done; @@ -3519,7 +3519,7 @@ DWORD dwDependenciesLength = 0; DWORD dwLength; int len; - LPSTR lpStr; + LPCSTR lpStr; if (lpServiceName) { @@ -3571,7 +3571,7 @@ if (lpDependencies) { - lpStr = (LPSTR)lpDependencies; + lpStr = (LPCSTR)lpDependencies; while (*lpStr) { dwLength = strlen(lpStr) + 1; @@ -3586,7 +3586,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - MultiByteToWideChar(CP_ACP, 0, (LPSTR)lpDependencies, dwDependenciesLength, lpDependenciesW, dwDependenciesLength); + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)lpDependencies, dwDependenciesLength, lpDependenciesW, dwDependenciesLength); } if (lpServiceStartName) Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.c [iso-8859-1] Sun Nov 6 13:33:29 2011 @@ -379,7 +379,7 @@ ExitThread(0); } - DPRINT("SERVICES: created start event with handle %x.\n", hScmStartEvent); + DPRINT("SERVICES: created start event with handle %p.\n", hScmStartEvent); // ScmInitThreadManager(); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Nov 6 13:33:29 2011 @@ -88,7 +88,7 @@ PHKEY phKey); DWORD ScmWriteDependencies(HKEY hServiceKey, - LPWSTR lpDependencies, + LPCWSTR lpDependencies, DWORD dwDependenciesLength); DWORD ScmMarkServiceForDelete(PSERVICE pService); Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Nov 6 13:33:29 2011 @@ -288,14 +288,14 @@ DWORD dwError; DWORD dwDependenciesLength = 0; DWORD dwLength; - LPSTR lpStr; + LPCSTR lpStr; TRACE("ChangeServiceConfigA() called\n"); /* Calculate the Dependencies length*/ if (lpDependencies != NULL) { - lpStr = (LPSTR)lpDependencies; + lpStr = lpDependencies; while (*lpStr) { dwLength = strlen(lpStr) + 1; @@ -362,14 +362,14 @@ DWORD dwError; DWORD dwDependenciesLength = 0; DWORD dwLength; - LPWSTR lpStr; + LPCWSTR lpStr; TRACE("ChangeServiceConfigW() called\n"); /* Calculate the Dependencies length*/ if (lpDependencies != NULL) { - lpStr = (LPWSTR)lpDependencies; + lpStr = lpDependencies; while (*lpStr) { dwLength = wcslen(lpStr) + 1; @@ -540,7 +540,7 @@ DWORD dwDependenciesLength = 0; DWORD dwError; DWORD dwLength; - LPSTR lpStr; + LPCSTR lpStr; TRACE("CreateServiceA() called\n"); TRACE("%p %s %s\n", hSCManager, @@ -552,10 +552,10 @@ return NULL; } - /* Calculate the Dependencies length*/ + /* Calculate the Dependencies length */ if (lpDependencies != NULL) { - lpStr = (LPSTR)lpDependencies; + lpStr = lpDependencies; while (*lpStr) { dwLength = strlen(lpStr) + 1; @@ -628,7 +628,7 @@ DWORD dwDependenciesLength = 0; DWORD dwError; DWORD dwLength; - LPWSTR lpStr; + LPCWSTR lpStr; TRACE("CreateServiceW() called\n"); TRACE("%p %S %S\n", hSCManager, @@ -640,10 +640,10 @@ return NULL; } - /* Calculate the Dependencies length*/ + /* Calculate the Dependencies length */ if (lpDependencies != NULL) { - lpStr = (LPWSTR)lpDependencies; + lpStr = lpDependencies; while (*lpStr) { dwLength = wcslen(lpStr) + 1;

1 0

[tfaber] 54313: [MSVCRTEX] - Fix some warnings - Remove a ros-diff in favor of mingw-w64's solution
by tfaber＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: tfaber Date: Sun Nov 6 13:07:43 2011 New Revision: 54313 URL: http://svn.reactos.org/svn/reactos?rev=54313&view=rev Log: [MSVCRTEX] - Fix some warnings - Remove a ros-diff in favor of mingw-w64's solution Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/startup/pseudo-reloc.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Nov 6 13:07:43 2011 @@ -63,6 +63,8 @@ add_library(msvcrtex ${MSVCRTEX_SOURCE}) add_target_compile_definitions(msvcrtex _DLL) set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL) +set_source_files_properties(startup/crtexe.c + startup/wcrtexe.c PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) if(NOT MSVC) target_link_libraries(msvcrtex oldnames) Modified: trunk/reactos/lib/sdk/crt/startup/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/pseudo… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/pseudo-reloc.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/pseudo-reloc.c [iso-8859-1] Sun Nov 6 13:07:43 2011 @@ -20,6 +20,7 @@ #include <stdlib.h> #include <stdarg.h> #include <memory.h> +#include <malloc.h> #if defined(__CYGWIN__) #include <wchar.h> @@ -46,10 +47,7 @@ extern char __RUNTIME_PSEUDO_RELOC_LIST__; extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; -#ifndef _MSC_VER -#define __ImageBase __MINGW_LSYMBOL(_image_base__) -#endif -extern char __ImageBase; +extern char __MINGW_LSYMBOL(_image_base__); void _pei386_runtime_relocator (void); @@ -466,7 +464,12 @@ do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__, &__RUNTIME_PSEUDO_RELOC_LIST_END__, - &__MINGW_LSYMBOL(_image_base__)); +#ifdef __GNUC__ + &__MINGW_LSYMBOL(_image_base__) +#else + &__ImageBase +#endif + ); #ifdef __MINGW64_VERSION_MAJOR restore_modified_sections (); #endif /* __MINGW64_VERSION_MAJOR */

1 0

[tfaber] 54312: [CRT] - Export _resetstkoflw from msvcrt. Implementation from Wine 1.3.32
by tfaber＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: tfaber Date: Sun Nov 6 12:51:18 2011 New Revision: 54312 URL: http://svn.reactos.org/svn/reactos?rev=54312&view=rev Log: [CRT] - Export _resetstkoflw from msvcrt. Implementation from Wine 1.3.32 Added: trunk/reactos/lib/sdk/crt/except/stack.c - copied, changed from r54294, trunk/reactos/lib/sdk/crt/except/checkesp.c Removed: trunk/reactos/lib/sdk/crt/except/checkesp.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/crt.rbuild 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 Nov 6 12:51:18 2011 @@ -783,7 +783,7 @@ # extern _pwctype @ cdecl _read(long ptr long) # stub _realloc_dbg -# stub _resetstkoflw +@ cdecl _resetstkoflw() @ cdecl _rmdir(str) @ cdecl _rmtmp() @ cdecl _rotl(long long) Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sun Nov 6 12:51:18 2011 @@ -21,11 +21,11 @@ direct/wmkdir.c direct/wrmdir.c except/abnorter.c - except/checkesp.c except/cpp.c except/cppexcept.c except/except.c except/matherr.c + except/stack.c except/xcptfil.c float/chgsign.c float/copysign.c 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 Nov 6 12:51:18 2011 @@ -77,11 +77,11 @@ </directory> <directory name="except"> <file>abnorter.c</file> - <file>checkesp.c</file> <file>cpp.c</file> <file>cppexcept.c</file> <file>except.c</file> <file>matherr.c</file> + <file>stack.c</file> <if property="ARCH" value="i386"> <directory name="i386"> <file>prolog.s</file> Removed: trunk/reactos/lib/sdk/crt/except/checkesp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/checkes… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/checkesp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/checkesp.c (removed) @@ -1,35 +1,0 @@ -/********************************************************************* -* _chkesp (MSVCRT.@) -* -* Trap to a debugger if the value of the stack pointer has changed. -* -* PARAMS -* None. -* -* RETURNS -* Does not return. -* -* NOTES -* This function is available for iX86 only. -* -* When VC++ generates debug code, it stores the value of the stack pointer -* before calling any external function, and checks the value following -* the call. It then calls this function, which will trap if the values are -* not the same. Usually this means that the prototype used to call -* the function is incorrect. It can also mean that the .spec entry has -* the wrong calling convention or parameters. -*/ - -#ifdef __i386__ - -void _chkesp(void) -{ -} - -#else - -void _chkesp(void) -{ -} - -#endif /* __i386__ */ Copied: trunk/reactos/lib/sdk/crt/except/stack.c (from r54294, trunk/reactos/lib/sdk/crt/except/checkesp.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/stack.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/checkesp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/stack.c [iso-8859-1] Sun Nov 6 12:51:18 2011 @@ -1,3 +1,5 @@ +#include <precomp.h> + /********************************************************************* * _chkesp (MSVCRT.@) * @@ -33,3 +35,14 @@ } #endif /* __i386__ */ + +/********************************************************************* + * _resetstkoflw (MSVCRT.@) + */ +int CDECL _resetstkoflw(void) +{ + int stack_addr; + + /* causes stack fault that updates NtCurrentTeb()->Tib.StackLimit */ + return VirtualProtect( &stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, NULL ); +}

1 0

[tfaber] 54311: [SYSSETUP] - Do not rely on setupapi's FileExists function, which shouldn't even be exported
by tfaber＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: tfaber Date: Sun Nov 6 12:17:42 2011 New Revision: 54311 URL: http://svn.reactos.org/svn/reactos?rev=54311&view=rev Log: [SYSSETUP] - Do not rely on setupapi's FileExists function, which shouldn't even be exported Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun Nov 6 12:17:42 2011 @@ -2263,8 +2263,9 @@ wcscpy(szBuffer, szDrive); wcscat(szBuffer, L"reactos\\system32\\ntoskrnl.exe"); LogItem(SYSSETUP_SEVERITY_INFORMATION, szBuffer); - if (FileExists(szBuffer, NULL)) - { + if (GetFileAttributesW(szBuffer) != INVALID_FILE_ATTRIBUTES) + { + /* the file exists, so this is the right drive */ wcsncpy(szPath, szDrive, dwPathLength); return TRUE; }

1 0

[ion] 54310: [KERNEL32]: The ANSI/OEM stubs were never initialized... it's a miracle this ever worked, probably because someone added a #define to at least one of them to hack it into working. Init...
by ion＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: ion Date: Sun Nov 6 04:13:21 2011 New Revision: 54310 URL: http://svn.reactos.org/svn/reactos?rev=54310&view=rev Log: [KERNEL32]: The ANSI/OEM stubs were never initialized... it's a miracle this ever worked, probably because someone added a #define to at least one of them to hack it into working. Initialize the value snow, fixes boot. Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] Sun Nov 6 04:13:21 2011 @@ -20,6 +20,10 @@ /* GLOBALS ******************************************************************/ BOOL bIsFileApiAnsi = TRUE; // set the file api to ansi or oem +PRTL_CONVERT_STRING Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; +PRTL_CONVERT_STRINGA BasepUnicodeStringTo8BitString = RtlUnicodeStringToAnsiString; +PRTL_COUNT_STRING BasepUnicodeStringTo8BitSize = BasepUnicodeStringToAnsiSize; +PRTL_COUNT_STRINGA Basep8BitStringToUnicodeSize = BasepAnsiStringToUnicodeSize; /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sun Nov 6 04:13:21 2011 @@ -20,11 +20,6 @@ #include <debug.h> /* GLOBALS ********************************************************************/ - -PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; -PRTL_CONVERT_STRINGA BasepUnicodeStringTo8BitString; -PRTL_COUNT_STRING BasepUnicodeStringTo8BitSize; -PRTL_COUNT_STRINGA Basep8BitStringToUnicodeSize; UNICODE_STRING Restricted = RTL_CONSTANT_STRING(L"Restricted"); Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sun Nov 6 04:13:21 2011 @@ -245,6 +245,13 @@ typedef ULONG (NTAPI *PRTL_COUNT_STRINGA)(IN PANSI_STRING UnicodeString); +ULONG +NTAPI +BasepUnicodeStringToAnsiSize(IN PUNICODE_STRING String); + +ULONG +NTAPI +BasepAnsiStringToUnicodeSize(IN PANSI_STRING String); extern PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; extern PRTL_CONVERT_STRINGA BasepUnicodeStringTo8BitString;

1 0

[ion] 54309: [KERNEL32]: Move path-related APIs away from dir.c, and into path.c instead. [KERNEL32]: Fix SetDllDirectoryW: - Fail if "; " is in path - Use RtlCreateUnicodeString instead of manual s...
by ion＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: ion Date: Sun Nov 6 02:00:56 2011 New Revision: 54309 URL: http://svn.reactos.org/svn/reactos?rev=54309&view=rev Log: [KERNEL32]: Move path-related APIs away from dir.c, and into path.c instead. [KERNEL32]: Fix SetDllDirectoryW: - Fail if ";" is in path - Use RtlCreateUnicodeString instead of manual string management -- if the allocation fails, do not free the current base directory string! Older API would always free the current directory string, even if setting up the new one failed. - Don't assume lpPathName is filled out, it can be NULL, and this means the DLL directory should be cleared. [KERNEL32]: Fix SetDllDirectoryA as above, additionally use RtlInitAnsiStringEx to protect against overflow, and use Basep8BitStringToUnicodeString, to add support for OEM paths instead of assuming ANSI. [KERNEL32]: GetDllDirectoryW: correctly NULL-terminate and check lengths [KERNEL32]: GetDllDirectoryA: same as above, plus use BasepUnicodeString* APIs to correctly support OEM paths instead of assuming ANSI. [KERNEL32]: NeedCurrentDirectoryForExePath(A/W): call internal BasepIsCurDirAllowedForPlainExeNames instead of converting from A->W, this isn't needed. [KERNEL32]: GetFullPathNameW just calls RtlGetFullPathName_U, no extra checks/etc are needed. Next steps are GetFullPathNameA, GetShort/LongPathNameA, GetShort/LongPathNameW, hoping to bring the wine test failures closer to zero. Added: trunk/reactos/dll/win32/kernel32/client/path.c (with props) Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/file/dir.c trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sun Nov 6 02:00:56 2011 @@ -20,6 +20,7 @@ client/heapmem.c client/job.c client/loader.c + client/path.c client/perfcnt.c client/power.c client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/dir.c [iso-8859-1] Sun Nov 6 02:00:56 2011 @@ -19,8 +19,6 @@ #define NDEBUG #include <debug.h> DEBUG_CHANNEL(kernel32file); - -UNICODE_STRING BaseDllDirectory = {0, 0, NULL}; /* FUNCTIONS *****************************************************************/ @@ -578,799 +576,4 @@ return TRUE; } - -/* - * @implemented - */ -DWORD -WINAPI -GetFullPathNameA ( - LPCSTR lpFileName, - DWORD nBufferLength, - LPSTR lpBuffer, - LPSTR *lpFilePart - ) -{ - WCHAR BufferW[MAX_PATH]; - PWCHAR FileNameW; - DWORD ret; - LPWSTR FilePartW = NULL; - - TRACE("GetFullPathNameA(lpFileName %s, nBufferLength %d, lpBuffer %p, " - "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); - - if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) - return 0; - - ret = GetFullPathNameW(FileNameW, MAX_PATH, BufferW, &FilePartW); - - if (!ret) - return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - ret = FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); - - if (ret < nBufferLength && lpFilePart) - { - /* if the path closed with '\', FilePart is NULL */ - if (!FilePartW) - *lpFilePart=NULL; - else - *lpFilePart = (FilePartW - BufferW) + lpBuffer; - } - - TRACE("GetFullPathNameA ret: lpBuffer %s lpFilePart %s\n", - lpBuffer, (lpFilePart == NULL) ? "NULL" : *lpFilePart); - - return ret; -} - - -/* - * @implemented - */ -DWORD -WINAPI -GetFullPathNameW ( - LPCWSTR lpFileName, - DWORD nBufferLength, - LPWSTR lpBuffer, - LPWSTR *lpFilePart - ) -{ - ULONG Length; - - TRACE("GetFullPathNameW(lpFileName %S, nBufferLength %d, lpBuffer %p, " - "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); - - Length = RtlGetFullPathName_U ((LPWSTR)lpFileName, - nBufferLength * sizeof(WCHAR), - lpBuffer, - lpFilePart); - - TRACE("GetFullPathNameW ret: lpBuffer %S lpFilePart %S Length %ld\n", - lpBuffer, (lpFilePart == NULL) ? L"NULL" : *lpFilePart, Length / sizeof(WCHAR)); - - if (!lpFileName) - { -#if (WINVER >= _WIN32_WINNT_WIN7) - SetLastError(ERROR_INVALID_PARAMETER); -#endif - return 0; - } - - return Length/sizeof(WCHAR); -} - - -/* - * NOTE: Copied from Wine. - * @implemented - */ -DWORD -WINAPI -GetShortPathNameA ( - LPCSTR longpath, - LPSTR shortpath, - DWORD shortlen - ) -{ - PWCHAR LongPathW; - WCHAR ShortPathW[MAX_PATH]; - DWORD ret; - - if (!longpath) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!(LongPathW = FilenameA2W(longpath, FALSE))) - return 0; - - ret = GetShortPathNameW(LongPathW, ShortPathW, MAX_PATH); - - if (!ret) - return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - return FilenameW2A_FitOrFail(shortpath, shortlen, ShortPathW, ret+1); -} - - -/* - * NOTE: Copied from Wine. - * @implemented - */ -DWORD -WINAPI -GetShortPathNameW ( - LPCWSTR longpath, - LPWSTR shortpath, - DWORD shortlen - ) -{ - WCHAR tmpshortpath[MAX_PATH]; - LPCWSTR p; - DWORD sp = 0, lp = 0; - DWORD tmplen; - WIN32_FIND_DATAW wfd; - HANDLE goit; - UNICODE_STRING ustr; - WCHAR ustr_buf[8+1+3+1]; - - TRACE("GetShortPathNameW: %S\n",longpath); - - if (!longpath) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if (!longpath[0]) - { - SetLastError(ERROR_BAD_PATHNAME); - return 0; - } - - /* check for drive letter */ - if (longpath[0] != '/' && longpath[1] == ':' ) - { - tmpshortpath[0] = longpath[0]; - tmpshortpath[1] = ':'; - sp = lp = 2; - } - - ustr.Buffer = ustr_buf; - ustr.Length = 0; - ustr.MaximumLength = sizeof(ustr_buf); - - while (longpath[lp]) - { - /* check for path delimiters and reproduce them */ - if (longpath[lp] == '\\' || longpath[lp] == '/') - { - if (!sp || tmpshortpath[sp-1] != '\\') - { - /* strip double "\\" */ - tmpshortpath[sp] = '\\'; - sp++; - } - tmpshortpath[sp] = 0; /* terminate string */ - lp++; - continue; - } - - for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); - tmplen = p - (longpath + lp); - lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); - /* Check, if the current element is a valid dos name */ - if (tmplen <= 8+1+3) - { - BOOLEAN spaces; - memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR)); - ustr_buf[tmplen] = '\0'; - ustr.Length = (USHORT)tmplen * sizeof(WCHAR); - if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces) - { - sp += tmplen; - lp += tmplen; - continue; - } - } - - /* Check if the file exists and use the existing short file name */ - goit = FindFirstFileW(tmpshortpath, &wfd); - if (goit == INVALID_HANDLE_VALUE) goto notfound; - FindClose(goit); - lstrcpyW(tmpshortpath + sp, wfd.cAlternateFileName); - sp += lstrlenW(tmpshortpath + sp); - lp += tmplen; - } - tmpshortpath[sp] = 0; - - tmplen = lstrlenW(tmpshortpath) + 1; - if (tmplen <= shortlen) - { - lstrcpyW(shortpath, tmpshortpath); - tmplen--; /* length without 0 */ - } - - return tmplen; - - notfound: - SetLastError ( ERROR_FILE_NOT_FOUND ); - return 0; -} - - -/* - * @implemented - */ -DWORD -WINAPI -SearchPathA ( - LPCSTR lpPath, - LPCSTR lpFileName, - LPCSTR lpExtension, - DWORD nBufferLength, - LPSTR lpBuffer, - LPSTR *lpFilePart - ) -{ - UNICODE_STRING PathU = { 0, 0, NULL }; - UNICODE_STRING FileNameU = { 0, 0, NULL }; - UNICODE_STRING ExtensionU = { 0, 0, NULL }; - UNICODE_STRING BufferU = { 0, 0, NULL }; - ANSI_STRING Path; - ANSI_STRING FileName; - ANSI_STRING Extension; - ANSI_STRING Buffer; - PWCHAR FilePartW; - DWORD RetValue = 0; - NTSTATUS Status = STATUS_SUCCESS; - - if (!lpFileName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - RtlInitAnsiString (&Path, - (LPSTR)lpPath); - RtlInitAnsiString (&FileName, - (LPSTR)lpFileName); - RtlInitAnsiString (&Extension, - (LPSTR)lpExtension); - - /* convert ansi (or oem) strings to unicode */ - if (bIsFileApiAnsi) - { - Status = RtlAnsiStringToUnicodeString (&PathU, - &Path, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - - Status = RtlAnsiStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - - Status = RtlAnsiStringToUnicodeString (&ExtensionU, - &Extension, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - } - else - { - Status = RtlOemStringToUnicodeString (&PathU, - &Path, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - Status = RtlOemStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - - Status = RtlOemStringToUnicodeString (&ExtensionU, - &Extension, - TRUE); - if (!NT_SUCCESS(Status)) - goto Cleanup; - } - - BufferU.MaximumLength = min(nBufferLength * sizeof(WCHAR), USHRT_MAX); - BufferU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - BufferU.MaximumLength); - if (BufferU.Buffer == NULL) - { - Status = STATUS_NO_MEMORY; - goto Cleanup; - } - - Buffer.MaximumLength = min(nBufferLength, USHRT_MAX); - Buffer.Buffer = lpBuffer; - - RetValue = SearchPathW (NULL == lpPath ? NULL : PathU.Buffer, - NULL == lpFileName ? NULL : FileNameU.Buffer, - NULL == lpExtension ? NULL : ExtensionU.Buffer, - nBufferLength, - BufferU.Buffer, - &FilePartW); - - if (0 != RetValue) - { - BufferU.Length = wcslen(BufferU.Buffer) * sizeof(WCHAR); - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - Status = RtlUnicodeStringToAnsiString(&Buffer, - &BufferU, - FALSE); - else - Status = RtlUnicodeStringToOemString(&Buffer, - &BufferU, - FALSE); - - if (NT_SUCCESS(Status) && Buffer.Buffer) - { - /* nul-terminate ascii string */ - Buffer.Buffer[BufferU.Length / sizeof(WCHAR)] = '\0'; - - if (NULL != lpFilePart && BufferU.Length != 0) - { - *lpFilePart = strrchr (lpBuffer, '\\') + 1; - } - } - } - -Cleanup: - RtlFreeHeap (RtlGetProcessHeap (), - 0, - PathU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - FileNameU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - ExtensionU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - BufferU.Buffer); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return 0; - } - - return RetValue; -} - - -/*********************************************************************** - * ContainsPath (Wine name: contains_pathW) - * - * Check if the file name contains a path; helper for SearchPathW. - * A relative path is not considered a path unless it starts with ./ or ../ - */ -static -BOOL -ContainsPath(LPCWSTR name) -{ - if (RtlDetermineDosPathNameType_U(name) != RtlPathTypeRelative) return TRUE; - if (name[0] != '.') return FALSE; - if (name[1] == '/' || name[1] == '\\' || name[1] == '\0') return TRUE; - return (name[1] == '.' && (name[2] == '/' || name[2] == '\\')); -} - - -/* - * @implemented - */ -DWORD -WINAPI -SearchPathW(LPCWSTR lpPath, - LPCWSTR lpFileName, - LPCWSTR lpExtension, - DWORD nBufferLength, - LPWSTR lpBuffer, - LPWSTR *lpFilePart) -{ - DWORD ret = 0; - - if (!lpFileName || !lpFileName[0]) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - /* If the name contains an explicit path, ignore the path */ - if (ContainsPath(lpFileName)) - { - /* try first without extension */ - if (RtlDoesFileExists_U(lpFileName)) - return GetFullPathNameW(lpFileName, nBufferLength, lpBuffer, lpFilePart); - - if (lpExtension) - { - LPCWSTR p = wcsrchr(lpFileName, '.'); - if (p && !strchr((const char *)p, '/') && !wcschr( p, '\\' )) - lpExtension = NULL; /* Ignore the specified extension */ - } - - /* Allocate a buffer for the file name and extension */ - if (lpExtension) - { - LPWSTR tmp; - DWORD len = wcslen(lpFileName) + wcslen(lpExtension); - - if (!(tmp = RtlAllocateHeap(RtlGetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) - { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - wcscpy(tmp, lpFileName); - wcscat(tmp, lpExtension); - if (RtlDoesFileExists_U(tmp)) - ret = GetFullPathNameW(tmp, nBufferLength, lpBuffer, lpFilePart); - RtlFreeHeap(RtlGetProcessHeap(), 0, tmp); - } - } - else if (lpPath && lpPath[0]) /* search in the specified path */ - { - ret = RtlDosSearchPath_U(lpPath, - lpFileName, - lpExtension, - nBufferLength * sizeof(WCHAR), - lpBuffer, - lpFilePart) / sizeof(WCHAR); - } - else /* search in the default path */ - { - WCHAR *DllPath = GetDllLoadPath(NULL); - - if (DllPath) - { - ret = RtlDosSearchPath_U(DllPath, - lpFileName, - lpExtension, - nBufferLength * sizeof(WCHAR), - lpBuffer, - lpFilePart) / sizeof(WCHAR); - RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath); - } - else - { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - } - - if (!ret) SetLastError(ERROR_FILE_NOT_FOUND); - - return ret; -} - -/* - * @implemented - */ -BOOL -WINAPI -SetDllDirectoryW( - LPCWSTR lpPathName - ) -{ - UNICODE_STRING PathName; - - RtlInitUnicodeString(&PathName, lpPathName); - - RtlEnterCriticalSection(&BaseDllDirectoryLock); - if(PathName.Length > 0) - { - if(PathName.Length + sizeof(WCHAR) <= BaseDllDirectory.MaximumLength) - { - RtlCopyUnicodeString(&BaseDllDirectory, &PathName); - } - else - { - RtlFreeUnicodeString(&BaseDllDirectory); - if(!(BaseDllDirectory.Buffer = (PWSTR)RtlAllocateHeap(RtlGetProcessHeap(), - 0, - PathName.Length + sizeof(WCHAR)))) - { - RtlLeaveCriticalSection(&BaseDllDirectoryLock); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - BaseDllDirectory.Length = 0; - BaseDllDirectory.MaximumLength = PathName.Length + sizeof(WCHAR); - - RtlCopyUnicodeString(&BaseDllDirectory, &PathName); - } - } - else - { - RtlFreeUnicodeString(&BaseDllDirectory); - } - RtlLeaveCriticalSection(&BaseDllDirectoryLock); - - return TRUE; -} - -/* - * @implemented - */ -BOOL -WINAPI -SetDllDirectoryA( - LPCSTR lpPathName /* can be NULL */ - ) -{ - PWCHAR PathNameW=NULL; - - if(lpPathName) - { - if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) - return FALSE; - } - - return SetDllDirectoryW(PathNameW); -} - -/* - * @implemented - */ -DWORD -WINAPI -GetDllDirectoryW( - DWORD nBufferLength, - LPWSTR lpBuffer - ) -{ - DWORD Ret; - - RtlEnterCriticalSection(&BaseDllDirectoryLock); - if(nBufferLength > 0) - { - Ret = BaseDllDirectory.Length / sizeof(WCHAR); - if(Ret > nBufferLength - 1) - { - Ret = nBufferLength - 1; - } - - if(Ret > 0) - { - RtlCopyMemory(lpBuffer, BaseDllDirectory.Buffer, Ret * sizeof(WCHAR)); - } - lpBuffer[Ret] = L'\0'; - } - else - { - /* include termination character, even if the string is empty! */ - Ret = (BaseDllDirectory.Length / sizeof(WCHAR)) + 1; - } - RtlLeaveCriticalSection(&BaseDllDirectoryLock); - - return Ret; -} - -/* - * @implemented - */ -DWORD -WINAPI -GetDllDirectoryA( - DWORD nBufferLength, - LPSTR lpBuffer - ) -{ - WCHAR BufferW[MAX_PATH]; - DWORD ret; - - ret = GetDllDirectoryW(MAX_PATH, BufferW); - - if (!ret) - return 0; - - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - return FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); -} - - -/* - * @implemented - */ -BOOL WINAPI -NeedCurrentDirectoryForExePathW(LPCWSTR ExeName) -{ - static const WCHAR env_name[] = {'N','o','D','e','f','a','u','l','t', - 'C','u','r','r','e','n','t', - 'D','i','r','e','c','t','o','r','y', - 'I','n','E','x','e','P','a','t','h',0}; - WCHAR env_val; - - /* MSDN mentions some 'registry location'. We do not use registry. */ - FIXME("(%s): partial stub\n", debugstr_w(ExeName)); - - if (wcschr(ExeName, L'\\')) - return TRUE; - - /* Check the existence of the variable, not value */ - if (!GetEnvironmentVariableW( env_name, &env_val, 1 )) - return TRUE; - - return FALSE; -} - - -/* - * @implemented - */ -BOOL WINAPI -NeedCurrentDirectoryForExePathA(LPCSTR ExeName) -{ - WCHAR *ExeNameW; - - if (!(ExeNameW = FilenameA2W(ExeName, FALSE))) - return TRUE; - - return NeedCurrentDirectoryForExePathW(ExeNameW); -} - - - - - -/*********************************************************************** - * @implemented - * - * GetLongPathNameW (KERNEL32.@) - * - * NOTES - * observed (Win2000): - * shortpath=NULL: LastError=ERROR_INVALID_PARAMETER, ret=0 - * shortpath="": LastError=ERROR_PATH_NOT_FOUND, ret=0 - */ -DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen ) -{ -#define MAX_PATHNAME_LEN 1024 - - WCHAR tmplongpath[MAX_PATHNAME_LEN]; - LPCWSTR p; - DWORD sp = 0, lp = 0; - DWORD tmplen; - BOOL unixabsolute; - WIN32_FIND_DATAW wfd; - HANDLE goit; - - if (!shortpath) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - if (!shortpath[0]) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return 0; - } - - TRACE("GetLongPathNameW(%s,%p,%ld)\n", shortpath, longpath, longlen); - - if (shortpath[0] == '\\' && shortpath[1] == '\\') - { - WARN("ERR: UNC pathname %s\n", shortpath); - lstrcpynW( longpath, shortpath, longlen ); - return wcslen(longpath); - } - unixabsolute = (shortpath[0] == '/'); - /* check for drive letter */ - if (!unixabsolute && shortpath[1] == ':' ) - { - tmplongpath[0] = shortpath[0]; - tmplongpath[1] = ':'; - lp = sp = 2; - } - - while (shortpath[sp]) - { - /* check for path delimiters and reproduce them */ - if (shortpath[sp] == '\\' || shortpath[sp] == '/') - { - if (!lp || tmplongpath[lp-1] != '\\') - { - /* strip double "\\" */ - tmplongpath[lp++] = '\\'; - } - tmplongpath[lp] = 0; /* terminate string */ - sp++; - continue; - } - - p = shortpath + sp; - if (sp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) - { - tmplongpath[lp++] = *p++; - tmplongpath[lp++] = *p++; - } - for (; *p && *p != '/' && *p != '\\'; p++); - tmplen = p - (shortpath + sp); - lstrcpynW(tmplongpath + lp, shortpath + sp, tmplen + 1); - /* Check if the file exists and use the existing file name */ - goit = FindFirstFileW(tmplongpath, &wfd); - if (goit == INVALID_HANDLE_VALUE) - { - TRACE("not found %s!\n", tmplongpath); - SetLastError ( ERROR_FILE_NOT_FOUND ); - return 0; - } - FindClose(goit); - wcscpy(tmplongpath + lp, wfd.cFileName); - lp += wcslen(tmplongpath + lp); - sp += tmplen; - } - tmplen = wcslen(shortpath) - 1; - if ((shortpath[tmplen] == '/' || shortpath[tmplen] == '\\') && - (tmplongpath[lp - 1] != '/' && tmplongpath[lp - 1] != '\\')) - tmplongpath[lp++] = shortpath[tmplen]; - tmplongpath[lp] = 0; - - tmplen = wcslen(tmplongpath) + 1; - if (tmplen <= longlen) - { - wcscpy(longpath, tmplongpath); - TRACE("returning %s\n", longpath); - tmplen--; /* length without 0 */ - } - - return tmplen; -} - - - -/*********************************************************************** - * GetLongPathNameA (KERNEL32.@) - */ -DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, DWORD longlen ) -{ - WCHAR *shortpathW; - WCHAR longpathW[MAX_PATH]; - DWORD ret; - - TRACE("GetLongPathNameA %s, %i\n",shortpath,longlen ); - - if (!(shortpathW = FilenameA2W( shortpath, FALSE ))) - return 0; - - ret = GetLongPathNameW(shortpathW, longpathW, MAX_PATH); - - if (!ret) return 0; - if (ret > MAX_PATH) - { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return 0; - } - - return FilenameW2A_FitOrFail(longpath, longlen, longpathW, ret+1 ); -} - /* EOF */ Added: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c (added) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Nov 6 02:00:56 2011 @@ -1,0 +1,817 @@ +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/client/path.c + * PURPOSE: Handles path APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *******************************************************************/ + +#include <k32.h> + +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +UNICODE_STRING BaseDllDirectory; +UNICODE_STRING NoDefaultCurrentDirectoryInExePath = RTL_CONSTANT_STRING(L"NoDefaultCurrentDirectoryInExePath"); + +/* FUNCTIONS ******************************************************************/ + +BOOL +WINAPI +BasepIsCurDirAllowedForPlainExeNames(VOID) +{ + NTSTATUS Status; + UNICODE_STRING EmptyString; + + RtlInitEmptyUnicodeString(&EmptyString, NULL, 0); + Status = RtlQueryEnvironmentVariable_U(0, + &NoDefaultCurrentDirectoryInExePath, + &EmptyString); + return NT_SUCCESS(Status); +} + +/* + * @implemented + */ +BOOL +WINAPI +SetDllDirectoryW(IN LPCWSTR lpPathName) +{ + UNICODE_STRING OldDirectory, DllDirectory; + + if (lpPathName) + { + if (wcschr(lpPathName, ';')) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!RtlCreateUnicodeString(&DllDirectory, lpPathName)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + else + { + RtlInitUnicodeString(&DllDirectory, 0); + } + + RtlEnterCriticalSection(&BaseDllDirectoryLock); + + OldDirectory = BaseDllDirectory; + BaseDllDirectory = DllDirectory; + + RtlLeaveCriticalSection(&BaseDllDirectoryLock); + + RtlFreeUnicodeString(&OldDirectory); + return 1; +} + +/* + * @implemented + */ +BOOL +WINAPI +SetDllDirectoryA(IN LPCSTR lpPathName) +{ + ANSI_STRING AnsiDllDirectory; + UNICODE_STRING OldDirectory, DllDirectory; + NTSTATUS Status; + + if (lpPathName) + { + if (strchr(lpPathName, ';')) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + Status = RtlInitAnsiStringEx(&AnsiDllDirectory, lpPathName); + if (NT_SUCCESS(Status)) + { + Status = Basep8BitStringToUnicodeString(&DllDirectory, + &AnsiDllDirectory, + TRUE); + } + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + } + else + { + RtlInitUnicodeString(&DllDirectory, 0); + } + + RtlEnterCriticalSection(&BaseDllDirectoryLock); + + OldDirectory = BaseDllDirectory; + BaseDllDirectory = DllDirectory; + + RtlLeaveCriticalSection(&BaseDllDirectoryLock); + + RtlFreeUnicodeString(&OldDirectory); + return 1; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetDllDirectoryW(IN DWORD nBufferLength, + OUT LPWSTR lpBuffer) +{ + ULONG Length; + + RtlEnterCriticalSection(&BaseDllDirectoryLock); + + if ((nBufferLength * sizeof(WCHAR)) > BaseDllDirectory.Length) + { + RtlCopyMemory(lpBuffer, BaseDllDirectory.Buffer, BaseDllDirectory.Length); + Length = BaseDllDirectory.Length / sizeof(WCHAR); + lpBuffer[Length] = UNICODE_NULL; + } + else + { + Length = (BaseDllDirectory.Length + sizeof(UNICODE_NULL)) / sizeof(WCHAR); + if (lpBuffer) *lpBuffer = UNICODE_NULL; + } + + RtlLeaveCriticalSection(&BaseDllDirectoryLock); + return Length; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetDllDirectoryA(IN DWORD nBufferLength, + OUT LPSTR lpBuffer) +{ + NTSTATUS Status; + ANSI_STRING AnsiDllDirectory; + ULONG Length; + + RtlInitEmptyAnsiString(&AnsiDllDirectory, lpBuffer, 0); + + RtlEnterCriticalSection(&BaseDllDirectoryLock); + + Length = BasepUnicodeStringTo8BitSize(&BaseDllDirectory); + if (Length > nBufferLength) + { + Status = STATUS_SUCCESS; + if (lpBuffer) *lpBuffer = ANSI_NULL; + } + else + { + --Length; + Status = BasepUnicodeStringTo8BitString(&AnsiDllDirectory, + &BaseDllDirectory, + FALSE); + } + + RtlLeaveCriticalSection(&BaseDllDirectoryLock); + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + Length = 0; + if (lpBuffer) *lpBuffer = ANSI_NULL; + } + + return Length; +} + +/* + * @implemented + */ +BOOL +WINAPI +NeedCurrentDirectoryForExePathW(IN LPCWSTR ExeName) +{ + if (wcschr(ExeName, '\\')) return TRUE; + + return BasepIsCurDirAllowedForPlainExeNames(); +} + +/* + * @implemented + */ +BOOL +WINAPI +NeedCurrentDirectoryForExePathA(IN LPCSTR ExeName) +{ + if (strchr(ExeName, '\\')) return TRUE; + + return BasepIsCurDirAllowedForPlainExeNames(); +} + +/* + * @implemented + */ +DWORD +WINAPI +GetFullPathNameA ( + LPCSTR lpFileName, + DWORD nBufferLength, + LPSTR lpBuffer, + LPSTR *lpFilePart + ) +{ + WCHAR BufferW[MAX_PATH]; + PWCHAR FileNameW; + DWORD ret; + LPWSTR FilePartW = NULL; + + DPRINT("GetFullPathNameA(lpFileName %s, nBufferLength %d, lpBuffer %p, " + "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); + + if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) + return 0; + + ret = GetFullPathNameW(FileNameW, MAX_PATH, BufferW, &FilePartW); + + if (!ret) + return 0; + + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + ret = FilenameW2A_FitOrFail(lpBuffer, nBufferLength, BufferW, ret+1); + + if (ret < nBufferLength && lpFilePart) + { + /* if the path closed with '\', FilePart is NULL */ + if (!FilePartW) + *lpFilePart=NULL; + else + *lpFilePart = (FilePartW - BufferW) + lpBuffer; + } + + DPRINT("GetFullPathNameA ret: lpBuffer %s lpFilePart %s\n", + lpBuffer, (lpFilePart == NULL) ? "NULL" : *lpFilePart); + + return ret; +} + + +/* + * @implemented + */ +DWORD +WINAPI +GetFullPathNameW(IN LPCWSTR lpFileName, + IN DWORD nBufferLength, + IN LPWSTR lpBuffer, + OUT LPWSTR *lpFilePart) +{ + return RtlGetFullPathName_U((LPWSTR)lpFileName, + nBufferLength * sizeof(WCHAR), + lpBuffer, + lpFilePart) / sizeof(WCHAR); +} + + +/* + * NOTE: Copied from Wine. + * @implemented + */ +DWORD +WINAPI +GetShortPathNameA ( + LPCSTR longpath, + LPSTR shortpath, + DWORD shortlen + ) +{ + PWCHAR LongPathW; + WCHAR ShortPathW[MAX_PATH]; + DWORD ret; + + if (!longpath) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!(LongPathW = FilenameA2W(longpath, FALSE))) + return 0; + + ret = GetShortPathNameW(LongPathW, ShortPathW, MAX_PATH); + + if (!ret) + return 0; + + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + return FilenameW2A_FitOrFail(shortpath, shortlen, ShortPathW, ret+1); +} + + +/* + * NOTE: Copied from Wine. + * @implemented + */ +DWORD +WINAPI +GetShortPathNameW ( + LPCWSTR longpath, + LPWSTR shortpath, + DWORD shortlen + ) +{ + WCHAR tmpshortpath[MAX_PATH]; + LPCWSTR p; + DWORD sp = 0, lp = 0; + DWORD tmplen; + WIN32_FIND_DATAW wfd; + HANDLE goit; + UNICODE_STRING ustr; + WCHAR ustr_buf[8+1+3+1]; + + DPRINT("GetShortPathNameW: %S\n",longpath); + + if (!longpath) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!longpath[0]) + { + SetLastError(ERROR_BAD_PATHNAME); + return 0; + } + + /* check for drive letter */ + if (longpath[0] != '/' && longpath[1] == ':' ) + { + tmpshortpath[0] = longpath[0]; + tmpshortpath[1] = ':'; + sp = lp = 2; + } + + ustr.Buffer = ustr_buf; + ustr.Length = 0; + ustr.MaximumLength = sizeof(ustr_buf); + + while (longpath[lp]) + { + /* check for path delimiters and reproduce them */ + if (longpath[lp] == '\\' || longpath[lp] == '/') + { + if (!sp || tmpshortpath[sp-1] != '\\') + { + /* strip double "\\" */ + tmpshortpath[sp] = '\\'; + sp++; + } + tmpshortpath[sp] = 0; /* terminate string */ + lp++; + continue; + } + + for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); + tmplen = p - (longpath + lp); + lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); + /* Check, if the current element is a valid dos name */ + if (tmplen <= 8+1+3) + { + BOOLEAN spaces; + memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR)); + ustr_buf[tmplen] = '\0'; + ustr.Length = (USHORT)tmplen * sizeof(WCHAR); + if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces) + { + sp += tmplen; + lp += tmplen; + continue; + } + } + + /* Check if the file exists and use the existing short file name */ + goit = FindFirstFileW(tmpshortpath, &wfd); + if (goit == INVALID_HANDLE_VALUE) goto notfound; + FindClose(goit); + lstrcpyW(tmpshortpath + sp, wfd.cAlternateFileName); + sp += lstrlenW(tmpshortpath + sp); + lp += tmplen; + } + tmpshortpath[sp] = 0; + + tmplen = lstrlenW(tmpshortpath) + 1; + if (tmplen <= shortlen) + { + lstrcpyW(shortpath, tmpshortpath); + tmplen--; /* length without 0 */ + } + + return tmplen; + + notfound: + SetLastError ( ERROR_FILE_NOT_FOUND ); + return 0; +} + + +/* + * @implemented + */ +DWORD +WINAPI +SearchPathA ( + LPCSTR lpPath, + LPCSTR lpFileName, + LPCSTR lpExtension, + DWORD nBufferLength, + LPSTR lpBuffer, + LPSTR *lpFilePart + ) +{ + UNICODE_STRING PathU = { 0, 0, NULL }; + UNICODE_STRING FileNameU = { 0, 0, NULL }; + UNICODE_STRING ExtensionU = { 0, 0, NULL }; + UNICODE_STRING BufferU = { 0, 0, NULL }; + ANSI_STRING Path; + ANSI_STRING FileName; + ANSI_STRING Extension; + ANSI_STRING Buffer; + PWCHAR FilePartW; + DWORD RetValue = 0; + NTSTATUS Status = STATUS_SUCCESS; + + if (!lpFileName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + RtlInitAnsiString (&Path, + (LPSTR)lpPath); + RtlInitAnsiString (&FileName, + (LPSTR)lpFileName); + RtlInitAnsiString (&Extension, + (LPSTR)lpExtension); + + /* convert ansi (or oem) strings to unicode */ + if (bIsFileApiAnsi) + { + Status = RtlAnsiStringToUnicodeString (&PathU, + &Path, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + + Status = RtlAnsiStringToUnicodeString (&FileNameU, + &FileName, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + + Status = RtlAnsiStringToUnicodeString (&ExtensionU, + &Extension, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + } + else + { + Status = RtlOemStringToUnicodeString (&PathU, + &Path, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + Status = RtlOemStringToUnicodeString (&FileNameU, + &FileName, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + + Status = RtlOemStringToUnicodeString (&ExtensionU, + &Extension, + TRUE); + if (!NT_SUCCESS(Status)) + goto Cleanup; + } + + BufferU.MaximumLength = min(nBufferLength * sizeof(WCHAR), USHRT_MAX); + BufferU.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), + 0, + BufferU.MaximumLength); + if (BufferU.Buffer == NULL) + { + Status = STATUS_NO_MEMORY; + goto Cleanup; + } + + Buffer.MaximumLength = min(nBufferLength, USHRT_MAX); + Buffer.Buffer = lpBuffer; + + RetValue = SearchPathW (NULL == lpPath ? NULL : PathU.Buffer, + NULL == lpFileName ? NULL : FileNameU.Buffer, + NULL == lpExtension ? NULL : ExtensionU.Buffer, + nBufferLength, + BufferU.Buffer, + &FilePartW); + + if (0 != RetValue) + { + BufferU.Length = wcslen(BufferU.Buffer) * sizeof(WCHAR); + /* convert ansi (or oem) string to unicode */ + if (bIsFileApiAnsi) + Status = RtlUnicodeStringToAnsiString(&Buffer, + &BufferU, + FALSE); + else + Status = RtlUnicodeStringToOemString(&Buffer, + &BufferU, + FALSE); + + if (NT_SUCCESS(Status) && Buffer.Buffer) + { + /* nul-terminate ascii string */ + Buffer.Buffer[BufferU.Length / sizeof(WCHAR)] = '\0'; + + if (NULL != lpFilePart && BufferU.Length != 0) + { + *lpFilePart = strrchr (lpBuffer, '\\') + 1; + } + } + } + +Cleanup: + RtlFreeHeap (RtlGetProcessHeap (), + 0, + PathU.Buffer); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + FileNameU.Buffer); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + ExtensionU.Buffer); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + BufferU.Buffer); + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return 0; + } + + return RetValue; +} + + +/*********************************************************************** + * ContainsPath (Wine name: contains_pathW) + * + * Check if the file name contains a path; helper for SearchPathW. + * A relative path is not considered a path unless it starts with ./ or ../ + */ +static +BOOL +ContainsPath(LPCWSTR name) +{ + if (RtlDetermineDosPathNameType_U(name) != RtlPathTypeRelative) return TRUE; + if (name[0] != '.') return FALSE; + if (name[1] == '/' || name[1] == '\\' || name[1] == '\0') return TRUE; + return (name[1] == '.' && (name[2] == '/' || name[2] == '\\')); +} + + +/* + * @implemented + */ +DWORD +WINAPI +SearchPathW(LPCWSTR lpPath, + LPCWSTR lpFileName, + LPCWSTR lpExtension, + DWORD nBufferLength, + LPWSTR lpBuffer, + LPWSTR *lpFilePart) +{ + DWORD ret = 0; + + if (!lpFileName || !lpFileName[0]) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + /* If the name contains an explicit path, ignore the path */ + if (ContainsPath(lpFileName)) + { + /* try first without extension */ + if (RtlDoesFileExists_U(lpFileName)) + return GetFullPathNameW(lpFileName, nBufferLength, lpBuffer, lpFilePart); + + if (lpExtension) + { + LPCWSTR p = wcsrchr(lpFileName, '.'); + if (p && !strchr((const char *)p, '/') && !wcschr( p, '\\' )) + lpExtension = NULL; /* Ignore the specified extension */ + } + + /* Allocate a buffer for the file name and extension */ + if (lpExtension) + { + LPWSTR tmp; + DWORD len = wcslen(lpFileName) + wcslen(lpExtension); + + if (!(tmp = RtlAllocateHeap(RtlGetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + wcscpy(tmp, lpFileName); + wcscat(tmp, lpExtension); + if (RtlDoesFileExists_U(tmp)) + ret = GetFullPathNameW(tmp, nBufferLength, lpBuffer, lpFilePart); + RtlFreeHeap(RtlGetProcessHeap(), 0, tmp); + } + } + else if (lpPath && lpPath[0]) /* search in the specified path */ + { + ret = RtlDosSearchPath_U(lpPath, + lpFileName, + lpExtension, + nBufferLength * sizeof(WCHAR), + lpBuffer, + lpFilePart) / sizeof(WCHAR); + } + else /* search in the default path */ + { + WCHAR *DllPath = GetDllLoadPath(NULL); + + if (DllPath) + { + ret = RtlDosSearchPath_U(DllPath, + lpFileName, + lpExtension, + nBufferLength * sizeof(WCHAR), + lpBuffer, + lpFilePart) / sizeof(WCHAR); + RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath); + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + } + + if (!ret) SetLastError(ERROR_FILE_NOT_FOUND); + + return ret; +} + +/*********************************************************************** + * @implemented + * + * GetLongPathNameW (KERNEL32.@) + * + * NOTES + * observed (Win2000): + * shortpath=NULL: LastError=ERROR_INVALID_PARAMETER, ret=0 + * shortpath="": LastError=ERROR_PATH_NOT_FOUND, ret=0 + */ +DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen ) +{ +#define MAX_PATHNAME_LEN 1024 + + WCHAR tmplongpath[MAX_PATHNAME_LEN]; + LPCWSTR p; + DWORD sp = 0, lp = 0; + DWORD tmplen; + BOOL unixabsolute; + WIN32_FIND_DATAW wfd; + HANDLE goit; + + if (!shortpath) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (!shortpath[0]) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return 0; + } + + DPRINT("GetLongPathNameW(%s,%p,%ld)\n", shortpath, longpath, longlen); + + if (shortpath[0] == '\\' && shortpath[1] == '\\') + { + DPRINT1("ERR: UNC pathname %s\n", shortpath); + lstrcpynW( longpath, shortpath, longlen ); + return wcslen(longpath); + } + unixabsolute = (shortpath[0] == '/'); + /* check for drive letter */ + if (!unixabsolute && shortpath[1] == ':' ) + { + tmplongpath[0] = shortpath[0]; + tmplongpath[1] = ':'; + lp = sp = 2; + } + + while (shortpath[sp]) + { + /* check for path delimiters and reproduce them */ + if (shortpath[sp] == '\\' || shortpath[sp] == '/') + { + if (!lp || tmplongpath[lp-1] != '\\') + { + /* strip double "\\" */ + tmplongpath[lp++] = '\\'; + } + tmplongpath[lp] = 0; /* terminate string */ + sp++; + continue; + } + + p = shortpath + sp; + if (sp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) + { + tmplongpath[lp++] = *p++; + tmplongpath[lp++] = *p++; + } + for (; *p && *p != '/' && *p != '\\'; p++); + tmplen = p - (shortpath + sp); + lstrcpynW(tmplongpath + lp, shortpath + sp, tmplen + 1); + /* Check if the file exists and use the existing file name */ + goit = FindFirstFileW(tmplongpath, &wfd); + if (goit == INVALID_HANDLE_VALUE) + { + DPRINT("not found %s!\n", tmplongpath); + SetLastError ( ERROR_FILE_NOT_FOUND ); + return 0; + } + FindClose(goit); + wcscpy(tmplongpath + lp, wfd.cFileName); + lp += wcslen(tmplongpath + lp); + sp += tmplen; + } + tmplen = wcslen(shortpath) - 1; + if ((shortpath[tmplen] == '/' || shortpath[tmplen] == '\\') && + (tmplongpath[lp - 1] != '/' && tmplongpath[lp - 1] != '\\')) + tmplongpath[lp++] = shortpath[tmplen]; + tmplongpath[lp] = 0; + + tmplen = wcslen(tmplongpath) + 1; + if (tmplen <= longlen) + { + wcscpy(longpath, tmplongpath); + DPRINT("returning %s\n", longpath); + tmplen--; /* length without 0 */ + } + + return tmplen; +} + + + +/*********************************************************************** + * GetLongPathNameA (KERNEL32.@) + */ +DWORD WINAPI GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, DWORD longlen ) +{ + WCHAR *shortpathW; + WCHAR longpathW[MAX_PATH]; + DWORD ret; + + DPRINT("GetLongPathNameA %s, %i\n",shortpath,longlen ); + + if (!(shortpathW = FilenameA2W( shortpath, FALSE ))) + return 0; + + ret = GetLongPathNameW(shortpathW, longpathW, MAX_PATH); + + if (!ret) return 0; + if (ret > MAX_PATH) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + return 0; + } + + return FilenameW2A_FitOrFail(longpath, longlen, longpathW, ret+1 ); +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/kernel32/client/path.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sun Nov 6 02:00:56 2011 @@ -37,6 +37,7 @@ <file>heapmem.c</file> <file>job.c</file> <file>loader.c</file> + <file>path.c</file> <file>perfcnt.c</file> <file>power.c</file> <file>proc.c</file>

1 0

[ion] 54308: [KERNEL32]: Actually properly support ANSI vs OEM SetFileAPI instead of assuming Unicode->ANSI for most things. Note this just adds support, there's still many wine-synched APIs that a...
by ion＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: ion Date: Sun Nov 6 01:47:49 2011 New Revision: 54308 URL: http://svn.reactos.org/svn/reactos?rev=54308&view=rev Log: [KERNEL32]: Actually properly support ANSI vs OEM SetFileAPI instead of assuming Unicode->ANSI for most things. Note this just adds support, there's still many wine-synched APIs that are using the FileNameA2W hacks and similar, which force ANSI. But it's a step in the right direction. Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c trunk/reactos/dll/win32/kernel32/client/utils.c trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/client/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/file.c [iso-8859-1] Sun Nov 6 01:47:49 2011 @@ -175,6 +175,33 @@ return ret; } +ULONG +NTAPI +BasepUnicodeStringToOemSize(IN PUNICODE_STRING String) +{ + return RtlUnicodeStringToOemSize(String); +} + +ULONG +NTAPI +BasepOemStringToUnicodeSize(IN PANSI_STRING String) +{ + return RtlOemStringToUnicodeSize(String); +} + +ULONG +NTAPI +BasepUnicodeStringToAnsiSize(IN PUNICODE_STRING String) +{ + return RtlUnicodeStringToAnsiSize(String); +} + +ULONG +NTAPI +BasepAnsiStringToUnicodeSize(IN PANSI_STRING String) +{ + return RtlAnsiStringToUnicodeSize(String); +} /* * @implemented @@ -185,6 +212,9 @@ { /* Set the correct Base Api */ Basep8BitStringToUnicodeString = (PRTL_CONVERT_STRING)RtlOemStringToUnicodeString; + BasepUnicodeStringTo8BitString = RtlUnicodeStringToOemString; + BasepUnicodeStringTo8BitSize = BasepUnicodeStringToOemSize; + Basep8BitStringToUnicodeSize = BasepOemStringToUnicodeSize; /* FIXME: Old, deprecated way */ bIsFileApiAnsi = FALSE; @@ -200,7 +230,10 @@ { /* Set the correct Base Api */ Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; - + BasepUnicodeStringTo8BitString = RtlUnicodeStringToAnsiString; + BasepUnicodeStringTo8BitSize = BasepUnicodeStringToAnsiSize; + Basep8BitStringToUnicodeSize = BasepAnsiStringToUnicodeSize; + /* FIXME: Old, deprecated way */ bIsFileApiAnsi = TRUE; } Modified: trunk/reactos/dll/win32/kernel32/client/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/utils.c [iso-8859-1] Sun Nov 6 01:47:49 2011 @@ -22,6 +22,10 @@ /* GLOBALS ********************************************************************/ PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; +PRTL_CONVERT_STRINGA BasepUnicodeStringTo8BitString; +PRTL_COUNT_STRING BasepUnicodeStringTo8BitSize; +PRTL_COUNT_STRINGA Basep8BitStringToUnicodeSize; + UNICODE_STRING Restricted = RTL_CONSTANT_STRING(L"Restricted"); /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sun Nov 6 01:47:49 2011 @@ -25,9 +25,9 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ DPRINT1("%s() is UNIMPLEMENTED!\n", __FUNCTION__) -#define debugstr_a +#define debugstr_a #define debugstr_w -#define wine_dbgstr_w +#define wine_dbgstr_w #define debugstr_guid #include "wine/unicode.h" @@ -70,7 +70,7 @@ /* Undocumented CreateProcess flag */ #define STARTF_SHELLPRIVATE 0x400 - + typedef struct _CODEPAGE_ENTRY { LIST_ENTRY Entry; @@ -169,14 +169,14 @@ BaseFormatObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes, IN PSECURITY_ATTRIBUTES SecurityAttributes OPTIONAL, IN PUNICODE_STRING ObjectName); - + NTSTATUS WINAPI BaseCreateStack(HANDLE hProcess, SIZE_T StackReserve, SIZE_T StackCommit, PINITIAL_TEB InitialTeb); - + VOID WINAPI BaseInitializeContext(IN PCONTEXT Context, @@ -184,7 +184,7 @@ IN PVOID StartAddress, IN PVOID StackAddress, IN ULONG ContextType); - + VOID WINAPI BaseThreadStartupThunk(VOID); @@ -192,13 +192,13 @@ VOID WINAPI BaseProcessStartThunk(VOID); - + __declspec(noreturn) VOID WINAPI BaseThreadStartup(LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter); - + VOID WINAPI BaseFreeThreadStack(IN HANDLE hProcess, @@ -214,7 +214,7 @@ VOID WINAPI BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress); - + PVOID WINAPI BasepIsRealtimeAllowed(IN BOOLEAN Keep); @@ -223,7 +223,7 @@ WINAPI BasepAnsiStringToHeapUnicodeString(IN LPCSTR AnsiString, OUT LPWSTR* UnicodeString); - + PUNICODE_STRING WINAPI Basep8BitStringToStaticUnicodeString(IN LPCSTR AnsiString); @@ -232,14 +232,25 @@ WINAPI Basep8BitStringToDynamicUnicodeString(OUT PUNICODE_STRING UnicodeString, IN LPCSTR String); - -#define BasepUnicodeStringTo8BitString RtlUnicodeStringToAnsiString typedef NTSTATUS (NTAPI *PRTL_CONVERT_STRING)(IN PUNICODE_STRING UnicodeString, IN PANSI_STRING AnsiString, IN BOOLEAN AllocateMemory); - + +typedef ULONG (NTAPI *PRTL_COUNT_STRING)(IN PUNICODE_STRING UnicodeString); + +typedef NTSTATUS (NTAPI *PRTL_CONVERT_STRINGA)(IN PANSI_STRING AnsiString, + IN PCUNICODE_STRING UnicodeString, + IN BOOLEAN AllocateMemory); + +typedef ULONG (NTAPI *PRTL_COUNT_STRINGA)(IN PANSI_STRING UnicodeString); + + extern PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; +extern PRTL_CONVERT_STRINGA BasepUnicodeStringTo8BitString; +extern PRTL_COUNT_STRING BasepUnicodeStringTo8BitSize; +extern PRTL_COUNT_STRINGA Basep8BitStringToUnicodeSize; + extern HANDLE BaseNamedObjectDirectory; HANDLE

1 0

[ion] 54307: [NTDLL]: Export RtlImageNtHeaderEx and LodrLoadAlternateResourceModule. [NDK]: Add LdrLoadAlternateResourceModule. Fix RtlDosApplyFileIsolationRedirection_UStr and add flags. [NTDLL]: ...
by ion＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: ion Date: Sun Nov 6 01:34:06 2011 New Revision: 54307 URL: http://svn.reactos.org/svn/reactos?rev=54307&view=rev Log: [NTDLL]: Export RtlImageNtHeaderEx and LodrLoadAlternateResourceModule. [NDK]: Add LdrLoadAlternateResourceModule. Fix RtlDosApplyFileIsolationRedirection_UStr and add flags. [NTDLL]: Halfplement LdrLoad/UnloadAlternateResourceModule. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/include/ndk/ldrfuncs.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -88,7 +88,7 @@ ;@ stdcall LdrHotPatchRoutine ;@ stdcall LdrInitShimEngineDynamic @ stdcall LdrInitializeThunk(long long long long) -;@ stdcall LdrLoadAlternateResourceModule +@ stdcall LdrLoadAlternateResourceModule(ptr ptr) @ stdcall LdrLoadDll(wstr long ptr ptr) @ stdcall LdrLockLoaderLock(long ptr ptr) ;@ stdcall LdrOpenImageFileOptionsKey ; 5.2 SP1 and higher @@ -566,7 +566,7 @@ @ stdcall RtlDllShutdownInProgress() @ stdcall RtlDnsHostNameToComputerName(ptr ptr long) @ stdcall RtlDoesFileExists_U(wstr) -;@ stdcall RtlDosApplyFileIsolationRedirection_Ustr +@ stdcall RtlDosApplyFileIsolationRedirection_Ustr(long ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RtlDosPathNameToNtPathName_U(wstr ptr ptr ptr) ;@ stdcall RtlDosPathNameToNtPathName_U_WithStatus ; 5.2 SP1, and higher @ stdcall RtlDosPathNameToRelativeNtPathName_U(ptr ptr ptr ptr) ; CHECKME @@ -690,7 +690,7 @@ @ stdcall RtlIdentifierAuthoritySid(ptr) @ stdcall RtlImageDirectoryEntryToData(long long long ptr) @ stdcall RtlImageNtHeader(long) -;@ stdcall RtlImageNtHeaderEx +@ stdcall RtlImageNtHeaderEx(long ptr double ptr) @ stdcall RtlImageRvaToSection(ptr long long) @ stdcall RtlImageRvaToVa(ptr long long ptr) @ stdcall RtlImpersonateSelf(long) Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -19,8 +19,17 @@ LONG LdrpLoaderLockAcquisitonCount; BOOLEAN LdrpShowRecursiveLoads, LdrpBreakOnRecursiveDllLoads; UNICODE_STRING LdrApiDefaultExtension = RTL_CONSTANT_STRING(L".DLL"); +ULONG AlternateResourceModuleCount; /* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +LdrAlternateResourcesEnabled(VOID) +{ + /* ReactOS does not support this */ + return FALSE; +} ULONG_PTR FORCEINLINE @@ -1524,15 +1533,46 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI LdrUnloadAlternateResourceModule(IN PVOID BaseAddress) { - //static BOOLEAN WarnedOnce = FALSE; - //if (WarnedOnce == FALSE) { UNIMPLEMENTED; WarnedOnce = TRUE; } - return FALSE; -} - + ULONG_PTR Cookie; + + /* Acquire the loader lock */ + LdrLockLoaderLock(TRUE, NULL, &Cookie); + + /* Check if there's any alternate resources loaded */ + if (AlternateResourceModuleCount) + { + UNIMPLEMENTED; + } + + /* Release the loader lock */ + LdrUnlockLoaderLock(1, Cookie); + + /* All done */ + return TRUE; +} + +/* FIXME: Add to ntstatus.mc */ +#define STATUS_MUI_FILE_NOT_FOUND ((NTSTATUS)0xC00B0001L) + +/* + * @implemented + */ +NTSTATUS +NTAPI +LdrLoadAlternateResourceModule(IN PVOID Module, + IN PWSTR Buffer) +{ + /* Is MUI Support enabled? */ + if (!LdrAlternateResourcesEnabled()) return STATUS_SUCCESS; + + UNIMPLEMENTED; + return STATUS_MUI_FILE_NOT_FOUND; +} + /* EOF */ Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -518,21 +518,21 @@ return ImageBase; } +/* + * @unimplemented + */ NTSYSAPI NTSTATUS NTAPI -RtlDosApplyFileIsolationRedirection_Ustr( - IN BOOLEAN Unknown, - IN PUNICODE_STRING OriginalName, - IN PUNICODE_STRING Extension, - IN OUT PUNICODE_STRING RedirectedName, - IN OUT PUNICODE_STRING RedirectedName2, - IN OUT PUNICODE_STRING *OriginalName2, - IN PVOID Unknown1, - IN PVOID Unknown2, - IN PVOID Unknown3 -) +RtlDosApplyFileIsolationRedirection_Ustr(IN ULONG Flags, + IN PUNICODE_STRING OriginalName, + IN PUNICODE_STRING Extension, + IN OUT PUNICODE_STRING StaticString, + IN OUT PUNICODE_STRING DynamicString, + IN OUT PUNICODE_STRING *NewName, + IN PULONG NewFlags, + IN PSIZE_T FileNameSize, + IN PSIZE_T RequiredLength) { return STATUS_SXS_KEY_NOT_FOUND; } - Modified: trunk/reactos/include/ndk/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrfuncs.h [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -56,6 +56,13 @@ IN PLDR_RESOURCE_INFO ResourceInfo, IN ULONG Level, OUT PIMAGE_RESOURCE_DIRECTORY *ResourceDirectory +); + +NTSTATUS +NTAPI +LdrLoadAlternateResourceModule( + IN PVOID Module, + IN PWSTR Buffer ); BOOLEAN Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -3275,15 +3275,15 @@ NTSTATUS NTAPI RtlDosApplyFileIsolationRedirection_Ustr( - IN BOOLEAN Unknown, + IN ULONG Flags, IN PUNICODE_STRING OriginalName, IN PUNICODE_STRING Extension, - IN OUT PUNICODE_STRING RedirectedName, - IN OUT PUNICODE_STRING RedirectedName2, - IN OUT PUNICODE_STRING *OriginalName2, - IN PVOID Unknown1, - IN PVOID Unknown2, - IN PVOID Unknown3 + IN OUT PUNICODE_STRING StaticString, + IN OUT PUNICODE_STRING DynamicString, + IN OUT PUNICODE_STRING *NewName, + IN PULONG NewFlags, + IN PSIZE_T FileNameSize, + IN PSIZE_T RequiredLength ); NTSYSAPI Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Sun Nov 6 01:34:06 2011 @@ -250,6 +250,11 @@ // RtlImageNtHeaderEx Flags // #define RTL_IMAGE_NT_HEADER_EX_FLAG_NO_RANGE_CHECK 0x00000001 + +// +// RtlDosApplyFileIsolationRedirection_Ustr Flags +// +#define RTL_DOS_APPLY_FILE_REDIRECTION_USTR_FLAG_RESPECT_DOT_LOCAL 0x01 // // Codepages

1 0

[pschweitzer] 54306: [KERNEL32] Fix c/p mistake. Brought to you by Vincenzo Cotugno
by pschweitzer＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: pschweitzer Date: Sun Nov 6 00:09:33 2011 New Revision: 54306 URL: http://svn.reactos.org/svn/reactos?rev=54306&view=rev Log: [KERNEL32] Fix c/p mistake. Brought to you by Vincenzo Cotugno Modified: trunk/reactos/dll/win32/kernel32/client/job.c Modified: trunk/reactos/dll/win32/kernel32/client/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] Sun Nov 6 00:09:33 2011 @@ -132,7 +132,7 @@ ExpectedSize = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION); JobInfo = &LocalInfo; } - else if (JobObjectInformationClass == JobObjectBasicLimitInformation) + else if (JobObjectInformationClass == JobObjectExtendedLimitInformation) { ExpectedSize = sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION); JobInfo = &LocalInfo; @@ -226,7 +226,7 @@ ExpectedSize = sizeof(JOBOBJECT_BASIC_LIMIT_INFORMATION); JobInfo = &LocalInfo; } - else if (JobObjectInformationClass == JobObjectBasicLimitInformation) + else if (JobObjectInformationClass == JobObjectExtendedLimitInformation) { ExpectedSize = sizeof(JOBOBJECT_EXTENDED_LIMIT_INFORMATION); JobInfo = &LocalInfo;

1 0

[spetreolle] 54305: -Add missing struct to winnt.h.
by spetreolle＠svn.reactos.org 06 Nov '11

06 Nov '11

Author: spetreolle Date: Sun Nov 6 00:04:57 2011 New Revision: 54305 URL: http://svn.reactos.org/svn/reactos?rev=54305&view=rev Log: -Add missing struct to winnt.h. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Nov 6 00:04:57 2011 @@ -3223,6 +3223,12 @@ TokenImpersonation } TOKEN_TYPE,*PTOKEN_TYPE; +typedef enum _TOKEN_ELEVATION_TYPE { + TokenElevationTypeDefault = 1, + TokenElevationTypeFull, + TokenElevationTypeLimited, +} TOKEN_ELEVATION_TYPE, *PTOKEN_ELEVATION_TYPE; + #include <pshpack4.h> typedef struct _TOKEN_STATISTICS { LUID TokenId;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2011