Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[tkreuzer] 28748: fix AddFontResourceExAW parameter check
by tkreuzer＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: tkreuzer Date: Sat Sep 1 23:32:20 2007 New Revision: 28748 URL: http://svn.reactos.org/svn/reactos?rev=28748&view=rev Log: fix AddFontResourceExAW parameter check 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 (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Sat Sep 1 23:32:20 2007 @@ -1091,17 +1091,13 @@ STDCALL AddFontResourceExW ( LPCWSTR lpszFilename, DWORD fl, PVOID pvReserved ) { - int retVal = 0; - - if (fl & (FR_PRIVATE | FR_NOT_ENUM)) - { - retVal = GdiAddFontResourceW(lpszFilename, fl,0); - } - else + if (fl & ~(FR_PRIVATE | FR_NOT_ENUM)) { SetLastError( ERROR_INVALID_PARAMETER ); - } - return retVal; + return 0; + } + + return GdiAddFontResourceW(lpszFilename, fl,0); } @@ -1114,26 +1110,24 @@ { NTSTATUS Status; PWSTR FilenameW; - int rc = 0; - - if (!(fl & (FR_PRIVATE | FR_NOT_ENUM))) + int rc; + + if (fl & ~(FR_PRIVATE | FR_NOT_ENUM)) { SetLastError( ERROR_INVALID_PARAMETER ); - } - else - { - Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); - if ( !NT_SUCCESS (Status) ) - { - SetLastError (RtlNtStatusToDosError(Status)); - } - else - { - rc = GdiAddFontResourceW ( FilenameW, fl, 0 ); - HEAP_free ( FilenameW ); - } - } - return rc; + return 0; + } + + Status = HEAP_strdupA2W ( &FilenameW, lpszFilename ); + if ( !NT_SUCCESS (Status) ) + { + SetLastError (RtlNtStatusToDosError(Status)); + return 0; + } + + rc = GdiAddFontResourceW ( FilenameW, fl, 0 ); + HEAP_free ( FilenameW ); + return rc; }

1 0

[janderwald] 28747: - dont show same wallpaper twice - bug report + patch by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us See issue #2601 for more details.
by janderwald＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: janderwald Date: Sat Sep 1 21:18:00 2007 New Revision: 28747 URL: http://svn.reactos.org/svn/reactos?rev=28747&view=rev Log: - dont show same wallpaper twice - bug report + patch by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us See issue #2601 for more details. Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Sat Sep 1 21:18:00 2007 @@ -165,16 +165,16 @@ hFind = FindFirstFile(szSearchPath, &fd); while (hFind != INVALID_HANDLE_VALUE) { - /* Don't add any hidden bitmaps */ - if ((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) + TCHAR filename[MAX_PATH]; + + GetWindowsDirectory(filename, MAX_PATH); + + _tcscat(filename, TEXT("\\")); + _tcscat(filename, fd.cFileName); + + /* Don't add any hidden bitmaps. Also don't add current wallpaper once more. */ + if (((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) && (_tcscmp(wallpaperFilename, filename) != 0)) { - TCHAR filename[MAX_PATH]; - - GetWindowsDirectory(filename, MAX_PATH); - - _tcscat(filename, TEXT("\\")); - _tcscat(filename, fd.cFileName); - himl = (HIMAGELIST)SHGetFileInfo(filename, 0, &sfi, @@ -780,3 +780,4 @@ return FALSE; } +

1 0

[janderwald] 28746: - fix loading of resources
by janderwald＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: janderwald Date: Sat Sep 1 20:34:22 2007 New Revision: 28746 URL: http://svn.reactos.org/svn/reactos?rev=28746&view=rev Log: - fix loading of resources Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c Sat Sep 1 20:34:22 2007 @@ -244,7 +244,7 @@ SetThreadDesktop(NotifyContext->Desktop); SwitchDesktop(NotifyContext->Desktop); CallInitCommonControls(); - NotifyContext->Dlg = CreateDialogParam(Win32CsrDllHandle, + NotifyContext->Dlg = CreateDialogParam(GetModuleHandleW(L"win32csr"), MAKEINTRESOURCE(IDD_END_NOW), NULL, EndNowDlgProc, (LPARAM) NotifyContext); if (NULL == NotifyContext->Dlg)

1 0

