Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 57877: [README.WINE] * Update the list of synced modules.
by akhaldi＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: akhaldi Date: Tue Dec 11 13:39:33 2012 New Revision: 57877 URL: http://svn.reactos.org/svn/reactos?rev=57877&view=rev Log: [README.WINE] * Update the list of synced modules. Modified: trunk/reactos/media/doc/README.WINE 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] Tue Dec 11 13:39:33 2012 @@ -21,7 +21,7 @@ The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-1.5.4 +reactos/tools/unicode # Synced to Wine-1.5.19 reactos/tools/widl # Synced to Wine-1.5.11 reactos/tools/wpp # Synced to Wine-1.3.26 @@ -42,14 +42,14 @@ reactos/dll/win32/advpack # Synced to Wine-1.5.19 reactos/dll/win32/atl # Synced to Wine-1.3.37 reactos/dll/win32/avifil32 # Synced to Wine-1.3.37 -reactos/dll/win32/bcrypt # Synced to Wine-1.5.4 +reactos/dll/win32/bcrypt # Synced to Wine-1.5.19 reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to Wine-1.5.4 -reactos/dll/win32/clusapi # Synced to Wine-1.5.4 +reactos/dll/win32/clusapi # Synced to Wine-1.5.19 reactos/dll/win32/comcat # Synced to Wine-1.5.4 reactos/dll/win32/comctl32 # Synced to Wine 1.3.37 reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 -reactos/dll/win32/compstui # Synced to Wine-1.5.4 +reactos/dll/win32/compstui # Synced to Wine-1.5.19 reactos/dll/win32/credui # Synced to Wine-1.5.4 reactos/dll/win32/crypt32 # Synced to Wine-1.3.37 reactos/dll/win32/cryptdlg # Synced to Wine-1.5.4 @@ -57,8 +57,8 @@ reactos/dll/win32/cryptnet # Synced to Wine-1.3.37 reactos/dll/win32/cryptui # Synced to Wine-1.5.4 reactos/dll/win32/dbghelp # Synced to Wine-1.3.37 -reactos/dll/win32/dciman32 # Synced to Wine-1.5.4 -reactos/dll/win32/dwmapi # Synced to Wine-1.5.4 +reactos/dll/win32/dciman32 # Synced to Wine-1.5.19 +reactos/dll/win32/dwmapi # Synced to Wine-1.5.19 reactos/dll/win32/faultrep # Synced to Wine-1.5.4 reactos/dll/win32/fusion # Synced to Wine-1.5.4 reactos/dll/win32/gdiplus # Synced to Wine-1.5.4 @@ -66,124 +66,124 @@ reactos/dll/win32/hlink # Synced to Wine-1.5.4 reactos/dll/win32/hnetcfg # Synced to Wine-1.5.4 reactos/dll/win32/httpapi # Synced to Wine-1.5.4 -reactos/dll/win32/iccvid # Autosync +reactos/dll/win32/iccvid # Synced to Wine-1.5.19 reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.5.4 reactos/dll/win32/imagehlp # Synced to Wine-1.5.4 reactos/dll/win32/imm32 # Synced to Wine-1.5.4 reactos/dll/win32/inetcomm # Synced to Wine-1.5.4 reactos/dll/win32/inetmib1 # Synced to Wine-1.5.4 -reactos/dll/win32/initpki # Synced to Wine-1.5.4 +reactos/dll/win32/initpki # Synced to Wine-1.5.19 reactos/dll/win32/inseng # Synced to Wine-1.5.4 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to Wine-1.5.4 +reactos/dll/win32/itircl # Synced to Wine-1.5.19 reactos/dll/win32/itss # Synced to Wine-1.5.4 reactos/dll/win32/jscript # Autosync +reactos/dll/win32/loadperf # Synced to Wine-1.5.19 reactos/dll/win32/localspl # Synced to Wine-1.1.14? -reactos/dll/win32/localspl # Autosync -reactos/dll/win32/localui # Autosync -reactos/dll/win32/lz32 # Synced to Wine-1.5.4 +reactos/dll/win32/localui # Synced to Wine-1.5.19 +reactos/dll/win32/lz32 # Synced to Wine-1.5.19 reactos/dll/win32/mapi32 # Autosync reactos/dll/win32/mciavi32 # Synced to Wine-1.5.4 -reactos/dll/win32/mcicda # Synced to Wine-1.5.4 +reactos/dll/win32/mcicda # Synced to Wine-1.5.19 reactos/dll/win32/mciqtz32 # Synced to Wine-1.5.4 reactos/dll/win32/mciseq # Synced to Wine-1.5.4 -reactos/dll/win32/mciwave # Synced to Wine-1.5.4 +reactos/dll/win32/mciwave # Synced to Wine-1.5.19 reactos/dll/win32/mlang # Synced to Wine-1.5.4 reactos/dll/win32/mpr # Autosync -reactos/dll/win32/mprapi # Synced to Wine-1.5.4 +reactos/dll/win32/mprapi # Synced to Wine-1.5.19 reactos/dll/win32/msacm32 # Autosync -reactos/dll/win32/msadp32.acm # Synced to Wine-1.5.4 -reactos/dll/win32/mscat32 # Synced to Wine-1.5.4 +reactos/dll/win32/msadp32.acm # Synced to Wine-1.5.19 +reactos/dll/win32/mscat32 # Synced to Wine-1.5.19 reactos/dll/win32/mscms # Synced to Wine-1.5.4 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.5.4 -reactos/dll/win32/msftedit # Synced to Wine-1.5.4 -reactos/dll/win32/msg711.acm # Synced to Wine-1.5.4 +reactos/dll/win32/msftedit # Synced to Wine-1.5.19 +reactos/dll/win32/msg711.acm # Synced to Wine-1.5.19 reactos/dll/win32/msgsm32.acm # Synced to Wine-1.5.4 reactos/dll/win32/mshtml # Autosync -reactos/dll/win32/mshtml.tlb # Autosync +reactos/dll/win32/mshtml.tlb # Synced to Wine-1.5.19 reactos/dll/win32/msi # Synced to Wine-1.5.19 -reactos/dll/win32/msimg32 # Synced to Wine-1.5.4 -reactos/dll/win32/msimtf # Synced to Wine-1.5.4 -reactos/dll/win32/msisip # Synced to Wine-1.5.4 +reactos/dll/win32/msimg32 # Synced to Wine-1.5.19 +reactos/dll/win32/msimtf # Synced to Wine-1.5.19 +reactos/dll/win32/msisip # Synced to Wine-1.5.19 reactos/dll/win32/msisys.ocx # Synced to Wine-1.5.4 -reactos/dll/win32/msnet32 # Synced to Wine-1.5.4 +reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 reactos/dll/win32/msrle32 # Autosync -reactos/dll/win32/mssign32 # Synced to Wine-1.5.4 -reactos/dll/win32/mssip32 # Synced to Wine-1.5.4 +reactos/dll/win32/mssign32 # Synced to Wine-1.5.19 +reactos/dll/win32/mssip32 # Synced to Wine-1.5.19 reactos/dll/win32/mstask # Synced to Wine-1.5.4 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/msvidc32 # Autosync -reactos/dll/win32/msxml # Synced to Wine-1.5.12 -reactos/dll/win32/msxml2 # Synced to Wine-1.5.12 +reactos/dll/win32/msxml # Synced to Wine-1.5.19 +reactos/dll/win32/msxml2 # Synced to Wine-1.5.19 reactos/dll/win32/msxml3 # Synced to Wine-1.5.12 -reactos/dll/win32/msxml4 # Synced to Wine-1.5.12 -reactos/dll/win32/msxml6 # Synced to Wine-1.5.12 -reactos/dll/win32/nddeapi # Synced to Wine-1.5.4 +reactos/dll/win32/msxml4 # Synced to Wine-1.5.19 +reactos/dll/win32/msxml6 # Synced to Wine-1.5.19 +reactos/dll/win32/nddeapi # Synced to Wine-1.5.19 reactos/dll/win32/netapi32 # Autosync -reactos/dll/win32/ntdsapi # Synced to Wine-1.5.4 +reactos/dll/win32/ntdsapi # Synced to Wine-1.5.19 reactos/dll/win32/ntprint # Synced to Wine-1.5.4 -reactos/dll/win32/objsel # Synced to Wine-1.5.4 +reactos/dll/win32/objsel # Synced to Wine-1.5.19 reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to Wine-1.5.4 +reactos/dll/win32/odbccp32 # Synced to Wine-1.5.19 reactos/dll/win32/ole32 # Synced to Wine-1.5.4 reactos/dll/win32/oleacc # Autosync reactos/dll/win32/oleaut32 # Autosync -reactos/dll/win32/olecli32 # Synced to Wine-1.5.4 +reactos/dll/win32/olecli32 # Synced to Wine-1.5.19 reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync -reactos/dll/win32/olesvr32 # Synced to Wine-1.5.4 -reactos/dll/win32/olethk32 # Synced to Wine-1.5.4 +reactos/dll/win32/olesvr32 # Synced to Wine-1.5.19 +reactos/dll/win32/olethk32 # Synced to Wine-1.5.19 reactos/dll/win32/pdh # Autosync -reactos/dll/win32/pidgen # Synced to Wine-1.5.4 +reactos/dll/win32/pidgen # Synced to Wine-1.5.19 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.5.4 reactos/dll/win32/pstorec # Synced to Wine-1.5.4 reactos/dll/win32/qmgr # Synced to Wine-1.2-rc5? reactos/dll/win32/qmgrprxy # Synced to Wine-1.14? -reactos/dll/win32/query # Synced to Wine-1.5.4 +reactos/dll/win32/query # Synced to Wine-1.5.19 reactos/dll/win32/rasapi32 # Synced to Wine-1.5.4 -reactos/dll/win32/resutils # Synced to Wine-1.5.4 +reactos/dll/win32/resutils # Synced to Wine-1.5.19 reactos/dll/win32/riched20 # Synced to Wine-1.5.4 -reactos/dll/win32/riched32 # Synced to Wine-1.5.4 +reactos/dll/win32/riched32 # Synced to Wine-1.5.19 reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Synced to Wine-1.5.4 -reactos/dll/win32/sccbase # Synced to Wine-1.5.4 -reactos/dll/win32/schannel # Synced to Wine-1.5.4 +reactos/dll/win32/sccbase # Synced to Wine-1.5.19 +reactos/dll/win32/schannel # Synced to Wine-1.5.19 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to Wine-1.5.4 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to Wine-1.2 +reactos/dll/win32/shdoclc # Synced to Wine-1.5.19 reactos/dll/win32/shdocvw # Autosync reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Synced to Wine-1.5.13 -reactos/dll/win32/slbcsp # Synced to Wine-1.5.4 -reactos/dll/win32/snmpapi # Synced to Wine-1.5.4 -reactos/dll/win32/softpub # Synced to Wine-1.5.4 -reactos/dll/win32/spoolss # Synced to Wine-1.5.4 -reactos/dll/win32/stdole2.tlb # Synced to Wine-1.3.37 -reactos/dll/win32/stdole32.tlb # Synced to Wine-1.3.37 +reactos/dll/win32/slbcsp # Synced to Wine-1.5.19 +reactos/dll/win32/snmpapi # Synced to Wine-1.5.19 +reactos/dll/win32/softpub # Synced to Wine-1.5.19 +reactos/dll/win32/spoolss # Synced to Wine-1.5.19 +reactos/dll/win32/stdole2.tlb # Synced to Wine-1.5.19 +reactos/dll/win32/stdole32.tlb # Synced to Wine-1.5.19 reactos/dll/win32/sti # Synced to Wine-1.5.4 reactos/dll/win32/sxs # Synced to Wine-1.5.4 reactos/dll/win32/tapi32 # Autosync -reactos/dll/win32/traffic # Synced to Wine-1.5.4 +reactos/dll/win32/traffic # Synced to Wine-1.5.19 reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) reactos/dll/win32/updspapi # Synced to Wine-1.5.4 -reactos/dll/win32/url # Synced to Wine-1.5.4 +reactos/dll/win32/url # Synced to Wine-1.5.19 reactos/dll/win32/urlmon # Autosync reactos/dll/win32/usp10 # Synced to Wine-1.5.4 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync reactos/dll/win32/windowscodecs # Autosync -reactos/dll/win32/winemp3.acm # Synced to Wine-1.5.4 +reactos/dll/win32/winemp3.acm # Synced to Wine-1.5.19 reactos/dll/win32/wing32 # Out of sync reactos/dll/win32/winhttp # Synced to Wine-1.5.4 reactos/dll/win32/wininet # Synced to Wine-1.5.4 @@ -192,13 +192,13 @@ reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/wintrust # Synced to Wine-1.5.4 reactos/dll/win32/wldap32 # Autosync -reactos/dll/win32/wmi # Synced to Wine-1.5.4 +reactos/dll/win32/wmi # Synced to Wine-1.5.19 reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 -reactos/dll/win32/wuapi # Synced to Wine-1.5.4 -reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.4 -reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.4 -reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.4 -reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.5.4 +reactos/dll/win32/wuapi # Synced to Wine-1.5.19 +reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19 +reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19 +reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.19 +reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.5.19 reactos/dll/win32/xmllite # Synced to Wine-1.5.19 reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21

