Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[fireball] 47047: [KMTEST] - Add KeStallExecutionProcessor test.
by fireball＠svn.reactos.org 27 Apr '10

27 Apr '10

Author: fireball Date: Tue Apr 27 15:06:42 2010 New Revision: 47047 URL: http://svn.reactos.org/svn/reactos?rev=47047&view=rev Log: [KMTEST] - Add KeStallExecutionProcessor test. Added: trunk/rostests/drivers/kmtest/ntos_ke.c (with props) Modified: trunk/rostests/drivers/kmtest/kmtest.c trunk/rostests/drivers/kmtest/kmtest.rbuild Modified: trunk/rostests/drivers/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.c?r… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.c [iso-8859-1] Tue Apr 27 15:06:42 2010 @@ -106,6 +106,7 @@ * Test Declarations */ VOID NtoskrnlIoTests(); +VOID NtoskrnlKeTests(); VOID NtoskrnlObTest(); VOID NtoskrnlExecutiveTests(); VOID NtoskrnlPoolsTest(); @@ -214,6 +215,7 @@ ThisDriverObject = DriverObject; NtoskrnlExecutiveTests(); + NtoskrnlKeTests(); NtoskrnlIoTests(); NtoskrnlObTest(); NtoskrnlPoolsTest(); Modified: trunk/rostests/drivers/kmtest/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.rbu… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.rbuild [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.rbuild [iso-8859-1] Tue Apr 27 15:06:42 2010 @@ -12,6 +12,7 @@ <file>reghelper.c</file> <file>ntos_ex.c</file> <file>ntos_io.c</file> + <file>ntos_ke.c</file> <file>ntos_ob.c</file> <file>ntos_pools.c</file> <file>kmtest.rc</file> Added: trunk/rostests/drivers/kmtest/ntos_ke.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_ke.c?… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_ke.c (added) +++ trunk/rostests/drivers/kmtest/ntos_ke.c [iso-8859-1] Tue Apr 27 15:06:42 2010 @@ -1,0 +1,86 @@ +/* + * NTOSKRNL Executive Regressions KM-Test + * ReactOS Kernel Mode Regression Testing framework + * + * Copyright 2006 Aleksey Bragin <aleksey(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; see the file COPYING.LIB. + * If not, write to the Free Software Foundation, + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/* INCLUDES *******************************************************************/ + +#include <ddk/ntddk.h> +#include <ntifs.h> +#include <ndk/ntndk.h> +#include "kmtest.h" + +#define NDEBUG +#include "debug.h" + +/* PRIVATE FUNCTIONS ***********************************************************/ + +VOID +NTAPI +KeStallTest() +{ + ULONG i; + LARGE_INTEGER TimeStart, TimeFinish; + + StartTest(); + + DPRINT1("Waiting for 30 secs with 50us stalls...\n"); + KeQuerySystemTime(&TimeStart); + for (i = 0; i < (30*1000*20); i++) + { + KeStallExecutionProcessor(50); + } + KeQuerySystemTime(&TimeFinish); + DPRINT1("Time elapsed: %d secs\n", (TimeFinish.QuadPart - TimeStart.QuadPart) / 10000000); // 30 + + DPRINT1("Waiting for 30 secs with 1000us stalls...\n"); + KeQuerySystemTime(&TimeStart); + for (i = 0; i < (30*1000); i++) + { + KeStallExecutionProcessor(1000); + } + KeQuerySystemTime(&TimeFinish); + DPRINT1("Time elapsed: %d secs\n", (TimeFinish.QuadPart - TimeStart.QuadPart) / 10000000); // 30 + + DPRINT1("Waiting for 30 secs with 1us stalls...\n"); + KeQuerySystemTime(&TimeStart); + for (i = 0; i < (30*1000*1000); i++) + { + KeStallExecutionProcessor(1); + } + KeQuerySystemTime(&TimeFinish); + DPRINT1("Time elapsed: %d secs\n", (TimeFinish.QuadPart - TimeStart.QuadPart) / 10000000); // 43 + + DPRINT1("Waiting for 30 secs with one huge stall...\n"); + KeQuerySystemTime(&TimeStart); + KeStallExecutionProcessor(30*1000000); + KeQuerySystemTime(&TimeFinish); + DPRINT1("Time elapsed: %d secs\n", (TimeFinish.QuadPart - TimeStart.QuadPart) / 10000000); // 30 + + FinishTest("NTOSKRNL KeStallmanExecution test"); +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID +NtoskrnlKeTests() +{ + KeStallTest(); +} Propchange: trunk/rostests/drivers/kmtest/ntos_ke.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 47046: Update rapps Database to recent Versions.
by dreimer＠svn.reactos.org 27 Apr '10

27 Apr '10