[janderwald] 28745: - load icon from the right HINSTANCE handle
by janderwald＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: janderwald Date: Sat Sep 1 20:03:12 2007 New Revision: 28745 URL: http://svn.reactos.org/svn/reactos?rev=28745&view=rev Log: - load icon from the right HINSTANCE handle Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sat Sep 1 20:03:12 2007 @@ -1880,13 +1880,13 @@ wc.lpfnWndProc = GuiConsoleWndProc; wc.style = 0; wc.hInstance = (HINSTANCE) GetModuleHandleW(NULL); - wc.hIcon = LoadIconW(Win32CsrDllHandle, MAKEINTRESOURCEW(1)); + wc.hIcon = LoadIconW(GetModuleHandleW(L"win32csr"), MAKEINTRESOURCEW(1)); wc.hCursor = LoadCursorW(NULL, (LPCWSTR) IDC_ARROW); wc.hbrBackground = NULL; wc.lpszMenuName = NULL; wc.cbClsExtra = 0; wc.cbWndExtra = 0; - wc.hIconSm = LoadImageW(Win32CsrDllHandle, MAKEINTRESOURCEW(1), IMAGE_ICON, + wc.hIconSm = LoadImageW(GetModuleHandleW(L"win32csr"), MAKEINTRESOURCEW(1), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); if (RegisterClassExW(&wc) == 0)

1 0

[janderwald] 28744: - load resources from the dll handle - loop untill the real stop condition is found - this makes the console properties menu working again See issue #1827 for more details.
by janderwald＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: janderwald Date: Sat Sep 1 19:54:16 2007 New Revision: 28744 URL: http://svn.reactos.org/svn/reactos?rev=28744&view=rev Log: - load resources from the dll handle - loop untill the real stop condition is found - this makes the console properties menu working again See issue #1827 for more details. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sat Sep 1 19:54:16 2007 @@ -121,15 +121,16 @@ GuiConsoleAppendMenuItems(HMENU hMenu, const GUICONSOLE_MENUITEM *Items) { - UINT i; + UINT i = 0; WCHAR szMenuString[255]; HMENU hSubMenu; - - for (i = 0; Items[i].uID != 0; i++) + HINSTANCE hInst = GetModuleHandleW(L"win32csr"); + + do { if (Items[i].uID != (UINT)-1) { - if (LoadStringW(Win32CsrDllHandle, + if (LoadStringW(hInst, Items[i].uID, szMenuString, sizeof(szMenuString) / sizeof(szMenuString[0])) > 0) @@ -167,20 +168,21 @@ 0, NULL); } - } + i++; + }while(!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0)); } static VOID FASTCALL GuiConsoleCreateSysMenu(PCSRSS_CONSOLE Console) { HMENU hMenu; - hMenu = GetSystemMenu(Console->hWindow, FALSE); if (hMenu != NULL) { GuiConsoleAppendMenuItems(hMenu, GuiConsoleMainMenuItems); + DrawMenuBar(Console->hWindow); } }

1 0

[greatlrd] 28743: implement stub for NtGdiPATHOBJ_vGetBounds, NtGdiPATHOBJ_vEnumStart, NtGdiPATHOBJ_vEnumStartClipLines
by greatlrd＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: greatlrd Date: Sat Sep 1 19:10:17 2007 New Revision: 28743 URL: http://svn.reactos.org/svn/reactos?rev=28743&view=rev Log: implement stub for NtGdiPATHOBJ_vGetBounds, NtGdiPATHOBJ_vEnumStart, NtGdiPATHOBJ_vEnumStartClipLines Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Sep 1 19:10:17 2007 @@ -2908,3 +2908,42 @@ return FALSE; } + /* + * @unimplemented + */ +VOID +STDCALL +NtGdiPATHOBJ_vGetBounds( + IN PATHOBJ *ppo, + OUT PRECTFX prectfx) +{ + UNIMPLEMENTED; +} + + + + /* + * @unimplemented + */ +VOID +STDCALL +NtGdiPATHOBJ_vEnumStart( + IN PATHOBJ *ppo) +{ + UNIMPLEMENTED; +} + + /* + * @unimplemented + */ +VOID +STDCALL +NtGdiPATHOBJ_vEnumStartClipLines( + IN PATHOBJ *ppo, + IN CLIPOBJ *pco, + IN SURFOBJ *pso, + IN LINEATTRS *pla) +{ + UNIMPLEMENTED; +} + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Sep 1 19:10:17 2007 @@ -659,10 +659,10 @@ # NtGdiSTROBJ_bGetAdvanceWidths 4 # NtGdiSTROBJ_vEnumStart 1 # NtGdiSTROBJ_dwGetCodePage 1 -# NtGdiPATHOBJ_vGetBounds 2 +NtGdiPATHOBJ_vGetBounds 2 NtGdiPATHOBJ_bEnum 2 -# NtGdiPATHOBJ_vEnumStart 1 -# NtGdiPATHOBJ_vEnumStartClipLines 4 +NtGdiPATHOBJ_vEnumStart 1 +NtGdiPATHOBJ_vEnumStartClipLines 4 NtGdiPATHOBJ_bEnumClipLines 3 # NtGdiGetDhpdev 1 NtGdiEngCheckAbort 1

1 0

