Ros-diffs

ros-diffs@reactos.org

81390 discussions

Start a nNew thread

[frik85] 3: ReactOS Website
by frik85＠svn.reactos.org 27 Jan '06

27 Jan '06

ReactOS Website Added: trunk/web/

1 0

[chorns] 1: Standard repository layout
by chorns＠svn.reactos.org 27 Jan '06

27 Jan '06

Standard repository layout Added: branches/ Added: tags/ Added: trunk/ Added: vendor/

1 0

[jimtabor] 21015: Implement NtGdiGetTextCharsetInfo, it tested good.
by jimtabor＠svn.reactos.org 25 Jan '06

25 Jan '06

Implement NtGdiGetTextCharsetInfo, it tested good. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2006-01-25 01:46:46 UTC (rev 21014) +++ trunk/reactos/subsys/win32k/objects/text.c 2006-01-25 07:39:46 UTC (rev 21015) @@ -2184,8 +2184,91 @@ OUT OPTIONAL LPFONTSIGNATURE lpSig, IN DWORD dwFlags) { - UNIMPLEMENTED; - return 0; + PDC Dc; + UINT Ret = DEFAULT_CHARSET, i = 0, fs_fsCsb0 = 0; + HFONT hFont; + PTEXTOBJ TextObj; + PFONTGDI FontGdi; + FONTSIGNATURE fs; + TT_OS2 *pOS2; + FT_Face Face; + NTSTATUS Status; + + Dc = DC_LockDc(hdc); + if (!Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return Ret; + } + hFont = Dc->w.hFont; + TextObj = TEXTOBJ_LockText(hFont); + DC_UnlockDc( Dc ); + if ( TextObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return Ret; + } + FontGdi = ObjToGDI(TextObj->Font, FONT); + Face = FontGdi->face; + TEXTOBJ_UnlockText(TextObj); + IntLockFreeType; + pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2); + IntUnLockFreeType; + memset(&fs, 0, sizeof(FONTSIGNATURE)); + if (NULL != pOS2) + { + fs.fsCsb[0] = pOS2->ulCodePageRange1; + fs.fsCsb[1] = pOS2->ulCodePageRange2; + fs.fsUsb[0] = pOS2->ulUnicodeRange1; + fs.fsUsb[1] = pOS2->ulUnicodeRange2; + fs.fsUsb[2] = pOS2->ulUnicodeRange3; + fs.fsUsb[3] = pOS2->ulUnicodeRange4; + fs_fsCsb0 = pOS2->ulCodePageRange1; + if (pOS2->version == 0) + { + FT_UInt dummy; + + if(FT_Get_First_Char( Face, &dummy ) < 0x100) + fs_fsCsb0 |= 1; + else + fs_fsCsb0 |= 1L << 31; + } + } + DPRINT("Csb 1=%x 0=%x\n", fs.fsCsb[1],fs.fsCsb[0]); + if (lpSig) + { + Status = MmCopyToCaller(lpSig, &fs, sizeof(FONTSIGNATURE)); + if (! NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return Ret; + } + } + if (0 == fs_fsCsb0) + { /* let's see if we can find any interesting cmaps */ + for (i = 0; i < Face->num_charmaps; i++) + { + switch (Face->charmaps[i]->encoding) + { + case ft_encoding_unicode: + case ft_encoding_apple_roman: + fs_fsCsb0 |= 1; + break; + case ft_encoding_symbol: + fs_fsCsb0 |= 1L << 31; + break; + default: + break; + } + } + } + while (0 == (fs_fsCsb0 >> i & 0x0001) && i < MAXTCIINDEX) + { + i++; + } + Ret = FontTci[i].ciCharset; + DPRINT("CharSet %d\n",Ret); + return Ret; } static BOOL

1 0

[jimtabor] 21014: SelectObject with a NULL DC returns 0 and sets ERROR_INVALID_HANDLE.
by jimtabor＠svn.reactos.org 25 Jan '06

25 Jan '06

