December 2022 - Wine-commits

Alexandre Julliard : oleaut32: Fix A<->W conversion when storing names in typelibs.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 680d17b453ad651ecb12be5d12a7e6baf84a4de1 URL: https://gitlab.winehq.org/wine/wine/-/commit/680d17b453ad651ecb12be5d12a7e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 13:19:49 2022 +0100 oleaut32: Fix A<->W conversion when storing names in typelibs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52873 --- dlls/oleaut32/typelib.c | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 602b9a1ee17..d92d0234c6c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2252,12 +2252,12 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx ) if(size == -1){ V_BSTR(pVar) = NULL; }else{ + int len; ptr = heap_alloc_zero(size); MSFT_Read(ptr, size, pcx, DO_NOT_SEEK); - V_BSTR(pVar)=SysAllocStringLen(NULL,size); - /* FIXME: do we need a AtoW conversion here? */ - V_UNION(pVar, bstrVal[size])='\0'; - while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; + len = MultiByteToWideChar(CP_ACP, 0, ptr, size, NULL, 0 ); + V_BSTR(pVar)=SysAllocStringLen(NULL,len); + MultiByteToWideChar(CP_ACP, 0, ptr, size, V_BSTR(pVar), len ); heap_free(ptr); } } @@ -5734,23 +5734,12 @@ static HRESULT TLB_CopyElemDesc( const ELEMDESC *src, ELEMDESC *dest, char **buf return S_OK; } -static HRESULT TLB_SanitizeBSTR(BSTR str) -{ - UINT len = SysStringLen(str), i; - for (i = 0; i < len; ++i) - if (str[i] > 0x7f) - str[i] = '?'; - return S_OK; -} - static HRESULT TLB_SanitizeVariant(VARIANT *var) { if (V_VT(var) == VT_INT) return VariantChangeType(var, var, 0, VT_I4); else if (V_VT(var) == VT_UINT) return VariantChangeType(var, var, 0, VT_UI4); - else if (V_VT(var) == VT_BSTR) - return TLB_SanitizeBSTR(V_BSTR(var)); return S_OK; } @@ -9421,7 +9410,8 @@ static DWORD WMSFT_encode_variant(VARIANT *value, WMSFT_TLBFile *file) } case VT_BSTR: { - int i, len = (6+SysStringLen(V_BSTR(&v))+3) & ~0x3; + int mb_len = WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), SysStringLen(V_BSTR(&v)), NULL, 0, NULL, NULL ); + int i, len = (6 + mb_len + 3) & ~0x3; char *data; if(file->custdata_seg.data){ @@ -9434,15 +9424,9 @@ static DWORD WMSFT_encode_variant(VARIANT *value, WMSFT_TLBFile *file) } *((unsigned short *)data) = V_VT(value); - *((unsigned int *)(data+2)) = SysStringLen(V_BSTR(&v)); - for(i=0; i<SysStringLen(V_BSTR(&v)); i++) { - if(V_BSTR(&v)[i] <= 0x7f) - data[i+6] = V_BSTR(&v)[i]; - else - data[i+6] = '?'; - } - WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), SysStringLen(V_BSTR(&v)), &data[6], len-6, NULL, NULL); - for(i=6+SysStringLen(V_BSTR(&v)); i<len; i++) + *((unsigned int *)(data+2)) = mb_len; + WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), SysStringLen(V_BSTR(&v)), &data[6], mb_len, NULL, NULL); + for (i = 6 + mb_len; i < len; i++) data[i] = 0x57; /* TODO: Check if the encoded data is already present in custdata_seg */

1 0

