Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[akhaldi] 57882: [GDIPLUS] * Sync with Wine 1.5.19. [PSDK] * Update some headers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 11 21:40:15 2012 New Revision: 57882 URL: http://svn.reactos.org/svn/reactos?rev=57882&view=rev Log: [GDIPLUS] * Sync with Wine 1.5.19. [PSDK] * Update some headers. Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/matrix.c trunk/reactos/dll/win32/gdiplus/metafile.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/dll/win32/gdiplus/stringformat.c trunk/reactos/include/psdk/gdiplusenums.h trunk/reactos/include/psdk/gdiplusimaging.h trunk/reactos/include/psdk/gdipluspixelformats.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… Modified: trunk/reactos/dll/win32/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/matrix.c… Modified: trunk/reactos/dll/win32/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/metafile… Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… Modified: trunk/reactos/dll/win32/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/stringfo… Modified: trunk/reactos/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusenums.… Modified: trunk/reactos/include/psdk/gdiplusimaging.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusimagin… Modified: trunk/reactos/include/psdk/gdipluspixelformats.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluspixelf…

12 years

[akhaldi] 57881: [WINDOWSCODECS] * Sync with Wine 1.5.19. [PSDK] * Update some headers. * Import wincodecsdk.idl from Wine.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 11 21:17:47 2012 New Revision: 57881 URL: http://svn.reactos.org/svn/reactos?rev=57881&view=rev Log: [WINDOWSCODECS] * Sync with Wine 1.5.19. [PSDK] * Update some headers. * Import wincodecsdk.idl from Wine. Added: trunk/reactos/dll/win32/windowscodecs/bitmap.c (with props) trunk/reactos/dll/win32/windowscodecs/colorcontext.c (with props) trunk/reactos/dll/win32/windowscodecs/icnsformat.c (with props) trunk/reactos/dll/win32/windowscodecs/metadatahandler.c (with props) trunk/reactos/dll/win32/windowscodecs/proxy.c (with props) trunk/reactos/dll/win32/windowscodecs/scaler.c (with props) trunk/reactos/dll/win32/windowscodecs/tgaformat.c (with props) trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.idl (with props) trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.rgs (with props) trunk/reactos/include/psdk/wincodecsdk.idl (with props) Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/bmpdecode.c trunk/reactos/dll/win32/windowscodecs/bmpencode.c trunk/reactos/dll/win32/windowscodecs/clsfactory.c trunk/reactos/dll/win32/windowscodecs/converter.c trunk/reactos/dll/win32/windowscodecs/fliprotate.c trunk/reactos/dll/win32/windowscodecs/gifformat.c trunk/reactos/dll/win32/windowscodecs/icoformat.c trunk/reactos/dll/win32/windowscodecs/imgfactory.c trunk/reactos/dll/win32/windowscodecs/info.c trunk/reactos/dll/win32/windowscodecs/jpegformat.c trunk/reactos/dll/win32/windowscodecs/main.c trunk/reactos/dll/win32/windowscodecs/palette.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/propertybag.c trunk/reactos/dll/win32/windowscodecs/regsvr.c trunk/reactos/dll/win32/windowscodecs/stream.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/typeof.h trunk/reactos/dll/win32/windowscodecs/ungif.c trunk/reactos/dll/win32/windowscodecs/ungif.h trunk/reactos/dll/win32/windowscodecs/version.rc trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h trunk/reactos/dll/win32/windowscodecs/windowscodecs.spec trunk/reactos/include/psdk/CMakeLists.txt trunk/reactos/include/psdk/wincodec.idl trunk/reactos/include/psdk/winternl.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… Added: trunk/reactos/dll/win32/windowscodecs/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bi… Modified: trunk/reactos/dll/win32/windowscodecs/bmpdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… Modified: trunk/reactos/dll/win32/windowscodecs/clsfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/cl… Added: trunk/reactos/dll/win32/windowscodecs/colorcontext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… Modified: trunk/reactos/dll/win32/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… Modified: trunk/reactos/dll/win32/windowscodecs/fliprotate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/fl… Modified: trunk/reactos/dll/win32/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gi… Added: trunk/reactos/dll/win32/windowscodecs/icnsformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ic… Modified: trunk/reactos/dll/win32/windowscodecs/icoformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ic… Modified: trunk/reactos/dll/win32/windowscodecs/imgfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/im… Modified: trunk/reactos/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/in… Modified: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jp… Modified: trunk/reactos/dll/win32/windowscodecs/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ma… Added: trunk/reactos/dll/win32/windowscodecs/metadatahandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/me… Modified: trunk/reactos/dll/win32/windowscodecs/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pa… Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… Modified: trunk/reactos/dll/win32/windowscodecs/propertybag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pr… Added: trunk/reactos/dll/win32/windowscodecs/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pr… Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/re… Added: trunk/reactos/dll/win32/windowscodecs/scaler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/sc… Modified: trunk/reactos/dll/win32/windowscodecs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/st… Added: trunk/reactos/dll/win32/windowscodecs/tgaformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/tg… Modified: trunk/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ti… Modified: trunk/reactos/dll/win32/windowscodecs/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ty… Modified: trunk/reactos/dll/win32/windowscodecs/ungif.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/un… Modified: trunk/reactos/dll/win32/windowscodecs/ungif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/un… Modified: trunk/reactos/dll/win32/windowscodecs/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ve… Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… Modified: trunk/reactos/dll/win32/windowscodecs/windowscodecs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… Added: trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… Added: trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… Modified: trunk/reactos/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincodec.idl?… Added: trunk/reactos/include/psdk/wincodecsdk.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincodecsdk.i… Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

