Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[cgutman] 48602: [TCPIP] - Read the IP information from the interface key inside the Tcpip service key (confirmed on XP) - Fix a logic error in my code (no idea how I missed it) - Restores static I...

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Aug 23 01:17:41 2010 New Revision: 48602 URL: http://svn.reactos.org/svn/reactos?rev=48602&view=rev Log: [TCPIP] - Read the IP information from the interface key inside the Tcpip service key (confirmed on XP) - Fix a logic error in my code (no idea how I missed it) - Restores static IP functionality (still waiting on janderwald to fix netcfgx's DNS value writing) Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Mon Aug 23 01:17:41 2010 @@ -569,9 +569,7 @@ * SystemSpecific1: Pointer to a registry path with protocol-specific configuration information * SystemSpecific2: Unused & must not be touched */ -{ - /* XXX confirm that this is still true, or re-word the following comment */ - /* we get to ignore BindContext because we will never pend an operation with NDIS */ +{ TI_DbgPrint(DEBUG_DATALINK, ("Called with registry path %wZ for %wZ\n", SystemSpecific1, DeviceName)); *Status = LANRegisterAdapter(DeviceName, SystemSpecific1); } @@ -952,10 +950,13 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE ParameterHandle; PKEY_VALUE_PARTIAL_INFORMATION KeyValueInfo; + WCHAR Buffer[150]; UNICODE_STRING IPAddress = RTL_CONSTANT_STRING(L"IPAddress"); UNICODE_STRING Netmask = RTL_CONSTANT_STRING(L"SubnetMask"); UNICODE_STRING Gateway = RTL_CONSTANT_STRING(L"DefaultGateway"); UNICODE_STRING EnableDhcp = RTL_CONSTANT_STRING(L"EnableDHCP"); + UNICODE_STRING Prefix = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"); + UNICODE_STRING TcpipRegistryPath; UNICODE_STRING RegistryDataU; ANSI_STRING RegistryDataA; @@ -1009,9 +1010,19 @@ TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", &IF->Description)); + + TcpipRegistryPath.MaximumLength = sizeof(WCHAR) * 150; + TcpipRegistryPath.Length = 0; + TcpipRegistryPath.Buffer = Buffer; + + RtlAppendUnicodeStringToString(&TcpipRegistryPath, + &Prefix); + + RtlAppendUnicodeStringToString(&TcpipRegistryPath, + &IF->Name); InitializeObjectAttributes(&ObjectAttributes, - RegistryPath, + &TcpipRegistryPath, OBJ_CASE_INSENSITIVE, 0, NULL); @@ -1019,6 +1030,7 @@ AddrInitIPv4(&DefaultMask, 0); Status = ZwOpenKey(&ParameterHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) { IF->Unicast = DefaultMask; @@ -1040,7 +1052,7 @@ KeyValueInfo, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(ULONG), &Unused); - if (NT_SUCCESS(Status) && KeyValueInfo->DataLength == sizeof(ULONG) && (*(PULONG)KeyValueInfo->Data) != 0) + if (NT_SUCCESS(Status) && KeyValueInfo->DataLength == sizeof(ULONG) && (*(PULONG)KeyValueInfo->Data) == 0) { RegistryDataU.MaximumLength = 16 + sizeof(WCHAR); RegistryDataU.Buffer = (PWCHAR)KeyValueInfo->Data;

14 years, 4 months

