Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[weiden] 18839: implemented SetupDiGetSelectedDriverA
by weiden＠svn.reactos.com 29 Oct '05

29 Oct '05

implemented SetupDiGetSelectedDriverA Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-29 09:49:19 UTC (rev 18838) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-29 09:52:43 UTC (rev 18839) @@ -4955,7 +4955,68 @@ return ret; } + /*********************************************************************** + * SetupDiGetSelectedDriverA (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiGetSelectedDriverA( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + OUT PSP_DRVINFO_DATA_A DriverInfoData) +{ + SP_DRVINFO_DATA_V2_W driverInfoData2W; + BOOL ret = FALSE; + + if (DriverInfoData == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V1_A) && DriverInfoData->cbSize != sizeof(SP_DRVINFO_DATA_V2_A)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + driverInfoData2W.cbSize = sizeof(SP_DRVINFO_DATA_V2_W); + + ret = SetupDiGetSelectedDriverW(DeviceInfoSet, + DeviceInfoData, + &driverInfoData2W); + + if (ret) + { + /* Do W->A conversion */ + DriverInfoData->DriverType = driverInfoData2W.DriverType; + DriverInfoData->Reserved = driverInfoData2W.Reserved; + if (WideCharToMultiByte(CP_ACP, 0, driverInfoData2W.Description, -1, + DriverInfoData->Description, LINE_LEN, NULL, NULL) == 0) + { + DriverInfoData->Description[0] = '\0'; + ret = FALSE; + } + if (WideCharToMultiByte(CP_ACP, 0, driverInfoData2W.MfgName, -1, + DriverInfoData->MfgName, LINE_LEN, NULL, NULL) == 0) + { + DriverInfoData->MfgName[0] = '\0'; + ret = FALSE; + } + if (WideCharToMultiByte(CP_ACP, 0, driverInfoData2W.ProviderName, -1, + DriverInfoData->ProviderName, LINE_LEN, NULL, NULL) == 0) + { + DriverInfoData->ProviderName[0] = '\0'; + ret = FALSE; + } + if (DriverInfoData->cbSize == sizeof(SP_DRVINFO_DATA_V2_A)) + { + /* Copy more fields */ + DriverInfoData->DriverDate = driverInfoData2W.DriverDate; + DriverInfoData->DriverVersion = driverInfoData2W.DriverVersion; + } + } + } + + return ret; +} + + +/********************************************************************** * * SetupDiGetSelectedDriverW (SETUPAPI.@) */ BOOL WINAPI _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-10-29 09:49:19 UTC (rev 18838) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-10-29 09:52:43 UTC (rev 18839) @@ -344,7 +344,7 @@ @ stdcall SetupDiGetINFClassA(str ptr ptr long ptr) @ stdcall SetupDiGetINFClassW(wstr ptr ptr long ptr) @ stub SetupDiGetSelectedDevice -@ stub SetupDiGetSelectedDriverA +@ stdcall SetupDiGetSelectedDriverA(ptr ptr ptr) @ stdcall SetupDiGetSelectedDriverW(ptr ptr ptr) @ stub SetupDiGetWizardPage @ stdcall SetupDiInstallClassA(long str long ptr)

1 0

[hpoussin] 18838: Fix infinite loop (spotted by mifritscher)
by hpoussin＠svn.reactos.com 29 Oct '05

29 Oct '05

