Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[cwittich] 67384: [WIN32K] use ExFreePoolWithTag instead of ExFreePool

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 24 19:24:07 2015 New Revision: 67384 URL: http://svn.reactos.org/svn/reactos?rev=67384&view=rev Log: [WIN32K] use ExFreePoolWithTag instead of ExFreePool Modified: trunk/reactos/win32ss/gdi/ntgdi/polyfill.c trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/gdi/ntgdi/polyfill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/polyfill… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/polyfill.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/polyfill.c [iso-8859-1] Fri Apr 24 19:24:07 2015 @@ -97,7 +97,7 @@ } /* -** This makes and initiaizes an Edge struct for a line between two points. +** This makes and initializes an Edge struct for a line between two points. */ static FILL_EDGE* Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Fri Apr 24 19:24:07 2015 @@ -165,7 +165,7 @@ } phwndCurrent++; } - ExFreePool(phwndTopLevel); + ExFreePoolWithTag(phwndTopLevel, USERTAG_WINDOWLIST); } } //// Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Fri Apr 24 19:24:07 2015 @@ -1520,7 +1520,7 @@ } } - ExFreePool(Children); + ExFreePoolWithTag(Children, USERTAG_WINDOWLIST); return (LRESULT) TRUE; } @@ -1888,7 +1888,7 @@ Ret = UserSendNotifyMessage(List[i], Msg, wParam, lParam); } - ExFreePool(List); + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } } else

9 years, 4 months

[cwittich] 67383: [WIN32K] fix a memory leak in error case

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 24 18:38:48 2015 New Revision: 67383 URL: http://svn.reactos.org/svn/reactos?rev=67383&view=rev Log: [WIN32K] fix a memory leak in error case Modified: trunk/reactos/win32ss/gdi/ntgdi/icm.c Modified: trunk/reactos/win32ss/gdi/ntgdi/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/icm.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/icm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/icm.c [iso-8859-1] Fri Apr 24 18:38:48 2015 @@ -150,8 +150,12 @@ } Ret = IntGetDeviceGammaRamp((HDEV)dc->ppdev, SafeRamp); - - if (!Ret) return Ret; + if (!Ret) + { + DC_UnlockDc(dc); + ExFreePoolWithTag(SafeRamp, GDITAG_ICM); + return Ret; + } _SEH2_TRY {

9 years, 4 months

[tfaber] 67382: [NTDLL_WINETEST] - Avoid printing an unterminated string in registry test. Powered by DPH. - Add a ROS hack to avoid a buffer overflow when one of our DPRINTs is returned by WaitFor...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 24 17:37:31 2015 New Revision: 67382 URL: http://svn.reactos.org/svn/reactos?rev=67382&view=rev Log: [NTDLL_WINETEST] - Avoid printing an unterminated string in registry test. Powered by DPH. - Add a ROS hack to avoid a buffer overflow when one of our DPRINTs is returned by WaitForDebugEvent (e.g. when using DPH) Modified: trunk/rostests/winetests/ntdll/exception.c trunk/rostests/winetests/ntdll/reg.c Modified: trunk/rostests/winetests/ntdll/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception… ============================================================================== --- trunk/rostests/winetests/ntdll/exception.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/exception.c [iso-8859-1] Fri Apr 24 17:37:31 2015 @@ -959,7 +959,15 @@ else if (de.dwDebugEventCode == OUTPUT_DEBUG_STRING_EVENT) { int stage; +#ifdef __REACTOS__ + /* This will catch our DPRINTs, such as + * "WARNING: RtlpDphTargetDllsLogicInitialize at ..\..\lib\rtl\heappage.c:1283 is UNIMPLEMENTED!" + * so we need a full-size buffer to avoid a stack overflow + */ + char buffer[513]; +#else char buffer[64]; +#endif status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, sizeof(stage), &size_read); Modified: trunk/rostests/winetests/ntdll/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/reg.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/reg.c [iso-8859-1] Fri Apr 24 17:37:31 2015 @@ -204,22 +204,9 @@ IN ULONG ValueLength, IN PVOID Context, IN PVOID EntryContext) { NTSTATUS ret = STATUS_SUCCESS; - int ValueNameLength = 0; - LPSTR ValName = 0; + trace("**Test %d**\n", CurrentTest); - - if(ValueName) - { - ValueNameLength = lstrlenW(ValueName); - - ValName = pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); - - WideCharToMultiByte(CP_ACP, 0, ValueName, ValueNameLength+1, ValName, ValueNameLength, NULL, NULL); - - trace("ValueName: %s\n", ValName); - } - else - trace("ValueName: (null)\n"); + trace("ValueName: %s\n", wine_dbgstr_w(ValueName)); switch(ValueType) { @@ -261,9 +248,6 @@ ok(!1, "Invalid Test Specified!\n"); CurrentTest++; - - if(ValName) - pRtlFreeHeap(GetProcessHeap(), 0, ValName); return ret; }

