Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[ekohl] 45366: GetServiceDisplayNameA/W and GetServiceKeyNameA/W must return an empty String if the given Buffer is too small. This fixes 6 tests.
by ekohl＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: ekohl Date: Sun Jan 31 23:22:50 2010 New Revision: 45366 URL: http://svn.reactos.org/svn/reactos?rev=45366&view=rev Log: GetServiceDisplayNameA/W and GetServiceKeyNameA/W must return an empty String if the given Buffer is too small. This fixes 6 tests. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c 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 Jan 31 23:22:50 2010 @@ -1289,6 +1289,8 @@ LPDWORD lpcchBuffer) { DWORD dwError; + LPSTR lpNameBuffer; + CHAR szEmptyName[] = ""; TRACE("GetServiceDisplayNameA() called\n"); TRACE("%p %s %p %p\n", hSCManager, @@ -1300,14 +1302,21 @@ return FALSE; } - if (!lpDisplayName) - *lpcchBuffer = 0; + if (!lpDisplayName || *lpcchBuffer < sizeof(CHAR)) + { + lpNameBuffer = szEmptyName; + *lpcchBuffer = sizeof(CHAR); + } + else + { + lpNameBuffer = lpDisplayName; + } RpcTryExcept { dwError = RGetServiceDisplayNameA((SC_RPC_HANDLE)hSCManager, lpServiceName, - lpDisplayName, + lpNameBuffer, lpcchBuffer); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -1315,8 +1324,6 @@ /* HACK: because of a problem with rpcrt4, rpcserver is hacked to return 6 for ERROR_SERVICE_DOES_NOT_EXIST */ dwError = ScmRpcStatusToWinError(RpcExceptionCode()); } - - RpcEndExcept; if (dwError != ERROR_SUCCESS) @@ -1342,6 +1349,8 @@ LPDWORD lpcchBuffer) { DWORD dwError; + LPWSTR lpNameBuffer; + WCHAR szEmptyName[] = L""; TRACE("GetServiceDisplayNameW() called\n"); @@ -1351,14 +1360,21 @@ return FALSE; } - if (!lpDisplayName) - *lpcchBuffer = 0; + if (!lpDisplayName || *lpcchBuffer < sizeof(WCHAR)) + { + lpNameBuffer = szEmptyName; + *lpcchBuffer = sizeof(WCHAR); + } + else + { + lpNameBuffer = lpDisplayName; + } RpcTryExcept { dwError = RGetServiceDisplayNameW((SC_RPC_HANDLE)hSCManager, lpServiceName, - lpDisplayName, + lpNameBuffer, lpcchBuffer); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -1390,6 +1406,8 @@ LPDWORD lpcchBuffer) { DWORD dwError; + LPSTR lpNameBuffer; + CHAR szEmptyName[] = ""; TRACE("GetServiceKeyNameA() called\n"); @@ -1399,23 +1417,21 @@ return FALSE; } - if (!lpDisplayName) - { - SetLastError(ERROR_INVALID_ADDRESS); - - if (!lpServiceName) - *lpcchBuffer = 1; - return FALSE; - } - - if (!lpServiceName) - *lpcchBuffer = 0; + if (!lpServiceName || *lpcchBuffer < sizeof(CHAR)) + { + lpNameBuffer = szEmptyName; + *lpcchBuffer = sizeof(CHAR); + } + else + { + lpNameBuffer = lpServiceName; + } RpcTryExcept { dwError = RGetServiceKeyNameA((SC_RPC_HANDLE)hSCManager, lpDisplayName, - lpServiceName, + lpNameBuffer, lpcchBuffer); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -1447,6 +1463,8 @@ LPDWORD lpcchBuffer) { DWORD dwError; + LPWSTR lpNameBuffer; + WCHAR szEmptyName[] = L""; TRACE("GetServiceKeyNameW() called\n"); @@ -1456,23 +1474,21 @@ return FALSE; } - if (!lpDisplayName) - { - SetLastError(ERROR_INVALID_ADDRESS); - - if (!lpServiceName) - *lpcchBuffer = 1; - return FALSE; - } - - if (!lpServiceName) - *lpcchBuffer = 0; + if (!lpServiceName || *lpcchBuffer < sizeof(WCHAR)) + { + lpNameBuffer = szEmptyName; + *lpcchBuffer = sizeof(WCHAR); + } + else + { + lpNameBuffer = lpServiceName; + } RpcTryExcept { dwError = RGetServiceKeyNameW((SC_RPC_HANDLE)hSCManager, lpDisplayName, - lpServiceName, + lpNameBuffer, lpcchBuffer); } RpcExcept(EXCEPTION_EXECUTE_HANDLER)