Alexandre Julliard : kernel32/tests: Fix a string comparison test in utf-8 locales.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: b771d417d8f7f514ea57ff41e06cb96f912b48e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b771d417d8f7f514ea57ff41e06cb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 14:10:51 2022 +0100 kernel32/tests: Fix a string comparison test in utf-8 locales. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52964 --- dlls/kernel32/tests/locale.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 723c24873c6..40706c15755 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1816,8 +1816,13 @@ static void test_CompareStringA(void) static const char ABC_FF[] = {'A','B','C',0,0xFF}; int ret, i; char a[256]; + BOOL is_utf8; + CPINFOEXA cpinfo; LCID lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT); + GetCPInfoExA( CP_ACP, 0, &cpinfo ); + is_utf8 = cpinfo.CodePage == CP_UTF8; + for (i = 0; i < ARRAY_SIZE(comparestringa_data); i++) { const struct comparestringa_entry *entry = &comparestringa_data[i]; @@ -1945,13 +1950,13 @@ static void test_CompareStringA(void) ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 3, ABC_FF, 3); ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 5, ABC_FF, 3); - ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); + ok(ret == CSTR_GREATER_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_GREATER_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 3, ABC_FF, 5); - ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ok(ret == CSTR_LESS_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 5, ABC_FF, 5); - ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ok(ret == CSTR_LESS_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_FF, 5, ABC_EE, 5); - ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); + ok(ret == CSTR_GREATER_THAN || (is_utf8 && ret == CSTR_EQUAL), "expected CSTR_GREATER_THAN, got %d\n", ret); } static void test_CompareStringW(void)

1 0

Zebediah Figura : wined3d: Require depth bias clamp to create a feature level 10.0 device.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 80771f1c4bfe2d864e32b93a6c5e4d748879dc2d URL: https://gitlab.winehq.org/wine/wine/-/commit/80771f1c4bfe2d864e32b93a6c5e4d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 18:40:08 2022 -0600 wined3d: Require depth bias clamp to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d38882ff5ab..e5a9e80decb 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2258,6 +2258,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.multiViewport && info->features2.features.geometryShader && info->features2.features.depthClamp + && info->features2.features.depthBiasClamp && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Zebediah Figura : wined3d: Disable wide line support.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: d6666cd02deea49badbd1c32aa0b61b2b270027b URL: https://gitlab.winehq.org/wine/wine/-/commit/d6666cd02deea49badbd1c32aa0b61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 18:45:37 2022 -0600 wined3d: Disable wide line support. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e5a9e80decb..03f7b4bfb5f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -299,6 +299,7 @@ static void wined3d_disable_vulkan_features(struct wined3d_physical_device_info VkPhysicalDeviceFeatures *features = &info->features2.features; features->depthBounds = VK_FALSE; + features->wideLines = VK_FALSE; features->alphaToOne = VK_FALSE; features->textureCompressionETC2 = VK_FALSE; features->textureCompressionASTC_LDR = VK_FALSE;

1 0

Zebediah Figura : wined3d: Require precise occlusion queries to create a feature level 9.2 device.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: c20b8da9e3ee086ad4ead4bb2c341565b49c0659 URL: https://gitlab.winehq.org/wine/wine/-/commit/c20b8da9e3ee086ad4ead4bb2c3415… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:09:11 2022 -0600 wined3d: Require precise occlusion queries to create a feature level 9.2 device. --- dlls/wined3d/adapter_vk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 03f7b4bfb5f..a7b2ff76e28 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2247,6 +2247,11 @@ static bool adapter_vk_init_driver_info(struct wined3d_adapter_vk *adapter_vk, adapter_vk->a.d3d_info.feature_level, vram_bytes, sysmem_bytes); } +static bool feature_level_9_2_supported(const struct wined3d_physical_device_info *info) +{ + return info->features2.features.occlusionQueryPrecise; +} + static bool feature_level_9_3_supported(const struct wined3d_physical_device_info *info, unsigned int shader_model) { return shader_model >= 3 @@ -2293,6 +2298,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (shader_model <= 1) return WINED3D_FEATURE_LEVEL_8; + if (!feature_level_9_2_supported(info)) + return WINED3D_FEATURE_LEVEL_9_1; + if (!feature_level_9_3_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_9_2;

1 0

Zebediah Figura : wined3d: Require pipeline statistics queries to create a feature level 10.0 device.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: a25ae51c1462eb2219f28d184a0d5838109da572 URL: https://gitlab.winehq.org/wine/wine/-/commit/a25ae51c1462eb2219f28d184a0d58… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:11:26 2022 -0600 wined3d: Require pipeline statistics queries to create a feature level 10.0 device. --- dlls/wined3d/adapter_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a7b2ff76e28..12bef2fba51 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2265,6 +2265,7 @@ static bool feature_level_10_supported(const struct wined3d_physical_device_info && info->features2.features.geometryShader && info->features2.features.depthClamp && info->features2.features.depthBiasClamp + && info->features2.features.pipelineStatisticsQuery && info->vertex_divisor_features.vertexAttributeInstanceRateDivisor && info->vertex_divisor_features.vertexAttributeInstanceRateZeroDivisor; }

