Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[ekohl] 53201: [ADVAPI32] Fix EnumServicesStatusEx[A/W]: - If lpServices is NULL or cbBufSize is less than sizeof(ENUM_SERVICE_STATUS_PROCESS) pass a pointer to an internal status buffer to REnumSe...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Aug 13 10:53:15 2011 New Revision: 53201 URL: http://svn.reactos.org/svn/reactos?rev=53201&view=rev Log: [ADVAPI32] Fix EnumServicesStatusEx[A/W]: - If lpServices is NULL or cbBufSize is less than sizeof(ENUM_SERVICE_STATUS_PROCESS) pass a pointer to an internal status buffer to REnumServicesStatusExA/W. Adding 'in' and 'unique' attributes in the idl file is NOT an option because this is not compatible with Windows. - Check the InfoLevel. 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] Sat Aug 13 10:53:15 2011 @@ -1150,7 +1150,9 @@ LPDWORD lpResumeHandle, LPCSTR pszGroupName) { + ENUM_SERVICE_STATUS_PROCESSA ServiceStatus; LPENUM_SERVICE_STATUS_PROCESSA lpStatusPtr; + DWORD dwBufferSize; DWORD dwError; DWORD dwCount; @@ -1166,6 +1168,18 @@ { SetLastError(ERROR_INVALID_HANDLE); return FALSE; + } + + if (lpServices == NULL || + cbBufSize < sizeof(ENUM_SERVICE_STATUS_PROCESSA)) + { + lpStatusPtr = &ServiceStatus; + dwBufferSize = sizeof(ENUM_SERVICE_STATUS_PROCESSA); + } + else + { + lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSA)lpServices; + dwBufferSize = cbBufSize; } RpcTryExcept @@ -1174,8 +1188,8 @@ InfoLevel, dwServiceType, dwServiceState, - (LPBYTE)lpServices, - cbBufSize, + (LPBYTE)lpStatusPtr, + dwBufferSize, pcbBytesNeeded, lpServicesReturned, lpResumeHandle, @@ -1189,18 +1203,20 @@ if (dwError == ERROR_SUCCESS || dwError == ERROR_MORE_DATA) { - lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSA)lpServices; - for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + if (InfoLevel == SC_ENUM_PROCESS_INFO) { - if (lpStatusPtr->lpServiceName) - lpStatusPtr->lpServiceName = - (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); - - if (lpStatusPtr->lpDisplayName) - lpStatusPtr->lpDisplayName = - (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); - - lpStatusPtr++; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } } } @@ -1234,11 +1250,31 @@ LPDWORD lpResumeHandle, LPCWSTR pszGroupName) { + ENUM_SERVICE_STATUS_PROCESSW ServiceStatus; LPENUM_SERVICE_STATUS_PROCESSW lpStatusPtr; + DWORD dwBufferSize; DWORD dwError; DWORD dwCount; TRACE("EnumServicesStatusExW() called\n"); + + if (InfoLevel != SC_ENUM_PROCESS_INFO) + { + SetLastError(ERROR_INVALID_LEVEL); + return FALSE; + } + + if (lpServices == NULL || + cbBufSize < sizeof(ENUM_SERVICE_STATUS_PROCESSW)) + { + lpStatusPtr = &ServiceStatus; + dwBufferSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW); + } + else + { + lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSW)lpServices; + dwBufferSize = cbBufSize; + } RpcTryExcept { @@ -1246,8 +1282,8 @@ InfoLevel, dwServiceType, dwServiceState, - (LPBYTE)lpServices, - cbBufSize, + (LPBYTE)lpStatusPtr, + dwBufferSize, pcbBytesNeeded, lpServicesReturned, lpResumeHandle, @@ -1261,18 +1297,20 @@ if (dwError == ERROR_SUCCESS || dwError == ERROR_MORE_DATA) { - lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSW)lpServices; - for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + if (InfoLevel == SC_ENUM_PROCESS_INFO) { - if (lpStatusPtr->lpServiceName) - lpStatusPtr->lpServiceName = - (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); - - if (lpStatusPtr->lpDisplayName) - lpStatusPtr->lpDisplayName = - (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); - - lpStatusPtr++; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } } }

13 years, 3 months

