Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 46787: Link C++ modules against libsupc++.a, too as in newer gcc versions libstdc++ doesn't duplicate these definitions anymore.
by tkreuzer＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: tkreuzer Date: Fri Apr 9 14:49:28 2010 New Revision: 46787 URL: http://svn.reactos.org/svn/reactos?rev=46787&view=rev Log: Link C++ modules against libsupc++.a, too as in newer gcc versions libstdc++ doesn't duplicate these definitions anymore. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Fri Apr 9 14:49:28 2010 @@ -483,7 +483,7 @@ // We use our proprietary "ofmt_stub.a" to implement a stub for "_get_output_format" required by "libmingwex.a". // This archive just contains the compiled "ofmt_stub.s" supplied with the MinGW Runtime sources. - fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" " ); + fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libsupc++.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" " ); /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64")

1 0

[gadamopoulos] 46786: asm.h: fix definition of HEX macro
by gadamopoulos＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: gadamopoulos Date: Fri Apr 9 13:14:56 2010 New Revision: 46786 URL: http://svn.reactos.org/svn/reactos?rev=46786&view=rev Log: asm.h: fix definition of HEX macro Modified: trunk/reactos/include/reactos/asm.h Modified: trunk/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.h?rev=… ============================================================================== --- trunk/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/asm.h [iso-8859-1] Fri Apr 9 13:14:56 2010 @@ -73,7 +73,7 @@ .altmacro /* Hex numbers need to be in 0x1AB format */ -#define HEX(x) 0x##x +#define HEX(y) 0x##y /* Macro values need to be marked */ #define VAL(x) \x

1 0

[tkreuzer] 46785: reduce diff to trunk
by tkreuzer＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: tkreuzer Date: Fri Apr 9 05:36:02 2010 New Revision: 46785 URL: http://svn.reactos.org/svn/reactos?rev=46785&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Fri Apr 9 05:36:02 2010 @@ -155,3 +155,4 @@ endif endef + Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Fri Apr 9 05:36:02 2010 @@ -483,7 +483,7 @@ // We use our proprietary "ofmt_stub.a" to implement a stub for "_get_output_format" required by "libmingwex.a". // This archive just contains the compiled "ofmt_stub.s" supplied with the MinGW Runtime sources. - fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" \"$(shell ${TARGET_CPP} -print-file-name=ofmt_stub.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)\"\n" ); + fprintf ( fMakefile, "PROJECT_CXXLIBS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-libgcc-file-name)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\" " ); /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64")

1 0

[cgutman] 46784: [NTOSKRNL] - Write the assigned resources to the registry
by cgutman＠svn.reactos.org 09 Apr '10

09 Apr '10

Author: cgutman Date: Fri Apr 9 03:10:34 2010 New Revision: 46784 URL: http://svn.reactos.org/svn/reactos?rev=46784&view=rev Log: [NTOSKRNL] - Write the assigned resources to the registry Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Apr 9 03:10:34 2010 @@ -245,6 +245,13 @@ RtlInitUnicodeString(&KeyName, L"ActiveService"); Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, DeviceNode->ServiceName.Buffer, DeviceNode->ServiceName.Length); + + if (NT_SUCCESS(Status) && DeviceNode->ResourceList) + { + RtlInitUnicodeString(&KeyName, L"AllocConfig"); + Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_RESOURCE_LIST, + DeviceNode->ResourceList, CM_RESOURCE_LIST_SIZE(DeviceNode->ResourceList)); + } if (NT_SUCCESS(Status)) IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);

1 0

[gschneider] 46783: [TASKMGR] Remove temp debug output related to another problem
by gschneider＠svn.reactos.org 08 Apr '10

08 Apr '10

Author: gschneider Date: Fri Apr 9 00:21:17 2010 New Revision: 46783 URL: http://svn.reactos.org/svn/reactos?rev=46783&view=rev Log: [TASKMGR] Remove temp debug output related to another problem Modified: trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Fri Apr 9 00:21:17 2010 @@ -448,9 +448,7 @@ pData = (LPPROCESS_PAGE_LIST_ITEM)item.lParam; if (!ProcessRunning(pData->ProcessId)) { - MessageBox(NULL, L"Processs is dead", L"HM?", MB_OK); - if (ListView_DeleteItem(hProcessPageListCtrl, i) == FALSE) - MessageBox(NULL, L"Deletion failed", L"HM!", MB_OK); + (void)ListView_DeleteItem(hProcessPageListCtrl, i); HeapFree(GetProcessHeap(), 0, pData); } }