9 years, 4 months

[cwittich] 67381: [WIN32K] fix a memory leak add a missing pool tag some spelling fixes

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 24 14:35:58 2015 New Revision: 67381 URL: http://svn.reactos.org/svn/reactos?rev=67381&view=rev Log: [WIN32K] fix a memory leak add a missing pool tag some spelling fixes Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Fri Apr 24 14:35:58 2015 @@ -823,7 +823,7 @@ PSHELL_HOOK_WINDOW Current; HWND* list; - /* FIXME: If we save nb elements in desktop, we dont have to loop to find nb entries */ + /* FIXME: If we save nb elements in desktop, we don't have to loop to find nb entries */ ListEntry = Desktop->ShellHookWindows.Flink; while (ListEntry != &Desktop->ShellHookWindows) { Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Fri Apr 24 14:35:58 2015 @@ -1451,6 +1451,7 @@ dwCount++; } } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } ObDereferenceObject(Thread); @@ -2795,10 +2796,10 @@ (Child->strName.Length < 0xFFFF && !RtlCompareUnicodeString(WindowName, &CurrentWindowName, TRUE))) { - Ret = Child->head.h; - break; - } - } + Ret = Child->head.h; + break; + } + } } ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Fri Apr 24 14:35:58 2015 @@ -487,7 +487,7 @@ if (InputWindowStation == NULL) { - ERR("Initializeing input window station\n"); + ERR("Initializing input window station\n"); InputWindowStation = WindowStationObject; WindowStationObject->Flags &= ~WSS_NOIO; @@ -1369,12 +1369,12 @@ * Size of buffer passed by caller. * * lpBuffer - * Buffer passed by caller. If the function succedes, the buffer is + * Buffer passed by caller. If the function succeeds, the buffer is * filled with window station/desktop count (in first DWORD) and * NULL-terminated window station/desktop names. * * pRequiredSize - * If the function suceedes, this is the number of bytes copied. + * If the function succeeds, this is the number of bytes copied. * Otherwise it's size of buffer needed for function to succeed. * * Status @@ -1495,7 +1495,7 @@ if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(WindowStation->psidUser, 0); + ExFreePoolWithTag(WindowStation->psidUser, USERTAG_SECURITY); WindowStation->psidUser = 0; goto Leave; }

9 years, 4 months

[akhaldi] 67380: [RSHELL][COMCTL32] Fix wrong selected item color used by the Start Menu. Brought to you by Stefano Toncich with minor changes by me. CORE-9309

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Apr 24 14:12:24 2015 New Revision: 67380 URL: http://svn.reactos.org/svn/reactos?rev=67380&view=rev Log: [RSHELL][COMCTL32] Fix wrong selected item color used by the Start Menu. Brought to you by Stefano Toncich with minor changes by me. CORE-9309 Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Fri Apr 24 14:12:24 2015 @@ -21,6 +21,7 @@ #include <commoncontrols.h> #include <shlwapi_undoc.h> #include <uxtheme.h> +#include <vssym32.h> #include "CMenuBand.h" #include "CMenuToolbars.h" @@ -159,7 +160,7 @@ isHot = m_hotBar == this && (int) cdraw->nmcd.dwItemSpec == m_hotItem; isPopup = m_popupBar == this && (int) cdraw->nmcd.dwItemSpec == m_popupItem; - if (m_initFlags & SMINIT_VERTICAL || IsAppThemed()) + if ((m_initFlags & SMINIT_VERTICAL)) { COLORREF clrText; HBRUSH bgBrush; @@ -295,7 +296,10 @@ UpdateImageLists(); // For custom-drawing - SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); + if (IsAppThemed()) + GetThemeSysBool(GetWindowTheme(m_hWnd), TMT_FLATMENUS); + else + SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); return S_OK; } @@ -383,7 +387,11 @@ SetWindowTheme(m_hWnd, L"", L""); - SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); + if (IsAppThemed()) + GetThemeSysBool(GetWindowTheme(m_hWnd), TMT_FLATMENUS); + else + SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); + m_menuBand->AdjustForTheme(m_useFlatMenus); // If needed, create the pager. Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Fri Apr 24 14:12:24 2015 @@ -1042,7 +1042,11 @@ } } +#ifdef __REACTOS__ + if (theme && !(dwItemCDFlag & TBCDRF_NOBACKGROUND)) +#else if (theme) +#endif { int partId = drawSepDropDownArrow ? TP_SPLITBUTTON : TP_BUTTON; int stateId = TS_NORMAL; @@ -1059,7 +1063,12 @@ DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL); } + +#ifdef __REACTOS__ + if (!theme) +#else else +#endif TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag); if (drawSepDropDownArrow)

