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

Henri Verbeet : explorer: Initialise window->pidl to NULL in shellwindows_Register().
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 6b49b50bbe16b6100a8efd0f1b6417279fa8574b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b49b50bbe16b6100a8efd0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 13:41:36 2021 +0200 explorer: Initialise window->pidl to NULL in shellwindows_Register(). Since array_reserve() doesn't. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 94d178880a8..51d1535aea6 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1219,6 +1219,7 @@ static HRESULT WINAPI shellwindows_Register(IShellWindows *iface, window->hwnd = hwnd; window->class = class; *cookie = window->cookie = ++cookie_counter; + window->pidl = NULL; LeaveCriticalSection(&sw->cs); return S_OK;

1 0

Alex Henrie : kernel32: Print processor group in Get(Active|Maximum)ProcessorCount.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 1e9757778c04679a51c7f5cbf425d794e2e3ade1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e9757778c04679a51c7f5cb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Apr 26 01:19:14 2021 -0600 kernel32: Print processor group in Get(Active|Maximum)ProcessorCount. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f07a997bea3..b31d73bc5a5 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -620,7 +620,7 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } @@ -631,7 +631,7 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; }

1 0

Sven Baars : dwrite: Fix some memory leaks (Coverity).
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 7ed4810a0ea06f19b2de82f765a916e6faffd1cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ed4810a0ea06f19b2de82f7… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 24 13:24:06 2021 +0200 dwrite: Fix some memory leaks (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 3 +++ dlls/dwrite/main.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 44a61aba1ef..d25ba2dd06b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4484,7 +4484,10 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat } if (FAILED(hr)) + { + release_font_data(font_data); break; + } } IDWriteFontFileStream_Release(stream); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 825e323b468..2a0b69400f4 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1590,6 +1590,7 @@ static HRESULT create_system_path_list(WCHAR ***ret, unsigned int *ret_count) index++; } + heap_free(value); heap_free(name); *ret = paths;

1 0

Anton Baskanov : winegstreamer: Allow setting the stop position to the stream duration.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: d7fecebe93938bf1ef2349ac74413e28d6b8e153 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7fecebe93938bf1ef2349ac… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 26 09:51:24 2021 +0700 winegstreamer: Allow setting the stop position to the stream duration. Since we no longer stop the GStreamer pipeline, it does not reset the stop position for us. Fixes a hang during intro video playback in RC Cars. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index fbc9fd32628..e12a0c49eb3 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -875,7 +875,7 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) * it transitions from stopped -> paused. */ seeking = &filter->sources[0]->seek; - if (seeking->llStop && seeking->llStop != seeking->llDuration) + if (seeking->llStop) stop_flags = AM_SEEKING_AbsolutePositioning; unix_funcs->wg_parser_stream_seek(filter->sources[0]->wg_stream, seeking->dRate, seeking->llCurrent, seeking->llStop, AM_SEEKING_AbsolutePositioning, stop_flags);

1 0

Sven Baars : ddraw/tests: Move a misplaced assignment (Coverity).
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 50c541176f9120ec463d91ada59a167bae36d402 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50c541176f9120ec463d91ad… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 24 13:24:05 2021 +0200 ddraw/tests: Move a misplaced assignment (Coverity). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5536625abdd..a1d4dd942fa 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1342,9 +1342,9 @@ static void test_depth_blit(const GUID *device_guid) hr = IDirectDrawSurface_GetSurfaceDesc(ds1, &ddsd_existing); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; if (is_software_device_type(device_guid)) ddsd_new.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY; - ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; ddsd_new.dwWidth = ddsd_existing.dwWidth; ddsd_new.dwHeight = ddsd_existing.dwHeight; ddsd_new.ddpfPixelFormat = ddsd_existing.ddpfPixelFormat;

1 0

