Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70972: [XDK][PSDK][DDK] Improve winnt.h and make it share more definitions with wdm.h.
by akhaldi＠svn.reactos.org 08 Mar '16

08 Mar '16

Author: akhaldi Date: Tue Mar 8 15:35:17 2016 New Revision: 70972 URL: http://svn.reactos.org/svn/reactos?rev=70972&view=rev Log: [XDK][PSDK][DDK] Improve winnt.h and make it share more definitions with wdm.h. Modified: trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/winnt.template.h trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Tue Mar 8 15:35:17 2016 @@ -29,6 +29,54 @@ #define SEMAPHORE_QUERY_STATE (0x0001) #define SEMAPHORE_MODIFY_STATE (0x0002) #define SEMAPHORE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3) + +$endif(_WDMDDK_) +$if(_WDMDDK_ || _WINNT_) + +typedef struct _PROCESSOR_GROUP_INFO { + UCHAR MaximumProcessorCount; + UCHAR ActiveProcessorCount; + UCHAR Reserved[38]; + KAFFINITY ActiveProcessorMask; +} PROCESSOR_GROUP_INFO, *PPROCESSOR_GROUP_INFO; + +typedef enum _PROCESSOR_CACHE_TYPE { + CacheUnified, + CacheInstruction, + CacheData, + CacheTrace +} PROCESSOR_CACHE_TYPE; + +typedef struct _CACHE_DESCRIPTOR { + UCHAR Level; + UCHAR Associativity; + USHORT LineSize; + ULONG Size; + PROCESSOR_CACHE_TYPE Type; +} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; + +typedef struct _NUMA_NODE_RELATIONSHIP { + ULONG NodeNumber; + UCHAR Reserved[20]; + GROUP_AFFINITY GroupMask; +} NUMA_NODE_RELATIONSHIP, *PNUMA_NODE_RELATIONSHIP; + +typedef struct _CACHE_RELATIONSHIP { + UCHAR Level; + UCHAR Associativity; + USHORT LineSize; + ULONG CacheSize; + PROCESSOR_CACHE_TYPE Type; + UCHAR Reserved[20]; + GROUP_AFFINITY GroupMask; +} CACHE_RELATIONSHIP, *PCACHE_RELATIONSHIP; + +typedef struct _GROUP_RELATIONSHIP { + USHORT MaximumGroupCount; + USHORT ActiveGroupCount; + UCHAR Reserved[20]; + PROCESSOR_GROUP_INFO GroupInfo[ANYSIZE_ARRAY]; +} GROUP_RELATIONSHIP, *PGROUP_RELATIONSHIP; typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { RelationProcessorCore, @@ -39,20 +87,12 @@ RelationAll = 0xffff } LOGICAL_PROCESSOR_RELATIONSHIP; -typedef enum _PROCESSOR_CACHE_TYPE { - CacheUnified, - CacheInstruction, - CacheData, - CacheTrace -} PROCESSOR_CACHE_TYPE; - -typedef struct _CACHE_DESCRIPTOR { - UCHAR Level; - UCHAR Associativity; - USHORT LineSize; - ULONG Size; - PROCESSOR_CACHE_TYPE Type; -} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; +typedef struct _PROCESSOR_RELATIONSHIP { + UCHAR Flags; + UCHAR Reserved[21]; + USHORT GroupCount; + _Field_size_(GroupCount) GROUP_AFFINITY GroupMask[ANYSIZE_ARRAY]; +} PROCESSOR_RELATIONSHIP, *PPROCESSOR_RELATIONSHIP; typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION { ULONG_PTR ProcessorMask; @@ -69,43 +109,6 @@ } DUMMYUNIONNAME; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION; -typedef struct _PROCESSOR_RELATIONSHIP { - UCHAR Flags; - UCHAR Reserved[21]; - USHORT GroupCount; - _Field_size_(GroupCount) GROUP_AFFINITY GroupMask[ANYSIZE_ARRAY]; -} PROCESSOR_RELATIONSHIP, *PPROCESSOR_RELATIONSHIP; - -typedef struct _NUMA_NODE_RELATIONSHIP { - ULONG NodeNumber; - UCHAR Reserved[20]; - GROUP_AFFINITY GroupMask; -} NUMA_NODE_RELATIONSHIP, *PNUMA_NODE_RELATIONSHIP; - -typedef struct _CACHE_RELATIONSHIP { - UCHAR Level; - UCHAR Associativity; - USHORT LineSize; - ULONG CacheSize; - PROCESSOR_CACHE_TYPE Type; - UCHAR Reserved[20]; - GROUP_AFFINITY GroupMask; -} CACHE_RELATIONSHIP, *PCACHE_RELATIONSHIP; - -typedef struct _PROCESSOR_GROUP_INFO { - UCHAR MaximumProcessorCount; - UCHAR ActiveProcessorCount; - UCHAR Reserved[38]; - KAFFINITY ActiveProcessorMask; -} PROCESSOR_GROUP_INFO, *PPROCESSOR_GROUP_INFO; - -typedef struct _GROUP_RELATIONSHIP { - USHORT MaximumGroupCount; - USHORT ActiveGroupCount; - UCHAR Reserved[20]; - PROCESSOR_GROUP_INFO GroupInfo[ANYSIZE_ARRAY]; -} GROUP_RELATIONSHIP, *PGROUP_RELATIONSHIP; - typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX { LOGICAL_PROCESSOR_RELATIONSHIP Relationship; ULONG Size; @@ -116,6 +119,9 @@ GROUP_RELATIONSHIP Group; } DUMMYUNIONNAME; } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX; + +$endif(_WDMDDK_ || _WINNT_) +$if(_WDMDDK_) /* Processor features */ #define PF_FLOATING_POINT_PRECISION_ERRATA 0 Modified: trunk/reactos/include/xdk/winnt.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt.template… ============================================================================== --- trunk/reactos/include/xdk/winnt.template.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt.template.h [iso-8859-1] Tue Mar 8 15:35:17 2016 @@ -71,6 +71,7 @@ $define(UCHAR=BYTE) $include(ntbasedef.h) $include(interlocked.h) +$include(ketypes.h) $include(winnt_old.h) #ifdef __cplusplus Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Tue Mar 8 15:35:17 2016 @@ -1100,6 +1100,9 @@ #define IO_REPARSE_TAG_SYMBOLIC_LINK IO_REPARSE_TAG_RESERVED_ZERO #define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003 #define IO_REPARSE_TAG_SYMLINK 0xA000000CL + +#define RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO 0x01000000 + #ifndef RC_INVOKED #ifdef _GUID_DEFINED @@ -3926,46 +3929,7 @@ HeapEnableTerminationOnCorruption } HEAP_INFORMATION_CLASS; -typedef enum _PROCESSOR_CACHE_TYPE { - CacheUnified, - CacheInstruction, - CacheData, - CacheTrace -} PROCESSOR_CACHE_TYPE; - -typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { - RelationProcessorCore, - RelationNumaNode, - RelationCache, - RelationProcessorPackage, - RelationGroup, - RelationAll = 0xffff -} LOGICAL_PROCESSOR_RELATIONSHIP; - #define CACHE_FULLY_ASSOCIATIVE 0xFF - -typedef struct _CACHE_DESCRIPTOR { - BYTE Level; - BYTE Associativity; - WORD LineSize; - DWORD Size; - PROCESSOR_CACHE_TYPE Type; -} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR; - -typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION { - ULONG_PTR ProcessorMask; - LOGICAL_PROCESSOR_RELATIONSHIP Relationship; - _ANONYMOUS_UNION union { - struct { - BYTE Flags; - } ProcessorCore; - struct { - DWORD NodeNumber; - } NumaNode; - CACHE_DESCRIPTOR Cache; - ULONGLONG Reserved[2]; - } DUMMYUNIONNAME; -} SYSTEM_LOGICAL_PROCESSOR_INFORMATION, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION; _Check_return_ NTSYSAPI

1 0

