wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Huw Davies : user32: Pass a POPUPMENU ptr to MENU_DrawMenuItem().
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 66d3c80de0d3735210e5ab6dd0e084e6ba19ff73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d3c80de0d3735210e5ab6dd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 31 09:52:38 2017 +0100 user32: Pass a POPUPMENU ptr to MENU_DrawMenuItem(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 51463e5..09fcae1 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -854,7 +854,7 @@ static void MENU_GetBitmapItemSize( MENUITEM *lpitem, SIZE *size, * Draw a bitmap item. */ static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, - HMENU hmenu, HWND hwndOwner, UINT odaction, BOOL menuBar) + POPUPMENU *menu, HWND hwndOwner, UINT odaction ) { BITMAP bm; DWORD rop; @@ -921,7 +921,7 @@ static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, drawItem.itemState |= (lpitem->fState & MF_DISABLED)?ODS_DISABLED:0; drawItem.itemState |= (lpitem->fState & MF_GRAYED)?ODS_GRAYED|ODS_DISABLED:0; drawItem.itemState |= (lpitem->fState & MF_HILITE)?ODS_SELECTED:0; - drawItem.hwndItem = (HWND)hmenu; + drawItem.hwndItem = (HWND)menu->obj.handle; drawItem.hDC = hdc; drawItem.itemData = lpitem->dwItemData; drawItem.rcItem = *rect; @@ -1392,14 +1392,13 @@ static void draw_popup_arrow( HDC hdc, RECT rect, UINT arrow_bitmap_width, * * Draw a single menu item. */ -static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, +static void MENU_DrawMenuItem( HWND hwnd, POPUPMENU *menu, HWND hwndOwner, HDC hdc, MENUITEM *lpitem, BOOL menuBar, UINT odaction ) { RECT rect; BOOL flat_menu = FALSE; int bkgnd; UINT arrow_bitmap_width = 0, arrow_bitmap_height = 0; - POPUPMENU *menu = MENU_GetMenu(hmenu); RECT bmprc; HRGN old_clip = NULL, clip; @@ -1448,7 +1447,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, TRACE("rect=%s\n", wine_dbgstr_rect( &lpitem->rect)); rect = lpitem->rect; - MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &rect); + MENU_AdjustMenuItemRect(menu, &rect); old_clip = CreateRectRgn( 0, 0, 0, 0 ); if (GetClipRgn( hdc, old_clip ) <= 0) @@ -1483,7 +1482,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, if (lpitem->fState & MF_GRAYED) dis.itemState |= ODS_GRAYED|ODS_DISABLED; if (lpitem->fState & MF_HILITE) dis.itemState |= ODS_SELECTED; dis.itemAction = odaction; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */ - dis.hwndItem = (HWND)hmenu; + dis.hwndItem = (HWND)menu->obj.handle; dis.hDC = hdc; dis.rcItem = rect; TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, " @@ -1611,7 +1610,8 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, * FIXME: * Custom checkmark bitmaps are monochrome but not always 1bpp. */ - if( !(menu->dwStyle & MNS_NOCHECK)) { + if (!(menu->dwStyle & MNS_NOCHECK)) + { bm = (lpitem->fState & MF_CHECKED) ? lpitem->hCheckBit : lpitem->hUnCheckBit; if (bm) /* we have a custom bitmap */ @@ -1644,13 +1644,12 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, checked = TRUE; } } - if( lpitem->hbmpItem && - !( checked && (menu->dwStyle & MNS_CHECKORBMP))) { + if (lpitem->hbmpItem && !(checked && (menu->dwStyle & MNS_CHECKORBMP))) + { POINT origorg; /* some applications make this assumption on the DC's origin */ SetViewportOrgEx( hdc, rect.left, rect.top, &origorg); - MENU_DrawBitmapItem(hdc, lpitem, &bmprc, hmenu, hwndOwner, - odaction, FALSE); + MENU_DrawBitmapItem( hdc, lpitem, &bmprc, menu, hwndOwner, odaction ); SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL); } /* Draw the popup-menu arrow */ @@ -1662,13 +1661,12 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, rect.left += check_bitmap_width; rect.right -= arrow_bitmap_width; } - else if( lpitem->hbmpItem) + else if (lpitem->hbmpItem) { /* Draw the bitmap */ POINT origorg; - + SetViewportOrgEx( hdc, rect.left, rect.top, &origorg); - MENU_DrawBitmapItem( hdc, lpitem, &bmprc, hmenu, hwndOwner, - odaction, menuBar); + MENU_DrawBitmapItem( hdc, lpitem, &bmprc, menu, hwndOwner, odaction ); SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL); } /* process text if present */ @@ -1798,7 +1796,7 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) item = menu->items; for (u = menu->nItems; u > 0; u--, item++) - MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc, + MENU_DrawMenuItem( hwnd, menu, menu->hwndOwner, hdc, item, FALSE, ODA_DRAWENTIRE ); } /* draw scroll arrows */ @@ -2025,7 +2023,7 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex, if (lppop->FocusedItem != NO_SELECTED_ITEM) { lppop->items[lppop->FocusedItem].fState &= ~(MF_HILITE|MF_MOUSESELECT); - MENU_DrawMenuItem( lppop->hWnd, hmenu, hwndOwner, hdc, &lppop->items[lppop->FocusedItem], + MENU_DrawMenuItem( lppop->hWnd, lppop, hwndOwner, hdc, &lppop->items[lppop->FocusedItem], !(lppop->wFlags & MF_POPUP), ODA_SELECT ); } @@ -2036,7 +2034,7 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex, if(!(lppop->items[wIndex].fType & MF_SEPARATOR)) { lppop->items[wIndex].fState |= MF_HILITE; MENU_EnsureMenuItemVisible(lppop, wIndex, hdc); - MENU_DrawMenuItem( lppop->hWnd, hmenu, hwndOwner, hdc, &lppop->items[wIndex], + MENU_DrawMenuItem( lppop->hWnd, lppop, hwndOwner, hdc, &lppop->items[wIndex], !(lppop->wFlags & MF_POPUP), ODA_SELECT ); } if (sendMenuSelect) @@ -2370,7 +2368,7 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, SelectObject( hdc, get_menu_font(FALSE)); item->fState |= MF_HILITE; - MENU_DrawMenuItem( menu->hWnd, hmenu, hwndOwner, hdc, item, !(menu->wFlags & MF_POPUP), ODA_DRAWENTIRE ); + MENU_DrawMenuItem( menu->hWnd, menu, hwndOwner, hdc, item, !(menu->wFlags & MF_POPUP), ODA_DRAWENTIRE ); ReleaseDC( menu->hWnd, hdc ); } if (!item->rect.top && !item->rect.left && !item->rect.bottom && !item->rect.right) @@ -4464,7 +4462,7 @@ DWORD WINAPI DrawMenuBarTemp(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFO } for (i = 0; i < lppop->nItems; i++) - MENU_DrawMenuItem( hwnd, hMenu, hwnd, hDC, &lppop->items[i], TRUE, ODA_DRAWENTIRE ); + MENU_DrawMenuItem( hwnd, lppop, hwnd, hDC, &lppop->items[i], TRUE, ODA_DRAWENTIRE ); retvalue = lppop->Height;

1 0

Huw Davies : user32: Remove the height parameter from MENU_DrawMenuItem().
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: e42bcbdea3c10f37589b709fb2e2e5ebad127364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e42bcbdea3c10f37589b709fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 31 09:52:37 2017 +0100 user32: Remove the height parameter from MENU_DrawMenuItem(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index e2ab09c..51463e5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1392,8 +1392,8 @@ static void draw_popup_arrow( HDC hdc, RECT rect, UINT arrow_bitmap_width, * * Draw a single menu item. */ -static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, MENUITEM *lpitem, - UINT height, BOOL menuBar, UINT odaction ) +static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, + MENUITEM *lpitem, BOOL menuBar, UINT odaction ) { RECT rect; BOOL flat_menu = FALSE; @@ -1534,7 +1534,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, rc.left -= MENU_COL_SPACE / 2 + 1; rc.top = 3; - rc.bottom = height - 3; + rc.bottom = menu->Height - 3; if (flat_menu) { oldPen = SelectObject( hdc, SYSCOLOR_GetPen(COLOR_BTNSHADOW) ); @@ -1791,15 +1791,15 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) { TRACE("hmenu %p Style %08x\n", hmenu, menu->dwStyle); /* draw menu items */ - if( menu->nItems) + if (menu->nItems) { MENUITEM *item; UINT u; item = menu->items; - for( u = menu->nItems; u > 0; u--, item++) + for (u = menu->nItems; u > 0; u--, item++) MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc, - item, menu->Height, FALSE, ODA_DRAWENTIRE ); + item, FALSE, ODA_DRAWENTIRE ); } /* draw scroll arrows */ if (menu->bScrolling) @@ -2024,10 +2024,9 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex, /* Clear previous highlighted item */ if (lppop->FocusedItem != NO_SELECTED_ITEM) { - lppop->items[lppop->FocusedItem].fState &= ~(MF_HILITE|MF_MOUSESELECT); - MENU_DrawMenuItem(lppop->hWnd, hmenu, hwndOwner, hdc,&lppop->items[lppop->FocusedItem], - lppop->Height, !(lppop->wFlags & MF_POPUP), - ODA_SELECT ); + lppop->items[lppop->FocusedItem].fState &= ~(MF_HILITE|MF_MOUSESELECT); + MENU_DrawMenuItem( lppop->hWnd, hmenu, hwndOwner, hdc, &lppop->items[lppop->FocusedItem], + !(lppop->wFlags & MF_POPUP), ODA_SELECT ); } /* Highlight new item (if any) */ @@ -2037,9 +2036,8 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex, if(!(lppop->items[wIndex].fType & MF_SEPARATOR)) { lppop->items[wIndex].fState |= MF_HILITE; MENU_EnsureMenuItemVisible(lppop, wIndex, hdc); - MENU_DrawMenuItem( lppop->hWnd, hmenu, hwndOwner, hdc, - &lppop->items[wIndex], lppop->Height, - !(lppop->wFlags & MF_POPUP), ODA_SELECT ); + MENU_DrawMenuItem( lppop->hWnd, hmenu, hwndOwner, hdc, &lppop->items[wIndex], + !(lppop->wFlags & MF_POPUP), ODA_SELECT ); } if (sendMenuSelect) { @@ -2372,11 +2370,11 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, SelectObject( hdc, get_menu_font(FALSE)); item->fState |= MF_HILITE; - MENU_DrawMenuItem( menu->hWnd, hmenu, hwndOwner, hdc, item, menu->Height, !(menu->wFlags & MF_POPUP), ODA_DRAWENTIRE ); - ReleaseDC( menu->hWnd, hdc ); + MENU_DrawMenuItem( menu->hWnd, hmenu, hwndOwner, hdc, item, !(menu->wFlags & MF_POPUP), ODA_DRAWENTIRE ); + ReleaseDC( menu->hWnd, hdc ); } if (!item->rect.top && !item->rect.left && !item->rect.bottom && !item->rect.right) - item->rect = rect; + item->rect = rect; item->fState |= MF_MOUSESELECT; @@ -4466,10 +4464,8 @@ DWORD WINAPI DrawMenuBarTemp(HWND hwnd, HDC hDC, LPRECT lprect, HMENU hMenu, HFO } for (i = 0; i < lppop->nItems; i++) - { - MENU_DrawMenuItem( hwnd, hMenu, hwnd, - hDC, &lppop->items[i], lppop->Height, TRUE, ODA_DRAWENTIRE ); - } + MENU_DrawMenuItem( hwnd, hMenu, hwnd, hDC, &lppop->items[i], TRUE, ODA_DRAWENTIRE ); + retvalue = lppop->Height; END:

1 0

Piotr Caban : msvcrt/tests: Add initial Scheduler tests.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 89849748688685a64a5d5dc70ad343c346cc127b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89849748688685a64a5d5dc70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:48:20 2017 +0200 msvcrt/tests: Add initial Scheduler tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 81 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 295e287..1089bfc 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -82,6 +82,7 @@ struct thiscall_thunk static ULONG_PTR (WINAPI *call_thiscall_func1)( void *func, void *this ); static ULONG_PTR (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); +static ULONG_PTR (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); static void init_thiscall_thunk(void) { @@ -94,16 +95,19 @@ static void init_thiscall_thunk(void) thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ call_thiscall_func1 = (void *)thunk; call_thiscall_func2 = (void *)thunk; + call_thiscall_func3 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) #define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),(const void*)(b)) #else #define init_thiscall_thunk() #define call_func1(func,_this) func(_this) #define call_func2(func,_this,a) func(_this,a) +#define call_func3(func,_this,a,b) func(_this,a,b) #endif /* __i386__ */ @@ -146,6 +150,28 @@ typedef struct { void *vtable; } Context; +typedef struct { + void *policy_container; +} SchedulerPolicy; + +struct SchedulerVtbl; +typedef struct { + struct SchedulerVtbl *vtable; +} Scheduler; + +struct SchedulerVtbl { + Scheduler* (__thiscall *vector_dor)(Scheduler*); + unsigned int (__thiscall *Id)(Scheduler*); + unsigned int (__thiscall *GetNumberOfVirtualProcessors)(Scheduler*); + SchedulerPolicy* (__thiscall *GetPolicy)(Scheduler*); + unsigned int (__thiscall *Reference)(Scheduler*); + unsigned int (__thiscall *Release)(Scheduler*); + void (__thiscall *RegisterShutdownEvent)(Scheduler*,HANDLE); + void (__thiscall *Attach)(Scheduler*); + /* CreateScheduleGroup */ + /* ScheduleTask */ +}; + static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); @@ -194,7 +220,14 @@ static size_t (__thiscall *p_event_wait)(event*, unsigned int); static int (__cdecl *p_event_wait_for_multiple)(event**, size_t, MSVCRT_bool, unsigned int); static Context* (__cdecl *p_Context_CurrentContext)(void); -unsigned int (__cdecl *p_Context_Id)(void); +static unsigned int (__cdecl *p_Context_Id)(void); +static SchedulerPolicy* (__thiscall *p_SchedulerPolicy_ctor)(SchedulerPolicy*); +static void (__thiscall *p_SchedulerPolicy_SetConcurrencyLimits)(SchedulerPolicy*, unsigned int, unsigned int); +static void (__thiscall *p_SchedulerPolicy_dtor)(SchedulerPolicy*); +static Scheduler* (__cdecl *p_Scheduler_Create)(SchedulerPolicy*); +static Scheduler* (__cdecl *p_CurrentScheduler_Get)(void); +static void (__cdecl *p_CurrentScheduler_Detach)(void); +static unsigned int (__cdecl *p_CurrentScheduler_Id)(void); /* make sure we use the correct errno */ #undef errno @@ -229,6 +262,8 @@ static BOOL init(void) SET(p_atoi, "atoi"); SET(p_Context_Id, "?Id@Context@Concurrency@@SAIXZ"); + SET(p_CurrentScheduler_Detach, "?Detach@CurrentScheduler@Concurrency@@SAXXZ"); + SET(p_CurrentScheduler_Id, "?Id@CurrentScheduler@Concurrency@@SAIXZ"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00@details@Concurrency@@QEAA@P6AXXZ@Z"); @@ -266,6 +301,11 @@ static BOOL init(void) SET(p_event_wait_for_multiple, "?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z"); SET(p_Context_CurrentContext, "?CurrentContext@Context@Concurrency@@SAPEAV12@XZ"); + SET(p_SchedulerPolicy_ctor, "??0SchedulerPolicy@Concurrency@@QEAA@XZ"); + SET(p_SchedulerPolicy_SetConcurrencyLimits, "?SetConcurrencyLimits@SchedulerPolicy@Concurrency@@QEAAXII@Z"); + SET(p_SchedulerPolicy_dtor, "??1SchedulerPolicy@Concurrency@@QEAA@XZ"); + SET(p_Scheduler_Create, "?Create@Scheduler@Concurrency@@SAPEAV12@AEBVSchedulerPolicy@2@@Z"); + SET(p_CurrentScheduler_Get, "?Get@CurrentScheduler@Concurrency@@SAPEAVScheduler@2@XZ"); } else { SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00@details@Concurrency@@QAE@P6AXXZ@Z"); SET(pSpinWait_dtor, "??_F?$_SpinWait@$00@details@Concurrency@@QAEXXZ"); @@ -302,6 +342,11 @@ static BOOL init(void) SET(p_event_wait_for_multiple, "?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z"); SET(p_Context_CurrentContext, "?CurrentContext@Context@Concurrency@@SAPAV12@XZ"); + SET(p_SchedulerPolicy_ctor, "??0SchedulerPolicy@Concurrency@@QAE@XZ"); + SET(p_SchedulerPolicy_SetConcurrencyLimits, "?SetConcurrencyLimits@SchedulerPolicy@Concurrency@@QAEXII@Z"); + SET(p_SchedulerPolicy_dtor, "??1SchedulerPolicy@Concurrency@@QAE@XZ"); + SET(p_Scheduler_Create, "?Create@Scheduler@Concurrency@@SAPAV12@ABVSchedulerPolicy@2@@Z"); + SET(p_CurrentScheduler_Get, "?Get@CurrentScheduler@Concurrency@@SAPAVScheduler@2@XZ"); } init_thiscall_thunk(); @@ -888,12 +933,46 @@ static void test_ExternalContextBase(void) WaitForSingleObject(thread, INFINITE); } +static void test_Scheduler(void) +{ + Scheduler *scheduler, *current_scheduler; + SchedulerPolicy policy; + unsigned int i; + + call_func1(p_SchedulerPolicy_ctor, &policy); + scheduler = p_Scheduler_Create(&policy); + ok(scheduler != NULL, "Scheduler::Create() = NULL\n"); + + call_func1(scheduler->vtable->Attach, scheduler); + current_scheduler = p_CurrentScheduler_Get(); + ok(current_scheduler == scheduler, "CurrentScheduler::Get() = %p, expected %p\n", + current_scheduler, scheduler); + p_CurrentScheduler_Detach(); + + current_scheduler = p_CurrentScheduler_Get(); + ok(current_scheduler != scheduler, "scheduler has not changed after detach\n"); + call_func1(scheduler->vtable->Release, scheduler); + + i = p_CurrentScheduler_Id(); + ok(!i, "CurrentScheduler::Id() = %u\n", i); + + call_func3(p_SchedulerPolicy_SetConcurrencyLimits, &policy, 1, 1); + scheduler = p_Scheduler_Create(&policy); + ok(scheduler != NULL, "Scheduler::Create() = NULL\n"); + + i = call_func1(scheduler->vtable->GetNumberOfVirtualProcessors, scheduler); + ok(i == 1, "Scheduler::GetNumberOfVirtualProcessors() = %u\n", i); + call_func1(scheduler->vtable->Release, scheduler); + call_func1(p_SchedulerPolicy_dtor, &policy); +} + START_TEST(msvcr100) { if (!init()) return; test_ExternalContextBase(); + test_Scheduler(); test_wmemcpy_s(); test_wmemmove_s(); test_fread_s();

1 0

Piotr Caban : msvcr100: Fix ThreadScheduler virtual table.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: f0b1a2a7792d344398c74671bb3b857929360f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b1a2a7792d344398c74671b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:48:12 2017 +0200 msvcr100: Fix ThreadScheduler virtual table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 403ff9f..b5dc2f8 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -971,11 +971,18 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(ThreadScheduler_Release) VTABLE_ADD_FUNC(ThreadScheduler_RegisterShutdownEvent) VTABLE_ADD_FUNC(ThreadScheduler_Attach) +#if _MSVCR_VER > 100 VTABLE_ADD_FUNC(ThreadScheduler_CreateScheduleGroup_loc) +#endif VTABLE_ADD_FUNC(ThreadScheduler_CreateScheduleGroup) +#if _MSVCR_VER > 100 VTABLE_ADD_FUNC(ThreadScheduler_ScheduleTask_loc) +#endif VTABLE_ADD_FUNC(ThreadScheduler_ScheduleTask) - VTABLE_ADD_FUNC(ThreadScheduler_IsAvailableLocation)); +#if _MSVCR_VER > 100 + VTABLE_ADD_FUNC(ThreadScheduler_IsAvailableLocation) +#endif + ); #ifndef __GNUC__ } #endif

1 0

Piotr Caban : msvcrt: Add CurrentScheduler::Id implementation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: b0ee400ed39d5bac5aab2e3843a041e83f9a06e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ee400ed39d5bac5aab2e384… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:48:07 2017 +0200 msvcrt: Add CurrentScheduler::Id implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 3c94bd3..403ff9f 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -115,6 +115,7 @@ static void ExternalContextBase_ctor(ExternalContextBase*); typedef struct Scheduler { const vtable_ptr *vtable; } Scheduler; +#define call_Scheduler_Id(this) CALL_VTBL_FUNC(this, 4, unsigned int, (const Scheduler*), (this)) #define call_Scheduler_Reference(this) CALL_VTBL_FUNC(this, 16, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Release(this) CALL_VTBL_FUNC(this, 20, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Attach(this) CALL_VTBL_FUNC(this, 28, void, (Scheduler*), (this)) @@ -902,8 +903,13 @@ SchedulerPolicy* __cdecl CurrentScheduler_GetPolicy(SchedulerPolicy *policy) /* ?Id@CurrentScheduler@Concurrency@@SAIXZ */ unsigned int __cdecl CurrentScheduler_Id(void) { - FIXME("() stub\n"); - return 0; + Context *context = try_get_current_context(); + + TRACE("()\n"); + + if(!context) + return -1; + return call_Scheduler_Id(CurrentScheduler_Get()); } /* ?IsAvailableLocation@CurrentScheduler@Concurrency@@SA_NABVlocation@2@@Z */

1 0

Piotr Caban : msvcrt: Add CurrentScheduler::Detach implementation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 5741991b1a1e4dbd69b1bd767938e8552faae4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5741991b1a1e4dbd69b1bd767… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:48:03 2017 +0200 msvcrt: Add CurrentScheduler::Detach implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 8487752..3c94bd3 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -802,7 +802,30 @@ void __cdecl CurrentScheduler_Create(const SchedulerPolicy *policy) /* ?Detach@CurrentScheduler@Concurrency@@SAXXZ */ void __cdecl CurrentScheduler_Detach(void) { - FIXME("() stub\n"); + ExternalContextBase *context = (ExternalContextBase*)try_get_current_context(); + + TRACE("()\n"); + + if(!context) + throw_exception(EXCEPTION_IMPROPER_SCHEDULER_DETACH, 0, NULL); + + if(context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + ERR("unknown context set\n"); + return; + } + + if(!context->scheduler.next) + throw_exception(EXCEPTION_IMPROPER_SCHEDULER_DETACH, 0, NULL); + + call_Scheduler_Release(context->scheduler.scheduler); + if(!context->scheduler.next) { + context->scheduler.scheduler = NULL; + }else { + struct scheduler_list *entry = context->scheduler.next; + context->scheduler.scheduler = entry->scheduler; + context->scheduler.next = entry->next; + MSVCRT_operator_delete(entry); + } } static void create_default_scheduler(void)

1 0

Piotr Caban : msvcrt: Attach context to default scheduler on creation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 5f72ec063f99ccb105c49206ccc36db843b5443c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f72ec063f99ccb105c49206c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:47:59 2017 +0200 msvcrt: Attach context to default scheduler on creation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cxx.h | 1 + dlls/msvcrt/scheduler.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index aefebdc..476f66a 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -267,6 +267,7 @@ typedef struct extern void *vtbl_wrapper_0; extern void *vtbl_wrapper_4; extern void *vtbl_wrapper_8; +extern void *vtbl_wrapper_16; extern void *vtbl_wrapper_20; extern void *vtbl_wrapper_28; diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 93dae7f..8487752 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -49,6 +49,7 @@ static int scheduler_id = -1; DEFINE_VTBL_WRAPPER(0); DEFINE_VTBL_WRAPPER(4); DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(16); DEFINE_VTBL_WRAPPER(20); DEFINE_VTBL_WRAPPER(28); @@ -114,6 +115,7 @@ static void ExternalContextBase_ctor(ExternalContextBase*); typedef struct Scheduler { const vtable_ptr *vtable; } Scheduler; +#define call_Scheduler_Reference(this) CALL_VTBL_FUNC(this, 16, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Release(this) CALL_VTBL_FUNC(this, 20, unsigned int, (Scheduler*), (this)) #define call_Scheduler_Attach(this) CALL_VTBL_FUNC(this, 28, void, (Scheduler*), (this)) @@ -143,6 +145,8 @@ static CRITICAL_SECTION default_scheduler_cs = { &default_scheduler_cs_debug, -1 static SchedulerPolicy default_scheduler_policy; static ThreadScheduler *default_scheduler; +static void create_default_scheduler(void); + static Context* try_get_current_context(void) { if (context_tls_index == TLS_OUT_OF_INDEXES) @@ -325,6 +329,10 @@ static void ExternalContextBase_ctor(ExternalContextBase *this) memset(this, 0, sizeof(*this)); this->context.vtable = &MSVCRT_ExternalContextBase_vtable; this->id = InterlockedIncrement(&context_id); + + create_default_scheduler(); + this->scheduler.scheduler = &default_scheduler->scheduler; + call_Scheduler_Reference(&default_scheduler->scheduler); } /* ?Alloc@Concurrency@@YAPAXI@Z */ @@ -834,7 +842,7 @@ Scheduler* __cdecl CurrentScheduler_Get(void) create_default_scheduler(); context->scheduler.scheduler = &default_scheduler->scheduler; - ThreadScheduler_Reference(default_scheduler); + call_Scheduler_Reference(&default_scheduler->scheduler); return &default_scheduler->scheduler; }

1 0

Piotr Caban : msvcrt: Add improper_scheduler_detach class implementation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: b2eab1a0e7a38cc789561de46cc587e600c0e62e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2eab1a0e7a38cc789561de46… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:47:53 2017 +0200 msvcrt: Add improper_scheduler_detach class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 +++--- dlls/msvcr100/msvcr100.spec | 8 +++--- dlls/msvcr110/msvcr110.spec | 12 ++++---- dlls/msvcr120/msvcr120.spec | 12 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 12 ++++---- dlls/msvcrt/cpp.c | 55 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 1 + 7 files changed, 82 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2eab1a0e7a38cc789561…

1 0

Piotr Caban : msvcrt: Add CurrentScheduler::Get implementation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: 43b768d5eb86f54707ad4ce74a5bb09fbd57529c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b768d5eb86f54707ad4ce74… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:47:49 2017 +0200 msvcrt: Add CurrentScheduler::Get implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 26ca900..93dae7f 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -141,6 +141,7 @@ static CRITICAL_SECTION_DEBUG default_scheduler_cs_debug = }; static CRITICAL_SECTION default_scheduler_cs = { &default_scheduler_cs_debug, -1, 0, 0, 0, 0 }; static SchedulerPolicy default_scheduler_policy; +static ThreadScheduler *default_scheduler; static Context* try_get_current_context(void) { @@ -796,12 +797,45 @@ void __cdecl CurrentScheduler_Detach(void) FIXME("() stub\n"); } +static void create_default_scheduler(void) +{ + if(default_scheduler) + return; + + EnterCriticalSection(&default_scheduler_cs); + if(!default_scheduler) { + ThreadScheduler *scheduler; + + if(!default_scheduler_policy.policy_container) + SchedulerPolicy_ctor(&default_scheduler_policy); + + scheduler = MSVCRT_operator_new(sizeof(*scheduler)); + ThreadScheduler_ctor(scheduler, &default_scheduler_policy); + default_scheduler = scheduler; + } + LeaveCriticalSection(&default_scheduler_cs); +} + /* ?Get@CurrentScheduler@Concurrency@@SAPAVScheduler@2@XZ */ /* ?Get@CurrentScheduler@Concurrency@@SAPEAVScheduler@2@XZ */ Scheduler* __cdecl CurrentScheduler_Get(void) { - FIXME("() stub\n"); - return NULL; + ExternalContextBase *context = (ExternalContextBase*)get_current_context(); + + TRACE("()\n"); + + if(context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + ERR("unknown context set\n"); + return NULL; + } + + if(context->scheduler.scheduler) + return context->scheduler.scheduler; + + create_default_scheduler(); + context->scheduler.scheduler = &default_scheduler->scheduler; + ThreadScheduler_Reference(default_scheduler); + return &default_scheduler->scheduler; } /* ?CreateScheduleGroup@CurrentScheduler@Concurrency@@SAPAVScheduleGroup@2@AAVlocation@2@@Z */ @@ -927,6 +961,10 @@ void msvcrt_free_scheduler(void) TlsFree(context_tls_index); if(default_scheduler_policy.policy_container) SchedulerPolicy_dtor(&default_scheduler_policy); + if(default_scheduler) { + ThreadScheduler_dtor(default_scheduler); + MSVCRT_operator_delete(default_scheduler); + } } void msvcrt_free_scheduler_thread(void)