1 0

[cfinck] 45365: - Change version to 1.5-RC2. - Clear up the information in SVN-Readme.txt.
by cfinck＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: cfinck Date: Sun Jan 31 22:07:24 2010 New Revision: 45365 URL: http://svn.reactos.org/svn/reactos?rev=45365&view=rev Log: - Change version to 1.5-RC2. - Clear up the information in SVN-Readme.txt. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] Sun Jan 31 22:07:24 2010 @@ -1,5 +1,5 @@ ReactOS Build Environment - Version 1.5 for Unix-based operating systems + Version 1.5-RC2 for Unix-based operating systems Base package and i386 build tools by Colin Finck (colin(a)reactos.org) Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Sun Jan 31 22:07:24 2010 @@ -21,8 +21,8 @@ # RosBE-Unix Constants DEFAULT_INSTALL_DIR="/usr/local/RosBE" -KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5-RC1" -ROSBE_VERSION="1.5" +KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5-RC2" +ROSBE_VERSION="1.5-RC2" TARGET_ARCH="i386" source "$rs_scriptdir/scripts/rosbelibrary.sh" Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/s… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/sources/SVN-Readme.txt [iso-8859-1] Sun Jan 31 22:07:24 2010 @@ -1,25 +1,35 @@ -Put the following files into this directory: +Put the following files from the appropriate subdirectory of http://svn.reactos.org/RosBE-Sources into this directory. +The arrows tell you what these files contain (if you want to package them yourself). - binutils.tar.bz2 - --> containing the binutils source tree in a subdirectory "binutils" - Source is available here: http://www.gnu.org/software/binutils/ + --> Contains the Binutils source tree in a subdirectory "binutils". + Source is available here: http://www.gnu.org/software/binutils - gcc.tar.bz2 - --> containing the gcc source tree for C and C++ compilation in a subdirectory "gcc" - Source is available here: http://gcc.gnu.org/svn.html + --> Contains the GCC source tree (core and g++) in a subdirectory "gcc". + Source is available here: http://gcc.gnu.org + +- gmp.tar.bz2 + --> Contains the GMP source tree in a subdirectory "gmp". + Source is available here: http://gmplib.org - make.tar.bz2 - --> containing the make source tree in a subdirectory "make" + --> Contains the GNU Make source tree in a subdirectory "make". Source is available here: http://savannah.gnu.org/cvs/?group=make -- mingw-runtime.tar.bz2 - --> containing the "include" and "lib" subdirectories of the mingw-runtime package - Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435 +- mingw_runtime_dev.tar.bz2 + --> Created by RosBE-Windows' "buildtoolchain.sh" script from its mingw_runtime.tar.bz2 package. + That mingw_runtime.tar.bz2 package contains the MinGW Runtime source tree in a subdirectory "mingw_runtime". + Its source is available here: http://sourceforge.net/projects/mingw + +- mpfr.tar.bz2 + --> Contains the MPFR source tree in a subdirectory "mpfr". + Source is available here: http://mpfr.org - nasm.tar.bz2 - --> containing the nasm source tree in a subdirectory "nasm" - Source is available here: http://sourceforge.net/project/showfiles.php?group_id=6208 + --> Contains the NASM source tree in a subdirectory "nasm". + Source is available here: http://sourceforge.net/projects/nasm/files - w32api.tar.bz2 - --> containing the "include" and "lib" subdirectories of the w32api package - Source is available here: http://sourceforge.net/project/showfiles.php?group_id=2435 + --> Contains the "include" and "lib" subdirectories of the w32api package. + Source is available here: http://sourceforge.net/projects/mingw/files

1 0

