May 2020 - wine-commits

Zebediah Figura : quartz: Retrieve the video format directly from the pin.
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 1ba3f252b5d6c8eb082b6517a10596570282bf38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ba3f252b5d6c8eb082b6517… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 19:28:49 2020 -0500 quartz: Retrieve the video format directly from the pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 3 +-- dlls/quartz/video.c | 43 ++++++++++++++++++++++++------------------- dlls/quartz/videorenderer.c | 23 ----------------------- dlls/quartz/vmr9.c | 23 ----------------------- 4 files changed, 25 insertions(+), 67 deletions(-) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 9c39b642c4..2aca600074 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -31,6 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "dshow.h" +#include "dvdmedia.h" #include "wine/debug.h" #include "wine/heap.h" #include "wine/strmbase.h" @@ -174,7 +175,6 @@ typedef struct tagBaseControlVideo typedef HRESULT (WINAPI *BaseControlVideo_GetSourceRect)(BaseControlVideo* This, RECT *pSourceRect); typedef HRESULT (WINAPI *BaseControlVideo_GetStaticImage)(BaseControlVideo* This, LONG *pBufferSize, LONG *pDIBImage); typedef HRESULT (WINAPI *BaseControlVideo_GetTargetRect)(BaseControlVideo* This, RECT *pTargetRect); -typedef VIDEOINFOHEADER* (WINAPI *BaseControlVideo_GetVideoFormat)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultSourceRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_IsDefaultTargetRect)(BaseControlVideo* This); typedef HRESULT (WINAPI *BaseControlVideo_SetDefaultSourceRect)(BaseControlVideo* This); @@ -187,7 +187,6 @@ typedef struct BaseControlVideoFuncTable BaseControlVideo_GetSourceRect pfnGetSourceRect; BaseControlVideo_GetStaticImage pfnGetStaticImage; BaseControlVideo_GetTargetRect pfnGetTargetRect; - BaseControlVideo_GetVideoFormat pfnGetVideoFormat; BaseControlVideo_IsDefaultSourceRect pfnIsDefaultSourceRect; BaseControlVideo_IsDefaultTargetRect pfnIsDefaultTargetRect; BaseControlVideo_SetDefaultSourceRect pfnSetDefaultSourceRect; diff --git a/dlls/quartz/video.c b/dlls/quartz/video.c index 11baee261d..213e3ce92d 100644 --- a/dlls/quartz/video.c +++ b/dlls/quartz/video.c @@ -120,9 +120,24 @@ static HRESULT WINAPI basic_video_Invoke(IBasicVideo *iface, DISPID id, REFIID i return hr; } +static const VIDEOINFOHEADER *get_video_format(BaseControlVideo *video) +{ + /* Members of VIDEOINFOHEADER up to bmiHeader are identical to those of + * VIDEOINFOHEADER2. */ + return (const VIDEOINFOHEADER *)video->pPin->mt.pbFormat; +} + +static const BITMAPINFOHEADER *get_bitmap_header(BaseControlVideo *video) +{ + const AM_MEDIA_TYPE *mt = &video->pPin->mt; + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + return &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; +} + static HRESULT WINAPI basic_video_get_AvgTimePerFrame(IBasicVideo *iface, REFTIME *pAvgTimePerFrame) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); if (!pAvgTimePerFrame) @@ -132,14 +147,12 @@ static HRESULT WINAPI basic_video_get_AvgTimePerFrame(IBasicVideo *iface, REFTIM TRACE("(%p/%p)->(%p)\n", This, iface, pAvgTimePerFrame); - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pAvgTimePerFrame = vih->AvgTimePerFrame; + *pAvgTimePerFrame = get_video_format(This)->AvgTimePerFrame; return S_OK; } static HRESULT WINAPI basic_video_get_BitRate(IBasicVideo *iface, LONG *pBitRate) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pBitRate); @@ -149,14 +162,12 @@ static HRESULT WINAPI basic_video_get_BitRate(IBasicVideo *iface, LONG *pBitRate if (!This->pPin->peer) return VFW_E_NOT_CONNECTED; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pBitRate = vih->dwBitRate; + *pBitRate = get_video_format(This)->dwBitRate; return S_OK; } static HRESULT WINAPI basic_video_get_BitErrorRate(IBasicVideo *iface, LONG *pBitErrorRate) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pBitErrorRate); @@ -166,37 +177,32 @@ static HRESULT WINAPI basic_video_get_BitErrorRate(IBasicVideo *iface, LONG *pBi if (!This->pPin->peer) return VFW_E_NOT_CONNECTED; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pBitErrorRate = vih->dwBitErrorRate; + *pBitErrorRate = get_video_format(This)->dwBitErrorRate; return S_OK; } static HRESULT WINAPI basic_video_get_VideoWidth(IBasicVideo *iface, LONG *pVideoWidth) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoWidth); if (!pVideoWidth) return E_POINTER; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pVideoWidth = vih->bmiHeader.biWidth; + *pVideoWidth = get_bitmap_header(This)->biWidth; return S_OK; } static HRESULT WINAPI basic_video_get_VideoHeight(IBasicVideo *iface, LONG *pVideoHeight) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); TRACE("(%p/%p)->(%p)\n", This, iface, pVideoHeight); if (!pVideoHeight) return E_POINTER; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pVideoHeight = abs(vih->bmiHeader.biHeight); + *pVideoHeight = abs(get_bitmap_header(This)->biHeight); return S_OK; } @@ -550,16 +556,15 @@ static HRESULT WINAPI basic_video_SetDefaultDestinationPosition(IBasicVideo *ifa static HRESULT WINAPI basic_video_GetVideoSize(IBasicVideo *iface, LONG *pWidth, LONG *pHeight) { - VIDEOINFOHEADER *vih; BaseControlVideo *This = impl_from_IBasicVideo(iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(This); TRACE("(%p/%p)->(%p, %p)\n", This, iface, pWidth, pHeight); if (!pWidth || !pHeight) return E_POINTER; - vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pHeight = vih->bmiHeader.biHeight; - *pWidth = vih->bmiHeader.biWidth; + *pHeight = bitmap_header->biHeight; + *pWidth = bitmap_header->biWidth; return S_OK; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 6e31e19695..b7a82e4faa 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -352,28 +352,6 @@ static HRESULT WINAPI VideoRenderer_GetTargetRect(BaseControlVideo* iface, RECT return S_OK; } -static VIDEOINFOHEADER* WINAPI VideoRenderer_GetVideoFormat(BaseControlVideo* iface) -{ - struct video_renderer *This = impl_from_BaseControlVideo(iface); - AM_MEDIA_TYPE *pmt; - - TRACE("(%p/%p)\n", This, iface); - - pmt = &This->renderer.sink.pin.mt; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { - return (VIDEOINFOHEADER*)pmt->pbFormat; - } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { - static VIDEOINFOHEADER vih; - VIDEOINFOHEADER2 *vih2 = (VIDEOINFOHEADER2*)pmt->pbFormat; - memcpy(&vih,vih2,sizeof(VIDEOINFOHEADER)); - memcpy(&vih.bmiHeader, &vih2->bmiHeader, sizeof(BITMAPINFOHEADER)); - return &vih; - } else { - ERR("Unknown format type %s\n", qzdebugstr_guid(&pmt->formattype)); - return NULL; - } -} - static HRESULT WINAPI VideoRenderer_IsDefaultSourceRect(BaseControlVideo* iface) { struct video_renderer *This = impl_from_BaseControlVideo(iface); @@ -430,7 +408,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VideoRenderer_GetSourceRect, VideoRenderer_GetStaticImage, VideoRenderer_GetTargetRect, - VideoRenderer_GetVideoFormat, VideoRenderer_IsDefaultSourceRect, VideoRenderer_IsDefaultTargetRect, VideoRenderer_SetDefaultSourceRect, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8fdcb3809b..abca2a03d1 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -772,28 +772,6 @@ static HRESULT WINAPI VMR9_GetTargetRect(BaseControlVideo* This, RECT *pTargetRe return S_OK; } -static VIDEOINFOHEADER* WINAPI VMR9_GetVideoFormat(BaseControlVideo* This) -{ - struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - AM_MEDIA_TYPE *pmt; - - TRACE("(%p/%p)\n", pVMR9, This); - - pmt = &pVMR9->renderer.sink.pin.mt; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { - return (VIDEOINFOHEADER*)pmt->pbFormat; - } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { - static VIDEOINFOHEADER vih; - VIDEOINFOHEADER2 *vih2 = (VIDEOINFOHEADER2*)pmt->pbFormat; - memcpy(&vih,vih2,sizeof(VIDEOINFOHEADER)); - memcpy(&vih.bmiHeader, &vih2->bmiHeader, sizeof(BITMAPINFOHEADER)); - return &vih; - } else { - ERR("Unknown format type %s\n", qzdebugstr_guid(&pmt->formattype)); - return NULL; - } -} - static HRESULT WINAPI VMR9_IsDefaultSourceRect(BaseControlVideo* This) { struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); @@ -850,7 +828,6 @@ static const BaseControlVideoFuncTable renderer_BaseControlVideoFuncTable = { VMR9_GetSourceRect, VMR9_GetStaticImage, VMR9_GetTargetRect, - VMR9_GetVideoFormat, VMR9_IsDefaultSourceRect, VMR9_IsDefaultTargetRect, VMR9_SetDefaultSourceRect,

1 0

Zebediah Figura : quartz: Rename "baseControlWindow" to "window".
by Alexandre Julliard 07 May '20

07 May '20

Module: wine Branch: master Commit: 855f17f3498802f8023213127607f37c3a58b88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=855f17f3498802f802321312… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 19:28:48 2020 -0500 quartz: Rename "baseControlWindow" to "window". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 57 +++++++++++++++++++++++---------------------- dlls/quartz/vmr9.c | 46 ++++++++++++++++++------------------ 2 files changed, 52 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=855f17f3498802f80232…

1 0

Brendan Shanks : user32/tests: Test success for QueryDisplayConfig() and DisplayConfigGetDeviceInfo().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 148fc1adb53aa1d78a67b2a0ee5ea8058d92589a URL: https://source.winehq.org/git/wine.git/?a=commit;h=148fc1adb53aa1d78a67b2a0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed May 6 10:17:30 2020 -0700 user32/tests: Test success for QueryDisplayConfig() and DisplayConfigGetDeviceInfo(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 111 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index c3c43d6f60..205df1c293 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1268,6 +1268,98 @@ static void test_EnumDisplayMonitors(void) } } +static void test_QueryDisplayConfig_result(UINT32 paths, const DISPLAYCONFIG_PATH_INFO *pi, UINT32 modes, const DISPLAYCONFIG_MODE_INFO *mi) +{ + UINT32 i; + LONG ret; + DISPLAYCONFIG_SOURCE_DEVICE_NAME source_name; + DISPLAYCONFIG_TARGET_DEVICE_NAME target_name; + DISPLAYCONFIG_TARGET_PREFERRED_MODE preferred_mode; + DISPLAYCONFIG_ADAPTER_NAME adapter_name; + + for (i = 0; i < paths; i++) + { + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name); + source_name.header.adapterId = pi[i].sourceInfo.adapterId; + source_name.header.id = pi[i].sourceInfo.id; + source_name.viewGdiDeviceName[0] = '\0'; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(!ret, "Expected 0, got %d\n", ret); + ok(source_name.viewGdiDeviceName[0] != '\0', "Expected GDI device name, got empty string\n"); + + target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; + target_name.header.size = sizeof(target_name); + target_name.header.adapterId = pi[i].targetInfo.adapterId; + target_name.header.id = pi[i].targetInfo.id; + target_name.monitorDevicePath[0] = '\0'; + ret = pDisplayConfigGetDeviceInfo(&target_name.header); + ok(!ret, "Expected 0, got %d\n", ret); + ok(target_name.monitorDevicePath[0] != '\0', "Expected monitor device path, got empty string\n"); + + preferred_mode.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE; + preferred_mode.header.size = sizeof(preferred_mode); + preferred_mode.header.adapterId = pi[i].targetInfo.adapterId; + preferred_mode.header.id = pi[i].targetInfo.id; + preferred_mode.width = preferred_mode.height = 0; + ret = pDisplayConfigGetDeviceInfo(&preferred_mode.header); + ok(!ret, "Expected 0, got %d\n", ret); + ok(preferred_mode.width > 0 && preferred_mode.height > 0, "Expected non-zero height/width, got %ux%u\n", + preferred_mode.width, preferred_mode.height); + + adapter_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME; + adapter_name.header.size = sizeof(adapter_name); + adapter_name.header.adapterId = pi[i].sourceInfo.adapterId; + adapter_name.adapterDevicePath[0] = '\0'; + ret = pDisplayConfigGetDeviceInfo(&adapter_name.header); + ok(!ret, "Expected 0, got %d\n", ret); + ok(adapter_name.adapterDevicePath[0] != '\0', "Expected adapter device path, got empty string\n"); + + /* Check corresponding modes */ + if (pi[i].sourceInfo.modeInfoIdx == DISPLAYCONFIG_PATH_MODE_IDX_INVALID) + { + skip("Path doesn't contain source modeInfoIdx"); + continue; + } + ok(pi[i].sourceInfo.modeInfoIdx < modes, "Expected index <%d, got %d\n", modes, pi[i].sourceInfo.modeInfoIdx); + if (pi[i].sourceInfo.modeInfoIdx >= modes) + continue; + + ok(mi[pi[i].sourceInfo.modeInfoIdx].infoType == DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE, "Expected infoType %d, got %d\n", + DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE, mi[pi[i].sourceInfo.modeInfoIdx].infoType); + ok(pi[i].sourceInfo.id == mi[pi[i].sourceInfo.modeInfoIdx].id, "Expected id %u, got %u\n", + pi[i].sourceInfo.id, mi[pi[i].sourceInfo.modeInfoIdx].id); + ok(pi[i].sourceInfo.adapterId.HighPart == mi[pi[i].sourceInfo.modeInfoIdx].adapterId.HighPart && + pi[i].sourceInfo.adapterId.LowPart == mi[pi[i].sourceInfo.modeInfoIdx].adapterId.LowPart, + "Expected LUID %08x:%08x, got %08x:%08x\n", + pi[i].sourceInfo.adapterId.HighPart, pi[i].sourceInfo.adapterId.LowPart, + mi[pi[i].sourceInfo.modeInfoIdx].adapterId.HighPart, mi[pi[i].sourceInfo.modeInfoIdx].adapterId.LowPart); + ok(mi[pi[i].sourceInfo.modeInfoIdx].sourceMode.width > 0 && mi[pi[i].sourceInfo.modeInfoIdx].sourceMode.height > 0, + "Expected non-zero height/width, got %ux%u\n", + mi[pi[i].sourceInfo.modeInfoIdx].sourceMode.width, mi[pi[i].sourceInfo.modeInfoIdx].sourceMode.height); + + + if (pi[i].targetInfo.modeInfoIdx == DISPLAYCONFIG_PATH_MODE_IDX_INVALID) + { + skip("Path doesn't contain target modeInfoIdx"); + continue; + } + ok(pi[i].targetInfo.modeInfoIdx < modes, "Expected index <%d, got %d\n", modes, pi[i].targetInfo.modeInfoIdx); + if (pi[i].targetInfo.modeInfoIdx >= modes) + continue; + + ok(mi[pi[i].targetInfo.modeInfoIdx].infoType == DISPLAYCONFIG_MODE_INFO_TYPE_TARGET, "Expected infoType %d, got %d\n", + DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE, mi[pi[i].targetInfo.modeInfoIdx].infoType); + ok(pi[i].targetInfo.id == mi[pi[i].targetInfo.modeInfoIdx].id, "Expected id %u, got %u\n", + pi[i].targetInfo.id, mi[pi[i].targetInfo.modeInfoIdx].id); + ok(pi[i].targetInfo.adapterId.HighPart == mi[pi[i].targetInfo.modeInfoIdx].adapterId.HighPart && + pi[i].targetInfo.adapterId.LowPart == mi[pi[i].targetInfo.modeInfoIdx].adapterId.LowPart, + "Expected LUID %08x:%08x, got %08x:%08x\n", + pi[i].targetInfo.adapterId.HighPart, pi[i].targetInfo.adapterId.LowPart, + mi[pi[i].targetInfo.modeInfoIdx].adapterId.HighPart, mi[pi[i].targetInfo.modeInfoIdx].adapterId.LowPart); + } +} + static void test_QueryDisplayConfig(void) { UINT32 paths, modes; @@ -1315,13 +1407,30 @@ static void test_QueryDisplayConfig(void) ret = pQueryDisplayConfig(0, &paths, pi, &modes, mi, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + /* Below this point, test functionality that requires a WDDM driver on Windows */ paths = modes = 1; memset(pi, 0xFF, sizeof(pi[0])); memset(mi, 0xFF, sizeof(mi[0])); ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, mi, NULL); - ok(ret == ERROR_INSUFFICIENT_BUFFER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + if (ret == ERROR_NOT_SUPPORTED) + { + todo_wine + win_skip("QueryDisplayConfig() functionality is unsupported\n"); + return; + } + ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %d\n", ret); ok (paths == 1, "got %u\n", paths); ok (modes == 1, "got %u\n", modes); + + paths = ARRAY_SIZE(pi); + modes = ARRAY_SIZE(mi); + memset(pi, 0xFF, sizeof(pi)); + memset(mi, 0xFF, sizeof(mi)); + ret = pQueryDisplayConfig(QDC_ONLY_ACTIVE_PATHS, &paths, pi, &modes, mi, NULL); + ok(!ret, "got %d\n", ret); + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + if (!ret && paths > 0 && modes > 0) + test_QueryDisplayConfig_result(paths, pi, modes, mi); } static void test_DisplayConfigGetDeviceInfo(void)

1 0

Brendan Shanks : user32/tests: Rename DisplayConfig test functions to match style.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: c95adb32b8795b78565c9a67e46d0a680b4f2841 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c95adb32b8795b78565c9a67… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed May 6 10:17:29 2020 -0700 user32/tests: Rename DisplayConfig test functions to match style. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index fb5e331c25..c3c43d6f60 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1107,7 +1107,7 @@ static void test_work_area(void) DestroyWindow(hwnd); } -static void test_get_display_config_buffer_sizes(void) +static void test_GetDisplayConfigBufferSizes(void) { UINT32 paths, modes; LONG ret; @@ -1268,7 +1268,7 @@ static void test_EnumDisplayMonitors(void) } } -static void test_query_display_config(void) +static void test_QueryDisplayConfig(void) { UINT32 paths, modes; DISPLAYCONFIG_PATH_INFO pi[10]; @@ -1324,7 +1324,7 @@ static void test_query_display_config(void) ok (modes == 1, "got %u\n", modes); } -static void test_display_config_get_device_info(void) +static void test_DisplayConfigGetDeviceInfo(void) { LONG ret; DISPLAYCONFIG_SOURCE_DEVICE_NAME source_name; @@ -1422,9 +1422,9 @@ static void test_display_config(void) return; } - test_get_display_config_buffer_sizes(); - test_query_display_config(); - test_display_config_get_device_info(); + test_GetDisplayConfigBufferSizes(); + test_QueryDisplayConfig(); + test_DisplayConfigGetDeviceInfo(); } START_TEST(monitor)

1 0

Brendan Shanks : include: Add additional DISPLAYCONFIG defines.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: d6dd7d0b058092ab0319fa278ecc209409e54485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6dd7d0b058092ab0319fa27… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed May 6 10:17:28 2020 -0700 include: Add additional DISPLAYCONFIG defines. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/wingdi.h b/include/wingdi.h index de028f5212..d989fb6f71 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3637,10 +3637,30 @@ typedef struct DISPLAYCONFIG_SDR_WHITE_LEVEL { ULONG SDRWhiteLevel; } DISPLAYCONFIG_SDR_WHITE_LEVEL; +#define DISPLAYCONFIG_PATH_MODE_IDX_INVALID 0xffffffff +#define DISPLAYCONFIG_PATH_TARGET_MODE_IDX_INVALID 0xffff +#define DISPLAYCONFIG_PATH_DESKTOP_IMAGE_IDX_INVALID 0xffff +#define DISPLAYCONFIG_PATH_SOURCE_MODE_IDX_INVALID 0xffff +#define DISPLAYCONFIG_PATH_CLONE_GROUP_INVALID 0xffff + +#define DISPLAYCONFIG_SOURCE_IN_USE 0x00000001 + +#define DISPLAYCONFIG_TARGET_IN_USE 0x00000001 +#define DISPLAYCONFIG_TARGET_FORCIBLE 0x00000002 +#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_BOOT 0x00000004 +#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_PATH 0x00000008 +#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_SYSTEM 0x00000010 +#define DISPLAYCONFIG_TARGET_IS_HMD 0x00000020 + +#define DISPLAYCONFIG_PATH_ACTIVE 0x00000001 +#define DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE 0x00000008 + /* For GetDisplayConfigBufferSizes */ #define QDC_ALL_PATHS 0x00000001 #define QDC_ONLY_ACTIVE_PATHS 0x00000002 #define QDC_DATABASE_CURRENT 0x00000004 +#define QDC_VIRTUAL_MODE_AWARE 0x00000010 +#define QDC_INCLUDE_HMD 0x00000020 #define GDI_ERROR (~0u) #define HGDI_ERROR ((HANDLE)~(ULONG_PTR)0)

1 0

Gabriel Ivăncescu : cmd.exe: Don't treat explicit paths as a PATH search list.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: a19a770f96ca1b09c4bef449c082b7da38964dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a19a770f96ca1b09c4bef449… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 5 16:10:37 2020 +0300 cmd.exe: Don't treat explicit paths as a PATH search list. For example, the explicit path "C:\some;path" is currently treated as if the PATH environment variable is "C:\some;path" which is obviously wrong, and searches for the directories "C:\some" and "path". Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 63 +++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 16843e4087..4026f3e6be 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1045,6 +1045,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) WCHAR pathext[MAXSTRING]; WCHAR *firstParam; BOOL extensionsupplied = FALSE; + BOOL explicit_path = FALSE; BOOL status; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; @@ -1084,6 +1085,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Reduce pathtosearch to a path with trailing '\' to support c:\a.bat and c:\windows\a.bat syntax */ if (lastSlash) *(lastSlash + 1) = 0x00; + explicit_path = TRUE; } /* Now extract PATHEXT */ @@ -1103,37 +1105,48 @@ void WCMD_run_program (WCHAR *command, BOOL called) BOOL found = FALSE; BOOL inside_quotes = FALSE; - /* Work on the first directory on the search path */ - pos = pathposn; - while ((inside_quotes || *pos != ';') && *pos != 0) + if (explicit_path) { - if (*pos == '"') - inside_quotes = !inside_quotes; - pos++; + lstrcpyW(thisDir, pathposn); + pathposn = NULL; } + else + { + /* Work on the next directory on the search path */ + pos = pathposn; + while ((inside_quotes || *pos != ';') && *pos != 0) + { + if (*pos == '"') + inside_quotes = !inside_quotes; + pos++; + } - if (*pos) { /* Reached semicolon */ - memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); - thisDir[(pos-pathposn)] = 0x00; - pathposn = pos+1; - } else { /* Reached string end */ - lstrcpyW(thisDir, pathposn); - pathposn = NULL; - } + if (*pos) /* Reached semicolon */ + { + memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); + thisDir[(pos-pathposn)] = 0x00; + pathposn = pos+1; + } + else /* Reached string end */ + { + lstrcpyW(thisDir, pathposn); + pathposn = NULL; + } - /* Remove quotes */ - length = lstrlenW(thisDir); - if (thisDir[length - 1] == '"') - thisDir[length - 1] = 0; + /* Remove quotes */ + length = lstrlenW(thisDir); + if (thisDir[length - 1] == '"') + thisDir[length - 1] = 0; - if (*thisDir != '"') - lstrcpyW(temp, thisDir); - else - lstrcpyW(temp, thisDir + 1); + if (*thisDir != '"') + lstrcpyW(temp, thisDir); + else + lstrcpyW(temp, thisDir + 1); - /* Since you can have eg. ..\.. on the path, need to expand - to full information */ - GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + /* Since you can have eg. ..\.. on the path, need to expand + to full information */ + GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + } /* 1. If extension supplied, see if that file exists */ lstrcatW(thisDir, slashW);

1 0

Jacek Caban : winegcc: Use --safeseh winebuild option on msvc target.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: d784de82c835321111a0e2d637e34757a8aed1fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d784de82c835321111a0e2d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 6 16:18:41 2020 +0200 winegcc: Use --safeseh winebuild option on msvc target. lld-link requires all x86 object files to be SEH compatible unless it's explicitly disabled. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 89f8eca5c2..8a7db2ad34 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1250,6 +1250,8 @@ static void build(struct options* opts) if (opts->large_address_aware) strarray_add( spec_args, "--large-address-aware" ); } + if (opts->target_platform == PLATFORM_WINDOWS) strarray_add(spec_args, "--safeseh"); + if (entry_point) { strarray_add(spec_args, "--entry");

1 0

Jacek Caban : winebuild: Introduce --safeseh option that allows marking assembly files as SEH compatible.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: e4e05cdaab4044b0e3a66723d51e74daf6a6ac35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e05cdaab4044b0e3a66723… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 6 16:18:31 2020 +0200 winebuild: Introduce --safeseh option that allows marking assembly files as SEH compatible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 +++++++ tools/winebuild/utils.c | 6 ++++++ tools/winebuild/winebuild.man.in | 3 +++ 4 files changed, 17 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index b30785b74a..c162888a03 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -364,6 +364,7 @@ extern int link_ext_symbols; extern int force_pointer_size; extern int unwind_tables; extern int unix_lib; +extern int safe_seh; extern char *input_file_name; extern char *spec_file_name; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 47f2787b10..efb86b705e 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -47,6 +47,7 @@ int link_ext_symbols = 0; int force_pointer_size = 0; int unwind_tables = 0; int unix_lib = 0; +int safe_seh = 0; #ifdef __i386__ enum target_cpu target_cpu = CPU_x86; @@ -290,6 +291,7 @@ static const char usage_str[] = " -N, --dll-name=DLLNAME Set the DLL name (default: from input file name)\n" " -o, --output=NAME Set the output file name (default: stdout)\n" " -r, --res=RSRC.RES Load resources from RSRC.RES\n" +" --safeseh Mark object files as SEH compatible\n" " --save-temps Do not delete the generated intermediate files\n" " --subsystem=SUBSYS Set the subsystem (one of native, windows, console, wince)\n" " -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" @@ -324,6 +326,7 @@ enum long_options_values LONG_OPT_NMCMD, LONG_OPT_NXCOMPAT, LONG_OPT_RESOURCES, + LONG_OPT_SAFE_SEH, LONG_OPT_SAVE_TEMPS, LONG_OPT_STATICLIB, LONG_OPT_SUBSYSTEM, @@ -350,6 +353,7 @@ static const struct option long_options[] = { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, { "nxcompat", 1, 0, LONG_OPT_NXCOMPAT }, { "resources", 0, 0, LONG_OPT_RESOURCES }, + { "safeseh", 0, 0, LONG_OPT_SAFE_SEH }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, { "version", 0, 0, LONG_OPT_VERSION }, @@ -543,6 +547,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) if (optarg[0] == 'n' || optarg[0] == 'N') spec->dll_characteristics &= ~IMAGE_DLLCHARACTERISTICS_NX_COMPAT; break; + case LONG_OPT_SAFE_SEH: + safe_seh = 1; + break; case LONG_OPT_RESOURCES: set_exec_mode( MODE_RESOURCES ); break; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 669520711c..2a1fc96092 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -684,6 +684,12 @@ void output_standard_file_header(void) else output( "/* File generated automatically; do not edit! */\n" ); output( "/* This file can be copied, modified and distributed without restriction. */\n\n" ); + if (safe_seh) + { + output( "\t.def @feat.00; .scl 3; .type 0; .endef\n" ); + output( "\t.globl @feat.00\n" ); + output( ".set @feat.00, 1\n" ); + } } /* dump a byte stream into the assembly code */ diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 9c91c1a504..63ea2a3226 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -219,6 +219,9 @@ and will automatically be handled correctly (though the .B \-r option will also work for Win32 files). .TP +.B --safeseh +Mark object files as SEH compatible. +.TP .B --save-temps Do not delete the various temporary files that \fBwinebuild\fR generates. .TP

1 0

Nikolay Sivov : mf: Fix timer instance leak on error path in SetTimer().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 35242aa417cd1dd7d61e72a1c8fdabd29517367f URL: https://source.winehq.org/git/wine.git/?a=commit;h=35242aa417cd1dd7d61e72a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 6 15:49:11 2020 +0300 mf: Fix timer instance leak on error path in SetTimer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d6b881218b..25832afdbb 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -4093,15 +4093,19 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags, hr = MF_S_CLOCK_STOPPED; if (SUCCEEDED(hr)) + { list_add_tail(&clock->timers, &clock_timer->entry); + if (cancel_key) + { + *cancel_key = &clock_timer->IUnknown_iface; + IUnknown_AddRef(*cancel_key); + } + } LeaveCriticalSection(&clock->cs); - if (SUCCEEDED(hr) && cancel_key) - { - *cancel_key = &clock_timer->IUnknown_iface; - IUnknown_AddRef(*cancel_key); - } + if (FAILED(hr)) + IUnknown_Release(&clock_timer->IUnknown_iface); return hr; }

1 0

Nikolay Sivov : dwrite: Enable global directional substitution features.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 1f90b33daf1051800ca96af9db8d3b6f7868b2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f90b33daf1051800ca96af9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 6 15:44:45 2020 +0300 dwrite: Enable global directional substitution features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index e7693b58ae..0372d739b5 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -301,6 +301,17 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i struct shaping_features features = { 0 }; unsigned int i; + if (!context->is_sideways) + { + if (context->is_rtl) + shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','a')); + else + { + shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','a')); + shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','m')); + } + } + for (i = 0; i < ARRAY_SIZE(common_features); ++i) shape_add_feature(&features, common_features[i]);

1 0

Nikolay Sivov : dwrite: Update DWRITE_SHAPING_TEXT_PROPERTIES definition.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 7e02e2e993e576eb955d111d06c56a1b44e6d2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e02e2e993e576eb955d111d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 6 15:44:44 2020 +0300 dwrite: Update DWRITE_SHAPING_TEXT_PROPERTIES definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 7 +++---- include/dwrite.idl | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index c2fd5c54d3..2cbac7700c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1178,6 +1178,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, method = get_number_substitutes(substitution, digits); + /* FIXME: have the shaping engine set this */ + memset(text_props, 0, length * sizeof(*text_props)); + for (i = 0; i < length; i++) { /* FIXME: set to better values */ glyph_props[i].justification = text[i] == ' ' ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; @@ -1186,10 +1189,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, glyph_props[i].isZeroWidthSpace = 0; glyph_props[i].reserved = 0; - /* FIXME: have the shaping engine set this */ - text_props[i].isShapedAlone = 0; - text_props[i].reserved = 0; - clustermap[i] = i; string[i] = text[i]; diff --git a/include/dwrite.idl b/include/dwrite.idl index b92b1544e0..a8c523edda 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -546,7 +546,9 @@ typedef struct DWRITE_TYPOGRAPHIC_FEATURES typedef struct DWRITE_SHAPING_TEXT_PROPERTIES { UINT16 isShapedAlone : 1; - UINT16 reserved : 15; + UINT16 reserved1 : 1; + UINT16 canBreakShapingAfter : 1; + UINT16 reserved : 13; } DWRITE_SHAPING_TEXT_PROPERTIES; typedef struct DWRITE_SHAPING_GLYPH_PROPERTIES

1 0

Hans Leidekker : msi: Return void from init_automation_object.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 1726b7f46c03a543f5d682d951f29a4af41001e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1726b7f46c03a543f5d682d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 6 14:03:04 2020 +0200 msi: Return void from init_automation_object. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/automation.c | 72 ++++++++++----------------------------------------- 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index ba3a068a74..87c7815094 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -543,18 +543,15 @@ static const IProvideMultipleClassInfoVtbl ProvideMultipleClassInfoVtbl = ProvideMultipleClassInfo_GetInfoOfIndex }; -static HRESULT init_automation_object(AutomationObject *This, MSIHANDLE msiHandle, tid_t tid) +static void init_automation_object(AutomationObject *This, MSIHANDLE msiHandle, tid_t tid) { TRACE("(%p, %d, %s)\n", This, msiHandle, debugstr_guid(get_riid_from_tid(tid))); This->IDispatch_iface.lpVtbl = &AutomationObjectVtbl; This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; This->ref = 1; - This->msiHandle = msiHandle; This->tid = tid; - - return S_OK; } /* @@ -1002,21 +999,15 @@ static HRESULT record_invoke( static HRESULT create_record(MSIHANDLE msiHandle, IDispatch **disp) { AutomationObject *record; - HRESULT hr; record = msi_alloc(sizeof(*record)); if (!record) return E_OUTOFMEMORY; - hr = init_automation_object(record, msiHandle, Record_tid); - if (hr != S_OK) - { - msi_free(record); - return hr; - } + init_automation_object(record, msiHandle, Record_tid); *disp = &record->IDispatch_iface; - return hr; + return S_OK; } static HRESULT list_invoke( @@ -1123,12 +1114,7 @@ static HRESULT create_list(const WCHAR *product, IDispatch **dispatch) list = msi_alloc_zero(sizeof(ListObject)); if (!list) return E_OUTOFMEMORY; - hr = init_automation_object(&list->autoobj, 0, StringList_tid); - if (hr != S_OK) - { - msi_free(list); - return hr; - } + init_automation_object(&list->autoobj, 0, StringList_tid); *dispatch = &list->autoobj.IDispatch_iface; @@ -2442,7 +2428,6 @@ static HRESULT installer_invoke( HRESULT create_msiserver(IUnknown *outer, void **ppObj) { AutomationObject *installer; - HRESULT hr; TRACE("(%p %p)\n", outer, ppObj); @@ -2452,99 +2437,70 @@ HRESULT create_msiserver(IUnknown *outer, void **ppObj) installer = msi_alloc(sizeof(AutomationObject)); if (!installer) return E_OUTOFMEMORY; - hr = init_automation_object(installer, 0, Installer_tid); - if (hr != S_OK) - { - msi_free(installer); - return hr; - } + init_automation_object(installer, 0, Installer_tid); *ppObj = &installer->IDispatch_iface; - return hr; + return S_OK; } HRESULT create_session(MSIHANDLE msiHandle, IDispatch *installer, IDispatch **disp) { SessionObject *session; - HRESULT hr; session = msi_alloc(sizeof(SessionObject)); if (!session) return E_OUTOFMEMORY; - hr = init_automation_object(&session->autoobj, msiHandle, Session_tid); - if (hr != S_OK) - { - msi_free(session); - return hr; - } + init_automation_object(&session->autoobj, msiHandle, Session_tid); session->installer = installer; *disp = &session->autoobj.IDispatch_iface; - return hr; + return S_OK; } static HRESULT create_database(MSIHANDLE msiHandle, IDispatch **dispatch) { AutomationObject *database; - HRESULT hr; TRACE("(%d %p)\n", msiHandle, dispatch); database = msi_alloc(sizeof(AutomationObject)); if (!database) return E_OUTOFMEMORY; - hr = init_automation_object(database, msiHandle, Database_tid); - if (hr != S_OK) - { - msi_free(database); - return hr; - } + init_automation_object(database, msiHandle, Database_tid); *dispatch = &database->IDispatch_iface; - return hr; + return S_OK; } static HRESULT create_view(MSIHANDLE msiHandle, IDispatch **dispatch) { AutomationObject *view; - HRESULT hr; TRACE("(%d %p)\n", msiHandle, dispatch); view = msi_alloc(sizeof(AutomationObject)); if (!view) return E_OUTOFMEMORY; - hr = init_automation_object(view, msiHandle, View_tid); - if (hr != S_OK) - { - msi_free(view); - return hr; - } + init_automation_object(view, msiHandle, View_tid); *dispatch = &view->IDispatch_iface; - return hr; + return S_OK; } static HRESULT create_summaryinfo(MSIHANDLE msiHandle, IDispatch **disp) { AutomationObject *info; - HRESULT hr; info = msi_alloc(sizeof(*info)); if (!info) return E_OUTOFMEMORY; - hr = init_automation_object(info, msiHandle, SummaryInfo_tid); - if (hr != S_OK) - { - msi_free(info); - return hr; - } + init_automation_object(info, msiHandle, SummaryInfo_tid); *disp = &info->IDispatch_iface; - return hr; + return S_OK; }

1 0

Zhiyi Zhang : comctl32/button: Do not set BS_PUSHBUTTON and BS_DEFPUSHBUTTON style directly to Split Buttons and Command Links.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 463482a8295fad657b7fa22ea145551f63547238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=463482a8295fad657b7fa22e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 6 16:47:58 2020 +0800 comctl32/button: Do not set BS_PUSHBUTTON and BS_DEFPUSHBUTTON style directly to Split Buttons and Command Links. For Split Buttons and Command Links of common control version 6, setting BS_PUSHBUTTON and BS_DEFPUSHBUTTON style toggles their default bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47621 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 12 +++++++++--- dlls/comctl32/tests/button.c | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b615df4a16..4f7a3052b1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -847,8 +847,14 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L break; case BM_SETSTYLE: - btn_type = wParam & BS_TYPEMASK; - style = (style & ~BS_TYPEMASK) | btn_type; + { + DWORD new_btn_type; + + new_btn_type= wParam & BS_TYPEMASK; + if (btn_type >= BS_SPLITBUTTON && new_btn_type <= BS_DEFPUSHBUTTON) + new_btn_type = (btn_type & ~BS_DEFPUSHBUTTON) | new_btn_type; + + style = (style & ~BS_TYPEMASK) | new_btn_type; SetWindowLongW( hWnd, GWL_STYLE, style ); /* Only redraw if lParam flag is set.*/ @@ -856,7 +862,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L InvalidateRect( hWnd, NULL, TRUE ); break; - + } case BM_CLICK: SendMessageW( hWnd, WM_LBUTTONDOWN, 0, 0 ); SendMessageW( hWnd, WM_LBUTTONUP, 0, 0 ); diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 933db6e982..716850073f 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2303,7 +2303,6 @@ static void test_style(void) else expected_type = j; - todo_wine_if(i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) ok(type == expected_type || broken(type == j), /* XP */ "Original type %#x, expected new type %#x, got %#x.\n", i, expected_type, type); }

