Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 22448: Implement the isometric mapping mode and call the mapping functions for Ellipse and Polygon drawing. Thanks MgW from IRC for testing. :)
by navaraf＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: navaraf Date: Wed Jun 21 12:33:27 2006 New Revision: 22448 URL: http://svn.reactos.ru/svn/reactos?rev=22448&view=rev Log: Implement the isometric mapping mode and call the mapping functions for Ellipse and Polygon drawing. Thanks MgW from IRC for testing. :) Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Wed Jun 21 12:33:27 2006 @@ -34,6 +34,24 @@ /* FUNCTIONS *****************************************************************/ +void FASTCALL +IntFixIsotropicMapping(PDC dc) +{ + ULONG xdim = EngMulDiv(dc->vportExtX, dc->GDIInfo->ulHorzSize, dc->GDIInfo->ulHorzRes) / dc->wndExtX; + ULONG ydim = EngMulDiv(dc->vportExtY, dc->GDIInfo->ulVertSize, dc->GDIInfo->ulVertRes) / dc->wndExtY; + + if (xdim > ydim) + { + dc->vportExtX = dc->vportExtX * abs(ydim / xdim); + if (!dc->vportExtX) dc->vportExtX = 1; + } + else + { + dc->vportExtY = dc->vportExtY * abs(xdim / ydim); + if (!dc->vportExtY) dc->vportExtY = 1; + } +} + BOOL FASTCALL IntGdiCombineTransform(LPXFORM XFormResult, LPXFORM xform1, @@ -668,7 +686,62 @@ } PrevMapMode = dc->w.MapMode; - dc->w.MapMode = MapMode; + + if (MapMode != dc->w.MapMode || (MapMode != MM_ISOTROPIC && MapMode != MM_ANISOTROPIC)) + { + dc->w.MapMode = MapMode; + + switch (MapMode) + { + case MM_TEXT: + dc->wndExtX = 1; + dc->wndExtY = 1; + dc->vportExtX = 1; + dc->vportExtY = 1; + break; + + case MM_LOMETRIC: + case MM_ISOTROPIC: + dc->wndExtX = dc->GDIInfo->ulHorzSize * 10; + dc->wndExtY = dc->GDIInfo->ulVertSize * 10; + dc->vportExtX = dc->GDIInfo->ulHorzRes; + dc->vportExtY = -dc->GDIInfo->ulVertRes; + break; + + case MM_HIMETRIC: + dc->wndExtX = dc->GDIInfo->ulHorzSize * 100; + dc->wndExtY = dc->GDIInfo->ulVertSize * 100; + dc->vportExtX = dc->GDIInfo->ulHorzRes; + dc->vportExtY = -dc->GDIInfo->ulVertRes; + break; + + case MM_LOENGLISH: + dc->wndExtX = EngMulDiv(1000, dc->GDIInfo->ulHorzSize, 254); + dc->wndExtY = EngMulDiv(1000, dc->GDIInfo->ulVertSize, 254); + dc->vportExtX = dc->GDIInfo->ulHorzRes; + dc->vportExtY = -dc->GDIInfo->ulVertRes; + break; + + case MM_HIENGLISH: + dc->wndExtX = EngMulDiv(10000, dc->GDIInfo->ulHorzSize, 254); + dc->wndExtY = EngMulDiv(10000, dc->GDIInfo->ulVertSize, 254); + dc->vportExtX = dc->GDIInfo->ulHorzRes; + dc->vportExtY = -dc->GDIInfo->ulVertRes; + break; + + case MM_TWIPS: + dc->wndExtX = EngMulDiv(14400, dc->GDIInfo->ulHorzSize, 254); + dc->wndExtY = EngMulDiv(14400, dc->GDIInfo->ulVertSize, 254); + dc->vportExtX = dc->GDIInfo->ulHorzRes; + dc->vportExtY = -dc->GDIInfo->ulVertRes; + break; + + case MM_ANISOTROPIC: + break; + } + + DC_UpdateXforms(dc); + } DC_UnlockDc(dc); @@ -737,6 +810,8 @@ dc->vportExtX = XExtent; dc->vportExtY = YExtent; + if (dc->w.MapMode == MM_ISOTROPIC) + IntFixIsotropicMapping(dc); DC_UpdateXforms(dc); DC_UnlockDc(dc); Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Wed Jun 21 12:33:27 2006 @@ -66,6 +66,7 @@ ASSERT(BitmapObj); /* Convert to screen coordinates */ + IntLPtoDP(dc, UnsafePoints, Count); for (CurrentPoint = 0; CurrentPoint < Count; CurrentPoint++) { UnsafePoints[CurrentPoint].x += dc->w.DCOrgX; @@ -258,20 +259,22 @@ IntGdiInitBrushInstance(&FillBrushInst, FillBrush, dc->XlateBrush); IntGdiInitBrushInstance(&PenBrushInst, PenBrush, dc->XlatePen); - nLeftRect += dc->w.DCOrgX; - nRightRect += dc->w.DCOrgX - 1; - nTopRect += dc->w.DCOrgY; - nBottomRect += dc->w.DCOrgY - 1; - - RadiusX = max((nRightRect - nLeftRect) >> 1, 1); - RadiusY = max((nBottomRect - nTopRect) >> 1, 1); - CenterX = nLeftRect + RadiusX; - CenterY = nTopRect + RadiusY; - RectBounds.left = nLeftRect; RectBounds.right = nRightRect; RectBounds.top = nTopRect; RectBounds.bottom = nBottomRect; + + IntLPtoDP(dc, (LPPOINT)&RectBounds, 2); + + RectBounds.left += dc->w.DCOrgX; + RectBounds.right += dc->w.DCOrgX; + RectBounds.top += dc->w.DCOrgY; + RectBounds.bottom += dc->w.DCOrgY; + + RadiusX = max((RectBounds.right - RectBounds.left) >> 1, 1); + RadiusY = max((RectBounds.bottom - RectBounds.top) >> 1, 1); + CenterX = RectBounds.left + RadiusX; + CenterY = RectBounds.top + RadiusY; if (RadiusX > RadiusY) {

1 0

[navaraf] 22447: Fix the millimeter calculation and assume 96DPI to be consistent with win32k.
by navaraf＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: navaraf Date: Wed Jun 21 12:25:25 2006 New Revision: 22447 URL: http://svn.reactos.ru/svn/reactos?rev=22447&view=rev Log: Fix the millimeter calculation and assume 96DPI to be consistent with win32k. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c Wed Jun 21 12:25:25 2006 @@ -881,7 +881,6 @@ ULONG VideoModeId) { PVBE_MODEINFO VBEMode = &DeviceExtension->ModeInfo[VideoModeId]; - INT dwCalc; VideoMode->Length = sizeof(VIDEO_MODE_INFORMATION); VideoMode->ModeIndex = VideoModeId; @@ -895,59 +894,9 @@ VideoMode->BitsPerPlane = VBEMode->BitsPerPixel / VBEMode->NumberOfPlanes; VideoMode->Frequency = 1; - /* FIXME - * how do I get the dpi from the monitor ??, for now - * I (GreatLord) will assume 72dpi for the monitor, few monitor can have more or less 72dpi - * you need pay alot of money to get one, that have more that 72dpi. - * - * math inch = pixel / 72dpi - * math Millimeter = pixel / (72dpi / 2.571428571) * 10 - * - */ - - VideoMode->XMillimeter = VBEMode->XResolution / 28; - dwCalc = VBEMode->XResolution % 28; - if ((dwCalc>=3) && (dwCalc<=5)) - VideoMode->XMillimeter +=1; - else if ((dwCalc>=6) && (dwCalc<=8)) - VideoMode->XMillimeter +=2; - else if ((dwCalc>=9) && (dwCalc<=11)) - VideoMode->XMillimeter +=3; - else if ((dwCalc>=12) && (dwCalc<=13)) - VideoMode->XMillimeter +=4; - else if ((dwCalc>=15) && (dwCalc<=16)) - VideoMode->XMillimeter +=5; - else if ((dwCalc>=17) && (dwCalc<=19)) - VideoMode->XMillimeter +=6; - else if ((dwCalc>=20) && (dwCalc<=22)) - VideoMode->XMillimeter +=7; - else if ((dwCalc>=23) && (dwCalc<=25)) - VideoMode->XMillimeter +=8; - else if ((dwCalc>=26) && (dwCalc<=27)) - VideoMode->XMillimeter +=9; - - VideoMode->YMillimeter = VBEMode->YResolution / 28; - dwCalc = VBEMode->YResolution % 28; - if ((dwCalc>=3) && (dwCalc<=5)) - VideoMode->YMillimeter +=1; - else if ((dwCalc>=6) && (dwCalc<=8)) - VideoMode->YMillimeter +=2; - else if ((dwCalc>=9) && (dwCalc<=11)) - VideoMode->YMillimeter +=3; - else if ((dwCalc>=12) && (dwCalc<=13)) - VideoMode->YMillimeter +=4; - else if ((dwCalc>=15) && (dwCalc<=16)) - VideoMode->YMillimeter +=5; - else if ((dwCalc>=17) && (dwCalc<=19)) - VideoMode->YMillimeter +=6; - else if ((dwCalc>=20) && (dwCalc<=22)) - VideoMode->YMillimeter +=7; - else if ((dwCalc>=23) && (dwCalc<=25)) - VideoMode->YMillimeter +=8; - else if ((dwCalc>=26) && (dwCalc<=27)) - VideoMode->YMillimeter +=9; - - + /* Assume 96DPI and 25.4 millimeters per inch */ + VideoMode->XMillimeter = VBEMode->XResolution * 254 / 960; + VideoMode->YMillimeter = VBEMode->YResolution * 254 / 960; if (VBEMode->BitsPerPixel > 8) {

