Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[sginsberg] 56194: [NTOS] - As a side effect to 45140 one of the "non-used debug features", breaking in with WinDbg, would no longer work. Add this back, as well as the DPC timeout debug check and ...

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Mar 20 13:39:25 2012 New Revision: 56194 URL: http://svn.reactos.org/svn/reactos?rev=56194&view=rev Log: [NTOS] - As a side effect to 45140 one of the "non-used debug features", breaking in with WinDbg, would no longer work. Add this back, as well as the DPC timeout debug check and support for skipping ticks. Modified: trunk/reactos/ntoskrnl/ke/time.c Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=561… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Tue Mar 20 13:39:25 2012 @@ -69,6 +69,17 @@ ULARGE_INTEGER CurrentTime, InterruptTime; LONG OldTickOffset; + /* Check if this tick is being skipped */ + if (Prcb->SkipTick) + { + /* Handle it next time */ + Prcb->SkipTick = FALSE; + + /* Increase interrupt count and end the interrupt */ + Prcb->InterruptCount++; + KiEndInterrupt(Irql, TrapFrame); + } + /* Add the increment time to the shared data */ InterruptTime.QuadPart = *(ULONGLONG*)&SharedUserData->InterruptTime; InterruptTime.QuadPart += Increment; @@ -80,6 +91,13 @@ /* Update the tick offset */ OldTickOffset = InterlockedExchangeAdd(&KiTickOffset, -(LONG)Increment); + /* If the debugger is enabled, check for break-in request */ + if (KdDebuggerEnabled && KdPollBreakIn()) + { + /* Break-in requested! */ + DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + } + /* Check for full tick */ if (OldTickOffset <= (LONG)Increment) { @@ -121,6 +139,14 @@ { PKTHREAD Thread = KeGetCurrentThread(); PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Check if this tick is being skipped */ + if (Prcb->SkipTick) + { + /* Handle it next time */ + Prcb->SkipTick = FALSE; + return; + } /* Increase interrupt count */ Prcb->InterruptCount++; @@ -154,6 +180,24 @@ { /* Handle being in a DPC */ Prcb->DpcTime++; + +#if DBG + /* Update the DPC time */ + Prcb->DebugDpcTime++; + + /* Check if we have timed out */ + if (Prcb->DebugDpcTime == KiDPCTimeout); + { + /* We did! */ + DbgPrint("*** DPC routine > 1 sec --- This is not a break in KeUpdateSystemTime\n"); + + /* Break if debugger is enabled */ + if (KdDebuggerEnabled) DbgBreakPoint(); + + /* Clear state */ + Prcb->DebugDpcTime = 0; + } +#endif } }

12 years, 9 months

[tfaber] 56193: [NTDLL/LDR] - Correctly handle out of memory condition (CID 14615) - Remove a useless assignment (CID 14493) - Correct wrong sizeof usage (CID 14104), add an assert

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Mar 20 09:08:23 2012 New Revision: 56193 URL: http://svn.reactos.org/svn/reactos?rev=56193&view=rev Log: [NTDLL/LDR] - Correctly handle out of memory condition (CID 14615) - Remove a useless assignment (CID 14493) - Correct wrong sizeof usage (CID 14104), add an assert Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Tue Mar 20 09:08:23 2012 @@ -207,20 +207,22 @@ KeyValueInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, KeyInfoSize); - if (KeyValueInformation == NULL) + if (KeyValueInformation != NULL) + { + /* Try again */ + Status = ZwQueryValueKey(KeyHandle, + &ValueNameString, + KeyValuePartialInformation, + KeyValueInformation, + KeyInfoSize, + &ResultSize); + FreeHeap = TRUE; + } + else { /* Give up this time */ Status = STATUS_NO_MEMORY; } - - /* Try again */ - Status = ZwQueryValueKey(KeyHandle, - &ValueNameString, - KeyValuePartialInformation, - KeyValueInformation, - KeyInfoSize, - &ResultSize); - FreeHeap = TRUE; } /* Check for success */ @@ -641,7 +643,7 @@ /* Allocate space for all the entries */ LdrRootEntry = RtlAllocateHeap(RtlGetProcessHeap(), 0, - Count * sizeof(LdrRootEntry)); + Count * sizeof(*LdrRootEntry)); if (!LdrRootEntry) return STATUS_NO_MEMORY; } else @@ -687,6 +689,7 @@ if (LdrEntry->EntryPoint) { /* Write in array */ + ASSERT(i < Count); LdrRootEntry[i] = LdrEntry; /* Display debug message */ @@ -1546,7 +1549,6 @@ /* Normalize the parameters */ ProcessParameters = RtlNormalizeProcessParams(Peb->ProcessParameters); - ProcessParameters = Peb->ProcessParameters; if (ProcessParameters) { /* Save the Image and Command Line Names */ @@ -1993,7 +1995,7 @@ if (Peb->ImageBaseAddress != (PVOID)NtHeader->OptionalHeader.ImageBase) { DPRINT1("LDR: Performing EXE relocation\n"); - + /* Change the protection to prepare for relocation */ ViewBase = Peb->ImageBaseAddress; Status = LdrpSetProtection(ViewBase, FALSE); @@ -2011,7 +2013,7 @@ DPRINT1("LdrRelocateImageWithBias() failed\n"); return Status; } - + /* Check if a start context was provided */ if (Context) { @@ -2019,7 +2021,7 @@ UNIMPLEMENTED; // We should support this return STATUS_INVALID_IMAGE_FORMAT; } - + /* Restore the protection */ Status = LdrpSetProtection(ViewBase, TRUE); if (!NT_SUCCESS(Status)) return Status;

