Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 33956: Add notes, no code change.
by jimtabor＠svn.reactos.org 13 Jun '08

13 Jun '08

Author: jimtabor Date: Fri Jun 13 13:19:28 2008 New Revision: 33956 URL: http://svn.reactos.org/svn/reactos?rev=33956&view=rev Log: Add notes, no code change. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Jun 13 13:19:28 2008 @@ -1432,7 +1432,8 @@ (PGDIBRUSHOBJ)->pBrushAttr = IntGdiAllocObjAttr(GDIObjType_BRUSH_TYPE); // Kernel Space to User Space Pointer - (PGDI_TABLE_ENTRY)->UserData = UserHeapAddressToUser(pBrushAttr); + (PGDI_TABLE_ENTRY)->UserData = pBrushAttr; + // Gdi will adjust for heap delta. Example Freeing: @@ -1441,11 +1442,9 @@ (PGDIBRUSHOBJ)->pBrushAttr = NULL; Notes: - Testing with DC_ATTR works but has drawing difficulties. This could be due - to a bug in user share heap allocation and deallocation. The test did not - include additional deallocations until the DC was freed. So it was always - allocated to the DC. Space between allocations was not even and at less - than sizeof(DC_ATTR). + Testing with DC_ATTR works but has drawing difficulties. + Base on observation, (Over looking the obvious) we need to supply heap delta + to user space gdi. Now, with testing, looks all normal. */ PVOID

1 0