1 0

[akhaldi] 57876: * Addendum to r57875.
by akhaldi＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: akhaldi Date: Tue Dec 11 11:07:55 2012 New Revision: 57876 URL: http://svn.reactos.org/svn/reactos?rev=57876&view=rev Log: * Addendum to r57875. Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt 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] Tue Dec 11 11:07:55 2012 @@ -9,7 +9,7 @@ if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #allow_warnings(xmllite_winetest) - set_source_files_properties(reader.c PROPERTIES COMPILE_FLAGS "-Wno-error") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() add_executable(xmllite_winetest ${SOURCE})

1 0

[akhaldi] 57875: * Allow warnings for all source files here.
by akhaldi＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: akhaldi Date: Tue Dec 11 11:04:27 2012 New Revision: 57875 URL: http://svn.reactos.org/svn/reactos?rev=57875&view=rev Log: * Allow warnings for all source files here. Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt 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] Tue Dec 11 11:04:27 2012 @@ -15,7 +15,7 @@ if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #allow_warnings(xmllite) - set_source_files_properties(reader.c PROPERTIES COMPILE_FLAGS "-Wno-error") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() add_library(xmllite SHARED ${SOURCE})

1 0

[akhaldi] 57874: [XMLLITE] * Forgot to svn add this.
by akhaldi＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: akhaldi Date: Tue Dec 11 11:00:56 2012 New Revision: 57874 URL: http://svn.reactos.org/svn/reactos?rev=57874&view=rev Log: [XMLLITE] * Forgot to svn add this. Added: trunk/reactos/dll/win32/xmllite/xmllite_private.h (with props) Added: trunk/reactos/dll/win32/xmllite/xmllite_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/xmllite_… ============================================================================== --- trunk/reactos/dll/win32/xmllite/xmllite_private.h (added) +++ trunk/reactos/dll/win32/xmllite/xmllite_private.h [iso-8859-1] Tue Dec 11 11:00:56 2012 @@ -1,0 +1,40 @@ +/* + * XMLLite private things + * + * Copyright 2012 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#ifndef __XMLLITE_PRIVATE__ +#define __XMLLITE_PRIVATE__ + +/* memory allocation functions */ +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +#endif /* __XMLLITE_PRIVATE__ */ Propchange: trunk/reactos/dll/win32/xmllite/xmllite_private.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 57873: [XMLLITE_WINETEST]: Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: akhaldi Date: Tue Dec 11 10:53:46 2012 New Revision: 57873 URL: http://svn.reactos.org/svn/reactos?rev=57873&view=rev Log: [XMLLITE_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt trunk/rostests/winetests/xmllite/reader.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] Tue Dec 11 10:53:46 2012 @@ -3,12 +3,17 @@ list(APPEND SOURCE reader.c - writer.c - testlist.c) + writer.c + testlist.c) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(xmllite_winetest) + set_source_files_properties(reader.c PROPERTIES COMPILE_FLAGS "-Wno-error") +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) add_cd_file(TARGET xmllite_winetest DESTINATION reactos/bin FOR all) 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] Tue Dec 11 10:53:46 2012 @@ -52,7 +52,7 @@ return buf; } -static const char xmldecl_full[] = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; +static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; static IStream *create_stream_on_data(const char *data, int size) { @@ -350,18 +350,37 @@ HRESULT hr; IXmlReader *reader; IUnknown *input; + DtdProcessing dtd; + XmlNodeType nodetype; /* crashes native */ if (0) { pCreateXmlReader(&IID_IXmlReader, NULL, NULL); - pCreateXmlReader(NULL, (LPVOID*)&reader, NULL); - } - - hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + pCreateXmlReader(NULL, (void**)&reader, NULL); + } + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_read_state(reader, XmlReadState_Closed, -1, FALSE); + + nodetype = XmlNodeType_Element; + hr = IXmlReader_GetNodeType(reader, &nodetype); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); + + dtd = 2; + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_DtdProcessing, (LONG_PTR*)&dtd); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(dtd == DtdProcessing_Prohibit, "got %d\n", dtd); + + dtd = 2; + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, dtd); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, -1); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* Null input pointer, releases previous input */ hr = IXmlReader_SetInput(reader, NULL); @@ -389,7 +408,8 @@ IXmlReaderInput *reader_input; IXmlReader *reader, *reader2; IUnknown *obj, *input; - IStream *stream; + IStream *stream, *stream2; + XmlNodeType nodetype; HRESULT hr; LONG ref; @@ -407,13 +427,19 @@ hr = pCreateXmlReaderInputWithEncodingName((IUnknown*)stream, NULL, NULL, FALSE, NULL, &reader_input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IUnknown_QueryInterface(reader_input, &IID_IStream, (void**)&stream2); + ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr); + + hr = IUnknown_QueryInterface(reader_input, &IID_ISequentialStream, (void**)&stream2); + ok(hr == E_NOINTERFACE, "Expected S_OK, got %08x\n", hr); + /* IXmlReaderInput grabs a stream reference */ ref = IStream_AddRef(stream); ok(ref == 3, "Expected 3, got %d\n", ref); IStream_Release(stream); /* try ::SetInput() with valid IXmlReaderInput */ - hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ref = IUnknown_AddRef(reader_input); @@ -424,6 +450,11 @@ ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_read_state(reader, XmlReadState_Initial, -1, FALSE); + + nodetype = XmlNodeType_Element; + hr = IXmlReader_GetNodeType(reader, &nodetype); + ok(hr == S_OK, "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "got %d\n", nodetype); /* IXmlReader grabs a IXmlReaderInput reference */ ref = IUnknown_AddRef(reader_input); @@ -532,15 +563,24 @@ static void test_reader_state(void) { IXmlReader *reader; + XmlNodeType nodetype; HRESULT hr; - hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* invalid arguments */ hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + /* attempt to read on closed reader */ + test_read_state(reader, XmlReadState_Closed, -1, 0); +if (0) +{ + /* newer versions crash here, probably cause no input was set */ + hr = IXmlReader_Read(reader, &nodetype); + ok(hr == S_FALSE, "got %08x\n", hr); +} IXmlReader_Release(reader); } @@ -551,6 +591,7 @@ HRESULT hr; XmlNodeType type; UINT count = 0; + const WCHAR *val; hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -567,37 +608,85 @@ hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "got %08x\n", hr); + ok(count == 0, "got %d\n", count); + + /* try to move without attributes */ + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + ok_pos(reader, 0, 0, -1, -1, FALSE); type = -1; hr = IXmlReader_Read(reader, &type); -todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); 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 position for <?xml ?> */ ok_pos(reader, 1, 3, -1, 55, TRUE); + test_read_state(reader, XmlReadState_Interactive, -1, 0); + + hr = IXmlReader_GetValue(reader, &val, NULL); +todo_wine + ok(hr == S_OK, "got %08x\n", hr); + if (hr == S_OK) + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + ok_pos(reader, 1, 7, -1, 55, TRUE); + /* try to move from last attribute */ + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Attribute, "got %d\n", type); + hr = IXmlReader_MoveToFirstAttribute(reader); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ok_pos(reader, 1, 7, -1, 55, TRUE); + hr = IXmlReader_GetAttributeCount(reader, NULL); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + hr = IXmlReader_GetAttributeCount(reader, &count); -todo_wine { - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ok(count == 3, "Expected 3, got %d\n", count); -} + hr = IXmlReader_GetDepth(reader, &count); todo_wine { ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(count == 1, "Expected 1, got %d\n", count); } + + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_GetNodeType(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_XmlDeclaration, "got %d\n", type); IStream_Release(stream); IXmlReader_Release(reader);

