Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 27 Jul '16

27 Jul '16

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++)

1 0

[akhaldi] 72011: [0.4.2] Update the version number.
by akhaldi＠svn.reactos.org 27 Jul '16

27 Jul '16

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)

1 0

[akhaldi] 72010: [0.4.2] Branch for the release.
by akhaldi＠svn.reactos.org 27 Jul '16

27 Jul '16

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/

1 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 27 Jul '16

27 Jul '16

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)&params); + + 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

1 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 27 Jul '16

27 Jul '16

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;

1 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 26 Jul '16

26 Jul '16

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);

1 0

[hbelusca] 72006: [INF]: Use the correct icon for audio controller devices in the device manager. By Jared Smudde. CORE-11679 #resolve #comment Committed, thanks!
by hbelusca＠svn.reactos.org 26 Jul '16

26 Jul '16

Author: hbelusca Date: Tue Jul 26 19:09:18 2016 New Revision: 72006 URL: http://svn.reactos.org/svn/reactos?rev=72006&view=rev Log: [INF]: Use the correct icon for audio controller devices in the device manager. By Jared Smudde. CORE-11679 #resolve #comment Committed, thanks! Modified: trunk/reactos/media/inf/audio.inf Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=72… ============================================================================== --- trunk/reactos/media/inf/audio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Tue Jul 26 19:09:18 2016 @@ -21,8 +21,8 @@ [AUDIOClass.NT.AddReg] HKR, , , 0, %AUDIOClassName% HKR, , EnumPropPages32,0, "MmSys.Cpl,MediaPropPageProvider" -HKR, , Icon, 0, "-51" -HKR, , Installer32, 0, "MmSys.Cpl,MediaClassInstaller" +HKR, , Icon, 0, "3004" +HKR, , Installer32, 0, "MmSys.Cpl,MediaClassInstaller" ;-------------------------------- Audio installation ----------------------------------------

1 0

[apriyadarshi] 72005: Fixed write crashes, write support working. Tested on win2k3 sp2 vmware sata
by apriyadarshi＠svn.reactos.org 26 Jul '16

26 Jul '16

Author: apriyadarshi Date: Tue Jul 26 15:38:14 2016 New Revision: 72005 URL: http://svn.reactos.org/svn/reactos?rev=72005&view=rev Log: Fixed write crashes, write support working. Tested on win2k3 sp2 vmware sata Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c Modified: branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/AHCI/drivers/storage/… ============================================================================== --- branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] (original) +++ branches/GSoC_2016/AHCI/drivers/storage/storahci/storahci.c [iso-8859-1] Tue Jul 26 15:38:14 2016 @@ -1800,7 +1800,6 @@ { SrbExtension->Flags |= ATA_FLAGS_DATA_OUT; SrbExtension->CommandReg = IDE_COMMAND_WRITE_DMA; - //NT_ASSERT(FALSE); } SrbExtension->FeaturesLow = 0; @@ -1813,7 +1812,15 @@ if (PortExtension->DeviceParams.Lba48BitMode) { SrbExtension->Flags |= ATA_FLAGS_48BIT_COMMAND; - SrbExtension->CommandReg = IDE_COMMAND_READ_DMA_EXT; + + if (IsReading) + { + SrbExtension->CommandReg = IDE_COMMAND_READ_DMA_EXT; + } + else + { + SrbExtension->CommandReg = IDE_COMMAND_WRITE_DMA_EXT; + } SrbExtension->LBA3 = (StartOffset >> 24) & 0xFF; SrbExtension->LBA4 = (StartOffset >> 32) & 0xFF;

1 0

[gadamopoulos] 72004: [BROWSEUI] - CExplorerBand: Implement showing the context menu on right click. - Part of the work submitted by Sylvain Deverre. CORE-10838
by gadamopoulos＠svn.reactos.org 26 Jul '16

26 Jul '16