[greatlrd] 28742: implement stub for NtGdiPATHOBJ_bEnum, NtGdiPATHOBJ_bEnumClipLines
by greatlrd＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: greatlrd Date: Sat Sep 1 18:13:53 2007 New Revision: 28742 URL: http://svn.reactos.org/svn/reactos?rev=28742&view=rev Log: implement stub for NtGdiPATHOBJ_bEnum, NtGdiPATHOBJ_bEnumClipLines Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Sep 1 18:13:53 2007 @@ -2853,6 +2853,9 @@ return 0; } + /* + * @unimplemented + */ DWORD NtGdiGetFontUnicodeRanges( IN HDC hdc, @@ -2862,6 +2865,9 @@ return 0; } + /* + * @unimplemented + */ UINT STDCALL NtGdiGetStringBitmapW( @@ -2875,3 +2881,30 @@ return 0; } + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiPATHOBJ_bEnum( + IN PATHOBJ *ppo, + OUT PATHDATA *ppd) +{ + UNIMPLEMENTED; + return FALSE; +} + + /* + * @unimplemented + */ +BOOL +STDCALL +NtGdiPATHOBJ_bEnumClipLines( + IN PATHOBJ *ppo, + IN ULONG cb, + OUT CLIPLINE *pcl) +{ + UNIMPLEMENTED; + return FALSE; +} + Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Sep 1 18:13:53 2007 @@ -660,10 +660,10 @@ # NtGdiSTROBJ_vEnumStart 1 # NtGdiSTROBJ_dwGetCodePage 1 # NtGdiPATHOBJ_vGetBounds 2 -# NtGdiPATHOBJ_bEnum 2 +NtGdiPATHOBJ_bEnum 2 # NtGdiPATHOBJ_vEnumStart 1 # NtGdiPATHOBJ_vEnumStartClipLines 4 -# NtGdiPATHOBJ_bEnumClipLines 3 +NtGdiPATHOBJ_bEnumClipLines 3 # NtGdiGetDhpdev 1 NtGdiEngCheckAbort 1 NtGdiHT_Get8BPPFormatPalette 4

1 0

[greatlrd] 28741: update the good api list
by greatlrd＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: greatlrd Date: Sat Sep 1 17:22:40 2007 New Revision: 28741 URL: http://svn.reactos.org/svn/reactos?rev=28741&view=rev Log: update the good api list Modified: trunk/reactos/dll/win32/gdi32/good api.def Modified: trunk/reactos/dll/win32/gdi32/good api.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/good%20api… ============================================================================== --- trunk/reactos/dll/win32/gdi32/good api.def (original) +++ trunk/reactos/dll/win32/gdi32/good api.def Sat Sep 1 17:22:40 2007 @@ -141,9 +141,24 @@ GetRandomRgn@12 GetRasterizerCaps@8 GetRegionData@12 +GetStringBitmapA@20 +GetStringBitmapW@20 +GetSystemPaletteUse@4 +GetTextCharset@4 +GetTextCharsetInfo@12 +GetTextExtentExPointI@28 +GetTextExtentExPointWPri@28 +GetTextExtentPointI@16 +GetTextFaceAliasW@12 +GetTextFaceW@12 +GetTransform@12 +GetWorldTransform@8 +HT_Get8BPPFormatPalette@16 +HT_Get8BPPMaskPalette@24 +

1 0

[greatlrd] 28740: fix two typo thx ged
by greatlrd＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: greatlrd Date: Sat Sep 1 17:10:36 2007 New Revision: 28740 URL: http://svn.reactos.org/svn/reactos?rev=28740&view=rev Log: fix two typo thx ged Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Sat Sep 1 17:10:36 2007 @@ -185,7 +185,7 @@ int Y, LPPOINT lpPoint) { - return MoveToEx(hdc, X, Y, lpPoint); + return NtGdiMoveToEx(hdc, X, Y, lpPoint); } /* @@ -199,7 +199,7 @@ int nYOffset, LPPOINT lpPoint) { - return OffsetViewportOrgEx(hdc, nXOffset, nYOffset, lpPoint); + return NtGdiOffsetViewportOrgEx(hdc, nXOffset, nYOffset, lpPoint); } /*

1 0

[greatlrd] 28739: fast bugfix, NtGdiExtEscape should accpect a NULL hdc.
by greatlrd＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: greatlrd Date: Sat Sep 1 17:05:33 2007 New Revision: 28739 URL: http://svn.reactos.org/svn/reactos?rev=28739&view=rev Log: fast bugfix, NtGdiExtEscape should accpect a NULL hdc. Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c Sat Sep 1 17:05:33 2007 @@ -156,12 +156,18 @@ INT OutSize, OPTIONAL LPSTR UnsafeOutData) { - PDC pDC = DC_LockDc(hDC); + PDC pDC; LPVOID SafeInData = NULL; LPVOID SafeOutData = NULL; NTSTATUS Status = STATUS_SUCCESS; INT Result; + if (hDC == 0) + { + hDC = (HDC)UserGetWindowDC(NULL); + } + + pDC = DC_LockDc(hDC); if ( pDC == NULL ) { SetLastWin32Error(ERROR_INVALID_HANDLE);

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 September 2007