1 0

Zhiyi Zhang : comctl32/tests: Test button styles.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 01fbe206174c0113f947ba24129e88365de7d643 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01fbe206174c0113f947ba24… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 6 16:47:47 2020 +0800 comctl32/tests: Test button styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 14071b2ecd..933db6e982 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2276,6 +2276,41 @@ static void test_bcm_get_ideal_size(void) DeleteObject(hfont); } +static void test_style(void) +{ + DWORD type, expected_type; + HWND button; + LRESULT ret; + DWORD i, j; + + for (i = BS_PUSHBUTTON; i <= BS_DEFCOMMANDLINK; ++i) + { + button = CreateWindowA(WC_BUTTONA, "test", i, 0, 0, 50, 50, NULL, 0, 0, NULL); + ok(button != NULL, "Expected button not null.\n"); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + expected_type = (i == BS_USERBUTTON ? BS_PUSHBUTTON : i); + ok(type == expected_type, "Expected type %#x, got %#x.\n", expected_type, type); + + for (j = BS_PUSHBUTTON; j <= BS_DEFCOMMANDLINK; ++j) + { + ret = SendMessageA(button, BM_SETSTYLE, j, FALSE); + ok(ret == 0, "Expected %#x, got %#lx.\n", 0, ret); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + if (i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) + expected_type = (i & ~BS_DEFPUSHBUTTON) | j; + else + expected_type = j; + + todo_wine_if(i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) + ok(type == expected_type || broken(type == j), /* XP */ + "Original type %#x, expected new type %#x, got %#x.\n", i, expected_type, type); + } + DestroyWindow(button); + } +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -2298,6 +2333,7 @@ START_TEST(button) test_get_set_textmargin(); test_state(); test_bcm_get_ideal_size(); + test_style(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Zhiyi Zhang : user32/tests: Test button styles.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 18cf85a3fc713452fc398f5ac6a349f70ef39eab URL: https://source.winehq.org/git/wine.git/?a=commit;h=18cf85a3fc713452fc398f5a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 6 16:47:38 2020 +0800 user32/tests: Test button styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 93ab7b4a27..f84525a0bf 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -31,6 +31,7 @@ #include "winuser.h" #include "winnls.h" #include "dbt.h" +#include "commctrl.h" #include "wine/test.h" @@ -17881,6 +17882,37 @@ static void test_invalid_window(void) ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError()); } +static void test_button_style(void) +{ + DWORD type, expected_type; + HWND button; + LRESULT ret; + DWORD i, j; + + for (i = BS_PUSHBUTTON; i <= BS_DEFCOMMANDLINK; ++i) + { + button = CreateWindowA(WC_BUTTONA, "test", i, 0, 0, 50, 50, NULL, 0, 0, NULL); + ok(button != NULL, "Expected button not null.\n"); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + expected_type = (i == BS_USERBUTTON ? BS_PUSHBUTTON : i); + ok(type == expected_type, "Expected type %#x, got %#x.\n", expected_type, type); + + for (j = BS_PUSHBUTTON; j <= BS_DEFCOMMANDLINK; ++j) + { + ret = SendMessageA(button, BM_SETSTYLE, j, FALSE); + ok(ret == 0, "Expected %#x, got %#lx.\n", 0, ret); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + expected_type = j; + + ok(type == expected_type, "Original type %#x, expected new type %#x, got %#x.\n", i, + expected_type, type); + } + DestroyWindow(button); + } +} + START_TEST(msg) { char **test_argv; @@ -17964,6 +17996,7 @@ START_TEST(msg) test_mdi_messages(); test_button_messages(); test_button_bm_get_set_image(); + test_button_style(); test_autoradio_BM_CLICK(); test_autoradio_kbd_move(); test_static_messages();

1 0

Zhiyi Zhang : user32/tests: Add a trailing '\n' to some ok() calls.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: f671b524f241305e025deb59cb8ab666e88105e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f671b524f241305e025deb59… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 6 16:47:26 2020 +0800 user32/tests: Add a trailing '\n' to some ok() calls. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 5a6a0bf5fb..3f6fe6cfca 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -652,8 +652,8 @@ static void test_WM_NEXTDLGCTL(void) * Check whether the style of the button which got the focus, changed to BS_DEFPUSHBUTTON and * the style of default button changed to BS_PUSHBUTTON. */ - ok(get_button_style(g_hwndTestDlgBut1) == BS_DEFPUSHBUTTON, "Button1's style not set to BS_DEFPUSHBUTTON"); - ok(get_button_style(g_hwndTestDlgBut2) == BS_PUSHBUTTON, "Button2's style not set to BS_PUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut1) == BS_DEFPUSHBUTTON, "Button1's style not set to BS_DEFPUSHBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_PUSHBUTTON, "Button2's style not set to BS_PUSHBUTTON\n"); /* Move focus to Button2 using "WM_NEXTDLGCTL" */ DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0); @@ -667,8 +667,8 @@ static void test_WM_NEXTDLGCTL(void) * Check whether the style of the button which got the focus, changed to BS_DEFPUSHBUTTON and * the style of button which lost the focus changed to BS_PUSHBUTTON. */ - ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON"); - ok(get_button_style(g_hwndTestDlgBut2) == BS_DEFPUSHBUTTON, "Button2's style not set to BS_DEFPUSHBUTTON"); + ok(get_button_style(g_hwndTestDlgBut1) == BS_PUSHBUTTON, "Button1's style not set to BS_PUSHBUTTON\n"); + ok(get_button_style(g_hwndTestDlgBut2) == BS_DEFPUSHBUTTON, "Button2's style not set to BS_DEFPUSHBUTTON\n"); /* Move focus to Edit control using "WM_NEXTDLGCTL" */ DefDlgProcA(g_hwndTestDlg, WM_NEXTDLGCTL, 0, 0);

1 0

Alexandre Julliard : kernel32: Move the psapi functions to kernelbase.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 876d7af94e71713e654db802b486e19c8b1b301c URL: https://source.winehq.org/git/wine.git/?a=commit;h=876d7af94e71713e654db802… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 6 16:24:24 2020 +0200 kernel32: Move the psapi functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 71 ---- dlls/kernel32/file.c | 66 --- dlls/kernel32/kernel32.spec | 58 +-- dlls/kernel32/module.c | 482 ---------------------- dlls/kernel32/process.c | 224 ----------- dlls/kernel32/virtual.c | 95 +---- dlls/kernelbase/debug.c | 865 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 58 +-- 8 files changed, 928 insertions(+), 991 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=876d7af94e71713e654d…

1 0

Zebediah Figura : ntoskrnl.exe: Move the BroadcastSystemMessage() call to plugplay_send_event().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 7addca95b5b9f960171a5673490d4d23c646ea90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7addca95b5b9f960171a5673… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 11:25:41 2020 -0500 ntoskrnl.exe: Move the BroadcastSystemMessage() call to plugplay_send_event(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/pnp.c | 1 - programs/plugplay/Makefile.in | 2 +- programs/plugplay/main.c | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 85bc1ce698..df48e44ede 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl IMPORTS = advapi32 hal msvcrt -DELAYIMPORTS = rpcrt4 setupapi user32 +DELAYIMPORTS = rpcrt4 setupapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 470e2368fb..91b825dffc 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -670,7 +670,6 @@ static LONG WINAPI rpc_filter( EXCEPTION_POINTERS *eptr ) static void send_devicechange( DWORD code, void *data, unsigned int size ) { - BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); __TRY { plugplay_send_event( code, data, size ); diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index 1bc2aa505a..001d81597f 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -1,5 +1,5 @@ MODULE = plugplay.exe -IMPORTS = advapi32 rpcrt4 +IMPORTS = advapi32 rpcrt4 user32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 00af2b0adf..8e00704842 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -141,6 +141,8 @@ void __cdecl plugplay_send_event( DWORD code, const BYTE *data, unsigned int siz struct listener *listener; struct event *event; + BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); + EnterCriticalSection( &plugplay_cs ); LIST_FOR_EACH_ENTRY(listener, &listener_list, struct listener, entry)

1 0

Zebediah Figura : user32: Implement RegisterDeviceNotification().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: e6df76770ee59b34fc7eafffb92e3500f4b9faa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6df76770ee59b34fc7eafff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 11:25:40 2020 -0500 user32: Implement RegisterDeviceNotification(). Based on a patch by Micah N Gorrell. This fixes controller hotplugging in Into the Breach. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 2 +- dlls/user32/misc.c | 81 ++++++++++++++++++++++++++++++------------------- include/winuser.h | 4 ++- 3 files changed, 53 insertions(+), 34 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index a91dd89c94..2d45552bcb 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_USER32_ -D_WINABLE_ MODULE = user32.dll IMPORTLIB = user32 -IMPORTS = setupapi gdi32 version advapi32 kernelbase +IMPORTS = setupapi gdi32 version sechost advapi32 kernelbase EXTRAINCL = $(PNG_CFLAGS) DELAYIMPORTS = hid imm32 usp10 diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 6e1f60612b..41909f9071 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -4,6 +4,7 @@ * Copyright 1995 Thomas Sandford * Copyright 1997 Marcus Meissner * Copyright 1998 Turchanov Sergey + * Copyright 2019 Micah N Gorrell for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,7 @@ #include "wingdi.h" #include "controls.h" #include "user_private.h" +#include "dbt.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -277,57 +279,72 @@ DWORD WINAPI RegisterTasklist (DWORD x) return TRUE; } +static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); + return 0; +} + +static DWORD CALLBACK devnotify_service_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header) +{ + FIXME("Support for service handles is not yet implemented!\n"); + return 0; +} + +struct device_notification_details +{ + DWORD (CALLBACK *cb)(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header); + HANDLE handle; +}; + +extern HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_details *details, + void *filter, DWORD flags ); +extern BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ); /*********************************************************************** * RegisterDeviceNotificationA (USER32.@) * * See RegisterDeviceNotificationW. */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags) +HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", - hnd,notifyfilter,flags ); - return (HDEVNOTIFY) 0xcafecafe; + TRACE("(hwnd=%p, filter=%p,flags=0x%08x)\n", + hRecipient,pNotificationFilter,dwFlags); + if (pNotificationFilter) + FIXME("The notification filter will requires an A->W when filter support is implemented\n"); + return RegisterDeviceNotificationW(hRecipient, pNotificationFilter, dwFlags); } /*********************************************************************** * RegisterDeviceNotificationW (USER32.@) - * - * Registers a window with the system so that it will receive - * notifications about a device. - * - * PARAMS - * hRecipient [I] Window or service status handle that - * will receive notifications. - * pNotificationFilter [I] DEV_BROADCAST_HDR followed by some - * type-specific data. - * dwFlags [I] See notes - * - * RETURNS - * - * A handle to the device notification. - * - * NOTES - * - * The dwFlags parameter can be one of two values: - *| DEVICE_NOTIFY_WINDOW_HANDLE - hRecipient is a window handle - *| DEVICE_NOTIFY_SERVICE_HANDLE - hRecipient is a service status handle */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) +HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWORD flags ) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", - hRecipient,pNotificationFilter,dwFlags ); - return (HDEVNOTIFY) 0xcafeaffe; + struct device_notification_details details; + + TRACE("handle %p, filter %p, flags %#x\n", handle, filter, flags); + + if (flags & ~(DEVICE_NOTIFY_SERVICE_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES)) + FIXME("unhandled flags %#x\n", flags); + + details.handle = handle; + + if (flags & DEVICE_NOTIFY_SERVICE_HANDLE) + details.cb = devnotify_service_callback; + else + details.cb = devnotify_window_callback; + + return I_ScRegisterDeviceNotification( &details, filter, 0 ); } /*********************************************************************** * UnregisterDeviceNotification (USER32.@) - * */ -BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY hnd) +BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) { - FIXME("(handle=%p), STUB!\n", hnd); - return TRUE; + TRACE("%p\n", handle); + + return I_ScUnregisterDeviceNotification( handle ); } /*********************************************************************** diff --git a/include/winuser.h b/include/winuser.h index 5fd774d295..aa392d636c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3114,7 +3114,9 @@ typedef struct tagTRACKMOUSEEVENT { typedef PVOID HDEVNOTIFY; typedef HDEVNOTIFY *PHDEVNOTIFY; -#define DEVICE_NOTIFY_WINDOW_HANDLE 0x00000000 +#define DEVICE_NOTIFY_WINDOW_HANDLE 0x00000000 +#define DEVICE_NOTIFY_SERVICE_HANDLE 0x00000001 +#define DEVICE_NOTIFY_ALL_INTERFACE_CLASSES 0x00000004 /* used for GetWindowInfo() */

1 0

Zebediah Figura : ntoskrnl.exe: Broadcast device notifications to registered handlers.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: d80101f17a10f490f669bf72f2e5e4e3f18c2711 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d80101f17a10f490f669bf72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 11:25:39 2020 -0500 ntoskrnl.exe: Broadcast device notifications to registered handlers. Based on a patch by Micah N Gorrell. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 5 ++++- dlls/ntoskrnl.exe/plugplay.idl | 2 ++ dlls/ntoskrnl.exe/pnp.c | 50 +++++++++++++++++++++++++++++++++++++++--- include/wine/plugplay.idl | 1 + programs/plugplay/main.c | 28 +++++++++++++++++++++++ 5 files changed, 82 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 67afa8f9d8..85bc1ce698 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl IMPORTS = advapi32 hal msvcrt -DELAYIMPORTS = setupapi user32 +DELAYIMPORTS = rpcrt4 setupapi user32 EXTRADLLFLAGS = -mno-cygwin @@ -12,3 +12,6 @@ C_SRCS = \ sync.c RC_SRCS = ntoskrnl.rc + +IDL_SRCS = \ + plugplay.idl diff --git a/dlls/ntoskrnl.exe/plugplay.idl b/dlls/ntoskrnl.exe/plugplay.idl new file mode 100644 index 0000000000..05e040388e --- /dev/null +++ b/dlls/ntoskrnl.exe/plugplay.idl @@ -0,0 +1,2 @@ +#pragma makedep client +#include "wine/plugplay.idl" diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 9e4c2c1416..470e2368fb 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -39,10 +39,12 @@ #include "ddk/wdm.h" #include "ddk/ntifs.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/heap.h" #include "wine/rbtree.h" #include "ntoskrnl_private.h" +#include "plugplay.h" #include "initguid.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -651,6 +653,35 @@ static NTSTATUS create_device_symlink( DEVICE_OBJECT *device, UNICODE_STRING *sy return ret; } +void __RPC_FAR * __RPC_USER MIDL_user_allocate( SIZE_T len ) +{ + return heap_alloc( len ); +} + +void __RPC_USER MIDL_user_free( void __RPC_FAR *ptr ) +{ + heap_free( ptr ); +} + +static LONG WINAPI rpc_filter( EXCEPTION_POINTERS *eptr ) +{ + return I_RpcExceptionFilter( eptr->ExceptionRecord->ExceptionCode ); +} + +static void send_devicechange( DWORD code, void *data, unsigned int size ) +{ + BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); + __TRY + { + plugplay_send_event( code, data, size ); + } + __EXCEPT(rpc_filter) + { + WARN("Failed to send event, exception %#x.\n", GetExceptionCode()); + } + __ENDTRY +} + /*********************************************************************** * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) */ @@ -756,9 +787,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); - BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, - enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast ); - + send_devicechange( enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, broadcast, len ); heap_free( broadcast ); } return ret; @@ -1002,12 +1031,26 @@ static NTSTATUS WINAPI pnp_manager_driver_entry( DRIVER_OBJECT *driver, UNICODE_ void pnp_manager_start(void) { static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r','\\','P','n','p','M','a','n','a','g','e','r',0}; + WCHAR endpoint[] = L"\\pipe\\wine_plugplay"; + WCHAR protseq[] = L"ncalrpc"; UNICODE_STRING driver_nameU; + RPC_WSTR binding_str; NTSTATUS status; + RPC_STATUS err; RtlInitUnicodeString( &driver_nameU, driver_nameW ); if ((status = IoCreateDriver( &driver_nameU, pnp_manager_driver_entry ))) ERR("Failed to create PnP manager driver, status %#x.\n", status); + + if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) + { + ERR("RpcStringBindingCompose() failed, error %#x\n", err); + return; + } + err = RpcBindingFromStringBindingW( binding_str, &plugplay_binding_handle ); + RpcStringFreeW( &binding_str ); + if (err) + ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); } static void destroy_root_pnp_device( struct wine_rb_entry *entry, void *context ) @@ -1020,6 +1063,7 @@ void pnp_manager_stop(void) { wine_rb_destroy( &root_pnp_devices, destroy_root_pnp_device, NULL ); IoDeleteDriver( pnp_manager ); + RpcBindingFree( &plugplay_binding_handle ); } void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) diff --git a/include/wine/plugplay.idl b/include/wine/plugplay.idl index 7cc5919124..8123b733ad 100644 --- a/include/wine/plugplay.idl +++ b/include/wine/plugplay.idl @@ -29,4 +29,5 @@ interface plugplay plugplay_rpc_handle plugplay_register_listener(); DWORD plugplay_get_event([in] plugplay_rpc_handle handle, [out, size_is(,*size)] BYTE **data, [out] unsigned int *size); void plugplay_unregister_listener([in] plugplay_rpc_handle handle); + void plugplay_send_event([in] DWORD event_code, [in, size_is(size)] const BYTE *data, [in] unsigned int size); } diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 59561dca50..00af2b0adf 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -136,6 +136,34 @@ void __cdecl plugplay_unregister_listener( plugplay_rpc_handle handle ) destroy_listener( handle ); } +void __cdecl plugplay_send_event( DWORD code, const BYTE *data, unsigned int size ) +{ + struct listener *listener; + struct event *event; + + EnterCriticalSection( &plugplay_cs ); + + LIST_FOR_EACH_ENTRY(listener, &listener_list, struct listener, entry) + { + if (!(event = malloc( sizeof(*event) ))) + break; + + if (!(event->data = malloc( size ))) + { + free( event ); + break; + } + + event->code = code; + memcpy( event->data, data, size ); + event->size = size; + list_add_tail( &listener->events, &event->entry ); + WakeConditionVariable( &listener->cv ); + } + + LeaveCriticalSection( &plugplay_cs ); +} + static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) { SERVICE_STATUS status;

1 0

Zebediah Figura : sechost: Implement I_ScRegisterDeviceNotification().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 6cf777ebd5f33e25743563eec49fa810a3080ee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cf777ebd5f33e25743563ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 11:25:38 2020 -0500 sechost: Implement I_ScRegisterDeviceNotification(). Based on a patch by Micah N Gorrell. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sechost/Makefile.in | 1 + dlls/sechost/plugplay.idl | 2 + dlls/sechost/sechost.spec | 4 +- dlls/sechost/service.c | 148 +++++++++++++++++++++++++++++++++++++++++ include/wine/plugplay.idl | 32 +++++++++ programs/plugplay/Makefile.in | 5 +- programs/plugplay/main.c | 130 ++++++++++++++++++++++++++++++++++++ programs/plugplay/plugplay.idl | 2 + 8 files changed, 321 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cf777ebd5f33e257435…

1 0

Zebediah Figura : quartz/vmr9: Resize the window in vmr_connect().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: d70d1cda38373db73fb7277681677084dd8e58a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d70d1cda38373db73fb72776… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 19:03:45 2020 -0500 quartz/vmr9: Resize the window in vmr_connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 30 +++++++++++++++--------------- dlls/quartz/tests/vmr9.c | 30 +++++++++++++++--------------- dlls/quartz/vmr9.c | 19 +++++++++---------- 3 files changed, 39 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d70d1cda38373db73fb7…

1 0

Zebediah Figura : quartz/vmr9: Factor out get_bitmap_header().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 0f6d8846ebfa25d262bb3d1636cbd219099cbca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f6d8846ebfa25d262bb3d16… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 19:03:44 2020 -0500 quartz/vmr9: Factor out get_bitmap_header(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 62 ++++++++++++++---------------------------------------- 1 file changed, 16 insertions(+), 46 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8ef8fc07e3..c43260b05d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -45,6 +45,14 @@ static inline const char *debugstr_normalized_rect(const VMR9NormalizedRect *rec return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); } +static const BITMAPINFOHEADER *get_bitmap_header(const AM_MEDIA_TYPE *mt) +{ + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + return &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; +} + struct quartz_vmr { struct strmbase_renderer renderer; @@ -210,31 +218,14 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface) static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo *info, LPBYTE data, DWORD size) { - AM_MEDIA_TYPE *amt; + const BITMAPINFOHEADER *bmiHeader = get_bitmap_header(&This->renderer.sink.pin.mt); HRESULT hr = S_OK; int width; int height; - BITMAPINFOHEADER *bmiHeader; D3DLOCKED_RECT lock; TRACE("%p %p %d\n", This, data, size); - amt = &This->renderer.sink.pin.mt; - - if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo)) - { - bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; - } - else if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo2)) - { - bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; - } - else - { - FIXME("Unknown type %s\n", debugstr_guid(&amt->subtype)); - return VFW_E_RUNTIME_ERROR; - } - width = bmiHeader->biWidth; height = bmiHeader->biHeight; @@ -347,8 +338,6 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - const VIDEOINFOHEADER *vih; - if (!IsEqualIID(&mt->majortype, &MEDIATYPE_Video) || !mt->pbFormat) return S_FALSE; @@ -356,9 +345,7 @@ static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const && !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) return S_FALSE; - vih = (VIDEOINFOHEADER *)mt->pbFormat; - - if (vih->bmiHeader.biCompression != BI_RGB) + if (get_bitmap_header(mt)->biCompression != BI_RGB) return S_FALSE; return S_OK; } @@ -530,26 +517,13 @@ static HRESULT WINAPI VMR9_ShouldDrawSampleNow(struct strmbase_renderer *iface, static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(mt); HRESULT hr; - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - { - VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)mt->pbFormat; - - filter->bmiheader = format->bmiHeader; - filter->VideoWidth = format->bmiHeader.biWidth; - filter->VideoHeight = format->bmiHeader.biHeight; - SetRect(&filter->source_rect, 0, 0, filter->VideoWidth, filter->VideoHeight); - } - else if (IsEqualIID(&mt->formattype, &FORMAT_VideoInfo2)) - { - VIDEOINFOHEADER2 *format = (VIDEOINFOHEADER2 *)mt->pbFormat; - - filter->bmiheader = format->bmiHeader; - filter->VideoWidth = format->bmiHeader.biWidth; - filter->VideoHeight = format->bmiHeader.biHeight; - SetRect(&filter->source_rect, 0, 0, filter->VideoWidth, filter->VideoHeight); - } + filter->bmiheader = *bitmap_header; + filter->VideoWidth = bitmap_header->biWidth; + filter->VideoHeight = bitmap_header->biHeight; + SetRect(&filter->source_rect, 0, 0, filter->VideoWidth, filter->VideoHeight); if (filter->mode || SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, VMR9Mode_Windowed))) @@ -732,7 +706,6 @@ static HRESULT WINAPI VMR9_GetSourceRect(BaseControlVideo* This, RECT *pSourceRe static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, LONG *image) { struct quartz_vmr *filter = impl_from_BaseControlVideo(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; IDirect3DSurface9 *rt = NULL, *surface = NULL; D3DLOCKED_RECT locked_rect; IDirect3DDevice9 *device; @@ -747,10 +720,7 @@ static HRESULT WINAPI VMR9_GetStaticImage(BaseControlVideo *iface, LONG *size, L EnterCriticalSection(&filter->renderer.csRenderLock); device = filter->allocator_d3d9_dev; - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = ((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) - bih = ((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + bih = *get_bitmap_header(&filter->renderer.sink.pin.mt); bih.biSizeImage = bih.biWidth * bih.biHeight * bih.biBitCount / 8; if (!image)

1 0

Zebediah Figura : quartz/videorenderer: Resize the window in video_renderer_connect().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: fb6ad569d7ca6aff96fe569df21f0723cee5faed URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb6ad569d7ca6aff96fe569d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 19:03:43 2020 -0500 quartz/videorenderer: Resize the window in video_renderer_connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 4 +-- dlls/quartz/tests/videorenderer.c | 30 +++++++++---------- dlls/quartz/videorenderer.c | 62 ++++++--------------------------------- 3 files changed, 26 insertions(+), 70 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index af659a9906..9aad189979 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -246,8 +246,8 @@ static void test_basic_video(IFilterGraph2 *graph) ok(hr == S_OK, "Cannot get destination position returned: %x\n", hr); ok(left == 0, "expected 0, got %d\n", left); ok(top == 0, "expected 0, got %d\n", top); - todo_wine ok(width == window_width, "expected %d, got %d\n", window_width, width); - todo_wine ok(height == video_height, "expected %d, got %d\n", video_height, height); + ok(width == window_width, "expected %d, got %d\n", window_width, width); + ok(height == video_height, "expected %d, got %d\n", video_height, height); hr = IBasicVideo_SetDestinationPosition(pbv, 0, 0, 0, 0); ok(hr==E_INVALIDARG, "IBasicVideo_SetDestinationPosition returned: %x\n", hr); diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 90d1e01932..b116b044b4 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1855,21 +1855,21 @@ static void test_video_window_position(IVideoWindow *window, HWND hwnd, HWND our ok(top == 0, "Got top %d.\n", top); hr = IVideoWindow_get_Width(window, &width); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(width == expect_width, "Got width %d.\n", width); + ok(width == expect_width, "Got width %d.\n", width); hr = IVideoWindow_get_Height(window, &height); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(height == expect_height, "Got height %d.\n", height); + ok(height == expect_height, "Got height %d.\n", height); hr = IVideoWindow_GetWindowPosition(window, &left, &top, &width, &height); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(left == 0, "Got left %d.\n", left); ok(top == 0, "Got top %d.\n", top); - todo_wine ok(width == expect_width, "Got width %d.\n", width); - todo_wine ok(height == expect_height, "Got height %d.\n", height); + ok(width == expect_width, "Got width %d.\n", width); + ok(height == expect_height, "Got height %d.\n", height); GetWindowRect(hwnd, &rect); ok(rect.left == 0, "Got window left %d.\n", rect.left); ok(rect.top == 0, "Got window top %d.\n", rect.top); - todo_wine ok(rect.right == expect_width, "Got window right %d.\n", rect.right); - todo_wine ok(rect.bottom == expect_height, "Got window bottom %d.\n", rect.bottom); + ok(rect.right == expect_width, "Got window right %d.\n", rect.right); + ok(rect.bottom == expect_height, "Got window bottom %d.\n", rect.bottom); hr = IVideoWindow_put_Left(window, 10); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1882,21 +1882,21 @@ static void test_video_window_position(IVideoWindow *window, HWND hwnd, HWND our ok(top == 0, "Got top %d.\n", top); hr = IVideoWindow_get_Width(window, &width); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(width == expect_width, "Got width %d.\n", width); + ok(width == expect_width, "Got width %d.\n", width); hr = IVideoWindow_get_Height(window, &height); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(height == expect_height, "Got height %d.\n", height); + ok(height == expect_height, "Got height %d.\n", height); hr = IVideoWindow_GetWindowPosition(window, &left, &top, &width, &height); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(left == 10, "Got left %d.\n", left); ok(top == 0, "Got top %d.\n", top); - todo_wine ok(width == expect_width, "Got width %d.\n", width); - todo_wine ok(height == expect_height, "Got height %d.\n", height); + ok(width == expect_width, "Got width %d.\n", width); + ok(height == expect_height, "Got height %d.\n", height); GetWindowRect(hwnd, &rect); ok(rect.left == 10, "Got window left %d.\n", rect.left); ok(rect.top == 0, "Got window top %d.\n", rect.top); - todo_wine ok(rect.right == 10 + expect_width, "Got window right %d.\n", rect.right); - todo_wine ok(rect.bottom == expect_height, "Got window bottom %d.\n", rect.bottom); + ok(rect.right == 10 + expect_width, "Got window right %d.\n", rect.right); + ok(rect.bottom == expect_height, "Got window bottom %d.\n", rect.bottom); hr = IVideoWindow_put_Height(window, 200); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1909,7 +1909,7 @@ static void test_video_window_position(IVideoWindow *window, HWND hwnd, HWND our ok(top == 0, "Got top %d.\n", top); hr = IVideoWindow_get_Width(window, &width); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(width == expect_width, "Got width %d.\n", width); + ok(width == expect_width, "Got width %d.\n", width); hr = IVideoWindow_get_Height(window, &height); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(height == 200, "Got height %d.\n", height); @@ -1917,12 +1917,12 @@ static void test_video_window_position(IVideoWindow *window, HWND hwnd, HWND our ok(hr == S_OK, "Got hr %#x.\n", hr); ok(left == 10, "Got left %d.\n", left); ok(top == 0, "Got top %d.\n", top); - todo_wine ok(width == expect_width, "Got width %d.\n", width); + ok(width == expect_width, "Got width %d.\n", width); ok(height == 200, "Got height %d.\n", height); GetWindowRect(hwnd, &rect); ok(rect.left == 10, "Got window left %d.\n", rect.left); ok(rect.top == 0, "Got window top %d.\n", rect.top); - todo_wine ok(rect.right == 10 + expect_width, "Got window right %d.\n", rect.right); + ok(rect.right == 10 + expect_width, "Got window right %d.\n", rect.right); ok(rect.bottom == 200, "Got window bottom %d.\n", rect.bottom); hr = IVideoWindow_SetWindowPosition(window, 100, 200, 300, 400); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 15a7d59eb1..15e05f48a8 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -44,11 +44,8 @@ struct video_renderer IOverlay IOverlay_iface; - BOOL init; - RECT SourceRect; RECT DestRect; - RECT WindowPos; LONG VideoWidth; LONG VideoHeight; LONG FullScreenMode; @@ -89,53 +86,6 @@ static const BITMAPINFOHEADER *get_bitmap_header(const AM_MEDIA_TYPE *mt) static void VideoRenderer_AutoShowWindow(struct video_renderer *This) { - if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) - { - DWORD style = GetWindowLongW(This->baseControlWindow.hwnd, GWL_STYLE); - DWORD style_ex = GetWindowLongW(This->baseControlWindow.hwnd, GWL_EXSTYLE); - - if (!This->WindowPos.right) - { - if (This->DestRect.right) - { - This->WindowPos.left = This->DestRect.left; - This->WindowPos.right = This->DestRect.right; - } - else - { - This->WindowPos.left = This->SourceRect.left; - This->WindowPos.right = This->SourceRect.right; - } - } - if (!This->WindowPos.bottom) - { - if (This->DestRect.bottom) - { - This->WindowPos.top = This->DestRect.top; - This->WindowPos.bottom = This->DestRect.bottom; - } - else - { - This->WindowPos.top = This->SourceRect.top; - This->WindowPos.bottom = This->SourceRect.bottom; - } - } - - AdjustWindowRectEx(&This->WindowPos, style, FALSE, style_ex); - - TRACE("WindowPos: %s\n", wine_dbgstr_rect(&This->WindowPos)); - SetWindowPos(This->baseControlWindow.hwnd, NULL, - This->WindowPos.left, - This->WindowPos.top, - This->WindowPos.right - This->WindowPos.left, - This->WindowPos.bottom - This->WindowPos.top, - SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE); - - GetClientRect(This->baseControlWindow.hwnd, &This->DestRect); - } - else if (!This->init) - This->DestRect = This->WindowPos; - This->init = TRUE; if (This->baseControlWindow.AutoShow) ShowWindow(This->baseControlWindow.hwnd, SW_SHOW); } @@ -280,10 +230,18 @@ static HRESULT video_renderer_connect(struct strmbase_renderer *iface, const AM_ { struct video_renderer *filter = impl_from_strmbase_renderer(iface); const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(mt); + HWND window = filter->baseControlWindow.hwnd; + RECT rect; filter->VideoWidth = bitmap_header->biWidth; filter->VideoHeight = abs(bitmap_header->biHeight); - SetRect(&filter->SourceRect, 0, 0, filter->VideoWidth, filter->VideoHeight); + SetRect(&rect, 0, 0, filter->VideoWidth, filter->VideoHeight); + filter->SourceRect = filter->DestRect = rect; + + AdjustWindowRectEx(&rect, GetWindowLongW(window, GWL_STYLE), FALSE, + GetWindowLongW(window, GWL_EXSTYLE)); + SetWindowPos(window, NULL, 0, 0, rect.right - rect.left, rect.bottom - rect.top, + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); return S_OK; } @@ -511,7 +469,6 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG f SetWindowPos(filter->baseControlWindow.hwnd, HWND_TOP, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), SWP_SHOWWINDOW); GetWindowRect(filter->baseControlWindow.hwnd, &filter->DestRect); - filter->WindowPos = filter->DestRect; } else { @@ -521,7 +478,6 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, LONG f GetClientRect(filter->baseControlWindow.hwnd, &filter->DestRect); SetWindowPos(filter->baseControlWindow.hwnd, 0, filter->DestRect.left, filter->DestRect.top, filter->DestRect.right, filter->DestRect.bottom, SWP_NOZORDER | SWP_SHOWWINDOW); - filter->WindowPos = filter->DestRect; } filter->FullScreenMode = fullscreen;

1 0

Zebediah Figura : quartz/videorenderer: Set the source rect at connection time.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: e5729cf8ebe4e9616b5e9963fc5304777a7c47b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5729cf8ebe4e9616b5e9963… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 19:03:42 2020 -0500 quartz/videorenderer: Set the source rect at connection time. Filter state should not be modified in IPin::QueryAccept(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 77afc9fcef..15a7d59eb1 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -193,9 +193,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - struct video_renderer *filter = impl_from_strmbase_renderer(iface); - const BITMAPINFOHEADER *bitmap_header; - if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return S_FALSE; @@ -209,12 +206,6 @@ static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *ifa && !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) return S_FALSE; - bitmap_header = get_bitmap_header(mt); - - filter->VideoWidth = bitmap_header->biWidth; - filter->VideoHeight = abs(bitmap_header->biHeight); - SetRect(&filter->SourceRect, 0, 0, filter->VideoWidth, filter->VideoHeight); - return S_OK; } @@ -285,6 +276,18 @@ static void video_renderer_init_stream(struct strmbase_renderer *iface) VideoRenderer_AutoShowWindow(filter); } +static HRESULT video_renderer_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +{ + struct video_renderer *filter = impl_from_strmbase_renderer(iface); + const BITMAPINFOHEADER *bitmap_header = get_bitmap_header(mt); + + filter->VideoWidth = bitmap_header->biWidth; + filter->VideoHeight = abs(bitmap_header->biHeight); + SetRect(&filter->SourceRect, 0, 0, filter->VideoWidth, filter->VideoHeight); + + return S_OK; +} + static RECT video_renderer_get_default_rect(struct video_window *iface) { struct video_renderer *This = impl_from_video_window(iface); @@ -321,6 +324,7 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_destroy = video_renderer_destroy, .renderer_query_interface = video_renderer_query_interface, .renderer_pin_query_interface = video_renderer_pin_query_interface, + .renderer_connect = video_renderer_connect, }; static const struct video_window_ops window_ops =

1 0

Zebediah Figura : quartz/videorenderer: Factor out get_bitmap_header().
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 665ac338ca17b546f9c81c9016917d5d0a4df7d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=665ac338ca17b546f9c81c90… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 19:03:41 2020 -0500 quartz/videorenderer: Factor out get_bitmap_header(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 85 ++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 55 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 54a646fbc0..77afc9fcef 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -79,6 +79,14 @@ static inline struct video_renderer *impl_from_BaseControlVideo(BaseControlVideo return CONTAINING_RECORD(iface, struct video_renderer, baseControlVideo); } +static const BITMAPINFOHEADER *get_bitmap_header(const AM_MEDIA_TYPE *mt) +{ + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else + return &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; +} + static void VideoRenderer_AutoShowWindow(struct video_renderer *This) { if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) @@ -144,9 +152,7 @@ static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; LPBYTE pbSrcStream = NULL; - BITMAPINFOHEADER *bih; HRESULT hr; HDC dc; @@ -159,11 +165,6 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return hr; } - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else - bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; - dc = GetDC(filter->baseControlWindow.hwnd); StretchDIBits(dc, filter->DestRect.left, filter->DestRect.top, filter->DestRect.right - filter->DestRect.left, @@ -171,7 +172,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa filter->SourceRect.left, filter->SourceRect.top, filter->SourceRect.right - filter->SourceRect.left, filter->SourceRect.bottom - filter->SourceRect.top, - pbSrcStream, (BITMAPINFO *)bih, DIB_RGB_COLORS, SRCCOPY); + pbSrcStream, (BITMAPINFO *)get_bitmap_header(&filter->renderer.sink.pin.mt), DIB_RGB_COLORS, SRCCOPY); ReleaseDC(filter->baseControlWindow.hwnd, dc); if (filter->renderer.filter.state == State_Paused) @@ -190,53 +191,31 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return S_OK; } -static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *pmt) +static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - struct video_renderer *This = impl_from_strmbase_renderer(iface); + struct video_renderer *filter = impl_from_strmbase_renderer(iface); + const BITMAPINFOHEADER *bitmap_header; - if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Video)) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return S_FALSE; - if (IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB32) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB24) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB565) || - IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8)) - { - LONG height; + if (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8)) + return S_FALSE; - if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) - { - VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat; - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; - height = format->bmiHeader.biHeight; - if (height < 0) - This->SourceRect.bottom = This->VideoHeight = -height; - else - This->SourceRect.bottom = This->VideoHeight = height; - } - else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) - { - VIDEOINFOHEADER2 *format2 = (VIDEOINFOHEADER2 *)pmt->pbFormat; - - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format2->bmiHeader.biWidth; - height = format2->bmiHeader.biHeight; - if (height < 0) - This->SourceRect.bottom = This->VideoHeight = -height; - else - This->SourceRect.bottom = This->VideoHeight = height; - } - else - { - WARN("Format type %s not supported\n", debugstr_guid(&pmt->formattype)); - return S_FALSE; - } - return S_OK; - } - return S_FALSE; + if (!IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo) + && !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) + return S_FALSE; + + bitmap_header = get_bitmap_header(mt); + + filter->VideoWidth = bitmap_header->biWidth; + filter->VideoHeight = abs(bitmap_header->biHeight); + SetRect(&filter->SourceRect, 0, 0, filter->VideoWidth, filter->VideoHeight); + + return S_OK; } static void video_renderer_destroy(struct strmbase_renderer *iface) @@ -360,7 +339,6 @@ static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG *size, LONG *image) { struct video_renderer *filter = impl_from_BaseControlVideo(iface); - const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; const BITMAPINFOHEADER *bih; size_t image_size; BYTE *sample_data; @@ -369,10 +347,7 @@ static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG EnterCriticalSection(&filter->renderer.csRenderLock); - if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; - else /* if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) */ - bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + bih = get_bitmap_header(&filter->renderer.sink.pin.mt); image_size = bih->biWidth * bih->biHeight * bih->biBitCount / 8; if (!image)

1 0

Vijay Kiran Kamuju : msasn1: Implement ASN1_CloseModule function.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 0d2f30370067e194dfdcc72b3e675aaedcc2061b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d2f30370067e194dfdcc72b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue May 5 14:21:43 2020 +0200 msasn1: Implement ASN1_CloseModule function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 7 +++++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 6882fbf6c9..b30725aa63 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -84,3 +84,10 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, return module; } + +void WINAPI ASN1_CloseModule(ASN1module_t module) +{ + TRACE("(%p)\n", module); + + heap_free(module); +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index ca6a461c65..09935f5149 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -219,7 +219,7 @@ @ stub ASN1_CloseDecoder @ stub ASN1_CloseEncoder2 @ stub ASN1_CloseEncoder -@ stub ASN1_CloseModule +@ stdcall ASN1_CloseModule(ptr) @ stub ASN1_CreateDecoder @ stub ASN1_CreateDecoderEx @ stub ASN1_CreateEncoder diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index adbf547efa..80f4dd5990 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -55,6 +55,7 @@ static void test_CreateModule(void) ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(!mod->PER.apfnEncoder, "Encoder function should not be s et.\n"); ok(!mod->PER.apfnDecoder, "Decoder function should not be set.\n"); + ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); @@ -66,6 +67,7 @@ static void test_CreateModule(void) ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); ok(mod->BER.apfnEncoder==(ASN1BerEncFun_t *)encfn, "Encoder function = %p.\n",mod->BER.apfnEncoder); ok(mod->BER.apfnDecoder==(ASN1BerDecFun_t *)decfn, "Decoder function = %p.\n",mod->BER.apfnDecoder); + ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); ok(!!mod, "Failed to create module.\n"); @@ -79,6 +81,7 @@ static void test_CreateModule(void) broken(!mod->PER.apfnEncoder), "Encoder function = %p.\n",mod->PER.apfnEncoder); ok(mod->PER.apfnDecoder==(ASN1PerDecFun_t *)decfn /* WINXP & WIN2008 */ || broken(!mod->PER.apfnDecoder), "Decoder function = %p.\n",mod->PER.apfnDecoder); + ASN1_CloseModule(mod); } START_TEST(asn1)

