- Wine-Devel - list.winehq.org

[PATCH] include: Add missing DBPARAM* types and enums
by Alistair Leslie-Hughes Oct. 26, 2020

Oct. 26, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/dbs.idl | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/dbs.idl b/include/dbs.idl index 65fd5b1d365..92265882016 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -800,3 +800,28 @@ typedef struct tagDBCOLUMNINFO { BYTE bScale; DBID columnid; } DBCOLUMNINFO; + +typedef DWORD DBPARAMFLAGS; + +enum DBPARAMFLAGSENUM { + DBPARAMFLAGS_ISINPUT = 0x001, + DBPARAMFLAGS_ISOUTPUT = 0x002, + DBPARAMFLAGS_ISSIGNED = 0x010, + DBPARAMFLAGS_ISNULLABLE = 0x040, + DBPARAMFLAGS_ISLONG = 0x080 +}; + +enum DBPARAMFLAGSENUM20 { + DBPARAMFLAGS_SCALEISNEGATIVE = 0x100 +}; + +typedef struct tagDBPARAMINFO { + DBPARAMFLAGS dwFlags; + DBORDINAL iOrdinal; + LPOLESTR pwszName; + ITypeInfo *pTypeInfo; + DBLENGTH ulParamSize; + DBTYPE wType; + BYTE bPrecision; + BYTE bScale; +} DBPARAMINFO; -- 2.28.0

1 0

unsubscribe
by Alexandre Viau Oct. 25, 2020

Oct. 25, 2020

1 0

[PATCH 1/3] d2d1: Implement D2D1SinCos
by Giovanni Mascellani Oct. 25, 2020

Oct. 25, 2020