Fix infinite loop (spotted by mifritscher) Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-28 19:17:37 UTC (rev 18837) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-29 09:49:19 UTC (rev 18838) @@ -4044,6 +4044,7 @@ InsertHeadList(PreviousEntry, &driverInfo->ListEntry); break; } + PreviousEntry = PreviousEntry->Flink; } if (PreviousEntry == DriverListHead) {

1 0

[greatlrd] 18837: Taskmgr greenish font remake by irc:dnordenberg (Swedish translator) approved by irc:mf (UI coordinator)
by greatlrd＠svn.reactos.com 28 Oct '05

28 Oct '05

Taskmgr greenish font remake by irc:dnordenberg (Swedish translator) approved by irc:mf (UI coordinator) Modified: trunk/reactos/subsys/system/taskmgr/res/font.bmp _____ Modified: trunk/reactos/subsys/system/taskmgr/res/font.bmp (Binary files differ)

1 0

[gvg] 18836: First send WM_ACTIVATE, then WM_SETFOCUS
by gvg＠svn.reactos.com 28 Oct '05

28 Oct '05

First send WM_ACTIVATE, then WM_SETFOCUS Modified: trunk/reactos/subsys/win32k/ntuser/focus.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/focus.c --- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-10-28 18:48:23 UTC (rev 18835) +++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-10-28 18:49:27 UTC (rev 18836) @@ -200,8 +200,8 @@ /* FIXME: Send WM_ACTIVATEAPP to all thread windows. */ } + co_IntSendActivateMessages(hWndPrev, hWnd, MouseActivate); co_IntSendSetFocusMessages(hWndFocusPrev, hWndFocus); - co_IntSendActivateMessages(hWndPrev, hWnd, MouseActivate); return TRUE; }

1 0

[gvg] 18835: Properly return window state
by gvg＠svn.reactos.com 28 Oct '05

28 Oct '05

Properly return window state Modified: trunk/reactos/subsys/win32k/ntuser/window.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-28 15:33:05 UTC (rev 18834) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-10-28 18:48:23 UTC (rev 18835) @@ -3554,7 +3554,23 @@ } Safepl.flags = 0; - Safepl.showCmd = ((Window->Flags & WINDOWOBJECT_RESTOREMAX) ? SW_MAXIMIZE : SW_SHOWNORMAL); + if (0 == (Window->Style & WS_VISIBLE)) + { + Safepl.showCmd = SW_HIDE; + } + else if (0 != (Window->Flags & WINDOWOBJECT_RESTOREMAX) || + 0 != (Window->Style & WS_MAXIMIZE)) + { + Safepl.showCmd = SW_MAXIMIZE; + } + else if (0 != (Window->Style & WS_MINIMIZE)) + { + Safepl.showCmd = SW_MINIMIZE; + } + else if (0 != (Window->Style & WS_MINIMIZE)) + { + Safepl.showCmd = SW_SHOWNORMAL; + } Size.x = Window->WindowRect.left; Size.y = Window->WindowRect.top;

1 0

[weiden] 18834: don't pass NULL as the last two parameters to ReadFile. This fixes a crash while installing OOo 2.0. Patch also submitted to winehq.
by weiden＠svn.reactos.com 28 Oct '05

28 Oct '05

don't pass NULL as the last two parameters to ReadFile. This fixes a crash while installing OOo 2.0. Patch also submitted to winehq. Modified: trunk/reactos/lib/msi/action.c _____ Modified: trunk/reactos/lib/msi/action.c --- trunk/reactos/lib/msi/action.c 2005-10-28 14:31:38 UTC (rev 18833) +++ trunk/reactos/lib/msi/action.c 2005-10-28 15:33:05 UTC (rev 18834) @@ -3676,8 +3676,9 @@ TT_TABLE_DIRECTORY tblDir; BOOL bFound = FALSE; TT_OFFSET_TABLE ttOffsetTable; + DWORD dwRead; - ReadFile(handle,&ttOffsetTable, sizeof(TT_OFFSET_TABLE),NULL,NULL); + ReadFile(handle,&ttOffsetTable, sizeof(TT_OFFSET_TABLE),&dwRead,NULL); ttOffsetTable.uNumOfTables = SWAPWORD(ttOffsetTable.uNumOfTables); ttOffsetTable.uMajorVersion = SWAPWORD(ttOffsetTable.uMajorVersion); ttOffsetTable.uMinorVersion = SWAPWORD(ttOffsetTable.uMinorVersion); @@ -3688,7 +3689,7 @@ for (i=0; i< ttOffsetTable.uNumOfTables; i++) { - ReadFile(handle,&tblDir, sizeof(TT_TABLE_DIRECTORY),NULL,NULL); + ReadFile(handle,&tblDir, sizeof(TT_TABLE_DIRECTORY),&dwRead,NULL); if (strncmp(tblDir.szTag,"name",4)==0) { bFound = TRUE; @@ -3705,14 +3706,14 @@ SetFilePointer(handle, tblDir.uOffset, NULL, FILE_BEGIN); ReadFile(handle,&ttNTHeader, sizeof(TT_NAME_TABLE_HEADER), - NULL,NULL); + &dwRead,NULL); ttNTHeader.uNRCount = SWAPWORD(ttNTHeader.uNRCount); ttNTHeader.uStorageOffset = SWAPWORD(ttNTHeader.uStorageOffset); bFound = FALSE; for(i=0; i<ttNTHeader.uNRCount; i++) { - ReadFile(handle,&ttRecord, sizeof(TT_NAME_RECORD),NULL,NULL); + ReadFile(handle,&ttRecord, sizeof(TT_NAME_RECORD),&dwRead,NULL); ttRecord.uNameID = SWAPWORD(ttRecord.uNameID); /* 4 is the Full Font Name */ if(ttRecord.uNameID == 4) @@ -3730,7 +3731,7 @@ NULL, FILE_BEGIN); buf = msi_alloc( ttRecord.uStringLength + 1 + strlen(tt) ); memset(buf, 0, ttRecord.uStringLength + 1 + strlen(tt)); - ReadFile(handle, buf, ttRecord.uStringLength, NULL, NULL); + ReadFile(handle, buf, ttRecord.uStringLength, &dwRead, NULL); if (strlen(buf) > 0) { strcat(buf,tt);