1 0

Vijay Kiran Kamuju : msasn1: Implement ASN1_CreateModule function.
by Alexandre Julliard 06 May '20

06 May '20

Module: wine Branch: master Commit: 84096382fc4ca80f5fc59908bf287e28a291bae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84096382fc4ca80f5fc59908… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue May 5 13:51:36 2020 +0200 msasn1: Implement ASN1_CreateModule function. Based on patch from Austin English. Wine-Bug: https:/bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 30 +++++++++++++++++++++++++++++- dlls/msasn1/tests/asn1.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 90c4a8a9c9..6882fbf6c9 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "msasn1.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msasn1); @@ -49,10 +50,37 @@ ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, { ASN1module_t module = NULL; - FIXME("(%08x %08x %08x %u %p %p %p %p %u): Stub!\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); + TRACE("(%08x %08x %08x %u %p %p %p %p %u)\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); if (!encoder || !decoder || !freemem || !size) return module; + module = heap_alloc(sizeof(module)); + if (module) + { + module->nModuleName = magic; + module->eRule = rule; + module->dwFlags = flags; + module->cPDUs = pdu; + module->apfnFreeMemory = freemem; + module->acbStructSize = size; + + if (rule & ASN1_PER_RULE) + { + module->PER.apfnEncoder = (ASN1PerEncFun_t *)encoder; + module->PER.apfnDecoder = (ASN1PerDecFun_t *)decoder; + } + else if (rule & ASN1_BER_RULE) + { + module->BER.apfnEncoder = (ASN1BerEncFun_t *)encoder; + module->BER.apfnDecoder = (ASN1BerDecFun_t *)decoder; + } + else + { + module->PER.apfnEncoder = NULL; + module->PER.apfnDecoder = NULL; + } + } + return module; } diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index 19019fc72b..adbf547efa 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -46,10 +46,39 @@ static void test_CreateModule(void) ok(!mod, "Expected Failure.\n"); mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, size, 0); - todo_wine ok(!!mod, "Failed to create module.\n"); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==0, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==0, "Got eRule = %08x\n.",mod->eRule); + ok(mod->dwFlags==0, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->cPDUs==0, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(!mod->PER.apfnEncoder, "Encoder function should not be s et.\n"); + ok(!mod->PER.apfnDecoder, "Decoder function should not be set.\n"); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); - todo_wine ok(!!mod, "Failed to create module.\n"); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==name, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==ASN1_BER_RULE_DER, "Got eRule = %08x\n.",mod->eRule); + ok(mod->cPDUs==1, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(mod->BER.apfnEncoder==(ASN1BerEncFun_t *)encfn, "Encoder function = %p.\n",mod->BER.apfnEncoder); + ok(mod->BER.apfnDecoder==(ASN1BerDecFun_t *)decfn, "Decoder function = %p.\n",mod->BER.apfnDecoder); + + mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); + ok(!!mod, "Failed to create module.\n"); + ok(mod->nModuleName==name, "Got Module name = %d\n.",mod->nModuleName); + ok(mod->eRule==ASN1_PER_RULE_ALIGNED, "Got eRule = %08x\n.",mod->eRule); + ok(mod->cPDUs==1, "Got PDUs = %08x\n.",mod->cPDUs); + ok(mod->dwFlags==ASN1FLAGS_NOASSERT, "Got Flags = %08x\n.",mod->dwFlags); + ok(mod->apfnFreeMemory==freefn, "Free function = %p.\n",mod->apfnFreeMemory); + ok(mod->acbStructSize==size, "Struct size = %p.\n",mod->acbStructSize); + ok(mod->PER.apfnEncoder==(ASN1PerEncFun_t *)encfn /* WINXP & WIN2008 */ || + broken(!mod->PER.apfnEncoder), "Encoder function = %p.\n",mod->PER.apfnEncoder); + ok(mod->PER.apfnDecoder==(ASN1PerDecFun_t *)decfn /* WINXP & WIN2008 */ || + broken(!mod->PER.apfnDecoder), "Decoder function = %p.\n",mod->PER.apfnDecoder); } START_TEST(asn1)

1 0

Zhiyi Zhang : wined3d: Fix an uninitialised variable warning.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 1976685a0f57bdec939228d73f6252c68ccb8f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1976685a0f57bdec939228d7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:46:43 2020 +0800 wined3d: Fix an uninitialised variable warning. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index a1aa3c0bb9..c21ecfd5c3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -257,7 +257,7 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G }; GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; - const char *tex_type_str; + const char *tex_type_str = NULL; unsigned int i; gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, @@ -310,8 +310,6 @@ static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, G } else { - tex_type_str = NULL; - for (i = 0; i < ARRAY_SIZE(texture_type); ++i) { if (!gl_info->supported[texture_type[i].extension])

1 0

Zhiyi Zhang : wined3d: Move device window to the correct output in wined3d_swapchain_state_resize_target().
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 7ee8674ed27474d2559dcd06f3e3de526e03fe49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ee8674ed27474d2559dcd06… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:46:30 2020 +0800 wined3d: Move device window to the correct output in wined3d_swapchain_state_resize_target(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 86f8277a27..dd0419412a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1472,7 +1472,9 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta struct wined3d_output *output, const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; + struct wined3d_output_desc output_desc; RECT original_window_rect, window_rect; + int x, y, width, height; HWND window; HRESULT hr; @@ -1488,37 +1490,42 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta AdjustWindowRectEx(&window_rect, GetWindowLongW(window, GWL_STYLE), FALSE, GetWindowLongW(window, GWL_EXSTYLE)); - SetRect(&window_rect, 0, 0, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); GetWindowRect(window, &original_window_rect); - OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + + x = original_window_rect.left; + y = original_window_rect.top; + width = window_rect.right - window_rect.left; + height = window_rect.bottom - window_rect.top; } - else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) + else { - actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) + if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - wined3d_mutex_unlock(); - return hr; + actual_mode = *mode; + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) + { + ERR("Failed to set display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - else - { - if (FAILED(hr = wined3d_output_get_display_mode(output, &actual_mode, NULL))) + + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) { - ERR("Failed to get display mode, hr %#x.\n", hr); + ERR("Failed to get output description, hr %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); + x = output_desc.desktop_rect.left; + y = output_desc.desktop_rect.top; + width = output_desc.desktop_rect.right - output_desc.desktop_rect.left; + height = output_desc.desktop_rect.bottom - output_desc.desktop_rect.top; } wined3d_mutex_unlock(); - MoveWindow(window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + MoveWindow(window, x, y, width, height, TRUE); return WINED3D_OK; }

1 0

Zhiyi Zhang : dxgi/tests: Test IDXGISwapChain_ResizeTarget() with all outputs.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 9c7635c4ddf09c1941041ae815405e05d1f372fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c7635c4ddf09c1941041ae8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:46:19 2020 +0800 dxgi/tests: Test IDXGISwapChain_ResizeTarget() with all outputs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 170 ++++++++++++++++++++++++++++--------------------- 1 file changed, 98 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c7635c4ddf09c194104…

1 0

Zhiyi Zhang : dxgi/tests: Do not run test_multi_adapter() in parallel with other tests.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: a304bfa97dfb8cddbb3c14efcd0e4a5283531b42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a304bfa97dfb8cddbb3c14ef… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:46:06 2020 +0800 dxgi/tests: Do not run test_multi_adapter() in parallel with other tests. test_multi_adapter() tests detaching non-primary outputs, interferencing other tests when non-primary outputs are enumerated. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 4ca0b952f8..325a0bf07a 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6505,7 +6505,6 @@ START_TEST(dxgi) queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); - queue_test(test_multi_adapter); queue_test(test_factory_check_feature_support); run_queued_tests(); @@ -6515,6 +6514,7 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); + test_multi_adapter(); test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles();

1 0

Zhiyi Zhang : dxgi/tests: Fix a possible test failure on D3D12.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 58486350eb202f8c570a630a5d18f1a028c2512a URL: https://source.winehq.org/git/wine.git/?a=commit;h=58486350eb202f8c570a630a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:45:52 2020 +0800 dxgi/tests: Fix a possible test failure on D3D12. Calling d3d12_swapchain_Present() right after switching to full screen mode may fail because the swapchain window may be in the animation of becoming full screen and vkQueuePresentKHR() returns VK_ERROR_OUT_OF_DATE_KHR, even after d3d12_swapchain_present() tried to recreate the swapchain. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 32aae2567f..4ca0b952f8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -129,6 +129,24 @@ static void get_virtual_rect(RECT *rect) rect->bottom = rect->top + GetSystemMetrics(SM_CYVIRTUALSCREEN); } +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + int diff = 200; + DWORD time; + MSG msg; + + time = GetTickCount() + diff; + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + #define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, BOOL supported, BOOL is_broken) @@ -4276,6 +4294,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) skip("Test %u: Could not change fullscreen state.\n", i); continue; } + flush_events(); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -4427,6 +4446,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); DestroyWindow(occluding_window); + flush_events(); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); @@ -4903,24 +4923,6 @@ static void test_object_wrapping(void) ok(!refcount, "Factory has %u references left.\n", refcount); } -/* try to make sure pending X events have been processed before continuing */ -static void flush_events(void) -{ - int diff = 200; - DWORD time; - MSG msg; - - time = GetTickCount() + diff; - while (diff > 0) - { - if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) - break; - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) - DispatchMessageA(&msg); - diff = time - GetTickCount(); - } -} - struct adapter_info { const WCHAR *name;

1 0

Zebediah Figura : ddraw: Implement DDENUMSURFACES_CANBECREATED.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 616585d7fbd7cd447a9e66a86f5dc8272584bb0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=616585d7fbd7cd447a9e66a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 3 15:42:08 2020 -0500 ddraw: Implement DDENUMSURFACES_CANBECREATED. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17233 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 137 +++++++++++++++++++++++++++++++++++++--------- dlls/ddraw/tests/ddraw1.c | 16 +++--- dlls/ddraw/tests/ddraw2.c | 16 +++--- dlls/ddraw/tests/ddraw4.c | 16 +++--- dlls/ddraw/tests/ddraw7.c | 16 +++--- 5 files changed, 142 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=616585d7fbd7cd447a9e…

1 0

Zebediah Figura : ddraw: Properly compare DDENUMSURFACES_NOMATCH to TRUE.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 8e8e0f48c42587af372c0dcc7f0e98ee3ae506d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e8e0f48c42587af372c0dcc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 3 15:42:07 2020 -0500 ddraw: Properly compare DDENUMSURFACES_NOMATCH to TRUE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b7e7e6514a..afd2875ea2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3213,7 +3213,7 @@ static HRESULT CALLBACK EnumSurfacesCallbackThunk(IDirectDrawSurface7 *surface, * DD_OK on success * *****************************************************************************/ -static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags, +static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD flags, DDSURFACEDESC2 *DDSD, void *Context, LPDDENUMSURFACESCALLBACK7 Callback) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); @@ -3223,10 +3223,10 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags, struct list *entry, *entry2; TRACE("iface %p, flags %#x, surface_desc %p, context %p, callback %p.\n", - iface, Flags, DDSD, Context, Callback); + iface, flags, DDSD, Context, Callback); - all = Flags & DDENUMSURFACES_ALL; - nomatch = Flags & DDENUMSURFACES_NOMATCH; + all = flags & DDENUMSURFACES_ALL; + nomatch = !!(flags & DDENUMSURFACES_NOMATCH); if (!Callback) return DDERR_INVALIDPARAMS; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 0e1de7909d..4a1818af6a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12229,7 +12229,7 @@ static void test_enum_surfaces(void) hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, &desc, &param, enum_surfaces_cb); ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); - todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); desc.dwFlags = 0; param.count = 0; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8d38344520..03615c61ce 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13205,7 +13205,7 @@ static void test_enum_surfaces(void) hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, &desc, &param, enum_surfaces_cb); ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); - todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); desc.dwFlags = 0; param.count = 0; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3a3983639d..ce6c8aaf22 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15793,7 +15793,7 @@ static void test_enum_surfaces(void) hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, &desc, &param, enum_surfaces_cb); ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); - todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); desc.dwFlags = 0; param.count = 0; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index bf31d3915b..466fcc544a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15203,7 +15203,7 @@ static void test_enum_surfaces(void) hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, &desc, &param, enum_surfaces_cb); ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); - todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); desc.dwFlags = 0; param.count = 0;

1 0

Zebediah Figura : ddraw/tests: Add more tests for EnumSurfaces().
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 2389fae064cc34ba1e87fdfc2b46691414817541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2389fae064cc34ba1e87fdfc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 3 15:42:06 2020 -0500 ddraw/tests: Add more tests for EnumSurfaces(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 158 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 158 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 168 +++++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 169 ++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 636 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2389fae064cc34ba1e87…

1 0

Derek Lesho : mf: Add missing ::Release of clock timer.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 1962a1f969e110b3effe6776fc03af68301c1d15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1962a1f969e110b3effe6776… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue May 5 09:59:00 2020 -0500 mf: Add missing ::Release of clock timer. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 75ef600a4d..d6b881218b 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -4289,6 +4289,7 @@ static HRESULT WINAPI present_clock_timer_callback_Invoke(IMFAsyncCallback *ifac EnterCriticalSection(&clock->cs); list_remove(&timer->entry); + IUnknown_Release(&timer->IUnknown_iface); LeaveCriticalSection(&clock->cs); IMFAsyncCallback_Invoke(timer->callback, timer->result);

1 0

Jacek Caban : configure: Explicitly specify subsystem when using msvc target.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: c8905b2880aff43ce4660e751d54ecfc55deab2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8905b2880aff43ce4660e75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:31:19 2020 +0200 configure: Explicitly specify subsystem when using msvc target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 14 +++++++++----- configure.ac | 8 ++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 47a2a25219..3c6c360a44 100755 --- a/configure +++ b/configure @@ -9847,6 +9847,7 @@ $as_echo "$wine_cv_crosscc" >&6; } done llvm_target=$CROSSTARGET + llvm_cflags="-fuse-ld=lld" if test -z "$llvm_target" then case $host_cpu in @@ -9854,16 +9855,19 @@ $as_echo "$wine_cv_crosscc" >&6; } *) llvm_target=$host_cpu-windows-gnu ;; esac fi - as_ac_var=`$as_echo "ac_cv_crosscflags_-target $llvm_target -fuse-ld=lld" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -target $llvm_target -fuse-ld=lld" >&5 -$as_echo_n "checking whether the cross-compiler supports -target $llvm_target -fuse-ld=lld... " >&6; } + case $llvm_target in + *windows) llvm_cflags="$llvm_cflags -Wl,-subsystem:console" ;; + esac + as_ac_var=`$as_echo "ac_cv_crosscflags_-target $llvm_target $llvm_cflags" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -target $llvm_target $llvm_cflags" >&5 +$as_echo_n "checking whether the cross-compiler supports -target $llvm_target $llvm_cflags... " >&6; } if eval \${$as_ac_var+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS ac_wine_try_cflags_saved_cc=$CC ac_wine_try_cflags_saved_exeext=$ac_exeext -CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -target $llvm_target -fuse-ld=lld" +CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs -target $llvm_target $llvm_cflags" CC="$CROSSCC" ac_exeext=".exe" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9889,7 +9893,7 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -target $CROSSTARGET" DELAYLOADFLAG="-Wl,-delayload," - CFLAGS="$CFLAGS -fuse-ld=lld" + CFLAGS="$CFLAGS $llvm_cflags" fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-strict-aliasing" >&5 diff --git a/configure.ac b/configure.ac index 103e81e285..d4a92d3cbb 100644 --- a/configure.ac +++ b/configure.ac @@ -1057,6 +1057,7 @@ then dnl Check if cross compiler supports -target argument llvm_target=$CROSSTARGET + llvm_cflags="-fuse-ld=lld" if test -z "$llvm_target" then case $host_cpu in @@ -1064,11 +1065,14 @@ then *) llvm_target=$host_cpu-windows-gnu ;; esac fi - WINE_TRY_CROSSCFLAGS([-target $llvm_target -fuse-ld=lld], + case $llvm_target in + *windows) llvm_cflags="$llvm_cflags -Wl,-subsystem:console" ;; + esac + WINE_TRY_CROSSCFLAGS([-target $llvm_target $llvm_cflags], [CROSSTARGET=$llvm_target EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -target $CROSSTARGET" AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"]) - CFLAGS="$CFLAGS -fuse-ld=lld"]) + CFLAGS="$CFLAGS $llvm_cflags"]) fi WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options

1 0

Jacek Caban : configure: Allow specifying default CROSSTARGET as configure argument.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 583ad67ff0f7290c2e30978d8a16e909a1f24dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=583ad67ff0f7290c2e30978d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:30:58 2020 +0200 configure: Allow specifying default CROSSTARGET as configure argument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index f730956951..47a2a25219 100755 --- a/configure +++ b/configure @@ -9732,7 +9732,6 @@ enable_wineandroid_drv=${enable_wineandroid_drv:-no} enable_winemac_drv=${enable_winemac_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} -CROSSTARGET="" if test "x$with_mingw" != xno then diff --git a/configure.ac b/configure.ac index 3716f4f46f..103e81e285 100644 --- a/configure.ac +++ b/configure.ac @@ -1023,7 +1023,7 @@ enable_winemac_drv=${enable_winemac_drv:-no} test "$ac_cv_header_linux_joystick_h" = "yes" -o "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no} dnl Check for cross compiler to build test programs -AC_SUBST(CROSSTARGET,"") +AC_SUBST(CROSSTARGET) if test "x$with_mingw" != xno then case "x$with_mingw" in

1 0

Jacek Caban : configure: Assume that -delayload linker argument is supported when -target argument is used.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 3cae9288ea6066fd9dcea1459ad1722e53f8216c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cae9288ea6066fd9dcea145… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:29:15 2020 +0200 configure: Assume that -delayload linker argument is supported when -target argument is used. In practice, it's present only on clang and it always needs to be used there. mingw and msvc targets have different syntax. We take care of that in winegcc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- configure | 83 +++++++++++++++++++----------------------------------------- configure.ac | 3 +-- 3 files changed, 28 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cae9288ea6066fd9dce…

1 0

Jacek Caban : winecrt0: Add _fltused symbol.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 053f07f602e2ead81d3764ec8cb4279614285e0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=053f07f602e2ead81d3764ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:29:06 2020 +0200 winecrt0: Add _fltused symbol. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 1 + dlls/winecrt0/crt_fltused.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index bcbd4e3b55..18a116e578 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -2,6 +2,7 @@ MODULE = libwinecrt0.a C_SRCS = \ crt_dllmain.c \ + crt_fltused.c \ debug.c \ delay_load.c \ dll_main.c \ diff --git a/dlls/winecrt0/crt_fltused.c b/dlls/winecrt0/crt_fltused.c new file mode 100644 index 0000000000..f65fc2d96c --- /dev/null +++ b/dlls/winecrt0/crt_fltused.c @@ -0,0 +1,24 @@ +/* + * Copyright 2020 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef _WIN32 + +/* referenced by MSVC to pull crt support for floating points. we don't use it. */ +int _fltused = 0; + +#endif

1 0

Jacek Caban : winecrt0: Build exception functions on clang msvc target.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 9666ed9c466d803eec868e5db1d63c10b614d4c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9666ed9c466d803eec868e5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:28:56 2020 +0200 winecrt0: Build exception functions on clang msvc target. We may potentially use compiler __try/__except support in this case, but there is no reason not to support both. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 3a0ecfef68..137ee2d6ee 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -23,7 +23,9 @@ #include "wine/exception.h" #include "wine/asm.h" -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) || defined(__clang__) + +#if defined(__i386__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "movl 4(%esp),%ecx\n\t" /* jmp_buf */ @@ -62,7 +64,7 @@ __ASM_GLOBAL_FUNC( __wine_rtl_unwind, "call " __ASM_STDCALL("RtlUnwind",16) "\n\t" "call *16(%ebp)" ) -#elif defined(__GNUC__) && defined(__x86_64__) +#elif defined(__x86_64__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "movq %rdx,(%rcx)\n\t" /* jmp_buf->Frame */ @@ -134,7 +136,7 @@ __ASM_GLOBAL_FUNC( __wine_rtl_unwind, /* we need an extra call to make sure the stack is correctly aligned */ "callq *%rax" ) -#elif defined(__GNUC__) && defined(__arm__) +#elif defined(__arm__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "str r1, [r0]\n\t" /* jmp_buf->Frame */ @@ -196,7 +198,7 @@ void __cdecl __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_ for (;;) target(); } -#elif defined(__GNUC__) && defined(__aarch64__) +#elif defined(__aarch64__) __ASM_GLOBAL_FUNC( __wine_setjmpex, "str x1, [x0]\n\t" /* jmp_buf->Frame */ @@ -383,3 +385,5 @@ DWORD __cdecl __wine_finally_ctx_handler( EXCEPTION_RECORD *record, } return ExceptionContinueSearch; } + +#endif /* __GNUC__ || __clang__ */

1 0

Jacek Caban : ntoskrnl.exe: Export _chkstk from importlib.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 92e40853d8b7915187a419633c0e996fafb1bdf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92e40853d8b7915187a41963… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:28:49 2020 +0200 ntoskrnl.exe: Export _chkstk from importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3013fe7eb9..7ebce5709d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3741,7 +3741,7 @@ __ASM_GLOBAL_FUNC( __chkstk, "ret" ); /************************************************************************** * _chkstk (NTOSKRNL.@) */ -__ASM_STDCALL_FUNC( _chkstk, 0, +__ASM_GLOBAL_FUNC( _chkstk, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8e3b127b16..76c4afb281 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1500,7 +1500,7 @@ @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @@ -1516,7 +1516,7 @@ @ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) -@ stdcall -arch=i386 -norelay _chkstk() +@ cdecl -arch=i386 -norelay _chkstk() @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) @ cdecl _finite(double)

1 0

Jacek Caban : ntdll: Export _chkstk from importlib.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 93d1eecb6aa4f911e4bf4ea2b32969b21588292c URL: https://source.winehq.org/git/wine.git/?a=commit;h=93d1eecb6aa4f911e4bf4ea2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 16:28:42 2020 +0200 ntdll: Export _chkstk from importlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/signal_i386.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5d083b0142..0dd3813987 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1640,7 +1640,7 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall -import ZombifyActCtx(ptr) @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e9a93e551d..e73682af0f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1736,7 +1736,7 @@ # @ stub _GetMUIStringFromCache # @ stub _OpenMuiStringCache @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ stdcall -arch=arm,x86_64 -private -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk # @ stub __dllonexit3 @ stub __misaligned_access # @ stub __wgetmainargs diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b2e467c70c..b19b334bb4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1413,7 +1413,7 @@ @ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin @ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ stdcall -private -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,x86_64 -norelay __chkstk() @ cdecl __isascii(long) NTDLL___isascii @ cdecl __iscsym(long) NTDLL___iscsym @ cdecl __iscsymf(long) NTDLL___iscsymf @@ -1430,7 +1430,7 @@ @ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) -@ stdcall -private -arch=i386 -norelay _chkstk() +@ cdecl -arch=i386 -norelay _chkstk() @ stub _fltused @ cdecl -arch=i386 -ret64 _ftol() NTDLL__ftol @ cdecl _i64toa(int64 ptr long) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e905ed0af1..5396037502 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -3050,7 +3050,7 @@ __ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" ) /************************************************************************** * _chkstk (NTDLL.@) */ -__ASM_STDCALL_FUNC( _chkstk, 0, +__ASM_GLOBAL_FUNC( _chkstk, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t" @@ -3061,7 +3061,7 @@ __ASM_STDCALL_FUNC( _chkstk, 0, /************************************************************************** * _alloca_probe (NTDLL.@) */ -__ASM_STDCALL_FUNC( _alloca_probe, 0, +__ASM_GLOBAL_FUNC( _alloca_probe, "negl %eax\n\t" "addl %esp,%eax\n\t" "xchgl %esp,%eax\n\t"

1 0

Nikolay Sivov : dwrite: Use feature tags directly instead of SDK symbols.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: eadd97cbcea105cade5981503b3bb8eceaa3a127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadd97cbcea105cade598150… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 13:45:55 2020 +0300 dwrite: Use feature tags directly instead of SDK symbols. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index a5a1a232e7..e7693b58ae 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -285,15 +285,15 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i { static const unsigned int common_features[] = { - DWRITE_FONT_FEATURE_TAG_GLYPH_COMPOSITION_DECOMPOSITION, - DWRITE_FONT_FEATURE_TAG_LOCALIZED_FORMS, - DWRITE_FONT_FEATURE_TAG_REQUIRED_LIGATURES, + DWRITE_MAKE_OPENTYPE_TAG('c','c','m','p'), + DWRITE_MAKE_OPENTYPE_TAG('l','o','c','l'), + DWRITE_MAKE_OPENTYPE_TAG('r','l','i','g'), }; static const unsigned int horizontal_features[] = { - DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES, - DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_LIGATURES, - DWRITE_FONT_FEATURE_TAG_STANDARD_LIGATURES, + DWRITE_MAKE_OPENTYPE_TAG('c','a','l','t'), + DWRITE_MAKE_OPENTYPE_TAG('c','l','i','g'), + DWRITE_MAKE_OPENTYPE_TAG('l','i','g','a'), DWRITE_MAKE_OPENTYPE_TAG('r','c','l','t'), }; struct scriptshaping_cache *cache = context->cache;

1 0

Nikolay Sivov : dwrite: Enable common positional features for all scripts.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 33ec962e271d2d7a88a1ec66940d52b708ec040c URL: https://source.winehq.org/git/wine.git/?a=commit;h=33ec962e271d2d7a88a1ec66… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 5 13:45:54 2020 +0300 dwrite: Enable common positional features for all scripts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 78 ++++++++++++++++--------------------- dlls/dwrite/dwrite_private.h | 4 +- dlls/dwrite/shape.c | 92 +++++++++++++++++++------------------------- 3 files changed, 74 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33ec962e271d2d7a88a1…

1 0

Hans Leidekker : msxml6: Update version resource.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: dd41471f0711aa1e0999fa91f4de970bd1b42e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd41471f0711aa1e0999fa91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 1 09:44:48 2020 +0200 msxml6: Update version resource. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml6/rsrc.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml6/rsrc.rc b/dlls/msxml6/rsrc.rc index 9c6e55c551..d803f67962 100644 --- a/dlls/msxml6/rsrc.rc +++ b/dlls/msxml6/rsrc.rc @@ -18,10 +18,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine MSXML 6.0" #define WINE_FILENAME_STR "msxml6.dll" -#define WINE_FILEVERSION 6,10,1129,0 -#define WINE_FILEVERSION_STR "6.10.1129.0" -#define WINE_PRODUCTVERSION 6,10,1129,0 -#define WINE_PRODUCTVERSION_STR "6.10.1129.0" +#define WINE_FILEVERSION 6,30,7601,24498 +#define WINE_FILEVERSION_STR "6.30.7601.24498" +#define WINE_PRODUCTVERSION 6,30,7601,24498 +#define WINE_PRODUCTVERSION_STR "6.30.7601.24498" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : msxml3: Update version resource.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 608a7f94e8fb9182b70f0b8d550e961e724f7d88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=608a7f94e8fb9182b70f0b8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 1 09:44:47 2020 +0200 msxml3: Update version resource. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc index 127ecee884..51da3e809e 100644 --- a/dlls/msxml3/version.rc +++ b/dlls/msxml3/version.rc @@ -16,10 +16,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine MSXML 3.0" #define WINE_FILENAME_STR "msxml3.dll" -#define WINE_FILEVERSION 8,90,1101,0 -#define WINE_FILEVERSION_STR "8.90.1101.0" -#define WINE_PRODUCTVERSION 8,90,1101,0 -#define WINE_PRODUCTVERSION_STR "8.90.1101.0" +#define WINE_FILEVERSION 8,110,7601,24402 +#define WINE_FILEVERSION_STR "8.110.7601.24402" +#define WINE_PRODUCTVERSION 8,110,7601,24402 +#define WINE_PRODUCTVERSION_STR "8.110.7601.24402" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : kernelbase: Add CopyMemoryNonTemporal export.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 9c0a205ff4c4b1ea62febca41213255b3b0f2452 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c0a205ff4c4b1ea62febca4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 19:05:28 2020 +0200 kernelbase: Add CopyMemoryNonTemporal export. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7b60ee3eef..e9a93e551d 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -168,7 +168,7 @@ # @ stub CopyFile2 @ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) @ stdcall CopyFileW(wstr wstr long) -# @ stub -arch=x86_64 CopyMemoryNonTemporal +@ stdcall -arch=x86_64 CopyMemoryNonTemporal(ptr ptr long) ntdll.RtlCopyMemoryNonTemporal @ stdcall CopySid(long ptr ptr) # @ stub CouldMultiUserAppsBehaviorBePossibleForPackage @ stdcall CreateActCtxW(ptr)

1 0

Alexandre Julliard : kernel32: Move some stub functions to kernelbase.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 0c90da7f7ed77c6ad067319ada66377c641c82d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c90da7f7ed77c6ad067319a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 20:15:08 2020 +0200 kernel32: Move some stub functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 23 --------------------- dlls/kernel32/kernel32.spec | 26 ++++++++++++------------ dlls/kernel32/locale.c | 28 ------------------------- dlls/kernel32/process.c | 33 ------------------------------ dlls/kernel32/time.c | 24 ---------------------- dlls/kernel32/version.c | 36 --------------------------------- dlls/kernelbase/file.c | 22 ++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 26 ++++++++++++------------ dlls/kernelbase/locale.c | 27 +++++++++++++++++++++++++ dlls/kernelbase/process.c | 45 +++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/thread.c | 12 +++++++++++ dlls/kernelbase/version.c | 40 ++++++++++++++++++++++++++++++++++++ 12 files changed, 172 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c90da7f7ed77c6ad067…

1 0

Alexandre Julliard : kernel32: Move FlushProcessWriteBuffers() stub to ntdll.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: a10f1e9d7b560f8cbdd85b8b5844694302fda0d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a10f1e9d7b560f8cbdd85b8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 20:07:31 2020 +0200 kernel32: Move FlushProcessWriteBuffers() stub to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 11 ----------- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 9 +++++++++ 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1bc32e5ef2..ee7fca5606 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -518,7 +518,7 @@ @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) KERNEL32_FlushFileBuffers @ stdcall -import FlushInstructionCache(long long long) -@ stdcall FlushProcessWriteBuffers() +@ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers @ stdcall -import FlushViewOfFile(ptr long) @ stdcall FoldStringA(long str long ptr long) @ stdcall -import FoldStringW(long wstr long ptr long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5146622230..1256d40588 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -992,17 +992,6 @@ BOOL WINAPI GetProcessDEPPolicy(HANDLE process, LPDWORD flags, PBOOL permanent) return TRUE; } -/********************************************************************** - * FlushProcessWriteBuffers (KERNEL32.@) - */ -VOID WINAPI FlushProcessWriteBuffers(void) -{ - static int once = 0; - - if (!once++) - FIXME(": stub\n"); -} - /*********************************************************************** * UnregisterApplicationRestart (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7b02838298..5f9eb9fdce 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -382,7 +382,7 @@ @ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) -@ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers +@ stdcall FlushProcessWriteBuffers() ntdll.NtFlushProcessWriteBuffers @ stdcall FlushViewOfFile(ptr long) @ stdcall FoldStringW(long wstr long ptr long) # @ stub ForceSyncFgPolicyInternal diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cb6a8ec8c4..b2e467c70c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -212,6 +212,7 @@ @ stdcall NtFlushBuffersFile(long ptr) @ stdcall NtFlushInstructionCache(long ptr long) @ stdcall NtFlushKey(long) +@ stdcall NtFlushProcessWriteBuffers() @ stdcall NtFlushVirtualMemory(long ptr ptr long) @ stub NtFlushWriteBuffer # @ stub NtFreeUserPhysicalPages diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index e59c255e32..6c5f722b2a 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -737,6 +737,15 @@ NTSTATUS WINAPI NtFlushInstructionCache( HANDLE handle, const void *addr, SIZE_T return STATUS_SUCCESS; } +/********************************************************************** + * NtFlushProcessWriteBuffers [NTDLL.@] + */ +void WINAPI NtFlushProcessWriteBuffers(void) +{ + static int once = 0; + if (!once++) FIXME( "stub\n" ); +} + /****************************************************************** * NtOpenProcess [NTDLL.@] * ZwOpenProcess [NTDLL.@]

1 0

Alexandre Julliard : kernel32: Move Wer* function stubs to kernelbase.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 8555e948bd0df14bf19df75b80026d6299667a1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8555e948bd0df14bf19df75b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 19:26:08 2020 +0200 kernel32: Move Wer* function stubs to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 3 +- dlls/kernel32/kernel32.spec | 16 +++---- dlls/kernel32/wer.c | 92 ----------------------------------------- dlls/kernelbase/debug.c | 82 ++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 16 +++---- include/werapi.h | 2 + 6 files changed, 101 insertions(+), 110 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index a6c9fed546..4c23ac59b6 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -37,8 +37,7 @@ C_SRCS = \ toolhelp.c \ version.c \ virtual.c \ - volume.c \ - wer.c + volume.c RC_SRCS = \ locale_rc.rc \ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index db9d93e52a..1bc32e5ef2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1589,14 +1589,14 @@ @ stdcall -import WaitNamedPipeW (wstr long) @ stdcall WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable @ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable -# @ stub WerGetFlags -@ stdcall WerRegisterFile(wstr long long) -@ stdcall WerRegisterMemoryBlock(ptr long) -@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) -@ stdcall WerSetFlags(long) -# @ stub WerUnregisterFile -@ stdcall WerUnregisterMemoryBlock(ptr) -@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) +@ stdcall -import WerGetFlags(ptr ptr) +@ stdcall -import WerRegisterFile(wstr long long) +@ stdcall -import WerRegisterMemoryBlock(ptr long) +@ stdcall -import WerRegisterRuntimeExceptionModule(wstr ptr) +@ stdcall -import WerSetFlags(long) +@ stdcall -import WerUnregisterFile(wstr) +@ stdcall -import WerUnregisterMemoryBlock(ptr) +@ stdcall -import WerUnregisterRuntimeExceptionModule(wstr ptr) # @ stub WerpCleanupMessageMapping # @ stub WerpInitiateRemoteRecovery # @ stub WerpNotifyLoadStringResource diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c deleted file mode 100644 index 2a7853bde9..0000000000 --- a/dlls/kernel32/wer.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Windows Error Reporting functions - * - * Copyright 2010 Louis Lenders - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "werapi.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wer); - -/*********************************************************************** - * WerRegisterFile (KERNEL32.@) - * - * Register a file to be included in WER error report. - */ -HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags) -{ - FIXME("(%s, %d, %d) stub!\n", debugstr_w(file), regfiletype, flags); - return E_NOTIMPL; -} - -/*********************************************************************** - * WerRegisterRuntimeExceptionModule (KERNEL32.@) - * - * Register a custom runtime exception handler. - */ - -HRESULT WINAPI WerRegisterRuntimeExceptionModule(PCWSTR callbackdll, PVOID context) -{ - FIXME("(%s, %p) stub!\n", debugstr_w(callbackdll), context); - return S_OK; -} - -/*********************************************************************** - * WerSetFlags (KERNEL32.@) - * - * Sets error reporting flags for the current process. - */ - -HRESULT WINAPI WerSetFlags(DWORD flags) -{ - FIXME("(%d) stub!\n", flags); - return E_NOTIMPL; -} - -/*********************************************************************** - * WerRegisterMemoryBlock (KERNEL32.@) - */ -HRESULT WINAPI WerRegisterMemoryBlock(void *block, DWORD size) -{ - FIXME("(%p %d) stub\n", block, size); - return E_NOTIMPL; -} - -/*********************************************************************** - * WerUnregisterMemoryBlock (KERNEL32.@) - */ -HRESULT WINAPI WerUnregisterMemoryBlock(void *block) -{ - FIXME("(%p) stub\n", block); - return E_NOTIMPL; -} - -/*********************************************************************** - * WerUnregisterRuntimeExceptionModule (KERNEL32.@) - */ -HRESULT WINAPI WerUnregisterRuntimeExceptionModule(PCWSTR callbackdll, PVOID context) -{ - FIXME("(%s, %p) stub!\n", debugstr_w(callbackdll), context); - return S_OK; -} diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 60c9d09cf6..f7457e8a37 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -28,6 +28,7 @@ #include "winternl.h" #include "wingdi.h" #include "winuser.h" +#include "werapi.h" #include "wine/exception.h" #include "wine/server.h" @@ -767,3 +768,84 @@ LONG WINAPI UnhandledExceptionFilter( EXCEPTION_POINTERS *epointers ) } return EXCEPTION_CONTINUE_SEARCH; } + + +/*********************************************************************** + * WerGetFlags (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerGetFlags( HANDLE process, DWORD *flags ) +{ + FIXME( "(%p, %p) stub\n", process, flags ); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerRegisterFile (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterFile( const WCHAR *file, WER_REGISTER_FILE_TYPE type, + DWORD flags ) +{ + FIXME( "(%s, %d, %d) stub\n", debugstr_w(file), type, flags ); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerRegisterMemoryBlock (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterMemoryBlock( void *block, DWORD size ) +{ + FIXME( "(%p %d) stub\n", block, size ); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerRegisterRuntimeExceptionModule (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerRegisterRuntimeExceptionModule( const WCHAR *dll, void *context ) +{ + FIXME( "(%s, %p) stub\n", debugstr_w(dll), context ); + return S_OK; +} + + +/*********************************************************************** + * WerSetFlags (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerSetFlags( DWORD flags ) +{ + FIXME("(%d) stub\n", flags); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerUnregisterFile (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerUnregisterFile( const WCHAR *file ) +{ + FIXME( "(%s) stub\n", debugstr_w(file) ); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerUnregisterMemoryBlock (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerUnregisterMemoryBlock( void *block ) +{ + FIXME( "(%p) stub\n", block ); + return E_NOTIMPL; +} + + +/*********************************************************************** + * WerUnregisterRuntimeExceptionModule (kernelbase.@) + */ +HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerUnregisterRuntimeExceptionModule( const WCHAR *dll, void *context ) +{ + FIXME( "(%s, %p) stub\n", debugstr_w(dll), context ); + return S_OK; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 904f1704eb..7b02838298 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1701,14 +1701,14 @@ @ stdcall WakeByAddressAll(ptr) ntdll.RtlWakeAddressAll @ stdcall WakeByAddressSingle(ptr) ntdll.RtlWakeAddressSingle @ stdcall WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable -# @ stub WerGetFlags -@ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile -@ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock -@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule -@ stdcall WerSetFlags(long) kernel32.WerSetFlags -# @ stub WerUnregisterFile -@ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock -@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule +@ stdcall WerGetFlags(ptr ptr) +@ stdcall WerRegisterFile(wstr long long) +@ stdcall WerRegisterMemoryBlock(ptr long) +@ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) +@ stdcall WerSetFlags(long) +@ stdcall WerUnregisterFile(wstr) +@ stdcall WerUnregisterMemoryBlock(ptr) +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) # @ stub WerpNotifyLoadStringResource # @ stub WerpNotifyUseStringResource @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) diff --git a/include/werapi.h b/include/werapi.h index 247c612175..30ba6cd950 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -174,6 +174,7 @@ typedef struct _WER_EXCEPTION_INFORMATION /* #### */ HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL); +HRESULT WINAPI WerGetFlags(HANDLE process, DWORD *flags); HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags); HRESULT WINAPI WerRegisterMemoryBlock(void *block, DWORD size); HRESULT WINAPI WerRegisterRuntimeExceptionModule(PCWSTR callbackdll, void *context); @@ -185,6 +186,7 @@ HRESULT WINAPI WerReportSetParameter(HREPORT, DWORD, PCWSTR, PCWSTR); HRESULT WINAPI WerReportSetUIOption(HREPORT, WER_REPORT_UI, PCWSTR); HRESULT WINAPI WerReportSubmit(HREPORT, WER_CONSENT, DWORD, PWER_SUBMIT_RESULT); HRESULT WINAPI WerSetFlags(DWORD flags); +HRESULT WINAPI WerUnregisterFile(PCWSTR file); HRESULT WINAPI WerUnregisterMemoryBlock(void *block); HRESULT WINAPI WerUnregisterRuntimeExceptionModule(PCWSTR callbackdll, void *context);