Author: dreimer Date: Tue Apr 27 08:31:32 2010 New Revision: 47046 URL: http://svn.reactos.org/svn/reactos?rev=47046&view=rev Log: Update rapps Database to recent Versions. Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/opera.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Tue Apr 27 08:31:32 2010 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.8.19 +Version = 0.8.21 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 1.6MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.19-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.21-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera.txt [iso-8859-1] Tue Apr 27 08:31:32 2010 @@ -2,13 +2,13 @@ [Section] Name = Opera -Version = 10.51 +Version = 10.52 Licence = Freeware Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client. -Size = 11.0M +Size = 12.0M Category = 5 URLSite = http://www.opera.com/ -URLDownload = http://get4.opera.com/pub/opera/win/1051/int/Opera_1051_int_Setup.exe +URLDownload = http://get4.opera.com/pub/opera/win/1052/int/Opera_1052_int_Setup.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Tue Apr 27 08:31:32 2010 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 2.10 +Version = 2.11 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. Size = 0.6M Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/scintilla/Sc210.exe +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/scintilla/Sc211.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Tue Apr 27 08:31:32 2010 @@ -2,13 +2,13 @@ [Section] Name = ÂµTorrent -Version = 2.0 +Version = 2.0.1 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 312K +Size = 314K Category = 5 URLSite = http://www.utorrent.com/ -URLDownload = http://download.utorrent.com/2.0/utorrent.exe +URLDownload = http://download.utorrent.com/2.0.1/utorrent.exe CDPath = none

1 0

[jgardou] 47045: [GDI32] - This wasn't a fix, it was code readability. Thanks to physicus for having pointed it.
by jgardou＠svn.reactos.org 26 Apr '10

26 Apr '10

Author: jgardou Date: Tue Apr 27 00:07:01 2010 New Revision: 47045 URL: http://svn.reactos.org/svn/reactos?rev=47045&view=rev Log: [GDI32] - This wasn't a fix, it was code readability. Thanks to physicus for having pointed it. Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/dc.c Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/objects/dc.c [iso-8859-1] Tue Apr 27 00:07:01 2010 @@ -60,7 +60,7 @@ DPRINT1("Not a DISPLAY device! %wZ\n", &Device); } - hDC = NtGdiOpenDCW( (Default ? &Device : NULL), + hDC = NtGdiOpenDCW( (Default ? NULL : &Device), (PDEVMODEW) lpInitData, (lpwszOutput ? &Output : NULL), iType, // DCW 0 and ICW 1.

1 0

[jgardou] 47044: [GDI32] - Use device string when given one in IntCreateDIC [WIN32K] - Exchange pdevmode when excahnging PDEVOBJ pointers - Update Globals gdi devcaps when switching mode if ppdev is the primary surface
by jgardou＠svn.reactos.org 26 Apr '10

26 Apr '10

Author: jgardou Date: Mon Apr 26 23:49:09 2010 New Revision: 47044 URL: http://svn.reactos.org/svn/reactos?rev=47044&view=rev Log: [GDI32] - Use device string when given one in IntCreateDIC [WIN32K] - Exchange pdevmode when excahnging PDEVOBJ pointers - Update Globals gdi devcaps when switching mode if ppdev is the primary surface Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/dc.c branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c Modified: branches/reactos-yarotows/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/gdi3… ============================================================================== --- branches/reactos-yarotows/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ branches/reactos-yarotows/dll/win32/gdi32/objects/dc.c [iso-8859-1] Mon Apr 26 23:49:09 2010 @@ -15,7 +15,7 @@ { UNICODE_STRING Device, Output; HDC hDC = NULL; - BOOL Display = FALSE, Default = TRUE; + BOOL Display = FALSE, Default = FALSE; ULONG UMdhpdev = 0; HANDLE hspool = NULL; @@ -31,7 +31,7 @@ if ((!lpwszDevice) && (!lpwszDriver)) { - Default = FALSE; // Ask Win32k to set Default device. + Default = TRUE; // Ask Win32k to set Default device. Display = TRUE; // Most likely to be DISPLAY. } else @@ -318,7 +318,7 @@ DeleteObject(HGDIOBJ hObject) { UINT Type = 0; - + /* From Wine: DeleteObject does not SetLastError() on a null object */ if(!hObject) return FALSE; @@ -332,7 +332,7 @@ Type = GDI_HANDLE_GET_TYPE(hObject); - if ((Type == GDI_OBJECT_TYPE_METAFILE) || + if ((Type == GDI_OBJECT_TYPE_METAFILE) || (Type == GDI_OBJECT_TYPE_ENHMETAFILE)) return FALSE; @@ -348,7 +348,7 @@ case GDI_OBJECT_TYPE_METADC: return MFDRV_DeleteObject( hObject ); case GDI_OBJECT_TYPE_EMF: - { + { PLDC pLDC = GdiGetLDC(hObject); if ( !pLDC ) return FALSE; return EMFDRV_DeleteObject( hObject ); @@ -533,7 +533,7 @@ return NtGdiGetDeviceCaps(hDC,i); } DPRINT("Device CAPS2\n"); - + switch (i) { case DRIVERVERSION: @@ -1608,7 +1608,7 @@ #if 0 case GDI_OBJECT_TYPE_METADC: - return MFDRV_SelectObject( hDC, hGdiObj); + return MFDRV_SelectObject( hDC, hGdiObj); case GDI_OBJECT_TYPE_EMF: PLDC pLDC = GdiGetLDC(hDC); if ( !pLDC ) return NULL; Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Mon Apr 26 23:49:09 2010 @@ -321,6 +321,10 @@ ppdev->gdiinfo = ppdev2->gdiinfo; ppdev2->gdiinfo = pdevTmp.gdiinfo; + /* Exchange DEVMODE */ + ppdev->pdmwDev = ppdev2->pdmwDev; + ppdev2->pdmwDev = pdevTmp.pdmwDev ; + /* Notify each driver instance of its new HDEV association */ ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); ppdev2->pfn.CompletePDEV(ppdev2->dhpdev, (HDEV)ppdev2); @@ -382,6 +386,12 @@ /* 8. Disable DirectDraw */ PDEVOBJ_vRelease(ppdevTmp); + + /* Update primary display capabilities */ + if(ppdev == gppdevPrimary) + { + PDEVOBJ_vGetDeviceCaps(ppdev, &GdiHandleTable->DevCaps); + } /* Success! */ retval = TRUE;

