September 2020 - Wine-Commits

Nikolay Sivov : maintainers: Get rid of removed paths.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: bce18ee78ad60b55a23642de45a76669211ea642 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bce18ee78ad60b55a23642de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 13:41:00 2020 +0300 maintainers: Get rid of removed paths. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 46b3d40ec3..b57eb5a536 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -198,8 +198,6 @@ M: Huw Davies <huw(a)codeweavers.com> F: dlls/combase/ F: dlls/ole32/compobj.c F: dlls/ole32/marshal.c -F: dlls/ole32/rpc.c -F: dlls/ole32/stubmanager.c F: dlls/ole32/usrmarshal.c OLE Storage

1 0

Nikolay Sivov : ole32/tests: Use treat-as-class functions directly.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: a4f27c3c7776dfaf574a72f659ffcdca26aff2e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4f27c3c7776dfaf574a72f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 12:44:29 2020 +0300 ole32/tests: Use treat-as-class functions directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 98b3ef642b..e627521fa5 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -72,8 +72,6 @@ DEFINE_EXPECT(PostUninitialize); /* functions that are not present on all versions of Windows */ static HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); -static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); -static HRESULT (WINAPI * pCoTreatAsClass)(REFCLSID clsidOld, REFCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); static HRESULT (WINAPI * pCoGetApartmentType)(APTTYPE *type, APTTYPEQUALIFIER *qualifier); static HRESULT (WINAPI * pCoIncrementMTAUsage)(CO_MTA_USAGE_COOKIE *cookie); @@ -2190,21 +2188,15 @@ static void test_TreatAsClass(void) HKEY clsidkey, deadbeefkey; LONG lr; - if (!pCoGetTreatAsClass) - { - win_skip("CoGetTreatAsClass not present\n"); - return; - } - - hr = pCoGetTreatAsClass(&deadbeef,&out); + hr = CoGetTreatAsClass(&deadbeef,&out); ok (hr == S_FALSE, "expected S_FALSE got %x\n",hr); ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); - hr = pCoGetTreatAsClass(NULL, &out); + hr = CoGetTreatAsClass(NULL, &out); ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); ok(IsEqualGUID(&out, &deadbeef), "expected no change to the clsid\n"); - hr = pCoGetTreatAsClass(&deadbeef, NULL); + hr = CoGetTreatAsClass(&deadbeef, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &clsidkey); @@ -2217,17 +2209,17 @@ static void test_TreatAsClass(void) return; } - hr = pCoTreatAsClass(&deadbeef, &deadbeef); + hr = CoTreatAsClass(&deadbeef, &deadbeef); ok(hr == REGDB_E_WRITEREGDB, "CoTreatAsClass gave wrong error: %08x\n", hr); - hr = pCoTreatAsClass(&deadbeef, &CLSID_FileProtocol); + hr = CoTreatAsClass(&deadbeef, &CLSID_FileProtocol); if(hr == REGDB_E_WRITEREGDB){ win_skip("Insufficient privileges to use CoTreatAsClass\n"); goto exit; } ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); - hr = pCoGetTreatAsClass(&deadbeef, &out); + hr = CoGetTreatAsClass(&deadbeef, &out); ok(hr == S_OK, "CoGetTreatAsClass failed: %08x\n",hr); ok(IsEqualGUID(&out, &CLSID_FileProtocol), "expected to get substituted clsid\n"); @@ -2263,10 +2255,10 @@ static void test_TreatAsClass(void) IUnknown_Release(pIP); } - hr = pCoTreatAsClass(&deadbeef, &CLSID_NULL); + hr = CoTreatAsClass(&deadbeef, &CLSID_NULL); ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); - hr = pCoGetTreatAsClass(&deadbeef, &out); + hr = CoGetTreatAsClass(&deadbeef, &out); ok(hr == S_FALSE, "expected S_FALSE got %08x\n", hr); ok(IsEqualGUID(&out, &deadbeef), "expected to get same clsid back\n"); @@ -3956,8 +3948,6 @@ static void init_funcs(void) pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); pCoSwitchCallContext = (void*)GetProcAddress(hOle32, "CoSwitchCallContext"); - pCoGetTreatAsClass = (void*)GetProcAddress(hOle32,"CoGetTreatAsClass"); - pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); pCoGetApartmentType = (void*)GetProcAddress(hOle32, "CoGetApartmentType"); pCoIncrementMTAUsage = (void*)GetProcAddress(hOle32, "CoIncrementMTAUsage");