1 0

[gschneider] 46782: [TASKMGR] - Don't try to query a performance index when switching from application to process tab - Query a process index instead: "go to process" works now
by gschneider＠svn.reactos.org 08 Apr '10

08 Apr '10

Author: gschneider Date: Fri Apr 9 00:10:45 2010 New Revision: 46782 URL: http://svn.reactos.org/svn/reactos?rev=46782&view=rev Log: [TASKMGR] - Don't try to query a performance index when switching from application to process tab - Query a process index instead: "go to process" works now Modified: trunk/reactos/base/applications/taskmgr/applpage.c trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Fri Apr 9 00:10:45 2010 @@ -49,7 +49,7 @@ void ApplicationPageShowContextMenu1(void); void ApplicationPageShowContextMenu2(void); int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); -int PerfGetIndexByProcessId(DWORD dwProcessId); +int ProcGetIndexByProcessId(DWORD dwProcessId); #if 0 void SwitchToThisWindow ( @@ -878,7 +878,6 @@ LPAPPLICATION_PAGE_LIST_ITEM pAPLI = NULL; LV_ITEM item; int i; - /* NMHDR nmhdr; */ for (i=0; i<ListView_GetItemCount(hApplicationPageListCtrl); i++) { memset(&item, 0, sizeof(LV_ITEM)); @@ -902,7 +901,7 @@ /* * Select the process item in the list */ - i = PerfGetIndexByProcessId(dwProcessId); + i = ProcGetIndexByProcessId(dwProcessId); if (i != -1) { ListView_SetItemState(hProcessPageListCtrl, Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Fri Apr 9 00:10:45 2010 @@ -387,27 +387,6 @@ return bSuccessful; } -int PerfGetIndexByProcessId(DWORD dwProcessId) -{ - int FoundIndex = -1; - ULONG Index; - - EnterCriticalSection(&PerfDataCriticalSection); - - for (Index = 0; Index < ProcessCount; Index++) - { - if (PtrToUlong(pPerfData[Index].ProcessId) == dwProcessId) - { - FoundIndex = Index; - break; - } - } - - LeaveCriticalSection(&PerfDataCriticalSection); - - return FoundIndex; -} - ULONG PerfDataGetProcessId(ULONG Index) { ULONG ProcessId; Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Fri Apr 9 00:10:45 2010 @@ -54,6 +54,27 @@ DWORD WINAPI ProcessPageRefreshThread(void *lpParameter); int ProcessRunning(ULONG ProcessId); +int ProcGetIndexByProcessId(DWORD dwProcessId) +{ + int i; + LVITEM item; + LPPROCESS_PAGE_LIST_ITEM pData; + + for (i=0; i<ListView_GetItemCount(hProcessPageListCtrl); i++) + { + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_PARAM; + item.iItem = i; + (void)ListView_GetItem(hProcessPageListCtrl, &item); + pData = (LPPROCESS_PAGE_LIST_ITEM)item.lParam; + if (PerfDataGetProcessId(pData->Index) == dwProcessId) + { + return i; + } + } + return 0; +} + DWORD GetSelectedProcessId(void) { int Index; @@ -427,7 +448,9 @@ pData = (LPPROCESS_PAGE_LIST_ITEM)item.lParam; if (!ProcessRunning(pData->ProcessId)) { - (void)ListView_DeleteItem(hProcessPageListCtrl, i); + MessageBox(NULL, L"Processs is dead", L"HM?", MB_OK); + if (ListView_DeleteItem(hProcessPageListCtrl, i) == FALSE) + MessageBox(NULL, L"Deletion failed", L"HM!", MB_OK); HeapFree(GetProcessHeap(), 0, pData); } }

1 0

[gschneider] 46781: [SHELL32] Add missing format specifier, switch parameters as advertised
by gschneider＠svn.reactos.org 08 Apr '10

08 Apr '10

Author: gschneider Date: Thu Apr 8 23:25:02 2010 New Revision: 46781 URL: http://svn.reactos.org/svn/reactos?rev=46781&view=rev Log: [SHELL32] Add missing format specifier, switch parameters as advertised Modified: trunk/reactos/dll/win32/shell32/fprop.c Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/fprop.c [iso-8859-1] Thu Apr 8 23:25:02 2010 @@ -114,7 +114,7 @@ { /* the file extension is unknown, so default to string "FileExtension File" */ SendMessageW(hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)value); - swprintf(name, value, &filext[1]); + swprintf(name, L"%s %s", &filext[1], value); SendMessageW(hDlgCtrl, WM_SETTEXT, (WPARAM)NULL, (LPARAM)name); return TRUE; }