1 0

[akhaldi] 57872: [XMLLITE]: Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: akhaldi Date: Tue Dec 11 10:53:36 2012 New Revision: 57872 URL: http://svn.reactos.org/svn/reactos?rev=57872&view=rev Log: [XMLLITE]: Sync with Wine 1.5.19. Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt trunk/reactos/dll/win32/xmllite/reader.c 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] Tue Dec 11 10:53:36 2012 @@ -12,12 +12,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def) +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(xmllite) + set_source_files_properties(reader.c PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + add_library(xmllite SHARED ${SOURCE}) - set_module_type(xmllite win32dll) - target_link_libraries(xmllite wine uuid) - add_importlibs(xmllite msvcrt kernel32 ntdll) - add_cd_file(TARGET xmllite DESTINATION reactos/system32 FOR all) 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] Tue Dec 11 10:53:36 2012 @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010 Nikolay Sivov + * Copyright 2010, 2012 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,33 +26,104 @@ #include "initguid.h" #include "objbase.h" #include "xmllite.h" +#include "xmllite_private.h" #include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xmllite); /* not defined in public headers */ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); -static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface, void **pObj); +typedef enum +{ + XmlEncoding_UTF16, + XmlEncoding_UTF8, + XmlEncoding_Unknown +} xml_encoding; + +static const WCHAR utf16W[] = {'U','T','F','-','1','6',0}; +static const WCHAR utf8W[] = {'U','T','F','-','8',0}; + +static const WCHAR dblquoteW[] = {'\"',0}; +static const WCHAR quoteW[] = {'\'',0}; + +struct xml_encoding_data +{ + const WCHAR *name; + xml_encoding enc; + UINT cp; +}; + +static const struct xml_encoding_data xml_encoding_map[] = { + { utf16W, XmlEncoding_UTF16, ~0 }, + { utf8W, XmlEncoding_UTF8, CP_UTF8 } +}; + +typedef struct +{ + char *data; + char *cur; + unsigned int allocated; + unsigned int written; +} encoded_buffer; + +typedef struct input_buffer input_buffer; + +typedef struct _xmlreaderinput +{ + IXmlReaderInput IXmlReaderInput_iface; + LONG ref; + /* reference passed on IXmlReaderInput creation, is kept when input is created */ + IUnknown *input; + IMalloc *imalloc; + xml_encoding encoding; + BOOL hint; + WCHAR *baseuri; + /* stream reference set after SetInput() call from reader, + stored as sequential stream, cause currently + optimizations possible with IStream aren't implemented */ + ISequentialStream *stream; + input_buffer *buffer; +} xmlreaderinput; + +typedef struct +{ + const WCHAR *str; + UINT len; +} strval; + +struct attribute +{ + struct list entry; + strval localname; + strval value; +}; typedef struct _xmlreader { IXmlReader IXmlReader_iface; LONG ref; - IXmlReaderInput *input; - ISequentialStream *stream;/* stored as sequential stream, cause currently - optimizations possible with IStream aren't implemented */ + xmlreaderinput *input; + IMalloc *imalloc; XmlReadState state; + XmlNodeType nodetype; + DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ + struct list attrs; /* attributes list for current node */ + struct attribute *attr; /* current attribute */ + UINT attr_count; } xmlreader; -typedef struct _xmlreaderinput -{ - IXmlReaderInput IXmlReaderInput_iface; - LONG ref; - IUnknown *input; /* reference passed on IXmlReaderInput creation */ -} xmlreaderinput; +struct input_buffer +{ + encoded_buffer utf16; + encoded_buffer encoded; + UINT code_page; + xmlreaderinput *input; +}; static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface) { @@ -62,6 +133,627 @@ static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface) { return CONTAINING_RECORD(iface, xmlreaderinput, IXmlReaderInput_iface); +} + +static inline void *m_alloc(IMalloc *imalloc, size_t len) +{ + if (imalloc) + return IMalloc_Alloc(imalloc, len); + else + return heap_alloc(len); +} + +static inline void *m_realloc(IMalloc *imalloc, void *mem, size_t len) +{ + if (imalloc) + return IMalloc_Realloc(imalloc, mem, len); + else + return heap_realloc(mem, len); +} + +static inline void m_free(IMalloc *imalloc, void *mem) +{ + if (imalloc) + IMalloc_Free(imalloc, mem); + else + heap_free(mem); +} + +/* reader memory allocation functions */ +static inline void *reader_alloc(xmlreader *reader, size_t len) +{ + return m_alloc(reader->imalloc, len); +} + +static inline void reader_free(xmlreader *reader, void *mem) +{ + m_free(reader->imalloc, mem); +} + +/* reader input memory allocation functions */ +static inline void *readerinput_alloc(xmlreaderinput *input, size_t len) +{ + return m_alloc(input->imalloc, len); +} + +static inline void *readerinput_realloc(xmlreaderinput *input, void *mem, size_t len) +{ + return m_realloc(input->imalloc, mem, len); +} + +static inline void readerinput_free(xmlreaderinput *input, void *mem) +{ + m_free(input->imalloc, mem); +} + +static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = readerinput_alloc(input, size); + if (ret) memcpy(ret, str, size); + } + + return ret; +} + +static void reader_clear_attrs(xmlreader *reader) +{ + struct attribute *attr, *attr2; + LIST_FOR_EACH_ENTRY_SAFE(attr, attr2, &reader->attrs, struct attribute, entry) + { + reader_free(reader, attr); + } + list_init(&reader->attrs); + reader->attr_count = 0; +} + +/* attribute data holds pointers to buffer data, so buffer shrink is not possible + while we are on a node with attributes */ +static HRESULT reader_add_attr(xmlreader *reader, strval *localname, strval *value) +{ + struct attribute *attr; + + attr = reader_alloc(reader, sizeof(*attr)); + if (!attr) return E_OUTOFMEMORY; + + attr->localname = *localname; + attr->value = *value; + list_add_tail(&reader->attrs, &attr->entry); + reader->attr_count++; + + return S_OK; +} + +static HRESULT init_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) +{ + const int initial_len = 0x2000; + buffer->data = readerinput_alloc(input, initial_len); + if (!buffer->data) return E_OUTOFMEMORY; + + memset(buffer->data, 0, 4); + buffer->cur = buffer->data; + buffer->allocated = initial_len; + buffer->written = 0; + + return S_OK; +} + +static void free_encoded_buffer(xmlreaderinput *input, encoded_buffer *buffer) +{ + readerinput_free(input, buffer->data); +} + +static HRESULT get_code_page(xml_encoding encoding, UINT *cp) +{ + if (encoding == XmlEncoding_Unknown) + { + FIXME("unsupported encoding %d\n", encoding); + return E_NOTIMPL; + } + + *cp = xml_encoding_map[encoding].cp; + + return S_OK; +} + +static xml_encoding parse_encoding_name(const WCHAR *name, int len) +{ + int min, max, n, c; + + if (!name) return XmlEncoding_Unknown; + + min = 0; + max = sizeof(xml_encoding_map)/sizeof(struct xml_encoding_data) - 1; + + while (min <= max) + { + n = (min+max)/2; + + if (len != -1) + c = strncmpiW(xml_encoding_map[n].name, name, len); + else + c = strcmpiW(xml_encoding_map[n].name, name); + if (!c) + return xml_encoding_map[n].enc; + + if (c > 0) + max = n-1; + else + min = n+1; + } + + return XmlEncoding_Unknown; +} + +static HRESULT alloc_input_buffer(xmlreaderinput *input) +{ + input_buffer *buffer; + HRESULT hr; + + input->buffer = NULL; + + buffer = readerinput_alloc(input, sizeof(*buffer)); + if (!buffer) return E_OUTOFMEMORY; + + buffer->input = input; + buffer->code_page = ~0; /* code page is unknown at this point */ + hr = init_encoded_buffer(input, &buffer->utf16); + if (hr != S_OK) { + readerinput_free(input, buffer); + return hr; + } + + hr = init_encoded_buffer(input, &buffer->encoded); + if (hr != S_OK) { + free_encoded_buffer(input, &buffer->utf16); + readerinput_free(input, buffer); + return hr; + } + + input->buffer = buffer; + return S_OK; +} + +static void free_input_buffer(input_buffer *buffer) +{ + free_encoded_buffer(buffer->input, &buffer->encoded); + free_encoded_buffer(buffer->input, &buffer->utf16); + readerinput_free(buffer->input, buffer); +} + +static void readerinput_release_stream(xmlreaderinput *readerinput) +{ + if (readerinput->stream) { + ISequentialStream_Release(readerinput->stream); + readerinput->stream = NULL; + } +} + +/* Queries already stored interface for IStream/ISequentialStream. + Interface supplied on creation will be overwritten */ +static HRESULT readerinput_query_for_stream(xmlreaderinput *readerinput) +{ + HRESULT hr; + + readerinput_release_stream(readerinput); + hr = IUnknown_QueryInterface(readerinput->input, &IID_IStream, (void**)&readerinput->stream); + if (hr != S_OK) + hr = IUnknown_QueryInterface(readerinput->input, &IID_ISequentialStream, (void**)&readerinput->stream); + + return hr; +} + +/* reads a chunk to raw buffer */ +static HRESULT readerinput_growraw(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + ULONG len = buffer->allocated - buffer->written, read; + HRESULT hr; + + /* always try to get aligned to 4 bytes, so the only case we can get partialy read characters is + variable width encodings like UTF-8 */ + len = (len + 3) & ~3; + /* try to use allocated space or grow */ + if (buffer->allocated - buffer->written < len) + { + buffer->allocated *= 2; + buffer->data = readerinput_realloc(readerinput, buffer->data, buffer->allocated); + len = buffer->allocated - buffer->written; + } + + hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); + if (FAILED(hr)) return hr; + TRACE("requested %d, read %d, ret 0x%08x\n", len, read, hr); + buffer->written += read; + + return hr; +} + +/* grows UTF-16 buffer so it has at least 'length' bytes free on return */ +static void readerinput_grow(xmlreaderinput *readerinput, int length) +{ + encoded_buffer *buffer = &readerinput->buffer->utf16; + + /* grow if needed, plus 4 bytes to be sure null terminator will fit in */ + if (buffer->allocated < buffer->written + length + 4) + { + int grown_size = max(2*buffer->allocated, buffer->allocated + length); + buffer->data = readerinput_realloc(readerinput, buffer->data, grown_size); + buffer->allocated = grown_size; + } +} + +static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + static char startA[] = {'<','?','x','m'}; + static WCHAR startW[] = {'<','?'}; + static char utf8bom[] = {0xef,0xbb,0xbf}; + static char utf16lebom[] = {0xff,0xfe}; + + *enc = XmlEncoding_Unknown; + + if (buffer->written <= 3) return MX_E_INPUTEND; + + /* try start symbols if we have enough data to do that, input buffer should contain + first chunk already */ + if (!memcmp(buffer->data, startA, sizeof(startA))) + *enc = XmlEncoding_UTF8; + else if (!memcmp(buffer->data, startW, sizeof(startW))) + *enc = XmlEncoding_UTF16; + /* try with BOM now */ + else if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) + { + buffer->cur += sizeof(utf8bom); + *enc = XmlEncoding_UTF8; + } + else if (!memcmp(buffer->data, utf16lebom, sizeof(utf16lebom))) + { + buffer->cur += sizeof(utf16lebom); + *enc = XmlEncoding_UTF16; + } + + return S_OK; +} + +static int readerinput_get_utf8_convlen(xmlreaderinput *readerinput) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + int len = buffer->written; + + /* complete single byte char */ + if (!(buffer->data[len-1] & 0x80)) return len; + + /* find start byte of multibyte char */ + while (--len && !(buffer->data[len] & 0xc0)) + ; + + return len; +} + +/* returns byte length of complete char sequence for specified code page, */ +static int readerinput_get_convlen(xmlreaderinput *readerinput, UINT cp) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; + int len = buffer->written; + + if (cp == CP_UTF8) + len = readerinput_get_utf8_convlen(readerinput); + else + len = buffer->written; + + return len - (buffer->cur - buffer->data); +} + +/* note that raw buffer content is kept */ +static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding enc) +{ + encoded_buffer *src = &readerinput->buffer->encoded; + encoded_buffer *dest = &readerinput->buffer->utf16; + int len, dest_len; + HRESULT hr; + UINT cp; + + hr = get_code_page(enc, &cp); + if (FAILED(hr)) return; + + len = readerinput_get_convlen(readerinput, cp); + + TRACE("switching to cp %d\n", cp); + + /* just copy in this case */ + if (enc == XmlEncoding_UTF16) + { + readerinput_grow(readerinput, len); + memcpy(dest->data, src->cur, len); + readerinput->buffer->code_page = cp; + return; + } + + dest_len = MultiByteToWideChar(cp, 0, src->cur, len, NULL, 0); + readerinput_grow(readerinput, dest_len); + MultiByteToWideChar(cp, 0, src->cur, len, (WCHAR*)dest->data, dest_len); + dest->data[dest_len] = 0; + readerinput->buffer->code_page = cp; +} + +static inline const WCHAR *reader_get_cur(xmlreader *reader) +{ + return (WCHAR*)reader->input->buffer->utf16.cur; +} + +static int reader_cmp(xmlreader *reader, const WCHAR *str) +{ + const WCHAR *ptr = reader_get_cur(reader); + int i = 0; + + return strncmpW(str, ptr, strlenW(str)); + + while (str[i]) { + if (ptr[i] != str[i]) return 0; + i++; + } + + return 1; +} + +/* moves cursor n WCHARs forward */ +static void reader_skipn(xmlreader *reader, int n) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + const WCHAR *ptr = reader_get_cur(reader); + + while (*ptr++ && n--) + { + buffer->cur += sizeof(WCHAR); + reader->pos++; + } +} + +/* [3] S ::= (#x20 | #x9 | #xD | #xA)+ */ +static int reader_skipspaces(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + const WCHAR *ptr = reader_get_cur(reader), *start = ptr; + + while (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n') + { + buffer->cur += sizeof(WCHAR); + if (*ptr == '\r') + reader->pos = 0; + else if (*ptr == '\n') + { + reader->line++; + reader->pos = 0; + } + else + reader->pos++; + ptr++; + } + + return ptr - start; +} + +/* [26] VersionNum ::= '1.' [0-9]+ */ +static HRESULT reader_parse_versionnum(xmlreader *reader, strval *val) +{ + const WCHAR *ptr, *ptr2, *start = reader_get_cur(reader); + static const WCHAR onedotW[] = {'1','.',0}; + + if (reader_cmp(reader, onedotW)) return WC_E_XMLDECL; + /* skip "1." */ + reader_skipn(reader, 2); + + ptr2 = ptr = reader_get_cur(reader); + while (*ptr >= '0' && *ptr <= '9') + ptr++; + + if (ptr2 == ptr) return WC_E_DIGIT; + TRACE("version=%s\n", debugstr_wn(start, ptr-start)); + val->str = start; + val->len = ptr-start; + reader_skipn(reader, ptr-ptr2); + return S_OK; +} + +/* [25] Eq ::= S? '=' S? */ +static HRESULT reader_parse_eq(xmlreader *reader) +{ + static const WCHAR eqW[] = {'=',0}; + reader_skipspaces(reader); + if (reader_cmp(reader, eqW)) return WC_E_EQUAL; + /* skip '=' */ + reader_skipn(reader, 1); + reader_skipspaces(reader); + return S_OK; +} + +/* [24] VersionInfo ::= S 'version' Eq ("'" VersionNum "'" | '"' VersionNum '"') */ +static HRESULT reader_parse_versioninfo(xmlreader *reader) +{ + static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; + strval val, name; + HRESULT hr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, versionW)) return WC_E_XMLDECL; + name.str = reader_get_cur(reader); + name.len = 7; + /* skip 'version' */ + reader_skipn(reader, 7); + + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + hr = reader_parse_versionnum(reader, &val); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return reader_add_attr(reader, &name, &val); +} + +/* ([A-Za-z0-9._] | '-') */ +static inline int is_wchar_encname(WCHAR ch) +{ + return ((ch >= 'A' && ch <= 'Z') || + (ch >= 'a' && ch <= 'z') || + (ch >= '0' && ch <= '9') || + (ch == '.') || (ch == '_') || + (ch == '-')); +} + +/* [81] EncName ::= [A-Za-z] ([A-Za-z0-9._] | '-')* */ +static HRESULT reader_parse_encname(xmlreader *reader, strval *val) +{ + const WCHAR *start = reader_get_cur(reader), *ptr; + xml_encoding enc; + int len; + + if ((*start < 'A' || *start > 'Z') && (*start < 'a' || *start > 'z')) + return WC_E_ENCNAME; + + ptr = start; + while (is_wchar_encname(*++ptr)) + ; + + len = ptr - start; + enc = parse_encoding_name(start, len); + TRACE("encoding name %s\n", debugstr_wn(start, len)); + val->str = start; + val->len = len; + + if (enc == XmlEncoding_Unknown) + return WC_E_ENCNAME; + + /* skip encoding name */ + reader_skipn(reader, len); + return S_OK; +} + +/* [80] EncodingDecl ::= S 'encoding' Eq ('"' EncName '"' | "'" EncName "'" ) */ +static HRESULT reader_parse_encdecl(xmlreader *reader) +{ + static const WCHAR encodingW[] = {'e','n','c','o','d','i','n','g',0}; + strval name, val; + HRESULT hr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, encodingW)) return S_FALSE; + name.str = reader_get_cur(reader); + name.len = 8; + /* skip 'encoding' */ + reader_skipn(reader, 8); + + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + hr = reader_parse_encname(reader, &val); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return reader_add_attr(reader, &name, &val); +} + +/* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ +static HRESULT reader_parse_sddecl(xmlreader *reader) +{ + static const WCHAR standaloneW[] = {'s','t','a','n','d','a','l','o','n','e',0}; + static const WCHAR yesW[] = {'y','e','s',0}; + static const WCHAR noW[] = {'n','o',0}; + const WCHAR *start, *ptr; + strval name, val; + HRESULT hr; + + if (!reader_skipspaces(reader)) return WC_E_WHITESPACE; + + if (reader_cmp(reader, standaloneW)) return S_FALSE; + name.str = reader_get_cur(reader); + name.len = 10; + /* skip 'standalone' */ + reader_skipn(reader, 10); + + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + if (reader_cmp(reader, yesW) && reader_cmp(reader, noW)) + return WC_E_XMLDECL; + + start = reader_get_cur(reader); + /* skip 'yes'|'no' */ + reader_skipn(reader, reader_cmp(reader, yesW) ? 2 : 3); + ptr = reader_get_cur(reader); + TRACE("standalone=%s\n", debugstr_wn(start, ptr-start)); + val.str = start; + val.len = ptr-start; + + if (reader_cmp(reader, quoteW) && reader_cmp(reader, dblquoteW)) + return WC_E_QUOTE; + /* skip "'"|'"' */ + reader_skipn(reader, 1); + + return reader_add_attr(reader, &name, &val); +} + +/* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ +static HRESULT reader_parse_xmldecl(xmlreader *reader) +{ + static const WCHAR xmldeclW[] = {'<','?','x','m','l',0}; + static const WCHAR declcloseW[] = {'?','>',0}; + HRESULT hr; + + /* check if we have "<?xml" */ + if (reader_cmp(reader, xmldeclW)) return S_FALSE; + + reader_skipn(reader, 5); + hr = reader_parse_versioninfo(reader); + if (FAILED(hr)) + return hr; + + hr = reader_parse_encdecl(reader); + if (FAILED(hr)) + return hr; + + hr = reader_parse_sddecl(reader); + if (FAILED(hr)) + return hr; + + reader_skipspaces(reader); + if (reader_cmp(reader, declcloseW)) return WC_E_XMLDECL; + reader_skipn(reader, 2); + + return S_OK; } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) @@ -89,23 +781,25 @@ static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); - LONG ref; - - TRACE("%p\n", This); - - ref = InterlockedDecrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) { - if (This->input) IUnknown_Release(This->input); - if (This->stream) IUnknown_Release(This->stream); - HeapFree(GetProcessHeap(), 0, This); + IMalloc *imalloc = This->imalloc; + if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); + reader_clear_attrs(This); + reader_free(This, This); + if (imalloc) IMalloc_Release(imalloc); } return ref; @@ -120,14 +814,9 @@ if (This->input) { - IUnknown_Release(This->input); - This->input = NULL; - } - - if (This->stream) - { - IUnknown_Release(This->stream); - This->stream = NULL; + readerinput_release_stream(This->input); + IUnknown_Release(&This->input->IXmlReaderInput_iface); + This->input = NULL; } This->line = This->pos = 0; @@ -143,14 +832,17 @@ hr = IUnknown_QueryInterface(input, &IID_IXmlReaderInput, (void**)&This->input); if (hr != S_OK) { + IXmlReaderInput *readerinput; + /* create IXmlReaderInput basing on supplied interface */ hr = CreateXmlReaderInputWithEncodingName(input, - NULL, NULL, FALSE, NULL, &This->input); + NULL, NULL, FALSE, NULL, &readerinput); if (hr != S_OK) return hr; + This->input = impl_from_IXmlReaderInput(readerinput); } /* set stream for supplied IXmlReaderInput */ - hr = xmlreaderinput_query_for_stream(This->input, (void**)&This->stream); + hr = readerinput_query_for_stream(This->input); if (hr == S_OK) This->state = XmlReadState_Initial; @@ -167,6 +859,9 @@ switch (property) { + case XmlReaderProperty_DtdProcessing: + *value = This->dtdmode; + break; case XmlReaderProperty_ReadState: *value = This->state; break; @@ -180,32 +875,104 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LONG_PTR value) { - FIXME("(%p %u %lu): stub\n", iface, property, value); + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p %u %lu)\n", iface, property, value); + + switch (property) + { + case XmlReaderProperty_DtdProcessing: + if (value < 0 || value > _DtdProcessing_Last) return E_INVALIDARG; + This->dtdmode = value; + break; + default: + FIXME("Unimplemented property (%u)\n", property); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) +{ + xmlreader *This = impl_from_IXmlReader(iface); + + FIXME("(%p)->(%p): stub\n", This, node_type); + + if (This->state == XmlReadState_Closed) return S_FALSE; + + /* if it's a first call for a new input we need to detect stream encoding */ + if (This->state == XmlReadState_Initial) + { + xml_encoding enc; + HRESULT hr; + + hr = readerinput_growraw(This->input); + if (FAILED(hr)) return hr; + + /* try to detect encoding by BOM or data and set input code page */ + hr = readerinput_detectencoding(This->input, &enc); + TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); + if (FAILED(hr)) return hr; + + /* always switch first time cause we have to put something in */ + readerinput_switchencoding(This->input, enc); + + /* parse xml declaration */ + hr = reader_parse_xmldecl(This); + if (FAILED(hr)) return hr; + + if (hr == S_OK) + { + This->state = XmlReadState_Interactive; + This->nodetype = *node_type = XmlNodeType_XmlDeclaration; + return S_OK; + } + } + return E_NOTIMPL; } -static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *node_type) -{ - FIXME("(%p %p): stub\n", iface, node_type); - return E_NOTIMPL; -} - static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node_type) { - FIXME("(%p %p): stub\n", iface, node_type); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)->(%p)\n", This, node_type); + + /* When we're on attribute always return attribute type, container node type is kept. + Note that container is not necessarily an element, and attribute doesn't mean it's + an attribute in XML spec terms. */ + *node_type = This->attr ? XmlNodeType_Attribute : This->nodetype; + return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); + return S_OK; } static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + const struct list *next; + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + + if (!This->attr) + return IXmlReader_MoveToFirstAttribute(iface); + + next = list_next(&This->attrs, &This->attr->entry); + if (next) + This->attr = LIST_ENTRY(next, struct attribute, entry); + + return next ? S_OK : S_FALSE; } static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, @@ -218,8 +985,13 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + This->attr = NULL; + return S_OK; } static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *qualifiedName, @@ -316,10 +1088,16 @@ return S_OK; } -static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *attributeCount) -{ - FIXME("(%p %p): stub\n", iface, attributeCount); - return E_NOTIMPL; +static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count) +{ + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)->(%p)\n", This, count); + + if (!count) return E_INVALIDARG; + + *count = This->attr_count; + return S_OK; } static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) @@ -365,21 +1143,6 @@ }; /** IXmlReaderInput **/ - -/* Queries already stored interface for IStream/ISequentialStream. - Interface supplied on creation will be overwritten */ -static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface, void **pObj) -{ - xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - HRESULT hr; - - hr = IUnknown_QueryInterface(This->input, &IID_IStream, pObj); - if (hr != S_OK) - hr = IUnknown_QueryInterface(This->input, &IID_ISequentialStream, pObj); - - return hr; -} - static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFIID riid, void** ppvObject) { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); @@ -393,7 +1156,7 @@ } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + WARN("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -405,22 +1168,27 @@ static ULONG WINAPI xmlreaderinput_AddRef(IXmlReaderInput *iface) { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; } static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) { xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - LONG ref; - - TRACE("%p\n", This); - - ref = InterlockedDecrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) { + IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(This->input); - HeapFree(GetProcessHeap(), 0, This); + if (This->stream) ISequentialStream_Release(This->stream); + if (This->buffer) free_input_buffer(This->buffer); + readerinput_free(This, This->baseuri); + readerinput_free(This, This); + if (imalloc) IMalloc_Release(imalloc); } return ref; @@ -433,13 +1201,11 @@ xmlreaderinput_Release }; -HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) +HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; - TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc); - - if (pMalloc) FIXME("custom IMalloc not supported yet\n"); + TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); if (!IsEqualGUID(riid, &IID_IXmlReader)) { @@ -447,42 +1213,68 @@ return E_FAIL; } - reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader)); + if (imalloc) + reader = IMalloc_Alloc(imalloc, sizeof(*reader)); + else + reader = heap_alloc(sizeof(*reader)); if(!reader) return E_OUTOFMEMORY; reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl; reader->ref = 1; - reader->stream = NULL; reader->input = NULL; reader->state = XmlReadState_Closed; + reader->dtdmode = DtdProcessing_Prohibit; reader->line = reader->pos = 0; - - *pObject = &reader->IXmlReader_iface; - - TRACE("returning iface %p\n", *pObject); + reader->imalloc = imalloc; + if (imalloc) IMalloc_AddRef(imalloc); + reader->nodetype = XmlNodeType_None; + list_init(&reader->attrs); + reader->attr_count = 0; + reader->attr = NULL; + + *obj = &reader->IXmlReader_iface; + + TRACE("returning iface %p\n", *obj); return S_OK; } HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, - IMalloc *pMalloc, + IMalloc *imalloc, LPCWSTR encoding, BOOL hint, LPCWSTR base_uri, IXmlReaderInput **ppInput) { xmlreaderinput *readerinput; - - FIXME("%p %p %s %d %s %p: stub\n", stream, pMalloc, wine_dbgstr_w(encoding), + HRESULT hr; + + TRACE("%p %p %s %d %s %p\n", stream, imalloc, wine_dbgstr_w(encoding), hint, wine_dbgstr_w(base_uri), ppInput); if (!stream || !ppInput) return E_INVALIDARG; - readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput)); + if (imalloc) + readerinput = IMalloc_Alloc(imalloc, sizeof(*readerinput)); + else + readerinput = heap_alloc(sizeof(*readerinput)); if(!readerinput) return E_OUTOFMEMORY; readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; readerinput->ref = 1; + readerinput->imalloc = imalloc; + readerinput->stream = NULL; + if (imalloc) IMalloc_AddRef(imalloc); + readerinput->encoding = parse_encoding_name(encoding, -1); + readerinput->hint = hint; + readerinput->baseuri = readerinput_strdupW(readerinput, base_uri); + + hr = alloc_input_buffer(readerinput); + if (hr != S_OK) + { + readerinput_free(readerinput, readerinput); + return hr; + } IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input); *ppInput = &readerinput->IXmlReaderInput_iface; 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] Tue Dec 11 10:53:36 2012 @@ -79,28 +79,135 @@ } /* IXmlReader state */ -cpp_quote("typedef enum XmlReadState") -cpp_quote("{") -cpp_quote(" XmlReadState_Initial = 0,") -cpp_quote(" XmlReadState_Interactive = 1,") -cpp_quote(" XmlReadState_Error = 2,") -cpp_quote(" XmlReadState_EndOfFile = 3,") -cpp_quote(" XmlReadState_Closed = 4") -cpp_quote("} XmlReadState;") +typedef enum XmlReadState +{ + XmlReadState_Initial, + XmlReadState_Interactive, + XmlReadState_Error, + XmlReadState_EndOfFile, + XmlReadState_Closed +} XmlReadState; + +/* conformance levels */ +typedef enum XmlConformanceLevel +{ + XmlConformanceLevel_Auto, + XmlConformanceLevel_Fragment, + XmlConformanceLevel_Document, + _XmlConformanceLevel_Last = XmlConformanceLevel_Document +} XmlConformanceLevel; + +/* DTD processing mode */ +typedef enum DtdProcessing +{ + DtdProcessing_Prohibit, + DtdProcessing_Parse, + _DtdProcessing_Last = DtdProcessing_Parse +} DtdProcessing; /* IXmlReader properties */ -cpp_quote("typedef enum XmlReaderProperty") -cpp_quote("{") -cpp_quote(" XmlReaderProperty_MultiLanguage = 0,") -cpp_quote(" XmlReaderProperty_ConformanceLevel = XmlReaderProperty_MultiLanguage + 1,") -cpp_quote(" XmlReaderProperty_RandomAccess = XmlReaderProperty_ConformanceLevel + 1,") -cpp_quote(" XmlReaderProperty_XmlResolver = XmlReaderProperty_RandomAccess + 1,") -cpp_quote(" XmlReaderProperty_DtdProcessing = XmlReaderProperty_XmlResolver + 1,") -cpp_quote(" XmlReaderProperty_ReadState = XmlReaderProperty_DtdProcessing + 1,") -cpp_quote(" XmlReaderProperty_MaxElementDepth = XmlReaderProperty_ReadState + 1,") -cpp_quote(" XmlReaderProperty_MaxEntityExpansion = XmlReaderProperty_MaxElementDepth + 1,") -cpp_quote(" _XmlReaderProperty_Last = XmlReaderProperty_MaxEntityExpansion") -cpp_quote("} XmlReaderProperty;") +typedef enum XmlReaderProperty +{ + XmlReaderProperty_MultiLanguage, + XmlReaderProperty_ConformanceLevel, + XmlReaderProperty_RandomAccess, + XmlReaderProperty_XmlResolver, + XmlReaderProperty_DtdProcessing, + XmlReaderProperty_ReadState, + XmlReaderProperty_MaxElementDepth, + XmlReaderProperty_MaxEntityExpansion, + _XmlReaderProperty_Last = XmlReaderProperty_MaxEntityExpansion +} XmlReaderProperty; + +/* reader error codes */ +typedef enum XmlError +{ + MX_E_MX = 0xc00cee00, + MX_E_INPUTEND, + MX_E_ENCODING, + MX_E_ENCODINGSWITCH, + MX_E_ENCODINGSIGNATURE, + WC_E_WC = 0xc00cee20, + WC_E_WHITESPACE, + WC_E_SEMICOLON, + WC_E_GREATERTHAN, + WC_E_QUOTE, + WC_E_EQUAL, + WC_E_LESSTHAN, + WC_E_HEXDIGIT, + WC_E_DIGIT, + WC_E_LEFTBRACKET, + WC_E_LEFTPAREN, + WC_E_XMLCHARACTER, + WC_E_NAMECHARACTER, + WC_E_SYNTAX, + WC_E_CDSECT, + WC_E_COMMENT, + WC_E_CONDSECT, + WC_E_DECLATTLIST, + WC_E_DECLDOCTYPE, + WC_E_DECLELEMENT, + WC_E_DECLENTITY, + WC_E_DECLNOTATION, + WC_E_NDATA, + WC_E_PUBLIC, + WC_E_SYSTEM, + WC_E_NAME, + WC_E_ROOTELEMENT, + WC_E_ELEMENTMATCH, + WC_E_UNIQUEATTRIBUTE, + WC_E_TEXTXMLDECL, + WC_E_LEADINGXML, + WC_E_TEXTDECL, + WC_E_XMLDECL, + WC_E_ENCNAME, + WC_E_PUBLICID, + WC_E_PESINTERNALSUBSET, + WC_E_PESBETWEENDECLS, + WC_E_NORECURSION, + WC_E_ENTITYCONTENT, + WC_E_UNDECLAREDENTITY, + WC_E_PARSEDENTITY, + WC_E_NOEXTERNALENTITYREF, + WC_E_PI, + WC_E_SYSTEMID, + WC_E_QUESTIONMARK, + WC_E_CDSECTEND, + WC_E_MOREDATA, + WC_E_DTDPROHIBITED, + WC_E_INVALIDXMLSPACE, + NC_E_NC = 0xc00cee60, + NC_E_QNAMECHARACTER, + NC_E_QNAMECOLON, + NC_E_NAMECOLON, + NC_E_DECLAREDPREFIX, + NC_E_UNDECLAREDPREFIX, + NC_E_EMPTYURI, + NC_E_XMLPREFIXRESERVED, + NC_E_XMLNSPREFIXRESERVED, + NC_E_XMLURIRESERVED, + NC_E_XMLNSURIRESERVED, + SC_E_SC = 0xc00cee80, + SC_E_MAXELEMENTDEPTH, + SC_E_MAXENTITYEXPANSION, + WR_E_WR = 0xc00cef00, + WR_E_NONWHITESPACE, + WR_E_NSPREFIXDECLARED, + WR_E_NSPREFIXWITHEMPTYNSURI, + WR_E_DUPLICATEATTRIBUTE, + WR_E_XMLNSPREFIXDECLARATION, + WR_E_XMLPREFIXDECLARATION, + WR_E_XMLURIDECLARATION, + WR_E_XMLNSURIDECLARATION, + WR_E_NAMESPACEUNDECLARED, + WR_E_INVALIDXMLSPACE, + WR_E_INVALIDACTION, + WR_E_INVALIDSURROGATEPAIR, + XML_E_INVALID_DECIMAL = 0xc00ce01d, + XML_E_INVALID_HEXIDECIMAL, + XML_E_INVALID_UNICODE, + XML_E_INVALIDENCODING = 0xc00ce06e +} XmlError; /* IXmlReader construction */ cpp_quote("STDAPI CreateXmlReader(REFIID riid, void **ppvObject, IMalloc *pMalloc);") 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] Tue Dec 11 10:53:36 2012 @@ -199,7 +199,7 @@ reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.4 reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.4 reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.5.4 -reactos/dll/win32/xmllite # Synced to Wine-1.5.4 +reactos/dll/win32/xmllite # Synced to Wine-1.5.19 reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21

