March 2021 - Wine-commits - list.winehq.org

Zhiyi Zhang : comctl32/datetime: Implement themed painting.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: 52992a99d602fd929aaeee24ffb977aaa50c4423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52992a99d602fd929aaeee24… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 4 16:45:57 2021 +0800 comctl32/datetime: Implement themed painting. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 71bb3d238b0..f44b52c3b65 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -43,6 +43,8 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" +#include "uxtheme.h" +#include "vsstyle.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(datetime); @@ -62,6 +64,7 @@ typedef struct RECT checkbox; /* checkbox allowing the control to be enabled/disabled */ RECT calbutton; /* button that toggles the dropdown of the monthcal control */ BOOL bCalDepressed; /* TRUE = cal button is depressed */ + BOOL bCalHot; /* TRUE if calendar button is hovered */ BOOL bDropdownEnabled; int select; WCHAR charsEntered[4]; @@ -128,6 +131,7 @@ static BOOL DATETIME_SendSimpleNotify (const DATETIME_INFO *infoPtr, UINT code); static BOOL DATETIME_SendDateTimeChangeNotify (const DATETIME_INFO *infoPtr); static const WCHAR allowedformatchars[] = L"dhHmMstyX"; static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1}; +static const WCHAR *themeClass = WC_SCROLLBARW; /* valid date limits */ static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDayOfWeek = 0, .wDay = 31 }; @@ -708,6 +712,9 @@ static int DATETIME_GetFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int co static void DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) { + HTHEME theme; + int state; + TRACE("\n"); if (infoPtr->dateValid) { @@ -771,7 +778,27 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) SelectObject (hdc, oldFont); } - if (!(infoPtr->dwStyle & DTS_UPDOWN)) { + if (infoPtr->dwStyle & DTS_UPDOWN) + return; + + theme = GetWindowTheme(infoPtr->hwndSelf); + if (theme) + { + if (infoPtr->dwStyle & WS_DISABLED) + state = ABS_DOWNDISABLED; + else if (infoPtr->bCalDepressed) + state = ABS_DOWNPRESSED; + else if (infoPtr->bCalHot) + state = ABS_DOWNHOT; + else + state = ABS_DOWNNORMAL; + + if (IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, state)) + DrawThemeParentBackground(infoPtr->hwndSelf, hdc, &infoPtr->calbutton); + DrawThemeBackground(theme, hdc, SBP_ARROWBTN, state, &infoPtr->calbutton, NULL); + } + else + { DrawFrameControl(hdc, &infoPtr->calbutton, DFC_SCROLL, DFCS_SCROLLDOWN | (infoPtr->bCalDepressed ? DFCS_PUSHED : 0) | (infoPtr->dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0) ); @@ -1280,6 +1307,85 @@ DATETIME_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) return 1; } +static LRESULT DATETIME_NCPaint (HWND hwnd, HRGN region) +{ + INT cxEdge, cyEdge; + HRGN clipRgn; + HTHEME theme; + LONG exStyle; + RECT r; + HDC dc; + + theme = OpenThemeData(NULL, WC_EDITW); + if (!theme) + return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); + + exStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); + if (!(exStyle & WS_EX_CLIENTEDGE)) + { + CloseThemeData(theme); + return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); + } + + cxEdge = GetSystemMetrics(SM_CXEDGE); + cyEdge = GetSystemMetrics(SM_CYEDGE); + GetWindowRect(hwnd, &r); + + /* New clipping region passed to default proc to exclude border */ + clipRgn = CreateRectRgn(r.left + cxEdge, r.top + cyEdge, r.right - cxEdge, r.bottom - cyEdge); + if (region != (HRGN)1) + CombineRgn(clipRgn, clipRgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + + dc = GetDCEx(hwnd, region, DCX_WINDOW | DCX_INTERSECTRGN); + if (IsThemeBackgroundPartiallyTransparent(theme, 0, 0)) + DrawThemeParentBackground(hwnd, dc, &r); + DrawThemeBackground(theme, dc, 0, 0, &r, 0); + ReleaseDC(hwnd, dc); + CloseThemeData(theme); + + /* Call default proc to get the scrollbars etc. also painted */ + DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)clipRgn, 0); + DeleteObject(clipRgn); + return 0; +} + +static LRESULT DATETIME_MouseMove (DATETIME_INFO *infoPtr, LONG x, LONG y) +{ + TRACKMOUSEEVENT event; + POINT point; + BOOL hot; + + point.x = x; + point.y = y; + hot = PtInRect(&infoPtr->calbutton, point); + if (hot != infoPtr->bCalHot) + { + infoPtr->bCalHot = hot; + RedrawWindow(infoPtr->hwndSelf, &infoPtr->calbutton, 0, RDW_INVALIDATE | RDW_UPDATENOW); + } + + if (!hot) + return 0; + + event.cbSize = sizeof(TRACKMOUSEEVENT); + event.dwFlags = TME_QUERY; + if (!TrackMouseEvent(&event) || event.hwndTrack != infoPtr->hwndSelf || !(event.dwFlags & TME_LEAVE)) + { + event.hwndTrack = infoPtr->hwndSelf; + event.dwFlags = TME_LEAVE; + TrackMouseEvent(&event); + } + + return 0; +} + +static LRESULT DATETIME_MouseLeave (DATETIME_INFO *infoPtr) +{ + infoPtr->bCalHot = FALSE; + RedrawWindow(infoPtr->hwndSelf, &infoPtr->calbutton, 0, RDW_INVALIDATE | RDW_UPDATENOW); + return 0; +} static LRESULT DATETIME_SetFocus (DATETIME_INFO *infoPtr, HWND lostFocus) @@ -1430,6 +1536,16 @@ DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRU return 0; } +static LRESULT DATETIME_ThemeChanged (DATETIME_INFO *infoPtr) +{ + HTHEME theme; + + theme = GetWindowTheme(infoPtr->hwndSelf); + CloseThemeData(theme); + OpenThemeData(infoPtr->hwndSelf, themeClass); + return 0; +} + static BOOL DATETIME_GetIdealSize(DATETIME_INFO *infoPtr, SIZE *size) { SIZE field_size; @@ -1508,6 +1624,7 @@ DATETIME_Create (HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->hwndNotify = lpcs->hwndParent; infoPtr->select = -1; /* initially, nothing is selected */ infoPtr->bDropdownEnabled = TRUE; + infoPtr->bCalHot = FALSE; DATETIME_StyleChanged(infoPtr, GWL_STYLE, &ss); DATETIME_SetFormatW (infoPtr, 0); @@ -1522,6 +1639,7 @@ DATETIME_Create (HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->hFont = GetStockObject(DEFAULT_GUI_FONT); SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); + OpenThemeData(hwnd, themeClass); return 0; } @@ -1531,6 +1649,11 @@ DATETIME_Create (HWND hwnd, const CREATESTRUCTW *lpcs) static LRESULT DATETIME_Destroy (DATETIME_INFO *infoPtr) { + HTHEME theme; + + theme = GetWindowTheme(infoPtr->hwndSelf); + CloseThemeData(theme); + if (infoPtr->hwndCheckbut) DestroyWindow(infoPtr->hwndCheckbut); if (infoPtr->hUpdown) @@ -1656,6 +1779,15 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_NCCREATE: return DATETIME_NCCreate (hwnd, (LPCREATESTRUCTW)lParam); + case WM_NCPAINT: + return DATETIME_NCPaint(hwnd, (HRGN)wParam); + + case WM_MOUSEMOVE: + return DATETIME_MouseMove(infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + + case WM_MOUSELEAVE: + return DATETIME_MouseLeave(infoPtr); + case WM_SETFOCUS: return DATETIME_SetFocus (infoPtr, (HWND)wParam); @@ -1686,6 +1818,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_STYLECHANGED: return DATETIME_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + case WM_THEMECHANGED: + return DATETIME_ThemeChanged(infoPtr); + case WM_SETFONT: return DATETIME_SetFont(infoPtr, (HFONT)wParam, (BOOL)lParam);

1 0

Zhiyi Zhang : comctl32/hotkey: Implement themed frame painting.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: 5ca79e66ad87966094b2ee4d70bad112b2702caa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ca79e66ad87966094b2ee4d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 4 16:47:27 2021 +0800 comctl32/hotkey: Implement themed frame painting. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/hotkey.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 58717a2a493..7421ff6ef65 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -37,6 +37,7 @@ #include "winnls.h" #include "commctrl.h" #include "comctl32.h" +#include "uxtheme.h" #include "wine/debug.h" #include "wine/heap.h" @@ -423,6 +424,50 @@ HOTKEY_NCCreate (HWND hwnd, const CREATESTRUCTW *lpcs) return DefWindowProcW (infoPtr->hwndSelf, WM_NCCREATE, 0, (LPARAM)lpcs); } +static LRESULT +HOTKEY_NCPaint (HWND hwnd, HRGN region) +{ + INT cxEdge, cyEdge; + HRGN clipRgn; + HTHEME theme; + LONG exStyle; + RECT r; + HDC dc; + + theme = OpenThemeData(NULL, WC_EDITW); + if (!theme) + return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); + + exStyle = GetWindowLongW(hwnd, GWL_EXSTYLE); + if (!(exStyle & WS_EX_CLIENTEDGE)) + { + CloseThemeData(theme); + return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); + } + + cxEdge = GetSystemMetrics(SM_CXEDGE); + cyEdge = GetSystemMetrics(SM_CYEDGE); + GetWindowRect(hwnd, &r); + + /* New clipping region passed to default proc to exclude border */ + clipRgn = CreateRectRgn(r.left + cxEdge, r.top + cyEdge, r.right - cxEdge, r.bottom - cyEdge); + if (region != (HRGN)1) + CombineRgn(clipRgn, clipRgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + + dc = GetDCEx(hwnd, region, DCX_WINDOW | DCX_INTERSECTRGN); + if (IsThemeBackgroundPartiallyTransparent(theme, 0, 0)) + DrawThemeParentBackground(hwnd, dc, &r); + DrawThemeBackground(theme, dc, 0, 0, &r, 0); + ReleaseDC(hwnd, dc); + CloseThemeData(theme); + + /* Call default proc to get the scrollbars etc. also painted */ + DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)clipRgn, 0); + DeleteObject(clipRgn); + return 0; +} + static LRESULT HOTKEY_SetFocus (HOTKEY_INFO *infoPtr) { @@ -516,6 +561,9 @@ HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_NCCREATE: return HOTKEY_NCCreate (hwnd, (LPCREATESTRUCTW)lParam); + case WM_NCPAINT: + return HOTKEY_NCPaint (hwnd, (HRGN)wParam); + case WM_PRINTCLIENT: case WM_PAINT: HOTKEY_Paint(infoPtr, (HDC)wParam);

1 0

Zhiyi Zhang : comctl32/listview: Only draw themed frame when WS_EX_CLIENTEDGE is present.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: c703c96a7816852f39489d10bc0f7cc223791efa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c703c96a7816852f39489d10… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 4 16:47:37 2021 +0800 comctl32/listview: Only draw themed frame when WS_EX_CLIENTEDGE is present. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a62ac4398cc..150771b8937 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10612,11 +10612,11 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, NMHDR *lpnmhdr) * [I] region : update region * * RETURN: - * TRUE - frame was painted - * FALSE - call default window proc + * 0 - frame was painted */ -static BOOL LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) +static LRESULT LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) { + LONG exstyle = GetWindowLongW (infoPtr->hwndSelf, GWL_EXSTYLE); HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); HDC dc; RECT r; @@ -10624,7 +10624,7 @@ static BOOL LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) int cxEdge = GetSystemMetrics (SM_CXEDGE), cyEdge = GetSystemMetrics (SM_CYEDGE); - if (!theme) + if (!theme || !(exstyle & WS_EX_CLIENTEDGE)) return DefWindowProcW (infoPtr->hwndSelf, WM_NCPAINT, (WPARAM)region, 0); GetWindowRect(infoPtr->hwndSelf, &r); @@ -10646,7 +10646,7 @@ static BOOL LISTVIEW_NCPaint(const LISTVIEW_INFO *infoPtr, HRGN region) DefWindowProcW (infoPtr->hwndSelf, WM_NCPAINT, (WPARAM)cliprgn, 0); DeleteObject(cliprgn); - return FALSE; + return 0; } /***

1 0

Nikolay Sivov : dwrite: Silence GetPropertyValues() fixme.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: c8ac1909bc0540ad080c626fc806f25582be1fa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8ac1909bc0540ad080c626f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 18:39:36 2021 +0300 dwrite: Silence GetPropertyValues() fixme. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 98c194b8c30..b0b8e3c34f4 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7212,7 +7212,13 @@ static HRESULT WINAPI dwritefontset_GetPropertyValues_(IDWriteFontSet3 *iface, D static HRESULT WINAPI dwritefontset_GetPropertyValues(IDWriteFontSet3 *iface, UINT32 index, DWRITE_FONT_PROPERTY_ID id, BOOL *exists, IDWriteLocalizedStrings **values) { - FIXME("%p, %u, %d, %p, %p.\n", iface, index, id, exists, values); + static int once; + + if (!once++) + FIXME("%p: stub\n", iface); + + if (!once++) + FIXME("%p, %u, %d, %p, %p.\n", iface, index, id, exists, values); return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite: Return font set for matched font list.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: f40c2a19e2fe508deb12b91cf1c63dd030863cf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f40c2a19e2fe508deb12b91c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 18:39:37 2021 +0300 dwrite: Return font set for matched font list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/dwrite/tests/font.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b0b8e3c34f4..b64ea53692f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -278,6 +278,9 @@ struct dwrite_fontset_builder size_t capacity; }; +static HRESULT fontset_create_from_font_data(IDWriteFactory7 *factory, struct dwrite_font_data **fonts, + unsigned int count, IDWriteFontSet1 **ret); + static void dwrite_grab_font_table(void *context, UINT32 table, const BYTE **data, UINT32 *size, void **data_context) { struct dwrite_fontface *fontface = context; @@ -2385,9 +2388,12 @@ static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList2 *ifa static HRESULT WINAPI dwritefontlist2_GetFontSet(IDWriteFontList2 *iface, IDWriteFontSet1 **fontset) { - FIXME("%p, %p.\n", iface, fontset); + struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontset); + + return fontset_create_from_font_data(fontlist->family->collection->factory, fontlist->fonts, + fontlist->font_count, fontset); } static const IDWriteFontList2Vtbl dwritefontlistvtbl = @@ -7410,6 +7416,40 @@ static const IDWriteFontSet3Vtbl fontsetvtbl = dwritefontset3_GetFontSourceName, }; +static HRESULT fontset_create_from_font_data(IDWriteFactory7 *factory, struct dwrite_font_data **fonts, + unsigned int count, IDWriteFontSet1 **ret) +{ + struct dwrite_fontset *object; + unsigned int i; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IDWriteFontSet3_iface.lpVtbl = &fontsetvtbl; + object->refcount = 1; + object->factory = factory; + IDWriteFactory7_AddRef(object->factory); + + if (count) + { + object->entries = heap_calloc(count, sizeof(*object->entries)); + object->count = count; + + /* FIXME: set available properties too */ + for (i = 0; i < object->count; ++i) + { + object->entries[i].file = fonts[i]->file; + object->entries[i].face_index = fonts[i]->face_index; + object->entries[i].simulations = fonts[i]->simulations; + IDWriteFontFile_AddRef(object->entries[i].file); + } + } + + *ret = (IDWriteFontSet1 *)&object->IDWriteFontSet3_iface; + + return S_OK; +} + static HRESULT fontset_builder_create_fontset(IDWriteFactory7 *factory, struct dwrite_fontset_entry *entries, unsigned int count, IDWriteFontSet **ret) { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4dcbbc4d077..12ea78b634b 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1626,7 +1626,24 @@ if (0) /* crashes on native */ if (SUCCEEDED(IDWriteFontFamily1_QueryInterface(family1, &IID_IDWriteFontList2, (void **)&fontlist2))) { + IDWriteFontSet1 *fontset = NULL, *fontset2 = NULL; + ok(fontlist == (IDWriteFontList *)fontlist2, "Unexpected interface pointer.\n"); + + hr = IDWriteFontList2_GetFontSet(fontlist2, &fontset); + todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontList2_GetFontSet(fontlist2, &fontset2); + todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(fontset != fontset2, "Unexpected instance.\n"); + } + if (fontset2) + IDWriteFontSet1_Release(fontset2); + if (fontset) + IDWriteFontSet1_Release(fontset); + IDWriteFontList2_Release(fontlist2); } else @@ -4067,6 +4084,18 @@ static void test_GetMatchingFonts(void) if (SUCCEEDED(IDWriteFontList_QueryInterface(fontlist, &IID_IDWriteFontList2, (void **)&fontlist3))) { + IDWriteFontSet1 *fontset, *fontset2; + + hr = IDWriteFontList2_GetFontSet(fontlist3, &fontset); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontList2_GetFontSet(fontlist3, &fontset2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(fontset != fontset2, "Unexpected instance.\n"); + + IDWriteFontSet1_Release(fontset2); + IDWriteFontSet1_Release(fontset); + IDWriteFontList2_Release(fontlist3); } else

1 0

Nikolay Sivov : dwrite: Implement GetFontSet() for families.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: 3049c94753ed9f44083b38b89862e41966f76e97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3049c94753ed9f44083b38b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 4 18:39:38 2021 +0300 dwrite: Implement GetFontSet() for families. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 14 ++++++++++---- dlls/dwrite/tests/font.c | 16 ++++------------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b64ea53692f..9232f29317f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2725,9 +2725,12 @@ static HRESULT WINAPI dwritefontfamily2_GetMatchingFonts(IDWriteFontFamily2 *ifa static HRESULT WINAPI dwritefontfamily2_GetFontSet(IDWriteFontFamily2 *iface, IDWriteFontSet1 **fontset) { - FIXME("%p, %p.\n", iface, fontset); + struct dwrite_fontfamily *family = impl_from_IDWriteFontFamily2(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontset); + + return fontset_create_from_font_data(family->collection->factory, family->data->fonts, + family->data->count, fontset); } static const IDWriteFontFamily2Vtbl fontfamilyvtbl = @@ -2806,9 +2809,12 @@ static HRESULT WINAPI dwritefontfamilylist1_GetFontFaceReference(IDWriteFontList static HRESULT WINAPI dwritefontfamilylist2_GetFontSet(IDWriteFontList2 *iface, IDWriteFontSet1 **fontset) { - FIXME("%p, %p.\n", iface, fontset); + struct dwrite_fontfamily *family = impl_family_from_IDWriteFontList2(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontset); + + return fontset_create_from_font_data(family->collection->factory, family->data->fonts, + family->data->count, fontset); } static const IDWriteFontList2Vtbl fontfamilylistvtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 12ea78b634b..8fe59ca5a1e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1631,18 +1631,14 @@ if (0) /* crashes on native */ ok(fontlist == (IDWriteFontList *)fontlist2, "Unexpected interface pointer.\n"); hr = IDWriteFontList2_GetFontSet(fontlist2, &fontset); - todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDWriteFontList2_GetFontSet(fontlist2, &fontset2); - todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(fontset != fontset2, "Unexpected instance.\n"); - } - if (fontset2) - IDWriteFontSet1_Release(fontset2); - if (fontset) - IDWriteFontSet1_Release(fontset); + + IDWriteFontSet1_Release(fontset2); + IDWriteFontSet1_Release(fontset); IDWriteFontList2_Release(fontlist2); } @@ -9959,17 +9955,13 @@ static void test_family_font_set(void) if (SUCCEEDED(IDWriteFontFamily_QueryInterface(family, &IID_IDWriteFontFamily2, (void **)&family2))) { hr = IDWriteFontFamily2_GetFontSet(family2, &fontset); - todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IDWriteFontFamily2_GetFontSet(family2, &fontset2); - todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { ok(fontset != fontset2, "Unexpected fontset instance.\n"); IDWriteFontSet1_Release(fontset2); IDWriteFontSet1_Release(fontset); - } + IDWriteFontFamily2_Release(family2); } else

1 0

Michael Müller : aclui: Add an empty ACE editor dialog.
by Alexandre Julliard 04 Mar '21

04 Mar '21

1 0

Michael Müller : aclui: Populate the users list.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: f57356ad44548ec0387beec9b68f11f7a37721ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=f57356ad44548ec0387beec9… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Feb 28 10:27:46 2021 -0600 aclui: Populate the users list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/Makefile.in | 2 +- dlls/aclui/aclui_main.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 1 deletion(-) diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index da3aa00084e..f93e5da6c8d 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,6 +1,6 @@ MODULE = aclui.dll IMPORTLIB = aclui -IMPORTS = comctl32 user32 +IMPORTS = comctl32 user32 advapi32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 3989c3017aa..199e7295adc 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -39,23 +39,178 @@ WINE_DEFAULT_DEBUG_CHANNEL(aclui); #define ISecurityInformation_GetSecurity(This, info, sd, def) (This)->lpVtbl->GetSecurity(This, info, sd, def) #define ISecurityInformation_GetAccessRights(This, type, flags, access, count, def) (This)->lpVtbl->GetAccessRights(This, type, flags, access, count, def) +struct user +{ + WCHAR *name; + PSID sid; +}; + struct security_page { + ISecurityInformation *security; SI_OBJECT_INFO info; + PSECURITY_DESCRIPTOR sd; + + struct user *users; + unsigned int user_count; HWND dialog; }; static HINSTANCE aclui_instance; +static WCHAR *get_sid_name(PSID sid, SID_NAME_USE *sid_type) +{ + WCHAR *name, *domain; + DWORD domain_len = 0; + DWORD name_len = 0; + BOOL ret; + + LookupAccountSidW(NULL, sid, NULL, &name_len, NULL, &domain_len, sid_type); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return NULL; + if (!(name = malloc(name_len * sizeof(WCHAR)))) + return NULL; + if (!(domain = malloc(domain_len * sizeof(WCHAR)))) + { + free(name); + return NULL; + } + + ret = LookupAccountSidW(NULL, sid, name, &name_len, domain, &domain_len, sid_type); + free(domain); + if (ret) return name; + free(name); + return NULL; +} + +static void add_user(struct security_page *page, PSID sid) +{ + struct user *new_array, *user; + SID_NAME_USE sid_type; + unsigned int i; + LVITEMW item; + WCHAR *name; + + /* check if we already processed this user or group */ + for (i = 0; i < page->user_count; ++i) + { + if (EqualSid(sid, page->users[i].sid)) + return; + } + + if (!(name = get_sid_name(sid, &sid_type))) + return; + + if (!(new_array = realloc(page->users, (page->user_count + 1) * sizeof(*page->users)))) + return; + page->users = new_array; + user = &page->users[page->user_count++]; + + user->name = name; + user->sid = sid; + + item.mask = LVIF_PARAM | LVIF_TEXT; + item.iItem = -1; + item.iSubItem = 0; + item.pszText = name; + item.lParam = (LPARAM)user; + + SendMessageW(GetDlgItem(page->dialog, IDC_USERS), LVM_INSERTITEMW, 0, (LPARAM)&item); +} + +static PSID get_sid_from_ace(ACE_HEADER *ace) +{ + switch (ace->AceType) + { + case ACCESS_ALLOWED_ACE_TYPE: + return &((ACCESS_ALLOWED_ACE *)ace)->SidStart; + case ACCESS_DENIED_ACE_TYPE: + return &((ACCESS_DENIED_ACE *)ace)->SidStart; + default: + FIXME("Unhandled ACE type %#x.\n", ace->AceType); + return NULL; + } +} + +static void init_users(struct security_page *page) +{ + BOOL defaulted, present; + ACE_HEADER *ace; + DWORD index; + ACL *dacl; + PSID sid; + + if (!GetSecurityDescriptorDacl(page->sd, &present, &dacl, &defaulted)) + { + ERR("Failed to query descriptor information, error %u.\n", GetLastError()); + return; + } + + if (!present) + return; + + for (index = 0; index < dacl->AceCount; index++) + { + if (!GetAce(dacl, index, (void **)&ace)) + break; + if (!(sid = get_sid_from_ace(ace))) + continue; + add_user(page, sid); + } +} + static void security_page_free(struct security_page *page) { + unsigned int i; + + for (i = 0; i < page->user_count; ++i) + free(page->users[i].name); + free(page->users); + + LocalFree(page->sd); + if (page->security) + ISecurityInformation_Release(page->security); free(page); } static void security_page_init_dlg(HWND hwnd, struct security_page *page) { + LVCOLUMNW column; + HWND control; + HRESULT hr; + RECT rect; + page->dialog = hwnd; + + if (FAILED(hr = ISecurityInformation_GetSecurity(page->security, + DACL_SECURITY_INFORMATION, &page->sd, FALSE))) + { + ERR("Failed to get security descriptor, hr %#x.\n", hr); + return; + } + + control = GetDlgItem(hwnd, IDC_USERS); + SendMessageW(control, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); + + GetClientRect(control, &rect); + column.mask = LVCF_FMT | LVCF_WIDTH; + column.fmt = LVCFMT_LEFT; + column.cx = rect.right - rect.left; + SendMessageW(control, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + + init_users(page); + + if (page->user_count) + { + LVITEMW item; + item.mask = LVIF_STATE; + item.iItem = 0; + item.iSubItem = 0; + item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = item.state; + SendMessageW(control, LVM_SETITEMW, 0, (LPARAM)&item); + } } static INT_PTR CALLBACK security_page_proc(HWND dialog, UINT msg, WPARAM wparam, LPARAM lparam) @@ -101,6 +256,9 @@ HPROPSHEETPAGE WINAPI CreateSecurityPage(ISecurityInformation *security) return NULL; } + page->security = security; + ISecurityInformation_AddRef(security); + memset(&propsheet, 0, sizeof(propsheet)); propsheet.dwSize = sizeof(propsheet); propsheet.dwFlags = PSP_DEFAULT | PSP_USECALLBACK; @@ -119,6 +277,7 @@ HPROPSHEETPAGE WINAPI CreateSecurityPage(ISecurityInformation *security) if (!(ret = CreatePropertySheetPageW(&propsheet))) { ERR("Failed to create property sheet page.\n"); + ISecurityInformation_Release(security); free(page); return NULL; }

1 0

Alexandre Julliard : ntdll: Add a helper to initialize a UNICODE_STRING on the Unix side.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: 285830f5ec2a4cc22ed9f3bbd1e62136deb0652d URL: https://source.winehq.org/git/wine.git/?a=commit;h=285830f5ec2a4cc22ed9f3bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 09:50:34 2021 +0100 ntdll: Add a helper to initialize a UNICODE_STRING on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 8 ++------ dlls/ntdll/unix/file.c | 11 +++-------- dlls/ntdll/unix/loader.c | 4 +--- dlls/ntdll/unix/system.c | 4 +--- dlls/ntdll/unix/unix_private.h | 7 +++++++ 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index cca334865e4..d1a669a4964 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -168,9 +168,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) wcscpy( buffer, type == NLS_SECTION_SORTKEYS ? sortdirW : systemdirW ); p = strrchr( path, '/' ) + 1; ascii_to_unicode( buffer + wcslen(buffer), p, strlen(p) + 1 ); - valueW.Buffer = buffer; - valueW.Length = wcslen( buffer ) * sizeof(WCHAR); - valueW.MaximumLength = sizeof( buffer ); + init_unicode_string( &valueW, buffer ); InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL ); status = open_unix_file( file, path, GENERIC_READ, &attr, 0, FILE_SHARE_READ, @@ -1645,9 +1643,7 @@ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void ** if ((status = get_nls_section_name( type, id, name ))) return status; - nameW.Buffer = name; - nameW.Length = wcslen(name) * sizeof(WCHAR); - nameW.MaximumLength = sizeof(name); + init_unicode_string( &nameW, name ); InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); if ((status = NtOpenSection( &handle, SECTION_MAP_READ, &attr ))) { diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 381805c0f04..315354be7aa 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1974,8 +1974,7 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni else drive->letter = 'a' + letter; - string.Buffer = (WCHAR *)MOUNTMGR_DEVICE_NAME; - string.Length = sizeof(MOUNTMGR_DEVICE_NAME) - sizeof(WCHAR); + init_unicode_string( &string, MOUNTMGR_DEVICE_NAME ); InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); status = NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT ); @@ -2750,10 +2749,8 @@ static NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); len += sprintf( buffer + len, "\\%s", path ); - name.Buffer = bufferW; - name.Length = len * sizeof(WCHAR); - name.MaximumLength = name.Length + sizeof(WCHAR); ascii_to_unicode( bufferW, buffer, len + 1 ); + init_unicode_string( &name, bufferW ); InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, 0, NULL ); return NtCreateKey( key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ); } @@ -2787,9 +2784,7 @@ void init_files(void) DWORD dummy; UNICODE_STRING nameW; - nameW.MaximumLength = sizeof(showdotfilesW); - nameW.Length = nameW.MaximumLength - sizeof(WCHAR); - nameW.Buffer = showdotfilesW; + init_unicode_string( &nameW, showdotfilesW ); if (!NtQueryValueKey( key, &nameW, KeyValuePartialInformation, tmp, sizeof(tmp), &dummy )) { WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)tmp)->Data; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index b7e1432535d..6adf4bb5b00 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1618,9 +1618,7 @@ static void load_ntdll(void) void *module; char *name = build_path( dll_dir, "ntdll.dll.so" ); - str.Buffer = path; - str.Length = sizeof(path) - sizeof(WCHAR); - str.MaximumLength = sizeof(path); + init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); name[strlen(name) - 3] = 0; /* remove .so */ status = open_builtin_file( name, &attr, &mapping, &module, &info, &st, FALSE ); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 788328292de..48321957fb8 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1809,9 +1809,7 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* sprintf( buffer, "%u", year ); ascii_to_unicode( yearW, buffer, strlen(buffer) + 1 ); - - nameW.Buffer = (WCHAR *)Time_ZonesW; - nameW.Length = sizeof(Time_ZonesW) - sizeof(WCHAR); + init_unicode_string( &nameW, Time_ZonesW ); InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); if (NtOpenKey( &key, KEY_READ, &attr )) return; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 031f9ed3d33..c8156fbcb6b 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -482,4 +482,11 @@ static inline int ntdll_wcsnicmp( const WCHAR *str1, const WCHAR *str2, int n ) #define towupper(c) ntdll_towupper(c) #define towlower(c) ntdll_towlower(c) +static inline void init_unicode_string( UNICODE_STRING *str, const WCHAR *data ) +{ + str->Length = wcslen(data) * sizeof(WCHAR); + str->MaximumLength = str->Length + sizeof(WCHAR); + str->Buffer = (WCHAR *)data; +} + #endif /* __NTDLL_UNIX_PRIVATE_H */

1 0

Alexandre Julliard : ntdll: Make the open_hkcu_key() helper available globally.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: 16b099441264e155edc58885868cd0ebb1e193b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16b099441264e155edc58885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 10:00:29 2021 +0100 ntdll: Make the open_hkcu_key() helper available globally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 29 ----------------------------- dlls/ntdll/unix/registry.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 3 +-- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 315354be7aa..bcaf03a2d02 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2727,35 +2727,6 @@ static int get_redirect_path( char *unix_name, int pos, const WCHAR *name, int l #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') -static NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) -{ - NTSTATUS status; - char buffer[256]; - WCHAR bufferW[256]; - DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; - DWORD i, len = sizeof(sid_data); - SID *sid; - UNICODE_STRING name; - OBJECT_ATTRIBUTES attr; - - status = NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len ); - if (status) return status; - - sid = ((TOKEN_USER *)sid_data)->User.Sid; - len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, - MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), - MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); - for (i = 0; i < sid->SubAuthorityCount; i++) - len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); - len += sprintf( buffer + len, "\\%s", path ); - - ascii_to_unicode( bufferW, buffer, len + 1 ); - init_unicode_string( &name, bufferW ); - InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, 0, NULL ); - return NtCreateKey( key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ); -} - - /*********************************************************************** * init_files */ diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index b52811b05e7..9a572d7f44e 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -40,6 +40,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); #define MAX_VALUE_LENGTH (16383 * sizeof(WCHAR)) +NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) +{ + NTSTATUS status; + char buffer[256]; + WCHAR bufferW[256]; + DWORD_PTR sid_data[(sizeof(TOKEN_USER) + SECURITY_MAX_SID_SIZE) / sizeof(DWORD_PTR)]; + DWORD i, len = sizeof(sid_data); + SID *sid; + UNICODE_STRING name; + OBJECT_ATTRIBUTES attr; + + status = NtQueryInformationToken( GetCurrentThreadEffectiveToken(), TokenUser, sid_data, len, &len ); + if (status) return status; + + sid = ((TOKEN_USER *)sid_data)->User.Sid; + len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, + MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ))); + for (i = 0; i < sid->SubAuthorityCount; i++) + len += sprintf( buffer + len, "-%u", sid->SubAuthority[i] ); + len += sprintf( buffer + len, "\\%s", path ); + + ascii_to_unicode( bufferW, buffer, len + 1 ); + init_unicode_string( &name, bufferW ); + InitializeObjectAttributes( &attr, &name, OBJ_CASE_INSENSITIVE, 0, NULL ); + return NtCreateKey( key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ); +} + + /****************************************************************************** * NtCreateKey (NTDLL.@) */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c8156fbcb6b..b8b6619c0a9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -105,8 +105,6 @@ extern void CDECL virtual_release_address_space(void) DECLSPEC_HIDDEN; extern NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) DECLSPEC_HIDDEN; -extern void CDECL set_show_dot_files( BOOL enable ) DECLSPEC_HIDDEN; - extern const char *home_dir DECLSPEC_HIDDEN; extern const char *data_dir DECLSPEC_HIDDEN; extern const char *build_dir DECLSPEC_HIDDEN; @@ -215,6 +213,7 @@ extern void DECLSPEC_NORETURN exec_process( NTSTATUS status ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern void signal_restore_full_cpu_context(void) DECLSPEC_HIDDEN; extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDDEN; +extern NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) DECLSPEC_HIDDEN; extern NTSTATUS cdrom_DeviceIoControl( HANDLE device, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer,

1 0