Signed-off-by: Giovanni Mascellani <wine(a)mascellani.eu> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/factory.c | 6 ++++++ dlls/d2d1/tests/d2d1.c | 29 +++++++++++++++++++++++++++++ include/d2d1_1.idl | 1 + 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 0ebcd0af553..410abfa5de6 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -6,6 +6,6 @@ @ stub D2D1ConvertColorSpace @ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext -@ stub D2D1SinCos +@ stdcall D2D1SinCos(float ptr ptr) @ stub D2D1Tan @ stub D2D1Vec3Length diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 2f50836bbcd..2cce8afc4a4 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -713,6 +713,12 @@ HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, return hr; } +void WINAPI D2D1SinCos(float angle, float *s, float *c) +{ + *s = sinf(angle); + *c = cosf(angle); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 166cdfccda6..9ec86eac3a5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9425,6 +9425,34 @@ static void test_wic_bitmap_format(void) DestroyWindow(window); } +static void test_math(void) +{ + float s, c; + int i; + + static const struct + { + float x; + float s; + float c; + } + sc_data[] = + { + {0.0, 0.0, 1.0}, + {1.0, 8.41470957e-001, 5.40302277e-001}, + {2.0, 9.09297407e-001, -4.16146845e-001}, + {M_PI / 2.0, 1.0, -4.37113883e-008}, + {M_PI, -8.74227766e-008, -1.0}, + }; + + for (i = 0; i < ARRAY_SIZE(sc_data); ++i) + { + D2D1SinCos(sc_data[i].x, &s, &c); + ok(compare_float(s, sc_data[i].s, 0), "Wrong sin(%.8e) (%.8e instead of %.8e).\n", sc_data[i].x, s, sc_data[i].s); + ok(compare_float(c, sc_data[i].c, 0), "Wrong cos(%.8e) (%.8e instead of %.8e).\n", sc_data[i].x, c, sc_data[i].c); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -9477,6 +9505,7 @@ START_TEST(d2d1) queue_test(test_max_bitmap_size); queue_test(test_dpi); queue_test(test_wic_bitmap_format); + queue_test(test_math); run_queued_tests(); } diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ddb7669c24b..6fa893edbda 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -794,3 +794,4 @@ interface ID2D1Factory1 : ID2D1Factory [local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, ID2D1Device **device); +[local] void __stdcall D2D1SinCos(float angle, float *s, float *c); -- 2.28.0

2 5

[PATCH 1/2] d3d8thk: add stub dll
by Austin English Oct. 25, 2020

Oct. 25, 2020

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + dlls/d3d8thk/Makefile.in | 8 ++++++ dlls/d3d8thk/d3d8thk.spec | 56 +++++++++++++++++++++++++++++++++++++ dlls/d3d8thk/d3d8thk_main.c | 42 ++++++++++++++++++++++++++++ dlls/d3d8thk/version.rc | 26 +++++++++++++++++ 5 files changed, 133 insertions(+) create mode 100644 dlls/d3d8thk/Makefile.in create mode 100644 dlls/d3d8thk/d3d8thk.spec create mode 100644 dlls/d3d8thk/d3d8thk_main.c create mode 100644 dlls/d3d8thk/version.rc diff --git a/configure.ac b/configure.ac index 372785ee0fd..331ae064bdc 100644 --- a/configure.ac +++ b/configure.ac @@ -3137,6 +3137,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d12) WINE_CONFIG_MAKEFILE(dlls/d3d12/tests) WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) +WINE_CONFIG_MAKEFILE(dlls/d3d8thk) WINE_CONFIG_MAKEFILE(dlls/d3d9) WINE_CONFIG_MAKEFILE(dlls/d3d9/tests) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_33) diff --git a/dlls/d3d8thk/Makefile.in b/dlls/d3d8thk/Makefile.in new file mode 100644 index 00000000000..b84c8d171f1 --- /dev/null +++ b/dlls/d3d8thk/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3d8thk.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3d8thk_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3d8thk/d3d8thk.spec b/dlls/d3d8thk/d3d8thk.spec new file mode 100644 index 00000000000..98e5d6c64a1 --- /dev/null +++ b/dlls/d3d8thk/d3d8thk.spec @@ -0,0 +1,56 @@ +@ stub OsThunkD3dContextCreate +@ stub OsThunkD3dContextDestroy +@ stub OsThunkD3dContextDestroyAll +@ stub OsThunkD3dDrawPrimitives2 +@ stub OsThunkD3dValidateTextureStageState +@ stub OsThunkDdAddAttachedSurface +@ stub OsThunkDdAlphaBlt +@ stub OsThunkDdAttachSurface +@ stub OsThunkDdBeginMoCompFrame +@ stub OsThunkDdBlt +@ stub OsThunkDdCanCreateD3DBuffer +@ stub OsThunkDdCanCreateSurface +@ stub OsThunkDdColorControl +@ stub OsThunkDdCreateD3DBuffer +@ stub OsThunkDdCreateDirectDrawObject +@ stub OsThunkDdCreateMoComp +@ stub OsThunkDdCreateSurface +@ stub OsThunkDdCreateSurfaceEx +@ stub OsThunkDdCreateSurfaceObject +@ stub OsThunkDdDeleteDirectDrawObject +@ stub OsThunkDdDeleteSurfaceObject +@ stub OsThunkDdDestroyD3DBuffer +@ stub OsThunkDdDestroyMoComp +@ stub OsThunkDdDestroySurface +@ stub OsThunkDdEndMoCompFrame +@ stub OsThunkDdFlip +@ stub OsThunkDdFlipToGDISurface +@ stub OsThunkDdGetAvailDriverMemory +@ stub OsThunkDdGetBltStatus +@ stub OsThunkDdGetDC +@ stub OsThunkDdGetDriverInfo +@ stub OsThunkDdGetDriverState +@ stub OsThunkDdGetDxHandle +@ stub OsThunkDdGetFlipStatus +@ stub OsThunkDdGetInternalMoCompInfo +@ stub OsThunkDdGetMoCompBuffInfo +@ stub OsThunkDdGetMoCompFormats +@ stub OsThunkDdGetMoCompGuids +@ stub OsThunkDdGetScanLine +@ stub OsThunkDdLock +@ stub OsThunkDdLockD3D +@ stub OsThunkDdQueryDirectDrawObject +@ stub OsThunkDdQueryMoCompStatus +@ stub OsThunkDdReenableDirectDrawObject +@ stub OsThunkDdReleaseDC +@ stub OsThunkDdRenderMoComp +@ stub OsThunkDdResetVisrgn +@ stub OsThunkDdSetColorKey +@ stub OsThunkDdSetExclusiveMode +@ stub OsThunkDdSetGammaRamp +@ stub OsThunkDdSetOverlayPosition +@ stub OsThunkDdUnattachSurface +@ stub OsThunkDdUnlock +@ stub OsThunkDdUnlockD3D +@ stub OsThunkDdUpdateOverlay +@ stub OsThunkDdWaitForVerticalBlank \ No newline at end of file diff --git a/dlls/d3d8thk/d3d8thk_main.c b/dlls/d3d8thk/d3d8thk_main.c new file mode 100644 index 00000000000..1d89cb48720 --- /dev/null +++ b/dlls/d3d8thk/d3d8thk_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d8thk); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3d8thk/version.rc b/dlls/d3d8thk/version.rc new file mode 100644 index 00000000000..444630a7745 --- /dev/null +++ b/dlls/d3d8thk/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3d8thk" +#define WINE_FILENAME_STR "d3d8thk.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.28.0

2 3

[PATCH 2/2] d3dim700: add stub dll
by Austin English Oct. 25, 2020

