October 2023 - Wine-Commits

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .sfd files.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: c047bb6ea3236705b6f21daedf45fe6a6467fd31 URL: https://gitlab.winehq.org/wine/wine/-/commit/c047bb6ea3236705b6f21daedf45fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 10:58:53 2023 +0200 makefiles: Always use the global SOURCES variable for .sfd files. --- dlls/dwrite/tests/Makefile.in | 9 +++------ dlls/gdi32/tests/Makefile.in | 9 +++------ dlls/gdiplus/tests/Makefile.in | 9 +++------ fonts/Makefile.in | 2 +- tools/make_makefiles | 6 +----- 5 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in index 7fbf9e36c7e..789f12dd10b 100644 --- a/dlls/dwrite/tests/Makefile.in +++ b/dlls/dwrite/tests/Makefile.in @@ -1,12 +1,9 @@ TESTDLL = dwrite.dll IMPORTS = dwrite gdi32 user32 -C_SRCS = \ +SOURCES = \ analyzer.c \ font.c \ - layout.c - -FONT_SRCS = \ + layout.c \ + resource.rc \ wine_test.sfd - -RC_SRCS = resource.rc diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 3eb478ff765..d6f33ee087d 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = gdi32.dll IMPORTS = setupapi user32 gdi32 advapi32 -C_SRCS = \ +SOURCES = \ bitmap.c \ brush.c \ clipping.c \ @@ -16,9 +16,8 @@ C_SRCS = \ metafile.c \ palette.c \ path.c \ - pen.c - -FONT_SRCS = \ + pen.c \ + resource.rc \ vertical.sfd \ wine_langnames.sfd \ wine_langnames2.sfd \ @@ -29,5 +28,3 @@ FONT_SRCS = \ wine_ttfnames.sfd \ wine_ttfnames_bold.sfd \ wine_vdmx.sfd - -RC_SRCS = resource.rc diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index ef3f26d9082..60587a2aabe 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = gdiplus.dll IMPORTS = gdiplus ole32 user32 gdi32 -C_SRCS = \ +SOURCES = \ brush.c \ customlinecap.c \ font.c \ @@ -13,10 +13,7 @@ C_SRCS = \ pathiterator.c \ pen.c \ region.c \ - stringformat.c - -RC_SRCS = resource.rc - -FONT_SRCS = \ + resource.rc \ + stringformat.c \ wine_longname.sfd \ wine_testfont0.sfd diff --git a/fonts/Makefile.in b/fonts/Makefile.in index b8021851987..a582d7be864 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -1,4 +1,4 @@ -FONT_SRCS = \ +SOURCES = \ courier.sfd \ fixedsys.sfd \ fixedsys_jp.sfd \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 5b263c58d24..9e10220ad46 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,7 +338,7 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); - if ($name =~ /\.(m|mc|po)$/) + if ($name =~ /\.(m|mc|po|sfd)$/) { push @{${$make}{"=SOURCES"}}, $name; next; @@ -346,10 +346,6 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } - elsif ($name =~ /\.sfd$/) - { - push @{${$make}{"=FONT_SRCS"}}, $name; - } elsif ($name =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $name;

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .mc files.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: 64de93e3001967a2c7a92de1b9ae42730f3c3f82 URL: https://gitlab.winehq.org/wine/wine/-/commit/64de93e3001967a2c7a92de1b9ae42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 10:50:42 2023 +0200 makefiles: Always use the global SOURCES variable for .mc files. --- dlls/kernelbase/Makefile.in | 9 ++++----- dlls/mferror/Makefile.in | 2 +- dlls/wininet/Makefile.in | 9 +++------ programs/fsutil/Makefile.in | 6 ++---- tools/make_makefiles | 12 +++++++----- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 1f10fe8cc0b..081e9bfbb64 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -7,10 +7,11 @@ EXTRADLLFLAGS = -nodefaultlibs -nostartfiles i386_EXTRADLLFLAGS = -Wl,--image-base,0x7b000000 x86_64_EXTRADLLFLAGS = -Wl,--image-base,0x174000000 -C_SRCS = \ +SOURCES = \ console.c \ debug.c \ file.c \ + kernelbase.rc \ loader.c \ locale.c \ main.c \ @@ -23,7 +24,5 @@ C_SRCS = \ sync.c \ thread.c \ version.c \ - volume.c - -RC_SRCS = kernelbase.rc -MC_SRCS = winerror.mc + volume.c \ + winerror.mc diff --git a/dlls/mferror/Makefile.in b/dlls/mferror/Makefile.in index 271688a79a5..5ee1b74184b 100644 --- a/dlls/mferror/Makefile.in +++ b/dlls/mferror/Makefile.in @@ -2,4 +2,4 @@ MODULE = mferror.dll EXTRADLLFLAGS = -Wb,--data-only -MC_SRCS = mferror.mc +SOURCES = mferror.mc diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index 5fbb66be50e..57db3794e36 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -5,7 +5,7 @@ IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32 EXTRAINCL = $(ZLIB_PE_CFLAGS) DELAYIMPORTS = secur32 crypt32 cryptui dhcpcsvc iphlpapi -C_SRCS = \ +SOURCES = \ cookie.c \ dialogs.c \ ftp.c \ @@ -14,9 +14,6 @@ C_SRCS = \ internet.c \ netconnection.c \ urlcache.c \ - utility.c - -RC_SRCS = wininet.rc - -MC_SRCS = \ + utility.c \ + wininet.rc \ winineterror.mc diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in index df1c8ac6657..55850d2a92b 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -3,8 +3,6 @@ IMPORTS = user32 EXTRADLLFLAGS = -mconsole -municode -C_SRCS = \ +SOURCES = \ + fsutil.mc \ main.c - -MC_SRCS = \ - fsutil.mc diff --git a/tools/make_makefiles b/tools/make_makefiles index 3cb272c5c06..82446973f25 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,7 +338,12 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); - if ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } + if ($name =~ /\.mc$/) + { + push @{${$make}{"=SOURCES"}}, $name; + next; + } + elsif ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } @@ -358,10 +363,6 @@ sub assign_sources_to_makefiles(@) { push @{${$make}{"=RC_SRCS"}}, $name; } - elsif ($name =~ /\.mc$/) - { - push @{${$make}{"=MC_SRCS"}}, $name; - } elsif ($name =~ /\.po$/) { push @{${$make}{"=PO_SRCS"}}, $name; @@ -408,6 +409,7 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{$file}; my $parent = get_parent_makefile( $file ); next unless $parent; + preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "SOURCES" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" );

1 0

Alexandre Julliard : makefiles: Remove unnecessary imports of usp10.dll.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: 1255764ad5a63bddcad02a44391281a001ea6b2b URL: https://gitlab.winehq.org/wine/wine/-/commit/1255764ad5a63bddcad02a44391281… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 10:45:23 2023 +0200 makefiles: Remove unnecessary imports of usp10.dll. The functions are in gdi32 nowadays. --- dlls/comctl32/Makefile.in | 2 +- dlls/d3dx9_24/Makefile.in | 2 +- dlls/d3dx9_25/Makefile.in | 2 +- dlls/d3dx9_26/Makefile.in | 2 +- dlls/d3dx9_27/Makefile.in | 2 +- dlls/d3dx9_28/Makefile.in | 2 +- dlls/d3dx9_29/Makefile.in | 2 +- dlls/d3dx9_30/Makefile.in | 2 +- dlls/d3dx9_31/Makefile.in | 2 +- dlls/d3dx9_32/Makefile.in | 2 +- dlls/d3dx9_33/Makefile.in | 2 +- dlls/d3dx9_34/Makefile.in | 2 +- dlls/d3dx9_35/Makefile.in | 2 +- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_37/Makefile.in | 2 +- dlls/d3dx9_38/Makefile.in | 2 +- dlls/d3dx9_39/Makefile.in | 2 +- dlls/d3dx9_40/Makefile.in | 2 +- dlls/d3dx9_41/Makefile.in | 2 +- dlls/d3dx9_42/Makefile.in | 2 +- dlls/d3dx9_43/Makefile.in | 2 +- dlls/riched20/Makefile.in | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index c0272f2d7d4..6412bf81003 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_COMCTL32_ MODULE = comctl32.dll IMPORTLIB = comctl32 -IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase +IMPORTS = uuid user32 gdi32 advapi32 imm32 kernelbase DELAYIMPORTS = winmm uxtheme C_SRCS = \ diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in index b43941c1942..bf23db04f1c 100644 --- a/dlls/d3dx9_24/Makefile.in +++ b/dlls/d3dx9_24/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=24 MODULE = d3dx9_24.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in index 9718cdea10b..f7190739256 100644 --- a/dlls/d3dx9_25/Makefile.in +++ b/dlls/d3dx9_25/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=25 MODULE = d3dx9_25.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in index 5984411d137..a59f1c9f7d0 100644 --- a/dlls/d3dx9_26/Makefile.in +++ b/dlls/d3dx9_26/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=26 MODULE = d3dx9_26.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in index 5484aebd010..ee99ec65b53 100644 --- a/dlls/d3dx9_27/Makefile.in +++ b/dlls/d3dx9_27/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=27 MODULE = d3dx9_27.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in index 14ea545fe3e..b8550538d9f 100644 --- a/dlls/d3dx9_28/Makefile.in +++ b/dlls/d3dx9_28/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=28 MODULE = d3dx9_28.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in index 796d905b86f..58dbedb8a2e 100644 --- a/dlls/d3dx9_29/Makefile.in +++ b/dlls/d3dx9_29/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=29 MODULE = d3dx9_29.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in index 36493d996b9..f835432c401 100644 --- a/dlls/d3dx9_30/Makefile.in +++ b/dlls/d3dx9_30/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=30 MODULE = d3dx9_30.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in index 9bbce4d35fd..9072b3e9e9f 100644 --- a/dlls/d3dx9_31/Makefile.in +++ b/dlls/d3dx9_31/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=31 MODULE = d3dx9_31.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in index 208a0718b42..e9fd6ca7900 100644 --- a/dlls/d3dx9_32/Makefile.in +++ b/dlls/d3dx9_32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=32 MODULE = d3dx9_32.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in index 8b636303015..8eb0d6bb970 100644 --- a/dlls/d3dx9_33/Makefile.in +++ b/dlls/d3dx9_33/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=33 MODULE = d3dx9_33.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in index 31a698532a0..ab3076e45c5 100644 --- a/dlls/d3dx9_34/Makefile.in +++ b/dlls/d3dx9_34/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=34 MODULE = d3dx9_34.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in index d1c02bd9564..2afd74c129f 100644 --- a/dlls/d3dx9_35/Makefile.in +++ b/dlls/d3dx9_35/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=35 MODULE = d3dx9_35.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 88778b301ca..c9bc5021fc8 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=36 MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in index f9a0d4085a8..66431141852 100644 --- a/dlls/d3dx9_37/Makefile.in +++ b/dlls/d3dx9_37/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=37 MODULE = d3dx9_37.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in index 2814a4686f9..1af5aaba2ee 100644 --- a/dlls/d3dx9_38/Makefile.in +++ b/dlls/d3dx9_38/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=38 MODULE = d3dx9_38.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in index 61c44debd2f..57b5f05d147 100644 --- a/dlls/d3dx9_39/Makefile.in +++ b/dlls/d3dx9_39/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=39 MODULE = d3dx9_39.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in index c1e8f15edab..9a5cfe44c4b 100644 --- a/dlls/d3dx9_40/Makefile.in +++ b/dlls/d3dx9_40/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=40 MODULE = d3dx9_40.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in index 132a6971639..093b404df8c 100644 --- a/dlls/d3dx9_41/Makefile.in +++ b/dlls/d3dx9_41/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=41 MODULE = d3dx9_41.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in index 305cb9b34f5..0dd2b322059 100644 --- a/dlls/d3dx9_42/Makefile.in +++ b/dlls/d3dx9_42/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=42 MODULE = d3dx9_42.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in index bcf41038c2c..5319ff2b28a 100644 --- a/dlls/d3dx9_43/Makefile.in +++ b/dlls/d3dx9_43/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DD3DX_SDK_VERSION=43 MODULE = d3dx9_43.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 -DELAYIMPORTS = windowscodecs usp10 +DELAYIMPORTS = windowscodecs EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index b64ee554690..0e5fc9d281d 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -1,6 +1,6 @@ MODULE = riched20.dll IMPORTLIB = riched20 -IMPORTS = uuid usp10 ole32 oleaut32 imm32 user32 gdi32 +IMPORTS = uuid ole32 oleaut32 imm32 user32 gdi32 EXTRADLLFLAGS = -Wl,--image-base,0x7ac00000

1 0

Alexandre Julliard : makefiles: Remove unnecessary imports of version.dll.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: 7e957a17f6c15a96869486154b25a945b6a6afe0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e957a17f6c15a96869486154b25a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 10:34:21 2023 +0200 makefiles: Remove unnecessary imports of version.dll. The functions are in kernelbase nowadays. --- dlls/dbghelp/Makefile.in | 1 - dlls/setupapi/Makefile.in | 2 +- dlls/shlwapi/Makefile.in | 2 +- dlls/user32/Makefile.in | 2 +- dlls/winealsa.drv/Makefile.in | 2 +- dlls/winecoreaudio.drv/Makefile.in | 2 +- dlls/wineoss.drv/Makefile.in | 2 +- dlls/winepulse.drv/Makefile.in | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 74647820126..3657fa7db12 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -3,7 +3,6 @@ IMPORTLIB = dbghelp IMPORTS = kernelbase $(ZLIB_PE_LIBS) EXTRAINCL = $(ZLIB_PE_CFLAGS) EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DELAYIMPORTS = version C_SRCS = \ coff.c \ diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 6b04a3f71ab..b18b58cd13a 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = setupapi.dll IMPORTLIB = setupapi -IMPORTS = uuid version advapi32 rpcrt4 kernelbase +IMPORTS = uuid advapi32 rpcrt4 kernelbase DELAYIMPORTS = cabinet shell32 wintrust ole32 comdlg32 user32 C_SRCS = \ diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 070dc232cee..2a93c495d14 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_SHLWAPI_ MODULE = shlwapi.dll IMPORTLIB = shlwapi IMPORTS = uuid shcore user32 gdi32 advapi32 kernelbase -DELAYIMPORTS = userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version +DELAYIMPORTS = userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm C_SRCS = \ assoc.c \ diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 2783d289407..0bfe49ad89e 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_USER32_ MODULE = user32.dll IMPORTLIB = user32 -IMPORTS = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u +IMPORTS = $(PNG_PE_LIBS) gdi32 sechost advapi32 kernelbase win32u EXTRAINCL = $(PNG_PE_CFLAGS) DELAYIMPORTS = imm32 diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 0a86fda23c3..94884bc3c2b 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = winealsa.drv UNIXLIB = winealsa.so -IMPORTS = uuid ole32 advapi32 version +IMPORTS = uuid ole32 advapi32 DELAYIMPORTS = winmm UNIX_LIBS = $(ALSA_LIBS) $(PTHREAD_LIBS) diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 0561f46f044..28998a4bbf8 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = winecoreaudio.drv UNIXLIB = winecoreaudio.so -IMPORTS = uuid ole32 user32 advapi32 version +IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm UNIX_LIBS = $(COREAUDIO_LIBS) diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in index 97e31aea662..a1771e14e2a 100644 --- a/dlls/wineoss.drv/Makefile.in +++ b/dlls/wineoss.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = wineoss.drv UNIXLIB = wineoss.so -IMPORTS = uuid ole32 user32 advapi32 version +IMPORTS = uuid ole32 user32 advapi32 DELAYIMPORTS = winmm UNIX_LIBS = $(OSS4_LIBS) $(PTHREAD_LIBS) UNIX_CFLAGS = $(OSS4_CFLAGS) diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in index 7a78f4e854e..d9cf2a02224 100644 --- a/dlls/winepulse.drv/Makefile.in +++ b/dlls/winepulse.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = winepulse.drv UNIXLIB = winepulse.so -IMPORTS = dxguid uuid winmm user32 advapi32 ole32 version +IMPORTS = dxguid uuid winmm user32 advapi32 ole32 UNIX_LIBS = $(PULSE_LIBS) $(PTHREAD_LIBS) -lm UNIX_CFLAGS = $(PULSE_CFLAGS)

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .po files.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: bf8cb196b5b4ce2be51af1f70f0f6011f2f06bd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf8cb196b5b4ce2be51af1f70f0f60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 12 10:54:07 2023 +0200 makefiles: Always use the global SOURCES variable for .po files. --- po/Makefile.in | 2 +- tools/make_makefiles | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/Makefile.in b/po/Makefile.in index ed8ba49c8c1..634cfe15374 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -1,4 +1,4 @@ -PO_SRCS = \ +SOURCES = \ ar.po \ ast.po \ bg.po \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 82446973f25..eebb02da691 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,7 +338,7 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); - if ($name =~ /\.mc$/) + if ($name =~ /\.(mc|po)$/) { push @{${$make}{"=SOURCES"}}, $name; next; @@ -363,10 +363,6 @@ sub assign_sources_to_makefiles(@) { push @{${$make}{"=RC_SRCS"}}, $name; } - elsif ($name =~ /\.po$/) - { - push @{${$make}{"=PO_SRCS"}}, $name; - } elsif ($name =~ /\.idl$/) { die "no makedep flags specified in $file" unless $dir eq "include" || get_makedep_flags($file);

1 0

Brendan Shanks : cfgmgr32: Add stub for CM_Get_Device_Interface_PropertyW.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: 69ceeaedf007bd11887816c6215ba9d7205692cd URL: https://gitlab.winehq.org/wine/wine/-/commit/69ceeaedf007bd11887816c6215ba9… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 11 21:30:04 2023 -0700 cfgmgr32: Add stub for CM_Get_Device_Interface_PropertyW. --- dlls/cfgmgr32/cfgmgr32.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 3b4f6106618..5c9b8f613db 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -91,6 +91,7 @@ @ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW @ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExA @ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExW +@ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_First_Log_Conf @ stub CM_Get_First_Log_Conf_Ex @ stub CM_Get_Global_State

1 0

Daniel Lehman : advapi32/tests: Skip ReadEventLog on failure to open System log.
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: wine Branch: master Commit: 9373f330e55fb00d5ef67dc00c6e8dfc40634c88 URL: https://gitlab.winehq.org/wine/wine/-/commit/9373f330e55fb00d5ef67dc00c6e8d… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Oct 11 22:56:41 2023 -0700 advapi32/tests: Skip ReadEventLog on failure to open System log. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55731 --- dlls/advapi32/tests/eventlog.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index e2334c692e5..1a35efe1844 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1327,11 +1327,13 @@ static void test_eventlog_start(void) char *sourcenameA, *computernameA, *localcomputerA; /* ReadEventLogW */ - size = MAX_COMPUTERNAME_LENGTH + 1; - localcomputer = malloc(size * sizeof(WCHAR)); - GetComputerNameW(localcomputer, &size); - handle = OpenEventLogW(0, L"System"); + if (!handle && (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == RPC_S_SERVER_UNAVAILABLE)) + { + win_skip( "Can't open event log\n" ); + return; + } + ok(handle != NULL, "OpenEventLogW(System) failed : %ld\n", GetLastError()); handle2 = OpenEventLogW(0, L"System"); todo_wine ok(handle != handle2, "Expected different handle\n"); CloseEventLog(handle2); @@ -1340,6 +1342,10 @@ static void test_eventlog_start(void) ok(!!handle2, "Expected valid handle\n"); CloseEventLog(handle2); + size = MAX_COMPUTERNAME_LENGTH + 1; + localcomputer = malloc(size * sizeof(WCHAR)); + GetComputerNameW(localcomputer, &size); + ret = TRUE; found = FALSE; while (!found && ret)

1 0

Francisco Casas : vkd3d-shader/d3dbc: Use D3DSIO_TEXKILL instead of VKD3D_SM1_OP_TEXKILL (clangd).
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: vkd3d Branch: master Commit: 38a73097582bd7e3959cbb9b8341445bc52a0f7b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/38a73097582bd7e3959cbb9b83414… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 11 12:56:33 2023 -0300 vkd3d-shader/d3dbc: Use D3DSIO_TEXKILL instead of VKD3D_SM1_OP_TEXKILL (clangd). --- libs/vkd3d-shader/d3dbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 598b7518..67fa3271 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2221,7 +2221,7 @@ static void write_sm1_jump(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b struct sm1_instruction instr = { - .opcode = VKD3D_SM1_OP_TEXKILL, + .opcode = D3DSIO_TEXKILL, .dst.type = D3DSPR_TEMP, .dst.reg = reg->id,

1 0

Francisco Casas : vkd3d-shader/hlsl: Remove enum hlsl_error_level (clangd).
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: vkd3d Branch: master Commit: 7960836551ab14f3cc746e368ae3597dcb7f30cb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7960836551ab14f3cc746e368ae35… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 11 10:34:22 2023 -0300 vkd3d-shader/hlsl: Remove enum hlsl_error_level (clangd). It is only used once for calling hlsl_note(), and it expects an enum vkd3d_shader_log_level values instead. --- libs/vkd3d-shader/hlsl.h | 7 ------- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 59c543c7..9f1a3fe2 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -864,13 +864,6 @@ struct hlsl_ctx uint32_t found_numthreads : 1; }; -enum hlsl_error_level -{ - HLSL_LEVEL_ERROR = 0, - HLSL_LEVEL_WARNING, - HLSL_LEVEL_NOTE, -}; - struct hlsl_resource_load_params { struct hlsl_type *format; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 5c816e89..7d17ca8c 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -249,7 +249,7 @@ static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir { hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, "Output semantic \"%s%u\" is used multiple times.", semantic->name, index); - hlsl_note(ctx, &ext_var->loc, HLSL_LEVEL_ERROR, + hlsl_note(ctx, &ext_var->loc, VKD3D_SHADER_LOG_ERROR, "First use of \"%s%u\" is here.", semantic->name, index); semantic->reported_duplicated_output_next_index = index + 1; } @@ -262,7 +262,7 @@ static struct hlsl_ir_var *add_semantic_var(struct hlsl_ctx *ctx, struct hlsl_ir hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, "Input semantic \"%s%u\" is used multiple times with incompatible types.", semantic->name, index); - hlsl_note(ctx, &ext_var->loc, HLSL_LEVEL_ERROR, + hlsl_note(ctx, &ext_var->loc, VKD3D_SHADER_LOG_ERROR, "First declaration of \"%s%u\" is here.", semantic->name, index); semantic->reported_duplicated_input_incompatible_next_index = index + 1; }

1 0

Francisco Casas : vkd3d-shader/tpf: Avoid translations to D3DDECLUSAGE and back (clangd).
by Alexandre Julliard Oct. 12, 2023

Oct. 12, 2023

Module: vkd3d Branch: master Commit: 432fa8fa8f4ba5cefbfb7ba89d5ab91ca0ebdfd4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/432fa8fa8f4ba5cefbfb7ba89d5ab… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 11 10:20:35 2023 -0300 vkd3d-shader/tpf: Avoid translations to D3DDECLUSAGE and back (clangd). --- libs/vkd3d-shader/tpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 5803e8de..5c42a588 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2731,7 +2731,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant const char *name; bool output; enum vkd3d_shader_type shader_type; - D3DDECLUSAGE usage; + D3D_NAME usage; } semantics[] = {

1 0