1 0

Alexandre Julliard : kernel32: Move some file functions to kernelbase.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: b6c94018823f0217dcc9e5ecf1f100ba9ef12b96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c94018823f0217dcc9e5ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 13:10:03 2020 +0200 kernel32: Move some file functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 326 ------------------- dlls/kernel32/kernel32.spec | 22 +- dlls/kernel32/path.c | 449 -------------------------- dlls/kernelbase/file.c | 700 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 20 +- 5 files changed, 721 insertions(+), 796 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6c94018823f0217dcc9…

1 0

Alexandre Julliard : kernel32: Move volume functions to kernelbase.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: e36a9c459d7d1644f401eb49f3684c6fe42f7948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36a9c459d7d1644f401eb49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 11:54:11 2020 +0200 kernel32: Move volume functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 40 +- dlls/kernel32/volume.c | 1675 +----------------------------------- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/kernelbase.spec | 40 +- dlls/kernelbase/volume.c | 1777 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 1851 insertions(+), 1684 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e36a9c459d7d1644f401…

1 0

Brendan Shanks : user32: Improve DisplayConfigGetDeviceInfo() stub.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: b1b1399dd6f31c60b43a193fcd8966b0776d1f3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1b1399dd6f31c60b43a193f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:31 2020 -0700 user32: Improve DisplayConfigGetDeviceInfo() stub. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 50 ++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/monitor.c | 6 ------ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 74158f6aae..10f17bb4c3 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4528,5 +4528,53 @@ LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCON LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) { FIXME("stub: %p\n", packet); - return ERROR_NOT_SUPPORTED; + + if (!packet || packet->size < sizeof(*packet)) + return ERROR_GEN_FAILURE; + + switch (packet->type) + { + case DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: + { + DISPLAYCONFIG_SOURCE_DEVICE_NAME *source_name = (DISPLAYCONFIG_SOURCE_DEVICE_NAME *)packet; + if (packet->size < sizeof(*source_name)) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; + } + case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: + { + DISPLAYCONFIG_TARGET_DEVICE_NAME *target_name = (DISPLAYCONFIG_TARGET_DEVICE_NAME *)packet; + if (packet->size < sizeof(*target_name)) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; + } + case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: + { + DISPLAYCONFIG_TARGET_PREFERRED_MODE *preferred_mode = (DISPLAYCONFIG_TARGET_PREFERRED_MODE *)packet; + if (packet->size < sizeof(*preferred_mode)) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; + } + case DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: + { + DISPLAYCONFIG_ADAPTER_NAME *adapter_name = (DISPLAYCONFIG_ADAPTER_NAME *)packet; + if (packet->size < sizeof(*adapter_name)) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; + } + case DISPLAYCONFIG_DEVICE_INFO_SET_TARGET_PERSISTENCE: + case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE: + case DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION: + case DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION: + case DISPLAYCONFIG_DEVICE_INFO_GET_ADVANCED_COLOR_INFO: + case DISPLAYCONFIG_DEVICE_INFO_SET_ADVANCED_COLOR_STATE: + case DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL: + default: + FIXME("Unimplemented packet type: %u\n", packet->type); + return ERROR_INVALID_PARAMETER; + } } diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 7c034c823a..fb5e331c25 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1332,8 +1332,6 @@ static void test_display_config_get_device_info(void) DISPLAYCONFIG_TARGET_PREFERRED_MODE preferred_mode; DISPLAYCONFIG_ADAPTER_NAME adapter_name; - todo_wine - { ret = pDisplayConfigGetDeviceInfo(NULL); ok(ret == ERROR_GEN_FAILURE, "got %d\n", ret); @@ -1366,7 +1364,6 @@ static void test_display_config_get_device_info(void) source_name.header.size = sizeof(source_name) - 1; ret = pDisplayConfigGetDeviceInfo(&source_name.header); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); - } source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; source_name.header.size = sizeof(source_name); @@ -1379,7 +1376,6 @@ static void test_display_config_get_device_info(void) target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; target_name.header.size = sizeof(target_name) - 1; ret = pDisplayConfigGetDeviceInfo(&target_name.header); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; @@ -1393,7 +1389,6 @@ static void test_display_config_get_device_info(void) preferred_mode.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE; preferred_mode.header.size = sizeof(preferred_mode) - 1; ret = pDisplayConfigGetDeviceInfo(&preferred_mode.header); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); preferred_mode.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE; @@ -1407,7 +1402,6 @@ static void test_display_config_get_device_info(void) adapter_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME; adapter_name.header.size = sizeof(adapter_name) - 1; ret = pDisplayConfigGetDeviceInfo(&adapter_name.header); - todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); adapter_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME;

1 0

Brendan Shanks : user32: Improve QueryDisplayConfig() stub.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 4e795a8d8130e0e7156f6ba8f1e33bac374ea851 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e795a8d8130e0e7156f6ba8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:30 2020 -0700 user32: Improve QueryDisplayConfig() stub. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 12 +++++++++++- dlls/user32/tests/monitor.c | 3 --- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index c43720eca8..74158f6aae 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4509,7 +4509,17 @@ LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCON DISPLAYCONFIG_TOPOLOGY_ID *topologyid) { FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); - return ERROR_CALL_NOT_IMPLEMENTED; + + if (!numpathelements || !numinfoelements) + return ERROR_INVALID_PARAMETER; + + if (!*numpathelements || !*numinfoelements) + return ERROR_INVALID_PARAMETER; + + if (!flags) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; } /*********************************************************************** diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 2a9c5c3984..7c034c823a 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1275,8 +1275,6 @@ static void test_query_display_config(void) DISPLAYCONFIG_MODE_INFO mi[20]; LONG ret; - todo_wine - { ret = pQueryDisplayConfig(QDC_ALL_PATHS, NULL, NULL, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); @@ -1324,7 +1322,6 @@ static void test_query_display_config(void) ok(ret == ERROR_INSUFFICIENT_BUFFER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); ok (paths == 1, "got %u\n", paths); ok (modes == 1, "got %u\n", modes); - } } static void test_display_config_get_device_info(void)

1 0

Brendan Shanks : user32/tests: Add QueryDisplayConfig() and DisplayConfigGetDeviceInfo() tests.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: af89ccc5350ecc4499031e95a629ee8188954d20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af89ccc5350ecc4499031e95… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:29 2020 -0700 user32/tests: Add QueryDisplayConfig() and DisplayConfigGetDeviceInfo() tests. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 181 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 174 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 63cbe5067c..2a9c5c3984 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -29,6 +29,9 @@ static HMODULE hdll; static LONG (WINAPI *pGetDisplayConfigBufferSizes)(UINT32,UINT32*,UINT32*); +static LONG (WINAPI *pQueryDisplayConfig)(UINT32,UINT32*,DISPLAYCONFIG_PATH_INFO*,UINT32*, + DISPLAYCONFIG_MODE_INFO*,DISPLAYCONFIG_TOPOLOGY_ID*); +static LONG (WINAPI *pDisplayConfigGetDeviceInfo)(DISPLAYCONFIG_DEVICE_INFO_HEADER*); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static void init_function_pointers(void) @@ -41,6 +44,8 @@ static void init_function_pointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(GetDisplayConfigBufferSizes) + GET_PROC(QueryDisplayConfig) + GET_PROC(DisplayConfigGetDeviceInfo) GET_PROC(SetThreadDpiAwarenessContext) #undef GET_PROC @@ -1102,17 +1107,11 @@ static void test_work_area(void) DestroyWindow(hwnd); } -static void test_display_config(void) +static void test_get_display_config_buffer_sizes(void) { UINT32 paths, modes; LONG ret; - if (!pGetDisplayConfigBufferSizes) - { - win_skip("GetDisplayConfigBufferSizes is not supported\n"); - return; - } - ret = pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); @@ -1269,6 +1268,174 @@ static void test_EnumDisplayMonitors(void) } } +static void test_query_display_config(void) +{ + UINT32 paths, modes; + DISPLAYCONFIG_PATH_INFO pi[10]; + DISPLAYCONFIG_MODE_INFO mi[20]; + LONG ret; + + todo_wine + { + ret = pQueryDisplayConfig(QDC_ALL_PATHS, NULL, NULL, NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 0; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, NULL, &modes, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 0; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 0; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, NULL, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 0; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = 0; + modes = 1; + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + ok (paths == 0, "got %u\n", paths); + ok (modes == 1, "got %u\n", modes); + + /* Crashes on Windows 10 */ + if (0) + { + ret = pQueryDisplayConfig(QDC_ALL_PATHS, NULL, pi, NULL, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + ret = pQueryDisplayConfig(QDC_ALL_PATHS, NULL, pi, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + } + + paths = modes = 1; + ret = pQueryDisplayConfig(0, &paths, pi, &modes, mi, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + paths = modes = 1; + memset(pi, 0xFF, sizeof(pi[0])); + memset(mi, 0xFF, sizeof(mi[0])); + ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, mi, NULL); + ok(ret == ERROR_INSUFFICIENT_BUFFER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + ok (paths == 1, "got %u\n", paths); + ok (modes == 1, "got %u\n", modes); + } +} + +static void test_display_config_get_device_info(void) +{ + LONG ret; + DISPLAYCONFIG_SOURCE_DEVICE_NAME source_name; + DISPLAYCONFIG_TARGET_DEVICE_NAME target_name; + DISPLAYCONFIG_TARGET_PREFERRED_MODE preferred_mode; + DISPLAYCONFIG_ADAPTER_NAME adapter_name; + + todo_wine + { + ret = pDisplayConfigGetDeviceInfo(NULL); + ok(ret == ERROR_GEN_FAILURE, "got %d\n", ret); + + source_name.header.type = 0xFFFF; + source_name.header.size = 0; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_GEN_FAILURE, "got %d\n", ret); + + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = 0; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_GEN_FAILURE, "got %d\n", ret); + + source_name.header.type = 0xFFFF; + source_name.header.size = sizeof(source_name.header); + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name.header); + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + source_name.header.type = 0xFFFF; + source_name.header.size = sizeof(source_name); + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name) - 1; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + } + + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name); + source_name.header.adapterId.LowPart = 0xFFFF; + source_name.header.adapterId.HighPart = 0xFFFF; + source_name.header.id = 0; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_GEN_FAILURE || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; + target_name.header.size = sizeof(target_name) - 1; + ret = pDisplayConfigGetDeviceInfo(&target_name.header); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; + target_name.header.size = sizeof(target_name); + target_name.header.adapterId.LowPart = 0xFFFF; + target_name.header.adapterId.HighPart = 0xFFFF; + target_name.header.id = 0; + ret = pDisplayConfigGetDeviceInfo(&target_name.header); + ok(ret == ERROR_GEN_FAILURE || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + preferred_mode.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE; + preferred_mode.header.size = sizeof(preferred_mode) - 1; + ret = pDisplayConfigGetDeviceInfo(&preferred_mode.header); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + preferred_mode.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE; + preferred_mode.header.size = sizeof(preferred_mode); + preferred_mode.header.adapterId.LowPart = 0xFFFF; + preferred_mode.header.adapterId.HighPart = 0xFFFF; + preferred_mode.header.id = 0; + ret = pDisplayConfigGetDeviceInfo(&preferred_mode.header); + ok(ret == ERROR_GEN_FAILURE || ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + + adapter_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME; + adapter_name.header.size = sizeof(adapter_name) - 1; + ret = pDisplayConfigGetDeviceInfo(&adapter_name.header); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + adapter_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME; + adapter_name.header.size = sizeof(adapter_name); + adapter_name.header.adapterId.LowPart = 0xFFFF; + adapter_name.header.adapterId.HighPart = 0xFFFF; + ret = pDisplayConfigGetDeviceInfo(&adapter_name.header); + ok(ret == ERROR_GEN_FAILURE || ret == ERROR_INVALID_PARAMETER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); +} + +static void test_display_config(void) +{ + if (!pGetDisplayConfigBufferSizes || + !pQueryDisplayConfig || + !pDisplayConfigGetDeviceInfo) + { + win_skip("DisplayConfig APIs are not supported\n"); + return; + } + + test_get_display_config_buffer_sizes(); + test_query_display_config(); + test_display_config_get_device_info(); +} + START_TEST(monitor) { init_function_pointers();

1 0

Brendan Shanks : user32: Move DisplayConfig stubs together into sysparams.c.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 91cf6d716e09976ac1667f33499930d367c7479d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91cf6d716e09976ac1667f33… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:28 2020 -0700 user32: Move DisplayConfig stubs together into sysparams.c. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 26 -------------------------- dlls/user32/sysparams.c | 44 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index bed5812a47..6e1f60612b 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -240,17 +240,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -/*********************************************************************** - * QueryDisplayConfig (USER32.@) - */ -LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, - UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, - DISPLAYCONFIG_TOPOLOGY_ID *topologyid) -{ - FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); - return ERROR_CALL_NOT_IMPLEMENTED; -} - /*********************************************************************** * RegisterSystemThread (USER32.@) */ @@ -545,21 +534,6 @@ BOOL WINAPI IsWindowRedirectedForPrint( HWND hwnd ) return FALSE; } -/********************************************************************** - * GetDisplayConfigBufferSizes [USER32.@] - */ -LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) -{ - FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); - - if (!num_path_info || !num_mode_info) - return ERROR_INVALID_PARAMETER; - - *num_path_info = 0; - *num_mode_info = 0; - return ERROR_NOT_SUPPORTED; -} - /********************************************************************** * RegisterPointerDeviceNotifications [USER32.@] */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 043742a9bf..c43720eca8 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3345,15 +3345,6 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND } -/*********************************************************************** - * DisplayConfigGetDeviceInfo (USER32.@) - */ -LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) -{ - FIXME("stub: %p\n", packet); - return ERROR_NOT_SUPPORTED; -} - /*********************************************************************** * EnumDisplaySettingsW (USER32.@) * @@ -4494,3 +4485,38 @@ BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) { return TRUE; } + +/********************************************************************** + * GetDisplayConfigBufferSizes (USER32.@) + */ +LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) +{ + FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); + + if (!num_path_info || !num_mode_info) + return ERROR_INVALID_PARAMETER; + + *num_path_info = 0; + *num_mode_info = 0; + return ERROR_NOT_SUPPORTED; +} + +/*********************************************************************** + * QueryDisplayConfig (USER32.@) + */ +LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, + UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, + DISPLAYCONFIG_TOPOLOGY_ID *topologyid) +{ + FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DisplayConfigGetDeviceInfo (USER32.@) + */ +LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) +{ + FIXME("stub: %p\n", packet); + return ERROR_NOT_SUPPORTED; +}

1 0

Brendan Shanks : include: Add additional DISPLAYCONFIG defines.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 6396546b0aec8cd0f7f05f5a375a2b6137372820 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6396546b0aec8cd0f7f05f5a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:27 2020 -0700 include: Add additional DISPLAYCONFIG defines. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/include/wingdi.h b/include/wingdi.h index 0a456f8230..de028f5212 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3293,6 +3293,9 @@ typedef enum { DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE = 6, DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION = 7, DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION = 8, + DISPLAYCONFIG_DEVICE_INFO_GET_ADVANCED_COLOR_INFO = 9, + DISPLAYCONFIG_DEVICE_INFO_SET_ADVANCED_COLOR_STATE = 10, + DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL = 11, DISPLAYCONFIG_DEVICE_INFO_FORCE_UINT32 = 0xffffffff } DISPLAYCONFIG_DEVICE_INFO_TYPE; @@ -3429,6 +3432,16 @@ typedef enum DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = (int) 0xffffffff } DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; +typedef enum +{ + DISPLAYCONFIG_COLOR_ENCODING_RGB = 0, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR444 = 1, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR422 = 2, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR420 = 3, + DISPLAYCONFIG_COLOR_ENCODING_INTENSITY = 4, + DISPLAYCONFIG_COLOR_ENCODING_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_COLOR_ENCODING; + typedef struct DISPLAYCONFIG_2DREGION { UINT32 cx; @@ -3525,6 +3538,105 @@ typedef struct DISPLAYCONFIG_MODE_INFO } DUMMYUNIONNAME; } DISPLAYCONFIG_MODE_INFO; +typedef struct DISPLAYCONFIG_SOURCE_DEVICE_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + WCHAR viewGdiDeviceName[CCHDEVICENAME]; +} DISPLAYCONFIG_SOURCE_DEVICE_NAME; + +typedef struct DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS { + union { + struct { + UINT32 friendlyNameFromEdid :1; + UINT32 friendlyNameForced :1; + UINT32 edidIdsValid :1; + UINT32 reserved :29; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS; + +typedef struct DISPLAYCONFIG_TARGET_DEVICE_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS flags; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY outputTechnology; + UINT16 edidManufactureId; + UINT16 edidProductCodeId; + UINT32 connectorInstance; + WCHAR monitorFriendlyDeviceName[64]; + WCHAR monitorDevicePath[128]; +} DISPLAYCONFIG_TARGET_DEVICE_NAME; + +typedef struct DISPLAYCONFIG_TARGET_PREFERRED_MODE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + UINT32 width; + UINT32 height; + DISPLAYCONFIG_TARGET_MODE targetMode; +} DISPLAYCONFIG_TARGET_PREFERRED_MODE; + +typedef struct DISPLAYCONFIG_ADAPTER_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + WCHAR adapterDevicePath[128]; +} DISPLAYCONFIG_ADAPTER_NAME; + +typedef struct DISPLAYCONFIG_SET_TARGET_PERSISTENCE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 bootPersistenceOn :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SET_TARGET_PERSISTENCE; + +typedef struct DISPLAYCONFIG_TARGET_BASE_TYPE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY baseOutputTechnology; +} DISPLAYCONFIG_TARGET_BASE_TYPE; + +typedef struct DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 disableMonitorVirtualResolution :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION; + +typedef struct DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 advancedColorSupported :1; + UINT32 advancedColorEnabled :1; + UINT32 wideColorEnforced :1; + UINT32 advancedColorForceDisabled :1; + UINT32 reserved :28; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; + DISPLAYCONFIG_COLOR_ENCODING colorEncoding; + UINT32 bitsPerColorChannel; +} DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO; + +typedef struct DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 enableAdvancedColor :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE; + +typedef struct DISPLAYCONFIG_SDR_WHITE_LEVEL { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + ULONG SDRWhiteLevel; +} DISPLAYCONFIG_SDR_WHITE_LEVEL; + /* For GetDisplayConfigBufferSizes */ #define QDC_ALL_PATHS 0x00000001 #define QDC_ONLY_ACTIVE_PATHS 0x00000002

1 0

Zhiyi Zhang : user32: Leave critical section before calling callbacks in EnumDisplayMonitors().
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 449ca2fbf9e44a40ff2cc6eedada8dd2f94c7adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=449ca2fbf9e44a40ff2cc6ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:30:39 2020 +0800 user32: Leave critical section before calling callbacks in EnumDisplayMonitors(). Previously, callbacks were called with a critical section held. It was intended that monitor handles passed to callbacks should always be valid. But it created a deadlock condition when callbacks call other functions which try to grab the critical section using a different thread. Tests also show that a monitor handle can be invalid after a display change. So do not hold the critical section when calling callbacks. Monitor handles will be checked when passed to GetMonitorInfo(), which is the sole function that consumes HMONITORs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab386a074e..043742a9bf 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4126,28 +4126,34 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { - RECT default_rect = {0, 0, 640, 480}; - DWORD i; + RECT monitor_rect; + DWORD i = 0; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); if (update_monitor_cache()) { - EnterCriticalSection( &monitors_section ); - for (i = 0; i < monitor_count; i++) + while (TRUE) { - if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitors[i].rcMonitor, lp )) + EnterCriticalSection( &monitors_section ); + if (i >= monitor_count) { LeaveCriticalSection( &monitors_section ); - return FALSE; + return TRUE; } + monitor_rect = monitors[i].rcMonitor; + LeaveCriticalSection( &monitors_section ); + + if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitor_rect, lp )) + return FALSE; + + ++i; } - LeaveCriticalSection( &monitors_section ); - return TRUE; } /* Fallback to report one monitor if using SetupAPI failed */ - if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + SetRect( &monitor_rect, 0, 0, 640, 480 ); + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &monitor_rect, lp )) return FALSE; return TRUE; }

1 0

Zhiyi Zhang : user32/tests: Test EnumDisplayMonitors().
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 065690be32e4b72fdf9418b82c2f1b02107abced URL: https://source.winehq.org/git/wine.git/?a=commit;h=065690be32e4b72fdf9418b8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:30:30 2020 +0800 user32/tests: Test EnumDisplayMonitors(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 116 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 05e70c4b62..63cbe5067c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1154,11 +1154,127 @@ static void test_display_config(void) ok((modes == 0 || modes == 100) && paths == 0, "got %u, %u\n", modes, paths); } +static BOOL CALLBACK test_EnumDisplayMonitors_normal_cb(HMONITOR monitor, HDC hdc, LPRECT rect, + LPARAM lparam) +{ + MONITORINFO mi; + LONG ret; + + mi.cbSize = sizeof(mi); + ret = GetMonitorInfoA(monitor, &mi); + ok(ret, "GetMonitorInfoA failed, error %#x.\n", GetLastError()); + ok(EqualRect(rect, &mi.rcMonitor), "Expected rect %s, got %s.\n", + wine_dbgstr_rect(&mi.rcMonitor), wine_dbgstr_rect(rect)); + + return TRUE; +} + +static BOOL CALLBACK test_EnumDisplayMonitors_return_false_cb(HMONITOR monitor, HDC hdc, + LPRECT rect, LPARAM lparam) +{ + return FALSE; +} + +static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor, HDC hdc, + LPRECT rect, LPARAM lparam) +{ + MONITORINFOEXA mi, mi2; + DEVMODEA old_dm, dm; + INT count; + LONG ret; + + mi.cbSize = sizeof(mi); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&mi); + ok(ret, "GetMonitorInfoA failed, error %#x.\n", GetLastError()); + + /* Test that monitor handle is invalid after the monitor is detached */ + if (!(mi.dwFlags & MONITORINFOF_PRIMARY)) + { + count = GetSystemMetrics(SM_CMONITORS); + + /* Save current display settings */ + memset(&old_dm, 0, sizeof(old_dm)); + old_dm.dmSize = sizeof(old_dm); + ret = EnumDisplaySettingsA(mi.szDevice, ENUM_CURRENT_SETTINGS, &old_dm); + ok(ret, "EnumDisplaySettingsA %s failed, error %#x.\n", mi.szDevice, GetLastError()); + + /* Detach monitor */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPosition.x = mi.rcMonitor.left; + dm.dmPosition.y = mi.rcMonitor.top; + ret = ChangeDisplaySettingsExA(mi.szDevice, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, + NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + ret = ChangeDisplaySettingsExA(mi.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + + /* Check if it's really detached */ + if (GetSystemMetrics(SM_CMONITORS) != count - 1) + { + skip("Failed to detach %s.\n", mi.szDevice); + return TRUE; + } + + /* The monitor handle should be invalid now */ + mi2.cbSize = sizeof(mi2); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&mi2); + ok(!ret, "GetMonitorInfoA succeeded.\n"); + + /* Restore the original display settings */ + ret = ChangeDisplaySettingsExA(mi.szDevice, &old_dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, + NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + ret = ChangeDisplaySettingsExA(mi.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + } + + return TRUE; +} + +static void test_EnumDisplayMonitors(void) +{ + DWORD error; + INT count; + BOOL ret; + + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_normal_cb, 0); + ok(ret, "EnumDisplayMonitors failed, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_return_false_cb, 0); + error = GetLastError(); + ok(!ret, "EnumDisplayMonitors succeeded.\n"); + ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); + + count = GetSystemMetrics(SM_CMONITORS); + SetLastError(0xdeadbeef); + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_invalid_handle_cb, 0); + error = GetLastError(); + if (count >= 2) + { + todo_wine ok(!ret, "EnumDisplayMonitors succeeded.\n"); + todo_wine ok(error == ERROR_INVALID_MONITOR_HANDLE || error == ERROR_INVALID_HANDLE, + "Expected error %#x, got %#x.\n", ERROR_INVALID_MONITOR_HANDLE, error); + } + else + { + ok(ret, "EnumDisplayMonitors failed.\n"); + ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); + } +} + START_TEST(monitor) { init_function_pointers(); test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); + test_EnumDisplayMonitors(); test_monitors(); test_work_area(); test_display_config();

1 0

Zhiyi Zhang : user32/tests: Fix a ChangeDisplaySettings() test.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 1bb2b160424a14a1162b6ae3429e49693150f406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb2b160424a14a1162b6ae3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:30:19 2020 +0800 user32/tests: Fix a ChangeDisplaySettings() test. Overlapped monitor rectangles should be automatically adjusted to avoid overlaps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 080f040c3f..05e70c4b62 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -757,26 +757,35 @@ static void test_ChangeDisplaySettingsEx(void) if (res) { + /* The secondary adapter should be to the right of the primary adapter */ + todo_wine ok(dm2.dmPosition.x == dm.dmPosition.x + dm.dmPelsWidth, + "Expected dm2.dmPosition.x %d, got %d.\n", dm.dmPosition.x + dm.dmPelsWidth, + dm2.dmPosition.x); + ok(dm2.dmPosition.y == dm.dmPosition.y, "Expected dm2.dmPosition.y %d, got %d.\n", + dm.dmPosition.y, dm2.dmPosition.y); + /* Test position conflict */ - dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth + 1; dm2.dmPosition.y = dm.dmPosition.y; res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); - /* Position is not changed even if ChangeDisplaySettingsExA returned DISP_CHANGE_SUCCESSFUL */ + /* Position is changed and automatically moved */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x, "Expect position change not applied.\n"); + todo_wine ok((dm2.dmPosition.x == dm.dmPosition.x - dm2.dmPelsWidth), + "Expected dmPosition.x %d, got %d.\n", dm.dmPosition.x - dm2.dmPelsWidth, + dm2.dmPosition.x); /* Test position with extra space. The extra space will be removed */ - dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth - dm2.dmPelsWidth / 2; + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth + 1; dm2.dmPosition.y = dm.dmPosition.y; res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); - dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; expect_dm(dm2, devices[1].name, 0); /* Test placing the secondary adapter to all sides of the primary adapter */

1 0

Zhiyi Zhang : user32/tests: Flush messages after mode changes.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 4369aaae5705092324576b6295799f37c60e6615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4369aaae5705092324576b62… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:30:07 2020 +0800 user32/tests: Flush messages after mode changes. test_ChangeDisplaySettingsEx() can generate so many posted messages for display change events that USERPostMessageLimit is reached and ERROR_NOT_ENOUGH_QUOTA is returned for PostMessage(). Call flush_events() after mode changes to limit message post rate. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48586 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 59 +++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e669b2b82e..080f040c3f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -46,6 +46,23 @@ static void init_function_pointers(void) #undef GET_PROC } +static void flush_events(void) +{ + int diff = 1000; + DWORD time; + MSG msg; + + time = GetTickCount() + diff; + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, 200, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -290,12 +307,6 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te dm.dmSize = sizeof(dm); SetLastError(0xdeadbeef); ret = EnumDisplaySettingsA(device, ENUM_CURRENT_SETTINGS, &dm); - /* On win10 TestBot, after many resolution changes, EnumDisplaySettingsA fails sometimes for unknown reasons */ - if (!ret) - { - win_skip_(__FILE__, line)("EnumDisplaySettingsA failed.\n"); - return; - } ok_(__FILE__, line)(ret, "Device %s test %d EnumDisplaySettingsA failed, error %#x\n", device, test, GetLastError()); ok(get_primary_adapter(primary_adapter), "Failed to get primary adapter name.\n"); @@ -649,6 +660,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } + flush_events(); expect_dm(dm, devices[device].name, mode); } @@ -662,14 +674,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", - devices[device].name, GetLastError()); - if (!res) - { - win_skip("EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); - continue; - } + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); position.x = dm.dmPosition.x + dm.dmPelsWidth; } @@ -679,13 +684,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); - if (!res) - { - win_skip("EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); - continue; - } + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); /* Find a mode that's different from the current mode */ memset(&dm2, 0, sizeof(dm2)); @@ -714,6 +713,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } + flush_events(); expect_dm(dm, devices[device].name, 0); } @@ -744,8 +744,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[0].name, ENUM_CURRENT_SETTINGS, &dm); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[0].name, GetLastError()); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[0].name, GetLastError()); if (res) { @@ -753,8 +752,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); } if (res) @@ -769,9 +767,8 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x || broken(!res), "Expect position change not applied.\n"); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x, "Expect position change not applied.\n"); /* Test position with extra space. The extra space will be removed */ dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth - dm2.dmPelsWidth / 2; @@ -818,6 +815,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } + flush_events(); expect_dm(dm2, devices[1].name, side); } @@ -841,9 +839,8 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x == dm.dmPelsWidth || broken(!res), "Expect dmPosition.x %d, got %d\n", + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + todo_wine ok(dm2.dmPosition.x == dm.dmPelsWidth, "Expect dmPosition.x %d, got %d\n", dm.dmPelsWidth, dm2.dmPosition.x); } else

1 0

Jacek Caban : wbemprox: Use __cpuid from intrin.h.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 8b6c86eb824d1f529dab7bbbbd09907f41c182d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6c86eb824d1f529dab7bbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 02:52:56 2020 +0200 wbemprox: Use __cpuid from intrin.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 55 ++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 42 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 24badb7bf9..5d39984d4c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -21,6 +21,7 @@ #define NONAMELESSSTRUCT #include <stdarg.h> +#include <intrin.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -3038,46 +3039,14 @@ done: return status; } -extern void do_cpuid( unsigned int ax, unsigned int *p ); -#if defined(_MSC_VER) -void do_cpuid( unsigned int ax, unsigned int *p ) +void do_cpuid( unsigned int ax, int *p ) { +#if defined(__i386__) || defined(__x86_64__) __cpuid( p, ax ); -} -#elif defined(__i386__) -__ASM_GLOBAL_FUNC( do_cpuid, - "pushl %esi\n\t" - "pushl %ebx\n\t" - "movl 12(%esp),%eax\n\t" - "movl 16(%esp),%esi\n\t" - "cpuid\n\t" - "movl %eax,(%esi)\n\t" - "movl %ebx,4(%esi)\n\t" - "movl %ecx,8(%esi)\n\t" - "movl %edx,12(%esi)\n\t" - "popl %ebx\n\t" - "popl %esi\n\t" - "ret" ) -#elif defined(__x86_64__) -__ASM_GLOBAL_FUNC( do_cpuid, - "pushq %rsi\n\t" - "pushq %rbx\n\t" - "movq %rcx,%rax\n\t" - "movq %rdx,%rsi\n\t" - "cpuid\n\t" - "movl %eax,(%rsi)\n\t" - "movl %ebx,4(%rsi)\n\t" - "movl %ecx,8(%rsi)\n\t" - "movl %edx,12(%rsi)\n\t" - "popq %rbx\n\t" - "popq %rsi\n\t" - "ret" ) #else -void do_cpuid( unsigned int ax, unsigned int *p ) -{ FIXME("\n"); -} #endif +} static unsigned int get_processor_model( unsigned int reg0, unsigned int *stepping, unsigned int *family ) { @@ -3093,7 +3062,7 @@ static unsigned int get_processor_model( unsigned int reg0, unsigned int *steppi *stepping = reg0 & 0x0f; return model; } -static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) +static void regs_to_str( int *regs, unsigned int len, WCHAR *buffer ) { unsigned int i; unsigned char *p = (unsigned char *)regs; @@ -3103,7 +3072,7 @@ static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) } static void get_processor_manufacturer( WCHAR *manufacturer, UINT len ) { - unsigned int tmp, regs[4] = {0, 0, 0, 0}; + int tmp, regs[4] = {0, 0, 0, 0}; do_cpuid( 0, regs ); tmp = regs[2]; /* swap edx and ecx */ @@ -3123,7 +3092,8 @@ static void get_processor_caption( WCHAR *caption, UINT len ) { const WCHAR *arch; WCHAR manufacturer[13]; - unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; + int regs[4] = {0, 0, 0, 0}; + unsigned int family, model, stepping; get_processor_manufacturer( manufacturer, ARRAY_SIZE( manufacturer ) ); if (!wcscmp( get_osarchitecture(), L"32-bit" )) arch = L"x86"; @@ -3137,7 +3107,8 @@ static void get_processor_caption( WCHAR *caption, UINT len ) } static void get_processor_version( WCHAR *version, UINT len ) { - unsigned int regs[4] = {0, 0, 0, 0}, model, stepping; + int regs[4] = {0, 0, 0, 0}; + unsigned int model, stepping; do_cpuid( 1, regs ); @@ -3146,20 +3117,20 @@ static void get_processor_version( WCHAR *version, UINT len ) } static UINT16 get_processor_revision(void) { - unsigned int regs[4] = {0, 0, 0, 0}; + int regs[4] = {0, 0, 0, 0}; do_cpuid( 1, regs ); return regs[0]; } static void get_processor_id( WCHAR *processor_id, UINT len ) { - unsigned int regs[4] = {0, 0, 0, 0}; + int regs[4] = {0, 0, 0, 0}; do_cpuid( 1, regs ); swprintf( processor_id, len, L"%08X%08X", regs[3], regs[0] ); } static void get_processor_name( WCHAR *name ) { - unsigned int regs[4] = {0, 0, 0, 0}; + int regs[4] = {0, 0, 0, 0}; int i; do_cpuid( 0x80000000, regs );