12 years, 9 months

[tfaber] 56192: [SHELL32] - Fix another local vs member variable issue.

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Mar 19 16:21:53 2012 New Revision: 56192 URL: http://svn.reactos.org/svn/reactos?rev=56192&view=rev Log: [SHELL32] - Fix another local vs member variable issue. Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Mon Mar 19 16:21:53 2012 @@ -1484,7 +1484,7 @@ pShellBrowser->SetMenuSB(hMenu, 0, m_hWnd); } } - uState = uState; + this->uState = uState; TRACE("--\n"); }

12 years, 9 months

[tfaber] 56191: [XMLLITE_WINETEST] - Fix MSVC build. Already sent upstream.

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Mar 19 16:12:15 2012 New Revision: 56191 URL: http://svn.reactos.org/svn/reactos?rev=56191&view=rev Log: [XMLLITE_WINETEST] - Fix MSVC build. Already sent upstream. Modified: trunk/rostests/winetests/xmllite/reader.c trunk/rostests/winetests/xmllite/writer.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Mon Mar 19 16:12:15 2012 @@ -33,8 +33,8 @@ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); -static HRESULT WINAPI (*pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); -static HRESULT WINAPI (*pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, +static HRESULT (WINAPI *pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +static HRESULT (WINAPI *pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, IMalloc *pMalloc, LPCWSTR encoding, BOOL hint, Modified: trunk/rostests/winetests/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/writer.… ============================================================================== --- trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] Mon Mar 19 16:12:15 2012 @@ -28,7 +28,7 @@ #include "xmllite.h" #include "wine/test.h" -static HRESULT WINAPI (*pCreateXmlWriter)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +static HRESULT (WINAPI *pCreateXmlWriter)(REFIID riid, void **ppvObject, IMalloc *pMalloc); static void test_writer_create(void) {

12 years, 9 months