1 0

[hpoussin] 22446: Fix indentation in SetupDiCreateDeviceInfoListExW Fix 2 architecture extension constants
by hpoussin＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: hpoussin Date: Wed Jun 21 11:52:19 2006 New Revision: 22446 URL: http://svn.reactos.ru/svn/reactos?rev=22446&view=rev Log: Fix indentation in SetupDiCreateDeviceInfoListExW Fix 2 architecture extension constants Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Wed Jun 21 11:52:19 2006 @@ -156,96 +156,95 @@ IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { - struct DeviceInfoSet *list; - LPWSTR UNCServerName = NULL; - DWORD size; - DWORD rc; - //CONFIGRET cr; - HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE;; - - TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, - debugstr_w(MachineName), Reserved); - - size = FIELD_OFFSET(struct DeviceInfoSet, szData); - if (MachineName) - size += (strlenW(MachineName) + 3) * sizeof(WCHAR); - list = HeapAlloc(GetProcessHeap(), 0, size); - if (!list) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - memset(list, 0, sizeof(struct DeviceInfoSet)); - - list->magic = SETUP_DEV_INFO_SET_MAGIC; - memcpy( - &list->ClassGuid, - ClassGuid ? ClassGuid : &GUID_NULL, - sizeof(list->ClassGuid)); - list->InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); - list->InstallParams.Flags |= DI_CLASSINSTALLPARAMS; - list->InstallParams.hwndParent = hwndParent; - if (MachineName) - { - rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &list->HKLM); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - UNCServerName = HeapAlloc(GetProcessHeap(), 0, (strlenW(MachineName) + 3) * sizeof(WCHAR)); - if (!UNCServerName) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - - strcpyW(UNCServerName + 2, MachineName); - list->szData[0] = list->szData[1] = '\\'; - strcpyW(list->szData + 2, MachineName); - list->MachineName = list->szData; - } - else - { - DWORD Size = MAX_PATH; - list->HKLM = HKEY_LOCAL_MACHINE; - UNCServerName = HeapAlloc(GetProcessHeap(), 0, (MAX_PATH + 2) * sizeof(WCHAR)); - if (!UNCServerName) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - if (!GetComputerNameW(UNCServerName + 2, &Size)) - goto cleanup; - list->MachineName = NULL; - } + struct DeviceInfoSet *list; + LPWSTR UNCServerName = NULL; + DWORD size; + DWORD rc; + //CONFIGRET cr; + HDEVINFO ret = (HDEVINFO)INVALID_HANDLE_VALUE;; + + TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, + debugstr_w(MachineName), Reserved); + + size = FIELD_OFFSET(struct DeviceInfoSet, szData); + if (MachineName) + size += (strlenW(MachineName) + 3) * sizeof(WCHAR); + list = HeapAlloc(GetProcessHeap(), 0, size); + if (!list) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + memset(list, 0, sizeof(struct DeviceInfoSet)); + + list->magic = SETUP_DEV_INFO_SET_MAGIC; + memcpy( + &list->ClassGuid, + ClassGuid ? ClassGuid : &GUID_NULL, + sizeof(list->ClassGuid)); + list->InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + list->InstallParams.Flags |= DI_CLASSINSTALLPARAMS; + list->InstallParams.hwndParent = hwndParent; + if (MachineName) + { + rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &list->HKLM); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + goto cleanup; + } + UNCServerName = HeapAlloc(GetProcessHeap(), 0, (strlenW(MachineName) + 3) * sizeof(WCHAR)); + if (!UNCServerName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + strcpyW(UNCServerName + 2, MachineName); + list->szData[0] = list->szData[1] = '\\'; + strcpyW(list->szData + 2, MachineName); + list->MachineName = list->szData; + } + else + { + DWORD Size = MAX_PATH; + list->HKLM = HKEY_LOCAL_MACHINE; + UNCServerName = HeapAlloc(GetProcessHeap(), 0, (MAX_PATH + 2) * sizeof(WCHAR)); + if (!UNCServerName) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + if (!GetComputerNameW(UNCServerName + 2, &Size)) + goto cleanup; + list->MachineName = NULL; + } #if 0 - UNCServerName[0] = UNCServerName[1] = '\\'; - cr = CM_Connect_MachineW(UNCServerName, &list->hMachine); - if (cr != CR_SUCCESS) - { - SetLastError(GetErrorCodeFromCrCode(cr)); - goto cleanup; - } + UNCServerName[0] = UNCServerName[1] = '\\'; + cr = CM_Connect_MachineW(UNCServerName, &list->hMachine); + if (cr != CR_SUCCESS) + { + SetLastError(GetErrorCodeFromCrCode(cr)); + goto cleanup; + } #endif - InitializeListHead(&list->DriverListHead); - InitializeListHead(&list->ListHead); - - ret = (HDEVINFO)list; + InitializeListHead(&list->DriverListHead); + InitializeListHead(&list->ListHead); + + ret = (HDEVINFO)list; cleanup: - if (ret == INVALID_HANDLE_VALUE) - { - if (list) - { - if (list->HKLM != NULL && list->HKLM != HKEY_LOCAL_MACHINE) - RegCloseKey(list->HKLM); - } - HeapFree(GetProcessHeap(), 0, list); - } - if (UNCServerName) + if (ret == INVALID_HANDLE_VALUE) + { + if (list) + { + if (list->HKLM != NULL && list->HKLM != HKEY_LOCAL_MACHINE) + RegCloseKey(list->HKLM); + HeapFree(GetProcessHeap(), 0, list); + } + } HeapFree(GetProcessHeap(), 0, UNCServerName); - return ret; + return ret; } /*********************************************************************** @@ -415,8 +414,8 @@ static const WCHAR ExtensionArchitectureNone[] = {0}; static const WCHAR ExtensionArchitecturealpha[] = {'a','l','p','h','a',0}; - static const WCHAR ExtensionArchitectureamd64[] = {'a','m','d','6','4',0}; - static const WCHAR ExtensionArchitectureia64[] = {'i','a','6','4',0}; + static const WCHAR ExtensionArchitectureamd64[] = {'A','M','D','6','4',0}; + static const WCHAR ExtensionArchitectureia64[] = {'I','A','6','4',0}; static const WCHAR ExtensionArchitecturemips[] = {'m','i','p','s',0}; static const WCHAR ExtensionArchitectureppc[] = {'p','p','c',0}; static const WCHAR ExtensionArchitecturex86[] = {'x','8','6',0};

1 0