9 years, 4 months

[cwittich] 67379: spelling fixes only

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 24 12:45:55 2015 New Revision: 67379 URL: http://svn.reactos.org/svn/reactos?rev=67379&view=rev Log: spelling fixes only Modified: trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Fri Apr 24 12:45:55 2015 @@ -110,8 +110,8 @@ (ProcessHandle != NtCurrentProcess())) { /* - * Retreiving the process cookie is only allowed for the calling process - * itself! XP only allowes NtCurrentProcess() as process handles even if + * Retrieving the process cookie is only allowed for the calling process + * itself! XP only allows NtCurrentProcess() as process handles even if * a real handle actually represents the current process. */ return STATUS_INVALID_PARAMETER; Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Fri Apr 24 12:45:55 2015 @@ -713,7 +713,7 @@ /* Check if the object is exclusively locked */ if (pobj->cExclusiveLock != 0) { - DPRINT1("GDIOBJ: Cannot reference oject %p with exclusive lock.\n", hobj); + DPRINT1("GDIOBJ: Cannot reference object %p with exclusive lock.\n", hobj); GDIOBJ_vDereferenceObject(pobj); DBG_DUMP_EVENT_LIST(&pobj->slhLog); return NULL;

9 years, 4 months

[cwittich] 67378: [NTOSKRNL] fix a memory leak

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 24 08:55:24 2015 New Revision: 67378 URL: http://svn.reactos.org/svn/reactos?rev=67378&view=rev Log: [NTOSKRNL] fix a memory leak Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Fri Apr 24 08:55:24 2015 @@ -768,14 +768,15 @@ PETHREAD CurrentThread; ANSI_STRING ImageName; ULONG CurrentSize; - USHORT ImageNameMaximumLength; // image name len in bytes + USHORT ImageNameMaximumLength; // image name length in bytes USHORT ImageNameLength; PLIST_ENTRY CurrentEntry; ULONG TotalSize = 0, ThreadsCount; ULONG TotalUser, TotalKernel; PUCHAR Current; NTSTATUS Status = STATUS_SUCCESS; - PUNICODE_STRING ProcessImageName; + PUNICODE_STRING TempProcessImageName; + _SEH2_VOLATILE PUNICODE_STRING ProcessImageName = NULL; PWCHAR szSrc; BOOLEAN Overflow = FALSE; @@ -828,7 +829,8 @@ // size of the structure for every process CurrentSize = sizeof(SYSTEM_PROCESS_INFORMATION) + sizeof(SYSTEM_THREAD_INFORMATION) * ThreadsCount; ImageNameLength = 0; - Status = SeLocateProcessImageName(Process, &ProcessImageName); + Status = SeLocateProcessImageName(Process, &TempProcessImageName); + ProcessImageName = TempProcessImageName; szSrc = NULL; if (NT_SUCCESS(Status) && (ProcessImageName->Length > 0)) { @@ -870,7 +872,7 @@ /* Fill system information */ if (!Overflow) { - SpiCurrent->NextEntryOffset = CurrentSize + ImageNameMaximumLength; // relative offset to the beginnnig of the next structure + SpiCurrent->NextEntryOffset = CurrentSize + ImageNameMaximumLength; // relative offset to the beginning of the next structure SpiCurrent->NumberOfThreads = ThreadsCount; SpiCurrent->CreateTime = Process->CreateTime; SpiCurrent->ImageName.Length = ImageNameLength; @@ -883,9 +885,6 @@ if (szSrc) { RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length); - - /* Release the memory allocated by SeLocateProcessImageName */ - ExFreePoolWithTag(ProcessImageName, TAG_SEPA); } else { @@ -944,6 +943,13 @@ SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); } + if (ProcessImageName) + { + /* Release the memory allocated by SeLocateProcessImageName */ + ExFreePoolWithTag(ProcessImageName, TAG_SEPA); + ProcessImageName = NULL; + } + /* Handle idle process entry */ Skip: if (Process == PsIdleProcess) Process = NULL; @@ -968,6 +974,12 @@ { if(Process != NULL) ObDereferenceObject(Process); + if (ProcessImageName) + { + /* Release the memory allocated by SeLocateProcessImageName */ + ExFreePoolWithTag(ProcessImageName, TAG_SEPA); + } + Status = _SEH2_GetExceptionCode(); } _SEH2_END @@ -1190,7 +1202,7 @@ DPRINT("SystemHandleInformation 3\n"); - /* Now get Handles from all processs. */ + /* Now get Handles from all processes. */ syspr = PsGetNextProcess(NULL); pr = syspr;