[tkreuzer] 48601: [NTDLL] - Call LdrProcessRelocationBlockLongLong from LdrProcessRelocationBlock instead of duplicating the code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Aug 23 01:16:42 2010 New Revision: 48601 URL: http://svn.reactos.org/svn/reactos?rev=48601&view=rev Log: [NTDLL] - Call LdrProcessRelocationBlockLongLong from LdrProcessRelocationBlock instead of duplicating the code Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Mon Aug 23 01:16:42 2010 @@ -88,10 +88,10 @@ RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); } LoadCount = Module->LoadCount; - if (Module->LoadCount > 0 && Module->LoadCount != LDRP_PROCESS_CREATION_TIME) - { + if (Module->LoadCount > 0 && Module->LoadCount != LDRP_PROCESS_CREATION_TIME) + { Module->LoadCount--; - } + } if (!Locked) { RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); @@ -107,10 +107,10 @@ RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); } LoadCount = Module->LoadCount; - if (Module->LoadCount != LDRP_PROCESS_CREATION_TIME) - { + if (Module->LoadCount != LDRP_PROCESS_CREATION_TIME) + { Module->LoadCount++; - } + } if (!Locked) { RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock); @@ -3464,54 +3464,15 @@ } -PIMAGE_BASE_RELOCATION NTAPI -LdrProcessRelocationBlock(IN ULONG_PTR Address, - IN ULONG Count, - IN PUSHORT TypeOffset, - IN LONG_PTR Delta) -{ - SHORT Offset; - USHORT Type; - USHORT i; - PUSHORT ShortPtr; - PULONG LongPtr; - - for (i = 0; i < Count; i++) - { - Offset = *TypeOffset & 0xFFF; - Type = *TypeOffset >> 12; - - switch (Type) - { - case IMAGE_REL_BASED_ABSOLUTE: - break; - - case IMAGE_REL_BASED_HIGH: - ShortPtr = (PUSHORT)((ULONG_PTR)Address + Offset); - *ShortPtr += HIWORD(Delta); - break; - - case IMAGE_REL_BASED_LOW: - ShortPtr = (PUSHORT)((ULONG_PTR)Address + Offset); - *ShortPtr += LOWORD(Delta); - break; - - case IMAGE_REL_BASED_HIGHLOW: - LongPtr = (PULONG)((ULONG_PTR)Address + Offset); - *LongPtr += Delta; - break; - - case IMAGE_REL_BASED_HIGHADJ: - case IMAGE_REL_BASED_MIPS_JMPADDR: - default: - DPRINT1("Unknown/unsupported fixup type %hu.\n", Type); - return NULL; - } - - TypeOffset++; - } - - return (PIMAGE_BASE_RELOCATION)TypeOffset; +PIMAGE_BASE_RELOCATION +NTAPI +LdrProcessRelocationBlock( + IN ULONG_PTR Address, + IN ULONG Count, + IN PUSHORT TypeOffset, + IN LONG_PTR Delta) +{ + return LdrProcessRelocationBlockLongLong(Address, Count, TypeOffset, Delta); } NTSTATUS

14 years, 4 months

[akhaldi] 48600: [FAULTREP] - Fix a typo.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 23 00:02:06 2010 New Revision: 48600 URL: http://svn.reactos.org/svn/reactos?rev=48600&view=rev Log: [FAULTREP] - Fix a typo. Modified: trunk/reactos/dll/win32/faultrep/faultrep.rbuild Modified: trunk/reactos/dll/win32/faultrep/faultrep.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/faultrep/faultre… ============================================================================== --- trunk/reactos/dll/win32/faultrep/faultrep.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/faultrep/faultrep.rbuild [iso-8859-1] Mon Aug 23 00:02:06 2010 @@ -1,6 +1,6 @@ <module name="faultrep" type="win32dll" baseaddress="${BASEADDRESS_FAULTREP}" installbase="system32" installname="faultrep.dll"> <importlibrary definition="faultrep.spec" /> - <include base="fusion">.</include> + <include base="faultrep">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <library>wine</library>

14 years, 4 months

