May 2022 - Wine-commits - list.winehq.org

Jacek Caban : win32u: Move GetMenuItemCount implementation from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: bad82953dbe5c0a8a61f81ca5313d7f32a004977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bad82953dbe5c0a8a61f81ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 16:28:06 2022 +0200 win32u: Move GetMenuItemCount implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 12 ++---------- dlls/win32u/menu.c | 14 ++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 6 ++++++ 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index e81fc086918..9f51fa555f8 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3696,17 +3696,9 @@ UINT WINAPI GetMenuState( HMENU menu, UINT item, UINT flags ) /********************************************************************** * GetMenuItemCount (USER32.@) */ -INT WINAPI GetMenuItemCount( HMENU hMenu ) +INT WINAPI GetMenuItemCount( HMENU menu ) { - POPUPMENU *menu = grab_menu_ptr(hMenu); - INT count; - - if (!menu) return -1; - count = menu->nItems; - release_menu_ptr(menu); - - TRACE("(%p) returning %d\n", hMenu, count); - return count; + return NtUserGetMenuItemCount( menu ); } diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 0f918a4762d..8544cca47b4 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -864,6 +864,20 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT return ret; } +/* see GetMenuItemCount */ +INT get_menu_item_count( HMENU handle ) +{ + POPUPMENU *menu; + INT count; + + if (!(menu = grab_menu_ptr( handle ))) return -1; + count = menu->nItems; + release_menu_ptr(menu); + + TRACE( "(%p) returning %d\n", handle, count ); + return count; +} + /********************************************************************** * NtUserRemoveMenu (win32u.@) */ diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3cf03d68399..114016954aa 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4718,6 +4718,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_GetIconParam: return get_icon_param( UlongToHandle(arg) ); + case NtUserCallOneParam_GetMenuItemCount: + return get_menu_item_count( UlongToHandle(arg) ); + case NtUserCallOneParam_GetSysColor: return get_sys_color( arg ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index caf77590559..537eec38a34 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -377,6 +377,7 @@ extern HMENU create_menu( BOOL is_popup ) DECLSPEC_HIDDEN; extern BOOL draw_menu_bar( HWND hwnd ) DECLSPEC_HIDDEN; extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL get_menu_info( HMENU handle, MENUINFO *info ) DECLSPEC_HIDDEN; +extern INT get_menu_item_count( HMENU handle ) DECLSPEC_HIDDEN; extern BOOL set_window_menu( HWND hwnd, HMENU handle ) DECLSPEC_HIDDEN; /* message.c */ diff --git a/include/ntuser.h b/include/ntuser.h index 75c16e412c0..1876b32c84b 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -704,6 +704,7 @@ enum NtUserCallOneParam_GetClipCursor, NtUserCallOneParam_GetCursorPos, NtUserCallOneParam_GetIconParam, + NtUserCallOneParam_GetMenuItemCount, NtUserCallOneParam_GetPrimaryMonitorRect, NtUserCallOneParam_GetSysColor, NtUserCallOneParam_GetSysColorBrush, @@ -773,6 +774,11 @@ static inline UINT_PTR NtUserGetIconParam( HICON icon ) return NtUserCallOneParam( HandleToUlong(icon), NtUserCallOneParam_GetIconParam ); } +static inline UINT_PTR NtUserGetMenuItemCount( HMENU menu ) +{ + return NtUserCallOneParam( HandleToUlong(menu), NtUserCallOneParam_GetMenuItemCount ); +} + static inline RECT NtUserGetPrimaryMonitorRect(void) { RECT primary;

1 0

Jacek Caban : win32u: Move NtUserTranslateAccelerator from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: dc0d16f192fa245dea07384b8290d7b64ac1970a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc0d16f192fa245dea07384b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Apr 10 16:14:50 2022 +0200 win32u: Move NtUserTranslateAccelerator from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 204 +------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 279 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + 7 files changed, 291 insertions(+), 204 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc0d16f192fa245dea07…

1 0

Jacek Caban : win32u: Move NtUserDeleteMenu implementation from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 189da79a18bcb7baabcd50de36bf2a6ba818b79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=189da79a18bcb7baabcd50de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 00:42:16 2022 +0200 win32u: Move NtUserDeleteMenu implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 6 +++--- dlls/user32/menu.c | 26 +++----------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/menu.c | 19 +++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 9 files changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index b856f054247..1b06143d4cf 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -945,11 +945,11 @@ static BOOL MDI_RestoreFrameMenu( HWND frame, HWND hChild ) } /* close */ - DeleteMenu(menu, SC_CLOSE, MF_BYCOMMAND); + NtUserDeleteMenu( menu, SC_CLOSE, MF_BYCOMMAND ); /* restore */ - DeleteMenu(menu, SC_RESTORE, MF_BYCOMMAND); + NtUserDeleteMenu( menu, SC_RESTORE, MF_BYCOMMAND ); /* minimize */ - DeleteMenu(menu, SC_MINIMIZE, MF_BYCOMMAND); + NtUserDeleteMenu( menu, SC_MINIMIZE, MF_BYCOMMAND ); DrawMenuBar(frame); diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 669d838bf61..761718182b5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -410,7 +410,7 @@ static HMENU MENU_GetSysMenu( HWND hWnd, HMENU hPopupMenu ) if (hPopupMenu) { if (GetClassLongW(hWnd, GCL_STYLE) & CS_NOCLOSE) - DeleteMenu(hPopupMenu, SC_CLOSE, MF_BYCOMMAND); + NtUserDeleteMenu( hPopupMenu, SC_CLOSE, MF_BYCOMMAND ); InsertMenuW( hMenu, -1, MF_SYSMENU | MF_POPUP | MF_BYPOSITION, (UINT_PTR)hPopupMenu, NULL ); @@ -3540,7 +3540,7 @@ BOOL WINAPI ChangeMenuA( HMENU hMenu, UINT pos, LPCSTR data, TRACE("menu=%p pos=%d data=%p id=%08x flags=%08x\n", hMenu, pos, data, id, flags ); if (flags & MF_APPEND) return AppendMenuA( hMenu, flags & ~MF_APPEND, id, data ); - if (flags & MF_DELETE) return DeleteMenu(hMenu, pos, flags & ~MF_DELETE); + if (flags & MF_DELETE) return NtUserDeleteMenu( hMenu, pos, flags & ~MF_DELETE ); if (flags & MF_CHANGE) return ModifyMenuA(hMenu, pos, flags & ~MF_CHANGE, id, data ); if (flags & MF_REMOVE) return NtUserRemoveMenu( hMenu, @@ -3560,7 +3560,7 @@ BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data, TRACE("menu=%p pos=%d data=%p id=%08x flags=%08x\n", hMenu, pos, data, id, flags ); if (flags & MF_APPEND) return AppendMenuW( hMenu, flags & ~MF_APPEND, id, data ); - if (flags & MF_DELETE) return DeleteMenu(hMenu, pos, flags & ~MF_DELETE); + if (flags & MF_DELETE) return NtUserDeleteMenu( hMenu, pos, flags & ~MF_DELETE ); if (flags & MF_CHANGE) return ModifyMenuW(hMenu, pos, flags & ~MF_CHANGE, id, data ); if (flags & MF_REMOVE) return NtUserRemoveMenu( hMenu, @@ -3825,26 +3825,6 @@ BOOL WINAPI AppendMenuW( HMENU hMenu, UINT flags, } -/********************************************************************** - * DeleteMenu (USER32.@) - */ -BOOL WINAPI DeleteMenu( HMENU hMenu, UINT id, UINT flags ) -{ - POPUPMENU *menu; - UINT pos; - - if (!(menu = find_menu_item(hMenu, id, flags, &pos))) - return FALSE; - - if (menu->items[pos].fType & MF_POPUP) - NtUserDestroyMenu( menu->items[pos].hSubMenu ); - - NtUserRemoveMenu( menu->obj.handle, pos, flags | MF_BYPOSITION ); - release_menu_ptr(menu); - return TRUE; -} - - /******************************************************************* * ModifyMenuW (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 26f2d1caf45..0697bcfa841 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -153,7 +153,7 @@ @ stdcall DefWindowProcA(long long long long) @ stdcall DefWindowProcW(long long long long) @ stdcall DeferWindowPos(long long long long long long long long) -@ stdcall DeleteMenu(long long long) +@ stdcall DeleteMenu(long long long) NtUserDeleteMenu @ stdcall DeregisterShellHookWindow (long) @ stdcall DestroyAcceleratorTable(long) NtUserDestroyAcceleratorTable @ stdcall DestroyCaret() diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index d41aba956f2..67abac37037 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -976,6 +976,25 @@ BOOL WINAPI NtUserRemoveMenu( HMENU handle, UINT id, UINT flags ) return TRUE; } +/********************************************************************** + * NtUserDeleteMenu (win32u.@) + */ +BOOL WINAPI NtUserDeleteMenu( HMENU handle, UINT id, UINT flags ) +{ + POPUPMENU *menu; + UINT pos; + + if (!(menu = find_menu_item( handle, id, flags, &pos ))) + return FALSE; + + if (menu->items[pos].fType & MF_POPUP) + NtUserDestroyMenu( menu->items[pos].hSubMenu ); + + NtUserRemoveMenu( menu->obj.handle, pos, flags | MF_BYPOSITION ); + release_menu_ptr( menu ); + return TRUE; +} + /********************************************************************** * NtUserSetMenuContextHelpId (win32u.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index f585e90bd4a..488056ef439 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -114,6 +114,7 @@ static void * const syscalls[] = NtUserCreateAcceleratorTable, NtUserCreateDesktopEx, NtUserCreateWindowStation, + NtUserDeleteMenu, NtUserDestroyAcceleratorTable, NtUserFindExistingCursorIcon, NtUserFindWindowEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 483b3d52289..43db8421bb8 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -824,7 +824,7 @@ @ stdcall NtUserDeferWindowPosAndBand(long long long long long long long long long long) @ stub NtUserDelegateCapturePointers @ stub NtUserDelegateInput -@ stub NtUserDeleteMenu +@ stdcall -syscall NtUserDeleteMenu(long long long) @ stub NtUserDeleteWindowGroup @ stdcall -syscall NtUserDestroyAcceleratorTable(long) @ stub NtUserDestroyActivationGroup diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 776a7e671f6..27ba163408b 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -101,6 +101,7 @@ SYSCALL_ENTRY( NtUserCreateAcceleratorTable ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ + SYSCALL_ENTRY( NtUserDeleteMenu ) \ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserFindExistingCursorIcon ) \ SYSCALL_ENTRY( NtUserFindWindowEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1f287c7631c..d90c4ec2f99 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -669,6 +669,15 @@ NTSTATUS WINAPI wow64_NtUserCheckMenuItem( UINT *args ) return NtUserCheckMenuItem( handle, id, flags ); } +NTSTATUS WINAPI wow64_NtUserDeleteMenu( UINT *args ) +{ + HMENU menu = get_handle( &args ); + UINT id = get_ulong( &args ); + UINT flags = get_ulong( &args ); + + return NtUserDeleteMenu( menu, id, flags ); +} + NTSTATUS WINAPI wow64_NtUserGetMenuItemRect( UINT *args ) { HWND hwnd = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 1876b32c84b..dfa9f53a187 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -487,6 +487,7 @@ HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK m ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 ); HDWP WINAPI NtUserDeferWindowPosAndBand( HDWP hdwp, HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags, UINT unk1, UINT unk2 ); +BOOL WINAPI NtUserDeleteMenu( HMENU menu, UINT id, UINT flags ); BOOL WINAPI NtUserDestroyAcceleratorTable( HACCEL handle ); BOOL WINAPI NtUserDestroyCursor( HCURSOR cursor, ULONG arg ); BOOL WINAPI NtUserDestroyMenu( HMENU menu );

1 0

Jacek Caban : win32u: Move NtUserGetSystemMenu implementation from user32.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 4604c4554007165e84d4dc44db215975923e2ba2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4604c4554007165e84d4dc44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 00:54:36 2022 +0200 win32u: Move NtUserGetSystemMenu implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 1 + dlls/user32/defwnd.c | 6 +++--- dlls/user32/mdi.c | 4 ++-- dlls/user32/menu.c | 45 ++------------------------------------------ dlls/user32/nonclient.c | 8 ++++---- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 + dlls/win32u/class.c | 2 +- dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 2 ++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 15 files changed, 70 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4604c4554007165e84d4…

1 0

Drew Ronneberg : shdocvw: Remove obsolete -D_SHDOCVW_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 842b0eb511be7ae9826c25b890460dc7db6da659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=842b0eb511be7ae9826c25b8… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Fri Apr 29 06:14:31 2022 -0400 shdocvw: Remove obsolete -D_SHDOCVW_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 30b0a1a299c..9523f299ce1 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_SHDOCVW_ MODULE = shdocvw.dll IMPORTLIB = shdocvw IMPORTS = uuid shlwapi advapi32

1 0

Drew Ronneberg : winspool.drv: Remove obsolete -D_SPOOL32_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 68bdfcda76d9760c3a6def67487387934221d1da URL: https://source.winehq.org/git/wine.git/?a=commit;h=68bdfcda76d9760c3a6def67… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:13 2022 -0400 winspool.drv: Remove obsolete -D_SPOOL32_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index 019b0e8ab9d..cd70d13b6f9 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SPOOL32_ +EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winspool.drv UNIXLIB = winspool.so IMPORTLIB = winspool

1 0

Drew Ronneberg : netapi32: Remove obsolete -D_SVRAPI_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: cacf4d1a55ad657eb05dd55661da048e789fb3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cacf4d1a55ad657eb05dd556… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:07 2022 -0400 netapi32: Remove obsolete -D_SVRAPI_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 1f97d9797b9..cb0ea5168b5 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_SVRAPI_ MODULE = netapi32.dll UNIXLIB = netapi32.so IMPORTLIB = netapi32

1 0

Drew Ronneberg : rpcrt4: Remove obsolete -D_RPCRT4_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: a1f8a75aa434d1bedc2024174161c174977086b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1f8a75aa434d1bedc202417… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:09 2022 -0400 rpcrt4: Remove obsolete -D_RPCRT4_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 2aa2a5376aa..822e6ded35d 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_RPCRT4_ -DMSWMSG +EXTRADEFS = -DMSWMSG MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32

1 0

Drew Ronneberg : user32: Remove obsolete -D_WINABLE_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 52a4126bc92a0d7ddf979d2c4a4e6d4bba18d251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52a4126bc92a0d7ddf979d2c… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:12 2022 -0400 user32: Remove obsolete -D_WINABLE_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 92d5c1ec1d9..4a413746de7 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_USER32_ -D_WINABLE_ +EXTRADEFS = -DWINE_NO_LONG_TYPES -D_USER32_ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u

1 0

Drew Ronneberg : oleaut32: Remove obsolete -D_OLEAUT32_ from Makefile.in.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 75f6f22d5b1f7e9c40595c2fa35131c8f3e636c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75f6f22d5b1f7e9c40595c2f… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:08 2022 -0400 oleaut32: Remove obsolete -D_OLEAUT32_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index a7dea7a37c7..3e760b8d835 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -2,7 +2,6 @@ MODULE = oleaut32.dll IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 urlmon windowscodecs -EXTRADEFS = -D_OLEAUT32_ C_SRCS = \ connpt.c \

1 0