1 0

[janderwald] 46780: [KS] - Fix tons of bugs in KsMergeAutomationTable - Implement removing instantiated filter from filter factory when filter is about to be closed - Fix a memory corrupion bug in KspHandleDataIntersection
by janderwald＠svn.reactos.org 08 Apr '10

08 Apr '10

Author: janderwald Date: Thu Apr 8 22:14:38 2010 New Revision: 46780 URL: http://svn.reactos.org/svn/reactos?rev=46780&view=rev Log: [KS] - Fix tons of bugs in KsMergeAutomationTable - Implement removing instantiated filter from filter factory when filter is about to be closed - Fix a memory corrupion bug in KspHandleDataIntersection Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/filter.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Thu Apr 8 22:14:38 2010 @@ -2096,8 +2096,15 @@ if (!AutomationTableB) return AutomationTableA->MethodSetsCount; - /* sanity check */ - ASSERT(AutomationTableA->MethodItemSize == AutomationTableB->MethodItemSize); + + DPRINT("AutomationTableA MethodItemSize %lu MethodSetsCount %lu\n", AutomationTableA->MethodItemSize, AutomationTableA->MethodSetsCount); + DPRINT("AutomationTableB MethodItemSize %lu MethodSetsCount %lu\n", AutomationTableB->MethodItemSize, AutomationTableB->MethodSetsCount); + + if (AutomationTableA->MethodItemSize && AutomationTableB->MethodItemSize) + { + /* sanity check */ + ASSERT(AutomationTableA->MethodItemSize == AutomationTableB->MethodItemSize); + } /* now iterate all property sets and compare their guids */ Count = AutomationTableA->MethodSetsCount; @@ -2138,8 +2145,14 @@ if (!AutomationTableB) return AutomationTableA->EventSetsCount; - /* sanity check */ - ASSERT(AutomationTableA->EventItemSize == AutomationTableB->EventItemSize); + DPRINT("AutomationTableA EventItemSize %lu EventSetsCount %lu\n", AutomationTableA->EventItemSize, AutomationTableA->EventSetsCount); + DPRINT("AutomationTableB EventItemSize %lu EventSetsCount %lu\n", AutomationTableB->EventItemSize, AutomationTableB->EventSetsCount); + + if (AutomationTableA->EventItemSize && AutomationTableB->EventItemSize) + { + /* sanity check */ + ASSERT(AutomationTableA->EventItemSize == AutomationTableB->EventItemSize); + } /* now iterate all Event sets and compare their guids */ Count = AutomationTableA->EventSetsCount; @@ -2182,6 +2195,8 @@ return AutomationTableA->PropertySetsCount; /* sanity check */ + DPRINT("AutomationTableA EventItemSize %lu PropertySetsCount %lu\n", AutomationTableA->PropertyItemSize, AutomationTableA->PropertySetsCount); + DPRINT("AutomationTableB EventItemSize %lu PropertySetsCount %lu\n", AutomationTableB->PropertyItemSize, AutomationTableB->PropertySetsCount); ASSERT(AutomationTableA->PropertyItemSize == AutomationTableB->PropertyItemSize); /* now iterate all property sets and compare their guids */ @@ -2221,18 +2236,18 @@ if (!AutomationTableA) { /* copy of property set */ - RtlMoveMemory((PVOID)Table->MethodSets, AutomationTableB->MethodSets, Table->MethodItemSize * AutomationTableB->MethodSetsCount); + RtlMoveMemory((PVOID)Table->MethodSets, AutomationTableB->MethodSets, sizeof(KSMETHOD_SET) * AutomationTableB->MethodSetsCount); return STATUS_SUCCESS; } else if (!AutomationTableB) { /* copy of property set */ - RtlMoveMemory((PVOID)Table->MethodSets, AutomationTableA->MethodSets, Table->MethodItemSize * AutomationTableA->MethodSetsCount); + RtlMoveMemory((PVOID)Table->MethodSets, AutomationTableA->MethodSets, sizeof(KSMETHOD_SET) * AutomationTableA->MethodSetsCount); return STATUS_SUCCESS; } /* first copy all property items from dominant table */ - RtlMoveMemory((PVOID)Table->MethodSets, AutomationTableA->MethodSets, Table->MethodItemSize * AutomationTableA->MethodSetsCount); + RtlMoveMemory((PVOID)Table->MethodSets, AutomationTableA->MethodSets, sizeof(KSMETHOD_SET) * AutomationTableA->MethodSetsCount); /* set counter */ Count = AutomationTableA->MethodSetsCount; @@ -2255,7 +2270,7 @@ if (!bFound) { /* copy new property item set */ - RtlMoveMemory((PVOID)&Table->MethodSets[Count], &AutomationTableB->MethodSets[Index], Table->MethodItemSize); + RtlMoveMemory((PVOID)&Table->MethodSets[Count], &AutomationTableB->MethodSets[Index], sizeof(KSMETHOD_SET)); Count++; } } @@ -2276,18 +2291,18 @@ if (!AutomationTableA) { /* copy of property set */ - RtlMoveMemory((PVOID)Table->PropertySets, AutomationTableB->PropertySets, Table->PropertyItemSize * AutomationTableB->PropertySetsCount); + RtlMoveMemory((PVOID)Table->PropertySets, AutomationTableB->PropertySets, sizeof(KSPROPERTY_SET) * AutomationTableB->PropertySetsCount); return STATUS_SUCCESS; } else if (!AutomationTableB) { /* copy of property set */ - RtlMoveMemory((PVOID)Table->PropertySets, AutomationTableA->PropertySets, Table->PropertyItemSize * AutomationTableA->PropertySetsCount); + RtlMoveMemory((PVOID)Table->PropertySets, AutomationTableA->PropertySets, sizeof(KSPROPERTY_SET) * AutomationTableA->PropertySetsCount); return STATUS_SUCCESS; } /* first copy all property items from dominant table */ - RtlMoveMemory((PVOID)Table->PropertySets, AutomationTableA->PropertySets, Table->PropertyItemSize * AutomationTableA->PropertySetsCount); + RtlMoveMemory((PVOID)Table->PropertySets, AutomationTableA->PropertySets, sizeof(KSPROPERTY_SET) * AutomationTableA->PropertySetsCount); /* set counter */ Count = AutomationTableA->PropertySetsCount; @@ -2310,7 +2325,7 @@ if (!bFound) { /* copy new property item set */ - RtlMoveMemory((PVOID)&Table->PropertySets[Count], &AutomationTableB->PropertySets[Index], Table->PropertyItemSize); + RtlMoveMemory((PVOID)&Table->PropertySets[Count], &AutomationTableB->PropertySets[Index], sizeof(KSPROPERTY_SET)); Count++; } } @@ -2330,18 +2345,18 @@ if (!AutomationTableA) { /* copy of Event set */ - RtlMoveMemory((PVOID)Table->EventSets, AutomationTableB->EventSets, Table->EventItemSize * AutomationTableB->EventSetsCount); + RtlMoveMemory((PVOID)Table->EventSets, AutomationTableB->EventSets, sizeof(KSEVENT_SET) * AutomationTableB->EventSetsCount); return STATUS_SUCCESS; } else if (!AutomationTableB) { /* copy of Event set */ - RtlMoveMemory((PVOID)Table->EventSets, AutomationTableA->EventSets, Table->EventItemSize * AutomationTableA->EventSetsCount); + RtlMoveMemory((PVOID)Table->EventSets, AutomationTableA->EventSets, sizeof(KSEVENT_SET) * AutomationTableA->EventSetsCount); return STATUS_SUCCESS; } /* first copy all Event items from dominant table */ - RtlMoveMemory((PVOID)Table->EventSets, AutomationTableA->EventSets, Table->EventItemSize * AutomationTableA->EventSetsCount); + RtlMoveMemory((PVOID)Table->EventSets, AutomationTableA->EventSets, sizeof(KSEVENT_SET) * AutomationTableA->EventSetsCount); /* set counter */ Count = AutomationTableA->EventSetsCount; @@ -2364,7 +2379,7 @@ if (!bFound) { /* copy new Event item set */ - RtlMoveMemory((PVOID)&Table->EventSets[Count], &AutomationTableB->EventSets[Index], Table->EventItemSize); + RtlMoveMemory((PVOID)&Table->EventSets[Count], &AutomationTableB->EventSets[Index], sizeof(KSEVENT_SET)); Count++; } } @@ -2428,7 +2443,7 @@ } /* now allocate the property sets */ - Table->PropertySets = AllocateItem(NonPagedPool, Table->PropertyItemSize * Table->PropertySetsCount); + Table->PropertySets = AllocateItem(NonPagedPool, sizeof(KSPROPERTY_SET) * Table->PropertySetsCount); if (!Table->PropertySets) { @@ -2471,7 +2486,7 @@ } /* now allocate the property sets */ - Table->MethodSets = AllocateItem(NonPagedPool, Table->MethodItemSize * Table->MethodSetsCount); + Table->MethodSets = AllocateItem(NonPagedPool, sizeof(KSMETHOD_SET) * Table->MethodSetsCount); if (!Table->MethodSets) { @@ -2514,7 +2529,7 @@ } /* now allocate the property sets */ - Table->EventSets = AllocateItem(NonPagedPool, Table->EventItemSize * Table->EventSetsCount); + Table->EventSets = AllocateItem(NonPagedPool, sizeof(KSEVENT_SET) * Table->EventSetsCount); if (!Table->EventSets) { Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Thu Apr 8 22:14:38 2010 @@ -43,6 +43,11 @@ const GUID IID_IKsFilter = {0x3ef6ee44L, 0x0D41, 0x11d2, {0xbe, 0xDA, 0x00, 0xc0, 0x4f, 0x8e, 0xF4, 0x57}}; const GUID KSPROPSETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; + +VOID +IKsFilter_RemoveFilterFromFilterFactory( + IKsFilterImpl * This, + PKSFILTERFACTORY FilterFactory); DEFINE_KSPROPERTY_TOPOLOGYSET(IKsFilterTopologySet, KspTopologyPropertyHandler); @@ -506,8 +511,8 @@ /* complete irp */ IoCompleteRequest(Irp, IO_NO_INCREMENT); - /* FIXME remove our instance from the filter factory */ - ASSERT(0); + /* remove our instance from the filter factory */ + IKsFilter_RemoveFilterFromFilterFactory(This, This->Factory); /* free object header */ KsFreeObjectHeader(This->ObjectHeader); @@ -605,6 +610,9 @@ MultipleItem = (PKSMULTIPLE_ITEM)(Pin + 1); DataRange = (PKSDATARANGE)(MultipleItem + 1); + /* FIXME make sure its 64 bit aligned */ + ASSERT(((ULONG_PTR)DataRange & 0x3F) == 0); + if (!This->Factory->FilterDescriptor || !This->PinDescriptorCount) { /* no filter / pin descriptor */ @@ -632,7 +640,7 @@ Irp, Pin, DataRange, - (PKSDATAFORMAT)This->Factory->FilterDescriptor->PinDescriptors[Pin->PinId].PinDescriptor.DataRanges, + (PKSDATAFORMAT)This->PinDescriptorsEx[Pin->PinId].PinDescriptor.DataRanges, DataLength, Data, &Length); @@ -643,6 +651,8 @@ break; } DataRange = UlongToPtr(PtrToUlong(DataRange) + DataRange->FormatSize); + /* FIXME make sure its 64 bit aligned */ + ASSERT(((ULONG_PTR)DataRange & 0x3F) == 0); } IoStatus->Status = Status; @@ -718,6 +728,8 @@ IKsFilterImpl * This; NTSTATUS Status; PKSFILTER FilterInstance; + UNICODE_STRING GuidString; + PKSPROPERTY Property; /* obtain filter from object header */ Status = IKsFilter_GetFilterFromIrp(Irp, &Filter); @@ -729,6 +741,14 @@ /* current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* property was not handled */ + Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + RtlStringFromGUID(&Property->Set, &GuidString); + DPRINT("IKsFilter_DispatchDeviceIoControl property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + RtlFreeUnicodeString(&GuidString); + if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { @@ -1126,10 +1146,70 @@ /* found last entry */ break; } - }while(FilterFactory); + }while(TRUE); /* attach filter factory */ BasicHeader->Next.Filter = &This->Filter; +} + +VOID +IKsFilter_RemoveFilterFromFilterFactory( + IKsFilterImpl * This, + PKSFILTERFACTORY FilterFactory) +{ + PKSBASIC_HEADER BasicHeader; + PKSFILTER Filter, LastFilter; + + /* get filter factory basic header */ + BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)FilterFactory - sizeof(KSBASIC_HEADER)); + + /* sanity check */ + ASSERT(BasicHeader->Type == KsObjectTypeFilterFactory); + ASSERT(BasicHeader->FirstChild.Filter != NULL); + + + /* set to first entry */ + Filter = BasicHeader->FirstChild.Filter; + LastFilter = NULL; + + do + { + if (Filter == &This->Filter) + { + if (LastFilter) + { + /* get basic header */ + BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)LastFilter - sizeof(KSBASIC_HEADER)); + /* remove filter instance */ + BasicHeader->Next.Filter = This->Header.Next.Filter; + break; + } + else + { + /* remove filter instance */ + BasicHeader->FirstChild.Filter = This->Header.Next.Filter; + break; + } + } + + /* get basic header */ + BasicHeader = (PKSBASIC_HEADER)((ULONG_PTR)Filter - sizeof(KSBASIC_HEADER)); + /* sanity check */ + ASSERT(BasicHeader->Type == KsObjectTypeFilter); + + LastFilter = Filter; + if (BasicHeader->Next.Filter) + { + /* iterate to next filter factory */ + Filter = BasicHeader->Next.Filter; + } + else + { + /* filter is not in list */ + ASSERT(0); + break; + } + }while(TRUE); } NTSTATUS

