- Wine-Devel - list.winehq.org

[PATCH v3 4/4] gdiplus: Add DrawDriverString serialization.
by Shawn M. Chapla July 17, 2020

July 17, 2020

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- v3: - Remove unnecessary else in draw_driver_string. dlls/gdiplus/gdiplus_private.h | 3 + dlls/gdiplus/graphics.c | 4 + dlls/gdiplus/metafile.c | 182 +++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 14 +-- 4 files changed, 185 insertions(+), 18 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2ceaeade01..1b2de4e8f4 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -104,6 +104,9 @@ extern GpStatus METAFILE_DrawImagePointsRect(GpMetafile* metafile, GpImage *imag extern GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_DrawDriverString(GpMetafile *metafile, GDIPCONST UINT16 *text, INT length, + GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush, + GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix) DECLSPEC_HIDDEN; extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6c50d2d56c..5194719fd6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7427,6 +7427,10 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, if (length == -1) length = lstrlenW(text); + if (graphics->image && graphics->image->type == ImageTypeMetafile) + return METAFILE_DrawDriverString((GpMetafile*)graphics->image, text, length, font, + format, brush, positions, flags, matrix); + if (graphics->hdc && !graphics->alpha_hdc && brush->bt == BrushTypeSolidColor && (((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d25278d115..cedffb23ca 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -378,6 +378,17 @@ typedef struct EmfPlusImageAttributes DWORD Reserved2; } EmfPlusImageAttributes; +typedef struct EmfPlusFont +{ + DWORD Version; + float EmSize; + DWORD SizeUnit; + DWORD FontStyleFlags; + DWORD Reserved; + DWORD Length; + WCHAR FamilyName[1]; +} EmfPlusFont; + typedef struct EmfPlusObject { EmfPlusRecordHeader Header; @@ -389,6 +400,7 @@ typedef struct EmfPlusObject EmfPlusRegion region; EmfPlusImage image; EmfPlusImageAttributes image_attributes; + EmfPlusFont font; } ObjectData; } EmfPlusObject; @@ -537,17 +549,6 @@ typedef struct EmfPlusFillPie } RectData; } EmfPlusFillPie; -typedef struct EmfPlusFont -{ - DWORD Version; - float EmSize; - DWORD SizeUnit; - DWORD FontStyleFlags; - DWORD Reserved; - DWORD Length; - WCHAR FamilyName[1]; -} EmfPlusFont; - typedef struct EmfPlusDrawDriverString { EmfPlusRecordHeader Header; @@ -4643,3 +4644,162 @@ GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) METAFILE_WriteRecords(metafile); return Ok; } + +static GpStatus METAFILE_AddFontObject(GpMetafile *metafile, GDIPCONST GpFont *font, DWORD *id) +{ + EmfPlusObject *object_record; + EmfPlusFont *font_record; + GpStatus stat; + INT fn_len; + INT style; + + *id = -1; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && + metafile->metafile_type != MetafileTypeEmfPlusDual) + return Ok; + + /* The following cast is ugly, but GdipGetFontStyle does treat + its first parameter as const. */ + stat = GdipGetFontStyle((GpFont*)font, &style); + if (stat != Ok) + return stat; + + fn_len = lstrlenW(font->family->FamilyName); + stat = METAFILE_AllocateRecord(metafile, + FIELD_OFFSET(EmfPlusObject, ObjectData.font.FamilyName[(fn_len + 1) & ~1]), + (void**)&object_record); + if (stat != Ok) + return stat; + + *id = METAFILE_AddObjectId(metafile); + + object_record->Header.Type = EmfPlusRecordTypeObject; + object_record->Header.Flags = *id | ObjectTypeFont << 8; + + font_record = &object_record->ObjectData.font; + font_record->Version = VERSION_MAGIC2; + font_record->EmSize = font->emSize; + font_record->SizeUnit = font->unit; + font_record->FontStyleFlags = style; + font_record->Reserved = 0; + font_record->Length = fn_len; + + memcpy(font_record->FamilyName, font->family->FamilyName, + fn_len * sizeof(*font->family->FamilyName)); + + return Ok; +} + +GpStatus METAFILE_DrawDriverString(GpMetafile *metafile, GDIPCONST UINT16 *text, INT length, + GDIPCONST GpFont *font, GDIPCONST GpStringFormat *format, GDIPCONST GpBrush *brush, + GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix) +{ + DWORD brush_id; + DWORD font_id; + DWORD alloc_size; + GpStatus stat; + EmfPlusDrawDriverString *draw_string_record; + BYTE *cursor; + BOOL inline_color; + BOOL include_matrix = FALSE; + + if (length <= 0) + return InvalidParameter; + + if (metafile->metafile_type != MetafileTypeEmfPlusOnly && + metafile->metafile_type != MetafileTypeEmfPlusDual) + { + FIXME("metafile type not supported: %i\n", metafile->metafile_type); + return NotImplemented; + } + + stat = METAFILE_AddFontObject(metafile, font, &font_id); + if (stat != Ok) + return stat; + + inline_color = (brush->bt == BrushTypeSolidColor); + if (!inline_color) + { + stat = METAFILE_AddBrushObject(metafile, brush, &brush_id); + if (stat != Ok) + return stat; + } + + if (matrix) + { + BOOL identity; + + stat = GdipIsMatrixIdentity(matrix, &identity); + if (stat != Ok) + return stat; + + include_matrix = !identity; + } + + alloc_size = FIELD_OFFSET(EmfPlusDrawDriverString, VariableData) + + length * (sizeof(*text) + sizeof(*positions)); + + if (include_matrix) + alloc_size += sizeof(*matrix); + + /* Pad record to DWORD alignment. */ + alloc_size = (alloc_size + 3) & ~3; + + stat = METAFILE_AllocateRecord(metafile, alloc_size, (void**)&draw_string_record); + if (stat != Ok) + return stat; + + draw_string_record->Header.Type = EmfPlusRecordTypeDrawDriverString; + draw_string_record->Header.Flags = font_id; + draw_string_record->DriverStringOptionsFlags = flags; + draw_string_record->MatrixPresent = include_matrix; + draw_string_record->GlyphCount = length; + + if (inline_color) + { + draw_string_record->Header.Flags |= 0x8000; + draw_string_record->brush.Color = ((GpSolidFill*)brush)->color; + } + else + draw_string_record->brush.BrushId = brush_id; + + cursor = &draw_string_record->VariableData[0]; + + memcpy(cursor, text, length * sizeof(*text)); + cursor += length * sizeof(*text); + + if (flags & DriverStringOptionsRealizedAdvance) + { + static BOOL fixme_written = FALSE; + + /* Native never writes DriverStringOptionsRealizedAdvance. Instead, + in the case of RealizedAdvance, each glyph position is computed + and serialized. + + While native GDI+ is capable of playing back metafiles with this + flag set, it is possible that some application might rely on + metafiles produced from GDI+ not setting this flag. Ideally we + would also compute the position of each glyph here, serialize those + values, and not set DriverStringOptionsRealizedAdvance. */ + if (!fixme_written) + { + fixme_written = TRUE; + FIXME("serializing RealizedAdvance flag and single GlyphPos with padding\n"); + } + + *((PointF*)cursor) = *positions; + } + else + memcpy(cursor, positions, length * sizeof(*positions)); + + if (include_matrix) + { + cursor += length * sizeof(*positions); + memcpy(cursor, matrix, sizeof(*matrix)); + } + + METAFILE_WriteRecords(metafile); + + return Ok; +} diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 986989bb1c..371a3c21b4 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2956,11 +2956,11 @@ static void test_restoredc(void) static const emfplus_record drawdriverstring_records[] = { { EMR_HEADER }, { EmfPlusRecordTypeHeader }, - { EmfPlusRecordTypeObject, ObjectTypeFont << 8, 1, 0 }, - { EmfPlusRecordTypeDrawDriverString, 0x8000, 1, 0 }, - { EmfPlusRecordTypeObject, (ObjectTypeFont << 8) | 1, 1 }, - { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 2, 1, 1 }, - { EmfPlusRecordTypeDrawDriverString, 0x1, 1, 1 }, + { EmfPlusRecordTypeObject, ObjectTypeFont << 8 }, + { EmfPlusRecordTypeDrawDriverString, 0x8000 }, + { EmfPlusRecordTypeObject, (ObjectTypeFont << 8) | 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 2 }, + { EmfPlusRecordTypeDrawDriverString, 0x1 }, { EmfPlusRecordTypeEndOfFile }, { EMR_EOF }, { 0 } @@ -3022,14 +3022,14 @@ static void test_drawdriverstring(void) stat = GdipDrawDriverString(graphics, L"Test", 4, solidfont, solidbrush, solidpos, DriverStringOptionsCmapLookup, matrix); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetMatrixElements(matrix, 1.5, 0.0, 0.0, 1.5, 0.0, 0.0); expect(Ok, stat); stat = GdipDrawDriverString(graphics, L"Test ", 5, hatchfont, hatchbrush, &hatchpos, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, matrix); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipDeleteGraphics(graphics); graphics = NULL; -- 2.27.0

2 1

[PATCH v2 1/4] gdiplus/tests: Add metafile DrawDriverString test.
by Shawn M. Chapla July 17, 2020

July 17, 2020

Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> --- v2: - Remove fragile output pixel testing. dlls/gdiplus/tests/metafile.c | 105 ++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f3b817b3de..986989bb1c 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2953,6 +2953,110 @@ static void test_restoredc(void) expect(Ok, stat); } +static const emfplus_record drawdriverstring_records[] = { + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeObject, ObjectTypeFont << 8, 1, 0 }, + { EmfPlusRecordTypeDrawDriverString, 0x8000, 1, 0 }, + { EmfPlusRecordTypeObject, (ObjectTypeFont << 8) | 1, 1 }, + { EmfPlusRecordTypeObject, (ObjectTypeBrush << 8) | 2, 1, 1 }, + { EmfPlusRecordTypeDrawDriverString, 0x1, 1, 1 }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 } +}; + +static void test_drawdriverstring(void) +{ + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const PointF solidpos[4] = {{10.0,10.0}, {20.0,10.0}, {30.0,10.0}, {40.0,10.0}}; + static const PointF hatchpos = {10.0,30.0}; + + GpBitmap *bitmap; + GpStatus stat; + GpGraphics *graphics; + GpFont *solidfont, *hatchfont; + GpBrush *solidbrush, *hatchbrush; + HDC hdc; + GpMatrix *matrix; + GpMetafile *metafile; + LOGFONTA logfont = { 0 }; + + hdc = CreateCompatibleDC(0); + + strcpy(logfont.lfFaceName, "Times New Roman"); + logfont.lfHeight = 12; + logfont.lfCharSet = DEFAULT_CHARSET; + + stat = GdipCreateFontFromLogfontA(hdc, &logfont, &solidfont); + if (stat == NotTrueTypeFont || stat == FileNotFound) + { + DeleteDC(hdc); + skip("Times New Roman not installed.\n"); + return; + } + + stat = GdipCloneFont(solidfont, &hatchfont); + expect(Ok, stat); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, + L"winetest", &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + hdc = NULL; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&solidbrush); + expect(Ok, stat); + + stat = GdipCreateHatchBrush(HatchStyleHorizontal, (ARGB)0xff00ff00, (ARGB)0xffff0000, + (GpHatch**)&hatchbrush); + expect(Ok, stat); + + stat = GdipCreateMatrix(&matrix); + expect(Ok, stat); + + stat = GdipDrawDriverString(graphics, L"Test", 4, solidfont, solidbrush, solidpos, + DriverStringOptionsCmapLookup, matrix); + todo_wine expect(Ok, stat); + + stat = GdipSetMatrixElements(matrix, 1.5, 0.0, 0.0, 1.5, 0.0, 0.0); + expect(Ok, stat); + + stat = GdipDrawDriverString(graphics, L"Test ", 5, hatchfont, hatchbrush, &hatchpos, + DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, matrix); + todo_wine expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + graphics = NULL; + + check_metafile(metafile, drawdriverstring_records, "drawdriverstring metafile", dst_points, + &frame, UnitPixel); + sync_metafile(&metafile, "drawdriverstring.emf"); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, drawdriverstring_records, "drawdriverstring playback", + dst_points, &frame, UnitPixel); + + GdipDeleteMatrix(matrix); + GdipDeleteGraphics(graphics); + GdipDeleteBrush(solidbrush); + GdipDeleteBrush(hatchbrush); + GdipDeleteFont(solidfont); + GdipDeleteFont(hatchfont); + GdipDisposeImage((GpImage*)bitmap); + GdipDisposeImage((GpImage*)metafile); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3002,6 +3106,7 @@ START_TEST(metafile) test_drawpath(); test_fillpath(); test_restoredc(); + test_drawdriverstring(); GdiplusShutdown(gdiplusToken); } -- 2.27.0

