Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[fireball] 30691: - Add a check for an incorrect virtual size. Currently ReactOS's floppy.sys has such an incorrect section.
by fireball＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: fireball Date: Fri Nov 23 16:39:31 2007 New Revision: 30691 URL: http://svn.reactos.org/svn/reactos?rev=30691&view=rev Log: - Add a check for an incorrect virtual size. Currently ReactOS's floppy.sys has such an incorrect section. Modified: trunk/reactos/lib/rossym/frommem.c Modified: trunk/reactos/lib/rossym/frommem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/frommem.c?rev=3… ============================================================================== --- trunk/reactos/lib/rossym/frommem.c (original) +++ trunk/reactos/lib/rossym/frommem.c Fri Nov 23 16:39:31 2007 @@ -24,8 +24,9 @@ PIMAGE_DOS_HEADER DosHeader; PIMAGE_NT_HEADERS NtHeaders; PIMAGE_SECTION_HEADER SectionHeader; - unsigned SectionIndex; - char SectionName[IMAGE_SIZEOF_SHORT_NAME]; + ULONG SectionIndex; + BOOLEAN RosSymSectionFound = FALSE; + CHAR SectionName[IMAGE_SIZEOF_SHORT_NAME]; /* Check if MZ header is valid */ DosHeader = (PIMAGE_DOS_HEADER) ImageStart; @@ -58,11 +59,13 @@ { if (0 == memcmp(SectionName, SectionHeader->Name, IMAGE_SIZEOF_SHORT_NAME)) { + RosSymSectionFound = TRUE; break; } SectionHeader++; } - if (NtHeaders->FileHeader.NumberOfSections <= SectionIndex) + + if (!RosSymSectionFound) { DPRINT("No %s section found\n", ROSSYM_SECTION_NAME); return FALSE; @@ -76,6 +79,12 @@ return FALSE; } + if (SectionHeader->VirtualAddress + SectionHeader->Misc.VirtualSize > ImageSize) + { + DPRINT("Bad %s section virtual size!\n", ROSSYM_SECTION_NAME); + return FALSE; + } + /* Load it */ return RosSymCreateFromRaw((char *) ImageStart + SectionHeader->VirtualAddress, SectionHeader->SizeOfRawData, RosSymInfo);

1 0

[cwittich] 30689: link to secur32 - will be needed by newer wine versions
by cwittich＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: cwittich Date: Fri Nov 23 13:10:21 2007 New Revision: 30689 URL: http://svn.reactos.org/svn/reactos?rev=30689&view=rev Log: link to secur32 - will be needed by newer wine versions Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.rbuild (original) +++ trunk/reactos/dll/win32/wininet/wininet.rbuild Fri Nov 23 13:10:21 2007 @@ -17,6 +17,7 @@ <library>mpr</library> <library>ws2_32</library> <library>crypt32</library> + <library>secur32</library> <file>cookie.c</file> <file>dialogs.c</file> <file>ftp.c</file>

1 0

[cwittich] 30688: add stub for InitializeSecurityContextW
by cwittich＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: cwittich Date: Fri Nov 23 12:10:32 2007 New Revision: 30688 URL: http://svn.reactos.org/svn/reactos?rev=30688&view=rev Log: add stub for InitializeSecurityContextW Modified: trunk/reactos/dll/win32/secur32/secur32.def trunk/reactos/dll/win32/secur32/sspi.c Modified: trunk/reactos/dll/win32/secur32/secur32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.def (original) +++ trunk/reactos/dll/win32/secur32/secur32.def Fri Nov 23 12:10:32 2007 @@ -40,7 +40,7 @@ ;@InitSecurityInterfaceA InitSecurityInterfaceW@0 InitializeSecurityContextA@48 -;InitializeSecurityContextW@48 +InitializeSecurityContextW@48 LsaEnumerateLogonSessions@8 LsaGetLogonSessionData@8 LsaRegisterPolicyChangeNotification@8 Modified: trunk/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/sspi.c?r… ============================================================================== --- trunk/reactos/dll/win32/secur32/sspi.c (original) +++ trunk/reactos/dll/win32/secur32/sspi.c Fri Nov 23 12:10:32 2007 @@ -156,6 +156,26 @@ return ERROR_CALL_NOT_IMPLEMENTED; } +SECURITY_STATUS +WINAPI +InitializeSecurityContextW ( + PCredHandle phCred, + PCtxtHandle phContext, + SEC_WCHAR* pszTarget, + ULONG fContextReq, + ULONG Reserved, + ULONG TargetData, + PSecBufferDesc pInput, + ULONG Reserved2, + PCtxtHandle phNewContext, + PSecBufferDesc pOut, + PULONG pfContextAttributes, + PTimeStamp pExpires + ) +{ + DPRINT1("%s() not implemented!\n", __FUNCTION__); + return ERROR_CALL_NOT_IMPLEMENTED; +} SECURITY_STATUS WINAPI