1 0

[akhaldi] 57871: [NETAPI32_WINETEST]: Sync with Wine 1.5.19.
by akhaldi＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: akhaldi Date: Tue Dec 11 10:19:54 2012 New Revision: 57871 URL: http://svn.reactos.org/svn/reactos?rev=57871&view=rev Log: [NETAPI32_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/netapi32/CMakeLists.txt trunk/rostests/winetests/netapi32/access.c trunk/rostests/winetests/netapi32/wksta.c Modified: trunk/rostests/winetests/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/CMakeLists.txt [iso-8859-1] Tue Dec 11 10:19:54 2012 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE access.c Modified: trunk/rostests/winetests/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/access… ============================================================================== --- trunk/rostests/winetests/netapi32/access.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/access.c [iso-8859-1] Tue Dec 11 10:19:54 2012 @@ -29,8 +29,8 @@ #include "wine/test.h" -WCHAR user_name[UNLEN + 1]; -WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; +static WCHAR user_name[UNLEN + 1]; +static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; static const WCHAR sNonexistentUser[] = {'N','o','n','e','x','i','s','t','e','n','t',' ', 'U','s','e','r',0}; @@ -63,6 +63,8 @@ static NET_API_STATUS (WINAPI *pNetUserModalsGet)(LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetUserAdd)(LPCWSTR,DWORD,LPBYTE,LPDWORD)=NULL; static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL; +static NET_API_STATUS (WINAPI *pNetLocalGroupGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; +static NET_API_STATUS (WINAPI *pNetLocalGroupGetMembers)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,PDWORD_PTR)=NULL; static int init_access_tests(void) { @@ -158,6 +160,7 @@ ok(rc == ERROR_BAD_NETPATH || rc == ERROR_NETWORK_UNREACHABLE || rc == RPC_S_SERVER_UNAVAILABLE || + rc == NERR_WkstaNotStarted || /* workstation service not running */ rc == RPC_S_INVALID_NET_ADDR, /* Some Win7 */ "Bad Network Path: rc=%d\n",rc); } @@ -320,6 +323,33 @@ ok(ret == NERR_UserNotFound, "Deleting a nonexistent user returned 0x%08x\n",ret); } +static void run_localgroupgetinfo_tests(void) +{ + NET_API_STATUS status; + static const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; + PLOCALGROUP_INFO_1 lgi = NULL; + PLOCALGROUP_MEMBERS_INFO_3 buffer = NULL; + DWORD entries_read = 0, total_entries =0; + int i; + + status = pNetLocalGroupGetInfo(NULL, admins, 1, (LPBYTE *)&lgi); + ok(status == NERR_Success || broken(status == NERR_GroupNotFound), + "NetLocalGroupGetInfo unexpectedly returned %d\n", status); + if (status != NERR_Success) return; + + trace("Local groupname:%s\n", wine_dbgstr_w( lgi->lgrpi1_name)); + trace("Comment: %s\n", wine_dbgstr_w( lgi->lgrpi1_comment)); + + pNetApiBufferFree(lgi); + + status = pNetLocalGroupGetMembers(NULL, admins, 3, (LPBYTE *)&buffer, MAX_PREFERRED_LENGTH, &entries_read, &total_entries, NULL); + ok(status == NERR_Success, "NetLocalGroupGetMembers unexpectedly returned %d\n", status); + ok(entries_read > 0 && total_entries > 0, "Amount of entries is unexpectedly 0\n"); + + for(i=0;i<entries_read;i++) + trace("domain and name: %s\n", wine_dbgstr_w(buffer[i].lgrmi3_domainandname)); +} + START_TEST(access) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -331,6 +361,8 @@ pNetUserModalsGet=(void*)GetProcAddress(hnetapi32,"NetUserModalsGet"); pNetUserAdd=(void*)GetProcAddress(hnetapi32, "NetUserAdd"); pNetUserDel=(void*)GetProcAddress(hnetapi32, "NetUserDel"); + pNetLocalGroupGetInfo=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetInfo"); + pNetLocalGroupGetMembers=(void*)GetProcAddress(hnetapi32, "NetLocalGroupGetMembers"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -346,6 +378,7 @@ run_usergetinfo_tests(); run_querydisplayinformation1_tests(); run_usermodalsget_tests(); + run_localgroupgetinfo_tests(); } FreeLibrary(hnetapi32); Modified: trunk/rostests/winetests/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/netapi32/wksta.… ============================================================================== --- trunk/rostests/winetests/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/rostests/winetests/netapi32/wksta.c [iso-8859-1] Tue Dec 11 10:19:54 2012 @@ -31,6 +31,7 @@ #include "lmerr.h" #include "lmwksta.h" #include "lmapibuf.h" +#include "lmjoin.h" static NET_API_STATUS (WINAPI *pNetApiBufferFree)(LPVOID)=NULL; static NET_API_STATUS (WINAPI *pNetApiBufferSize)(LPVOID,LPDWORD)=NULL; @@ -38,9 +39,10 @@ static NET_API_STATUS (WINAPI *pNetWkstaUserGetInfo)(LPWSTR,DWORD,PBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetWkstaTransportEnum)(LPWSTR,DWORD,LPBYTE*, DWORD,LPDWORD,LPDWORD,LPDWORD)=NULL; - -WCHAR user_name[UNLEN + 1]; -WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; +static NET_API_STATUS (WINAPI *pNetGetJoinInformation)(LPCWSTR,LPWSTR*,PNETSETUP_JOIN_STATUS); + +static WCHAR user_name[UNLEN + 1]; +static WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; static int init_wksta_tests(void) { @@ -77,12 +79,17 @@ LPWKSTA_USER_INFO_1 ui1 = NULL; LPWKSTA_USER_INFO_1101 ui1101 = NULL; DWORD dwSize; + NET_API_STATUS rc; /* Level 0 */ - ok(pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0) == NERR_Success, - "NetWkstaUserGetInfo is unsuccessful\n"); - - ok(ui0 != NULL, "ui0 is NULL\n"); + rc = pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0); + if (rc == NERR_WkstaNotStarted) + { + skip("Workstation service not running\n"); + return; + } + ok(!rc && ui0, "got %d and %p (expected NERR_Success and != NULL\n", rc, ui0); + /* This failure occurred when I ran sshd as service and didn't authenticate * Since the test dereferences ui0, the rest of this test is worthless */ @@ -166,7 +173,7 @@ /* final check: valid return, actually get data back */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, &totalEntries, NULL); - ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE, + ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE || apiReturn == NERR_WkstaNotStarted, "NetWkstaTransportEnum returned %d\n", apiReturn); if (apiReturn == NERR_Success) { /* WKSTA_TRANSPORT_INFO_0 *transports = (WKSTA_TRANSPORT_INFO_0 *)bufPtr; */ @@ -179,6 +186,28 @@ } } +static void run_wkstajoininfo_tests(void) +{ + NET_API_STATUS ret; + LPWSTR buffer = NULL; + NETSETUP_JOIN_STATUS buffertype = 0xdada; + /* NT4 doesn't have this function */ + if (!pNetGetJoinInformation) { + win_skip("NetGetJoinInformation not available\n"); + return; + } + + ret = pNetGetJoinInformation(NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(buffertype == 0xdada, "buffertype set to unexpected value %d\n", buffertype); + + ret = pNetGetJoinInformation(NULL, &buffer, &buffertype); + ok(ret == NERR_Success, "NetJoinGetInformation returned unexpected 0x%08x\n", ret); + ok(buffertype != 0xdada && buffertype != NetSetupUnknownStatus, "buffertype set to unexpected value %d\n", buffertype); + trace("workstation joined to %s with status %d\n", wine_dbgstr_w(buffer), buffertype); + pNetApiBufferFree(buffer); +} + START_TEST(wksta) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -188,6 +217,7 @@ pNetpGetComputerName=(void*)GetProcAddress(hnetapi32,"NetpGetComputerName"); pNetWkstaUserGetInfo=(void*)GetProcAddress(hnetapi32,"NetWkstaUserGetInfo"); pNetWkstaTransportEnum=(void*)GetProcAddress(hnetapi32,"NetWkstaTransportEnum"); + pNetGetJoinInformation=(void*)GetProcAddress(hnetapi32,"NetGetJoinInformation"); /* These functions were introduced with NT. It's safe to assume that * if one is not available, none are. @@ -205,6 +235,7 @@ win_skip("Function NetpGetComputerName not available\n"); run_wkstausergetinfo_tests(); run_wkstatransportenum_tests(); + run_wkstajoininfo_tests(); } FreeLibrary(hnetapi32);