Author: gadamopoulos Date: Tue Jul 26 15:09:04 2016 New Revision: 72004 URL: http://svn.reactos.org/svn/reactos?rev=72004&view=rev Log: [BROWSEUI] - CExplorerBand: Implement showing the context menu on right click. - Part of the work submitted by Sylvain Deverre. CORE-10838 Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp trunk/reactos/dll/win32/browseui/explorerband.h Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Tue Jul 26 15:09:04 2016 @@ -142,6 +142,33 @@ return reinterpret_cast<NodeInfo*>(tvItem.lParam); } +HRESULT CExplorerBand::ExecuteCommand(CComPtr<IContextMenu>& menu, UINT nCmd) +{ + CComPtr<IOleWindow> pBrowserOleWnd; + CMINVOKECOMMANDINFO cmi; + HWND browserWnd; + HRESULT hr; + + hr = IUnknown_QueryService(pSite, SID_SShellBrowser, IID_PPV_ARG(IOleWindow, &pBrowserOleWnd)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pBrowserOleWnd->GetWindow(&browserWnd); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + ZeroMemory(&cmi, sizeof(cmi)); + cmi.cbSize = sizeof(cmi); + cmi.lpVerb = MAKEINTRESOURCEA(nCmd); + cmi.hwnd = browserWnd; + if (GetKeyState(VK_SHIFT) & 0x8000) + cmi.fMask |= CMIC_MASK_SHIFT_DOWN; + if (GetKeyState(VK_CONTROL) & 0x8000) + cmi.fMask |= CMIC_MASK_CONTROL_DOWN; + + return menu->InvokeCommand(&cmi); +} + HRESULT CExplorerBand::UpdateBrowser(LPITEMIDLIST pidlGoto) { CComPtr<IShellBrowser> pBrowserService; @@ -197,17 +224,111 @@ { NodeInfo* pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem); - UpdateBrowser(pNodeInfo->absolutePidl); - /* Prevents navigation if selection is initiated inside the band */ if (bNavigating) return; + UpdateBrowser(pNodeInfo->absolutePidl); + SetFocus(); // Expand the node //TreeView_Expand(m_hWnd, pnmtv->itemNew.hItem, TVE_EXPAND); } + +// *** ATL event handlers *** +LRESULT CExplorerBand::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + HTREEITEM item; + NodeInfo *info; + HMENU treeMenu; + WORD x; + WORD y; + CComPtr<IShellFolder> pFolder; + CComPtr<IContextMenu> contextMenu; + HRESULT hr; + UINT uCommand; + LPITEMIDLIST pidlChild; + + treeMenu = NULL; + item = TreeView_GetSelection(m_hWnd); + bHandled = TRUE; + if (!item) + { + goto Cleanup; + } + + x = LOWORD(lParam); + y = HIWORD(lParam); + if (x == -1 && y == -1) + { + // TODO: grab position of tree item and position it correctly + } + + info = GetNodeInfo(item); + if (!info) + { + ERR("No node data, something has gone wrong !\n"); + goto Cleanup; + } + hr = SHBindToParent(info->absolutePidl, IID_PPV_ARG(IShellFolder, &pFolder), + (LPCITEMIDLIST*)&pidlChild); + if (!SUCCEEDED(hr)) + { + ERR("Can't bind to folder!\n"); + goto Cleanup; + } + hr = pFolder->GetUIObjectOf(m_hWnd, 1, (LPCITEMIDLIST*)&pidlChild, IID_IContextMenu, + NULL, reinterpret_cast<void**>(&contextMenu)); + if (!SUCCEEDED(hr)) + { + ERR("Can't get IContextMenu interface\n"); + goto Cleanup; + } + treeMenu = CreatePopupMenu(); + hr = contextMenu->QueryContextMenu(treeMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, + CMF_EXPLORE); + if (!SUCCEEDED(hr)) + { + WARN("Can't get context menu for item\n"); + DestroyMenu(treeMenu); + goto Cleanup; + } + uCommand = TrackPopupMenu(treeMenu, TPM_LEFTALIGN | TPM_RETURNCMD | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, + x, y, 0, m_hWnd, NULL); + + ExecuteCommand(contextMenu, uCommand); +Cleanup: + if (treeMenu) + DestroyMenu(treeMenu); + bNavigating = TRUE; + TreeView_SelectItem(m_hWnd, oldSelected); + bNavigating = FALSE; + return TRUE; +} + +LRESULT CExplorerBand::ContextMenuHack(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + bHandled = FALSE; + if (uMsg == WM_RBUTTONDOWN) + { + TVHITTESTINFO info; + info.pt.x = LOWORD(lParam); + info.pt.y = HIWORD(lParam); + info.flags = TVHT_ONITEM; + info.hItem = NULL; + + // Save the current location + oldSelected = TreeView_GetSelection(m_hWnd); + + // Move to the item selected by the treeview (don't change right pane) + TreeView_HitTest(m_hWnd, &info); + bNavigating = TRUE; + TreeView_SelectItem(m_hWnd, info.hItem); + bNavigating = FALSE; + } + return FALSE; /* let the wndproc process the message */ +} // *** Helper functions *** HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort) { @@ -723,6 +844,7 @@ // *** IWinEventHandler methods *** HRESULT STDMETHODCALLTYPE CExplorerBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { + BOOL bHandled; if (uMsg == WM_NOTIFY) { NMHDR *pNotifyHeader = (NMHDR*)lParam; @@ -734,6 +856,74 @@ case TVN_SELCHANGED: OnSelectionChanged((LPNMTREEVIEW)lParam); break; + case NM_RCLICK: + OnContextMenu(WM_CONTEXTMENU, (WPARAM)m_hWnd, GetMessagePos(), bHandled); + *theResult = 1; + break; + case TVN_BEGINLABELEDITW: + { + // TODO: put this in a function ? (mostly copypasta from CDefView) + DWORD dwAttr = SFGAO_CANRENAME; + LPNMTVDISPINFO dispInfo = (LPNMTVDISPINFO)lParam; + CComPtr<IShellFolder> pParent; + LPCITEMIDLIST pChild; + HRESULT hr; + + *theResult = 1; + NodeInfo *info = GetNodeInfo(dispInfo->item.hItem); + if (!info) + return E_FAIL; + hr = SHBindToParent(info->absolutePidl, IID_PPV_ARG(IShellFolder, &pParent), &pChild); + if (!SUCCEEDED(hr) || !pParent.p) + return E_FAIL; + + hr = pParent->GetAttributesOf(1, &pChild, &dwAttr); + if (SUCCEEDED(hr) && (dwAttr & SFGAO_CANRENAME)) + *theResult = 0; + return S_OK; + } + case TVN_ENDLABELEDITW: + { + LPNMTVDISPINFO dispInfo = (LPNMTVDISPINFO)lParam; + NodeInfo *info = GetNodeInfo(dispInfo->item.hItem); + HRESULT hr; + + *theResult = 0; + if (dispInfo->item.pszText) + { + LPITEMIDLIST pidlNew; + CComPtr<IShellFolder> pParent; + LPCITEMIDLIST pidlChild; + + hr = SHBindToParent(info->absolutePidl, IID_PPV_ARG(IShellFolder, &pParent), &pidlChild); + if (!SUCCEEDED(hr) || !pParent.p) + return E_FAIL; + + hr = pParent->SetNameOf(0, pidlChild, dispInfo->item.pszText, SHGDN_INFOLDER, &pidlNew); + if(SUCCEEDED(hr) && pidlNew) + { + CComPtr<IPersistFolder2> pPersist; + LPITEMIDLIST pidlParent, pidlNewAbs; + + hr = pParent->QueryInterface(IID_PPV_ARG(IPersistFolder2, &pPersist)); + if(!SUCCEEDED(hr)) + return E_FAIL; + + hr = pPersist->GetCurFolder(&pidlParent); + if(!SUCCEEDED(hr)) + return E_FAIL; + pidlNewAbs = ILCombine(pidlParent, pidlNew); + + // Navigate to our new location + UpdateBrowser(pidlNewAbs); + + ILFree(pidlNewAbs); + ILFree(pidlNew); + *theResult = 1; + } + return S_OK; + } + } default: break; } Modified: trunk/reactos/dll/win32/browseui/explorerband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] Tue Jul 26 15:09:04 2016 @@ -61,6 +61,7 @@ DWORD dwBandID; HIMAGELIST hImageList; HTREEITEM hRoot; + HTREEITEM oldSelected; // *** notification cookies *** DWORD adviseCookie; @@ -68,9 +69,14 @@ void InitializeExplorerBand(); void DestroyExplorerBand(); + HRESULT ExecuteCommand(CComPtr<IContextMenu>& menu, UINT nCmd); BOOL OnTreeItemExpanding(LPNMTREEVIEW pnmtv); void OnSelectionChanged(LPNMTREEVIEW pnmtv); + + // *** ATL event handlers *** + LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT ContextMenuHack(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); // *** Helper functions *** NodeInfo* GetNodeInfo(HTREEITEM hItem); @@ -141,7 +147,7 @@ virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); - + // *** IDropTarget methods *** virtual HRESULT STDMETHODCALLTYPE DragEnter(IDataObject *pObj, DWORD glfKeyState, POINTL pt, DWORD *pdwEffect); virtual HRESULT STDMETHODCALLTYPE DragOver(DWORD glfKeyState, POINTL pt, DWORD *pdwEffect); @@ -174,6 +180,8 @@ END_COM_MAP() BEGIN_MSG_MAP(CExplorerBand) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) + MESSAGE_HANDLER(WM_RBUTTONDOWN, ContextMenuHack) END_MSG_MAP() };