9 years, 4 months

[aandrejevic] 67377: [NTVDM] When the VGA memory map is A0000-BFFFF, mirror the bottom 64 KB into the top. This should take care of all VGA addressing problems.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Apr 24 01:05:50 2015 New Revision: 67377 URL: http://svn.reactos.org/svn/reactos?rev=67377&view=rev Log: [NTVDM] When the VGA memory map is A0000-BFFFF, mirror the bottom 64 KB into the top. This should take care of all VGA addressing problems. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] Fri Apr 24 01:05:50 2015 @@ -22,7 +22,7 @@ /* PRIVATE VARIABLES **********************************************************/ static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; -static CONST DWORD MemoryLimit[] = { 0xAFFFF, 0xAFFFF, 0xB7FFF, 0xBFFFF }; +static CONST DWORD MemoryLimit[] = { 0xBFFFF, 0xAFFFF, 0xB7FFF, 0xBFFFF }; /* * Activate this line if you want to use the real @@ -622,7 +622,7 @@ static inline DWORD VgaTranslateReadAddress(DWORD Address) { - DWORD Offset = Address - VgaGetVideoBaseAddress(); + DWORD Offset = LOWORD(Address - VgaGetVideoBaseAddress()); BYTE Plane; /* Check for chain-4 and odd-even mode */ @@ -649,7 +649,7 @@ static inline DWORD VgaTranslateWriteAddress(DWORD Address) { - DWORD Offset = Address - VgaGetVideoBaseAddress(); + DWORD Offset = LOWORD(Address - VgaGetVideoBaseAddress()); /* Check for chain-4 and odd-even mode */ if (VgaSeqRegisters[VGA_SEQ_MEM_REG] & VGA_SEQ_MEM_C4) @@ -1905,8 +1905,6 @@ PUCHAR BufPtr = (PUCHAR)Buffer; DPRINT("VgaReadMemory: Address 0x%08X, Size %lu\n", Address, Size); - Address = min(max(Address, VgaGetVideoBaseAddress()), VgaGetVideoLimitAddress()); - Size = min(Size, VgaGetVideoLimitAddress() - Address + 1); /* Ignore if video RAM access is disabled */ if ((VgaMiscRegister & VGA_MISC_RAM_ENABLED) == 0) return; @@ -1934,8 +1932,6 @@ PUCHAR BufPtr = (PUCHAR)Buffer; DPRINT("VgaWriteMemory: Address 0x%08X, Size %lu\n", Address, Size); - Address = min(max(Address, VgaGetVideoBaseAddress()), VgaGetVideoLimitAddress()); - Size = min(Size, VgaGetVideoLimitAddress() - Address + 1); /* Ignore if video RAM access is disabled */ if ((VgaMiscRegister & VGA_MISC_RAM_ENABLED) == 0) return TRUE;

9 years, 4 months