1 0

Nikolay Sivov : ole32/tests: Link to storage API directly.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 0562c64dd241c34b5653260904f407f4763a2093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0562c64dd241c34b56532609… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 12:44:30 2020 +0300 ole32/tests: Link to storage API directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/stg_prop.c | 95 +++++++++++--------------------------------- dlls/ole32/tests/storage32.c | 19 +-------- 2 files changed, 26 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0562c64dd241c34b5653…

1 0

Nikolay Sivov : ole32/tests: Fix test crash on recent Windows 10.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: efe4d24feab64d5a550dbb294d9cf09fcf03dfa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe4d24feab64d5a550dbb29… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 12:44:31 2020 +0300 ole32/tests: Fix test crash on recent Windows 10. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index a6811b9d24..891df59c54 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -3529,13 +3529,17 @@ static void test_client_security(void) hr = IClassFactory_QueryInterface(pProxy, &IID_IUnknown, (LPVOID*)&pUnknown1); ok_ole_success(hr, "IUnknown_QueryInterface IID_IUnknown"); - hr = IClassFactory_QueryInterface(pProxy, &IID_IRemUnknown, (LPVOID*)&pProxy2); - ok_ole_success(hr, "IUnknown_QueryInterface IID_IStream"); + /* Does not work on Windows 10 19xx+ */ + if (SUCCEEDED(IClassFactory_QueryInterface(pProxy, &IID_IRemUnknown, (void **)&pProxy2))) + { + hr = IUnknown_QueryInterface(pProxy2, &IID_IUnknown, (void **)&pUnknown2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IUnknown_QueryInterface(pProxy2, &IID_IUnknown, (LPVOID*)&pUnknown2); - ok_ole_success(hr, "IUnknown_QueryInterface IID_IUnknown"); + ok(pUnknown1 == pUnknown2, "both proxy's IUnknowns should be the same - %p, %p\n", pUnknown1, pUnknown2); + IUnknown_Release(pUnknown2); - ok(pUnknown1 == pUnknown2, "both proxy's IUnknowns should be the same - %p, %p\n", pUnknown1, pUnknown2); + IUnknown_Release(pProxy2); + } hr = IClassFactory_QueryInterface(pProxy, &IID_IMarshal, (LPVOID*)&pMarshal); ok_ole_success(hr, "IUnknown_QueryInterface IID_IMarshal"); @@ -3572,9 +3576,7 @@ static void test_client_security(void) CoTaskMemFree(pServerPrincName); IClassFactory_Release(pProxy); - IUnknown_Release(pProxy2); IUnknown_Release(pUnknown1); - IUnknown_Release(pUnknown2); IMarshal_Release(pMarshal); IClientSecurity_Release(pCliSec);

1 0

Alexandre Julliard : makefiles: Add dependencies for the import lib symlinks.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: b211bd7b6449e3a67bb0ecf5c113981eefa0dbb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b211bd7b6449e3a67bb0ecf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 11:35:14 2020 +0200 makefiles: Add dependencies for the import lib symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 49 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 56166af910..e17bf24c41 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2151,6 +2151,24 @@ static int needs_delay_lib( const struct makefile *make ) } +/******************************************************************* + * needs_implib_symlink + */ +static int needs_implib_symlink( const struct makefile *make ) +{ + if (!make->module) return 0; + if (!make->importlib) return 0; + if (make->is_win16 && make->disabled) return 0; + if (strncmp( make->base_dir, "dlls/", 5 )) return 0; + if (!strcmp( make->module, make->importlib )) return 0; + if (!strchr( make->importlib, '.' ) && + !strncmp( make->module, make->importlib, strlen( make->importlib )) && + !strcmp( make->module + strlen( make->importlib ), ".dll" )) + return 0; + return 1; +} + + /******************************************************************* * add_default_libraries */ @@ -2227,8 +2245,12 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (is_cross || !*dll_ext || submake->staticimplib) lib = base_dir_path( submake, strmake( "lib%s.a", name )); else + { strarray_add( deps, top_obj_dir_path( make, strmake( "%s/lib%s.def", submake->base_dir, name ))); + if (needs_implib_symlink( submake )) + strarray_add( deps, top_obj_dir_path( make, strmake( "dlls/lib%s.def", name ))); + } break; } @@ -2237,13 +2259,17 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (lib) { - if (delay && !delay_load_flag && (is_cross || !*dll_ext)) - lib = replace_extension( lib, ".a", ".delay.a" ); - else if (is_cross) - lib = replace_extension( lib, ".a", ".cross.a" ); + const char *ext = NULL; + + if (delay && !delay_load_flag && (is_cross || !*dll_ext)) ext = ".delay.a"; + else if (is_cross) ext = ".cross.a"; + if (ext) lib = replace_extension( lib, ".a", ext ); lib = top_obj_dir_path( make, lib ); strarray_add( deps, lib ); strarray_add( &ret, lib ); + if (needs_implib_symlink( top_makefile->submakes[j] )) + strarray_add( deps, top_obj_dir_path( make, + strmake( "dlls/lib%s%s", name, ext ? ext : ".a" ))); } else strarray_add( &ret, strmake( "-l%s", name )); } @@ -2608,17 +2634,7 @@ static struct strarray output_importlib_symlinks( const struct makefile *parent, const char *lib, *dst, *ext[4]; int i, count = 0; - if (!make->module) return ret; - if (!make->importlib) return ret; - if (make->is_win16 && make->disabled) return ret; - if (strncmp( make->base_dir, "dlls/", 5 )) return ret; - if (!strcmp( make->module, make->importlib )) return ret; - if (!strchr( make->importlib, '.' ) && - !strncmp( make->module, make->importlib, strlen( make->importlib )) && - !strcmp( make->module + strlen( make->importlib ), ".dll" )) - return ret; - - ext[count++] = *dll_ext ? "def" : "a"; + ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; if (needs_delay_lib( make )) ext[count++] = "delay.a"; if (needs_cross_lib( make )) ext[count++] = "cross.a"; @@ -3739,7 +3755,8 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); } } - strarray_addall( &symlinks, output_importlib_symlinks( make, submake )); + if (needs_implib_symlink( submake )) + strarray_addall( &symlinks, output_importlib_symlinks( make, submake )); } if (submake->disabled) continue;