1 0

[janderwald] 47043: [SHELL32] - Start implementing file copy / move / delete dialog - Not yet enabled
by janderwald＠svn.reactos.org 26 Apr '10

26 Apr '10

Author: janderwald Date: Mon Apr 26 21:50:11 2010 New Revision: 47043 URL: http://svn.reactos.org/svn/reactos?rev=47043&view=rev Log: [SHELL32] - Start implementing file copy / move / delete dialog - Not yet enabled Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/shlfileop.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Mon Apr 26 21:50:11 2010 @@ -372,6 +372,17 @@ PUSHBUTTON "OK", 14005, 150, 236, 50, 14 PUSHBUTTON "Cancel", 14006, 206, 236, 50, 14 END + +IDD_SH_FILE_COPY DIALOGEX 0, 0, 264, 45 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Copying..." +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + PUSHBUTTON "Cancel", 14002, 195, 14, 60, 16 + CONTROL "", 14000, "MSCTLS_PROGRESS32", 0, 8, 20, 170, 10 + LTEXT "File", 14001, 8, 6, 169, 10 +END + FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION Modified: trunk/reactos/dll/win32/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.c [iso-8859-1] Mon Apr 26 21:50:11 2010 @@ -33,6 +33,8 @@ #define IsDotDir(x) ((x[0] == '.') && ((x[1] == 0) || ((x[1] == '.') && (x[2] == 0)))) #define FO_MASK 0xF +#define WM_FILE (WM_USER + 1) +#define TIMER_ID (100) static const WCHAR wWildcardFile[] = {'*',0}; static const WCHAR wWildcardChars[] = {'*','?',0}; @@ -51,6 +53,40 @@ BOOL bManyItems; BOOL bCancelled; } FILE_OPERATION; + +#define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026 + +typedef struct +{ + DWORD attributes; + LPWSTR szDirectory; + LPWSTR szFilename; + LPWSTR szFullPath; + BOOL bFromWildcard; + BOOL bFromRelative; + BOOL bExists; +} FILE_ENTRY; + +typedef struct +{ + FILE_ENTRY *feFiles; + DWORD num_alloc; + DWORD dwNumFiles; + BOOL bAnyFromWildcard; + BOOL bAnyDirectories; + BOOL bAnyDontExist; +} FILE_LIST; + +typedef struct +{ + FILE_LIST * from; + FILE_LIST * to; + FILE_OPERATION * op; + DWORD Index; + HWND hDlgCtrl; + HWND hwndDlg; +}FILE_OPERATION_CONTEXT; + /* Confirm dialogs with an optional "Yes To All" as used in file operations confirmations */ @@ -514,6 +550,163 @@ return GetLastError(); } +static WINAPI DWORD SHOperationProgressRoutine(LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER StreamSize, LARGE_INTEGER StreamBytesTransferred, DWORD dwStreamNumber, DWORD dwCallbackReason, HANDLE hSourceFile, HANDLE hDestinationFile, LPVOID lpData) +{ + FILE_OPERATION_CONTEXT * Context; + LARGE_INTEGER Progress; + + /* get context */ + Context = (FILE_OPERATION_CONTEXT*)lpData; + + if (TotalBytesTransferred.QuadPart) + { + Progress.QuadPart = (TotalBytesTransferred.QuadPart * 100) / TotalFileSize.QuadPart; + } + else + { + Progress.QuadPart = 1; + } + + /* update progress bar */ + SendMessageW(Context->hDlgCtrl, PBM_SETPOS, (WPARAM)Progress.u.LowPart, 0); + + if (TotalBytesTransferred.QuadPart == TotalFileSize.QuadPart) + { + /* file was copied */ + Context->Index++; + PostMessageW(Context->hwndDlg, WM_FILE, 0, 0); + } + + return PROGRESS_CONTINUE; +} + +BOOL +QueueFile( + FILE_OPERATION_CONTEXT * Context) +{ + FILE_ENTRY * from, *to; + BOOL bRet = FALSE; + + if (Context->Index >= Context->from->dwNumFiles) + return FALSE; + + /* get current file */ + from = &Context->from->feFiles[Context->Index]; + + if (Context->op->req->fFlags != FO_DELETE) + to = &Context->to->feFiles[Context->Index]; + + /* update status */ + SendDlgItemMessageW(Context->hwndDlg, 14001, WM_SETTEXT, 0, (LPARAM)from->szFullPath); + + if (Context->op->req->wFunc == FO_COPY) + { + bRet = CopyFileExW(from->szFullPath, to->szFullPath, SHOperationProgressRoutine, (LPVOID)Context, &Context->op->bCancelled, 0); + } + else if (Context->op->req->wFunc == FO_MOVE) + { + //bRet = MoveFileWithProgressW(from->szFullPath, to->szFullPath, SHOperationProgressRoutine, (LPVOID)Context, MOVEFILE_COPY_ALLOWED); + } + else if (Context->op->req->wFunc == FO_DELETE) + { + bRet = DeleteFile(from->szFullPath); + } + + return bRet; +} + +static INT_PTR CALLBACK SHOperationDialog(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + FILE_OPERATION_CONTEXT * Context; + + Context = (FILE_OPERATION_CONTEXT*) GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch(uMsg) + { + case WM_INITDIALOG: + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)lParam); + + /* get context */ + Context = (FILE_OPERATION_CONTEXT*)lParam; + + /* store progress bar handle */ + Context->hDlgCtrl = GetDlgItem(hwndDlg, 14000); + + /* store window handle */ + Context->hwndDlg = hwndDlg; + + /* set progress bar range */ + (void)SendMessageW(Context->hDlgCtrl, (UINT) PBM_SETRANGE, 0, MAKELPARAM(0, 100)); + + /* start file queueing */ + SetTimer(hwndDlg, TIMER_ID, 1000, NULL); + //QueueFile(Context); + + return TRUE; + + case WM_CLOSE: + Context->op->bCancelled = TRUE; + EndDialog(hwndDlg, Context->op->bCancelled); + return TRUE; + case WM_COMMAND: + if (LOWORD(wParam) == 14002) + { + Context->op->bCancelled = TRUE; + EndDialog(hwndDlg, Context->op->bCancelled); + return TRUE; + } + break; + case WM_TIMER: + if (wParam == TIMER_ID) + { + QueueFile(Context); + KillTimer(hwndDlg, TIMER_ID); + } + break; + case WM_FILE: + if (!QueueFile(Context)) + EndDialog(hwndDlg, Context->op->bCancelled); + default: + break; + } + return FALSE; +} + +HRESULT +SHShowFileOperationDialog(FILE_OPERATION *op, FILE_LIST *flFrom, FILE_LIST *flTo) +{ + HWND hwnd; + BOOL bRet; + MSG msg; + FILE_OPERATION_CONTEXT Context; + + Context.from = flFrom; + Context.to = flTo; + Context.op = op; + Context.Index = 0; + Context.op->bCancelled = FALSE; + + hwnd = CreateDialogParam(shell32_hInstance, MAKEINTRESOURCE(IDD_SH_FILE_COPY), NULL, SHOperationDialog, (LPARAM)&Context); + if (hwnd == NULL) + { + ERR("Failed to create dialog\n"); + return E_FAIL; + } + ShowWindow(hwnd, SW_SHOWNORMAL); + + while ((bRet = GetMessage(&msg, NULL, 0, 0)) != 0) + { + if (!IsWindow(hwnd) || !IsDialogMessage(hwnd, &msg)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + + return NOERROR; +} + + /************************************************************************ * SHNotifyCopyFile [internal] * @@ -808,28 +1001,7 @@ return retCode; } -#define ERROR_SHELL_INTERNAL_FILE_NOT_FOUND 1026 - -typedef struct -{ - DWORD attributes; - LPWSTR szDirectory; - LPWSTR szFilename; - LPWSTR szFullPath; - BOOL bFromWildcard; - BOOL bFromRelative; - BOOL bExists; -} FILE_ENTRY; - -typedef struct -{ - FILE_ENTRY *feFiles; - DWORD num_alloc; - DWORD dwNumFiles; - BOOL bAnyFromWildcard; - BOOL bAnyDirectories; - BOOL bAnyDontExist; -} FILE_LIST; + static void __inline grow_list(FILE_LIST *list) Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Apr 26 21:50:11 2010 @@ -193,6 +193,7 @@ #define IDD_TREEVIEW 0x3741 #define SHELL_EXTENDED_SHORTCUT_DLG 0x4000 #define OPEN_WITH_PROGRAMM_DLG 0x4001 +#define IDD_SH_FILE_COPY 0x4002 /* ID's of the ShellAbout controls */ // Part 1 - ID's identical to Windows Server 2003 SP1's shell32.dll