[rharabien] 56190: [XMLLITE_WINETEST] - Sync to Wine 1.3.37

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 19 15:18:56 2012 New Revision: 56190 URL: http://svn.reactos.org/svn/reactos?rev=56190&view=rev Log: [XMLLITE_WINETEST] - Sync to Wine 1.3.37 Added: trunk/rostests/winetests/xmllite/writer.c (with props) Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt trunk/rostests/winetests/xmllite/reader.c trunk/rostests/winetests/xmllite/testlist.c Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/CMakeLi… ============================================================================== --- trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] Mon Mar 19 15:18:56 2012 @@ -1,12 +1,13 @@ add_definitions(-D__ROS_LONG64__) -add_executable(xmllite_winetest reader.c testlist.c) -target_link_libraries(xmllite_winetest wine) +list(APPEND SOURCE + reader.c + writer.c + testlist.c) -if(MSVC) - target_link_libraries(xmllite_winetest uuid) -endif() +add_executable(xmllite_winetest ${SOURCE}) +target_link_libraries(xmllite_winetest wine uuid) set_module_type(xmllite_winetest win32cui) add_importlibs(xmllite_winetest xmllite ole32 msvcrt kernel32 ntdll) Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Mon Mar 19 15:18:56 2012 @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <stdarg.h> #include <stdio.h> @@ -32,8 +33,8 @@ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); -HRESULT (WINAPI *pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); -HRESULT (WINAPI *pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, +static HRESULT WINAPI (*pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +static HRESULT WINAPI (*pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, IMalloc *pMalloc, LPCWSTR encoding, BOOL hint, @@ -258,13 +259,13 @@ typedef struct _testinput { - const IUnknownVtbl *lpVtbl; + IUnknown IUnknown_iface; LONG ref; } testinput; static inline testinput *impl_from_IUnknown(IUnknown *iface) { - return (testinput *)((char*)iface - FIELD_OFFSET(testinput, lpVtbl)); + return CONTAINING_RECORD(iface, testinput, IUnknown_iface); } static HRESULT WINAPI testinput_QueryInterface(IUnknown *iface, REFIID riid, void** ppvObj) @@ -317,10 +318,10 @@ input = HeapAlloc(GetProcessHeap(), 0, sizeof (*input)); if(!input) return E_OUTOFMEMORY; - input->lpVtbl = &testinput_vtbl; + input->IUnknown_iface.lpVtbl = &testinput_vtbl; input->ref = 1; - *ppObj = &input->lpVtbl; + *ppObj = &input->IUnknown_iface; return S_OK; } @@ -353,8 +354,8 @@ /* crashes native */ if (0) { - hr = pCreateXmlReader(&IID_IXmlReader, NULL, NULL); - hr = pCreateXmlReader(NULL, (LPVOID*)&reader, NULL); + pCreateXmlReader(&IID_IXmlReader, NULL, NULL); + pCreateXmlReader(NULL, (LPVOID*)&reader, NULL); } hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); @@ -372,13 +373,14 @@ hr = testinput_createinstance((void**)&input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - input_iids.count = 0; - hr = IXmlReader_SetInput(reader, input); - ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); - ok_iids(&input_iids, setinput_full, setinput_full_old, FALSE); - - IUnknown_Release(input); - + if (hr == S_OK) + { + input_iids.count = 0; + hr = IXmlReader_SetInput(reader, input); + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok_iids(&input_iids, setinput_full, setinput_full_old, FALSE); + IUnknown_Release(input); + } IXmlReader_Release(reader); } @@ -574,7 +576,7 @@ ok(type == XmlNodeType_XmlDeclaration, "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); } - /* new version 1.2.x and 1.3.x properly update postition for <?xml ?> */ + /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ ok_pos(reader, 1, 3, -1, 55, TRUE); /* check attributes */ Modified: trunk/rostests/winetests/xmllite/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/testlis… ============================================================================== --- trunk/rostests/winetests/xmllite/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/testlist.c [iso-8859-1] Mon Mar 19 15:18:56 2012 @@ -7,9 +7,11 @@ #include "wine/test.h" extern void func_reader(void); +extern void func_writer(void); const struct test winetest_testlist[] = { { "reader", func_reader }, + { "writer", func_writer }, { 0, 0 } }; Added: trunk/rostests/winetests/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/writer.… ============================================================================== --- trunk/rostests/winetests/xmllite/writer.c (added) +++ trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] Mon Mar 19 15:18:56 2012 @@ -1,0 +1,87 @@ +/* + * XMLLite IXmlWriter tests + * + * Copyright 2011 (C) Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "xmllite.h" +#include "wine/test.h" + +static HRESULT WINAPI (*pCreateXmlWriter)(REFIID riid, void **ppvObject, IMalloc *pMalloc); + +static void test_writer_create(void) +{ + HRESULT hr; + IXmlWriter *writer; + + /* crashes native */ + if (0) + { + pCreateXmlWriter(&IID_IXmlWriter, NULL, NULL); + pCreateXmlWriter(NULL, (LPVOID*)&writer, NULL); + } + + hr = pCreateXmlWriter(&IID_IXmlWriter, (LPVOID*)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + if(hr == S_OK) + { + IXmlWriter_Release(writer); + } +} + +static BOOL init_pointers(void) +{ + /* don't free module here, it's to be unloaded on exit */ + HMODULE mod = LoadLibraryA("xmllite.dll"); + + if (!mod) + { + win_skip("xmllite library not available\n"); + return FALSE; + } + +#define MAKEFUNC(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return FALSE; + MAKEFUNC(CreateXmlWriter); +#undef MAKEFUNC + + return TRUE; +} + +START_TEST(writer) +{ + HRESULT r; + + r = CoInitialize( NULL ); + ok( r == S_OK, "failed to init com\n"); + + if (!init_pointers()) + { + CoUninitialize(); + return; + } + + test_writer_create(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/xmllite/writer.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 9 months