1 0

Jacek Caban : wineboot: Use __cpuid from intrin.h.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: d0a57cf98849a0f318ba4202a9f22c3c9533a172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a57cf98849a0f318ba4202… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 02:52:46 2020 +0200 wineboot: Use __cpuid from intrin.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 59 +++++++++----------------------------------- 1 file changed, 12 insertions(+), 47 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 54e48d0310..ac0b04d6d8 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -57,6 +57,7 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#include <intrin.h> #include <sys/stat.h> #include <unistd.h> #include <windows.h> @@ -195,44 +196,7 @@ static DWORD set_reg_value_dword( HKEY hkey, const WCHAR *name, DWORD value ) #if defined(__i386__) || defined(__x86_64__) -#if defined(_MSC_VER) -static void do_cpuid( unsigned int ax, unsigned int *p ) -{ - __cpuid( p, ax ); -} -#elif defined(__i386__) -extern void __cdecl do_cpuid( unsigned int ax, unsigned int *p ); -__ASM_GLOBAL_FUNC( do_cpuid, - "pushl %esi\n\t" - "pushl %ebx\n\t" - "movl 12(%esp),%eax\n\t" - "movl 16(%esp),%esi\n\t" - "cpuid\n\t" - "movl %eax,(%esi)\n\t" - "movl %ebx,4(%esi)\n\t" - "movl %ecx,8(%esi)\n\t" - "movl %edx,12(%esi)\n\t" - "popl %ebx\n\t" - "popl %esi\n\t" - "ret" ) -#else -extern void __cdecl do_cpuid( unsigned int ax, unsigned int *p ); -__ASM_GLOBAL_FUNC( do_cpuid, - "pushq %rsi\n\t" - "pushq %rbx\n\t" - "movq %rcx,%rax\n\t" - "movq %rdx,%rsi\n\t" - "cpuid\n\t" - "movl %eax,(%rsi)\n\t" - "movl %ebx,4(%rsi)\n\t" - "movl %ecx,8(%rsi)\n\t" - "movl %edx,12(%rsi)\n\t" - "popq %rbx\n\t" - "popq %rsi\n\t" - "ret" ) -#endif - -static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) +static void regs_to_str( int *regs, unsigned int len, WCHAR *buffer ) { unsigned int i; unsigned char *p = (unsigned char *)regs; @@ -259,18 +223,19 @@ static void get_identifier( WCHAR *buf, size_t size, const WCHAR *arch ) { static const WCHAR fmtW[] = {'%','s',' ','F','a','m','i','l','y',' ','%','u',' ','M','o','d','e','l', ' ','%','u',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; - unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; + unsigned int family, model, stepping; + int regs[4] = {0, 0, 0, 0}; - do_cpuid( 1, regs ); + __cpuid( regs, 1 ); model = get_model( regs[0], &stepping, &family ); swprintf( buf, size, fmtW, arch, family, model, stepping ); } static void get_vendorid( WCHAR *buf ) { - unsigned int tmp, regs[4] = {0, 0, 0, 0}; + int tmp, regs[4] = {0, 0, 0, 0}; - do_cpuid( 0, regs ); + __cpuid( regs, 0 ); tmp = regs[2]; /* swap edx and ecx */ regs[2] = regs[3]; regs[3] = tmp; @@ -280,17 +245,17 @@ static void get_vendorid( WCHAR *buf ) static void get_namestring( WCHAR *buf ) { - unsigned int regs[4] = {0, 0, 0, 0}; + int regs[4] = {0, 0, 0, 0}; int i; - do_cpuid( 0x80000000, regs ); + __cpuid( regs, 0x80000000 ); if (regs[0] >= 0x80000004) { - do_cpuid( 0x80000002, regs ); + __cpuid( regs, 0x80000002 ); regs_to_str( regs, 16, buf ); - do_cpuid( 0x80000003, regs ); + __cpuid( regs, 0x80000003 ); regs_to_str( regs, 16, buf + 16 ); - do_cpuid( 0x80000004, regs ); + __cpuid( regs, 0x80000004 ); regs_to_str( regs, 16, buf + 32 ); } for (i = lstrlenW(buf) - 1; i >= 0 && buf[i] == ' '; i--) buf[i] = 0;

1 0

Jacek Caban : include: Add intrin.h and use it to provide __cpuid implementation.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 48fa25d4dea31318d0c8551ee8f52a0f25f65c51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48fa25d4dea31318d0c8551e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 02:52:26 2020 +0200 include: Add intrin.h and use it to provide __cpuid implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/intrin.h | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 74db5ee151..8aa61021d2 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -450,6 +450,7 @@ SOURCES = \ msvcrt/fenv.h \ msvcrt/float.h \ msvcrt/fpieee.h \ + msvcrt/intrin.h \ msvcrt/inttypes.h \ msvcrt/io.h \ msvcrt/limits.h \ diff --git a/include/msvcrt/intrin.h b/include/msvcrt/intrin.h new file mode 100644 index 0000000000..5ad2776450 --- /dev/null +++ b/include/msvcrt/intrin.h @@ -0,0 +1,25 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef _INC_INTRIN +#define _INC_INTRIN + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(__i386__) || defined(__x86_64__) +static inline void __cpuid(int info[4], int ax) +{ + __asm__ ("cpuid" : "=a"(info[0]), "=b" (info[1]), "=c"(info[2]), "=d"(info[3]) : "a"(ax), "c"(0)); +} +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* _INC_INTRIN */

1 0

Zebediah Figura : kernel32/tests: Fix failures in test_GetThreadSelectorEntry() on 32-bit machines.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 6849be3ffaba0572395f91899f0adf912f817a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6849be3ffaba0572395f9189… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 18:29:42 2020 -0500 kernel32/tests: Fix failures in test_GetThreadSelectorEntry() on 32-bit machines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index e068797ff5..a9869863b4 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1218,10 +1218,12 @@ static void test_GetThreadSelectorEntry(void) SetLastError( 0xdeadbeef ); ret = GetThreadSelectorEntry(GetCurrentThread(), 0xdeadbeef, &entry); ok(!ret, "GetThreadSelectorEntry(invalid) succeeded\n"); - ok( GetLastError() == ERROR_GEN_FAILURE, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_GEN_FAILURE + || GetLastError() == ERROR_INVALID_THREAD_ID /* 32-bit */, "wrong error %u\n", GetLastError() ); ret = GetThreadSelectorEntry(GetCurrentThread(), ctx.SegDs + 0x100, &entry); ok(!ret, "GetThreadSelectorEntry(invalid) succeeded\n"); - ok( GetLastError() == ERROR_GEN_FAILURE, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_GEN_FAILURE + || GetLastError() == ERROR_NOACCESS /* 32-bit */, "wrong error %u\n", GetLastError() ); memset(&entry, 0x11, sizeof(entry)); ret = GetThreadSelectorEntry(GetCurrentThread(), ctx.SegFs, &entry);

1 0

Zebediah Figura : kernel32/tests: Account for unsupported NLSVERSIONINFOEX.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 42a18cf5fa201c44249589cf4631cc28e05c7509 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a18cf5fa201c44249589cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 18:29:41 2020 -0500 kernel32/tests: Account for unsupported NLSVERSIONINFOEX. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4c1e1b4d73..a8efb60eb5 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6653,17 +6653,29 @@ static void test_NLSVersion(void) win_skip( "GetNLSVersion not available\n" ); return; } + SetLastError( 0xdeadbeef ); memset( &info, 0xcc, sizeof(info) ); - info.dwNLSVersionInfoSize = sizeof(info); + info.dwNLSVersionInfoSize = offsetof( NLSVERSIONINFO, dwEffectiveId ); ret = pGetNLSVersion( COMPARE_STRING, MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ), (NLSVERSIONINFO *)&info ); ok( ret, "GetNLSVersion failed err %u\n", GetLastError() ); - ok( info.dwEffectiveId == MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ), - "wrong id %x\n", info.dwEffectiveId ); - ok( IsEqualIID( &info.guidCustomVersion, &guid_fr ) || - broken( IsEqualIID( &info.guidCustomVersion, &guid_null )), /* <= win7 */ - "wrong guid %s\n", debugstr_guid(&info.guidCustomVersion) ); + + SetLastError( 0xdeadbeef ); + memset( &info, 0xcc, sizeof(info) ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pGetNLSVersion( COMPARE_STRING, MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ), + (NLSVERSIONINFO *)&info ); + ok( ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER /* < Vista */, + "GetNLSVersion failed err %u\n", GetLastError() ); + if (ret) + { + ok( info.dwEffectiveId == MAKELANGID( LANG_FRENCH, SUBLANG_FRENCH_CANADIAN ), + "wrong id %x\n", info.dwEffectiveId ); + ok( IsEqualIID( &info.guidCustomVersion, &guid_fr ) || + broken( IsEqualIID( &info.guidCustomVersion, &guid_null )), /* <= win7 */ + "wrong guid %s\n", debugstr_guid(&info.guidCustomVersion) ); + } SetLastError( 0xdeadbeef ); info.dwNLSVersionInfoSize = 8;

1 0

Zebediah Figura : quartz/vmr9: Add a stub IVMRMixerBitmap9 interface.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 913e6ef805a7a3813cb1e15573ce8d948174d632 URL: https://source.winehq.org/git/wine.git/?a=commit;h=913e6ef805a7a3813cb1e155… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 18:05:24 2020 -0500 quartz/vmr9: Add a stub IVMRMixerBitmap9 interface. Needed by Sniper Fury and Modern Combat 5. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 5c08868fc0..189b7d4f89 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -231,7 +231,7 @@ static void test_common_interfaces(IBaseFilter *filter) todo_wine check_interface(filter, &IID_IVMRAspectRatioControl9, TRUE); todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); check_interface(filter, &IID_IVMRFilterConfig9, TRUE); - todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); + check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 4fd3e70b96..8ef8fc07e3 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -39,6 +39,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +static inline const char *debugstr_normalized_rect(const VMR9NormalizedRect *rect) +{ + if (!rect) return "(null)"; + return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); +} + struct quartz_vmr { struct strmbase_renderer renderer; @@ -49,6 +55,7 @@ struct quartz_vmr IAMFilterMiscFlags IAMFilterMiscFlags_iface; IVMRFilterConfig IVMRFilterConfig_iface; IVMRFilterConfig9 IVMRFilterConfig9_iface; + IVMRMixerBitmap9 IVMRMixerBitmap9_iface; IVMRMonitorConfig IVMRMonitorConfig_iface; IVMRMonitorConfig9 IVMRMonitorConfig9_iface; IVMRSurfaceAllocatorNotify IVMRSurfaceAllocatorNotify_iface; @@ -632,6 +639,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRFilterConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9)) *out = &filter->IVMRFilterConfig9_iface; + else if (IsEqualGUID(iid, &IID_IVMRMixerBitmap9) && is_vmr9(filter)) + *out = &filter->IVMRMixerBitmap9_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) *out = &filter->IVMRMonitorConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9)) @@ -2254,6 +2263,63 @@ static const IVMRSurfaceAllocatorNotify9Vtbl VMR9_SurfaceAllocatorNotify_Vtbl = VMR9SurfaceAllocatorNotify_NotifyEvent }; +static inline struct quartz_vmr *impl_from_IVMRMixerBitmap9(IVMRMixerBitmap9 *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRMixerBitmap9_iface); +} + +static HRESULT WINAPI mixer_bitmap9_QueryInterface(IVMRMixerBitmap9 *iface, REFIID iid, void **out) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerBitmap9(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, iid, out); +} + +static ULONG WINAPI mixer_bitmap9_AddRef(IVMRMixerBitmap9 *iface) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerBitmap9(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI mixer_bitmap9_Release(IVMRMixerBitmap9 *iface) +{ + struct quartz_vmr *filter = impl_from_IVMRMixerBitmap9(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI mixer_bitmap9_SetAlphaBitmap(IVMRMixerBitmap9 *iface, + const VMR9AlphaBitmap *bitmap) +{ + FIXME("iface %p, bitmap %p, stub!\n", iface, bitmap); + TRACE("dwFlags %#x, hdc %p, pDDS %p, rSrc %s, rDest %s, fAlpha %.8e, clrSrcKey #%06x, dwFilterMode %#x.\n", + bitmap->dwFlags, bitmap->hdc, bitmap->pDDS, wine_dbgstr_rect(&bitmap->rSrc), + debugstr_normalized_rect(&bitmap->rDest), bitmap->fAlpha, bitmap->clrSrcKey, bitmap->dwFilterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_bitmap9_UpdateAlphaBitmapParameters(IVMRMixerBitmap9 *iface, + const VMR9AlphaBitmap *bitmap) +{ + FIXME("iface %p, bitmap %p, stub!\n", iface, bitmap); + return E_NOTIMPL; +} + +static HRESULT WINAPI mixer_bitmap9_GetAlphaBitmapParameters(IVMRMixerBitmap9 *iface, + VMR9AlphaBitmap *bitmap) +{ + FIXME("iface %p, bitmap %p, stub!\n", iface, bitmap); + return E_NOTIMPL; +} + +static const IVMRMixerBitmap9Vtbl mixer_bitmap9_vtbl = +{ + mixer_bitmap9_QueryInterface, + mixer_bitmap9_AddRef, + mixer_bitmap9_Release, + mixer_bitmap9_SetAlphaBitmap, + mixer_bitmap9_UpdateAlphaBitmapParameters, + mixer_bitmap9_GetAlphaBitmapParameters, +}; + static inline struct quartz_vmr *impl_from_IOverlay(IOverlay *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IOverlay_iface); @@ -2379,6 +2445,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; object->IVMRFilterConfig_iface.lpVtbl = &VMR7_FilterConfig_Vtbl; object->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; + object->IVMRMixerBitmap9_iface.lpVtbl = &mixer_bitmap9_vtbl; object->IVMRMonitorConfig_iface.lpVtbl = &VMR7_MonitorConfig_Vtbl; object->IVMRMonitorConfig9_iface.lpVtbl = &VMR9_MonitorConfig_Vtbl; object->IVMRSurfaceAllocatorNotify_iface.lpVtbl = &VMR7_SurfaceAllocatorNotify_Vtbl;

1 0

Zebediah Figura : quartz/vmr9: Call IVMRSurfaceAllocator9::TerminateDevice() when destroying the filter.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: e7ed2798e863c2ac56aabf654c61c912e31a4a7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7ed2798e863c2ac56aabf65… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 18:05:23 2020 -0500 quartz/vmr9: Call IVMRSurfaceAllocator9::TerminateDevice() when destroying the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index c0fb6a6f34..5c08868fc0 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3272,7 +3272,7 @@ static void test_surface_allocator_notify_refcount(void) ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); - todo_wine ok(allocator_got_TerminateDevice == 1, "Got %u calls to TerminateDevice().\n", + ok(allocator_got_TerminateDevice == 1, "Got %u calls to TerminateDevice().\n", allocator_got_TerminateDevice); ok(allocator_refcount == 1, "Got outstanding refcount %d.\n", allocator_refcount); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a8f88e3d04..4fd3e70b96 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -595,7 +595,10 @@ static void vmr_destroy(struct strmbase_renderer *iface) InterlockedIncrement(&filter->renderer.filter.refcount); if (filter->allocator) + { + IVMRSurfaceAllocatorEx9_TerminateDevice(filter->allocator, filter->cookie); IVMRSurfaceAllocatorEx9_Release(filter->allocator); + } if (filter->presenter) IVMRImagePresenter9_Release(filter->presenter);

1 0

Zebediah Figura : quartz/vmr9: Track the IVMRSurfaceAllocatorNotify9 reference count separately.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 9181a12e620bccd5642e5ee521623897649c5638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9181a12e620bccd5642e5ee5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 18:05:22 2020 -0500 quartz/vmr9: Track the IVMRSurfaceAllocatorNotify9 reference count separately. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/vmr9.c | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 4994829641..c0fb6a6f34 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3271,10 +3271,10 @@ static void test_surface_allocator_notify_refcount(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ref = IBaseFilter_Release(filter); - todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %d.\n", ref); todo_wine ok(allocator_got_TerminateDevice == 1, "Got %u calls to TerminateDevice().\n", allocator_got_TerminateDevice); - todo_wine ok(allocator_refcount == 1, "Got outstanding refcount %d.\n", allocator_refcount); + ok(allocator_refcount == 1, "Got outstanding refcount %d.\n", allocator_refcount); ref = IVMRSurfaceAllocatorNotify9_Release(notify); ok(!ref, "Got outstanding refcount %d.\n", ref); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 93fc3417e7..a8f88e3d04 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -56,6 +56,12 @@ struct quartz_vmr IVMRWindowlessControl IVMRWindowlessControl_iface; IVMRWindowlessControl9 IVMRWindowlessControl9_iface; + /* Devil May Cry 3 releases the last IBaseFilter reference while still + * holding an IVMRSurfaceAllocatorNotify9 reference, and depends on + * IVMRSurfaceAllocator9::TerminateDevice() being called as a result. + * Native uses a separate reference count for IVMRSurfaceAllocatorNotify9. */ + LONG IVMRSurfaceAllocatorNotify9_refcount; + IOverlay IOverlay_iface; IVMRSurfaceAllocatorEx9 *allocator; @@ -571,12 +577,23 @@ static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) return hr; } +static void vmr_free(struct quartz_vmr *filter) +{ + free(filter); + InterlockedDecrement(&object_locks); +} + static void vmr_destroy(struct strmbase_renderer *iface) { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); video_window_cleanup(&filter->baseControlWindow); + /* Devil May Cry 3 releases the IVMRSurfaceAllocatorNotify9 interface from + * TerminateDevice(). Artificially increase the reference count so that we + * don't free the filter yet. */ + InterlockedIncrement(&filter->renderer.filter.refcount); + if (filter->allocator) IVMRSurfaceAllocatorEx9_Release(filter->allocator); if (filter->presenter) @@ -592,9 +609,8 @@ static void vmr_destroy(struct strmbase_renderer *iface) CloseHandle(filter->run_event); FreeLibrary(filter->hD3d9); strmbase_renderer_cleanup(&filter->renderer); - free(filter); - - InterlockedDecrement(&object_locks); + if (!filter->IVMRSurfaceAllocatorNotify9_refcount) + vmr_free(filter); } static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, void **out) @@ -2044,14 +2060,25 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_QueryInterface(IVMRSurfaceAlloc static ULONG WINAPI VMR9SurfaceAllocatorNotify_AddRef(IVMRSurfaceAllocatorNotify9 *iface) { - struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); - return IUnknown_AddRef(This->renderer.filter.outer_unk); + struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); + ULONG refcount = InterlockedIncrement(&filter->IVMRSurfaceAllocatorNotify9_refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; } static ULONG WINAPI VMR9SurfaceAllocatorNotify_Release(IVMRSurfaceAllocatorNotify9 *iface) { - struct quartz_vmr *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); - return IUnknown_Release(This->renderer.filter.outer_unk); + struct quartz_vmr *filter = impl_from_IVMRSurfaceAllocatorNotify9(iface); + ULONG refcount = InterlockedDecrement(&filter->IVMRSurfaceAllocatorNotify9_refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount && !filter->renderer.filter.refcount) + vmr_free(filter); + + return refcount; } static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AdviseSurfaceAllocator(IVMRSurfaceAllocatorNotify9 *iface, DWORD_PTR id, IVMRSurfaceAllocator9 *alloc)

1 0

Zebediah Figura : quartz/tests: Add tests for the separate reference count of IVMRSurfaceAllocatorNotify9.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 05adf7bed26ffe2dc388e6c496efd4c825ff721f URL: https://source.winehq.org/git/wine.git/?a=commit;h=05adf7bed26ffe2dc388e6c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 4 18:05:21 2020 -0500 quartz/tests: Add tests for the separate reference count of IVMRSurfaceAllocatorNotify9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 54e9b53afb..4994829641 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2769,7 +2769,7 @@ static D3DFORMAT allocator_format; static DWORD allocator_accept_flags; static IDirect3DSurface9 *allocator_surfaces[5]; static IVMRSurfaceAllocatorNotify9 *allocator_notify; -static unsigned int allocator_got_PresentImage; +static unsigned int allocator_got_PresentImage, allocator_got_TerminateDevice; static HRESULT WINAPI presenter_QueryInterface(IVMRImagePresenter9 *iface, REFIID iid, void **out) { @@ -2882,6 +2882,7 @@ static HRESULT WINAPI allocator_TerminateDevice(IVMRSurfaceAllocator9 *iface, DW if (winetest_debug > 1) trace("TerminateDevice()\n"); ok(cookie == 0xabacab, "Got cookie %#lx.\n", cookie); /* Don't dereference the surfaces here, to mimic How to Survive. */ + ++allocator_got_TerminateDevice; return E_NOTIMPL; } @@ -3253,6 +3254,32 @@ static void test_clipping_window(void) DestroyWindow(window); } +static void test_surface_allocator_notify_refcount(void) +{ + IBaseFilter *filter = create_vmr9(VMR9Mode_Renderless); + IVMRSurfaceAllocatorNotify9 *notify; + HRESULT hr; + ULONG ref; + + allocator_got_TerminateDevice = 0; + + set_mixing_mode(filter, 2); + + IBaseFilter_QueryInterface(filter, &IID_IVMRSurfaceAllocatorNotify9, (void **)&notify); + + hr = IVMRSurfaceAllocatorNotify9_AdviseSurfaceAllocator(notify, 0xabacab, &allocator_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IBaseFilter_Release(filter); + todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); + todo_wine ok(allocator_got_TerminateDevice == 1, "Got %u calls to TerminateDevice().\n", + allocator_got_TerminateDevice); + todo_wine ok(allocator_refcount == 1, "Got outstanding refcount %d.\n", allocator_refcount); + + ref = IVMRSurfaceAllocatorNotify9_Release(notify); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3284,6 +3311,7 @@ START_TEST(vmr9) test_renderless_formats(); test_mixing_mode(); test_clipping_window(); + test_surface_allocator_notify_refcount(); CoUninitialize(); }

1 0

Philip Rebohle : winevulkan: Update to VK spec version spec 1.2.140.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: d2f552d1508dbabb595eae23db9e5c157eaf9b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2f552d1508dbabb595eae23… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon May 4 20:30:00 2020 +0200 winevulkan: Update to VK spec version spec 1.2.140. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 47 + dlls/winevulkan/vulkan_thunks.h | 8 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 3067 ++++++++++++++++++++------------------- 5 files changed, 1628 insertions(+), 1498 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2f552d1508dbabb595e…

1 0

Philip Rebohle : winevulkan: Avoid adding duplicate enum aliases.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 4465ecfe0e3fa9fa14518abd1907193adb154957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4465ecfe0e3fa9fa14518abd… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon May 4 22:12:10 2020 +0200 winevulkan: Avoid adding duplicate enum aliases. VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHR is being defined multiple times by the current vk.xml. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e24dac9901..ccc3f228b0 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -395,7 +395,9 @@ class VkEnum(object): if not value.is_alias() and v.value == value.value: LOGGER.debug("Adding duplicate enum value {0} to {1}".format(v, self.name)) return - self.values.append(value) + # Avoid adding duplicate aliases multiple times + if not any(x.name == value.name for x in self.values): + self.values.append(value) def definition(self): if self.is_alias():

1 0

Philip Rebohle : winevulkan: Support struct forward-declarations as base types.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 727441cc24d54d9a6623d523788d4011c526ba94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=727441cc24d54d9a6623d523… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Mon May 4 20:29:58 2020 +0200 winevulkan: Support struct forward-declarations as base types. Some types are basically forward-declared structs now, such as ANativeWindow. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5d9889620e..e24dac9901 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -253,7 +253,10 @@ class VkBaseType(object): def definition(self): # Definition is similar for alias or non-alias as type # is already set to alias. - return "typedef {0} {1};\n".format(self.type, self.name) + if not self.type is None: + return "typedef {0} {1};\n".format(self.type, self.name) + else: + return "struct {0};\n".format(self.name) def is_alias(self): return bool(self.alias) @@ -2953,7 +2956,9 @@ class VkRegistry(object): if type_info["category"] == "basetype": name = t.find("name").text - _type = t.find("type").text + _type = None + if not t.find("type") is None: + _type = t.find("type").text basetype = VkBaseType(name, _type) base_types.append(basetype) type_info["data"] = basetype

1 0

Vijay Kiran Kamuju : msasn1/tests: Add initial tests.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 4e2ad334b5881af7661be4d6df3c51aae92ca4a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e2ad334b5881af7661be4d6… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:45:01 2020 +0200 msasn1/tests: Add initial tests. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msasn1/tests/Makefile.in | 5 ++++ dlls/msasn1/tests/asn1.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/configure b/configure index b94c0ce7aa..3da5851930 100755 --- a/configure +++ b/configure @@ -20760,6 +20760,7 @@ wine_fn_config_makefile dlls/msado15 enable_msado15 wine_fn_config_makefile dlls/msado15/tests enable_tests wine_fn_config_makefile dlls/msadp32.acm enable_msadp32_acm wine_fn_config_makefile dlls/msasn1 enable_msasn1 +wine_fn_config_makefile dlls/msasn1/tests enable_tests wine_fn_config_makefile dlls/mscat32 enable_mscat32 wine_fn_config_makefile dlls/mscms enable_mscms wine_fn_config_makefile dlls/mscms/tests enable_tests diff --git a/configure.ac b/configure.ac index 3d0c88fd9d..27db99f304 100644 --- a/configure.ac +++ b/configure.ac @@ -3438,6 +3438,7 @@ WINE_CONFIG_MAKEFILE(dlls/msado15) WINE_CONFIG_MAKEFILE(dlls/msado15/tests) WINE_CONFIG_MAKEFILE(dlls/msadp32.acm) WINE_CONFIG_MAKEFILE(dlls/msasn1) +WINE_CONFIG_MAKEFILE(dlls/msasn1/tests) WINE_CONFIG_MAKEFILE(dlls/mscat32) WINE_CONFIG_MAKEFILE(dlls/mscms) WINE_CONFIG_MAKEFILE(dlls/mscms/tests) diff --git a/dlls/msasn1/tests/Makefile.in b/dlls/msasn1/tests/Makefile.in new file mode 100644 index 0000000000..395ef933c0 --- /dev/null +++ b/dlls/msasn1/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msasn1.dll +IMPORTS = msasn1 + +C_SRCS = \ + asn1.c diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c new file mode 100644 index 0000000000..19019fc72b --- /dev/null +++ b/dlls/msasn1/tests/asn1.c @@ -0,0 +1,58 @@ +/* + * Copyright 2020 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "msasn1.h" +#include "wine/test.h" + +static void test_CreateModule(void) +{ + const ASN1GenericFun_t encfn[] = { NULL }; + const ASN1GenericFun_t decfn[] = { NULL }; + const ASN1FreeFun_t freefn[] = { NULL }; + const ASN1uint32_t size[] = { 0 }; + ASN1magic_t name = 0x61736e31; + ASN1module_t mod; + + mod = ASN1_CreateModule(0, 0, 0, 0, NULL, NULL, NULL, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, NULL, NULL, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, NULL, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, NULL, 0); + ok(!mod, "Expected Failure.\n"); + + mod = ASN1_CreateModule(0, 0, 0, 0, encfn, decfn, freefn, size, 0); + todo_wine ok(!!mod, "Failed to create module.\n"); + + mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); + todo_wine ok(!!mod, "Failed to create module.\n"); +} + +START_TEST(asn1) +{ + test_CreateModule(); +}

1 0

Vijay Kiran Kamuju : msasn1: Add ASN1_CreateModule stub implementation.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 48aefd2a0409d8c2a8474eb110992ac2532b6a78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48aefd2a0409d8c2a8474eb1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:43:06 2020 +0200 msasn1: Add ASN1_CreateModule stub implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 19 +++++++++++++++++++ dlls/msasn1/msasn1.spec | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 7ca0eac63e..90c4a8a9c9 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -23,6 +23,10 @@ #include "winbase.h" #include "msasn1.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msasn1); + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -37,3 +41,18 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, ASN1uint32_t flags, + ASN1uint32_t pdu, const ASN1GenericFun_t encoder[], + const ASN1GenericFun_t decoder[], const ASN1FreeFun_t freemem[], + const ASN1uint32_t size[], ASN1magic_t magic) +{ + ASN1module_t module = NULL; + + FIXME("(%08x %08x %08x %u %p %p %p %p %u): Stub!\n", ver, rule, flags, pdu, encoder, decoder, freemem, size, magic); + + if (!encoder || !decoder || !freemem || !size) + return module; + + return module; +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index 165839964d..ca6a461c65 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -223,7 +223,7 @@ @ stub ASN1_CreateDecoder @ stub ASN1_CreateDecoderEx @ stub ASN1_CreateEncoder -@ stub ASN1_CreateModule +@ stdcall ASN1_CreateModule(long long long long ptr ptr ptr ptr long) @ stub ASN1_Decode @ stub ASN1_Encode @ stub ASN1_FreeDecoded

1 0

Vijay Kiran Kamuju : include: Add related ASN1encoding_s and ASN1decoding_s structs.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 7e9bee3a8dc145426d97271e99e689af81fb30a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e9bee3a8dc145426d97271e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 29 19:38:33 2020 +0200 include: Add related ASN1encoding_s and ASN1decoding_s structs. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msasn1.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/include/msasn1.h b/include/msasn1.h index 89a6255a5f..dd0bcb5b3d 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -43,6 +43,11 @@ typedef ASN1uint16_t ASN1choice_t; typedef ASN1uint32_t ASN1magic_t; typedef ASN1ztcharstring_t ASN1objectdescriptor_t; +#define ASN1_MAKE_VERSION(major,minor) (((major) << 16) | (minor)) +#define ASN1_THIS_VERSION ASN1_MAKE_VERSION(1,0) + +#define ASN1DECFREE_NON_PDU_ID ((ASN1uint32_t)-1) + typedef void (WINAPI *ASN1FreeFun_t)(void *data); typedef void (WINAPI *ASN1GenericFun_t)(void); @@ -64,6 +69,30 @@ typedef struct tagASN1BerFunArr_t { const ASN1BerDecFun_t *apfnDecoder; } ASN1BerFunArr_t; +enum +{ + ASN1FLAGS_NONE = 0x00000000, + ASN1FLAGS_NOASSERT = 0x00001000 +}; + +enum +{ + ASN1ENCODE_APPEND = 0x00000001, + ASN1ENCODE_REUSEBUFFER = 0x00000004, + ASN1ENCODE_SETBUFFER = 0x00000008, + ASN1ENCODE_ALLOCATEBUFFER = 0x00000010, + ASN1ENCODE_NOASSERT = ASN1FLAGS_NOASSERT +}; + +enum +{ + ASN1DECODE_APPENDED = 0x00000001, + ASN1DECODE_REWINDBUFFER = 0x00000004, + ASN1DECODE_SETBUFFER = 0x00000008, + ASN1DECODE_AUTOFREEBUFFER = 0x00000010, + ASN1DECODE_NOASSERT = ASN1FLAGS_NOASSERT +}; + typedef struct tagASN1bitstring_t { ASN1uint32_t length; @@ -128,6 +157,9 @@ typedef enum tagASN1error_e ASN1_WRN_NOEOD = 1002, } ASN1error_e; +#define ASN1_SUCCEEDED(ret) (((int)(ret)) >= 0) +#define ASN1_FAILED(ret) (((int)(ret)) < 0) + typedef struct tagASN1generalizedtime_t { ASN1uint16_t year; @@ -147,19 +179,52 @@ typedef struct tagASN1intx_t ASN1octet_t *value; } ASN1intx_t; -typedef struct tagASN1module_t { +typedef struct tagASN1module_t +{ ASN1magic_t nModuleName; ASN1encodingrule_e eRule; ASN1uint32_t dwFlags; ASN1uint32_t cPDUs; const ASN1FreeFun_t *apfnFreeMemory; const ASN1uint32_t *acbStructSize; - union { - ASN1PerFunArr_t PER; - ASN1BerFunArr_t BER; + union + { + ASN1PerFunArr_t PER; + ASN1BerFunArr_t BER; }; } *ASN1module_t; +struct ASN1encoding_s +{ + ASN1magic_t magic; + ASN1uint32_t version; + ASN1module_t module; + ASN1octet_t *buf; + ASN1uint32_t size; + ASN1uint32_t len; + ASN1error_e err; + ASN1uint32_t bit; + ASN1octet_t *pos; + ASN1uint32_t cbExtraHeader; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; +}; + +struct ASN1decoding_s +{ + ASN1magic_t magic; + ASN1uint32_t version; + ASN1module_t module; + ASN1octet_t *buf; + ASN1uint32_t size; + ASN1uint32_t len; + ASN1error_e err; + ASN1uint32_t bit; + ASN1octet_t *pos; + ASN1encodingrule_e eRule; + ASN1uint32_t dwFlags; +}; + typedef struct ASN1objectidentifier_s { struct ASN1objectidentifier_s *next;

1 0

Jacek Caban : include: Introduce WINE_USE_LONG macro.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 0a09fdfa1fa82502921e48c4f4f7275b6ed2479e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a09fdfa1fa82502921e48c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 16:25:36 2020 +0200 include: Introduce WINE_USE_LONG macro. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 2 +- include/ntdef.h | 2 +- include/windef.h | 4 ++-- include/winnt.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 1871910efa..546c450043 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -30,7 +30,7 @@ typedef struct #else typedef struct _GUID { -#ifdef _MSC_VER +#ifdef WINE_USE_LONG unsigned long Data1; #else unsigned int Data1; diff --git a/include/ntdef.h b/include/ntdef.h index d85aa6feb5..069e86575b 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -53,7 +53,7 @@ typedef enum _WAIT_TYPE { #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; -#ifdef _MSC_VER +#ifdef WINE_USE_LONG typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; diff --git a/include/windef.h b/include/windef.h index 436ac6afd8..7ece7c8628 100644 --- a/include/windef.h +++ b/include/windef.h @@ -241,7 +241,7 @@ extern "C" { #define BASETYPES typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short USHORT, *PUSHORT; -#ifdef _MSC_VER +#ifdef WINE_USE_LONG typedef unsigned long ULONG, *PULONG; #else typedef unsigned int ULONG, *PULONG; @@ -257,7 +257,7 @@ typedef int INT, *PINT, *LPINT; typedef unsigned int UINT, *PUINT; typedef float FLOAT, *PFLOAT; typedef char *PSZ; -#ifdef _MSC_VER +#ifdef WINE_USE_LONG typedef long *LPLONG; typedef unsigned long DWORD, *PDWORD, *LPDWORD; #else diff --git a/include/winnt.h b/include/winnt.h index 883794cde8..cc2099086d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -452,7 +452,7 @@ typedef VOID *PVOID64; typedef BYTE BOOLEAN, *PBOOLEAN; typedef char CHAR, *PCHAR; typedef short SHORT, *PSHORT; -#ifdef _MSC_VER +#ifdef WINE_USE_LONG typedef long LONG, *PLONG; #else typedef int LONG, *PLONG;

1 0

Jacek Caban : winegcc: Add support for msvc target.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 35a7ed0c787dc5db9cc8d0a6c194433c0e6fcd6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=35a7ed0c787dc5db9cc8d0a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:24:55 2020 +0200 winegcc: Add support for msvc target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 95e3913500..89f8eca5c2 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -487,7 +487,6 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add( flags, strmake( "-Wl,-soname,%s.so", output_name )); break; - case PLATFORM_WINDOWS: case PLATFORM_MINGW: case PLATFORM_CYGWIN: if (opts->shared || opts->win16_app) @@ -515,6 +514,24 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_addall( link_args, flags ); return link_args; + case PLATFORM_WINDOWS: + if (opts->shared || opts->win16_app) + { + strarray_add( flags, "-shared" ); + strarray_add( flags, "-Wl,-kill-at" ); + } + if (opts->unicode_app) strarray_add( flags, "-municode" ); + if (opts->nodefaultlibs || opts->use_msvcrt) strarray_add( flags, "-nodefaultlibs" ); + if (opts->nostartfiles || opts->use_msvcrt) strarray_add( flags, "-nostartfiles" ); + if (opts->image_base) strarray_add( flags, strmake("-Wl,-base:%s", opts->image_base )); + if (opts->subsystem) + strarray_add( flags, strmake("-Wl,-subsystem:%s", opts->subsystem )); + else + strarray_add( flags, strmake("-Wl,-subsystem:%s", opts->gui_app ? "windows" : "console" )); + + strarray_addall( link_args, flags ); + return link_args; + default: if (opts->image_base) { @@ -1298,16 +1315,26 @@ static void build(struct options* opts) entry_point = opts->target_cpu == CPU_x86 ? "DllMainCRTStartup@12" : "DllMainCRTStartup"; if (is_pe && entry_point) - strarray_add(link_args, strmake("-Wl,--entry,%s%s", - is_pe && opts->target_cpu == CPU_x86 ? "_" : "", - entry_point)); + { + if (opts->target_platform == PLATFORM_WINDOWS) + strarray_add(link_args, strmake("-Wl,-entry:%s", entry_point)); + else + strarray_add(link_args, strmake("-Wl,--entry,%s%s", + is_pe && opts->target_cpu == CPU_x86 ? "_" : "", + entry_point)); + } strarray_add(link_args, spec_o_name); if (is_pe) { for (j = 0; j < opts->delayimports->size; j++) - strarray_add(link_args, strmake("-Wl,-delayload,%s", opts->delayimports->base[j])); + { + if (opts->target_platform == PLATFORM_WINDOWS) + strarray_add(link_args, strmake("-Wl,-delayload:%s", opts->delayimports->base[j])); + else + strarray_add(link_args, strmake("-Wl,-delayload,%s",opts->delayimports->base[j])); + } } for ( j = 0; j < files->size; j++ )

1 0

Jacek Caban : winegcc: Use libgcc only on mingw target.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 66aa39d95986f19f9c4ba172d8d910908dcb03cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=66aa39d95986f19f9c4ba172… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:20:48 2020 +0200 winegcc: Use libgcc only on mingw target. It's not available for msvc, but we get all we need from importlibs there. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 2be8b508fb..95e3913500 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1282,7 +1282,7 @@ static void build(struct options* opts) /* link everything together now */ link_args = get_link_args( opts, output_name ); - if ((opts->nodefaultlibs || opts->use_msvcrt) && is_pe) + if ((opts->nodefaultlibs || opts->use_msvcrt) && opts->target_platform == PLATFORM_MINGW) { libgcc = find_libgcc(opts->prefix, link_args); if (!libgcc) libgcc = "-lgcc";

1 0

Jacek Caban : winegcc: Make mingw a separated platform from msvc.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 2dee9b98747cbbfe05641e7056d8cf4f908bdad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dee9b98747cbbfe05641e70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:20:26 2020 +0200 winegcc: Make mingw a separated platform from msvc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 2 +- tools/winegcc/utils.h | 1 + tools/winegcc/winegcc.c | 24 +++++++++++++----------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index cc5d67977f..0fe9b04b00 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -273,7 +273,7 @@ static char* try_lib_path(const char* dir, const char* pre, static file_type guess_lib_type(enum target_platform platform, const char* dir, const char* library, const char *suffix, char** file) { - if (platform != PLATFORM_WINDOWS && platform != PLATFORM_CYGWIN) + if (platform != PLATFORM_WINDOWS && platform != PLATFORM_MINGW && platform != PLATFORM_CYGWIN) { /* Unix shared object */ if ((*file = try_lib_path(dir, "lib", library, ".so", file_so))) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index cb4778fa09..9c70011a90 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -49,6 +49,7 @@ enum target_platform PLATFORM_ANDROID, PLATFORM_SOLARIS, PLATFORM_WINDOWS, + PLATFORM_MINGW, PLATFORM_CYGWIN }; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 95797e6b63..2be8b508fb 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -181,14 +181,15 @@ static const struct enum target_platform platform; } platform_names[] = { - { "macos", PLATFORM_APPLE }, - { "darwin", PLATFORM_APPLE }, - { "android", PLATFORM_ANDROID }, - { "solaris", PLATFORM_SOLARIS }, - { "cygwin", PLATFORM_CYGWIN }, - { "mingw32", PLATFORM_WINDOWS }, - { "windows", PLATFORM_WINDOWS }, - { "winnt", PLATFORM_WINDOWS } + { "macos", PLATFORM_APPLE }, + { "darwin", PLATFORM_APPLE }, + { "android", PLATFORM_ANDROID }, + { "solaris", PLATFORM_SOLARIS }, + { "cygwin", PLATFORM_CYGWIN }, + { "mingw32", PLATFORM_MINGW }, + { "windows-gnu", PLATFORM_MINGW }, + { "windows", PLATFORM_WINDOWS }, + { "winnt", PLATFORM_MINGW } }; struct options @@ -258,7 +259,7 @@ static enum target_platform build_platform = PLATFORM_SOLARIS; #elif defined(__CYGWIN__) static enum target_platform build_platform = PLATFORM_CYGWIN; #elif defined(_WIN32) -static enum target_platform build_platform = PLATFORM_WINDOWS; +static enum target_platform build_platform = PLATFORM_MINGW; #else static enum target_platform build_platform = PLATFORM_UNSPECIFIED; #endif @@ -487,6 +488,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) break; case PLATFORM_WINDOWS: + case PLATFORM_MINGW: case PLATFORM_CYGWIN: if (opts->shared || opts->win16_app) { @@ -729,7 +731,7 @@ static void compile(struct options* opts, const char* lang) break; } - if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN) + if (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN || opts->target_platform == PLATFORM_MINGW) goto no_compat_defines; if (opts->processor != proc_cpp) @@ -1043,7 +1045,7 @@ static void build(struct options* opts) int generate_app_loader = 1; const char *crt_lib = NULL, *entry_point = NULL; int fake_module = 0; - int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN); + int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN || opts->target_platform == PLATFORM_MINGW); unsigned int j; /* NOTE: for the files array we'll use the following convention:

1 0

Jacek Caban : winegcc: Explicitly pass DLL crt entry point to PE linker when Wine crt is used.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 78ce43f01772bc1ddafdf217cb1390f7e7c8c9d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ce43f01772bc1ddafdf217… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:19:43 2020 +0200 winegcc: Explicitly pass DLL crt entry point to PE linker when Wine crt is used. Linkers don't agree on its default. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a5bc0f4576..95797e6b63 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1292,6 +1292,9 @@ static void build(struct options* opts) for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); + if (is_pe && opts->use_msvcrt && !entry_point && (opts->shared || opts->win16_app)) + entry_point = opts->target_cpu == CPU_x86 ? "DllMainCRTStartup@12" : "DllMainCRTStartup"; + if (is_pe && entry_point) strarray_add(link_args, strmake("-Wl,--entry,%s%s", is_pe && opts->target_cpu == CPU_x86 ? "_" : "",

1 0

Jacek Caban : winegcc: Add entry symbol underscore when building linker command.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 346cbb6f266f2e3aa1559981404dfc57dc738e76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=346cbb6f266f2e3aa1559981… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 4 15:19:23 2020 +0200 winegcc: Add entry symbol underscore when building linker command. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index d38ca97488..a5bc0f4576 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1185,14 +1185,9 @@ static void build(struct options* opts) if (!opts->entry_point) { if (opts->subsystem && !strcmp( opts->subsystem, "native" )) - entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_DriverEntry@8" : "DriverEntry"; + entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "DriverEntry@8" : "DriverEntry"; else if (opts->use_msvcrt && !opts->shared && !opts->win16_app) - { - if (opts->unicode_app) - entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_wmainCRTStartup" : "wmainCRTStartup"; - else - entry_point = (is_pe && opts->target_cpu == CPU_x86) ? "_mainCRTStartup" : "mainCRTStartup"; - } + entry_point = opts->unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; else if (!is_pe && !opts->shared && opts->unicode_app) entry_point = "__wine_spec_exe_wentry"; } @@ -1297,7 +1292,10 @@ static void build(struct options* opts) for ( j = 0; j < lib_dirs->size; j++ ) strarray_add(link_args, strmake("-L%s", lib_dirs->base[j])); - if (is_pe && entry_point) strarray_add(link_args, strmake("-Wl,--entry,%s", entry_point)); + if (is_pe && entry_point) + strarray_add(link_args, strmake("-Wl,--entry,%s%s", + is_pe && opts->target_cpu == CPU_x86 ? "_" : "", + entry_point)); strarray_add(link_args, spec_o_name);

1 0

Nikolay Sivov : comctl32: Move MRU functions to another file.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 964cb1ba414fab246d84483644b23e414b344571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964cb1ba414fab246d844836… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 14:12:00 2020 +0300 comctl32: Move MRU functions to another file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/comctl32undoc.c | 1184 ----------------------------------------- dlls/comctl32/commctrl.c | 962 +++++++++++++++++++++++++++++++++ 3 files changed, 962 insertions(+), 1185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=964cb1ba414fab246d84…

1 0

Nikolay Sivov : comctl32/tab: Use wide string literals.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 2bd02f9aae8b6d15a94ab80e02e2f23a415feda7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bd02f9aae8b6d15a94ab80e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 14:11:59 2020 +0300 comctl32/tab: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tab.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index f8a54935ca..3bb5310d1f 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -152,7 +152,7 @@ typedef struct #define TAB_HOTTRACK_TIMER 1 #define TAB_HOTTRACK_TIMER_INTERVAL 100 /* milliseconds */ -static const WCHAR themeClass[] = { 'T','a','b',0 }; +static const WCHAR themeClass[] = L"Tab"; static inline TAB_ITEM* TAB_GetItem(const TAB_INFO *infoPtr, INT i) { @@ -1013,7 +1013,6 @@ static void TAB_SetupScrolling( TAB_INFO* infoPtr, const RECT* clientRect) { - static const WCHAR emptyW[] = { 0 }; INT maxRange = 0; if (infoPtr->needsScrolling) @@ -1044,7 +1043,7 @@ static void TAB_SetupScrolling( */ if (infoPtr->hwndUpDown==0) { - infoPtr->hwndUpDown = CreateWindowW(UPDOWN_CLASSW, emptyW, + infoPtr->hwndUpDown = CreateWindowW(UPDOWN_CLASSW, L"", WS_VISIBLE | WS_CHILD | UDS_HORZ, controlPos.left, controlPos.top, controlPos.right - controlPos.left,

1 0

Nikolay Sivov : comctl32/propsheet: Use wide string literals.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 30db9fa830702d9e3975bd58799c0b15b6557047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30db9fa830702d9e3975bd58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 14:11:58 2020 +0300 comctl32/propsheet: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 05ab4aa48d..1604b9e961 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -139,8 +139,7 @@ typedef struct * Defines and global variables */ -static const WCHAR PropSheetInfoStr[] = - {'P','r','o','p','e','r','t','y','S','h','e','e','t','I','n','f','o',0 }; +static const WCHAR PropSheetInfoStr[] = L"PropertySheetInfo"; #define PSP_INTERNAL_UNICODE 0x80000000 @@ -546,7 +545,6 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, { WCHAR szTitle[256]; const WCHAR *pTitle; - static const WCHAR pszNull[] = { '(','n','u','l','l',')',0 }; if (IS_INTRESOURCE( lppsp->pszTitle )) { @@ -555,7 +553,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, else if (*p) pTitle = p; else - pTitle = pszNull; + pTitle = L"(null)"; } else pTitle = lppsp->pszTitle;

1 0

Nikolay Sivov : comctl32/header: Use wide string literals.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 6dbe2b5348c8bb553de5642550ea5d33f171a4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dbe2b5348c8bb553de56425… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 14:11:57 2020 +0300 comctl32/header: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/header.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index c70960484a..085549fed6 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -111,7 +111,7 @@ static void HEADER_FreeCallbackItems(HEADER_ITEM *lpItem); static LRESULT HEADER_SendNotify(const HEADER_INFO *infoPtr, UINT code, NMHDR *hdr); static LRESULT HEADER_SendCtrlCustomDraw(const HEADER_INFO *infoPtr, DWORD dwDrawStage, HDC hdc, const RECT *rect); -static const WCHAR themeClass[] = {'H','e','a','d','e','r',0}; +static const WCHAR themeClass[] = L"Header"; static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDITEMW *phdi, BOOL fUnicode) { @@ -146,9 +146,7 @@ static void HEADER_StoreHDItemInHeader(HEADER_ITEM *lpItem, UINT mask, const HDI if (phdi->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ { - static const WCHAR emptyString[] = {0}; - - LPCWSTR pszText = (phdi->pszText != NULL ? phdi->pszText : emptyString); + const WCHAR *pszText = phdi->pszText != NULL ? phdi->pszText : L""; if (fUnicode) Str_SetPtrW(&lpItem->pszText, pszText); else

1 0

Bernhard Übelacker : cmd/tests: Test that the if command is not influenced by a previous one.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: c358de84c8a767bc36a1d05017243eda11215962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c358de84c8a767bc36a1d050… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun May 3 17:05:25 2020 +0200 cmd/tests: Test that the if command is not influenced by a previous one. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47770 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48738 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 2 files changed, 9 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4bf37a35bb..73b0917c27 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1013,6 +1013,13 @@ if /i not (a)==(b) ( ) else ( echo comparison operators surrounded by brackets seem to be broken ) +if defined windir echo windir is defined +if not defined windir echo windir is defined +if not exist %windir% ( + echo windir does not exist +) else ( + echo windir does exist +) echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5bcd29b917..fb84de2f5d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -699,6 +699,8 @@ comparison operators surrounded by brackets seem to work comparison operators surrounded by brackets seem to work comparison operators surrounded by brackets seem to work comparison operators surrounded by brackets seem to work +windir is defined +windir does exist --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work

1 0

Bernhard Übelacker : cmd: Fix crash in if condition parsing.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: b1e91a36a75fd8ae27a999248aa034e69227bc02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1e91a36a75fd8ae27a99924… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sun May 3 17:05:24 2020 +0200 cmd: Fix crash in if condition parsing. Regression introduced in f238e846e701d2039eceb51f2f6e9d936f8c791c. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47770 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48738 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 6 ++++++ programs/cmd/wcmdmain.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1870e5688d..70ccddebc1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2938,9 +2938,15 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) int test; /* Condition evaluation result */ WCHAR *command; + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) == -1) goto syntax_err; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command)); + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2819f7fa99..16843e4087 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1947,8 +1947,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE To be able to handle ('s in the condition part take as much as evaluate_if_condition would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { - static const WCHAR parmI[] = {'/','I','\0'}; - static const WCHAR notW[] = {'n','o','t','\0'}; int negate; /* Negate condition */ int test; /* Condition evaluation result */ WCHAR *p, *command; @@ -1956,17 +1954,18 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE inIf = TRUE; p = curPos+(ARRAY_SIZE(ifCmd)); - while (*p == ' ' || *p == '\t') { + while (*p == ' ' || *p == '\t') p++; - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) - p += lstrlenW(notW); - if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) - p += lstrlenW(parmI); - } + WCMD_parse (p, quals, param1, param2); + /* Function evaluate_if_condition relies on the global variables quals, param1 and param2 + set in a call to WCMD_parse before */ if (evaluate_if_condition(p, &command, &test, &negate) != -1) { int if_condition_len = command - curPos; + WINE_TRACE("p: %s, quals: %s, param1: %s, param2: %s, command: %s, if_condition_len: %d\n", + wine_dbgstr_w(p), wine_dbgstr_w(quals), wine_dbgstr_w(param1), + wine_dbgstr_w(param2), wine_dbgstr_w(command), if_condition_len); memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); (*curLen)+=if_condition_len; curPos+=if_condition_len;

1 0

Piotr Caban : msvcrt: Fix 0 parsing in parse_double helper.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: ab5e48f4fc70debe2696b4047099e2cddd355954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab5e48f4fc70debe2696b404… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 4 11:30:24 2020 +0200 msvcrt: Fix 0 parsing in parse_double helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 5 ++++- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 31ed4e2181..407f819884 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -744,7 +744,10 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), } #endif - while(nch == '0') nch = get(ctx); + while(nch == '0') { + found_digit = TRUE; + nch = get(ctx); + } b.data[0] = 0; b.b = 0; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9b26484592..46eb0cc080 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1956,6 +1956,11 @@ static void test__strtod(void) { "0.1D-4736", 9, 0 }, { "3.4028234663852887e38", 21, FLT_MAX }, { "1.7976931348623158e+308", 23, DBL_MAX }, + { "00", 2, 0 }, + { "00.", 3, 0 }, + { ".00", 3, 0 }, + { "-0.", 3, 0 }, + { "0e13", 4, 0 }, }; const char overflow[] = "1d9999999999999999999";