1 0

[gschneider] 47042: [EXPLORER] Add missing 24bpp start menu icon, created by Gabriel Ilardi See issue #5007 for more details.
by gschneider＠svn.reactos.org 26 Apr '10

26 Apr '10

Author: gschneider Date: Mon Apr 26 21:01:37 2010 New Revision: 47042 URL: http://svn.reactos.org/svn/reactos?rev=47042&view=rev Log: [EXPLORER] Add missing 24bpp start menu icon, created by Gabriel Ilardi See issue #5007 for more details. Modified: trunk/reactos/base/shell/explorer/res/startmenu.ico Modified: trunk/reactos/base/shell/explorer/res/startmenu.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/st… ============================================================================== Binary files - no diff available.

1 0

[gschneider] 47041: [NETSHELL] Fix LAN status icon resource See issue #3813 for more details.
by gschneider＠svn.reactos.org 26 Apr '10

26 Apr '10

Author: gschneider Date: Mon Apr 26 20:30:08 2010 New Revision: 47041 URL: http://svn.reactos.org/svn/reactos?rev=47041&view=rev Log: [NETSHELL] Fix LAN status icon resource See issue #3813 for more details. Modified: trunk/reactos/dll/win32/netshell/lang/bg-BG.rc trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc trunk/reactos/dll/win32/netshell/lang/da-DK.rc trunk/reactos/dll/win32/netshell/lang/el-GR.rc trunk/reactos/dll/win32/netshell/lang/en-US.rc trunk/reactos/dll/win32/netshell/lang/es-ES.rc trunk/reactos/dll/win32/netshell/lang/fr-FR.rc trunk/reactos/dll/win32/netshell/lang/hu-HU.rc trunk/reactos/dll/win32/netshell/lang/id-ID.rc trunk/reactos/dll/win32/netshell/lang/it-IT.rc trunk/reactos/dll/win32/netshell/lang/ja-JP.rc trunk/reactos/dll/win32/netshell/lang/nl-NL.rc trunk/reactos/dll/win32/netshell/lang/no-NO.rc trunk/reactos/dll/win32/netshell/lang/pl-PL.rc trunk/reactos/dll/win32/netshell/lang/ro-RO.rc trunk/reactos/dll/win32/netshell/lang/ru-RU.rc trunk/reactos/dll/win32/netshell/lang/sv-SE.rc trunk/reactos/dll/win32/netshell/lang/uk-UA.rc trunk/reactos/dll/win32/netshell/lang/zh-CN.rc Modified: trunk/reactos/dll/win32/netshell/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/bg-BG.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "Ñêîðîñò:", -1, 19, 48, 60, 8 GROUPBOX "Äåéíîñò", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Ïðàòåíè", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON "", IDC_NETSTAT, 110, 85, 18, 20 LTEXT "Ïîëó÷åíè", -1, 149, 90, 37, 8 LTEXT "Áàéòà:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/cs-CZ.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "Rychlost:", -1, 19, 48, 60, 8 GROUPBOX "Aktivita", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Odesláno", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Pøijato", -1, 149, 90, 37, 8 LTEXT "Bytù:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/da… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/da-DK.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -36,7 +36,7 @@ LTEXT "Hastighed:", -1, 19, 48, 60, 8 GROUPBOX "Netværks Aktivitet", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Sendt", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT " Modtaget", -1, 149, 90, 37, 8 LTEXT "Bytes:", -1, 73, 115, 44, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/el… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/el-GR.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -36,7 +36,7 @@ LTEXT "Ôá÷ýôçôá:", -1, 19, 48, 60, 8 GROUPBOX "Åíåñãçôéêüôçôá", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "ÁðåóôÜëëçóáí", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "ÅëÞöèçóáí", -1, 149, 90, 37, 8 LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/en… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/en-US.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "Speed:", -1, 19, 48, 60, 8 GROUPBOX "Activity", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Sent", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Received", -1, 149, 90, 37, 8 LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "Velocidad:", -1, 19, 48, 60, 8 GROUPBOX "Actividad ", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Enviados", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Recibidos", -1, 149, 90, 37, 8 LTEXT "Paquetes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/fr-FR.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "Vitesse :", -1, 19, 48, 60, 8 GROUPBOX "Activité", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Envoyés", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Reçus", -1, 149, 90, 37, 8 LTEXT "Octets :", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/hu-HU.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -36,7 +36,7 @@ LTEXT "Sebesség:", -1, 19, 48, 60, 8 GROUPBOX "Tevékenység", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Elküldött", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Beérkezett", -1, 149, 90, 37, 8 LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/id… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/id-ID.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -36,7 +36,7 @@ LTEXT "Kecepatan:", -1, 19, 48, 60, 8 GROUPBOX "Aktivitas", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Dikirim", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Diterima", -1, 149, 90, 37, 8 LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/it… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -39,7 +39,7 @@ GROUPBOX "Attività", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Inviati", -1, 26, 90, 60, 8 ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 - ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON "", IDC_NETSTAT, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 LTEXT "Ricevuti", -1, 149, 90, 37, 8 LTEXT "Byte:", -1, 17, 115, 32, 8 Modified: trunk/reactos/dll/win32/netshell/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ja-JP.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "¬x:", -1, 19, 48, 60, 8 GROUPBOX "®ìóµ", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "M", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "óM", -1, 149, 90, 37, 8 LTEXT "oCg:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/nl-NL.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -39,7 +39,7 @@ LTEXT "Snelheid:", -1, 19, 48, 60, 8 GROUPBOX "Activiteit", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Verzonden", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Ontvangen", -1, 149, 90, 37, 8 LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/no… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "Hastighet:", -1, 19, 48, 60, 8 GROUPBOX "Aktivitet", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Sendt", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Mottatt", -1, 149, 90, 37, 8 LTEXT "Byte:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "Szybkoæ:", -1, 19, 48, 60, 8 GROUPBOX "Aktywnoæ", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Wys³ano", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Odebrano", -1, 149, 90, 37, 8 LTEXT "bajtów:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ro-RO.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "Vitezã:", -1, 19, 48, 60, 8 GROUPBOX "Activitate", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Trimis", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Primit", -1, 149, 90, 37, 8 LTEXT "Octeþi:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "Ñêîðîñòü:", -1, 19, 48, 60, 8 GROUPBOX "Àêòèâíîñòü", -1, 9, 74, 198, 70, BS_GROUPBOX RTEXT "Îòïðàâëåíî", -1, 20, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Ïðèíÿòî", -1, 158, 90, 37, 8 LTEXT "Áàéò:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 54, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/sv… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/sv-SE.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -37,7 +37,7 @@ LTEXT "Hastighet:", -1, 19, 48, 60, 8 GROUPBOX "Aktivitet", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Skickat", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Mottaget", -1, 149, 90, 37, 8 LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -45,7 +45,7 @@ LTEXT "Øâèäê³ñòü:", -1, 19, 48, 60, 8 GROUPBOX "Àêòèâí³ñòü", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Íàä³ñëàíî", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "Îòðèìàíî", -1, 149, 90, 37, 8 LTEXT "Áàéò³â:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 Modified: trunk/reactos/dll/win32/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/zh-CN.rc [iso-8859-1] Mon Apr 26 20:30:08 2010 @@ -36,7 +36,7 @@ LTEXT "ËÙ¶È:", -1, 19, 48, 60, 8 GROUPBOX "Activity", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "·¢ËÍ", -1, 26, 90, 60, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 + ICON "", IDC_NETSTAT, 110, 85, 32, 32 LTEXT "½ÓÊÕ", -1, 149, 90, 37, 8 LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8