[hpoussin] 22445: Fix some bugs according to test suite Delete unused files
by hpoussin＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: hpoussin Date: Wed Jun 21 10:40:02 2006 New Revision: 22445 URL: http://svn.reactos.ru/svn/reactos?rev=22445&view=rev Log: Fix some bugs according to test suite Delete unused files Removed: trunk/reactos/dll/win32/setupapi/infparse.c trunk/reactos/dll/win32/setupapi/virtcopy.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devclass… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Wed Jun 21 10:40:02 2006 @@ -991,7 +991,7 @@ { goto cleanup; } - else if (dwRegType != REG_SZ) + else if (dwRegType != REG_SZ || dwLength < MAX_GUID_STRING_LEN * sizeof(WCHAR)) { rc = ERROR_GEN_FAILURE; goto cleanup; @@ -1077,7 +1077,11 @@ KEY_ENUMERATE_SUB_KEYS, &hEnumeratorKey); if (rc != ERROR_SUCCESS) - goto cleanup; + { + if (rc == ERROR_FILE_NOT_FOUND) + rc = ERROR_INVALID_DATA; + goto cleanup; + } rc = SETUP_CreateDevicesListFromEnumerator(list, Class, Enumerator, hEnumeratorKey); } else @@ -1155,39 +1159,29 @@ else { hDeviceInfo = SetupDiCreateDeviceInfoListExW( - Flags & DIGCF_DEVICEINTERFACE ? NULL : ClassGuid, + Flags & (DIGCF_DEVICEINTERFACE | DIGCF_ALLCLASSES) ? NULL : ClassGuid, NULL, MachineName, NULL); if (hDeviceInfo == INVALID_HANDLE_VALUE) goto cleanup; list = (struct DeviceInfoSet *)hDeviceInfo; } - if (IsEqualIID(&list->ClassGuid, &GUID_NULL)) - pClassGuid = NULL; - else - pClassGuid = &list->ClassGuid; - if (Flags & DIGCF_PROFILE) FIXME(": flag DIGCF_PROFILE ignored\n"); + /* FIXME: list->ClassGuid is never used! */ if (Flags & DIGCF_ALLCLASSES) - { - rc = SETUP_CreateDevicesList(list, MachineName, pClassGuid, Enumerator); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - goto cleanup; - } - ret = hDeviceInfo; - } - else if (Flags & DIGCF_DEVICEINTERFACE) - { - if (ClassGuid == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - goto cleanup; - } - + pClassGuid = NULL; + else if (ClassGuid) + pClassGuid = ClassGuid; + else + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + + if (Flags & DIGCF_DEVICEINTERFACE) + { rc = SETUP_CreateInterfaceList(list, MachineName, ClassGuid, Enumerator, Flags & DIGCF_PRESENT); if (rc != ERROR_SUCCESS) { @@ -1198,6 +1192,16 @@ } else { + if (Flags & DIGCF_ALLCLASSES) + rc = SETUP_CreateDevicesList(list, MachineName, NULL, Enumerator); + else if (ClassGuid) + rc = SETUP_CreateDevicesList(list, MachineName, pClassGuid, Enumerator); + else + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + rc = SETUP_CreateDevicesList(list, MachineName, ClassGuid, Enumerator); if (rc != ERROR_SUCCESS) { Removed: trunk/reactos/dll/win32/setupapi/infparse.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/infparse… ============================================================================== --- trunk/reactos/dll/win32/setupapi/infparse.c (original) +++ trunk/reactos/dll/win32/setupapi/infparse.c (removed) @@ -1,185 +1,0 @@ -/* - * SetupX .inf file parsing functions - * - * Copyright 2000 Andreas Mohr for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * FIXME: - * - return values ??? - * - this should be reimplemented at some point to have its own - * file parsing instead of using profile functions, - * as some SETUPX exports probably demand that - * (IpSaveRestorePosition, IpFindNextMatchLine, ...). - */ - -#include "setupapi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); - -#define MAX_HANDLES 16384 -#define FIRST_HANDLE 32 - -static HINF handles[MAX_HANDLES]; - - -static RETERR16 alloc_hinf16( HINF hinf, HINF16 *hinf16 ) -{ - int i; - for (i = 0; i < MAX_HANDLES; i++) - { - if (!handles[i]) - { - handles[i] = hinf; - *hinf16 = i + FIRST_HANDLE; - return OK; - } - } - return ERR_IP_OUT_OF_HANDLES; -} - -static HINF get_hinf( HINF16 hinf16 ) -{ - int idx = hinf16 - FIRST_HANDLE; - if (idx < 0 || idx >= MAX_HANDLES) return 0; - return handles[idx]; -} - - -static HINF free_hinf16( HINF16 hinf16 ) -{ - HINF ret; - int idx = hinf16 - FIRST_HANDLE; - - if (idx < 0 || idx >= MAX_HANDLES) return 0; - ret = handles[idx]; - handles[idx] = 0; - return ret; -} - -/* convert last error code to a RETERR16 value */ -static RETERR16 get_last_error(void) -{ - switch(GetLastError()) - { - case ERROR_EXPECTED_SECTION_NAME: - case ERROR_BAD_SECTION_NAME_LINE: - case ERROR_SECTION_NAME_TOO_LONG: return ERR_IP_INVALID_SECT_NAME; - case ERROR_SECTION_NOT_FOUND: return ERR_IP_SECT_NOT_FOUND; - case ERROR_LINE_NOT_FOUND: return ERR_IP_LINE_NOT_FOUND; - default: return IP_ERROR; /* FIXME */ - } -} - - -/*********************************************************************** - * IpOpen (SETUPX.2) - * - */ -RETERR16 WINAPI IpOpen16( LPCSTR filename, HINF16 *hinf16 ) -{ - HINF hinf = SetupOpenInfFileA( filename, NULL, INF_STYLE_WIN4, NULL ); - if (hinf == (HINF)INVALID_HANDLE_VALUE) return get_last_error(); - return alloc_hinf16( hinf, hinf16 ); -} - - -/*********************************************************************** - * IpClose (SETUPX.4) - */ -RETERR16 WINAPI IpClose16( HINF16 hinf16 ) -{ - HINF hinf = free_hinf16( hinf16 ); - if (!hinf) return ERR_IP_INVALID_HINF; - SetupCloseInfFile( hinf ); - return OK; -} - - -/*********************************************************************** - * IpGetProfileString (SETUPX.210) - */ -RETERR16 WINAPI IpGetProfileString16( HINF16 hinf16, LPCSTR section, LPCSTR entry, - LPSTR buffer, WORD buflen ) -{ - DWORD required_size; - HINF hinf = get_hinf( hinf16 ); - - if (!hinf) return ERR_IP_INVALID_HINF; - if (!SetupGetLineTextA( NULL, hinf, section, entry, buffer, buflen, &required_size )) - return get_last_error(); - TRACE("%p: section %s entry %s ret %s\n", - hinf, debugstr_a(section), debugstr_a(entry), debugstr_a(buffer) ); - return OK; -} - - -/*********************************************************************** - * GenFormStrWithoutPlaceHolders (SETUPX.103) - * - * ought to be pretty much implemented, I guess... - */ -void WINAPI GenFormStrWithoutPlaceHolders16( LPSTR dst, LPCSTR src, HINF16 hinf16 ) -{ - UNICODE_STRING srcW; - HINF hinf = get_hinf( hinf16 ); - - if (!hinf) return; - - if (!RtlCreateUnicodeStringFromAsciiz( &srcW, src )) return; - PARSER_string_substA( hinf, srcW.Buffer, dst, MAX_INF_STRING_LENGTH ); - RtlFreeUnicodeString( &srcW ); - TRACE( "%s -> %s\n", debugstr_a(src), debugstr_a(dst) ); -} - -/*********************************************************************** - * GenInstall (SETUPX.101) - * - * generic installer function for .INF file sections - * - * This is not perfect - patch whenever you can ! - * - * wFlags == GENINSTALL_DO_xxx - * e.g. NetMeeting: - * first call GENINSTALL_DO_REGSRCPATH | GENINSTALL_DO_FILES, - * second call GENINSTALL_DO_LOGCONFIG | CFGAUTO | INI2REG | REG | INI - */ -RETERR16 WINAPI GenInstall16( HINF16 hinf16, LPCSTR section, WORD genflags ) -{ - UINT flags = 0; - HINF hinf = get_hinf( hinf16 ); - RETERR16 ret = OK; - void *context; - - if (!hinf) return ERR_IP_INVALID_HINF; - - if (genflags & GENINSTALL_DO_FILES) flags |= SPINST_FILES; - if (genflags & GENINSTALL_DO_INI) flags |= SPINST_INIFILES; - if (genflags & GENINSTALL_DO_REG) flags |= SPINST_REGISTRY; - if (genflags & GENINSTALL_DO_INI2REG) flags |= SPINST_INI2REG; - if (genflags & GENINSTALL_DO_LOGCONFIG) flags |= SPINST_LOGCONFIG; - if (genflags & GENINSTALL_DO_REGSRCPATH) FIXME( "unsupported flag: GENINSTALL_DO_REGSRCPATH\n" ); - if (genflags & GENINSTALL_DO_CFGAUTO) FIXME( "unsupported flag: GENINSTALL_DO_CFGAUTO\n" ); - if (genflags & GENINSTALL_DO_PERUSER) FIXME( "unsupported flag: GENINSTALL_DO_PERUSER\n" ); - - context = SetupInitDefaultQueueCallback( 0 ); - if (!SetupInstallFromInfSectionA( 0, hinf, section, flags, 0, NULL, - SP_COPY_NEWER_OR_SAME, SetupDefaultQueueCallbackA, - context, 0, 0 )) - ret = get_last_error(); - - SetupTermDefaultQueueCallback( context ); - return ret; -} Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/install.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Wed Jun 21 10:40:02 2006 @@ -805,7 +805,7 @@ } ret = TRUE; done: - if (buffer && buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer ); + if (buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer ); return ret; } @@ -1094,11 +1094,15 @@ hinf = SetupOpenInfFileW( path, NULL, INF_STYLE_WIN4, NULL ); if (hinf == INVALID_HANDLE_VALUE) return; - callback_context = SetupInitDefaultQueueCallback( hwnd ); - SetupInstallFromInfSectionW( hwnd, hinf, section, SPINST_ALL, NULL, NULL, SP_COPY_NEWER, - SetupDefaultQueueCallbackW, callback_context, - NULL, NULL ); - SetupTermDefaultQueueCallback( callback_context ); + if (SetupDiGetActualSectionToInstallW( + hinf, section, section, sizeof(section)/sizeof(section[0]), NULL, NULL )) + { + callback_context = SetupInitDefaultQueueCallback( hwnd ); + SetupInstallFromInfSectionW( hwnd, hinf, section, SPINST_ALL, NULL, NULL, SP_COPY_NEWER, + SetupDefaultQueueCallbackW, callback_context, + NULL, NULL ); + SetupTermDefaultQueueCallback( callback_context ); + } SetupCloseInfFile( hinf ); /* FIXME: should check the mode and maybe reboot */ Removed: trunk/reactos/dll/win32/setupapi/virtcopy.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/virtcopy… ============================================================================== --- trunk/reactos/dll/win32/setupapi/virtcopy.c (original) +++ trunk/reactos/dll/win32/setupapi/virtcopy.c (removed) @@ -1,780 +1,0 @@ -/* - * SetupAPI virtual copy operations - * - * Copyright 2001 Andreas Mohr - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * FIXME: we now rely on builtin setupapi.dll for dialog resources. - * This is bad ! We ought to have 16bit resource handling working. - */ - -#include "setupapi_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(setupapi); - -static FARPROC16 VCP_Proc = NULL; -static LPARAM VCP_MsgRef = 0; - -static BOOL VCP_opened = FALSE; - -static VCPSTATUS vcp_status; - -static HINSTANCE SETUPAPI_hInstance; - -static WORD VCP_Callback( LPVOID obj, UINT16 msg, WPARAM16 wParam, LPARAM lParam, LPARAM lParamRef ) -{ - WORD args[8]; - DWORD ret = OK; - if (VCP_Proc) - { - args[7] = HIWORD(obj); - args[6] = LOWORD(obj); - args[5] = msg; - args[4] = wParam; - args[3] = HIWORD(lParam); - args[2] = LOWORD(lParam); - args[1] = HIWORD(lParamRef); - args[0] = LOWORD(lParamRef); - WOWCallback16Ex( (DWORD)VCP_Proc, WCB16_PASCAL, sizeof(args), args, &ret ); - } - return (WORD)ret; -} - -/****************************** VHSTR management ******************************/ - -/* - * This is a totally braindead implementation for now; - * I don't care about speed at all ! Size and implementation time - * is much more important IMHO. I could have created some sophisticated - * tree structure, but... what the hell ! :-) - */ -typedef struct { - DWORD refcount; - LPCSTR pStr; -} VHSTR_STRUCT; - -static VHSTR_STRUCT **vhstrlist = NULL; -static VHSTR vhstr_alloc = 0; - -#define VALID_VHSTR(x) ((x < vhstr_alloc) && (vhstrlist[x]) && (vhstrlist[x]->refcount)) - -/*********************************************************************** - * vsmStringAdd (SETUPX.207) - */ -VHSTR WINAPI vsmStringAdd16(LPCSTR lpszName) -{ - VHSTR n; - VHSTR index = 0xffff; - HANDLE heap; - - TRACE("add string '%s'\n", lpszName); - /* search whether string already inserted */ - TRACE("searching for existing string...\n"); - for (n = 0; n < vhstr_alloc; n++) - { - if ((vhstrlist[n]) && (vhstrlist[n]->refcount)) - { - TRACE("checking item: %d\n", n); - if (!strcmp(vhstrlist[n]->pStr, lpszName)) - { - TRACE("found\n"); - vhstrlist[n]->refcount++; - return n; - } - } - } - - /* hmm, not found yet, let's insert it */ - TRACE("inserting item\n"); - for (n = 0; n < vhstr_alloc; n++) - { - if ((!(vhstrlist[n])) || (!(vhstrlist[n]->refcount))) - { - index = n; - break; - } - } - heap = GetProcessHeap(); - if (n == vhstr_alloc) /* hmm, no free index found yet */ - { - index = vhstr_alloc; - vhstr_alloc += 20; - - if (vhstrlist) - vhstrlist = HeapReAlloc(heap, HEAP_ZERO_MEMORY, vhstrlist, - sizeof(VHSTR_STRUCT *) * vhstr_alloc); - else - vhstrlist = HeapAlloc(heap, HEAP_ZERO_MEMORY, - sizeof(VHSTR_STRUCT *) * vhstr_alloc); - } - if (index == 0xffff) - return 0xffff; /* failure */ - if (!vhstrlist[index]) - vhstrlist[index] = HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(VHSTR_STRUCT)); - vhstrlist[index]->refcount = 1; - vhstrlist[index]->pStr = HeapAlloc(heap, 0, strlen(lpszName)+1); - strcpy((LPSTR)vhstrlist[index]->pStr, lpszName); - return index; -} - -/*********************************************************************** - * vsmStringDelete (SETUPX.206) - */ -INT16 WINAPI vsmStringDelete16(VHSTR vhstr) -{ - if (VALID_VHSTR(vhstr)) - { - vhstrlist[vhstr]->refcount--; - if (!vhstrlist[vhstr]->refcount) - { - HeapFree(GetProcessHeap(), 0, (LPSTR)vhstrlist[vhstr]->pStr); - vhstrlist[vhstr]->pStr = NULL; - } - return VCPN_OK; - } - - /* string not found */ - return VCPN_FAIL; -} - -/* - * vsmStringFind() - not exported from a standard SETUPX.DLL, it seems - */ -VHSTR WINAPI vsmStringFind16(LPCSTR lpszName) -{ - WORD n; - for (n = 0; n < vhstr_alloc; n++) - if ((vhstrlist[n]) && (vhstrlist[n]->refcount) && (!strcmp(vhstrlist[n]->pStr, lpszName))) - return n; - return 0xffff; -} - -/*********************************************************************** - * vsmGetStringName (SETUPX.205) - * - * Pretty correct, I guess - */ -INT16 WINAPI vsmGetStringName16(VHSTR vhstr, LPSTR lpszBuffer, int cbBuffer) -{ - if (VALID_VHSTR(vhstr)) - { - int len = strlen(vhstrlist[vhstr]->pStr)+1; - if (cbBuffer >= len) - { - if (lpszBuffer) - strcpy(lpszBuffer, vhstrlist[vhstr]->pStr); - return len; - } - } - return VCPN_FAIL; -} - -/*********************************************************************** - * vsmStringCompare (not exported from a standard SETUPX.DLL, it seems) - */ -INT16 WINAPI vsmStringCompare16(VHSTR vhstrA, VHSTR vhstrB) -{ - if ((!VALID_VHSTR(vhstrA)) || (!VALID_VHSTR(vhstrB))) - return VCPN_FAIL; /* correct ? */ - return strcmp(vhstrlist[vhstrA]->pStr, vhstrlist[vhstrB]->pStr); -} - -/*********************************************************************** - * vsmGetStringRawName (SETUPX.208) - */ -LPCSTR WINAPI vsmGetStringRawName16(VHSTR vhstr) -{ - return (VALID_VHSTR(vhstr)) ? vhstrlist[vhstr]->pStr : NULL; -} - - -/***************************** VIRTNODE management ****************************/ -static LPVIRTNODE *pvnlist = NULL; -static DWORD vn_num = 0; -static DWORD vn_last = 0; - -static RETERR16 VCP_VirtnodeCreate(LPVCPFILESPEC vfsSrc, LPVCPFILESPEC vfsDst, WORD fl, LPARAM lParam, LPEXPANDVTBL lpExpandVtbl) -{ - HANDLE heap; - LPVIRTNODE lpvn; - RETERR16 cbres; - - while (vn_last < vn_num) - { - if (pvnlist[vn_last] == NULL) - break; - vn_last++; - } - heap = GetProcessHeap(); - if (vn_last == vn_num) - { - vn_num += 20; - if (pvnlist) - pvnlist = HeapReAlloc(heap, HEAP_ZERO_MEMORY, pvnlist, - sizeof(LPVIRTNODE *) * vn_num); - else - pvnlist = HeapAlloc(heap, HEAP_ZERO_MEMORY, - sizeof(LPVIRTNODE *) * vn_num); - } - pvnlist[vn_last] = HeapAlloc(heap, HEAP_ZERO_MEMORY, sizeof(VIRTNODE)); - lpvn = pvnlist[vn_last]; - vn_last++; - - lpvn->cbSize = sizeof(VIRTNODE); - - if (vfsSrc) - memcpy(&lpvn->vfsSrc, vfsSrc, sizeof(VCPFILESPEC)); - - if (vfsDst) - memcpy(&lpvn->vfsDst, vfsDst, sizeof(VCPFILESPEC)); - - lpvn->fl = fl; - lpvn->lParam = lParam; - lpvn->lpExpandVtbl = lpExpandVtbl; - - lpvn->vhstrDstFinalName = 0xffff; /* FIXME: what is this ? */ - - cbres = VCP_Callback(lpvn, VCPM_NODECREATE, 0, 0, VCP_MsgRef); - lpvn->fl |= VFNL_CREATED; - cbres = VCP_Callback(lpvn, VCPM_NODEACCEPT, 0, 0, VCP_MsgRef); - - return OK; -} - -#if 0 -static BOOL VCP_VirtnodeDelete(LPVIRTNODE lpvnDel) -{ - DWORD n; - RETERR16 cbres; - - for (n = 0; n < vn_last; n++) - { - if (pvnlist[n] == lpvnDel) - { - cbres = VCP_Callback(lpvnDel, VCPM_NODEDESTROY, 0, 0, VCP_MsgRef); - HeapFree(GetProcessHeap(), 0, lpvnDel); - pvnlist[n] = NULL; - return TRUE; - } - } - return FALSE; -} -#endif - -/*********************************************************************** - * VcpOpen (SETUPX.200) - * - * Sets up a virtual copy operation. - * This means that functions such as GenInstall() - * create a VIRTNODE struct for every file to be touched in a .INF file - * instead of actually touching the file. - * The actual copy/move/rename gets started when VcpClose or - * VcpFlush is called; several different callbacks are made - * (copy, rename, open, close, version conflicts, ...) on every file copied. - */ -RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef) -{ - TRACE("(%p, %08lx)\n", vifproc, lparamMsgRef); - if (VCP_opened) - return ERR_VCP_BUSY; - - VCP_Proc = (FARPROC16)vifproc; - VCP_MsgRef = lparamMsgRef; - - /* load SETUPAPI needed for dialog resources etc. */ - SETUPAPI_hInstance = GetModuleHandleA("setupapi.dll"); - if (!SETUPAPI_hInstance) - { - ERR("Could not load sibling setupapi.dll\n"); - return ERR_VCP_NOMEM; - } - VCP_opened = TRUE; - return OK; -} - -/*********************************************************************** - * VcpQueueCopy [SETUPX.13] - * - * lpExpandVtbl seems to be deprecated. - * fl are the CNFL_xxx and VNFL_xxx flags. - * lParam are the VNLP_xxx flags. - */ -RETERR16 WINAPI VcpQueueCopy16( - LPCSTR lpszSrcFileName, LPCSTR lpszDstFileName, - LPCSTR lpszSrcDir, LPCSTR lpszDstDir, - LOGDISKID16 ldidSrc, LOGDISKID16 ldidDst, - LPEXPANDVTBL lpExpandVtbl, - WORD fl, LPARAM lParam -) -{ - VCPFILESPEC vfsSrc, vfsDst; - - if (!VCP_opened) - return ERR_VCP_NOTOPEN; - - TRACE("srcdir: %s, srcfile: %s, dstdir: %s, dstfile: %s\n", - lpszSrcDir, lpszSrcFileName, lpszDstDir, lpszDstFileName); - - TRACE("ldidSrc == %d, ldidDst == %d\n", ldidSrc, ldidDst); - - vfsSrc.ldid = ldidSrc; - vfsSrc.vhstrDir = vsmStringAdd16(lpszSrcDir); - vfsSrc.vhstrFileName = vsmStringAdd16(lpszSrcFileName); - - vfsDst.ldid = ldidDst; - vfsDst.vhstrDir = vsmStringAdd16(lpszDstDir); - vfsDst.vhstrFileName = vsmStringAdd16(lpszDstFileName); - - return VCP_VirtnodeCreate(&vfsSrc, &vfsDst, fl, lParam, - lpExpandVtbl); -} - -/*********************************************************************** - * VcpQueueDelete [SETUPX.17] - * - * Is lParamRef the same as lParam in VcpQueueCopy ? - * Damn docu !! Err... which docu ? - */ -RETERR16 WINAPI VcpQueueDelete16( - LPCSTR lpszDstFileName, - LPCSTR lpszDstDir, - LOGDISKID16 ldidDst, - LPARAM lParamRef -) -{ - VCPFILESPEC vfsDst; - - if (!VCP_opened) - return ERR_VCP_NOTOPEN; - - vfsDst.ldid = ldidDst; - vfsDst.vhstrDir = vsmStringAdd16(lpszDstDir); - vfsDst.vhstrFileName = vsmStringAdd16(lpszDstFileName); - - return VCP_VirtnodeCreate(NULL, &vfsDst, VNFL_DELETE, lParamRef, 0); -} - -/*********************************************************************** - * VcpQueueRename [SETUPX.204] - * - */ -RETERR16 WINAPI VcpQueueRename16( - LPCSTR lpszSrcFileName, LPCSTR lpszDstFileName, - LPCSTR lpszSrcDir, LPCSTR lpszDstDir, - LOGDISKID16 ldidSrc, LOGDISKID16 ldidDst, - LPARAM lParam -) -{ - VCPFILESPEC vfsSrc, vfsDst; - - if (!VCP_opened) - return ERR_VCP_NOTOPEN; - - vfsSrc.ldid = ldidSrc; - vfsSrc.vhstrDir = vsmStringAdd16(lpszSrcDir); - vfsSrc.vhstrFileName = vsmStringAdd16(lpszSrcFileName); - - vfsDst.ldid = ldidDst; - vfsDst.vhstrDir = vsmStringAdd16(lpszDstDir); - vfsDst.vhstrFileName = vsmStringAdd16(lpszDstFileName); - - return VCP_VirtnodeCreate(&vfsSrc, &vfsDst, VNFL_RENAME, lParam, - 0); -} - -/*********************************************************************** - * VcpEnumFiles (SETUPX.@) - */ -INT16 WINAPI VcpEnumFiles(VCPENUMPROC vep, LPARAM lParamRef) -{ - WORD n; - - for (n = 0; n < vn_last; n++) - vep(pvnlist[n], lParamRef); - - return 0; /* FIXME: return value ? */ -} - -/*********************************************************************** - * VcpExplain (SETUPX.411) - */ -LPCSTR WINAPI VcpExplain16(LPVIRTNODE lpVn, DWORD dwWhat) -{ - static char buffer[MAX_PATH]; /* FIXME: is this how it's done ? */ - buffer[0] = '\0'; - switch (dwWhat) - { - case VCPEX_SRC_FULL: - case VCPEX_DST_FULL: - { - LPVCPFILESPEC lpvfs = - (dwWhat == VCPEX_SRC_FULL) ? &lpVn->vfsSrc : &lpVn->vfsDst; - - /* if we have an ldid, use it, otherwise use the string */ - /* from the vhstrlist array */ - if (lpvfs->ldid != 0xffff) - CtlGetLddPath16(lpvfs->ldid, buffer); - else - strcat(buffer, vsmGetStringRawName16(lpvfs->vhstrDir)); - - strcat(buffer, "\\"); - strcat(buffer, vsmGetStringRawName16(lpvfs->vhstrFileName)); - } - break; - default: - FIXME("%ld unimplemented !\n", dwWhat); - strcpy(buffer, "Unknown error"); - break; - } - return buffer; -} - -static RETERR16 VCP_CheckPaths(void) -{ - DWORD n; - LPVIRTNODE lpvn; - RETERR16 cbres; - - cbres = VCP_Callback(&vcp_status, VCPM_VSTATPATHCHECKSTART, 0, 0, VCP_MsgRef); - for (n = 0; n < vn_num; n++) - { - lpvn = pvnlist[n]; - if (!lpvn) continue; - /* FIXME: check paths of all VIRTNODEs here ! */ - cbres = VCP_Callback(&lpvn->vfsDst, VCPM_CHECKPATH, 0, (DWORD)lpvn, VCP_MsgRef); - } - cbres = VCP_Callback(&vcp_status, VCPM_VSTATPATHCHECKEND, 0, 0, VCP_MsgRef); - return OK; -} - -static RETERR16 VCP_CopyFiles(void) -{ - char fn_src[MAX_PATH], fn_dst[MAX_PATH]; - RETERR16 res = OK, cbres; - DWORD n; - LPVIRTNODE lpvn; - - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCOPYSTART, 0, 0, VCP_MsgRef); - for (n = 0; n < vn_num; n++) - { - lpvn = pvnlist[n]; - if ((!lpvn) || ((lpvn->fl & VNFL_NODE_TYPE) != VNFL_COPY)) continue; - /* FIXME: need to send VCPM_VSTATNEWDISK notification sometimes */ - strcpy(fn_src, VcpExplain16(lpvn, VCPEX_SRC_FULL)); - strcpy(fn_dst, VcpExplain16(lpvn, VCPEX_DST_FULL)); - /* FIXME: what is this VCPM_VSTATWRITE here for ? - * I guess it's to signal successful destination file creation */ - cbres = VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); - - /* FIXME: need to do the file copy in small chunks for notifications */ - TRACE("copying '%s' to '%s'\n", fn_src, fn_dst); - /* perform the file copy */ - if (!(CopyFileA(fn_src, fn_dst, - (lpvn->fl & VNLP_COPYIFEXISTS) ? FALSE : TRUE ))) - { - ERR("error copying, src: %s -> dst: %s\n", fn_src, fn_dst); - res = ERR_VCP_IOFAIL; - } - - vcp_status.prgFileRead.dwSoFar++; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATREAD, 0, 0, VCP_MsgRef); - vcp_status.prgFileWrite.dwSoFar++; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); - } - - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCOPYEND, 0, 0, VCP_MsgRef); - return res; -} - -/*********************************************************************** - * VcpFlush - internal (not exported), but documented - * - * VNFL_NOW is used for VcpFlush. - */ -RETERR16 VcpFlush16(WORD fl, LPCSTR lpszBackupDest) -{ - return OK; -} - -/*********************************************************************** - * VcpClose (SETUPX.201) - * - * Does callbacks (-> vifproc) with VCPM_VSTATCLOSESTART, - * VCPM_VSTATCLOSEEND. - * - * fl gets VCPFL_xxx flags to indicate what to do with the - * VIRTNODEs (files to mess with) created by e.g. GenInstall() - */ -RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) -{ - RETERR16 res = OK; - WORD cbres = VCPN_PROCEED; - - TRACE("(%04x, '%s')\n", fl, lpszBackupDest); - - /* FIXME: needs to sort virtnodes in case VCPFL_INSPECIFIEDORDER - * is not set. This is done by VCP_Callback(VCPM_NODECOMPARE) */ - - TRACE("#1\n"); - memset(&vcp_status, 0, sizeof(VCPSTATUS)); - /* yes, vcp_status.cbSize is 0 ! */ - TRACE("#2\n"); - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSESTART, 0, 0, VCP_MsgRef); - TRACE("#3\n"); - - res = VCP_CheckPaths(); - TRACE("#4\n"); - if (res != OK) - return res; /* is this ok ? */ - VCP_CopyFiles(); - - TRACE("#5\n"); - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0, VCP_MsgRef); - TRACE("#6\n"); - VCP_Proc = NULL; - VCP_opened = FALSE; - return OK; -} - -#if 0 -static RETERR16 VCP_RenameFiles(void) -{ - char fn_src[MAX_PATH], fn_dst[MAX_PATH]; - RETERR16 res = OK, cbres; - DWORD n; - LPVIRTNODE lpvn; - - cbres = VCP_Callback(&vcp_status, VCPM_VSTATRENAMESTART, 0, 0, VCP_MsgRef); - for (n = 0; n < vn_num; n++) - { - lpvn = pvnlist[n]; - if ((!lpvn) || ((lpvn->fl & VNFL_NODE_TYPE) != VNFL_RENAME)) continue; - strcpy(fn_src, VcpExplain16(lpvn, VCPEX_SRC_FULL)); - strcpy(fn_dst, VcpExplain16(lpvn, VCPEX_DST_FULL)); - cbres = VCP_Callback(&lpvn->vfsDst, VCPM_FILEOPENOUT, 0, (LPARAM)lpvn, VCP_MsgRef); - if (!(MoveFileExA(fn_src, fn_dst, MOVEFILE_REPLACE_EXISTING))) - res = ERR_VCP_IOFAIL; - else - VCP_VirtnodeDelete(lpvn); - } - cbres = VCP_Callback(&vcp_status, VCPM_VSTATRENAMEEND, 0, 0, VCP_MsgRef); - return res; -} -#endif - -/*********************************************************************** - * vcpDefCallbackProc (SETUPX.202) - */ -RETERR16 WINAPI vcpDefCallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, - LPARAM lParam, LPARAM lParamRef) -{ - static int count = 0; - if (count < 10) - FIXME("(%p, %04x, %04x, %08lx, %08lx) - what to do here ?\n", - lpvObj, uMsg, wParam, lParam, lParamRef); - count++; - return OK; -} - -/********************* point-and-click stuff from here ***********************/ - -static HWND hDlgCopy = 0; -static HKEY hKeyFiles = 0, hKeyRename = 0, hKeyConflict = 0; -static char BackupDir[12]; - -static INT_PTR CALLBACK VCP_UI_FileCopyDlgProc(HWND hWndDlg, UINT iMsg, WPARAM wParam, LPARAM lParam) -{ - INT_PTR retval = FALSE; - - if (iMsg == WM_INITDIALOG) - { - ShowWindow(hWndDlg, SW_SHOWNORMAL); - UpdateWindow(hWndDlg); - retval = TRUE; - } - return retval; -} - -static BOOL VCP_UI_GetDialogTemplate(LPCVOID *template32) -{ - HRSRC hResInfo; - HGLOBAL hDlgTmpl32; - - if (!(hResInfo = FindResourceA(SETUPAPI_hInstance, MAKEINTRESOURCEA(COPYFILEDLGORD), (LPSTR)RT_DIALOG))) - return FALSE; - if (!(hDlgTmpl32 = LoadResource(SETUPAPI_hInstance, hResInfo )) || - !(*template32 = LockResource( hDlgTmpl32 ))) - return FALSE; - return TRUE; -} - -static LRESULT WINAPI -VCP_UI_FileCopyWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - if (uMsg != WM_CREATE) - return DefWindowProcA (hwnd, uMsg, wParam, lParam); - - switch (uMsg) - { - case WM_CREATE: - return 0; - default: - FIXME("%04x: unhandled.\n", uMsg); - } - - return 0; -} - -static void VCP_UI_RegisterProgressClass(void) -{ - static BOOL registered = FALSE; - WNDCLASSA wndClass; - - if (registered) - return; - - registered = TRUE; - ZeroMemory (&wndClass, sizeof(WNDCLASSA)); - wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW; - wndClass.lpfnWndProc = VCP_UI_FileCopyWndProc; - wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = 0; - wndClass.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); - wndClass.hbrBackground = NULL; - wndClass.lpszClassName = "setupx_progress"; - - RegisterClassA (&wndClass); -} - -static RETERR16 VCP_UI_NodeCompare(LPVIRTNODE vn1, LPVIRTNODE vn2) -{ - LPCSTR file1, file2; - file1 = vsmGetStringRawName16(vn1->vfsSrc.vhstrFileName); - file2 = vsmGetStringRawName16(vn2->vfsSrc.vhstrFileName); - return (RETERR16)strcmp(file1, file2); -} - -static RETERR16 VCP_UI_CopyStart(void) -{ - LPCVOID template32; - char buf[256]; /* plenty */ - BOOL dirty; - DWORD len; - - /* FIXME: should be registered at DLL startup instead */ - VCP_UI_RegisterProgressClass(); - if (!(VCP_UI_GetDialogTemplate(&template32))) - return VCPN_FAIL; - - if (vn_num > 10) /* hack */ - { - hDlgCopy = CreateDialogIndirectParamA(SETUPAPI_hInstance, template32, 0, - VCP_UI_FileCopyDlgProc, 0); - if (!hDlgCopy) - return VCPN_FAIL; - SetDlgItemTextA(hDlgCopy, SOURCESTRORD, "Scanning ..."); - SetDlgItemTextA(hDlgCopy, DESTSTRORD, "NOT_IMPLEMENTED_YET"); - } - strcpy(buf, REG_INSTALLEDFILES); - if (RegCreateKeyA(HKEY_LOCAL_MACHINE, buf, &hKeyFiles)) - return VCPN_FAIL; - strcat(buf, REGPART_RENAME); - if (RegCreateKeyA(HKEY_LOCAL_MACHINE, buf, &hKeyRename)) - return VCPN_FAIL; - if (RegCreateKeyA(HKEY_LOCAL_MACHINE, REG_VERSIONCONFLICT, &hKeyConflict)) - return VCPN_FAIL; - len = 1; - if (!(RegQueryValueExA(hKeyConflict, "Dirty", NULL, 0, (LPBYTE)&dirty, &len))) - { - /* FIXME: what does SETUPX.DLL do in this case ? */ - MESSAGE("Warning: another program using SETUPX is already running ! Failed.\n"); - return VCPN_FAIL; - } - dirty = TRUE; - if (RegSetValueExA(hKeyConflict, "Dirty", 0, REG_BINARY, (LPBYTE)&dirty, 1)) - return VCPN_FAIL; - len = 12; - if (!(RegQueryValueExA(hKeyConflict, "BackupDirectory", NULL, 0, (LPBYTE)BackupDir, &len))) - strcpy(BackupDir, "VCM"); - - /* create C:\WINDOWS\[BackupDir] and set registry key to it */ - GetWindowsDirectoryA(buf, 256); - strcat(buf, "\\"); - strcat(buf, BackupDir); - if (!(CreateDirectoryA(buf, NULL))) - return VCPN_FAIL; - if (RegSetValueExA(hKeyConflict, "BackupDirectory", 0, REG_SZ, (LPBYTE)buf, strlen(buf)+1)) - return VCPN_FAIL; - RegCloseKey(hKeyConflict); - - return VCPN_OK; -} - -/*********************************************************************** - * vcpUICallbackProc (SETUPX.213) - */ -RETERR16 WINAPI vcpUICallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, - LPARAM lParam, LPARAM lParamRef) -{ - static int count = 0; - RETERR16 res = VCPN_OK, cbres; - - if (count < 5) - FIXME("(%p, %04x, %04x, %08lx, %08lx) - semi-stub\n", - lpvObj, uMsg, wParam, lParam, lParamRef); - count++; - switch (uMsg) - { - /* unused messages, it seems */ - case VCPM_DISKPREPINFO: - - case VCPM_FILENEEDED: - - case VCPM_NODECREATE: - case VCPM_NODEACCEPT: - - case VCPM_VSTATCLOSESTART: - case VCPM_VSTATPATHCHECKSTART: - case VCPM_VSTATPATHCHECKEND: - - case VCPM_CHECKPATH: - break; - - /* the real stuff */ - case VCPM_NODECOMPARE: - res = VCP_UI_NodeCompare((LPVIRTNODE)lpvObj, (LPVIRTNODE)lParam); - break; - case VCPM_VSTATREAD: - break; - case VCPM_VSTATWRITE: - cbres = VCP_Callback(&vcp_status, VCPM_DISKPREPINFO, 0, 0, VCP_MsgRef); - break; - case VCPM_VSTATCLOSEEND: - RegCloseKey(hKeyFiles); - RegCloseKey(hKeyRename); - RegDeleteKeyA(HKEY_LOCAL_MACHINE, REG_VERSIONCONFLICT); - break; - case VCPM_VSTATCOPYSTART: - res = VCP_UI_CopyStart(); - break; - case VCPM_VSTATCOPYEND: - if (hDlgCopy) DestroyWindow(hDlgCopy); - break; - default: - FIXME("unhandled msg 0x%04x\n", uMsg); - } - return res; -}