[ekohl] 45364: [FORMATTING] - Fix indentation. No code changes.
by ekohl＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: ekohl Date: Sun Jan 31 22:00:45 2010 New Revision: 45364 URL: http://svn.reactos.org/svn/reactos?rev=45364&view=rev Log: [FORMATTING] - Fix indentation. No code changes. Modified: trunk/reactos/base/system/lsass/lsass.c Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] Sun Jan 31 22:00:45 2010 @@ -37,43 +37,42 @@ #include <debug.h> INT WINAPI -wWinMain( - IN HINSTANCE hInstance, - IN HINSTANCE hPrevInstance, - IN LPWSTR lpCmdLine, - IN INT nShowCmd) +wWinMain(IN HINSTANCE hInstance, + IN HINSTANCE hPrevInstance, + IN LPWSTR lpCmdLine, + IN INT nShowCmd) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("Local Security Authority Subsystem\n"); - DPRINT(" Initializing...\n"); + DPRINT("Local Security Authority Subsystem\n"); + DPRINT(" Initializing...\n"); - /* Initialize the LSA server DLL. */ - Status = LsapInitLsa(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("LsapInitLsa() failed (Status 0x%08lX)\n", Status); - goto ByeBye; - } + /* Initialize the LSA server DLL. */ + Status = LsapInitLsa(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsapInitLsa() failed (Status 0x%08lX)\n", Status); + goto ByeBye; + } #if 0 - /* Initialize the SAM server DLL. */ - Status = SamIInitialize(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SamIInitialize() failed (Status 0x%08lX)\n", Status); - goto ByeBye; - } + /* Initialize the SAM server DLL. */ + Status = SamIInitialize(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamIInitialize() failed (Status 0x%08lX)\n", Status); + goto ByeBye; + } #endif - /* FIXME: More initialization */ + /* FIXME: More initialization */ - DPRINT(" Done...\n"); + DPRINT(" Done...\n"); ByeBye: - NtTerminateThread(NtCurrentThread(), Status); + NtTerminateThread(NtCurrentThread(), Status); - return 0; + return 0; } /* EOF */

1 0

[fireball] 45363: [FORMATTING] - Reformat dma.c, no code change.
by fireball＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: fireball Date: Sun Jan 31 21:35:06 2010 New Revision: 45363 URL: http://svn.reactos.org/svn/reactos?rev=45363&view=rev Log: [FORMATTING] - Reformat dma.c, no code change. Modified: trunk/reactos/hal/halx86/generic/dma.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r…

1 0

