April 2019 - Wine-commits - list.winehq.org

Zebediah Figura : d3d9: Forbid creating a stateblock while recording.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: dd0bed46a56867ed5a03ee2a6ea06d35d925cecf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd0bed46a56867ed5a03ee2a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 2 12:42:48 2019 -0500 d3d9: Forbid creating a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 9 +++++++++ dlls/d3d9/tests/device.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4a41443..bad9211 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2313,6 +2313,15 @@ static HRESULT WINAPI d3d9_device_CreateStateBlock(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to create a stateblock while recording, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + wined3d_mutex_unlock(); + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 40ccdc4..e7366b1 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -10602,7 +10602,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_GetRenderState(device, D3DRS_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -10621,7 +10621,7 @@ static void test_begin_end_state_block(void) IDirect3DStateBlock9_Release(stateblock); IDirect3DStateBlock9_Release(stateblock2); refcount = IDirect3DDevice9_Release(device); - todo_wine ok(!refcount, "Device has %u references left.\n", refcount); + ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); DestroyWindow(window); }

1 0

Alistair Leslie-Hughes : include: Wrap D3DX10 functions in extern "C".
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 0501ad920afd208d85cf807c9fcec1d4e8245164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0501ad920afd208d85cf807c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 1 03:35:12 2019 +0000 include: Wrap D3DX10 functions in extern "C". Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10core.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index c99ab82..afd77e9 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -65,6 +65,9 @@ interface ID3DX10ThreadPump : IUnknown HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); } +cpp_quote("#ifdef __cplusplus") +cpp_quote("extern \"C\" {") +cpp_quote("#endif") cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") @@ -72,3 +75,6 @@ cpp_quote("HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, cpp_quote(" HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain,") cpp_quote(" ID3D10Device **device);") cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);") +cpp_quote("#ifdef __cplusplus") +cpp_quote("}") +cpp_quote("#endif")

1 0