3 8

[PATCH v6 5/5] windowscodecs: Add support for decoding uncompressed DDS image.
by Ziqing Hui July 17, 2020

July 17, 2020

For uncompressed DDS image, "a block" means a pixel. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 75 +++++++++++++++++----------- dlls/windowscodecs/tests/ddsformat.c | 10 ---- 2 files changed, 47 insertions(+), 38 deletions(-)

2 1

[PATCH 4/5] include: improve errors when TEXT()/OLESTR() aren't implementable.
by Puetz Kevin A July 17, 2020

July 17, 2020

With WINE_UNICODE_NATIVE is set, literals can use L"". With WINE_UNICODE_CHAR16 is set, literals can use u"". Otherwise (TCHAR/_TCHAR/OLECHAR == WCHAR == unsigned short) there is no suitable string literal syntax. Rather than generating an expression of the wrong type (char16_t *), these macros now expand to invalid syntax, i.e. prefix"..." which will fail to compile. But prefix should appear in the error message, and a descriptive identifier that one can easily search for in the headers to see which definitions are available that would work. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- include/tchar.h | 2 ++ include/winnt.rh | 5 ++++- include/wtypes.idl | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index 519a9f1002..6c9035c219 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -253,6 +253,8 @@ typedef char16_t _TCHAR; #define __T(x) u##x #else typedef unsigned short _TCHAR; +/* no compiler support for TEXT() in _UNICODE mode, consider -fshort-wchar or -DWINE_UNICODE_CHAR16 */ +# define __T(string) _TEXT_no_compiler_utf16_literal##string #endif typedef _TCHAR _TUCHAR; typedef _TCHAR _TSCHAR; diff --git a/include/winnt.rh b/include/winnt.rh index 786a38f326..bcc780b2ab 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -28,8 +28,11 @@ # define __TEXT(string) string # elif defined(WINE_UNICODE_NATIVE) # define __TEXT(string) L##string -# else +# elif defined(WINE_UNICODE_CHAR16) # define __TEXT(string) u##string +# else + /* no compiler support for TEXT() in UNICODE mode, consider -fshort-wchar or -DWINE_UNICODE_CHAR16 */ +# define __TEXT(string) TEXT_no_compiler_utf16_literal##string # endif # define TEXT(string) __TEXT(string) #endif diff --git a/include/wtypes.idl b/include/wtypes.idl index a6682212b5..9d9b73d62d 100644 --- a/include/wtypes.idl +++ b/include/wtypes.idl @@ -289,8 +289,10 @@ typedef [string] const OLECHAR *LPCOLESTR; cpp_quote("#ifndef __WINESRC__") cpp_quote("# ifdef WINE_UNICODE_NATIVE") cpp_quote("# define OLESTR(str) L##str") -cpp_quote("# else") +cpp_quote("# elif defined(WINE_UNICODE_CHAR16)") cpp_quote("# define OLESTR(str) u##str") +cpp_quote("# else") +cpp_quote("# define OLESTR(str) OLESTR_no_compiler_utf16_literal##str") cpp_quote("# endif") cpp_quote("#endif")

2 1

[PATCH v6 4/5] windowscodecs/tests: Add tests for decoding uncompressed DDS image.
by Ziqing Hui July 17, 2020

July 17, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 98 +++++++++++++++------------- 1 file changed, 54 insertions(+), 44 deletions(-)

2 1

[PATCH v6 3/5] windowscodecs: Return fail for unsupported format in DdsDecoder_Initialize().
by Ziqing Hui July 17, 2020

July 17, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 18 +++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 3 --- 2 files changed, 17 insertions(+), 4 deletions(-)

2 1

[PATCH v6 2/5] windowscodecs: In find_decoder(), get rid of nested if by using goto, and use IWICWineDecoder_Initialize() to initialize decoders.
by Ziqing Hui July 17, 2020

July 17, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v6: * Move declaration for decoderinfo and wine_decoder inside the loop. * Remove label "end". * Remove the NULL checking for the release of enumdecoders and unkdecoderinfo because we know that they must have been successfully created. unkdecoderinfo is not able to be moved inside because it is used in the loop condition. dlls/windowscodecs/imgfactory.c | 100 ++++++++++++++++---------------- 1 file changed, 49 insertions(+), 51 deletions(-)

2 1

[PATCH v6 1/5] windowscodecs: Implement DdsDecoder_Wine_Initialize().
by Ziqing Hui July 17, 2020

July 17, 2020

Code in DdsDecoder_Initialize() are moved to DdsDecoder_Wine_Initialize(). And DdsDecoder_Initialize() are implemented on top of DdsDecoder_Wine_Initialize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 126 +++++++++++++++++---------------- 1 file changed, 66 insertions(+), 60 deletions(-)

2 1

[PATCH 3/5] include: _TEXT(...) should obey _UNICODE to match _TCHAR
by Puetz Kevin A July 17, 2020

July 17, 2020

This is, at least pedantically, independent of the similar macro UNICODE which controls <windef.h>, e.g. TEXT(), TCHAR, WINELIB_NAME_AW. So _T(...) and _TEXT(...) can't reuse the implementation of TEXT(...). Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- include/tchar.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/tchar.h b/include/tchar.h index 33db74c7ee..519a9f1002 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -231,10 +231,6 @@ extern "C" { #endif /* tchar mappings */ -#define __T(x) __TEXT(x) -#define _T(x) __T(x) -#define _TEXT(x) __T(x) - #ifdef _UNICODE #if !defined(_WINT_T_DEFINED) && !defined(__WINT_TYPE__) typedef unsigned short wint_t; @@ -248,11 +244,13 @@ typedef unsigned short wctype_t; #ifndef __TCHAR_DEFINED #if defined(WINE_UNICODE_NATIVE) typedef wchar_t _TCHAR; +#define __T(x) L##x #elif defined(WINE_UNICODE_CHAR16) # if !defined(__cplusplus) && !defined(RC_INVOKED) # include <uchar.h> /* Bring in char16_t and char32_t for C */ # endif typedef char16_t _TCHAR; +#define __T(x) u##x #else typedef unsigned short _TCHAR; #endif @@ -264,6 +262,7 @@ typedef _TCHAR _TINT; #endif #else /* _UNICODE */ +#define __T(x) x #ifndef __TCHAR_DEFINED typedef char _TCHAR; typedef unsigned char _TUCHAR; @@ -278,6 +277,9 @@ typedef unsigned int _TINT; #endif #endif +#define _T(x) __T(x) +#define _TEXT(x) __T(x) + #ifndef _TCHAR_DEFINED typedef _TCHAR TCHAR, *PTCHAR; #define _TCHAR_DEFINED -- 2.27.0.windows.1

1 0

[PATCH 1/4] ntdll/tests: Remove some workarounds for no longer supported versions of Windows.
by Zebediah Figura July 17, 2020