1 0

[akhaldi] 57870: [MAGNIFY] * Reduce palette window size. * Fix some Japanese text. * Brought to you by Hirofumi Katayama. CORE-6802 #resolve #comment Committed in r57870. Thanks ; )
by akhaldi＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: akhaldi Date: Tue Dec 11 10:15:46 2012 New Revision: 57870 URL: http://svn.reactos.org/svn/reactos?rev=57870&view=rev Log: [MAGNIFY] * Reduce palette window size. * Fix some Japanese text. * Brought to you by Hirofumi Katayama. CORE-6802 #resolve #comment Committed in r57870. Thanks ;) Modified: trunk/reactos/base/applications/magnify/lang/ja-JP.rc trunk/reactos/base/applications/magnify/magnifier.c Modified: trunk/reactos/base/applications/magnify/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/ja-JP.rc [iso-8859-1] Tue Dec 11 10:15:46 2012 @@ -38,13 +38,13 @@ LTEXT "æ¡å¤§ç:",IDC_STATIC,6,8,68,8 COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "æ¡å¤§ã®å¯¾è±¡",IDC_STATIC,7,25,139,59 - GROUPBOX "è¡¨ ç¤º",IDC_STATIC,7,87,139,57 - CONTROL "ãã¦ã¹ ã«ã¼ã½ ã«ã®åããè¿½ã",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + GROUPBOX "è¡¨ç¤º",IDC_STATIC,7,87,139,57 + CONTROL "ãã¦ã¹ ã«ã¼ã½ã«ã®åããè¿½ã",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 CONTROL "ãã¼ãã¼ãã®ãã©ã¼ã«ã¹ãè¿½ã",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 CONTROL "ç·¨éä¸ã®ããã¹ããè¿½ã",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 CONTROL "è²ãåè»¢ãã",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 CONTROL "æå°åãã¦éå§ãã",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 - CONTROL "æ¡å¤§é¡ãè¡¨ ç¤ºãã",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 + CONTROL "æ¡å¤§é¡ãè¡¨ç¤ºãã",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 END IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 @@ -54,8 +54,8 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,193,76,50,14 ICON IDI_ICON,IDC_STATIC,7,17,20,20 - LTEXT "æ¡å¤§é¡ã¯è»½ãè¦è¦éå®³ãããæ¹ã«æä½éã®æ©è½ ãæä¾ããããã«è¨è¨ããã¦ãã¾ããã»ã¨ãã©ã®è¦è¦éå®³èã®æ¹ã®å ´åãæ¥å¸¸å©ç¨ããã«ã¯ããé«æ©è½ ãªæ¡å¤§ã¦ã¼ãã£ãªãã£ãå¿è¦ã¨ãªãã¾ãã",IDC_STATIC,36,7,207,33 - CONTROL "ä»å¾ããã®ã¡ãã»ã¼ã¸ãè¡¨ ç¤ºããªã",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 + LTEXT "æ¡å¤§é¡ã¯è»½ãè¦è¦éå®³ãããæ¹ã«æä½éã®æ©è½ãæä¾ããããã«è¨è¨ããã¦ãã¾ããã»ã¨ãã©ã®è¦è¦éå®³èã®æ¹ã®å ´åãæ¥å¸¸å©ç¨ããã«ã¯ããé«æ©è½ãªæ¡å¤§ã¦ã¼ãã£ãªãã£ãå¿è¦ã¨ãªãã¾ãã",IDC_STATIC,36,7,207,33 + CONTROL "ä»å¾ããã®ã¡ãã»ã¼ã¸ãè¡¨ç¤ºããªã",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 END STRINGTABLE Modified: trunk/reactos/base/applications/magnify/magnifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/magnifier.c [iso-8859-1] Tue Dec 11 10:15:46 2012 @@ -7,6 +7,7 @@ * */ +/* TODO: AppBar */ #include "magnifier.h" const TCHAR szWindowClass[] = TEXT("MAGNIFIER"); @@ -118,18 +119,21 @@ */ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) { + RECT rcWorkArea; hInst = hInstance; // Store instance handle in our global variable - // Create the Window + SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0); + + /* Create the Window */ hMainWnd = CreateWindowEx( - WS_EX_TOPMOST, + WS_EX_TOPMOST | WS_EX_PALETTEWINDOW, szWindowClass, szTitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, + (rcWorkArea.right - rcWorkArea.left) * 2 / 3, + 200, NULL, NULL, hInstance,