[rharabien] 56189: [XMLLITE] - Sync to Wine 1.3.37

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 19 15:17:34 2012 New Revision: 56189 URL: http://svn.reactos.org/svn/reactos?rev=56189&view=rev Log: [XMLLITE] - Sync to Wine 1.3.37 Added: trunk/reactos/dll/win32/xmllite/writer.c (with props) Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/xmllite.spec trunk/reactos/include/psdk/xmllite.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Mon Mar 19 15:17:34 2012 @@ -6,6 +6,7 @@ list(APPEND SOURCE reader.c + writer.c xmllite_main.c #${REACTOS_BINARY_DIR}/include/psdk/xmllite_i.c ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Mon Mar 19 15:17:34 2012 @@ -38,7 +38,7 @@ typedef struct _xmlreader { - const IXmlReaderVtbl *lpVtbl; + IXmlReader IXmlReader_iface; LONG ref; IXmlReaderInput *input; ISequentialStream *stream;/* stored as sequential stream, cause currently @@ -49,19 +49,19 @@ typedef struct _xmlreaderinput { - const IUnknownVtbl *lpVtbl; + IXmlReaderInput IXmlReaderInput_iface; LONG ref; IUnknown *input; /* reference passed on IXmlReaderInput creation */ } xmlreaderinput; static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface) { - return (xmlreader *)((char*)iface - FIELD_OFFSET(xmlreader, lpVtbl)); + return CONTAINING_RECORD(iface, xmlreader, IXmlReader_iface); } static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface) { - return (xmlreaderinput *)((char*)iface - FIELD_OFFSET(xmlreaderinput, lpVtbl)); + return CONTAINING_RECORD(iface, xmlreaderinput, IXmlReaderInput_iface); } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) @@ -450,14 +450,14 @@ reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader)); if(!reader) return E_OUTOFMEMORY; - reader->lpVtbl = &xmlreader_vtbl; + reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl; reader->ref = 1; reader->stream = NULL; reader->input = NULL; reader->state = XmlReadState_Closed; reader->line = reader->pos = 0; - *pObject = &reader->lpVtbl; + *pObject = &reader->IXmlReader_iface; TRACE("returning iface %p\n", *pObject); @@ -481,11 +481,11 @@ readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput)); if(!readerinput) return E_OUTOFMEMORY; - readerinput->lpVtbl = &xmlreaderinput_vtbl; + readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; readerinput->ref = 1; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input); - *ppInput = (IXmlReaderInput*)&readerinput->lpVtbl; + *ppInput = &readerinput->IXmlReaderInput_iface; TRACE("returning iface %p\n", *ppInput); Added: trunk/reactos/dll/win32/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/writer.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/writer.c (added) +++ trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] Mon Mar 19 15:17:34 2012 @@ -1,0 +1,413 @@ +/* + * IXmlWriter implementation + * + * Copyright 2011 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "xmllite.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xmllite); + +typedef struct _xmlwriter +{ + IXmlWriter IXmlWriter_iface; + LONG ref; +} xmlwriter; + +static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface) +{ + return CONTAINING_RECORD(iface, xmlwriter, IXmlWriter_iface); +} + +static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IXmlWriter)) + { + *ppvObject = iface; + } + + IXmlWriter_AddRef(iface); + + return S_OK; +} + +static ULONG WINAPI xmlwriter_AddRef(IXmlWriter *iface) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + TRACE("%p\n", This); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + LONG ref; + + TRACE("%p\n", This); + + ref = InterlockedDecrement(&This->ref); + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/*** IXmlWriter methods ***/ +static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *pOutput) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %p\n", This, pOutput); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR *ppValue) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %u %p\n", This, nProperty, ppValue); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR pValue) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %u %lu\n", This, nProperty, pValue); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteAttributes(IXmlWriter *iface, IXmlReader *pReader, + BOOL fWriteDefaultAttributes) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %p %d\n", This, pReader, fWriteDefaultAttributes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR pwszPrefix, + LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri, + LPCWSTR pwszValue) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), + wine_dbgstr_w(pwszNamespaceUri), wine_dbgstr_w(pwszValue)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR pwszText) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s\n", This, wine_dbgstr_w(pwszText)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR wch) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s %d\n", This, wine_dbgstr_w(pwch), cwch); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR pwszComment) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR pwszName, LPCWSTR pwszPublicId, + LPCWSTR pwszSystemId, LPCWSTR pwszSubset) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszName), wine_dbgstr_w(pwszPublicId), + wine_dbgstr_w(pwszSystemId), wine_dbgstr_w(pwszSubset)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pwszPrefix, + LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri, + LPCWSTR pwszValue) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), + wine_dbgstr_w(pwszNamespaceUri), wine_dbgstr_w(pwszValue)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteEndDocument(IXmlWriter *iface) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteEntityRef(IXmlWriter *iface, LPCWSTR pwszName) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s\n", This, wine_dbgstr_w(pwszName)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteName(IXmlWriter *iface, LPCWSTR pwszName) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s\n", This, wine_dbgstr_w(pwszName)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteNmToken(IXmlWriter *iface, LPCWSTR pwszNmToken) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s\n", This, wine_dbgstr_w(pwszNmToken)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteNode(IXmlWriter *iface, IXmlReader *pReader, + BOOL fWriteDefaultAttributes) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %p %d\n", This, pReader, fWriteDefaultAttributes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteNodeShallow(IXmlWriter *iface, IXmlReader *pReader, + BOOL fWriteDefaultAttributes) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %p %d\n", This, pReader, fWriteDefaultAttributes); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LPCWSTR pwszName, + LPCWSTR pwszText) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s %s\n", This, wine_dbgstr_w(pwszName), wine_dbgstr_w(pwszText)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteQualifiedName(IXmlWriter *iface, LPCWSTR pwszLocalName, + LPCWSTR pwszNamespaceUri) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s %s\n", This, wine_dbgstr_w(pwszLocalName), wine_dbgstr_w(pwszNamespaceUri)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR pwszData) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s\n", This, wine_dbgstr_w(pwszData)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteRawChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s %d\n", This, wine_dbgstr_w(pwch), cwch); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandalone standalone) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pwszPrefix, + LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName), + wine_dbgstr_w(pwszNamespaceUri)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, LPCWSTR pwszText) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s\n", This, wine_dbgstr_w(pwszText)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteSurrogateCharEntity(IXmlWriter *iface, WCHAR wchLow, WCHAR wchHigh) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %d %d\n", This, wchLow, wchHigh); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_WriteWhitespace(IXmlWriter *iface, LPCWSTR pwszWhitespace) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p %s\n", This, wine_dbgstr_w(pwszWhitespace)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI xmlwriter_Flush(IXmlWriter *iface) +{ + xmlwriter *This = impl_from_IXmlWriter(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const struct IXmlWriterVtbl xmlwriter_vtbl = +{ + xmlwriter_QueryInterface, + xmlwriter_AddRef, + xmlwriter_Release, + xmlwriter_SetOutput, + xmlwriter_GetProperty, + xmlwriter_SetProperty, + xmlwriter_WriteAttributes, + xmlwriter_WriteAttributeString, + xmlwriter_WriteCData, + xmlwriter_WriteCharEntity, + xmlwriter_WriteChars, + xmlwriter_WriteComment, + xmlwriter_WriteDocType, + xmlwriter_WriteElementString, + xmlwriter_WriteEndDocument, + xmlwriter_WriteEndElement, + xmlwriter_WriteEntityRef, + xmlwriter_WriteFullEndElement, + xmlwriter_WriteName, + xmlwriter_WriteNmToken, + xmlwriter_WriteNode, + xmlwriter_WriteNodeShallow, + xmlwriter_WriteProcessingInstruction, + xmlwriter_WriteQualifiedName, + xmlwriter_WriteRaw, + xmlwriter_WriteRawChars, + xmlwriter_WriteStartDocument, + xmlwriter_WriteStartElement, + xmlwriter_WriteString, + xmlwriter_WriteSurrogateCharEntity, + xmlwriter_WriteWhitespace, + xmlwriter_Flush +}; + +HRESULT WINAPI CreateXmlWriter(REFIID riid, void **pObject, IMalloc *pMalloc) +{ + xmlwriter *writer; + + TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc); + + if (pMalloc) FIXME("custom IMalloc not supported yet\n"); + + if (!IsEqualGUID(riid, &IID_IXmlWriter)) + { + ERR("Unexpected IID requested -> (%s)\n", wine_dbgstr_guid(riid)); + return E_FAIL; + } + + writer = HeapAlloc(GetProcessHeap(), 0, sizeof (*writer)); + if(!writer) return E_OUTOFMEMORY; + + writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl; + writer->ref = 1; + + *pObject = &writer->IXmlWriter_iface; + + TRACE("returning iface %p\n", *pObject); + + return S_OK; +} Propchange: trunk/reactos/dll/win32/xmllite/writer.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/xmllite/xmllite.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite.… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/xmllite.spec [iso-8859-1] Mon Mar 19 15:17:34 2012 @@ -1,6 +1,6 @@ @ stdcall CreateXmlReader(ptr ptr ptr) @ stub CreateXmlReaderInputWithEncodingCodePage @ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr ptr long ptr ptr) -@ stub CreateXmlWriter +@ stdcall CreateXmlWriter(ptr ptr ptr) @ stub CreateXmlWriterOutputWithEncodingCodePage @ stub CreateXmlWriterOutputWithEncodingName Modified: trunk/reactos/include/psdk/xmllite.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmllite.idl?r… ============================================================================== --- trunk/reactos/include/psdk/xmllite.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/xmllite.idl [iso-8859-1] Mon Mar 19 15:17:34 2012 @@ -109,3 +109,65 @@ cpp_quote("STDAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,") cpp_quote(" LPCWSTR encoding, BOOL hint,") cpp_quote(" LPCWSTR base_uri, IXmlReaderInput **ppInput);") + +typedef enum XmlStandalone +{ + XmlStandalone_Omit, + XmlStandalone_Yes, + XmlStandalone_No, + _XmlStandalone_Last = XmlStandalone_No +} XmlStandalone; + +typedef enum XmlWriterProperty +{ + XmlWriterProperty_MultiLanguage, + XmlWriterProperty_Indent, + XmlWriterProperty_ByteOrderMark, + XmlWriterProperty_OmitXmlDeclaration, + XmlWriterProperty_ConformanceLevel, + _XmlWriterProperty_Last = XmlWriterProperty_OmitXmlDeclaration +} XmlWriterProperty; + +/* IXmlWriter */ +[ + local, + object, + uuid(7279FC88-709D-4095-B63D-69FE4B0D9030), + pointer_default(unique) +] +interface IXmlWriter : IUnknown +{ + HRESULT SetOutput([in] IUnknown *pOutput); + HRESULT GetProperty([in] UINT nProperty, [out] LONG_PTR *ppValue); + HRESULT SetProperty([in] UINT nProperty, [in] LONG_PTR pValue); + HRESULT WriteAttributes([in] IXmlReader *pReader, [in] BOOL fWriteDefaultAttributes); + HRESULT WriteAttributeString([in] LPCWSTR pwszPrefix, [in] LPCWSTR pwszLocalName, + [in] LPCWSTR pwszNamespaceUri, [in] LPCWSTR pwszValue); + HRESULT WriteCData([in] LPCWSTR pwszText); + HRESULT WriteCharEntity([in] WCHAR wch); + HRESULT WriteChars([in] const WCHAR *pwch, [in] UINT cwch); + HRESULT WriteComment([in] LPCWSTR pwszComment); + HRESULT WriteDocType([in] LPCWSTR pwszName, [in] LPCWSTR pwszPublicId, + [in] LPCWSTR pwszSystemId, [in] LPCWSTR pwszSubset); + HRESULT WriteElementString([in] LPCWSTR pwszPrefix, [in] LPCWSTR pwszLocalName, + [in] LPCWSTR pwszNamespaceUri, [in] LPCWSTR pwszValue); + HRESULT WriteEndDocument(); + HRESULT WriteEndElement(); + HRESULT WriteEntityRef([in] LPCWSTR pwszName); + HRESULT WriteFullEndElement(); + HRESULT WriteName([in] LPCWSTR pwszName); + HRESULT WriteNmToken([in] LPCWSTR pwszNmToken); + HRESULT WriteNode([in] IXmlReader *pReader, [in] BOOL fWriteDefaultAttributes); + HRESULT WriteNodeShallow([in] IXmlReader *pReader, [in] BOOL fWriteDefaultAttributes); + HRESULT WriteProcessingInstruction([in] LPCWSTR pwszName, [in] LPCWSTR pwszText); + HRESULT WriteQualifiedName([in] LPCWSTR pwszLocalName, [in] LPCWSTR pwszNamespaceUri); + HRESULT WriteRaw([in] LPCWSTR pwszData); + HRESULT WriteRawChars([in] const WCHAR *pwch, [in] UINT cwch); + HRESULT WriteStartDocument([in] XmlStandalone standalone); + HRESULT WriteStartElement([in] LPCWSTR pwszPrefix, [in] LPCWSTR pwszLocalName, + [in] LPCWSTR pwszNamespaceUri); + HRESULT WriteString([in] LPCWSTR pwszText); + HRESULT WriteSurrogateCharEntity([in] WCHAR wchLow, [in] WCHAR wchHigh); + HRESULT WriteWhitespace([in] LPCWSTR pwszWhitespace); + HRESULT Flush(); +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Mar 19 15:17:34 2012 @@ -188,7 +188,7 @@ reactos/dll/win32/xinput1_2 # Synced to Wine-1.3.37 reactos/dll/win32/xinput1_3 # Autosync reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.3.37 -reactos/dll/win32/xmllite # Autosync +reactos/dll/win32/xmllite # Synced to Wine-1.3.37 reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21