[cgutman] 53200: [IP] - Zero the sin_zero member in the TDI_ADDRESS_IP struct

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Aug 13 04:03:26 2011 New Revision: 53200 URL: http://svn.reactos.org/svn/reactos?rev=53200&view=rev Log: [IP] - Zero the sin_zero member in the TDI_ADDRESS_IP struct Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Aug 13 04:03:26 2011 @@ -640,6 +640,9 @@ UnlockObject(Connection, OldIrql); AddressIP->Address[0].Address[0].in_addr = ipaddr.addr; + + RtlZeroMemory(&AddressIP->Address[0].Address[0].sin_zero, + sizeof(AddressIP->Address[0].Address[0].sin_zero)); return Status; }

13 years, 3 months

[tkreuzer] 53199: [KS] Fix MSVC build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 12 16:53:15 2011 New Revision: 53199 URL: http://svn.reactos.org/svn/reactos?rev=53199&view=rev Log: [KS] Fix MSVC build Added: trunk/reactos/drivers/ksfilter/ks/msvc.S (with props) Modified: trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt Modified: trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/CMakeL… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Fri Aug 12 16:53:15 2011 @@ -31,6 +31,10 @@ ks.rc ${CMAKE_CURRENT_BINARY_DIR}/ks.def) +if(MSVC) + list(APPEND SOURCE msvc.S) +endif() + add_library(ks SHARED ${SOURCE}) set_target_properties(ks PROPERTIES SUFFIX ".sys") Added: trunk/reactos/drivers/ksfilter/ks/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/msvc.S… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/msvc.S (added) +++ trunk/reactos/drivers/ksfilter/ks/msvc.S [iso-8859-1] Fri Aug 12 16:53:15 2011 @@ -1,0 +1,26 @@ + +#include <asm.inc> + +.code + +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig:PROC +ALIAS <&alias> = <&orig> +ENDM + +PUBLIC ?NonDelegatedRelease@CBaseUnknown@@UAGKXZ +?NonDelegatedRelease@CBaseUnknown@@UAGKXZ: + jmp _IIndirectedUnknown_fnRelease@4 + + +DEFINE_ALIAS ??0CBaseUnknown@@QAE@ABU_GUID@@PAUIUnknown@@@Z, @CBaseUnknown_ConstructorWithGUID@16 +DEFINE_ALIAS ??0CBaseUnknown@@QAE@PAUIUnknown@@@Z, @CBaseUnknown_Constructor@12 +DEFINE_ALIAS ??1CBaseUnknown@@UAE@XZ, @CBaseUnknown_DefaultDestructor@8 +DEFINE_ALIAS ??_FCBaseUnknown@@QAEXXZ, @CBaseUnknown_Destructor@12 +DEFINE_ALIAS ?IndirectedAddRef@CBaseUnknown@@UAGKXZ, _IIndirectedUnknown_fnAddRef@4 +DEFINE_ALIAS ?IndirectedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z, _IIndirectedUnknown_fnQueryInterface@12 +DEFINE_ALIAS ?IndirectedRelease@CBaseUnknown@@UAGKXZ, _IIndirectedUnknown_fnRelease@4 +DEFINE_ALIAS ?NonDelegatedAddRef@CBaseUnknown@@UAGKXZ, _INonDelegatedUnknown_fnAddRef@4 +DEFINE_ALIAS ?NonDelegatedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z, _INonDelegatedUnknown_fnQueryInterface@12 + +END Propchange: trunk/reactos/drivers/ksfilter/ks/msvc.S ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 3 months