1 0

Piotr Caban : msvcrt/tests: Cleanup strtod tests.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 19bff79da8d34739840c79bf80e23af5db30b6c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19bff79da8d34739840c79bf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 4 11:30:18 2020 +0200 msvcrt/tests: Cleanup strtod tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 92 +++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 59 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 05aa747f84..9b26484592 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1934,48 +1934,44 @@ static inline BOOL compare_double(double f, double g, unsigned int ulps) static void test__strtod(void) { - const char double1[] = "12.1"; - const char double2[] = "-13.721"; - const char double3[] = "INF"; - const char double4[] = ".21e12"; - const char double5[] = "214353e-3"; - const char double6[] = "NAN"; + static const struct { + const char *str; + int len; + double ret; + } tests[] = { + { "12.1", 4, 12.1 }, + { "-13.721", 7, -13.721 }, + { "INF", 0, 0 }, + { ".21e12", 6, 210000000000.0 }, + { "214353e-3", 9, 214.353 }, + { "NAN", 0, 0 }, + { "12.1d2", 6, 12.1e2 }, + { " d10", 0, 0 }, + { "0.1", 3, 0.1 }, + { "-0.1", 4, -0.1 }, + { "0.1281832188491894198128921", 27, 0.1281832188491894198128921 }, + { "0.82181281288121", 16, 0.82181281288121 }, + { "21921922352523587651128218821", 29, 21921922352523587651128218821.0 }, + { "0.1d238", 7, 0.1e238 }, + { "0.1D-4736", 9, 0 }, + { "3.4028234663852887e38", 21, FLT_MAX }, + { "1.7976931348623158e+308", 23, DBL_MAX }, + }; const char overflow[] = "1d9999999999999999999"; - const char white_chars[] = " d10"; char *end; double d; + int i; - d = strtod(double1, &end); - ok(d == 12.1, "d = %.16e\n", d); - ok(end == double1+4, "incorrect end (%d)\n", (int)(end-double1)); - - d = strtod(double2, &end); - ok(d == -13.721, "d = %.16e\n", d); - ok(end == double2+7, "incorrect end (%d)\n", (int)(end-double2)); - - d = strtod(double3, &end); - ok(d == 0, "d = %.16e\n", d); - ok(end == double3, "incorrect end (%d)\n", (int)(end-double3)); - - d = strtod(double4, &end); - ok(d == 210000000000.0, "d = %.16e\n", d); - ok(end == double4+6, "incorrect end (%d)\n", (int)(end-double4)); - - d = strtod(double5, &end); - ok(d == 214.353, "d = %.16e\n", d); - ok(end == double5+9, "incorrect end (%d)\n", (int)(end-double5)); - - d = strtod(double6, &end); - ok(d == 0, "d = %.16e\n", d); - ok(end == double6, "incorrect end (%d)\n", (int)(end-double6)); - - d = strtod("12.1d2", NULL); - ok(d == 12.1e2, "d = %.16e\n", d); - - d = strtod(white_chars, &end); - ok(d == 0, "d = %.16e\n", d); - ok(end == white_chars, "incorrect end (%d)\n", (int)(end-white_chars)); + for (i=0; i<ARRAY_SIZE(tests); i++) + { + errno = 0xdeadbeef; + d = strtod(tests[i].str, &end); + ok(d == tests[i].ret, "%d) d = %.16e\n", i, d); + ok(end == tests[i].str + tests[i].len, "%d) len = %d\n", + i, (int)(end - tests[i].str)); + ok(errno = 0xdeadbeef, "%d) errno = %d\n", i, errno); + } if (!p__strtod_l) win_skip("_strtod_l not found\n"); @@ -2013,22 +2009,6 @@ static void test__strtod(void) setlocale(LC_ALL, "C"); - /* Precision tests */ - d = strtod("0.1", NULL); - ok(d == 0.1, "d = %.16e\n", d); - d = strtod("-0.1", NULL); - ok(d == -0.1, "d = %.16e\n", d); - d = strtod("0.1281832188491894198128921", NULL); - ok(d == 0.1281832188491894198128921, "d = %.16e\n", d); - d = strtod("0.82181281288121", NULL); - ok(d == 0.82181281288121, "d = %.16e\n", d); - d = strtod("21921922352523587651128218821", NULL); - ok(d == 21921922352523587651128218821.0, "d = %.16e\n", d); - d = strtod("0.1d238", NULL); - ok(d == 0.1e238, "d = %.16e\n", d); - d = strtod("0.1D-4736", NULL); - ok(d == 0.0, "d = %.16e\n", d); - errno = 0xdeadbeef; strtod(overflow, &end); ok(errno == ERANGE, "errno = %x\n", errno); @@ -2037,12 +2017,6 @@ static void test__strtod(void) errno = 0xdeadbeef; strtod("-1d309", NULL); ok(errno == ERANGE, "errno = %x\n", errno); - - d = strtod("3.4028234663852887e38", NULL); - ok(d <= FLT_MAX, "d = %e\n", d); - - d = strtod("1.7976931348623158e+308", NULL); - ok(d == DBL_MAX, "d = %le\n", d); } static void test_mbstowcs(void)

1 0

Nikolay Sivov : dwrite: Partially implement chaining contextual substitution (GSUB lookup 6).
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 075f5b73feb8609957dd6d00adc083825c1a5cd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=075f5b73feb8609957dd6d00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:35 2020 +0300 dwrite: Partially implement chaining contextual substitution (GSUB lookup 6). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 214 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 200 insertions(+), 14 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=075f5b73feb8609957dd…

1 0

Nikolay Sivov : dwrite: Implement single substitution lookup (GSUB lookup 1).
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: a6be9579196f8c625017a73c536e73f426b0f93b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6be9579196f8c625017a73c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:34 2020 +0300 dwrite: Implement single substitution lookup (GSUB lookup 1). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 4 ++ dlls/dwrite/dwrite_private.h | 6 ++ dlls/dwrite/opentype.c | 165 ++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 164 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index bc5c54f21e..5ee057028f 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1252,6 +1252,10 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, context.length = length; context.is_rtl = is_rtl; context.is_sideways = is_sideways; + context.u.subst.glyphs = glyphs; + context.u.subst.glyph_props = glyph_props; + context.u.subst.max_glyph_count = max_glyph_count; + context.glyph_count = g; context.language_tag = get_opentype_language(locale); script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7a8ce1e499..28ac05a1c1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -478,6 +478,12 @@ struct scriptshaping_context const UINT16 *glyphs; const DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; } pos; + struct + { + UINT16 *glyphs; + DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props; + unsigned int max_glyph_count; + } subst; } u; unsigned int glyph_count; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b5947a8960..e1bfee097b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -507,6 +507,18 @@ enum gpos_lookup_type GPOS_LOOKUP_EXTENSION_POSITION = 9, }; +enum gsub_lookup_type +{ + GSUB_LOOKUP_SINGLE_SUBST = 1, + GSUB_LOOKUP_MULTIPLE_SUBST = 2, + GSUB_LOOKUP_ALTERNATE_SUBST = 3, + GSUB_LOOKUP_LIGATURE_SUBST = 4, + GSUB_LOOKUP_CONTEXTUAL_SUBST = 5, + GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST = 6, + GSUB_LOOKUP_EXTENSION_SUBST = 7, + GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST = 8, +}; + enum gpos_value_format { GPOS_VALUE_X_PLACEMENT = 0x1, @@ -528,13 +540,28 @@ enum OPENTYPE_PLATFORM_ID OPENTYPE_PLATFORM_CUSTOM }; -struct ot_gpos_extensionpos_format1 +struct ot_gsubgpos_extensionpos_format1 { - WORD format; - WORD lookup_type; + UINT16 format; + UINT16 lookup_type; DWORD extension_offset; }; +struct ot_gsub_singlesubst_format1 +{ + UINT16 format; + UINT16 coverage; + short delta; +}; + +struct ot_gsub_singlesubst_format2 +{ + UINT16 format; + UINT16 coverage; + UINT16 count; + UINT16 substitutes[1]; +}; + struct ot_feature { WORD feature_params; @@ -740,12 +767,6 @@ typedef struct { #include "poppack.h" -enum gsub_lookup_type -{ - GSUB_LOOKUP_SINGLE_SUBST = 1, - GSUB_LOOKUP_EXTENSION_SUBST = 7, -}; - enum TT_NAME_WINDOWS_ENCODING_ID { TT_NAME_WINDOWS_ENCODING_SYMBOL = 0, @@ -3286,7 +3307,23 @@ static unsigned int opentype_layout_get_gpos_subtable(const struct scriptshaping FIELD_OFFSET(struct ot_lookup_table, subtable[subtable])); if (lookup_type == GPOS_LOOKUP_EXTENSION_POSITION) { - const struct ot_gpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gpos.table, + const struct ot_gsubgpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gpos.table, + lookup_offset + subtable_offset, sizeof(*format1)); + subtable_offset += GET_BE_DWORD(format1->extension_offset); + } + + return lookup_offset + subtable_offset; +} + +static unsigned int opentype_layout_get_gsub_subtable(const struct scriptshaping_cache *cache, + unsigned int lookup_offset, unsigned int subtable) +{ + UINT16 lookup_type = table_read_be_word(&cache->gsub.table, lookup_offset); + unsigned int subtable_offset = table_read_be_word(&cache->gsub.table, lookup_offset + + FIELD_OFFSET(struct ot_lookup_table, subtable[subtable])); + if (lookup_type == GSUB_LOOKUP_EXTENSION_SUBST) + { + const struct ot_gsubgpos_extensionpos_format1 *format1 = table_read_ensure(&cache->gsub.table, lookup_offset + subtable_offset, sizeof(*format1)); subtable_offset += GET_BE_DWORD(format1->extension_offset); } @@ -3971,7 +4008,7 @@ static void opentype_layout_apply_gpos_lookup(struct scriptshaping_context *cont lookup_type = GET_BE_WORD(lookup_table->lookup_type); if (lookup_type == GPOS_LOOKUP_EXTENSION_POSITION) { - const struct ot_gpos_extensionpos_format1 *extension = table_read_ensure(&cache->gpos.table, + const struct ot_gsubgpos_extensionpos_format1 *extension = table_read_ensure(&cache->gpos.table, lookup.offset + GET_BE_WORD(lookup_table->subtable[0]), sizeof(*extension)); WORD format; @@ -4157,9 +4194,115 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, heap_free(lookups.indexes); } +static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator *iter, const struct lookup *lookup) +{ + struct scriptshaping_cache *cache = iter->context->cache; + UINT16 format, coverage; + unsigned int i; + + for (i = 0; i < lookup->subtable_count; ++i) + { + unsigned int subtable_offset = opentype_layout_get_gsub_subtable(cache, lookup->offset, i); + UINT16 glyph = iter->context->u.subst.glyphs[iter->pos]; + unsigned int coverage_index; + + format = table_read_be_word(&cache->gsub.table, subtable_offset); + + coverage = table_read_be_word(&cache->gsub.table, subtable_offset + + FIELD_OFFSET(struct ot_gsub_singlesubst_format1, coverage)); + + if (format == 1) + { + const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(&cache->gsub.table, subtable_offset, + sizeof(*format1)); + + coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + continue; + + iter->context->u.subst.glyphs[iter->pos] = glyph + GET_BE_WORD(format1->delta); + break; + } + else if (format == 2) + { + UINT16 count = table_read_be_word(&cache->gsub.table, subtable_offset + + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); + const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(&cache->gsub.table, subtable_offset, + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count) + count * sizeof(UINT16)); + + coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= count) + continue; + + iter->context->u.subst.glyphs[iter->pos] = GET_BE_WORD(format2->substitutes[coverage_index]); + break; + } + else + WARN("Unknown single substitution format %u.\n", format); + } + + return FALSE; +} + static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, unsigned int first_glyph, unsigned int glyph_count, int lookup_index) { + struct ot_gsubgpos_table *table = &context->cache->gsub; + const struct ot_lookup_table *lookup_table; + struct glyph_iterator iter; + struct lookup lookup; + WORD lookup_type; + + lookup.offset = table_read_be_word(&table->table, table->lookup_list + FIELD_OFFSET(struct ot_lookup_list, lookup[lookup_index])); + if (!lookup.offset) + return; + + lookup.offset += table->lookup_list; + + if (!(lookup_table = table_read_ensure(&table->table, lookup.offset, sizeof(*lookup_table)))) + return; + + lookup.subtable_count = GET_BE_WORD(lookup_table->subtable_count); + if (!lookup.subtable_count) + return; + + lookup_type = GET_BE_WORD(lookup_table->lookup_type); + lookup.flags = GET_BE_WORD(lookup_table->flags); + + glyph_iterator_init(context, lookup.flags, first_glyph, glyph_count, &iter); + + while (iter.pos < first_glyph + iter.len) + { + BOOL ret; + + if (!glyph_iterator_match(&iter)) + { + ++iter.pos; + continue; + } + + switch (lookup_type) + { + case GSUB_LOOKUP_SINGLE_SUBST: + ret = opentype_layout_apply_gsub_single_substitution(&iter, &lookup); + break; + case GSUB_LOOKUP_MULTIPLE_SUBST: + case GSUB_LOOKUP_CHAINING_CONTEXTUAL_SUBST: + case GSUB_LOOKUP_ALTERNATE_SUBST: + case GSUB_LOOKUP_LIGATURE_SUBST: + case GSUB_LOOKUP_CONTEXTUAL_SUBST: + case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: + WARN("Unimplemented lookup %d.\n", lookup_type); + break; + default: + WARN("Unknown lookup type %u.\n", lookup_type); + return; + } + + /* Some lookups update position after making changes. */ + if (!ret) + ++iter.pos; + } } HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index,

1 0

Nikolay Sivov : dwrite: Add a helper to collect gsub/gpos lookups.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 5eb742687defb83d7a792f1e5088c4a0e91f3ab4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb742687defb83d7a792f1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:33 2020 +0300 dwrite: Add a helper to collect gsub/gpos lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 81 +++++++++++++++++++++++++++++++++----------------- dlls/dwrite/shape.c | 6 ++-- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b9db82d661..b5947a8960 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4054,43 +4054,41 @@ static int lookups_sorting_compare(const void *left, const void *right) return *(int *)left - *(int *)right; }; -void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, - unsigned int script_index, unsigned int language_index, const struct shaping_features *features) +static void opentype_layout_collect_lookups(struct scriptshaping_context *context, unsigned int script_index, + unsigned int language_index, const struct shaping_features *features, struct ot_gsubgpos_table *table, + struct lookups *lookups) { - WORD table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; - struct scriptshaping_cache *cache = context->cache; + UINT16 table_offset, langsys_offset, script_feature_count, total_feature_count, total_lookup_count; const struct ot_feature_list *feature_list; - struct lookups lookups = { 0 }; unsigned int i, j, l; /* ScriptTable offset. */ - table_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + script_index * sizeof(struct ot_script_record) + - FIELD_OFFSET(struct ot_script_record, script)); + table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); if (!table_offset) return; if (language_index == ~0u) - langsys_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset); + langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset); else - langsys_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + langsys_offset = table_read_be_word(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys) + language_index * sizeof(struct ot_langsys_record) + FIELD_OFFSET(struct ot_langsys_record, langsys)); - script_feature_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + - langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_count)); + script_feature_count = table_read_be_word(&table->table, table->script_list + table_offset + langsys_offset + + FIELD_OFFSET(struct ot_langsys, feature_count)); if (!script_feature_count) return; - total_feature_count = table_read_be_word(&cache->gpos.table, cache->gpos.feature_list); + total_feature_count = table_read_be_word(&table->table, table->feature_list); if (!total_feature_count) return; - total_lookup_count = table_read_be_word(&cache->gpos.table, cache->gpos.lookup_list); + total_lookup_count = table_read_be_word(&table->table, table->lookup_list); if (!total_lookup_count) return; - feature_list = table_read_ensure(&cache->gpos.table, cache->gpos.feature_list, + feature_list = table_read_ensure(&table->table, table->feature_list, FIELD_OFFSET(struct ot_feature_list, features[total_feature_count])); if (!feature_list) return; @@ -4100,7 +4098,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, { for (j = 0; j < script_feature_count; ++j) { - WORD feature_index = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + UINT16 feature_index = table_read_be_word(&table->table, table->script_list + table_offset + langsys_offset + FIELD_OFFSET(struct ot_langsys, feature_index[j])); if (feature_index >= total_feature_count) continue; @@ -4110,49 +4108,78 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, WORD feature_offset = GET_BE_WORD(feature_list->features[feature_index].offset); WORD lookup_count; - lookup_count = table_read_be_word(&cache->gpos.table, cache->gpos.feature_list + feature_offset + + lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset + FIELD_OFFSET(struct ot_feature, lookup_count)); if (!lookup_count) continue; - if (!dwrite_array_reserve((void **)&lookups.indexes, &lookups.capacity, lookups.count + lookup_count, - sizeof(*lookups.indexes))) + if (!dwrite_array_reserve((void **)&lookups->indexes, &lookups->capacity, lookups->count + lookup_count, + sizeof(*lookups->indexes))) { - heap_free(lookups.indexes); return; } for (l = 0; l < lookup_count; ++l) { - WORD lookup_index = table_read_be_word(&cache->gpos.table, cache->gpos.feature_list + - feature_offset + FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); + UINT16 lookup_index = table_read_be_word(&table->table, table->feature_list + feature_offset + + FIELD_OFFSET(struct ot_feature, lookuplist_index[l])); if (lookup_index >= total_lookup_count) continue; - lookups.indexes[lookups.count++] = lookup_index; + lookups->indexes[lookups->count++] = lookup_index; } } } } /* Sort lookups. */ - qsort(lookups.indexes, lookups.count, sizeof(*lookups.indexes), lookups_sorting_compare); + qsort(lookups->indexes, lookups->count, sizeof(*lookups->indexes), lookups_sorting_compare); +} - for (l = 0; l < lookups.count; ++l) +void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, + unsigned int language_index, const struct shaping_features *features) +{ + struct lookups lookups = { 0 }; + unsigned int i; + + opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); + + for (i = 0; i < lookups.count; ++i) { /* Skip duplicates. */ - if (l && lookups.indexes[l] == lookups.indexes[l - 1]) + if (i && lookups.indexes[i] == lookups.indexes[i - 1]) continue; - opentype_layout_apply_gpos_lookup(context, lookups.indexes[l]); + opentype_layout_apply_gpos_lookup(context, lookups.indexes[i]); } heap_free(lookups.indexes); } +static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, unsigned int first_glyph, + unsigned int glyph_count, int lookup_index) +{ +} + HRESULT opentype_layout_apply_gsub_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) { + struct lookups lookups = { 0 }; + unsigned int i; + + opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gsub, &lookups); + + for (i = 0; i < lookups.count; ++i) + { + /* Skip duplicates. */ + if (i && lookups.indexes[i] == lookups.indexes[i - 1]) + continue; + + opentype_layout_apply_gsub_lookup(context, 0, context->glyph_count, lookups.indexes[i]); + } + + heap_free(lookups.indexes); + return S_OK; } diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index dd7c45e3e7..533efe6cc7 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -189,7 +189,7 @@ const struct scriptshaping_ops default_shaping_ops = default_set_text_glyphs_props }; -static DWORD shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, +static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, unsigned int *script_index) { static const DWORD fallback_scripts[] = @@ -199,10 +199,10 @@ static DWORD shape_select_script(const struct scriptshaping_cache *cache, DWORD DWRITE_MAKE_OPENTYPE_TAG('l','a','t','n'), 0, }; - DWORD script; + unsigned int script; /* Passed scripts in ascending priority. */ - while (*scripts) + while (scripts && *scripts) { if ((script = opentype_layout_find_script(cache, kind, *scripts, script_index))) return script;

1 0

Nikolay Sivov : dwrite: Add helper functions to collect default GSUB features.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: bd6a500ab095944a234cc93398d005569c5035a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd6a500ab095944a234cc933… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:32 2020 +0300 dwrite: Add helper functions to collect default GSUB features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 19 +++++++---- dlls/dwrite/dwrite_private.h | 17 ++++++++-- dlls/dwrite/opentype.c | 10 ++++-- dlls/dwrite/shape.c | 80 ++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 108 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd6a500ab095944a234c…

1 0

Nikolay Sivov : dwrite: Initialize GSUB offsets in shaping cache.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 7208bc40dcbea8638c4679b451f88ce06f8ab981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7208bc40dcbea8638c4679b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:31 2020 +0300 dwrite: Initialize GSUB offsets in shaping cache. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 10 ++++++++++ dlls/dwrite/shape.c | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d89dacb3a4..4516189445 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -448,6 +448,7 @@ struct scriptshaping_cache void *context; UINT16 upem; + struct ot_gsubgpos_table gsub; struct ot_gsubgpos_table gpos; struct diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 66c3398316..a2af5ce954 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2942,6 +2942,16 @@ DWRITE_CONTAINER_TYPE opentype_analyze_container_type(void const *data, UINT32 d void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) { + cache->font->grab_font_table(cache->context, MS_GSUB_TAG, &cache->gsub.table.data, &cache->gsub.table.size, + &cache->gsub.table.context); + + if (cache->gsub.table.data) + { + cache->gsub.script_list = table_read_be_word(&cache->gsub.table, FIELD_OFFSET(struct gpos_gsub_header, script_list)); + cache->gsub.feature_list = table_read_be_word(&cache->gsub.table, FIELD_OFFSET(struct gpos_gsub_header, feature_list)); + cache->gsub.lookup_list = table_read_be_word(&cache->gsub.table, FIELD_OFFSET(struct gpos_gsub_header, lookup_list)); + } + cache->font->grab_font_table(cache->context, MS_GPOS_TAG, &cache->gpos.table.data, &cache->gpos.table.size, &cache->gpos.table.context); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index d7d1261f35..bd53f03513 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -52,6 +52,7 @@ void release_scriptshaping_cache(struct scriptshaping_cache *cache) return; cache->font->release_font_table(cache->context, cache->gdef.table.context); + cache->font->release_font_table(cache->context, cache->gsub.table.context); cache->font->release_font_table(cache->context, cache->gpos.table.context); heap_free(cache); }

1 0

Nikolay Sivov : dwrite: Add separate structure for top level gsub/gpos offsets.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: b8f1aed6d91d174d29094a7e184d57e713041982 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f1aed6d91d174d29094a7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 11:29:30 2020 +0300 dwrite: Add separate structure for top level gsub/gpos offsets. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 16 +++++++++------- dlls/dwrite/opentype.c | 27 ++++++++++++++------------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5755696875..d89dacb3a4 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -434,19 +434,21 @@ enum SCRIPT_JUSTIFY SCRIPT_JUSTIFY_ARABIC_SEEN_M }; +struct ot_gsubgpos_table +{ + struct dwrite_fonttable table; + unsigned int script_list; + unsigned int feature_list; + unsigned int lookup_list; +}; + struct scriptshaping_cache { const struct shaping_font_ops *font; void *context; UINT16 upem; - struct - { - struct dwrite_fonttable table; - unsigned int script_list; - unsigned int feature_list; - unsigned int lookup_list; - } gpos; + struct ot_gsubgpos_table gpos; struct { diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0307cd5981..66c3398316 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2962,10 +2962,11 @@ void opentype_layout_scriptshaping_cache_init(struct scriptshaping_cache *cache) cache->gdef.classdef = table_read_be_word(&cache->gdef.table, FIELD_OFFSET(struct gdef_header, classdef)); } -DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD kind, DWORD script, +unsigned int opentype_layout_find_script(const struct scriptshaping_cache *cache, unsigned int kind, DWORD script, unsigned int *script_index) { - WORD script_count; + const struct ot_gsubgpos_table *table = &cache->gpos; + UINT16 script_count; unsigned int i; *script_index = ~0u; @@ -2973,14 +2974,14 @@ DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD if (kind != MS_GPOS_TAG) return 0; - script_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list); + script_count = table_read_be_word(&table->table, table->script_list); if (!script_count) return 0; for (i = 0; i < script_count; i++) { - DWORD tag = table_read_dword(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + i * sizeof(struct ot_script_record)); + unsigned int tag = table_read_dword(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + i * sizeof(struct ot_script_record)); if (!tag) continue; @@ -2994,10 +2995,11 @@ DWORD opentype_layout_find_script(const struct scriptshaping_cache *cache, DWORD return 0; } -DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWORD kind, DWORD language, +unsigned int opentype_layout_find_language(const struct scriptshaping_cache *cache, unsigned int kind, DWORD language, unsigned int script_index, unsigned int *language_index) { - WORD table_offset, lang_count; + const struct ot_gsubgpos_table *table = &cache->gpos; + UINT16 table_offset, lang_count; unsigned int i; *language_index = ~0u; @@ -3005,17 +3007,16 @@ DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWO if (kind != MS_GPOS_TAG) return 0; - table_offset = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + - FIELD_OFFSET(struct ot_script_list, scripts) + script_index * sizeof(struct ot_script_record) + - FIELD_OFFSET(struct ot_script_record, script)); + table_offset = table_read_be_word(&table->table, table->script_list + FIELD_OFFSET(struct ot_script_list, scripts) + + script_index * sizeof(struct ot_script_record) + FIELD_OFFSET(struct ot_script_record, script)); if (!table_offset) return 0; - lang_count = table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset + + lang_count = table_read_be_word(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys_count)); for (i = 0; i < lang_count; i++) { - DWORD tag = table_read_dword(&cache->gpos.table, cache->gpos.script_list + table_offset + + unsigned int tag = table_read_dword(&table->table, table->script_list + table_offset + FIELD_OFFSET(struct ot_script, langsys) + i * sizeof(struct ot_langsys_record)); if (tag == language) @@ -3026,7 +3027,7 @@ DWORD opentype_layout_find_language(const struct scriptshaping_cache *cache, DWO } /* Try 'defaultLangSys' if it's set. */ - if (table_read_be_word(&cache->gpos.table, cache->gpos.script_list + table_offset)) + if (table_read_be_word(&table->table, table->script_list + table_offset)) return ~0u; return 0;

1 0

Jacek Caban : riched20: Include wine/asm.h in editstr.h.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 9763f5189f1312c82c98b3ce25cb8100ae4cb420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9763f5189f1312c82c98b3ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 3 14:09:42 2020 +0200 riched20: Include wine/asm.h in editstr.h. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49068 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 1 + dlls/riched20/txthost.c | 1 - dlls/riched20/txtsrv.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index a65169056e..2c5737f3e9 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -43,6 +43,7 @@ #include <textserv.h> #include "usp10.h" +#include "wine/asm.h" #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 5992fc0b06..99f446e581 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -25,7 +25,6 @@ #include "richole.h" #include "imm.h" #include "textserv.h" -#include "wine/asm.h" #include "wine/debug.h" #include "editstr.h" diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 12761621c4..622d851928 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -27,7 +27,6 @@ #include "tom.h" #include "imm.h" #include "textserv.h" -#include "wine/asm.h" #include "wine/debug.h" #include "editstr.h"

1 0

Zebediah Figura : ntoskrnl.exe: Implement IoIs32bitProcess().
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 0e09d5ea74d1c4a2b780c27a66b227e7a406d9d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e09d5ea74d1c4a2b780c27a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 3 11:22:02 2020 -0500 ntoskrnl.exe: Implement IoIs32bitProcess(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49088 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + include/ddk/wdm.h | 3 +++ 4 files changed, 17 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d1bdc33653..3013fe7eb9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2196,6 +2196,7 @@ static void *create_process_object( HANDLE handle ) process->header.Type = 3; process->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ NtQueryInformationProcess( handle, ProcessBasicInformation, &process->info, sizeof(process->info), NULL ); + IsWow64Process( handle, &process->wow64 ); return process; } @@ -3935,6 +3936,17 @@ PEPROCESS WINAPI IoGetRequestorProcess(IRP *irp) return irp->Tail.Overlay.Thread->kthread.process; } +#ifdef _WIN64 +/*********************************************************************** + * IoIs32bitProcess (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI IoIs32bitProcess(IRP *irp) +{ + TRACE("irp %p.\n", irp); + return irp->Tail.Overlay.Thread->kthread.process->wow64; +} +#endif + /*********************************************************************** * RtlIsNtDdiVersionAvailable (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 14d95a47f8..8e3b127b16 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -416,6 +416,7 @@ @ stdcall IoInitializeTimer(ptr ptr ptr) @ stdcall IoInvalidateDeviceRelations(ptr long) @ stub IoInvalidateDeviceState +@ stdcall -arch=win64 IoIs32bitProcess(ptr) @ stub IoIsFileOriginRemote @ stub IoIsOperationSynchronous @ stub IoIsSystemThread diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 256e945e6f..23f03c336d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -40,6 +40,7 @@ struct _EPROCESS { DISPATCHER_HEADER header; PROCESS_BASIC_INFORMATION info; + BOOL wow64; }; struct _KTHREAD diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 60396779fc..db8073ebe3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1608,6 +1608,9 @@ void WINAPI IoGetStackLimits(ULONG_PTR*,ULONG_PTR*); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); +#ifdef _WIN64 +BOOLEAN WINAPI IoIs32bitProcess(IRP*); +#endif NTSTATUS WINAPI IoOpenDeviceRegistryKey(DEVICE_OBJECT*,ULONG,ACCESS_MASK,HANDLE*); void WINAPI IoQueueWorkItem(PIO_WORKITEM,PIO_WORKITEM_ROUTINE,WORK_QUEUE_TYPE,void*); NTSTATUS WINAPI IoRegisterDeviceInterface(PDEVICE_OBJECT,const GUID*,PUNICODE_STRING,PUNICODE_STRING);

1 0

Zebediah Figura : ntdll: Export RtlCopyMemoryNonTemporal.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 74f820fccca59b553b802c67731763fa7cb56e08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74f820fccca59b553b802c67… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 2 20:55:55 2020 -0500 ntdll: Export RtlCopyMemoryNonTemporal. Needed by Blindwrite 7's kernel driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..cb6a8ec8c4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -526,6 +526,7 @@ @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) +@ stdcall -arch=x86_64 RtlCopyMemoryNonTemporal(ptr ptr long) RtlCopyMemory # @ stub RtlCopyMemoryStreamTo # @ stub RtlCopyOutOfProcessMemoryStreamTo # @ stub RtlCopyRangeList diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7e52751608..14d95a47f8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1002,6 +1002,7 @@ @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) +@ stdcall -arch=x86_64 RtlCopyMemoryNonTemporal(ptr ptr long) RtlCopyMemory @ stub RtlCopyRangeList @ stdcall RtlCopySid(long ptr ptr) @ stdcall RtlCopyString(ptr ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index b180d11556..60396779fc 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1696,6 +1696,11 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); +#ifdef __x86_64__ +void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); +#else +#define RtlCopyMemoryNonTemporal RtlCopyMemory +#endif BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG); NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING);

1 0

Zebediah Figura : ntoskrnl.exe: Protect relocated pages one at a time.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 22dfb0df10b44d1c21b3d04b59312670c2318431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22dfb0df10b44d1c21b3d04b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 2 20:55:54 2020 -0500 ntoskrnl.exe: Protect relocated pages one at a time. Blindwrite 7's ezplay.sys has sections which are consecutive in memory but not page aligned. Thus changing the protection to PROT_READWRITE one section at a time has the effect that old_prot for all sections but the first is set to PROT_READWRITE (actually, PROT_WRITECOPY), causing us to restore the wrong protection and the driver to crash in its entry point. To fix this, protect and unprotect one page at a time while processing it, i.e. essentially revert 6c0a8c359. To avoid reintroducing bug 28254, protect two pages at a time instead of just one. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 01f25b5e2a..d1bdc33653 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3378,16 +3378,13 @@ static inline void *get_rva( HMODULE module, DWORD va ) return (void *)((char *)module + va); } -/* Copied from ntdll with checks for page alignment and characteristics removed */ -static NTSTATUS perform_relocations( void *module, SIZE_T len ) +static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) { IMAGE_NT_HEADERS *nt; char *base; IMAGE_BASE_RELOCATION *rel, *end; const IMAGE_DATA_DIRECTORY *relocs; - const IMAGE_SECTION_HEADER *sec; INT_PTR delta; - ULONG protect_old[96], i; nt = RtlImageNtHeader( module ); base = (char *)nt->OptionalHeader.ImageBase; @@ -3406,19 +3403,6 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) if (!relocs->Size) return STATUS_SUCCESS; if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; - if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) - return STATUS_INVALID_IMAGE_FORMAT; - - sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + - nt->FileHeader.SizeOfOptionalHeader); - for (i = 0; i < nt->FileHeader.NumberOfSections; i++) - { - void *addr = get_rva( module, sec[i].VirtualAddress ); - SIZE_T size = sec[i].SizeOfRawData; - NtProtectVirtualMemory( NtCurrentProcess(), &addr, - &size, PAGE_READWRITE, &protect_old[i] ); - } - TRACE( "relocating from %p-%p to %p-%p\n", base, base + len, module, (char *)module + len ); @@ -3428,25 +3412,24 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) while (rel < end - 1 && rel->SizeOfBlock) { + void *page = get_rva( module, rel->VirtualAddress ); + DWORD old_prot; + if (rel->VirtualAddress >= len) { WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); return STATUS_ACCESS_VIOLATION; } - rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), - (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + + /* Relocation entries may hang over the end of the page, so we need to + * protect two pages. */ + VirtualProtect( page, page_size * 2, PAGE_READWRITE, &old_prot ); + rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); + VirtualProtect( page, page_size * 2, old_prot, &old_prot ); if (!rel) return STATUS_INVALID_IMAGE_FORMAT; } - for (i = 0; i < nt->FileHeader.NumberOfSections; i++) - { - void *addr = get_rva( module, sec[i].VirtualAddress ); - SIZE_T size = sec[i].SizeOfRawData; - NtProtectVirtualMemory( NtCurrentProcess(), &addr, - &size, protect_old[i], &protect_old[i] ); - } - return STATUS_SUCCESS; } @@ -3475,7 +3458,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - status = perform_relocations(module, nt->OptionalHeader.SizeOfImage); + status = perform_relocations( module, nt->OptionalHeader.SizeOfImage, info.PageSize ); if (status != STATUS_SUCCESS) goto error;

1 0

Alexandre Julliard : libport: Get rid of interlocked functions.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 7eef40d444b3325f9580ff557afb6bc19c811f5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eef40d444b3325f9580ff55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:19 2020 +0200 libport: Get rid of interlocked functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 132 --------------- libs/port/Makefile.in | 1 - libs/port/interlocked.c | 437 ------------------------------------------------ libs/wine/debug.c | 2 +- 4 files changed, 1 insertion(+), 571 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7eef40d444b3325f9580…

1 0

Alexandre Julliard : server: Avoid using interlocked functions.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 2633a5c1ae542f08f127ba737fa59fb03ed6180b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2633a5c1ae542f08f127ba73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:14 2020 +0200 server: Avoid using interlocked functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/change.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/change.c b/server/change.c index 6091d21f7f..a8f3329c72 100644 --- a/server/change.c +++ b/server/change.c @@ -88,7 +88,7 @@ struct dir uid_t uid; /* file stat.st_uid */ struct list entry; /* entry in global change notifications list */ unsigned int filter; /* notification filter */ - int notified; /* SIGIO counter */ + volatile int notified; /* SIGIO counter */ int want_data; /* return change data */ int subtree; /* do we want to watch subdirectories? */ struct list change_records; /* data for the change */ @@ -307,7 +307,7 @@ void do_change_notify( int unix_fd ) LIST_FOR_EACH_ENTRY( dir, &change_list, struct dir, entry ) { if (get_unix_fd( dir->fd ) != unix_fd) continue; - interlocked_xchg_add( &dir->notified, 1 ); + dir->notified = 1; break; } } @@ -319,8 +319,9 @@ void sigio_callback(void) LIST_FOR_EACH_ENTRY( dir, &change_list, struct dir, entry ) { - if (interlocked_xchg( &dir->notified, 0 )) - fd_async_wake_up( dir->fd, ASYNC_TYPE_WAIT, STATUS_ALERTED ); + if (!dir->notified) continue; + dir->notified = 0; + fd_async_wake_up( dir->fd, ASYNC_TYPE_WAIT, STATUS_ALERTED ); } }

1 0

Alexandre Julliard : user32: Use the standard Interlocked* functions.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 5d5b6a1f35c6fee51dcef60818028061f03ce0ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5b6a1f35c6fee51dcef608… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:10 2020 +0200 user32: Use the standard Interlocked* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 2 +- dlls/user32/input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index d3e78bb473..b6a3b3661f 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -449,7 +449,7 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } if (info->id == WH_KEYBOARD_LL || info->id == WH_MOUSE_LL) - interlocked_xchg_add( &global_key_state_counter, 1 ); /* force refreshing the key state cache */ + InterlockedIncrement( &global_key_state_counter ); /* force refreshing the key state cache */ return ret; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 0325e2ce3d..b7cdbd84ef 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -433,7 +433,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) * (like Adobe Photoshop CS5) expect that changes to the async key state * are also immediately available in other threads. */ if (prev_key_state != key_state_info->state[key]) - counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; + counter = InterlockedIncrement( &global_key_state_counter ); key_state_info->time = GetTickCount(); key_state_info->counter = counter;