1 0

[cwittich] 30687: don't try to alphablend monochrome bitmaps - fixes the red zone overwrite in opera 9.24
by cwittich＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: cwittich Date: Fri Nov 23 10:33:54 2007 New Revision: 30687 URL: http://svn.reactos.org/svn/reactos?rev=30687&view=rev Log: don't try to alphablend monochrome bitmaps - fixes the red zone overwrite in opera 9.24 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Fri Nov 23 10:33:54 2007 @@ -1400,7 +1400,10 @@ IconSize.cy = bmpMask.bmHeight / 2; } - if (bmpColor.bmBitsPixel == 32) + /* NtGdiCreateCompatibleBitmap will create a monochrome bitmap + when cxWidth or cyHeight is 0 + */ + if ((bmpColor.bmBitsPixel == 32) && (cxWidth != 0) && (cyHeight != 0)) { bAlpha = TRUE; }

1 0

[greatlrd] 30686: small fix for cGetTTFFromFOT fix the number of param, did do a pedump. on export to found out it is @28 but I need look at my private note later
by greatlrd＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: greatlrd Date: Fri Nov 23 04:38:54 2007 New Revision: 30686 URL: http://svn.reactos.org/svn/reactos?rev=30686&view=rev Log: small fix for cGetTTFFromFOT fix the number of param, did do a pedump. on export to found out it is @28 but I need look at my private note later Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Nov 23 04:38:54 2007 @@ -620,5 +620,5 @@ XLATEOBJ_piVector@4 bInitSystemAndFontsDirectoriesW@8 bMakePathNameW@16 -cGetTTFFromFOT@4 +cGetTTFFromFOT@28 gdiPlaySpoolStream@24 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Nov 23 04:38:54 2007 @@ -2491,12 +2491,14 @@ /* * @unimplemented */ + +/* FIXME wrong protypes, it is a fastcall api */ DWORD STDCALL -cGetTTFFromFOT(DWORD unknown) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - +cGetTTFFromFOT(DWORD x1 ,DWORD x2 ,DWORD x3, DWORD x4, DWORD x5, DWORD x6, DWORD x7) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} +

1 0

[tkreuzer] 30685: add cGetTTFFromFOT stub. I don't know the number of parameters, but this allows loading gdi32 on win xp using myapp.exe.local gdi32api test on win xp: 209 tests pass, 62 tests fail.
by tkreuzer＠svn.reactos.org 23 Nov '07

23 Nov '07

Author: tkreuzer Date: Fri Nov 23 04:08:47 2007 New Revision: 30685 URL: http://svn.reactos.org/svn/reactos?rev=30685&view=rev Log: add cGetTTFFromFOT stub. I don't know the number of parameters, but this allows loading gdi32 on win xp using myapp.exe.local gdi32api test on win xp: 209 tests pass, 62 tests fail. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Nov 23 04:08:47 2007 @@ -620,5 +620,5 @@ XLATEOBJ_piVector@4 bInitSystemAndFontsDirectoriesW@8 bMakePathNameW@16 -;cGetTTFFromFOT +cGetTTFFromFOT@4 gdiPlaySpoolStream@24 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Nov 23 04:08:47 2007 @@ -2488,9 +2488,15 @@ - - - - - - +/* + * @unimplemented + */ +DWORD +STDCALL +cGetTTFFromFOT(DWORD unknown) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} +

1 0

[greatlrd] 30684: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) update the dx version number for ddraw.dll to same as windows xp ddraw.dll it help some program works.
by greatlrd＠svn.reactos.org 22 Nov '07

22 Nov '07