Alexandre Julliard : reg: Add missing null to terminate a string.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 8268c47462544baf5bc7e5071c0a9f2d00c5c2cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8268c47462544baf5bc7e507… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 21:47:59 2019 +0200 reg: Add missing null to terminate a string. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 1e69bc7..2a09e34 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -316,7 +316,7 @@ static void export_file_header(HANDLE hFile) { static const WCHAR header[] = { 0xfeff,'W','i','n','d','o','w','s',' ', 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', - 'V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n'}; + 'V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n',0}; write_file(hFile, header); }

1 0

Nikolay Sivov : include: Add IDebugControl2 definition.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 08f3c7d5114cfaeb7bb352433517fd6256a9106b URL: https://source.winehq.org/git/wine.git/?a=commit;h=08f3c7d5114cfaeb7bb35243… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 12:16:47 2019 +0300 include: Add IDebugControl2 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbgeng.h | 329 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 329 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08f3c7d5114cfaeb7bb3…

1 0

Nikolay Sivov : dbgeng: Add IDebugControl2 stub.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 406ac1bc746574aaa9432a958c6de5e1ddf2dade URL: https://source.winehq.org/git/wine.git/?a=commit;h=406ac1bc746574aaa9432a95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 12:16:48 2019 +0300 dbgeng: Add IDebugControl2 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 905 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 905 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=406ac1bc746574aaa943…

1 0

Sergio Gómez Del Real : riched20: Handle efficiently caret creation/destruction.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 5868c664c1ac56bc6e3a6a531172d6bdae51b9dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5868c664c1ac56bc6e3a6a53… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Apr 3 08:23:04 2019 -0500 riched20: Handle efficiently caret creation/destruction. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 55 ++++++++++++++++++++++++++++--------------------- dlls/riched20/editor.c | 18 +++++++++------- dlls/riched20/editor.h | 7 ++++--- dlls/riched20/editstr.h | 2 ++ dlls/riched20/paint.c | 1 - dlls/riched20/table.c | 3 +-- 6 files changed, 49 insertions(+), 37 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ad72511..0951bb9 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -266,36 +266,47 @@ void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, return; } - -void -ME_MoveCaret(ME_TextEditor *editor) +void create_caret(ME_TextEditor *editor) { int x, y, height; ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); - if(editor->bHaveFocus && !ME_IsSelection(editor)) - { - x = min(x, editor->rcFormat.right-1); - ITextHost_TxCreateCaret(editor->texthost, NULL, 0, height); - ITextHost_TxSetCaretPos(editor->texthost, x, y); - } + ITextHost_TxCreateCaret(editor->texthost, NULL, 0, height); + editor->caret_height = height; + editor->caret_hidden = TRUE; } +void show_caret(ME_TextEditor *editor) +{ + ITextHost_TxShowCaret(editor->texthost, TRUE); + editor->caret_hidden = FALSE; +} -void ME_ShowCaret(ME_TextEditor *ed) +void hide_caret(ME_TextEditor *editor) { - ME_MoveCaret(ed); - if(ed->bHaveFocus && !ME_IsSelection(ed)) - ITextHost_TxShowCaret(ed->texthost, TRUE); + /* calls to HideCaret are cumulative; do so only once */ + if (!editor->caret_hidden) + { + ITextHost_TxShowCaret(editor->texthost, FALSE); + editor->caret_hidden = TRUE; + } } -void ME_HideCaret(ME_TextEditor *ed) +void update_caret(ME_TextEditor *editor) { - if(!ed->bHaveFocus || ME_IsSelection(ed)) + int x, y, height; + + if (!editor->bHaveFocus) return; + if (!ME_IsSelection(editor)) { - ITextHost_TxShowCaret(ed->texthost, FALSE); - DestroyCaret(); + ME_GetCursorCoordinates(editor, &editor->pCursors[0], &x, &y, &height); + if (height != editor->caret_height) create_caret(editor); + x = min(x, editor->rcFormat.right-1); + ITextHost_TxSetCaretPos(editor->texthost, x, y); + show_caret(editor); } + else + hide_caret(editor); } BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, @@ -1200,8 +1211,7 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) } } ME_InvalidateSelection(editor); - ITextHost_TxShowCaret(editor->texthost, FALSE); - ME_ShowCaret(editor); + update_caret(editor); ME_SendSelChange(editor); } @@ -1233,8 +1243,7 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) } ME_InvalidateSelection(editor); - ITextHost_TxShowCaret(editor->texthost, FALSE); - ME_ShowCaret(editor); + update_caret(editor); ME_SendSelChange(editor); } @@ -1627,9 +1636,9 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) ME_InvalidateSelection(editor); ME_Repaint(editor); - ITextHost_TxShowCaret(editor->texthost, FALSE); + hide_caret(editor); ME_EnsureVisible(editor, &tmp_curs); - ME_ShowCaret(editor); + update_caret(editor); ME_SendSelChange(editor); return success; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b7254d2..b826a2c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1802,9 +1802,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!(format & SFF_SELECTION)) { ME_ClearTempStyle(editor); } - ITextHost_TxShowCaret(editor->texthost, FALSE); - ME_MoveCaret(editor); - ITextHost_TxShowCaret(editor->texthost, TRUE); + update_caret(editor); ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE); @@ -2158,8 +2156,7 @@ static int handle_EM_EXSETSEL( ME_TextEditor *editor, int to, int from ) ME_InvalidateSelection( editor ); end = ME_SetSelection( editor, to, from ); ME_InvalidateSelection( editor ); - ITextHost_TxShowCaret( editor->texthost, FALSE ); - ME_ShowCaret( editor ); + update_caret( editor ); ME_SendSelChange( editor ); return end; @@ -3118,6 +3115,8 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->bHaveFocus = FALSE; ed->bDialogMode = FALSE; ed->bMouseCaptured = FALSE; + ed->caret_hidden = FALSE; + ed->caret_height = 0; for (i=0; i<HFONT_CACHE_SIZE; i++) { ed->pFontCache[i].nRefs = 0; @@ -3529,7 +3528,7 @@ static LRESULT ME_WmCreate(ME_TextEditor *editor, LPARAM lParam, BOOL unicode) ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); - ME_MoveCaret(editor); + update_caret(editor); return 0; } @@ -4511,7 +4510,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, break; case WM_SETFOCUS: editor->bHaveFocus = TRUE; - ME_ShowCaret(editor); + create_caret(editor); + update_caret(editor); ME_SendOldNotify(editor, EN_SETFOCUS); if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) ME_InvalidateSelection( editor ); @@ -4520,7 +4520,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_CommitUndo(editor); /* End coalesced undos for typed characters */ editor->bHaveFocus = FALSE; editor->wheel_remain = 0; - ME_HideCaret(editor); + hide_caret(editor); + DestroyCaret(); ME_SendOldNotify(editor, EN_KILLFOCUS); if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) ME_InvalidateSelection( editor ); @@ -4978,6 +4979,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, RECT rc; PAINTSTRUCT ps; + update_caret(editor); hDC = BeginPaint(editor->hWnd, &ps); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify(editor, EN_UPDATE); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 2633fa8..2e08eee 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -152,9 +152,10 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) DECLSPEC_ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; int ME_SetSelection(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; -void ME_HideCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN; -void ME_ShowCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN; -void ME_MoveCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN; +void hide_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; +void show_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; +void update_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; +void create_caret(ME_TextEditor *ed) DECLSPEC_HIDDEN; BOOL ME_CharFromPos(ME_TextEditor *editor, int x, int y, ME_Cursor *cursor, BOOL *isExact) DECLSPEC_HIDDEN; void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) DECLSPEC_HIDDEN; void ME_MouseMove(ME_TextEditor *editor, int x, int y) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 28be524..87cd71c 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -442,6 +442,8 @@ typedef struct tagME_TextEditor /* Cache previously set scrollbar info */ SCROLLINFO vert_si, horz_si; + int caret_height; + BOOL caret_hidden; BOOL bMouseCaptured; int wheel_remain; struct list style_list; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index e2ccef4..675e0f7 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -43,7 +43,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_InitContext(&c, editor, hDC); SetBkMode(hDC, TRANSPARENT); - ME_MoveCaret(editor); item = editor->pBuffer->pFirst->next; /* This context point is an offset for the paragraph positions stored * during wrapping. It shouldn't be modified during painting. */ diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 7e8d7ff..1b4b914 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -613,8 +613,7 @@ void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) } ME_InvalidateSelection(editor); ME_Repaint(editor); - ITextHost_TxShowCaret(editor->texthost, FALSE); - ME_ShowCaret(editor); + update_caret(editor); ME_SendSelChange(editor); }