1 0

Piotr Caban : msvcrt: Add Scheduler:: SetDefaultSchedulerPolicy implementation.
by Alexandre Julliard 31 Mar '17

31 Mar '17

Module: wine Branch: master Commit: b26fed8ad1913f6d5589e04982dfa440784cec02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26fed8ad1913f6d5589e0498… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 30 22:47:44 2017 +0200 msvcrt: Add Scheduler::SetDefaultSchedulerPolicy implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scheduler.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 4a8eb8e..26ca900 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -132,6 +132,16 @@ extern const vtable_ptr MSVCRT_ThreadScheduler_vtable; static int context_tls_index = TLS_OUT_OF_INDEXES; +static CRITICAL_SECTION default_scheduler_cs; +static CRITICAL_SECTION_DEBUG default_scheduler_cs_debug = +{ + 0, 0, &default_scheduler_cs, + { &default_scheduler_cs_debug.ProcessLocksList, &default_scheduler_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": default_scheduler_cs") } +}; +static CRITICAL_SECTION default_scheduler_cs = { &default_scheduler_cs_debug, -1, 0, 0, 0, 0 }; +static SchedulerPolicy default_scheduler_policy; + static Context* try_get_current_context(void) { if (context_tls_index == TLS_OUT_OF_INDEXES) @@ -745,14 +755,27 @@ Scheduler* __cdecl Scheduler_Create(const SchedulerPolicy *policy) /* ?ResetDefaultSchedulerPolicy@Scheduler@Concurrency@@SAXXZ */ void __cdecl Scheduler_ResetDefaultSchedulerPolicy(void) { - FIXME("() stub\n"); + TRACE("()\n"); + + EnterCriticalSection(&default_scheduler_cs); + if(default_scheduler_policy.policy_container) + SchedulerPolicy_dtor(&default_scheduler_policy); + SchedulerPolicy_ctor(&default_scheduler_policy); + LeaveCriticalSection(&default_scheduler_cs); } /* ?SetDefaultSchedulerPolicy@Scheduler@Concurrency@@SAXABVSchedulerPolicy@2@@Z */ /* ?SetDefaultSchedulerPolicy@Scheduler@Concurrency@@SAXAEBVSchedulerPolicy@2@@Z */ void __cdecl Scheduler_SetDefaultSchedulerPolicy(const SchedulerPolicy *policy) { - FIXME("(%p) stub\n", policy); + TRACE("(%p)\n", policy); + + EnterCriticalSection(&default_scheduler_cs); + if(!default_scheduler_policy.policy_container) + SchedulerPolicy_copy_ctor(&default_scheduler_policy, policy); + else + SchedulerPolicy_op_assign(&default_scheduler_policy, policy); + LeaveCriticalSection(&default_scheduler_cs); } /* ?Create@CurrentScheduler@Concurrency@@SAXABVSchedulerPolicy@2@@Z */ @@ -902,6 +925,8 @@ void msvcrt_free_scheduler(void) { if (context_tls_index != TLS_OUT_OF_INDEXES) TlsFree(context_tls_index); + if(default_scheduler_policy.policy_container) + SchedulerPolicy_dtor(&default_scheduler_policy); } void msvcrt_free_scheduler_thread(void)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017