1 0

[weiden] 18833: fix returning the new token handle in DuplicateTokenEx
by weiden＠svn.reactos.com 28 Oct '05

28 Oct '05

fix returning the new token handle in DuplicateTokenEx Modified: trunk/reactos/lib/advapi32/token/token.c _____ Modified: trunk/reactos/lib/advapi32/token/token.c --- trunk/reactos/lib/advapi32/token/token.c 2005-10-28 14:23:48 UTC (rev 18832) +++ trunk/reactos/lib/advapi32/token/token.c 2005-10-28 14:31:38 UTC (rev 18833) @@ -258,7 +258,6 @@ OUT PHANDLE DuplicateTokenHandle) { OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE NewToken; NTSTATUS Status; SECURITY_QUALITY_OF_SERVICE Sqos; @@ -291,7 +290,7 @@ &ObjectAttributes, FALSE, TokenType, - &NewToken); + DuplicateTokenHandle); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); @@ -344,7 +343,7 @@ }; PACL Dacl; ULONG SidLen; - HANDLE hToken; + HANDLE hToken = NULL; NTSTATUS Status, AccessStatus; /* doesn't return gracefully if IsMember is NULL! */ @@ -484,7 +483,7 @@ } Cleanup: - if (hToken != ExistingTokenHandle) + if (hToken != NULL && hToken != ExistingTokenHandle) { NtClose(hToken); }

1 0

[turner] 18832: change to "RELEASE"
by turner＠svn.reactos.com 28 Oct '05

28 Oct '05

change to "RELEASE" Modified: branches/ros-branch-0_2_8/reactos/include/reactos/version.h _____ Modified: branches/ros-branch-0_2_8/reactos/include/reactos/version.h --- branches/ros-branch-0_2_8/reactos/include/reactos/version.h 2005-10-28 13:37:55 UTC (rev 18831) +++ branches/ros-branch-0_2_8/reactos/include/reactos/version.h 2005-10-28 14:23:48 UTC (rev 18832) @@ -22,7 +22,7 @@ #define KERNEL_VERSION_PATCH_LEVEL 8 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ -#define KERNEL_VERSION_BUILD_TYPE L"RC2" +#define KERNEL_VERSION_BUILD_TYPE L"RELEASE" #endif

1 0

[weiden] 18831: forward EncodePointer and DecodePointer to ntdll
by weiden＠svn.reactos.com 28 Oct '05

28 Oct '05