[dquintana] 67376: [RAPPS_NEW] * Turn the files into .CPP, to ease future changes. All the code remains class-free for now, with one exception. * Adapt the download progress dialog implementation t...

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Apr 23 23:08:21 2015 New Revision: 67376 URL: http://svn.reactos.org/svn/reactos?rev=67376&view=rev Log: [RAPPS_NEW] * Turn the files into .CPP, to ease future changes. All the code remains class-free for now, with one exception. * Adapt the download progress dialog implementation to ATL/C++, which is a best match for COM classes. * Add an ATL CModule class to the process, necessary for CORE-9593 Added: trunk/reactos/base/applications/rapps_new/aboutdlg.cpp - copied unchanged from r67374, trunk/reactos/base/applications/rapps_new/aboutdlg.c trunk/reactos/base/applications/rapps_new/available.cpp - copied, changed from r67350, trunk/reactos/base/applications/rapps_new/available.c trunk/reactos/base/applications/rapps_new/installdlg.cpp - copied unchanged from r67350, trunk/reactos/base/applications/rapps_new/installdlg.c trunk/reactos/base/applications/rapps_new/installed.cpp - copied, changed from r67350, trunk/reactos/base/applications/rapps_new/installed.c trunk/reactos/base/applications/rapps_new/listview.cpp - copied unchanged from r67350, trunk/reactos/base/applications/rapps_new/listview.c trunk/reactos/base/applications/rapps_new/loaddlg.cpp - copied, changed from r67350, trunk/reactos/base/applications/rapps_new/loaddlg.c trunk/reactos/base/applications/rapps_new/misc.cpp - copied, changed from r67350, trunk/reactos/base/applications/rapps_new/misc.c trunk/reactos/base/applications/rapps_new/richedit.cpp - copied, changed from r67350, trunk/reactos/base/applications/rapps_new/richedit.c trunk/reactos/base/applications/rapps_new/settingsdlg.cpp - copied unchanged from r67350, trunk/reactos/base/applications/rapps_new/settingsdlg.c trunk/reactos/base/applications/rapps_new/splitter.cpp - copied unchanged from r67350, trunk/reactos/base/applications/rapps_new/splitter.c trunk/reactos/base/applications/rapps_new/statusbar.cpp - copied unchanged from r67350, trunk/reactos/base/applications/rapps_new/statusbar.c trunk/reactos/base/applications/rapps_new/toolbar.cpp - copied, changed from r67350, trunk/reactos/base/applications/rapps_new/toolbar.c trunk/reactos/base/applications/rapps_new/treeview.cpp - copied unchanged from r67350, trunk/reactos/base/applications/rapps_new/treeview.c trunk/reactos/base/applications/rapps_new/winmain.cpp - copied, changed from r67350, trunk/reactos/base/applications/rapps_new/winmain.c Removed: trunk/reactos/base/applications/rapps_new/aboutdlg.c trunk/reactos/base/applications/rapps_new/available.c trunk/reactos/base/applications/rapps_new/installdlg.c trunk/reactos/base/applications/rapps_new/installed.c trunk/reactos/base/applications/rapps_new/listview.c trunk/reactos/base/applications/rapps_new/loaddlg.c trunk/reactos/base/applications/rapps_new/misc.c trunk/reactos/base/applications/rapps_new/richedit.c trunk/reactos/base/applications/rapps_new/settingsdlg.c trunk/reactos/base/applications/rapps_new/splitter.c trunk/reactos/base/applications/rapps_new/statusbar.c trunk/reactos/base/applications/rapps_new/toolbar.c trunk/reactos/base/applications/rapps_new/treeview.c trunk/reactos/base/applications/rapps_new/winmain.c Modified: trunk/reactos/base/applications/rapps_new/CMakeLists.txt trunk/reactos/base/applications/rapps_new/rapps.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/rapps_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/aboutdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Copied: trunk/reactos/base/applications/rapps_new/available.cpp (from r67350, trunk/reactos/base/applications/rapps_new/available.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/installdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/installed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Copied: trunk/reactos/base/applications/rapps_new/installed.cpp (from r67350, trunk/reactos/base/applications/rapps_new/installed.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Copied: trunk/reactos/base/applications/rapps_new/loaddlg.cpp (from r67350, trunk/reactos/base/applications/rapps_new/loaddlg.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Copied: trunk/reactos/base/applications/rapps_new/misc.cpp (from r67350, trunk/reactos/base/applications/rapps_new/misc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/richedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Copied: trunk/reactos/base/applications/rapps_new/richedit.cpp (from r67350, trunk/reactos/base/applications/rapps_new/richedit.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/splitter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/statusbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Copied: trunk/reactos/base/applications/rapps_new/toolbar.cpp (from r67350, trunk/reactos/base/applications/rapps_new/toolbar.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Removed: trunk/reactos/base/applications/rapps_new/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Copied: trunk/reactos/base/applications/rapps_new/winmain.cpp (from r67350, trunk/reactos/base/applications/rapps_new/winmain.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne…

9 years, 4 months

