Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[jgardou] 53580: [ACTCXPRXY] - we have an entry point, provided by rpc proxy data
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 15:19:10 2011 New Revision: 53580 URL: http://svn.reactos.org/svn/reactos?rev=53580&view=rev Log: [ACTCXPRXY] - we have an entry point, provided by rpc proxy data Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild Modified: trunk/reactos/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Sun Sep 4 15:19:10 2011 @@ -33,7 +33,7 @@ add_library(actxprxy SHARED ${SOURCE}) -set_entrypoint(actxprxy 0) +set_module_type(actxprxy win32dll) target_link_libraries(actxprxy uuid Modified: trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] Sun Sep 4 15:19:10 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="actxprxy" type="win32dll" baseaddress="${BASEADDRESS_ACTXPRXY}" installbase="system32" entrypoint="0" installname="actxprxy.dll" allowwarnings="true"> +<module name="actxprxy" type="win32dll" baseaddress="${BASEADDRESS_ACTXPRXY}" installbase="system32" installname="actxprxy.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="actxprxy.spec" /> <include base="actxprxy">.</include>

1 0

[ekohl] 53579: [SERVICES] RStartServiceA: Convert the ANSI start arguments vector to a UNICODE vector and pass it to ScmStartService. Calls to StartServiceA can now be used to pass arguments to a s...
by ekohl＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: ekohl Date: Sun Sep 4 14:42:08 2011 New Revision: 53579 URL: http://svn.reactos.org/svn/reactos?rev=53579&view=rev Log: [SERVICES] RStartServiceA: Convert the ANSI start arguments vector to a UNICODE vector and pass it to ScmStartService. Calls to StartServiceA can now be used to pass arguments to a starting service. Modified: trunk/reactos/base/system/services/rpcserver.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 Sep 4 14:42:08 2011 @@ -4086,6 +4086,9 @@ DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; + LPWSTR *lpVector = NULL; + DWORD i; + DWORD dwLength; DPRINT("RStartServiceA() called\n"); @@ -4119,12 +4122,56 @@ if (lpService->bDeleted) return ERROR_SERVICE_MARKED_FOR_DELETE; - /* FIXME: Convert argument vector to Unicode */ + /* Build a Unicode argument vector */ + if (argc > 0) + { + lpVector = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + argc * sizeof(LPWSTR)); + if (lpVector == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + for (i = 0; i < argc; i++) + { + dwLength = MultiByteToWideChar(CP_ACP, + 0, + ((LPSTR*)argv)[i], + -1, + NULL, + 0); + + lpVector[i] = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwLength * sizeof(WCHAR)); + if (lpVector[i] == NULL) + { + dwError = ERROR_NOT_ENOUGH_MEMORY; + goto done; + } + + MultiByteToWideChar(CP_ACP, + 0, + ((LPSTR*)argv)[i], + -1, + lpVector[i], + dwLength); + } + } /* Start the service */ - dwError = ScmStartService(lpService, 0, NULL); - - /* FIXME: Free argument vector */ + dwError = ScmStartService(lpService, argc, lpVector); + +done: + /* Free the Unicode argument vector */ + if (lpVector != NULL) + { + for (i = 0; i < argc; i++) + { + if (lpVector[i] != NULL) + HeapFree(GetProcessHeap(), 0, lpVector[i]); + } + HeapFree(GetProcessHeap(), 0, lpVector); + } return dwError; }

1 0

[jgardou] 53578: [PSDK] - put NOGDI guard at the right place...
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 14:09:14 2011 New Revision: 53578 URL: http://svn.reactos.org/svn/reactos?rev=53578&view=rev Log: [PSDK] - put NOGDI guard at the right place... Modified: trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Sun Sep 4 14:09:14 2011 @@ -141,14 +141,13 @@ #if (_WIN32_WINNT >= 0x0600) #define HISTORY_NO_DUP_FLAG 0x1 #define CONSOLE_OVERSTRIKE 0x1 -#ifndef NOGDI + typedef struct _CONSOLE_HISTORY_INFO { UINT cbSize; UINT HistoryBufferSize; UINT NumberOfHistoryBuffers; DWORD dwFlags; } CONSOLE_HISTORY_INFO, *PCONSOLE_HISTORY_INFO; -#endif typedef struct _CONSOLE_SCREEN_BUFFER_INFOEX { ULONG cbSize; @@ -161,6 +160,7 @@ COLORREF ColorTable[16]; } CONSOLE_SCREEN_BUFFER_INFOEX, *PCONSOLE_SCREEN_BUFFER_INFOEX; +#ifndef NOGDI typedef struct _CONSOLE_FONT_INFOEX { ULONG cbSize; DWORD nFont; @@ -169,6 +169,7 @@ UINT FontWeight; WCHAR FaceName[LF_FACESIZE]; } CONSOLE_FONT_INFOEX, *PCONSOLE_FONT_INFOEX; +#endif #endif BOOL WINAPI AllocConsole(void);