Anton Baskanov : winegstreamer: Fix integer overflow in scale_uint64.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: ad5342b87c1cb1697f6a801f6284ee8fc0657ac9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5342b87c1cb1697f6a801f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Apr 26 09:51:22 2021 +0700 winegstreamer: Fix integer overflow in scale_uint64. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/quartz_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 243dc9f80ba..fbc9fd32628 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -597,8 +597,8 @@ static uint64_t scale_uint64(uint64_t value, uint32_t numerator, uint32_t denomi return 0; i.QuadPart = value; - low.QuadPart = i.u.LowPart * numerator; - high.QuadPart = i.u.HighPart * numerator + low.u.HighPart; + low.QuadPart = (ULONGLONG)i.u.LowPart * numerator; + high.QuadPart = (ULONGLONG)i.u.HighPart * numerator + low.u.HighPart; low.u.HighPart = 0; if (high.u.HighPart >= denominator)

1 0

Ziqing Hui : windowscodecs: Add stub for DdsFrameEncode.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 0737c3c2159fc59850966d4238bac4ff0ba3e449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0737c3c2159fc59850966d42… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Apr 24 14:07:14 2021 +0800 windowscodecs: Add stub for DdsFrameEncode. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 234 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 231 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 873d4f1bb1f..ef6571842dd 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -169,6 +169,18 @@ typedef struct DdsEncoder { BOOL committed; } DdsEncoder; +typedef struct DdsFrameEncode { + IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; + LONG ref; + DdsEncoder *parent; + BOOL initialized; + BOOL frame_created; + UINT width; + UINT height; + double dpi_x; + double dpi_y; +} DdsFrameEncode; + static struct dds_format { DDS_PIXELFORMAT pixel_format; const GUID *wic_format; @@ -698,6 +710,11 @@ static inline DdsEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) return CONTAINING_RECORD(iface, DdsEncoder, IWICBitmapEncoder_iface); } +static inline DdsFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, DdsFrameEncode, IWICBitmapFrameEncode_iface); +} + static HRESULT WINAPI DdsFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, void **ppv) { @@ -1482,6 +1499,185 @@ static const IWICWineDecoderVtbl DdsDecoder_Wine_Vtbl = { DdsDecoder_Wine_Initialize }; +static HRESULT WINAPI DdsFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, void **ppv) +{ + DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) + { + *ppv = &This->IWICBitmapFrameEncode_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI DdsFrameEncode_AddRef(IWICBitmapFrameEncode *iface) +{ + DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI DdsFrameEncode_Release(IWICBitmapFrameEncode *iface) +{ + DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + IWICBitmapEncoder_Release(&This->parent->IWICBitmapEncoder_iface); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI DdsFrameEncode_Initialize(IWICBitmapFrameEncode *iface, + IPropertyBag2 *encoderOptions) +{ + FIXME("(%p,%p): stub\n", iface, encoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsFrameEncode_SetSize(IWICBitmapFrameEncode *iface, + UINT width, UINT height) +{ + DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + + TRACE("(%p,%u,%u)\n", iface, width, height); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || This->frame_created) + { + hr = WINCODEC_ERR_WRONGSTATE; + } + else + { + This->width = width; + This->height = height; + hr = S_OK; + } + + LeaveCriticalSection(&This->parent->lock); + + return hr; +} + +static HRESULT WINAPI DdsFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, + double dpiX, double dpiY) +{ + DdsFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + + TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || This->frame_created) + { + hr = WINCODEC_ERR_WRONGSTATE; + } + else + { + This->dpi_x = dpiX; + This->dpi_y = dpiY; + hr = S_OK; + } + + LeaveCriticalSection(&This->parent->lock); + + return hr; +} + +static HRESULT WINAPI DdsFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, + WICPixelFormatGUID *pixelFormat) +{ + FIXME("(%p,%s): stub\n", iface, debugstr_guid(pixelFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, + UINT count, IWICColorContext **colorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, count, colorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, + IWICPalette *palette) +{ + FIXME("(%p,%p): stub\n", iface, palette); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, + IWICBitmapSource *thumbnail) +{ + TRACE("(%p,%p)\n", iface, thumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI DdsFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, + UINT lineCount, UINT stride, UINT bufferSize, BYTE *pixels) +{ + FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, stride, bufferSize, pixels); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, + IWICBitmapSource *bitmapSource, WICRect *rc) +{ + FIXME("(%p,%p,%s): stub\n", iface, bitmapSource, debug_wic_rect(rc)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsFrameEncode_Commit(IWICBitmapFrameEncode *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI DdsFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, + IWICMetadataQueryWriter **metadataQueryWriter) +{ + FIXME("(%p,%p): stub\n", iface, metadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapFrameEncodeVtbl DdsFrameEncode_Vtbl = { + DdsFrameEncode_QueryInterface, + DdsFrameEncode_AddRef, + DdsFrameEncode_Release, + DdsFrameEncode_Initialize, + DdsFrameEncode_SetSize, + DdsFrameEncode_SetResolution, + DdsFrameEncode_SetPixelFormat, + DdsFrameEncode_SetColorContexts, + DdsFrameEncode_SetPalette, + DdsFrameEncode_SetThumbnail, + DdsFrameEncode_WritePixels, + DdsFrameEncode_WriteSource, + DdsFrameEncode_Commit, + DdsFrameEncode_GetMetadataQueryWriter +}; + HRESULT DdsDecoder_CreateInstance(REFIID iid, void** ppv) { DdsDecoder *This; @@ -1628,10 +1824,42 @@ static HRESULT WINAPI DdsEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmap } static HRESULT WINAPI DdsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, - IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) + IWICBitmapFrameEncode **frameEncode, IPropertyBag2 **encoderOptions) { - FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); - return E_NOTIMPL; + DdsEncoder *This = impl_from_IWICBitmapEncoder(iface); + DdsFrameEncode *result; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, frameEncode, encoderOptions); + + EnterCriticalSection(&This->lock); + + if (!This->stream) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(*result)); + if (!result) + { + hr = E_OUTOFMEMORY; + goto end; + } + + result->IWICBitmapFrameEncode_iface.lpVtbl = &DdsFrameEncode_Vtbl; + result->ref = 1; + result->parent = This; + result->initialized = FALSE; + result->frame_created = FALSE; + IWICBitmapEncoder_AddRef(iface); + + *frameEncode = &result->IWICBitmapFrameEncode_iface; + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI DdsEncoder_Commit(IWICBitmapEncoder *iface)

1 0

Rémi Bernon : mscoree: Initialize parsed_config_file private_path.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 7cc8df67c31322df65ef3069f2e7c0e82856080c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cc8df67c31322df65ef3069… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 22 21:06:16 2021 +0200 mscoree: Initialize parsed_config_file private_path. In case of error we may free uninitialized pointer otherwise. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 38f304f3df8..b6aa647d876 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -617,6 +617,7 @@ static const struct ISAXErrorHandlerVtbl ConfigFileHandlerErrorVtbl = static void init_config(parsed_config_file *config) { list_init(&config->supported_runtimes); + config->private_path = NULL; } static HRESULT parse_config(VARIANT input, parsed_config_file *result)

1 0

Henri Verbeet : wined3d: Correct the wined3d_device_set_blend_state() .spec entry.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: e6d9538c7d098dfa404c42d9020e4fde803e0e87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6d9538c7d098dfa404c42d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 13:41:33 2021 +0200 wined3d: Correct the wined3d_device_set_blend_state() .spec entry. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 203ffd67b89..3d10509c389 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -95,7 +95,7 @@ @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr ptr long) @ cdecl wined3d_device_set_base_vertex_index(ptr long) -@ cdecl wined3d_device_set_blend_state(ptr ptr ptr) +@ cdecl wined3d_device_set_blend_state(ptr ptr ptr long) @ cdecl wined3d_device_set_clip_status(ptr ptr) @ cdecl wined3d_device_set_compute_shader(ptr ptr) @ cdecl wined3d_device_set_constant_buffer(ptr long long ptr)

1 0

Alexandre Julliard : makefiles: Install PE import libraries in the architecture-specific directory.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: ee81814f2baa78975ff4ecb1522b0fb74620442b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee81814f2baa78975ff4ecb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 16:40:00 2021 +0200 makefiles: Install PE import libraries in the architecture-specific directory. Based on a patch by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 56 +++++++++++++------------------------------------------- 1 file changed, 13 insertions(+), 43 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c54eda772db..a6d525a92e8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -148,7 +148,6 @@ static struct strarray enable_tests; static struct strarray cmdline_vars; static struct strarray subdirs; static struct strarray disabled_dirs; -static struct strarray cross_import_libs; static struct strarray delay_import_libs; static struct strarray top_install_lib; static struct strarray top_install_dev; @@ -2128,26 +2127,6 @@ static struct makefile *get_parent_makefile( struct makefile *make ) } -/******************************************************************* - * needs_cross_lib - */ -static int needs_cross_lib( const struct makefile *make ) -{ - const char *name; - if (!crosstarget) return 0; - if (make->importlib) name = make->importlib; - else if (make->staticlib) - { - name = replace_extension( make->staticlib, ".a", "" ); - if (!strncmp( name, "lib", 3 )) name += 3; - } - else return 0; - if (strarray_exists( &cross_import_libs, name )) return 1; - if (delay_load_flag && strarray_exists( &delay_import_libs, name )) return 1; - return 0; -} - - /******************************************************************* * needs_delay_lib */ @@ -2683,8 +2662,8 @@ static struct strarray output_importlib_symlinks( const struct makefile *make ) int i, count = 0; ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; + if (crosstarget) ext[count++] = "cross.a"; if (needs_delay_lib( make )) ext[count++] = "delay.a"; - if (needs_cross_lib( make )) ext[count++] = "cross.a"; for (i = 0; i < count; i++) { @@ -3125,10 +3104,8 @@ static void output_source_default( struct makefile *make, struct incl_file *sour find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); int need_cross = (crosstarget && !(source->file->flags & FLAG_C_UNIX) && - (make->is_cross || - ((source->file->flags & FLAG_C_IMPLIB) && - (needs_cross_lib( make ) || needs_delay_lib( make ))) || - (make->staticlib && needs_cross_lib( make )))); + (make->is_cross || (make->module && make->staticlib) || + (source->file->flags & FLAG_C_IMPLIB))); int need_obj = ((*dll_ext || !(source->file->flags & FLAG_C_UNIX)) && (!need_cross || (source->file->flags & FLAG_C_IMPLIB) || @@ -3449,14 +3426,12 @@ static void output_module( struct makefile *make ) strmake( "lib%s.a", make->importlib ), strmake( "d$(dlldir)/lib%s.a", make->importlib )); } - if (crosstarget && (needs_cross_lib( make ) || needs_delay_lib( make ))) + if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" ); - if (needs_cross_lib( make )) - { - strarray_add( &make->clean_files, strmake( "lib%s.cross.a", make->importlib )); - output_filename( strmake( "%s.cross.a", importlib_path )); - } + + strarray_add( &make->clean_files, strmake( "lib%s.cross.a", make->importlib )); + output_filename( strmake( "%s.cross.a", importlib_path )); if (needs_delay_lib( make )) { strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); @@ -3472,6 +3447,9 @@ static void output_module( struct makefile *make ) output_filename( spec_file ); output_filenames_obj_dir( make, cross_files ); output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.cross.a", make->importlib ), + strmake( "d%s/lib%s.a", pe_dir, make->importlib )); } if (needs_implib_symlink( make )) strarray_addall( &top_makefile->clean_files, output_importlib_symlinks( make )); @@ -3502,7 +3480,7 @@ static void output_static_lib( struct makefile *make ) output( " && %s $@\n", ranlib ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d$(dlldir)/%s", make->staticlib )); - if (needs_cross_lib( make )) + if (crosstarget && make->module) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); @@ -3514,6 +3492,8 @@ static void output_static_lib( struct makefile *make ) tools_path( make, "winebuild" ), crosstarget ); output_filenames_obj_dir( make, make->crossobj_files ); output( "\n" ); + add_install_rule( make, make->staticlib, name, + strmake( "d%s/%s", pe_dir, make->staticlib )); } } @@ -4301,16 +4281,6 @@ static void load_sources( struct makefile *make ) make->is_cross = crosstarget && make->use_msvcrt; - if (make->is_cross) - { - strarray_addall_uniq( &cross_import_libs, make->imports ); - strarray_addall_uniq( &cross_import_libs, make->extra_imports ); - 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" ); - strarray_add_uniq( &cross_import_libs, "ntdll" ); - } - if (!*dll_ext || make->is_cross) for (i = 0; i < make->delayimports.count; i++) strarray_add_uniq( &delay_import_libs, get_base_name( make->delayimports.str[i] ));

1 0