wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Nikolay Sivov : gdiplus/metafile: Fully initialize record header on allocation.
by Alexandre Julliard 29 Mar '21

29 Mar '21

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 29 Mar '21

29 Mar '21

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

Nikolay Sivov : mf/session: Handle MF_TOPONODE_DISABLE_PREROLL on sink nodes.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: 4634fd4ccb8dc3069b12b712abaf1585ba864431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4634fd4ccb8dc3069b12b712… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 29 10:11:24 2021 +0300 mf/session: Handle MF_TOPONODE_DISABLE_PREROLL on sink nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index aa96ffd33ca..c2334f82d62 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1232,6 +1232,7 @@ static DWORD session_get_object_rate_caps(IUnknown *object) static HRESULT session_add_media_sink(struct media_session *session, IMFTopologyNode *node, IMFMediaSink *sink) { struct media_sink *media_sink; + unsigned int disable_preroll = 0; DWORD flags; LIST_FOR_EACH_ENTRY(media_sink, &session->presentation.sinks, struct media_sink, entry) @@ -1248,7 +1249,8 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology IMFMediaSink_QueryInterface(media_sink->sink, &IID_IMFMediaEventGenerator, (void **)&media_sink->event_generator); - if (SUCCEEDED(IMFMediaSink_GetCharacteristics(sink, &flags)) && flags & MEDIASINK_CAN_PREROLL) + IMFTopologyNode_GetUINT32(node, &MF_TOPONODE_DISABLE_PREROLL, &disable_preroll); + if (SUCCEEDED(IMFMediaSink_GetCharacteristics(sink, &flags)) && flags & MEDIASINK_CAN_PREROLL && !disable_preroll) { if (SUCCEEDED(IMFMediaSink_QueryInterface(media_sink->sink, &IID_IMFMediaSinkPreroll, (void **)&media_sink->preroll))) session->presentation.flags |= SESSION_FLAG_NEEDS_PREROLL;

1 0

Jacek Caban : amstream/tests: Move WINE_NO_NAMELESS_EXTENSION to source file.
by Alexandre Julliard 29 Mar '21

29 Mar '21

Module: wine Branch: master Commit: d614d048330ebe6943e0aa1231211602579cd67a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d614d048330ebe6943e0aa12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 27 16:02:21 2021 +0100 amstream/tests: Move WINE_NO_NAMELESS_EXTENSION to source file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/Makefile.in | 1 - dlls/amstream/tests/amstream.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in index 48b07d1b097..eb756ddf39d 100644 --- a/dlls/amstream/tests/Makefile.in +++ b/dlls/amstream/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = amstream.dll IMPORTS = strmbase strmiids uuid ddraw ole32 user32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ amstream.c diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f422a6a8db9..2c5252d8eed 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -20,6 +20,7 @@ #define COBJMACROS #define NONAMELESSUNION +#define WINE_NO_NAMELESS_EXTENSION #include "wine/test.h" #include "dshow.h"

1 0

Jacek Caban : gdiplus: Use nameless unions.
by Alexandre Julliard 29 Mar '21

29 Mar '21

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 29 Mar '21

29 Mar '21

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

Jacek Caban : inetcomm: Use nameless unions.
by Alexandre Julliard 29 Mar '21

29 Mar '21

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 29 Mar '21

29 Mar '21

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 29 Mar '21

29 Mar '21

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

Francois Gouget : testbot/TestLauncher: Import some sanity checks from WineTest.
by Alexandre Julliard 29 Mar '21

29 Mar '21

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

← Newer
1
...
9
10
11
12
13
14
15
...
117
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021