forward EncodePointer and DecodePointer to ntdll Modified: trunk/reactos/lib/kernel32/kernel32.def _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2005-10-28 12:12:33 UTC (rev 18830) +++ trunk/reactos/lib/kernel32/kernel32.def 2005-10-28 13:37:55 UTC (rev 18831) @@ -152,6 +152,7 @@ DebugBreak(a)0=NTDLL.DbgBreakPoint DebugBreakProcess@4 DebugSetProcessKillOnExit@4 +DecodePointer(a)4=NTDLL.RtlDecodePointer DefineDosDeviceA@12 DefineDosDeviceW@12 DelayLoadFailureHook@8 @@ -175,6 +176,7 @@ DosPathToSessionPathW@12 DuplicateConsoleHandle@16 DuplicateHandle@28 +EncodePointer(a)4=NTDLL.RtlEncodePointer EndUpdateResourceA@8 EndUpdateResourceW@8 EnterCriticalSection(a)4=NTDLL.RtlEnterCriticalSection

1 0

[mbosma] 18830: Add Stubs for DirectDrawVideoPort and DDVideoPortContainer.
by mbosma＠svn.reactos.com 28 Oct '05

28 Oct '05

Add Stubs for DirectDrawVideoPort and DDVideoPortContainer. Modified: trunk/reactos/lib/ddraw/ddraw.xml Added: trunk/reactos/lib/ddraw/main/videoport.c _____ Modified: trunk/reactos/lib/ddraw/ddraw.xml --- trunk/reactos/lib/ddraw/ddraw.xml 2005-10-28 12:09:22 UTC (rev 18829) +++ trunk/reactos/lib/ddraw/ddraw.xml 2005-10-28 12:12:33 UTC (rev 18830) @@ -29,6 +29,7 @@ <file>color.c</file> <file>gamma.c</file> <file>palette.c</file> + <file>videoport.c</file> </directory> <directory name="soft"> _____ Added: trunk/reactos/lib/ddraw/main/videoport.c --- trunk/reactos/lib/ddraw/main/videoport.c 2005-10-28 12:09:22 UTC (rev 18829) +++ trunk/reactos/lib/ddraw/main/videoport.c 2005-10-28 12:12:33 UTC (rev 18830) @@ -0,0 +1,182 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: lib/ddraw/main/videoport.c + * PURPOSE: IDirectDrawVideoPort and DDVideoPortContainer Implementation + * PROGRAMMER: Maarten Bosma + * + */ + +#include "rosdraw.h" + + +/************* IDirectDrawVideoPort *************/ + +HRESULT WINAPI +Main_DirectDrawVideoPort_QueryInterface (LPDIRECTDRAWVIDEOPORT iface, REFIID riid, LPVOID* ppvObj) +{ + DX_STUB; +} + +ULONG WINAPI +Main_DirectDrawVideoPort_AddRef (LPDIRECTDRAWVIDEOPORT iface) +{ + DX_STUB; +} + +ULONG WINAPI +Main_DirectDrawVideoPort_Release (LPDIRECTDRAWVIDEOPORT iface) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawVideoPort_Flip (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, DWORD dwFlags) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawVideoPort_GetBandwidthInfo (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpddpfFormat, DWORD dwWidth, + DWORD dwHeight, DWORD dwFlags, LPDDVIDEOPORTBANDWIDTH lpBandwidth) +{ + DX_STUB; +} + +HRESULT WINAPI +Main_DirectDrawVideoPort_GetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_GetInputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpNumFormats, + LPDDPIXELFORMAT lpFormats, DWORD dwFlags) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_GetOutputFormats (LPDIRECTDRAWVIDEOPORT iface, LPDDPIXELFORMAT lpInputFormat, + LPDWORD lpNumFormats, LPDDPIXELFORMAT lpFormats, DWORD dwFlags) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_GetFieldPolarity (LPDIRECTDRAWVIDEOPORT iface, LPBOOL lpbFieldPolarity) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoLine (LPDIRECTDRAWVIDEOPORT This, LPDWORD lpdwLine) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_GetVideoSignalStatus (LPDIRECTDRAWVIDEOPORT iface, LPDWORD lpdwStatus) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_SetColorControls (LPDIRECTDRAWVIDEOPORT iface, LPDDCOLORCONTROL lpColorControl) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_SetTargetSurface (LPDIRECTDRAWVIDEOPORT iface, LPDIRECTDRAWSURFACE lpDDSurface, + DWORD dwFlags) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_StartVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_StopVideo (LPDIRECTDRAWVIDEOPORT iface) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_UpdateVideo (LPDIRECTDRAWVIDEOPORT iface, LPDDVIDEOPORTINFO dwFlags) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DirectDrawVideoPort_WaitForSync (LPDIRECTDRAWVIDEOPORT iface, DWORD dwFlags, DWORD dwLine, + DWORD dwTimeout) +{ + DX_STUB; +} + +/************* IDDVideoPortContainer *************/ + +HRESULT WINAPI Main_DDVideoPortContainer_QueryInterface (LPDDVIDEOPORTCONTAINER iface, REFIID riid, LPVOID* ppvObj) +{ + DX_STUB; +} + +ULONG WINAPI Main_DDVideoPortContainer_AddRef (LPDDVIDEOPORTCONTAINER iface) +{ + DX_STUB; +} + +ULONG WINAPI Main_DDVideoPortContainer_Release (LPDDVIDEOPORTCONTAINER iface) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DDVideoPortContainer_CreateVideoPort (LPDDVIDEOPORTCONTAINER iface, DWORD dwFlags, LPDDVIDEOPORTDESC pPortDesc, + LPDIRECTDRAWVIDEOPORT* DDVideoPort, IUnknown* pUnkOuter) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DDVideoPortContainer_EnumVideoPorts (LPDDVIDEOPORTCONTAINER iface, DWORD dwFlags, LPDDVIDEOPORTCAPS pCaps, LPVOID pContext, + LPDDENUMVIDEOCALLBACK pEnumVideoCallback) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DDVideoPortContainer_GetVideoPortConnectInfo (LPDDVIDEOPORTCONTAINER iface, DWORD PortId, DWORD* pNumEntries, + LPDDVIDEOPORTCONNECT pConnectInfo) +{ + DX_STUB; +} + +HRESULT WINAPI Main_DDVideoPortContainer_QueryVideoPortStatus (LPDDVIDEOPORTCONTAINER iface, DWORD PortId, LPDDVIDEOPORTSTATUS pStatus) +{ + DX_STUB; +} + +IDirectDrawVideoPortVtbl DirectDrawVideoPort_Vtable = +{ + Main_DirectDrawVideoPort_QueryInterface, + Main_DirectDrawVideoPort_AddRef, + Main_DirectDrawVideoPort_Release, + Main_DirectDrawVideoPort_Flip, + Main_DirectDrawVideoPort_GetBandwidthInfo, + Main_DirectDrawVideoPort_GetColorControls, + Main_DirectDrawVideoPort_GetInputFormats, + Main_DirectDrawVideoPort_GetOutputFormats, + Main_DirectDrawVideoPort_GetFieldPolarity, + Main_DirectDrawVideoPort_GetVideoLine, + Main_DirectDrawVideoPort_GetVideoSignalStatus, + Main_DirectDrawVideoPort_SetColorControls, + Main_DirectDrawVideoPort_SetTargetSurface, + Main_DirectDrawVideoPort_StartVideo, + Main_DirectDrawVideoPort_StopVideo, + Main_DirectDrawVideoPort_UpdateVideo, + Main_DirectDrawVideoPort_WaitForSync +}; + +IDDVideoPortContainerVtbl DDVideoPortContainer_Vtable = +{ + Main_DDVideoPortContainer_QueryInterface, + Main_DDVideoPortContainer_AddRef, + Main_DDVideoPortContainer_Release, + Main_DDVideoPortContainer_CreateVideoPort, + Main_DDVideoPortContainer_EnumVideoPorts, + Main_DDVideoPortContainer_GetVideoPortConnectInfo, + Main_DDVideoPortContainer_QueryVideoPortStatus +}; Property changes on: trunk/reactos/lib/ddraw/main/videoport.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
74
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 October 2005