Author: greatlrd Date: Fri Nov 23 01:26:04 2007 New Revision: 30684 URL: http://svn.reactos.org/svn/reactos?rev=30684&view=rev Log: patch from Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) update the dx version number for ddraw.dll to same as windows xp ddraw.dll it help some program works. Modified: trunk/reactos/dll/directx/ddraw/ddraw.rc Modified: trunk/reactos/dll/directx/ddraw/ddraw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rc… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rc (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rc Fri Nov 23 01:26:04 2007 @@ -5,9 +5,9 @@ #define REACTOS_STR_INTERNAL_NAME "ddraw\0" #define REACTOS_STR_ORIGINAL_FILENAME "ddraw.dll\0" -#define REACTOS_FILEVERSION 5,3,0,900 -#define REACTOS_STR_FILE_VERSION "5.3.0.900" -#define REACTOS_PRODUCTVERSION 5,3,0,900 -#define REACTOS_STR_PRODUCT_VERSION "5.3" +#define REACTOS_FILEVERSION 5,3,2600,2180 +#define REACTOS_STR_FILE_VERSION "5.3.2600.2180" +#define REACTOS_PRODUCTVERSION 5,3,2600,2180 +#define REACTOS_STR_PRODUCT_VERSION "5.3.2600.2180" #include <reactos/version.rc>

1 0

[tkreuzer] 30683: add fontview to bootcd and add ttf file association See issue #1411 for more details.
by tkreuzer＠svn.reactos.org 22 Nov '07

22 Nov '07

Author: tkreuzer Date: Thu Nov 22 23:15:30 2007 New Revision: 30683 URL: http://svn.reactos.org/svn/reactos?rev=30683&view=rev Log: add fontview to bootcd and add ttf file association See issue #1411 for more details. Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Thu Nov 22 23:15:30 2007 @@ -99,6 +99,7 @@ HKCR,".ttf","",0x00000000,"ttffile" HKCR,"ttffile","",0x00000000,"TrueType Font File" HKCR,"ttffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156" +HKCR,"ttffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1" ; Help Files HKCR,".hlp","",0x00000000,"hlpfile" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Nov 22 23:15:30 2007 @@ -484,6 +484,7 @@ modules\rosapps\dflat32\edit.exe 1 optional modules\rosapps\downloader\downloader.exe 1 optional modules\rosapps\downloader\downloader.xml 1 optional +modules\rosapps\fontview\fontview.exe 1 optional modules\rosapps\gettype\gettype.exe 1 optional modules\rosapps\green\green.sys 1 optional modules\rosapps\imagesoft\imagesoft.exe 1 optional

1 0

[greatlrd] 30682: Implement DirectDrawEnumerateW, DirectDrawEnumerateExW they always return DDERR_UNSUPPORTED
by greatlrd＠svn.reactos.org 22 Nov '07

22 Nov '07

Author: greatlrd Date: Thu Nov 22 22:36:16 2007 New Revision: 30682 URL: http://svn.reactos.org/svn/reactos?rev=30682&view=rev Log: Implement DirectDrawEnumerateW, DirectDrawEnumerateExW they always return DDERR_UNSUPPORTED Modified: trunk/reactos/dll/directx/ddraw/main.c Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Thu Nov 22 22:36:16 2007 @@ -204,17 +204,6 @@ return retValue; } - -/* - * UNIMPLEMENT - */ - -HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, - LPVOID lpContext) -{ - DX_STUB; -} - /* * UNIMPLEMENT */ @@ -255,9 +244,13 @@ return DDERR_UNSUPPORTED; } -/* - * UNIMPLEMENT - */ +HRESULT +WINAPI +DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, + LPVOID lpContext) +{ + return DDERR_UNSUPPORTED; +} HRESULT WINAPI @@ -265,9 +258,11 @@ LPVOID lpContext, DWORD dwFlags) { - /* Note this function are not longer supported in ddraw in windows 2003 */ - DX_STUB; -} + return DDERR_UNSUPPORTED; +} + + + /* See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/ @@ -376,7 +371,7 @@ (dp2command->bCommand >= D3DDP2OP_LINELIST) ) // dp2command->bCommand >= with 15 to 255 { /* set error code for command 0 to 3, 8 and 15 to 255 */ - retCode = E_FAIL; + retCode = DDERR_INVALIDPARAMS; } else { /* set error code for 4 - 7, 9 - 12, 14 */

1 0