[tkreuzer] 53198: [CRT] Add assembly stubs and aliases for c++ symbols for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 12 11:43:53 2011 New Revision: 53198 URL: http://svn.reactos.org/svn/reactos?rev=53198&view=rev Log: [CRT] Add assembly stubs and aliases for c++ symbols for MSVC Added: trunk/reactos/lib/sdk/crt/except/i386/cpp.s (with props) Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/except/cpp.c 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] Fri Aug 12 11:43:53 2011 @@ -314,6 +314,10 @@ float/i386/logb.c float/i386/statfp.c setjmp/i386/setjmp.s) + if(MSVC) + list(APPEND CRT_SOURCE + except/i386/cpp.s) + endif() elseif(ARCH MATCHES amd64) list(APPEND CRT_SOURCE except/amd64/seh.s Modified: trunk/reactos/lib/sdk/crt/except/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cpp.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] Fri Aug 12 11:43:53 2011 @@ -708,15 +708,6 @@ #ifndef __GNUC__ } #endif -#endif - -#ifdef _MSC_VER -#pragma message ("HAXX!") -const vtable_ptr MSVCRT_exception_vtable; -const vtable_ptr MSVCRT_bad_typeid_vtable; -const vtable_ptr MSVCRT_bad_cast_vtable; -const vtable_ptr MSVCRT___non_rtti_object_vtable; -const vtable_ptr MSVCRT_type_info_vtable; #endif /* Static RTTI for exported objects */ Added: trunk/reactos/lib/sdk/crt/except/i386/cpp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/i386/cp… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/i386/cpp.s (added) +++ trunk/reactos/lib/sdk/crt/except/i386/cpp.s [iso-8859-1] Fri Aug 12 11:43:53 2011 @@ -1,0 +1,112 @@ + + +#include <asm.inc> + +.code +.align 4 + +MACRO(DEFINE_THISCALL_WRAPPER, cxxname, stdcallname) +EXTERN &stdcallname:PROC +PUBLIC &cxxname +&cxxname: + pop eax + push ecx + push eax + jmp &stdcallname +ENDM + +DEFINE_THISCALL_WRAPPER ??0exception@@QAE@ABQBD@Z, _MSVCRT_exception_ctor@8 +DEFINE_THISCALL_WRAPPER ??0exception@@QAE@ABQBDH@Z, _MSVCRT_exception_ctor_noalloc@12 +DEFINE_THISCALL_WRAPPER ??0exception@@QAE@ABV0@@Z, _MSVCRT_exception_copy_ctor@8 +DEFINE_THISCALL_WRAPPER ??0exception@@QAE@XZ, _MSVCRT_exception_default_ctor@4 +DEFINE_THISCALL_WRAPPER ??1exception@@UAE@XZ, _MSVCRT_exception_dtor@4 +DEFINE_THISCALL_WRAPPER ??4exception@@QAEAAV0@ABV0@@Z, _MSVCRT_exception_opequals@8 +DEFINE_THISCALL_WRAPPER ??_Eexception@@UAEPAXI@Z, _MSVCRT_exception_vector_dtor@8 +DEFINE_THISCALL_WRAPPER ??_Gexception@@UAEPAXI@Z, _MSVCRT_exception_scalar_dtor@8 +DEFINE_THISCALL_WRAPPER ?what@exception@@UBEPBDXZ, _MSVCRT_what_exception@4 +DEFINE_THISCALL_WRAPPER ??0bad_typeid@@QAE@ABV0@@Z, _MSVCRT_bad_typeid_copy_ctor@8 +DEFINE_THISCALL_WRAPPER ??0bad_typeid@@QAE@PBD@Z, _MSVCRT_bad_typeid_ctor@8 +DEFINE_THISCALL_WRAPPER ??_Fbad_typeid@@QAEXXZ, _MSVCRT_bad_typeid_default_ctor@4 +DEFINE_THISCALL_WRAPPER ??1bad_typeid@@UAE@XZ, _MSVCRT_bad_typeid_dtor@4 +DEFINE_THISCALL_WRAPPER ??4bad_typeid@@QAEAAV0@ABV0@@Z, _MSVCRT_bad_typeid_opequals@8 +DEFINE_THISCALL_WRAPPER ??_Ebad_typeid@@UAEPAXI@Z, _MSVCRT_bad_typeid_vector_dtor@8 +DEFINE_THISCALL_WRAPPER ??_Gbad_typeid@@UAEPAXI@Z, _MSVCRT_bad_typeid_scalar_dtor@8 +DEFINE_THISCALL_WRAPPER ??0__non_rtti_object@@QAE@ABV0@@Z, _MSVCRT___non_rtti_object_copy_ctor@8 +DEFINE_THISCALL_WRAPPER ??0__non_rtti_object@@QAE@PBD@Z, _MSVCRT___non_rtti_object_ctor@8 +DEFINE_THISCALL_WRAPPER ??1__non_rtti_object@@UAE@XZ, _MSVCRT___non_rtti_object_dtor@4 +DEFINE_THISCALL_WRAPPER ??4__non_rtti_object@@QAEAAV0@ABV0@@Z, _MSVCRT___non_rtti_object_opequals@8 +DEFINE_THISCALL_WRAPPER ??_E__non_rtti_object@@UAEPAXI@Z, _MSVCRT___non_rtti_object_vector_dtor@8 +DEFINE_THISCALL_WRAPPER ??_G__non_rtti_object@@UAEPAXI@Z, _MSVCRT___non_rtti_object_scalar_dtor@8 +DEFINE_THISCALL_WRAPPER ??0bad_cast@@AAE@PBQBD@Z, _MSVCRT_bad_cast_ctor@8 +DEFINE_THISCALL_WRAPPER ??0bad_cast@@QAE@ABQBD@Z, _MSVCRT_bad_cast_ctor@8 +DEFINE_THISCALL_WRAPPER ??0bad_cast@@QAE@ABV0@@Z, _MSVCRT_bad_cast_copy_ctor@8 +DEFINE_THISCALL_WRAPPER ??0bad_cast@@QAE@PBD@Z, _MSVCRT_bad_cast_ctor_charptr@8 +DEFINE_THISCALL_WRAPPER ??_Fbad_cast@@QAEXXZ, _MSVCRT_bad_cast_default_ctor@4 +DEFINE_THISCALL_WRAPPER ??1bad_cast@@UAE@XZ, _MSVCRT_bad_cast_dtor@4 +DEFINE_THISCALL_WRAPPER ??4bad_cast@@QAEAAV0@ABV0@@Z, _MSVCRT_bad_cast_opequals@8 +DEFINE_THISCALL_WRAPPER ??_Ebad_cast@@UAEPAXI@Z, _MSVCRT_bad_cast_vector_dtor@8 +DEFINE_THISCALL_WRAPPER ??_Gbad_cast@@UAEPAXI@Z, _MSVCRT_bad_cast_scalar_dtor@8 +DEFINE_THISCALL_WRAPPER ??8type_info@@QBEHABV0@@Z, _MSVCRT_type_info_opequals_equals@8 +DEFINE_THISCALL_WRAPPER ??9type_info@@QBEHABV0@@Z, _MSVCRT_type_info_opnot_equals@8 +DEFINE_THISCALL_WRAPPER ?before@type_info@@QBEHABV1@@Z, _MSVCRT_type_info_before@8 +DEFINE_THISCALL_WRAPPER ??1type_info@@UAE@XZ, _MSVCRT_type_info_dtor@4 +DEFINE_THISCALL_WRAPPER ?name@type_info@@QBEPBDXZ, _MSVCRT_type_info_name@4 +DEFINE_THISCALL_WRAPPER ?raw_name@type_info@@QBEPBDXZ, _MSVCRT_type_info_raw_name@4 + + +#undef _MSVCRT_ +MACRO(START_VTABLE, shortname, cxxname) +EXTERN _&shortname&_rtti:PROC +EXTERN ___thiscall_MSVCRT_&shortname&_vector_dtor:PROC + .long _&shortname&_rtti +PUBLIC _MSVCRT_&shortname&_vtable +_MSVCRT_&shortname&_vtable: +PUBLIC &cxxname +&cxxname: + .long ___thiscall_MSVCRT_&shortname&_vector_dtor +ENDM + +MACRO(DEFINE_EXCEPTION_VTABLE, shortname, cxxname) + START_VTABLE shortname, cxxname + EXTERN ___thiscall_MSVCRT_what_exception:PROC + .long ___thiscall_MSVCRT_what_exception +ENDM + +START_VTABLE type_info, __dummyname_type_info +DEFINE_EXCEPTION_VTABLE exception, ??_7exception@@6B@ +DEFINE_EXCEPTION_VTABLE bad_typeid, ??_7bad_typeid@@6B@ +DEFINE_EXCEPTION_VTABLE bad_cast, ??_7bad_cast@@6B@ +DEFINE_EXCEPTION_VTABLE __non_rtti_object, ??_7__non_rtti_object@@6B@ + +EXTERN _MSVCRT_operator_delete:PROC +PUBLIC ??3@YAXPAX@Z +??3@YAXPAX@Z: + jmp _MSVCRT_operator_delete + +EXTERN _MSVCRT_operator_new:PROC +PUBLIC ??_U@YAPAXI@Z +??_U@YAPAXI@Z: + jmp _MSVCRT_operator_new + + +MACRO(DEFINE_ALIAS, alias, orig, type) +EXTERN &orig:&type +ALIAS <&alias> = <&orig> +ENDM + +DEFINE_ALIAS ??_V@YAXPAX@Z, _MSVCRT_operator_delete, PROC +DEFINE_ALIAS ??2@YAPAXI@Z, _MSVCRT_operator_new, PROC +DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, _MSVCRT__query_new_handler, PROC +DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, _MSVCRT__set_new_handler, PROC +DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, _MSVCRT_set_new_handler, PROC +DEFINE_ALIAS ?_query_new_mode@@YAHXZ, _MSVCRT__query_new_mode, PROC +DEFINE_ALIAS ?_set_new_mode@@YAHH@Z, _MSVCRT__set_new_mode, PROC +DEFINE_ALIAS ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z, _MSVCRT__set_se_translator, PROC +DEFINE_ALIAS ?set_terminate@@YAP6AXXZP6AXXZ@Z, _MSVCRT_set_terminate, PROC +DEFINE_ALIAS ?set_unexpected@@YAP6AXXZP6AXXZ@Z, _MSVCRT_set_unexpected, PROC +DEFINE_ALIAS ?terminate@@YAXXZ, _MSVCRT_terminate, PROC +DEFINE_ALIAS ?unexpected@@YAXXZ, _MSVCRT_unexpected, PROC + + +END + Propchange: trunk/reactos/lib/sdk/crt/except/i386/cpp.s ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 3 months