[ekohl] 45362: - Implement RCreateServiceA. - Make CreateServiceA call RCreateServiceA instead of CreateServiceW.
by ekohl＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: ekohl Date: Sun Jan 31 21:28:04 2010 New Revision: 45362 URL: http://svn.reactos.org/svn/reactos?rev=45362&view=rev Log: - Implement RCreateServiceA. - Make CreateServiceA call RCreateServiceA instead of CreateServiceW. Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/service/scm.c 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 Jan 31 21:28:04 2010 @@ -3241,8 +3241,135 @@ DWORD dwPwSize, LPSC_RPC_HANDLE lpServiceHandle) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD dwError = ERROR_SUCCESS; + LPWSTR lpServiceNameW = NULL; + LPWSTR lpDisplayNameW = NULL; + LPWSTR lpBinaryPathNameW = NULL; + LPWSTR lpLoadOrderGroupW = NULL; + LPWSTR lpDependenciesW = NULL; + LPWSTR lpServiceStartNameW = NULL; + DWORD dwDependenciesLength = 0; + DWORD dwLength; + int len; + LPSTR lpStr; + + if (lpServiceName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, NULL, 0); + lpServiceNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpServiceNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, lpServiceNameW, len); + } + + if (lpDisplayName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, NULL, 0); + lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpDisplayNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpDisplayNameW, len); + } + + if (lpBinaryPathName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, NULL, 0); + lpBinaryPathNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpBinaryPathNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, lpBinaryPathNameW, len); + } + + if (lpLoadOrderGroup) + { + len = MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, NULL, 0); + lpLoadOrderGroupW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpLoadOrderGroupW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, lpLoadOrderGroupW, len); + } + + if (lpDependencies) + { + lpStr = (LPSTR)lpDependencies; + while (*lpStr) + { + dwLength = strlen(lpStr) + 1; + dwDependenciesLength += dwLength; + lpStr = lpStr + dwLength; + } + dwDependenciesLength++; + + lpDependenciesW = HeapAlloc(GetProcessHeap(), 0, dwDependenciesLength * sizeof(WCHAR)); + if (!lpDependenciesW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, (LPSTR)lpDependencies, dwDependenciesLength, lpDependenciesW, dwDependenciesLength); + } + + if (lpServiceStartName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, NULL, 0); + lpServiceStartNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpServiceStartNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, lpServiceStartNameW, len); + } + + dwError = RCreateServiceW(hSCManager, + lpServiceNameW, + lpDisplayNameW, + dwDesiredAccess, + dwServiceType, + dwStartType, + dwErrorControl, + lpBinaryPathNameW, + lpLoadOrderGroupW, + lpdwTagId, + (LPBYTE)lpDependenciesW, + dwDependenciesLength, + lpServiceStartNameW, + lpPassword, + dwPwSize, + lpServiceHandle); + +cleanup: + if (lpServiceNameW !=NULL) + HeapFree(GetProcessHeap(), 0, lpServiceNameW); + + if (lpDisplayNameW != NULL) + HeapFree(GetProcessHeap(), 0, lpDisplayNameW); + + if (lpBinaryPathNameW != NULL) + HeapFree(GetProcessHeap(), 0, lpBinaryPathNameW); + + if (lpLoadOrderGroupW != NULL) + HeapFree(GetProcessHeap(), 0, lpLoadOrderGroupW); + + if (lpDependenciesW != NULL) + HeapFree(GetProcessHeap(), 0, lpDependenciesW); + + if (lpServiceStartNameW != NULL) + HeapFree(GetProcessHeap(), 0, lpServiceStartNameW); + + return dwError; } 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 Jan 31 21:28:04 2010 @@ -287,10 +287,8 @@ switch (dwInfoLevel) { case SERVICE_CONFIG_DESCRIPTION: - { Info.psd = (LPSERVICE_DESCRIPTIONW)&lpInfo; break; - } case SERVICE_CONFIG_FAILURE_ACTIONS: Info.psfa = (LPSERVICE_FAILURE_ACTIONSW)&lpInfo; @@ -596,18 +594,15 @@ LPCSTR lpServiceStartName, LPCSTR lpPassword) { - SC_HANDLE RetVal = NULL; - LPWSTR lpServiceNameW = NULL; - LPWSTR lpDisplayNameW = NULL; - LPWSTR lpBinaryPathNameW = NULL; - LPWSTR lpLoadOrderGroupW = NULL; - LPWSTR lpDependenciesW = NULL; - LPWSTR lpServiceStartNameW = NULL; - LPWSTR lpPasswordW = NULL; + SC_HANDLE hService = NULL; DWORD dwDependenciesLength = 0; + DWORD dwError; DWORD dwLength; - int len; LPSTR lpStr; + + TRACE("CreateServiceA() called\n"); + TRACE("%p %s %s\n", hSCManager, + lpServiceName, lpDisplayName); if (!hSCManager) { @@ -615,55 +610,8 @@ return NULL; } - if (lpServiceName) - { - len = MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, NULL, 0); - lpServiceNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpServiceNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, lpServiceNameW, len); - } - - if (lpDisplayName) - { - len = MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, NULL, 0); - lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpDisplayNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpDisplayNameW, len); - } - - if (lpBinaryPathName) - { - len = MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, NULL, 0); - lpBinaryPathNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpBinaryPathNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, lpBinaryPathNameW, len); - } - - if (lpLoadOrderGroup) - { - len = MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, NULL, 0); - lpLoadOrderGroupW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpLoadOrderGroupW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, lpLoadOrderGroupW, len); - } - - if (lpDependencies) + /* Calculate the Dependencies length*/ + if (lpDependencies != NULL) { lpStr = (LPSTR)lpDependencies; while (*lpStr) @@ -673,77 +621,44 @@ lpStr = lpStr + dwLength; } dwDependenciesLength++; - - lpDependenciesW = HeapAlloc(GetProcessHeap(), 0, dwDependenciesLength * sizeof(WCHAR)); - if (!lpDependenciesW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpDependencies, dwDependenciesLength, lpDependenciesW, dwDependenciesLength); - } - - if (lpServiceStartName) - { - len = MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, NULL, 0); - lpServiceStartNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpServiceStartNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, lpServiceStartNameW, len); - } - - if (lpPassword) - { - len = MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, NULL, 0); - lpPasswordW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpPasswordW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, lpPasswordW, len); - } - - RetVal = CreateServiceW(hSCManager, - lpServiceNameW, - lpDisplayNameW, - dwDesiredAccess, - dwServiceType, - dwStartType, - dwErrorControl, - lpBinaryPathNameW, - lpLoadOrderGroupW, - lpdwTagId, - lpDependenciesW, - lpServiceStartNameW, - lpPasswordW); - -cleanup: - if (lpServiceNameW !=NULL) - HeapFree(GetProcessHeap(), 0, lpServiceNameW); - - if (lpDisplayNameW != NULL) - HeapFree(GetProcessHeap(), 0, lpDisplayNameW); - - if (lpBinaryPathNameW != NULL) - HeapFree(GetProcessHeap(), 0, lpBinaryPathNameW); - - if (lpLoadOrderGroupW != NULL) - HeapFree(GetProcessHeap(), 0, lpLoadOrderGroupW); - - if (lpDependenciesW != NULL) - HeapFree(GetProcessHeap(), 0, lpDependenciesW); - - if (lpServiceStartNameW != NULL) - HeapFree(GetProcessHeap(), 0, lpServiceStartNameW); - - if (lpPasswordW != NULL) - HeapFree(GetProcessHeap(), 0, lpPasswordW); - - return RetVal; + } + + /* FIXME: Encrypt the password */ + + RpcTryExcept + { + /* Call to services.exe using RPC */ + dwError = RCreateServiceA((SC_RPC_HANDLE)hSCManager, + (LPSTR)lpServiceName, + (LPSTR)lpDisplayName, + dwDesiredAccess, + dwServiceType, + dwStartType, + dwErrorControl, + (LPSTR)lpBinaryPathName, + (LPSTR)lpLoadOrderGroup, + lpdwTagId, + (LPBYTE)lpDependencies, + dwDependenciesLength, + (LPSTR)lpServiceStartName, + NULL, /* FIXME: lpPassword */ + 0, /* FIXME: dwPasswordLength */ + (SC_RPC_HANDLE *)&hService); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; + + if (dwError != ERROR_SUCCESS) + { + ERR("RCreateServiceA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } + + return hService; }