12 years

[akhaldi] 57880: [LOCALUI_WINETEST]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 11 13:42:40 2012 New Revision: 57880 URL: http://svn.reactos.org/svn/reactos?rev=57880&view=rev Log: [LOCALUI_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/localui/localui.c Modified: trunk/rostests/winetests/localui/localui.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/localui/localui… ============================================================================== --- trunk/rostests/winetests/localui/localui.c [iso-8859-1] (original) +++ trunk/rostests/winetests/localui/localui.c [iso-8859-1] Tue Dec 11 13:42:40 2012 @@ -71,9 +71,14 @@ if (!pi_buffer) { res = EnumPortsW(NULL, 2, NULL, 0, &pi_needed, &pi_numports); + if (!res && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { + win_skip("The service 'Spooler' is required for many tests\n"); + return NULL; + } + ok(!res, "EnumPorts succeeded: got %d\n", res); pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); - SetLastError(0xdeadbeef); res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports); + ok(res == 1, "EnumPorts failed: got %d\n", res); } if (pi_buffer) { pi = (PORT_INFO_2W *) pi_buffer; @@ -160,12 +165,12 @@ SetLastError(0xdeadbeef); new_portname = NULL; /* - * - On MSDN, you can read, that no dialogs should be displayed, when hWnd + * - On MSDN, you can read that no dialog should be displayed when hWnd * is NULL, but native localui does not care - * - when the new port already exist, + * - When the new port already exists, * TRUE is returned, but new_portname is NULL - * - when the new port starts with "COM" or "LPT", - * FALSE is returned with ERROR_NOT_SUPPORTED in windows + * - When the new port starts with "COM" or "LPT", + * FALSE is returned with ERROR_NOT_SUPPORTED on windows */ res = pAddPortUI(NULL, NULL, localportW, &new_portname); ok( res || @@ -292,7 +297,13 @@ } } - /* find installed Ports */ + /* find installed ports */ + + /* "FILE:" */ + file_present = find_portinfo2(portname_fileW); + + if (!pi_numports) /* Nothing to test without a port */ + return; id = 0; /* "LPT1:" - "LPT9:" */ @@ -316,9 +327,6 @@ if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); } - /* "FILE:" */ - file_present = find_portinfo2(portname_fileW); - test_AddPortUI(); test_ConfigurePortUI();

12 years

[akhaldi] 57879: [SCHANNEL_WINETEST]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 11 13:41:44 2012 New Revision: 57879 URL: http://svn.reactos.org/svn/reactos?rev=57879&view=rev Log: [SCHANNEL_WINETEST]: Sync with Wine 1.5.19. Modified: trunk/rostests/winetests/schannel/CMakeLists.txt trunk/rostests/winetests/schannel/main.c Modified: trunk/rostests/winetests/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/CMakeL… ============================================================================== --- trunk/rostests/winetests/schannel/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/schannel/CMakeLists.txt [iso-8859-1] Tue Dec 11 13:41:44 2012 @@ -1,8 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) - +add_definitions(-D__ROS_LONG64__) add_executable(schannel_winetest main.c testlist.c) target_link_libraries(schannel_winetest wine) set_module_type(schannel_winetest win32cui) Modified: trunk/rostests/winetests/schannel/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/schannel/main.c… ============================================================================== --- trunk/rostests/winetests/schannel/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/schannel/main.c [iso-8859-1] Tue Dec 11 13:41:44 2012 @@ -44,6 +44,17 @@ #define SECPKG_FUNCTION_TABLE_SIZE_5 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ ValidateTargetInfo) #define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) + +#define LSA_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_EXTENDED_ERROR | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_STREAM | \ + SECPKG_FLAG_MUTUAL_AUTH ) static NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE*, PULONG); @@ -179,8 +190,9 @@ /* First package: Unified */ status = pTables->GetInfo(&PackageInfo); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n", - PackageInfo.fCapabilities); + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || + PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), + "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 || @@ -204,7 +216,7 @@ if (status == STATUS_SUCCESS) { - ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n", + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS, "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID);

