Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[fireball] 38552: - Revert changes to NtSetVolumeInformationFile made in 38550, it should indeed use IoGetRelatedDeviceObject, not target device.
by fireball＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: fireball Date: Sun Jan 4 04:12:38 2009 New Revision: 38552 URL: http://svn.reactos.org/svn/reactos?rev=38552&view=rev Log: - Revert changes to NtSetVolumeInformationFile made in 38550, it should indeed use IoGetRelatedDeviceObject, not target device. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sun Jan 4 04:12:38 2009 @@ -3307,8 +3307,7 @@ } /* Get the device object */ - Status = IoGetRelatedTargetDevice(FileObject, &DeviceObject); - if (!NT_SUCCESS(Status)) return Status; + DeviceObject = IoGetRelatedDeviceObject(FileObject); /* Clear File Object event */ KeClearEvent(&FileObject->Event);

2 1

[fireball] 38560: Dmitry Chapyshev - Add more length checks to NtQueryInformationProcess, inspired by r28570.
by fireball＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: fireball Date: Sun Jan 4 05:56:14 2009 New Revision: 38560 URL: http://svn.reactos.org/svn/reactos?rev=38560&view=rev Log: Dmitry Chapyshev - Add more length checks to NtQueryInformationProcess, inspired by r28570. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=38… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sun Jan 4 05:56:14 2009 @@ -120,7 +120,7 @@ /* Set return length */ Length = sizeof(PROCESS_BASIC_INFORMATION); - if ( ProcessInformationLength != Length ) + if (ProcessInformationLength != Length) { Status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -152,7 +152,7 @@ case ProcessIoCounters: Length = sizeof(IO_COUNTERS); - if ( ProcessInformationLength != Length ) + if (ProcessInformationLength != Length) { Status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -167,7 +167,7 @@ /* Set the return length */ Length = sizeof(KERNEL_USER_TIMES); - if ( ProcessInformationLength != Length ) + if (ProcessInformationLength != Length) { Status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -195,15 +195,20 @@ /* Process Debug Port */ case ProcessDebugPort: + /* Set return length */ + Length = sizeof(HANDLE); + + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Protect write with SEH */ _SEH2_TRY { /* Return whether or not we have a debug port */ *(PHANDLE)ProcessInformation = (Process->DebugPort ? (HANDLE)-1 : NULL); - - /* Set the return length*/ - Length = sizeof(HANDLE); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -225,7 +230,7 @@ /* Set the return length*/ Length = sizeof(ULONG); - if ( ProcessInformationLength != Length ) + if (ProcessInformationLength != Length) { Status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -251,14 +256,19 @@ /* Session ID for the process */ case ProcessSessionInformation: + /* Set the return length*/ + Length = sizeof(PROCESS_SESSION_INFORMATION); + + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Enter SEH for write safety */ _SEH2_TRY { /* Write back the Session ID */ SessionInfo->SessionId = Process->Session; - - /* Set the return length */ - Length = sizeof(PROCESS_SESSION_INFORMATION); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -279,7 +289,7 @@ /* Set the return length */ Length = sizeof(VM_COUNTERS); - if ( ProcessInformationLength != Length ) + if (ProcessInformationLength != Length) { Status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -313,15 +323,20 @@ /* Hard Error Processing Mode */ case ProcessDefaultHardErrorMode: + /* Set the return length*/ + Length = sizeof(ULONG); + + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Enter SEH for writing back data */ _SEH2_TRY { /* Write the current processing mode */ *(PULONG)ProcessInformation = Process-> DefaultHardErrorProcessing; - - /* Set the return length */ - Length = sizeof(ULONG); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -334,15 +349,20 @@ /* Priority Boosting status */ case ProcessPriorityBoost: + /* Set the return length*/ + Length = sizeof(ULONG); + + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Enter SEH for writing back data */ _SEH2_TRY { /* Return boost status */ *(PULONG)ProcessInformation = Process->Pcb.DisableBoost ? TRUE : FALSE; - - /* Set the return length */ - Length = sizeof(ULONG); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -355,6 +375,14 @@ /* DOS Device Map */ case ProcessDeviceMap: + /* Set the return length*/ + Length = sizeof(PROCESS_DEVICEMAP_INFORMATION); + + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Query the device map information */ ObQueryDeviceMapInformation(Process, &DeviceMap); @@ -362,9 +390,6 @@ _SEH2_TRY { *(PPROCESS_DEVICEMAP_INFORMATION)ProcessInformation = DeviceMap; - - /* Set the return length */ - Length = sizeof(PROCESS_DEVICEMAP_INFORMATION); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -377,14 +402,19 @@ /* Priority class */ case ProcessPriorityClass: + /* Set the return length*/ + Length = sizeof(USHORT); + + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } /* Enter SEH for writing back data */ _SEH2_TRY { /* Return current priority class */ *(PUSHORT)ProcessInformation = Process->PriorityClass; - - /* Set the return length */ - Length = sizeof(USHORT); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[gedmurphy] 38559: - Generate to do list, test list, bug list and deprecated list. - Add place holder for header and footer. This will need to be changed to suit the script. - Don't generate a tab index. - Build the search data so we can search the source.
by gedmurphy＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: gedmurphy Date: Sun Jan 4 05:44:45 2009 New Revision: 38559 URL: http://svn.reactos.org/svn/reactos?rev=38559&view=rev Log: - Generate to do list, test list, bug list and deprecated list. - Add place holder for header and footer. This will need to be changed to suit the script. - Don't generate a tab index. - Build the search data so we can search the source. Modified: trunk/reactos/Doxyfile Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=38559&r1=3855… ============================================================================== --- trunk/reactos/Doxyfile [iso-8859-1] (original) +++ trunk/reactos/Doxyfile [iso-8859-1] Sun Jan 4 05:44:45 2009 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "0.4-SVN r?????" +PROJECT_NUMBER = "ReactOS Source Code" # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -435,25 +435,25 @@ # disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. -GENERATE_TODOLIST = NO +GENERATE_TODOLIST = YES # The GENERATE_TESTLIST tag can be used to enable (YES) or # disable (NO) the test list. This list is created by putting \test # commands in the documentation. -GENERATE_TESTLIST = NO +GENERATE_TESTLIST = YES # The GENERATE_BUGLIST tag can be used to enable (YES) or # disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. -GENERATE_BUGLIST = NO +GENERATE_BUGLIST = YES # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or # disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. -GENERATE_DEPRECATEDLIST= NO +GENERATE_DEPRECATEDLIST= YES # The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. @@ -753,7 +753,7 @@ # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) -COLS_IN_ALPHA_INDEX = 5 +COLS_IN_ALPHA_INDEX = 3 # In case all classes in a project start with a common prefix, all # classes will be put under the same header in the alphabetical index. @@ -787,13 +787,13 @@ # each generated HTML page. If it is left blank doxygen will generate a # standard header. -HTML_HEADER = +HTML_HEADER = Doxygen/header.html # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -HTML_FOOTER = +HTML_FOOTER = Doxygen/footer.html # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to @@ -816,7 +816,7 @@ # JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). -HTML_DYNAMIC_SECTIONS = YES +HTML_DYNAMIC_SECTIONS = NO # If the GENERATE_DOCSET tag is set to YES, additional index files # will be generated that can be used as input for Apple's Xcode 3 @@ -941,7 +941,7 @@ # top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. -DISABLE_INDEX = NO +DISABLE_INDEX = YES # This tag can be used to set the number of enum values (range [1..20]) # that doxygen will group on one line in the generated HTML documentation. @@ -1515,4 +1515,4 @@ # The SEARCHENGINE tag specifies whether or not a search engine should be # used. If set to NO the values of all tags below this one will be ignored. -SEARCHENGINE = NO +SEARCHENGINE = YES