[akhaldi] 48599: [CMAKE] - Add dciman32, dhcpcsvc, dnsapi, dwmapi and faultrep to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 22 23:59:45 2010 New Revision: 48599 URL: http://svn.reactos.org/svn/reactos?rev=48599&view=rev Log: [CMAKE] - Add dciman32, dhcpcsvc, dnsapi, dwmapi and faultrep to build. Added: branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sun Aug 22 23:59:45 2010 @@ -18,6 +18,11 @@ add_subdirectory(crypt32) add_subdirectory(cryptdll) add_subdirectory(dbghelp) +add_subdirectory(dciman32) +add_subdirectory(dhcpcsvc) +add_subdirectory(dnsapi) +add_subdirectory(dwmapi) +add_subdirectory(faultrep) add_subdirectory(gdi32) add_subdirectory(kernel32) add_subdirectory(msvcrt) Added: branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dciman3… ============================================================================== --- branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt [iso-8859-1] Sun Aug 22 23:59:45 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(dciman32 ${CMAKE_CURRENT_SOURCE_DIR}/dciman32.spec ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def) + +add_library(dciman32 SHARED dciman_main.c) + +set_target_properties(dciman32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(dciman32 + ${CMAKE_CURRENT_BINARY_DIR}/dciman32.def + wine + mingw_common) + +add_dependencies(dciman32 dciman32_def psdk) Propchange: branches/cmake-bringup/dll/win32/dciman32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dhcpcsv… ============================================================================== --- branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt [iso-8859-1] Sun Aug 22 23:59:45 2010 @@ -1,0 +1,41 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(include) + +spec2def(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/dhcpcsvc.spec ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def) + +list(APPEND SOURCE + dhcp/adapter.c + dhcp/alloc.c + dhcp/api.c + dhcp/compat.c + dhcp/dhclient.c + dhcp/dispatch.c + dhcp/hash.c + dhcp/options.c + dhcp/pipe.c + dhcp/socket.c + dhcp/tables.c + dhcp/util.c + dhcpcsvc.c + dhcpcsvc.rc) + +add_library(dhcpcsvc SHARED + ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc_rosdhcp.h.gch + ${SOURCE}) + +set_target_properties(dhcpcsvc PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(dhcpcsvc + ${CMAKE_CURRENT_BINARY_DIR}/dhcpcsvc.def + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a + -lws2_32 + -liphlpapi + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + oldnames + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(dhcpcsvc ${CMAKE_CURRENT_SOURCE_DIR}/include/rosdhcp.h ${SOURCE}) +add_dependencies(dhcpcsvc dhcpcsvc_def psdk) Propchange: branches/cmake-bringup/dll/win32/dhcpcsvc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dnsapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] Sun Aug 22 23:59:45 2010 @@ -1,0 +1,40 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +include_directories(include) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/src) +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/adns_win32) + +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-DADNS_JGAA_WIN32) + +spec2def(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi.spec ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def) + +list(APPEND SOURCE + dnsapi/adns.c + dnsapi/context.c + dnsapi/memory.c + dnsapi/names.c + dnsapi/query.c + dnsapi/record.c + dnsapi/stubs.c + dnsapi.rc) + +add_library(dnsapi SHARED + ${CMAKE_CURRENT_BINARY_DIR}/dnsapi_precomp.h.gch + ${SOURCE}) + +set_target_properties(dnsapi PROPERTIES LINK_FLAGS "-Wl,-entry,0") + +target_link_libraries(dnsapi + ${CMAKE_CURRENT_BINARY_DIR}/dnsapi.def + adns + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -lws2_32 + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a + -liphlpapi + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) +add_dependencies(dnsapi dnsapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dwmapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] Sun Aug 22 23:59:45 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(dwmapi ${CMAKE_CURRENT_SOURCE_DIR}/dwmapi.spec ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def) + +add_library(dwmapi SHARED dwmapi_main.c version.rc) + +set_target_properties(dwmapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(dwmapi + ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def + wine + mingw_common) + +add_dependencies(dwmapi dwmapi_def psdk) Propchange: branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/faultre… ============================================================================== --- branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt [iso-8859-1] Sun Aug 22 23:59:45 2010 @@ -1,0 +1,20 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(faultrep ${CMAKE_CURRENT_SOURCE_DIR}/faultrep.spec ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def) + +add_library(faultrep SHARED faultrep.c) + +set_target_properties(faultrep PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(faultrep + ${CMAKE_CURRENT_BINARY_DIR}/faultrep.def + wine + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a) + +add_dependencies(faultrep faultrep_def psdk) Propchange: branches/cmake-bringup/dll/win32/faultrep/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[akhaldi] 48598: [CMAKE] - Fix adns lib.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 22 23:46:10 2010 New Revision: 48598 URL: http://svn.reactos.org/svn/reactos?rev=48598&view=rev Log: [CMAKE] - Fix adns lib. Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/adns… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Sun Aug 22 23:46:10 2010 @@ -1,9 +1,22 @@ + include_directories(src) include_directories(adns_win32) +add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(-DADNS_JGAA_WIN32) -file(GLOB_RECURSE SOURCE "/src/*.c" "./adns_win32/*.c") +list(APPEND SOURCE + adns_win32/adns_unix_calls.c + src/check.c + src/event.c + src/general.c + src/parse.c + src/poll.c + src/query.c + src/reply.c + src/setup.c + src/transmit.c + src/types.c) add_library(adns ${SOURCE}) add_dependencies(adns psdk)

14 years, 4 months

