April 2018 - Wine-Devel - list.winehq.org

[PATCH 1/2] user32/menu: Hold a reference to menu data for calls with menu handles on input
by Nikolay Sivov April 16, 2018

April 16, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This obviously does not cover everything, only some easy cases. Making MENU_GetMenu() work this way requires changes everywhere, and some restructuring too, making patch size unmanageable. dlls/user32/menu.c | 200 +++++++++++++++++++++++++++++---------------- 1 file changed, 130 insertions(+), 70 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 99a99c0395..d437ba3266 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -98,6 +98,7 @@ typedef struct { UINT nScrollPos; /* Current scroll position */ UINT nTotalHeight; /* Total height of menu items inside menu */ RECT items_rect; /* Rectangle within which the items lie. Excludes margins and scroll arrows */ + LONG refcount; /* ------------ MENUINFO members ------ */ DWORD dwStyle; /* Extended menu style */ UINT cyMax; /* max height of the whole menu, 0 is screen height */ @@ -299,6 +300,32 @@ static POPUPMENU *MENU_GetMenu(HMENU hMenu) return menu; } +static POPUPMENU *grab_menu_ptr(HMENU hMenu) +{ + POPUPMENU *menu = get_user_handle_ptr( hMenu, USER_MENU ); + + if (menu == OBJ_OTHER_PROCESS) + { + WARN("other process menu %p?\n", hMenu); + return NULL; + } + + if (menu) + menu->refcount++; + else + WARN("invalid menu handle=%p\n", hMenu); + return menu; +} + +static void release_menu_ptr(POPUPMENU *menu) +{ + if (menu) + { + menu->refcount--; + release_user_handle_ptr(menu); + } +} + /*********************************************************************** * get_win_sys_menu * @@ -3830,10 +3857,15 @@ UINT WINAPI GetMenuState( HMENU hMenu, UINT wItemID, UINT wFlags ) */ INT WINAPI GetMenuItemCount( HMENU hMenu ) { - LPPOPUPMENU menu = MENU_GetMenu(hMenu); + POPUPMENU *menu = grab_menu_ptr(hMenu); + INT count; + if (!menu) return -1; - TRACE("(%p) returning %d\n", hMenu, menu->nItems ); - return menu->nItems; + count = menu->nItems; + release_menu_ptr(menu); + + TRACE("(%p) returning %d\n", hMenu, count); + return count; } @@ -4127,6 +4159,7 @@ HMENU WINAPI CreateMenu(void) if (!(menu = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*menu) ))) return 0; menu->FocusedItem = NO_SELECTED_ITEM; + menu->refcount = 1; if (!(hMenu = alloc_user_handle( &menu->obj, USER_MENU ))) HeapFree( GetProcessHeap(), 0, menu ); @@ -4148,6 +4181,9 @@ BOOL WINAPI DestroyMenu( HMENU hMenu ) if (!(lppop = free_user_handle( hMenu, USER_MENU ))) return FALSE; if (lppop == OBJ_OTHER_PROCESS) return FALSE; + if (InterlockedDecrement(&lppop->refcount)) + return TRUE; + /* DestroyMenu should not destroy system menu popup owner */ if ((lppop->wFlags & (MF_POPUP | MF_SYSMENU)) == MF_POPUP && lppop->hWnd) { @@ -4349,14 +4385,14 @@ BOOL MENU_SetMenu( HWND hWnd, HMENU hMenu ) if (GetCapture() == hWnd) set_capture_window( 0, GUI_INMENUMODE, NULL ); /* release the capture */ - if (hMenu != 0) + if (hMenu) { - LPPOPUPMENU lpmenu; - - if (!(lpmenu = MENU_GetMenu(hMenu))) return FALSE; + POPUPMENU *menu; - lpmenu->hWnd = hWnd; - lpmenu->Height = 0; /* Make sure we recalculate the size */ + if (!(menu = grab_menu_ptr(hMenu))) return FALSE; + menu->hWnd = hWnd; + menu->Height = 0; /* Make sure we recalculate the size */ + release_menu_ptr(menu); } SetWindowLongPtrW( hWnd, GWLP_ID, (LONG_PTR)hMenu ); return TRUE; @@ -4395,7 +4431,6 @@ HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos ) */ BOOL WINAPI DrawMenuBar( HWND hWnd ) { - LPPOPUPMENU lppop; HMENU hMenu; if (!IsWindow( hWnd )) @@ -4403,9 +4438,15 @@ BOOL WINAPI DrawMenuBar( HWND hWnd ) if (!WIN_ALLOWED_MENU(GetWindowLongW( hWnd, GWL_STYLE ))) return TRUE; - if ((hMenu = GetMenu( hWnd )) && (lppop = MENU_GetMenu( hMenu ))) { - lppop->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */ - lppop->hwndOwner = hWnd; + if ((hMenu = GetMenu( hWnd ))) + { + POPUPMENU *menu = grab_menu_ptr(hMenu); + if (menu) + { + menu->Height = 0; /* Make sure we call MENU_MenuBarCalcSize */ + menu->hwndOwner = hWnd; + release_menu_ptr(menu); + } } return SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | @@ -4573,14 +4614,17 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template ) */ BOOL WINAPI IsMenu(HMENU hmenu) { - LPPOPUPMENU menu = MENU_GetMenu(hmenu); + POPUPMENU *menu; + BOOL is_menu; - if (!menu) - { + menu = grab_menu_ptr(hmenu); + is_menu = menu != NULL; + release_menu_ptr(menu); + + if (!is_menu) SetLastError(ERROR_INVALID_MENU_HANDLE); - return FALSE; - } - return TRUE; + + return is_menu; } /********************************************************************** @@ -4942,53 +4986,60 @@ BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, return SetMenuItemInfo_common( menuitem, &mii, TRUE ); } +static BOOL set_menu_default_item(POPUPMENU *menu, UINT uItem, UINT bypos) +{ + unsigned int i; + MENUITEM *item; + + /* reset all default-item flags */ + item = menu->items; + for (i = 0; i < menu->nItems; i++, item++) + { + item->fState &= ~MFS_DEFAULT; + } + + /* no default item */ + if (-1 == uItem) + return TRUE; + + item = menu->items; + if ( bypos ) + { + if ( uItem >= menu->nItems ) return FALSE; + item[uItem].fState |= MFS_DEFAULT; + return TRUE; + } + else + { + for (i = 0; i < menu->nItems; i++, item++) + { + if (item->wID == uItem) + { + item->fState |= MFS_DEFAULT; + return TRUE; + } + } + } + + return FALSE; +} + /********************************************************************** * SetMenuDefaultItem (USER32.@) * */ BOOL WINAPI SetMenuDefaultItem(HMENU hmenu, UINT uItem, UINT bypos) { - UINT i; - POPUPMENU *menu; - MENUITEM *item; - - TRACE("(%p,%d,%d)\n", hmenu, uItem, bypos); - - if (!(menu = MENU_GetMenu(hmenu))) return FALSE; + POPUPMENU *menu; + BOOL ret; - /* reset all default-item flags */ - item = menu->items; - for (i = 0; i < menu->nItems; i++, item++) - { - item->fState &= ~MFS_DEFAULT; - } + TRACE("(%p,%d,%d)\n", hmenu, uItem, bypos); - /* no default item */ - if ( -1 == uItem) - { - return TRUE; - } + if (!(menu = grab_menu_ptr(hmenu))) return FALSE; + ret = set_menu_default_item(menu, uItem, bypos); + release_menu_ptr(menu); - item = menu->items; - if ( bypos ) - { - if ( uItem >= menu->nItems ) return FALSE; - item[uItem].fState |= MFS_DEFAULT; - return TRUE; - } - else - { - for (i = 0; i < menu->nItems; i++, item++) - { - if (item->wID == uItem) - { - item->fState |= MFS_DEFAULT; - return TRUE; - } - } - - } - return FALSE; + return ret; } /********************************************************************** @@ -5213,13 +5264,13 @@ BOOL WINAPI SetMenuInfo (HMENU hMenu, LPCMENUINFO lpmi) * */ BOOL WINAPI GetMenuInfo (HMENU hMenu, LPMENUINFO lpmi) -{ POPUPMENU *menu; +{ + POPUPMENU *menu; TRACE("(%p %p)\n", hMenu, lpmi); - if (lpmi && (lpmi->cbSize == sizeof( MENUINFO)) && (menu = MENU_GetMenu(hMenu))) + if (lpmi && (lpmi->cbSize == sizeof(MENUINFO)) && (menu = grab_menu_ptr(hMenu))) { - if (lpmi->fMask & MIM_BACKGROUND) lpmi->hbrBack = menu->hbrBack; @@ -5235,6 +5286,7 @@ BOOL WINAPI GetMenuInfo (HMENU hMenu, LPMENUINFO lpmi) if (lpmi->fMask & MIM_STYLE) lpmi->dwStyle = menu->dwStyle; + release_menu_ptr(menu); return TRUE; } SetLastError( ERROR_INVALID_PARAMETER); @@ -5247,14 +5299,15 @@ BOOL WINAPI GetMenuInfo (HMENU hMenu, LPMENUINFO lpmi) */ BOOL WINAPI SetMenuContextHelpId( HMENU hMenu, DWORD dwContextHelpID) { - LPPOPUPMENU menu; + POPUPMENU *menu; TRACE("(%p 0x%08x)\n", hMenu, dwContextHelpID); - if ((menu = MENU_GetMenu(hMenu))) + if ((menu = grab_menu_ptr(hMenu))) { - menu->dwContextHelpID = dwContextHelpID; - return TRUE; + menu->dwContextHelpID = dwContextHelpID; + release_menu_ptr(menu); + return TRUE; } return FALSE; } @@ -5265,15 +5318,18 @@ BOOL WINAPI SetMenuContextHelpId( HMENU hMenu, DWORD dwContextHelpID) */ DWORD WINAPI GetMenuContextHelpId( HMENU hMenu ) { - LPPOPUPMENU menu; + DWORD help_id = 0; + POPUPMENU *menu; TRACE("(%p)\n", hMenu); - if ((menu = MENU_GetMenu(hMenu))) + if ((menu = grab_menu_ptr(hMenu))) { - return menu->dwContextHelpID; + help_id = menu->dwContextHelpID; + release_menu_ptr(menu); } - return 0; + + return help_id; } /********************************************************************** @@ -5281,12 +5337,16 @@ DWORD WINAPI GetMenuContextHelpId( HMENU hMenu ) */ INT WINAPI MenuItemFromPoint(HWND hWnd, HMENU hMenu, POINT ptScreen) { - POPUPMENU *menu = MENU_GetMenu(hMenu); + POPUPMENU *menu = grab_menu_ptr(hMenu); UINT pos; /*FIXME: Do we have to handle hWnd here? */ if (!menu) return -1; - if (MENU_FindItemByCoords( menu, ptScreen, &pos ) != ht_item) return -1; + + if (MENU_FindItemByCoords( menu, ptScreen, &pos ) != ht_item) + pos = -1; + + release_menu_ptr(menu); return pos; } -- 2.17.0

1 1

[PATCH 00/41] Implement the MSI custom action server
by Zebediah Figura April 16, 2018

April 16, 2018

"That's ugly, please let's fix this the right way, we have all the necessary infrastructure now." -- Alexandre Julliard, 2009 [1] This patchset is dedicated to Alexandre, who, to be fair, wasn't wrong, but wasn't exactly right either ;-) This patchset fixes bug 18070. It also lays the groundwork to fix bugs 31741 and 37856. It can be viewed in full at [2]. The series is divided into roughly three major changes. The first (patches 0001-0003) replaces the method of IPC used (or at least intended to be used) from COM to RPC. This is necessary because the custom action might change the threading model and break our COM proxies, see [3] for more details. I chose RPC over one of the mentioned workarounds since it seemed a much cleaner solution, and additionally made the remote API much simpler (since e.g. we don't have to convert to and from HRESULTs). The bulk of the series (patches 0004-0040) fix individual functions so that they can be used from a custom action. I use the subject "Make Msi*() RPC-compatible." for consistency's sake, but the changes made vary from tweaking IDL annotations and return types to implementing the entire function (as in MsiView*() which previously blithely returned a local handle). The last part (patch 0041) performs the actual change, i.e. segregating ACTION_CallDllFunction() into a separate process and building the actual RPC stubs. With a bit of manual fixing this patch should be able to be applied directly on top of any other patch in the series, if it is desired for review purposes to be able to test a change in the "real-world" environment; this is how I did most of my debugging while building the series. This patchset has been tested for regressions against all installers available through winetricks, plus a few various installers I have on my system. I also tested it against several installers mentioned in bug 18070 or duplicates thereof, including Adobe Acrobat X Pro, so I can confirm that the bug is indeed fixed. [1] https://www.winehq.org/pipermail/wine-devel/2009-July/077148.html [2] https://github.com/zfigura/wine/tree/newmsi [3] https://www.winehq.org/pipermail/wine-devel/2018-April/125484.html Zebediah Figura (41): msi: Stop vending WineMsiRemotePackage. msi: Allocate the remote handle on the server side. msi: Convert the IWineMsiRemote* remote interfaces to RPC stubs. msi: Make MsiGetProperty() RPC-compatible. msi: Make MsiSetProperty() RPC-compatible. msi/tests: Clean up property tests. msi: Also null-terminate WCHAR strings. msi/tests: Test properties from custom actions. msi: Make MsiProcessMessage() RPC-compatible. msi/tests: Improve COM test. msi: Make MsiGetActiveDatabase() RPC-compatible. msi: Make MsiDatabaseIsTablePersistent() RPC-compatible. msi: Make MsiDatabaseOpenView() RPC-compatible. msi: Make MsiViewExecute() RPC-compatible. msi: Make MsiViewFetch() RPC-compatible. msi: Make MsiViewClose() RPC-compatible. msi: Make MsiViewGetColumnInfo() RPC-compatible. msi: Make MsiViewModify() RPC-compatible. msi/tests: Add tests for MsiDatabaseGetPrimaryKeys(). msi: Make MsiDatabaseGetPrimaryKeys() RPC-compatible. msi: Make MsiGetSummaryInformation() RPC-compatible. msi: Make MsiDoAction() RPC-compatible. msi: Make MsiSequence() RPC-compatible. msi: Make MsiGetTargetPath() RPC-compatible. msi: Make MsiSetTargetPath() RPC-compatible. msi: Make MsiGetSourcePath() RPC-compatible. msi: Make MsiGetMode() RPC-compatible. msi: Make MsiSetMode() RPC-compatible. msi: Make MsiGetFeatureState() RPC-compatible. msi: Make MsiSetFeatureState() RPC-compatible. msi: Make MsiGetComponentState() RPC-compatible. msi: Make MsiSetComponentState() RPC-compatible. msi: Make MsiGetMode() RPC-compatible. msi: Make MsiSetInstallLevel() RPC-compatible. msi: Make MsiFormatRecord() RPC-compatible. msi: Make MsiEvaluateCondition() RPC-compatible. msi: Handle some invalid parameters in MsiGetFeatureCost(). msi: Make MsiGetFeatureCost() RPC-compatible. msi: Make MsiEnumComponentCosts RPC-compatible. msi: Make remote_GetActionInfo() RPC-compatible. msi: Execute custom actions in a separate process. dlls/msi/Makefile.in | 8 +- dlls/msi/cond.y | 32 +- dlls/msi/custom.c | 292 ++++++-------- dlls/msi/database.c | 129 +------ dlls/msi/dialog.c | 5 +- dlls/msi/format.c | 43 +-- dlls/msi/handle.c | 30 +- dlls/msi/install.c | 447 +++++----------------- dlls/msi/msi.c | 31 +- dlls/msi/msi.spec | 2 + dlls/msi/msi_main.c | 14 - dlls/msi/msipriv.h | 13 +- dlls/msi/msiquery.c | 236 ++++++++---- dlls/msi/msiserver.idl | 70 ---- dlls/msi/package.c | 506 ++++++++----------------- dlls/msi/record.c | 106 ++++++ dlls/msi/suminfo.c | 27 +- dlls/msi/tests/custom.c | 922 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/custom.spec | 1 + dlls/msi/tests/db.c | 41 ++ dlls/msi/tests/install.c | 37 ++ dlls/msi/tests/package.c | 265 ++++++------- dlls/msi/winemsi.idl | 102 +++++ programs/msiexec/msiexec.c | 9 +- 24 files changed, 1938 insertions(+), 1430 deletions(-) create mode 100644 dlls/msi/winemsi.idl -- 2.7.4

3 9

[PATCH 5/5 resend] riched20/tests: Add tests for IRichEditOle::{GetObject,GetObjectCount}.
by Jactry Zeng April 16, 2018

April 16, 2018

Superseded patch 144699. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/richole.c | 145 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 129 insertions(+), 16 deletions(-)

2 1

[PATCH 4/5 v2] riched20: Implement IRichEditOle::GetObject.
by Jactry Zeng April 16, 2018

April 16, 2018

Superseded patch 144698. ChangLog: - Fix a typo: REO_IOB_USE_CP->REO_GETOBJ_ALL_INTERFACES Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 57 +++++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 53 insertions(+), 8 deletions(-)

2 1

[PATCH 3/5 resend] riched20: Implement IRichEditOle::GetObjectCount.
by Jactry Zeng April 16, 2018

April 16, 2018

Superseded patch 144697. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/richole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 2/5 v2] riched20: Save reobj in linked list.
by Jactry Zeng April 16, 2018

April 16, 2018

Superseded patch 144696. ChangLog: - Fix logic of adding linked list in ME_InsertOLEFromCursor(); - Rewrite ME_ReObjItem struct as re_object struct; - Add failure test for heap_alloc in create_re_object(); - Split change for ME_PrevRun(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/caret.c | 32 ++++++++++++++++++++++++++++++-- dlls/riched20/editor.c | 1 + dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 9 ++++++++- dlls/riched20/list.c | 6 +++++- dlls/riched20/richole.c | 30 +++++++++++++++--------------- dlls/riched20/run.c | 2 +- dlls/riched20/writer.c | 6 +++--- 8 files changed, 64 insertions(+), 24 deletions(-)

2 1

[PATCH 1/5 resend] riched20: Check para before use in ME_PrevRun.
by Jactry Zeng April 16, 2018

April 16, 2018

Superseded patch 144695. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 2/2] ntoskrnl: Implement ExInterlockedPushEntrySList
by Alistair Leslie-Hughes April 16, 2018

April 16, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6340a01..8e6fde2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1679,6 +1679,20 @@ PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, PSLI return InterlockedPushEntrySList( list, entry ); } +/*********************************************************************** + * ExInterlockedPushEntrySList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL3_ENTRYPOINT +DEFINE_FASTCALL3_ENTRYPOINT( NTOSKRNL_ExInterlockedPushEntrySList ) +PSLIST_ENTRY WINAPI DECLSPEC_HIDDEN __regs_NTOSKRNL_ExInterlockedPushEntrySList( PSLIST_HEADER list, + PSLIST_ENTRY entry, + PKSPIN_LOCK lock ) +#else +PSLIST_ENTRY WINAPI NTOSKRNL_ExInterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry, PKSPIN_LOCK lock ) +#endif +{ + return InterlockedPushEntrySList( list, entry ); +} /*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6acdcbd..ce9f93c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -6,7 +6,7 @@ @ stub ExInterlockedCompareExchange64 @ stub ExInterlockedFlushSList @ stdcall -norelay ExInterlockedPopEntrySList(ptr ptr) NTOSKRNL_ExInterlockedPopEntrySList -@ stub ExInterlockedPushEntrySList +@ stdcall -norelay ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection @ stdcall -norelay ExReleaseFastMutexUnsafe(ptr) @ stub ExReleaseResourceLite diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 9818757..8634f36 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1375,6 +1375,7 @@ PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); +PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); -- 1.9.1

1 0

[PATCH 1/2] ntoskrnl: Implement ExInterlockedPopEntrySList.
by Alistair Leslie-Hughes April 16, 2018

April 16, 2018

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e464549..6340a01 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1652,6 +1652,20 @@ PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) /*********************************************************************** + * ExInterlockedPopEntrySList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_ExInterlockedPopEntrySList ) +PSLIST_ENTRY WINAPI __regs_NTOSKRNL_ExInterlockedPopEntrySList( PSLIST_HEADER list, PKSPIN_LOCK lock ) +#else +PSLIST_ENTRY WINAPI NTOSKRNL_ExInterlockedPopEntrySList( PSLIST_HEADER list, PKSPIN_LOCK lock ) +#endif +{ + return InterlockedPopEntrySList( list ); +} + + +/*********************************************************************** * InterlockedPushEntrySList (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1b03233..6acdcbd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -5,7 +5,7 @@ @ stub ExInterlockedAddLargeStatistic @ stub ExInterlockedCompareExchange64 @ stub ExInterlockedFlushSList -@ stub ExInterlockedPopEntrySList +@ stdcall -norelay ExInterlockedPopEntrySList(ptr ptr) NTOSKRNL_ExInterlockedPopEntrySList @ stub ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection @ stdcall -norelay ExReleaseFastMutexUnsafe(ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5b7c9e6..9818757 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1374,6 +1374,7 @@ PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG); PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); +PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); -- 1.9.1

1 0

Oracle v. Google
by Alex Henrie April 15, 2018

April 15, 2018

Hello, As you have probably already heard, last week a US court made the crazy decision that the name and arguments of a function are both copyrightable and not protected by fair use, even if duplicating them is necessary for basic software compatibility: https://cdn.patentlyo.com/media/2018/03/17-1118.Opinion.3-26-2018.1.pdf Does anyone know exactly how much this ruling affects Wine? Can we ask the SFC for a legal opinion? -Alex

3 4