1 0

[cwittich] 38558: sync riched20 with wine 1.1.12
by cwittich＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: cwittich Date: Sun Jan 4 05:42:09 2009 New Revision: 38558 URL: http://svn.reactos.org/svn/reactos?rev=38558&view=rev Log: sync riched20 with wine 1.1.12 Modified: trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/table.c Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sun Jan 4 05:42:09 2009 @@ -1616,7 +1616,7 @@ data.string = string; data.length = strlen(string); data.pos = 0; - es.dwCookie = (DWORD)&data; + es.dwCookie = (DWORD_PTR)&data; es.pfnCallback = ME_ReadFromRTFString; ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE); } @@ -2065,7 +2065,7 @@ return FALSE; gds.hData = GetClipboardData(cf); gds.nLength = 0; - es.dwCookie = (DWORD)&gds; + es.dwCookie = (DWORD_PTR)&gds; es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); @@ -2685,6 +2685,7 @@ DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) IUnknown_Release(editor->lpOleCallback); + SetWindowLongPtrW(editor->hWnd, 0, 0); OleUninitialize(); FREE_OBJ(editor->pBuffer); @@ -3821,7 +3822,6 @@ } case WM_DESTROY: ME_DestroyEditor(editor); - SetWindowLongPtrW(editor->hWnd, 0, 0); return 0; case WM_SETCURSOR: { Modified: trunk/reactos/dll/win32/riched20/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/table.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/table.c [iso-8859-1] Sun Jan 4 05:42:09 2009 @@ -54,8 +54,7 @@ #include "editor.h" #include "rtf.h" -WINE_DEFAULT_DEBUG_CHANNEL(richedit); -WINE_DECLARE_DEBUG_CHANNEL(richedit_lists); +WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, int nCursor, @@ -176,7 +175,7 @@ { if(TRACE_ON(richedit_lists)) { - TRACE_(richedit_lists)("---\n"); + TRACE("---\n"); ME_DumpDocument(editor->pBuffer); } #ifndef NDEBUG

