Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hyperion] 38210: modified dll/win32/gdi32/gdi32.rbuild modified dll/win32/kernel32/kernel32.rbuild modified dll/win32/user32/user32.rbuild Inexplicably missed the "big three" in r37187. Don't link msvcrt in core Win32 DLLs, for real this time modified dll/win32/user32/misc/dllmain.c Don't use wcstok. Removes the dependency on msvcrt
by hyperion＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: hyperion Date: Sat Dec 20 18:13:08 2008 New Revision: 38210 URL: http://svn.reactos.org/svn/reactos?rev=38210&view=rev Log: modified dll/win32/gdi32/gdi32.rbuild modified dll/win32/kernel32/kernel32.rbuild modified dll/win32/user32/user32.rbuild Inexplicably missed the "big three" in r37187. Don't link msvcrt in core Win32 DLLs, for real this time modified dll/win32/user32/misc/dllmain.c Don't use wcstok. Removes the dependency on msvcrt Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/user32.rbuild Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Sat Dec 20 18:13:08 2008 @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll"> <importlibrary definition="gdi32.def" /> <include base="gdi32">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sat Dec 20 18:13:08 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> - <module name="kernel32_base" type="objectlibrary"> + <module name="kernel32_base" type="objectlibrary" crt="dll"> <include base="kernel32_base">.</include> <include base="kernel32_base">include</include> <include base="ReactOS">include/reactos/subsys</include> @@ -135,7 +135,7 @@ </directory> <library>normalize</library> </module> - <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> + <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" crt="dll"> <importlibrary definition="kernel32.def" /> <include base="kernel32">.</include> <include base="kernel32" root="intermediate">.</include> Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Sat Dec 20 18:13:08 2008 @@ -132,16 +132,27 @@ { WCHAR buffer[KEY_LENGTH]; LPWSTR ptr; - LPWSTR seps = L" ,"; - - RtlCopyMemory(buffer, szAppInit, KEY_LENGTH);; - - ptr = wcstok(buffer, seps); - while (ptr) - { - LoadLibraryW(ptr); - ptr = wcstok(NULL, seps); - } + size_t i; + + RtlCopyMemory(buffer, szAppInit, KEY_LENGTH); + + for (i = 0; i < KEY_LENGTH; ++ i) + { + if(buffer[i] == L' ' || buffer[i] == L',') + buffer[i] = 0; + } + + for (i = 0; i < KEY_LENGTH; ) + { + if(buffer[i] == 0) + ++ i; + else + { + ptr = buffer + i; + i += wcslen(ptr); + LoadLibraryW(ptr); + } + } } } @@ -153,17 +164,28 @@ WCHAR buffer[KEY_LENGTH]; HMODULE hModule; LPWSTR ptr; - LPWSTR seps = L" ,"; + size_t i; RtlCopyMemory(buffer, szAppInit, KEY_LENGTH); - ptr = wcstok(buffer, seps); - while (ptr) - { - hModule = GetModuleHandleW(ptr); - FreeLibrary(hModule); - ptr = wcstok(NULL, seps); - } + for (i = 0; i < KEY_LENGTH; ++ i) + { + if(buffer[i] == L' ' || buffer[i] == L',') + buffer[i] = 0; + } + + for (i = 0; i < KEY_LENGTH; ) + { + if(buffer[i] == 0) + ++ i; + else + { + ptr = buffer + i; + i += wcslen(ptr); + hModule = GetModuleHandleW(ptr); + FreeLibrary(hModule); + } + } } } Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Sat Dec 20 18:13:08 2008 @@ -1,4 +1,4 @@ -<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes"> +<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll"> <importlibrary definition="user32.def" /> <include base="user32">.</include> <include base="user32">include</include>

1 0

[tkreuzer] 38209: Don't redefine _tcscpy_s and _tsplitpath_s
by tkreuzer＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: tkreuzer Date: Sat Dec 20 17:55:05 2008 New Revision: 38209 URL: http://svn.reactos.org/svn/reactos?rev=38209&view=rev Log: Don't redefine _tcscpy_s and _tsplitpath_s Modified: trunk/reactos/base/shell/explorer/utility/utility.h Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Sat Dec 20 17:55:05 2008 @@ -191,11 +191,12 @@ #else // __STDC_WANT_SECURE_LIB__ #define strcpy_s(d, l, s) strcpy(d, s) -#define _tcscpy_s(d, l, s) _tcscpy(d, s) +#define wcscpy_s(d, l, s) wcscpy(d, s) #define wcsncpy_s(d, l, s, n) wcsncpy(d, s, n) #define _stprintf_s1(b, l, f, p1) _stprintf(b, f, p1) #define _stprintf_s2(b, l, f, p1,p2) _stprintf(b, f, p1,p2) -#define _tsplitpath_s(f, d,dl, p,pl, n,nl, e,el) _tsplitpath(f, d, p, n, e) +#define _wsplitpath_s(f, d,dl, p,pl, n,nl, e,el) _wsplitpath(f, d, p, n, e) +#define _splitpath_s(f, d,dl, p,pl, n,nl, e,el) _splitpath(f, d, p, n, e) #endif // __STDC_WANT_SECURE_LIB__