[tkreuzer] 53197: [SPEC2DEF] Ignore redirections for c++ symbols, since this doesn't work with link

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 12 11:41:35 2011 New Revision: 53197 URL: http://svn.reactos.org/svn/reactos?rev=53197&view=rev Log: [SPEC2DEF] Ignore redirections for c++ symbols, since this doesn't work with link Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Fri Aug 12 11:41:35 2011 @@ -338,10 +338,18 @@ } else if (pexp->pcRedirection) { - int fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); - - fprintf(fileDest, "="); - PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); + if (gbMSComp && (pexp->pcName[0] == '?')) + { + /* ignore c++ redirection, since link doesn't like that! */ + } + else + { + int fDeco; + + fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); + fprintf(fileDest, "="); + PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); + } } else if (((pexp->uFlags & FL_STUB) || (pexp->nCallingConvention == CC_STUB)) && (pexp->pcName[0] == '?'))

13 years, 3 months

[gadamopoulos] 53196: [uxtheme] - Implement GetThemeBackgroundRegion for BT_IMAGEFILE background type

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 12 11:15:26 2011 New Revision: 53196 URL: http://svn.reactos.org/svn/reactos?rev=53196&view=rev Log: [uxtheme] - Implement GetThemeBackgroundRegion for BT_IMAGEFILE background type Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/draw.c [iso-8859-1] Fri Aug 12 11:15:26 2011 @@ -1731,6 +1731,150 @@ return S_OK; } + +static HBITMAP UXTHEME_DrawThemePartToDib(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, LPCRECT pRect) +{ + HDC hdcMem; + BITMAPINFO bmi = {0}; + HBITMAP hbmp, hbmpOld; + HBRUSH hbrBack; + + hdcMem = CreateCompatibleDC(0); + + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = pRect->right; + bmi.bmiHeader.biHeight = -pRect->bottom; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 32; + hbmp = CreateDIBSection(hdcMem, &bmi, DIB_RGB_COLORS , NULL, 0, 0); + + hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmp); + + /* FIXME: use an internal function that doesn't do transparent blt */ + hbrBack = CreateSolidBrush(RGB(255,0,255)); + + FillRect(hdcMem, pRect, hbrBack); + + DrawThemeBackground(hTheme, hdcMem, iPartId, iStateId, pRect, NULL); + + DeleteObject(hbrBack); + SelectObject(hdcMem, hbmpOld); + DeleteObject(hdcMem); + + return hbmp; +} + +#define PT_IN_RECT(lprc,x,y) ( x >= lprc->left && x < lprc->right && \ + y >= lprc->top && y < lprc->bottom) + +static HRGN UXTHEME_RegionFromDibBits(RGBQUAD* pBuffer, RGBQUAD* pclrTransparent, LPCRECT pRect) +{ + int x, y, xstart; + int cMaxRgnRects, cRgnDataSize, cRgnRects; + RECT* prcCurrent; + PRGNDATA prgnData; + ULONG clrTransparent, *pclrCurrent; + HRGN hrgnRet; + + pclrCurrent = (PULONG)pBuffer; + clrTransparent = *(PULONG)pclrTransparent; + + /* Create a region and pre-allocate memory enough for 3 spaces in one row*/ + cRgnRects = 0; + cMaxRgnRects = 4* (pRect->bottom-pRect->top); + cRgnDataSize = sizeof(RGNDATA) + cMaxRgnRects * sizeof(RECT); + + /* Allocate the region data */ + prgnData = (PRGNDATA)HeapAlloc(GetProcessHeap(), 0, cRgnDataSize); + + prcCurrent = (PRECT)prgnData->Buffer; + + /* Calculate the region rects */ + y=0; + /* Scan each line of the bitmap */ + while(y<pRect->bottom) + { + x=0; + /* Scan each pixel */ + while (x<pRect->right) + { + /* Check if the pixel is not transparent and it is in the requested rect */ + if(*pclrCurrent != clrTransparent && PT_IN_RECT(pRect,x,y)) + { + xstart = x; + /* Find the end of the opaque row of pixels */ + while (x<pRect->right) + { + if(*pclrCurrent == clrTransparent || !PT_IN_RECT(pRect,x,y)) + break; + x++; + pclrCurrent++; + } + + /* Add the scaned line to the region */ + SetRect(prcCurrent, xstart, y,x,y+1); + prcCurrent++; + cRgnRects++; + + /* Increase the size of the buffer if it is full */ + if(cRgnRects == cMaxRgnRects) + { + cMaxRgnRects *=2; + cRgnDataSize = sizeof(RGNDATA) + cMaxRgnRects * sizeof(RECT); + prgnData = (PRGNDATA)HeapReAlloc(GetProcessHeap(), + 0, + prgnData, + cRgnDataSize); + prcCurrent = (RECT*)prgnData->Buffer + cRgnRects; + } + } + else + { + x++; + pclrCurrent++; + } + } + y++; + } + + /* Fill the region data header */ + prgnData->rdh.dwSize = sizeof(prgnData->rdh); + prgnData->rdh.iType = RDH_RECTANGLES; + prgnData->rdh.nCount = cRgnRects; + prgnData->rdh.nRgnSize = cRgnDataSize; + prgnData->rdh.rcBound = *pRect; + + /* Create the region*/ + hrgnRet = ExtCreateRegion (NULL, cRgnDataSize, prgnData); + + /* Free the region data*/ + HeapFree(GetProcessHeap(),0,prgnData); + + /* return the region*/ + return hrgnRet; +} + +HRESULT UXTHEME_GetImageBackBackgroundRegion(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, LPCRECT pRect, HRGN *pRegion) +{ + HBITMAP hbmp; + DIBSECTION dib; + RGBQUAD clrTransparent = {0xFF,0x0, 0xFF,0x0}; + + /* Draw the theme part to a dib */ + hbmp = UXTHEME_DrawThemePartToDib(hTheme, hdc, iPartId, iStateId, pRect); + + /* Retrieve the info of the dib section */ + GetObject(hbmp, sizeof (DIBSECTION), &dib); + + /* Convert the bits of the dib section to a region */ + *pRegion = UXTHEME_RegionFromDibBits((RGBQUAD*)dib.dsBm.bmBits, &clrTransparent, pRect); + + /* Free the temp bitmap */ + DeleteObject(hbmp); + + return S_OK; +} + /*********************************************************************** * GetThemeBackgroundRegion (UXTHEME.@) * @@ -1752,8 +1896,7 @@ GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_BGTYPE, &bgtype); if(bgtype == BT_IMAGEFILE) { - FIXME("Images not handled yet\n"); - hr = ERROR_CALL_NOT_IMPLEMENTED; + hr = UXTHEME_GetImageBackBackgroundRegion(hTheme, hdc, iPartId, iStateId, pRect, pRegion); } else if(bgtype == BT_BORDERFILL) { *pRegion = CreateRectRgn(pRect->left, pRect->top, pRect->right, pRect->bottom);