1 0

Józef Kucia : wined3d: Initialise Vulkan for adapters.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 3dd8cab4f33fd7391f3f80ada0d024ed97afc603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd8cab4f33fd7391f3f80ad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 3 11:11:32 2019 +0200 wined3d: Initialise Vulkan for adapters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 80 +++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 + dlls/wined3d/wined3d_vk.h | 186 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 265 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd8cab4f33fd7391f3f…

1 0

Józef Kucia : wined3d: Add support for USE_WIN32_VULKAN.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: f9cf21512e2a114e7f76db1834d309cb2f072734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9cf21512e2a114e7f76db18… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 3 11:11:33 2019 +0200 wined3d: Add support for USE_WIN32_VULKAN. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 87 ++++++++++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_vk.h | 6 ++++ 2 files changed, 74 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 337c6f7..cea6e69 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -24,12 +24,63 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#ifdef USE_WIN32_VULKAN +static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) +{ + struct vulkan_ops *vk_ops = &vk_info->vk_ops; + + if (!(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) + { + WARN("Failed to load vulkan-1.dll.\n"); + return FALSE; + } + + vk_ops->vkGetInstanceProcAddr = (void *)GetProcAddress(vk_info->vulkan_lib, "vkGetInstanceProcAddr"); + if (!vk_ops->vkGetInstanceProcAddr) + { + FreeLibrary(vk_info->vulkan_lib); + return FALSE; + } + + return TRUE; +} + +static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) +{ + if (vk_info->vulkan_lib) + { + FreeLibrary(vk_info->vulkan_lib); + vk_info->vulkan_lib = NULL; + } +} +#else +static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) +{ + struct vulkan_ops *vk_ops = &vk_info->vk_ops; + const struct vulkan_funcs *vk_funcs; + HDC dc; + + dc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(dc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, dc); + + if (!vk_funcs) + return FALSE; + + vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr; + return TRUE; +} + +static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) {} +#endif + static void adapter_vk_destroy(struct wined3d_adapter *adapter) { struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(adapter); - const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); + wined3d_unload_vulkan(vk_info); wined3d_adapter_cleanup(&adapter_vk->a); heap_free(adapter_vk); } @@ -62,25 +113,17 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; - const struct vulkan_funcs *vk_funcs; + VkInstance instance = VK_NULL_HANDLE; VkInstanceCreateInfo instance_info; - VkInstance instance; VkResult vr; - HDC dc; - - dc = GetDC(0); - vk_funcs = __wine_get_vulkan_driver(dc, WINE_VULKAN_DRIVER_VERSION); - ReleaseDC(0, dc); - if (!vk_funcs) + if (!wined3d_load_vulkan(vk_info)) return FALSE; - vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr; - if (!(vk_ops->vkCreateInstance = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkCreateInstance")))) { ERR("Could not get 'vkCreateInstance'.\n"); - return FALSE; + goto fail; } memset(&instance_info, 0, sizeof(instance_info)); @@ -88,7 +131,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %d.\n", vr); - return FALSE; + goto fail; } TRACE("Created Vulkan instance %p.\n", instance); @@ -97,8 +140,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if (!(vk_ops->name = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #name)))) \ { \ WARN("Could not get instance proc addr for '" #name "'.\n"); \ - vk_funcs->p_vkDestroyInstance(instance, NULL); \ - return FALSE; \ + goto fail; \ } #define VK_INSTANCE_PFN LOAD_INSTANCE_PFN #define VK_DEVICE_PFN LOAD_INSTANCE_PFN @@ -110,6 +152,12 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) vk_info->instance = instance; return TRUE; + +fail: + if (vk_ops->vkDestroyInstance) + VK_CALL(vkDestroyInstance(instance, NULL)); + wined3d_unload_vulkan(vk_info); + return FALSE; } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, @@ -134,12 +182,12 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!(gpu_description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA))) { ERR("Failed to get GPU description.\n"); - goto fail; + goto fail_vulkan; } wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); if (!wined3d_adapter_vk_init_format_info(adapter)) - goto fail; + goto fail_vulkan; adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; @@ -150,9 +198,10 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, return TRUE; +fail_vulkan: + VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); + wined3d_unload_vulkan(vk_info); fail: - if (vk_info->vk_ops.vkDestroyInstance) - VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_adapter_cleanup(adapter); return FALSE; } diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index ac59a2d..784dd0c 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -20,7 +20,9 @@ #define __WINE_WINED3D_VK_H #define VK_NO_PROTOTYPES +#ifndef USE_WIN32_VULKAN #define WINE_VK_HOST +#endif #include "wine/vulkan.h" #define VK_INSTANCE_FUNCS() \ @@ -179,6 +181,10 @@ struct wined3d_vk_info { VkInstance instance; struct vulkan_ops vk_ops; + +#ifdef USE_WIN32_VULKAN + HMODULE vulkan_lib; +#endif }; #define VK_CALL(f) (vk_info->vk_ops.f)

