ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
July 2016
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
18 participants
358 discussions
Start a n
N
ew thread
[tfaber] 72016: [0.4.2] - Add a hack to avoid MmGetPhysicalAddress failures during USB transfers CORE-9224
by tfaber@svn.reactos.org
Author: tfaber Date: Wed Jul 27 10:55:39 2016 New Revision: 72016 URL:
http://svn.reactos.org/svn/reactos?rev=72016&view=rev
Log: [0.4.2] - Add a hack to avoid MmGetPhysicalAddress failures during USB transfers CORE-9224 Modified: branches/ros-branch-0_4_2/reactos/drivers/usb/usbehci/usb_request.cpp branches/ros-branch-0_4_2/reactos/drivers/usb/usbohci/usb_request.cpp Modified: branches/ros-branch-0_4_2/reactos/drivers/usb/usbehci/usb_request.cpp URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/driver…
============================================================================== --- branches/ros-branch-0_4_2/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Wed Jul 27 10:55:39 2016 @@ -601,6 +601,7 @@ // // get address // + *(volatile char *)TransferBuffer; // HACK for CORE-9224 Address = MmGetPhysicalAddress(TransferBuffer); // Modified: branches/ros-branch-0_4_2/reactos/drivers/usb/usbohci/usb_request.cpp URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/driver…
============================================================================== --- branches/ros-branch-0_4_2/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Wed Jul 27 10:55:39 2016 @@ -771,6 +771,7 @@ // // get physical page // + *(volatile char *)Buffer; // HACK for CORE-9224 Page = MmGetPhysicalAddress(Buffer).LowPart; // @@ -1087,6 +1088,7 @@ // // store physical address of buffer // + *(volatile char *)TransferBuffer; // HACK for CORE-9224 CurrentDescriptor->BufferPhysical = MmGetPhysicalAddress(TransferBuffer).LowPart; CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + TransferBufferLength - 1; @@ -1503,6 +1505,7 @@ // // store physical address of buffer // + *(volatile char *)MmGetMdlVirtualAddress(m_TransferBufferMDL); // HACK for CORE-9224 DataDescriptor->BufferPhysical = MmGetPhysicalAddress(MmGetMdlVirtualAddress(m_TransferBufferMDL)).LowPart; DataDescriptor->LastPhysicalByteAddress = DataDescriptor->BufferPhysical + m_TransferBufferLength - 1;
8 years, 5 months
1
0
0
0
[tfaber] 72015: [0.4.2] - Update start menu banner
by tfaber@svn.reactos.org
Author: tfaber Date: Wed Jul 27 10:48:19 2016 New Revision: 72015 URL:
http://svn.reactos.org/svn/reactos?rev=72015&view=rev
Log: [0.4.2] - Update start menu banner Added: branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158-rc1.bmp - copied, changed from r72012, branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158.bmp branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158-rc2.bmp - copied, changed from r72012, branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158.bmp branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158-rc3.bmp - copied, changed from r72012, branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158.bmp Modified: branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158.bmp Copied: branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158-rc1.bmp (from r72012, branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158.bmp) URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/base/s…
============================================================================== Binary files - no diff available. Copied: branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158-rc2.bmp (from r72012, branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158.bmp) URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/base/s…
============================================================================== Binary files - no diff available. Copied: branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158-rc3.bmp (from r72012, branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158.bmp) URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/base/s…
============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_2/reactos/base/shell/explorer/res/bmp/158.bmp URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/base/s…
============================================================================== Binary files - no diff available.
8 years, 5 months
1
0
0
0
[akhaldi] 72014: [0.4.2] * Disable COMMAND.COM debugging messages. CORE-10710
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jul 27 10:42:15 2016 New Revision: 72014 URL:
http://svn.reactos.org/svn/reactos?rev=72014&view=rev
Log: [0.4.2] * Disable
COMMAND.COM
debugging messages. CORE-10710 Modified: branches/ros-branch-0_4_2/reactos/subsystems/mvdm/dos/command.S Modified: branches/ros-branch-0_4_2/reactos/subsystems/mvdm/dos/command.S URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/subsys…
============================================================================== --- branches/ros-branch-0_4_2/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/subsystems/mvdm/dos/command.S [iso-8859-1] Wed Jul 27 10:42:15 2016 @@ -17,7 +17,7 @@ #include "asmxtras.inc" #include <isvbop.inc> -// #define NDEBUG +#define NDEBUG /* DEFINES ********************************************************************/
8 years, 5 months
1
0
0
0
[akhaldi] 72013: [0.4.2] * Apply the Wordpad related hack from CORE-5823 by Jared Smudde.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jul 27 10:40:42 2016 New Revision: 72013 URL:
http://svn.reactos.org/svn/reactos?rev=72013&view=rev
Log: [0.4.2] * Apply the Wordpad related hack from CORE-5823 by Jared Smudde. Modified: branches/ros-branch-0_4_2/reactos/base/applications/wordpad/res/formatbar.bmp branches/ros-branch-0_4_2/reactos/base/applications/wordpad/res/toolbar.bmp Modified: branches/ros-branch-0_4_2/reactos/base/applications/wordpad/res/formatbar.bmp URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/base/a…
============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_4_2/reactos/base/applications/wordpad/res/toolbar.bmp URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/base/a…
============================================================================== Binary files - no diff available.
8 years, 5 months
1
0
0
0
[akhaldi] 72012: [0.4.2] * Apply the patch that allows us to dynamically change the resolution by resizing in VirtualBox. CORE-6742
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jul 27 10:34:01 2016 New Revision: 72012 URL:
http://svn.reactos.org/svn/reactos?rev=72012&view=rev
Log: [0.4.2] * Apply the patch that allows us to dynamically change the resolution by resizing in VirtualBox. CORE-6742 Modified: branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/device.c branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/device.h branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/pdevobj.c branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/display.c Modified: branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/device.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/win32s…
============================================================================== --- branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/device.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/device.c [iso-8859-1] Wed Jul 27 10:34:01 2016 @@ -30,99 +30,22 @@ return STATUS_SUCCESS; } - -PGRAPHICS_DEVICE -NTAPI -EngpRegisterGraphicsDevice( - _In_ PUNICODE_STRING pustrDeviceName, - _In_ PUNICODE_STRING pustrDiplayDrivers, - _In_ PUNICODE_STRING pustrDescription, +BOOLEAN +EngpPopulateDeviceModeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, _In_ PDEVMODEW pdmDefault) { - PGRAPHICS_DEVICE pGraphicsDevice; - PDEVICE_OBJECT pDeviceObject; - PFILE_OBJECT pFileObject; - NTSTATUS Status; PWSTR pwsz; - ULONG i, cj, cModes = 0; - SIZE_T cjWritten; - BOOL bEnable = TRUE; + PLDEVOBJ pldev; PDEVMODEINFO pdminfo; PDEVMODEW pdm, pdmEnd; - PLDEVOBJ pldev; + ULONG i, cModes = 0; BOOLEAN bModeMatch = FALSE; - TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); - - /* Allocate a GRAPHICS_DEVICE structure */ - pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, - sizeof(GRAPHICS_DEVICE), - GDITAG_GDEVICE); - if (!pGraphicsDevice) - { - ERR("ExAllocatePoolWithTag failed\n"); - return NULL; - } - - /* Try to open the driver */ - Status = IoGetDeviceObjectPointer(pustrDeviceName, - FILE_READ_DATA | FILE_WRITE_DATA, - &pFileObject, - &pDeviceObject); - if (!NT_SUCCESS(Status)) - { - ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; - } - - /* Enable the device */ - EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); - - /* Copy the device and file object pointers */ - pGraphicsDevice->DeviceObject = pDeviceObject; - pGraphicsDevice->FileObject = pFileObject; - - /* Copy device name */ - RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, - sizeof(pGraphicsDevice->szNtDeviceName), - pustrDeviceName->Buffer, - pustrDeviceName->Length); - - /* Create a win device name (FIXME: virtual devices!) */ - swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); - - /* Allocate a buffer for the strings */ - cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR); - pwsz = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_DRVSUP); - if (!pwsz) - { - ERR("Could not allocate string buffer\n"); - ASSERT(FALSE); // FIXME - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; - } - - /* Copy display driver names */ - pGraphicsDevice->pDiplayDrivers = pwsz; - RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, - pustrDiplayDrivers->Buffer, - pustrDiplayDrivers->Length); - - /* Copy description */ - pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); - RtlCopyMemory(pGraphicsDevice->pwszDescription, - pustrDescription->Buffer, - pustrDescription->Length); - pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; - - /* Initialize the pdevmodeInfo list and default index */ - pGraphicsDevice->pdevmodeInfo = NULL; - pGraphicsDevice->iDefaultMode = 0; - pGraphicsDevice->iCurrentMode = 0; - - // FIXME: initialize state flags - pGraphicsDevice->StateFlags = 0; + ASSERT(pGraphicsDevice->pdevmodeInfo == NULL); + ASSERT(pGraphicsDevice->pDevModeList == NULL); + + pwsz = pGraphicsDevice->pDiplayDrivers; /* Loop through the driver names * This is a REG_MULTI_SZ string */ @@ -138,7 +61,7 @@ } /* Get the mode list from the driver */ - pdminfo = LDEVOBJ_pdmiGetModes(pldev, pDeviceObject); + pdminfo = LDEVOBJ_pdmiGetModes(pldev, pGraphicsDevice->DeviceObject); if (!pdminfo) { ERR("Could not get mode list for '%ls'\n", pwsz); @@ -170,8 +93,7 @@ if (!pGraphicsDevice->pdevmodeInfo || cModes == 0) { ERR("No devmodes\n"); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; + return FALSE; } /* Allocate an index buffer */ @@ -182,8 +104,7 @@ if (!pGraphicsDevice->pDevModeList) { ERR("No devmode list\n"); - ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); - return NULL; + return FALSE; } TRACE("Looking for mode %lux%lux%lu(%lu Hz)\n", @@ -232,7 +153,106 @@ pGraphicsDevice->pDevModeList[i].pdm = pdm; i++; } - } + } + return TRUE; +} + +PGRAPHICS_DEVICE +NTAPI +EngpRegisterGraphicsDevice( + _In_ PUNICODE_STRING pustrDeviceName, + _In_ PUNICODE_STRING pustrDiplayDrivers, + _In_ PUNICODE_STRING pustrDescription, + _In_ PDEVMODEW pdmDefault) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVICE_OBJECT pDeviceObject; + PFILE_OBJECT pFileObject; + NTSTATUS Status; + PWSTR pwsz; + ULONG cj; + SIZE_T cjWritten; + BOOL bEnable = TRUE; + + TRACE("EngpRegisterGraphicsDevice(%wZ)\n", pustrDeviceName); + + /* Allocate a GRAPHICS_DEVICE structure */ + pGraphicsDevice = ExAllocatePoolWithTag(PagedPool, + sizeof(GRAPHICS_DEVICE), + GDITAG_GDEVICE); + if (!pGraphicsDevice) + { + ERR("ExAllocatePoolWithTag failed\n"); + return NULL; + } + + /* Try to open the driver */ + Status = IoGetDeviceObjectPointer(pustrDeviceName, + FILE_READ_DATA | FILE_WRITE_DATA, + &pFileObject, + &pDeviceObject); + if (!NT_SUCCESS(Status)) + { + ERR("Could not open driver %wZ, 0x%lx\n", pustrDeviceName, Status); + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } + + /* Enable the device */ + EngFileWrite(pFileObject, &bEnable, sizeof(BOOL), &cjWritten); + + /* Copy the device and file object pointers */ + pGraphicsDevice->DeviceObject = pDeviceObject; + pGraphicsDevice->FileObject = pFileObject; + + /* Copy device name */ + RtlStringCbCopyNW(pGraphicsDevice->szNtDeviceName, + sizeof(pGraphicsDevice->szNtDeviceName), + pustrDeviceName->Buffer, + pustrDeviceName->Length); + + /* Create a win device name (FIXME: virtual devices!) */ + swprintf(pGraphicsDevice->szWinDeviceName, L"\\\\.\\DISPLAY%d", (int)giDevNum); + + /* Allocate a buffer for the strings */ + cj = pustrDiplayDrivers->Length + pustrDescription->Length + sizeof(WCHAR); + pwsz = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_DRVSUP); + if (!pwsz) + { + ERR("Could not allocate string buffer\n"); + ASSERT(FALSE); // FIXME + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } + + /* Copy display driver names */ + pGraphicsDevice->pDiplayDrivers = pwsz; + RtlCopyMemory(pGraphicsDevice->pDiplayDrivers, + pustrDiplayDrivers->Buffer, + pustrDiplayDrivers->Length); + + /* Copy description */ + pGraphicsDevice->pwszDescription = pwsz + pustrDiplayDrivers->Length / sizeof(WCHAR); + RtlCopyMemory(pGraphicsDevice->pwszDescription, + pustrDescription->Buffer, + pustrDescription->Length); + pGraphicsDevice->pwszDescription[pustrDescription->Length/sizeof(WCHAR)] = 0; + + /* Initialize the pdevmodeInfo list and default index */ + pGraphicsDevice->pdevmodeInfo = NULL; + pGraphicsDevice->iDefaultMode = 0; + pGraphicsDevice->iCurrentMode = 0; + + // FIXME: initialize state flags + pGraphicsDevice->StateFlags = 0; + + /* Create the mode list */ + pGraphicsDevice->pDevModeList = NULL; + if (!EngpPopulateDeviceModeList(pGraphicsDevice, pdmDefault)) + { + ExFreePoolWithTag(pGraphicsDevice, GDITAG_GDEVICE); + return NULL; + } /* Lock loader */ EngAcquireSemaphore(ghsemGraphicsDeviceList); @@ -250,7 +270,7 @@ /* Unlock loader */ EngReleaseSemaphore(ghsemGraphicsDeviceList); - TRACE("Prepared %lu modes for %ls\n", cModes, pGraphicsDevice->pwszDescription); + TRACE("Prepared %lu modes for %ls\n", pGraphicsDevice->cDevModes, pGraphicsDevice->pwszDescription); return pGraphicsDevice; } Modified: branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/device.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/win32s…
============================================================================== --- branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/device.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/device.h [iso-8859-1] Wed Jul 27 10:34:01 2016 @@ -2,6 +2,11 @@ #pragma once #define TAG_GDEV 'gdev' + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev); extern PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; extern PGRAPHICS_DEVICE gpVgaGraphicsDevice; @@ -29,6 +34,11 @@ _In_ PUNICODE_STRING pustrDescription, _In_ PDEVMODEW pdmDefault); +BOOLEAN +EngpPopulateDeviceModeList( + _Inout_ PGRAPHICS_DEVICE pGraphicsDevice, + _In_ PDEVMODEW pdmDefault); + INIT_FUNCTION NTSTATUS NTAPI Modified: branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/pdevobj.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/win32s…
============================================================================== --- branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Wed Jul 27 10:34:01 2016 @@ -249,6 +249,45 @@ DPRINT("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface); return ppdev->pSurface; +} + +VOID +NTAPI +PDEVOBJ_vRefreshModeList( + PPDEVOBJ ppdev) +{ + PGRAPHICS_DEVICE pGraphicsDevice; + PDEVMODEINFO pdminfo, pdmiNext; + DEVMODEW dmDefault; + + /* Lock the PDEV */ + EngAcquireSemaphore(ppdev->hsemDevLock); + + pGraphicsDevice = ppdev->pGraphicsDevice; + + /* Remember our default mode */ + dmDefault = *pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm; + + /* Clear out the modes */ + for (pdminfo = pGraphicsDevice->pdevmodeInfo; + pdminfo; + pdminfo = pdmiNext) + { + pdmiNext = pdminfo->pdmiNext; + ExFreePoolWithTag(pdminfo, GDITAG_DEVMODE); + } + pGraphicsDevice->pdevmodeInfo = NULL; + ExFreePoolWithTag(pGraphicsDevice->pDevModeList, GDITAG_GDEVICE); + pGraphicsDevice->pDevModeList = NULL; + + /* Now re-populate the list */ + if (!EngpPopulateDeviceModeList(pGraphicsDevice, &dmDefault)) + { + DPRINT1("FIXME: EngpPopulateDeviceModeList failed, we just destroyed a perfectly good mode list\n"); + } + + /* Unlock PDEV */ + EngReleaseSemaphore(ppdev->hsemDevLock); } PDEVMODEW Modified: branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/display.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/win32s…
============================================================================== --- branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Wed Jul 27 10:34:01 2016 @@ -463,22 +463,34 @@ PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEENTRY pdmentry; ULONG i, iFoundMode; + PPDEVOBJ ppdev; TRACE("Enter UserEnumDisplaySettings('%wZ', %lu)\n", pustrDevice, iModeNum); /* Ask GDI for the GRAPHICS_DEVICE */ pGraphicsDevice = EngpFindGraphicsDevice(pustrDevice, 0, 0); - - if (!pGraphicsDevice) + ppdev = EngpGetPDEV(pustrDevice); + + if (!pGraphicsDevice || !ppdev) { /* No device found */ ERR("No device found!\n"); return STATUS_UNSUCCESSFUL; } + /* let's politely ask the driver for an updated mode list, + just in case there's something new in there (vbox) */ + + PDEVOBJ_vRefreshModeList(ppdev); + PDEVOBJ_vRelease(ppdev); + + /* FIXME: maybe only refresh when iModeNum is bigger than cDevModes? */ if (iModeNum >= pGraphicsDevice->cDevModes) + { + ERR("STATUS_NO_MORE_ENTRIES!\n"); return STATUS_NO_MORE_ENTRIES; + } iFoundMode = 0; for (i = 0; i < pGraphicsDevice->cDevModes; i++)
8 years, 5 months
1
0
0
0
[akhaldi] 72011: [0.4.2] Update the version number.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jul 27 10:09:46 2016 New Revision: 72011 URL:
http://svn.reactos.org/svn/reactos?rev=72011&view=rev
Log: [0.4.2] Update the version number. Modified: branches/ros-branch-0_4_2/reactos/sdk/include/reactos/version.cmake Modified: branches/ros-branch-0_4_2/reactos/sdk/include/reactos/version.cmake URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/sdk/in…
============================================================================== --- branches/ros-branch-0_4_2/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Wed Jul 27 10:09:46 2016 @@ -17,15 +17,15 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "5") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "4") +set(KERNEL_VERSION_PATCH_LEVEL "2") set(COPYRIGHT_YEAR "2016") # KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "") +set(KERNEL_VERSION_RELEASE_TYPE "RC1") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") if(KERNEL_VERSION_PATCH_LEVEL)
8 years, 5 months
1
0
0
0
[akhaldi] 72010: [0.4.2] Branch for the release.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Wed Jul 27 09:56:46 2016 New Revision: 72010 URL:
http://svn.reactos.org/svn/reactos?rev=72010&view=rev
Log: [0.4.2] Branch for the release. Added: branches/ros-branch-0_4_2/ - copied from r72009, trunk/
8 years, 5 months
1
0
0
0
[hbelusca] 72009: [SETUPAPI]: Implement SetupPromptForDiskA/W by importing dialog.c from Wine Staging 1.9.15. (Add also the patch "Add patch to support IDF_CHECKFIRST in SetupPromptForDisk." by Dar...
by hbelusca@svn.reactos.org
Author: hbelusca Date: Wed Jul 27 00:48:41 2016 New Revision: 72009 URL:
http://svn.reactos.org/svn/reactos?rev=72009&view=rev
Log: [SETUPAPI]: Implement SetupPromptForDiskA/W by importing dialog.c from Wine Staging 1.9.15. (Add also the patch "Add patch to support IDF_CHECKFIRST in SetupPromptForDisk." by DarkPlayer - 541cc8d08661980dfe80fe2bb9dd27c91879e09f) Added: trunk/reactos/dll/win32/setupapi/dialog.c (with props) Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt trunk/reactos/dll/win32/setupapi/lang/bg-BG.rc trunk/reactos/dll/win32/setupapi/lang/cs-CZ.rc trunk/reactos/dll/win32/setupapi/lang/da-DK.rc trunk/reactos/dll/win32/setupapi/lang/de-DE.rc trunk/reactos/dll/win32/setupapi/lang/en-US.rc trunk/reactos/dll/win32/setupapi/lang/es-ES.rc trunk/reactos/dll/win32/setupapi/lang/fi-FI.rc trunk/reactos/dll/win32/setupapi/lang/fr-FR.rc trunk/reactos/dll/win32/setupapi/lang/he-IL.rc trunk/reactos/dll/win32/setupapi/lang/hu-HU.rc trunk/reactos/dll/win32/setupapi/lang/id-ID.rc trunk/reactos/dll/win32/setupapi/lang/it-IT.rc trunk/reactos/dll/win32/setupapi/lang/ja-JP.rc trunk/reactos/dll/win32/setupapi/lang/ko-KR.rc trunk/reactos/dll/win32/setupapi/lang/nl-NL.rc trunk/reactos/dll/win32/setupapi/lang/no-NO.rc trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc trunk/reactos/dll/win32/setupapi/lang/pt-BR.rc trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc trunk/reactos/dll/win32/setupapi/lang/ru-RU.rc trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc trunk/reactos/dll/win32/setupapi/lang/sq-AL.rc trunk/reactos/dll/win32/setupapi/lang/sv-SE.rc trunk/reactos/dll/win32/setupapi/lang/th-TH.rc trunk/reactos/dll/win32/setupapi/lang/tr-TR.rc trunk/reactos/dll/win32/setupapi/lang/uk-UA.rc trunk/reactos/dll/win32/setupapi/lang/zh-CN.rc trunk/reactos/dll/win32/setupapi/lang/zh-TW.rc trunk/reactos/dll/win32/setupapi/resource.h trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/stubs.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi…
============================================================================== --- trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -16,6 +16,7 @@ cfgmgr.c devclass.c devinst.c + dialog.c dirid.c diskspace.c driver.c @@ -40,7 +41,7 @@ set_module_type(setupapi win32dll UNICODE) target_link_libraries(setupapi uuid wine ${PSEH_LIB}) -add_delay_importlibs(setupapi shell32 winspool wintrust) +add_delay_importlibs(setupapi comdlg32 shell32 winspool wintrust) add_importlibs(setupapi gdi32 comctl32 advapi32 user32 rpcrt4 version msvcrt kernel32 ntdll) add_pch(setupapi setupapi_private.h SOURCE) add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/setupapi/dialog.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/dialog.…
============================================================================== --- trunk/reactos/dll/win32/setupapi/dialog.c (added) +++ trunk/reactos/dll/win32/setupapi/dialog.c [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -0,0 +1,281 @@ +/* + * SetupAPI dialog functions + * + * Copyright 2009 Ricardo Filipe + * + * 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 + */ + +#include "setupapi_private.h" + +struct promptdisk_params { + PCWSTR DialogTitle; + PCWSTR DiskName; + PCWSTR PathToSource; + PCWSTR FileSought; + PCWSTR TagFile; + DWORD DiskPromptStyle; + PWSTR PathBuffer; + DWORD PathBufferSize; + PDWORD PathRequiredSize; +}; + +/* initiates the fields of the SetupPromptForDisk dialog according to the parameters +*/ +static void promptdisk_init(HWND hwnd, struct promptdisk_params *params) +{ + SetWindowLongPtrW(hwnd, DWLP_USER, (LONG_PTR)params); + + if(params->DialogTitle) + SetWindowTextW(hwnd, params->DialogTitle); + if(params->PathToSource) + SetDlgItemTextW(hwnd, IDC_PATH, params->PathToSource); + + if(!(params->DiskPromptStyle & IDF_OEMDISK)) + { + WCHAR message[256+2*MAX_PATH]; + WCHAR format[256]; + WCHAR unknown[256]; + DWORD_PTR args[2]; + LoadStringW(hInstance, IDS_PROMPTDISK, format, + sizeof(format)/sizeof(format[0])); + + args[0] = (DWORD_PTR)params->FileSought; + if(params->DiskName) + args[1] = (DWORD_PTR)params->DiskName; + else + { + LoadStringW(hInstance, IDS_UNKNOWN, unknown, + sizeof(unknown)/sizeof(unknown[0])); + args[1] = (DWORD_PTR)unknown; + } + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + format, 0, 0, message, sizeof(message)/sizeof(*message), + (__ms_va_list*)args); + SetDlgItemTextW(hwnd, IDC_FILENEEDED, message); + + LoadStringW(hInstance, IDS_INFO, message, + sizeof(message)/sizeof(message[0])); + SetDlgItemTextW(hwnd, IDC_INFO, message); + LoadStringW(hInstance, IDS_COPYFROM, message, + sizeof(message)/sizeof(message[0])); + SetDlgItemTextW(hwnd, IDC_COPYFROM, message); + } + if(params->DiskPromptStyle & IDF_NOBROWSE) + ShowWindow(GetDlgItem(hwnd, IDC_RUNDLG_BROWSE), SW_HIDE); +} + +/* When the user clicks in the Ok button in SetupPromptForDisk dialog + * if the parameters are good it copies the path from the dialog to the output buffer + * saves the required size for the buffer if PathRequiredSize is given + * returns NO_ERROR if there is no PathBuffer to copy too + * returns DPROMPT_BUFFERTOOSMALL if the path is too big to fit in PathBuffer + */ +static void promptdisk_ok(HWND hwnd, struct promptdisk_params *params) +{ + int requiredSize; + WCHAR aux[MAX_PATH]; + GetWindowTextW(GetDlgItem(hwnd, IDC_PATH), aux, MAX_PATH); + requiredSize = strlenW(aux)+1; + + if(params->PathRequiredSize) + { + *params->PathRequiredSize = requiredSize; + TRACE("returning PathRequiredSize=%d\n",*params->PathRequiredSize); + } + if(!params->PathBuffer) + { + EndDialog(hwnd, NO_ERROR); + return; + } + if(requiredSize > params->PathBufferSize) + { + EndDialog(hwnd, DPROMPT_BUFFERTOOSMALL); + return; + } + strcpyW(params->PathBuffer, aux); + TRACE("returning PathBuffer=%s\n", debugstr_w(params->PathBuffer)); + EndDialog(hwnd, DPROMPT_SUCCESS); +} + +/* When the user clicks the browse button in SetupPromptForDisk dialog + * it copies the path of the selected file to the dialog path field + */ +static void promptdisk_browse(HWND hwnd, struct promptdisk_params *params) +{ + OPENFILENAMEW ofn; + ZeroMemory(&ofn, sizeof(ofn)); + + ofn.lStructSize = sizeof(ofn); + ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; + ofn.hwndOwner = hwnd; + ofn.nMaxFile = MAX_PATH; + ofn.lpstrFile = HeapAlloc(GetProcessHeap(), 0, MAX_PATH*sizeof(WCHAR)); + strcpyW(ofn.lpstrFile, params->FileSought); + + if(GetOpenFileNameW(&ofn)) + { + WCHAR* last_slash = strrchrW(ofn.lpstrFile, '\\'); + if (last_slash) *last_slash = 0; + SetDlgItemTextW(hwnd, IDC_PATH, ofn.lpstrFile); + } + HeapFree(GetProcessHeap(), 0, ofn.lpstrFile); +} + +/* Handles the messages sent to the SetupPromptForDisk dialog +*/ +static INT_PTR CALLBACK promptdisk_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) + { + case WM_INITDIALOG: + promptdisk_init(hwnd, (struct promptdisk_params *)lParam); + return TRUE; + case WM_COMMAND: + switch(wParam) + { + case IDOK: + { + struct promptdisk_params *params = + (struct promptdisk_params *)GetWindowLongPtrW(hwnd, DWLP_USER); + promptdisk_ok(hwnd, params); + return TRUE; + } + case IDCANCEL: + EndDialog(hwnd, DPROMPT_CANCEL); + return TRUE; + case IDC_RUNDLG_BROWSE: + { + struct promptdisk_params *params = + (struct promptdisk_params *)GetWindowLongPtrW(hwnd, DWLP_USER); + promptdisk_browse(hwnd, params); + return TRUE; + } + } + } + return FALSE; +} + +/*********************************************************************** + * SetupPromptForDiskA (SETUPAPI.@) + */ +UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskName, + PCSTR PathToSource, PCSTR FileSought, PCSTR TagFile, DWORD DiskPromptStyle, + PSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) +{ + WCHAR *DialogTitleW, *DiskNameW, *PathToSourceW; + WCHAR *FileSoughtW, *TagFileW, PathBufferW[MAX_PATH]; + UINT ret, length; + + TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_a(DialogTitle), + debugstr_a(DiskName), debugstr_a(PathToSource), debugstr_a(FileSought), + debugstr_a(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, + PathRequiredSize); + + DialogTitleW = strdupAtoW(DialogTitle); + DiskNameW = strdupAtoW(DiskName); + PathToSourceW = strdupAtoW(PathToSource); + FileSoughtW = strdupAtoW(FileSought); + TagFileW = strdupAtoW(TagFile); + + ret = SetupPromptForDiskW(hwndParent, DialogTitleW, DiskNameW, PathToSourceW, + FileSoughtW, TagFileW, DiskPromptStyle, PathBufferW, MAX_PATH, PathRequiredSize); + + HeapFree(GetProcessHeap(), 0, DialogTitleW); + HeapFree(GetProcessHeap(), 0, DiskNameW); + HeapFree(GetProcessHeap(), 0, PathToSourceW); + HeapFree(GetProcessHeap(), 0, FileSoughtW); + HeapFree(GetProcessHeap(), 0, TagFileW); + + if(ret == DPROMPT_SUCCESS) + { + length = WideCharToMultiByte(CP_ACP, 0, PathBufferW, -1, NULL, 0, NULL, NULL); + if(PathRequiredSize) *PathRequiredSize = length; + if(PathBuffer) + { + if(length > PathBufferSize) + return DPROMPT_BUFFERTOOSMALL; + WideCharToMultiByte(CP_ACP, 0, PathBufferW, -1, PathBuffer, length, NULL, NULL); + } + } + return ret; +} + +/*********************************************************************** + * SetupPromptForDiskW (SETUPAPI.@) + */ +UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR DiskName, + PCWSTR PathToSource, PCWSTR FileSought, PCWSTR TagFile, DWORD DiskPromptStyle, + PWSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) +{ + struct promptdisk_params params; + UINT ret; + + TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_w(DialogTitle), + debugstr_w(DiskName), debugstr_w(PathToSource), debugstr_w(FileSought), + debugstr_w(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, + PathRequiredSize); + + if(!FileSought) + { + SetLastError(ERROR_INVALID_PARAMETER); + return DPROMPT_CANCEL; + } + + if (PathToSource && (DiskPromptStyle & IDF_CHECKFIRST)) + { + static const WCHAR format[] = {'%', 's', '\\', '%', 's', '\0'}; + WCHAR filepath[MAX_PATH]; + + if (strlenW(PathToSource) + 1 + strlenW(FileSought) < sizeof(filepath)) + { + snprintfW(filepath, MAX_PATH, format, PathToSource, FileSought); + + if (GetFileAttributesW(filepath) != INVALID_FILE_ATTRIBUTES) + { + if (PathRequiredSize) + *PathRequiredSize = strlenW(PathToSource) + 1; + + if (!PathBuffer) + return DPROMPT_SUCCESS; + + if (PathBufferSize >= strlenW(PathToSource) + 1) + { + strcpyW(PathBuffer, PathToSource); + return DPROMPT_SUCCESS; + } + else + return DPROMPT_BUFFERTOOSMALL; + } + } + } + + params.DialogTitle = DialogTitle; + params.DiskName = DiskName; + params.PathToSource = PathToSource; + params.FileSought = FileSought; + params.TagFile = TagFile; + params.DiskPromptStyle = DiskPromptStyle; + params.PathBuffer = PathBuffer; + params.PathBufferSize = PathBufferSize; + params.PathRequiredSize = PathRequiredSize; + + ret = DialogBoxParamW(hInstance, MAKEINTRESOURCEW(IDPROMPTFORDISK), + hwndParent, promptdisk_proc, (LPARAM)¶ms); + + if(ret == DPROMPT_CANCEL) + SetLastError(ERROR_CANCELLED); + return ret; +} Propchange: trunk/reactos/dll/win32/setupapi/dialog.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/setupapi/lang/bg-BG.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/bg…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/bg-BG.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "ТÑÑбва да пÑезапÑÑнеÑе компÑÑÑÑа, за да пÑиклÑÑено ÑлаганеÑо. ÐÑкаÑе ли да го напÑавиÑе?" Modified: trunk/reactos/dll/win32/setupapi/lang/cs-CZ.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/cs…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/cs-CZ.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -19,6 +19,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Aby mohla být instalace dokonÄena, musà být poÄÃtaÄ restartován. PokraÄovat?" Modified: trunk/reactos/dll/win32/setupapi/lang/da-DK.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/da…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/da-DK.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Your computer needs to be rebooted to finish installation. Do you want to proceed?" Modified: trunk/reactos/dll/win32/setupapi/lang/de-DE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/de…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/de-DE.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Ihr Computer muss zum Beenden der Installation neu gestartet werden. Wollen Sie fortfahren?" Modified: trunk/reactos/dll/win32/setupapi/lang/en-US.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/en…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/en-US.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Your computer needs to be rebooted to finish installation. Do you want to proceed?" Modified: trunk/reactos/dll/win32/setupapi/lang/es-ES.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/es…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/es-ES.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Su equipo debe ser reinicializada para completar la instalación. ¿Desea continuar?" Modified: trunk/reactos/dll/win32/setupapi/lang/fi-FI.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/fi…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/fi-FI.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Your computer needs to be rebooted to finish installation. Do you want to proceed?" Modified: trunk/reactos/dll/win32/setupapi/lang/fr-FR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/fr…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/fr-FR.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Votre ordinateur doit être redémarré pour terminer l'installation. Voulez-vous redémarrer ?" Modified: trunk/reactos/dll/win32/setupapi/lang/he-IL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/he…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/he-IL.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "צר×× ××פע×× ×××ש ×ת ××ש×× ××× ×ס××× ×ת ×××ª×§× ×. ××× ×רצ×× × ×××ש××?" Modified: trunk/reactos/dll/win32/setupapi/lang/hu-HU.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/hu…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/hu-HU.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "A számÃtógépet újra kell indÃtani a telepÃtés befejezéséhez. Szeretnéd most újraindÃtani?" Modified: trunk/reactos/dll/win32/setupapi/lang/id-ID.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/id…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/id-ID.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Komputer anda perlu di-boot ulang untuk menyelesaikan instalasi. Anda ingin melakukannya?" Modified: trunk/reactos/dll/win32/setupapi/lang/it-IT.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/it…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/it-IT.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Il computer deve essere riavviato per completare l'installazione. Volete procedere?" Modified: trunk/reactos/dll/win32/setupapi/lang/ja-JP.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/ja…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/ja-JP.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Your computer needs to be rebooted to finish installation. Do you want to proceed?" Modified: trunk/reactos/dll/win32/setupapi/lang/ko-KR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/ko…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/ko-KR.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Your computer needs to be rebooted to finish installation. Do you want to proceed?" Modified: trunk/reactos/dll/win32/setupapi/lang/nl-NL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/nl…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/nl-NL.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Your computer needs to be rebooted to finish installation. Do you want to proceed?" Modified: trunk/reactos/dll/win32/setupapi/lang/no-NO.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/no…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/no-NO.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Din datamaskin trenger å startes på nytt for å fullføre installasjonen. Vil du starte på nytt?" Modified: trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/pl…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/pl-PL.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Twój komputer musi zostaÄ zrestartowany, by ukoÅczyÄ instalacjÄ. Czy chcesz kontynuowaÄ?" Modified: trunk/reactos/dll/win32/setupapi/lang/pt-BR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/pt…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/pt-BR.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -28,6 +28,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Your computer needs to be rebooted to finish installation. Do you want to proceed?" Modified: trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/ro…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/ro-RO.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Este necesarÄ repornirea calculatorului pentru a finaliza instalarea. ContinuaÈi?" Modified: trunk/reactos/dll/win32/setupapi/lang/ru-RU.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/ru…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/ru-RU.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "ÐÐ°Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð´Ð¾Ð»Ð¶ÐµÐ½ бÑÑÑ Ð¿ÐµÑезагÑÑжен, ÑÑÐ¾Ð±Ñ Ð·Ð°Ð²ÐµÑÑиÑÑ ÑÑÑановкÑ. ÐÑодолжиÑÑ?" Modified: trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/sk…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/sk-SK.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -18,6 +18,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Pre dokonÄenie inÅ¡talácie je potrebné reÅ¡tartovaÅ¥ poÄÃtaÄ. Chcete pokraÄovaÅ¥?" Modified: trunk/reactos/dll/win32/setupapi/lang/sq-AL.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/sq…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/sq-AL.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -17,6 +17,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Kompjuteri juaj duhet të rifillohet për të përfunduar instalimin. A doni të vazhdoni?" Modified: trunk/reactos/dll/win32/setupapi/lang/sv-SE.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/sv…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/sv-SE.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Your computer needs to be rebooted to finish installation. Do you want to proceed?" Modified: trunk/reactos/dll/win32/setupapi/lang/th-TH.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/th…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/th-TH.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "à¹à¸¡à¸·à¹à¸à¹à¸ªà¸£à¹à¸à¸ªà¸´à¹à¸à¸à¸²à¸£à¸à¸´à¸à¸à¸±à¹à¸à¹à¸¥à¹à¸§ à¸à¸à¸¡à¸à¸´à¸§à¹à¸à¸à¸£à¹à¸à¸à¸à¸à¸¸à¸à¸à¸³à¹à¸à¹à¸à¸à¹à¸à¸à¹à¸à¸´à¸à¹à¸à¸£à¸·à¹à¸à¸à¹à¸«à¸¡à¹/n/n à¸à¸¸à¸à¸à¹à¸à¸à¸à¸²à¸£à¹à¸à¸´à¸à¹à¸à¸£à¸·à¹à¸à¸à¹à¸«à¸¡à¹à¹à¸à¸µà¹à¸¢à¸§à¸à¸µà¹à¹à¸¥à¸¢à¸«à¸£à¸·à¸à¹à¸¡à¹?" Modified: trunk/reactos/dll/win32/setupapi/lang/tr-TR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/tr…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/tr-TR.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -13,6 +13,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "Bilgisayarınız kurulumunuz bitirilmesi için yeniden baÅlatılacak. Onaylıyor musunuz?" Modified: trunk/reactos/dll/win32/setupapi/lang/uk-UA.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/uk…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/uk-UA.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -21,6 +21,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "ÐÐ»Ñ Ð·Ð°ÐºÑнÑÐµÐ½Ð½Ñ ÑÑÑановки Ð½ÐµÐ¾Ð±Ñ Ñдно пеÑезапÑÑÑиÑи ÐÐ°Ñ ÐºÐ¾Ð¼Ð¿'ÑÑеÑ. ÐÑодовжиÑи?" Modified: trunk/reactos/dll/win32/setupapi/lang/zh-CN.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/zh…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/zh-CN.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -15,6 +15,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "æ¨ç计ç®æºéè¦éæ°å¯å¨æè½å®æå®è£ ãæ¨è¦ç»§ç»åï¼" Modified: trunk/reactos/dll/win32/setupapi/lang/zh-TW.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/zh…
============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/zh-TW.rc [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -15,6 +15,28 @@ CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +IDPROMPTFORDISK DIALOG 0, 0, 260, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Files Needed" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Insert the manufacturer's installation disk, and then\nmake sure the correct drive is selected below", IDC_FILENEEDED, 10, 10, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 38, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Copy manufacturer's files from:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + DEFPUSHBUTTON "OK", IDOK, 195, 10, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 195, 30, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Browse...", IDC_RUNDLG_BROWSE, 195, 100, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_PROMPTDISK "The file '%1' on %2 is needed" + IDS_UNKNOWN "Unknown" + IDS_COPYFROM "Copy files from:" + IDS_INFO "Type the path where the file is located, and then click OK." +END + STRINGTABLE BEGIN IDS_QUERY_REBOOT_TEXT "æ¨çè¨ç®æ©éè¦éæ°ååæè½å®æå®è£ãæ¨è¦ç¹¼çºåï¼" Modified: trunk/reactos/dll/win32/setupapi/resource.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/resourc…
============================================================================== --- trunk/reactos/dll/win32/setupapi/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/resource.h [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -1,4 +1,15 @@ #pragma once + +#define IDC_FILENEEDED 503 +#define IDC_INFO 504 +#define IDC_COPYFROM 505 +#define IDC_PATH 506 +#define IDC_RUNDLG_BROWSE 507 + +#define IDS_PROMPTDISK 508 +#define IDS_UNKNOWN 509 +#define IDS_COPYFROM 510 +#define IDS_INFO 511 #define IDS_QUERY_REBOOT_TEXT 1000 #define IDS_QUERY_REBOOT_CAPTION 2000 @@ -8,6 +19,8 @@ #define SOURCESTRORD 3001 #define DESTSTRORD 3002 #define PROGRESSORD 3003 + +#define IDPROMPTFORDISK 3004 #define IDI_SETUPAPI_DISP_ADAPT 1 #define IDI_SETUPAPI_MOUSE 2 Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap…
============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -30,10 +30,14 @@ #include <windef.h> #include <winbase.h> +#include <winuser.h> +#include <wingdi.h> #include <winreg.h> -#include <wingdi.h> #include <winspool.h> #include <wincon.h> + +#include <commdlg.h> + #include <objbase.h> #include <cfgmgr32.h> #include <regstr.h> @@ -53,6 +57,8 @@ #ifdef __REACTOS__ #undef __WINESRC__ #endif + +#include "resource.h" #define SETUP_DEVICE_INFO_SET_MAGIC 0xd00ff057 #define SETUP_CLASS_IMAGE_LIST_MAGIC 0xd00ff058 @@ -240,6 +246,16 @@ }; extern HINSTANCE hInstance; +extern OSVERSIONINFOEXW OsVersionInfo; + +/* + * See:
https://msdn.microsoft.com/en-us/library/bb432397(v=vs.85).aspx
+ * for more information. + */ +extern DWORD GlobalSetupFlags; +#define PSPGF_NO_BACKUP 0x0002 +#define PSPGF_NONINTERACTIVE 0x0004 + #define RC_STRING_MAX_SIZE 256 #define REG_INSTALLEDFILES "System\\CurrentControlSet\\Control\\InstalledFiles" @@ -280,17 +296,6 @@ #define _S_IWRITE 0x0080 #define _S_IREAD 0x0100 -extern HINSTANCE hInstance; -extern OSVERSIONINFOEXW OsVersionInfo; - -/* - * See:
https://msdn.microsoft.com/en-us/library/bb432397(v=vs.85).aspx
- * for more information. - */ -extern DWORD GlobalSetupFlags; -#define PSPGF_NO_BACKUP 0x0002 -#define PSPGF_NONINTERACTIVE 0x0004 - /* devinst.c */ BOOL Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c…
============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -56,33 +56,6 @@ return FALSE; } -/*********************************************************************** - * SetupPromptForDiskA (SETUPAPI.@) - */ -UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskName, - PCSTR PathToSource, PCSTR FileSought, PCSTR TagFile, DWORD DiskPromptStyle, - PSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) -{ - FIXME("%p %s %s %s %s %s %d %p %d %p: stub\n", hwndParent, debugstr_a(DialogTitle), - debugstr_a(DiskName), debugstr_a(PathToSource), debugstr_a(FileSought), - debugstr_a(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, - PathRequiredSize); - return 0; -} - -/*********************************************************************** - * SetupPromptForDiskW (SETUPAPI.@) - */ -UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR DiskName, - PCWSTR PathToSource, PCWSTR FileSought, PCWSTR TagFile, DWORD DiskPromptStyle, - PWSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) -{ - FIXME("%p %s %s %s %s %s %d %p %d %p: stub\n", hwndParent, debugstr_w(DialogTitle), - debugstr_w(DiskName), debugstr_w(PathToSource), debugstr_w(FileSought), - debugstr_w(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, - PathRequiredSize); - return 0; -} /*********************************************************************** * SetupDiRemoveDevice(SETUPAPI.@) Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Jul 27 00:48:41 2016 @@ -338,6 +338,7 @@ reactos/dll/win32/secur32/wrapper.c # Synced to WineStaging-1.9.4 setupapi - + reactos/dll/win32/setupapi/dialog.c # Synced to WineStaging-1.9.15 reactos/dll/win32/setupapi/query.c # Partially synced to WineStaging-1.9.4 reactos/dll/win32/setupapi/setupcab.c # Synced to WineStaging-1.9.4
8 years, 5 months
1
0
0
0
[hbelusca] 72008: [SETUPAPI] - Transform the cached OsVersionInfo structure into a OSVERSIONINFOEXW that is then reused in SetupDiGetActualSectionToInstallExW. - Remove few unused hardcoded strings...
by hbelusca@svn.reactos.org
Author: hbelusca Date: Wed Jul 27 00:10:14 2016 New Revision: 72008 URL:
http://svn.reactos.org/svn/reactos?rev=72008&view=rev
Log: [SETUPAPI] - Transform the cached OsVersionInfo structure into a OSVERSIONINFOEXW that is then reused in SetupDiGetActualSectionToInstallExW. - Remove few unused hardcoded strings. - Add two TRACEs in SetupDiGetActualSectionToInstallExW to debug diverse INF file installation problems. - parser.c: enclose the contents of the for-loop inside braces. - Implement pSetupSetGlobalFlags and pSetupModifyGlobalFlags, see
https://msdn.microsoft.com/en-us/library/bb432397(v=vs.85).aspx
- Popup an error message box in InstallHinfSectionW if an error happened and if interactive setup is allowed (through the global setup flags). Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/setupcab.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst…
============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Wed Jul 27 00:10:14 2016 @@ -23,8 +23,6 @@ /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; -static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; -static const WCHAR Class[] = {'C','l','a','s','s',0}; static const WCHAR DateFormat[] = {'%','u','-','%','u','-','%','u',0}; static const WCHAR DotCoInstallers[] = {'.','C','o','I','n','s','t','a','l','l','e','r','s',0}; static const WCHAR DotHW[] = {'.','H','W',0}; @@ -459,21 +457,16 @@ if (CurrentPlatform.cbSize != sizeof(SP_ALTPLATFORM_INFO)) { /* That's the first time we go here. We need to fill in the structure */ - OSVERSIONINFOEX VersionInfo; SYSTEM_INFO SystemInfo; - VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - ret = GetVersionExW((OSVERSIONINFO*)&VersionInfo); - if (!ret) - goto done; GetSystemInfo(&SystemInfo); CurrentPlatform.cbSize = sizeof(SP_ALTPLATFORM_INFO); - CurrentPlatform.Platform = VersionInfo.dwPlatformId; - CurrentPlatform.MajorVersion = VersionInfo.dwMajorVersion; - CurrentPlatform.MinorVersion = VersionInfo.dwMinorVersion; + CurrentPlatform.Platform = OsVersionInfo.dwPlatformId; + CurrentPlatform.MajorVersion = OsVersionInfo.dwMajorVersion; + CurrentPlatform.MinorVersion = OsVersionInfo.dwMinorVersion; CurrentPlatform.ProcessorArchitecture = SystemInfo.wProcessorArchitecture; CurrentPlatform.Reserved = 0; - CurrentProductType = VersionInfo.wProductType; - CurrentSuiteMask = VersionInfo.wSuiteMask; + CurrentProductType = OsVersionInfo.wProductType; + CurrentSuiteMask = OsVersionInfo.wSuiteMask; } ProductType = CurrentProductType; SuiteMask = CurrentSuiteMask; @@ -489,6 +482,7 @@ CallbackInfo.BestScore4 = ULONG_MAX; CallbackInfo.BestScore5 = ULONG_MAX; strcpyW(CallbackInfo.BestSection, InfSectionName); + TRACE("EnumerateSectionsStartingWith(InfSectionName = %S)\n", InfSectionName); if (!EnumerateSectionsStartingWith( InfHandle, InfSectionName, @@ -498,6 +492,7 @@ SetLastError(ERROR_GEN_FAILURE); goto done; } + TRACE("CallbackInfo.BestSection = %S\n", CallbackInfo.BestSection); dwFullLength = lstrlenW(CallbackInfo.BestSection); if (RequiredSize != NULL) @@ -1011,7 +1006,7 @@ dwLength = MAX_CLASS_NAME_LEN * sizeof(WCHAR); if (!RegQueryValueExW(hClassKey, - Class, + REGSTR_VAL_CLASS, NULL, NULL, (LPBYTE)szClassName, @@ -1163,7 +1158,7 @@ return FALSE; /* Retrieve the class name data and close the key */ - rc = QueryRegistryValue(hKey, Class, (LPBYTE *) &Buffer, &dwRegType, &dwLength); + rc = QueryRegistryValue(hKey, REGSTR_VAL_CLASS, (LPBYTE *) &Buffer, &dwRegType, &dwLength); RegCloseKey(hKey); /* Make sure we got the data */ @@ -3613,7 +3608,7 @@ if (!SetupGetLineTextW(NULL, hInf, Version, - ClassGUID, + REGSTR_VAL_CLASSGUID, Buffer, MAX_PATH, &RequiredSize)) @@ -3634,7 +3629,7 @@ if (!SetupGetLineTextW(NULL, hInf, Version, - Class, + REGSTR_VAL_CLASS, Buffer, MAX_PATH, &RequiredSize)) @@ -3657,7 +3652,7 @@ } if (RegSetValueExW(hClassKey, - Class, + REGSTR_VAL_CLASS, 0, REG_SZ, (LPBYTE)Buffer, Modified: trunk/reactos/dll/win32/setupapi/install.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install…
============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Wed Jul 27 00:10:14 2016 @@ -1459,25 +1459,25 @@ */ void WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, LPCWSTR cmdline, INT show ) { + BOOL ret = FALSE; WCHAR *s, *path, section[MAX_PATH]; void *callback_context = NULL; DWORD SectionNameLength; UINT mode; HINF hinf = INVALID_HANDLE_VALUE; BOOL bRebootRequired = FALSE; - BOOL ret; TRACE("hwnd %p, handle %p, cmdline %s\n", hwnd, handle, debugstr_w(cmdline)); lstrcpynW( section, cmdline, MAX_PATH ); - if (!(s = strchrW( section, ' ' ))) return; + if (!(s = strchrW( section, ' ' ))) goto cleanup; *s++ = 0; while (*s == ' ') s++; mode = atoiW( s ); /* quoted paths are not allowed on native, the rest of the command line is taken as the path */ - if (!(s = strchrW( s, ' ' ))) return; + if (!(s = strchrW( s, ' ' ))) goto cleanup; while (*s == ' ') s++; path = s; @@ -1576,6 +1576,12 @@ SetupTermDefaultQueueCallback( callback_context ); if ( hinf != INVALID_HANDLE_VALUE ) SetupCloseInfFile( hinf ); + + // TODO: Localize the error string. + if (!ret && !(GlobalSetupFlags & PSPGF_NONINTERACTIVE)) + { + MessageBoxW(hwnd, section, L"setupapi.dll: An error happened...", MB_ICONERROR | MB_OK); + } } Modified: trunk/reactos/dll/win32/setupapi/misc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?…
============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Wed Jul 27 00:10:14 2016 @@ -838,25 +838,37 @@ } -static DWORD global_flags = 0; /* FIXME: what should be in here? */ +/* + * See:
https://msdn.microsoft.com/en-us/library/bb432397(v=vs.85).aspx
+ * for more information. + */ +DWORD GlobalSetupFlags = 0; /*********************************************************************** * pSetupGetGlobalFlags (SETUPAPI.@) */ DWORD WINAPI pSetupGetGlobalFlags(void) { + return GlobalSetupFlags; +} + +/*********************************************************************** + * pSetupModifyGlobalFlags (SETUPAPI.@) + */ +void WINAPI pSetupModifyGlobalFlags( DWORD mask, DWORD flags ) +{ FIXME( "stub\n" ); - return global_flags; -} - + GlobalSetupFlags = (GlobalSetupFlags & ~mask) | (flags & mask); +} /*********************************************************************** * pSetupSetGlobalFlags (SETUPAPI.@) */ void WINAPI pSetupSetGlobalFlags( DWORD flags ) { - global_flags = flags; -} + pSetupModifyGlobalFlags(0xFFFFFFFF, flags); +} + /*********************************************************************** * AssertFail (SETUPAPI.@) Modified: trunk/reactos/dll/win32/setupapi/parser.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.…
============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Wed Jul 27 00:10:14 2016 @@ -2383,10 +2383,12 @@ unsigned int i; for (i = 0; i < file->nb_sections; i++) + { if (strncmpiW(pStr, file->sections[i]->name, len) == 0) { if (!Callback(file->sections[i]->name, Context)) return FALSE; } + } return TRUE; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap…
============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Wed Jul 27 00:10:14 2016 @@ -569,7 +569,7 @@ @ stdcall pSetupIsUserAdmin() @ stub pSetupMakeSurePathExists @ stub pSetupMalloc -@ stub pSetupModifyGlobalFlags +@ stdcall pSetupModifyGlobalFlags(long long) @ stdcall pSetupMultiByteToUnicode(str long) @ stdcall pSetupOpenAndMapFileForRead(wstr ptr ptr ptr ptr) @ stub pSetupOutOfMemory Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap…
============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Wed Jul 27 00:10:14 2016 @@ -281,7 +281,15 @@ #define _S_IREAD 0x0100 extern HINSTANCE hInstance; -extern OSVERSIONINFOW OsVersionInfo; +extern OSVERSIONINFOEXW OsVersionInfo; + +/* + * See:
https://msdn.microsoft.com/en-us/library/bb432397(v=vs.85).aspx
+ * for more information. + */ +extern DWORD GlobalSetupFlags; +#define PSPGF_NO_BACKUP 0x0002 +#define PSPGF_NONINTERACTIVE 0x0004 /* devinst.c */ Modified: trunk/reactos/dll/win32/setupapi/setupcab.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupca…
============================================================================== --- trunk/reactos/dll/win32/setupapi/setupcab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupcab.c [iso-8859-1] Wed Jul 27 00:10:14 2016 @@ -29,10 +29,10 @@ #include <share.h> #include <fdi.h> -HINSTANCE hInstance = 0; -OSVERSIONINFOW OsVersionInfo; - -static HINSTANCE CABINET_hInstance = 0; +HINSTANCE hInstance = NULL; +OSVERSIONINFOEXW OsVersionInfo; + +static HINSTANCE CABINET_hInstance = NULL; static HFDI (__cdecl *sc_FDICreate)(PFNALLOC, PFNFREE, PFNOPEN, PFNREAD, PFNWRITE, PFNCLOSE, PFNSEEK, int, PERF); @@ -652,8 +652,8 @@ switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); - OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); - if (!GetVersionExW(&OsVersionInfo)) + OsVersionInfo.dwOSVersionInfoSize = sizeof(OsVersionInfo); + if (!GetVersionExW((POSVERSIONINFOW)&OsVersionInfo)) return FALSE; hInstance = (HINSTANCE)hinstDLL; break;
8 years, 5 months
1
0
0
0
[hbelusca] 72007: [NTVDM]: Don't attempt to deinitialize the video console if it wasn't previously initialized. CORE-10182 #resolve
by hbelusca@svn.reactos.org
Author: hbelusca Date: Tue Jul 26 19:57:40 2016 New Revision: 72007 URL:
http://svn.reactos.org/svn/reactos?rev=72007&view=rev
Log: [NTVDM]: Don't attempt to deinitialize the video console if it wasn't previously initialized. CORE-10182 #resolve Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/console/video.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cons…
============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/console/video.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/console/video.c [iso-8859-1] Tue Jul 26 19:57:40 2016 @@ -806,7 +806,10 @@ BOOLEAN VgaConsoleInitialize(HANDLE TextHandle) { - /* Save the default text-mode console output handle */ + /* + * Initialize the console video by saving the default + * text-mode console output handle, if it is valid. + */ if (!IsConsoleHandle(TextHandle)) return FALSE; TextConsoleBuffer = TextHandle; @@ -814,6 +817,7 @@ if (!GetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo) || !GetConsoleScreenBufferInfo(TextConsoleBuffer, &OrgConsoleBufferInfo)) { + TextConsoleBuffer = NULL; return FALSE; } ConsoleInfo = OrgConsoleBufferInfo; @@ -826,8 +830,13 @@ VOID VgaConsoleCleanup(VOID) { + /* If the console video was not initialized, just return */ + if (!TextConsoleBuffer) + return; + VgaDetachFromConsole(); + // TODO: We need to initialize those events before using them! CloseHandle(AnotherEvent); CloseHandle(EndEvent); CloseHandle(StartEvent);
8 years, 5 months
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
9
...
36
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
Results per page:
10
25
50
100
200