[tkreuzer] 48597: [WIN32K] / [GDI32] - GetTextExtentExPointI and GetTextExtentPointI take an array of glyph indices, not characters. Pass a flag GTEF_INDICES (This is a reactos specific definition ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Aug 22 23:38:02 2010 New Revision: 48597 URL: http://svn.reactos.org/svn/reactos?rev=48597&view=rev Log: [WIN32K] / [GDI32] - GetTextExtentExPointI and GetTextExtentPointI take an array of glyph indices, not characters. Pass a flag GTEF_INDICES (This is a reactos specific definition and not exactly like on Windows XP, but the real names/values are undocumented and this is the easiest way.) to NtGdiGetTextExtent/NtGdiGetTextExtentExW and handle this flag in TextIntGetTextExtentPoint to account for this. Fixes bug 3481 Modified: trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Sun Aug 22 23:38:02 2010 @@ -173,7 +173,7 @@ LPSIZE lpSize ) { - return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpSize, 1); + return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpSize, 0); } @@ -299,7 +299,7 @@ LPINT alpDx, LPSIZE lpSize) { - return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,1); + return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,GTEF_INDICES); } /* @@ -312,7 +312,7 @@ int cgi, LPSIZE lpSize) { - return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2); + return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,GTEF_INDICES); } /* Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun Aug 22 23:38:02 2010 @@ -191,6 +191,9 @@ // NtGdiGetCharABCWidthW Flags #define GCABCW_NOFLOAT 0x0001 #define GCABCW_INDICES 0x0002 + +// NtGdiGetTextExtent* flags (reactos own) +#define GTEF_INDICES 0x1 /* CAPS1 support */ #define CAPS1 94 Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Sun Aug 22 23:38:02 2010 @@ -96,7 +96,7 @@ ULONG FASTCALL ftGdiGetGlyphOutline(PDC,WCHAR,UINT,LPGLYPHMETRICS,ULONG,PVOID,LPMAT2,BOOL); INT FASTCALL IntGetOutlineTextMetrics(PFONTGDI,UINT,OUTLINETEXTMETRICW *); BOOL FASTCALL ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS); -BOOL FASTCALL TextIntGetTextExtentPoint(PDC,PTEXTOBJ,LPCWSTR,INT,ULONG,LPINT,LPINT,LPSIZE); +BOOL FASTCALL TextIntGetTextExtentPoint(PDC,PTEXTOBJ,LPCWSTR,INT,ULONG,LPINT,LPINT,LPSIZE,FLONG); BOOL FASTCALL ftGdiGetTextMetricsW(HDC,PTMW_INTERNAL); DWORD FASTCALL IntGetFontLanguageInfo(PDC); INT FASTCALL ftGdiGetTextCharsetInfo(PDC,PFONTSIGNATURE,DWORD); Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Sun Aug 22 23:38:02 2010 @@ -75,7 +75,7 @@ return Count; } - +#if 0 DWORD FASTCALL GreGetCharacterPlacementW( @@ -90,13 +90,14 @@ if (!pgcpw) { - if (GreGetTextExtentW( hdc, pwsz, nCount, &Size, 1)) + if (GreGetTextExtentW( hdc, pwsz, nCount, &Size, 0)) return MAKELONG(Size.cx, Size.cy); return 0; } UNIMPLEMENTED; return 0; } +#endif INT FASTCALL @@ -167,7 +168,7 @@ DC_UnlockDc(pdc); return 0; } - Good = TextIntGetTextExtentPoint(pdc, TextObj, alphabet, 52, 0, NULL, 0, &sz); + Good = TextIntGetTextExtentPoint(pdc, TextObj, alphabet, 52, 0, NULL, 0, &sz, 0); TEXTOBJ_UnlockText(TextObj); DC_UnlockDc(pdc); Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Aug 22 23:38:02 2010 @@ -2123,7 +2123,8 @@ ULONG MaxExtent, LPINT Fit, LPINT Dx, - LPSIZE Size) + LPSIZE Size, + FLONG fl) { PFONTGDI FontGDI; FT_Face face; @@ -2195,7 +2196,11 @@ for (i = 0; i < Count; i++) { - glyph_index = FT_Get_Char_Index(face, *String); + if (fl & GTEF_INDICES) + glyph_index = *String; + else + glyph_index = FT_Get_Char_Index(face, *String); + if (!(realglyph = ftGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { @@ -4238,16 +4243,17 @@ IntLockFreeType; face = FontGDI->face; + if (DefChar == 0xffff && FT_IS_SFNT(face)) + { + TT_OS2 *pOS2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); + DefChar = (pOS2->usDefaultChar ? FT_Get_Char_Index(face, pOS2->usDefaultChar) : 0); + } + for (i = 0; i < cwc; i++) { - Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); + Buffer[i] = FT_Get_Char_Index(face, UnSafepwc[i]); // FIXME: unsafe! if (Buffer[i] == 0) { - if (DefChar == 0xffff && FT_IS_SFNT(face)) - { - TT_OS2 *pOS2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); - DefChar = (pOS2->usDefaultChar ? FT_Get_Char_Index(face, pOS2->usDefaultChar) : 0); - } Buffer[i] = DefChar; } } Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Sun Aug 22 23:38:02 2010 @@ -15,6 +15,7 @@ /** Functions *****************************************************************/ +#if 0 /* flOpts : GetTextExtentPoint32W = 0 @@ -60,7 +61,8 @@ 0, NULL, 0, - psize); + psize, + flOpts); TEXTOBJ_UnlockText(TextObj); } else @@ -123,7 +125,8 @@ MaxExtent, (LPINT)Fit, (LPINT)Dx, - pSize); + pSize, + fl); TEXTOBJ_UnlockText(TextObj); } else @@ -132,6 +135,7 @@ DC_UnlockDc(pdc); return Result; } +#endif DWORD APIENTRY @@ -347,7 +351,8 @@ MaxExtent, NULL == UnsafeFit ? NULL : &Fit, Dx, - &Size); + &Size, + fl); TEXTOBJ_UnlockText(TextObj); } else @@ -420,7 +425,7 @@ LPSIZE psize, UINT flOpts) { - return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, 0, NULL, NULL, psize, 0); + return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, 0, NULL, NULL, psize, flOpts); } BOOL

14 years, 4 months

[akhaldi] 48596: [CMAKE] - Add compstui, credui, crtdll, crypt32, cryptdll and dbghelp to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 22 22:52:07 2010 New Revision: 48596 URL: http://svn.reactos.org/svn/reactos?rev=48596&view=rev Log: [CMAKE] - Add compstui, credui, crtdll, crypt32, cryptdll and dbghelp to build. Added: branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/credui/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sun Aug 22 22:52:07 2010 @@ -12,6 +12,12 @@ add_subdirectory(cards) add_subdirectory(cfgmgr32) add_subdirectory(clusapi) +add_subdirectory(compstui) +add_subdirectory(credui) +add_subdirectory(crtdll) +add_subdirectory(crypt32) +add_subdirectory(cryptdll) +add_subdirectory(dbghelp) add_subdirectory(gdi32) add_subdirectory(kernel32) add_subdirectory(msvcrt) Added: branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… ============================================================================== --- branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt [iso-8859-1] Sun Aug 22 22:52:07 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(compstui ${CMAKE_CURRENT_SOURCE_DIR}/compstui.spec ${CMAKE_CURRENT_BINARY_DIR}/compstui.def) + +add_library(compstui SHARED compstui_main.c) + +set_target_properties(compstui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(compstui + ${CMAKE_CURRENT_BINARY_DIR}/compstui.def + wine + mingw_common) + +add_dependencies(compstui compstui_def psdk) Propchange: branches/cmake-bringup/dll/win32/compstui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/credui/… ============================================================================== --- branches/cmake-bringup/dll/win32/credui/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/credui/CMakeLists.txt [iso-8859-1] Sun Aug 22 22:52:07 2010 @@ -1,0 +1,22 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(credui ${CMAKE_CURRENT_SOURCE_DIR}/credui.spec ${CMAKE_CURRENT_BINARY_DIR}/credui.def) + +add_library(credui SHARED credui_main.c credui.rc) + +set_target_properties(credui PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(credui + ${CMAKE_CURRENT_BINARY_DIR}/credui.def + wine + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + -lcomctl32) + +add_dependencies(credui credui_def psdk) Propchange: branches/cmake-bringup/dll/win32/credui/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crtdll/… ============================================================================== --- branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Sun Aug 22 22:52:07 2010 @@ -1,0 +1,32 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_definitions(-DUSE_MSVCRT_PREFIX) +add_definitions(-D_MSVCRT_LIB_) +add_definitions(-D_MSVCRT_) +add_definitions(-DCRTDLL) +add_definitions(-D_CTYPE_DISABLE_MACROS) +add_definitions(-D_NO_INLINING) +add_definitions(-D__MINGW_IMPORT="") + +include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) + +spec2def(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/crtdll.spec ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def) + +list(APPEND SOURCE dllmain.c crtdll.rc) + +add_library(crtdll SHARED + ${CMAKE_CURRENT_BINARY_DIR}/crtdll_precomp.h.gch + ${SOURCE}) + +set_target_properties(crtdll PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(crtdll + ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def + wine + crt + ${REACTOS_SOURCE_DIR}/dll/win32/kernel32/libkernel32.a + ${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a) + +add_pch(crtdll ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_dependencies(crtdll crtdll_def psdk) Propchange: branches/cmake-bringup/dll/win32/crtdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/crypt32… ============================================================================== --- branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Sun Aug 22 22:52:07 2010 @@ -1,0 +1,55 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D_WINE) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(crypt32 ${CMAKE_CURRENT_SOURCE_DIR}/crypt32.spec ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def) + +add_library(crypt32 SHARED + base64.c + cert.c + chain.c + collectionstore.c + context.c + crl.c + ctl.c + decode.c + encode.c + filestore.c + main.c + message.c + msg.c + object.c + oid.c + proplist.c + protectdata.c + provstore.c + regstore.c + rootstore.c + serialize.c + sip.c + store.c + str.c + crypt32.rc + version.rc) + +set_target_properties(crypt32 PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(crypt32 + ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def + wine + pseh + mingw_common + ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a + ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(crypt32 crypt32_def psdk) Propchange: branches/cmake-bringup/dll/win32/crypt32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] Sun Aug 22 22:52:07 2010 @@ -1,0 +1,19 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(cryptdll ${CMAKE_CURRENT_SOURCE_DIR}/cryptdll.spec ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def) + +add_library(cryptdll SHARED cryptdll.c) + +set_target_properties(cryptdll PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(cryptdll + ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def + wine + mingw_common) + +add_dependencies(cryptdll cryptdll_def psdk) Propchange: branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… ============================================================================== --- branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Sun Aug 22 22:52:07 2010 @@ -1,0 +1,56 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") + +add_definitions(-D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D_WINE) + +add_definitions(-DHAVE_REGEX_H) +add_definitions(-D_IMAGEHLP_SOURCE_) + +if(ARCH MATCHES amd64) +add_definitions(-DUNW_FLAG_NHANDLER=0 -DUNW_FLAG_EHANDLER=1 -DUNW_FLAG_UHANDLER=2 -DUNW_FLAG_CHAININFO=3) +endif(ARCH MATCHES amd64) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(dbghelp ${CMAKE_CURRENT_SOURCE_DIR}/dbghelp.spec ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def) + +add_library(dbghelp SHARED + coff.c + cpu_i386.c + cpu_ppc.c + cpu_x86_64.c + crc32.c + dbghelp.c + dwarf.c + elf_module.c + image.c + macho_module.c + minidump.c + module.c + msc.c + path.c + pe_module.c + regex.c + rosstubs.c + source.c + stabs.c + stack.c + storage.c + symbol.c + type.c + version.rc) + +set_target_properties(dbghelp PROPERTIES LINK_FLAGS "-Wl,-entry,_DllMain@12") + +target_link_libraries(dbghelp + ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def + wine + mingw_common + -lpsapi + -lversion + pseh + ${REACTOS_SOURCE_DIR}/dll/win32/msvcrt/libmsvcrt.a) + +add_dependencies(dbghelp dbghelp_def psdk) Propchange: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

[tkreuzer] 48595: [WIN32K] - When doing a cleanup for a DC, check, if the default brushes are set, before dereferencing them. Fixes a possible kernel mode crash. - Remove some obsolete casts

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Aug 22 22:44:36 2010 New Revision: 48595 URL: http://svn.reactos.org/svn/reactos?rev=48595&view=rev Log: [WIN32K] - When doing a cleanup for a DC, check, if the default brushes are set, before dereferencing them. Fixes a possible kernel mode crash. - Remove some obsolete casts Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sun Aug 22 22:44:36 2010 @@ -165,8 +165,10 @@ DC_vSelectPalette(pDC, NULL); /* Dereference default brushes */ - BRUSH_ShareUnlockBrush(pDC->eboText.pbrush); - BRUSH_ShareUnlockBrush(pDC->eboBackground.pbrush); + if (pDC->eboText.pbrush) + BRUSH_ShareUnlockBrush(pDC->eboText.pbrush); + if (pDC->eboBackground.pbrush) + BRUSH_ShareUnlockBrush(pDC->eboBackground.pbrush); /* Cleanup the dc brushes */ EBRUSHOBJ_vCleanup(&pDC->eboFill); @@ -205,12 +207,12 @@ } if (pDC->prgnVis) { // FIXME! HAX!!! - Index = GDI_HANDLE_GET_INDEX(((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr); + Index = GDI_HANDLE_GET_INDEX(pDC->prgnVis->BaseObject.hHmgr); Entry = &GdiHandleTable->Entries[Index]; if (Entry->UserData) FreeObjectAttr(Entry->UserData); Entry->UserData = NULL; // - if (!GDIOBJ_SetOwnership(((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr, Owner)) return FALSE; + if (!GDIOBJ_SetOwnership(pDC->prgnVis->BaseObject.hHmgr, Owner)) return FALSE; } if (pDC->rosdc.hGCClipRgn) { // FIXME! HAX!!!

14 years, 4 months

[akhaldi] 48594: [CMAKE] - Guard pseh2.h against RC_INVOKED.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 22 22:43:43 2010 New Revision: 48594 URL: http://svn.reactos.org/svn/reactos?rev=48594&view=rev Log: [CMAKE] - Guard pseh2.h against RC_INVOKED. Modified: branches/cmake-bringup/include/psdk/rpc.h Modified: branches/cmake-bringup/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpc.… ============================================================================== --- branches/cmake-bringup/include/psdk/rpc.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpc.h [iso-8859-1] Sun Aug 22 22:43:43 2010 @@ -12,7 +12,9 @@ #endif #ifdef __GNUC__ +#ifndef RC_INVOKED #include <pseh/pseh2.h> +#endif #endif #ifndef __RPC_H__

14 years, 4 months

[cgutman] 48593: [DHCPCSVC] - Write the DNS servers in a REG_MULTI_SZ value [IPHLPAPI] - Rewrite the registry reading code - Use HeapFree to free memory from the allocated from heap

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Aug 22 22:22:27 2010 New Revision: 48593 URL: http://svn.reactos.org/svn/reactos?rev=48593&view=rev Log: [DHCPCSVC] - Write the DNS servers in a REG_MULTI_SZ value [IPHLPAPI] - Rewrite the registry reading code - Use HeapFree to free memory from the allocated from heap Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h trunk/reactos/dll/win32/iphlpapi/registry.c trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/dh… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] Sun Aug 22 22:22:27 2010 @@ -507,24 +507,25 @@ char *nsbuf; int i, addrs = new_lease->options[DHO_DOMAIN_NAME_SERVERS].len / sizeof(ULONG); - - nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) ); + int len = 0; + + nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) + 1 ); if( nsbuf) { - nsbuf[0] = 0; + memset(nsbuf, 0, addrs * sizeof(IP_ADDRESS_STRING) + 1); for( i = 0; i < addrs; i++ ) { nameserver.len = sizeof(ULONG); memcpy( nameserver.iabuf, new_lease->options[DHO_DOMAIN_NAME_SERVERS].data + (i * sizeof(ULONG)), sizeof(ULONG) ); strcat( nsbuf, piaddr(nameserver) ); - if( i != addrs-1 ) strcat( nsbuf, "," ); + len += strlen(nsbuf) + 1; } DH_DbgPrint(MID_TRACE,("Setting DhcpNameserver: %s\n", nsbuf)); - RegSetValueExA( RegKey, "DhcpNameServer", 0, REG_SZ, - (LPBYTE)nsbuf, strlen(nsbuf) + 1 ); + RegSetValueExA( RegKey, "DhcpNameServer", 0, REG_MULTI_SZ, + (LPBYTE)nsbuf, len + 1 ); free( nsbuf ); } Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sun Aug 22 22:22:27 2010 @@ -139,6 +139,7 @@ PWCHAR GetNthChildKeyName( HANDLE RegHandle, DWORD n ); void ConsumeChildKeyName( PWCHAR Name ); PWCHAR QueryRegistryValueString( HANDLE RegHandle, PWCHAR ValueName ); +PWCHAR *QueryRegistryValueStringMulti( HANDLE RegHandle, PWCHAR ValueName ); void ConsumeRegValueString( PWCHAR NameServer ); BOOL isInterface( TDIEntityID *if_maybe ); BOOL hasArp( HANDLE tcpFile, TDIEntityID *arp_maybe ); Modified: trunk/reactos/dll/win32/iphlpapi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/registr… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] Sun Aug 22 22:22:27 2010 @@ -66,25 +66,123 @@ if (Name) HeapFree( GetProcessHeap(), 0, Name ); } -PWCHAR QueryRegistryValueString( HANDLE RegHandle, PWCHAR ValueName ) { - PWCHAR Name; - DWORD ReturnedSize = 0; +PVOID QueryRegistryValue(HANDLE RegHandle, PWCHAR ValueName, LPDWORD RegistryType, LPDWORD Length) +{ + PVOID ReadValue = NULL; + DWORD Error; - if (RegQueryValueExW( RegHandle, ValueName, NULL, NULL, NULL, - &ReturnedSize ) != 0) { - return 0; - } else { - Name = malloc( ReturnedSize); - RegQueryValueExW( RegHandle, ValueName, NULL, NULL, (PVOID)Name, - &ReturnedSize ); - return Name; - } + *Length = 0; + *RegistryType = REG_NONE; + + while (TRUE) + { + Error = RegQueryValueExW(RegHandle, ValueName, NULL, RegistryType, ReadValue, Length); + if (Error == ERROR_SUCCESS) + { + if (ReadValue) break; + } + else if (Error == ERROR_MORE_DATA) + { + HeapFree(GetProcessHeap(), 0, ReadValue); + } + else break; + + ReadValue = HeapAlloc(GetProcessHeap(), 0, *Length); + if (!ReadValue) return NULL; + } + + if (Error != ERROR_SUCCESS) + { + if (ReadValue) HeapFree(GetProcessHeap(), 0, ReadValue); + + *Length = 0; + *RegistryType = REG_NONE; + ReadValue = NULL; + } + + return ReadValue; +} + +PWCHAR TerminateReadString(PWCHAR String, DWORD Length) +{ + PWCHAR TerminatedString; + + TerminatedString = HeapAlloc(GetProcessHeap(), 0, Length + sizeof(WCHAR)); + if (TerminatedString == NULL) + return NULL; + + memcpy(TerminatedString, String, Length); + + TerminatedString[Length / sizeof(WCHAR)] = UNICODE_NULL; + + return TerminatedString; +} + +PWCHAR QueryRegistryValueString( HANDLE RegHandle, PWCHAR ValueName ) +{ + PWCHAR String, TerminatedString; + DWORD Type, Length; + + String = QueryRegistryValue(RegHandle, ValueName, &Type, &Length); + if (!String) return NULL; + if (Type != REG_SZ) + { + DbgPrint("Type mismatch for %S (%d != %d)\n", ValueName, Type, REG_SZ); + //HeapFree(GetProcessHeap(), 0, String); + //return NULL; + } + + TerminatedString = TerminateReadString(String, Length); + HeapFree(GetProcessHeap(), 0, String); + if (!TerminatedString) return NULL; + + return TerminatedString; } void ConsumeRegValueString( PWCHAR Value ) { - if (Value) free(Value); + if (Value) HeapFree(GetProcessHeap(), 0, Value); } PWCHAR *QueryRegistryValueStringMulti( HANDLE RegHandle, PWCHAR ValueName ) { - return 0; /* FIXME if needed */ + PWCHAR String, TerminatedString, Tmp; + PWCHAR *Table; + DWORD Type, Length, i, j; + + String = QueryRegistryValue(RegHandle, ValueName, &Type, &Length); + if (!String) return NULL; + if (Type != REG_MULTI_SZ) + { + DbgPrint("Type mismatch for %S (%d != %d)\n", ValueName, Type, REG_MULTI_SZ); + //HeapFree(GetProcessHeap(), 0, String); + //return NULL; + } + + TerminatedString = TerminateReadString(String, Length); + HeapFree(GetProcessHeap(), 0, String); + if (!TerminatedString) return NULL; + + for (Tmp = TerminatedString, i = 0; *Tmp; Tmp++, i++) while (*Tmp) Tmp++; + + Table = HeapAlloc(GetProcessHeap(), 0, (i + 1) * sizeof(PWCHAR)); + if (!Table) + { + HeapFree(GetProcessHeap(), 0, TerminatedString); + return NULL; + } + + for (Tmp = TerminatedString, j = 0; *Tmp; Tmp++, j++) + { + PWCHAR Orig = Tmp; + + for (i = 0; *Tmp; i++, Tmp++); + + Table[j] = HeapAlloc(GetProcessHeap(), 0, i * sizeof(WCHAR)); + memcpy(Table[j], Orig, i * sizeof(WCHAR)); + } + + Table[j] = NULL; + + HeapFree(GetProcessHeap(), 0, TerminatedString); + + return Table; } Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Sun Aug 22 22:22:27 2010 @@ -122,47 +122,24 @@ void EnumNameServers( HANDLE RegHandle, PWCHAR Interface, PVOID Data, EnumNameServersFunc cb ) { - PWCHAR NameServerString = - QueryRegistryValueString(RegHandle, L"DhcpNameServer"); + PWCHAR *NameServerString = + QueryRegistryValueStringMulti(RegHandle, L"DhcpNameServer"); + DWORD i; if (!NameServerString) - NameServerString = QueryRegistryValueString(RegHandle, L"NameServer"); - - if (NameServerString) { - /* Now, count the non-empty comma separated */ - DWORD ch; - DWORD LastNameStart = 0; - for (ch = 0; NameServerString[ch]; ch++) { - if (NameServerString[ch] == ',') { - if (ch - LastNameStart > 0) { /* Skip empty entries */ - PWCHAR NameServer = - malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); - if (NameServer) { - memcpy(NameServer,NameServerString + LastNameStart, - (ch - LastNameStart) * sizeof(WCHAR)); - NameServer[ch - LastNameStart] = 0; - cb( Interface, NameServer, Data ); - free(NameServer); - LastNameStart = ch +1; - } - } - LastNameStart = ch + 1; /* The first one after the comma */ - } - } - if (ch - LastNameStart > 0) { /* A last name? */ - PWCHAR NameServer = malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); - if (NameServer) { - memcpy(NameServer,NameServerString + LastNameStart, - (ch - LastNameStart) * sizeof(WCHAR)); - NameServer[ch - LastNameStart] = 0; - cb( Interface, NameServer, Data ); - free(NameServer); - } - } - ConsumeRegValueString(NameServerString); - } -} - + NameServerString = QueryRegistryValueStringMulti(RegHandle, L"NameServer"); + + if (!NameServerString) return; + + for (i = 0; NameServerString[i]; i++) + { + cb(Interface, NameServerString[i], Data); + + HeapFree(GetProcessHeap(), 0, NameServerString[i]); + } + + HeapFree(GetProcessHeap(), 0, NameServerString); +} static void CreateNameServerListEnumNamesFuncCount( PWCHAR Interface, PWCHAR Server, PVOID _Data ) {

14 years, 4 months

← Newer
1
...
5
6
7
8
9
10
11
...
29
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 2010