12 years, 9 months

[rharabien] 56188: [INETMIB1] - Sync to Wine 1.3.37

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 19 15:08:06 2012 New Revision: 56188 URL: http://svn.reactos.org/svn/reactos?rev=56188&view=rev Log: [INETMIB1] - Sync to Wine 1.3.37 Modified: trunk/reactos/dll/win32/inetmib1/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/inetmib1/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/main.c?… ============================================================================== --- trunk/reactos/dll/win32/inetmib1/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetmib1/main.c [iso-8859-1] Mon Mar 19 15:08:06 2012 @@ -21,6 +21,9 @@ #include <stdarg.h> #include <stdlib.h> #include <limits.h> + +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "snmp.h" @@ -59,7 +62,7 @@ }; static AsnInteger32 mapStructEntryToValue(struct structToAsnValue *map, - UINT mapLen, void *record, UINT id, BYTE bPduType, SnmpVarBind *pVarBind) + UINT mapLen, void *record, UINT id, SnmpVarBind *pVarBind) { /* OIDs are 1-based */ if (!id) @@ -640,7 +643,7 @@ { *pErrorStatus = mapStructEntryToValue(mib2IfEntryMap, DEFINE_SIZEOF(mib2IfEntryMap), - &ifTable->table[tableIndex - 1], item, bPduType, + &ifTable->table[tableIndex - 1], item, pVarBind); if (bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndInteger(&pVarBind->name, @@ -713,7 +716,7 @@ if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2IpMap, - DEFINE_SIZEOF(mib2IpMap), &ipStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2IpMap), &ipStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -798,7 +801,7 @@ assert(item); *pErrorStatus = mapStructEntryToValue(mib2IpAddrMap, DEFINE_SIZEOF(mib2IpAddrMap), - &ipAddrTable->table[tableIndex - 1], item, bPduType, pVarBind); + &ipAddrTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ipAddrTable->table[tableIndex - 1].dwAddr); @@ -891,7 +894,7 @@ assert(item); *pErrorStatus = mapStructEntryToValue(mib2IpRouteMap, DEFINE_SIZEOF(mib2IpRouteMap), - &ipRouteTable->table[tableIndex - 1], item, bPduType, pVarBind); + &ipRouteTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ipRouteTable->table[tableIndex - 1].dwForwardDest); @@ -978,7 +981,7 @@ { *pErrorStatus = mapStructEntryToValue(mib2IpNetMap, DEFINE_SIZEOF(mib2IpNetMap), - &ipNetTable[tableIndex - 1], item, bPduType, pVarBind); + &ipNetTable[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndInteger(&pVarBind->name, &myOid, item, tableIndex); @@ -1053,7 +1056,7 @@ if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2IcmpMap, - DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, bPduType, + DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); @@ -1115,7 +1118,7 @@ if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2TcpMap, - DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -1165,7 +1168,7 @@ if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2UdpMap, - DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -1258,7 +1261,7 @@ assert(item); *pErrorStatus = mapStructEntryToValue(mib2UdpEntryMap, DEFINE_SIZEOF(mib2UdpEntryMap), - &udpTable->table[tableIndex - 1], item, bPduType, pVarBind); + &udpTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) { AsnObjectIdentifier oid; @@ -1342,29 +1345,26 @@ static struct mibImplementation *findSupportedQuery(UINT *ids, UINT idLength, UINT *matchingIndex) { - int indexHigh = DEFINE_SIZEOF(supportedIDs) - 1, indexLow = 0, i; - struct mibImplementation *impl = NULL; + int indexHigh = DEFINE_SIZEOF(supportedIDs) - 1, indexLow = 0; AsnObjectIdentifier oid1 = { idLength, ids}; if (!idLength) return NULL; - for (i = (indexLow + indexHigh) / 2; !impl && indexLow <= indexHigh; - i = (indexLow + indexHigh) / 2) - { - INT cmp; - - cmp = SnmpUtilOidNCmp(&oid1, &supportedIDs[i].name, idLength); - if (!cmp) - { - impl = &supportedIDs[i]; + + while (indexLow <= indexHigh) + { + INT cmp, i = (indexLow + indexHigh) / 2; + if (!(cmp = SnmpUtilOidNCmp(&oid1, &supportedIDs[i].name, idLength))) + { *matchingIndex = i; - } - else if (cmp > 0) + return &supportedIDs[i]; + } + if (cmp > 0) indexLow = i + 1; else indexHigh = i - 1; } - return impl; + return NULL; } /***************************************************************************** Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Mar 19 15:08:06 2012 @@ -72,7 +72,7 @@ reactos/dll/win32/imagehlp # Synced to Wine-1.3.37 reactos/dll/win32/imm32 # Synced to Wine-1.3.37 reactos/dll/win32/inetcomm # Synced to Wine-1.3.37 -reactos/dll/win32/inetmib1 # Autosync +reactos/dll/win32/inetmib1 # Synced to Wine-1.3.37 reactos/dll/win32/initpki # Synced to Wine-1.3.37 reactos/dll/win32/inseng # Synced to Wine-1.3.37 reactos/dll/win32/iphlpapi # Out of sync

