Skip to content

Commit

Permalink
Hotfixes: Update NosTale hotfix for 0bfdac7 (#1289)
Browse files Browse the repository at this point in the history
Fix broken builds since Wine upstream 0bfdac7f65
("win32u: Move the PE side DND callbacks to user32.").

Fixes #1288.
  • Loading branch information
kangtastic authored Oct 19, 2024
1 parent 6a7196a commit 020e5a4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
4 changes: 3 additions & 1 deletion wine-tkg-git/wine-tkg-patches/hotfixes/NosTale/hotfixes
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
fi
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 879ef36148b489f82a3d99d2113b01eb7eb985a1 HEAD ); then
warning "Hotfix: Fix NosTale mouse bug"
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 5127bedd54716a773fe079e19a4e38891b939671 HEAD ); then
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 0bfdac7f6585f9bfce1d37335f53d2ed307d073b HEAD ); then
_hotfixes+=("$_where"/wine-tkg-patches/hotfixes/NosTale/nostale_mouse_fix)
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 5127bedd54716a773fe079e19a4e38891b939671 HEAD ); then
_hotfixes+=("$_where"/wine-tkg-patches/hotfixes/NosTale/nostale_mouse_fix-0bfdac7)
else
_hotfixes+=("$_where"/wine-tkg-patches/hotfixes/NosTale/nostale_mouse_fix-5127bed)
fi
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/dlls/user32/Makefile.in
+++ b/dlls/user32/Makefile.in
@@ -4,6 +4,7 @@ IMPORTLIB = user32
IMPORTS = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u
EXTRAINCL = $(PNG_PE_CFLAGS)
DELAYIMPORTS = imm32
+i386_EXTRADLLFLAGS = -Wl,--image-base,0x7e410000

C_SRCS = \
button.c \
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
--- a/dlls/user32/Makefile.in
+++ b/dlls/user32/Makefile.in
@@ -4,6 +4,7 @@ IMPORTLIB = user32
IMPORTS = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u
IMPORTS = $(PNG_PE_LIBS) gdi32 sechost advapi32 kernelbase win32u uuid
EXTRAINCL = $(PNG_PE_CFLAGS)
DELAYIMPORTS = imm32
DELAYIMPORTS = imm32 combase
+i386_EXTRADLLFLAGS = -Wl,--image-base,0x7e410000

C_SRCS = \
SOURCES = \
button.c \

0 comments on commit 020e5a4

Please sign in to comment.