1 0

Józef Kucia : wined3d: Pass application info to Vulkan.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 46a451f32738668738c980635ff813f209b6434e URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a451f32738668738c98063… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 3 11:11:34 2019 +0200 wined3d: Pass application info to Vulkan. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_main.c | 42 +++++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cea6e69..ca3a0f9 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -110,11 +110,28 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_check_format, }; +static unsigned int wined3d_get_wine_vk_version(void) +{ + const char *ptr = PACKAGE_VERSION; + int major, minor; + + major = atoi(ptr); + + while (isdigit(*ptr) || *ptr == '.') + ++ptr; + + minor = atoi(ptr); + + return VK_MAKE_VERSION(major, minor, 0); +} + static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstance instance = VK_NULL_HANDLE; VkInstanceCreateInfo instance_info; + VkApplicationInfo app_info; + char app_name[MAX_PATH]; VkResult vr; if (!wined3d_load_vulkan(vk_info)) @@ -126,8 +143,17 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) goto fail; } + memset(&app_info, 0, sizeof(app_info)); + app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; + if (wined3d_get_app_name(app_name, ARRAY_SIZE(app_name))) + app_info.pApplicationName = app_name; + app_info.pEngineName = "Damavand"; + app_info.engineVersion = wined3d_get_wine_vk_version(); + app_info.apiVersion = VK_API_VERSION_1_0; + memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_info.pApplicationInfo = &app_info; if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %d.\n", vr); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index d2e4978..0a0121d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -142,6 +142,30 @@ success: return 0; } +BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) +{ + char buffer[MAX_PATH]; + unsigned int len; + char *p, *name; + + len = GetModuleFileNameA(0, buffer, ARRAY_SIZE(buffer)); + if (!(len && len < MAX_PATH)) + return FALSE; + + name = buffer; + if ((p = strrchr(name, '/' ))) + name = p + 1; + if ((p = strrchr(name, '\\'))) + name = p + 1; + + len = strlen(name) + 1; + if (app_name_size < len) + return FALSE; + + memcpy(app_name, name, len); + return TRUE; +} + static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; @@ -149,7 +173,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) DWORD size = sizeof(buffer); HKEY hkey = 0; HKEY appkey = 0; - DWORD len, tmpvalue; + DWORD tmpvalue; WNDCLASSA wc; wined3d_context_tls_idx = TlsAlloc(); @@ -191,20 +215,16 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0; - len = GetModuleFileNameA( 0, buffer, MAX_PATH ); - if (len && len < MAX_PATH) + if (wined3d_get_app_name(buffer, ARRAY_SIZE(buffer))) { HKEY tmpkey; /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Direct3D */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey )) + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey)) { - char *p, *appname = buffer; - if ((p = strrchr( appname, '/' ))) appname = p + 1; - if ((p = strrchr( appname, '\\' ))) appname = p + 1; - strcat( appname, "\\Direct3D" ); - TRACE("appname = [%s]\n", appname); - if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; - RegCloseKey( tmpkey ); + strcat(buffer, "\\Direct3D"); + TRACE("Application name %s.\n", buffer); + if (RegOpenKeyA(tmpkey, buffer, &appkey)) appkey = 0; + RegCloseKey(tmpkey); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 012c90f..c2fbf1d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2919,6 +2919,8 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; +BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) DECLSPEC_HIDDEN; + struct wined3d_blend_state { LONG refcount;