12 years, 9 months

[rharabien] 56187: [INETMIB1_WINETEST] - Sync to Wine 1.3.37

by rharabien＠svn.reactos.org

Author: rharabien Date: Mon Mar 19 15:06:28 2012 New Revision: 56187 URL: http://svn.reactos.org/svn/reactos?rev=56187&view=rev Log: [INETMIB1_WINETEST] - Sync to Wine 1.3.37 Modified: trunk/rostests/winetests/inetmib1/main.c Modified: trunk/rostests/winetests/inetmib1/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetmib1/main.c… ============================================================================== --- trunk/rostests/winetests/inetmib1/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/inetmib1/main.c [iso-8859-1] Mon Mar 19 15:06:28 2012 @@ -109,7 +109,7 @@ ret = pQuery(SNMP_PDU_GET, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index); ok(error == SNMP_ERRORSTATUS_NOERROR || - error == ERROR_FILE_NOT_FOUND /* Win9x */, + broken(error == ERROR_FILE_NOT_FOUND) /* NT4 */, "expected SNMP_ERRORSTATUS_NOERROR or ERROR_FILE_NOT_FOUND, got %d\n", error); if (error == SNMP_ERRORSTATUS_NOERROR) @@ -251,7 +251,6 @@ vars2[0].value.asnType = 0; list.len = 1; list.list = vars2; - moreData = TRUE; noChange = FALSE; ret = pQuery(SNMP_PDU_GETNEXT, &list, &error, &index); ok(ret, "SnmpExtensionQuery failed: %d, %d\n", error, index);