1 0

[gadamopoulos] 72003: [BROWSEUI] - CExplorerBand: Expand the tree view to the current folder when a new folder is browser (either with the addressbar or by double clicking a folder). - Part of the ...
by gadamopoulos＠svn.reactos.org 26 Jul '16

26 Jul '16

Author: gadamopoulos Date: Tue Jul 26 14:31:38 2016 New Revision: 72003 URL: http://svn.reactos.org/svn/reactos?rev=72003&view=rev Log: [BROWSEUI] - CExplorerBand: Expand the tree view to the current folder when a new folder is browser (either with the addressbar or by double clicking a folder). - Part of the work submitted by Sylvain Deverre. CORE-10838 Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp trunk/reactos/dll/win32/browseui/explorerband.h Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Tue Jul 26 14:31:38 2016 @@ -35,7 +35,7 @@ } CExplorerBand::CExplorerBand() : - pSite(NULL), fVisible(FALSE), dwBandID(0) + pSite(NULL), fVisible(FALSE), bNavigating(FALSE), dwBandID(0) { } @@ -67,21 +67,21 @@ TreeView_SetImageList(m_hWnd, (HIMAGELIST)piml, TVSIL_NORMAL); // Insert the root node - HTREEITEM hItem = InsertItem(0, pDesktop, pidl, pidl, FALSE); - if (!hItem) + hRoot = InsertItem(0, pDesktop, pidl, pidl, FALSE); + if (!hRoot) { ERR("Failed to create root item\n"); return; } - NodeInfo* pNodeInfo = GetNodeInfo(hItem); + NodeInfo* pNodeInfo = GetNodeInfo(hRoot); // Insert child nodes - InsertSubitems(hItem, pNodeInfo); - TreeView_Expand(m_hWnd, hItem, TVE_EXPAND); + InsertSubitems(hRoot, pNodeInfo); + TreeView_Expand(m_hWnd, hRoot, TVE_EXPAND); // Navigate to current folder position - //NavigateToCurrentFolder(); + NavigateToCurrentFolder(); // Register shell notification shcne.pidl = pidl; @@ -198,6 +198,11 @@ NodeInfo* pNodeInfo = GetNodeInfo(pnmtv->itemNew.hItem); UpdateBrowser(pNodeInfo->absolutePidl); + + /* Prevents navigation if selection is initiated inside the band */ + if (bNavigating) + return; + SetFocus(); // Expand the node //TreeView_Expand(m_hWnd, pnmtv->itemNew.hItem, TVE_EXPAND); @@ -260,6 +265,17 @@ return htiCreated; } +/* This is the slow version of the above method */ +HTREEITEM CExplorerBand::InsertItem(HTREEITEM hParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort) +{ + CComPtr<IShellFolder> psfFolder; + HRESULT hr = SHBindToParent(pElt, IID_PPV_ARG(IShellFolder, &psfFolder), NULL); + if (FAILED_UNEXPECTEDLY(hr)) + return NULL; + + return InsertItem(hParent, psfFolder, pElt, pEltRelative, bSort); +} + BOOL CExplorerBand::InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo) { CComPtr<IEnumIDList> pEnumIDList; @@ -332,6 +348,137 @@ SendMessage(WM_SETREDRAW, TRUE, 0); return (uItemCount > 0) ? TRUE : FALSE; +} + +/** + * Navigate to a given PIDL in the treeview, and return matching tree item handle + * - dest: The absolute PIDL we should navigate in the treeview + * - item: Handle of the tree item matching the PIDL + * - bExpand: expand collapsed nodes in order to find the right element + * - bInsert: insert the element at the right place if we don't find it + * - bSelect: select the item after we found it + */ +BOOL CExplorerBand::NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExpand, BOOL bInsert, + BOOL bSelect) +{ + HTREEITEM current; + HTREEITEM tmp; + HTREEITEM parent; + BOOL found; + NodeInfo *nodeData; + LPITEMIDLIST relativeChild; + TVITEM tvItem; + + if (!item) + return FALSE; + + found = FALSE; + current = hRoot; + parent = NULL; + while(!found) + { + nodeData = GetNodeInfo(current); + if (!nodeData) + { + ERR("Something has gone wrong, no data associated to node !\n"); + *item = NULL; + return FALSE; + } + // If we found our node, give it back + if (!pDesktop->CompareIDs(0, nodeData->absolutePidl, dest)) + { + if (bSelect) + TreeView_SelectItem(m_hWnd, current); + *item = current; + return TRUE; + } + + // Check if we are a parent of the requested item + relativeChild = ILFindChild(nodeData->absolutePidl, dest); + if (relativeChild != 0) + { + // Notify treeview we have children + tvItem.mask = TVIF_CHILDREN; + tvItem.hItem = current; + tvItem.cChildren = 1; + TreeView_SetItem(m_hWnd, &tvItem); + + // If we can expand and the node isn't expanded yet, do it + if (bExpand) + { + if (!nodeData->expanded) + InsertSubitems(current, nodeData); + TreeView_Expand(m_hWnd, current, TVE_EXPAND); + } + + // Try to get a child + tmp = TreeView_GetChild(m_hWnd, current); + if (tmp) + { + // We have a child, let's continue with it + parent = current; + current = tmp; + continue; + } + + if (bInsert && nodeData->expanded) + { + // Happens when we have to create a subchild inside a child + current = InsertItem(current, dest, relativeChild, TRUE); + } + // We end up here, without any children, so we found nothing + // Tell the parent node it has children + ZeroMemory(&tvItem, sizeof(tvItem)); + *item = NULL; + return FALSE; + } + + // Find sibling + tmp = TreeView_GetNextSibling(m_hWnd, current); + if (tmp) + { + current = tmp; + continue; + } + if (bInsert) + { + current = InsertItem(parent, dest, ILFindLastID(dest), TRUE); + *item = current; + return TRUE; + } + *item = NULL; + return FALSE; + } + return FALSE; +} + +BOOL CExplorerBand::NavigateToCurrentFolder() +{ + LPITEMIDLIST explorerPidl; + CComPtr<IBrowserService> pBrowserService; + HRESULT hr; + HTREEITEM dummy; + BOOL result; + explorerPidl = NULL; + + hr = IUnknown_QueryService(pSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &pBrowserService)); + if (!SUCCEEDED(hr)) + { + ERR("Can't get IBrowserService !\n"); + return FALSE; + } + + hr = pBrowserService->GetPidl(&explorerPidl); + if (!SUCCEEDED(hr) || !explorerPidl) + { + ERR("Unable to get browser PIDL !\n"); + return FALSE; + } + bNavigating = TRUE; + /* find PIDL into our explorer */ + result = NavigateToPIDL(explorerPidl, &dummy, TRUE, FALSE, TRUE); + bNavigating = FALSE; + return result; } // *** IOleWindow methods *** @@ -658,8 +805,16 @@ HRESULT STDMETHODCALLTYPE CExplorerBand::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - UNIMPLEMENTED; - return E_NOTIMPL; + switch (dispIdMember) + { + case DISPID_DOWNLOADCOMPLETE: + case DISPID_NAVIGATECOMPLETE2: + TRACE("DISPID_NAVIGATECOMPLETE2 received\n"); + NavigateToCurrentFolder(); + return S_OK; + } + TRACE("Unknown dispid requested: %08x\n", dispIdMember); + return E_INVALIDARG; } // *** IDropTarget methods *** Modified: trunk/reactos/dll/win32/browseui/explorerband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] Tue Jul 26 14:31:38 2016 @@ -56,6 +56,7 @@ // *** tree explorer band stuff *** BOOL fVisible; + BOOL bNavigating; BOOL bFocused; DWORD dwBandID; HIMAGELIST hImageList; @@ -75,7 +76,10 @@ NodeInfo* GetNodeInfo(HTREEITEM hItem); HRESULT UpdateBrowser(LPITEMIDLIST pidlGoto); HTREEITEM InsertItem(HTREEITEM hParent, IShellFolder *psfParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort); + HTREEITEM InsertItem(HTREEITEM hParent, LPITEMIDLIST pElt, LPITEMIDLIST pEltRelative, BOOL bSort); BOOL InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo); + BOOL NavigateToPIDL(LPITEMIDLIST dest, HTREEITEM *item, BOOL bExpand, BOOL bInsert, BOOL bSelect); + BOOL NavigateToCurrentFolder(); public: CExplorerBand();

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs