March 2021 - Wine-Commits - list.winehq.org

Nikolay Sivov : gdiplus/metafile: Implement TranslateClip() recording.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: 33d2f6b7ec4af183f433bc0fd46361bfff0741ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=33d2f6b7ec4af183f433bc0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 15:27:22 2021 +0300 gdiplus/metafile: Implement TranslateClip() recording. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 18 +++++++++------- dlls/gdiplus/metafile.c | 31 ++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 25672530313..0745e7997ff 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -117,6 +117,7 @@ extern GpStatus METAFILE_FillPie(GpMetafile *metafile, GpBrush *brush, const GpR REAL startAngle, REAL sweepAngle) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawArc(GpMetafile *metafile, GpPen *pen, const GpRectF *rect, REAL startAngle, REAL sweepAngle) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_OffsetClip(GpMetafile *metafile, REAL dx, REAL dy) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e292afdfb2c..dd34cf81ddb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7011,6 +7011,8 @@ HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void) */ GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics *graphics, REAL dx, REAL dy) { + GpStatus stat; + TRACE("(%p, %.2f, %.2f)\n", graphics, dx, dy); if(!graphics) @@ -7019,6 +7021,13 @@ GpStatus WINGDIPAPI GdipTranslateClip(GpGraphics *graphics, REAL dx, REAL dy) if(graphics->busy) return ObjectBusy; + if (is_metafile_graphics(graphics)) + { + stat = METAFILE_OffsetClip((GpMetafile *)graphics->image, dx, dy); + if (stat != Ok) + return stat; + } + return GdipTranslateRegion(graphics->clip, dx, dy); } @@ -7029,16 +7038,9 @@ GpStatus WINGDIPAPI GdipTranslateClipI(GpGraphics *graphics, INT dx, INT dy) { TRACE("(%p, %d, %d)\n", graphics, dx, dy); - if(!graphics) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - return GdipTranslateRegion(graphics->clip, (REAL)dx, (REAL)dy); + return GdipTranslateClip(graphics, dx, dy); } - /***************************************************************************** * GdipMeasureDriverString [GDIPLUS.@] */ diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index d9fa9e77c91..8ab1acadb42 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -573,6 +573,13 @@ typedef struct EmfPlusFillRegion } data; } EmfPlusFillRegion; +typedef struct EmfPlusOffsetClip +{ + EmfPlusRecordHeader Header; + float dx; + float dy; +} EmfPlusOffsetClip; + static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) { struct emfplus_object *object = &metafile->objtable[id]; @@ -5196,3 +5203,27 @@ GpStatus METAFILE_DrawArc(GpMetafile *metafile, GpPen *pen, const GpRectF *rect, return Ok; } + +GpStatus METAFILE_OffsetClip(GpMetafile *metafile, REAL dx, REAL dy) +{ + EmfPlusOffsetClip *record; + GpStatus stat; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeOffsetClip, + sizeof(*record), (void **)&record); + if (stat != Ok) + return stat; + + record->dx = dx; + record->dy = dy; + + METAFILE_WriteRecords(metafile); + + return Ok; +} diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 92c738f5116..9ffd9ef60c8 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -3707,6 +3707,54 @@ static void test_drawrectangle(void) expect(Ok, stat); } +static void test_offsetclip(void) +{ + static const GpRectF frame = { 0.0f, 0.0f, 100.0f, 100.0f }; + static const emfplus_record offset_clip_records[] = + { + { EMR_HEADER }, + { EmfPlusRecordTypeHeader }, + { EmfPlusRecordTypeOffsetClip }, + { EmfPlusRecordTypeOffsetClip }, + { EmfPlusRecordTypeEndOfFile }, + { EMR_EOF }, + { 0 }, + }; + + GpMetafile *metafile; + GpGraphics *graphics; + HENHMETAFILE hemf; + GpStatus stat; + HDC hdc; + + hdc = CreateCompatibleDC(0); + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + DeleteDC(hdc); + + stat = GdipGetImageGraphicsContext((GpImage *)metafile, &graphics); + expect(Ok, stat); + + stat = GdipTranslateClip(graphics, 1.0f, -1.0f); + expect(Ok, stat); + + stat = GdipTranslateClipI(graphics, 2, 3); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + sync_metafile(&metafile, "offset_clip.emf"); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + check_emfplus(hemf, offset_clip_records, "offset clip"); + DeleteEnhMetaFile(hemf); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3764,6 +3812,7 @@ START_TEST(metafile) test_drawellipse(); test_fillellipse(); test_drawrectangle(); + test_offsetclip(); GdiplusShutdown(gdiplusToken); }

1 0

Nikolay Sivov : gdiplus/metafile: Fully initialize record header on allocation.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: 7ca2f86f060245dc61e23e3e39065cb9271fab30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca2f86f060245dc61e23e3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 15:27:21 2021 +0300 gdiplus/metafile: Fully initialize record header on allocation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 175 +++++++++++++++++------------------------------- 1 file changed, 60 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7ca2f86f060245dc61e2…

1 0

Rémi Bernon : dinput: Wait for the hook thread to exit when stopping it.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: b71cea76ed24ca940783e01da54917eefa0bb36b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b71cea76ed24ca940783e01d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 26 18:36:01 2021 +0100 dinput: Wait for the hook thread to exit when stopping it. FlatOut2 demo calls FreeLibrary on the dinput8 module more times than it has loaded it, and the module reference that the internal thread has is getting decremented before its exit. Having an internal window to destroy also makes it more likely to crash as it takes more time to exit calls the window procedure function. Waiting for the thread to complete when all the dinput instances are destroyed ensures that the thread isn't alive when the game frees the DLL, and prevents the thread from crashing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50673 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 45023fc104a..5da60cf1f7c 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1861,6 +1861,7 @@ static BOOL check_hook_thread(void) { static HANDLE hook_thread; HMODULE module; + HANDLE wait_handle = NULL; EnterCriticalSection(&dinput_hook_crit); @@ -1884,11 +1885,17 @@ static BOOL check_hook_thread(void) hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - CloseHandle(hook_thread); + wait_handle = hook_thread; hook_thread = NULL; } LeaveCriticalSection(&dinput_hook_crit); + + if (wait_handle) + { + WaitForSingleObject(wait_handle, INFINITE); + CloseHandle(wait_handle); + } return hook_thread_id != 0; }

1 0

Jacek Caban : inetcomm: Use nameless unions.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: 36bfd19a9f6905ffb7cd635892eed3a0d8492ec4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36bfd19a9f6905ffb7cd6358… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 27 16:01:58 2021 +0100 inetcomm: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/Makefile.in | 1 - dlls/inetcomm/mimeintl.c | 20 ++++++++++---------- dlls/inetcomm/mimeole.c | 24 ++++++++++++------------ dlls/inetcomm/pop3transport.c | 12 ++++++------ dlls/inetcomm/protocol.c | 4 ++-- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in index 2b6eda3454f..b73879a006c 100644 --- a/dlls/inetcomm/Makefile.in +++ b/dlls/inetcomm/Makefile.in @@ -1,7 +1,6 @@ MODULE = inetcomm.dll IMPORTLIB = inetcomm IMPORTS = uuid urlmon propsys oleaut32 ole32 ws2_32 user32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index ec7d34028eb..6a4230d09aa 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -410,11 +410,11 @@ static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODE { case VT_LPSTR: if(cpiSource == CP_UNICODE) cpiSource = GetACP(); - src_len = strlen(pIn->u.pszVal); + src_len = strlen(pIn->pszVal); break; case VT_LPWSTR: cpiSource = CP_UNICODE; - src_len = lstrlenW(pIn->u.pwszVal) * sizeof(WCHAR); + src_len = lstrlenW(pIn->pwszVal) * sizeof(WCHAR); break; default: return E_INVALIDARG; @@ -426,37 +426,37 @@ static HRESULT WINAPI MimeInternat_ConvertString(IMimeInternational *iface, CODE DWORD mode = 0; UINT in_size = src_len, out_size; - hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->u.pszVal, &in_size, + hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->pszVal, &in_size, NULL, &out_size); if(hr == S_OK) /* S_FALSE means the conversion could not be performed */ { out_size += (cpiDest == CP_UNICODE) ? sizeof(WCHAR) : sizeof(char); - pOut->u.pszVal = CoTaskMemAlloc(out_size); - if(!pOut->u.pszVal) + pOut->pszVal = CoTaskMemAlloc(out_size); + if(!pOut->pszVal) hr = E_OUTOFMEMORY; else { mode = 0; in_size = src_len; - hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->u.pszVal, &in_size, - (BYTE*)pOut->u.pszVal, &out_size); + hr = IMultiLanguage_ConvertString(ml, &mode, cpiSource, cpiDest, (BYTE*)pIn->pszVal, &in_size, + (BYTE*)pOut->pszVal, &out_size); if(hr == S_OK) { if(cpiDest == CP_UNICODE) { - pOut->u.pwszVal[out_size / sizeof(WCHAR)] = 0; + pOut->pwszVal[out_size / sizeof(WCHAR)] = 0; pOut->vt = VT_LPWSTR; } else { - pOut->u.pszVal[out_size] = '\0'; + pOut->pszVal[out_size] = '\0'; pOut->vt = VT_LPSTR; } } else - CoTaskMemFree(pOut->u.pszVal); + CoTaskMemFree(pOut->pszVal); } } IMultiLanguage_Release(ml); diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 74c5c670d15..9f2c3b83647 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -738,7 +738,7 @@ static void read_value(header_t *header, char **cur) } header->value.vt = VT_LPSTR; - header->value.u.pszVal = value; + header->value.pszVal = value; *cur = end; } @@ -748,22 +748,22 @@ static void init_content_type(MimeBody *body, header_t *header) char *slash; DWORD len; - slash = strchr(header->value.u.pszVal, '/'); + slash = strchr(header->value.pszVal, '/'); if(!slash) { WARN("malformed context type value\n"); return; } - len = slash - header->value.u.pszVal; + len = slash - header->value.pszVal; body->content_pri_type = HeapAlloc(GetProcessHeap(), 0, len + 1); - memcpy(body->content_pri_type, header->value.u.pszVal, len); + memcpy(body->content_pri_type, header->value.pszVal, len); body->content_pri_type[len] = '\0'; body->content_sub_type = strdupA(slash + 1); } static void init_content_encoding(MimeBody *body, header_t *header) { - const char *encoding = header->value.u.pszVal; + const char *encoding = header->value.pszVal; if(!stricmp(encoding, "base64")) body->encoding = IET_BASE64; @@ -1099,7 +1099,7 @@ static HRESULT WINAPI MimeBody_GetProp( { PropVariantClear(pValue); pValue->vt = VT_LPSTR; - pValue->u.pszVal = strdupA(This->content_pri_type); + pValue->pszVal = strdupA(This->content_pri_type); return S_OK; } @@ -1416,11 +1416,11 @@ static HRESULT WINAPI MimeBody_SetOption( switch(oid) { case OID_SECURITY_HWND_OWNER: - FIXME("OID_SECURITY_HWND_OWNER (value %08x): ignoring\n", pValue->u.ulVal); + FIXME("OID_SECURITY_HWND_OWNER (value %08x): ignoring\n", pValue->ulVal); hr = S_OK; break; case OID_TRANSMIT_BODY_ENCODING: - FIXME("OID_TRANSMIT_BODY_ENCODING (value %08x): ignoring\n", pValue->u.ulVal); + FIXME("OID_TRANSMIT_BODY_ENCODING (value %08x): ignoring\n", pValue->ulVal); hr = S_OK; break; default: @@ -2745,16 +2745,16 @@ static HRESULT WINAPI MimeMessage_SetOption( switch(oid) { case OID_HIDE_TNEF_ATTACHMENTS: - FIXME("OID_HIDE_TNEF_ATTACHMENTS (value %d): ignoring\n", pValue->u.boolVal); + FIXME("OID_HIDE_TNEF_ATTACHMENTS (value %d): ignoring\n", pValue->boolVal); break; case OID_SHOW_MACBINARY: - FIXME("OID_SHOW_MACBINARY (value %d): ignoring\n", pValue->u.boolVal); + FIXME("OID_SHOW_MACBINARY (value %d): ignoring\n", pValue->boolVal); break; case OID_SAVEBODY_KEEPBOUNDARY: - FIXME("OID_SAVEBODY_KEEPBOUNDARY (value %d): ignoring\n", pValue->u.boolVal); + FIXME("OID_SAVEBODY_KEEPBOUNDARY (value %d): ignoring\n", pValue->boolVal); break; case OID_CLEANUP_TREE_ON_SAVE: - FIXME("OID_CLEANUP_TREE_ON_SAVE (value %d): ignoring\n", pValue->u.boolVal); + FIXME("OID_CLEANUP_TREE_ON_SAVE (value %d): ignoring\n", pValue->boolVal); break; default: FIXME("Unhandled oid %08x\n", oid); diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 1c8bc91bb00..053a23a1ed2 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -331,12 +331,12 @@ static HRESULT POP3Transport_ParseResponse(POP3Transport *This, char *pszRespons { switch (This->command) { - case POP3_UIDL: hr = parse_uidl_response(This, &pResponse->u.rUidlInfo); break; - case POP3_STAT: hr = parse_stat_response(This, &pResponse->u.rStatInfo); break; - case POP3_LIST: hr = parse_list_response(This, &pResponse->u.rListInfo); break; - case POP3_DELE: hr = parse_dele_response(This, &pResponse->u.dwPopId); break; - case POP3_RETR: hr = parse_retr_response(This, &pResponse->u.rRetrInfo); break; - case POP3_TOP: hr = parse_top_response(This, &pResponse->u.rTopInfo); break; + case POP3_UIDL: hr = parse_uidl_response(This, &pResponse->rUidlInfo); break; + case POP3_STAT: hr = parse_stat_response(This, &pResponse->rStatInfo); break; + case POP3_LIST: hr = parse_list_response(This, &pResponse->rListInfo); break; + case POP3_DELE: hr = parse_dele_response(This, &pResponse->dwPopId); break; + case POP3_RETR: hr = parse_retr_response(This, &pResponse->rRetrInfo); break; + case POP3_TOP: hr = parse_top_response(This, &pResponse->rTopInfo); break; default: This->state = STATE_DONE; break; diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index e272689a9ac..620d171e737 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -141,7 +141,7 @@ static HRESULT on_mime_message_available(MimeHtmlProtocol *protocol, IMimeMessag if(FAILED(hres)) return report_result(protocol, hres); - found = !lstrcmpW(protocol->location, value.u.pwszVal); + found = !lstrcmpW(protocol->location, value.pwszVal); PropVariantClear(&value); }while(!found); }else { @@ -159,7 +159,7 @@ static HRESULT on_mime_message_available(MimeHtmlProtocol *protocol, IMimeMessag value.vt = VT_LPWSTR; hres = IMimeBody_GetProp(mime_body, "content-type", 0, &value); if(SUCCEEDED(hres)) { - hres = IInternetProtocolSink_ReportProgress(protocol->sink, BINDSTATUS_MIMETYPEAVAILABLE, value.u.pwszVal); + hres = IInternetProtocolSink_ReportProgress(protocol->sink, BINDSTATUS_MIMETYPEAVAILABLE, value.pwszVal); PropVariantClear(&value); }

1 0

Jacek Caban : propsys/tests: Use nameless unions.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: 497de3cc19f971808ca4105f52038e61dc818db1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=497de3cc19f971808ca4105f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 27 16:01:51 2021 +0100 propsys/tests: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/Makefile.in | 1 - dlls/propsys/tests/propsys.c | 248 ++++++++++++++++++++--------------------- 2 files changed, 124 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=497de3cc19f971808ca4…

1 0

Jacek Caban : propsys: Use nameless unions.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: 1d8e5079f0e53a767a783e5107f57f04c1897951 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d8e5079f0e53a767a783e51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 27 16:01:46 2021 +0100 propsys: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/Makefile.in | 1 - dlls/propsys/propvar.c | 140 +++++++++++++++++++++++------------------------ 2 files changed, 70 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d8e5079f0e53a767a78…

1 0

Jacek Caban : gdiplus: Use nameless unions.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: 883298f627072efa25e6ad6e1ff865a1d1547043 URL: https://source.winehq.org/git/wine.git/?a=commit;h=883298f627072efa25e6ad6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 27 16:02:12 2021 +0100 gdiplus: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/Makefile.in | 1 - dlls/gdiplus/image.c | 58 ++++++++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index d4f6d2a8705..e73e7d4e897 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -2,7 +2,6 @@ MODULE = gdiplus.dll IMPORTLIB = gdiplus IMPORTS = uuid shlwapi ole32 user32 gdi32 DELAYIMPORTS = windowscodecs -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 552dcf83e9a..ead76fc4b27 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2467,7 +2467,7 @@ GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID *list list[i] = 0; continue; } - list[i] = id.u.uiVal; + list[i] = id.uiVal; } IWICEnumMetadataItem_Release(enumerator); @@ -2484,25 +2484,25 @@ static UINT propvariant_size(PROPVARIANT *value) case VT_I1: case VT_UI1: if (!(value->vt & VT_VECTOR)) return 1; - return value->u.caub.cElems; + return value->caub.cElems; case VT_I2: case VT_UI2: if (!(value->vt & VT_VECTOR)) return 2; - return value->u.caui.cElems * 2; + return value->caui.cElems * 2; case VT_I4: case VT_UI4: case VT_R4: if (!(value->vt & VT_VECTOR)) return 4; - return value->u.caul.cElems * 4; + return value->caul.cElems * 4; case VT_I8: case VT_UI8: case VT_R8: if (!(value->vt & VT_VECTOR)) return 8; - return value->u.cauh.cElems * 8; + return value->cauh.cElems * 8; case VT_LPSTR: - return value->u.pszVal ? strlen(value->u.pszVal) + 1 : 0; + return value->pszVal ? strlen(value->pszVal) + 1 : 0; case VT_BLOB: - return value->u.blob.cbSize; + return value->blob.cbSize; default: FIXME("not supported variant type %d\n", value->vt); return 0; @@ -2545,7 +2545,7 @@ GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID propid, UINT if (!reader) return PropertyNotFound; id.vt = VT_UI2; - id.u.uiVal = propid; + id.uiVal = propid; hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); if (FAILED(hr)) return PropertyNotFound; @@ -2610,38 +2610,38 @@ static GpStatus propvariant_to_item(PROPVARIANT *value, PropertyItem *item, case VT_I1: case VT_UI1: if (!(value->vt & VT_VECTOR)) - *(BYTE *)item->value = value->u.bVal; + *(BYTE *)item->value = value->bVal; else - memcpy(item->value, value->u.caub.pElems, item_size); + memcpy(item->value, value->caub.pElems, item_size); break; case VT_I2: case VT_UI2: if (!(value->vt & VT_VECTOR)) - *(USHORT *)item->value = value->u.uiVal; + *(USHORT *)item->value = value->uiVal; else - memcpy(item->value, value->u.caui.pElems, item_size); + memcpy(item->value, value->caui.pElems, item_size); break; case VT_I4: case VT_UI4: case VT_R4: if (!(value->vt & VT_VECTOR)) - *(ULONG *)item->value = value->u.ulVal; + *(ULONG *)item->value = value->ulVal; else - memcpy(item->value, value->u.caul.pElems, item_size); + memcpy(item->value, value->caul.pElems, item_size); break; case VT_I8: case VT_UI8: case VT_R8: if (!(value->vt & VT_VECTOR)) - *(ULONGLONG *)item->value = value->u.uhVal.QuadPart; + *(ULONGLONG *)item->value = value->uhVal.QuadPart; else - memcpy(item->value, value->u.cauh.pElems, item_size); + memcpy(item->value, value->cauh.pElems, item_size); break; case VT_LPSTR: - memcpy(item->value, value->u.pszVal, item_size); + memcpy(item->value, value->pszVal, item_size); break; case VT_BLOB: - memcpy(item->value, value->u.blob.pBlobData, item_size); + memcpy(item->value, value->blob.pBlobData, item_size); break; default: FIXME("not supported variant type %d\n", value->vt); @@ -2698,7 +2698,7 @@ GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID propid, UINT size if (!reader) return PropertyNotFound; id.vt = VT_UI2; - id.u.uiVal = propid; + id.uiVal = propid; hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); if (FAILED(hr)) return PropertyNotFound; @@ -2851,7 +2851,7 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, { item = heap_alloc(item_size + sizeof(*item)); - propvariant_to_item(&value, item, item_size + sizeof(*item), id.u.uiVal); + propvariant_to_item(&value, item, item_size + sizeof(*item), id.uiVal); buf[i].id = item->id; buf[i].type = item->type; buf[i].length = item_size; @@ -3040,12 +3040,12 @@ static BOOL get_bool_property(IWICMetadataReader *reader, const GUID *guid, cons PropVariantInit(&value); id.vt = VT_LPWSTR; - id.u.pwszVal = CoTaskMemAlloc((lstrlenW(prop_name) + 1) * sizeof(WCHAR)); - if (!id.u.pwszVal) return FALSE; - lstrcpyW(id.u.pwszVal, prop_name); + id.pwszVal = CoTaskMemAlloc((lstrlenW(prop_name) + 1) * sizeof(WCHAR)); + if (!id.pwszVal) return FALSE; + lstrcpyW(id.pwszVal, prop_name); hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); if (hr == S_OK && value.vt == VT_BOOL) - ret = value.u.boolVal; + ret = value.boolVal; PropVariantClear(&id); PropVariantClear(&value); @@ -3067,9 +3067,9 @@ static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, PropVariantInit(&value); id.vt = VT_LPWSTR; - id.u.pwszVal = CoTaskMemAlloc((lstrlenW(prop_name) + 1) * sizeof(WCHAR)); - if (!id.u.pwszVal) return NULL; - lstrcpyW(id.u.pwszVal, prop_name); + id.pwszVal = CoTaskMemAlloc((lstrlenW(prop_name) + 1) * sizeof(WCHAR)); + if (!id.pwszVal) return NULL; + lstrcpyW(id.pwszVal, prop_name); hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); if (hr == S_OK) { @@ -3415,7 +3415,7 @@ static ULONG get_ulong_by_index(IWICMetadataReader* reader, ULONG index) switch (value.vt) { case VT_UI4: - result = value.u.ulVal; + result = value.ulVal; break; default: ERR("unhandled case %u\n", value.vt); @@ -3477,7 +3477,7 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI if (name.vt == VT_LPSTR) { for (j = 0; j < ARRAY_SIZE(keywords); j++) - if (!strcmp(keywords[j].name, name.u.pszVal)) + if (!strcmp(keywords[j].name, name.pszVal)) break; if (j < ARRAY_SIZE(keywords) && !keywords[j].seen) {

1 0

Jacek Caban : inetcomm/tests: Use nameless unions.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: 23ebe1ed7fe6b37ba80a5879d58fb8f32dfa7b71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ebe1ed7fe6b37ba80a5879… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 27 16:02:06 2021 +0100 inetcomm/tests: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/Makefile.in | 1 - dlls/inetcomm/tests/mimeintl.c | 16 +++++----- dlls/inetcomm/tests/mimeole.c | 66 ++++++++++++++++++++--------------------- 3 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=23ebe1ed7fe6b37ba80a…

1 0

Nikolay Sivov : dwrite: Introduce callback interface to initialize freetype face objects.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: wine Branch: master Commit: f3d777ba7dd9ca662c984bfd7e3a90fddb30e311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3d777ba7dd9ca662c984bfd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 29 10:48:51 2021 +0300 dwrite: Introduce callback interface to initialize freetype face objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 17 +++++-- dlls/dwrite/font.c | 79 +++++++++++++++++++++++++++++++ dlls/dwrite/freetype.c | 108 ++++++++++++++++++------------------------- dlls/dwrite/main.c | 6 ++- 4 files changed, 141 insertions(+), 69 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 47be661555c..5e41455f66d 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -486,9 +486,6 @@ extern int dwrite_outline_push_tag(struct dwrite_outline *outline, unsigned char extern int dwrite_outline_push_points(struct dwrite_outline *outline, const D2D1_POINT_2F *points, unsigned int count) DECLSPEC_HIDDEN; -extern BOOL init_freetype(void) DECLSPEC_HIDDEN; -extern void release_freetype(void) DECLSPEC_HIDDEN; - extern HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; @@ -734,3 +731,17 @@ extern HRESULT shape_get_typographic_features(struct scriptshaping_context *cont unsigned int max_tagcount, unsigned int *actual_tagcount, unsigned int *tags) DECLSPEC_HIDDEN; extern HRESULT shape_check_typographic_feature(struct scriptshaping_context *context, const unsigned int *scripts, unsigned int tag, unsigned int glyph_count, const UINT16 *glyphs, UINT8 *feature_applies) DECLSPEC_HIDDEN; + +struct font_data_context; +extern HMODULE dwrite_module DECLSPEC_HIDDEN; + +struct font_callback_funcs +{ + int (CDECL *get_font_data)(void *key, const void **data_ptr, UINT64 *data_size, unsigned int *index, + struct font_data_context **context); + void (CDECL *release_font_data)(struct font_data_context *context); +}; + +extern NTSTATUS CDECL init_font_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) DECLSPEC_HIDDEN; +extern void init_font_backend(void) DECLSPEC_HIDDEN; +extern void release_font_backend(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 245a59d5f54..ca7ce8ca53a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7958,3 +7958,82 @@ HRESULT create_fontset_builder(IDWriteFactory7 *factory, IDWriteFontSetBuilder2 return S_OK; } + +struct font_data_context +{ + IDWriteFontFileStream *stream; + void *context; +}; + +static int CDECL get_font_data_cb(void *key, const void **data_ptr, UINT64 *data_size, + unsigned int *index, struct font_data_context **ret_context) +{ + IDWriteFontFace *fontface = key; + struct font_data_context *context; + IDWriteFontFileStream *stream; + IDWriteFontFile *file; + unsigned int count; + void *data_context; + HRESULT hr; + + *ret_context = NULL; + + count = 1; + if (FAILED(IDWriteFontFace_GetFiles(fontface, &count, &file))) return 1; + + hr = get_filestream_from_file(file, &stream); + IDWriteFontFile_Release(file); + if (FAILED(hr)) return 1; + + hr = IDWriteFontFileStream_GetFileSize(stream, data_size); + if (FAILED(hr)) + { + IDWriteFontFileStream_Release(stream); + return 1; + } + + hr = IDWriteFontFileStream_ReadFileFragment(stream, data_ptr, 0, *data_size, &data_context); + if (FAILED(hr)) + { + IDWriteFontFileStream_Release(stream); + return 1; + } + + if (!(context = heap_alloc(sizeof(*context)))) + { + IDWriteFontFileStream_Release(stream); + return 1; + } + + context->stream = stream; + context->context = data_context; + + *ret_context = context; + *index = IDWriteFontFace_GetIndex(fontface); + + return 0; +} + +static void CDECL release_font_data_cb(struct font_data_context *context) +{ + if (!context) return; + IDWriteFontFileStream_ReleaseFileFragment(context->stream, context->context); + IDWriteFontFileStream_Release(context->stream); + heap_free(context); +} + +struct font_callback_funcs callback_funcs = +{ + get_font_data_cb, + release_font_data_cb, +}; + +void init_font_backend(void) +{ + init_font_lib(dwrite_module, DLL_PROCESS_ATTACH, &callback_funcs, NULL); +} + +void release_font_backend(void) +{ + init_font_lib(dwrite_module, DLL_PROCESS_DETACH, &callback_funcs, NULL); +} diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 9e4001d11c2..c4bbbd4624c 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -31,6 +31,8 @@ #include FT_TRUETYPE_TABLES_H #endif /* HAVE_FT2BUILD_H */ +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "wine/debug.h" @@ -60,6 +62,8 @@ typedef struct FT_Int patch; } FT_Version_t; +static const struct font_callback_funcs *callback_funcs; + #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(FT_Done_FreeType); MAKE_FUNCPTR(FT_Done_Glyph); @@ -92,86 +96,44 @@ MAKE_FUNCPTR(FTC_Manager_RemoveFaceID); #undef MAKE_FUNCPTR static FT_Error (*pFT_Outline_EmboldenXY)(FT_Outline *, FT_Pos, FT_Pos); -struct face_finalizer_data -{ - IDWriteFontFileStream *stream; - void *context; -}; - static void face_finalizer(void *object) { FT_Face face = object; - struct face_finalizer_data *data = (struct face_finalizer_data *)face->generic.data; - - IDWriteFontFileStream_ReleaseFileFragment(data->stream, data->context); - IDWriteFontFileStream_Release(data->stream); - heap_free(data); + callback_funcs->release_font_data((struct font_data_context *)face->generic.data); } static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointer request_data, FT_Face *face) { - IDWriteFontFace *fontface = (IDWriteFontFace*)face_id; - IDWriteFontFileStream *stream; - IDWriteFontFile *file; + struct font_data_context *context; const void *data_ptr; - UINT32 index, count; FT_Error fterror; UINT64 data_size; - void *context; - HRESULT hr; + UINT32 index; *face = NULL; - if (!fontface) { + if (!face_id) + { WARN("NULL fontface requested.\n"); return FT_Err_Ok; } - count = 1; - hr = IDWriteFontFace_GetFiles(fontface, &count, &file); - if (FAILED(hr)) - return FT_Err_Ok; - - hr = get_filestream_from_file(file, &stream); - IDWriteFontFile_Release(file); - if (FAILED(hr)) + if (callback_funcs->get_font_data(face_id, &data_ptr, &data_size, &index, &context)) return FT_Err_Ok; - hr = IDWriteFontFileStream_GetFileSize(stream, &data_size); - if (FAILED(hr)) { - fterror = FT_Err_Invalid_Stream_Read; - goto fail; - } - - hr = IDWriteFontFileStream_ReadFileFragment(stream, &data_ptr, 0, data_size, &context); - if (FAILED(hr)) { - fterror = FT_Err_Invalid_Stream_Read; - goto fail; - } - - index = IDWriteFontFace_GetIndex(fontface); fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, face); - if (fterror == FT_Err_Ok) { - struct face_finalizer_data *data; - - data = heap_alloc(sizeof(*data)); - data->stream = stream; - data->context = context; - - (*face)->generic.data = data; + if (fterror == FT_Err_Ok) + { + (*face)->generic.data = context; (*face)->generic.finalizer = face_finalizer; - return fterror; } else - IDWriteFontFileStream_ReleaseFileFragment(stream, context); - -fail: - IDWriteFontFileStream_Release(stream); + callback_funcs->release_font_data(context); return fterror; } -BOOL init_freetype(void) +static BOOL init_freetype(void) { FT_Version_t FT_Version; @@ -243,12 +205,6 @@ sym_not_found: return FALSE; } -void release_freetype(void) -{ - pFTC_Manager_Done(cache_manager); - pFT_Done_FreeType(library); -} - void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) { EnterCriticalSection(&freetype_cs); @@ -790,17 +746,22 @@ INT32 freetype_get_glyph_advance(IDWriteFontFace5 *fontface, FLOAT emSize, UINT1 return advance; } -#else /* HAVE_FREETYPE */ - -BOOL init_freetype(void) +static NTSTATUS init_freetype_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) { - return FALSE; + callback_funcs = ptr_in; + if (!init_freetype()) return STATUS_DLL_NOT_FOUND; + return STATUS_SUCCESS; } -void release_freetype(void) +static NTSTATUS release_freetype_lib(void) { + pFTC_Manager_Done(cache_manager); + pFT_Done_FreeType(library); + return STATUS_SUCCESS; } +#else /* HAVE_FREETYPE */ + void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) { } @@ -838,4 +799,23 @@ INT32 freetype_get_glyph_advance(IDWriteFontFace5 *fontface, FLOAT emSize, UINT1 return 0; } +static NTSTATUS init_freetype_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) +{ + return STATUS_DLL_NOT_FOUND; +} + +static NTSTATUS release_freetype_lib(void) +{ + return STATUS_DLL_NOT_FOUND; +} + #endif /* HAVE_FREETYPE */ + +NTSTATUS CDECL init_font_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) +{ + if (reason == DLL_PROCESS_ATTACH) + return init_freetype_lib(module, reason, ptr_in, ptr_out); + else if (reason == DLL_PROCESS_DETACH) + return release_freetype_lib(); + return STATUS_SUCCESS; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 3326b1550ce..41b81ae951b 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +HMODULE dwrite_module = 0; static IDWriteFactory7 *shared_factory; static void release_shared_factory(IDWriteFactory7 *factory); @@ -42,14 +43,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) switch (reason) { case DLL_PROCESS_ATTACH: + dwrite_module = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); - init_freetype(); + init_font_backend(); init_local_fontfile_loader(); break; case DLL_PROCESS_DETACH: if (reserved) break; release_shared_factory(shared_factory); - release_freetype(); + release_font_backend(); } return TRUE; }

1 0

Francois Gouget : testbot/TestLauncher: Import some sanity checks from WineTest.
by Alexandre Julliard March 29, 2021

March 29, 2021

Module: tools Branch: master Commit: ce576c3c9760be0e3329da9b6e08851bec13403d URL: https://source.winehq.org/git/tools.git/?a=commit;h=ce576c3c9760be0e3329da9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 29 16:01:52 2021 +0200 testbot/TestLauncher: Import some sanity checks from WineTest. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 106 ++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 2a423d2..b024714 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -21,6 +21,7 @@ */ #include <stdio.h> +#include <assert.h> #include <errno.h> #include <windows.h> @@ -49,6 +50,90 @@ void Error(const char* Format, ...) } +/* + * Configuration / wineprefix sanity checks (from winetest.exe) + */ + +static BOOL is_wow64(void) +{ + BOOL is_wow64; + BOOL (WINAPI *pIsWow64Process)(HANDLE hProcess, PBOOL Wow64Process); + HANDLE hkernel32 = GetModuleHandleA("kernel32.dll"); + pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); + if (!pIsWow64Process || !pIsWow64Process(GetCurrentProcess(), &is_wow64)) + return FALSE; + return is_wow64; +} + +static BOOL running_under_wine (void) +{ + HMODULE module = GetModuleHandleA("ntdll.dll"); + + if (!module) return FALSE; + return (GetProcAddress(module, "wine_server_call") != NULL); +} + +static BOOL check_mount_mgr(void) +{ + HANDLE handle = CreateFileA( "\\\\.\\MountPointManager", GENERIC_READ, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) return FALSE; + CloseHandle( handle ); + return TRUE; +} + +static BOOL check_wow64_registry(void) +{ + char buffer[MAX_PATH]; + DWORD type, size = MAX_PATH; + HKEY hkey; + BOOL ret; + + if (!is_wow64()) return TRUE; + if (RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey )) + return FALSE; + ret = !RegQueryValueExA( hkey, "ProgramFilesDir (x86)", NULL, &type, (BYTE *)buffer, &size ); + RegCloseKey( hkey ); + return ret; +} + +static BOOL check_display_driver(void) +{ + HWND hwnd = CreateWindowA( "STATIC", "", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, + 0, 0, GetModuleHandleA(0), 0 ); + if (!hwnd) return FALSE; + DestroyWindow( hwnd ); + return TRUE; +} + +static BOOL running_on_visible_desktop (void) +{ + HWND desktop; + HMODULE huser32 = GetModuleHandleA("user32.dll"); + HWINSTA (WINAPI *pGetProcessWindowStation)(void); + BOOL (WINAPI *pGetUserObjectInformationA)(HANDLE,INT,LPVOID,DWORD,LPDWORD); + + pGetProcessWindowStation = (void *)GetProcAddress(huser32, "GetProcessWindowStation"); + pGetUserObjectInformationA = (void *)GetProcAddress(huser32, "GetUserObjectInformationA"); + + desktop = GetDesktopWindow(); + if (!GetWindowLongPtrW(desktop, GWLP_WNDPROC)) /* Win9x */ + return IsWindowVisible(desktop); + + if (pGetProcessWindowStation && pGetUserObjectInformationA) + { + DWORD len; + HWINSTA wstation; + USEROBJECTFLAGS uoflags; + + wstation = pGetProcessWindowStation(); + assert(pGetUserObjectInformationA(wstation, UOI_FLAGS, &uoflags, sizeof(uoflags), &len)); + return (uoflags.dwFlags & WSF_VISIBLE) != 0; + } + return IsWindowVisible(desktop); +} + + /* * Missing dll and entry point detection. */ @@ -152,6 +237,8 @@ int main(int argc, char *argv[]) p++; } + /* Command line parsing and validation */ + TimeOut = INFINITE; CommandLine = NULL; Arg = 1; @@ -230,6 +317,25 @@ int main(int argc, char *argv[]) return 1; } + /* Configuration / wineprefix sanity checks (from winetest.exe) */ + + if (!running_on_visible_desktop()) + Error("Tests must be run on a visible desktop\n"); + + if (running_under_wine()) + { + if (!check_mount_mgr()) + Error("Mount manager not running, most likely your WINEPREFIX wasn't created correctly\n"); + + if (!check_wow64_registry()) + Error("WoW64 keys missing, most likely your WINEPREFIX wasn't created correctly\n"); + + if (!check_display_driver()) + Error("Unable to create a window, the display driver is not working\n"); + } + + /* Run the test */ + Start = GetTickCount(); printf("%s:%s start -\n", TestName, Subtest); fflush(stdout);

1 0