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

Akihiro Sagawa : gdi32: Implement GetCharWidthInfo().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1128587fd262f9ad476b49e7837ac74dd656e6ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=1128587fd262f9ad476b49e7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 9 10:32:59 2019 +0100 gdi32: Implement GetCharWidthInfo(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 2 ++ dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/dc.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/font.c | 24 ++++++++++++++++++++++++ dlls/gdi32/freetype.c | 35 +++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdi_private.h | 8 ++++++++ dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/path.c | 1 + dlls/wineandroid.drv/init.c | 1 + dlls/winemac.drv/gdi.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 16 files changed, 87 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1128587fd262f9ad476b…

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExReleaseResourceLite().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: aeed70689cee9b0da5912d79ea0a84d66879e256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeed70689cee9b0da5912d79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:16 2019 -0500 ntoskrnl.exe: Implement ExReleaseResourceLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 9 +++++++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2d8bdb5..06ec176 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4225,14 +4225,6 @@ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) } /********************************************************************* - * ExReleaseResourceLite (NTOSKRNL.@) - */ -void WINAPI ExReleaseResourceLite(PERESOURCE resource) -{ - FIXME("stub: %p\n", resource); -} - -/********************************************************************* * PsGetProcessWow64Process (NTOSKRNL.@) */ PVOID WINAPI PsGetProcessWow64Process(PEPROCESS process) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ee26d8b..2d1c826 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -9,7 +9,7 @@ @ stdcall -fastcall -arch=i386 ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection @ stdcall -fastcall ExReleaseFastMutexUnsafe(ptr) -@ stdcall ExReleaseResourceLite(ptr) +@ stdcall -fastcall ExReleaseResourceLite(ptr) @ stub ExReleaseRundownProtection @ stub ExReleaseRundownProtectionEx @ stub ExRundownCompleted diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 88c9ea7..2ea2e61 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1066,3 +1066,12 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA KeReleaseSpinLock( &resource->SpinLock, irql ); } + +/*********************************************************************** + * ExReleaseResourceLite (NTOSKRNL.EXE.@) + */ +DEFINE_FASTCALL1_WRAPPER( ExReleaseResourceLite ) +void WINAPI ExReleaseResourceLite( ERESOURCE *resource ) +{ + ExReleaseResourceForThreadLite( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); +}

1 0