1 0

[cwittich] 38557: sync browseui_winetest with wine 1.1.12
by cwittich＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: cwittich Date: Sun Jan 4 05:34:13 2009 New Revision: 38557 URL: http://svn.reactos.org/svn/reactos?rev=38557&view=rev Log: sync browseui_winetest with wine 1.1.12 Modified: trunk/rostests/winetests/browseui/autocomplete.c Modified: trunk/rostests/winetests/browseui/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/autoco… ============================================================================== --- trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] Sun Jan 4 05:34:13 2009 @@ -45,7 +45,7 @@ ok(FALSE, #exp " failed: %x\n", res); \ } -LPWSTR strdup_AtoW(LPCSTR str) +static LPWSTR strdup_AtoW(LPCSTR str) { int size = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); LPWSTR wstr = (LPWSTR)CoTaskMemAlloc((size + 1)*sizeof(WCHAR)); @@ -86,14 +86,14 @@ return This; } -ULONG STDMETHODCALLTYPE TestACL_AddRef(IEnumString *iface) +static ULONG STDMETHODCALLTYPE TestACL_AddRef(IEnumString *iface) { TestACL *This = (TestACL *)iface; trace("ACL(%p): addref (%d)\n", This, This->ref+1); return InterlockedIncrement(&This->ref); } -ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface) +static ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface) { TestACL *This = (TestACL *)iface; ULONG res; @@ -103,7 +103,7 @@ return res; } -HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) +static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { TestACL *This = (TestACL *)iface; *ppvOut = NULL; @@ -129,7 +129,7 @@ return E_NOINTERFACE; } -HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) +static HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) { TestACL *This = (TestACL *)iface; ULONG i; @@ -150,19 +150,19 @@ return S_FALSE; } -HRESULT STDMETHODCALLTYPE TestACL_Skip(IEnumString *iface, ULONG celt) +static HRESULT STDMETHODCALLTYPE TestACL_Skip(IEnumString *iface, ULONG celt) { ok(FALSE, "Unexpected call to TestACL_Skip\n"); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE TestACL_Clone(IEnumString *iface, IEnumString **out) +static HRESULT STDMETHODCALLTYPE TestACL_Clone(IEnumString *iface, IEnumString **out) { ok(FALSE, "Unexpected call to TestACL_Clone\n"); return E_OUTOFMEMORY; } -HRESULT STDMETHODCALLTYPE TestACL_Reset(IEnumString *iface) +static HRESULT STDMETHODCALLTYPE TestACL_Reset(IEnumString *iface) { TestACL *This = (TestACL *)iface; trace("ACL(%p): Reset\n", This); @@ -170,7 +170,7 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE TestACL_Expand(IACList *iface, LPCOLESTR str) +static HRESULT STDMETHODCALLTYPE TestACL_Expand(IACList *iface, LPCOLESTR str) { TestACL *This = impl_from_IACList(iface); trace("ACL(%p): Expand\n", impl_from_IACList(iface)); @@ -190,17 +190,17 @@ TestACL_Clone }; -ULONG STDMETHODCALLTYPE TestACL_ACList_AddRef(IACList *iface) +static ULONG STDMETHODCALLTYPE TestACL_ACList_AddRef(IACList *iface) { return TestACL_AddRef((IEnumString *)impl_from_IACList(iface)); } -ULONG STDMETHODCALLTYPE TestACL_ACList_Release(IACList *iface) +static ULONG STDMETHODCALLTYPE TestACL_ACList_Release(IACList *iface) { return TestACL_Release((IEnumString *)impl_from_IACList(iface)); } -HRESULT STDMETHODCALLTYPE TestACL_ACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvout) +static HRESULT STDMETHODCALLTYPE TestACL_ACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvout) { return TestACL_QueryInterface((IEnumString *)impl_from_IACList(iface), iid, ppvout); }