[akhaldi] 70971: [GDI32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 08 Mar '16

08 Mar '16

Author: akhaldi Date: Tue Mar 8 15:01:05 2016 New Revision: 70971 URL: http://svn.reactos.org/svn/reactos?rev=70971&view=rev Log: [GDI32_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/gdi32/dc.c trunk/rostests/winetests/gdi32/dib.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/icm.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/gdi32/path.c Modified: trunk/rostests/winetests/gdi32/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dc.c?rev=… ============================================================================== --- trunk/rostests/winetests/gdi32/dc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/dc.c [iso-8859-1] Tue Mar 8 15:01:05 2016 @@ -424,9 +424,7 @@ else ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); type = GetClipBox( hdc, &rect ); - if (GetObjectType( hdc ) == OBJ_ENHMETADC) - todo_wine ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); - else + todo_wine_if (GetObjectType( hdc ) == OBJ_ENHMETADC) ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); type = GetBoundsRect( hdc, &rect, 0 ); @@ -443,12 +441,7 @@ SetMapMode( hdc, MM_TEXT ); Rectangle( hdc, 2, 2, 4, 4 ); type = GetBoundsRect( hdc, &rect, DCB_RESET ); - if (GetObjectType( hdc ) == OBJ_ENHMETADC || (GetObjectType( hdc ) == OBJ_DC && GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER)) - todo_wine - ok( rect.left == 2 && rect.top == 2 && rect.right == 4 && rect.bottom == 4 && type == DCB_SET, - "GetBoundsRect returned %d,%d,%d,%d type %x for %s\n", - rect.left, rect.top, rect.right, rect.bottom, type, descr ); - else + todo_wine_if (GetObjectType( hdc ) == OBJ_ENHMETADC || (GetObjectType( hdc ) == OBJ_DC && GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER)) ok( rect.left == 2 && rect.top == 2 && rect.right == 4 && rect.bottom == 4 && type == DCB_SET, "GetBoundsRect returned %d,%d,%d,%d type %x for %s\n", rect.left, rect.top, rect.right, rect.bottom, type, descr ); @@ -462,20 +455,12 @@ ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr ); if (GetDeviceCaps( ref_dc, TECHNOLOGY ) == DT_RASDISPLAY) { - if (GetSystemMetrics( SM_CXSCREEN ) != GetSystemMetrics( SM_CXVIRTUALSCREEN )) - todo_wine ok( GetDeviceCaps( ref_dc, DESKTOPHORZRES ) == GetSystemMetrics( SM_CXSCREEN ), - "Got DESKTOPHORZRES %d on %s, expected %d\n", - GetDeviceCaps( ref_dc, DESKTOPHORZRES ), descr, GetSystemMetrics( SM_CXSCREEN ) ); - else + todo_wine_if (GetSystemMetrics( SM_CXSCREEN ) != GetSystemMetrics( SM_CXVIRTUALSCREEN )) ok( GetDeviceCaps( ref_dc, DESKTOPHORZRES ) == GetSystemMetrics( SM_CXSCREEN ), "Got DESKTOPHORZRES %d on %s, expected %d\n", GetDeviceCaps( ref_dc, DESKTOPHORZRES ), descr, GetSystemMetrics( SM_CXSCREEN ) ); - if (GetSystemMetrics( SM_CYSCREEN ) != GetSystemMetrics( SM_CYVIRTUALSCREEN )) - todo_wine ok( GetDeviceCaps( ref_dc, DESKTOPVERTRES ) == GetSystemMetrics( SM_CYSCREEN ), - "Got DESKTOPVERTRES %d on %s, expected %d\n", - GetDeviceCaps( ref_dc, DESKTOPVERTRES ), descr, GetSystemMetrics( SM_CYSCREEN ) ); - else + todo_wine_if (GetSystemMetrics( SM_CYSCREEN ) != GetSystemMetrics( SM_CYVIRTUALSCREEN )) ok( GetDeviceCaps( ref_dc, DESKTOPVERTRES ) == GetSystemMetrics( SM_CYSCREEN ), "Got DESKTOPVERTRES %d on %s, expected %d\n", GetDeviceCaps( ref_dc, DESKTOPVERTRES ), descr, GetSystemMetrics( SM_CYSCREEN ) ); @@ -490,11 +475,8 @@ GetDeviceCaps( ref_dc, DESKTOPVERTRES ) ); } - if (GetDeviceCaps( ref_dc, TECHNOLOGY ) == DT_RASDISPLAY && GetObjectType( hdc ) != OBJ_ENHMETADC && + todo_wine_if (GetDeviceCaps( ref_dc, TECHNOLOGY ) == DT_RASDISPLAY && GetObjectType( hdc ) != OBJ_ENHMETADC && (GetSystemMetrics( SM_XVIRTUALSCREEN ) || GetSystemMetrics( SM_YVIRTUALSCREEN ))) - todo_wine ok( EqualRect( &rect, &ref_rect ), "GetClipBox returned %d,%d,%d,%d on %s\n", - rect.left, rect.top, rect.right, rect.bottom, descr ); - else ok( EqualRect( &rect, &ref_rect ), "GetClipBox returned %d,%d,%d,%d on %s\n", rect.left, rect.top, rect.right, rect.bottom, descr ); } @@ -630,11 +612,13 @@ static void test_DC_bitmap(void) { + PIXELFORMATDESCRIPTOR descr; HDC hdc, hdcmem; DWORD bits[64]; HBITMAP hbmp, oldhbmp; COLORREF col; int i, bitspixel; + int ret, ret2; /* fill bitmap data with b&w pattern */ for( i = 0; i < 64; i++) bits[i] = i & 1 ? 0 : 0xffffff; @@ -645,7 +629,31 @@ /* create a memory dc */ hdcmem = CreateCompatibleDC( hdc); ok( hdcmem != NULL, "CreateCompatibleDC rets %p\n", hdcmem); - /* tests */ + + /* test DescribePixelFormat with descr == NULL */ + ret2 = DescribePixelFormat(hdcmem, 0, sizeof(descr), NULL); + ok(ret2 > 0, "expected ret2 > 0, got %d\n", ret2); + ret = DescribePixelFormat(hdcmem, 1, sizeof(descr), NULL); + ok(ret == ret2, "expected ret == %d, got %d\n", ret2, ret); + ret = DescribePixelFormat(hdcmem, 0x10000, sizeof(descr), NULL); + ok(ret == ret2, "expected ret == %d, got %d\n", ret2, ret); + + /* test DescribePixelFormat with descr != NULL */ + memset(&descr, 0, sizeof(descr)); + ret = DescribePixelFormat(hdcmem, 0, sizeof(descr), &descr); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(descr.nSize == 0, "expected descr.nSize == 0, got %d\n", descr.nSize); + + memset(&descr, 0, sizeof(descr)); + ret = DescribePixelFormat(hdcmem, 1, sizeof(descr), &descr); + ok(ret == ret2, "expected ret == %d, got %d\n", ret2, ret); + ok(descr.nSize == sizeof(descr), "expected desc.nSize == sizeof(descr), got %d\n", descr.nSize); + + memset(&descr, 0, sizeof(descr)); + ret = DescribePixelFormat(hdcmem, 0x10000, sizeof(descr), &descr); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(descr.nSize == 0, "expected descr.nSize == 0, got %d\n", descr.nSize); + /* test monochrome bitmap: should always work */ hbmp = CreateBitmap(32, 32, 1, 1, bits); ok( hbmp != NULL, "CreateBitmap returns %p\n", hbmp); Modified: trunk/rostests/winetests/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dib.c?rev… ============================================================================== --- trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] Tue Mar 8 15:01:05 2016 @@ -1322,10 +1322,7 @@ for(i = 1; i <= num_broken; i++) ok_cond = ok_cond || broken( !strcmp(hash, current_sha1[i]) ); - if(todo) - todo_wine ok( ok_cond, "%s: %s: expected hash %s got %s\n", - dst_format, info, *current_sha1, hash ); - else + todo_wine_if(todo) ok( ok_cond, "%s: %s: expected hash %s got %s\n", dst_format, info, *current_sha1, hash ); Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Tue Mar 8 15:01:05 2016 @@ -926,7 +926,7 @@ trace("ACP %d -> charset %d\n", GetACP(), expected_cs); hdc = CreateCompatibleDC(0); - assert(hdc); + ok(hdc != NULL, "failed to create hdc\n"); trace("logpixelsX %d, logpixelsY %d\n", GetDeviceCaps(hdc, LOGPIXELSX), GetDeviceCaps(hdc, LOGPIXELSY)); @@ -974,9 +974,7 @@ { if (font_res == fd[i].dpi && lf.lfCharSet == expected_cs) { - if (ret) /* FIXME: Remove once Wine is fixed */ - todo_wine ok(!ret, "%s height %d charset %d dpi %d should be enumerated\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); - else + todo_wine_if (ret) /* FIXME: Remove once Wine is fixed */ ok(!ret, "%s height %d charset %d dpi %d should be enumerated\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); } } @@ -1136,26 +1134,26 @@ ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); ok(ret, "%s: GetCharABCWidthsI should have succeeded\n", description); ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); - if (todo) todo_wine ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); - else ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); - if (todo) todo_wine ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); - else ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + todo_wine_if (todo) + ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + todo_wine_if (todo) + ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); ret = pGetCharABCWidthsW(hdc, 'i', 'i', abc); ok(ret, "%s: GetCharABCWidthsW should have succeeded\n", description); ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); - if (todo) todo_wine ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); - else ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); - if (todo) todo_wine ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); - else ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's should be unchanged\n", description); + todo_wine_if (todo) + ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + todo_wine_if (todo) + ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); ok(ret, "%s: GetCharABCWidthsFloatW should have succeeded\n", description); ok (abcf->abcfB > 0.0, "%s: abcfB should be positive\n", description); - if (todo) todo_wine ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's sign should be unchanged\n", description); - else ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's should be unchanged\n", description); - if (todo) todo_wine ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); - else ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); + todo_wine_if (todo) + ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's sign should be unchanged\n", description); + todo_wine_if (todo) + ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); } static void test_GetCharABCWidths(void) @@ -1410,6 +1408,7 @@ static void test_text_extents(void) { static const WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; + static const WCHAR emptyW[] = {0}; LPINT extents; INT i, len, fit1, fit2, extents2[3]; LOGFONTA lf; @@ -1428,8 +1427,19 @@ hdc = GetDC(0); hfont = SelectObject(hdc, hfont); GetTextMetricsA(hdc, &tm); - GetTextExtentPointA(hdc, "o", 1, &sz); + ret = GetTextExtentPointA(hdc, "o", 1, &sz); + ok(ret, "got %d\n", ret); ok(sz.cy == tm.tmHeight, "cy %d tmHeight %d\n", sz.cy, tm.tmHeight); + + memset(&sz, 0xcc, sizeof(sz)); + ret = GetTextExtentPointA(hdc, "o", 0, &sz); + ok(ret, "got %d\n", ret); + ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); + + memset(&sz, 0xcc, sizeof(sz)); + ret = GetTextExtentPointA(hdc, "", 0, &sz); + ok(ret, "got %d\n", ret); + ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); SetLastError(0xdeadbeef); GetTextExtentExPointW(hdc, wt, 1, 1, &fit1, &fit2, &sz1); @@ -1441,6 +1451,16 @@ ReleaseDC(0, hdc); return; } + + memset(&sz, 0xcc, sizeof(sz)); + ret = GetTextExtentPointW(hdc, wt, 0, &sz); + ok(ret, "got %d\n", ret); + ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); + + memset(&sz, 0xcc, sizeof(sz)); + ret = GetTextExtentPointW(hdc, emptyW, 0, &sz); + ok(ret, "got %d\n", ret); + ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); len = lstrlenW(wt); extents = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof extents[0]); @@ -1724,7 +1744,7 @@ strcpy(lf.lfFaceName, kd[i].face_name); lf.lfHeight = kd[i].height; hfont = CreateFontIndirectA(&lf); - assert(hfont != 0); + ok(hfont != NULL, "failed to create a font, name %s\n", kd[i].face_name); hfont_old = SelectObject(hdc, hfont); @@ -1850,7 +1870,7 @@ strcpy(lf.lfFaceName, fd[i].face_name); hfont = CreateFontIndirectA(&lf); - assert(hfont); + ok(hfont != NULL, "failed to create a font, name %s\n", fd[i].face_name); old_hfont = SelectObject(hdc, hfont); ret = GetTextMetricsA(hdc, &tm); @@ -2076,12 +2096,40 @@ {"", 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; HDC hdc = CreateCompatibleDC(0); - assert(hdc); + ok(hdc != NULL, "failed to create hdc\n"); test_height( hdc, tahoma ); test_height_selection_vdmx( hdc ); DeleteDC(hdc); +} + +static UINT get_font_fsselection(LOGFONTA *lf) +{ + OUTLINETEXTMETRICA *otm; + HFONT hfont, hfont_old; + DWORD ret, otm_size; + UINT fsSelection; + HDC hdc; + + hdc = GetDC(0); + hfont = CreateFontIndirectA(lf); + ok(hfont != NULL, "failed to create a font\n"); + + hfont_old = SelectObject(hdc, hfont); + + otm_size = GetOutlineTextMetricsA(hdc, 0, NULL); + otm = HeapAlloc(GetProcessHeap(), 0, otm_size); + otm->otmSize = sizeof(*otm); + ret = GetOutlineTextMetricsA(hdc, otm->otmSize, otm); + ok(ret == otm->otmSize, "expected %u, got %u, error %d\n", otm->otmSize, ret, GetLastError()); + fsSelection = otm->otmfsSelection; + HeapFree(GetProcessHeap(), 0, otm); + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + ReleaseDC(0, hdc); + + return fsSelection; } static void test_GetOutlineTextMetrics(void) @@ -2092,6 +2140,38 @@ HDC hdc; DWORD ret, otm_size; LPSTR unset_ptr; + UINT fsSelection; + + /* check fsSelection field with bold simulation */ + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Wingdings"); + lf.lfCharSet = SYMBOL_CHARSET; + + /* regular face */ + fsSelection = get_font_fsselection(&lf); + ok((fsSelection & (1 << 5)) == 0, "got 0x%x\n", fsSelection); + + /* face with bold simulation */ + lf.lfWeight = FW_BOLD; + fsSelection = get_font_fsselection(&lf); + ok((fsSelection & (1 << 5)) != 0, "got 0x%x\n", fsSelection); + + /* check fsSelection field with oblique simulation */ + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = -13; + lf.lfWeight = FW_NORMAL; + lf.lfPitchAndFamily = DEFAULT_PITCH; + lf.lfQuality = PROOF_QUALITY; + + /* regular face */ + fsSelection = get_font_fsselection(&lf); + ok((fsSelection & 1) == 0, "got 0x%x\n", fsSelection); + + lf.lfItalic = 1; + /* face with oblique simulation */ + fsSelection = get_font_fsselection(&lf); + ok((fsSelection & 1) == 1, "got 0x%x\n", fsSelection); if (!is_font_installed("Arial")) { @@ -2108,7 +2188,7 @@ lf.lfPitchAndFamily = DEFAULT_PITCH; lf.lfQuality = PROOF_QUALITY; hfont = CreateFontIndirectA(&lf); - assert(hfont != 0); + ok(hfont != NULL, "failed to create a font\n"); hfont_old = SelectObject(hdc, hfont); otm_size = GetOutlineTextMetricsA(hdc, 0, NULL); @@ -3782,11 +3862,7 @@ expect_default_A = expect_default_W; /* Wine currently uses SYMBOL_CHARSET to identify whether the ANSI metrics need special handling */ - if(cmap_type != cmap_ms_symbol && tmA.tmCharSet == SYMBOL_CHARSET && expect_first_A != 0x1e) - todo_wine ok(tmA.tmFirstChar == expect_first_A || - tmA.tmFirstChar == expect_first_A + 1 /* win9x */, - "A: tmFirstChar for %s got %02x expected %02x\n", font_name, tmA.tmFirstChar, expect_first_A); - else + todo_wine_if(cmap_type != cmap_ms_symbol && tmA.tmCharSet == SYMBOL_CHARSET && expect_first_A != 0x1e) ok(tmA.tmFirstChar == expect_first_A || tmA.tmFirstChar == expect_first_A + 1 /* win9x */, "A: tmFirstChar for %s got %02x expected %02x\n", font_name, tmA.tmFirstChar, expect_first_A); @@ -3810,18 +3886,12 @@ if (ret) { /* Wine uses the os2 first char */ - if(cmap_first != os2_first_char && cmap_type != cmap_ms_symbol) - todo_wine ok(tmW.tmFirstChar == expect_first_W, "W: tmFirstChar for %s got %02x expected %02x\n", - font_name, tmW.tmFirstChar, expect_first_W); - else + todo_wine_if(cmap_first != os2_first_char && cmap_type != cmap_ms_symbol) ok(tmW.tmFirstChar == expect_first_W, "W: tmFirstChar for %s got %02x expected %02x\n", font_name, tmW.tmFirstChar, expect_first_W); /* Wine uses the os2 last char */ - if(expect_last_W != os2_last_char && cmap_type != cmap_ms_symbol) - todo_wine ok(tmW.tmLastChar == expect_last_W, "W: tmLastChar for %s got %02x expected %02x\n", - font_name, tmW.tmLastChar, expect_last_W); - else + todo_wine_if(expect_last_W != os2_last_char && cmap_type != cmap_ms_symbol) ok(tmW.tmLastChar == expect_last_W, "W: tmLastChar for %s got %02x expected %02x\n", font_name, tmW.tmLastChar, expect_last_W); ok(tmW.tmBreakChar == expect_break_W, "W: tmBreakChar for %s got %02x expected %02x\n", @@ -6054,14 +6124,11 @@ } /* FIXME: Remove once Wine is fixed */ - if (td[i][j].dpi != 96 && + todo_wine_if (td[i][j].dpi != 96 && /* MS Sans Serif for 120 dpi and higher should include 12 pixel bitmap set */ ((!strcmp(td[i][j].face_name, "MS Sans Serif") && td[i][j].height == 12) || /* System for 120 dpi and higher should include 20 pixel bitmap set */ (!strcmp(td[i][j].face_name, "System") && td[i][j].height > 16))) - todo_wine - ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height); - else ok(height == td[i][j].height_pixels, "%d(%d): expected height %d, got %d\n", i, j, td[i][j].height_pixels, height); ok(td[i][j].weight == lf.lfWeight, "%d(%d): expected lfWeight %d, got %d\n", i, j, td[i][j].weight, lf.lfWeight); @@ -6281,13 +6348,18 @@ static void test_fake_bold_font(void) { + static const MAT2 x2_mat = { {0,2}, {0,0}, {0,0}, {0,2} }; HDC hdc; - HFONT hfont, hfont_old; LOGFONTA lf; BOOL ret; - TEXTMETRICA tm[2]; - ABC abc[2]; - INT w[2]; + struct glyph_data { + TEXTMETRICA tm; + ABC abc; + INT w; + GLYPHMETRICS gm; + } data[2]; + int i; + DWORD r; if (!pGetCharWidth32A || !pGetCharABCWidthsA) { win_skip("GetCharWidth32A/GetCharABCWidthA is not available on this platform\n"); @@ -6297,45 +6369,51 @@ /* Test outline font */ memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Wingdings"); - lf.lfWeight = FW_NORMAL; lf.lfCharSet = SYMBOL_CHARSET; - hfont = CreateFontIndirectA(&lf); hdc = GetDC(NULL); - hfont_old = SelectObject(hdc, hfont); - - /* base metrics */ - ret = GetTextMetricsA(hdc, &tm[0]); - ok(ret, "got %d\n", ret); - ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &abc[0]); - ok(ret, "got %d\n", ret); - - lf.lfWeight = FW_BOLD; - hfont = CreateFontIndirectA(&lf); - DeleteObject(SelectObject(hdc, hfont)); - - /* bold metrics */ - ret = GetTextMetricsA(hdc, &tm[1]); - ok(ret, "got %d\n", ret); - ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &abc[1]); - ok(ret, "got %d\n", ret); - - DeleteObject(SelectObject(hdc, hfont_old)); + + for (i = 0; i <= 1; i++) + { + HFONT hfont, hfont_old; + + lf.lfWeight = i ? FW_BOLD : FW_NORMAL; + hfont = CreateFontIndirectA(&lf); + hfont_old = SelectObject(hdc, hfont); + + ret = GetTextMetricsA(hdc, &data[i].tm); + ok(ret, "got %d\n", ret); + ret = pGetCharABCWidthsA(hdc, 0x76, 0x76, &data[i].abc); + ok(ret, "got %d\n", ret); + data[i].w = data[i].abc.abcA + data[i].abc.abcB + data[i].abc.abcC; + r = GetGlyphOutlineA(hdc, 0x76, GGO_METRICS, &data[i].gm, 0, NULL, &x2_mat); + ok(r != GDI_ERROR, "got %d\n", ret); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + } ReleaseDC(NULL, hdc); /* compare results (outline) */ - ok(tm[0].tmHeight == tm[1].tmHeight, "expected %d, got %d\n", tm[0].tmHeight, tm[1].tmHeight); - ok(tm[0].tmAscent == tm[1].tmAscent, "expected %d, got %d\n", tm[0].tmAscent, tm[1].tmAscent); - ok(tm[0].tmDescent == tm[1].tmDescent, "expected %d, got %d\n", tm[0].tmDescent, tm[1].tmDescent); - ok((tm[0].tmAveCharWidth + 1) == tm[1].tmAveCharWidth, - "expected %d, got %d\n", tm[0].tmAveCharWidth + 1, tm[1].tmAveCharWidth); - ok((tm[0].tmMaxCharWidth + 1) == tm[1].tmMaxCharWidth, - "expected %d, got %d\n", tm[0].tmMaxCharWidth + 1, tm[1].tmMaxCharWidth); - ok(tm[0].tmOverhang == tm[1].tmOverhang, "expected %d, got %d\n", tm[0].tmOverhang, tm[1].tmOverhang); - w[0] = abc[0].abcA + abc[0].abcB + abc[0].abcC; - w[1] = abc[1].abcA + abc[1].abcB + abc[1].abcC; - ok((w[0] + 1) == w[1], "expected %d, got %d\n", w[0] + 1, w[1]); - + ok(data[0].tm.tmHeight == data[1].tm.tmHeight, + "expected %d, got %d\n", data[0].tm.tmHeight, data[1].tm.tmHeight); + ok(data[0].tm.tmAscent == data[1].tm.tmAscent, + "expected %d, got %d\n", data[0].tm.tmAscent, data[1].tm.tmAscent); + ok(data[0].tm.tmDescent == data[1].tm.tmDescent, + "expected %d, got %d\n", data[0].tm.tmDescent, data[1].tm.tmDescent); + ok(data[0].tm.tmAveCharWidth + 1 == data[1].tm.tmAveCharWidth, + "expected %d, got %d\n", data[0].tm.tmAveCharWidth + 1, data[1].tm.tmAveCharWidth); + ok(data[0].tm.tmMaxCharWidth + 1 == data[1].tm.tmMaxCharWidth, + "expected %d, got %d\n", data[0].tm.tmMaxCharWidth + 1, data[1].tm.tmMaxCharWidth); + ok(data[0].tm.tmOverhang == data[1].tm.tmOverhang, + "expected %d, got %d\n", data[0].tm.tmOverhang, data[1].tm.tmOverhang); + ok(data[0].w + 1 == data[1].w, + "expected %d, got %d\n", data[0].w + 1, data[1].w); + + ok(data[0].gm.gmCellIncX + 1 == data[1].gm.gmCellIncX, + "expected %d, got %d\n", data[0].gm.gmCellIncX + 1, data[1].gm.gmCellIncX); + ok(data[0].gm.gmCellIncY == data[1].gm.gmCellIncY, + "expected %d, got %d\n", data[0].gm.gmCellIncY, data[1].gm.gmCellIncY); } static void test_bitmap_font_glyph_index(void) Modified: trunk/rostests/winetests/gdi32/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/icm.c?rev… ============================================================================== --- trunk/rostests/winetests/gdi32/icm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/icm.c [iso-8859-1] Tue Mar 8 15:01:05 2016 @@ -50,6 +50,12 @@ size = MAX_PATH; ret = GetICMProfileA( dc, &size, NULL ); ok( !ret, "GetICMProfileA succeeded\n" ); + ok( size > 0, "got %u\n", size ); + + size = 0; + ret = GetICMProfileA( dc, &size, NULL ); + ok( !ret, "GetICMProfileA succeeded\n" ); + ok( size > 0, "got %u\n", size ); size = MAX_PATH; ret = GetICMProfileA( NULL, &size, filename ); @@ -107,6 +113,11 @@ size = MAX_PATH; ret = GetICMProfileW( NULL, &size, filename ); ok( !ret, "GetICMProfileW succeeded\n" ); + + size = 0; + ret = GetICMProfileW( dc, &size, NULL ); + ok( !ret, "GetICMProfileW succeeded\n" ); + ok( size > 0, "got %u\n", size ); size = 0; SetLastError(0xdeadbeef); Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Tue Mar 8 15:01:05 2016 @@ -1101,6 +1101,44 @@ 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_TEXTOUT_OUTLINE_ON_PATH_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xdd, 0xff, 0xff, 0xff, 0xdd, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x0c, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x90, 0x06, 0x00, 0x00, 0x1a, 0x04, 0x00, 0x00, + 0x51, 0x02, 0x00, 0x00, 0x72, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x1a, 0x0b, 0x09, 0x00, + 0xf0, 0xa6, 0x05, 0x00, 0x25, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x80, + 0x3b, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x54, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x01, 0x00, 0x00, 0x00, 0xc3, 0x30, 0x0d, 0x42, + 0xcf, 0xf3, 0x0c, 0x42, 0x0b, 0x00, 0x00, 0x00, + 0x16, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x54, 0x00, 0x00, 0x00, 0x54, 0x00, 0x65, 0x00, + 0x73, 0x00, 0x74, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x80, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + static const unsigned char MF_LINETO_BITS[] = { 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, @@ -2224,6 +2262,8 @@ HDC hdcDisplay, hdcMetafile; HENHMETAFILE hMetafile; BOOL ret; + LOGFONTA lf; + HFONT hFont; static const INT dx[4] = { 3, 5, 8, 12 }; /* Win9x doesn't play EMFs on invisible windows */ @@ -2234,6 +2274,19 @@ hdcDisplay = GetDC(hwnd); ok(hdcDisplay != 0, "GetDC error %d\n", GetLastError()); + /* with default font */ + ret = BeginPath(hdcDisplay); + ok(ret, "BeginPath error %d\n", GetLastError()); + + ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); + ok(ret, "ExtTextOut error %d\n", GetLastError()); + + ret = EndPath(hdcDisplay); + ok(ret, "EndPath error %d\n", GetLastError()); + + ret = GetPath(hdcDisplay, NULL, NULL, 0); + ok(!ret, "expected 0, got %d\n", ret); + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); @@ -2245,6 +2298,9 @@ ret = EndPath(hdcMetafile); ok(ret, "EndPath error %d\n", GetLastError()); + + ret = GetPath(hdcMetafile, NULL, NULL, 0); + ok(!ret, "expected 0, got %d\n", ret); hMetafile = CloseEnhMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); @@ -2261,6 +2317,66 @@ ret = DeleteEnhMetaFile(hMetafile); ok(ret, "DeleteEnhMetaFile error %d\n", GetLastError()); + + /* with outline font */ + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = ANSI_CHARSET; + lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf.lfWeight = FW_DONTCARE; + lf.lfHeight = 7; + lf.lfQuality = DEFAULT_QUALITY; + lstrcpyA(lf.lfFaceName, "Tahoma"); + hFont = CreateFontIndirectA(&lf); + ok(hFont != 0, "CreateFontIndirectA error %d\n", GetLastError()); + hFont = SelectObject(hdcDisplay, hFont); + + ret = BeginPath(hdcDisplay); + ok(ret, "BeginPath error %d\n", GetLastError()); + + ret = ExtTextOutA(hdcDisplay, 11, 22, 0, NULL, "Test", 4, dx); + ok(ret, "ExtTextOut error %d\n", GetLastError()); + + ret = EndPath(hdcDisplay); + ok(ret, "EndPath error %d\n", GetLastError()); + + ret = GetPath(hdcDisplay, NULL, NULL, 0); + ok(ret != 0, "expected != 0\n"); + + SelectObject(hdcDisplay, hFont); + + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + hFont = SelectObject(hdcMetafile, hFont); + + ret = BeginPath(hdcMetafile); + ok(ret, "BeginPath error %d\n", GetLastError()); + + ret = ExtTextOutA(hdcMetafile, 11, 22, 0, NULL, "Test", 4, dx); + ok(ret, "ExtTextOut error %d\n", GetLastError()); + + ret = EndPath(hdcMetafile); + ok(ret, "EndPath error %d\n", GetLastError()); + + ret = GetPath(hdcMetafile, NULL, NULL, 0); + ok(!ret, "expected 0, got %d\n", ret); + + hFont = SelectObject(hdcMetafile, hFont); + DeleteObject(hFont); + + hMetafile = CloseEnhMetaFile(hdcMetafile); + ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if (compare_emf_bits(hMetafile, EMF_TEXTOUT_OUTLINE_ON_PATH_BITS, sizeof(EMF_TEXTOUT_OUTLINE_ON_PATH_BITS), + "emf_TextOut_on_path", FALSE) != 0) + { + dump_emf_bits(hMetafile, "emf_TextOut_outline_on_path"); + dump_emf_records(hMetafile, "emf_TextOut_outline_on_path"); + } + + ret = DeleteEnhMetaFile(hMetafile); + ok(ret, "DeleteEnhMetaFile error %d\n", GetLastError()); + ret = ReleaseDC(hwnd, hdcDisplay); ok(ret, "ReleaseDC error %d\n", GetLastError()); DestroyWindow(hwnd); @@ -3361,6 +3477,41 @@ DeleteEnhMetaFile(hemf); } +static const unsigned char EMF_PATH_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe6, 0xff, 0xff, 0xff, 0xe6, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xf8, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xd3, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0xd3, 0xf3, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, + 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, + 0x96, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, + 0x96, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, + 0x32, 0x00, 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, + 0x32, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x13, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + static void test_emf_GetPath(void) { HDC hdcMetafile; @@ -3383,13 +3534,20 @@ ok( ret, "LineTo error %d.\n", GetLastError()); ret = LineTo(hdcMetafile, 50, 50); ok( ret, "LineTo error %d.\n", GetLastError()); + Rectangle(hdcMetafile, 10, 10, 20, 20); EndPath(hdcMetafile); size = GetPath(hdcMetafile, NULL, NULL, 0); - todo_wine ok( size == 5, "GetPath returned %d.\n", size); + ok( size == 9, "GetPath returned %d.\n", size); hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if (compare_emf_bits(hemf, EMF_PATH_BITS, sizeof(EMF_PATH_BITS), "test_emf_GetPath", FALSE) != 0) + { + dump_emf_bits(hemf, "test_emf_GetPath"); + dump_emf_records(hemf, "test_emf_GetPath"); + } DeleteEnhMetaFile(hemf); } Modified: trunk/rostests/winetests/gdi32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/path.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/path.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/path.c [iso-8859-1] Tue Mar 8 15:01:05 2016 @@ -390,9 +390,7 @@ size = GetPath(hdc, pnt, types, size); assert(size > 0); - if (todo_size) todo_wine - ok(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); - else + todo_wine_if (todo_size) ok(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); if (winetest_debug > 2) @@ -407,11 +405,7 @@ (pnt[idx].x >= expected[eidx].x-2 && pnt[idx].x <= expected[eidx].x+2) && (pnt[idx].y >= expected[eidx].y-2 && pnt[idx].y <= expected[eidx].y+2); - if (expected[eidx].todo || numskip) todo_wine - ok(match, "Expected #%d: %s (%d,%d) but got %s (%d,%d)\n", eidx, - type_string[expected[eidx].type], expected[eidx].x, expected[eidx].y, - type_string[types[idx]], pnt[idx].x, pnt[idx].y); - else + todo_wine_if (expected[eidx].todo || numskip) ok(match, "Expected #%d: %s (%d,%d) but got %s (%d,%d)\n", eidx, type_string[expected[eidx].type], expected[eidx].x, expected[eidx].y, type_string[types[idx]], pnt[idx].x, pnt[idx].y);

1 0

[akhaldi] 70970: [PSDK] Update shobjidl.idl. CORE-10912
by akhaldi＠svn.reactos.org 08 Mar '16

08 Mar '16

Author: akhaldi Date: Tue Mar 8 14:55:33 2016 New Revision: 70970 URL: http://svn.reactos.org/svn/reactos?rev=70970&view=rev Log: [PSDK] Update shobjidl.idl. CORE-10912 Modified: trunk/reactos/include/psdk/shobjidl.idl Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Tue Mar 8 14:55:33 2016 @@ -4066,6 +4066,35 @@ [out, iid_is(riid)] void **presources); } + +typedef [v1_enum] enum ACTIVATEOPTIONS +{ + AO_NONE = 0x00000000, + AO_DESIGNMODE = 0x00000001, + AO_NOERRORUI = 0x00000002, + AO_NOSPLASHSCREEN = 0x00000004 +} ACTIVATEOPTIONS; + +[ + uuid(2e941141-7f97-4756-ba1d-9decde894a3d), + object, + pointer_default(unique) +] +interface IApplicationActivationManager : IUnknown +{ + HRESULT ActivateApplication([in] LPCWSTR appusermodelid, + [in, unique] LPCWSTR arguments, + [in] ACTIVATEOPTIONS options, + [out] DWORD *processid); + HRESULT ActivateForFile([in] LPCWSTR appusermodelid, + [in] IShellItemArray *itemarray, + [in, unique] LPCWSTR verb, + [out] DWORD *processid); + HRESULT ActivateForProtocol([in] LPCWSTR appusermodelid, + [in] IShellItemArray *itemarray, + [out] DWORD *processid); +} + /***************************************************************************** * ShellObjects typelibrary */ @@ -4160,6 +4189,14 @@ ] coclass ShellItem { interface IShellItem2; + } + + [ + uuid(45ba127d-10a8-46ea-8ab7-56ea9078943c) + ] + coclass ApplicationActivationManager + { + interface IApplicationActivationManager; } }

1 0

[akhaldi] 70969: [BCRYPT] Implement mbedTLS backend. Brought to you by Peter Hater. CORE-10934
by akhaldi＠svn.reactos.org 08 Mar '16

08 Mar '16

Author: akhaldi Date: Tue Mar 8 14:49:52 2016 New Revision: 70969 URL: http://svn.reactos.org/svn/reactos?rev=70969&view=rev Log: [BCRYPT] Implement mbedTLS backend. Brought to you by Peter Hater. CORE-10934 Modified: trunk/reactos/dll/3rdparty/mbedtls/mbedtls.spec trunk/reactos/dll/win32/bcrypt/CMakeLists.txt trunk/reactos/dll/win32/bcrypt/bcrypt_main.c trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/dll/3rdparty/mbedtls/mbedtls.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mbedtls/mbedt… ============================================================================== --- trunk/reactos/dll/3rdparty/mbedtls/mbedtls.spec [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mbedtls/mbedtls.spec [iso-8859-1] Tue Mar 8 14:49:52 2016 @@ -29,4 +29,19 @@ @ cdecl mbedtls_cipher_info_from_type(long) @ cdecl mbedtls_md_info_from_type(long) @ cdecl mbedtls_pk_get_bitlen(ptr) -@ cdecl mbedtls_ctr_drbg_seed(ptr ptr ptr str long) +@ cdecl mbedtls_ctr_drbg_seed(ptr ptr ptr str long) +@ cdecl mbedtls_sha1_init(ptr) +@ cdecl mbedtls_sha1_starts(ptr) +@ cdecl mbedtls_sha1_update(ptr ptr long) +@ cdecl mbedtls_sha1_finish(ptr ptr) +@ cdecl mbedtls_sha1_free(ptr) +@ cdecl mbedtls_sha256_init(ptr) +@ cdecl mbedtls_sha256_starts(ptr long) +@ cdecl mbedtls_sha256_update(ptr ptr long) +@ cdecl mbedtls_sha256_finish(ptr ptr) +@ cdecl mbedtls_sha256_free(ptr) +@ cdecl mbedtls_sha512_init(ptr) +@ cdecl mbedtls_sha512_starts(ptr long) +@ cdecl mbedtls_sha512_update(ptr ptr long) +@ cdecl mbedtls_sha512_finish(ptr ptr) +@ cdecl mbedtls_sha512_free(ptr) Modified: trunk/reactos/dll/win32/bcrypt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/CMakeLists.txt [iso-8859-1] Tue Mar 8 14:49:52 2016 @@ -1,6 +1,8 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/include/reactos/libs/mbedtls) spec2def(bcrypt.dll bcrypt.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -12,5 +14,5 @@ add_library(bcrypt SHARED ${SOURCE}) set_module_type(bcrypt win32dll) target_link_libraries(bcrypt wine) -add_importlibs(bcrypt advapi32 msvcrt kernel32 ntdll) +add_importlibs(bcrypt mbedtls advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET bcrypt DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/bcrypt/bcrypt_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/bcrypt_ma… ============================================================================== --- trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/bcrypt/bcrypt_main.c [iso-8859-1] Tue Mar 8 14:49:52 2016 @@ -18,6 +18,7 @@ */ #include <wine/config.h> +#include <wine/port.h> #include <ntstatus.h> #define WIN32_NO_STATUS @@ -28,6 +29,13 @@ #include <wine/debug.h> #include <wine/unicode.h> +#include <wine/library.h> + +#ifdef SONAME_LIBMBEDTLS +#include <mbedtls/sha1.h> +#include <mbedtls/sha256.h> +#include <mbedtls/sha512.h> +#endif WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); @@ -106,7 +114,91 @@ wine_dlclose( libgnutls_handle, NULL, 0 ); libgnutls_handle = NULL; } -#endif /* HAVE_GNUTLS_HASH && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ +#elif defined(SONAME_LIBMBEDTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) && !defined(__REACTOS__) +WINE_DECLARE_DEBUG_CHANNEL(winediag); + +void *libmbedtls_handle; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(mbedtls_sha1_init); +MAKE_FUNCPTR(mbedtls_sha1_starts); +MAKE_FUNCPTR(mbedtls_sha1_update); +MAKE_FUNCPTR(mbedtls_sha1_finish); +MAKE_FUNCPTR(mbedtls_sha1_free); +MAKE_FUNCPTR(mbedtls_sha256_init); +MAKE_FUNCPTR(mbedtls_sha256_starts); +MAKE_FUNCPTR(mbedtls_sha256_update); +MAKE_FUNCPTR(mbedtls_sha256_finish); +MAKE_FUNCPTR(mbedtls_sha256_free); +MAKE_FUNCPTR(mbedtls_sha512_init); +MAKE_FUNCPTR(mbedtls_sha512_starts); +MAKE_FUNCPTR(mbedtls_sha512_update); +MAKE_FUNCPTR(mbedtls_sha512_finish); +MAKE_FUNCPTR(mbedtls_sha512_free); +#undef MAKE_FUNCPTR + +#define mbedtls_sha1_init pmbedtls_sha1_init +#define mbedtls_sha1_starts pmbedtls_sha1_starts +#define mbedtls_sha1_update pmbedtls_sha1_update +#define mbedtls_sha1_finish pmbedtls_sha1_finish +#define mbedtls_sha1_free pmbedtls_sha1_free +#define mbedtls_sha256_init pmbedtls_sha256_init +#define mbedtls_sha256_starts pmbedtls_sha256_starts +#define mbedtls_sha256_update pmbedtls_sha256_update +#define mbedtls_sha256_finish pmbedtls_sha256_finish +#define mbedtls_sha256_free pmbedtls_sha256_free +#define mbedtls_sha512_init pmbedtls_sha512_init +#define mbedtls_sha512_starts pmbedtls_sha512_starts +#define mbedtls_sha512_update pmbedtls_sha512_update +#define mbedtls_sha512_finish pmbedtls_sha512_finish +#define mbedtls_sha512_free pmbedtls_sha512_free + +static BOOL mbedtls_initialize(void) +{ + if (!(libmbedtls_handle = wine_dlopen( SONAME_LIBMBEDTLS, RTLD_NOW, NULL, 0 ))) + { + ERR_(winediag)( "failed to load libmbedtls, no support for crypto hashes\n" ); + return FALSE; + } + +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym( libmbedtls_handle, #f, NULL, 0 ))) \ + { \ + ERR( "failed to load %s\n", #f ); \ + goto fail; \ + } + + LOAD_FUNCPTR(mbedtls_sha1_init) + LOAD_FUNCPTR(mbedtls_sha1_starts) + LOAD_FUNCPTR(mbedtls_sha1_update) + LOAD_FUNCPTR(mbedtls_sha1_finish) + LOAD_FUNCPTR(mbedtls_sha1_free); + LOAD_FUNCPTR(mbedtls_sha256_init) + LOAD_FUNCPTR(mbedtls_sha256_starts) + LOAD_FUNCPTR(mbedtls_sha256_update) + LOAD_FUNCPTR(mbedtls_sha256_finish) + LOAD_FUNCPTR(mbedtls_sha256_free); + LOAD_FUNCPTR(mbedtls_sha512_init) + LOAD_FUNCPTR(mbedtls_sha512_starts) + LOAD_FUNCPTR(mbedtls_sha512_update) + LOAD_FUNCPTR(mbedtls_sha512_finish) + LOAD_FUNCPTR(mbedtls_sha512_free); +#undef LOAD_FUNCPTR + + return TRUE; + +fail: + wine_dlclose( libmbedtls_handle, NULL, 0 ); + libmbedtls_handle = NULL; + return FALSE; +} + +static void mbedtls_uninitialize(void) +{ + wine_dlclose( libmbedtls_handle, NULL, 0 ); + libmbedtls_handle = NULL; +} +#endif /* SONAME_LIBMBEDTLS && !HAVE_COMMONCRYPTO_COMMONDIGEST_H && !__REACTOS__ */ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) @@ -390,6 +482,108 @@ pgnutls_hash_deinit( hash->handle, output ); return STATUS_SUCCESS; } +#elif defined(SONAME_LIBMBEDTLS) +struct hash +{ + struct object hdr; + enum alg_id alg_id; + union + { + mbedtls_sha1_context sha1_ctx; + mbedtls_sha256_context sha256_ctx; + mbedtls_sha512_context sha512_ctx; + } u; +}; + +static NTSTATUS hash_init( struct hash *hash ) +{ +#ifndef __REACTOS__ + if (!libmbedtls_handle) return STATUS_INTERNAL_ERROR; +#endif + switch (hash->alg_id) + { + case ALG_ID_SHA1: + mbedtls_sha1_init(&hash->u.sha1_ctx); + mbedtls_sha1_starts(&hash->u.sha1_ctx); + break; + + case ALG_ID_SHA256: + mbedtls_sha256_init(&hash->u.sha256_ctx); + mbedtls_sha256_starts(&hash->u.sha256_ctx, FALSE); + break; + + case ALG_ID_SHA384: + case ALG_ID_SHA512: + mbedtls_sha512_init(&hash->u.sha512_ctx); + mbedtls_sha512_starts(&hash->u.sha512_ctx, hash->alg_id==ALG_ID_SHA384); + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) +{ +#ifndef __REACTOS__ + if (!libmbedtls_handle) return STATUS_INTERNAL_ERROR; +#endif + switch (hash->alg_id) + { + case ALG_ID_SHA1: + mbedtls_sha1_update(&hash->u.sha1_ctx, input, size); + break; + + case ALG_ID_SHA256: + mbedtls_sha256_update(&hash->u.sha256_ctx, input, size); + break; + + case ALG_ID_SHA384: + case ALG_ID_SHA512: + mbedtls_sha512_update(&hash->u.sha512_ctx, input, size); + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) +{ +#ifndef __REACTOS__ + if (!libmbedtls_handle) return STATUS_INTERNAL_ERROR; +#endif + switch (hash->alg_id) + { + case ALG_ID_SHA1: + mbedtls_sha1_finish(&hash->u.sha1_ctx, output); + mbedtls_sha1_free(&hash->u.sha1_ctx); + break; + + case ALG_ID_SHA256: + mbedtls_sha256_finish(&hash->u.sha256_ctx, output); + mbedtls_sha256_free(&hash->u.sha256_ctx); + break; + + case ALG_ID_SHA384: + case ALG_ID_SHA512: + mbedtls_sha512_finish(&hash->u.sha512_ctx, output); + mbedtls_sha512_free(&hash->u.sha512_ctx); + break; + + default: + ERR( "unhandled id %u\n", hash->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + + return STATUS_SUCCESS; +} #else struct hash { @@ -621,6 +815,8 @@ DisableThreadLibraryCalls( hinst ); #if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) gnutls_initialize(); +#elif defined(SONAME_LIBMBEDTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) && !defined(__REACTOS__) + mbedtls_initialize(); #endif break; @@ -628,6 +824,8 @@ if (reserved) break; #if defined(HAVE_GNUTLS_HASH) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) gnutls_uninitialize(); +#elif defined(SONAME_LIBMBEDTLS) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) && !defined(__REACTOS__) + mbedtls_uninitialize(); #endif break; } Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Tue Mar 8 14:49:52 2016 @@ -1242,7 +1242,7 @@ #define SONAME_LIBJPEG "libjpeg" /* Define to the soname of the libmbedtls library. */ -#define SONAME_LIBMBEDTLS L"mbedtls" +#define SONAME_LIBMBEDTLS "mbedtls" /* Define to the soname of the libncurses library. */ /* #undef SONAME_LIBNCURSES */

1 0

[akhaldi] 70968: [PSDK] Update xmldomdid.h. CORE-10912
by akhaldi＠svn.reactos.org 07 Mar '16

07 Mar '16

Author: akhaldi Date: Mon Mar 7 16:32:35 2016 New Revision: 70968 URL: http://svn.reactos.org/svn/reactos?rev=70968&view=rev Log: [PSDK] Update xmldomdid.h. CORE-10912 Modified: trunk/reactos/include/psdk/xmldomdid.h Modified: trunk/reactos/include/psdk/xmldomdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/xmldomdid.h?r… ============================================================================== --- trunk/reactos/include/psdk/xmldomdid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/xmldomdid.h [iso-8859-1] Mon Mar 7 16:32:35 2016 @@ -19,173 +19,174 @@ #ifndef __XMLDOMDID_H__ #define __XMLDOMDID_H__ -#define DISPID_DOM_BASE 1 -#define DISPID_DOM_COLLECTION_BASE 1000000 -#define DISPID_DOM_COLLECTION_MAX 2999999 - -#define DISPID_DOM_NODE 1 -#define DISPID_DOM_NODE_NODENAME 2 -#define DISPID_DOM_NODE_NODEVALUE 3 -#define DISPID_DOM_NODE_NODETYPE 4 -#define DISPID_DOM_NODE_NODETYPEENUM 5 -#define DISPID_DOM_NODE_PARENTNODE 6 -#define DISPID_DOM_NODE_CHILDNODES 7 -#define DISPID_DOM_NODE_FIRSTCHILD 8 -#define DISPID_DOM_NODE_LASTCHILD 9 -#define DISPID_DOM_NODE_PREVIOUSSIBLING 10 -#define DISPID_DOM_NODE_NEXTSIBLING 11 -#define DISPID_DOM_NODE_ATTRIBUTES 12 -#define DISPID_DOM_NODE_INSERTBEFORE 13 -#define DISPID_DOM_NODE_REPLACECHILD 14 -#define DISPID_DOM_NODE_REMOVECHILD 15 -#define DISPID_DOM_NODE_APPENDCHILD 16 -#define DISPID_DOM_NODE_HASCHILDNODES 17 -#define DISPID_DOM_NODE_OWNERDOC 18 -#define DISPID_DOM_NODE_CLONENODE 19 - -#define DISPID_XMLDOM_NODE 20 -#define DISPID_XMLDOM_NODE_STRINGTYPE 21 -#define DISPID_XMLDOM_NODE_SPECIFIED 22 -#define DISPID_XMLDOM_NODE_DEFINITION 23 -#define DISPID_XMLDOM_NODE_TEXT 24 -#define DISPID_XMLDOM_NODE_NODETYPEDVALUE 25 -#define DISPID_XMLDOM_NODE_DATATYPE 26 -#define DISPID_XMLDOM_NODE_XML 27 -#define DISPID_XMLDOM_NODE_TRANSFORMNODE 28 -#define DISPID_XMLDOM_NODE_SELECTNODES 29 -#define DISPID_XMLDOM_NODE_SELECTSINGLENODE 30 -#define DISPID_XMLDOM_NODE_PARSED 31 -#define DISPID_XMLDOM_NODE_NAMESPACE 32 -#define DISPID_XMLDOM_NODE_PREFIX 33 -#define DISPID_XMLDOM_NODE_BASENAME 34 -#define DISPID_XMLDOM_NODE_TRANSFORMNODETOOBJECT 35 -#define DISPID_XMLDOM_NODE__TOP 36 - -#define DISPID_DOM_DOCUMENT 37 -#define DISPID_DOM_DOCUMENT_DOCTYPE 38 -#define DISPID_DOM_DOCUMENT_IMPLEMENTATION 39 -#define DISPID_DOM_DOCUMENT_DOCUMENTELEMENT 40 -#define DISPID_DOM_DOCUMENT_CREATEELEMENT 41 -#define DISPID_DOM_DOCUMENT_CREATEDOCUMENTFRAGMENT 42 -#define DISPID_DOM_DOCUMENT_CREATETEXTNODE 43 -#define DISPID_DOM_DOCUMENT_CREATECOMMENT 44 -#define DISPID_DOM_DOCUMENT_CREATECDATASECTION 45 -#define DISPID_DOM_DOCUMENT_CREATEPROCESSINGINSTRUCTION 46 -#define DISPID_DOM_DOCUMENT_CREATEATTRIBUTE 47 -#define DISPID_DOM_DOCUMENT_CREATEENTITY 48 -#define DISPID_DOM_DOCUMENT_CREATEENTITYREFERENCE 49 -#define DISPID_DOM_DOCUMENT_GETELEMENTSBYTAGNAME 50 -#define DISPID_DOM_DOCUMENT_TOP 51 - -#define DISPID_XMLDOM_DOCUMENT 52 -#define DISPID_XMLDOM_DOCUMENT_DOCUMENTNODE 53 -#define DISPID_XMLDOM_DOCUMENT_CREATENODE 54 -#define DISPID_XMLDOM_DOCUMENT_CREATENODEEX 55 -#define DISPID_XMLDOM_DOCUMENT_NODEFROMID 56 -#define DISPID_XMLDOM_DOCUMENT_DOCUMENTNAMESPACES 57 -#define DISPID_XMLDOM_DOCUMENT_LOAD 58 -#define DISPID_XMLDOM_DOCUMENT_PARSEERROR 59 -#define DISPID_XMLDOM_DOCUMENT_URL 60 -#define DISPID_XMLDOM_DOCUMENT_ASYNC 61 -#define DISPID_XMLDOM_DOCUMENT_ABORT 62 -#define DISPID_XMLDOM_DOCUMENT_LOADXML 63 -#define DISPID_XMLDOM_DOCUMENT_SAVE 64 -#define DISPID_XMLDOM_DOCUMENT_VALIDATE 65 -#define DISPID_XMLDOM_DOCUMENT_RESOLVENAMESPACE 66 -#define DISPID_XMLDOM_DOCUMENT_PRESERVEWHITESPACE 67 -#define DISPID_XMLDOM_DOCUMENT_ONREADYSTATECHANGE 68 -#define DISPID_XMLDOM_DOCUMENT_ONDATAAVAILABLE 69 -#define DISPID_XMLDOM_DOCUMENT_ONTRANSFORMNODE 70 -#define DISPID_XMLDOM_DOCUMENT__TOP 71 - -#define DISPID_DOM_NODELIST 72 -#define DISPID_DOM_NODELIST_ITEM 73 -#define DISPID_DOM_NODELIST_LENGTH 74 - -#define DISPID_XMLDOM_NODELIST 75 -#define DISPID_XMLDOM_NODELIST_NEXTNODE 76 -#define DISPID_XMLDOM_NODELIST_RESET 77 -#define DISPID_XMLDOM_NODELIST_NEWENUM 78 -#define DISPID_XMLDOM_NODELIST__TOP 79 - -#define DISPID_DOM_NAMEDNODEMAP 80 -#define DISPID_DOM_NAMEDNODEMAP_GETNAMEDITEM 81 -#define DISPID_DOM_NAMEDNODEMAP_SETNAMEDITEM 82 -#define DISPID_DOM_NAMEDNODEMAP_REMOVENAMEDITEM 83 - -#define DISPID_XMLDOM_NAMEDNODEMAP 84 -#define DISPID_XMLDOM_NAMEDNODEMAP_GETQUALIFIEDITEM 85 -#define DISPID_XMLDOM_NAMEDNODEMAP_REMOVEQUALIFIEDITEM 86 -#define DISPID_XMLDOM_NAMEDNODEMAP_NEXTNODE 87 -#define DISPID_XMLDOM_NAMEDNODEMAP_RESET 88 -#define DISPID_XMLDOM_NAMEDNODEMAP_NEWENUM 89 -#define DISPID_XMLDOM_NAMEDNODEMAP__TOP 90 - -#define DISPID_DOM_W3CWRAPPERS 91 - -#define DISPID_DOM_DOCUMENTFRAGMENT 92 -#define DISPID_DOM_DOCUMENTFRAGMENT__TOP 93 - -#define DISPID_DOM_ELEMENT 94 -#define DISPID_DOM_ELEMENT_GETTAGNAME 95 -#define DISPID_DOM_ELEMENT_GETATTRIBUTES 96 -#define DISPID_DOM_ELEMENT_GETATTRIBUTE 97 -#define DISPID_DOM_ELEMENT_SETATTRIBUTE 98 -#define DISPID_DOM_ELEMENT_REMOVEATTRIBUTE 99 -#define DISPID_DOM_ELEMENT_GETATTRIBUTENODE 100 -#define DISPID_DOM_ELEMENT_SETATTRIBUTENODE 101 -#define DISPID_DOM_ELEMENT_REMOVEATTRIBUTENODE 102 -#define DISPID_DOM_ELEMENT_GETELEMENTSBYTAGNAME 103 -#define DISPID_DOM_ELEMENT_NORMALIZE 104 -#define DISPID_DOM_ELEMENT__TOP 105 - -#define DISPID_DOM_DATA 106 -#define DISPID_DOM_DATA_DATA 107 -#define DISPID_DOM_DATA_LENGTH 108 -#define DISPID_DOM_DATA_SUBSTRING 109 -#define DISPID_DOM_DATA_APPEND 110 -#define DISPID_DOM_DATA_INSERT 111 -#define DISPID_DOM_DATA_DELETE 112 -#define DISPID_DOM_DATA_REPLACE 113 -#define DISPID_DOM_DATA__TOP 114 - -#define DISPID_DOM_ATTRIBUTE 115 -#define DISPID_DOM_ATTRIBUTE_GETNAME 116 -#define DISPID_DOM_ATTRIBUTE_SPECIFIED 117 -#define DISPID_DOM_ATTRIBUTE_VALUE 118 -#define DISPID_DOM_ATTRIBUTE__TOP 119 - -#define DISPID_DOM_TEXT 120 -#define DISPID_DOM_TEXT_SPLITTEXT 121 -#define DISPID_DOM_TEXT_JOINTEXT 122 -#define DISPID_DOM_TEXT__TOP 123 - -#define DISPID_DOM_PI 124 -#define DISPID_DOM_PI_TARGET 125 -#define DISPID_DOM_PI_DATA 126 -#define DISPID_DOM_PI__TOP 127 - -#define DISPID_DOM_DOCUMENTTYPE 128 -#define DISPID_DOM_DOCUMENTTYPE_NAME 129 -#define DISPID_DOM_DOCUMENTTYPE_ENTITIES 130 -#define DISPID_DOM_DOCUMENTTYPE_NOTATIONS 131 -#define DISPID_DOM_DOCUMENTTYPE__TOP 132 - -#define DISPID_DOM_NOTATION 133 -#define DISPID_DOM_NOTATION_PUBLICID 134 -#define DISPID_DOM_NOTATION_SYSTEMID 135 -#define DISPID_DOM_NOTATION__TOP 136 - -#define DISPID_DOM_ENTITY 137 -#define DISPID_DOM_ENTITY_PUBLICID 138 -#define DISPID_DOM_ENTITY_SYSTEMID 139 -#define DISPID_DOM_ENTITY_NOTATIONNAME 140 -#define DISPID_DOM_ENTITY__TOP 141 - -#define DISPID_DOM_IMPLEMENTATION 142 -#define DISPID_DOM_IMPLEMENTATION_HASFEATURE 143 -#define DISPID_DOM_IMPLEMENTATION__TOP 144 - +#define DISPID_DOM_BASE 0x00000001 +#define DISPID_DOM_COLLECTION_BASE 0x000f4240 +#define DISPID_DOM_COLLECTION_MAX 0x002dc6bf + +#define DISPID_DOM_NODE 0x00000001 +#define DISPID_DOM_NODE_NODENAME 0x00000002 +#define DISPID_DOM_NODE_NODEVALUE 0x00000003 +#define DISPID_DOM_NODE_NODETYPE 0x00000004 +#define DISPID_DOM_NODE_NODETYPEENUM 0x00000005 +#define DISPID_DOM_NODE_PARENTNODE 0x00000006 +#define DISPID_DOM_NODE_CHILDNODES 0x00000007 +#define DISPID_DOM_NODE_FIRSTCHILD 0x00000008 +#define DISPID_DOM_NODE_LASTCHILD 0x00000009 +#define DISPID_DOM_NODE_PREVIOUSSIBLING 0x0000000a +#define DISPID_DOM_NODE_NEXTSIBLING 0x0000000b +#define DISPID_DOM_NODE_ATTRIBUTES 0x0000000c +#define DISPID_DOM_NODE_INSERTBEFORE 0x0000000d +#define DISPID_DOM_NODE_REPLACECHILD 0x0000000e +#define DISPID_DOM_NODE_REMOVECHILD 0x0000000f +#define DISPID_DOM_NODE_APPENDCHILD 0x00000010 +#define DISPID_DOM_NODE_HASCHILDNODES 0x00000011 +#define DISPID_DOM_NODE_OWNERDOC 0x00000012 +#define DISPID_DOM_NODE_CLONENODE 0x00000013 + +#define DISPID_XMLDOM_NODE 0x00000014 +#define DISPID_XMLDOM_NODE_STRINGTYPE 0x00000015 +#define DISPID_XMLDOM_NODE_SPECIFIED 0x00000016 +#define DISPID_XMLDOM_NODE_DEFINITION 0x00000017 +#define DISPID_XMLDOM_NODE_TEXT 0x00000018 +#define DISPID_XMLDOM_NODE_NODETYPEDVALUE 0x00000019 +#define DISPID_XMLDOM_NODE_DATATYPE 0x0000001a +#define DISPID_XMLDOM_NODE_XML 0x0000001b +#define DISPID_XMLDOM_NODE_TRANSFORMNODE 0x0000001c +#define DISPID_XMLDOM_NODE_SELECTNODES 0x0000001d +#define DISPID_XMLDOM_NODE_SELECTSINGLENODE 0x0000001e +#define DISPID_XMLDOM_NODE_PARSED 0x0000001f +#define DISPID_XMLDOM_NODE_NAMESPACE 0x00000020 +#define DISPID_XMLDOM_NODE_PREFIX 0x00000021 +#define DISPID_XMLDOM_NODE_BASENAME 0x00000022 +#define DISPID_XMLDOM_NODE_TRANSFORMNODETOOBJECT 0x00000023 +#define DISPID_XMLDOM_NODE__TOP 0x00000024 + +#define DISPID_DOM_DOCUMENT 0x00000025 +#define DISPID_DOM_DOCUMENT_DOCTYPE 0x00000026 +#define DISPID_DOM_DOCUMENT_IMPLEMENTATION 0x00000027 +#define DISPID_DOM_DOCUMENT_DOCUMENTELEMENT 0x00000028 +#define DISPID_DOM_DOCUMENT_CREATEELEMENT 0x00000029 +#define DISPID_DOM_DOCUMENT_CREATEDOCUMENTFRAGMENT 0x0000002a +#define DISPID_DOM_DOCUMENT_CREATETEXTNODE 0x0000002b +#define DISPID_DOM_DOCUMENT_CREATECOMMENT 0x0000002c +#define DISPID_DOM_DOCUMENT_CREATECDATASECTION 0x0000002d +#define DISPID_DOM_DOCUMENT_CREATEPROCESSINGINSTRUCTION 0x0000002e +#define DISPID_DOM_DOCUMENT_CREATEATTRIBUTE 0x0000002f +#define DISPID_DOM_DOCUMENT_CREATEENTITY 0x00000030 +#define DISPID_DOM_DOCUMENT_CREATEENTITYREFERENCE 0x00000031 +#define DISPID_DOM_DOCUMENT_GETELEMENTSBYTAGNAME 0x00000032 +#define DISPID_DOM_DOCUMENT_TOP 0x00000033 + +#define DISPID_XMLDOM_DOCUMENT 0x00000034 +#define DISPID_XMLDOM_DOCUMENT_DOCUMENTNODE 0x00000035 +#define DISPID_XMLDOM_DOCUMENT_CREATENODE 0x00000036 +#define DISPID_XMLDOM_DOCUMENT_CREATENODEEX 0x00000037 +#define DISPID_XMLDOM_DOCUMENT_NODEFROMID 0x00000038 +#define DISPID_XMLDOM_DOCUMENT_DOCUMENTNAMESPACES 0x00000039 +#define DISPID_XMLDOM_DOCUMENT_LOAD 0x0000003a +#define DISPID_XMLDOM_DOCUMENT_PARSEERROR 0x0000003b +#define DISPID_XMLDOM_DOCUMENT_URL 0x0000003c +#define DISPID_XMLDOM_DOCUMENT_ASYNC 0x0000003d +#define DISPID_XMLDOM_DOCUMENT_ABORT 0x0000003e +#define DISPID_XMLDOM_DOCUMENT_LOADXML 0x0000003f +#define DISPID_XMLDOM_DOCUMENT_SAVE 0x00000040 +#define DISPID_XMLDOM_DOCUMENT_VALIDATE 0x00000041 +#define DISPID_XMLDOM_DOCUMENT_RESOLVENAMESPACE 0x00000042 +#define DISPID_XMLDOM_DOCUMENT_PRESERVEWHITESPACE 0x00000043 +#define DISPID_XMLDOM_DOCUMENT_ONREADYSTATECHANGE 0x00000044 +#define DISPID_XMLDOM_DOCUMENT_ONDATAAVAILABLE 0x00000045 +#define DISPID_XMLDOM_DOCUMENT_ONTRANSFORMNODE 0x00000046 +#define DISPID_XMLDOM_DOCUMENT__TOP 0x00000047 + +#define DISPID_DOM_NODELIST 0x00000048 +#define DISPID_DOM_NODELIST_ITEM 0x00000049 +#define DISPID_DOM_NODELIST_LENGTH 0x0000004a +#define DISPID_XMLDOM_NODELIST 0x0000004b +#define DISPID_XMLDOM_NODELIST_NEXTNODE 0x0000004c +#define DISPID_XMLDOM_NODELIST_RESET 0x0000004d +#define DISPID_XMLDOM_NODELIST_NEWENUM 0x0000004e +#define DISPID_XMLDOM_NODELIST__TOP 0x0000004f + +#define DISPID_DOM_NAMEDNODEMAP 0x00000050 +#define DISPID_DOM_NAMEDNODEMAP_GETNAMEDITEM 0x00000053 +#define DISPID_DOM_NAMEDNODEMAP_SETNAMEDITEM 0x00000054 +#define DISPID_DOM_NAMEDNODEMAP_REMOVENAMEDITEM 0x00000055 +#define DISPID_XMLDOM_NAMEDNODEMAP 0x00000056 +#define DISPID_XMLDOM_NAMEDNODEMAP_GETQUALIFIEDITEM 0x00000057 +#define DISPID_XMLDOM_NAMEDNODEMAP_REMOVEQUALIFIEDITEM 0x00000058 +#define DISPID_XMLDOM_NAMEDNODEMAP_NEXTNODE 0x00000059 +#define DISPID_XMLDOM_NAMEDNODEMAP_RESET 0x0000005a +#define DISPID_XMLDOM_NAMEDNODEMAP_NEWENUM 0x0000005b +#define DISPID_XMLDOM_NAMEDNODEMAP__TOP 0x0000005c + +#define DISPID_DOM_W3CWRAPPERS 0x0000005d + +#define DISPID_DOM_DOCUMENTFRAGMENT 0x0000005e +#define DISPID_DOM_DOCUMENTFRAGMENT__TOP 0x0000005f + +#define DISPID_DOM_ELEMENT 0x00000060 +#define DISPID_DOM_ELEMENT_GETTAGNAME 0x00000061 +#define DISPID_DOM_ELEMENT_GETATTRIBUTES 0x00000062 +#define DISPID_DOM_ELEMENT_GETATTRIBUTE 0x00000063 +#define DISPID_DOM_ELEMENT_SETATTRIBUTE 0x00000064 +#define DISPID_DOM_ELEMENT_REMOVEATTRIBUTE 0x00000065 +#define DISPID_DOM_ELEMENT_GETATTRIBUTENODE 0x00000066 +#define DISPID_DOM_ELEMENT_SETATTRIBUTENODE 0x00000067 +#define DISPID_DOM_ELEMENT_REMOVEATTRIBUTENODE 0x00000068 +#define DISPID_DOM_ELEMENT_GETELEMENTSBYTAGNAME 0x00000069 +#define DISPID_DOM_ELEMENT_NORMALIZE 0x0000006a +#define DISPID_DOM_ELEMENT__TOP 0x0000006b + +#define DISPID_DOM_DATA 0x0000006c +#define DISPID_DOM_DATA_DATA 0x0000006d +#define DISPID_DOM_DATA_LENGTH 0x0000006e +#define DISPID_DOM_DATA_SUBSTRING 0x0000006f +#define DISPID_DOM_DATA_APPEND 0x00000070 +#define DISPID_DOM_DATA_INSERT 0x00000071 +#define DISPID_DOM_DATA_DELETE 0x00000072 +#define DISPID_DOM_DATA_REPLACE 0x00000073 +#define DISPID_DOM_DATA__TOP 0x00000074 + +#define DISPID_DOM_ATTRIBUTE 0x00000075 +#define DISPID_DOM_ATTRIBUTE_GETNAME 0x00000076 +#define DISPID_DOM_ATTRIBUTE_SPECIFIED 0x00000077 +#define DISPID_DOM_ATTRIBUTE_VALUE 0x00000078 +#define DISPID_DOM_ATTRIBUTE__TOP 0x00000079 + +#define DISPID_DOM_TEXT 0x0000007a +#define DISPID_DOM_TEXT_SPLITTEXT 0x0000007b +#define DISPID_DOM_TEXT_JOINTEXT 0x0000007c +#define DISPID_DOM_TEXT__TOP 0x0000007d + +#define DISPID_DOM_PI 0x0000007e +#define DISPID_DOM_PI_TARGET 0x0000007f +#define DISPID_DOM_PI_DATA 0x00000080 +#define DISPID_DOM_PI__TOP 0x00000081 + +#define DISPID_DOM_DOCUMENTTYPE 0x00000082 +#define DISPID_DOM_DOCUMENTTYPE_NAME 0x00000083 +#define DISPID_DOM_DOCUMENTTYPE_ENTITIES 0x00000084 +#define DISPID_DOM_DOCUMENTTYPE_NOTATIONS 0x00000085 +#define DISPID_DOM_DOCUMENTTYPE__TOP 0x00000086 + +#define DISPID_DOM_NOTATION 0x00000087 +#define DISPID_DOM_NOTATION_PUBLICID 0x00000088 +#define DISPID_DOM_NOTATION_SYSTEMID 0x00000089 +#define DISPID_DOM_NOTATION__TOP 0x0000008a + +#define DISPID_DOM_ENTITY 0x0000008b +#define DISPID_DOM_ENTITY_PUBLICID 0x0000008c +#define DISPID_DOM_ENTITY_SYSTEMID 0x0000008d +#define DISPID_DOM_ENTITY_NOTATIONNAME 0x0000008e +#define DISPID_DOM_ENTITY__TOP 0x0000008f + +#define DISPID_DOM_W3CWRAPPERS_TOP 0x0000008f + +#define DISPID_DOM_IMPLEMENTATION 0x00000090 +#define DISPID_DOM_IMPLEMENTATION_HASFEATURE 0x00000091 +#define DISPID_DOM_IMPLEMENTATION__TOP 0x00000092 + +#define DISPID_DOM__TOP 0x000000af #define DISPID_DOM_ERROR 0x000000b0 #define DISPID_DOM_ERROR_ERRORCODE 0x000000b1 @@ -197,9 +198,21 @@ #define DISPID_DOM_ERROR_FILEPOS 0x000000b7 #define DISPID_DOM_ERROR__TOP 0x000000b8 -#define DISPID_XMLDOMEVENT 197 +#define DISPID_XTLRUNTIME 0x000000b9 +#define DISPID_XTLRUNTIME_UNIQUEID 0x000000ba +#define DISPID_XTLRUNTIME_DEPTH 0x000000bb +#define DISPID_XTLRUNTIME_CHILDNUMBER 0x000000bc +#define DISPID_XTLRUNTIME_ANCESTORCHILDNUMBER 0x000000bd +#define DISPID_XTLRUNTIME_ABSOLUTECHILDNUMBER 0x000000be +#define DISPID_XTLRUNTIME_FORMATINDEX 0x000000bf +#define DISPID_XTLRUNTIME_FORMATNUMBER 0x000000c0 +#define DISPID_XTLRUNTIME_FORMATDATE 0x000000c1 +#define DISPID_XTLRUNTIME_FORMATTIME 0x000000c2 +#define DISPID_XTLRUNTIME__TOP 0x000000c3 + +#define DISPID_XMLDOMEVENT 0x000000c4 #define DISPID_XMLDOMEVENT_ONREADYSTATECHANGE DISPID_READYSTATECHANGE -#define DISPID_XMLDOMEVENT_ONDATAAVAILABLE 198 -#define DISPID_XMLDOMEVENT__TOP 199 +#define DISPID_XMLDOMEVENT_ONDATAAVAILABLE 0x000000c5 +#define DISPID_XMLDOMEVENT__TOP 0x000000c6 #endif /* __XMLDOMDID_H__ */

1 0

[akhaldi] 70967: [PSDK] Add some missing MUI_* definitions.
by akhaldi＠svn.reactos.org 06 Mar '16

06 Mar '16

Author: akhaldi Date: Sun Mar 6 21:32:01 2016 New Revision: 70967 URL: http://svn.reactos.org/svn/reactos?rev=70967&view=rev Log: [PSDK] Add some missing MUI_* definitions. Modified: trunk/reactos/include/psdk/winnls.h Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Sun Mar 6 21:32:01 2016 @@ -491,6 +491,13 @@ typedef long LONG_PTR; #endif +#if (WINVER >= 0x0600) +#define MUI_FULL_LANGUAGE 0x01 +#define MUI_LANGUAGE_ID 0x04 +#define MUI_LANGUAGE_NAME 0x08 +#define MUI_MACHINE_LANGUAGE_SETTINGS 0x400 +#endif /* (WINVER >= 0x0600) */ + #ifndef RC_INVOKED typedef DWORD LCTYPE; typedef DWORD CALTYPE;

1 0

[hbelusca] 70966: [README]: Update the ReadME for CLT2016.
by hbelusca＠svn.reactos.org 06 Mar '16

06 Mar '16

Author: hbelusca Date: Sun Mar 6 20:21:25 2016 New Revision: 70966 URL: http://svn.reactos.org/svn/reactos?rev=70966&view=rev Log: [README]: Update the ReadME for CLT2016. Modified: branches/ReactOS-0.4.0-CLT2016/reactos/boot/bootdata/readme.txt Modified: branches/ReactOS-0.4.0-CLT2016/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… ============================================================================== --- branches/ReactOS-0.4.0-CLT2016/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-CLT2016/reactos/boot/bootdata/readme.txt [iso-8859-1] Sun Mar 6 20:21:25 2016 @@ -1,5 +1,32 @@ +================================================================================ +ReactOS Version 0.4.0 +für die Chemnitzer Linux-Tage 2016 +================================================================================ + +Willkommen zu ReactOS! + +CD-INHALT: + + * ReactOS Live-System/Installation + * ReactOS in einer virtuellen QEMU-Maschine + * ReactOS Build Environment (RosBE) + * Quellcode + +Diese CD sollte unter Windows ein AutoRun-Programm starten. Alternativ +können Sie sich den CD-Inhalt über einen Dateibrowser anschauen. +Die Ordnernamen sollten selbsterklärend sein. + +Der gesamte Quellcode des Betriebssystems lässt sich unter Einsatz des +ReactOS Build Environments sowohl unter Windows als auch unter +Unix-ähnlichen Betriebssystemen wie Linux kompilieren. + +Weitere Informationen über ReactOS finden Sie unter www.reactos.org! + +================================================================================ + + ======================== -ReactOS Version 0.4.x +ReactOS Version 0.4.0 Updated January 5, 2016 ======================== @@ -47,9 +74,3 @@ The tutorials contain more information on the project, compiling and testing ReactOS - amongst other topics. Contributors to the project are always welcome. - - -6. Author ---------- - -This document was written by Jason Filby (jasonfilby(a)yahoo.com).

1 0

[hbelusca] 70965: [WELCOME] - Adaptations for CLT-2016. [BOOTDATA] - Flatten out the ISO layout for hybridcd. - Add user-friendly boot menu. [VERSION] - Adjust version to 0.4.0 CLT-2016.
by hbelusca＠svn.reactos.org 06 Mar '16

06 Mar '16

Author: hbelusca Date: Sun Mar 6 20:12:04 2016 New Revision: 70965 URL: http://svn.reactos.org/svn/reactos?rev=70965&view=rev Log: [WELCOME] - Adaptations for CLT-2016. [BOOTDATA] - Flatten out the ISO layout for hybridcd. - Add user-friendly boot menu. [VERSION] - Adjust version to 0.4.0 CLT-2016. Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/bg-BG.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/cs-CZ.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/da-DK.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/el-GR.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/es-ES.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/et-EE.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/fr-FR.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/he-IL.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/hu-HU.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/id-ID.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/it-IT.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/ja-JP.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/lt-LT.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/ms-MY.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/nl-NL.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/no-NO.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/pl-PL.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/pt-BR.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/ro-RO.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/ru-RU.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/sk-SK.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/sq-AL.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/sv-SE.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/th-TH.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/tr-TR.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/uk-UA.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/zh-CN.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/zh-TW.rc Modified: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/de-DE.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/en-US.rc branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/welcome.rc branches/ReactOS-0.4.0-CLT2016/reactos/boot/CMakeLists.txt branches/ReactOS-0.4.0-CLT2016/reactos/boot/bootdata/autorun.inf branches/ReactOS-0.4.0-CLT2016/reactos/boot/bootdata/hybridcd.ini branches/ReactOS-0.4.0-CLT2016/reactos/cmake/CMakeMacros.cmake branches/ReactOS-0.4.0-CLT2016/reactos/include/reactos/version.cmake [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Modified: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Modified: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/ms-MY.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Removed: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Modified: branches/ReactOS-0.4.0-CLT2016/reactos/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Modified: branches/ReactOS-0.4.0-CLT2016/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Modified: branches/ReactOS-0.4.0-CLT2016/reactos/boot/bootdata/autorun.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Modified: branches/ReactOS-0.4.0-CLT2016/reactos/boot/bootdata/hybridcd.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/b… Modified: branches/ReactOS-0.4.0-CLT2016/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/c… Modified: branches/ReactOS-0.4.0-CLT2016/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/reactos/i…

1 0

[hbelusca] 70964: [CLT2016] Branch ReactOS 0.4.0 from the release tag, for CLT2016.
by hbelusca＠svn.reactos.org 06 Mar '16

06 Mar '16

Author: hbelusca Date: Sun Mar 6 19:56:27 2016 New Revision: 70964 URL: http://svn.reactos.org/svn/reactos?rev=70964&view=rev Log: [CLT2016] Branch ReactOS 0.4.0 from the release tag, for CLT2016. Added: branches/ReactOS-0.4.0-CLT2016/ (props changed) - copied from r70963, tags/ReactOS-0.4.0/ Propchange: branches/ReactOS-0.4.0-CLT2016/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Mar 6 19:56:27 2016 @@ -0,0 +1 @@ +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651,70655

1 0

[akhaldi] 70963: [DNSAPI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 06 Mar '16

06 Mar '16

Author: akhaldi Date: Sun Mar 6 16:50:59 2016 New Revision: 70963 URL: http://svn.reactos.org/svn/reactos?rev=70963&view=rev Log: [DNSAPI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/dnsapi/name.c trunk/rostests/winetests/dnsapi/record.c Modified: trunk/rostests/winetests/dnsapi/name.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/name.c?r… ============================================================================== --- trunk/rostests/winetests/dnsapi/name.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dnsapi/name.c [iso-8859-1] Sun Mar 6 16:50:59 2016 @@ -26,6 +26,8 @@ //#include "winbase.h" //#include "winnls.h" #include <windns.h> + +BOOL WINAPI DnsFlushResolverCacheEntry_A(PCSTR); static const struct { @@ -154,22 +156,22 @@ static void test_DnsNameCompare_A( void ) { - static CHAR empty[] = "", - dot[] = ".", - dotdot[] = "..", - A[] = "A", - a[] = "a", - B[] = "B", - b[] = "b", - A_dot_B[] = "A.B", - a_dot_a[] = "a.a", - a_dot_b[] = "a.b", - a_dot_b_dot[] = "a.b.", - a_dot_b_dotdot[] = "a.b..", - B_dot_A[] = "B.A", - b_dot_a[] = "b.a", - b_dot_a_dot[] = "b.a.", - b_dot_a_dotdot[] = "b.a.."; + static const CHAR empty[] = "", + dot[] = ".", + dotdot[] = "..", + A[] = "A", + a[] = "a", + B[] = "B", + b[] = "b", + A_dot_B[] = "A.B", + a_dot_a[] = "a.a", + a_dot_b[] = "a.b", + a_dot_b_dot[] = "a.b.", + a_dot_b_dotdot[] = "a.b..", + B_dot_A[] = "B.A", + b_dot_a[] = "b.a", + b_dot_a_dot[] = "b.a.", + b_dot_a_dotdot[] = "b.a.."; ok( DnsNameCompare_A( NULL, NULL ) == TRUE, "failed unexpectedly\n" ); @@ -202,8 +204,27 @@ ok( DnsNameCompare_A( a_dot_b, b_dot_a_dot ) == FALSE, "succeeded unexpectedly\n" ); } +static void test_DnsFlushResolverCacheEntry_A(void) +{ + BOOL ret; + DWORD err; + + SetLastError( 0xdeadbeef ); + ret = DnsFlushResolverCacheEntry_A( NULL ); + err = GetLastError(); + ok( !ret, "got %d\n", ret ); + ok( err == 0xdeadbeef, "got %u\n", err ); + + ret = DnsFlushResolverCacheEntry_A( "localhost" ); + ok( ret, "got %d\n", ret ); + + ret = DnsFlushResolverCacheEntry_A( "nxdomain.test.winehq.org" ); + ok( ret, "got %d\n", ret ); +} + START_TEST(name) { test_DnsValidateName_A(); test_DnsNameCompare_A(); -} + test_DnsFlushResolverCacheEntry_A(); +} Modified: trunk/rostests/winetests/dnsapi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dnsapi/record.c… ============================================================================== --- trunk/rostests/winetests/dnsapi/record.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dnsapi/record.c [iso-8859-1] Sun Mar 6 16:50:59 2016 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define UNICODE + #include <wine/test.h> //#include <stdarg.h> @@ -28,12 +30,12 @@ //#include "winnls.h" #include <windns.h> -static char name1[] = "localhost"; -static char name2[] = "LOCALHOST"; +static WCHAR name1[] = {'l','o','c','a','l','h','o','s','t',0}; +static WCHAR name2[] = {'L','O','C','A','L','H','O','S','T',0}; -static DNS_RECORDA r1 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; -static DNS_RECORDA r2 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; -static DNS_RECORDA r3 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; +static DNS_RECORDW r1 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; +static DNS_RECORDW r2 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; +static DNS_RECORDW r3 = { NULL, name1, DNS_TYPE_A, sizeof(DNS_A_DATA), { 0 }, 1200, 0, { { 0xffffffff } } }; static void test_DnsRecordCompare( void ) { @@ -43,10 +45,10 @@ ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r2.Flags.S.CharSet = DnsCharSetUnicode; - ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r2.Flags.S.CharSet = DnsCharSetAnsi; - ok( DnsRecordCompare( &r1, &r2 ) == FALSE, "succeeded unexpectedly\n" ); + ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); r1.Flags.S.CharSet = DnsCharSetAnsi; ok( DnsRecordCompare( &r1, &r2 ) == TRUE, "failed unexpectedly\n" ); @@ -60,8 +62,8 @@ static void test_DnsRecordSetCompare( void ) { - DNS_RECORD *diff1; - DNS_RECORD *diff2; + DNS_RECORDW *diff1; + DNS_RECORDW *diff2; DNS_RRSET rr1, rr2; r1.Flags.DW = 0x2019; @@ -120,7 +122,7 @@ static void test_DnsRecordSetDetach( void ) { DNS_RRSET rr; - DNS_RECORDA *r, *s; + DNS_RECORDW *r, *s; DNS_RRSET_INIT( rr ); DNS_RRSET_ADD( rr, &r1 );

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