1 0

[jgardou] 53577: [WINETESTS/WININET] - fix warnings
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 13:09:16 2011 New Revision: 53577 URL: http://svn.reactos.org/svn/reactos?rev=53577&view=rev Log: [WINETESTS/WININET] - fix warnings Modified: trunk/rostests/winetests/wininet/CMakeLists.txt Modified: trunk/rostests/winetests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] Sun Sep 4 13:09:16 2011 @@ -1,3 +1,5 @@ + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) add_definitions( -D__ROS_LONG64__

1 0

[jgardou] 53576: [WINETESTS/URLMON] - fix warnings
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 13:01:38 2011 New Revision: 53576 URL: http://svn.reactos.org/svn/reactos?rev=53576&view=rev Log: [WINETESTS/URLMON] - fix warnings Modified: trunk/rostests/winetests/urlmon/CMakeLists.txt Modified: trunk/rostests/winetests/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/CMakeLis… ============================================================================== --- trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/CMakeLists.txt [iso-8859-1] Sun Sep 4 13:01:38 2011 @@ -1,3 +1,5 @@ + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) add_definitions( -D__ROS_LONG64__

1 0

[spetreolle] 53575: [WINETESTS] Allow to run skipped test in interactive mode.
by spetreolle＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: spetreolle Date: Sun Sep 4 12:26:49 2011 New Revision: 53575 URL: http://svn.reactos.org/svn/reactos?rev=53575&view=rev Log: [WINETESTS] Allow to run skipped test in interactive mode. Modified: trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sun Sep 4 12:26:49 2011 @@ -1427,7 +1427,7 @@ const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); -if(1) +if(!winetest_interactive) skip("skipping match_emf_record(), bug 5393\n"); else {

1 0

[tfaber] 53574: [KMTestSuite] - Thank you, SVN, for sucking at merging
by tfaber＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: tfaber Date: Sun Sep 4 12:10:38 2011 New Revision: 53574 URL: http://svn.reactos.org/svn/reactos?rev=53574&view=rev Log: [KMTestSuite] - Thank you, SVN, for sucking at merging Added: branches/GSoC_2011/KMTestSuite/winetests/kernel32/dosdev.c - copied unchanged from r53570, trunk/rostests/winetests/kernel32/dosdev.c

1 0

[jgardou] 53573: [PSDK] - fix compilation for any fool wanting to use our headers outside of NT 5.2 scope
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 12:08:54 2011 New Revision: 53573 URL: http://svn.reactos.org/svn/reactos?rev=53573&view=rev Log: [PSDK] - fix compilation for any fool wanting to use our headers outside of NT 5.2 scope Modified: trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Sun Sep 4 12:08:54 2011 @@ -3,6 +3,10 @@ #ifdef __cplusplus extern "C" { +#endif + +#if (_WIN32_WINNT >= 0x0600) && !defined(NOGDI) +# include "wingdi.h" #endif #ifdef _MSC_VER @@ -137,12 +141,14 @@ #if (_WIN32_WINNT >= 0x0600) #define HISTORY_NO_DUP_FLAG 0x1 #define CONSOLE_OVERSTRIKE 0x1 +#ifndef NOGDI typedef struct _CONSOLE_HISTORY_INFO { UINT cbSize; UINT HistoryBufferSize; UINT NumberOfHistoryBuffers; DWORD dwFlags; } CONSOLE_HISTORY_INFO, *PCONSOLE_HISTORY_INFO; +#endif typedef struct _CONSOLE_SCREEN_BUFFER_INFOEX { ULONG cbSize;

1 0

