April 2020 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d9: Introduce helpers to convert between d3d9 and wined3d scanline ordering types.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: 4997657116bfd8645fc9ace8831966defa3046cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4997657116bfd8645fc9ace8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 2 15:22:55 2020 +0430 d3d9: Introduce helpers to convert between d3d9 and wined3d scanline ordering types. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 10 ++++++++++ dlls/d3d9/device.c | 4 ++-- dlls/d3d9/directx.c | 11 +++++------ dlls/d3d9/swapchain.c | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 0d7ab0172a..f9150384a3 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -341,6 +341,11 @@ static inline D3DMULTISAMPLE_TYPE d3dmultisample_type_from_wined3d(enum wined3d_ return (D3DMULTISAMPLE_TYPE)type; } +static inline D3DSCANLINEORDERING d3dscanlineordering_from_wined3d(enum wined3d_scanline_ordering ordering) +{ + return (D3DSCANLINEORDERING)ordering; +} + static inline unsigned int map_access_from_usage(unsigned int usage) { if (usage & D3DUSAGE_WRITEONLY) @@ -394,4 +399,9 @@ static inline enum wined3d_multisample_type wined3d_multisample_type_from_d3d(D3 return (enum wined3d_multisample_type)type; } +static inline enum wined3d_scanline_ordering wined3d_scanline_ordering_from_d3d(D3DSCANLINEORDERING ordering) +{ + return (enum wined3d_scanline_ordering)ordering; +} + #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 3f81f1474a..eb204ca088 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1030,7 +1030,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_mode.height = mode->Height; wined3d_mode.refresh_rate = mode->RefreshRate; wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format); - wined3d_mode.scanline_ordering = mode->ScanLineOrdering; + wined3d_mode.scanline_ordering = wined3d_scanline_ordering_from_d3d(mode->ScanLineOrdering); } if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters, extended)) @@ -4370,7 +4370,7 @@ static HRESULT WINAPI d3d9_device_GetDisplayModeEx(IDirect3DDevice9Ex *iface, mode->Height = wined3d_mode.height; mode->RefreshRate = wined3d_mode.refresh_rate; mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); - mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + mode->ScanLineOrdering = d3dscanlineordering_from_wined3d(wined3d_mode.scanline_ordering); } return hr; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 6a1745ee1c..41065796dd 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -525,7 +525,7 @@ static UINT WINAPI d3d9_GetAdapterModeCountEx(IDirect3D9Ex *iface, wined3d_mutex_lock(); count = wined3d_output_get_mode_count(d3d9->wined3d_outputs[output_idx], - wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering); + wined3dformat_from_d3dformat(filter->Format), wined3d_scanline_ordering_from_d3d(filter->ScanLineOrdering)); wined3d_mutex_unlock(); return count; @@ -550,9 +550,8 @@ static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_output_get_mode(d3d9->wined3d_outputs[output_idx], - wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering, mode_idx, - &wined3d_mode); + hr = wined3d_output_get_mode(d3d9->wined3d_outputs[output_idx], wined3dformat_from_d3dformat(filter->Format), + wined3d_scanline_ordering_from_d3d(filter->ScanLineOrdering), mode_idx, &wined3d_mode); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) @@ -561,7 +560,7 @@ static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, mode->Height = wined3d_mode.height; mode->RefreshRate = wined3d_mode.refresh_rate; mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); - mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + mode->ScanLineOrdering = d3dscanlineordering_from_wined3d(wined3d_mode.scanline_ordering); } return hr; @@ -596,7 +595,7 @@ static HRESULT WINAPI d3d9_GetAdapterDisplayModeEx(IDirect3D9Ex *iface, mode->Height = wined3d_mode.height; mode->RefreshRate = wined3d_mode.refresh_rate; mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); - mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + mode->ScanLineOrdering = d3dscanlineordering_from_wined3d(wined3d_mode.scanline_ordering); } return hr; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index be9c55ac3e..8d6cff982d 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -320,7 +320,7 @@ static HRESULT WINAPI d3d9_swapchain_GetDisplayModeEx(IDirect3DSwapChain9Ex *ifa mode->Height = wined3d_mode.height; mode->RefreshRate = wined3d_mode.refresh_rate; mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); - mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + mode->ScanLineOrdering = d3dscanlineordering_from_wined3d(wined3d_mode.scanline_ordering); } return hr;

1 0

Matteo Bruni : wined3d: Add a TRACE to wined3d_buffer_gl_upload_ranges().
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: 934ddd08bb10106fc1b2c291e07dd531c7d72990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=934ddd08bb10106fc1b2c291… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 1 21:51:07 2020 +0200 wined3d: Add a TRACE to wined3d_buffer_gl_upload_ranges(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index af83bb9460..cf32ffff6d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1492,6 +1492,9 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_range *range; + TRACE("buffer %p, context %p, data %p, data_offset %u, range_count %u, ranges %p.\n", + buffer, context, data, data_offset, range_count, ranges); + wined3d_buffer_gl_bind(buffer_gl, context_gl); while (range_count--)

1 0

Zebediah Figura : quartz/filesource: Get rid of the AsyncReader typedef.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: d1d01de751a916ca2d9e13a1d0aeb34319934cca URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1d01de751a916ca2d9e13a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 1 23:01:00 2020 -0500 quartz/filesource: Get rid of the AsyncReader typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 83 +++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d1d01de751a916ca2d9e…

1 0

Nikolay Sivov : ntdll: Fix trace pointer returned from RtlGetUnloadEventTraceEx().
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: 064c7bdbb4bb9857f6dcd8695529ea65655f449e URL: https://source.winehq.org/git/wine.git/?a=commit;h=064c7bdbb4bb9857f6dcd869… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 2 11:40:45 2020 +0300 ntdll: Fix trace pointer returned from RtlGetUnloadEventTraceEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 +++- dlls/ntdll/tests/exception.c | 26 +++++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b946416734..23fde1f516 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -197,6 +197,7 @@ typedef struct _RTL_UNLOAD_EVENT_TRACE } RTL_UNLOAD_EVENT_TRACE, *PRTL_UNLOAD_EVENT_TRACE; static RTL_UNLOAD_EVENT_TRACE unload_traces[RTL_UNLOAD_EVENT_TRACE_NUMBER]; +static RTL_UNLOAD_EVENT_TRACE *unload_trace_ptr; static unsigned int unload_trace_seq; static void module_push_unload_trace( const LDR_MODULE *ldr ) @@ -213,6 +214,7 @@ static void module_push_unload_trace( const LDR_MODULE *ldr ) ptr->ImageName[len / sizeof(*ptr->ImageName)] = 0; unload_trace_seq = (unload_trace_seq + 1) % ARRAY_SIZE(unload_traces); + unload_trace_ptr = unload_traces; } /********************************************************************* @@ -233,7 +235,7 @@ void WINAPI RtlGetUnloadEventTraceEx(ULONG **size, ULONG **count, void **trace) *size = &element_size; *count = &element_count; - *trace = unload_traces; + *trace = &unload_trace_ptr; } /************************************************************************* diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 249ba9d7c3..72afb0a376 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3410,21 +3410,20 @@ static void test_suspend_process(void) static void test_unload_trace(void) { static const WCHAR imageW[] = {'m','s','x','m','l','3','.','d','l','l',0}; - RTL_UNLOAD_EVENT_TRACE *unload_trace, *ptr; + RTL_UNLOAD_EVENT_TRACE *unload_trace, **unload_trace_ex = NULL, *ptr; ULONG *element_size, *element_count, size; - BOOL found = FALSE; HMODULE hmod; + BOOL found; unload_trace = pRtlGetUnloadEventTrace(); ok(unload_trace != NULL, "Failed to get unload events pointer.\n"); if (pRtlGetUnloadEventTraceEx) { - ptr = NULL; - pRtlGetUnloadEventTraceEx(&element_size, &element_count, (void **)&ptr); + pRtlGetUnloadEventTraceEx(&element_size, &element_count, (void **)&unload_trace_ex); ok(*element_size >= sizeof(*ptr), "Unexpected element size.\n"); ok(*element_count == RTL_UNLOAD_EVENT_TRACE_NUMBER, "Unexpected trace element count %u.\n", *element_count); - ok(ptr != NULL, "Unexpected pointer %p.\n", ptr); + ok(unload_trace_ex != NULL, "Unexpected pointer %p.\n", unload_trace_ex); size = *element_size; } else @@ -3434,6 +3433,7 @@ static void test_unload_trace(void) ok(hmod != NULL, "Failed to load library.\n"); FreeLibrary(hmod); + found = FALSE; ptr = unload_trace; while (ptr->BaseAddress != NULL) { @@ -3445,6 +3445,22 @@ static void test_unload_trace(void) ptr = (RTL_UNLOAD_EVENT_TRACE *)((char *)ptr + size); } ok(found, "Unloaded module wasn't found.\n"); + + if (unload_trace_ex) + { + found = FALSE; + ptr = *unload_trace_ex; + while (ptr->BaseAddress != NULL) + { + if (!lstrcmpW(imageW, ptr->ImageName)) + { + found = TRUE; + break; + } + ptr = (RTL_UNLOAD_EVENT_TRACE *)((char *)ptr + size); + } + ok(found, "Unloaded module wasn't found.\n"); + } } START_TEST(exception)

1 0

Francois Gouget : wpp: Standardize the error and warning messages.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: bda70216a62bd8c69b698882f8a6e13c4b9ae1e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bda70216a62bd8c69b698882… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 2 11:09:37 2020 +0200 wpp: Standardize the error and warning messages. Use lowercase 'error:' and 'warning:' prefixes like other tools so the messages can be recognized by standard tools. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wpp/preproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index df5adf0dbc..284704b9f4 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -692,7 +692,7 @@ int ppy_error(const char *s, ...) { va_list ap; va_start(ap, s); - generic_msg(s, "Error", ppy_text, ap); + generic_msg(s, "error", ppy_text, ap); va_end(ap); exit(1); } @@ -701,7 +701,7 @@ int ppy_warning(const char *s, ...) { va_list ap; va_start(ap, s); - generic_msg(s, "Warning", ppy_text, ap); + generic_msg(s, "warning", ppy_text, ap); va_end(ap); return 0; }

1 0

Akihiro Sagawa : ddraw/tests: Add more managed texture tests.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: 8bb3ebced4a7bd11ad929eafe7d7ffb3a6e96463 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bb3ebced4a7bd11ad929eaf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 2 00:13:42 2020 +0900 ddraw/tests: Add more managed texture tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 73 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 142 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bb3ebced4a7bd11ad92…

1 0

Akihiro Sagawa : ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: 62e13708d0cc01a4a9f613c077a680709bcc2e4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=62e13708d0cc01a4a9f613c0… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 2 00:13:45 2020 +0900 ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48844 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 1 + dlls/ddraw/tests/ddraw4.c | 2 -- dlls/ddraw/tests/ddraw7.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3f737d1294..20143891d3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6252,6 +6252,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->ddsCaps.dwCaps2 & (DDSCAPS2_TEXTUREMANAGE | DDSCAPS2_D3DTEXTUREMANAGE)) { + wined3d_desc.bind_flags &= ~WINED3D_BIND_RENDER_TARGET; wined3d_desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; /* Managed textures have the system memory flag set. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6c79f70845..7c53c7e2e9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6231,10 +6231,8 @@ static void test_rt_caps(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if(i == 10 || i == 11) ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x and caps2 %#x, hr %#x.\n", i, test_data[i].caps_in, test_data[i].caps2_in, hr); - if (FAILED(hr)) continue; memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 34ac5935fb..9e50c1a7bc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5968,10 +5968,8 @@ static void test_rt_caps(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - todo_wine_if(i == 10 || i == 11) ok(SUCCEEDED(hr), "Test %u: Failed to create surface with caps %#x and caps2 %#x, hr %#x.\n", i, test_data[i].caps_in, test_data[i].caps2_in, hr); - if (FAILED(hr)) continue; memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc);

1 0

Matteo Bruni : wined3d: Get rid of a WARN in wined3d_query_get_data().
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: 913ca5c80156774165626d1fe4801878e6c3e3a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=913ca5c80156774165626d1f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 1 21:51:05 2020 +0200 wined3d: Get rid of a WARN in wined3d_query_get_data(). We've been handling the flags for a while. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 66965020b4..ab3bb74380 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -456,9 +456,6 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, TRACE("query %p, data %p, data_size %u, flags %#x.\n", query, data, data_size, flags); - if (flags) - WARN("Ignoring flags %#x.\n", flags); - if (query->state == QUERY_BUILDING) { WARN("Query is building, returning S_FALSE.\n");

1 0

Dmitry Timoshkov : adsldp: Map 1.2.840.113556.1.4.907 to ADSTYPE_NT_SECURITY_DESCRIPTOR.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: ab54779c61e75f63be278b37bca01ba566124458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab54779c61e75f63be278b37… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 2 17:17:22 2020 +0800 adsldp: Map 1.2.840.113556.1.4.907 to ADSTYPE_NT_SECURITY_DESCRIPTOR. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 1 + dlls/adsldp/schema.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 9a52d78500..550f78bd9a 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1484,6 +1484,7 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex } case ADSTYPE_OCTET_STRING: + case ADSTYPE_NT_SECURITY_DESCRIPTOR: { struct berval **values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); if (!values) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 101a84c196..f0ecfc3ac6 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -99,6 +99,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.40")) return ADSTYPE_OCTET_STRING; + if (!wcscmp(type->syntax, L"1.2.840.113556.1.4.907")) + return ADSTYPE_NT_SECURITY_DESCRIPTOR; FIXME("not handled type syntax %s for %s\n", debugstr_w(type->syntax), debugstr_w(name)); return ADSTYPE_CASE_IGNORE_STRING;

1 0

Alexandre Julliard : makefiles: Always explicitly specify the C runtime import.
by Alexandre Julliard April 2, 2020

April 2, 2020

Module: wine Branch: master Commit: e67ca92f5721acb0e5252951dd2bc15d637af2be URL: https://source.winehq.org/git/wine.git/?a=commit;h=e67ca92f5721acb0e5252951… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 11:30:23 2020 +0200 makefiles: Always explicitly specify the C runtime import. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 0ff17564d7..061d8c6572 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2236,7 +2236,6 @@ static struct strarray get_default_imports( const struct makefile *make ) struct strarray ret = empty_strarray; if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret; - if (make->use_msvcrt) strarray_add( &ret, "msvcrt" ); strarray_add( &ret, "winecrt0" ); if (make->is_win16) strarray_add( &ret, "kernel" ); strarray_add( &ret, "kernel32" ); @@ -4270,12 +4269,8 @@ static void load_sources( struct makefile *make ) } if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) { - if (make->use_msvcrt && !make->testdll && !make->staticlib) - { - strarray_add( &make->imports, "ucrtbase" ); - crt_dll = "ucrtbase"; - } - else crt_dll = "msvcrt"; + crt_dll = !make->testdll && !make->staticlib ? "ucrtbase" : "msvcrt"; + strarray_add( &make->imports, crt_dll ); } if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); } @@ -4289,7 +4284,6 @@ static void load_sources( struct makefile *make ) { for (i = 0; i < make->imports.count; i++) strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); - if (crt_dll) strarray_add_uniq( &cross_import_libs, crt_dll ); if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" );

1 0