1 0

Alexandre Julliard : ntdll: Use the standard Interlocked* functions.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 39e4b788d6ca7d1e1ad045059ec7d088fde8a0db URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e4b788d6ca7d1e1ad04505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:10:04 2020 +0200 ntdll: Use the standard Interlocked* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 20 +++++++++---------- dlls/ntdll/critsection.c | 28 +++++++++------------------ dlls/ntdll/file.c | 4 ++-- dlls/ntdll/large_int.c | 25 +++++++++++++++++++++++- dlls/ntdll/loader.c | 6 +++--- dlls/ntdll/locale.c | 2 +- dlls/ntdll/ntdll_misc.h | 4 ++++ dlls/ntdll/rtl.c | 45 ++++++++++++++++++++++++++++++------------- dlls/ntdll/server.c | 6 +++--- dlls/ntdll/signal_arm64.c | 4 ++-- dlls/ntdll/sync.c | 48 +++++++++++++++++++++++----------------------- dlls/ntdll/thread.c | 10 +++++----- dlls/ntdll/threadpool.c | 49 ++++++++++++++++++----------------------------- 13 files changed, 138 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39e4b788d6ca7d1e1ad0…

1 0

Alexandre Julliard : include: Use the gcc interlocked functions also on i386 if possible.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: adb45d2294c0b165970a9b7d03713c8bc768ba0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb45d2294c0b165970a9b7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:09:58 2020 +0200 include: Use the gcc interlocked functions also on i386 if possible. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 85 ++++++++++++++++++++++++------------------------------ include/winternl.h | 1 + 2 files changed, 38 insertions(+), 48 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 1f36782d20..f92d864c78 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2975,71 +2975,63 @@ static FORCEINLINE void *WINAPI InterlockedExchangePointer( void *volatile *dest #endif -#elif defined(__i386__) -# if defined(__GNUC__) && !defined(_NTSYSTEM_) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) +#elif defined(__GNUC__) static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_val_compare_and_swap( dest, compare, xchg ); +#else LONG ret; __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" ); return ret; +#endif } static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { LONG ret; +#if defined(__i386__) || defined(__x86_64__) __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); +#else + do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); +#endif return ret; } static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_fetch_and_add( dest, incr ); +#else LONG ret; __asm__ __volatile__( "lock; xaddl %0,(%1)" : "=r" (ret) : "r" (dest), "0" (incr) : "memory" ); return ret; +#endif } static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_add_and_fetch( dest, 1 ); +#else return InterlockedExchangeAdd( dest, 1 ) + 1; +#endif } static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 + return __sync_add_and_fetch( dest, -1 ); +#else return InterlockedExchangeAdd( dest, -1 ) - 1; +#endif } -# else /* __GNUC__ */ - -WINBASEAPI LONG WINAPI InterlockedCompareExchange(LONG volatile*,LONG,LONG); -WINBASEAPI LONG WINAPI InterlockedDecrement(LONG volatile*); -WINBASEAPI LONG WINAPI InterlockedExchange(LONG volatile*,LONG); -WINBASEAPI LONG WINAPI InterlockedExchangeAdd(LONG volatile*,LONG); -WINBASEAPI LONG WINAPI InterlockedIncrement(LONG volatile*); - -# endif /* __GNUC__ */ - -static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) -{ - return (PVOID)InterlockedCompareExchange( (LONG volatile*)dest, (LONG)xchg, (LONG)compare ); -} - -static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) -{ - return (PVOID)InterlockedExchange( (LONG volatile*)dest, (LONG)val ); -} - -WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGLONG,LONGLONG); - -#elif defined(__GNUC__) - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return __sync_val_compare_and_swap( dest, compare, xchg ); -} +#ifdef _WIN64 static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) { @@ -3051,17 +3043,6 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return __sync_val_compare_and_swap( dest, compare, xchg ); } -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - LONG ret; -#ifdef __x86_64__ - __asm__ __volatile__( "lock; xchgl %0,(%1)" : "=r" (ret) :"r" (dest), "0" (val) : "memory" ); -#else - do ret = *dest; while (!__sync_bool_compare_and_swap( dest, ret, val )); -#endif - return ret; -} - static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) { PVOID ret; @@ -3073,22 +3054,30 @@ static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest return ret; } -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) +#else + +static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) { - return __sync_fetch_and_add( dest, incr ); + return (PVOID)InterlockedCompareExchange( (LONG volatile*)dest, (LONG)xchg, (LONG)compare ); } -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) +static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) { - return __sync_add_and_fetch( dest, 1 ); + return (PVOID)InterlockedExchange( (LONG volatile*)dest, (LONG)val ); } -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) +#ifdef __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 +static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) { - return __sync_add_and_fetch( dest, -1 ); + return __sync_val_compare_and_swap( dest, compare, xchg ); } +#else +WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGLONG,LONGLONG); +#endif + +#endif -#endif /* __i386__ */ +#endif /* __GNUC__ */ #ifdef __WINESRC__ diff --git a/include/winternl.h b/include/winternl.h index 87d0bde295..fec0741204 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3078,6 +3078,7 @@ NTSYSAPI UINT WINAPI RtlEnlargedUnsignedDivide(ULONGLONG,UINT,UINT *); NTSYSAPI LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); NTSYSAPI LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT); NTSYSAPI LONGLONG WINAPI RtlExtendedLargeIntegerDivide(LONGLONG,INT,INT *); +NTSYSAPI LONGLONG WINAPI RtlInterlockedCompareExchange64(LONGLONG*,LONGLONG,LONGLONG); NTSYSAPI LONGLONG WINAPI RtlLargeIntegerAdd(LONGLONG,LONGLONG); NTSYSAPI LONGLONG WINAPI RtlLargeIntegerArithmeticShift(LONGLONG,INT); NTSYSAPI ULONGLONG WINAPI RtlLargeIntegerDivide( ULONGLONG,ULONGLONG,ULONGLONG *);

1 0

Alexandre Julliard : gdi32: Return 0 char width for missing glyphs.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: aa90ed6df69791c03219cd1cdcf82da9ec5af4c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa90ed6df69791c03219cd1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 2 15:07:28 2020 +0200 gdi32: Return 0 char width for missing glyphs. Fixes a test failure with Emoji font: font.c:7147: Test failed: Noto Color Emoji: mismatched widths 2145357798/1.33654768e+008 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 31ad56706a..f68198df8b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8414,8 +8414,10 @@ static BOOL CDECL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastC GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); for(c = firstChar; c <= lastChar; c++) { - get_glyph_outline( physdev->font, c, GGO_METRICS, &gm, &abc, 0, NULL, &identity ); - buffer[c - firstChar] = abc.abcA + abc.abcB + abc.abcC; + if (get_glyph_outline( physdev->font, c, GGO_METRICS, &gm, &abc, 0, NULL, &identity ) == GDI_ERROR) + buffer[c - firstChar] = 0; + else + buffer[c - firstChar] = abc.abcA + abc.abcB + abc.abcC; } LeaveCriticalSection( &freetype_cs ); return TRUE;

1 0

Zebediah Figura : quartz/vmr9: Remove the "force" parameter of VMR9_maybe_init().
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 7da087b76a54221d62c474c0ba8211ba46ba07fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da087b76a54221d62c474c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 22:52:03 2020 -0500 quartz/vmr9: Remove the "force" parameter of VMR9_maybe_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 113cb7cea4..93fc3417e7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -387,7 +387,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo * return hr; } -static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_MEDIA_TYPE *mt) +static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE *mt) { VMR9AllocationInfo info = {}; HRESULT hr = E_FAIL; @@ -418,11 +418,9 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_M TRACE("Initializing in mode %u, our window %p, clipping window %p.\n", filter->mode, filter->baseControlWindow.hwnd, filter->hWndClippingWindow); - if (filter->num_surfaces) - return S_OK; if (filter->mode == VMR9Mode_Windowless && !filter->hWndClippingWindow) - return (force ? VFW_E_RUNTIME_ERROR : S_OK); + return S_OK; info.dwWidth = filter->source_rect.right; info.dwHeight = filter->source_rect.bottom; @@ -542,7 +540,7 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE if (filter->mode || SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, VMR9Mode_Windowed))) - hr = VMR9_maybe_init(filter, FALSE, mt); + hr = allocate_surfaces(filter, mt); return hr; }

1 0

Zebediah Figura : quartz/vmr9: Do not call VMR9_maybe_init() in vmr_start_stream().
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 1cb4b642f39b246a00b7affcf1f44caa6881ce7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cb4b642f39b246a00b7affc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 22:52:02 2020 -0500 quartz/vmr9: Do not call VMR9_maybe_init() in vmr_start_stream(). We have already connected if we got here, and we can only have failed to allocate surfaces if we had no clipping window, which cannot have changed in the meantime. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 52cc80eca4..113cb7cea4 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -484,8 +484,6 @@ static void vmr_start_stream(struct strmbase_renderer *iface) TRACE("(%p)\n", This); - if (This->renderer.sink.pin.peer) - VMR9_maybe_init(This, TRUE, &This->renderer.sink.pin.mt); IVMRImagePresenter9_StartPresenting(This->presenter, This->cookie); SetWindowPos(This->baseControlWindow.hwnd, NULL, This->source_rect.left,

1 0

Zebediah Figura : quartz/vmr9: Forbid setting the video clipping window while connected.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: a54597fd7812c3602f1c8084cc2d38675249fb6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a54597fd7812c3602f1c8084… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 22:52:01 2020 -0500 quartz/vmr9: Forbid setting the video clipping window while connected. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 0bd37fe7f1..54e9b53afb 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3234,7 +3234,7 @@ static void test_clipping_window(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 06e545eedf..52cc80eca4 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1846,23 +1846,30 @@ static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon return E_NOTIMPL; } -static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl9 *iface, HWND hwnd) +static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl9 *iface, HWND window) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl9(iface); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); - TRACE("(%p/%p)->(%p)\n", iface, This, hwnd); + TRACE("filter %p, window %p.\n", filter, window); - if (!IsWindow(hwnd)) + if (!IsWindow(window)) { - WARN("Invalid window %p, returning E_INVALIDARG.\n", hwnd); + WARN("Invalid window %p, returning E_INVALIDARG.\n", window); return E_INVALIDARG; } - EnterCriticalSection(&This->renderer.filter.csFilter); - This->hWndClippingWindow = hwnd; - if (This->renderer.sink.pin.peer) - VMR9_maybe_init(This, FALSE, &This->renderer.sink.pin.mt); - LeaveCriticalSection(&This->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.csFilter); + + if (filter->renderer.sink.pin.peer) + { + LeaveCriticalSection(&filter->renderer.filter.csFilter); + WARN("Attempt to set the clipping window while connected; returning VFW_E_WRONG_STATE.\n"); + return VFW_E_WRONG_STATE; + } + + filter->hWndClippingWindow = window; + + LeaveCriticalSection(&filter->renderer.filter.csFilter); return S_OK; }

1 0

Zebediah Figura : quartz/vmr9: Validate the window in IVMRWindowlessControl9::SetVideoClippingWindow().
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: f1de733a03affcfda9878fe9a3d7c0942160bd5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1de733a03affcfda9878fe9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 22:52:00 2020 -0500 quartz/vmr9: Validate the window in IVMRWindowlessControl9::SetVideoClippingWindow(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/vmr9.c | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index a098416bb2..0bd37fe7f1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3226,9 +3226,9 @@ static void test_clipping_window(void) ok(!!window, "Failed to create a window.\n"); hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, NULL); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, (HWND)0xdeadbeef); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f611a3a7cf..06e545eedf 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1852,12 +1852,16 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowles TRACE("(%p/%p)->(%p)\n", iface, This, hwnd); + if (!IsWindow(hwnd)) + { + WARN("Invalid window %p, returning E_INVALIDARG.\n", hwnd); + return E_INVALIDARG; + } + EnterCriticalSection(&This->renderer.filter.csFilter); This->hWndClippingWindow = hwnd; if (This->renderer.sink.pin.peer) VMR9_maybe_init(This, FALSE, &This->renderer.sink.pin.mt); - if (!hwnd) - IVMRSurfaceAllocatorEx9_TerminateDevice(This->allocator, This->cookie); LeaveCriticalSection(&This->renderer.filter.csFilter); return S_OK; }

1 0

Zebediah Figura : quartz/tests: Add some tests for IVMRWindowlessControl9::SetVideoClippingWindow().
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: 218d2a5119002d9a89513830826c097785c64614 URL: https://source.winehq.org/git/wine.git/?a=commit;h=218d2a5119002d9a89513830… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 22:51:59 2020 -0500 quartz/tests: Add some tests for IVMRWindowlessControl9::SetVideoClippingWindow(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index cb04d0b4aa..a098416bb2 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -3191,6 +3191,68 @@ static void test_mixing_mode(void) DestroyWindow(window); } +static void test_clipping_window(void) +{ + VIDEOINFOHEADER vih = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 32, + .bmiHeader.biHeight = 16, + .bmiHeader.biBitCount = 32, + }; + AM_MEDIA_TYPE mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_RGB32, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(vih), + .pbFormat = (BYTE *)&vih, + }; + IBaseFilter *filter = create_vmr9(VMR9Mode_Windowless); + IVMRWindowlessControl9 *windowless_control; + IFilterGraph2 *graph = create_graph(); + struct testfilter source; + HWND window; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_QueryInterface(filter, &IID_IVMRWindowlessControl9, (void **)&windowless_control); + IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + testfilter_init(&source); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"vmr9"); + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, NULL); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, (HWND)0xdeadbeef); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IVMRWindowlessControl9_Release(windowless_control); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + DestroyWindow(window); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -3221,6 +3283,7 @@ START_TEST(vmr9) test_allocate_surface_helper(); test_renderless_formats(); test_mixing_mode(); + test_clipping_window(); CoUninitialize(); }

1 0

Zebediah Figura : advapi32: Move string SID/SD conversion functions to sechost.
by Alexandre Julliard 04 May '20

04 May '20

Module: wine Branch: master Commit: a67af66aead0cd19e80186ab635c2b698c58aff2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67af66aead0cd19e80186ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 16:51:40 2020 -0500 advapi32: Move string SID/SD conversion functions to sechost. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 8 +- dlls/advapi32/security.c | 1314 ------------------------------------------- dlls/sechost/Makefile.in | 1 + dlls/sechost/sechost.spec | 8 +- dlls/sechost/security.c | 1247 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1256 insertions(+), 1322 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a67af66aead0cd19e801…

1 0

Alistair Leslie-Hughes : dmime: Parse lyric track data.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: d1f858e03da732c621504f90e349d5170ca3336e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1f858e03da732c621504f90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 30 16:41:16 2020 +1000 dmime: Parse lyric track data. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/lyricstrack.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 49f44f52a3..b45041ca81 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -37,6 +37,11 @@ static inline IDirectMusicLyricsTrack *impl_from_IDirectMusicTrack8(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, IDirectMusicTrack8_iface); } +static inline IDirectMusicLyricsTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI lyrics_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { @@ -236,10 +241,94 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { lyrics_track_Join }; +static HRESULT parse_lyrics_track_events(IDirectMusicLyricsTrack *This, IStream *stream, + struct chunk_entry *lyric) +{ + struct chunk_entry chunk = {.parent = lyric}; + HRESULT hr; + DMUS_IO_LYRICSTRACK_EVENTHEADER header; + WCHAR name[256]; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(lyric)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACKEVENT_LIST) { + struct chunk_entry child = {.parent = &chunk}; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_LYRICSTRACKEVENTHEADER_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_LYRICSTRACK_EVENTHEADER\n"); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - dwTimingFlags 0x%08x\n", header.dwTimingFlags); + TRACE(" - lTimeLogical %d\n", header.lTimeLogical); + TRACE(" - lTimePhysical %d\n", header.lTimePhysical); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_LYRICSTRACKEVENTTEXT_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &name, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_FOURCC_LYRICSTRACKEVENTTEXT_CHUNK\n"); + TRACE(" - name %s\n", debugstr_w(name)); + } + } + + return SUCCEEDED(hr) ? S_OK : hr; +} + +static HRESULT parse_lyricstrack_list(IDirectMusicLyricsTrack *This, IStream *stream, struct chunk_entry *lyric) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = lyric}; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(lyric)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACKEVENTS_LIST) + hr = parse_lyrics_track_events(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI lyrics_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicLyricsTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACK_LIST) + hr = parse_lyricstrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = {

1 0

Gijs Vermeulen : kernel32: Remove unused functions is_executable() and get_table_entry().
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: e7abfe953394fdb36ce95e588b6ce1988d833736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7abfe953394fdb36ce95e58… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 1 19:36:25 2020 +0200 kernel32: Remove unused functions is_executable() and get_table_entry(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 5 ----- dlls/kernel32/path.c | 11 ----------- 2 files changed, 16 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ac04e85946..52c24b275d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -62,11 +62,6 @@ extern BOOL WINAPI Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); -static inline unsigned short get_table_entry( const unsigned short *table, WCHAR ch ) -{ - return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; -} - /*********************************************************************** * get_lcid_codepage * diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 93759592c4..54dbf5a4f6 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -43,17 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); #define MAX_PATHNAME_LEN 1024 -/* check if a file name is for an executable file (.exe or .com) */ -static inline BOOL is_executable( const WCHAR *name ) -{ - static const WCHAR exeW[] = {'.','e','x','e',0}; - static const WCHAR comW[] = {'.','c','o','m',0}; - int len = strlenW(name); - - if (len < 4) return FALSE; - return (!strcmpiW( name + len - 4, exeW ) || !strcmpiW( name + len - 4, comW )); -} - /*********************************************************************** * copy_filename_WtoA *

1 0

Gijs Vermeulen : ntdll: Remove unused function fast_wait_cv().
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: d8ec1fb894bd8838ad93f244fadb2ee67a61b2e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ec1fb894bd8838ad93f244… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 1 19:36:24 2020 +0200 ntdll: Remove unused function fast_wait_cv(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index fbfb8f893e..2aed1c78e7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2306,11 +2306,6 @@ static NTSTATUS fast_sleep_cs_cv( RTL_CONDITION_VARIABLE *variable, return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) -{ - return STATUS_NOT_IMPLEMENTED; -} - static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) { return STATUS_NOT_IMPLEMENTED;

1 0

Zebediah Figura : qcap/filewriter: Propagate file I/O failure in file_writer_sink_receive().
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: fc45c96383698aeec790848716a4f746eb4144cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc45c96383698aeec7908487… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 12:45:04 2020 -0500 qcap/filewriter: Propagate file I/O failure in file_writer_sink_receive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 5e63facf7b..af148d4aa1 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -85,7 +85,11 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed offset.QuadPart = start; if (!SetFilePointerEx(filter->file, offset, NULL, FILE_BEGIN) || !WriteFile(filter->file, data, stop - start, &size, NULL)) + { ERR("Failed to write file, error %u.\n", GetLastError()); + return HRESULT_FROM_WIN32(hr); + } + if (size != stop - start) ERR("Short write, %u/%u.\n", size, (DWORD)(stop - start));

1 0

Gijs Vermeulen : wineqtdecoder: Do not use wide string literals to fix warning.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 49f85ecbc4e6faafc1d63db0927aa4ef6d0f1a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49f85ecbc4e6faafc1d63db0… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 1 19:36:22 2020 +0200 wineqtdecoder: Do not use wide string literals to fix warning. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtvdecoder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 031b08e1de..a86cd432c2 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -602,6 +602,8 @@ static const struct strmbase_filter_ops filter_ops = HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) { + static const WCHAR inW[] = { 'I','n',0 }; + static const WCHAR outW[] = { 'O','u','t',0 }; QTVDecoderImpl *object; HRESULT hr; ISeekingPassThru *passthrough; @@ -614,9 +616,9 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) InitializeCriticalSection(&object->stream_cs); object->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTVDecoderImpl.stream_cs"); - strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, inW, &sink_ops, NULL); - strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + strmbase_source_init(&object->source, &object->filter, outW, &source_ops); if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown *)&object->source.pin.IPin_iface, CLSCTX_INPROC_SERVER,

1 0

Nikolay Sivov : comctl32/datetime: Use designated initializers for constants.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 0c4f7c2554fffd3d09de8146d5482fd957df61cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c4f7c2554fffd3d09de8146… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:04 2020 +0300 comctl32/datetime: Use designated initializers for constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 2ce3da591f..7b7ac8a86a 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -130,8 +130,8 @@ static const WCHAR allowedformatchars[] = {'d', 'h', 'H', 'm', 'M', 's', 't', 'y static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1}; /* valid date limits */ -static const SYSTEMTIME max_allowed_date = { /* wYear */ 9999, /* wMonth */ 12, /* wDayOfWeek */ 0, /* wDay */ 31 }; -static const SYSTEMTIME min_allowed_date = { /* wYear */ 1752, /* wMonth */ 9, /* wDayOfWeek */ 0, /* wDay */ 14 }; +static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDayOfWeek = 0, .wDay = 31 }; +static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDayOfWeek = 0, .wDay = 14 }; static DWORD DATETIME_GetSystemTime (const DATETIME_INFO *infoPtr, SYSTEMTIME *systime)

1 0