1 0

Zebediah Figura : wined3d: Require vertex pipeline image stores and atomics to create a feature level 11.1 device.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: ec62575e9d99fc35752760cc37ded207febdfd11 URL: https://gitlab.winehq.org/wine/wine/-/commit/ec62575e9d99fc35752760cc37ded2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 4 19:19:40 2022 -0600 wined3d: Require vertex pipeline image stores and atomics to create a feature level 11.1 device. --- dlls/wined3d/adapter_vk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 12bef2fba51..713aaec9e39 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2283,6 +2283,11 @@ static bool feature_level_11_supported(const struct wined3d_physical_device_info && info->features2.features.tessellationShader; } +static bool feature_level_11_1_supported(const struct wined3d_physical_device_info *info) +{ + return info->features2.features.vertexPipelineStoresAndAtomics; +} + static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_physical_device_info *info, const struct shader_caps *shader_caps) { @@ -2314,6 +2319,9 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_p if (!feature_level_11_supported(info, shader_model)) return WINED3D_FEATURE_LEVEL_10_1; + if (!feature_level_11_1_supported(info)) + return WINED3D_FEATURE_LEVEL_11; + return WINED3D_FEATURE_LEVEL_11_1; }

1 0

Huw Davies : winemac: Fix printf format warnings in window.c.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: abec83e50979d7c5ed0f2b99a52a361d3db96dc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/abec83e50979d7c5ed0f2b99a52a36… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 16:18:53 2022 +0000 winemac: Fix printf format warnings in window.c. --- dlls/winemac.drv/window.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 37696f02d25..896efb6a68e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); static pthread_mutex_t win_data_mutex; static CFMutableDictionaryRef win_datas; -static DWORD activate_on_focus_time; +static unsigned int activate_on_focus_time; /*********************************************************************** @@ -129,10 +129,10 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, * * Helper for macdrv_window_to_mac_rect and macdrv_mac_to_window_rect. */ -static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT *rect, +static void get_mac_rect_offset(struct macdrv_win_data *data, unsigned int style, RECT *rect, const RECT *window_rect, const RECT *client_rect) { - DWORD ex_style, style_mask = 0, ex_style_mask = 0; + unsigned int ex_style, style_mask = 0, ex_style_mask = 0; rect->top = rect->bottom = rect->left = rect->right = 0; @@ -1309,7 +1309,7 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) { MSG msg; RECT origRect, movedRect, desktopRect; - LONG hittest = (LONG)(wparam & 0x0f); + int hittest = (int)(wparam & 0x0f); POINT capturePoint; LONG style = NtUserGetWindowLongW(hwnd, GWL_STYLE); BOOL moved = FALSE; @@ -1325,7 +1325,7 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) capturePoint.y = (short)HIWORD(dwPoint); NtUserClipCursor(NULL); - TRACE("hwnd %p hittest %d, pos %d,%d\n", hwnd, hittest, capturePoint.x, capturePoint.y); + TRACE("hwnd %p hittest %d, pos %d,%d\n", hwnd, hittest, (int)capturePoint.x, (int)capturePoint.y); origRect.left = origRect.right = origRect.top = origRect.bottom = 0; if (AdjustWindowRectEx(&origRect, style, FALSE, NtUserGetWindowLongW(hwnd, GWL_EXSTYLE))) @@ -1486,9 +1486,9 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) /*********************************************************************** * perform_window_command */ -static void perform_window_command(HWND hwnd, DWORD style_any, DWORD style_none, WORD command, WORD hittest) +static void perform_window_command(HWND hwnd, unsigned int style_any, unsigned int style_none, WORD command, WORD hittest) { - DWORD style; + unsigned int style; TRACE("win %p style_any 0x%08x style_none 0x%08x command 0x%04x hittest 0x%04x\n", hwnd, style_any, style_none, command, hittest); @@ -1668,7 +1668,7 @@ void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, DWOR { struct macdrv_win_data *data = get_win_data(hwnd); - TRACE("hwnd %p key %#08x alpha %#02x flags %x\n", hwnd, key, alpha, flags); + TRACE("hwnd %p key %#08x alpha %#02x flags %x\n", hwnd, (unsigned int)key, alpha, (unsigned int)flags); if (data) { @@ -1757,7 +1757,7 @@ void macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) { struct macdrv_win_data *data; - TRACE("hwnd %p offset %d styleOld 0x%08x styleNew 0x%08x\n", hwnd, offset, style->styleOld, style->styleNew); + TRACE("hwnd %p offset %d styleOld 0x%08x styleNew 0x%08x\n", hwnd, offset, (unsigned int)style->styleOld, (unsigned int)style->styleNew); if (hwnd == NtUserGetDesktopWindow()) return; if (!(data = get_win_data(hwnd))) return; @@ -1865,7 +1865,7 @@ LRESULT macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) !NtUserGetWindowLongPtrW(hwnd, GWLP_ID) && (NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_SYSMENU)) { - TRACE("ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam); + TRACE("ignoring SC_KEYMENU wp %lx lp %lx\n", (unsigned long)wparam, lparam); ret = 0; } @@ -2022,7 +2022,7 @@ LRESULT macdrv_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) return 0; } - FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp); + FIXME("unrecognized window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, (unsigned long)wp, lp); return 0; } @@ -2104,7 +2104,7 @@ void macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, { struct macdrv_thread_data *thread_data; struct macdrv_win_data *data; - DWORD new_style = NtUserGetWindowLongW(hwnd, GWL_STYLE); + unsigned int new_style = NtUserGetWindowLongW(hwnd, GWL_STYLE); RECT old_window_rect, old_whole_rect, old_client_rect; if (!(data = get_win_data(hwnd))) return; @@ -2298,16 +2298,16 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) if (data->window_rect.left == rect.left && data->window_rect.top == rect.top) flags |= SWP_NOMOVE; else - TRACE("%p moving from (%d,%d) to (%d,%d)\n", hwnd, data->window_rect.left, - data->window_rect.top, rect.left, rect.top); + TRACE("%p moving from (%d,%d) to (%d,%d)\n", hwnd, (int)data->window_rect.left, + (int)data->window_rect.top, (int)rect.left, (int)rect.top); if ((data->window_rect.right - data->window_rect.left == width && data->window_rect.bottom - data->window_rect.top == height) || (IsRectEmpty(&data->window_rect) && width == 1 && height == 1)) flags |= SWP_NOSIZE; else - TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, data->window_rect.right - data->window_rect.left, - data->window_rect.bottom - data->window_rect.top, width, height); + TRACE("%p resizing from (%dx%d) to (%dx%d)\n", hwnd, (int)(data->window_rect.right - data->window_rect.left), + (int)(data->window_rect.bottom - data->window_rect.top), width, height); being_dragged = data->drag_event != NULL; release_win_data(data); @@ -2333,7 +2333,7 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) */ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) { - LONG style = NtUserGetWindowLongW(hwnd, GWL_STYLE); + unsigned int style = NtUserGetWindowLongW(hwnd, GWL_STYLE); if (!hwnd) return; @@ -2455,7 +2455,7 @@ void macdrv_window_did_minimize(HWND hwnd) void macdrv_window_did_unminimize(HWND hwnd) { struct macdrv_win_data *data; - DWORD style; + unsigned int style; TRACE("win %p\n", hwnd);

1 0

Huw Davies : winemac: Fix remaining printf format warnings.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 027bd21b0c2b7d1f4560cccc4a00213a4167be8d URL: https://gitlab.winehq.org/wine/wine/-/commit/027bd21b0c2b7d1f4560cccc4a0021… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 12 16:22:56 2022 +0000 winemac: Fix remaining printf format warnings. --- dlls/winemac.drv/macdrv_main.c | 10 +++++----- dlls/winemac.drv/opengl.c | 4 ++-- dlls/winemac.drv/unixlib.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 39bd66f3211..eeed9a4bcbe 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -132,12 +132,12 @@ HKEY open_hkcu_key(const char *name) sid = ((TOKEN_USER *)sid_data)->User.Sid; len = sprintf(buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, - MAKELONG(MAKEWORD(sid->IdentifierAuthority.Value[5], - sid->IdentifierAuthority.Value[4]), - MAKEWORD(sid->IdentifierAuthority.Value[3], - sid->IdentifierAuthority.Value[2]))); + (unsigned int)MAKELONG(MAKEWORD(sid->IdentifierAuthority.Value[5], + sid->IdentifierAuthority.Value[4]), + MAKEWORD(sid->IdentifierAuthority.Value[3], + sid->IdentifierAuthority.Value[2]))); for (i = 0; i < sid->SubAuthorityCount; i++) - len += sprintf(buffer + len, "-%u", sid->SubAuthority[i]); + len += sprintf(buffer + len, "-%u", (unsigned int)sid->SubAuthority[i]); ascii_to_unicode(bufferW, buffer, len); hkcu = reg_open_key(NULL, bufferW, len * sizeof(WCHAR)); diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e1da34892ba..ff78b183360 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -76,7 +76,7 @@ struct wgl_context BOOL sharing; LONG update_swap_interval; LONG view_moved; - DWORD last_flush_time; + unsigned int last_flush_time; UINT major; }; @@ -2222,7 +2222,7 @@ static void macdrv_glFlush(void) if (skip_single_buffer_flushes) { const pixel_format *pf = &pixel_formats[context->format - 1]; - DWORD now = NtGetTickCount(); + unsigned int now = NtGetTickCount(); TRACE("double buffer %d last flush time %d now %d\n", (int)pf->double_buffer, context->last_flush_time, now); diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 614e3ddb11a..07f0da4a6f3 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -87,7 +87,7 @@ struct init_params /* macdrv_notify_icon params */ struct notify_icon_params { - DWORD msg; + unsigned int msg; struct _NOTIFYICONDATAW *data; };

1 0

Zebediah Figura : include: Add CONFIGFLAG_* definitions.
by Alexandre Julliard 13 Dec '22

13 Dec '22

Module: wine Branch: master Commit: 760788557c7322f5480ea67e94097f9112d86d54 URL: https://gitlab.winehq.org/wine/wine/-/commit/760788557c7322f5480ea67e94097f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Dec 12 17:23:09 2022 -0600 include: Add CONFIGFLAG_* definitions. --- include/regstr.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/regstr.h b/include/regstr.h index 0be6c9ac5f1..850d16133a9 100644 --- a/include/regstr.h +++ b/include/regstr.h @@ -30,5 +30,25 @@ /* UninstallString <= 63 chars in Windows (otherwise problems) */ #define REGSTR_VAL_UNINSTALLER_COMMANDLINE TEXT("UninstallString") +#define CONFIGFLAG_DISABLED 0x00000001 +#define CONFIGFLAG_REMOVED 0x00000002 +#define CONFIGFLAG_MANUAL_INSTALL 0x00000004 +#define CONFIGFLAG_IGNORE_BOOT_LC 0x00000008 +#define CONFIGFLAG_NET_BOOT 0x00000010 +#define CONFIGFLAG_REINSTALL 0x00000020 +#define CONFIGFLAG_FAILEDINSTALL 0x00000040 +#define CONFIGFLAG_CANTSTOPACHILD 0x00000080 +#define CONFIGFLAG_OKREMOVEROM 0x00000100 +#define CONFIGFLAG_NOREMOVEEXIT 0x00000200 +#define CONFIGFLAG_FINISH_INSTALL 0x00000400 +#define CONFIGFLAG_NEEDS_FORCED_CONFIG 0x00000800 +#define CONFIGFLAG_NETBOOT_CARD 0x00001000 +#define CONFIGFLAG_PARTIAL_LOG_CONF 0x00002000 +#define CONFIGFLAG_SUPPRESS_SURPRISE 0x00004000 +#define CONFIGFLAG_VERIFY_HARDWARE 0x00008000 +#define CONFIGFLAG_FINISHINSTALL_UI 0x00010000 +#define CONFIGFLAG_FINISHINSTALL_ACTION 0x00020000 +#define CONFIGFLAG_BOOT_DEVICE 0x00040000 +#define CONFIGFLAG_NEEDS_CLASS_CONFIG 0x00080000 #endif /* _INC_REGSTR_H */

1 0