12 years

[akhaldi] 57878: [PSDK] * Add some missing definition in sspi.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Dec 11 13:40:57 2012 New Revision: 57878 URL: http://svn.reactos.org/svn/reactos?rev=57878&view=rev Log: [PSDK] * Add some missing definition in sspi.h. Modified: trunk/reactos/include/psdk/sspi.h Modified: trunk/reactos/include/psdk/sspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sspi.h?rev=57… ============================================================================== --- trunk/reactos/include/psdk/sspi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sspi.h [iso-8859-1] Tue Dec 11 13:40:57 2012 @@ -101,25 +101,30 @@ #define PSecPkgInfo WINELIB_NAME_AW(PSecPkgInfo) /* fCapabilities field of SecPkgInfo */ -#define SECPKG_FLAG_INTEGRITY 0x00000001 -#define SECPKG_FLAG_PRIVACY 0x00000002 -#define SECPKG_FLAG_TOKEN_ONLY 0x00000004 -#define SECPKG_FLAG_DATAGRAM 0x00000008 -#define SECPKG_FLAG_CONNECTION 0x00000010 -#define SECPKG_FLAG_MULTI_REQUIRED 0x00000020 -#define SECPKG_FLAG_CLIENT_ONLY 0x00000040 -#define SECPKG_FLAG_EXTENDED_ERROR 0x00000080 -#define SECPKG_FLAG_IMPERSONATION 0x00000100 -#define SECPKG_FLAG_ACCEPT_WIN32_NAME 0x00000200 -#define SECPKG_FLAG_STREAM 0x00000400 -#define SECPKG_FLAG_NEGOTIABLE 0x00000800 -#define SECPKG_FLAG_GSS_COMPATIBLE 0x00001000 -#define SECPKG_FLAG_LOGON 0x00002000 -#define SECPKG_FLAG_ASCII_BUFFERS 0x00004000 -#define SECPKG_FLAG_FRAGMENT 0x00008000 -#define SECPKG_FLAG_MUTUAL_AUTH 0x00010000 -#define SECPKG_FLAG_DELEGATION 0x00020000 -#define SECPKG_FLAG_READONLY_WITH_CHECKSUM 0x00040000 +#define SECPKG_FLAG_INTEGRITY 0x00000001 +#define SECPKG_FLAG_PRIVACY 0x00000002 +#define SECPKG_FLAG_TOKEN_ONLY 0x00000004 +#define SECPKG_FLAG_DATAGRAM 0x00000008 +#define SECPKG_FLAG_CONNECTION 0x00000010 +#define SECPKG_FLAG_MULTI_REQUIRED 0x00000020 +#define SECPKG_FLAG_CLIENT_ONLY 0x00000040 +#define SECPKG_FLAG_EXTENDED_ERROR 0x00000080 +#define SECPKG_FLAG_IMPERSONATION 0x00000100 +#define SECPKG_FLAG_ACCEPT_WIN32_NAME 0x00000200 +#define SECPKG_FLAG_STREAM 0x00000400 +#define SECPKG_FLAG_NEGOTIABLE 0x00000800 +#define SECPKG_FLAG_GSS_COMPATIBLE 0x00001000 +#define SECPKG_FLAG_LOGON 0x00002000 +#define SECPKG_FLAG_ASCII_BUFFERS 0x00004000 +#define SECPKG_FLAG_FRAGMENT 0x00008000 +#define SECPKG_FLAG_MUTUAL_AUTH 0x00010000 +#define SECPKG_FLAG_DELEGATION 0x00020000 +#define SECPKG_FLAG_READONLY_WITH_CHECKSUM 0x00040000 +#define SECPKG_FLAG_RESTRICTED_TOKENS 0x00080000 +#define SECPKG_FLAG_NEGO_EXTENDER 0x00100000 +#define SECPKG_FLAG_NEGOTIABLE2 0x00200000 +#define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 +#define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 typedef struct _SecBuffer {

12 years

[akhaldi] 57877: [README.WINE] * Update the list of synced modules.

by akhaldi＠svn.reactos.org

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

12 years

[akhaldi] 57876: * Addendum to r57875.

by akhaldi＠svn.reactos.org

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})

12 years

[akhaldi] 57875: * Allow warnings for all source files here.

by akhaldi＠svn.reactos.org

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})

12 years

[akhaldi] 57874: [XMLLITE] * Forgot to svn add this.

by akhaldi＠svn.reactos.org

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

12 years

[akhaldi] 57873: [XMLLITE_WINETEST]: Sync with Wine 1.5.19.

by akhaldi＠svn.reactos.org

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);

12 years

← Newer
1
...
17
18
19
20
21
22
23
...
29
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 December 2012