Nikolay Sivov : comctl32/syslink: Use wide string literals.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 1141a7df28acc5b5a86af110ef68932eeb823a58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1141a7df28acc5b5a86af110… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:03 2020 +0300 comctl32/syslink: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/syslink.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 78d0fd0986..802a8803e8 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -165,10 +165,6 @@ static VOID SYSLINK_ClearDoc (SYSLINK_INFO *infoPtr) */ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { - static const WCHAR SL_LINKOPEN[] = { '<','a' }; - static const WCHAR SL_HREF[] = { 'h','r','e','f','=','\"' }; - static const WCHAR SL_ID[] = { 'i','d','=','\"' }; - static const WCHAR SL_LINKCLOSE[] = { '<','/','a','>' }; LPCWSTR current, textstart = NULL, linktext = NULL, firsttag = NULL; int taglen = 0, textlen = 0, linklen = 0, docitems = 0; PDOC_ITEM Last = NULL; @@ -182,7 +178,7 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { if(*current == '<') { - if(!wcsnicmp(current, SL_LINKOPEN, ARRAY_SIZE(SL_LINKOPEN)) && (CurrentType == slText)) + if(!wcsnicmp(current, L"<a", 2) && (CurrentType == slText)) { BOOL ValidParam = FALSE, ValidLink = FALSE; @@ -210,14 +206,14 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) CheckParameter: /* compare the current position with all known parameters */ - if(!wcsnicmp(tmp, SL_HREF, ARRAY_SIZE(SL_HREF))) + if(!wcsnicmp(tmp, L"href=\"", 6)) { taglen += 6; ValidParam = TRUE; CurrentParameter = &lpUrl; CurrentParameterLen = &lenUrl; } - else if(!wcsnicmp(tmp, SL_ID, ARRAY_SIZE(SL_ID))) + else if(!wcsnicmp(tmp, L"id=\"", 4)) { taglen += 4; ValidParam = TRUE; @@ -291,7 +287,7 @@ CheckParameter: } } } - else if(!wcsnicmp(current, SL_LINKCLOSE, ARRAY_SIZE(SL_LINKCLOSE)) && (CurrentType == slLink) && firsttag) + else if (!wcsnicmp(current, L"</a>", 4) && (CurrentType == slLink) && firsttag) { /* there's a <a...> tag opened, first add the previous text, if present */ if(textstart != NULL && textlen > 0 && firsttag > textstart)

1 0

Nikolay Sivov : comctl32/datetime: Use wide string literals.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 8fee131b28a3a7889c698baa7fe1fd6aad23c714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fee131b28a3a7889c698baa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:02 2020 +0300 comctl32/datetime: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 63 +++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 51c20a7063..2ce3da591f 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -361,9 +361,6 @@ DATETIME_SetFormatA (DATETIME_INFO *infoPtr, LPCSTR lpszFormat) static void DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int resultSize) { - static const WCHAR fmt_dW[] = { '%', 'd', 0 }; - static const WCHAR fmt__2dW[] = { '%', '.', '2', 'd', 0 }; - static const WCHAR fmt__3sW[] = { '%', '.', '3', 's', 0 }; SYSTEMTIME date = infoPtr->date; int spec; WCHAR buffer[80]; @@ -395,10 +392,10 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int *result = 0; break; case ONEDIGITDAY: - wsprintfW (result, fmt_dW, date.wDay); + wsprintfW (result, L"%d", date.wDay); break; case TWODIGITDAY: - wsprintfW (result, fmt__2dW, date.wDay); + wsprintfW (result, L"%.2d", date.wDay); break; case THREECHARDAY: GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1+(date.wDayOfWeek+6)%7, result, 4); @@ -414,7 +411,7 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int result[2] = 0; } else - wsprintfW (result, fmt_dW, date.wHour - (date.wHour > 12 ? 12 : 0)); + wsprintfW (result, L"%d", date.wHour - (date.wHour > 12 ? 12 : 0)); break; case TWODIGIT12HOUR: if (date.wHour == 0) { @@ -423,35 +420,35 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int result[2] = 0; } else - wsprintfW (result, fmt__2dW, date.wHour - (date.wHour > 12 ? 12 : 0)); + wsprintfW (result, L"%.2d", date.wHour - (date.wHour > 12 ? 12 : 0)); break; case ONEDIGIT24HOUR: - wsprintfW (result, fmt_dW, date.wHour); + wsprintfW (result, L"%d", date.wHour); break; case TWODIGIT24HOUR: - wsprintfW (result, fmt__2dW, date.wHour); + wsprintfW (result, L"%.2d", date.wHour); break; case ONEDIGITSECOND: - wsprintfW (result, fmt_dW, date.wSecond); + wsprintfW (result, L"%d", date.wSecond); break; case TWODIGITSECOND: - wsprintfW (result, fmt__2dW, date.wSecond); + wsprintfW (result, L"%.2d", date.wSecond); break; case ONEDIGITMINUTE: - wsprintfW (result, fmt_dW, date.wMinute); + wsprintfW (result, L"%d", date.wMinute); break; case TWODIGITMINUTE: - wsprintfW (result, fmt__2dW, date.wMinute); + wsprintfW (result, L"%.2d", date.wMinute); break; case ONEDIGITMONTH: - wsprintfW (result, fmt_dW, date.wMonth); + wsprintfW (result, L"%d", date.wMonth); break; case TWODIGITMONTH: - wsprintfW (result, fmt__2dW, date.wMonth); + wsprintfW (result, L"%.2d", date.wMonth); break; case THREECHARMONTH: GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+date.wMonth -1, buffer, ARRAY_SIZE(buffer)); - wsprintfW (result, fmt__3sW, buffer); + wsprintfW (result, L"%s.3s", buffer); break; case FULLMONTH: GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+date.wMonth -1, @@ -472,14 +469,14 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int result[1] = 0; break; case ONEDIGITYEAR: - wsprintfW (result, fmt_dW, date.wYear % 10); + wsprintfW (result, L"%d", date.wYear % 10); break; case TWODIGITYEAR: - wsprintfW (result, fmt__2dW, date.wYear % 100); + wsprintfW (result, L"%.2d", date.wYear % 100); break; case INVALIDFULLYEAR: case FULLYEAR: - wsprintfW (result, fmt_dW, date.wYear); + wsprintfW (result, L"%d", date.wYear); break; } @@ -601,11 +598,6 @@ static int DATETIME_GetFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int co { /* fields are a fixed width, determined by the largest possible string */ /* presumably, these widths should be language dependent */ - static const WCHAR fld_d1W[] = { '2', 0 }; - static const WCHAR fld_d2W[] = { '2', '2', 0 }; - static const WCHAR fld_d4W[] = { '2', '2', '2', '2', 0 }; - static const WCHAR fld_am1[] = { 'A', 0 }; - static const WCHAR fld_am2[] = { 'A', 'M', 0 }; int spec; WCHAR buffer[80]; LPCWSTR bufptr; @@ -640,22 +632,17 @@ static int DATETIME_GetFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int co case TWODIGITMINUTE: case TWODIGITMONTH: case TWODIGITYEAR: - bufptr = fld_d2W; + bufptr = L"22"; break; case INVALIDFULLYEAR: case FULLYEAR: - bufptr = fld_d4W; + bufptr = L"2222"; break; case THREECHARMONTH: case FULLMONTH: case THREECHARDAY: case FULLDAY: { - static const WCHAR fld_day[] = {'W','e','d','n','e','s','d','a','y',0}; - static const WCHAR fld_abbrday[] = {'W','e','d',0}; - static const WCHAR fld_mon[] = {'S','e','p','t','e','m','b','e','r',0}; - static const WCHAR fld_abbrmon[] = {'D','e','c',0}; - const WCHAR *fall; LCTYPE lctype; INT i, max_count; @@ -664,22 +651,22 @@ static int DATETIME_GetFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int co /* choose locale data type and fallback string */ switch (spec) { case THREECHARDAY: - fall = fld_abbrday; + fall = L"Wed"; lctype = LOCALE_SABBREVDAYNAME1; max_count = 7; break; case FULLDAY: - fall = fld_day; + fall = L"Wednesday"; lctype = LOCALE_SDAYNAME1; max_count = 7; break; case THREECHARMONTH: - fall = fld_abbrmon; + fall = L"Dec"; lctype = LOCALE_SABBREVMONTHNAME1; max_count = 12; break; default: /* FULLMONTH */ - fall = fld_mon; + fall = L"September"; lctype = LOCALE_SMONTHNAME1; max_count = 12; break; @@ -704,13 +691,13 @@ static int DATETIME_GetFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int co return cx; } case ONELETTERAMPM: - bufptr = fld_am1; + bufptr = L"A"; break; case TWOLETTERAMPM: - bufptr = fld_am2; + bufptr = L"AM"; break; default: - bufptr = fld_d1W; + bufptr = L"2"; break; } }

1 0

Nikolay Sivov : comctl32/rebar: Use wide string literals.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 4a0c440d30e6a089b0a6ba5bd297c35c2004b9a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a0c440d30e6a089b0a6ba5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:01 2020 +0300 comctl32/rebar: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 6bca2f1818..af35008b69 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -302,8 +302,7 @@ static const char * const band_maskname[] = { "RBBIM_CHEVRONSTATE", /* 0x00002000 */ NULL }; - -static const WCHAR themeClass[] = { 'R','e','b','a','r',0 }; +static const WCHAR themeClass[] = L"Rebar"; static CHAR * REBAR_FmtStyle(char *buffer, UINT style) @@ -1010,7 +1009,6 @@ REBAR_ForceResize (REBAR_INFO *infoPtr) static VOID REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus) { - static const WCHAR strComboBox[] = { 'C','o','m','b','o','B','o','x',0 }; REBAR_BAND *lpBand; WCHAR szClassName[40]; UINT i; @@ -1047,7 +1045,7 @@ REBAR_MoveChildWindows (const REBAR_INFO *infoPtr, UINT start, UINT endplus) } GetClassNameW (lpBand->hwndChild, szClassName, ARRAY_SIZE(szClassName)); - if (!lstrcmpW (szClassName, strComboBox) || + if (!lstrcmpW (szClassName, WC_COMBOBOXW) || !lstrcmpW (szClassName, WC_COMBOBOXEXW)) { INT nEditHeight, yPos; RECT rc;

1 0

Nikolay Sivov : comctl32/animate: Use wide string literals.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 202c71761314f29d125efee8d496c45ef08f9a37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=202c71761314f29d125efee8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:00 2020 +0300 comctl32/animate: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/animate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index f8ba159779..f7ac28ae4c 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -94,12 +94,11 @@ static void ANIMATE_Notify(const ANIMATE_INFO *infoPtr, UINT notif) static BOOL ANIMATE_LoadResW(ANIMATE_INFO *infoPtr, HINSTANCE hInst, LPCWSTR lpName) { - static const WCHAR aviW[] = { 'A', 'V', 'I', 0 }; HRSRC hrsrc; MMIOINFO mminfo; LPVOID lpAvi; - hrsrc = FindResourceW(hInst, lpName, aviW); + hrsrc = FindResourceW(hInst, lpName, L"AVI"); if (!hrsrc) return FALSE; @@ -794,12 +793,11 @@ static BOOL ANIMATE_Stop(ANIMATE_INFO *infoPtr) static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs) { - static const WCHAR msvfw32W[] = { 'm', 's', 'v', 'f', 'w', '3', '2', '.', 'd', 'l', 'l', 0 }; ANIMATE_INFO *infoPtr; if (!fnIC.hModule) { - fnIC.hModule = LoadLibraryW(msvfw32W); + fnIC.hModule = LoadLibraryW(L"msvfw32.dll"); if (!fnIC.hModule) return FALSE; fnIC.fnICOpen = (void*)GetProcAddress(fnIC.hModule, "ICOpen");

1 0

Nikolay Sivov : comctl32/ipaddress: Use wide string literals.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: e9e8b77d2d34f6a2f7f1ef5a37048528724b6bca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e8b77d2d34f6a2f7f1ef5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:41:59 2020 +0300 comctl32/ipaddress: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index d88cd88f31..c75a108565 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -59,8 +59,7 @@ typedef struct IPPART_INFO Part[4]; } IPADDRESS_INFO; -static const WCHAR IP_SUBCLASS_PROP[] = - { 'C', 'C', 'I', 'P', '3', '2', 'S', 'u', 'b', 'c', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; +static const WCHAR IP_SUBCLASS_PROP[] = L"CCIP32SubclassInfo"; #define POS_DEFAULT 0 #define POS_LEFT 1 @@ -72,8 +71,6 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static void IPADDRESS_UpdateText (const IPADDRESS_INFO *infoPtr) { - static const WCHAR zero[] = {'0', 0}; - static const WCHAR dot[] = {'.', 0}; WCHAR field[4]; WCHAR ip[16]; INT i; @@ -85,9 +82,9 @@ static void IPADDRESS_UpdateText (const IPADDRESS_INFO *infoPtr) lstrcatW(ip, field); else /* empty edit treated as zero */ - lstrcatW(ip, zero); + lstrcatW(ip, L"0"); if (i != 3) - lstrcatW(ip, dot); + lstrcatW(ip, L"."); } SetWindowTextW(infoPtr->Self, ip); @@ -140,7 +137,6 @@ static int IPADDRESS_GetPartIndex(const IPADDRESS_INFO *infoPtr, HWND hwnd) static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) { - static const WCHAR dotW[] = { '.', 0 }; RECT rect, rcPart; COLORREF bgCol, fgCol; HTHEME theme; @@ -193,9 +189,9 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) rect.right = rcPart.left; if (theme) - DrawThemeText(theme, hdc, EP_EDITTEXT, state, dotW, 1, DT_SINGLELINE | DT_CENTER | DT_BOTTOM, 0, &rect); + DrawThemeText(theme, hdc, EP_EDITTEXT, state, L".", 1, DT_SINGLELINE | DT_CENTER | DT_BOTTOM, 0, &rect); else - DrawTextW(hdc, dotW, 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); + DrawTextW(hdc, L".", 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); } if (theme) @@ -360,20 +356,18 @@ static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range) static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) { - static const WCHAR nil[] = { 0 }; int i; TRACE("\n"); for (i = 0; i < 4; i++) - SetWindowTextW (infoPtr->Part[i].EditHwnd, nil); + SetWindowTextW (infoPtr->Part[i].EditHwnd, L""); } static LRESULT IPADDRESS_SetAddress (const IPADDRESS_INFO *infoPtr, DWORD ip_address) { WCHAR buf[20]; - static const WCHAR fmt[] = { '%', 'd', 0 }; int i; TRACE("\n"); @@ -382,7 +376,7 @@ static LRESULT IPADDRESS_SetAddress (const IPADDRESS_INFO *infoPtr, DWORD ip_add const IPPART_INFO* part = &infoPtr->Part[i]; int value = ip_address & 0xff; if ( (value >= part->LowerLimit) && (value <= part->UpperLimit) ) { - wsprintfW (buf, fmt, value); + wsprintfW (buf, L"%d", value); SetWindowTextW (part->EditHwnd, buf); IPADDRESS_Notify (infoPtr, EN_CHANGE); } @@ -405,7 +399,6 @@ static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) static BOOL IPADDRESS_ConstrainField (const IPADDRESS_INFO *infoPtr, int currentfield) { - static const WCHAR fmt[] = { '%', 'd', 0 }; const IPPART_INFO *part; int curValue, newValue; WCHAR field[10]; @@ -428,7 +421,7 @@ static BOOL IPADDRESS_ConstrainField (const IPADDRESS_INFO *infoPtr, int current if (newValue == curValue) return FALSE; - wsprintfW (field, fmt, newValue); + wsprintfW (field, L"%d", newValue); TRACE(" field=%s\n", debugstr_w(field)); return SetWindowTextW (part->EditHwnd, field); }

1 0

Nikolay Sivov : comctl32/monthcal: Use wide string literals.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: b2843f218f485bfe2ad8d67f47fb6772dd70b8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2843f218f485bfe2ad8d67f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:41:58 2020 +0300 comctl32/monthcal: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1de13dab36..98c682df33 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -142,7 +142,7 @@ typedef struct SIZE dim; /* [cx,cy] - dimensions of calendars matrix, row/column count */ } MONTHCAL_INFO, *LPMONTHCAL_INFO; -static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; +static const WCHAR themeClass[] = L"Scrollbar"; /* empty SYSTEMTIME const */ static const SYSTEMTIME st_null; @@ -782,7 +782,6 @@ static void MONTHCAL_CircleDay(const MONTHCAL_INFO *infoPtr, HDC hdc, static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEMTIME *st, int bold, const PAINTSTRUCT *ps) { - static const WCHAR fmtW[] = { '%','d',0 }; WCHAR buf[10]; RECT r, r_temp; COLORREF oldCol = 0; @@ -811,7 +810,7 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM SelectObject(hdc, bold ? infoPtr->hBoldFont : infoPtr->hFont); old_bkmode = SetBkMode(hdc, TRANSPARENT); - wsprintfW(buf, fmtW, st->wDay); + wsprintfW(buf, L"%d", st->wDay); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE ); SetBkMode(hdc, old_bkmode); @@ -862,12 +861,6 @@ static void MONTHCAL_PaintButton(MONTHCAL_INFO *infoPtr, HDC hdc, enum nav_direc /* paint a title with buttons and month/year string */ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { - static const WCHAR mmmmW[] = {'M','M','M','M',0}; - static const WCHAR mmmW[] = {'M','M','M',0}; - static const WCHAR mmW[] = {'M','M',0}; - static const WCHAR fmtyearW[] = {'%','l','d',0}; - static const WCHAR fmtmmW[] = {'%','0','2','d',0}; - static const WCHAR fmtmW[] = {'%','d',0}; RECT *title = &infoPtr->calendars[calIdx].title; const SYSTEMTIME *st = &infoPtr->calendars[calIdx].month; WCHAR monthW[80], strW[80], fmtW[80], yearW[6] /* valid year range is 1601-30827 */; @@ -887,18 +880,18 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU DrawTextW(hdc, strW, lstrlenW(strW), title, DT_CENTER | DT_VCENTER | DT_SINGLELINE); GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SYEARMONTH, fmtW, ARRAY_SIZE(fmtW)); - wsprintfW(yearW, fmtyearW, st->wYear); + wsprintfW(yearW, L"%ld", st->wYear); /* month is trickier as it's possible to have different format pictures, we'll test for M, MM, MMM, and MMMM */ - if (wcsstr(fmtW, mmmmW)) + if (wcsstr(fmtW, L"MMMM")) GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+st->wMonth-1, monthW, ARRAY_SIZE(monthW)); - else if (wcsstr(fmtW, mmmW)) + else if (wcsstr(fmtW, L"MMM")) GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVMONTHNAME1+st->wMonth-1, monthW, ARRAY_SIZE(monthW)); - else if (wcsstr(fmtW, mmW)) - wsprintfW(monthW, fmtmmW, st->wMonth); + else if (wcsstr(fmtW, L"MM")) + wsprintfW(monthW, L"%02d", st->wMonth); else - wsprintfW(monthW, fmtmW, st->wMonth); + wsprintfW(monthW, L"%d", st->wMonth); /* update hit boxes */ yearoffset = 0; @@ -946,7 +939,6 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { const SYSTEMTIME *date = &infoPtr->calendars[calIdx].month; - static const WCHAR fmt_weekW[] = { '%','d',0 }; INT mindays, weeknum, weeknum1, startofprescal; INT i, prev_month; SYSTEMTIME st; @@ -1032,15 +1024,15 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con for(i = 0; i < 6; i++) { if((i == 0) && (weeknum > 50)) { - wsprintfW(buf, fmt_weekW, weeknum); + wsprintfW(buf, L"%d", weeknum); weeknum = 0; } else if((i == 5) && (weeknum > 47)) { - wsprintfW(buf, fmt_weekW, 1); + wsprintfW(buf, L"%d", 1); } else - wsprintfW(buf, fmt_weekW, weeknum + i); + wsprintfW(buf, L"%d", weeknum + i); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE); OffsetRect(&r, 0, infoPtr->height_increment); @@ -1056,7 +1048,6 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con /* bottom today date */ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - static const WCHAR fmt_todayW[] = { '%','s',' ','%','s',0 }; WCHAR buf_todayW[30], buf_dateW[20], buf[80]; RECT text_rect, box_rect; HFONT old_font; @@ -1075,7 +1066,7 @@ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, cons old_font = SelectObject(hdc, infoPtr->hBoldFont); SetTextColor(hdc, infoPtr->colors[MCSC_TEXT]); - wsprintfW(buf, fmt_todayW, buf_todayW, buf_dateW); + wsprintfW(buf, L"%s %s", buf_todayW, buf_dateW); DrawTextW(hdc, buf, -1, &text_rect, DT_CALCRECT | DT_LEFT | DT_VCENTER | DT_SINGLELINE); DrawTextW(hdc, buf, -1, &text_rect, DT_LEFT | DT_VCENTER | DT_SINGLELINE); @@ -2484,7 +2475,6 @@ MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr) /* sets the size information */ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) { - static const WCHAR O0W[] = { '0','0',0 }; RECT *title=&infoPtr->calendars[0].title; RECT *prev=&infoPtr->titlebtnprev; RECT *next=&infoPtr->titlebtnnext; @@ -2526,8 +2516,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) } else /* locale independent fallback on failure */ { - static const WCHAR sunW[] = { 'S','u','n' }; - GetTextExtentPoint32W(hdc, sunW, ARRAY_SIZE(sunW), &sz); + GetTextExtentPoint32W(hdc, L"Sun", 3, &sz); day_width = sz.cx; break; } @@ -2537,7 +2526,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) /* recalculate the height and width increments and offsets */ size.cx = 0; - GetTextExtentPoint32W(hdc, O0W, 2, &size); + GetTextExtentPoint32W(hdc, L"00", 2, &size); /* restore the originally selected font */ SelectObject(hdc, font);

1 0

Zebediah Figura : d3dcompiler: Add a helper to initialize the hlsl_ir_node structure.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 2dc666c9df06be9053f5864c3a244f635c2e2c3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dc666c9df06be9053f5864c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 23:54:23 2020 -0500 d3dcompiler: Add a helper to initialize the hlsl_ir_node structure. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 ++- dlls/d3dcompiler_43/hlsl.y | 110 ++++++++++++++++++------------ dlls/d3dcompiler_43/utils.c | 58 ++-------------- 3 files changed, 81 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2dc666c9df06be9053f5…

1 0

Alexandre Julliard : ntoskrnl: Add missing exports for functions that are already implemented.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 1028a5c15f28edea10c3acdd262a9868bffd78d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1028a5c15f28edea10c3acdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 1 15:38:55 2020 +0200 ntoskrnl: Add missing exports for functions that are already implemented. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 136 ++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1028a5c15f28edea10c3…

1 0

Vijay Kiran Kamuju : include: Add missing GUIDs and CLSIDs to wincodecsdk.idl.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 947c483812fbee439a13d35b6534be51f3c95c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=947c483812fbee439a13d35b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 1 01:37:03 2020 +0200 include: Add missing GUIDs and CLSIDs to wincodecsdk.idl. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincodecsdk.idl | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=947c483812fbee439a13…

1 0

Vijay Kiran Kamuju : include: Add some missing defines to winioctl.h.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 5bfb33a60dec286e29380399dbc0e2ba9a33c927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bfb33a60dec286e29380399… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Apr 9 18:11:07 2020 +0200 include: Add some missing defines to winioctl.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winioctl.h | 210 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 204 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bfb33a60dec286e2938…

1 0

Henri Verbeet : wined3d: Submit the current command buffer in adapter_vk_flush_context().
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 8319d154cc27ebb335801a39023c39d764525ec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8319d154cc27ebb335801a39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:24 2020 +0430 wined3d: Submit the current command buffer in adapter_vk_flush_context(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 65850ab4cc..f06cf30f27 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1493,7 +1493,11 @@ static void adapter_vk_destroy_query(struct wined3d_query *query) static void adapter_vk_flush_context(struct wined3d_context *context) { - TRACE("context %p.\n", context); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + + TRACE("context_vk %p.\n", context_vk); + + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); } static void adapter_vk_draw_primitive(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM_SRGB.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 5beefc63bac65e6cb255924eec4888c4d03d7e26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5beefc63bac65e6cb255924e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:23 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM_SRGB. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 222b3bf92c..e7f04cbdf2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4187,6 +4187,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, {WINED3DFMT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, "XYZ1"}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, "XYZ1"}, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, },

1 0

Henri Verbeet : wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: f0adc5c0b52853d34f964f10b82319743c68ba6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0adc5c0b52853d34f964f10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:22 2020 +0430 wined3d: Add Vulkan format information for WINED3DFMT_B8G8R8X8_UNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 04e9300ee6..222b3bf92c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4186,6 +4186,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, "000X"}, {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, + {WINED3DFMT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, "XYZ1"}, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, },

1 0

Henri Verbeet : wined3d: Add a swizzle to the Vulkan format information for WINED3DFMT_A8_UNORM.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: a3874561cd68c8fec22c05a024ed23cbc17ddcb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3874561cd68c8fec22c05a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:21 2020 +0430 wined3d: Add a swizzle to the Vulkan format information for WINED3DFMT_A8_UNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 17 +++++++++++++---- dlls/wined3d/utils.c | 10 ++++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b8b90c95c5..49373eb58a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4509,6 +4509,7 @@ const VkDescriptorImageInfo *wined3d_texture_vk_get_default_image_info(struct wi const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; VkImageViewCreateInfo create_info; + struct color_fixup_desc fixup; uint32_t flags = 0; VkResult vr; @@ -4529,10 +4530,18 @@ const VkDescriptorImageInfo *wined3d_texture_vk_get_default_image_info(struct wi create_info.image = texture_vk->vk_image; create_info.viewType = vk_image_view_type_from_wined3d(texture_vk->t.resource.type, flags); create_info.format = format_vk->vk_format; - create_info.components.r = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.g = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.b = VK_COMPONENT_SWIZZLE_IDENTITY; - create_info.components.a = VK_COMPONENT_SWIZZLE_IDENTITY; + fixup = format_vk->f.color_fixup; + if (is_identity_fixup(fixup) || !can_use_texture_swizzle(context_vk->c.d3d_info, &format_vk->f)) + { + create_info.components.r = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.g = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.b = VK_COMPONENT_SWIZZLE_IDENTITY; + create_info.components.a = VK_COMPONENT_SWIZZLE_IDENTITY; + } + else + { + wined3d_vk_swizzle_from_color_fixup(&create_info.components, fixup); + } create_info.subresourceRange.aspectMask = vk_aspect_mask_from_format(&format_vk->f); create_info.subresourceRange.baseMipLevel = 0; create_info.subresourceRange.levelCount = texture_vk->t.level_count; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2108eb65ba..04e9300ee6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4135,6 +4135,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, { enum wined3d_format_id id; VkFormat vk_format; + const char *fixup; } vulkan_formats[] = { @@ -4182,7 +4183,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_R8_UINT, VK_FORMAT_R8_UINT, }, {WINED3DFMT_R8_SNORM, VK_FORMAT_R8_SNORM, }, {WINED3DFMT_R8_SINT, VK_FORMAT_R8_SINT, }, - {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, }, + {WINED3DFMT_A8_UNORM, VK_FORMAT_R8_UNORM, "000X"}, {WINED3DFMT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, }, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, @@ -4211,6 +4212,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, VkFormatProperties properties; VkImageUsageFlags vk_usage; unsigned int flags; + const char *fixup; unsigned int i; VkResult vr; @@ -4219,6 +4221,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, if (vulkan_formats[i].id == format->f.id) { vk_format = vulkan_formats[i].vk_format; + fixup = vulkan_formats[i].fixup; break; } } @@ -4229,7 +4232,10 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, } format->vk_format = vk_format; - format->f.color_fixup = COLOR_FIXUP_IDENTITY; + if (fixup) + format->f.color_fixup = create_color_fixup_desc_from_string(fixup); + else + format->f.color_fixup = COLOR_FIXUP_IDENTITY; VK_CALL(vkGetPhysicalDeviceFormatProperties(vk_physical_device, vk_format, &properties));

1 0

Henri Verbeet : wined3d: Create Vulkan samplers for samplers.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 385d06daa5f3ebba64b6958de26dc2a05c360c70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=385d06daa5f3ebba64b6958d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 15:24:20 2020 +0430 wined3d: Create Vulkan samplers for samplers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 23 +++++++-- dlls/wined3d/context_vk.c | 59 +++++++++++++++++++++ dlls/wined3d/sampler.c | 115 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 20 ++++++- 4 files changed, 210 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=385d06daa5f3ebba64b6…

1 0

Andrew Eikum : ntoskrnl: Quiet down failed class installer debug message.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 7ac5b7889f9e3e54941d1b4ad28ad488503b9428 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac5b7889f9e3e54941d1b4a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 30 15:39:30 2020 -0500 ntoskrnl: Quiet down failed class installer debug message. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 75310f7b35..9e4c2c1416 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -298,7 +298,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN { if (!SetupDiCallClassInstaller(dif_list[i], set, sp_device) && GetLastError() != ERROR_DI_DO_DEFAULT) { - ERR("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError()); + WARN("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError()); return FALSE; } }

1 0

Andrew Eikum : setupapi: Quiet down missing driver debug message.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 20a283e7e20a456ccb34730013e837571c884448 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20a283e7e20a456ccb347300… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 30 15:39:23 2020 -0500 setupapi: Quiet down missing driver debug message. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5bd2b88a02..fca60402a5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4739,7 +4739,7 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device if (!device->driver_count) { - ERR("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); + WARN("No compatible drivers were enumerated for device %s.\n", debugstr_w(device->instanceId)); SetLastError(ERROR_NO_COMPAT_DRIVERS); return FALSE; }

1 0

Piotr Caban : msvcrt: Avoid depending on signed variable overflow in parse_double.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 65642f4bb7d9c8bfb9f16f6f59d4c06271431f43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65642f4bb7d9c8bfb9f16f6f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 1 11:58:11 2020 +0200 msvcrt: Avoid depending on signed variable overflow in parse_double. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b2bc3e9c2e..31ed4e2181 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -549,8 +549,10 @@ static double strtod16(MSVCRT_wchar_t get(void *ctx), void unget(void *ctx), } if(nch>='0' && nch<='9') { while(nch>='0' && nch<='9') { - if(e>INT_MAX/10 || (e=e*10+nch-'0')<0) + if(e>INT_MAX/10 || e*10>INT_MAX-nch+'0') e = INT_MAX; + else + e = e*10+nch-'0'; nch = get(ctx); } if((nch!=MSVCRT_WEOF) && (nch < '0' || nch > '9')) unget(ctx); @@ -827,8 +829,10 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx), if(nch>='0' && nch<='9') { while(nch>='0' && nch<='9') { - if(e>INT_MAX/10 || (e=e*10+nch-'0')<0) + if(e>INT_MAX/10 || e*10>INT_MAX-nch+'0') e = INT_MAX; + else + e = e*10+nch-'0'; nch = get(ctx); } if(nch != MSVCRT_WEOF) unget(ctx);

1 0

Zebediah Figura : quartz/tests: Test current position caching.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 9733b821e050ab0f9867c47a50f8ae9ddc2f1d0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9733b821e050ab0f9867c47a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 21:51:47 2020 -0500 quartz/tests: Test current position caching. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 186 +++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 3722a6f9dd..90d1e01932 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -489,6 +489,7 @@ struct testfilter { struct strmbase_filter filter; struct strmbase_source source; + IMediaSeeking IMediaSeeking_iface; }; static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) @@ -517,6 +518,19 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; +static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_BaseFilter(iface->filter); + + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &filter->IMediaSeeking_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -525,15 +539,172 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { + .base.pin_query_interface = testsource_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, }; +static struct testfilter *impl_from_IMediaSeeking(IMediaSeeking *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, IMediaSeeking_iface); +} + +static HRESULT WINAPI testseek_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out); +} + +static ULONG WINAPI testseek_AddRef(IMediaSeeking *iface) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI testseek_Release(IMediaSeeking *iface) +{ + struct testfilter *filter = impl_from_IMediaSeeking(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI testseek_GetCapabilities(IMediaSeeking *iface, DWORD *caps) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_CheckCapabilities(IMediaSeeking *iface, DWORD *caps) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_IsFormatSupported(IMediaSeeking *iface, const GUID *format) +{ + if (winetest_debug > 1) trace("IsFormatSupported()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_QueryPreferredFormat(IMediaSeeking *iface, GUID *format) +{ + if (winetest_debug > 1) trace("%p->QueryPreferredFormat()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetTimeFormat(IMediaSeeking *iface, GUID *format) +{ + if (winetest_debug > 1) trace("%p->GetTimeFormat()\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_IsUsingTimeFormat(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetTimeFormat(IMediaSeeking *iface, const GUID *format) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetDuration(IMediaSeeking *iface, LONGLONG *duration) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) +{ + if (winetest_debug > 1) trace("GetStopPosition()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) +{ + if (winetest_debug > 1) trace("GetCurrentPosition()\n"); + return 0xdeadbeef; +} + +static HRESULT WINAPI testseek_ConvertTimeFormat(IMediaSeeking *iface, LONGLONG *target, + const GUID *target_format, LONGLONG source, const GUID *source_format) +{ + if (winetest_debug > 1) trace("ConvertTimeFormat()\n"); + ok(IsEqualGUID(source_format, &TIME_FORMAT_MEDIA_TIME), + "Got source format %s.\n", debugstr_guid(source_format)); + ok(!target_format, "Got target format %s.\n", debugstr_guid(target_format)); + *target = source; + return S_OK; +} + +static HRESULT WINAPI testseek_SetPositions(IMediaSeeking *iface, LONGLONG *current, + DWORD current_flags, LONGLONG *stop, DWORD stop_flags ) +{ + if (winetest_debug > 1) trace("SetPositions()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetPositions(IMediaSeeking *iface, LONGLONG *current, LONGLONG *stop) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetAvailable(IMediaSeeking *iface, LONGLONG *earliest, LONGLONG *latest) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_SetRate(IMediaSeeking *iface, double rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetRate(IMediaSeeking *iface, double *rate) +{ + ok(0, "Unexpected call.\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI testseek_GetPreroll(IMediaSeeking *iface, LONGLONG *preroll) +{ + if (winetest_debug > 1) trace("%p->GetPreroll()\n", iface); + return E_NOTIMPL; +} + +static const IMediaSeekingVtbl testseek_vtbl = +{ + testseek_QueryInterface, + testseek_AddRef, + testseek_Release, + testseek_GetCapabilities, + testseek_CheckCapabilities, + testseek_IsFormatSupported, + testseek_QueryPreferredFormat, + testseek_GetTimeFormat, + testseek_IsUsingTimeFormat, + testseek_SetTimeFormat, + testseek_GetDuration, + testseek_GetStopPosition, + testseek_GetCurrentPosition, + testseek_ConvertTimeFormat, + testseek_SetPositions, + testseek_GetPositions, + testseek_GetAvailable, + testseek_SetRate, + testseek_GetRate, + testseek_GetPreroll, +}; + static void testfilter_init(struct testfilter *filter) { static const GUID clsid = {0xabacab}; strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); + filter->IMediaSeeking_iface.lpVtbl = &testseek_vtbl; } static void test_allocator(IMemInputPin *input) @@ -852,14 +1023,17 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } -static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) { IMediaControl *control; + IMediaSeeking *seeking; + REFERENCE_TIME time; OAFilterState state; HANDLE thread; HRESULT hr; IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IBaseFilter_QueryInterface(filter, &IID_IMediaSeeking, (void **)&seeking); hr = IMediaControl_Pause(control); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -867,11 +1041,18 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *grap hr = IMediaControl_GetState(control, 0, &state); ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); + ok(hr == 0xdeadbeef, "Got hr %#x.\n", hr); + thread = send_frame_time(input, 1, 0x11); /* dark blue */ hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSeeking_GetCurrentPosition(seeking, &time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(time == 10000000, "Got time %s.\n", wine_dbgstr_longlong(time)); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = IMediaControl_Run(control); @@ -923,6 +1104,7 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *grap hr = join_thread(thread); ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSeeking_Release(seeking); IMediaControl_Release(control); } @@ -1241,7 +1423,7 @@ static void test_connect_pin(void) test_filter_state(input, graph); test_flushing(pin, input, graph); - test_sample_time(pin, input, graph); + test_sample_time(filter, pin, input, graph); test_eos(pin, input, graph); test_current_image(filter, input, graph, &vih.bmiHeader);

1 0

Zebediah Figura : quartz/tests: Add some tests for end-of-stream notifications on the VMR9.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: b66d0ed6a3e367839e23d59ff68aedaba2c1a223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b66d0ed6a3e367839e23d59f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 21:51:46 2020 -0500 quartz/tests: Add some tests for end-of-stream notifications on the VMR9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 0e02de6452..cb04d0b4aa 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1228,6 +1228,145 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control ok(hr == S_OK, "Got hr %#x.\n", hr); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IPin *pin, IMemInputPin *input, IMediaControl *control) +{ + IMediaEvent *eventsrc; + OAFilterState state; + HRESULT hr; + BOOL ret; + + IMediaControl_QueryInterface(control, &IID_IMediaEvent, (void **)&eventsrc); + + commit_allocator(input); + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* We do not receive an EC_COMPLETE notification until the last sample is + * done rendering. */ + + commit_allocator(input); + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ret = check_ec_complete(eventsrc, 1600); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS while flushing. */ + + commit_allocator(input); + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS and then flushing or stopping. */ + + commit_allocator(input); + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + IMediaEvent_Release(eventsrc); +} + static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *control) { OAFilterState state; @@ -1521,6 +1660,7 @@ static void test_connect_pin(void) test_filter_state(input, control); test_flushing(pin, input, control); + test_eos(pin, input, control); test_sample_time(pin, input, control); test_current_image(filter, input, control, &vih.bmiHeader);

1 0

Zebediah Figura : quartz/tests: Add some tests for sample presentation time on the VMR9.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 3cad37a64b90c31db0d0b71cb49e46d760b0a90d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cad37a64b90c31db0d0b71c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 21:51:45 2020 -0500 quartz/tests: Add some tests for sample presentation time on the VMR9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 154 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 111 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cad37a64b90c31db0d0…

1 0

Zebediah Figura : quartz/tests: Add more tests for mixing mode.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 122998ab156595d7abde9bd2a272a5350b209ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=122998ab156595d7abde9bd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 21:51:44 2020 -0500 quartz/tests: Add more tests for mixing mode. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index d8c2ee8b4a..9485d055f0 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2896,6 +2896,93 @@ out: DestroyWindow(window); } +static void test_mixing_mode(void) +{ + IVMRWindowlessControl9 *windowless_control; + IVMRMixerControl9 *mixer_control; + IVMRFilterConfig9 *config; + DWORD stream_count = 0; + IBaseFilter *filter; + unsigned int i; + HWND window; + HRESULT hr; + ULONG ref; + + static const VMR9Mode modes[] = + { + 0, + VMR9Mode_Windowed, + VMR9Mode_Windowless, + VMR9Mode_Renderless, + }; + + for (i = 0; i < ARRAY_SIZE(modes); ++i) + { + filter = create_vmr9(modes[i]); + IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); + todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream_count == 1, "Got %u streams.\n", stream_count); + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + IVMRMixerControl9_Release(mixer_control); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream_count == 1, "Got %u streams.\n", stream_count); + + IVMRFilterConfig9_Release(config); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + filter = create_vmr9(VMR9Mode_Windowless); + IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); + IBaseFilter_QueryInterface(filter, &IID_IVMRWindowlessControl9, (void **)&windowless_control); + + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream_count == 4, "Got %u streams.\n", stream_count); + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + IVMRMixerControl9_Release(mixer_control); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream_count == 4, "Got %u streams.\n", stream_count); + + IVMRWindowlessControl9_Release(windowless_control); + IVMRFilterConfig9_Release(config); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + DestroyWindow(window); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -2925,6 +3012,7 @@ START_TEST(vmr9) test_video_window(); test_allocate_surface_helper(); test_renderless_formats(); + test_mixing_mode(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Fix a copy-paste error.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 40a115eb1440cedf24a860cf1865f572a0f69ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a115eb1440cedf24a860cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 21:51:43 2020 -0500 quartz/tests: Fix a copy-paste error. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 367d7df568..d8c2ee8b4a 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -378,12 +378,12 @@ static void test_aggregation(void) ULONG ref; filter = (IBaseFilter *)0xdeadbeef; - hr = CoCreateInstance(&CLSID_VideoMixingRenderer, &test_outer, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!filter, "Got interface %p.\n", filter); - hr = CoCreateInstance(&CLSID_VideoMixingRenderer, &test_outer, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref);

1 0

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 May 2020