SelectObject with a NULL DC returns 0 and sets ERROR_INVALID_HANDLE. Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2006-01-24 23:10:17 UTC (rev 21013) +++ trunk/reactos/subsys/win32k/objects/dc.c 2006-01-25 01:46:46 UTC (rev 21014) @@ -2069,8 +2069,17 @@ HRGN hVisRgn; BOOLEAN Failed; - if(!hDC || !hGDIObj) return NULL; - + if (!hDC || !hGDIObj) + { + /* From Wine: + * SelectObject() with a NULL DC returns 0 and sets ERROR_INVALID_HANDLE. + * Note: Under XP at least invalid ptrs can also be passed, not just NULL; + * Don't test that here in case it crashes earlier win versions. + */ + if (!hDC) SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + dc = DC_LockDc(hDC); if (NULL == dc) {

1 0

[hbirr] 21013: Delete the cache manager rewrite branch.
by hbirr＠svn.reactos.org 24 Jan '06

24 Jan '06

Delete the cache manager rewrite branch. Deleted: branches/cache_manager_rewrite/reactos/

1 0

[mf] 21012: explorer: fix small memory leak
by mf＠svn.reactos.org 24 Jan '06

24 Jan '06

explorer: fix small memory leak Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-24 20:05:50 UTC (rev 21011) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-24 20:27:05 UTC (rev 21012) @@ -163,8 +163,10 @@ Root::~Root() { - if (_entry) + if (_entry) { _entry->free_subentries(); + delete _entry; + } }

1 0

[mf] 21011: Work around for ROS to display the Explorer Rebar control
by mf＠svn.reactos.org 24 Jan '06

24 Jan '06

Work around for ROS to display the Explorer Rebar control Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-24 06:02:32 UTC (rev 21010) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-24 20:05:50 UTC (rev 21011) @@ -298,9 +298,14 @@ case WM_DESTROY: break; - case WM_SIZE: + case WM_SIZE: +#ifdef _ROS_ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); + MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); +#else resize_frame(LOWORD(lparam), HIWORD(lparam)); - break; // do not pass message to DefFrameProc +#endif + break; // do not pass message to DefFrameProc case WM_GETMINMAXINFO: { LPMINMAXINFO lpmmi = (LPMINMAXINFO)lparam;

1 0

[jimtabor] 21010: GetCurrentObject does not SetLastError() on a null object.
by jimtabor＠svn.reactos.org 24 Jan '06

24 Jan '06

GetCurrentObject does not SetLastError() on a null object. Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2006-01-24 06:01:58 UTC (rev 21009) +++ trunk/reactos/subsys/win32k/objects/dc.c 2006-01-24 06:02:32 UTC (rev 21010) @@ -1173,6 +1173,9 @@ HGDIOBJ SelObject; DC *dc; + /* From Wine: GetCurrentObject does not SetLastError() on a null object */ + if(!hDC) return NULL; + if(!(dc = DC_LockDc(hDC))) { SetLastWin32Error(ERROR_INVALID_HANDLE);

1 0

[jimtabor] 21009: DeleteObject does not SetLastError on a null object.
by jimtabor＠svn.reactos.org 24 Jan '06

24 Jan '06

DeleteObject does not SetLastError on a null object. Modified: trunk/reactos/lib/gdi32/objects/dc.c _____ Modified: trunk/reactos/lib/gdi32/objects/dc.c --- trunk/reactos/lib/gdi32/objects/dc.c 2006-01-24 05:39:17 UTC (rev 21008) +++ trunk/reactos/lib/gdi32/objects/dc.c 2006-01-24 06:01:58 UTC (rev 21009) @@ -193,6 +193,9 @@ STDCALL DeleteObject(HGDIOBJ hObject) { + /* From Wine: DeleteObject does not SetLastError() on a null object */ + if(!hObject) return FALSE; + if (0 != ((DWORD) hObject & GDI_HANDLE_STOCK_MASK)) { DPRINT1("Trying to delete system object 0x%x\n", hObject);

1 0

[jimtabor] 21008: I noticed GetObjectW in Wine is the same when a null object is used. It does not SetLastError.
by jimtabor＠svn.reactos.org 24 Jan '06

24 Jan '06

I noticed GetObjectW in Wine is the same when a null object is used. It does not SetLastError. Modified: trunk/reactos/subsys/win32k/objects/dc.c _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2006-01-24 05:23:52 UTC (rev 21007) +++ trunk/reactos/subsys/win32k/objects/dc.c 2006-01-24 05:39:17 UTC (rev 21008) @@ -1,3 +1,4 @@ + /* * ReactOS W32 Subsystem * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team @@ -1788,6 +1789,9 @@ LPVOID SafeBuf; NTSTATUS Status = STATUS_SUCCESS; + /* From Wine: GetObject does not SetLastError() on a null object */ + if (!handle) return 0; + if (count <= 0) { return 0;

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