1 0

[ekohl] 45361: Implement basic version of PNP_CreateKey.
by ekohl＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: ekohl Date: Sun Jan 31 20:44:02 2010 New Revision: 45361 URL: http://svn.reactos.org/svn/reactos?rev=45361&view=rev Log: Implement basic version of PNP_CreateKey. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sun Jan 31 20:44:02 2010 @@ -831,8 +831,24 @@ DWORD samDesired, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + HKEY hKey = 0; + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, + pszSubKey, + 0, + NULL, + 0, + KEY_ALL_ACCESS, + NULL, + &hKey, + NULL)) + return CR_REGISTRY_ERROR; + + /* FIXME: Set security key */ + + RegCloseKey(hKey); + + return CR_SUCCESS; }

1 0

[janderwald] 45360: [MMEBUDDY] - Hackfix corruption of audio buffer list which made the playback thread spin forever on an already played buffer. - Tested with Winamp / VLC / mplay32 with Vbox 3.1.2
by janderwald＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: janderwald Date: Sun Jan 31 20:09:30 2010 New Revision: 45360 URL: http://svn.reactos.org/svn/reactos?rev=45360&view=rev Log: [MMEBUDDY] - Hackfix corruption of audio buffer list which made the playback thread spin forever on an already played buffer. - Tested with Winamp / VLC / mplay32 with Vbox 3.1.2 Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Sun Jan 31 20:09:30 2010 @@ -248,10 +248,18 @@ { /* There are already queued headers - make this one the tail */ SND_TRACE(L"Enqueued next wave header\n"); - SoundDeviceInstance->TailWaveHeader->lpNext = WaveHeader; - SoundDeviceInstance->TailWaveHeader = WaveHeader; - - DoWaveStreaming(SoundDeviceInstance); + + /* FIXME - Make sure that the buffer has not already been added to the list */ + if ( SoundDeviceInstance->TailWaveHeader != WaveHeader ) + { + SND_ASSERT(SoundDeviceInstance->TailWaveHeader != WaveHeader); + + SoundDeviceInstance->TailWaveHeader->lpNext = WaveHeader; + SoundDeviceInstance->TailWaveHeader = WaveHeader; + DUMP_WAVEHDR_QUEUE(SoundDeviceInstance); + + DoWaveStreaming(SoundDeviceInstance); + } } DUMP_WAVEHDR_QUEUE(SoundDeviceInstance); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/streaming.c [iso-8859-1] Sun Jan 31 20:09:30 2010 @@ -77,6 +77,7 @@ { { /* Move on to the next header */ + SND_ASSERT(Header != Header->lpNext); Header = Header->lpNext; } } @@ -209,9 +210,9 @@ } else { - SND_TRACE(L"%d/%d bytes of wavehdr completed\n", HdrExtension->BytesCompleted, WaveHdr->dwBufferLength); /* Partially completed */ HdrExtension->BytesCompleted += dwNumberOfBytesTransferred; + SND_TRACE(L"%d/%d bytes of wavehdr completed\n", HdrExtension->BytesCompleted, WaveHdr->dwBufferLength); break; }