1 0

[fireball] 46779: [DRIVERS/GREEN] - Includes cleanup, fix NDK inclusion.
by fireball＠svn.reactos.org 08 Apr '10

08 Apr '10

Author: fireball Date: Thu Apr 8 11:39:24 2010 New Revision: 46779 URL: http://svn.reactos.org/svn/reactos?rev=46779&view=rev Log: [DRIVERS/GREEN] - Includes cleanup, fix NDK inclusion. Modified: trunk/rosapps/drivers/green/green.h Modified: trunk/rosapps/drivers/green/green.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/green.h?rev=… ============================================================================== --- trunk/rosapps/drivers/green/green.h [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/green.h [iso-8859-1] Thu Apr 8 11:39:24 2010 @@ -1,7 +1,6 @@ -#include <stdarg.h> +#include <ntddk.h> #include <ntifs.h> -#include <ndk/iotypes.h> -#include <ndk/obfuncs.h> +#include <ntndk.h> #include <windef.h> #define WINBASEAPI typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES;

1 0

[fireball] 46778: - Copy whole window bits when moving a window, SWM's job. Fixes "repainting" issues when moving a window.
by fireball＠svn.reactos.org 08 Apr '10

08 Apr '10

Author: fireball Date: Thu Apr 8 11:09:26 2010 New Revision: 46778 URL: http://svn.reactos.org/svn/reactos?rev=46778&view=rev Log: - Copy whole window bits when moving a window, SWM's job. Fixes "repainting" issues when moving a window. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Thu Apr 8 11:09:26 2010 @@ -83,6 +83,23 @@ else RedrawWindow( data->hwnd, NULL, rgn, RDW_INVALIDATE | RDW_ERASE | RDW_ALLCHILDREN ); DeleteObject( rgn ); } +} + +void swm_move_whole_window( struct ntdrv_win_data *data, const RECT *old_rect ) +{ + HDC hdc_src, hdc_dst; + HWND parent; + + parent = GetAncestor( data->hwnd, GA_PARENT ); + hdc_src = GetDCEx( parent, 0, DCX_CACHE ); + hdc_dst = GetDCEx( data->hwnd, 0, DCX_CACHE | DCX_WINDOW ); + + BitBlt( hdc_dst, 0, 0, + data->whole_rect.right - data->whole_rect.left, data->whole_rect.bottom - data->whole_rect.top, + hdc_src, old_rect->left, old_rect->top, SRCCOPY ); + + ReleaseDC( data->hwnd, hdc_dst ); + ReleaseDC( parent, hdc_src ); } HKL CDECL RosDrv_ActivateKeyboardLayout( HKL layout, UINT flags ) @@ -936,7 +953,12 @@ /* Sync position change */ if (!(swp_flags & SWP_NOREDRAW)) // HACK: When removing this, explorer's start menu starts to appear partially. Investigate! + { SwmPosChanged(hwnd, &data->whole_rect, &old_whole_rect, insert_after, swp_flags); + + /* SWM: Move whole window bits */ + swm_move_whole_window( data, &old_whole_rect ); + } /* Pass show/hide information to the window manager */ if (swp_flags & SWP_SHOWWINDOW)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs