Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 19836: - if the device cannot be opened display information about the parent node
by weiden＠svn.reactos.com 03 Dec '05

03 Dec '05

- if the device cannot be opened display information about the parent node - only administrators can change the status of a device Modified: trunk/reactos/lib/devmgr/En.rc Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/misc.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/resource.h _____ Modified: trunk/reactos/lib/devmgr/En.rc --- trunk/reactos/lib/devmgr/En.rc 2005-12-03 09:09:10 UTC (rev 19835) +++ trunk/reactos/lib/devmgr/En.rc 2005-12-03 11:55:07 UTC (rev 19836) @@ -16,6 +16,7 @@ IDS_DISABLEDEVICE "Do not use this device (disable)" IDS_UNKNOWNDEVICE "Unknown device" IDS_NODRIVERLOADED "No drivers are installed for this device." + IDS_DEVONPARENT "on %1" END STRINGTABLE _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-12-03 09:09:10 UTC (rev 19835) +++ trunk/reactos/lib/devmgr/advprop.c 2005-12-03 11:55:07 UTC (rev 19836) @@ -49,7 +49,10 @@ HDEVINFO DeviceInfoSet; SP_DEVINFO_DATA DeviceInfoData; - HANDLE hMachine; + HDEVINFO CurrentDeviceInfoSet; + SP_DEVINFO_DATA CurrentDeviceInfoData; + DEVINST ParentDevInst; + HMACHINE hMachine; LPCWSTR lpMachineName; HINSTANCE hComCtl32; @@ -62,7 +65,8 @@ BOOL CanDisable : 1; BOOL DeviceEnabled : 1; BOOL DeviceUsageChanged : 1; - BOOL CreatedDevInfoSet : 1; + BOOL CloseDevInst : 1; + BOOL IsAdmin : 1; WCHAR szDevName[255]; WCHAR szTemp[255]; @@ -170,7 +174,7 @@ ApplyGeneralSettings(IN HWND hwndDlg, IN PDEVADVPROP_INFO dap) { - if (dap->DeviceUsageChanged) + if (dap->DeviceUsageChanged && dap->IsAdmin) { DEVENABLEACTION SelectedUsageAction; @@ -217,13 +221,14 @@ HWND hPropSheetDlg; BOOL bFlag; DWORD i; + HDEVINFO DeviceInfoSet = NULL; + PSP_DEVINFO_DATA DeviceInfoData = NULL; hPropSheetDlg = GetParent(hwndDlg); if (ReOpen) { PROPSHEETHEADER psh; - HDEVINFO hOldDevInfo; /* switch to the General page */ PropSheet_SetCurSelByID(hPropSheetDlg, @@ -254,47 +259,57 @@ dap->nDevPropSheets = 0; /* create a new device info set and re-open the device */ - hOldDevInfo = dap->DeviceInfoSet; - dap->DeviceInfoSet = SetupDiCreateDeviceInfoListEx(NULL, - hwndDlg, - dap->lpMachineName, - NULL); - if (dap->DeviceInfoSet != INVALID_HANDLE_VALUE) + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) { - if (SetupDiOpenDeviceInfo(dap->DeviceInfoSet, + SetupDiDestroyDeviceInfoList(dap->CurrentDeviceInfoSet); + } + + dap->ParentDevInst = 0; + dap->CurrentDeviceInfoSet = SetupDiCreateDeviceInfoListEx(NULL, + hwndDlg, + dap->lpMachineName, + NULL); + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + if (SetupDiOpenDeviceInfo(dap->CurrentDeviceInfoSet, dap->szDeviceID, hwndDlg, 0, - &dap->DeviceInfoData)) + &dap->CurrentDeviceInfoData)) { - if (dap->CreatedDevInfoSet) + if (dap->CloseDevInst) { - SetupDiDestroyDeviceInfoList(hOldDevInfo); + SetupDiDestroyDeviceInfoList(dap->DeviceInfoSet); } - dap->CreatedDevInfoSet = TRUE; + dap->CloseDevInst = TRUE; + dap->DeviceInfoSet = dap->CurrentDeviceInfoSet; + dap->DeviceInfoData = dap->CurrentDeviceInfoData; + dap->CurrentDeviceInfoSet = INVALID_HANDLE_VALUE; } else - { - SetupDiDestroyDeviceInfoList(dap->DeviceInfoSet); - dap->DeviceInfoSet = INVALID_HANDLE_VALUE; - dap->CreatedDevInfoSet = FALSE; - } + goto GetParentNode; } else { - /* oops, something went wrong, restore the old device info set */ - dap->DeviceInfoSet = hOldDevInfo; +GetParentNode: + /* get the parent node from the initial devinst */ + CM_Get_Parent_Ex(&dap->ParentDevInst, + dap->DeviceInfoData.DevInst, + 0, + dap->hMachine); + } - if (dap->DeviceInfoSet != INVALID_HANDLE_VALUE) - { - SetupDiOpenDeviceInfo(dap->DeviceInfoSet, - dap->szDeviceID, - hwndDlg, - 0, - &dap->DeviceInfoData); - } + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + DeviceInfoSet = dap->CurrentDeviceInfoSet; + DeviceInfoData = &dap->CurrentDeviceInfoData; } + else + { + DeviceInfoSet = dap->DeviceInfoSet; + DeviceInfoData = &dap->DeviceInfoData; + } /* find out how many new device property sheets to add. fake a PROPSHEETHEADER structure, we don't plan to @@ -303,8 +318,8 @@ psh.dwFlags = 0; psh.nPages = 0; - if (!SetupDiGetClassDevPropertySheets(dap->DeviceInfoSet, - &dap->DeviceInfoData, + if (!SetupDiGetClassDevPropertySheets(DeviceInfoSet, + DeviceInfoData, &psh, 0, &dap->nDevPropSheets, @@ -319,8 +334,8 @@ psh.phpage = dap->DevPropSheets; /* query the new property sheet pages to add */ - if (SetupDiGetClassDevPropertySheets(dap->DeviceInfoSet, - &dap->DeviceInfoData, + if (SetupDiGetClassDevPropertySheets(DeviceInfoSet, + DeviceInfoData, &psh, dap->nDevPropSheets, NULL, @@ -353,10 +368,23 @@ dap->nDevPropSheets = 0; } } + else + { + if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + DeviceInfoSet = dap->CurrentDeviceInfoSet; + DeviceInfoData = &dap->CurrentDeviceInfoData; + } + else + { + DeviceInfoSet = dap->DeviceInfoSet; + DeviceInfoData = &dap->DeviceInfoData; + } + } /* get the device name */ - if (GetDeviceDescriptionString(dap->DeviceInfoSet, - &dap->DeviceInfoData, + if (GetDeviceDescriptionString(DeviceInfoSet, + DeviceInfoData, dap->szDevName, sizeof(dap->szDevName) / sizeof(dap->szDevName[0]))) { @@ -366,7 +394,7 @@ } /* set the device image */ - if (SetupDiLoadClassIcon(&dap->DeviceInfoData.ClassGuid, + if (SetupDiLoadClassIcon(&DeviceInfoData->ClassGuid, &hIcon, NULL)) { @@ -387,7 +415,7 @@ dap->szDevName); /* set the device type edit control text */ - if (GetDeviceTypeString(&dap->DeviceInfoData, + if (GetDeviceTypeString(DeviceInfoData, dap->szTemp, sizeof(dap->szTemp) / sizeof(dap->szTemp[0]))) { @@ -397,8 +425,8 @@ } /* set the device manufacturer edit control text */ - if (GetDeviceManufacturerString(dap->DeviceInfoSet, - &dap->DeviceInfoData, + if (GetDeviceManufacturerString(DeviceInfoSet, + DeviceInfoData, dap->szTemp, sizeof(dap->szTemp) / sizeof(dap->szTemp[0]))) { @@ -408,7 +436,8 @@ } /* set the device location edit control text */ - if (GetDeviceLocationString(dap->DeviceInfoData.DevInst, + if (GetDeviceLocationString(DeviceInfoData->DevInst, + dap->ParentDevInst, dap->szTemp, sizeof(dap->szTemp) / sizeof(dap->szTemp[0]))) { @@ -418,7 +447,7 @@ } /* set the device status edit control text */ - if (GetDeviceStatusString(dap->DeviceInfoData.DevInst, + if (GetDeviceStatusString(DeviceInfoData->DevInst, dap->hMachine, dap->szTemp, sizeof(dap->szTemp) / sizeof(dap->szTemp[0]))) @@ -435,14 +464,14 @@ dap->CanDisable = FALSE; dap->DeviceEnabled = FALSE; - if (CanDisableDevice(dap->DeviceInfoData.DevInst, + if (CanDisableDevice(DeviceInfoData->DevInst, dap->hMachine, &bFlag)) { dap->CanDisable = bFlag; } - if (IsDeviceEnabled(dap->DeviceInfoData.DevInst, + if (IsDeviceEnabled(DeviceInfoData->DevInst, dap->hMachine, &bFlag)) { @@ -452,9 +481,9 @@ /* enable/disable the device usage controls */ EnableWindow(GetDlgItem(hwndDlg, IDC_DEVUSAGELABEL), - dap->CanDisable); + dap->CanDisable && dap->IsAdmin); EnableWindow(hDevUsage, - dap->CanDisable); + dap->CanDisable && dap->IsAdmin); /* clear the combobox */ SendMessage(hDevUsage, @@ -662,7 +691,7 @@ PCREATEPROPERTYSHEETPAGEW pCreatePropertySheetPageW; PDESTROYPROPERTYSHEETPAGE pDestroyPropertySheetPage; PDEVADVPROP_INFO DevAdvPropInfo; - HANDLE hMachine = NULL; + HMACHINE hMachine = NULL; DWORD DevIdSize = 0; INT_PTR Ret = -1; @@ -750,11 +779,16 @@ DevAdvPropInfo->DeviceInfoSet = DeviceInfoSet; DevAdvPropInfo->DeviceInfoData = *DeviceInfoData; + DevAdvPropInfo->CurrentDeviceInfoSet = INVALID_HANDLE_VALUE; + DevAdvPropInfo->CurrentDeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + DevAdvPropInfo->hMachine = hMachine; DevAdvPropInfo->lpMachineName = lpMachineName; DevAdvPropInfo->szDevName[0] = L'\0'; DevAdvPropInfo->hComCtl32 = hComCtl32; + DevAdvPropInfo->IsAdmin = IsUserAdmin(); + psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPTITLE | PSH_NOAPPLYNOW; psh.hwndParent = hWndParent; @@ -860,12 +894,17 @@ DevAdvPropInfo->DevPropSheets); } - if (DevAdvPropInfo->CreatedDevInfoSet) + if (DevAdvPropInfo->CloseDevInst) { /* close the device info set in case a new one was created */ SetupDiDestroyDeviceInfoList(DevAdvPropInfo->DeviceInfoSet); } + if (DevAdvPropInfo->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) + { + SetupDiDestroyDeviceInfoList(DevAdvPropInfo->CurrentDeviceInfoSet); + } + HeapFree(GetProcessHeap(), 0, DevAdvPropInfo); _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-12-03 09:09:10 UTC (rev 19835) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-12-03 11:55:07 UTC (rev 19836) @@ -182,6 +182,7 @@ /* get the location string */ if (GetDeviceLocationString(HwDevInfo->DevInfoData.DevInst, + 0, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) && LoadAndFormatString(hDllInstance, _____ Modified: trunk/reactos/lib/devmgr/misc.c --- trunk/reactos/lib/devmgr/misc.c 2005-12-03 09:09:10 UTC (rev 19835) +++ trunk/reactos/lib/devmgr/misc.c 2005-12-03 11:55:07 UTC (rev 19836) @@ -311,64 +311,89 @@ BOOL -GetDeviceLocationString(IN DEVINST dnDevInst, +GetDeviceLocationString(IN DEVINST dnDevInst OPTIONAL, + IN DEVINST dnParentDevInst OPTIONAL, OUT LPWSTR szBuffer, IN DWORD BufferSize) { DWORD RegDataType; ULONG DataSize; CONFIGRET cRet; + LPWSTR szFormatted; BOOL Ret = FALSE; DataSize = BufferSize * sizeof(WCHAR); - cRet = CM_Get_DevNode_Registry_Property(dnDevInst, - CM_DRP_LOCATION_INFORMATION, - &RegDataType, - szBuffer, - &DataSize, - 0); - if (cRet != CR_SUCCESS || - RegDataType != REG_SZ) + szBuffer[0] = L'\0'; + if (dnParentDevInst != 0) { - szBuffer[0] = L'\0'; - if (LoadString(hDllInstance, - IDS_UNKNOWN, - szBuffer, - BufferSize)) + /* query the parent node name */ + if (CM_Get_DevNode_Registry_Property(dnParentDevInst, + CM_DRP_DEVICEDESC, + &RegDataType, + szBuffer, + &DataSize, + 0) == CR_SUCCESS && + RegDataType == REG_SZ && + LoadAndFormatString(hDllInstance, + IDS_DEVONPARENT, + &szFormatted, + szBuffer) != 0) { + wcsncpy(szBuffer, + szFormatted, + BufferSize - 1); + szBuffer[BufferSize - 1] = L'\0'; + LocalFree((HLOCAL)szFormatted); Ret = TRUE; } } - else + else if (dnDevInst != 0) { - /* FIXME - check string for NULL termination! */ - Ret = TRUE; - } + cRet = CM_Get_DevNode_Registry_Property(dnDevInst, + CM_DRP_LOCATION_INFORMATION, + &RegDataType, + szBuffer, + &DataSize, + 0); + if (cRet == CR_SUCCESS && RegDataType == REG_SZ) + { + /* FIXME - check string for NULL termination! */ + Ret = TRUE; + } - if (szBuffer[0] >= L'0' && szBuffer[0] <= L'9') - { - /* convert the string to an integer value and create a - formatted string */ - LPWSTR szFormatted; - ULONG ulLocation = (ULONG)wcstoul(szBuffer, - NULL, - 10); - if (LoadAndFormatString(hDllInstance, - IDS_LOCATIONSTR, - &szFormatted, - ulLocation, - szBuffer) != 0) + if (Ret && szBuffer[0] >= L'0' && szBuffer[0] <= L'9') { - wcsncpy(szBuffer, - szFormatted, - BufferSize - 1); - szBuffer[BufferSize - 1] = L'\0'; - LocalFree((HLOCAL)szFormatted); + /* convert the string to an integer value and create a + formatted string */ + ULONG ulLocation = (ULONG)wcstoul(szBuffer, + NULL, + 10); + if (LoadAndFormatString(hDllInstance, + IDS_LOCATIONSTR, + &szFormatted, + ulLocation, + szBuffer) != 0) + { + wcsncpy(szBuffer, + szFormatted, + BufferSize - 1); + szBuffer[BufferSize - 1] = L'\0'; + LocalFree((HLOCAL)szFormatted); + } + else + Ret = FALSE; } - else - Ret = FALSE; } + if (!Ret && + LoadString(hDllInstance, + IDS_UNKNOWN, + szBuffer, + BufferSize)) + { + Ret = TRUE; + } + return Ret; } @@ -430,7 +455,7 @@ BOOL GetDeviceStatusString(IN DEVINST DevInst, - IN HANDLE hMachine, + IN HMACHINE hMachine, OUT LPWSTR szBuffer, IN DWORD BufferSize) { @@ -514,7 +539,7 @@ BOOL IsDeviceHidden(IN DEVINST DevInst, - IN HANDLE hMachine, + IN HMACHINE hMachine, OUT BOOL *IsHidden) { CONFIGRET cr; @@ -538,7 +563,7 @@ BOOL CanDisableDevice(IN DEVINST DevInst, - IN HANDLE hMachine, + IN HMACHINE hMachine, OUT BOOL *CanDisable) { CONFIGRET cr; @@ -562,7 +587,7 @@ BOOL IsDeviceEnabled(IN DEVINST DevInst, - IN HANDLE hMachine, + IN HMACHINE hMachine, OUT BOOL *IsEnabled) { CONFIGRET cr; _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-12-03 09:09:10 UTC (rev 19835) +++ trunk/reactos/lib/devmgr/precomp.h 2005-12-03 11:55:07 UTC (rev 19836) @@ -222,29 +222,30 @@ IN DWORD BufferSize); BOOL -GetDeviceLocationString(IN DEVINST dnDevInst, +GetDeviceLocationString(IN DEVINST dnDevInst OPTIONAL, + IN DEVINST dnParentDevInst OPTIONAL, OUT LPWSTR szBuffer, IN DWORD BufferSize); BOOL GetDeviceStatusString(IN DEVINST DevInst, - IN HANDLE hMachine, + IN HMACHINE hMachine, OUT LPWSTR szBuffer, IN DWORD BufferSize); BOOL IsDeviceHidden(IN DEVINST DevInst, - IN HANDLE hMachine, + IN HMACHINE hMachine, OUT BOOL *IsHidden); BOOL CanDisableDevice(IN DEVINST DevInst, - IN HANDLE hMachine, + IN HMACHINE hMachine, OUT BOOL *CanDisable); BOOL IsDeviceEnabled(IN DEVINST DevInst, - IN HANDLE hMachine, + IN HMACHINE hMachine, OUT BOOL *IsEnabled); BOOL _____ Modified: trunk/reactos/lib/devmgr/resource.h --- trunk/reactos/lib/devmgr/resource.h 2005-12-03 09:09:10 UTC (rev 19835) +++ trunk/reactos/lib/devmgr/resource.h 2005-12-03 11:55:07 UTC (rev 19836) @@ -37,6 +37,7 @@ #define IDS_DISABLEDEVICE 0x109 #define IDS_UNKNOWNDEVICE 0x10A #define IDS_NODRIVERLOADED 0x10B +#define IDS_DEVONPARENT 0x10C #define IDS_DEV_NO_PROBLEM 0x200 #define IDS_DEV_NOT_CONFIGURED 0x201

1 0

[greatlrd] 19835: Correct some prototypes and struct, Adding some missing struct for d3d Thx Alex Ionescu for his patch for it.
by greatlrd＠svn.reactos.com 03 Dec '05

03 Dec '05

Correct some prototypes and struct, Adding some missing struct for d3d Thx Alex Ionescu for his patch for it. Modified: trunk/reactos/include/win32k/ntddraw.h Modified: trunk/reactos/subsys/win32k/include/intddraw.h Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c Modified: trunk/reactos/w32api/include/ddk/d3dnthal.h _____ Modified: trunk/reactos/include/win32k/ntddraw.h --- trunk/reactos/include/win32k/ntddraw.h 2005-12-02 22:50:23 UTC (rev 19834) +++ trunk/reactos/include/win32k/ntddraw.h 2005-12-03 09:09:10 UTC (rev 19835) @@ -10,11 +10,13 @@ HANDLE hDirectDrawLocal, HANDLE hSurfColor, HANDLE hSurfZ, - PD3DNTHAL_CONTEXTCREATEDATA pdcci + /* Is msdn wrong on D3DNTHAL_CONTEXTCREATEDATA ?? */ + D3DNTHAL_CONTEXTCREATEDATA *pdcci ); + DWORD STDCALL NtGdiD3dContextDestroy( - PD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData + LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData ); DWORD STDCALL NtGdiD3dContextDestroyAll(VOID); @@ -22,15 +24,16 @@ DWORD STDCALL NtGdiD3dDrawPrimitives2( HANDLE hCmdBuf, HANDLE hVBuf, - PD3DNTHAL_DRAWPRIMITIVES2DATA pded, + LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, FLATPTR *pfpVidMemCmd, DWORD *pdwSizeCmd, FLATPTR *pfpVidMemVtx, DWORD *pdwSizeVtx + ); DWORD STDCALL NtGdiD3dValidateTextureStageState( - PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData + LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData ); DWORD STDCALL NtGdiDdAddAttachedSurface( @@ -233,8 +236,8 @@ HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo, DWORD *pCallBackFlags, - PD3DNTHAL_CALLBACKS puD3dCallbacks, - PD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, + LPD3DNTHAL_CALLBACKS puD3dCallbacks, + LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, LPDDSURFACEDESC puD3dTextureFormats, DWORD *puNumHeaps, _____ Modified: trunk/reactos/subsys/win32k/include/intddraw.h --- trunk/reactos/subsys/win32k/include/intddraw.h 2005-12-02 22:50:23 UTC (rev 19834) +++ trunk/reactos/subsys/win32k/include/intddraw.h 2005-12-03 09:09:10 UTC (rev 19835) @@ -1,6 +1,8 @@ #ifndef _INT_W32k_DDRAW #define _INT_W32k_DDRAW +#include <ddkernel.h> + #define GDI_OBJECT_TYPE_DIRECTDRAW 0x00600000 #define GDI_OBJECT_TYPE_DD_SURFACE 0x00610000 #define GDI_OBJECT_TYPE_DD_VIDEOPORT 0x00620000 @@ -8,8 +10,6 @@ #define GDI_OBJECT_TYPE_DD_CLIPPER 0x00640000 #define GDI_OBJECT_TYPE_DD_MOTIONCOMP 0x00650000 - - typedef struct { DD_SURFACE_LOCAL Local; @@ -49,7 +49,7 @@ // D3DHAL_D3DEXTENDEDCAPS D3dHal3Ext; // Heap Callback - DD_GETHEAPALIGNMENTDATA HeapData; + PDD_GETHEAPALIGNMENTDATA HeapData; // Kernel Callback DD_KERNELCALLBACKS Kernel; _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-02 22:50:23 UTC (rev 19834) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-03 09:09:10 UTC (rev 19835) @@ -116,8 +116,8 @@ HANDLE hDirectDrawLocal, DD_HALINFO *pHalInfo, DWORD *pCallBackFlags, - PD3DNTHAL_CALLBACKS puD3dCallbacks, - PD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, + LPD3DNTHAL_CALLBACKS puD3dCallbacks, + LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, LPDDSURFACEDESC puD3dTextureFormats, DWORD *puNumHeaps, _____ Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c --- trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-12-02 22:50:23 UTC (rev 19834) +++ trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-12-03 09:09:10 UTC (rev 19835) @@ -20,7 +20,7 @@ HANDLE hDirectDrawLocal, HANDLE hSurfColor, HANDLE hSurfZ, - PD3DNTHAL_CONTEXTCREATEDATA pdcci + D3DNTHAL_CONTEXTCREATEDATA *pdcci ) { UNIMPLEMENTED @@ -29,7 +29,7 @@ } DWORD STDCALL NtGdiD3dContextDestroy( - PD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData + LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData ) { UNIMPLEMENTED @@ -46,9 +46,9 @@ } DWORD STDCALL NtGdiD3dDrawPrimitives2( - HANDLE hCmdBuf, + HANDLE hCmdBuf, HANDLE hVBuf, - PD3DNTHAL_DRAWPRIMITIVES2DATA pded, + LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, FLATPTR *pfpVidMemCmd, DWORD *pdwSizeCmd, FLATPTR *pfpVidMemVtx, @@ -61,7 +61,7 @@ } DWORD STDCALL NtGdiD3dValidateTextureStageState( - PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData + LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData ) { UNIMPLEMENTED _____ Modified: trunk/reactos/w32api/include/ddk/d3dnthal.h --- trunk/reactos/w32api/include/ddk/d3dnthal.h 2005-12-02 22:50:23 UTC (rev 19834) +++ trunk/reactos/w32api/include/ddk/d3dnthal.h 2005-12-03 09:09:10 UTC (rev 19835) @@ -20,26 +20,89 @@ DEFINE_GUID(GUID_ZPixelFormats, 0x93869880, 0x36CF, 0x11D1, 0x9B, 0x1B, 0x00, 0xAA, 0x00, 0xBB, 0xB8, 0xAE); DEFINE_GUID(GUID_DDStereoMode, 0xF828169C, 0xA8E8, 0x11D2, 0xA1, 0xF2, 0x00, 0xA0, 0xC9, 0x83, 0xEA, 0xF6); -typedef struct _D3DNTHAL_CONTEXTCREATEDATA *PD3DNTHAL_CONTEXTCREATEDATA; -typedef struct _D3DNTHAL_CONTEXTDESTROYDATA *PD3DNTHAL_CONTEXTDESTROYDATA; -typedef struct _D3DNTHAL_DRAWPRIMITIVES2DATA *PD3DNTHAL_DRAWPRIMITIVES2DATA; -typedef struct _D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA *PD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA; +typedef struct _D3DNTHAL_CONTEXTCREATEDATA +{ + union + { + PDD_DIRECTDRAW_GLOBAL lpDDGbl; + PDD_DIRECTDRAW_LOCAL lpDDLcl; + }; + union + { + PDD_SURFACE_LOCAL lpDDS; + PDD_SURFACE_LOCAL lpDDSLcl; + }; + union + { + PDD_SURFACE_LOCAL lpDDSZ; + PDD_SURFACE_LOCAL lpDDSZLcl; + }; + DWORD dwPID; + ULONG_PTR dwhContext; + HRESULT ddrval; +} D3DNTHAL_CONTEXTCREATEDATA, *LPD3DNTHAL_CONTEXTCREATEDATA; -/* DIRECT3D object callbacks */ -typedef DWORD (STDCALL *PD3DNTHAL_CONTEXTCREATECB)(PD3DNTHAL_CONTEXTCREATEDATA); -typedef DWORD (STDCALL *PD3DNTHAL_CONTEXTDESTROYCB)(PD3DNTHAL_CONTEXTDESTROYDATA); +typedef struct _D3DNTHAL_CONTEXTDESTROYDATA +{ + ULONG_PTR dwhContext; + HRESULT ddrval; +} D3DNTHAL_CONTEXTDESTROYDATA, *LPD3DNTHAL_CONTEXTDESTROYDATA; -typedef struct _D3DNTHAL_CALLBACKS { - DWORD dwSize; - PD3DNTHAL_CONTEXTCREATECB ContextCreate; - PD3DNTHAL_CONTEXTDESTROYCB ContextDestroy; - PVOID Reserved[32]; -} D3DNTHAL_CALLBACKS; -typedef D3DNTHAL_CALLBACKS *PD3DNTHAL_CALLBACKS; +typedef struct _D3DNTHAL_CONTEXTDESTROYALLDATA +{ + DWORD dwPID; + HRESULT ddrval; +} D3DNTHAL_CONTEXTDESTROYALLDATA, *LPD3DNTHAL_CONTEXTDESTROYALLDATA; -/* Structures to report driver capabilities */ +typedef struct _D3DNTHAL_SCENECAPTUREDATA +{ + ULONG_PTR dwhContext; + DWORD dwFlag; + HRESULT ddrval; +} D3DNTHAL_SCENECAPTUREDATA, *LPD3DNTHAL_SCENECAPTUREDATA; -typedef struct _D3DNTHAL_DEVICEDESC { +typedef struct _D3DNTHAL_TEXTURECREATEDATA +{ + ULONG_PTR dwhContext; + HANDLE hDDS; + ULONG_PTR dwHandle; + HRESULT ddrval; +} D3DNTHAL_TEXTURECREATEDATA, *LPD3DNTHAL_TEXTURECREATEDATA; + +typedef struct _D3DNTHAL_TEXTUREDESTROYDATA +{ + ULONG_PTR dwhContext; + ULONG_PTR dwHandle; + HRESULT ddrval; +} D3DNTHAL_TEXTUREDESTROYDATA, *LPD3DNTHAL_TEXTUREDESTROYDATA; + +typedef struct _D3DNTHAL_TEXTURESWAPDATA +{ + ULONG_PTR dwhContext; + ULONG_PTR dwHandle1; + ULONG_PTR dwHandle2; + HRESULT ddrval; +} D3DNTHAL_TEXTURESWAPDATA, *LPD3DNTHAL_TEXTURESWAPDATA; + +typedef struct _D3DNTHAL_TEXTUREGETSURFDATA +{ + ULONG_PTR dwhContext; + HANDLE hDDS; + ULONG_PTR dwHandle; + HRESULT ddrval; +} D3DNTHAL_TEXTUREGETSURFDATA, *LPD3DNTHAL_TEXTUREGETSURFDATA; + +typedef DWORD (APIENTRY *LPD3DNTHAL_CONTEXTCREATECB)(LPD3DNTHAL_CONTEXTCREATEDATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_CONTEXTDESTROYCB)(LPD3DNTHAL_CONTEXTDESTROYDATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_CONTEXTDESTROYALLCB)(LPD3DNTHAL_CONTEXTDESTROYALLDATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_SCENECAPTURECB)(LPD3DNTHAL_SCENECAPTUREDATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_TEXTURECREATECB)(LPD3DNTHAL_TEXTURECREATEDATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_TEXTUREDESTROYCB)(LPD3DNTHAL_TEXTUREDESTROYDATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_TEXTURESWAPCB)(LPD3DNTHAL_TEXTURESWAPDATA); +typedef DWORD (APIENTRY *LPD3DNTHAL_TEXTUREGETSURFCB)(LPD3DNTHAL_TEXTUREGETSURFDATA); + +typedef struct _D3DNTHALDeviceDesc_V1 +{ DWORD dwSize; DWORD dwFlags; D3DCOLORMODEL dcmColorModel; @@ -53,18 +116,92 @@ DWORD dwDeviceZBufferBitDepth; DWORD dwMaxBufferSize; DWORD dwMaxVertexCount; -} D3DNTHAL_DEVICEDESC, *PD3DNT_HALDEVICEDESC; +} D3DNTHALDEVICEDESC_V1, *LPD3DNTHALDEVICEDESC_V1; -typedef struct _D3DNTHAL_GLOBALDRIVERDATA { +typedef struct _D3DNTHAL_GLOBALDRIVERDATA +{ DWORD dwSize; - D3DNTHAL_DEVICEDESC hwCaps; + D3DNTHALDEVICEDESC_V1 hwCaps; DWORD dwNumVertices; DWORD dwNumClipVertices; DWORD dwNumTextureFormats; LPDDSURFACEDESC lpTextureFormats; -} D3DNTHAL_GLOBALDRIVERDATA, *PD3DNTHAL_GLOBALDRIVERDATA; +} D3DNTHAL_GLOBALDRIVERDATA, *LPD3DNTHAL_GLOBALDRIVERDATA; +typedef struct _D3DNTHAL_CALLBACKS +{ + DWORD dwSize; + LPD3DNTHAL_CONTEXTCREATECB ContextCreate; + LPD3DNTHAL_CONTEXTDESTROYCB ContextDestroy; + LPD3DNTHAL_CONTEXTDESTROYALLCB ContextDestroyAll; + LPD3DNTHAL_SCENECAPTURECB SceneCapture; + LPVOID dwReserved10; + LPVOID dwReserved11; + LPVOID dwReserved22; + LPVOID dwReserved23; + ULONG_PTR dwReserved; + LPD3DNTHAL_TEXTURECREATECB TextureCreate; + LPD3DNTHAL_TEXTUREDESTROYCB TextureDestroy; + LPD3DNTHAL_TEXTURESWAPCB TextureSwap; + LPD3DNTHAL_TEXTUREGETSURFCB TextureGetSurf; + LPVOID dwReserved12; + LPVOID dwReserved13; + LPVOID dwReserved14; + LPVOID dwReserved15; + LPVOID dwReserved16; + LPVOID dwReserved17; + LPVOID dwReserved18; + LPVOID dwReserved19; + LPVOID dwReserved20; + LPVOID dwReserved21; + LPVOID dwReserved24; + ULONG_PTR dwReserved0; + ULONG_PTR dwReserved1; + ULONG_PTR dwReserved2; + ULONG_PTR dwReserved3; + ULONG_PTR dwReserved4; + ULONG_PTR dwReserved5; + ULONG_PTR dwReserved6; + ULONG_PTR dwReserved7; + ULONG_PTR dwReserved8; + ULONG_PTR dwReserved9; +} D3DNTHAL_CALLBACKS, *LPD3DNTHAL_CALLBACKS; +typedef struct _D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA +{ + ULONG_PTR dwhContext; + DWORD dwFlags; + ULONG_PTR dwReserved; + DWORD dwNumPasses; + HRESULT ddrval; +} D3DNTHAL_VALIDATETEXTURESTAGESTATEDATA, FAR *LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA; + +typedef struct _D3DNTHAL_DRAWPRIMITIVES2DATA +{ + ULONG_PTR dwhContext; + DWORD dwFlags; + DWORD dwVertexType; + PDD_SURFACE_LOCAL lpDDCommands; + DWORD dwCommandOffset; + DWORD dwCommandLength; + union + { + PDD_SURFACE_LOCAL lpDDVertex; + LPVOID lpVertices; + }; + DWORD dwVertexOffset; + DWORD dwVertexLength; + DWORD dwReqVertexBufSize; + DWORD dwReqCommandBufSize; + LPDWORD lpdwRStates; + union + { + DWORD dwVertexSize; + HRESULT ddrval; + }; + DWORD dwErrorOffset; +} D3DNTHAL_DRAWPRIMITIVES2DATA, FAR *LPD3DNTHAL_DRAWPRIMITIVES2DATA; + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

[sgasiorek] 19834: imported newer version of DIALOG_DoDialogBox and DEFDLG_RestoreFocus from Wine
by sgasiorek＠svn.reactos.com 02 Dec '05

02 Dec '05

imported newer version of DIALOG_DoDialogBox and DEFDLG_RestoreFocus from Wine Modified: trunk/reactos/lib/user32/windows/dialog.c _____ Modified: trunk/reactos/lib/user32/windows/dialog.c --- trunk/reactos/lib/user32/windows/dialog.c 2005-12-02 22:14:03 UTC (rev 19833) +++ trunk/reactos/lib/user32/windows/dialog.c 2005-12-02 22:50:23 UTC (rev 19834) @@ -502,23 +502,30 @@ MSG msg; INT retval; HWND ownerMsg = GetAncestor( owner, GA_ROOT ); + BOOL bFirstEmpty; + if (!(dlgInfo = GETDLGINFO(hwnd))) return -1; + bFirstEmpty = TRUE; if (!(dlgInfo->flags & DF_END)) /* was EndDialog called in WM_INITDIALOG ? */ { - ShowWindow( hwnd, SW_SHOW ); for (;;) { - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) + if (!PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) { - if (!PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + if (bFirstEmpty) { + /* ShowWindow the first time the queue goes empty */ + ShowWindow( hwnd, SW_SHOWNORMAL ); + bFirstEmpty = FALSE; + } + if (!(GetWindowLongW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) + { /* No message present -> send ENTERIDLE and wait */ SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); - if (!GetMessageW( &msg, 0, 0, 0 )) break; } + if (!GetMessageW( &msg, 0, 0, 0 )) break; } - else if (!GetMessageW( &msg, 0, 0, 0 )) break; if (!IsWindow( hwnd )) return -1; if (!(dlgInfo->flags & DF_END) && !IsDialogMessageW( hwnd, &msg)) @@ -889,13 +896,16 @@ if (IsIconic( hwnd )) return; if (!(infoPtr = GETDLGINFO(hwnd))) return; - if (!IsWindow( infoPtr->hwndFocus )) return; /* Don't set the focus back to controls if EndDialog is already called.*/ - if (!(infoPtr->flags & DF_END)) - { - DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); - return; + if (infoPtr->flags & DF_END) return; + if (!IsWindow(infoPtr->hwndFocus) || infoPtr->hwndFocus == hwnd) { + /* If no saved focus control exists, set focus to the first visible, + non-disabled, WS_TABSTOP control in the dialog */ + infoPtr->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE ); + if (!IsWindow( infoPtr->hwndFocus )) return; } + DEFDLG_SetFocus( hwnd, infoPtr->hwndFocus ); + /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, sometimes losing focus when receiving WM_SETFOCUS messages. */ }

1 0

[sgasiorek] 19833: fixes for GetDlgItemTextA, GetDlgItemTextW and DIALOG_CreateIndirect from Wine 0.9.2
by sgasiorek＠svn.reactos.com 02 Dec '05

02 Dec '05

fixes for GetDlgItemTextA, GetDlgItemTextW and DIALOG_CreateIndirect from Wine 0.9.2 user32 dialog test failures decreased to 7 Modified: trunk/reactos/lib/user32/windows/dialog.c _____ Modified: trunk/reactos/lib/user32/windows/dialog.c --- trunk/reactos/lib/user32/windows/dialog.c 2005-12-02 22:01:52 UTC (rev 19832) +++ trunk/reactos/lib/user32/windows/dialog.c 2005-12-02 22:14:03 UTC (rev 19833) @@ -825,7 +825,8 @@ { /* Send initialisation messages and set focus */ - if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param )) + if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ) && + ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) { /* By returning TRUE, app has requested a default focus assignment */ dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE); @@ -1911,6 +1912,7 @@ LPSTR lpString, int nMaxCount) { + if (lpString && (lpString > 0)) lpString[0] = '\0'; return (UINT)SendDlgItemMessageA( hDlg, nIDDlgItem, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); } @@ -1926,6 +1928,7 @@ LPWSTR lpString, int nMaxCount) { + if (lpString && (lpString > 0)) lpString[0] = '\0'; return (UINT)SendDlgItemMessageW( hDlg, nIDDlgItem, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); }

1 0

[greatlrd] 19832: Corretat en översätting miss upptäckes av harteex program files till program
by greatlrd＠svn.reactos.com 02 Dec '05

02 Dec '05

Corretat en översätting miss upptäckes av harteex program files till program Modified: trunk/reactos/lib/userenv/Sv.rc _____ Modified: trunk/reactos/lib/userenv/Sv.rc --- trunk/reactos/lib/userenv/Sv.rc 2005-12-02 21:33:33 UTC (rev 19831) +++ trunk/reactos/lib/userenv/Sv.rc 2005-12-02 22:01:52 UTC (rev 19832) @@ -43,5 +43,5 @@ IDS_CACHE "Lokala instõllningar\\Temporary Internet Files" IDS_HISTORY "Lokala instõllningar\\Tidigare" IDS_COOKIES "Cookies" - IDS_PROGRAMFILES "%SystemDrive%\\Program files" + IDS_PROGRAMFILES "%SystemDrive%\\Program" END

1 0

[sgasiorek] 19831: Imported from Wine 0.9.2:
by sgasiorek＠svn.reactos.com 02 Dec '05

02 Dec '05

Imported from Wine 0.9.2: DIALOG_GetNextTabItem GetNextDlgGroupItem GetNextDlgTabItem fixes user32 dialog test hang and decreases number of failure tests to 9 Modified: trunk/reactos/lib/user32/windows/dialog.c _____ Modified: trunk/reactos/lib/user32/windows/dialog.c --- trunk/reactos/lib/user32/windows/dialog.c 2005-12-02 20:06:02 UTC (rev 19830) +++ trunk/reactos/lib/user32/windows/dialog.c 2005-12-02 21:33:33 UTC (rev 19831) @@ -1094,44 +1094,30 @@ if(!hChildFirst) { if(GetParent(hwndCtrl) != hwndMain) + /* i.e. if we are not at the top level of the recursion */ hChildFirst = GetWindow(GetParent(hwndCtrl),wndSearch); else - { - if(fPrevious) - hChildFirst = GetWindow(hwndCtrl,GW_HWNDLAST); - else - hChildFirst = GetWindow(hwndCtrl,GW_HWNDFIRST); - } + hChildFirst = GetWindow(hwndCtrl, fPrevious ? GW_HWNDLAST : GW_HWNDFIRST); } } while(hChildFirst) { - BOOL bCtrl = FALSE; - while(hChildFirst) + dsStyle = GetWindowLongA(hChildFirst,GWL_STYLE); + exStyle = GetWindowLongA(hChildFirst,GWL_EXSTYLE); + if( (exStyle & WS_EX_CONTROLPARENT) && (dsStyle & WS_VISIBLE) && !(dsStyle & WS_DISABLED)) { - dsStyle = GetWindowLongA(hChildFirst,GWL_STYLE); - exStyle = GetWindowLongA(hChildFirst,GWL_EXSTYLE); - if( (dsStyle & DS_CONTROL || exStyle & WS_EX_CONTROLPARENT) && (dsStyle & WS_VISIBLE) && !(dsStyle & WS_DISABLED)) - { - bCtrl=TRUE; - break; - } - else if( (dsStyle & WS_TABSTOP) && (dsStyle & WS_VISIBLE) && !(dsStyle & WS_DISABLED)) - break; - hChildFirst = GetWindow(hChildFirst,wndSearch); + HWND retWnd; + retWnd = DIALOG_GetNextTabItem(hwndMain,hChildFirst,NULL,fPrevious ); + if (retWnd) return (retWnd); } - if(hChildFirst) + else if( (dsStyle & WS_TABSTOP) && (dsStyle & WS_VISIBLE) && !(dsStyle & WS_DISABLED)) { - if(bCtrl) - retWnd = DIALOG_GetNextTabItem(hwndMain,hChildFirst,NULL,fPrevious ); - else - retWnd = hChildFirst; + return (hChildFirst); } - if(retWnd) break; hChildFirst = GetWindow(hChildFirst,wndSearch); } - if(!retWnd && hwndCtrl) + if(hwndCtrl) { HWND hParent = GetParent(hwndCtrl); while(hParent) @@ -1144,7 +1130,8 @@ if(!retWnd) retWnd = DIALOG_GetNextTabItem(hwndMain,hwndMain,NULL,fPrevious ); } - return retWnd; + return retWnd ? retWnd : hwndCtrl; + } /********************************************************************** @@ -1942,7 +1929,6 @@ return (UINT)SendDlgItemMessageW( hDlg, nIDDlgItem, WM_GETTEXT, nMaxCount, (LPARAM)lpString ); } - /* * @implemented */ @@ -1953,54 +1939,110 @@ HWND hCtl, BOOL bPrevious) { - HWND hwnd, retvalue; + HWND hwnd, hwndNext, retvalue, hwndLastGroup = 0; + BOOL fLooped=FALSE; + BOOL fSkipping=FALSE; - if(hCtl) - { + if (hDlg == hCtl) hCtl = NULL; + if (!hCtl && bPrevious) return 0; + /* if the hwndCtrl is the child of the control in the hwndDlg, * then the hwndDlg has to be the parent of the hwndCtrl */ - if(GetParent(hCtl) != hDlg && GetParent(GetParent(hCtl)) == hDlg) - hDlg = GetParent(hCtl); - } if (hCtl) { + if (!IsChild (hDlg, hCtl)) return 0; /* Make sure hwndCtrl is a top-level child */ - HWND parent = GetParent( hCtl ); - while (parent && parent != hDlg) parent = GetParent(parent); - if (parent != hDlg) return 0; + } else { /* No ctrl specified -> start from the beginning */ if (!(hCtl = GetWindow( hDlg, GW_CHILD ))) return 0; - if (bPrevious) hCtl = GetWindow( hCtl, GW_HWNDLAST ); + /* MSDN is wrong. fPrevious does not result in the last child */ + + /* No ctrl specified -> start from the beginning */ + if (!(hCtl = GetWindow( hDlg, GW_CHILD ))) return 0; + + /* MSDN is wrong. fPrevious does not result in the last child */ + + /* Maybe that first one is valid. If so then we don't want to skip it*/ + if ((GetWindowLongW( hCtl, GWL_STYLE ) & (WS_VISIBLE|WS_DISABLED)) == WS_VISIBLE) + { + return hCtl; + } + } + /* Always go forward around the group and list of controls; for the + * previous control keep track; for the next break when you find one + */ retvalue = hCtl; - hwnd = GetWindow( hCtl, GW_HWNDNEXT ); - while (1) + hwnd = hCtl; + while (hwndNext = GetWindow (hwnd, GW_HWNDNEXT), + 1) { - if (!hwnd || (GetWindowLongW( hwnd, GWL_STYLE ) & WS_GROUP)) + while (!hwndNext) { - /* Wrap-around to the beginning of the group */ - HWND tmp; + /* Climb out until there is a next sibling of the ancestor or we + * reach the top (in which case we loop back to the start) + */ + if (hDlg == GetParent (hwnd)) + { + /* Wrap around to the beginning of the list, within the same + * group. (Once only) + */ + if (fLooped) goto end; + fLooped = TRUE; + hwndNext = GetWindow (hDlg, GW_CHILD); + } + else + { + hwnd = GetParent (hwnd); + hwndNext = GetWindow (hwnd, GW_HWNDNEXT); + } + } + hwnd = hwndNext; - hwnd = GetWindow( hDlg, GW_CHILD ); - for (tmp = hwnd; tmp; tmp = GetWindow( tmp, GW_HWNDNEXT ) ) + /* Wander down the leading edge of controlparents */ + while ( (GetWindowLongW (hwnd, GWL_EXSTYLE) & WS_EX_CONTROLPARENT) && + ((GetWindowLongW (hwnd, GWL_STYLE) & (WS_VISIBLE | WS_DISABLED)) == WS_VISIBLE) && + (hwndNext = GetWindow (hwnd, GW_CHILD))) + hwnd = hwndNext; + /* Question. If the control is a control parent but either has no + * children or is not visible/enabled then if it has a WS_GROUP does + * it count? For that matter does it count anyway? + * I believe it doesn't count. + */ + + if ((GetWindowLongW (hwnd, GWL_STYLE) & WS_GROUP)) + { + hwndLastGroup = hwnd; + if (!fSkipping) { - if (GetWindowLongW( tmp, GWL_STYLE ) & WS_GROUP) hwnd = tmp; - if (tmp == hCtl) break; + /* Look for the beginning of the group */ + fSkipping = TRUE; } } - if (hwnd == hCtl) break; - if ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_VISIBLE|WS_DISABLED)) == WS_VISIBLE) + + if (hwnd == hCtl) { + if (!fSkipping) break; + if (hwndLastGroup == hwnd) break; + hwnd = hwndLastGroup; + fSkipping = FALSE; + fLooped = FALSE; + } + + if (!fSkipping && + (GetWindowLongW (hwnd, GWL_STYLE) & (WS_VISIBLE|WS_DISABLED)) == + WS_VISIBLE) + { retvalue = hwnd; if (!bPrevious) break; } - hwnd = GetWindow( hwnd, GW_HWNDNEXT ); } +end: return retvalue; } @@ -2015,9 +2057,19 @@ HWND hCtl, BOOL bPrevious) { + /* Undocumented but tested under Win2000 and WinME */ + if (hDlg == hCtl) hCtl = NULL; + + /* Contrary to MSDN documentation, tested under Win2000 and WinME + * NB GetLastError returns whatever was set before the function was + * called. + */ + if (!hCtl && bPrevious) return 0; + return DIALOG_GetNextTabItem(hDlg, hDlg, hCtl, bPrevious); } + #if 0 BOOL STDCALL

1 0

[ion] 19830: - Correctly zero out esi. Thanks to Patrick Baggett.
by ion＠svn.reactos.com 02 Dec '05

02 Dec '05

- Correctly zero out esi. Thanks to Patrick Baggett. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-12-02 15:45:47 UTC (rev 19829) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2005-12-02 20:06:02 UTC (rev 19830) @@ -60,7 +60,7 @@ * expect any static data (like some badly coded usermode/win9x apps do) */ xor ebx, ebx - xor esi, edi + xor esi, esi xor edi, edi xor ebp, ebp

1 0

[cwittich] 19829: set eol-style:native
by cwittich＠svn.reactos.com 02 Dec '05

02 Dec '05

set eol-style:native Modified: trunk/reactos/include/idl/eventlogrpc.acf Modified: trunk/reactos/include/idl/pnp.acf Modified: trunk/reactos/include/idl/svcctl.acf _____ Modified: trunk/reactos/include/idl/eventlogrpc.acf --- trunk/reactos/include/idl/eventlogrpc.acf 2005-12-02 15:43:44 UTC (rev 19828) +++ trunk/reactos/include/idl/eventlogrpc.acf 2005-12-02 15:45:47 UTC (rev 19829) @@ -1,6 +1,6 @@ -[ - explicit_handle -] -interface eventlog -{ +[ + explicit_handle +] +interface eventlog +{ } \ No newline at end of file Property changes on: trunk/reactos/include/idl/eventlogrpc.acf ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/include/idl/pnp.acf --- trunk/reactos/include/idl/pnp.acf 2005-12-02 15:43:44 UTC (rev 19828) +++ trunk/reactos/include/idl/pnp.acf 2005-12-02 15:45:47 UTC (rev 19829) @@ -1,6 +1,6 @@ -[ - explicit_handle -] -interface pnp -{ +[ + explicit_handle +] +interface pnp +{ } \ No newline at end of file Property changes on: trunk/reactos/include/idl/pnp.acf ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/include/idl/svcctl.acf --- trunk/reactos/include/idl/svcctl.acf 2005-12-02 15:43:44 UTC (rev 19828) +++ trunk/reactos/include/idl/svcctl.acf 2005-12-02 15:45:47 UTC (rev 19829) @@ -1,6 +1,6 @@ -[ - explicit_handle -] -interface svcctl -{ +[ + explicit_handle +] +interface svcctl +{ } \ No newline at end of file Property changes on: trunk/reactos/include/idl/svcctl.acf ___________________________________________________________________ Name: svn:eol-style + native

1 0

[cwittich] 19828: added ACF files req. by midl
by cwittich＠svn.reactos.com 02 Dec '05

02 Dec '05

added ACF files req. by midl Added: trunk/reactos/include/idl/eventlogrpc.acf Added: trunk/reactos/include/idl/pnp.acf Added: trunk/reactos/include/idl/svcctl.acf _____ Added: trunk/reactos/include/idl/eventlogrpc.acf --- trunk/reactos/include/idl/eventlogrpc.acf 2005-12-02 13:59:35 UTC (rev 19827) +++ trunk/reactos/include/idl/eventlogrpc.acf 2005-12-02 15:43:44 UTC (rev 19828) @@ -0,0 +1,6 @@ +[ + explicit_handle +] +interface eventlog +{ +} \ No newline at end of file _____ Added: trunk/reactos/include/idl/pnp.acf --- trunk/reactos/include/idl/pnp.acf 2005-12-02 13:59:35 UTC (rev 19827) +++ trunk/reactos/include/idl/pnp.acf 2005-12-02 15:43:44 UTC (rev 19828) @@ -0,0 +1,6 @@ +[ + explicit_handle +] +interface pnp +{ +} \ No newline at end of file _____ Added: trunk/reactos/include/idl/svcctl.acf --- trunk/reactos/include/idl/svcctl.acf 2005-12-02 13:59:35 UTC (rev 19827) +++ trunk/reactos/include/idl/svcctl.acf 2005-12-02 15:43:44 UTC (rev 19828) @@ -0,0 +1,6 @@ +[ + explicit_handle +] +interface svcctl +{ +} \ No newline at end of file

1 0

[royce] 19827: store pointer to Backend in the Project class so properties of the Backend object can eventually be queried from the generic rbuild code
by royce＠svn.reactos.com 02 Dec '05

02 Dec '05

store pointer to Backend in the Project class so properties of the Backend object can eventually be queried from the generic rbuild code Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-12-02 12:47:42 UTC (rev 19826) +++ trunk/reactos/tools/rbuild/project.cpp 2005-12-02 13:59:35 UTC (rev 19827) @@ -19,6 +19,7 @@ #include <assert.h> #include "rbuild.h" +#include "backend/backend.h" using std::string; using std::vector; @@ -87,13 +88,15 @@ node (NULL), head (NULL), configuration (configuration) -{ +{ ReadXml(); } Project::~Project () { size_t i; + if ( _backend ) + delete _backend; for ( i = 0; i < modules.size (); i++ ) delete modules[i]; for ( i = 0; i < linkerFlags.size (); i++ ) _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-12-02 12:47:42 UTC (rev 19826) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-12-02 13:59:35 UTC (rev 19827) @@ -243,18 +243,20 @@ try { string projectFilename ( RootXmlFile ); + printf ( "Reading build files..." ); Project project ( configuration, projectFilename ); printf ( "done\n" ); - project.WriteConfigurationFile (); - project.ExecuteInvocations (); - Backend* backend = Backend::Factory::Create ( + + project.SetBackend ( Backend::Factory::Create ( BuildSystem, project, - configuration ); - backend->Process (); - delete backend; + configuration ) ); + project.WriteConfigurationFile (); + project.ExecuteInvocations (); + project.GetBackend().Process(); + return 0; } catch ( Exception& ex ) _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-12-02 12:47:42 UTC (rev 19826) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-12-02 13:59:35 UTC (rev 19827) @@ -35,11 +35,14 @@ #endif/*WIN32*/ #endif/*_MSC_VER*/ +#include <infhost.h> + #include "ssprintf.h" #include "exception.h" #include "xml.h" -#include <infhost.h> +class Backend; // forward declaration + typedef std::vector<std::string> string_list; extern std::string ExePrefix; @@ -191,6 +194,7 @@ { std::string xmlfile; XMLElement *node, *head; + Backend* _backend; public: const Configuration& configuration; std::string name; @@ -205,8 +209,11 @@ Project ( const Configuration& configuration, const std::string& filename ); ~Project (); + void SetBackend ( Backend* backend ) { _backend = backend; } + Backend& GetBackend() { return *_backend; } void WriteConfigurationFile (); void ExecuteInvocations (); + void ProcessXML ( const std::string& path ); Module* LocateModule ( const std::string& name ); const Module* LocateModule ( const std::string& name ) const;

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