1 0

[arty] 22444: Fix small annoyance. Misplaced comma ftw.
by arty＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: arty Date: Wed Jun 21 07:30:54 2006 New Revision: 22444 URL: http://svn.reactos.ru/svn/reactos?rev=22444&view=rev Log: Fix small annoyance. Misplaced comma ftw. Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/iphlpapi/ifenum_r… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c (original) +++ trunk/reactos/dll/win32/iphlpapi/ifenum_reactos.c Wed Jun 21 07:30:54 2006 @@ -263,7 +263,7 @@ entry->ent.if_mtu, entry->ent.if_speed, entry->ent.if_physaddrlen); - DPRINT(" if_physaddr .................... %02x:%02x:%02x:%02x:%02x:%02x\n", + DPRINT(" if_physaddr .................... %02x:%02x:%02x:%02x:%02x:%02x\n" " if_descr ....................... %s\n", entry->ent.if_physaddr[0] & 0xff, entry->ent.if_physaddr[1] & 0xff,

1 0

[jimtabor] 22443: Sync to wine, User32. Tested with winefile, explorer with out any problems and no real improvements.
by jimtabor＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: jimtabor Date: Wed Jun 21 06:14:09 2006 New Revision: 22443 URL: http://svn.reactos.ru/svn/reactos?rev=22443&view=rev Log: Sync to wine, User32. Tested with winefile, explorer with out any problems and no real improvements. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/de… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Wed Jun 21 06:14:09 2006 @@ -37,8 +37,12 @@ HBRUSH SysBrushes[NUM_SYSCOLORS] = {0}; /* Bits in the dwKeyData */ -#define KEYDATA_ALT 0x2000 - +#define KEYDATA_ALT 0x2000 +#define KEYDATA_PREVSTATE 0x4000 + +static short iF10Key = 0; +static short iMenuSysKey = 0; + /* FUNCTIONS *****************************************************************/ void @@ -922,6 +926,39 @@ return GetSysColorBrush(COLOR_WINDOW); } +static void DefWndPrint( HWND hwnd, HDC hdc, ULONG uFlags) +{ + /* + * Visibility flag. + */ + if ( (uFlags & PRF_CHECKVISIBLE) && + !IsWindowVisible(hwnd) ) + return; + + /* + * Unimplemented flags. + */ + if ( (uFlags & PRF_CHILDREN) || + (uFlags & PRF_OWNED) || + (uFlags & PRF_NONCLIENT) ) + { + DPRINT1("WM_PRINT message with unsupported flags\n"); + } + + /* + * Background + */ + if ( uFlags & PRF_ERASEBKGND) + SendMessageW(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0); + + /* + * Client area + */ + if ( uFlags & PRF_CLIENT) + SendMessageW(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, PRF_CLIENT); +} + + VOID FASTCALL DefWndScreenshot(HWND hWnd) { @@ -960,11 +997,18 @@ return (DefWndNCHitTest(hWnd, Point)); } + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + case WM_MBUTTONDOWN: + iF10Key = iMenuSysKey = 0; + break; + case WM_NCLBUTTONDOWN: { return (DefWndNCLButtonDown(hWnd, wParam, lParam)); } + case WM_LBUTTONDBLCLK: case WM_NCLBUTTONDBLCLK: { return (DefWndNCLButtonDblClk(hWnd, wParam, lParam)); @@ -978,6 +1022,16 @@ case WM_WINDOWPOSCHANGED: { return (DefWndHandleWindowPosChanged(hWnd, (WINDOWPOS*)lParam)); + } + + case WM_NCRBUTTONDOWN: + { + /* in Windows, capture is taken when right-clicking on the caption bar */ + if (wParam == HTCAPTION) + { + SetCapture(hWnd); + } + break; } case WM_RBUTTONUP: @@ -1001,6 +1055,15 @@ } break; } + + case WM_NCRBUTTONUP: + /* + * FIXME : we must NOT send WM_CONTEXTMENU on a WM_NCRBUTTONUP (checked + * in Windows), but what _should_ we do? According to MSDN : + * "If it is appropriate to do so, the system sends the WM_SYSCOMMAND + * message to the window". When is it appropriate? + */ + break; case WM_CONTEXTMENU: { @@ -1057,7 +1120,7 @@ case WM_PRINT: { - /* FIXME: Implement. */ + DefWndPrint(hWnd, (HDC)wParam, lParam); return (0); } @@ -1196,6 +1259,9 @@ case WM_CTLCOLORSTATIC: case WM_CTLCOLORSCROLLBAR: return (LRESULT) DefWndControlColor((HDC)wParam, Msg - WM_CTLCOLORMSGBOX); + + case WM_CTLCOLOR: + return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam)); case WM_SETCURSOR: { @@ -1233,19 +1299,25 @@ return (DefWndHandleSysCommand(hWnd, wParam, Pt)); } - /* FIXME: Handle key messages. */ -/* + case WM_KEYDOWN: - case WM_KEYUP: - case WM_SYSKEYUP: - case WM_SYSCHAR: -*/ + if(wParam == VK_F10) iF10Key = VK_F10; + break; /* FIXME: This is also incomplete. */ case WM_SYSKEYDOWN: { if (HIWORD(lParam) & KEYDATA_ALT) { + /* if( HIWORD(lParam) & ~KEYDATA_PREVSTATE ) */ + if ( (wParam == VK_MENU || wParam == VK_LMENU + || wParam == VK_RMENU) && !iMenuSysKey ) + iMenuSysKey = 1; + else + iMenuSysKey = 0; + + iF10Key = 0; + if (wParam == VK_F4) /* Try to close the window */ { HWND top = GetAncestor(hWnd, GA_ROOT); @@ -1262,6 +1334,42 @@ DefWndScreenshot(hWnd); } } + else if( wParam == VK_F10 ) + iF10Key = 1; + else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) + SendMessageW( hWnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); + break; + } + + case WM_KEYUP: + case WM_SYSKEYUP: + { + /* Press and release F10 or ALT */ + if (((wParam == VK_MENU || wParam == VK_LMENU || wParam == VK_RMENU) + && iMenuSysKey) || ((wParam == VK_F10) && iF10Key)) + SendMessageW( GetAncestor( hWnd, GA_ROOT ), WM_SYSCOMMAND, SC_KEYMENU, 0L ); + iMenuSysKey = iF10Key = 0; + break; + } + + case WM_SYSCHAR: + { + iMenuSysKey = 0; + if (wParam == '\r' && IsIconic(hWnd)) + { + PostMessageW( hWnd, WM_SYSCOMMAND, SC_RESTORE, 0L ); + break; + } + if ((HIWORD(lParam) & KEYDATA_ALT) && wParam) + { + if (wParam == '\t' || wParam == '\x1b') break; + if (wParam == ' ' && (GetWindowLongW( hWnd, GWL_STYLE ) & WS_CHILD)) + SendMessageW( GetParent(hWnd), Msg, wParam, lParam ); + else + SendMessageW( hWnd, WM_SYSCOMMAND, SC_KEYMENU, wParam ); + } + else /* check for Ctrl-Esc */ + if (wParam != '\x1b') MessageBeep(0); break; } @@ -1270,17 +1378,11 @@ LONG Style; INT Ret = 0; - if (!lParam) - return 0; + if (!lParam) return 0; Style = GetWindowLongW(hWnd, GWL_STYLE); -// if (!(Style & WS_POPUP)) -// return 0; - if ((Style & WS_VISIBLE) && wParam) - return 0; - if (!(Style & WS_VISIBLE) && !wParam) - return 0; - if (!GetWindow(hWnd, GW_OWNER)) - return 0; + if ((Style & WS_VISIBLE) && wParam) return 0; + if (!(Style & WS_VISIBLE) && !wParam) return 0; + if (!GetWindow(hWnd, GW_OWNER)) return 0; Ret = NtUserCallTwoParam((DWORD) hWnd, (DWORD) wParam, TWOPARAM_ROUTINE_ROS_SHOWWINDOW); if(Ret) { @@ -1293,7 +1395,9 @@ case WM_CANCELMODE: { + iMenuSysKey = 0; /* FIXME: Check for a desktop. */ + if (!(GetWindowLongW( hWnd, GWL_STYLE ) & WS_CHILD)) EndMenu(); if (GetCapture() == hWnd) { ReleaseCapture(); @@ -1306,8 +1410,7 @@ return (-1); /* case WM_DROPOBJECT: - - break; + return DRAG_FILE; */ case WM_QUERYDROPOBJECT: { @@ -1403,6 +1506,11 @@ { return (1); } + + case WM_ENDSESSION: + if (wParam) PostQuitMessage(0); + return 0; + } return 0; }