1 0

[cwittich] 38556: sync hlink_winetest with wine 1.1.12
by cwittich＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: cwittich Date: Sun Jan 4 05:33:07 2009 New Revision: 38556 URL: http://svn.reactos.org/svn/reactos?rev=38556&view=rev Log: sync hlink_winetest with wine 1.1.12 Modified: trunk/rostests/winetests/hlink/hlink.c Modified: trunk/rostests/winetests/hlink/hlink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/hlink.c?r… ============================================================================== --- trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] Sun Jan 4 05:33:07 2009 @@ -23,6 +23,7 @@ #include <stdio.h> +#include <initguid.h> #include <hlink.h> #include <hlguids.h> @@ -157,6 +158,13 @@ ok(r == S_OK, "failed\n"); ok(str == NULL, "string should be null\n"); + /* Unimplented functions checks */ + r = IHlink_GetAdditionalParams(lnk, NULL); + ok(r == E_NOTIMPL, "failed\n"); + + r = IHlink_SetAdditionalParams(lnk, NULL); + ok(r == E_NOTIMPL, "failed\n"); + IHlink_Release(lnk); } @@ -171,6 +179,23 @@ 0x2f,0x00,0x77,0x00,0x69,0x00,0x6e,0x00, 0x65,0x00,0x68,0x00,0x71,0x00,0x2e,0x00, 0x6f,0x00,0x72,0x00,0x67,0x00,0x2f,0x00, + 0x00,0x00, +}; + +/* url only (IE7) */ +static const unsigned char expected_hlink_data_ie7[] = +{ + 0x02,0x00,0x00,0x00,0x03,0x00,0x00,0x00, + 0xe0,0xc9,0xea,0x79,0xf9,0xba,0xce,0x11, + 0x8c,0x82,0x00,0xaa,0x00,0x4b,0xa9,0x0b, + 0x3e,0x00,0x00,0x00,0x68,0x00,0x74,0x00, + 0x74,0x00,0x70,0x00,0x3a,0x00,0x2f,0x00, + 0x2f,0x00,0x77,0x00,0x69,0x00,0x6e,0x00, + 0x65,0x00,0x68,0x00,0x71,0x00,0x2e,0x00, + 0x6f,0x00,0x72,0x00,0x67,0x00,0x2f,0x00, + 0x00,0x00,0x79,0x58,0x81,0xf4,0x3b,0x1d, + 0x7f,0x48,0xaf,0x2c,0x82,0x5d,0xc4,0x85, + 0x27,0x63,0x00,0x00,0x00,0x00,0xa5,0xab, 0x00,0x00, }; @@ -188,6 +213,25 @@ 0x69,0x00,0x6e,0x00,0x65,0x00,0x68,0x00, 0x71,0x00,0x2e,0x00,0x6f,0x00,0x72,0x00, 0x67,0x00,0x2f,0x00,0x00,0x00, +}; + +/* url + friendly name (IE7) */ +static const unsigned char expected_hlink_data2_ie7[] = +{ + 0x02,0x00,0x00,0x00,0x17,0x00,0x00,0x00, + 0x08,0x00,0x00,0x00,0x57,0x00,0x69,0x00, + 0x6e,0x00,0x65,0x00,0x20,0x00,0x48,0x00, + 0x51,0x00,0x00,0x00,0xe0,0xc9,0xea,0x79, + 0xf9,0xba,0xce,0x11,0x8c,0x82,0x00,0xaa, + 0x00,0x4b,0xa9,0x0b,0x3e,0x00,0x00,0x00, + 0x68,0x00,0x74,0x00,0x74,0x00,0x70,0x00, + 0x3a,0x00,0x2f,0x00,0x2f,0x00,0x77,0x00, + 0x69,0x00,0x6e,0x00,0x65,0x00,0x68,0x00, + 0x71,0x00,0x2e,0x00,0x6f,0x00,0x72,0x00, + 0x67,0x00,0x2f,0x00,0x00,0x00,0x79,0x58, + 0x81,0xf4,0x3b,0x1d,0x7f,0x48,0xaf,0x2c, + 0x82,0x5d,0xc4,0x85,0x27,0x63,0x00,0x00, + 0x00,0x00,0xa5,0xab,0x00,0x00, }; /* url + friendly name + location */ @@ -208,6 +252,27 @@ 0x61,0x00,0x6e,0x00,0x6b,0x00,0x00,0x00, }; +/* url + friendly name + location (IE7) */ +static const unsigned char expected_hlink_data3_ie7[] = +{ + 0x02,0x00,0x00,0x00,0x1f,0x00,0x00,0x00, + 0x08,0x00,0x00,0x00,0x57,0x00,0x69,0x00, + 0x6e,0x00,0x65,0x00,0x20,0x00,0x48,0x00, + 0x51,0x00,0x00,0x00,0xe0,0xc9,0xea,0x79, + 0xf9,0xba,0xce,0x11,0x8c,0x82,0x00,0xaa, + 0x00,0x4b,0xa9,0x0b,0x3e,0x00,0x00,0x00, + 0x68,0x00,0x74,0x00,0x74,0x00,0x70,0x00, + 0x3a,0x00,0x2f,0x00,0x2f,0x00,0x77,0x00, + 0x69,0x00,0x6e,0x00,0x65,0x00,0x68,0x00, + 0x71,0x00,0x2e,0x00,0x6f,0x00,0x72,0x00, + 0x67,0x00,0x2f,0x00,0x00,0x00,0x79,0x58, + 0x81,0xf4,0x3b,0x1d,0x7f,0x48,0xaf,0x2c, + 0x82,0x5d,0xc4,0x85,0x27,0x63,0x00,0x00, + 0x00,0x00,0xa5,0xab,0x00,0x00,0x07,0x00, + 0x00,0x00,0x5f,0x00,0x62,0x00,0x6c,0x00, + 0x61,0x00,0x6e,0x00,0x6b,0x00,0x00,0x00, +}; + /* relative url */ static const unsigned char expected_hlink_data4[] = { @@ -238,6 +303,25 @@ 0x2f,0x00,0x00,0x00, }; +/* url + target frame name (IE7) */ +static const unsigned char expected_hlink_data5_ie7[] = +{ + 0x02,0x00,0x00,0x00,0x83,0x00,0x00,0x00, + 0x07,0x00,0x00,0x00,0x74,0x00,0x67,0x00, + 0x74,0x00,0x66,0x00,0x72,0x00,0x6d,0x00, + 0x00,0x00,0xe0,0xc9,0xea,0x79,0xf9,0xba, + 0xce,0x11,0x8c,0x82,0x00,0xaa,0x00,0x4b, + 0xa9,0x0b,0x3e,0x00,0x00,0x00,0x68,0x00, + 0x74,0x00,0x74,0x00,0x70,0x00,0x3a,0x00, + 0x2f,0x00,0x2f,0x00,0x77,0x00,0x69,0x00, + 0x6e,0x00,0x65,0x00,0x68,0x00,0x71,0x00, + 0x2e,0x00,0x6f,0x00,0x72,0x00,0x67,0x00, + 0x2f,0x00,0x00,0x00,0x79,0x58,0x81,0xf4, + 0x3b,0x1d,0x7f,0x48,0xaf,0x2c,0x82,0x5d, + 0xc4,0x85,0x27,0x63,0x00,0x00,0x00,0x00, + 0xa5,0xab,0x00,0x00, +}; + /* filename */ static const unsigned char expected_hlink_data6[] = { @@ -255,7 +339,9 @@ static void test_persist_save_data(const char *testname, IHlink *lnk, const unsigned char *expected_data, - unsigned int expected_data_size) + unsigned int expected_data_size, + const unsigned char *expected_data_alt, + unsigned int expected_data_alt_size) { HRESULT hr; IStream *stream; @@ -265,6 +351,7 @@ const unsigned char *data; DWORD i; BOOL same; + unsigned int expected_data_win9x_size = 0; hr = IHlink_QueryInterface(lnk, &IID_IPersistStream, (void **)&ps); ok(hr == S_OK, "IHlink_QueryInterface failed with error 0x%08x\n", hr); @@ -282,10 +369,15 @@ data = GlobalLock(hglobal); + if (expected_data_size % 4) + expected_data_win9x_size = 4 * ((expected_data_size / 4) + 1); + /* first check we have the right amount of data */ - ok(data_size == expected_data_size, - "%s: Size of saved data differs (expected %d, actual %d)\n", - testname, expected_data_size, data_size); + ok((data_size == expected_data_size) || + (data_size == expected_data_alt_size) || + broken(data_size == expected_data_win9x_size), /* Win9x and WinMe */ + "%s: Size of saved data differs (expected %d or %d, actual %d)\n", + testname, expected_data_size, expected_data_alt_size, data_size); same = TRUE; /* then do a byte-by-byte comparison */ @@ -301,6 +393,23 @@ } } + if (!same && (expected_data_alt != expected_data)) + { + /* then try the alternate data */ + same = TRUE; + for (i = 0; i < min(data_size, expected_data_alt_size); i++) + { + if ((expected_data_alt[i] != data[i]) && + (((expected_data_alt != expected_hlink_data2) && + (expected_data_alt != expected_hlink_data3)) || + ((i < 52 || i >= 56) && (i < 80 || i >= 84)))) + { + same = FALSE; + break; + } + } + } + ok(same, "%s: Saved data differs\n", testname); if (!same) { @@ -337,25 +446,33 @@ skip("Can't create lnk, skipping test_persist. Was wineprefixcreate run properly?\n"); return; } - test_persist_save_data("url only", lnk, expected_hlink_data, sizeof(expected_hlink_data)); + test_persist_save_data("url only", lnk, + expected_hlink_data, sizeof(expected_hlink_data), + expected_hlink_data_ie7, sizeof(expected_hlink_data_ie7)); IHlink_Release(lnk); hr = HlinkCreateFromString(url, NULL, friendly_name, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); - test_persist_save_data("url + friendly name", lnk, expected_hlink_data2, sizeof(expected_hlink_data2)); + test_persist_save_data("url + friendly name", lnk, + expected_hlink_data2, sizeof(expected_hlink_data2), + expected_hlink_data2_ie7, sizeof(expected_hlink_data2_ie7)); IHlink_Release(lnk); hr = HlinkCreateFromString(url, location, friendly_name, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); - test_persist_save_data("url + friendly_name + location", lnk, expected_hlink_data3, sizeof(expected_hlink_data3)); + test_persist_save_data("url + friendly_name + location", lnk, + expected_hlink_data3, sizeof(expected_hlink_data3), + expected_hlink_data3_ie7, sizeof(expected_hlink_data3_ie7)); IHlink_Release(lnk); hr = HlinkCreateFromString(rel_url, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); - test_persist_save_data("relative url", lnk, expected_hlink_data4, sizeof(expected_hlink_data4)); + test_persist_save_data("relative url", lnk, + expected_hlink_data4, sizeof(expected_hlink_data4), + expected_hlink_data4, sizeof(expected_hlink_data4)); IHlink_Release(lnk); hr = HlinkCreateFromString(url, NULL, NULL, NULL, @@ -363,13 +480,17 @@ ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); hr = IHlink_SetTargetFrameName(lnk, target_frame_name); ok(hr == S_OK, "IHlink_SetTargetFrameName failed with error 0x%08x\n", hr); - test_persist_save_data("url + target frame name", lnk, expected_hlink_data5, sizeof(expected_hlink_data5)); + test_persist_save_data("url + target frame name", lnk, + expected_hlink_data5, sizeof(expected_hlink_data5), + expected_hlink_data5_ie7, sizeof(expected_hlink_data5_ie7)); IHlink_Release(lnk); hr = HlinkCreateFromString(filename, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (LPVOID*) &lnk); ok(hr == S_OK, "IHlinCreateFromString failed with error 0x%08x\n", hr); - test_persist_save_data("filename", lnk, expected_hlink_data6, sizeof(expected_hlink_data6)); + test_persist_save_data("filename", lnk, + expected_hlink_data6, sizeof(expected_hlink_data6), + expected_hlink_data6, sizeof(expected_hlink_data6)); IHlink_Release(lnk); }