13 years, 3 months

[gadamopoulos] 53195: [themesvc] - Add the themes service. For now it will only call ThemeHooksInstall and ThemeHooksRemove. From now on we do not need apihooksrv in order to have themes

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 12 10:25:30 2011 New Revision: 53195 URL: http://svn.reactos.org/svn/reactos?rev=53195&view=rev Log: [themesvc] - Add the themes service. For now it will only call ThemeHooksInstall and ThemeHooksRemove. From now on we do not need apihooksrv in order to have themes Added: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/ (with props) branches/GSoC_2011/ThemesSupport/base/services/thmsvc/CMakeLists.txt (with props) branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.c (with props) branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.rbuild (with props) branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.rc (with props) Modified: branches/GSoC_2011/ThemesSupport/base/services/CMakeLists.txt branches/GSoC_2011/ThemesSupport/base/services/services.rbuild Modified: branches/GSoC_2011/ThemesSupport/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/base/se… ============================================================================== --- branches/GSoC_2011/ThemesSupport/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/base/services/CMakeLists.txt [iso-8859-1] Fri Aug 12 10:25:30 2011 @@ -7,5 +7,6 @@ add_subdirectory(tcpsvcs) add_subdirectory(telnetd) #add_subdirectory(tftpd) +add_subdirectory(thmsvc) add_subdirectory(umpnpmgr) add_subdirectory(wlansvc) Modified: branches/GSoC_2011/ThemesSupport/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/base/se… ============================================================================== --- branches/GSoC_2011/ThemesSupport/base/services/services.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/base/services/services.rbuild [iso-8859-1] Fri Aug 12 10:25:30 2011 @@ -25,6 +25,9 @@ <directory name="tftpd"> <xi:include href="tftpd/tftpd.rbuild" /> </directory> + <directory name="thmsvc"> + <xi:include href="thmsvc/thmsvc.rbuild" /> + </directory> <directory name="umpnpmgr"> <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> </directory> Propchange: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Aug 12 10:25:30 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/base/se… ============================================================================== --- branches/GSoC_2011/ThemesSupport/base/services/thmsvc/CMakeLists.txt (added) +++ branches/GSoC_2011/ThemesSupport/base/services/thmsvc/CMakeLists.txt [iso-8859-1] Fri Aug 12 10:25:30 2011 @@ -1,0 +1,10 @@ + +set_unicode() + +add_executable(thmsvc thmsvc.c thmsvc.rc) + +target_link_libraries(thmsvc wine) + +set_module_type(thmsvc win32cui) +add_importlibs(thmsvc uxtheme advapi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET thmsvc DESTINATION reactos/system32 FOR all) Propchange: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/base/se… ============================================================================== --- branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.c (added) +++ branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.c [iso-8859-1] Fri Aug 12 10:25:30 2011 @@ -1,0 +1,149 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: services/thmsvc/thmsvc.c + * PURPOSE: Themes service + * PROGRAMMER: Giannis Adamopoulos + */ + +/* INCLUDES *****************************************************************/ + +#define WIN32_NO_STATUS +#include <windows.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(thmsvc); + + +/* GLOBALS ******************************************************************/ + +static VOID CALLBACK ServiceMain(DWORD argc, LPWSTR *argv); +static WCHAR ServiceName[] = L"Themes"; +static SERVICE_TABLE_ENTRYW ServiceTable[] = +{ + {ServiceName, ServiceMain}, + {NULL, NULL} +}; + +SERVICE_STATUS_HANDLE ServiceStatusHandle; +SERVICE_STATUS ServiceStatus; + +BOOL WINAPI ThemeHooksInstall(); + +BOOL WINAPI ThemeHooksRemove(); + +/* FUNCTIONS *****************************************************************/ + +static VOID +UpdateServiceStatus(DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = dwState; + + if (dwState == SERVICE_RUNNING) + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_PAUSE_CONTINUE | SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + else if (dwState == SERVICE_PAUSED) + ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_PAUSE_CONTINUE; + else + ServiceStatus.dwControlsAccepted = 0; + + ServiceStatus.dwWin32ExitCode = 0; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + + if (dwState == SERVICE_START_PENDING || + dwState == SERVICE_STOP_PENDING || + dwState == SERVICE_PAUSE_PENDING || + dwState == SERVICE_CONTINUE_PENDING) + ServiceStatus.dwWaitHint = 10000; + else + ServiceStatus.dwWaitHint = 0; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); +} + + +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + TRACE("ServiceControlHandler() called\n"); + + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + TRACE(" SERVICE_CONTROL_STOP received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + ThemeHooksRemove(); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_PAUSE: + TRACE(" SERVICE_CONTROL_PAUSE received\n"); + UpdateServiceStatus(SERVICE_PAUSED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_CONTINUE: + TRACE(" SERVICE_CONTROL_CONTINUE received\n"); + UpdateServiceStatus(SERVICE_RUNNING); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_INTERROGATE: + TRACE(" SERVICE_CONTROL_INTERROGATE received\n"); + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_SHUTDOWN: + TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + default : + TRACE(" Control %lu received\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + + +static VOID CALLBACK +ServiceMain(DWORD argc, LPWSTR *argv) +{ + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + TRACE("ServiceMain() called\n"); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandler, + NULL); + + TRACE("Calling SetServiceStatus()\n"); + UpdateServiceStatus(SERVICE_RUNNING); + TRACE("SetServiceStatus() called\n"); + + ThemeHooksInstall(); + + TRACE("ServiceMain() done\n"); +} + + +int +wmain(int argc, WCHAR *argv[]) +{ + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + TRACE("thmsvc: main() started\n"); + + StartServiceCtrlDispatcher(ServiceTable); + + TRACE("thmsvc: main() done\n"); + + return 0; +} + +/* EOF */ Propchange: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/base/se… ============================================================================== --- branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.rbuild (added) +++ branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.rbuild [iso-8859-1] Fri Aug 12 10:25:30 2011 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="thmsvc" type="win32cui" installbase="system32" installname="thmsvc.exe" unicode="yes"> + <include base="thmsvc">.</include> + <library>uxtheme</library> + <library>wine</library> + <library>ntdll</library> + <library>advapi32</library> + <file>thmsvc.c</file> + <file>thmsvc.rc</file> +</module> Propchange: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/base/se… ============================================================================== --- branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.rc (added) +++ branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.rc [iso-8859-1] Fri Aug 12 10:25:30 2011 @@ -1,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "Themes-Service\0" +#define REACTOS_STR_INTERNAL_NAME "thmsvc\0" +#define REACTOS_STR_ORIGINAL_FILENAME "thmsvc.exe\0" +#include <reactos/version.rc> Propchange: branches/GSoC_2011/ThemesSupport/base/services/thmsvc/thmsvc.rc ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 3 months