[greatlrd] 30681: Implement DirectDrawEnumerateA the DirectDrawEnumerateProcData struct are from wine. rest of the code are writen by me. the DirectDrawEnumerateExA are not finish but it is a start.
by greatlrd＠svn.reactos.org 22 Nov '07

22 Nov '07

Author: greatlrd Date: Thu Nov 22 22:11:43 2007 New Revision: 30681 URL: http://svn.reactos.org/svn/reactos?rev=30681&view=rev Log: Implement DirectDrawEnumerateA the DirectDrawEnumerateProcData struct are from wine. rest of the code are writen by me. the DirectDrawEnumerateExA are not finish but it is a start. Modified: trunk/reactos/dll/directx/ddraw/main.c Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Thu Nov 22 22:11:43 2007 @@ -12,6 +12,7 @@ #include "rosdraw.h" + /* PSEH for SEH Support */ #include <pseh/pseh.h> @@ -19,7 +20,23 @@ // This function is exported by the dll - +typedef struct +{ + LPVOID lpCallback; + LPVOID lpContext; +} DirectDrawEnumerateProcData; + +BOOL +CALLBACK +TranslateCallbackA(GUID *lpGUID, + LPSTR lpDriverDescription, + LPSTR lpDriverName, + LPVOID lpContext, + HMONITOR hm) +{ + DirectDrawEnumerateProcData *pEPD = (DirectDrawEnumerateProcData*)lpContext; + return ((LPDDENUMCALLBACKA) pEPD->lpCallback)(lpGUID, lpDriverDescription, lpDriverName, pEPD->lpContext); +} /*++ * @name DirectDrawCreateClipper @@ -163,28 +180,79 @@ return retVal; } +HRESULT +WINAPI +DirectDrawEnumerateA( LPDDENUMCALLBACKA lpCallback, + LPVOID lpContext) +{ + HRESULT retValue; + DirectDrawEnumerateProcData epd; + + DX_WINDBG_trace(); + + epd.lpCallback = (LPVOID) lpCallback; + epd.lpContext = lpContext; + + if (!IsBadCodePtr((LPVOID)lpCallback)) + { + return DirectDrawEnumerateExA((LPDDENUMCALLBACKEXA)TranslateCallbackA, &epd, DDENUM_NONDISPLAYDEVICES); + } + else + { + retValue = DDERR_INVALIDPARAMS; + } + return retValue; +} + + /* * UNIMPLEMENT */ -HRESULT -WINAPI -DirectDrawEnumerateA( - LPDDENUMCALLBACKA lpCallback, - LPVOID lpContext) +HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, + LPVOID lpContext) { DX_STUB; } - /* * UNIMPLEMENT */ -HRESULT WINAPI DirectDrawEnumerateW(LPDDENUMCALLBACKW lpCallback, - LPVOID lpContext) -{ - DX_STUB; +HRESULT +WINAPI +DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA lpCallback, + LPVOID lpContext, + DWORD dwFlags) +{ + HKEY hKey; + DWORD cbData = 0; + DWORD Value = 0; + LONG rc; + BOOL EnumerateAttachedSecondaries = FALSE; + DWORD privateDWFlags = 0; + + DX_WINDBG_trace(); + + rc = RegOpenKeyA(HKEY_LOCAL_MACHINE, REGSTR_PATH_DDHW, &hKey); + if (rc == ERROR_SUCCESS) + { + /* Enumerate Attached Secondaries */ + cbData = sizeof(DWORD); + rc = RegQueryValueExA(hKey, "EnumerateAttachedSecondaries", NULL, NULL, (LPBYTE)&Value, &cbData); + if (rc == ERROR_SUCCESS) + { + if (Value != 0) + { + EnumerateAttachedSecondaries = TRUE; + privateDWFlags = DDENUM_ATTACHEDSECONDARYDEVICES; + } + } + RegCloseKey(hKey); + } + + // not finish + return DDERR_UNSUPPORTED; } /* @@ -193,23 +261,11 @@ HRESULT WINAPI -DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA lpCallback, - LPVOID lpContext, - DWORD dwFlags) -{ - DX_STUB; -} - -/* - * UNIMPLEMENT - */ - -HRESULT -WINAPI DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags) { + /* Note this function are not longer supported in ddraw in windows 2003 */ DX_STUB; }

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007