12 years, 9 months

[osiejka] 56186: [TRANSLATION] - romanian translation update by Stefan Fulea (bug no. 6956); - fix unrecognized escape sequence warnings;

by osiejka＠svn.reactos.org

Author: osiejka Date: Mon Mar 19 00:09:30 2012 New Revision: 56186 URL: http://svn.reactos.org/svn/reactos?rev=56186&view=rev Log: [TRANSLATION] - romanian translation update by Stefan Fulea (bug no. 6956); - fix unrecognized escape sequence warnings; Modified: trunk/reactos/base/applications/cacls/lang/ja-JP.rc trunk/reactos/base/applications/cacls/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/ja-JP.rc trunk/reactos/base/applications/charmap/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/doskey/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/find/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/more/lang/ro-RO.rc trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc trunk/reactos/base/applications/findstr/lang/ro-RO.rc trunk/reactos/base/applications/fontview/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc trunk/reactos/base/applications/games/spider/lang/ja-JP.rc trunk/reactos/base/applications/kbswitch/lang/ro-RO.rc trunk/reactos/base/applications/logoff/lang/ja-JP.rc trunk/reactos/base/applications/logoff/lang/ro-RO.rc trunk/reactos/base/applications/magnify/lang/ja-JP.rc trunk/reactos/base/applications/magnify/lang/ro-RO.rc trunk/reactos/base/applications/mmc/lang/ro-RO.rc trunk/reactos/base/applications/msconfig/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/ja-JP.rc trunk/reactos/base/applications/mstsc/lang/ja-JP.rc trunk/reactos/base/applications/mstsc/lang/ro-RO.rc trunk/reactos/base/applications/network/ipconfig/lang/ro-RO.rc trunk/reactos/base/applications/network/ping/lang/ro-RO.rc trunk/reactos/base/applications/network/ping/lang/zh-CN.rc trunk/reactos/base/applications/notepad/lang/ja-JP.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/shutdown/lang/ja-JP.rc trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/base/system/format/lang/ro-RO.rc trunk/reactos/base/system/regsvr32/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc trunk/reactos/dll/cpl/telephon/lang/ro-RO.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netid/lang/ja-JP.rc trunk/reactos/dll/win32/newdev/lang/ja-JP.rc trunk/reactos/dll/win32/rasdlg/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/user32/lang/ro-RO.rc trunk/reactos/dll/win32/winmm/winmm_Br.rc trunk/reactos/dll/win32/winmm/winmm_Ro.rc trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/cacls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/cmdutils/doskey/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/findstr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/kbswitch/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/logoff/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/logoff/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/magnify/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mmc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/msconfig/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/mstsc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/network/ipconfig/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/shutdown/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/sndvol32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… Modified: trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/base/system/format/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/ro… Modified: trunk/reactos/base/system/regsvr32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… Modified: trunk/reactos/dll/cpl/telephon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ja-J… Modified: trunk/reactos/dll/cpl/telephon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/ro-R… Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… Modified: trunk/reactos/dll/win32/netid/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ja-JP… Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… Modified: trunk/reactos/dll/win32/rasdlg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/ro-R… 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/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… Modified: trunk/reactos/dll/win32/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/ro-R… Modified: trunk/reactos/dll/win32/winmm/winmm_Br.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_Br.r… Modified: trunk/reactos/dll/win32/winmm/winmm_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_Ro.r… Modified: trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ro-R… Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…

12 years, 9 months

[cgutman] 56185: [NTOSKRNL] - Forgot this dereference - Unloading works now, but there are many bugs in the device stacks that prevent it from occurring - Usbhub will unload properly when a hub is ...

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Mar 18 22:28:14 2012 New Revision: 56185 URL: http://svn.reactos.org/svn/reactos?rev=56185&view=rev Log: [NTOSKRNL] - Forgot this dereference - Unloading works now, but there are many bugs in the device stacks that prevent it from occurring - Usbhub will unload properly when a hub is removed for a driver update, but usbstor won't unload when all usb storage devices have been removed - Work needs to be done to fix issues like this 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] Sun Mar 18 22:28:14 2012 @@ -2610,7 +2610,7 @@ Status = PipCallDriverAddDevice(DeviceNode, FALSE, DriverObject); /* Remove the extra reference */ - //ObDereferenceObject(DriverObject); + ObDereferenceObject(DriverObject); } else {

12 years, 9 months

← Newer
1
...
8
9
10
11
12
13
14
...
36
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 March 2012