1 0

[akhaldi] 57869: [CALC]: Fix Japanese resource. Brought to you by Hirofumi Katayama. CORE-6800 #resolve #comment Committed in r57869. Thanks ; )
by akhaldi＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: akhaldi Date: Tue Dec 11 09:57:31 2012 New Revision: 57869 URL: http://svn.reactos.org/svn/reactos?rev=57869&view=rev Log: [CALC]: Fix Japanese resource. Brought to you by Hirofumi Katayama. CORE-6800 #resolve #comment Committed in r57869. Thanks ;) Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] Tue Dec 11 09:57:31 2012 @@ -341,29 +341,29 @@ IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE BEGIN - POPUP "ç·¨é" - BEGIN - MENUITEM "ã³ãã¼\tCtrl+C", IDM_EDIT_COPY - MENUITEM "è²¼ ãä»ãtCtrl+V", IDM_EDIT_PASTE - END - POPUP "è¡¨ ç¤º" - BEGIN - MENUITEM "æ¨æº", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "å¤æ", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "16é²\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "10é²\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "8é²\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "2é²\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Degrees\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "Radians\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Gradians\tF4", IDM_VIEW_GRAD, CHECKED - MENUITEM SEPARATOR - MENUITEM "æ¡ãåºåã", IDM_VIEW_GROUP, CHECKED - END - POPUP "ãã«ã" + POPUP "ç·¨é(&E)" + BEGIN + MENUITEM "ã³ãã¼(&C)\tCtrl+C", IDM_EDIT_COPY + MENUITEM "è²¼ãä»ã(&P)\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "è¡¨ç¤º(&V)" + BEGIN + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "1&6é²\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "&10é²\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "&8é²\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "&2é²\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "&Degrees\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "&Radians\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "&Gradians\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "æ¡ãåºåã(&I)", IDM_VIEW_GROUP, CHECKED + END + POPUP "ãã«ã(&H)" BEGIN MENUITEM "ãã«ã ãããã¯", IDM_HELP_HELP MENUITEM SEPARATOR @@ -373,30 +373,30 @@ IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE BEGIN - POPUP "ç·¨é" - BEGIN - MENUITEM "ã³ãã¼\tCtrl+C", IDM_EDIT_COPY - MENUITEM "è²¼ ãä»ã\tCtrl+V", IDM_EDIT_PASTE - END - POPUP "è¡¨ ç¤º" - BEGIN - MENUITEM "æ¨æº", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "å¤æ", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "16é²\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "10é²\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "8é²\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "2é²\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED - MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED - MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED - MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED - MENUITEM SEPARATOR - MENUITEM "æ¡ãåºåã", IDM_VIEW_GROUP, CHECKED - END - POPUP "ãã«ã" + POPUP "ç·¨é(&E)" + BEGIN + MENUITEM "ã³ãã¼(&C)\tCtrl+C", IDM_EDIT_COPY + MENUITEM "è²¼ãä»ã(&P)\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "è¡¨ç¤º(&V)" + BEGIN + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "1&6é²\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "&10é²\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "&8é²\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "&2é²\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "&Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "&Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "&Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "&Byte\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "æ¡ãåºåã(&I)", IDM_VIEW_GROUP, CHECKED + END + POPUP "ãã«ã(&H)" BEGIN MENUITEM "ãã«ã ãããã¯", IDM_HELP_HELP MENUITEM SEPARATOR @@ -406,20 +406,20 @@ IDR_MENU_STANDARD MENU DISCARDABLE BEGIN - POPUP "ç·¨é" - BEGIN - MENUITEM "ã³ãã¼\tCtrl+C", IDM_EDIT_COPY - MENUITEM "è²¼ ãä»ã\tCtrl+V", IDM_EDIT_PASTE - END - POPUP "è¡¨ ç¤º" - BEGIN - MENUITEM "æ¨æº", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "å¤æ", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "æ¡ãåºåã", IDM_VIEW_GROUP, CHECKED - END - POPUP "ãã«ã" + POPUP "ç·¨é(&E)" + BEGIN + MENUITEM "ã³ãã¼(&C)\tCtrl+C", IDM_EDIT_COPY + MENUITEM "è²¼ãä»ã(&P)\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "è¡¨ç¤º" + BEGIN + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "æ¡ãåºåã(&I)", IDM_VIEW_GROUP, CHECKED + END + POPUP "ãã«ã(&H)" BEGIN MENUITEM "ãã«ã ãããã¯", IDM_HELP_HELP MENUITEM SEPARATOR @@ -431,7 +431,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STRING_LICENSE "ReactOS é»åã¯GNU GPLã©ã¤ã»ã³ã¹ã®åã§æä¾ãããããªã¼ã½ ããã¦ã§ã¢ã§ãã\r\n\r\nãã¡ãã§GNU GPLã©ã¤ã»ã³ã¹ã®ã³ãã¼ãå¾ããã¨ãã§ãã¾ã:\r\nhttp://www… GPLã©ã¤ã»ã³ã¹ã®ç¿»è¨³ãå¾ããã¨ãã§ãã¾ã:\r\nhttp://www.gn…" + IDS_STRING_LICENSE "ReactOS é»åã¯GNU GPLã©ã¤ã»ã³ã¹ã®åã§æä¾ãããããªã¼ã½ããã¦ã§ã¢ã§ãã\r\n\r\nãã¡ãã§GNU GPLã©ã¤ã»ã³ã¹ã®ã³ãã¼ãå¾ããã¨ãã§ãã¾ã:\r\nhttp://www… GPLã©ã¤ã»ã³ã¹ã®ç¿»è¨³ãå¾ããã¨ãã§ãã¾ã:\r\nhttp://www.gn…" IDS_MATH_ERROR "ã¨ã©ã¼" IDS_QUICKHELP "ã¯ã¤ãã¯ãã«ã" END