1 0

[cwittich] 22442: -started to refactor the code -started to improve the design -use XmlSerialization to store the settings instead of parsing the QEmu commandline each time -this version does not work yet - all other settings have to be moved to QEmu.cs first
by cwittich＠svn.reactos.org 21 Jun '06

21 Jun '06

Author: cwittich Date: Wed Jun 21 04:13:55 2006 New Revision: 22442 URL: http://svn.reactos.ru/svn/reactos?rev=22442&view=rev Log: -started to refactor the code -started to improve the design -use XmlSerialization to store the settings instead of parsing the QEmu commandline each time -this version does not work yet - all other settings have to be moved to QEmu.cs first Added: trunk/tools/Qemu GUI/QEmu.cs Modified: trunk/tools/Qemu GUI/Form1.cs trunk/tools/Qemu GUI/Form1.resx [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/Qemu GUI/Form1.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Form1.cs?rev=22442… Modified: trunk/tools/Qemu GUI/Form1.resx URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/Form1.resx?rev=224… Added: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22442&…

1 0

[greatlrd] 22441: move back packmgr did move it by mistake
by greatlrd＠svn.reactos.org 20 Jun '06

20 Jun '06

Author: greatlrd Date: Wed Jun 21 01:12:15 2006 New Revision: 22441 URL: http://svn.reactos.ru/svn/reactos?rev=22441&view=rev Log: move back packmgr did move it by mistake Added: trunk/rosapps/packmgr/ - copied from r22440, trunk/tools/packmgr/ Removed: trunk/tools/packmgr/

1 0

[greatlrd] 22440: move qemu gui to tools
by greatlrd＠svn.reactos.org 20 Jun '06

20 Jun '06

Author: greatlrd Date: Wed Jun 21 01:11:39 2006 New Revision: 22440 URL: http://svn.reactos.ru/svn/reactos?rev=22440&view=rev Log: move qemu gui to tools Added: trunk/tools/Qemu GUI/ - copied from r22439, trunk/rosapps/Qemu GUI/ Removed: trunk/rosapps/Qemu GUI/

1 0

[greatlrd] 22439: Moved remotely
by greatlrd＠svn.reactos.org 20 Jun '06

20 Jun '06

Author: greatlrd Date: Wed Jun 21 01:11:04 2006 New Revision: 22439 URL: http://svn.reactos.ru/svn/reactos?rev=22439&view=rev Log: Moved remotely Added: trunk/tools/packmgr/ - copied from r22438, trunk/rosapps/packmgr/ Removed: trunk/rosapps/packmgr/

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