1 0

[ekohl] 47040: [MKHIVE] Revert remaining changes of r47019.
by ekohl＠svn.reactos.org 26 Apr '10

26 Apr '10

Author: ekohl Date: Mon Apr 26 18:06:17 2010 New Revision: 47040 URL: http://svn.reactos.org/svn/reactos?rev=47040&view=rev Log: [MKHIVE] Revert remaining changes of r47019. Modified: trunk/reactos/tools/mkhive/reginf.c trunk/reactos/tools/mkhive/registry.c Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Mon Apr 26 18:06:17 2010 @@ -188,7 +188,7 @@ { if (ValueName) { - RegDeleteValueA (KeyHandle, ValueName); + RegDeleteValueA (KeyHandle, ValueName); } else { @@ -253,7 +253,7 @@ if (!(Flags & FLG_ADDREG_BINVALUETYPE) || (Type == REG_DWORD && InfHostGetFieldCount (Context) == 5)) { - CHAR *Str = NULL; + PCHAR Str = NULL; if (Type == REG_MULTI_SZ) { Modified: trunk/reactos/tools/mkhive/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/registry.c?re… ============================================================================== --- trunk/reactos/tools/mkhive/registry.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/registry.c [iso-8859-1] Mon Apr 26 18:06:17 2010 @@ -25,9 +25,9 @@ /* * TODO: - * - Implement RegDeleteKeyW() + * - Implement RegDeleteKey() * - Implement RegEnumValue() - * - Implement RegQueryValueExW() + * - Implement RegQueryValueExA() */ #include <stdlib.h> @@ -246,34 +246,15 @@ } LONG WINAPI -RegDeleteKeyW(IN HKEY hKey, - IN LPCWSTR lpSubKey) -{ - if (lpSubKey != NULL && wcschr(lpSubKey, L'\\') != NULL) - return(ERROR_INVALID_PARAMETER); - - DPRINT1("RegDeleteKeyW: FIXME!\n"); - - return(ERROR_SUCCESS); -} - -LONG WINAPI -RegDeleteKeyA(IN HKEY hKey, - IN LPCSTR lpSubKey) -{ - PWSTR lpSubKeyW; - LONG rc; - - if (lpSubKey != NULL && strchr(lpSubKey, '\\') != NULL) - return(ERROR_INVALID_PARAMETER); - - lpSubKeyW = MultiByteToWideChar(lpSubKey); - if (!lpSubKeyW) - return ERROR_OUTOFMEMORY; - - rc = RegDeleteKeyW(hKey, lpSubKeyW); - free(lpSubKeyW); - return rc; +RegDeleteKeyA(HKEY Key, + LPCSTR Name) +{ + if (Name != NULL && strchr(Name, '\\') != NULL) + return(ERROR_INVALID_PARAMETER); + + DPRINT1("FIXME!\n"); + + return(ERROR_SUCCESS); } LONG WINAPI