1 0

Piotr Caban : iphlpapi: Don't use strncasecmp.
by Alexandre Julliard 03 Apr '19

03 Apr '19

Module: wine Branch: master Commit: 95510d5b1b541c0f9e6dd508adc050d057f63ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95510d5b1b541c0f9e6dd508… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:05 2019 +0200 iphlpapi: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index be1cc52..b4ed542 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -302,7 +302,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) while ((ptr = fgets(buf, sizeof(buf), fp))) { while (*ptr && isspace(*ptr)) ptr++; - if (strncasecmp(ptr, name, nameLen) == 0 && *(ptr + nameLen) == ':') + if (_strnicmp(ptr, name, nameLen) == 0 && *(ptr + nameLen) == ':') { ptr += nameLen + 1; sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u", @@ -433,10 +433,10 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -657,13 +657,13 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) if ((ptr = strchr(value, '\n'))) *ptr='\0'; - if (!strcasecmp(buf, "Icmp6InMsgs")) + if (!_strnicmp(buf, "Icmp6InMsgs", -1)) { if (sscanf(value, "%d", &res)) stats->icmpInStats.dwMsgs = res; continue; } - if (!strcasecmp(buf, "Icmp6InErrors")) + if (!_strnicmp(buf, "Icmp6InErrors", -1)) { if (sscanf(value, "%d", &res)) stats->icmpInStats.dwErrors = res; continue; @@ -671,7 +671,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) for (i = 0; i < ARRAY_SIZE(icmpinstatlist); i++) { - if (!strcasecmp(buf, icmpinstatlist[i].name)) + if (!_strnicmp(buf, icmpinstatlist[i].name, -1)) { if (sscanf(value, "%d", &res)) stats->icmpInStats.rgdwTypeCount[icmpinstatlist[i].pos] = res; @@ -679,13 +679,13 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) } } - if (!strcasecmp(buf, "Icmp6OutMsgs")) + if (!_strnicmp(buf, "Icmp6OutMsgs", -1)) { if (sscanf(value, "%d", &res)) stats->icmpOutStats.dwMsgs = res; continue; } - if (!strcasecmp(buf, "Icmp6OutErrors")) + if (!_strnicmp(buf, "Icmp6OutErrors", -1)) { if (sscanf(value, "%d", &res)) stats->icmpOutStats.dwErrors = res; continue; @@ -693,7 +693,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) for (i = 0; i < ARRAY_SIZE(icmpoutstatlist); i++) { - if (!strcasecmp(buf, icmpoutstatlist[i].name)) + if (!_strnicmp(buf, icmpoutstatlist[i].name, -1)) { if (sscanf(value, "%d", &res)) stats->icmpOutStats.rgdwTypeCount[icmpoutstatlist[i].pos] = res; @@ -823,7 +823,7 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!strcasecmp(buf, ipstatlist[i].name) && sscanf(value, "%d", &res)) + if (!_strnicmp(buf, ipstatlist[i].name, -1) && sscanf(value, "%d", &res)) *ipstatlist[i].elem = res; } fclose(fp); @@ -847,10 +847,10 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -1029,10 +1029,10 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -1210,7 +1210,7 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udpstatlist); i++) - if (!strcasecmp(buf, udpstatlist[i].name) && sscanf(value, "%d", &res)) + if (!_strnicmp(buf, udpstatlist[i].name, -1) && sscanf(value, "%d", &res)) *udpstatlist[i].elem = res; } fclose(fp); @@ -1234,10 +1234,10 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u",

1 0