[tkreuzer] 33955: MSDB KB 145994 (http://support.microsoft.com/?scid=kb%3Ben-us%3B145994): yBaseUnit is textmetric->tmHeight not average text extent. Testing confirms that GdiGetCharDimension returns this as height. This makes dialog boxes less stretched in height. Still not identical to XP. calx.exe: On XP yBaseUnit == 13, on ROS == 14 (was 16 before)
by tkreuzer＠svn.reactos.org 13 Jun '08

13 Jun '08

Author: tkreuzer Date: Fri Jun 13 08:33:53 2008 New Revision: 33955 URL: http://svn.reactos.org/svn/reactos?rev=33955&view=rev Log: MSDB KB 145994 (http://support.microsoft.com/?scid=kb%3Ben-us%3B145994): yBaseUnit is textmetric->tmHeight not average text extent. Testing confirms that GdiGetCharDimension returns this as height. This makes dialog boxes less stretched in height. Still not identical to XP. calx.exe: On XP yBaseUnit == 13, on ROS == 14 (was 16 before) Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Fri Jun 13 08:33:53 2008 @@ -1615,16 +1615,19 @@ GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, LONG *height) { SIZE sz; + TEXTMETRICW tm; static const WCHAR alphabet[] = { 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q', 'r','s','t','u','v','w','x','y','z','A','B','C','D','E','F','G','H', 'I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',0}; - if(lptm && !GetTextMetricsW(hdc, lptm)) return 0; + if(!GetTextMetricsW(hdc, &tm)) return 0; if(!GetTextExtentPointW(hdc, alphabet, 52, &sz)) return 0; - if (height) *height = sz.cy; + if (lptm) *lptm = tm; + if (height) *height = tm.tmHeight; + return (sz.cx / 26 + 1) / 2; }

1 0

[weiden] 33954: Revert 33953. This is completely wrong! WINE doesn't quite get the ordinals right. Ordinal 200 really should be SHCreateDesktop and ordinal 201 really should be SHDesktopMessageLoop. I am currently working on a patch for this. The fact that explorer-new was able to start with these changes is just pure coincidence.
by weiden＠svn.reactos.org 13 Jun '08

13 Jun '08

Author: weiden Date: Fri Jun 13 08:14:08 2008 New Revision: 33954 URL: http://svn.reactos.org/svn/reactos?rev=33954&view=rev Log: Revert 33953. This is completely wrong! WINE doesn't quite get the ordinals right. Ordinal 200 really should be SHCreateDesktop and ordinal 201 really should be SHDesktopMessageLoop. I am currently working on a patch for this. The fact that explorer-new was able to start with these changes is just pure coincidence. Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Fri Jun 13 08:14:08 2008 @@ -189,10 +189,10 @@ 197 stub -noname SHGlobalDefect 198 stdcall -noname SHAbortInvokeCommand() 199 stub SHGetFileIcon - 200 stdcall SHLocalAlloc(long long) - 201 stdcall SHLocalFree(ptr) - 202 stdcall SHLocalReAlloc(ptr long long) - 203 stdcall AddCommasW(long str) + 200 stub SHLocalAlloc + 201 stub SHLocalFree + 202 stub SHLocalReAlloc + 203 stub AddCommasW 204 stub ShortSizeFormatW 205 stdcall Printer_LoadIconsW(wstr ptr ptr) 206 stub Link_AddExtraDataSection Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] Fri Jun 13 08:14:08 2008 @@ -842,73 +842,6 @@ } /*************************************************************************/ - -/************************************************************************* - * AddCommasW [SHELL32.203] - */ -LPWSTR WINAPI AddCommasW(DWORD lValue, LPWSTR szRet) -{ - WCHAR szValue[MAX_PATH], szSeparator[8 + 1]; - NUMBERFMTW numFormat; - LCID lcid = GetUserDefaultLCID(); - - GetLocaleInfoW(lcid, - LOCALE_STHOUSAND, - szSeparator, - 8 + 1); - - numFormat.NumDigits = 0; - numFormat.LeadingZero = 0; - numFormat.Grouping = 0; - numFormat.lpDecimalSep = szSeparator; - numFormat.lpThousandSep = szSeparator; - numFormat.NegativeOrder = 0; - - swprintf(szValue, L"%llu", lValue); - //_ultow(lValue, szValue, 16); - - if (GetNumberFormatW(lcid, - 0, - szValue, - &numFormat, - szRet, - wcslen(szRet)) != 0) - { - return szRet; - } - - wcscpy(szRet, szValue); - return szRet; -} - - -/************************************************************************* - * SHLocalAlloc [SHELL32.200] - */ -HLOCAL WINAPI SHLocalAlloc(UINT uFlags, SIZE_T uBytes) -{ - return LocalAlloc(uFlags, uBytes); -} - -/************************************************************************* - * SHLocalFree [SHELL32.201] - */ -HLOCAL WINAPI SHLocalFree(HLOCAL hMem) -{ - return LocalFree(hMem); -} - -/************************************************************************* - * SHLocalAlloc [SHELL32.202] - */ -HLOCAL WINAPI SHLocalReAlloc(HLOCAL hMem, SIZE_T uBytes, UINT uFlags) -{ - return LocalReAlloc(hMem, uBytes, uFlags); -} - - -/*************************************************************************/ - typedef struct {

1 0

[dchapyshev] 33953: - Implement AddCommasW - Implement SHLocalAlloc - Implement SHLocalFree - Implement SHLocalReAlloc explorer-new starts in reactos now!
by dchapyshev＠svn.reactos.org 13 Jun '08

13 Jun '08

Author: dchapyshev Date: Fri Jun 13 02:58:34 2008 New Revision: 33953 URL: http://svn.reactos.org/svn/reactos?rev=33953&view=rev Log: - Implement AddCommasW - Implement SHLocalAlloc - Implement SHLocalFree - Implement SHLocalReAlloc explorer-new starts in reactos now! Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Fri Jun 13 02:58:34 2008 @@ -189,10 +189,10 @@ 197 stub -noname SHGlobalDefect 198 stdcall -noname SHAbortInvokeCommand() 199 stub SHGetFileIcon - 200 stub SHLocalAlloc - 201 stub SHLocalFree - 202 stub SHLocalReAlloc - 203 stub AddCommasW + 200 stdcall SHLocalAlloc(long long) + 201 stdcall SHLocalFree(ptr) + 202 stdcall SHLocalReAlloc(ptr long long) + 203 stdcall AddCommasW(long str) 204 stub ShortSizeFormatW 205 stdcall Printer_LoadIconsW(wstr ptr ptr) 206 stub Link_AddExtraDataSection Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] Fri Jun 13 02:58:34 2008 @@ -842,6 +842,73 @@ } /*************************************************************************/ + +/************************************************************************* + * AddCommasW [SHELL32.203] + */ +LPWSTR WINAPI AddCommasW(DWORD lValue, LPWSTR szRet) +{ + WCHAR szValue[MAX_PATH], szSeparator[8 + 1]; + NUMBERFMTW numFormat; + LCID lcid = GetUserDefaultLCID(); + + GetLocaleInfoW(lcid, + LOCALE_STHOUSAND, + szSeparator, + 8 + 1); + + numFormat.NumDigits = 0; + numFormat.LeadingZero = 0; + numFormat.Grouping = 0; + numFormat.lpDecimalSep = szSeparator; + numFormat.lpThousandSep = szSeparator; + numFormat.NegativeOrder = 0; + + swprintf(szValue, L"%llu", lValue); + //_ultow(lValue, szValue, 16); + + if (GetNumberFormatW(lcid, + 0, + szValue, + &numFormat, + szRet, + wcslen(szRet)) != 0) + { + return szRet; + } + + wcscpy(szRet, szValue); + return szRet; +} + + +/************************************************************************* + * SHLocalAlloc [SHELL32.200] + */ +HLOCAL WINAPI SHLocalAlloc(UINT uFlags, SIZE_T uBytes) +{ + return LocalAlloc(uFlags, uBytes); +} + +/************************************************************************* + * SHLocalFree [SHELL32.201] + */ +HLOCAL WINAPI SHLocalFree(HLOCAL hMem) +{ + return LocalFree(hMem); +} + +/************************************************************************* + * SHLocalAlloc [SHELL32.202] + */ +HLOCAL WINAPI SHLocalReAlloc(HLOCAL hMem, SIZE_T uBytes, UINT uFlags) +{ + return LocalReAlloc(hMem, uBytes, uFlags); +} + + +/*************************************************************************/ + typedef struct {

1 0

[weiden] 33952: Add missing definitions
by weiden＠svn.reactos.org 12 Jun '08

12 Jun '08

Author: weiden Date: Thu Jun 12 18:38:09 2008 New Revision: 33952 URL: http://svn.reactos.org/svn/reactos?rev=33952&view=rev Log: Add missing definitions Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Thu Jun 12 18:38:09 2008 @@ -1082,6 +1082,11 @@ #define SHCNF_PATH WINELIB_NAME_AW(SHCNF_PATH) #define SHCNF_PRINTER WINELIB_NAME_AW(SHCNF_PRINTER) +#define SHCNRF_InterruptLevel 0x1 +#define SHCNRF_ShellLevel 0x2 +#define SHCNRF_RecursiveInterrupt 0x1000 +#define SHCNRF_NewDelivery 0x8000 + void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2); typedef enum {

1 0

[tkreuzer] 33951: Patch by Jeffrey Morlan (mrnobo1024 at yahoo dot com, irc: Goplat), modified by me: The freetype asm function FT_MulFix clobbers the edx register, but doesn't tell it to gcc explicitly, so when inlined versions were resulting in wrong results. Fix it by also marking edx as output register. Also enable commented out code in win32k again that works correctly now. By me: I modified the patch to not alter any 3rd party code, but instead I copied the fuction to _ftmulfix_ros.c and a
by tkreuzer＠svn.reactos.org 12 Jun '08

12 Jun '08

Author: tkreuzer Date: Thu Jun 12 15:50:12 2008 New Revision: 33951 URL: http://svn.reactos.org/svn/reactos?rev=33951&view=rev Log: Patch by Jeffrey Morlan (mrnobo1024 at yahoo dot com, irc: Goplat), modified by me: The freetype asm function FT_MulFix clobbers the edx register, but doesn't tell it to gcc explicitly, so when inlined versions were resulting in wrong results. Fix it by also marking edx as output register. Also enable commented out code in win32k again that works correctly now. By me: I modified the patch to not alter any 3rd party code, but instead I copied the fuction to _ftmulfix_ros.c and also coplied the container file ftbase.c which now uses the fixed function from our private file. This fixes a bunch of text output issues (underscore, text marking) See issue #3346 for more details. Added: trunk/reactos/dll/3rdparty/freetype/src/base/_ftbase_ros.c (with props) trunk/reactos/dll/3rdparty/freetype/src/base/_ftmulfix_ros.c (with props) Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] Thu Jun 12 15:50:12 2008 @@ -24,7 +24,7 @@ <file>ftsystem.c</file> <file>ftinit.c</file> <file>ftdebug.c</file> - <file>ftbase.c</file> + <file>_ftbase_ros.c</file> <file>ftbbox.c</file> <file>ftglyph.c</file> <file>ftbdf.c</file> Added: trunk/reactos/dll/3rdparty/freetype/src/base/_ftbase_ros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/src/… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/src/base/_ftbase_ros.c (added) +++ trunk/reactos/dll/3rdparty/freetype/src/base/_ftbase_ros.c [iso-8859-1] Thu Jun 12 15:50:12 2008 @@ -1,0 +1,42 @@ +/***************************************************************************/ +/* */ +/* ftbase.c */ +/* */ +/* Single object library component (body only). */ +/* */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007 by */ +/* David Turner, Robert Wilhelm, and Werner Lemberg. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#include <ft2build.h> + +#define FT_MAKE_OPTION_SINGLE_OBJECT + +#define FT_MulFix FT_MulFix_wrong +#include "ftcalc.c" +#undef FT_MulFix +#include "_ftmulfix_ros.c" + +#include "ftdbgmem.c" +#include "ftgloadr.c" +#include "ftnames.c" +#include "ftobjs.c" +#include "ftoutln.c" +#include "ftrfork.c" +#include "ftstream.c" +#include "fttrigon.c" +#include "ftutil.c" + +#if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON ) +#include <ftmac.c> +#endif + +/* END */ Propchange: trunk/reactos/dll/3rdparty/freetype/src/base/_ftbase_ros.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/3rdparty/freetype/src/base/_ftmulfix_ros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/src/… ============================================================================== --- trunk/reactos/dll/3rdparty/freetype/src/base/_ftmulfix_ros.c (added) +++ trunk/reactos/dll/3rdparty/freetype/src/base/_ftmulfix_ros.c [iso-8859-1] Thu Jun 12 15:50:12 2008 @@ -1,0 +1,92 @@ + FT_EXPORT_DEF( FT_Long ) + FT_MulFix( FT_Long a, + FT_Long b ) + { + /* use inline assembly to speed up things a bit */ + +#if defined( __GNUC__ ) && defined( i386 ) + + FT_Long result; + + + __asm__ __volatile__ ( + "imul %%edx\n" + "movl %%edx, %%ecx\n" + "sarl $31, %%ecx\n" + "addl $0x8000, %%ecx\n" + "addl %%ecx, %%eax\n" + "adcl $0, %%edx\n" + "shrl $16, %%eax\n" + "shll $16, %%edx\n" + "addl %%edx, %%eax\n" + "mov %%eax, %0\n" + : "=r"(result), "=d"(b) + : "a"(a), "d"(b) + : "%ecx" + ); + return result; + +#elif 1 + + FT_Long sa, sb; + FT_ULong ua, ub; + + + if ( a == 0 || b == 0x10000L ) + return a; + + sa = ( a >> ( sizeof ( a ) * 8 - 1 ) ); + a = ( a ^ sa ) - sa; + sb = ( b >> ( sizeof ( b ) * 8 - 1 ) ); + b = ( b ^ sb ) - sb; + + ua = (FT_ULong)a; + ub = (FT_ULong)b; + + if ( ua <= 2048 && ub <= 1048576L ) + ua = ( ua * ub + 0x8000U ) >> 16; + else + { + FT_ULong al = ua & 0xFFFFU; + + + ua = ( ua >> 16 ) * ub + al * ( ub >> 16 ) + + ( ( al * ( ub & 0xFFFFU ) + 0x8000U ) >> 16 ); + } + + sa ^= sb, + ua = (FT_ULong)(( ua ^ sa ) - sa); + + return (FT_Long)ua; + +#else /* 0 */ + + FT_Long s; + FT_ULong ua, ub; + + + if ( a == 0 || b == 0x10000L ) + return a; + + s = a; a = FT_ABS( a ); + s ^= b; b = FT_ABS( b ); + + ua = (FT_ULong)a; + ub = (FT_ULong)b; + + if ( ua <= 2048 && ub <= 1048576L ) + ua = ( ua * ub + 0x8000UL ) >> 16; + else + { + FT_ULong al = ua & 0xFFFFUL; + + + ua = ( ua >> 16 ) * ub + al * ( ub >> 16 ) + + ( ( al * ( ub & 0xFFFFUL ) + 0x8000UL ) >> 16 ); + } + + return ( s < 0 ? -(FT_Long)ua : (FT_Long)ua ); + +#endif /* 0 */ + + } Propchange: trunk/reactos/dll/3rdparty/freetype/src/base/_ftmulfix_ros.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Thu Jun 12 15:50:12 2008 @@ -362,7 +362,7 @@ /* FIXME: Complete text metrics */ XScale = Face->size->metrics.x_scale; YScale = Face->size->metrics.y_scale; -#if 1 /* This (Wine) code doesn't seem to work correctly for us */ +#if 0 /* This (Wine) code doesn't seem to work correctly for us */ FontGDI->TextMetric.tmAscent = (FT_MulFix(Face->ascender, YScale) + 32) >> 6; FontGDI->TextMetric.tmDescent = (FT_MulFix(Face->descender, YScale) + 32) >> 6; FontGDI->TextMetric.tmHeight = (FT_MulFix(Face->ascender, YScale) - @@ -644,10 +644,10 @@ Descent = pOS2->usWinDescent; } -#if 1 /* This (Wine) code doesn't seem to work correctly for us, cmd issue */ +#if 0 /* This (Wine) code doesn't seem to work correctly for us, cmd issue */ TM->tmAscent = (FT_MulFix(Ascent, YScale) + 32) >> 6; TM->tmDescent = (FT_MulFix(Descent, YScale) + 32) >> 6; -#else /* This (ros) code doesn't seem to work correctly for us for it miss 2-3 pixel draw of the font*/ +#else /* This (ros) code was previously affected by a FreeType bug, but it works now */ TM->tmAscent = (Face->size->metrics.ascender + 32) >> 6; /* units above baseline */ TM->tmDescent = (32 - Face->size->metrics.descender) >> 6; /* units below baseline */ #endif

1 0

[weiden] 33950: Lookup DrawCaptionTemp () only once during startup
by weiden＠svn.reactos.org 12 Jun '08

12 Jun '08

Author: weiden Date: Thu Jun 12 11:50:57 2008 New Revision: 33950 URL: http://svn.reactos.org/svn/reactos?rev=33950&view=rev Log: Lookup DrawCaptionTemp () only once during startup Modified: trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Thu Jun 12 11:50:57 2008 @@ -21,8 +21,10 @@ #include <precomp.h> HINSTANCE hExplorerInstance; +HMODULE hUser32; HANDLE hProcessHeap; HKEY hkExplorer = NULL; +DRAWCAPTEMP DrawCapTemp = NULL; /* undoc GUID */ DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); @@ -289,6 +291,13 @@ hExplorerInstance = hInstance; hProcessHeap = GetProcessHeap(); + hUser32 = GetModuleHandle(TEXT("USER32.DLL")); + if (hUser32 != NULL) + { + DrawCapTemp = (DRAWCAPTEMP)GetProcAddress(hUser32, + PROC_NAME_DRAWCAPTIONTEMP); + } + InitCommonControls(); OleInitialize(NULL); Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Thu Jun 12 11:50:57 2008 @@ -77,8 +77,10 @@ Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__); extern HINSTANCE hExplorerInstance; +extern HMODULE hUser32; extern HANDLE hProcessHeap; extern HKEY hkExplorer; +extern DRAWCAPTEMP DrawCapTemp; /* * dragdrop.c Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Thu Jun 12 11:50:57 2008 @@ -1640,7 +1640,6 @@ { HFONT hCaptionFont, hBoldCaptionFont; LRESULT Ret = CDRF_DODEFAULT; - HMODULE hUser32; PTASK_GROUP TaskGroup; PTASK_ITEM TaskItem; @@ -1701,25 +1700,16 @@ uidctFlags |= DC_ACTIVE; } - hUser32 = GetModuleHandle(TEXT("USER32.DLL")); - if (hUser32 != NULL) - { - DRAWCAPTEMP DrawCapTemp; - - /* DrawCaptionTemp */ - DrawCapTemp = (DRAWCAPTEMP)GetProcAddress(hUser32, - PROC_NAME_DRAWCAPTIONTEMP); - if (DrawCapTemp != NULL) - { - /* Draw the button content */ - TaskItem->DisplayTooltip = !DrawCapTemp(TaskItem->hWnd, - nmtbcd->nmcd.hdc, - &nmtbcd->nmcd.rc, - hCaptionFont, - NULL, - NULL, - uidctFlags); - } + if (DrawCapTemp != NULL) + { + /* Draw the button content */ + TaskItem->DisplayTooltip = !DrawCapTemp(TaskItem->hWnd, + nmtbcd->nmcd.hdc, + &nmtbcd->nmcd.rc, + hCaptionFont, + NULL, + NULL, + uidctFlags); } return CDRF_SKIPDEFAULT; Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Thu Jun 12 11:50:57 2008 @@ -1223,7 +1223,6 @@ BOOL Ret; UINT Flags; RECT rcButton; - HMODULE hUser32; /* NOTE: This is the backwards compatibility code that is used if the Common Controls Version 6.0 are not available! */ @@ -1294,24 +1293,15 @@ if (hIconStart != NULL) Flags |= DC_ICON; - hUser32 = GetModuleHandle(TEXT("USER32.DLL")); - if (hUser32 != NULL) - { - DRAWCAPTEMP DrawCapTemp; - - /* DrawCaptionTemp */ - DrawCapTemp = (DRAWCAPTEMP)GetProcAddress(hUser32, - PROC_NAME_DRAWCAPTIONTEMP); - if (DrawCapTemp != NULL) - { - Ret = DrawCapTemp(NULL, - hDC, - &rcButton, - This->hStartBtnFont, - hIconStart, - szStartCaption, - Flags); - } + if (DrawCapTemp != NULL) + { + Ret = DrawCapTemp(NULL, + hDC, + &rcButton, + This->hStartBtnFont, + hIconStart, + szStartCaption, + Flags); } SelectObject(hDC,

1 0

[weiden] 33949: Fix call to DrawCaptionTemp ()
by weiden＠svn.reactos.org 12 Jun '08

12 Jun '08

Author: weiden Date: Thu Jun 12 10:45:09 2008 New Revision: 33949 URL: http://svn.reactos.org/svn/reactos?rev=33949&view=rev Log: Fix call to DrawCaptionTemp () Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Thu Jun 12 10:45:09 2008 @@ -1701,17 +1701,14 @@ uidctFlags |= DC_ACTIVE; } - hUser32 = LoadLibrary(TEXT("USER32.DLL")); + hUser32 = GetModuleHandle(TEXT("USER32.DLL")); if (hUser32 != NULL) { DRAWCAPTEMP DrawCapTemp; - LONG ord = 187; -#ifndef UNICODE - ord = 186; -#endif + /* DrawCaptionTemp */ DrawCapTemp = (DRAWCAPTEMP)GetProcAddress(hUser32, - (LPCSTR)ord); + PROC_NAME_DRAWCAPTIONTEMP); if (DrawCapTemp != NULL) { /* Draw the button content */ @@ -1723,8 +1720,6 @@ NULL, uidctFlags); } - - FreeLibrary(hUser32); } return CDRF_SKIPDEFAULT;

1 0

[cfinck] 33948: Fix the position of the top page buttons in the Wiki for IE6, IE7 and Opera
by cfinck＠svn.reactos.org 12 Jun '08

12 Jun '08

Author: cfinck Date: Thu Jun 12 05:21:35 2008 New Revision: 33948 URL: http://svn.reactos.org/svn/reactos?rev=33948&view=rev Log: Fix the position of the top page buttons in the Wiki for IE6, IE7 and Opera Modified: trunk/web/reactos.org/htdocs/wiki/skins/roscms/IE60Fixes.css trunk/web/reactos.org/htdocs/wiki/skins/roscms/IE70Fixes.css trunk/web/reactos.org/htdocs/wiki/skins/roscms/OperaFixes.css Modified: trunk/web/reactos.org/htdocs/wiki/skins/roscms/IE60Fixes.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/skins/… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/skins/roscms/IE60Fixes.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/wiki/skins/roscms/IE60Fixes.css [iso-8859-1] Thu Jun 12 05:21:35 2008 @@ -25,7 +25,7 @@ #p-cactions { position: absolute; left: 157px; - top: 175px; + top: 178px; z-index: 3; } Modified: trunk/web/reactos.org/htdocs/wiki/skins/roscms/IE70Fixes.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/skins/… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/skins/roscms/IE70Fixes.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/wiki/skins/roscms/IE70Fixes.css [iso-8859-1] Thu Jun 12 05:21:35 2008 @@ -22,7 +22,7 @@ #p-cactions { position: absolute; left: 157px; - top: 175px; + top: 178px; z-index: 3; } Modified: trunk/web/reactos.org/htdocs/wiki/skins/roscms/OperaFixes.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/skins/… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/skins/roscms/OperaFixes.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/wiki/skins/roscms/OperaFixes.css [iso-8859-1] Thu Jun 12 05:21:35 2008 @@ -3,5 +3,5 @@ #p-cactions { position: absolute; left: 157px; - top: 175px; + top: 177px; }

1 0

[fireball] 33947: - Fix a bug in timedate.cpl, where an incorrect color was passed. - Add bounds checking for GetSystemMetrics both in user32 and in kernel counterpart. - Based on a patch from bug 3316. See issue #3316 for more details.
by fireball＠svn.reactos.org 12 Jun '08

12 Jun '08

Author: fireball Date: Thu Jun 12 04:50:12 2008 New Revision: 33947 URL: http://svn.reactos.org/svn/reactos?rev=33947&view=rev Log: - Fix a bug in timedate.cpl, where an incorrect color was passed. - Add bounds checking for GetSystemMetrics both in user32 and in kernel counterpart. - Based on a patch from bug 3316. See issue #3316 for more details. Modified: trunk/reactos/dll/cpl/timedate/monthcal.c trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] Thu Jun 12 04:50:12 2008 @@ -504,7 +504,7 @@ if (crOldCtrlText == CLR_INVALID) { crOldCtrlText = SetTextColor(hDC, - infoPtr->Enabled ? MONTHCAL_CTRLFG : MONTHCAL_DISABLED_CTRLFG); + GetSysColor(infoPtr->Enabled ? MONTHCAL_CTRLFG : MONTHCAL_DISABLED_CTRLFG)); } for (x = prcUpdate->left / infoPtr->CellSize.cx; Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Thu Jun 12 04:50:12 2008 @@ -100,9 +100,11 @@ GetSystemMetrics(int nIndex) { // FIXME("Global Sever Data -> %x\n",g_psi); - if (g_psi) return g_psi->SystemMetrics[nIndex]; + if (nIndex < 0 || nIndex >= SM_CMETRICS) return 0; + if (g_psi) + return g_psi->SystemMetrics[nIndex]; else - return(NtUserGetSystemMetrics(nIndex)); + return(NtUserGetSystemMetrics(nIndex)); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Thu Jun 12 04:50:12 2008 @@ -278,6 +278,13 @@ ULONG Width, Height, Result; // DPRINT1("UserGetSystemMetrics -> %d\n",Index); + + if (Index >= SM_CMETRICS) + { + DPRINT1("UserGetSystemMetrics() called with invalid index %d\n", Index); + return 0; + } + if (gpsi && Setup) return gpsi->SystemMetrics[Index]; else

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