[ekohl] 53572: [ADVAPI32] Pass service start arguments to ANSI services too. Clean up the service start code.
by ekohl＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: ekohl Date: Sun Sep 4 12:01:27 2011 New Revision: 53572 URL: http://svn.reactos.org/svn/reactos?rev=53572&view=rev Log: [ADVAPI32] Pass service start arguments to ANSI services too. Clean up the service start code. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Sep 4 12:01:27 2011 @@ -278,119 +278,146 @@ static DWORD -ScStartService(PACTIVE_SERVICE lpService, - PSCM_CONTROL_PACKET ControlPacket) -{ - HANDLE ThreadHandle; - DWORD ThreadId; - LPWSTR *lpArgW; +ScBuildUnicodeArgsVector(PSCM_CONTROL_PACKET ControlPacket, + LPDWORD lpArgCount, + LPWSTR **lpArgVector) +{ + LPWSTR *lpVector; + LPWSTR *lpArg; DWORD i; - TRACE("ScStartService() called\n"); - TRACE("Size: %lu\n", ControlPacket->dwSize); - TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); - - /* Set the service status handle */ - lpService->hServiceStatus = ControlPacket->hServiceStatus; - - if (lpService->bUnicode == TRUE) - { - lpService->ThreadParams.W.dwArgCount = ControlPacket->dwArgumentsCount; - lpService->ThreadParams.W.lpArgVector = NULL; - - if (ControlPacket->dwArgumentsOffset > 0) - { - lpService->ThreadParams.W.lpArgVector = - HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - ControlPacket->dwSize - ControlPacket->dwArgumentsOffset); - if (lpService->ThreadParams.W.lpArgVector == NULL) - return ERROR_OUTOFMEMORY; - - memcpy(lpService->ThreadParams.W.lpArgVector, - ((PBYTE)ControlPacket + ControlPacket->dwArgumentsOffset), - ControlPacket->dwSize - ControlPacket->dwArgumentsOffset); - - lpArgW = lpService->ThreadParams.W.lpArgVector; - for (i = 0; i < lpService->ThreadParams.W.dwArgCount; i++) - { - *lpArgW = (LPWSTR)((ULONG_PTR)lpArgW + (ULONG_PTR)*lpArgW); - lpArgW++; - } - } - } - else - { - /* FIXME */ - lpService->ThreadParams.A.dwArgCount = 0; - lpService->ThreadParams.A.lpArgVector = NULL; - -#if 0 - LPSTR *lpArgVector; - LPSTR Ptr; - LPSTR AnsiString; - DWORD AnsiLength; - - AnsiLength = WideCharToMultiByte(CP_ACP, + *lpArgCount = 0; + *lpArgVector = NULL; + + if (ControlPacket->dwArgumentsCount > 0) + { + lpVector = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + ControlPacket->dwSize - ControlPacket->dwArgumentsOffset); + if (lpVector == NULL) + return ERROR_OUTOFMEMORY; + + memcpy(lpVector, + ((PBYTE)ControlPacket + ControlPacket->dwArgumentsOffset), + ControlPacket->dwSize - ControlPacket->dwArgumentsOffset); + + lpArg = lpVector; + for (i = 0; i < ControlPacket->dwArgumentsCount; i++) + { + *lpArg = (LPWSTR)((ULONG_PTR)lpArg + (ULONG_PTR)*lpArg); + lpArg++; + } + + *lpArgCount = ControlPacket->dwArgumentsCount; + *lpArgVector = lpVector; + } + + return ERROR_SUCCESS; +} + + +static DWORD +ScBuildAnsiArgsVector(PSCM_CONTROL_PACKET ControlPacket, + LPDWORD lpArgCount, + LPSTR **lpArgVector) +{ + LPSTR *lpVector; + LPSTR *lpPtr; + LPWSTR lpUnicodeString; + LPSTR lpAnsiString; + DWORD dwVectorSize; + DWORD dwUnicodeSize; + DWORD dwAnsiSize; + DWORD i; + + *lpArgCount = 0; + *lpArgVector = NULL; + + if (ControlPacket->dwArgumentsCount > 0) + { + dwVectorSize = ControlPacket->dwArgumentsCount * sizeof(LPWSTR); + + lpUnicodeString = (LPWSTR)((PBYTE)ControlPacket + + ControlPacket->dwArgumentsOffset + + dwVectorSize); + dwUnicodeSize = (ControlPacket->dwSize - + ControlPacket->dwArgumentsOffset - + dwVectorSize) / sizeof(WCHAR); + + dwAnsiSize = WideCharToMultiByte(CP_ACP, 0, - lpService->Arguments, - dwLength, + lpUnicodeString, + dwUnicodeSize, NULL, 0, NULL, NULL); - if (AnsiLength == 0) - return ERROR_INVALID_PARAMETER; /* ? */ - - AnsiString = HeapAlloc(GetProcessHeap(), - 0, - AnsiLength + 1); - if (AnsiString == NULL) + + lpVector = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + dwVectorSize + dwAnsiSize); + if (lpVector == NULL) return ERROR_OUTOFMEMORY; + + lpPtr = (LPSTR*)lpVector; + lpAnsiString = (LPSTR)((ULONG_PTR)lpVector + dwVectorSize); WideCharToMultiByte(CP_ACP, 0, - lpService->Arguments, - dwLength, - AnsiString, - AnsiLength, + lpUnicodeString, + dwUnicodeSize, + lpAnsiString, + dwAnsiSize, NULL, NULL); - AnsiString[AnsiLength] = ANSI_NULL; - - lpArgVector = HeapAlloc(GetProcessHeap(), - 0, - (dwArgCount + 1) * sizeof(LPSTR)); - if (lpArgVector == NULL) - { - HeapFree(GetProcessHeap(), - 0, - AnsiString); - return ERROR_OUTOFMEMORY; - } - - dwArgCount = 0; - Ptr = AnsiString; - while (*Ptr) - { - lpArgVector[dwArgCount] = Ptr; - - dwArgCount++; - Ptr += (strlen(Ptr) + 1); - } - lpArgVector[dwArgCount] = NULL; - - (lpService->ThreadParams.A.lpServiceMain)(dwArgCount, lpArgVector); - - HeapFree(GetProcessHeap(), - 0, - lpArgVector); - HeapFree(GetProcessHeap(), - 0, - AnsiString); -#endif - } + for (i = 0; i < ControlPacket->dwArgumentsCount; i++) + { + *lpPtr = lpAnsiString; + + lpPtr++; + lpAnsiString += (strlen(lpAnsiString) + 1); + } + + *lpArgCount = ControlPacket->dwArgumentsCount; + *lpArgVector = lpVector; + } + + return ERROR_SUCCESS; +} + + +static DWORD +ScStartService(PACTIVE_SERVICE lpService, + PSCM_CONTROL_PACKET ControlPacket) +{ + HANDLE ThreadHandle; + DWORD ThreadId; + DWORD dwError; + + TRACE("ScStartService() called\n"); + TRACE("Size: %lu\n", ControlPacket->dwSize); + TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); + + /* Set the service status handle */ + lpService->hServiceStatus = ControlPacket->hServiceStatus; + + /* Build the arguments vector */ + if (lpService->bUnicode == TRUE) + { + dwError = ScBuildUnicodeArgsVector(ControlPacket, + &lpService->ThreadParams.W.dwArgCount, + &lpService->ThreadParams.W.lpArgVector); + } + else + { + dwError = ScBuildAnsiArgsVector(ControlPacket, + &lpService->ThreadParams.A.dwArgCount, + &lpService->ThreadParams.A.lpArgVector); + } + + if (dwError != ERROR_SUCCESS) + return dwError; /* Invoke the services entry point and implement the command loop */ ThreadHandle = CreateThread(NULL,

1 0

[jgardou] 53571: [WINETESTS/GDI32] - fix warnings
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 11:31:17 2011 New Revision: 53571 URL: http://svn.reactos.org/svn/reactos?rev=53571&view=rev Log: [WINETESTS/GDI32] - fix warnings Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt trunk/rostests/winetests/gdi32/metafile.c Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… ============================================================================== --- trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Sun Sep 4 11:31:17 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) list(APPEND SOURCE bitmap.c Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sun Sep 4 11:31:17 2011 @@ -1427,14 +1427,15 @@ const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); -#if 1 +if(1) skip("skipping match_emf_record(), bug 5393\n"); -#else +else +{ trace("%s: EMF record %u, size %u/record %u, size %u\n", desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; -#endif +} /* We have already bailed out if iType or nSize don't match */ offset1 += emr1->nSize;

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
40
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2011