1 0

[hyperion] 38208: modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S For some reason, "call _RtlUnwind@16" is being linked as "call 0" (very likely a linker bug). Reimplementing _SEH2GlobalUnwind in C and taking the address of RtlUnwind from C code seems to work Annotate functions implemented in assembler with .func/.endfunc, so the symbols are more correct
by hyperion＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: hyperion Date: Sat Dec 20 17:27:17 2008 New Revision: 38208 URL: http://svn.reactos.org/svn/reactos?rev=38208&view=rev Log: modified lib/pseh/framebased-gcchack.c modified lib/pseh/i386/framebased-gcchack.S For some reason, "call _RtlUnwind@16" is being linked as "call 0" (very likely a linker bug). Reimplementing _SEH2GlobalUnwind in C and taking the address of RtlUnwind from C code seems to work Annotate functions implemented in assembler with .func/.endfunc, so the symbols are more correct Modified: trunk/reactos/lib/pseh/framebased-gcchack.c trunk/reactos/lib/pseh/i386/framebased-gcchack.S Modified: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Sat Dec 20 17:27:17 2008 @@ -38,7 +38,6 @@ #endif extern _SEH2Registration_t * __cdecl _SEH2CurrentRegistration(void); -extern void _SEH2GlobalUnwind(void *); extern int __SEH2Except(void *, void *); extern void __SEH2Finally(void *, void *); @@ -49,6 +48,24 @@ extern int __cdecl __SEH2FrameHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); extern int __cdecl __SEH2NestedHandler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); + +FORCEINLINE +void _SEH2GlobalUnwind(void * target) +{ + __asm__ __volatile__ + ( + "push %%ebp\n" + "push $0\n" + "push $0\n" + "push $Return%=\n" + "push %[target]\n" + "call %c[RtlUnwind]\n" + "Return%=: pop %%ebp\n" : + : + [target] "g" (target), [RtlUnwind] "g" (&RtlUnwind) : + "eax", "ebx", "ecx", "edx", "esi", "edi", "flags", "memory" + ); +} FORCEINLINE int _SEH2Except(_SEH2Frame_t * frame, volatile _SEH2TryLevel_t * trylevel) Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Sat Dec 20 17:27:17 2008 @@ -21,11 +21,14 @@ .text .intel_syntax noprefix +.func _SEH2CurrentRegistration .globl __SEH2CurrentRegistration __SEH2CurrentRegistration: mov eax, [fs:0] ret +.endfunc +.func __SEH2EnterFrame .globl ___SEH2EnterFrame ___SEH2EnterFrame: mov eax, [esp+4] @@ -33,24 +36,39 @@ mov [eax], ecx mov [fs:0], eax ret +.endfunc +.func __SEH2LeaveFrame .globl ___SEH2LeaveFrame ___SEH2LeaveFrame: mov eax, [fs:0] mov eax, [eax] mov [fs:0], eax ret +.endfunc +.func __SEH2Handle .globl ___SEH2Handle ___SEH2Handle: mov eax, [esp+4] mov ebp, [esp+8] mov esp, [esp+12] jmp eax +.endfunc +.func __SEH2Except .globl ___SEH2Except +___SEH2Except: + mov eax, [esp+4] + mov ecx, [esp+8] + + call eax + + ret +.endfunc + +.func __SEH2Finally .globl ___SEH2Finally -___SEH2Except: ___SEH2Finally: mov eax, [esp+4] mov ecx, [esp+8] @@ -58,30 +76,9 @@ call eax ret +.endfunc -.globl __SEH2GlobalUnwind -__SEH2GlobalUnwind: - -.extern _RtlUnwind@16 - - push ebx - mov ebx, [esp+8] - push esi - push edi - - push 0 // ReturnValue - push 0 // ExceptionRecord - push .RestoreRegisters // TargetIp - push ebx // TargetFrame - call _RtlUnwind@16 - -.RestoreRegisters: - pop edi - pop esi - pop ebx - - ret - +.func __SEH2FrameHandler .globl ___SEH2FrameHandler ___SEH2FrameHandler: @@ -89,7 +86,9 @@ cld jmp __SEH2FrameHandler +.endfunc +.func __SEH2NestedHandler .globl ___SEH2NestedHandler ___SEH2NestedHandler: @@ -97,5 +96,6 @@ cld jmp __SEH2NestedHandler +.endfunc // EOF