[akhaldi] 67375: [SHELL32][BROWSEUI] Implement SetAnimation so that AVIs from shell32 can be used when the progress dialog is in use. Brought to you by Robert Naumann. CORE-9327

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 23 22:35:23 2015 New Revision: 67375 URL: http://svn.reactos.org/svn/reactos?rev=67375&view=rev Log: [SHELL32][BROWSEUI] Implement SetAnimation so that AVIs from shell32 can be used when the progress dialog is in use. Brought to you by Robert Naumann. CORE-9327 Modified: trunk/reactos/dll/win32/browseui/CProgressDialog.cpp trunk/reactos/dll/win32/shell32/shlfileop.cpp trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/browseui/CProgressDialog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CProgre… ============================================================================== --- trunk/reactos/dll/win32/browseui/CProgressDialog.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CProgressDialog.cpp [iso-8859-1] Thu Apr 23 22:35:23 2015 @@ -343,6 +343,13 @@ HRESULT WINAPI CProgressDialog::SetAnimation(HINSTANCE hInstance, UINT uiResourceId) { + HWND hAnimation = GetDlgItem(this->hwnd, IDD_PROGRESS_DLG); + SetWindowLongW(hAnimation, GWL_STYLE, + GetWindowLongW(hAnimation, GWL_STYLE)|ACS_TRANSPARENT|ACS_CENTER|ACS_AUTOPLAY); + + if(!Animate_OpenEx(hAnimation,hInstance,MAKEINTRESOURCEW(uiResourceId))) + return S_FALSE; + return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Thu Apr 23 22:35:23 2015 @@ -479,20 +479,24 @@ if (op->progress == NULL) return; WCHAR szTitle[50], szPreflight[50]; + UINT animation_id = NULL; switch (op->req->wFunc) { case FO_COPY: LoadStringW(shell32_hInstance, IDS_FILEOOP_COPYING, szTitle, sizeof(szTitle)/sizeof(WCHAR)); LoadStringW(shell32_hInstance, IDS_FILEOOP_FROM_TO, op->szBuilderString, sizeof( op->szBuilderString)/sizeof(WCHAR)); + animation_id = IDA_SHELL_COPY; break; case FO_DELETE: LoadStringW(shell32_hInstance, IDS_FILEOOP_DELETING, szTitle, sizeof(szTitle)/sizeof(WCHAR)); LoadStringW(shell32_hInstance, IDS_FILEOOP_FROM, op->szBuilderString, sizeof( op->szBuilderString)/sizeof(WCHAR)); + animation_id = IDA_SHELL_DELETE; break; case FO_MOVE: LoadStringW(shell32_hInstance, IDS_FILEOOP_MOVING, szTitle, sizeof(szTitle)/sizeof(WCHAR)); LoadStringW(shell32_hInstance, IDS_FILEOOP_FROM_TO, op->szBuilderString, sizeof( op->szBuilderString)/sizeof(WCHAR)); + animation_id = IDA_SHELL_COPY; break; default: return; @@ -501,6 +505,7 @@ op->progress->SetTitle(szTitle); op->progress->SetLine(1, szPreflight, false, NULL); + op->progress->SetAnimation(shell32_hInstance, animation_id); } static void _SetOperationTexts(FILE_OPERATION *op, LPCWSTR src, LPCWSTR dest) { 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] Thu Apr 23 22:35:23 2015 @@ -488,16 +488,18 @@ * AVI resources * * windows shell32 has 14 of them: 150-152 and 160-170 - * FIXME: Need to add them, but for now just let them use the same: searching.avi - * (also to limit shell32's size) + * FIXME: Add 150-152 */ -#define IDR_AVI_SEARCH 150 -#define IDR_AVI_SEARCHING 151 -#define IDR_AVI_FINDCOMPUTER 152 -#define IDR_AVI_FILEMOVE 160 -#define IDR_AVI_FILECOPY 161 -#define IDR_AVI_FILENUKE 163 -#define IDR_AVI_FILEDELETE 164 + +#define IDA_SHELL_COPY 160 +#define IDA_SHELL_COPY1 161 +#define IDA_SHELL_COPY2 167 +#define IDA_SHELL_COPY3 168 +#define IDA_SHELL_RECYCLE 162 +#define IDA_SHELL_EMPTY_RECYCLE 163 +#define IDA_SHELL_DELETE 164 +#define IDA_SHELL_DELETE1 169 +#define IDA_SHELL_DOWNLOAD 170 /* Desktop Browser commands */ #define FCIDM_DESKBROWSER_CLOSE 0xA004

9 years, 4 months

← Newer
1
...
8
9
10
11
12
13
14
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2015