1 0

Nikolay Sivov : combase: Implement CoCreateInstanceFromApp().
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 76b50a01a0907e1212ece8e644a356af80598187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b50a01a0907e1212ece8e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 9 12:44:28 2020 +0300 combase: Implement CoCreateInstanceFromApp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-com-l1-1-0.spec | 2 +- .../api-ms-win-core-com-l1-1-1.spec | 2 +- dlls/combase/combase.c | 110 +++++++++++-------- dlls/combase/combase.spec | 2 +- dlls/ole32/ole32.spec | 1 + dlls/ole32/tests/compobj.c | 122 +++++++++++++++++++++ include/objbase.h | 2 + include/wtypes.idl | 41 ++++--- 8 files changed, 217 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=76b50a01a0907e1212ec…

1 0

Alexandre Julliard : makefiles: Build extra targets explicitly if they are not a dependency.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 96e5ac876fd48c3692a2b89780e7bb40fe526798 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e5ac876fd48c3692a2b897… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 11:47:42 2020 +0200 makefiles: Build extra targets explicitly if they are not a dependency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 2 -- tools/makedep.c | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index e35f85ac89..fcc988b211 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -18,8 +18,6 @@ SVG_SRCS = \ EXTRA_TARGETS = wine-debug.apk -all: wine-debug.apk - wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg gradle -q assembleDebug mv build/outputs/apk/wine-debug.apk $@ diff --git a/tools/makedep.c b/tools/makedep.c index 96f7100a0e..4775a60334 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3931,6 +3931,12 @@ static void output_sources( struct makefile *make ) add_install_rule( make, make->scripts.str[i], make->scripts.str[i], strmake( "S$(bindir)/%s", make->scripts.str[i] )); + for (i = 0; i < make->extra_targets.count; i++) + if (strarray_exists( &make->dependencies, obj_dir_path( make, make->extra_targets.str[i] ))) + strarray_add( &make->clean_files, make->extra_targets.str[i] ); + else + strarray_add( &make->all_targets, make->extra_targets.str[i] ); + if (!make->src_dir) strarray_add( &make->distclean_files, ".gitignore" ); strarray_add( &make->distclean_files, "Makefile" ); if (make->testdll) strarray_add( &make->distclean_files, "testlist.c" ); @@ -3969,7 +3975,6 @@ static void output_sources( struct makefile *make ) strarray_addall( &make->clean_files, make->pot_files ); strarray_addall( &make->clean_files, make->debug_files ); strarray_addall( &make->clean_files, make->all_targets ); - strarray_addall( &make->clean_files, make->extra_targets ); if (make->clean_files.count) {

1 0

Alexandre Julliard : makefiles: Expand makedep path at compile time.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: a204ad557dd504391e13e1382278472cd86517f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a204ad557dd504391e13e138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 11:36:45 2020 +0200 makefiles: Expand makedep path at compile time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 +- dlls/ntdll/Makefile.in | 8 ++++---- libs/wine/Makefile.in | 8 ++++---- loader/Makefile.in | 2 +- tools/widl/Makefile.in | 2 +- tools/winegcc/Makefile.in | 4 ++-- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 32b2e6959c..a94abad599 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -52,4 +52,4 @@ C_SRCS = \ RC_SRCS = gdi32.rc -freetype_EXTRADEFS = -DWINE_FONT_DIR=\"`$(MAKEDEP) -R ${datadir}/wine ${fontdir}`\" +freetype_EXTRADEFS = -DWINE_FONT_DIR=\"`${MAKEDEP} -R ${datadir}/wine ${fontdir}`\" diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 52f63892af..a553536d4c 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -72,13 +72,13 @@ EXTRA_OBJS = unix/version.o server_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ - -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ - -DDLL_TO_BINDIR=\"`$(MAKEDEP) -R ${dlldir} ${bindir}`\" + -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \ + -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" unix_loader_EXTRADEFS = \ -DBINDIR=\"${bindir}\" \ - -DDLL_TO_BINDIR=\"`$(MAKEDEP) -R ${dlldir} ${bindir}`\" \ - -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" + -DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \ + -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" unix/version.c: dummy version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/$.*$/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 6bb27e34dc..65a0789502 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -87,10 +87,10 @@ C_SRCS = \ config_EXTRADEFS = \ -DBINDIR='"${bindir}"' \ -DDLLDIR='"${dlldir}"' \ - -DLIB_TO_BINDIR=\"`$(MAKEDEP) -R ${libdir} ${bindir}`\" \ - -DLIB_TO_DLLDIR=\"`$(MAKEDEP) -R ${libdir} ${dlldir}`\" \ - -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" \ - -DBIN_TO_DATADIR=\"`$(MAKEDEP) -R ${bindir} ${datadir}/wine`\" + -DLIB_TO_BINDIR=\"`${MAKEDEP} -R ${libdir} ${bindir}`\" \ + -DLIB_TO_DLLDIR=\"`${MAKEDEP} -R ${libdir} ${dlldir}`\" \ + -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" \ + -DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\" SHAREDLIB = $(LIBWINE_SHAREDLIB) diff --git a/loader/Makefile.in b/loader/Makefile.in index 1cb9ab6bf7..e8c271f15d 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -18,7 +18,7 @@ INSTALL_LIB = $(WINELOADER_PROGRAMS) preloader_EXTRADEFS = -fno-builtin -main_EXTRADEFS = -DDLLDIR=\"${dlldir}\" -DBIN_TO_DLLDIR=\"`$(MAKEDEP) -R ${bindir} ${dlldir}`\" +main_EXTRADEFS = -DDLLDIR=\"${dlldir}\" -DBIN_TO_DLLDIR=\"`${MAKEDEP} -R ${bindir} ${dlldir}`\" wine_OBJS = main.o wine_DEPS = $(WINELOADER_DEPENDS) diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 6c74e88d25..a231087f37 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -21,7 +21,7 @@ BISON_SRCS = parser.y widl_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ - -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" + -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" EXTRALIBS = -lwpp diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 0d94eed5ff..8328d6f34a 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -11,8 +11,8 @@ C_SRCS = \ winegcc_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ -DLIBDIR="\"${libdir}\"" \ - -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" \ - -DBIN_TO_LIBDIR=\"`$(MAKEDEP) -R ${bindir} ${libdir}`\" \ + -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" \ + -DBIN_TO_LIBDIR=\"`${MAKEDEP} -R ${bindir} ${libdir}`\" \ -DCC="\"$(CC)\"" \ -DCPP="\"$(CPPBIN)\"" \ -DCXX="\"$(CXX)\"" \ diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 660bc940f4..9d7c87e8fd 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -13,7 +13,7 @@ BISON_SRCS = mcy.y wmc_EXTRADEFS = \ -DNLSDIR="\"${nlsdir}\"" \ - -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" + -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" EXTRALIBS = $(GETTEXTPO_LIBS) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index b7462e3b99..fb6eba20c2 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -17,8 +17,8 @@ BISON_SRCS = parser.y wrc_EXTRADEFS = \ -DNLSDIR="\"${nlsdir}\"" \ -DINCLUDEDIR="\"${includedir}\"" \ - -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" \ - -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" + -DBIN_TO_NLSDIR=\"`${MAKEDEP} -R ${bindir} ${nlsdir}`\" \ + -DBIN_TO_INCLUDEDIR=\"`${MAKEDEP} -R ${bindir} ${includedir}`\" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp

1 0

Alexandre Julliard : makefiles: Store .pot files in a separate variable.
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: 82acb284bda2fe655ce0ff51b18667f1c9311e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82acb284bda2fe655ce0ff51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 9 11:46:00 2020 +0200 makefiles: Store .pot files in a separate variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index e17bf24c41..b4576d94f4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -208,6 +208,7 @@ struct makefile /* values generated at output time */ struct strarray in_files; struct strarray ok_files; + struct strarray pot_files; struct strarray clean_files; struct strarray distclean_files; struct strarray uninstall_files; @@ -2657,32 +2658,18 @@ static void output_po_files( const struct makefile *make ) { const char *po_dir = src_dir_path( make, "po" ); struct strarray pot_files = empty_strarray; - struct incl_file *source; - unsigned int i; + unsigned int i, j; for (i = 0; i < make->subdirs.count; i++) { struct makefile *submake = make->submakes[i]; - LIST_FOR_EACH_ENTRY( source, &submake->sources, struct incl_file, entry ) + for (j = 0; j < submake->pot_files.count; j++) { - if (source->file->flags & FLAG_PARENTDIR) continue; - if (strendswith( source->name, ".rc" ) && (source->file->flags & FLAG_RC_PO)) - { - char *pot_file = replace_extension( source->name, ".rc", ".pot" ); - char *pot_path = base_dir_path( submake, pot_file ); - output( "%s: tools/wrc include dummy\n", pot_path ); - output( "\t(a)cd %s && $(MAKE) %s\n", base_dir_path( submake, "" ), pot_file ); - strarray_add( &pot_files, pot_path ); - } - else if (strendswith( source->name, ".mc" )) - { - char *pot_file = replace_extension( source->name, ".mc", ".pot" ); - char *pot_path = base_dir_path( submake, pot_file ); - output( "%s: tools/wmc include dummy\n", pot_path ); - output( "\t(a)cd %s && $(MAKE) %s\n", base_dir_path( submake, "" ), pot_file ); - strarray_add( &pot_files, pot_path ); - } + char *pot_path = base_dir_path( submake, submake->pot_files.str[j] ); + output( "%s: dummy\n", pot_path ); + output( "\t(a)cd %s && $(MAKE) %s\n", base_dir_path( submake, "" ), submake->pot_files.str[j] ); + strarray_add( &pot_files, pot_path ); } } if (linguas.count) @@ -2697,6 +2684,8 @@ static void output_po_files( const struct makefile *make ) output_filename( strmake( "%s/%s.po", po_dir, linguas.str[i] )); output( "\n" ); } + output_filenames( pot_files ); + output( ": tools/wrc tools/wmc include\n" ); output( "%s/wine.pot:", po_dir ); output_filenames( pot_files ); output( "\n" ); @@ -2766,7 +2755,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c strarray_add( &make->res_files, strmake( "%s.res", obj )); if (source->file->flags & FLAG_RC_PO && !(source->file->flags & FLAG_PARENTDIR)) { - strarray_add( &make->clean_files, strmake( "%s.pot", obj )); + strarray_add( &make->pot_files, strmake( "%s.pot", obj )); output( "%s.pot ", obj_dir_path( make, obj ) ); } output( "%s.res: %s", obj_dir_path( make, obj ), source->filename ); @@ -2800,7 +2789,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c char *obj_path = obj_dir_path( make, obj ); strarray_add( &make->res_files, strmake( "%s.res", obj )); - strarray_add( &make->clean_files, strmake( "%s.pot", obj )); + strarray_add( &make->pot_files, strmake( "%s.pot", obj )); output( "%s.pot %s.res: %s", obj_path, obj_path, source->filename ); output_filename( tools_path( make, "wmc" )); output_filenames( source->dependencies ); @@ -3977,6 +3966,7 @@ static void output_sources( struct makefile *make ) strarray_addall( &make->clean_files, make->crossobj_files ); strarray_addall( &make->clean_files, make->unixobj_files ); strarray_addall( &make->clean_files, make->res_files ); + strarray_addall( &make->clean_files, make->pot_files ); strarray_addall( &make->clean_files, make->debug_files ); strarray_addall( &make->clean_files, make->all_targets ); strarray_addall( &make->clean_files, make->extra_targets );

1 0

Ziqing Hui : windowscodecs: Correctly set output frame size for WriteSource().
by Alexandre Julliard Sept. 9, 2020

Sept. 9, 2020

Module: wine Branch: master Commit: e8a45561c8da94f0d626f30b77ba4b994b70a3f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8a45561c8da94f0d626f30b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 9 14:14:31 2020 +0800 windowscodecs: Correctly set output frame size for WriteSource(). 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/main.c | 23 +++++++++++++++++++++-- dlls/windowscodecs/tests/converter.c | 4 ++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 94d6640782..7e03112a63 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -125,10 +125,29 @@ HRESULT configure_write_source(IWICBitmapFrameEncode *iface, const WICPixelFormatGUID *format, INT width, INT height, double xres, double yres) { + UINT src_width, src_height; HRESULT hr = S_OK; - if (width == 0 || height == 0) - return WINCODEC_ERR_WRONGSTATE; + if (width == 0 && height == 0) + { + if (prc) + { + if (prc->Width <= 0 || prc->Height <= 0) return E_INVALIDARG; + width = prc->Width; + height = prc->Height; + } + else + { + hr = IWICBitmapSource_GetSize(source, &src_width, &src_height); + if (FAILED(hr)) return hr; + if (src_width == 0 || src_height == 0) return E_INVALIDARG; + width = src_width; + height = src_height; + } + hr = IWICBitmapFrameEncode_SetSize(iface, (UINT)width, (UINT)height); + if (FAILED(hr)) return hr; + } + if (width == 0 || height == 0) return E_INVALIDARG; if (!format) { diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 852f677482..87f68207c6 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1401,13 +1401,13 @@ static void test_multi_encoder_impl(const struct bitmap_data **srcs, const CLSID } hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, rc); - todo_wine_if(!set_size) { if (rc && (rc->Width <= 0 || rc->Height <= 0)) { /* WriteSource fails but WriteSource_Proxy succeeds. */ ok(hr == E_INVALIDARG, "WriteSource should fail, hr=%x (%s)\n", hr, name); hr = IWICBitmapFrameEncode_WriteSource_Proxy(frameencode, &src_obj->IWICBitmapSource_iface, rc); if (!set_size && rc->Width < 0) + todo_wine ok(hr == WINCODEC_ERR_SOURCERECTDOESNOTMATCHDIMENSIONS, "WriteSource_Proxy(%dx%d) got unexpected hr %x (%s)\n", rc->Width, rc->Height, hr, name); else @@ -1423,12 +1423,12 @@ static void test_multi_encoder_impl(const struct bitmap_data **srcs, const CLSID ok(hr == S_OK, "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); } - } if (SUCCEEDED(hr)) { hr = IWICBitmapFrameEncode_Commit(frameencode); if (!set_size && rc && rc->Height < 0) + todo_wine ok(hr == WINCODEC_ERR_UNEXPECTEDSIZE, "Commit got unexpected hr %x (%s)\n", hr, name); else ok(hr == S_OK, "Commit failed, hr=%x (%s)\n", hr, name);

1 0