1 0

[jimtabor] 45359: [Win32k|User32] - Updated DrawIconEx information for Meta support.
by jimtabor＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: jimtabor Date: Sun Jan 31 19:38:45 2010 New Revision: 45359 URL: http://svn.reactos.org/svn/reactos?rev=45359&view=rev Log: [Win32k|User32] - Updated DrawIconEx information for Meta support. Modified: trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Sun Jan 31 19:38:45 2010 @@ -16,10 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/icon.c + * FILE: dll/win32/user32/windows/icon.c * PURPOSE: Icon * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: @@ -346,7 +345,7 @@ int Y, HICON hIcon) { - return DrawIconEx(hDC, X, Y, hIcon, 0, 0, 0, NULL, DI_NORMAL | DI_DEFAULTSIZE); + return DrawIconEx(hDC, X, Y, hIcon, 0, 0, 0, NULL, DI_NORMAL|DI_DEFAULTSIZE|DI_COMPAT); } /* Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jan 31 19:38:45 2010 @@ -1548,6 +1548,15 @@ const PUNICODE_STRING str, UINT uFlags); +// Used with NtUserDrawIconEx, last parameter. +typedef struct _DRAWICONEXDATA +{ + HBITMAP hbmMask; + HBITMAP hbmColor; + int cx; + int cy; +} DRAWICONEXDATA, *PDRAWICONEXDATA; + BOOL NTAPI NtUserDrawIconEx( @@ -1560,8 +1569,8 @@ UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags, - DWORD Unknown0, - DWORD Unknown1); + BOOL bMetaHDC, + PVOID pDIXData); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun Jan 31 19:38:45 2010 @@ -1563,8 +1563,8 @@ UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags, - DWORD Unknown0, - DWORD Unknown1) + BOOL bMetaHDC, // When TRUE, GDI functions need to be handled in User32! + PVOID pDIXData) { PCURICON_OBJECT pIcon; BOOL Ret;

1 0

[janderwald] 45358: [PORTCLS] - Use silence buffer when no audio buffers are available. Replaces the endless disturbing sound loop. - Sound still broken
by janderwald＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: janderwald Date: Sun Jan 31 16:32:31 2010 New Revision: 45358 URL: http://svn.reactos.org/svn/reactos?rev=45358&view=rev Log: [PORTCLS] - Use silence buffer when no audio buffers are available. Replaces the endless disturbing sound loop. - Sound still broken Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Sun Jan 31 16:32:31 2010 @@ -267,7 +267,6 @@ if (!Irp) { DPRINT("NoIrp\n"); - return STATUS_UNSUCCESSFUL; // no irp available, use silence buffer *Buffer = (PUCHAR)m_SilenceBuffer; *BufferSize = m_MaxFrameSize;

1 0

[sir_richard] 45357: [NTOS]: Always set correct segments; the if/else branch should decide which segments to save, not whether or not to set the sane ones. Fixes boot on VirtualBox and real hardware.
by sir_richard＠svn.reactos.org 31 Jan '10

31 Jan '10

Author: sir_richard Date: Sun Jan 31 16:22:55 2010 New Revision: 45357 URL: http://svn.reactos.org/svn/reactos?rev=45357&view=rev Log: [NTOS]: Always set correct segments; the if/else branch should decide which segments to save, not whether or not to set the sane ones. Fixes boot on VirtualBox and real hardware. Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sun Jan 31 16:22:55 2010 @@ -654,10 +654,12 @@ TrapFrame->SegGs = Ke386GetGs(); TrapFrame->SegDs = Ke386GetDs(); TrapFrame->SegEs = Ke386GetEs(); - Ke386SetFs(KGDT_R0_PCR); - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - } + } + + /* Set correct segments */ + Ke386SetFs(KGDT_R0_PCR); + Ke386SetDs(KGDT_R3_DATA | RPL_MASK); + Ke386SetEs(KGDT_R3_DATA | RPL_MASK); /* Save exception list and terminate it */ TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList;

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 January 2010