Zebediah Figura : qcap/tests: Add some tests for IPersistPropertyBag on the AVI compressor.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 5f32efcf19a1b3650ee8b3bff0b4b772771ea0cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f32efcf19a1b3650ee8b3bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 18:02:34 2019 -0500 qcap/tests: Add some tests for IPersistPropertyBag on the AVI compressor. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 2d2d4c7..0ee2e1b 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -330,6 +330,89 @@ static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, return 0; } +static HRESULT WINAPI property_bag_QueryInterface(IPropertyBag *iface, REFIID iid, void **out) +{ + ok(0, "Unexpected call (iid %s).\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI property_bag_AddRef(IPropertyBag *iface) +{ + ok(0, "Unexpected call.\n"); + return 2; +} + +static ULONG WINAPI property_bag_Release(IPropertyBag *iface) +{ + ok(0, "Unexpected call.\n"); + return 1; +} + +static const WCHAR fcchandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; +static BSTR ppb_handler; +static unsigned int ppb_got_read; + +static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) +{ + ok(!lstrcmpW(name, fcchandlerW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); + todo_wine ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var)); + ok(!log, "Got unexpected error log %p.\n", log); + V_BSTR(var) = SysAllocString(ppb_handler); + ppb_got_read++; + return S_OK; +} + +static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, const WCHAR *name, VARIANT *var) +{ + ok(0, "Unexpected call (name %s).\n", wine_dbgstr_w(name)); + return E_FAIL; +} + +static const IPropertyBagVtbl property_bag_vtbl = +{ + property_bag_QueryInterface, + property_bag_AddRef, + property_bag_Release, + property_bag_Read, + property_bag_Write, +}; + +static void test_property_bag(IMoniker *mon) +{ + IPropertyBag property_bag = {&property_bag_vtbl}; + IPropertyBag *devenum_bag; + IPersistPropertyBag *ppb; + VARIANT var; + HRESULT hr; + ULONG ref; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&devenum_bag); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(devenum_bag, fcchandlerW, &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ppb_handler = V_BSTR(&var); + + hr = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistPropertyBag, (void **)&ppb); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPersistPropertyBag_InitNew(ppb); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ppb_got_read = 0; + hr = IPersistPropertyBag_Load(ppb, &property_bag, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ppb_got_read == 1, "Got %u calls to Read().\n", ppb_got_read); + + ref = IPersistPropertyBag_Release(ppb); + ok(!ref, "Got unexpected refcount %d.\n", ref); + + VariantClear(&var); + IPropertyBag_Release(devenum_bag); +} + START_TEST(avico) { static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', @@ -373,8 +456,11 @@ START_TEST(avico) ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); } - CoTaskMemFree(name); + if (!memcmp(name, test_display_name, 11 * sizeof(WCHAR))) + test_property_bag(mon); + + CoTaskMemFree(name); IMoniker_Release(mon); }

1 0

Zebediah Figura : qcap/avico: Initialize variant type to VT_BSTR in AVICompressorPropertyBag_Load().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 9e6e2ee8d9305cd86dfb402cf5b06da2043f6f02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e6e2ee8d9305cd86dfb402c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 18:02:35 2019 -0500 qcap/avico: Initialize variant type to VT_BSTR in AVICompressorPropertyBag_Load(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 2 +- dlls/qcap/tests/avico.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index d5020a0..3351b36 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -323,7 +323,7 @@ static HRESULT WINAPI AVICompressorPropertyBag_Load(IPersistPropertyBag *iface, TRACE("(%p)->(%p %p)\n", This, pPropBag, pErrorLog); - V_VT(&v) = VT_EMPTY; + V_VT(&v) = VT_BSTR; hres = IPropertyBag_Read(pPropBag, fcc_handlerW, &v, NULL); if(FAILED(hres)) { WARN("Could not read FccHandler: %08x\n", hres); diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 0ee2e1b..9ef66b9 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -355,7 +355,7 @@ static unsigned int ppb_got_read; static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) { ok(!lstrcmpW(name, fcchandlerW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); - todo_wine ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var)); + ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var)); ok(!log, "Got unexpected error log %p.\n", log); V_BSTR(var) = SysAllocString(ppb_handler); ppb_got_read++; @@ -403,7 +403,7 @@ static void test_property_bag(IMoniker *mon) ppb_got_read = 0; hr = IPersistPropertyBag_Load(ppb, &property_bag, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ppb_got_read == 1, "Got %u calls to Read().\n", ppb_got_read); ref = IPersistPropertyBag_Release(ppb);

1 0

Zebediah Figura : qcap/tests: Get rid of test_AviCo().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 28bdddcc2b1e5ec7218eb6a71c7d575b708c6bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28bdddcc2b1e5ec7218eb6a7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 18:02:36 2019 -0500 qcap/tests: Get rid of test_AviCo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/qcap.c | 137 ------------------------------------------------- 1 file changed, 137 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 20ab2e9..a250139 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -59,7 +59,6 @@ DEFINE_EXPECT(ReceiveConnection); DEFINE_EXPECT(GetAllocatorRequirements); DEFINE_EXPECT(NotifyAllocator); DEFINE_EXPECT(Reconnect); -DEFINE_EXPECT(Read_FccHandler); DEFINE_EXPECT(MediaSeeking_GetPositions); DEFINE_EXPECT(MemAllocator_GetProperties); DEFINE_EXPECT(MemInputPin_QueryInterface_IStream); @@ -74,28 +73,6 @@ DEFINE_EXPECT(MediaSample_GetActualDataLength); DEFINE_EXPECT(MediaSample_GetSize); DEFINE_EXPECT(MediaSample_GetMediaTime); -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len-1); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - typedef enum { SOURCE_FILTER, SINK_FILTER, @@ -1737,119 +1714,6 @@ static void test_AviMux(char *arg) ok(ref == 0, "IStream was not destroyed (%d)\n", ref); } -static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv) -{ - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IPropertyBag, riid)) { - *ppv = iface; - return S_OK; - } - - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI PropertyBag_AddRef(IPropertyBag *iface) -{ - return 2; -} - -static ULONG WINAPI PropertyBag_Release(IPropertyBag *iface) -{ - return 1; -} - -static HRESULT WINAPI PropertyBag_Read(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog) -{ - ok(!pErrorLog, "pErrorLog = %p\n", pErrorLog); - - if(!strcmp_wa(pszPropName, "FccHandler")) { - CHECK_EXPECT(Read_FccHandler); - V_VT(pVar) = VT_BSTR; - V_BSTR(pVar) = a2bstr("mrle"); - return S_OK; - } - - ok(0, "unexpected call: %s\n", wine_dbgstr_w(pszPropName)); - return E_NOTIMPL; -} - -static HRESULT WINAPI PropertyBag_Write(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar) -{ - ok(0, "unexpected call: %s\n", wine_dbgstr_w(pszPropName)); - return E_NOTIMPL; -} - -static const IPropertyBagVtbl PropertyBagVtbl = { - PropertyBag_QueryInterface, - PropertyBag_AddRef, - PropertyBag_Release, - PropertyBag_Read, - PropertyBag_Write -}; - -static IPropertyBag PropertyBag = { &PropertyBagVtbl }; - -static void test_AviCo(void) -{ - IPersistPropertyBag *persist_bag; - IPin *pin, *in_pin, *out_pin; - IEnumPins *enum_pins; - IBaseFilter *avico; - PIN_INFO pin_info; - HRESULT hres; - - static const WCHAR inputW[] = {'I','n','p','u','t',0}; - static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; - - hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); - if(hres == REGDB_E_CLASSNOTREG || hres == CLASS_E_CLASSNOTAVAILABLE) { - win_skip("CLSID_AVICo not registered/available\n"); - return; - } - ok(hres == S_OK, "Could not create CLSID_AVICo class: %08x\n", hres); - - hres = IBaseFilter_QueryInterface(avico, &IID_IPin, (void**)&pin); - ok(hres == E_NOINTERFACE, "QueryInterface(IID_IPin) returned: %08x\n", hres); - - hres = IBaseFilter_QueryInterface(avico, &IID_IPersistPropertyBag, (void**)&persist_bag); - ok(hres == S_OK, "QueryInterface(IID_IPersistPropertyBag) returned: %08x\n", hres); - - SET_EXPECT(Read_FccHandler); - hres = IPersistPropertyBag_Load(persist_bag, &PropertyBag, NULL); - ok(hres == S_OK, "Load failed: %08x\n", hres); - CHECK_CALLED(Read_FccHandler); - - IPersistPropertyBag_Release(persist_bag); - - hres = IBaseFilter_EnumPins(avico, &enum_pins); - ok(hres == S_OK, "EnumPins failed: %08x\n", hres); - - hres = IEnumPins_Next(enum_pins, 1, &in_pin, NULL); - ok(hres == S_OK, "Next failed: %08x\n", hres); - - hres = IPin_QueryPinInfo(in_pin, &pin_info); - ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres); - ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n"); - ok(pin_info.dir == PINDIR_INPUT, "pin_info.dir = %d\n", pin_info.dir); - todo_wine ok(!lstrcmpW(pin_info.achName, inputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); - - hres = IEnumPins_Next(enum_pins, 1, &out_pin, NULL); - ok(hres == S_OK, "Next failed: %08x\n", hres); - - hres = IPin_QueryPinInfo(out_pin, &pin_info); - ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres); - ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n"); - ok(pin_info.dir == PINDIR_OUTPUT, "pin_info.dir = %d\n", pin_info.dir); - todo_wine ok(!lstrcmpW(pin_info.achName, outputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); - - IEnumPins_Release(enum_pins); - - IPin_Release(in_pin); - IPin_Release(out_pin); - IBaseFilter_Release(avico); -} - /* Outer IUnknown for COM aggregation tests */ struct unk_impl { IUnknown IUnknown_iface; @@ -2005,7 +1869,6 @@ START_TEST(qcap) test_AviMux_QueryInterface(); test_AviMux(arg_c>2 ? arg_v[2] : NULL); - test_AviCo(); test_COM_vfwcapture(); CoUninitialize();

1 0

Piotr Caban : gdi32: Don't use strcasecmp.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 541c8d271e8f493a648b637d0d4aae16c27d05fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=541c8d271e8f493a648b637d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:23 2019 +0200 gdi32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3e4a876..352a866 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2875,7 +2875,7 @@ static void load_fontconfig_fonts(void) len = strlen( file ); if(len < 4) continue; ext = &file[ len - 3 ]; - if(strcasecmp(ext, "pfa") && strcasecmp(ext, "pfb")) + if(_strnicmp(ext, "pfa", -1) && _strnicmp(ext, "pfb", -1)) AddFontToList(file, NULL, 0, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); }

1 0

Alexandre Julliard : makefiles: Store resource files in a separate array.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 5edcae420aaf3972f669a16d17f62ca9e82f97e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5edcae420aaf3972f669a16d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:52:43 2019 +0200 makefiles: Store resource files in a separate array. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 307b7a3..20fec7f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -205,6 +205,7 @@ struct makefile struct strarray uninstall_files; struct strarray object_files; struct strarray crossobj_files; + struct strarray res_files; struct strarray c2man_files; struct strarray dlldata_files; struct strarray implib_objs; @@ -2567,8 +2568,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c unsigned int i; if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); - strarray_add( &make->object_files, strmake( "%s.res", obj )); - if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); @@ -2622,8 +2622,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c { unsigned int i; - strarray_add( &make->object_files, strmake( "%s.res", obj )); - if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + strarray_add( &make->res_files, strmake( "%s.res", obj )); strarray_add( &make->clean_files, strmake( "%s.pot", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s -U -O res -o $@ %s", tools_path( make, "wmc" ), source->filename ); @@ -2652,8 +2651,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c */ static void output_source_res( struct makefile *make, struct incl_file *source, const char *obj ) { - strarray_add( &make->object_files, source->name ); - if (crosstarget) strarray_add( &make->crossobj_files, source->name ); + strarray_add( &make->res_files, source->name ); } @@ -2883,8 +2881,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, obj_name = strmake( "%s%s", obj_dir_path( make, obj ), crosstarget ? ".cross.o" : ".o" ); strarray_add( &make->clean_files, dll_name ); - strarray_add( &make->object_files, strmake( "%s.res", obj )); - if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), obj_dir_path( make, dll_name )); output( "\techo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -o $@\n", obj, obj_dir_path( make, dll_name ), tools_path( make, "wrc" )); @@ -3101,6 +3098,7 @@ static void output_module( struct makefile *make ) } if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3113,6 +3111,7 @@ static void output_module( struct makefile *make ) } else output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); @@ -3260,6 +3259,7 @@ static void output_test_module( struct makefile *make ) output_winegcc_command( make, !!crosstarget ); output_filenames( make->appmode ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); @@ -3269,11 +3269,13 @@ static void output_test_module( struct makefile *make ) output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( make->appmode ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s %s%s:", obj_dir_path( make, testmodule ), ext, obj_dir_path( make, stripped ), ext ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3621,7 +3623,7 @@ static void output_sources( struct makefile *make ) if (top_makefile->submakes[i]->testdll && !top_makefile->submakes[i]->disabled) strarray_add( &tests, top_makefile->submakes[i]->testdll ); for (i = 0; i < tests.count; i++) - strarray_add( &make->object_files, replace_extension( tests.str[i], ".dll", "_test.res" )); + strarray_add( &make->res_files, replace_extension( tests.str[i], ".dll", "_test.res" )); } if (make->dlldata_files.count) @@ -3674,7 +3676,8 @@ static void output_sources( struct makefile *make ) } strarray_addall( &make->clean_files, make->object_files ); - strarray_addall_uniq( &make->clean_files, make->crossobj_files ); + strarray_addall( &make->clean_files, make->crossobj_files ); + strarray_addall( &make->clean_files, make->res_files ); strarray_addall( &make->clean_files, make->all_targets ); strarray_addall( &make->clean_files, make->extra_targets );

1 0

Alexandre Julliard : makefiles: Add a helper to generate a winegcc command line.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: cc7c6a734b76a33d2696c49236fd4626ff6d9077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7c6a734b76a33d2696c492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:34:05 2019 +0200 makefiles: Add a helper to generate a winegcc command line. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 59 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1a21b3d..3f09f3b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2224,6 +2224,28 @@ static struct strarray get_shared_lib_names( const char *libname ) /******************************************************************* + * output_winegcc_command + */ +static void output_winegcc_command( struct makefile *make, int cross ) +{ + output( "\t%s -o $@", tools_path( make, "winegcc" )); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + if (cross) + { + output_filename( "-b" ); + output_filename( crosstarget ); + output_filename( "--lib-suffix=.cross.a" ); + } + else + { + output_filenames( target_flags ); + output_filenames( unwind_flags ); + } +} + + +/******************************************************************* * output_symlink_rule * * Output a rule to create a symlink. @@ -2870,11 +2892,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); + output_filename( "-s" ); output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); @@ -2903,10 +2922,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filename( "--lib-suffix=.cross.a" ); + output_winegcc_command( make, 1 ); + output_filename( "-s" ); output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); @@ -3107,11 +3124,7 @@ static void output_module( struct makefile *make ) output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); if (spec_file) { output( " -shared %s", spec_file ); @@ -3262,22 +3275,15 @@ static void output_test_module( struct makefile *make ) strarray_add( &make->all_targets, strmake( "%s%s", testmodule, dll_ext )); strarray_add( &make->clean_files, strmake( "%s%s", stripped, dll_ext )); output( "%s%s:\n", obj_dir_path( make, testmodule ), dll_ext ); - output( "\t%s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s:\n", obj_dir_path( make, stripped ), dll_ext ); - output( "\t%s -s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); + output_filename( "-s" ); output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); @@ -3314,10 +3320,7 @@ static void output_test_module( struct makefile *make ) output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filename( "--lib-suffix=.cross.a" ); + output_winegcc_command( make, 1 ); output_filenames_obj_dir( make, make->crossobj_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" );

1 0

Alexandre Julliard : makefiles: Unify APPMODE and EXTRADLLFLAGS variables.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1d6a4102444f0f2dfd9f131ad4dc9811343cbd0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d6a4102444f0f2dfd9f131a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 10:13:37 2019 +0200 makefiles: Unify APPMODE and EXTRADLLFLAGS variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rundll.exe16/Makefile.in | 2 +- programs/svchost/Makefile.in | 2 +- programs/winhelp.exe16/Makefile.in | 2 +- programs/winoldap.mod16/Makefile.in | 2 +- tools/make_makefiles | 1 + tools/makedep.c | 29 +++++++++++++++-------------- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/programs/rundll.exe16/Makefile.in b/programs/rundll.exe16/Makefile.in index fe08104..4ea0fe9 100644 --- a/programs/rundll.exe16/Makefile.in +++ b/programs/rundll.exe16/Makefile.in @@ -1,4 +1,4 @@ MODULE = rundll.exe16 -APPMODE = -m16 +APPMODE = -mconsole -m16 C_SRCS = rundll.c diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in index b24af3b..0cbf5be 100644 --- a/programs/svchost/Makefile.in +++ b/programs/svchost/Makefile.in @@ -1,5 +1,5 @@ MODULE = svchost.exe -APPMODE = -municode +APPMODE = -mconsole -municode IMPORTS = advapi32 C_SRCS = \ diff --git a/programs/winhelp.exe16/Makefile.in b/programs/winhelp.exe16/Makefile.in index ad1695b..a9deacb 100644 --- a/programs/winhelp.exe16/Makefile.in +++ b/programs/winhelp.exe16/Makefile.in @@ -1,4 +1,4 @@ MODULE = winhelp.exe16 -APPMODE = -m16 +APPMODE = -mconsole -m16 C_SRCS = winhelp.c diff --git a/programs/winoldap.mod16/Makefile.in b/programs/winoldap.mod16/Makefile.in index cedf378..01fbf78 100644 --- a/programs/winoldap.mod16/Makefile.in +++ b/programs/winoldap.mod16/Makefile.in @@ -1,4 +1,4 @@ MODULE = winoldap.mod16 -APPMODE = -m16 +APPMODE = -mconsole -m16 C_SRCS = winoldap.c diff --git a/tools/make_makefiles b/tools/make_makefiles index 455ff9e..3936310 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -445,6 +445,7 @@ sub update_makefiles(@) if ($file =~ /^programs\//) { die "APPMODE should be defined in $file" unless defined $make{"APPMODE"} ; + die "APPMODE should contain -mconsole or -mwindows in $file" unless $make{"APPMODE"} =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe"; } else diff --git a/tools/makedep.c b/tools/makedep.c index 20fec7f..227d589 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -170,7 +170,6 @@ struct makefile struct strarray define_args; struct strarray programs; struct strarray scripts; - struct strarray appmode; struct strarray imports; struct strarray subdirs; struct strarray delayimports; @@ -195,6 +194,7 @@ struct makefile int disabled; int use_msvcrt; int is_win16; + int is_exe; struct makefile **submakes; /* values generated at output time */ @@ -2143,11 +2143,11 @@ static struct strarray get_default_imports( const struct makefile *make ) struct strarray ret = empty_strarray; if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret; - if (strarray_exists( &make->appmode, "-mno-cygwin" )) strarray_add( &ret, "msvcrt" ); + if (strarray_exists( &make->extradllflags, "-mno-cygwin" )) strarray_add( &ret, "msvcrt" ); + strarray_add( &ret, "winecrt0" ); if (make->is_win16) strarray_add( &ret, "kernel" ); strarray_add( &ret, "kernel32" ); strarray_add( &ret, "ntdll" ); - strarray_add( &ret, "winecrt0" ); return ret; } @@ -3070,8 +3070,7 @@ static void output_module( struct makefile *make ) char *spec_file = NULL; unsigned int i; - if (!make->appmode.count) - spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 )); add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ @@ -3106,10 +3105,10 @@ static void output_module( struct makefile *make ) output_winegcc_command( make, 0 ); if (spec_file) { - output( " -shared %s", spec_file ); - output_filenames( make->extradllflags ); + output_filename( "-shared" ); + output_filename( spec_file ); } - else output_filenames( make->appmode ); + output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); @@ -3257,7 +3256,7 @@ static void output_test_module( struct makefile *make ) strarray_add( &make->clean_files, strmake( "%s%s", stripped, ext )); output( "%s%s:\n", obj_dir_path( make, testmodule ), ext ); output_winegcc_command( make, !!crosstarget ); - output_filenames( make->appmode ); + output_filenames( make->extradllflags ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); @@ -3267,7 +3266,7 @@ static void output_test_module( struct makefile *make ) output_winegcc_command( make, !!crosstarget ); output_filename( "-s" ); output_filename( strmake( "-Wb,-F,%s", testmodule )); - output_filenames( make->appmode ); + output_filenames( make->extradllflags ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); @@ -3469,7 +3468,7 @@ static void output_subdirs( struct makefile *make ) if (!submake->staticlib) { strarray_add( &builddeps_deps, subdir ); - if (!submake->appmode.count) + if (!submake->is_exe) { output( "manpages htmlpages sgmlpages xmlpages::\n" ); output( "\t(a)cd %s && $(MAKE) $@\n", subdir ); @@ -3977,7 +3976,6 @@ static void load_sources( struct makefile *make ) make->programs = get_expanded_make_var_array( make, "PROGRAMS" ); make->scripts = get_expanded_make_var_array( make, "SCRIPTS" ); - make->appmode = get_expanded_make_var_array( make, "APPMODE" ); make->imports = get_expanded_make_var_array( make, "IMPORTS" ); make->delayimports = get_expanded_make_var_array( make, "DELAYIMPORTS" ); make->extradllflags = get_expanded_make_var_array( make, "EXTRADLLFLAGS" ); @@ -3987,9 +3985,12 @@ static void load_sources( struct makefile *make ) if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; + strarray_addall( &make->extradllflags, get_expanded_make_var_array( make, "APPMODE" )); make->disabled = make->base_dir && strarray_exists( &disabled_dirs, make->base_dir ); - make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ) || strarray_exists( &make->appmode, "-m16" ); - make->use_msvcrt = strarray_exists( &make->appmode, "-mno-cygwin" ); + make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ); + make->use_msvcrt = strarray_exists( &make->extradllflags, "-mno-cygwin" ); + make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) || + strarray_exists( &make->extradllflags, "-mwindows" ); for (i = 0; i < make->imports.count && !make->use_msvcrt; i++) make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) ||

1 0

Michael Stefaniuc : wineps.drv: Avoid using the comma operator.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 23be5e516bbba671915a0c30d8c7353b418e8718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23be5e516bbba671915a0c30… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:56 2019 +0200 wineps.drv: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index c4d0a96..c1de724 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -271,7 +271,7 @@ DWORD PSDRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, } dst_x = dst->visrect.left; - dst_y = dst->visrect.top, + dst_y = dst->visrect.top; dst_width = dst->visrect.right - dst->visrect.left; dst_height = dst->visrect.bottom - dst->visrect.top; if (src->width * dst->width < 0)

1 0