1 0

[hbelusca] 57868: [FREELDR] Fix the height of the FreeLdr debugging options dialog.
by hbelusca＠svn.reactos.org 11 Dec '12

11 Dec '12

Author: hbelusca Date: Tue Dec 11 02:34:10 2012 New Revision: 57868 URL: http://svn.reactos.org/svn/reactos?rev=57868&view=rev Log: [FREELDR] Fix the height of the FreeLdr debugging options dialog. Modified: trunk/reactos/boot/freeldr/freeldr/options.c Modified: trunk/reactos/boot/freeldr/freeldr/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/optio… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] Tue Dec 11 02:34:10 2012 @@ -20,7 +20,7 @@ #include <freeldr.h> #include <debug.h> -PCSTR OptionsMenuList[] = +PCSTR OptionsMenuList[] = { "Safe Mode", "Safe Mode with Networking", @@ -45,7 +45,7 @@ #endif }; -PCSTR FrldrDbgMsg = "Enable freeldr debug channels\n" +PCSTR FrldrDbgMsg = "Enable FreeLdr debug channels\n" "Acceptable syntax: [level1]#channel1[,[level2]#channel2]\n" "level can be one of: trace,warn,fixme,err\n" " if the level is ommited all levels\n" @@ -58,7 +58,7 @@ " trace+windows,trace+reactos\n" " +hwdetect,err-disk\n" " +peloader\n" - "NOTE: all letters must be lowercase, no spaces allowed\n"; + "NOTE: all letters must be lowercase, no spaces allowed."; enum OptionMenuItems { @@ -85,7 +85,7 @@ #endif }; -ULONG OptionsMenuItemCount = sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]); +ULONG OptionsMenuItemCount = sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]); BOOLEAN SafeMode = FALSE; BOOLEAN SafeModeWithNetworking = FALSE; @@ -98,8 +98,8 @@ VOID DoOptionsMenu(VOID) { - ULONG SelectedMenuItem; - CHAR DebugChannelString[100]; + ULONG SelectedMenuItem; + CHAR DebugChannelString[100]; if (!UiDisplayMenu("Select an option:", OptionsMenuList, @@ -149,7 +149,7 @@ break; case FREELDR_DEBUGGING: DebugChannelString[0]=0; - if(UiEditBox(FrldrDbgMsg, DebugChannelString, 100)) + if (UiEditBox(FrldrDbgMsg, DebugChannelString, 100)) DbgParseDebugChannels(DebugChannelString); break; //case SEPARATOR2:

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