July 17, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/om.c | 387 ++++++++++++++++-------------------------- 1 file changed, 149 insertions(+), 238 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c17b6ffa8db..5d7e4007853 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -25,7 +25,6 @@ #include "winnt.h" #include "stdlib.h" -static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*, BOOL, LPCSTR); static BOOLEAN (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); @@ -98,8 +97,7 @@ static void test_case_sensitive (void) ok(status == STATUS_SUCCESS, "Failed to create Mutant(%08x)\n", status); status = pNtCreateEvent(&Event, GENERIC_ALL, &attr, FALSE, FALSE); - ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH, - "NtCreateEvent should have failed with STATUS_OBJECT_NAME_COLLISION or STATUS_OBJECT_TYPE_MISMATCH got (%08x)\n", status); + ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); pRtlInitUnicodeString(&str, buffer2); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); @@ -117,8 +115,7 @@ static void test_case_sensitive (void) pRtlInitUnicodeString(&str, buffer4); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); status = pNtCreateMutant(&Mutant, GENERIC_ALL, &attr, FALSE); - ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH, - "NtCreateMutant should have failed with STATUS_OBJECT_NAME_COLLISION or STATUS_OBJECT_TYPE_MISMATCH got (%08x)\n", status); + ok(status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* Vista+ */, "got %#x\n", status); status = pNtCreateEvent(&h, GENERIC_ALL, &attr, FALSE, FALSE); ok(status == STATUS_OBJECT_NAME_COLLISION, @@ -247,19 +244,10 @@ static HANDLE get_base_dir(void) sprintf( name, "\\BaseNamedObjects\\Session\\%u", NtCurrentTeb()->Peb->SessionId ); pRtlCreateUnicodeStringFromAsciiz(&str, name ); status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); + ok(!status, "got %#x\n", status); + ok(is_correct_dir( dir, objname ), "wrong dir\n"); pRtlFreeUnicodeString(&str); - if (!status && is_correct_dir( dir, objname )) goto done; - if (!status) pNtClose( dir ); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); - status = pNtOpenDirectoryObject(&dir, DIRECTORY_QUERY, &attr); - pRtlFreeUnicodeString(&str); - if (!status && is_correct_dir( dir, objname )) goto done; - if (!status) pNtClose( dir ); - - dir = 0; - -done: pNtClose( h ); return dir; } @@ -289,15 +277,10 @@ static void test_name_collisions(void) pRtlCreateUnicodeStringFromAsciiz(&str, "\\??\\PIPE\\om.c-mutant"); status = pNtCreateMutant(&h, GENERIC_ALL, &attr, FALSE); - ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_OBJECT_PATH_NOT_FOUND, - "NtCreateMutant should have failed with STATUS_OBJECT_TYPE_MISMATCH got(%08x)\n", status); + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status); pRtlFreeUnicodeString(&str); - if (!(dir = get_base_dir())) - { - win_skip( "couldn't find the BaseNamedObjects dir\n" ); - return; - } + dir = get_base_dir(); pRtlCreateUnicodeStringFromAsciiz(&str, "om.c-test"); InitializeObjectAttributes(&attr, &str, OBJ_OPENIF, dir, NULL); h = CreateMutexA(NULL, FALSE, "om.c-test"); @@ -339,12 +322,12 @@ static void test_name_collisions(void) pNtClose(h1); pNtClose(h2); - h = pCreateWaitableTimerA(NULL, TRUE, "om.c-test"); + h = CreateWaitableTimerA(NULL, TRUE, "om.c-test"); ok(h != 0, "CreateWaitableTimerA failed got ret=%p (%d)\n", h, GetLastError()); status = pNtCreateTimer(&h1, GENERIC_ALL, &attr, NotificationTimer); ok(status == STATUS_OBJECT_NAME_EXISTS && h1 != NULL, "NtCreateTimer should have succeeded with STATUS_OBJECT_NAME_EXISTS got(%08x)\n", status); - h2 = pCreateWaitableTimerA(NULL, TRUE, "om.c-test"); + h2 = CreateWaitableTimerA(NULL, TRUE, "om.c-test"); winerr = GetLastError(); ok(h2 != 0 && winerr == ERROR_ALREADY_EXISTS, "CreateWaitableTimerA should have succeeded with ERROR_ALREADY_EXISTS got ret=%p (%d)\n", h2, winerr); @@ -468,12 +451,7 @@ static void test_name_limits(void) size.QuadPart = 4096; pRtlCreateUnicodeStringFromAsciiz( &target, "\\DosDevices" ); - if (!(attr.RootDirectory = get_base_dir())) - { - win_skip( "couldn't find the BaseNamedObjects dir\n" ); - return; - } - + attr.RootDirectory = get_base_dir(); str.Length = 0; status = pNtCreateMutant( &ret, GENERIC_ALL, &attr2, FALSE ); ok( status == STATUS_SUCCESS, "%u: NtCreateMutant failed %x\n", str.Length, status ); @@ -481,7 +459,7 @@ static void test_name_limits(void) status = pNtOpenMutant( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenMutant failed %x\n", str.Length, status ); status = pNtOpenMutant( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenMutant failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateSemaphore( &ret, GENERIC_ALL, &attr2, 1, 2 ); @@ -490,7 +468,7 @@ static void test_name_limits(void) status = pNtOpenSemaphore( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSemaphore failed %x\n", str.Length, status ); status = pNtOpenSemaphore( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenSemaphore failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateEvent( &ret, GENERIC_ALL, &attr2, 1, 0 ); @@ -499,7 +477,7 @@ static void test_name_limits(void) status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenEvent failed %x\n", str.Length, status ); status = pNtOpenEvent( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenEvent failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateKeyedEvent( &ret, GENERIC_ALL, &attr2, 0 ); @@ -508,7 +486,7 @@ static void test_name_limits(void) status = pNtOpenKeyedEvent( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenKeyedEvent failed %x\n", str.Length, status ); status = pNtOpenKeyedEvent( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenKeyedEvent failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateTimer( &ret, GENERIC_ALL, &attr2, NotificationTimer ); @@ -517,7 +495,7 @@ static void test_name_limits(void) status = pNtOpenTimer( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenTimer failed %x\n", str.Length, status ); status = pNtOpenTimer( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenTimer failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateIoCompletion( &ret, GENERIC_ALL, &attr2, 0 ); @@ -526,7 +504,7 @@ static void test_name_limits(void) status = pNtOpenIoCompletion( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenCompletion failed %x\n", str.Length, status ); status = pNtOpenIoCompletion( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenCompletion failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateJobObject( &ret, GENERIC_ALL, &attr2 ); @@ -535,7 +513,7 @@ static void test_name_limits(void) status = pNtOpenJobObject( &ret2, GENERIC_ALL, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenJobObject failed %x\n", str.Length, status ); status = pNtOpenJobObject( &ret2, GENERIC_ALL, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenJobObject failed %x\n", str.Length, status ); pNtClose( ret ); status = pNtCreateDirectoryObject( &ret, GENERIC_ALL, &attr2 ); @@ -564,7 +542,7 @@ static void test_name_limits(void) status = pNtOpenSection( &ret2, SECTION_MAP_WRITE, &attr ); ok( status == STATUS_OBJECT_TYPE_MISMATCH, "%u: NtOpenSection failed %x\n", str.Length, status ); status = pNtOpenSection( &ret2, SECTION_MAP_WRITE, &attr3 ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE /* < 7 */, "%u: NtOpenSection failed %x\n", str.Length, status ); pNtClose( ret ); @@ -868,7 +846,7 @@ static void test_name_limits(void) attr2.ObjectName = attr3.ObjectName = NULL; status = pNtCreateKey( &ret, GENERIC_ALL, &attr2, 0, NULL, 0, NULL ); todo_wine - ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE /* vista wow64 */, "NULL: NtCreateKey failed %x\n", status ); status = pNtCreateKey( &ret, GENERIC_ALL, &attr3, 0, NULL, 0, NULL ); todo_wine @@ -876,7 +854,7 @@ static void test_name_limits(void) status = pNtCreateKey( &ret, GENERIC_ALL, NULL, 0, NULL, 0, NULL ); ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtCreateKey failed %x\n", status ); status = pNtOpenKey( &ret, GENERIC_ALL, &attr2 ); - ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE, + ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_HANDLE /* vista wow64 */, "NULL: NtOpenKey failed %x\n", status ); status = pNtOpenKey( &ret, GENERIC_ALL, &attr3 ); ok( status == STATUS_ACCESS_VIOLATION, "NULL: NtOpenKey failed %x\n", status ); @@ -894,15 +872,14 @@ static void test_directory(void) UNICODE_STRING str; OBJECT_ATTRIBUTES attr; HANDLE dir, dir1, h, h2; - BOOL is_nt4; + WCHAR buffer[256]; + ULONG len, full_len; /* No name and/or no attributes */ status = pNtCreateDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, - "NtCreateDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08x)\n", status); + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#x\n", status); status = pNtOpenDirectoryObject(NULL, DIRECTORY_QUERY, &attr); - ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, - "NtOpenDirectoryObject should have failed with STATUS_ACCESS_VIOLATION got(%08x)\n", status); + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER /* wow64 */, "got %#x\n", status); status = pNtCreateDirectoryObject(&h, DIRECTORY_QUERY, NULL); ok(status == STATUS_SUCCESS, "Failed to create Directory without attributes(%08x)\n", status); @@ -951,87 +928,76 @@ static void test_directory(void) pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr); - is_nt4 = (status == STATUS_OBJECT_NAME_NOT_FOUND); /* nt4 doesn't have Local\\ symlink */ - if (!is_nt4) - { - WCHAR buffer[256]; - ULONG len, full_len; - - ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); - pRtlFreeUnicodeString(&str); - InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); - status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateDirectoryObject got %08x\n", status ); - pRtlFreeUnicodeString(&str); - - pRtlCreateUnicodeStringFromAsciiz( &str, "\\BaseNamedObjects\\Local\\om.c-test" ); - InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); - pRtlFreeUnicodeString( &str ); - pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-test" ); - InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); - status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Failed to open directory %08x\n", status ); - if (!status) pNtClose(h); - pRtlFreeUnicodeString( &str ); - - pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-event" ); - InitializeObjectAttributes( &attr, &str, 0, dir1, NULL ); - status = pNtCreateEvent( &h, GENERIC_ALL, &attr, 1, 0 ); - ok( status == STATUS_SUCCESS, "NtCreateEvent failed %x\n", status ); - status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); - ok( status == STATUS_SUCCESS, "NtOpenEvent failed %x\n", status ); - pNtClose( h2 ); - pRtlFreeUnicodeString( &str ); - pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-test\\om.c-event" ); - InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); - status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenEvent failed %x\n", status ); - pRtlFreeUnicodeString( &str ); - pRtlCreateUnicodeStringFromAsciiz( &str, "\\BasedNamedObjects\\Local\\om.c-test\\om.c-event" ); - InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); - status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenEvent failed %x\n", status ); - pRtlFreeUnicodeString( &str ); - pNtClose( h ); - pNtClose( dir1 ); - - str.Buffer = buffer; - str.MaximumLength = sizeof(buffer); - len = 0xdeadbeef; - memset( buffer, 0xaa, sizeof(buffer) ); - status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); - if (status != STATUS_SUCCESS) - goto error; - full_len = str.Length + sizeof(WCHAR); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); - if (len == full_len) - ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); - - str.MaximumLength = str.Length; - len = 0xdeadbeef; - status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); - - str.MaximumLength = 0; - len = 0xdeadbeef; - status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); - - str.MaximumLength = str.Length + sizeof(WCHAR); - len = 0xdeadbeef; - status = pNtQuerySymbolicLinkObject( dir, &str, &len ); - ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); - ok( len == full_len, "bad length %u/%u\n", len, full_len ); - -error: - pNtClose(dir); - } + + ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); + pRtlFreeUnicodeString(&str); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); + status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtCreateDirectoryObject got %08x\n", status ); + pRtlFreeUnicodeString(&str); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\BaseNamedObjects\\Local\\om.c-test" ); + InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); + status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-test" ); + InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); + status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "Failed to open directory %08x\n", status ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-event" ); + InitializeObjectAttributes( &attr, &str, 0, dir1, NULL ); + status = pNtCreateEvent( &h, GENERIC_ALL, &attr, 1, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateEvent failed %x\n", status ); + status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenEvent failed %x\n", status ); + pNtClose( h2 ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "om.c-test\\om.c-event" ); + InitializeObjectAttributes( &attr, &str, 0, dir, NULL ); + status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); + ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenEvent failed %x\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\BasedNamedObjects\\Local\\om.c-test\\om.c-event" ); + InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); + status = pNtOpenEvent( &h2, GENERIC_ALL, &attr ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenEvent failed %x\n", status ); + pRtlFreeUnicodeString( &str ); + pNtClose( h ); + pNtClose( dir1 ); + + str.Buffer = buffer; + str.MaximumLength = sizeof(buffer); + len = 0xdeadbeef; + memset( buffer, 0xaa, sizeof(buffer) ); + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + full_len = str.Length + sizeof(WCHAR); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); + + str.MaximumLength = str.Length; + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + + str.MaximumLength = 0; + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + + str.MaximumLength = str.Length + sizeof(WCHAR); + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + + pNtClose(dir); pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); @@ -1091,26 +1057,23 @@ error: pNtClose(dir); - if (!is_nt4) - { - InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Global\\om.c-test"); - status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); - pRtlFreeUnicodeString(&str); - pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local\\om.c-test\\one more level"); - status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); - pRtlFreeUnicodeString(&str); - pNtClose(h); - InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); - status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); - ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); - pRtlFreeUnicodeString(&str); - pNtClose(h); - pNtClose(dir); - } + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Global\\om.c-test"); + status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + pRtlFreeUnicodeString(&str); + pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local\\om.c-test\\one more level"); + status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + pRtlFreeUnicodeString(&str); + pNtClose(h); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); + pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); + status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); + pRtlFreeUnicodeString(&str); + pNtClose(h); + pNtClose(dir); /* Create other objects using RootDirectory */ @@ -1160,11 +1123,9 @@ static void test_symboliclink(void) InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); pRtlCreateUnicodeStringFromAsciiz(&target, "\\DosDevices"); status = pNtCreateSymbolicLinkObject( NULL, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, - "NtCreateSymbolicLinkObject got %08x\n", status ); + ok(status == STATUS_ACCESS_VIOLATION, "got %#x\n", status); status = pNtOpenSymbolicLinkObject( NULL, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_ACCESS_VIOLATION || status == STATUS_INVALID_PARAMETER, - "NtOpenSymbolicLinkObject got %08x\n", status ); + ok(status == STATUS_ACCESS_VIOLATION, "got %#x\n", status); status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, NULL); ok(status == STATUS_ACCESS_VIOLATION, @@ -1178,14 +1139,10 @@ static void test_symboliclink(void) ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_VIOLATION, /* nt4 */ "NtCreateSymbolicLinkObject failed(%08x)\n", status); pRtlFreeUnicodeString(&target); - if (!status) pNtClose(h); InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); status = pNtCreateSymbolicLinkObject(&link, SYMBOLIC_LINK_QUERY, &attr, &target); - ok(status == STATUS_INVALID_PARAMETER || - broken(status == STATUS_SUCCESS), /* nt4 */ - "NtCreateSymbolicLinkObject should have failed with STATUS_INVALID_PARAMETER got(%08x)\n", status); - if (!status) pNtClose(h); + ok(status == STATUS_INVALID_PARAMETER, "got %#x\n", status); status = pNtOpenSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, &attr); ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenSymbolicLinkObject should have failed with STATUS_OBJECT_PATH_SYNTAX_BAD got(%08x)\n", status); @@ -1242,21 +1199,14 @@ static void test_symboliclink(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\BaseNamedObjects\\om.c-test\\" ); status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND, - "NtCreateSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "got %#x\n", status ); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND, - "NtOpenSymbolicLinkObject got %08x\n", status ); + ok( status == STATUS_OBJECT_NAME_INVALID, "got %#x\n", status ); pRtlFreeUnicodeString( &str ); pRtlFreeUnicodeString(&target); /* Compound test */ - if (!(dir = get_base_dir())) - { - win_skip( "couldn't find the BaseNamedObjects dir\n" ); - return; - } - + dir = get_base_dir(); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, "test-link"); pRtlCreateUnicodeStringFromAsciiz(&target, "\\DosDevices"); @@ -1285,7 +1235,7 @@ static void _test_file_info(unsigned line, HANDLE handle) NTSTATUS status; status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef); - ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED, + ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* Vista+ */, "expected STATUS_NOT_IMPLEMENTED, got %x\n", status); status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); @@ -1293,7 +1243,7 @@ static void _test_file_info(unsigned line, HANDLE handle) status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileIoCompletionNotificationInformation); - ok_(__FILE__,line)(status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS), + ok_(__FILE__,line)(status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS) /* XP */, "FileIoCompletionNotificationInformation returned %x\n", status); } @@ -1305,7 +1255,7 @@ static void _test_no_file_info(unsigned line, HANDLE handle) NTSTATUS status; status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef); - ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED, + ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED /* Vista+ */, "expected STATUS_NOT_IMPLEMENTED, got %x\n", status); status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); @@ -1314,7 +1264,7 @@ static void _test_no_file_info(unsigned line, HANDLE handle) status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileIoCompletionNotificationInformation); - ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS), + ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* XP */, "FileIoCompletionNotificationInformation returned %x\n", status); } @@ -1432,24 +1382,19 @@ static void test_query_object(void) ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); - ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ - "unexpected len %u\n", len ); + ok( len == expected_len, "unexpected len %u\n", len ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, 0, &len ); - ok( status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INSUFFICIENT_RESOURCES), - "NtQueryObject failed %x\n", status ); - ok( len == expected_len || broken(!len || len == sizeof(UNICODE_STRING)), + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %#x\n", status ); + ok( len == expected_len || broken(!len /* XP */ || len == sizeof(UNICODE_STRING) /* 2003 */), "unexpected len %u\n", len ); len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(UNICODE_STRING), &len ); - ok( status == STATUS_BUFFER_OVERFLOW || broken(status == STATUS_INSUFFICIENT_RESOURCES - || status == STATUS_INFO_LENGTH_MISMATCH), - "NtQueryObject failed %x\n", status ); - ok( len == expected_len || broken(!len), - "unexpected len %u\n", len ); + ok( status == STATUS_BUFFER_OVERFLOW, "got %#x\n", status); + ok( len == expected_len, "unexpected len %u\n", len ); test_object_type( handle, "File" ); @@ -1498,8 +1443,7 @@ static void test_query_object(void) ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); - ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ - "unexpected len %u\n", len ); + ok( len == expected_len, "unexpected len %u\n", len ); ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_mailslot") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); @@ -1521,8 +1465,7 @@ static void test_query_object(void) str = (UNICODE_STRING *)buffer; expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); todo_wine - ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ - "unexpected len %u\n", len ); + ok( len == expected_len, "unexpected len %u\n", len ); todo_wine ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_pipe") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); @@ -1542,29 +1485,25 @@ static void test_query_object(void) pNtClose( handle ); pRtlCreateUnicodeStringFromAsciiz( &path, "\\REGISTRY\\Machine\\Software\\Classes" ); - status = pNtCreateKey( &handle, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, - "NtCreateKey failed status %x\n", status ); + status = pNtCreateKey( &handle, KEY_READ, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed status %x\n", status ); pRtlFreeUnicodeString( &path ); - if (status == STATUS_SUCCESS) - { - len = 0; - status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); - ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); - str = (UNICODE_STRING *)buffer; - todo_wine - ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); - str = (UNICODE_STRING *)buffer; - expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); - todo_wine - ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ - "unexpected len %u\n", len ); - todo_wine - ok( len > sizeof(UNICODE_STRING) + sizeof("\\Classes") * sizeof(WCHAR), - "name too short %s\n", wine_dbgstr_w(str->Buffer) ); - trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); - pNtClose( handle ); - } + + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); + str = (UNICODE_STRING *)buffer; + todo_wine + ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); + ok( len == expected_len || len == expected_len - sizeof(WCHAR) /* wow64 */, "unexpected len %u\n", len ); + todo_wine + ok( len > sizeof(UNICODE_STRING) + sizeof("\\Classes") * sizeof(WCHAR), + "name too short %s\n", wine_dbgstr_w(str->Buffer) ); + trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + pNtClose( handle ); + pRtlFreeUnicodeString( &session ); test_object_type( GetCurrentProcess(), "Process" ); @@ -1853,7 +1792,7 @@ static void test_keyed_events(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtPulseEvent %x\n", status ); status = pNtCreateEvent( &event, GENERIC_ALL, &attr, FALSE, FALSE ); - ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH, + ok( status == STATUS_OBJECT_NAME_COLLISION || status == STATUS_OBJECT_TYPE_MISMATCH /* 7+ */, "CreateEvent %x\n", status ); NtClose( handle ); @@ -1911,34 +1850,15 @@ static void test_null_device(void) num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = WriteFile(null, buf, sizeof(buf), &num_bytes, &ov); - if (ret || GetLastError() != ERROR_IO_PENDING) - { - ok(ret, "WriteFile failed with error %u\n", GetLastError()); - } - else - { - num_bytes = 0xdeadbeef; - ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); - ok(ret, "GetOverlappedResult failed with error %u\n", GetLastError()); - } + ok(ret, "got error %u\n", GetLastError()); ok(num_bytes == sizeof(buf), "expected num_bytes = %u, got %u\n", (DWORD)sizeof(buf), num_bytes); num_bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(null, buf, sizeof(buf), &num_bytes, &ov); - if (ret || GetLastError() != ERROR_IO_PENDING) - { - ok(!ret, "ReadFile unexpectedly succeeded\n"); - } - else - { - num_bytes = 0xdeadbeef; - ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); - ok(!ret, "GetOverlappedResult unexpectedly succeeded\n"); - } - ok(GetLastError() == ERROR_HANDLE_EOF, - "expected ERROR_HANDLE_EOF, got %u\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_HANDLE_EOF, "got error %u\n", GetLastError()); pNtClose(null); @@ -2151,15 +2071,6 @@ static void test_wait_on_address(void) START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); - HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); - - if (!hntdll) - { - skip("not running on NT, skipping test\n"); - return; - } - - pCreateWaitableTimerA = (void *)GetProcAddress(hkernel32, "CreateWaitableTimerA"); pRtlCreateUnicodeStringFromAsciiz = (void *)GetProcAddress(hntdll, "RtlCreateUnicodeStringFromAsciiz"); pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); -- 2.27.0

1 3