1 0

[tkreuzer] 38207: define _INTEGRAL_MAX_BITS only if it was not already defined
by tkreuzer＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: tkreuzer Date: Sat Dec 20 17:16:49 2008 New Revision: 38207 URL: http://svn.reactos.org/svn/reactos?rev=38207&view=rev Log: define _INTEGRAL_MAX_BITS only if it was not already defined Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Dec 20 17:16:49 2008 @@ -180,7 +180,9 @@ typedef WORD LANGID; #ifdef __GNUC__ #define _HAVE_INT64 -#define _INTEGRAL_MAX_BITS 64 +#ifndef _INTEGRAL_MAX_BITS +# define _INTEGRAL_MAX_BITS 64 +#endif #undef __int64 #define __int64 long long #elif defined(__WATCOMC__) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 )

1 0

[tkreuzer] 38206: Update ETO constants
by tkreuzer＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: tkreuzer Date: Sat Dec 20 16:47:24 2008 New Revision: 38206 URL: http://svn.reactos.org/svn/reactos?rev=38206&view=rev Log: Update ETO constants Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat Dec 20 16:47:24 2008 @@ -576,10 +576,21 @@ #define DCBA_FACEDOWNRIGHT 259 #define FLOODFILLBORDER 0 #define FLOODFILLSURFACE 1 -#define ETO_CLIPPED 4 -#define ETO_GLYPH_INDEX 16 -#define ETO_OPAQUE 2 -#define ETO_RTLREADING 128 +#define ETO_OPAQUE 0x00002 +#define ETO_CLIPPED 0x00004 +#if (WINVER >= 0x0400) +#define ETO_GLYPH_INDEX 0x00010 +#define ETO_RTLREADING 0x00080 +#define ETO_NUMERICSLOCAL 0x00400 +#define ETO_NUMERICSLATIN 0x00800 +#define ETO_IGNORELANGUAGE 0x01000 +#endif +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) +#define ETO_PDY 0x02000 +#endif +#if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN) +#define ETO_REVERSE_INDEX_MAP 0x10000 +#endif #define GDICOMMENT_WINDOWS_METAFILE (-2147483647) #define GDICOMMENT_BEGINGROUP 2 #define GDICOMMENT_ENDGROUP 3 @@ -866,7 +877,7 @@ #define TCI_SRCCODEPAGE 2 #define TCI_SRCFONTSIG 3 #if (_WIN32_WINNT >= 0x0500) -#define SHADEBLENDCAPS 120 +#define SHADEBLENDCAPS 120 #define COLORMGMTCAPS 121 /* SHADEBLENDCAPS */ #define SB_NONE 0x00000000

1 0

[cgutman] 38205: - Remove a leftover variable
by cgutman＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: cgutman Date: Sat Dec 20 16:20:36 2008 New Revision: 38205 URL: http://svn.reactos.org/svn/reactos?rev=38205&view=rev Log: - Remove a leftover variable Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Sat Dec 20 16:20:36 2008 @@ -64,7 +64,6 @@ IP_PACKET Packet = { 0 }; IP_ADDRESS RemoteAddress, LocalAddress; PIPv4_HEADER Header; - NTSTATUS Status; if( *data == 0x45 ) { /* IPv4 */ Header = (PIPv4_HEADER)data; @@ -103,7 +102,7 @@ Packet.SrcAddr = LocalAddress; Packet.DstAddr = RemoteAddress; - if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, TCPPacketSendComplete, NULL ))) + if (!NT_SUCCESS(IPSendDatagram( &Packet, NCE, TCPPacketSendComplete, NULL ))) { FreeNdisPacket(Packet.NdisPacket); return OSK_EINVAL;

1 0

