Ros-diffs May 2016

ros-diffs@reactos.org

18 participants
260 discussions

[hbelusca] 71330: [DRIVERS][NTOSKRNL] Don't use PWORK_QUEUE_ITEM casts in ExQueueWorkItem calls, but use the explicit underlaying work queue item object instead.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun May 15 00:16:31 2016 New Revision: 71330 URL: http://svn.reactos.org/svn/reactos?rev=71330&view=rev Log: [DRIVERS][NTOSKRNL] Don't use PWORK_QUEUE_ITEM casts in ExQueueWorkItem calls, but use the explicit underlaying work queue item object instead. Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h trunk/reactos/drivers/filters/mountmgr/notify.c trunk/reactos/ntoskrnl/cache/cachesub.c trunk/reactos/ntoskrnl/cache/pinsup.c Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mntmgr.h [iso-8859-1] Sun May 15 00:16:31 2016 @@ -112,7 +112,7 @@ typedef struct _ONLINE_NOTIFICATION_WORK_ITEM { - WORK_QUEUE_ITEM; // 0x00 + WORK_QUEUE_ITEM WorkItem; // 0x00 PDEVICE_EXTENSION DeviceExtension; // 0x10 UNICODE_STRING SymbolicName; // 0x14 } ONLINE_NOTIFICATION_WORK_ITEM, *PONLINE_NOTIFICATION_WORK_ITEM; // 0x1C Modified: trunk/reactos/drivers/filters/mountmgr/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/n… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/notify.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/notify.c [iso-8859-1] Sun May 15 00:16:31 2016 @@ -119,11 +119,11 @@ { /* Queue a new one for execution */ Head = RemoveHeadList(&(DeviceExtension->OnlineNotificationListHead)); - NewWorkItem = CONTAINING_RECORD(Head, ONLINE_NOTIFICATION_WORK_ITEM, List); + NewWorkItem = CONTAINING_RECORD(Head, ONLINE_NOTIFICATION_WORK_ITEM, WorkItem.List); KeReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); - NewWorkItem->List.Blink = NULL; - NewWorkItem->List.Flink = NULL; - ExQueueWorkItem((PWORK_QUEUE_ITEM)NewWorkItem, DelayedWorkQueue); + NewWorkItem->WorkItem.List.Blink = NULL; + NewWorkItem->WorkItem.List.Flink = NULL; + ExQueueWorkItem(&NewWorkItem->WorkItem, DelayedWorkQueue); } else { @@ -155,10 +155,8 @@ return; } - WorkItem->List.Flink = NULL; + ExInitializeWorkItem(&WorkItem->WorkItem, SendOnlineNotificationWorker, WorkItem); WorkItem->DeviceExtension = DeviceExtension; - WorkItem->WorkerRoutine = SendOnlineNotificationWorker; - WorkItem->Parameter = WorkItem; WorkItem->SymbolicName.Length = SymbolicName->Length; WorkItem->SymbolicName.MaximumLength = SymbolicName->Length + sizeof(WCHAR); WorkItem->SymbolicName.Buffer = AllocatePool(WorkItem->SymbolicName.MaximumLength); @@ -179,12 +177,12 @@ { /* Queue that one for execution */ DeviceExtension->OnlineNotificationWorkerActive = 1; - ExQueueWorkItem((PWORK_QUEUE_ITEM)WorkItem, DelayedWorkQueue); + ExQueueWorkItem(&WorkItem->WorkItem, DelayedWorkQueue); } else { /* Otherwise, just put it in the queue list */ - InsertTailList(&(DeviceExtension->OnlineNotificationListHead), &(WorkItem->List)); + InsertTailList(&(DeviceExtension->OnlineNotificationListHead), &(WorkItem->WorkItem.List)); } KeReleaseSpinLock(&(DeviceExtension->WorkerLock), OldIrql); Modified: trunk/reactos/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/cachesub.c?… ============================================================================== --- trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] Sun May 15 00:16:31 2016 @@ -108,11 +108,11 @@ WorkItem->FileOffset = *FileOffset; WorkItem->Length = Length; - ExInitializeWorkItem(((PWORK_QUEUE_ITEM)WorkItem), + ExInitializeWorkItem(&WorkItem->WorkItem, (PWORKER_THREAD_ROUTINE)CcpReadAhead, WorkItem); - ExQueueWorkItem((PWORK_QUEUE_ITEM)WorkItem, DelayedWorkQueue); + ExQueueWorkItem(&WorkItem->WorkItem, DelayedWorkQueue); DPRINT("Done\n"); } Modified: trunk/reactos/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/pinsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] Sun May 15 00:16:31 2016 @@ -273,7 +273,7 @@ WorkItem->ReleaseFromLazyWrite = Bcb->Map->Callbacks.ReleaseFromLazyWrite; WorkItem->LazyContext = Bcb->Map->LazyContext; - ExInitializeWorkItem(((PWORK_QUEUE_ITEM)WorkItem), + ExInitializeWorkItem(&WorkItem->WorkItem, (PWORKER_THREAD_ROUTINE)CcpUnmapCache, WorkItem); @@ -287,7 +287,7 @@ RemoveEntryList(&Bcb->ThisFileList); CcpUnlock(); - ExQueueWorkItem((PWORK_QUEUE_ITEM)WorkItem, DelayedWorkQueue); + ExQueueWorkItem(&WorkItem->WorkItem, DelayedWorkQueue); CcpLock(); } DPRINT("Done\n");

8 years, 7 months

[hbelusca] 71329: [PROGMAN] Implement drag&drop support for program items. A similar functionality can be implemented later in our shell32/explorer, based on this code. We do here better than Windo...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 12 22:36:05 2016 New Revision: 71329 URL: http://svn.reactos.org/svn/reactos?rev=71329&view=rev Log: [PROGMAN] Implement drag&drop support for program items. A similar functionality can be implemented later in our shell32/explorer, based on this code. We do here better than Windows' progman since we can select and move more than one icon. Note that if you test it on ReactOS you will see nice bugs coming from our (well, Wine's) comctl32.dll xD :P Modified: trunk/reactos/base/shell/progman/group.c trunk/reactos/base/shell/progman/progman.h Modified: trunk/reactos/base/shell/progman/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/group.c… ============================================================================== --- trunk/reactos/base/shell/progman/group.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/group.c [iso-8859-1] Thu May 12 22:36:05 2016 @@ -119,6 +119,7 @@ PROGGROUP* group; INT iItem; LVITEMW lvItem; + POINT pt; group = (PROGGROUP*)GetWindowLongPtrW(hWnd, 0); @@ -260,6 +261,98 @@ /* ... or use group->hActiveProgram */ PROGRAM_ExecuteProgram((PROGRAM*)lvItem.lParam); break; + } + + case LVN_BEGINDRAG: + { + POINT ptMin; + + BOOL bFirst = TRUE; + for (iItem = SendMessageA(group->hListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED); + iItem != -1; + iItem = SendMessageA(group->hListView, LVM_GETNEXTITEM, iItem, LVNI_SELECTED)) + { + if (bFirst) + { + group->hDragImageList = (HIMAGELIST)SendMessageA(group->hListView, + LVM_CREATEDRAGIMAGE, + iItem, + (LPARAM)&pt); + ptMin = pt; + bFirst = FALSE; + } + else + { + HIMAGELIST hOneImageList, hTempImageList; + + hOneImageList = (HIMAGELIST)SendMessageA(group->hListView, + LVM_CREATEDRAGIMAGE, + iItem, + (LPARAM)&pt); + hTempImageList = ImageList_Merge(group->hDragImageList, + 0, + hOneImageList, + 0, + pt.x - ptMin.x, + pt.y - ptMin.y); + ImageList_Destroy(group->hDragImageList); + ImageList_Destroy(hOneImageList); + group->hDragImageList = hTempImageList; + ptMin.x = min(ptMin.x, pt.x); + ptMin.y = min(ptMin.y, pt.y); + } + } + // pt = ((LPNMLISTVIEW)lParam)->ptAction; + pt.x = ((LPNMLISTVIEW)lParam)->ptAction.x; + pt.y = ((LPNMLISTVIEW)lParam)->ptAction.y; + group->ptStart = pt; + pt.x -= ptMin.x; + pt.y -= ptMin.y; + ImageList_BeginDrag(group->hDragImageList, 0, pt.x, pt.y); + MapWindowPoints(group->hListView, Globals.hMDIWnd, &pt, 1); + ImageList_DragEnter(Globals.hMDIWnd, pt.x, pt.y); + group->bDragging = TRUE; + group->hOldCursor = GetCursor(); + SetCapture(group->hWnd); + + break; + } + } + break; + + case WM_MOUSEMOVE: + if (group->bDragging) + { + pt.x = GET_X_LPARAM(lParam); + pt.y = GET_Y_LPARAM(lParam); + MapWindowPoints(group->hWnd, Globals.hMDIWnd, &pt, 1); + ImageList_DragMove(pt.x, pt.y); + } + break; + + case WM_LBUTTONUP: + if (group->bDragging) + { + // LVHITTESTINFO lvhti; + POINT ptHit; + + group->bDragging = FALSE; + ImageList_DragLeave(Globals.hMDIWnd); + ImageList_EndDrag(); + ImageList_Destroy(group->hDragImageList); + ReleaseCapture(); + SetCursor(group->hOldCursor); + ptHit.x = GET_X_LPARAM(lParam); + ptHit.y = GET_Y_LPARAM(lParam); + MapWindowPoints(group->hWnd, group->hListView, &ptHit, 1); + for (iItem = SendMessageA(group->hListView, LVM_GETNEXTITEM, -1, LVNI_SELECTED); + iItem != -1; + iItem = SendMessageA(group->hListView, LVM_GETNEXTITEM, iItem, LVNI_SELECTED)) + { + SendMessageA(group->hListView, LVM_GETITEMPOSITION, iItem, (LPARAM)&pt); + pt.x += ptHit.x - group->ptStart.x; + pt.y += ptHit.y - group->ptStart.y; + SendMessageA(group->hListView, LVM_SETITEMPOSITION, iItem, MAKELPARAM(pt.x, pt.y)); } } break; Modified: trunk/reactos/base/shell/progman/progman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… ============================================================================== --- trunk/reactos/base/shell/progman/progman.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/progman.h [iso-8859-1] Thu May 12 22:36:05 2016 @@ -46,6 +46,8 @@ #include <commctrl.h> #include <richedit.h> + +#include <windowsx.h> #define MAX_STRING_LEN 255 #define MAX_PATHNAME_LEN 1024

8 years, 7 months

[rnaumann] 71328: [SHELL] Change the icon controls of the folder-options general page to static ones. Also give them and the radio buttons some meaningfull identifiers. Big thanks to our flying dut...

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Thu May 12 21:26:55 2016 New Revision: 71328 URL: http://svn.reactos.org/svn/reactos?rev=71328&view=rev Log: [SHELL] Change the icon controls of the folder-options general page to static ones. Also give them and the radio buttons some meaningfull identifiers. Big thanks to our flying dutchman ;) Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef…

8 years, 7 months

[hbelusca] 71327: [PROGMAN] - Fix the icon chooser dialog: icon enumeration, icon list cleanup... Similar fixes should also be ported to our shell32 icon list dialog code! - Remove erroneous LBS_SO...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 12 21:12:40 2016 New Revision: 71327 URL: http://svn.reactos.org/svn/reactos?rev=71327&view=rev Log: [PROGMAN] - Fix the icon chooser dialog: icon enumeration, icon list cleanup... Similar fixes should also be ported to our shell32 icon list dialog code! - Remove erroneous LBS_SORT style from the icon list box. Modified: trunk/reactos/base/shell/progman/dialog.c trunk/reactos/base/shell/progman/new_resources.rc Modified: trunk/reactos/base/shell/progman/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/dialog.… ============================================================================== --- trunk/reactos/base/shell/progman/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/dialog.c [iso-8859-1] Thu May 12 21:12:40 2016 @@ -514,9 +514,9 @@ WCHAR szName[100]; if (IS_INTRESOURCE(lpszName)) + swprintf(szName, L"%u", lpszName); + else wcscpy(szName, lpszName); - else - swprintf(szName, L"%u", lpszName); hIcon = (HICON)LoadImageW(hModule, lpszName, IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); if (hIcon == NULL) @@ -531,17 +531,17 @@ DestroyIconList(HWND hDlgCtrl) { HICON hIcon; - INT index; - INT count; + UINT count; count = SendMessageA(hDlgCtrl, LB_GETCOUNT, 0, 0); - if (count == LB_ERR) + if (count == LB_ERR || count == 0) return; - for (index = 0; index < count; ++index) - { - hIcon = (HICON)SendMessageA(hDlgCtrl, LB_GETITEMDATA, index, 0); + while (count-- > 0) + { + hIcon = (HICON)SendMessageA(hDlgCtrl, LB_GETITEMDATA, 0, 0); DestroyIcon(hIcon); + SendMessageA(hDlgCtrl, LB_DELETESTRING, 0, 0); } } @@ -591,7 +591,7 @@ if (pIconContext->hLibrary) { EnumResourceNamesW(pIconContext->hLibrary, - (LPCWSTR)RT_ICON, // RT_GROUP_ICON + (LPCWSTR)RT_GROUP_ICON, EnumPickIconResourceProc, (LONG_PTR)pIconContext->hDlgCtrl); FreeLibrary(pIconContext->hLibrary); @@ -640,7 +640,7 @@ if (pIconContext->hLibrary) { EnumResourceNamesW(pIconContext->hLibrary, - (LPCWSTR)RT_ICON, // RT_GROUP_ICON + (LPCWSTR)RT_GROUP_ICON, EnumPickIconResourceProc, (LONG_PTR)pIconContext->hDlgCtrl); FreeLibrary(pIconContext->hLibrary); Modified: trunk/reactos/base/shell/progman/new_resources.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/new_res… ============================================================================== --- trunk/reactos/base/shell/progman/new_resources.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/new_resources.rc [iso-8859-1] Thu May 12 21:12:40 2016 @@ -132,7 +132,7 @@ PUSHBUTTON "Cancel",IDCANCEL,175,25,60,15 PUSHBUTTON "&Browse...",PM_BROWSE,175,45,60,15 PUSHBUTTON "&Help",IDHELP,175,65,60,15 - LISTBOX PM_SYMBOL_LIST,5,45,165,35,LBS_SORT | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + LISTBOX PM_SYMBOL_LIST,5,45,165,35,LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP END IDD_EXECUTE DIALOGEX 0, 0, 200, 85

8 years, 7 months

[akhaldi] 71326: [0.4.1] Merge the hal fix by Thomas in r71307. CORE-11123

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 12 20:06:21 2016 New Revision: 71326 URL: http://svn.reactos.org/svn/reactos?rev=71326&view=rev Log: [0.4.1] Merge the hal fix by Thomas in r71307. CORE-11123 Added: branches/ros-branch-0_4_1/reactos/hal/halx86/up/pic.S - copied unchanged from r71307, trunk/reactos/hal/halx86/up/pic.S Modified: branches/ros-branch-0_4_1/ (props changed) branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/hal/halx86/pic.cmake branches/ros-branch-0_4_1/reactos/hal/halx86/up/pic.c Propchange: branches/ros-branch-0_4_1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 12 20:06:21 2016 @@ -1 +1 @@ -/trunk:71217,71231,71245,71252,71255,71296,71309,71318 +/trunk:71217,71231,71245,71252,71255,71296,71307,71309,71318 Propchange: branches/ros-branch-0_4_1/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 12 20:06:21 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296,71309,71318 +/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296,71307,71309,71318 Modified: branches/ros-branch-0_4_1/reactos/hal/halx86/pic.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/hal/ha… ============================================================================== --- branches/ros-branch-0_4_1/reactos/hal/halx86/pic.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/hal/halx86/pic.cmake [iso-8859-1] Thu May 12 20:06:21 2016 @@ -1,7 +1,8 @@ list(APPEND HAL_PIC_ASM_SOURCE generic/systimer.S - generic/trap.S) + generic/trap.S + up/pic.S) list(APPEND HAL_PIC_SOURCE generic/profil.c Modified: branches/ros-branch-0_4_1/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/hal/ha… ============================================================================== --- branches/ros-branch-0_4_1/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/hal/halx86/up/pic.c [iso-8859-1] Thu May 12 20:06:21 2016 @@ -11,6 +11,11 @@ #include <hal.h> #define NDEBUG #include <debug.h> + +VOID +NTAPI +HalpEndSoftwareInterrupt(IN KIRQL OldIrql, + IN PKTRAP_FRAME TrapFrame); /* GLOBALS ********************************************************************/ @@ -263,7 +268,7 @@ * so it will always preempt until we reach PROFILE_LEVEL. */ 0b00000000000000000001011111110000, /* IRQL 20 */ - 0b00000000000000000001001111110000, /* IRQL 20 */ + 0b00000000000000000001001111110000, /* IRQL 21 */ 0b00000000000000000001000111110000, /* IRQL 22 */ 0b00000000000000000001000011110000, /* IRQL 23 */ 0b00000000000000000001000001110000, /* IRQL 24 */ @@ -732,15 +737,17 @@ KeGetPcr()->IRR &= ~(1 << Irql); } -VOID -NTAPI -HalpEndSoftwareInterrupt(IN KIRQL OldIrql, - IN PKTRAP_FRAME TrapFrame) +PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY +NTAPI +HalpEndSoftwareInterrupt2(IN KIRQL OldIrql, + IN PKTRAP_FRAME TrapFrame) { ULONG PendingIrql, PendingIrqlMask, PendingIrqMask; PKPCR Pcr = KeGetPcr(); PIC_MASK Mask; + UNREFERENCED_PARAMETER(TrapFrame); + /* Set old IRQL */ Pcr->Irql = OldIrql; @@ -749,10 +756,10 @@ { /* Check for pending software interrupts and compare with current IRQL */ PendingIrqlMask = Pcr->IRR & FindHigherIrqlMask[OldIrql]; - if (!PendingIrqlMask) return; + if (!PendingIrqlMask) return NULL; /* Check for in-service delayed interrupt */ - if (Pcr->IrrActive & 0xFFFFFFF0) return; + if (Pcr->IrrActive & 0xFFFFFFF0) return NULL; /* Check if pending IRQL affects hardware state */ BitScanReverse(&PendingIrql, PendingIrqlMask); @@ -777,10 +784,11 @@ else { /* No need to loop checking for hardware interrupts */ - SWInterruptHandlerTable2[PendingIrql](TrapFrame); - UNREACHABLE; + return SWInterruptHandlerTable2[PendingIrql]; } } + + return NULL; } /* EDGE INTERRUPT DISMISSAL FUNCTIONS *****************************************/

8 years, 7 months

[hbelusca] 71325: [PROGMAN] - Load the main icon in a global variable (we use it at different places). - Use the main icon for the shell-about dialog.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 12 19:54:53 2016 New Revision: 71325 URL: http://svn.reactos.org/svn/reactos?rev=71325&view=rev Log: [PROGMAN] - Load the main icon in a global variable (we use it at different places). - Use the main icon for the shell-about dialog. Modified: trunk/reactos/base/shell/progman/main.c trunk/reactos/base/shell/progman/progman.h Modified: trunk/reactos/base/shell/progman/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/main.c?… ============================================================================== --- trunk/reactos/base/shell/progman/main.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/main.c [iso-8859-1] Thu May 12 19:54:53 2016 @@ -620,11 +620,10 @@ MAIN_LoadSettings(); /* Load the default icons */ + Globals.hDefaultIcon = LoadIconW(NULL, MAKEINTRESOURCEW(IDI_WINLOGO)); + Globals.hMainIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_APPICON)); Globals.hPersonalGroupIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_GROUP_PERSONAL_ICON)); Globals.hCommonGroupIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_GROUP_COMMON_ICON)); - Globals.hDefaultIcon = LoadIconW(NULL, MAKEINTRESOURCEW(IDI_WINLOGO)); - - // Globals.hMainIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_APPICON)); /* Initialize the common controls */ icex.dwSize = sizeof(icex); @@ -1036,7 +1035,7 @@ break; case PM_ABOUT: - ShellAboutW(hWnd, szTitle, NULL, NULL); + ShellAboutW(hWnd, szTitle, NULL, Globals.hMainIcon); break; default: @@ -1060,7 +1059,7 @@ wndClass.cbClsExtra = 0; wndClass.cbWndExtra = 0; wndClass.hInstance = Globals.hInstance; - wndClass.hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_APPICON)); + wndClass.hIcon = Globals.hMainIcon; wndClass.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_ARROW)); wndClass.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); wndClass.lpszMenuName = NULL; Modified: trunk/reactos/base/shell/progman/progman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… ============================================================================== --- trunk/reactos/base/shell/progman/progman.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/progman.h [iso-8859-1] Thu May 12 19:54:53 2016 @@ -147,11 +147,11 @@ HACCEL hAccel; HWND hMainWnd; HWND hMDIWnd; - //HICON hMainIcon; - HICON hGroupIcon; + HICON hDefaultIcon; + HICON hMainIcon; + // HICON hGroupIcon; HICON hPersonalGroupIcon; HICON hCommonGroupIcon; - HICON hDefaultIcon; HMENU hMainMenu; HMENU hFileMenu; HMENU hOptionMenu;

8 years, 7 months

[hbelusca] 71324: [PROGMAN]: Use a ListView to list program items. On systems that support it (aka. Vista+), enable ListView theming.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 12 19:45:26 2016 New Revision: 71324 URL: http://svn.reactos.org/svn/reactos?rev=71324&view=rev Log: [PROGMAN]: Use a ListView to list program items. On systems that support it (aka. Vista+), enable ListView theming. Modified: trunk/reactos/base/shell/progman/group.c Modified: trunk/reactos/base/shell/progman/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/group.c… ============================================================================== --- trunk/reactos/base/shell/progman/group.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/group.c [iso-8859-1] Thu May 12 19:45:26 2016 @@ -31,6 +31,83 @@ /*********************************************************************** * + * UX Theming helpers, dropped from msconfig_new/comctl32ex/uxthemesupp.c + * + */ + +static HMODULE hUxTheme = NULL; + +typedef HRESULT (WINAPI* ETDTProc)(HWND, DWORD); +static ETDTProc fnEnableThemeDialogTexture = NULL; + +typedef HRESULT (WINAPI* SWTProc)(HWND, LPCWSTR, LPCWSTR); +static SWTProc fnSetWindowTheme = NULL; + + +static BOOL +InitUxTheme(VOID) +{ + if (hUxTheme) return TRUE; + + hUxTheme = LoadLibraryW(L"uxtheme.dll"); + if (hUxTheme == NULL) return FALSE; + + fnEnableThemeDialogTexture = + (ETDTProc)GetProcAddress(hUxTheme, "EnableThemeDialogTexture"); + fnSetWindowTheme = + (SWTProc)GetProcAddress(hUxTheme, "SetWindowTheme"); + + return TRUE; +} + +#if 0 +static VOID +CleanupUxTheme(VOID) +{ + FreeLibrary(hUxTheme); + hUxTheme = NULL; +} +#endif + + +//////////////////////////////////////////////////////////////////////////////// +// Taken from WinSpy++ 1.7 +// http://www.catch22.net/software/winspy +// Copyright (c) 2002 by J Brown +// + +HRESULT +WINAPI +EnableThemeDialogTexture(_In_ HWND hwnd, + _In_ DWORD dwFlags) +{ + if (!InitUxTheme()) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!fnEnableThemeDialogTexture) + return HRESULT_FROM_WIN32(GetLastError()); + + return fnEnableThemeDialogTexture(hwnd, dwFlags); +} + +HRESULT +WINAPI +SetWindowTheme(_In_ HWND hwnd, + _In_ LPCWSTR pszSubAppName, + _In_ LPCWSTR pszSubIdList) +{ + if (!InitUxTheme()) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!fnSetWindowTheme) + return HRESULT_FROM_WIN32(GetLastError()); + + return fnSetWindowTheme(hwnd, pszSubAppName, pszSubIdList); +} + + +/*********************************************************************** + * * GROUP_GroupWndProc */ @@ -40,6 +117,8 @@ GROUP_GroupWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PROGGROUP* group; + INT iItem; + LVITEMW lvItem; group = (PROGGROUP*)GetWindowLongPtrW(hWnd, 0); @@ -89,6 +168,53 @@ SetWindowLongPtrW(hWnd, 0, 0); break; + case WM_CREATE: + { + DWORD dwStyle; + RECT rect; + GetClientRect(hWnd, &rect); + group->hListView = CreateWindowW(WC_LISTVIEW, + NULL, + WS_CHILD | WS_VISIBLE | WS_OVERLAPPED, + 0, 0, + rect.right - rect.left, + rect.bottom - rect.top, + hWnd, + NULL, + Globals.hInstance, + NULL); + dwStyle = (GetWindowLongPtrW(group->hListView, GWL_STYLE) | LVS_SHOWSELALWAYS) & ~LVS_AUTOARRANGE; + SetWindowLongPtrW(group->hListView, GWL_STYLE, dwStyle); + dwStyle = SendMessageA(group->hListView, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0) | LVS_EX_BORDERSELECT; + SendMessageA(group->hListView, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_SNAPTOGRID, dwStyle); + InitUxTheme(); + SetWindowTheme(group->hListView, L"Explorer", NULL); + group->hListLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), ILC_COLOR24 | ILC_MASK, 1, 1); + SendMessageA(group->hListView, LVM_SETIMAGELIST, 0, (LPARAM)group->hListLarge); + SendMessageA(group->hListView, LVM_SETICONSPACING, 0, MAKELPARAM(80, 64)); + break; + } + + case WM_DESTROY: + { + SendMessageA(group->hListView, LVM_SETIMAGELIST, 0, 0); + ImageList_Destroy(group->hListLarge); + DestroyWindow(group->hListView); + break; + } + + case WM_SIZE: + { + RECT rect; + rect.left = 0; + rect.top = 0; + rect.right = LOWORD(lParam); + rect.bottom = HIWORD(lParam); + AdjustWindowRectEx(&rect, GetWindowLongPtrW(group->hListView, GWL_STYLE), FALSE, GetWindowLongPtrW(group->hListView, GWL_EXSTYLE)); + MoveWindow(group->hListView, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, TRUE); + break; + } + case WM_CLOSE: SendMessageW(hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); break; @@ -101,6 +227,41 @@ case WM_NCLBUTTONDOWN: Globals.hActiveGroup = (PROGGROUP*)GetWindowLongPtrW(hWnd, 0); Globals.hActiveGroup->hActiveProgram = NULL; + break; + + case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) + { + case NM_CLICK: + { + iItem = ((LPNMITEMACTIVATE)lParam)->iItem; + if (iItem == -1) + { + group->hActiveProgram = NULL; + break; + } + + lvItem.mask = LVIF_PARAM; + lvItem.iItem = iItem; + SendMessageW(group->hListView, LVM_GETITEMW, 0, (LPARAM)&lvItem); + group->hActiveProgram = (PROGRAM*)lvItem.lParam; + break; + } + + case NM_DBLCLK: + { + iItem = ((LPNMITEMACTIVATE)lParam)->iItem; + if (iItem == -1) + break; + + lvItem.mask = LVIF_PARAM; + lvItem.iItem = iItem; + SendMessageW(group->hListView, LVM_GETITEMW, 0, (LPARAM)&lvItem); + /* ... or use group->hActiveProgram */ + PROGRAM_ExecuteProgram((PROGRAM*)lvItem.lParam); + break; + } + } break; }

8 years, 7 months

[akhaldi] 71323: [0.4.1] Merge the explorer fix by Thomas in r71318. CORE-11217

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 12 19:40:49 2016 New Revision: 71323 URL: http://svn.reactos.org/svn/reactos?rev=71323&view=rev Log: [0.4.1] Merge the explorer fix by Thomas in r71318. CORE-11217 Modified: branches/ros-branch-0_4_1/ (props changed) branches/ros-branch-0_4_1/reactos/ (props changed) branches/ros-branch-0_4_1/reactos/base/shell/explorer/traywnd.cpp Propchange: branches/ros-branch-0_4_1/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 12 19:40:49 2016 @@ -1 +1 @@ -/trunk:71217,71231,71245,71252,71255,71296,71309 +/trunk:71217,71231,71245,71252,71255,71296,71309,71318 Propchange: branches/ros-branch-0_4_1/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 12 19:40:49 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296,71309 +/trunk/reactos:71217,71231-71232,71245,71252,71262,71279,71296,71309,71318 Modified: branches/ros-branch-0_4_1/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/base/s… ============================================================================== --- branches/ros-branch-0_4_1/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Thu May 12 19:40:49 2016 @@ -1052,7 +1052,7 @@ rcTray.top, rcTray.right - rcTray.left, rcTray.bottom - rcTray.top, - SWP_NOZORDER); + SWP_NOZORDER | SWP_NOACTIVATE); ResizeWorkArea(); @@ -1146,7 +1146,7 @@ 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE); + SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); /* Determine a minimum tray window rectangle. The "client" height is zero here since we cannot determine an optimal minimum width when @@ -1456,7 +1456,7 @@ { SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); } - SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); + SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); return TRUE; } @@ -1825,7 +1825,7 @@ { SetWindowStyle(m_hWnd, WS_THICKFRAME | WS_BORDER, WS_THICKFRAME | WS_BORDER); } - SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); + SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOOWNERZORDER); }

8 years, 7 months

[akhaldi] 71322: [PROGMAN] Fix PCH build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu May 12 16:32:35 2016 New Revision: 71322 URL: http://svn.reactos.org/svn/reactos?rev=71322&view=rev Log: [PROGMAN] Fix PCH build. Modified: trunk/reactos/base/shell/progman/progman.h Modified: trunk/reactos/base/shell/progman/progman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman… ============================================================================== --- trunk/reactos/base/shell/progman/progman.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/progman/progman.h [iso-8859-1] Thu May 12 16:32:35 2016 @@ -31,8 +31,6 @@ #ifndef PROGMAN_H #define PROGMAN_H - -#pragma once #include <stdio.h> #include <stdlib.h>

8 years, 7 months

[ekohl] 71321: [USETUP] Pressing F3-Enter during setup behaves wrong sometimes. Patch by Wim Hueskes. CORE-11231 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 12 16:18:32 2016 New Revision: 71321 URL: http://svn.reactos.org/svn/reactos?rev=71321&view=rev Log: [USETUP] Pressing F3-Enter during setup behaves wrong sometimes. Patch by Wim Hueskes. CORE-11231 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Thu May 12 16:18:32 2016 @@ -1978,6 +1978,8 @@ { if (ConfirmQuit(Ir) == TRUE) return QUIT_PAGE; + + break; } else if (Cancel == TRUE) { @@ -2133,6 +2135,8 @@ { if (ConfirmQuit(Ir) == TRUE) return QUIT_PAGE; + + break; } else if (Cancel == TRUE) { @@ -2287,6 +2291,8 @@ { if (ConfirmQuit(Ir) == TRUE) return QUIT_PAGE; + + break; } else if (Cancel == TRUE) { @@ -2375,7 +2381,7 @@ } } - return SELECT_PARTITION_PAGE; + return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE; } @@ -3250,8 +3256,11 @@ ULONG Length; /* We do not need the filsystem list any more */ - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; + if (FileSystemList != NULL) + { + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; + } if (PartitionList == NULL || PartitionList->CurrentDisk == NULL ||

8 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
26
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 May 2016