[gadamopoulos] 53194: [uxtheme] - Send WM_THEMECHANGED when theme hooks are removed and there is an active theme

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Aug 12 10:21:10 2011 New Revision: 53194 URL: http://svn.reactos.org/svn/reactos?rev=53194&view=rev Log: [uxtheme] - Send WM_THEMECHANGED when theme hooks are removed and there is an active theme Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c [iso-8859-1] Fri Aug 12 10:21:10 2011 @@ -183,5 +183,12 @@ BOOL WINAPI ThemeHooksRemove() { - return UnregisterUserApiHook(); -} + BOOL ret; + + ret = UnregisterUserApiHook(); + + if(IsThemeActive()) + UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); + + return ret; +}

13 years, 3 months

[cgutman] 53193: [USER32] - Simplify finding the icon size in IntDrawState - As a bonus, it now works for black and white icons too

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 12 10:07:16 2011 New Revision: 53193 URL: http://svn.reactos.org/svn/reactos?rev=53193&view=rev Log: [USER32] - Simplify finding the icon size in IntDrawState - As a bonus, it now works for black and white icons too Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Fri Aug 12 10:07:16 2011 @@ -1254,7 +1254,6 @@ if(!cx || !cy) { SIZE s; - ICONINFO ici; BITMAP bm; switch(opcode) @@ -1270,14 +1269,8 @@ break; case DST_ICON: - if(!GetIconInfo((HICON)lp, &ici)) + if(!get_icon_size((HICON)lp, &s)) return FALSE; - if(!GetObjectW(ici.hbmColor, sizeof(bm), &bm)) - return FALSE; - s.cx = bm.bmWidth; - s.cy = bm.bmHeight; - DeleteObject(ici.hbmMask); - DeleteObject(ici.hbmColor); break; case DST_BITMAP:

13 years, 3 months

[cgutman] 53192: [USER32] - Fix a bitmap leak in IntDrawState

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Aug 12 09:54:50 2011 New Revision: 53192 URL: http://svn.reactos.org/svn/reactos?rev=53192&view=rev Log: [USER32] - Fix a bitmap leak in IntDrawState Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Fri Aug 12 09:54:50 2011 @@ -1,4 +1,4 @@ -/* +ï»¿/* * ReactOS User32 Library * - Various drawing functions * @@ -1276,6 +1276,8 @@ return FALSE; s.cx = bm.bmWidth; s.cy = bm.bmHeight; + DeleteObject(ici.hbmMask); + DeleteObject(ici.hbmColor); break; case DST_BITMAP:

13 years, 3 months

← Newer
1
...
29
30
31
32
33
34
35
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011