[tkreuzer] 38204: TextOut functions take a character count, not a byte count. Rename cb to cch.
by tkreuzer＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: tkreuzer Date: Sat Dec 20 15:19:43 2008 New Revision: 38204 URL: http://svn.reactos.org/svn/reactos?rev=38204&view=rev Log: TextOut functions take a character count, not a byte count. Rename cb to cch. Modified: trunk/reactos/dll/win32/gdi32/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] Sat Dec 20 15:19:43 2008 @@ -12,7 +12,7 @@ int nXStart, int nYStart, LPCSTR lpString, - int cbString) + int cchString) { ANSI_STRING StringA; UNICODE_STRING StringU; @@ -25,7 +25,7 @@ } else StringU.Buffer = NULL; - ret = TextOutW(hdc, nXStart, nYStart, StringU.Buffer, cbString); + ret = TextOutW(hdc, nXStart, nYStart, StringU.Buffer, cchString); RtlFreeUnicodeString(&StringU); return ret; } @@ -41,9 +41,9 @@ int nXStart, int nYStart, LPCWSTR lpString, - int cbString) -{ - return NtGdiExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cbString, NULL, 0); + int cchString) +{ + return NtGdiExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cchString, NULL, 0); } @@ -143,7 +143,7 @@ GetTextExtentPointA( HDC hdc, LPCSTR lpString, - int cbString, + int cchString, LPSIZE lpSize ) { @@ -154,7 +154,7 @@ RtlInitAnsiString(&StringA, (LPSTR)lpString); RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); - ret = GetTextExtentPointW(hdc, StringU.Buffer, cbString, lpSize); + ret = GetTextExtentPointW(hdc, StringU.Buffer, cchString, lpSize); RtlFreeUnicodeString(&StringU); @@ -170,11 +170,11 @@ GetTextExtentPointW( HDC hdc, LPCWSTR lpString, - int cbString, + int cchString, LPSIZE lpSize ) { - return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cbString, lpSize, 0); + return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpSize, 0); } @@ -184,13 +184,13 @@ BOOL APIENTRY GetTextExtentExPointW( - HDC hdc, - LPCWSTR lpszStr, - int cchString, - int nMaxExtent, - LPINT lpnFit, - LPINT alpDx, - LPSIZE lpSize + HDC hdc, + LPCWSTR lpszStr, + int cchString, + int nMaxExtent, + LPINT lpnFit, + LPINT alpDx, + LPSIZE lpSize ) { return NtGdiGetTextExtentExW ( @@ -240,7 +240,7 @@ GetTextExtentPoint32A( HDC hdc, LPCSTR lpString, - int cbString, + int cchString, LPSIZE lpSize ) { @@ -251,7 +251,7 @@ RtlInitAnsiString(&StringA, (LPSTR)lpString); RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); - ret = GetTextExtentPoint32W(hdc, StringU.Buffer, cbString, lpSize); + ret = GetTextExtentPoint32W(hdc, StringU.Buffer, cchString, lpSize); RtlFreeUnicodeString(&StringU); @@ -267,11 +267,11 @@ GetTextExtentPoint32W( HDC hdc, LPCWSTR lpString, - int cbString, + int cchString, LPSIZE lpSize ) { - return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cbString, lpSize, 0); + return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpSize, 0); } /* @@ -315,7 +315,7 @@ UINT fuOptions, CONST RECT *lprc, LPCSTR lpString, - UINT cbCount, + UINT cchString, CONST INT *lpDx ) { @@ -326,7 +326,7 @@ RtlInitAnsiString(&StringA, (LPSTR)lpString); RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); - ret = ExtTextOutW(hdc, X, Y, fuOptions, lprc, StringU.Buffer, cbCount, lpDx); + ret = ExtTextOutW(hdc, X, Y, fuOptions, lprc, StringU.Buffer, cchString, lpDx); RtlFreeUnicodeString(&StringU); @@ -346,11 +346,11 @@ UINT fuOptions, CONST RECT *lprc, LPCWSTR lpString, - UINT cbCount, + UINT cchString, CONST INT *lpDx ) { - return NtGdiExtTextOutW(hdc, X, Y, fuOptions, (LPRECT)lprc, (LPWSTR)lpString, cbCount, (LPINT)lpDx, 0); + return NtGdiExtTextOutW(hdc, X, Y, fuOptions, (LPRECT)lprc, (LPWSTR)lpString, cchString, (LPINT)lpDx, 0); }

1 0

[tkreuzer] 38203: Handle ETO_PDY more correctly (dy values still ignored)
by tkreuzer＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: tkreuzer Date: Sat Dec 20 15:01:14 2008 New Revision: 38203 URL: http://svn.reactos.org/svn/reactos?rev=38203&view=rev Log: Handle ETO_PDY more correctly (dy values still ignored) Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c 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] Sat Dec 20 15:01:14 2008 @@ -3669,7 +3669,14 @@ } else { - TextLeft += Dx[i] << 6; + if (fuOptions & ETO_PDY) + { + TextLeft += Dx[i*2] << 6; + } + else + { + TextLeft += Dx[i] << 6; + } // DbgPrint("new TextLeft2: %d\n", TextLeft); } previous = glyph_index;