1 0

[cwittich] 38555: sync iphlpapi_winetest with wine 1.1.12
by cwittich＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: cwittich Date: Sun Jan 4 05:31:13 2009 New Revision: 38555 URL: http://svn.reactos.org/svn/reactos?rev=38555&view=rev Log: sync iphlpapi_winetest with wine 1.1.12 Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/iphlpa… ============================================================================== --- trunk/rostests/winetests/iphlpapi/iphlpapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/iphlpapi/iphlpapi.c [iso-8859-1] Sun Jan 4 05:31:13 2009 @@ -322,7 +322,8 @@ PMIB_IPNETTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); apiReturn = gGetIpNetTable(buf, &dwSize, FALSE); - ok(apiReturn == NO_ERROR, + ok(apiReturn == NO_ERROR || + apiReturn == ERROR_NO_DATA, /* empty ARP table's okay */ "GetIpNetTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); HeapFree(GetProcessHeap(), 0, buf);

1 0

[cwittich] 38554: sync msxml3 with wine 1.1.12 (2/2)
by cwittich＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: cwittich Date: Sun Jan 4 04:48:31 2009 New Revision: 38554 URL: http://svn.reactos.org/svn/reactos?rev=38554&view=rev Log: sync msxml3 with wine 1.1.12 (2/2) Added: trunk/rostests/winetests/msxml3/domdoc.c (with props) trunk/rostests/winetests/msxml3/msxml3.rbuild (with props) trunk/rostests/winetests/msxml3/saxreader.c (with props) trunk/rostests/winetests/msxml3/schema.c (with props) trunk/rostests/winetests/msxml3/testlist.c (with props) trunk/rostests/winetests/msxml3/xmldoc.c (with props) trunk/rostests/winetests/msxml3/xmlelem.c (with props) Modified: trunk/rostests/winetests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… Added: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… Added: trunk/rostests/winetests/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/msxml3.r… Added: trunk/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/saxreade… Added: trunk/rostests/winetests/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/schema.c… Added: trunk/rostests/winetests/msxml3/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/testlist… Added: trunk/rostests/winetests/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmldoc.c… Added: trunk/rostests/winetests/msxml3/xmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmlelem.…