Oct. 25, 2020

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- configure.ac | 1 + dlls/d3dim700/Makefile.in | 8 +++++++ dlls/d3dim700/d3dim700.spec | 18 +++++++++++++++ dlls/d3dim700/d3dim700_main.c | 42 +++++++++++++++++++++++++++++++++++ dlls/d3dim700/version.rc | 26 ++++++++++++++++++++++ 5 files changed, 95 insertions(+) create mode 100644 dlls/d3dim700/Makefile.in create mode 100644 dlls/d3dim700/d3dim700.spec create mode 100644 dlls/d3dim700/d3dim700_main.c create mode 100644 dlls/d3dim700/version.rc diff --git a/configure.ac b/configure.ac index 331ae064bdc..2f81fd22610 100644 --- a/configure.ac +++ b/configure.ac @@ -3156,6 +3156,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests) WINE_CONFIG_MAKEFILE(dlls/d3dim) +WINE_CONFIG_MAKEFILE(dlls/d3dim700) WINE_CONFIG_MAKEFILE(dlls/d3drm) WINE_CONFIG_MAKEFILE(dlls/d3drm/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) diff --git a/dlls/d3dim700/Makefile.in b/dlls/d3dim700/Makefile.in new file mode 100644 index 00000000000..12a28ae475a --- /dev/null +++ b/dlls/d3dim700/Makefile.in @@ -0,0 +1,8 @@ +MODULE = d3dim700.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + d3dim700_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dim700/d3dim700.spec b/dlls/d3dim700/d3dim700.spec new file mode 100644 index 00000000000..931b3dd9f68 --- /dev/null +++ b/dlls/d3dim700/d3dim700.spec @@ -0,0 +1,18 @@ +@ stub D3DFree +@ stub D3DMalloc +@ stub D3DRealloc +@ stub Direct3DCreateDevice +@ stub CreateTexture +@ stub D3DBreakVBLock +@ stub D3DTextureUpdate +@ stub DestroyTexture +@ stub Direct3DCreate +@ stub Direct3D_HALCleanUp +@ stub FlushD3DDevices +@ stub GetLOD +@ stub GetPriority +@ stub PaletteAssociateNotify +@ stub PaletteUpdateNotify +@ stub SetLOD +@ stub SetPriority +@ stub SurfaceFlipNotify \ No newline at end of file diff --git a/dlls/d3dim700/d3dim700_main.c b/dlls/d3dim700/d3dim700_main.c new file mode 100644 index 00000000000..18a211ccc74 --- /dev/null +++ b/dlls/d3dim700/d3dim700_main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dim700); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3dim700/version.rc b/dlls/d3dim700/version.rc new file mode 100644 index 00000000000..cff97677690 --- /dev/null +++ b/dlls/d3dim700/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine d3dim700" +#define WINE_FILENAME_STR "d3dim700.dll" +#define WINE_FILEVERSION 5,3,2600,5512 +#define WINE_FILEVERSION_STR "5.3.2600.5512" +#define WINE_PRODUCTVERSION 5,3,2600,5512 +#define WINE_PRODUCTVERSION_STR "5.3.2600.5512" + +#include "wine/wine_common_ver.rc" -- 2.28.0

1 0

[PATCH v2] makefiles: Add configure flag to allow silent build output.
by Jeff Smith Oct. 24, 2020

Oct. 24, 2020