1 0

[khornicek] 38202: - add check for NULL pointer, "first" is NULL for folders, files without extension etc. see bug 3959 See issue #3959 for more details.
by khornicek＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: khornicek Date: Sat Dec 20 14:48:08 2008 New Revision: 38202 URL: http://svn.reactos.org/svn/reactos?rev=38202&view=rev Log: - add check for NULL pointer, "first" is NULL for folders, files without extension etc. see bug 3959 See issue #3959 for more details. Modified: trunk/reactos/dll/cpl/appwiz/createlink.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Sat Dec 20 14:48:08 2008 @@ -155,7 +155,9 @@ first[1] = L'\0'; first = wcsrchr(pContext->szDescription, L'.'); - first[0] = L'\0'; + + if(first) + first[0] = L'\0'; } }

1 0

[tkreuzer] 38201: When fuOptions has ETO_PDY specified, the DxBuffer in NtGdiExtTextOutW consists of pairs of INTs, thus the Buffer must be twice as big. (Thanks to aspotashev for locating the problem) MmCopyToCaller -> SEH2. Allocate only one buffer for the string and the Dx values. See issue #3958 for more details.
by tkreuzer＠svn.reactos.org 20 Dec '08

20 Dec '08

Author: tkreuzer Date: Sat Dec 20 14:38:23 2008 New Revision: 38201 URL: http://svn.reactos.org/svn/reactos?rev=38201&view=rev Log: When fuOptions has ETO_PDY specified, the DxBuffer in NtGdiExtTextOutW consists of pairs of INTs, thus the Buffer must be twice as big. (Thanks to aspotashev for locating the problem) MmCopyToCaller -> SEH2. Allocate only one buffer for the string and the Dx values. See issue #3958 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c 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] Sat Dec 20 14:38:23 2008 @@ -3135,6 +3135,8 @@ BOOL DoBreak = FALSE; LPCWSTR String, SafeString = NULL; HPALETTE hDestPalette; + PVOID TmpBuffer = NULL; + ULONG TmpBufSize, StringSize, DxSize = 0; // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -3160,41 +3162,70 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); goto fail; } + + Status = STATUS_SUCCESS; if (Count > 0) { - SafeString = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), TAG_GDITEXT); - if (!SafeString) - { + TmpBufSize = StringSize = Count * sizeof(WCHAR); + if (UnsafeDx) + { + /* If ETO_PDY is specified, we have pairs of INTs */ + DxSize = Count * sizeof(INT) * (fuOptions & ETO_PDY ? 2 : 1); + TmpBufSize += DxSize; + } + + /* Allocate a temp buffer for the string and the Dx values */ + TmpBuffer = ExAllocatePoolWithTag(PagedPool, TmpBufSize, TAG_GDITEXT); + SafeString = TmpBuffer; + if (!TmpBuffer) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); goto fail; } - Status = MmCopyFromCaller(SafeString, UnsafeString, Count * sizeof(WCHAR)); - if (! NT_SUCCESS(Status)) + + /* Probe and copy user mode data to the temp buffer */ + _SEH2_TRY + { + if (UnsafeString) + { + ProbeForRead(UnsafeString, StringSize, 1); + memcpy((PVOID)SafeString, UnsafeString, StringSize); + } + + if (UnsafeDx) + { + ProbeForRead(UnsafeDx, DxSize, 1); + Dx = (INT*)((ULONG_PTR)TmpBuffer + StringSize); + memcpy(Dx, UnsafeString, DxSize); + } + + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) { goto fail; } } String = SafeString; - if (NULL != UnsafeDx && Count > 0) - { - Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); - if (NULL == Dx) - { - goto fail; - } - Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT)); + if (lprc) + { + _SEH2_TRY + { + ProbeForRead(lprc, sizeof(RECT), 1); + memcpy(&SpecifiedDestRect, lprc, sizeof(RECT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END if (!NT_SUCCESS(Status)) { - goto fail; - } - } - - if (lprc) - { - Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); goto fail; } } @@ -3692,13 +3723,9 @@ BRUSHOBJ_UnlockBrush(BrushFg); NtGdiDeleteObject(hBrushFg); } - if (NULL != SafeString) - { - ExFreePoolWithTag((void*)SafeString, TAG_GDITEXT); - } - if (NULL != Dx) - { - ExFreePoolWithTag(Dx, TAG_GDITEXT); + if (TmpBuffer) + { + ExFreePoolWithTag(TmpBuffer, TAG_GDITEXT); } DC_UnlockDc(dc);

1 0

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