1 0

[cwittich] 38553: sync msxml3 with wine 1.1.12 (1/2)
by cwittich＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: cwittich Date: Sun Jan 4 04:48:19 2009 New Revision: 38553 URL: http://svn.reactos.org/svn/reactos?rev=38553&view=rev Log: sync msxml3 with wine 1.1.12 (1/2) Added: trunk/reactos/dll/win32/msxml3/httprequest.c (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/msxml3/attribute.c trunk/reactos/dll/win32/msxml3/bsc.c trunk/reactos/dll/win32/msxml3/cdata.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/dispex.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/factory.c trunk/reactos/dll/win32/msxml3/main.c trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/dll/win32/msxml3/msxml_private.h trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/nodemap.c trunk/reactos/dll/win32/msxml3/queryresult.c trunk/reactos/dll/win32/msxml3/regsvr.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/text.c trunk/reactos/dll/win32/msxml3/xmlelem.c trunk/reactos/include/psdk/msxml2.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/attribute… Modified: trunk/reactos/dll/win32/msxml3/bsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/bsc.c?rev… Modified: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?r… Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… Modified: trunk/reactos/dll/win32/msxml3/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/dispex.c?… Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… Modified: trunk/reactos/dll/win32/msxml3/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/factory.c… Added: trunk/reactos/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/httpreque… Modified: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?re… Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… Modified: trunk/reactos/dll/win32/msxml3/nodemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodemap.c… Modified: trunk/reactos/dll/win32/msxml3/queryresult.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/queryresu… Modified: trunk/reactos/dll/win32/msxml3/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/regsvr.c?… Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re… Modified: trunk/reactos/dll/win32/msxml3/xmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlelem.c… Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re…

1 0

[fireball] 38551: - Fix a typo: if a process has DisableBoost set then TRUE should be returned when querying ProcessPriorityBoost information, not FALSE.
by fireball＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: fireball Date: Sun Jan 4 03:41:34 2009 New Revision: 38551 URL: http://svn.reactos.org/svn/reactos?rev=38551&view=rev Log: - Fix a typo: if a process has DisableBoost set then TRUE should be returned when querying ProcessPriorityBoost information, not FALSE. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=38… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sun Jan 4 03:41:34 2009 @@ -339,7 +339,7 @@ { /* Return boost status */ *(PULONG)ProcessInformation = Process->Pcb.DisableBoost ? - FALSE : TRUE; + TRUE : FALSE; /* Set the return length */ Length = sizeof(ULONG);

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009