Adds configure flag --enable-silent-rules. Use of this flag will result in the output from make being much quieter. This option can still be over-ridden at make-time by setting V=1. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- v2: Moved rule generation to the configure stage, so no variable indirection ends up in the Makefile unless it has been implicitly requested. Note: If someone uses an implementation of make that does _not_ support variable indirection (a.k.a. computed variable name, nested variable reference, or nested macro expansion), they can and should avoid using the --enable-silent-rules flag. AFAICT, when this subject came up for automake over 10 years ago, such a make implemention was not identified, except for some that were already obsolete/unsupported at the time. Makefile.in | 3 +- configure | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 15 ++++++++++ tools/makedep.c | 62 ++++++++++++++++++++-------------------- 4 files changed, 124 insertions(+), 32 deletions(-) diff --git a/Makefile.in b/Makefile.in index 307a95b3b1a..28144fdd269 100644 --- a/Makefile.in +++ b/Makefile.in @@ -88,6 +88,7 @@ TOP_INSTALL_LIB = @TOP_INSTALL_LIB@ TOP_INSTALL_DEV = @TOP_INSTALL_DEV@ @ALL_VARS_RULES@ @SET_MAKE@ +(a)SILENT_RULES@ all: wine @echo "Wine build complete." @@ -122,7 +123,7 @@ programs/winetest/build.rc: dummy @build="STRINGTABLE { 1 \"`GIT_DIR=$(srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1) programs/winetest/build.nfo: - -$(CC) -v 2>$@ + @-$(CC) -v 2>$@ dlls/wineandroid.drv/wine-debug.apk: dlls/wineandroid.drv/build.gradle $(srcdir)/dlls/wineandroid.drv/AndroidManifest.xml $(srcdir)/dlls/wineandroid.drv/WineActivity.java $(srcdir)/dlls/wineandroid.drv/wine.svg cd dlls/wineandroid.drv && gradle -q -Psrcdir=$(srcdir) assembleDebug diff --git a/configure b/configure index 2686af02232..6928dfdd176 100755 --- a/configure +++ b/configure @@ -773,6 +773,7 @@ AR BISON FLEX TOOLSDIR +SILENT_RULES TARGETFLAGS LD CPPBIN @@ -842,6 +843,7 @@ enable_win64 enable_tests enable_maintainer_mode enable_werror +enable_silent_rules with_alsa with_capi with_cms @@ -2572,6 +2574,7 @@ Optional Features: --enable-maintainer-mode enable maintainer-specific build rules --enable-werror treat compilation warnings as errors + --enable-silent-rules produce quieter build output (override: 'make V=1') --disable-largefile omit support for large files Optional Packages: @@ -3905,6 +3908,11 @@ if test "${enable_werror+set}" = set; then : enableval=$enable_werror; fi +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + # Check whether --with-alsa was given. @@ -5823,6 +5831,74 @@ then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi +if test "x$enable_silent_rules" = "xyes" +then + SILENT_RULES="QUIET = \$(QUIET_\$(V)) +QUIET_ = \$(QUIET_0) +QUIET_0 = @ +QUIET_AR = \$(QUIET_AR_\$(V)) +QUIET_AR_ = \$(QUIET_AR_0) +QUIET_AR_0 = @echo ' ' AR \$@; +QUIET_BISON = \$(QUIET_BISON_\$(V)) +QUIET_BISON_ = \$(QUIET_BISON_0) +QUIET_BISON_0 = @echo ' ' BISON \$@; +QUIET_BUILDIMAGE = \$(QUIET_BUILDIMAGE_\$(V)) +QUIET_BUILDIMAGE_ = \$(QUIET_BUILDIMAGE_0) +QUIET_BUILDIMAGE_0 = @echo ' ' BUILDIMAGE \$@; +QUIET_CC = \$(QUIET_CC_\$(V)) +QUIET_CC_ = \$(QUIET_CC_0) +QUIET_CC_0 = @echo ' ' CC \$@; +QUIET_CCLD = \$(QUIET_CCLD_\$(V)) +QUIET_CCLD_ = \$(QUIET_CCLD_0) +QUIET_CCLD_0 = @echo ' ' CCLD \$@; +QUIET_GEN = \$(QUIET_GEN_\$(V)) +QUIET_GEN_ = \$(QUIET_GEN_0) +QUIET_GEN_0 = @echo ' ' GEN \$@; +QUIET_FLEX = \$(QUIET_FLEX_\$(V)) +QUIET_FLEX_ = \$(QUIET_FLEX_0) +QUIET_FLEX_0 = @echo ' ' FLEX \$@; +QUIET_FONTFORGE = \$(QUIET_FONTFORGE_\$(V)) +QUIET_FONTFORGE_ = \$(QUIET_FONTFORGE_0) +QUIET_FONTFORGE_0 = @echo ' ' FONTFORGE \$@; +QUIET_LN = \$(QUIET_LN_\$(V)) +QUIET_LN_ = \$(QUIET_LN_0) +QUIET_LN_0 = @echo ' ' LN \$@; +QUIET_MAKE_XFTMPL = \$(QUIET_MAKE_XFTMPL_\$(V)) +QUIET_MAKE_XFTMPL_ = \$(QUIET_MAKE_XFTMPL_0) +QUIET_MAKE_XFTMPL_0 = @echo ' ' MAKE_XFTMPL \$@; +QUIET_MSGCAT = \$(QUIET_MSGCAT_\$(V)) +QUIET_MSGCAT_ = \$(QUIET_MSGCAT_0) +QUIET_MSGCAT_0 = @echo ' ' MSGCAT \$@; +QUIET_MSGFMT = \$(QUIET_MSGFMT_\$(V)) +QUIET_MSGFMT_ = \$(QUIET_MSGFMT_0) +QUIET_MSGFMT_0 = @echo ' ' MSGFMT \$@; +QUIET_MSGMERGE = \$(QUIET_MSGMERGE_\$(V)) +QUIET_MSGMERGE_ = \$(QUIET_MSGMERGE_0) +QUIET_MSGMERGE_0 = @echo ' ' MSGMERGE \$@; +QUIET_RANLIB = \$(QUIET_RANLIB_\$(V)) +QUIET_RANLIB_ = \$(QUIET_RANLIB_0) +QUIET_RANLIB_0 = @echo ' ' RANLIB \$@; +QUIET_SFNT2FON = \$(QUIET_SFNT2FON_\$(V)) +QUIET_SFNT2FON_ = \$(QUIET_SFNT2FON_0) +QUIET_SFNT2FON_0 = @echo ' ' SFNT2FON \$@; +QUIET_TEST = \$(QUIET_TEST_\$(V)) +QUIET_TEST_ = \$(QUIET_TEST_0) +QUIET_TEST_0 = @echo ' ' TEST \$@; +QUIET_WIDL = \$(QUIET_WIDL_\$(V)) +QUIET_WIDL_ = \$(QUIET_WIDL_0) +QUIET_WIDL_0 = @echo ' ' WIDL \$@; +QUIET_WINEBUILD = \$(QUIET_WINEBUILD_\$(V)) +QUIET_WINEBUILD_ = \$(QUIET_WINEBUILD_0) +QUIET_WINEBUILD_0 = @echo ' ' WINEBUILD \$@; +QUIET_WMC = \$(QUIET_WMC_\$(V)) +QUIET_WMC_ = \$(QUIET_WMC_0) +QUIET_WMC_0 = @echo ' ' WMC \$@; +QUIET_WRC = \$(QUIET_WRC_\$(V)) +QUIET_WRC_ = \$(QUIET_WRC_0) +QUIET_WRC_0 = @echo ' ' WRC \$@; +" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5 $as_echo_n "checking for the directory containing the Wine tools... " >&6; } if ${wine_cv_toolsdir+:} false; then : diff --git a/configure.ac b/configure.ac index 372785ee0fd..a3b2bbbc17e 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,7 @@ AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests])) AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules])) AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],[treat compilation warnings as errors])) +AC_ARG_ENABLE(silent-rules, AS_HELP_STRING([--enable-silent-rules],[produce quieter build output (override: 'make V=1')])) AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support])) AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)])) @@ -226,6 +227,20 @@ then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi +if test "x$enable_silent_rules" = "xyes" +then + AC_SUBST(SILENT_RULES, +"QUIET = \$(QUIET_\$(V)) +QUIET_ = \$(QUIET_0) +QUIET_0 = @ +m4_foreach_w([rule],[AR BISON BUILDIMAGE CC CCLD GEN FLEX FONTFORGE LN MAKE_XFTMPL MSGCAT + MSGFMT MSGMERGE RANLIB SFNT2FON TEST WIDL WINEBUILD WMC WRC], +[QUIET_[]rule = \$(QUIET_[]rule[]_\$(V)) +QUIET_[]rule[]_ = \$(QUIET_[]rule[]_0) +QUIET_[]rule[]_0 = @echo ' ' rule \$@; +])")dnl +fi + AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, [wine_cv_toolsdir="$with_wine_tools" if test -z "$with_wine_tools"; then diff --git a/tools/makedep.c b/tools/makedep.c index 90a21ef825c..ea1efcdc019 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2408,7 +2408,7 @@ static const char *get_debug_file( struct makefile *make, const char *name ) */ static void output_winegcc_command( struct makefile *make, int is_cross ) { - output( "\t%s -o $@", tools_path( make, "winegcc" )); + output( "\t$(QUIET_CCLD)%s -o $@", tools_path( make, "winegcc" )); output_filename( "--wine-objdir ." ); if (tools_dir) { @@ -2445,7 +2445,7 @@ static void output_symlink_rule( const char *src_name, const char *link_name, in dir[name - link_name] = 0; } - output( "\t" ); + output( "\t$(QUIET_LN)" ); if (create_dir && dir && *dir) output( "%s -d %s && ", root_src_dir_path( "tools/install-sh" ), dir ); output( "rm -f %s && ", link_name ); @@ -2672,7 +2672,7 @@ static void output_po_files( const struct makefile *make ) for (i = 0; i < linguas.count; i++) output_filename( strmake( "%s/%s.po", po_dir, linguas.str[i] )); output( ": %s/wine.pot\n", po_dir ); - output( "\tmsgmerge --previous -q $@ %s/wine.pot | msgattrib --no-obsolete -o $@.new && mv $@.new $@\n", + output( "\t$(QUIET_MSGMERGE)msgmerge --previous -q $@ %s/wine.pot | msgattrib --no-obsolete -o $@.new && mv $@.new $@\n", po_dir ); output( "po:" ); for (i = 0; i < linguas.count; i++) @@ -2682,7 +2682,7 @@ static void output_po_files( const struct makefile *make ) output( "%s/wine.pot:", po_dir ); output_filenames( make->pot_files ); output( "\n" ); - output( "\tmsgcat -o $@" ); + output( "\t$(QUIET_MSGCAT)msgcat -o $@" ); output_filenames( make->pot_files ); output( "\n" ); } @@ -2699,7 +2699,7 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co if (find_include_file( make, header )) { output( "%s: %s\n", obj_dir_path( make, header ), source->filename ); - output( "\t%s -p %s_ -o %s.tab.c -d %s\n", + output( "\t$(QUIET_BISON)%s -p %s_ -o %s.tab.c -d %s\n", bison, obj, obj_dir_path( make, obj ), source->filename ); output( "%s.tab.c: %s %s\n", obj_dir_path( make, obj ), source->filename, obj_dir_path( make, header )); @@ -2707,7 +2707,7 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co } else output( "%s.tab.c: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -p %s_ -o $@ %s\n", bison, obj, source->filename ); + output( "\t$(QUIET_BISON)%s -p %s_ -o $@ %s\n", bison, obj, source->filename ); } @@ -2717,7 +2717,7 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co static void output_source_l( struct makefile *make, struct incl_file *source, const char *obj ) { output( "%s.yy.c: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -o$@ %s\n", flex, source->filename ); + output( "\t$(QUIET_FLEX)%s -o $@ %s\n", flex, source->filename ); } @@ -2755,7 +2755,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c output_filename( tools_path( make, "wrc" )); output_filenames( source->dependencies ); output( "\n" ); - output( "\t%s -u -o $@", tools_path( make, "wrc" ) ); + output( "\t$(QUIET_WRC)%s -u -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); output_filename( "--nostdinc" ); @@ -2787,7 +2787,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c output_filename( tools_path( make, "wmc" )); output_filenames( source->dependencies ); output( "\n" ); - output( "\t%s -u -o $@ %s", tools_path( make, "wmc" ), source->filename ); + output( "\t$(QUIET_WMC)%s -u -o $@ %s", tools_path( make, "wmc" ), source->filename ); if (linguas.count) { output_filename( "--po-dir=po" ); @@ -2845,7 +2845,7 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); - output( "\t%s -o $@", tools_path( make, "widl" ) ); + output( "\t$(QUIET_WIDL)%s -o $@", tools_path( make, "widl" ) ); output_filenames( target_flags ); output_filename( "--nostdinc" ); output_filenames( defines ); @@ -2876,7 +2876,7 @@ static void output_source_x( struct makefile *make, struct incl_file *source, co { output( "%s.h: %s%s %s\n", obj_dir_path( make, obj ), tools_dir_path( make, "make_xftmpl" ), tools_ext, source->filename ); - output( "\t%s%s -H -o $@ %s\n", + output( "\t$(QUIET_MAKE_XFTMPL)%s%s -H -o $@ %s\n", tools_dir_path( make, "make_xftmpl" ), tools_ext, source->filename ); if (source->file->flags & FLAG_INSTALL) { @@ -2900,7 +2900,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, if (fontforge && !make->src_dir) { output( "%s: %s\n", ttf_file, source->filename ); - output( "\t%s -script %s %s $@\n", + output( "\t$(QUIET_FONTFORGE)%s -script %s %s $@\n", fontforge, root_src_dir_path( "fonts/genttf.ff" ), source->filename ); if (!(source->file->flags & FLAG_SFD_FONTS)) strarray_add( &make->font_files, ttf_obj ); } @@ -2922,7 +2922,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source, strarray_add( &make->all_targets, xstrdup( font )); output( "%s: %s %s\n", obj_dir_path( make, font ), tools_path( make, "sfnt2fon" ), ttf_file ); - output( "\t%s -q -o $@ %s %s\n", tools_path( make, "sfnt2fon" ), ttf_file, args ); + output( "\t$(QUIET_SFNT2FON)%s -q -o $@ %s %s\n", tools_path( make, "sfnt2fon" ), ttf_file, args ); add_install_rule( make, source->name, xstrdup(font), strmake( "d$(fontdir)/%s", font )); } } @@ -2945,7 +2945,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, if (images[i]) { output( "%s.%s: %s\n", src_dir_path( make, obj ), images[i], source->filename ); - output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", convert, icotool, rsvg, + output( "\t$(QUIET_BUILDIMAGE)CONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", convert, icotool, rsvg, root_src_dir_path( "tools/buildimage" ), source->filename ); } } @@ -2979,7 +2979,7 @@ static void output_source_desktop( struct makefile *make, struct incl_file *sour static void output_source_po( struct makefile *make, struct incl_file *source, const char *obj ) { output( "%s.mo: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s -o $@ %s\n", msgfmt, source->filename ); + output( "\t$(QUIET_MSGFMT)%s -o $@ %s\n", msgfmt, source->filename ); strarray_add( &make->all_targets, strmake( "%s.mo", obj )); } @@ -3014,7 +3014,7 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c strarray_add( &make->in_files, xstrdup(obj) ); strarray_add( &make->all_targets, xstrdup(obj) ); output( "%s: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t%s %s >$@ || (rm -f $@ && false)\n", sed_cmd, source->filename ); + output( "\t$(QUIET_GEN)%s %s >$@ || (rm -f $@ && false)\n", sed_cmd, source->filename ); output( "%s:", obj_dir_path( make, obj )); output_filenames( source->dependencies ); output( "\n" ); @@ -3046,7 +3046,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, strarray_add( &make->clean_files, dll_name ); 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 -u -o $@\n", obj, output_file, + output( "\t$(QUIET_WRC)echo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -u -o $@\n", obj, output_file, tools_path( make, "wrc" )); output( "%s:", output_file); @@ -3104,7 +3104,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour else strarray_add( &make->clean_files, strmake( "%s.o", obj )); output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(CC) -c -o $@ %s", source->filename ); + output( "\t$(QUIET_CC)$(CC) -c -o $@ %s", source->filename ); output_filenames( defines ); if (make->module || make->staticlib || make->sharedlib || make->testdll) { @@ -3120,7 +3120,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour { strarray_add( is_dll_src ? &make->clean_files : &make->crossobj_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); - output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); + output( "\t$(QUIET_CC)$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( defines ); output_filenames( extra_cross_cflags ); if (source->file->flags & FLAG_C_IMPLIB) output_filename( "-fno-builtin" ); @@ -3135,7 +3135,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour { strarray_add( &make->ok_files, strmake( "%s.ok", obj )); output( "%s.ok:\n", obj_dir_path( make, obj )); - output( "\t%s $(RUNTESTFLAGS) -T . -M %s -p %s%s %s && touch $@\n", + output( "\t$(QUIET_TEST)%s $(RUNTESTFLAGS) -T . -M %s -p %s%s %s && touch $@\n", root_src_dir_path( "tools/runtest" ), make->testdll, obj_dir_path( make, replace_extension( make->testdll, ".dll", "_test.exe" )), make->is_cross ? "" : dll_ext, obj ); @@ -3368,7 +3368,7 @@ static void output_module( struct makefile *make ) { strarray_add( &make->clean_files, strmake( "lib%s.def", make->importlib )); output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); - output( "\t%s -w --def -o $@", tools_path( make, "winebuild" ) ); + output( "\t$(QUIET_WINEBUILD)%s -w --def -o $@", tools_path( make, "winebuild" ) ); output_filenames( target_flags ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); @@ -3389,7 +3389,7 @@ static void output_module( struct makefile *make ) output( "%s.a: %s %s", importlib_path, tools_path( make, "winebuild" ), spec_file ); output_filenames_obj_dir( make, make->implib_objs ); output( "\n" ); - output( "\t%s -w --implib -o $@", tools_path( make, "winebuild" ) ); + output( "\t$(QUIET_WINEBUILD)%s -w --implib -o $@", tools_path( make, "winebuild" ) ); output_filenames( target_flags ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); @@ -3416,7 +3416,7 @@ static void output_module( struct makefile *make ) output( ": %s %s", tools_path( make, "winebuild" ), spec_file ); output_filenames_obj_dir( make, cross_files ); output( "\n" ); - output( "\t%s -b %s -w --implib -o $@", tools_path( make, "winebuild" ), crosstarget ); + output( "\t$(QUIET_WINEBUILD)%s -b %s -w --implib -o $@", tools_path( make, "winebuild" ), crosstarget ); if (make->is_win16) output_filename( "-m16" ); output_filename( "--export" ); output_filename( spec_file ); @@ -3446,11 +3446,11 @@ static void output_static_lib( struct makefile *make ) output( "%s:", obj_dir_path( make, make->staticlib )); output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->unixobj_files ); - output( "\n\trm -f $@\n" ); - output( "\t%s rc $@", ar ); + output( "\n\t$(QUIET)rm -f $@\n" ); + output( "\t$(QUIET_AR)%s rc $@", ar ); output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->unixobj_files ); - output( "\n\t%s $@\n", ranlib ); + output( "\n\t$(QUIET_RANLIB)%s $@\n", ranlib ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d$(dlldir)/%s", make->staticlib )); if (needs_cross_lib( make )) @@ -3461,7 +3461,7 @@ static void output_static_lib( struct makefile *make ) output( "%s: %s", obj_dir_path( make, name ), tools_path( make, "winebuild" )); output_filenames_obj_dir( make, make->crossobj_files ); output( "\n" ); - output( "\t%s -b %s -w --staticlib -o $@", tools_path( make, "winebuild" ), crosstarget ); + output( "\t$(QUIET_WINEBUILD)%s -b %s -w --staticlib -o $@", tools_path( make, "winebuild" ), crosstarget ); output_filenames_obj_dir( make, make->crossobj_files ); output( "\n" ); } @@ -3490,7 +3490,7 @@ static void output_shared_lib( struct makefile *make ) output_filenames_obj_dir( make, make->object_files ); output_filenames( dep_libs ); output( "\n" ); - output( "\t$(CC) -o $@" ); + output( "\t$(QUIET_CCLD)$(CC) -o $@" ); output_filenames_obj_dir( make, make->object_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); @@ -3557,7 +3557,7 @@ static void output_test_module( struct makefile *make ) output( "\n" ); output( "programs/winetest/%s: %s%s\n", testres, obj_dir_path( make, stripped ), ext ); - output( "\techo \"%s TESTRES \\\"%s%s\\\"\" | %s -u -o $@\n", + output( "\t$(QUIET_WRC)echo \"%s TESTRES \\\"%s%s\\\"\" | %s -u -o $@\n", testmodule, obj_dir_path( make, stripped ), ext, tools_path( make, "wrc" )); output_filenames_obj_dir( make, make->ok_files ); @@ -3602,7 +3602,7 @@ static void output_programs( struct makefile *make ) output_filenames_obj_dir( make, objs ); output_filenames( deps ); output( "\n" ); - output( "\t$(CC) -o $@" ); + output( "\t$(QUIET_CCLD)$(CC) -o $@" ); output_filenames_obj_dir( make, objs ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); @@ -3777,7 +3777,7 @@ static void output_sources( struct makefile *make ) { output( "%s: %s %s\n", obj_dir_path( make, "dlldata.c" ), tools_path( make, "widl" ), src_dir_path( make, "Makefile.in" )); - output( "\t%s --dlldata-only -o $@", tools_path( make, "widl" )); + output( "\t$(QUIET_WIDL)%s --dlldata-only -o $@", tools_path( make, "widl" )); output_filenames( make->dlldata_files ); output( "\n" ); } -- 2.23.0

1 0

[PATCH] windowscodecs: Include system header png.h before Windows headers.
by Olivier F. R. Dierick Oct. 24, 2020

Oct. 24, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50050 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> --- dlls/windowscodecs/libpng.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 201f5c7..93ff6e0 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -25,6 +25,9 @@ #include "wine/port.h" #include <stdarg.h> +#ifdef SONAME_LIBPNG +#include <png.h> +#endif #define NONAMELESSUNION @@ -43,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #ifdef SONAME_LIBPNG -#include <png.h> - static void *libpng_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(png_create_info_struct); -- 2.1.4

2 1

[PATCH v2] ntdll: Stub NtQuerySystemInformation(SystemExtendedProcessInformation).
by Zebediah Figura Oct. 24, 2020

Oct. 24, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46870 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Add bug reference. dlls/ntdll/unix/system.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index b85a3c7b6ad..6ff277c2d0c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2615,6 +2615,12 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemExtendedProcessInformation: + FIXME("SystemExtendedProcessInformation, size %u, info %p, stub!\n", size, info); + memset( info, 0, size ); + ret = STATUS_SUCCESS; + break; + default: FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size ); -- 2.28.0

1 0

[PATCH] ntdll: Stub NtQuerySystemInformation(SystemExtendedProcessInformation).
by Zebediah Figura Oct. 24, 2020

Oct. 24, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/system.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index b85a3c7b6ad..6ff277c2d0c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2615,6 +2615,12 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, break; } + case SystemExtendedProcessInformation: + FIXME("SystemExtendedProcessInformation, size %u, info %p, stub!\n", size, info); + memset( info, 0, size ); + ret = STATUS_SUCCESS; + break; + default: FIXME( "(0x%08x,%p,0x%08x,%p) stub\n", class, info, size, ret_size ); -- 2.28.0

1 0

[PATCH 1/3] mscoree/tests: Test invalid assembly paths in registry.
by Rémi Bernon Oct. 23, 2020

Oct. 23, 2020

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mscoree/tests/Makefile.in | 2 +- dlls/mscoree/tests/comtest.c | 46 ++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index f65e1bc6c25..7dcd5b64113 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mscoree.dll -IMPORTS = ole32 shlwapi uuid shell32 +IMPORTS = ole32 shlwapi uuid shell32 advapi32 C_SRCS = \ comtest.c \ diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 12b112417d5..8c2ae955cef 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -148,6 +148,51 @@ static void run_test(BOOL expect_success) } IClassFactory_Release(classFactory); } + +} + +static void run_registry_test(run_type run) +{ + char buffer[256]; + ITest *test = NULL; + HRESULT hr, result_expected; + HKEY hkey; + DWORD ret; + int i = 0; + + if (run == run_type_exe_directory) result_expected = S_OK; + else result_expected = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + sprintf(buffer, "CLSID\\%s", wine_dbgstr_guid(&CLSID_Test), ""); + ret = RegCreateKeyA( HKEY_CLASSES_ROOT, buffer, &hkey ); + ok(ret == ERROR_SUCCESS, "RegCreateKeyA returned %x\n", ret); + + ret = RegSetKeyValueA(hkey, "InprocServer32", NULL, REG_SZ, "mscoree.dll", 11); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "Assembly", REG_SZ, "comtest, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", 74); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "Class", REG_SZ, "DLL.Test", 8); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + ret = RegSetKeyValueA(hkey, "InprocServer32", "CodeBase", REG_SZ, "file:///U:/invalid/path/to/comtest.dll", 41); + ok(ret == ERROR_SUCCESS, "RegSetKeyValueA returned %x\n", ret); + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + todo_wine ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test); + } + + RegDeleteKeyValueA(hkey, "InprocServer32", "CodeBase"); + RegDeleteKeyValueA(hkey, "InprocServer32", "Class"); + RegDeleteKeyValueA(hkey, "InprocServer32", "Assembly"); + RegDeleteKeyValueA(hkey, "InprocServer32", NULL); + RegDeleteKeyA(hkey, "InprocServer32"); + RegCloseKey(hkey); } static void get_dll_path_for_run(char *path_dll, UINT path_dll_size, run_type run) @@ -247,6 +292,7 @@ static void prepare_and_run_test(const char *dll_source, run_type run) SetCurrentDirectoryA(path_tmp); run_test(run == run_type_exe_directory); + run_registry_test(run); cleanup: if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE) -- 2.28.0

2 5