1 0

[tkreuzer] 47039: Comment out an ASSERT that gets trigged frequently. See issue #5320 for more details.
by tkreuzer＠svn.reactos.org 26 Apr '10

26 Apr '10

Author: tkreuzer Date: Mon Apr 26 17:46:16 2010 New Revision: 47039 URL: http://svn.reactos.org/svn/reactos?rev=47039&view=rev Log: Comment out an ASSERT that gets trigged frequently. See issue #5320 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Mon Apr 26 17:46:16 2010 @@ -736,7 +736,7 @@ else { DPRINT1("Not POWNED or CLASSDC hwndCurrent -> %x \n", pDCE->hwndCurrent); - ASSERT(FALSE); + //ASSERT(FALSE); } } else

1 0

[ekohl] 47038: [MKHIVE] Partial revert of r47019 because mkhive failed on Linux machines.
by ekohl＠svn.reactos.org 26 Apr '10

26 Apr '10

Author: ekohl Date: Mon Apr 26 17:35:57 2010 New Revision: 47038 URL: http://svn.reactos.org/svn/reactos?rev=47038&view=rev Log: [MKHIVE] Partial revert of r47019 because mkhive failed on Linux machines. Modified: trunk/reactos/tools/mkhive/mkhive.rbuild trunk/reactos/tools/mkhive/reginf.c trunk/reactos/tools/mkhive/rtl.c Modified: trunk/reactos/tools/mkhive/mkhive.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.rbuild… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] Mon Apr 26 17:35:57 2010 @@ -1,13 +1,13 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="mkhive" type="buildtool"> - <include base="newinflibhost">.</include> + <include base="inflibhost">.</include> <include base="cmlibhost">.</include> <include base="zlibhost">.</include> <include base="rtl">.</include> <define name="MKHIVE_HOST" /> <compilerflag compilerset="gcc">-fshort-wchar</compilerflag> - <library>newinflibhost</library> + <library>inflibhost</library> <library>cmlibhost</library> <library>host_wcsfuncs</library> <file>binhive.c</file> Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Mon Apr 26 17:35:57 2010 @@ -51,34 +51,34 @@ /* FUNCTIONS ****************************************************************/ static BOOL -GetRootKey (PWCHAR Name) +GetRootKey (PCHAR Name) { - if (!_wcsicmp (Name, L"HKCR")) - { - wcscpy (Name, L"\\Registry\\Machine\\SOFTWARE\\Classes\\"); - return TRUE; - } - - if (!_wcsicmp (Name, L"HKCU")) - { - wcscpy (Name, L"\\Registry\\User\\.DEFAULT\\"); - return TRUE; - } - - if (!_wcsicmp (Name, L"HKLM")) - { - wcscpy (Name, L"\\Registry\\Machine\\"); - return TRUE; - } - - if (!_wcsicmp (Name, L"HKU")) - { - wcscpy (Name, L"\\Registry\\User\\"); + if (!strcasecmp (Name, "HKCR")) + { + strcpy (Name, "\\Registry\\Machine\\SOFTWARE\\Classes\\"); + return TRUE; + } + + if (!strcasecmp (Name, "HKCU")) + { + strcpy (Name, "\\Registry\\User\\.DEFAULT\\"); + return TRUE; + } + + if (!strcasecmp (Name, "HKLM")) + { + strcpy (Name, "\\Registry\\Machine\\"); + return TRUE; + } + + if (!strcasecmp (Name, "HKU")) + { + strcpy (Name, "\\Registry\\User\\"); return TRUE; } #if 0 - if (!_wcsicmp (Name, L"HKR")) + if (!strcasecmp (Name, "HKR")) return FALSE; #endif @@ -94,19 +94,19 @@ static VOID AppendMultiSzValue ( IN HKEY KeyHandle, - IN PWCHAR ValueName, - IN PWCHAR Strings, + IN PCHAR ValueName, + IN PCHAR Strings, IN SIZE_T StringSize) { SIZE_T Size; ULONG Type; size_t Total; - PWCHAR Buffer; - PWCHAR p; + PCHAR Buffer; + PCHAR p; size_t len; LONG Error; - Error = RegQueryValueExW ( + Error = RegQueryValueExA ( KeyHandle, ValueName, NULL, @@ -117,11 +117,11 @@ (Type != REG_MULTI_SZ)) return; - Buffer = malloc (Size + (StringSize * sizeof(WCHAR))); + Buffer = malloc (Size + StringSize); if (Buffer == NULL) return; - Error = RegQueryValueExW ( + Error = RegQueryValueExA ( KeyHandle, ValueName, NULL, @@ -135,25 +135,25 @@ Total = Size; while (*Strings != 0) { - len = wcslen (Strings) + 1; - - for (p = Buffer; *p != 0; p += wcslen (p) + 1) - if (!_wcsicmp (p, Strings)) + len = strlen (Strings) + 1; + + for (p = Buffer; *p != 0; p += strlen (p) + 1) + if (!strcasecmp (p, Strings)) break; if (*p == 0) /* not found, need to append it */ { - memcpy (p, Strings, len * sizeof(WCHAR)); + memcpy (p, Strings, len); p[len] = 0; - Total += len * sizeof(WCHAR); + Total += len; } Strings += len; } if (Total != Size) { - DPRINT ("setting value %S to %S\n", ValueName, Buffer); - RegSetValueExW ( + DPRINT ("setting value %s to %s\n", ValueName, Buffer); + RegSetValueExA ( KeyHandle, ValueName, 0, @@ -175,11 +175,11 @@ static BOOL do_reg_operation( IN HKEY KeyHandle, - IN PWCHAR ValueName, + IN PCHAR ValueName, IN PINFCONTEXT Context, IN ULONG Flags) { - WCHAR EmptyStr = (WCHAR)0; + CHAR EmptyStr = (CHAR)0; ULONG Type; ULONG Size; LONG Error; @@ -188,11 +188,11 @@ { if (ValueName) { - RegDeleteValueW (KeyHandle, ValueName); - } - else - { - RegDeleteKeyW (KeyHandle, NULL); + RegDeleteValueA (KeyHandle, ValueName); + } + else + { + RegDeleteKeyA (KeyHandle, NULL); } return TRUE; @@ -203,7 +203,7 @@ if (Flags & (FLG_ADDREG_NOCLOBBER | FLG_ADDREG_OVERWRITEONLY)) { - Error = RegQueryValueExW ( + Error = RegQueryValueExA ( KeyHandle, ValueName, NULL, @@ -253,7 +253,7 @@ if (!(Flags & FLG_ADDREG_BINVALUETYPE) || (Type == REG_DWORD && InfHostGetFieldCount (Context) == 5)) { - WCHAR *Str = NULL; + CHAR *Str = NULL; if (Type == REG_MULTI_SZ) { @@ -262,7 +262,7 @@ if (Size) { - Str = malloc (Size * sizeof(WCHAR)); + Str = malloc (Size); if (Str == NULL) return FALSE; @@ -292,7 +292,7 @@ if (Size) { - Str = malloc (Size * sizeof(WCHAR)); + Str = malloc (Size); if (Str == NULL) return FALSE; @@ -302,11 +302,11 @@ if (Type == REG_DWORD) { - ULONG dw = Str ? wcstoul (Str, NULL, 0) : 0; - - DPRINT("setting dword %S to %x\n", ValueName, dw); - - RegSetValueExW ( + ULONG dw = Str ? strtoul (Str, NULL, 0) : 0; + + DPRINT("setting dword %s to %x\n", ValueName, dw); + + RegSetValueExA ( KeyHandle, ValueName, 0, @@ -316,27 +316,27 @@ } else { - DPRINT("setting value %S to %S\n", ValueName, Str); + DPRINT("setting value %s to %s\n", ValueName, Str); if (Str) { - RegSetValueExW ( + RegSetValueExA ( KeyHandle, ValueName, 0, Type, (PVOID)Str, - (ULONG)Size * sizeof(WCHAR)); + (ULONG)Size); } else { - RegSetValueExW ( + RegSetValueExA ( KeyHandle, ValueName, 0, Type, (PVOID)&EmptyStr, - (ULONG)sizeof(WCHAR)); + (ULONG)sizeof(CHAR)); } } free (Str); @@ -354,11 +354,11 @@ if (Data == NULL) return FALSE; - DPRINT("setting binary data %S len %d\n", ValueName, Size); + DPRINT("setting binary data %s len %d\n", ValueName, Size); InfHostGetBinaryField (Context, 5, Data, Size, NULL); } - RegSetValueExW ( + RegSetValueExA ( KeyHandle, ValueName, 0, @@ -378,10 +378,10 @@ * Called once for each AddReg and DelReg entry in a given section. */ static BOOL -registry_callback (HINF hInf, PWCHAR Section, BOOL Delete) +registry_callback (HINF hInf, PCHAR Section, BOOL Delete) { - WCHAR Buffer[MAX_INF_STRING_LENGTH]; - PWCHAR ValuePtr; + CHAR Buffer[MAX_INF_STRING_LENGTH]; + PCHAR ValuePtr; ULONG Flags; size_t Length; @@ -403,11 +403,11 @@ continue; /* get key */ - Length = wcslen (Buffer); + Length = strlen (Buffer); if (InfHostGetStringField (Context, 2, Buffer + Length, MAX_INF_STRING_LENGTH - (ULONG)Length, NULL) != 0) *Buffer = 0; - DPRINT("KeyName: <%S>\n", Buffer); + DPRINT("KeyName: <%s>\n", Buffer); if (Delete) { @@ -424,17 +424,17 @@ if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY)) { - if (RegOpenKeyW (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) - { - DPRINT("RegOpenKey(%S) failed\n", Buffer); + if (RegOpenKeyA (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) + { + DPRINT("RegOpenKey(%s) failed\n", Buffer); continue; /* ignore if it doesn't exist */ } } else { - if (RegCreateKeyW (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) - { - DPRINT("RegCreateKey(%S) failed\n", Buffer); + if (RegCreateKeyA (NULL, Buffer, &KeyHandle) != ERROR_SUCCESS) + { + DPRINT("RegCreateKey(%s) failed\n", Buffer); continue; } } @@ -469,18 +469,18 @@ ULONG ErrorLine; /* Load inf file from install media. */ - if (InfHostOpenFile(&hInf, FileName, 0, &ErrorLine) != 0) + if (InfHostOpenFile(&hInf, FileName, &ErrorLine) != 0) { DPRINT1 ("InfHostOpenFile(%s) failed\n", FileName); return FALSE; } - if (!registry_callback (hInf, L"DelReg", TRUE)) + if (!registry_callback (hInf, "DelReg", TRUE)) { DPRINT1 ("registry_callback() for DelReg failed\n"); } - if (!registry_callback (hInf, L"AddReg", FALSE)) + if (!registry_callback (hInf, "AddReg", FALSE)) { DPRINT1 ("registry_callback() for AddReg failed\n"); } Modified: trunk/reactos/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=470… ============================================================================== --- trunk/reactos/tools/mkhive/rtl.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/rtl.c [iso-8859-1] Mon Apr 26 17:35:57 2010 @@ -207,32 +207,3 @@ } return Mask ? 1 : 0; } - -#undef tolower -WCHAR towlower(WCHAR ch) -{ - if (ch < L'A') - { - return ch; - } - else if (ch <= L'Z') - { - return ch + (L'a' - L'A'); - } - - return ch; -} - -int _wcsicmp(PCWSTR cs, PCWSTR ct) -{ - while (towlower(*cs) == towlower(*ct)) - { - if (*cs == 0) - return 0; - - cs++; - ct++; - } - - return towlower(*cs) - towlower(*ct); -}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2010