February 2022 - Wine-Commits

Eric Pouech : localui: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 2974f234431a7e5dbb398799ee1e9b723c1c44e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2974f234431a7e5dbb398799… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:59 2022 +0100 localui: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localui/Makefile.in | 1 - dlls/localui/localui.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/localui/Makefile.in b/dlls/localui/Makefile.in index 71135130da1..eb4273f8d93 100644 --- a/dlls/localui/Makefile.in +++ b/dlls/localui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = localui.dll IMPORTS = winspool user32 diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 87522494a1d..643b01d7b3f 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -134,7 +134,7 @@ static BOOL dlg_configure_lpt(HANDLE hXcv, HWND hWnd) res = DialogBoxParamW(LOCALUI_hInstance, MAKEINTRESOURCEW(LPTCONFIG_DIALOG), hWnd, dlgproc_lptconfig, (LPARAM) &data); - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %u with %lu\n", res, GetLastError()); if (!res) SetLastError(ERROR_CANCELLED); return res; @@ -270,7 +270,7 @@ static INT_PTR CALLBACK dlgproc_addport(HWND hwnd, UINT msg, WPARAM wparam, LPAR (lstrlenW(data->portname) + 1) * sizeof(WCHAR), (PBYTE) &dummy, 0, &len, &status); - TRACE("got %u with status %u\n", res, status); + TRACE("got %lu with status %lu\n", res, status); if (res && (status == ERROR_SUCCESS)) { /* The caller must free data->portname */ EndDialog(hwnd, TRUE); @@ -334,7 +334,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP (PBYTE) &dummy, 0, (PBYTE) &data->value, sizeof(data->value), &len, &status); - TRACE("got %u with status %u\n", res, status); + TRACE("got %lu with status %lu\n", res, status); /* Set current setting as the initial value in the Dialog */ SetDlgItemInt(hwnd, LPTCONFIG_EDIT, data->value, FALSE); @@ -349,7 +349,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP res = GetDlgItemInt(hwnd, LPTCONFIG_EDIT, (BOOL *) &status, FALSE); /* length is in WCHAR, including the '\0' */ GetDlgItemTextW(hwnd, LPTCONFIG_EDIT, bufferW, ARRAY_SIZE(bufferW)); - TRACE("got %s and %u (translated: %u)\n", debugstr_w(bufferW), res, status); + TRACE("got %s and %lu (translated: %lu)\n", debugstr_w(bufferW), res, status); /* native localui.dll use the same limits */ if ((res > 0) && (res < 1000000) && status) { @@ -359,7 +359,7 @@ static INT_PTR CALLBACK dlgproc_lptconfig(HWND hwnd, UINT msg, WPARAM wparam, LP (lstrlenW(bufferW) +1) * sizeof(WCHAR), (PBYTE) &dummy, 0, &len, &status); - TRACE("got %u with status %u\n", res, status); + TRACE("got %lu with status %lu\n", res, status); EndDialog(hwnd, TRUE); return TRUE; } @@ -489,7 +489,7 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam res = DialogBoxParamW(LOCALUI_hInstance, MAKEINTRESOURCEW(ADDPORT_DIALOG), hWnd, dlgproc_addport, (LPARAM) &data); - TRACE("got %u with %u for %s\n", res, GetLastError(), debugstr_w(data.portname)); + TRACE("got %lu with %lu for %s\n", res, GetLastError(), debugstr_w(data.portname)); if (ppPortName) *ppPortName = NULL; @@ -498,7 +498,7 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam (lstrlenW(data.portname)+1) * sizeof(WCHAR), (PBYTE) &dummy, 0, &needed, &status); - TRACE("got %u with status %u\n", res, status); + TRACE("got %lu with status %lu\n", res, status); if (res && (status == ERROR_SUCCESS) && ppPortName) { /* Native localui uses GlobalAlloc also. The caller must GlobalFree the buffer */ @@ -520,7 +520,7 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam ClosePrinter(hXcv); } - TRACE("=> %u with %u\n", res, GetLastError()); + TRACE("=> %lu with %lu\n", res, GetLastError()); return res; } @@ -652,7 +652,7 @@ PMONITORUI WINAPI InitializePrintMonitorUI(void) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %ld, %p)\n",hinstDLL, fdwReason, lpvReserved); switch(fdwReason) {

1 0

Jan Sikorski : wined3d: Use a separate heap for deferred resource upload buffers.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: b33a5b34b7a815c85f946efeb840aff1d15ffa62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b33a5b34b7a815c85f946efe… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Feb 11 13:43:27 2022 +0100 wined3d: Use a separate heap for deferred resource upload buffers. Significantly reduces global heap lock contention in some games. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 90686e8d170..ffa0689e5a4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -49,6 +49,7 @@ struct wined3d_command_list SIZE_T data_size; void *data; + HANDLE upload_heap; SIZE_T resource_count; struct wined3d_resource **resources; @@ -3979,6 +3980,7 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) struct wined3d_deferred_context { struct wined3d_device_context c; + HANDLE upload_heap; SIZE_T data_size, data_capacity; void *data; @@ -4108,7 +4110,15 @@ static bool wined3d_deferred_context_map_upload_bo(struct wined3d_device_context deferred->upload_count + 1, sizeof(*deferred->uploads))) return false; - if (!(sysmem = heap_alloc(size + RESOURCE_ALIGNMENT - 1))) + if (!deferred->upload_heap) + deferred->upload_heap = HeapCreate(HEAP_NO_SERIALIZE, 0, 0); + if (!deferred->upload_heap) + { + ERR("Failed to create upload heap.\n"); + return false; + } + + if (!(sysmem = HeapAlloc(deferred->upload_heap, 0, size + RESOURCE_ALIGNMENT - 1))) return false; upload = &deferred->uploads[deferred->upload_count++]; @@ -4253,10 +4263,9 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte heap_free(deferred->resources); for (i = 0; i < deferred->upload_count; ++i) - { wined3d_resource_decref(deferred->uploads[i].resource); - heap_free(deferred->uploads[i].sysmem); - } + if (deferred->upload_heap) + HeapDestroy(deferred->upload_heap); heap_free(deferred->uploads); for (i = 0; i < deferred->command_list_count; ++i) @@ -4341,6 +4350,9 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->command_list_count = 0; deferred->query_count = 0; + object->upload_heap = deferred->upload_heap; + deferred->upload_heap = 0; + /* This is in fact recorded into a subsequent command list. */ if (restore) wined3d_device_context_set_state(&deferred->c, deferred->c.state); @@ -4357,13 +4369,11 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device static void wined3d_command_list_destroy_object(void *object) { struct wined3d_command_list *list = object; - SIZE_T i; TRACE("list %p.\n", list); - for (i = 0; i < list->upload_count; ++i) - heap_free(list->uploads[i].sysmem); - + if (list->upload_heap) + HeapDestroy(list->upload_heap); heap_free(list); }

1 0

Zebediah Figura : wined3d: Always set map_ptr for mapped OpenGL BOs.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: d53f9d5f8811a145920d2a3168c2a1f0a5fe9804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d53f9d5f8811a145920d2a31… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 10 19:02:31 2022 -0600 wined3d: Always set map_ptr for mapped OpenGL BOs. Regardless of whether we are mapping persistently. Matches the Vulkan backend. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 7b40b1de0fb..9153b7fd95f 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2831,7 +2831,6 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_ const struct wined3d_gl_info *gl_info; struct wined3d_bo_user *bo_user; struct wined3d_bo_gl tmp; - uint8_t *map_ptr; if (flags & WINED3D_MAP_NOOVERWRITE) goto map; @@ -2869,9 +2868,9 @@ map: { struct wined3d_allocator_chunk_gl *chunk_gl = wined3d_allocator_chunk_gl(bo->memory->chunk); - if (!(map_ptr = wined3d_allocator_chunk_gl_map(chunk_gl, context_gl))) + if (!(bo->b.map_ptr = wined3d_allocator_chunk_gl_map(chunk_gl, context_gl))) ERR("Failed to map chunk.\n"); - return map_ptr; + return bo->b.map_ptr; } gl_info = context_gl->gl_info; @@ -2906,31 +2905,32 @@ map: } gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags))) && wined3d_map_persistent()) - bo->b.map_ptr = map_ptr; + bo->b.map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)); } else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); + bo->b.map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); } else { - map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); + bo->b.map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); checkGLcall("Map buffer object"); - return map_ptr; + return bo->b.map_ptr; } static void wined3d_bo_gl_unmap(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - if (bo->b.map_ptr) + if (wined3d_map_persistent()) return; + bo->b.map_ptr = NULL; + wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); if (bo->memory)

1 0

Paul Gofman : wined3d: Use StretchBlt() in swapchain_blit_gdi().
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 2435f116c3ae527a4b6b52b78a44449a277fd8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=2435f116c3ae527a4b6b52b7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 11 15:19:58 2022 +0300 wined3d: Use StretchBlt() in swapchain_blit_gdi(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 49a40f3e1d6..5fcbfc58779 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -459,8 +459,9 @@ static void swapchain_blit_gdi(struct wined3d_swapchain *swapchain, if (!(dst_dc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) ERR("Failed to get destination DC.\n"); - if (!BitBlt(dst_dc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, - dst_rect->bottom - dst_rect->top, src_dc, src_rect->left, src_rect->top, SRCCOPY)) + if (!StretchBlt(dst_dc, dst_rect->left, dst_rect->top, dst_rect->right - dst_rect->left, + dst_rect->bottom - dst_rect->top, src_dc, src_rect->left, src_rect->top, + src_rect->right - src_rect->left, src_rect->bottom - src_rect->top, SRCCOPY)) ERR("Failed to blit.\n"); ReleaseDC(swapchain->win_handle, dst_dc);

1 0

Zhiyi Zhang : light.msstyles: Do not use transparent treeview parts.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 6255d92a60fc635755108a6dbc8a936ac3d5275f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6255d92a60fc635755108a6d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:15:35 2022 +0800 light.msstyles: Do not use transparent treeview parts. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52434 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../blue_treeview_expand_collapse_11px.bmp | Bin 1106 -> 930 bytes .../blue_treeview_expand_collapse_11px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_13px.bmp | Bin 1490 -> 1178 bytes .../blue_treeview_expand_collapse_13px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_16px.bmp | Bin 2186 -> 1674 bytes .../blue_treeview_expand_collapse_16px.svg | 14 ++++++++++---- .../blue_treeview_expand_collapse_18px.bmp | Bin 2730 -> 2154 bytes .../blue_treeview_expand_collapse_18px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_20px.bmp | Bin 3338 -> 2538 bytes .../blue_treeview_expand_collapse_20px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_23px.bmp | Bin 4370 -> 3450 bytes .../blue_treeview_expand_collapse_23px.svg | 14 +++++++++----- .../blue_treeview_expand_collapse_9px.bmp | Bin 786 -> 642 bytes .../blue_treeview_expand_collapse_9px.svg | 15 ++++++++++----- 14 files changed, 67 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6255d92a60fc63575510…

1 0

Zhiyi Zhang : light.msstyles: Fill radio button background with white pixels.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: aafad831a9e886e76d32154c1b83b66e0cb8dcc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aafad831a9e886e76d32154c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Feb 11 15:14:54 2022 +0800 light.msstyles: Fill radio button background with white pixels. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/blue_radiobutton_13px.bmp | Bin 5546 -> 5546 bytes dlls/light.msstyles/blue_radiobutton_13px.svg | 27 +++++++++++++------------- dlls/light.msstyles/blue_radiobutton_16px.bmp | Bin 8330 -> 8330 bytes dlls/light.msstyles/blue_radiobutton_16px.svg | 27 +++++++++++++------------- dlls/light.msstyles/blue_radiobutton_19px.bmp | Bin 11690 -> 11690 bytes dlls/light.msstyles/blue_radiobutton_19px.svg | 19 ++++++++++-------- dlls/light.msstyles/blue_radiobutton_22px.bmp | Bin 15626 -> 15626 bytes dlls/light.msstyles/blue_radiobutton_22px.svg | 17 +++++++++------- dlls/light.msstyles/blue_radiobutton_25px.bmp | Bin 20138 -> 20138 bytes dlls/light.msstyles/blue_radiobutton_25px.svg | 25 ++++++++++++------------ dlls/light.msstyles/blue_radiobutton_28px.bmp | Bin 25226 -> 25226 bytes dlls/light.msstyles/blue_radiobutton_28px.svg | 17 +++++++++------- dlls/light.msstyles/blue_radiobutton_31px.bmp | Bin 30890 -> 30890 bytes dlls/light.msstyles/blue_radiobutton_31px.svg | 17 +++++++++------- 14 files changed, 82 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aafad831a9e886e76d32…

1 0

Eric Pouech : kernelbase: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 2dcfe064420d2f401a95c363e704c81b8379a8bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dcfe064420d2f401a95c363… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:29 2022 +0100 kernelbase: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 2 +- dlls/kernelbase/console.c | 42 ++++++++--------- dlls/kernelbase/debug.c | 38 +++++++-------- dlls/kernelbase/file.c | 80 ++++++++++++++++---------------- dlls/kernelbase/loader.c | 28 +++++------ dlls/kernelbase/locale.c | 62 ++++++++++++------------- dlls/kernelbase/main.c | 12 ++--- dlls/kernelbase/memory.c | 28 +++++------ dlls/kernelbase/path.c | 78 +++++++++++++++---------------- dlls/kernelbase/process.c | 22 ++++----- dlls/kernelbase/registry.c | 110 ++++++++++++++++++++++---------------------- dlls/kernelbase/security.c | 52 ++++++++++----------- dlls/kernelbase/string.c | 14 +++--- dlls/kernelbase/sync.c | 26 +++++------ dlls/kernelbase/thread.c | 2 +- dlls/kernelbase/version.c | 42 ++++++++--------- dlls/kernelbase/volume.c | 18 ++++---- 17 files changed, 328 insertions(+), 328 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2dcfe064420d2f401a95…

1 0

Eric Pouech : l3codeca.acm: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 751c590d379031689ce8d73e675d6ed0c02b10d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=751c590d379031689ce8d73e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:41:47 2022 +0100 l3codeca.acm: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/l3codeca.acm/Makefile.in | 1 - dlls/l3codeca.acm/mpegl3.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in index 781dfb27ddd..451794b2624 100644 --- a/dlls/l3codeca.acm/Makefile.in +++ b/dlls/l3codeca.acm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = l3codeca.acm IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase EXTRAINCL = $(MPG123_PE_CFLAGS) diff --git a/dlls/l3codeca.acm/mpegl3.c b/dlls/l3codeca.acm/mpegl3.c index 336e706bb83..b5b0f8029e5 100644 --- a/dlls/l3codeca.acm/mpegl3.c +++ b/dlls/l3codeca.acm/mpegl3.c @@ -292,7 +292,7 @@ static LRESULT MPEG3_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -354,12 +354,12 @@ static LRESULT MPEG3_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) WARN("Encoding to MPEG is not supported\n"); return ACMERR_NOTPOSSIBLE; default: - WARN("Unsupported tag %08x\n", afd->dwFormatTag); + WARN("Unsupported tag %08lx\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -488,7 +488,7 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad } break; default: - WARN("Unsupported query %08x\n", adss->fdwSize); + WARN("Unsupported query %08lx\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -509,7 +509,7 @@ static LRESULT MPEG3_StreamConvert(ACMDRVSTREAMINSTANCE *instance, ACMDRVSTREAMH ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag @@ -536,7 +536,7 @@ static LRESULT MPEG3_StreamConvert(ACMDRVSTREAMINSTANCE *instance, ACMDRVSTREAMH LRESULT CALLBACK MPEG3_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lx %p %04x %08lx %08lx);\n", + TRACE("(%08Ix %p %04x %08Ix %08Ix);\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg)

1 0

Eric Pouech : imagehlp: Enable compilation with long types.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: 8b7beee065f19dcf1dac0c343cee0bd59d13ef85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7beee065f19dcf1dac0c34… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 11 08:40:11 2022 +0100 imagehlp: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/Makefile.in | 2 +- dlls/imagehlp/access.c | 6 +++--- dlls/imagehlp/integrity.c | 18 +++++++++--------- dlls/imagehlp/modify.c | 18 +++++++++--------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in index 555bc47f879..e8958d9fc62 100644 --- a/dlls/imagehlp/Makefile.in +++ b/dlls/imagehlp/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_IMAGEHLP_SOURCE_ +EXTRADEFS = -D_IMAGEHLP_SOURCE_ MODULE = imagehlp.dll IMPORTLIB = imagehlp IMPORTS = dbghelp diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 29315f172ab..f0b5814dead 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -153,7 +153,7 @@ BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoad NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) { - WARN("CreateFile: Error = %d\n", GetLastError()); + WARN("CreateFile: Error = %ld\n", GetLastError()); goto Error; } @@ -162,7 +162,7 @@ BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoad 0, 0, NULL); if (!hFileMapping) { - WARN("CreateFileMapping: Error = %d\n", GetLastError()); + WARN("CreateFileMapping: Error = %ld\n", GetLastError()); goto Error; } @@ -170,7 +170,7 @@ BOOL WINAPI MapAndLoad(PCSTR pszImageName, PCSTR pszDllPath, PLOADED_IMAGE pLoad CloseHandle(hFileMapping); if (!mapping) { - WARN("MapViewOfFile: Error = %d\n", GetLastError()); + WARN("MapViewOfFile: Error = %ld\n", GetLastError()); goto Error; } diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index d86ec11bd59..c2759c027f4 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -160,7 +160,7 @@ static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle, else return FALSE; - TRACE("ret = %d size = %x addr = %x\n", ret, sd->Size, sd->VirtualAddress); + TRACE("ret = %d size = %lx addr = %lx\n", ret, sd->Size, sd->VirtualAddress); *pdwSize = sd->Size; *pdwOfs = sd->VirtualAddress; @@ -208,7 +208,7 @@ static BOOL IMAGEHLP_SetSecurityDirOffset(HANDLE handle, sd->Size = dwSize; sd->VirtualAddress = dwOfs; - TRACE("size = %x addr = %x\n", sd->Size, sd->VirtualAddress); + TRACE("size = %lx addr = %lx\n", sd->Size, sd->VirtualAddress); /* write the header back again */ count = SetFilePointer(handle, pe_offset, NULL, FILE_BEGIN); @@ -282,7 +282,7 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num, *pdwOfs = sd_VirtualAddr + offset; *pdwSize = len; - TRACE("len = %x addr = %x\n", len, sd_VirtualAddr + offset); + TRACE("len = %lx addr = %lx\n", len, sd_VirtualAddr + offset); return TRUE; } @@ -492,7 +492,7 @@ BOOL WINAPI ImageEnumerateCertificates( const size_t cert_hdr_size = sizeof hdr - sizeof hdr.bCertificate; BOOL r; - TRACE("%p %hd %p %p %d\n", + TRACE("%p %hd %p %p %ld\n", handle, TypeFilter, CertificateCount, Indices, IndexCount); r = IMAGEHLP_GetSecurityDirOffset( handle, &sd_VirtualAddr, &size ); @@ -515,7 +515,7 @@ BOOL WINAPI ImageEnumerateCertificates( if( count != cert_hdr_size ) return FALSE; - TRACE("Size = %08x id = %08hx\n", + TRACE("Size = %08lx id = %08hx\n", hdr.dwLength, hdr.wCertificateType ); /* check the certificate is not too big or too small */ @@ -556,7 +556,7 @@ BOOL WINAPI ImageGetCertificateData( { DWORD r, offset, ofs, size, count; - TRACE("%p %d %p %p\n", handle, Index, Certificate, RequiredLength); + TRACE("%p %ld %p %p\n", handle, Index, Certificate, RequiredLength); if( !RequiredLength) { @@ -607,7 +607,7 @@ BOOL WINAPI ImageGetCertificateHeader( DWORD r, offset, ofs, size, count; const size_t cert_hdr_size = sizeof *pCert - sizeof pCert->bCertificate; - TRACE("%p %d %p\n", handle, index, pCert); + TRACE("%p %ld %p\n", handle, index, pCert); if( !IMAGEHLP_GetCertificateOffset( handle, index, &ofs, &size ) ) return FALSE; @@ -792,7 +792,7 @@ BOOL WINAPI ImageGetDigestStream( IMAGE_NT_HEADERS *nt_hdr; IMAGE_SECTION_HEADER *section_headers; - TRACE("(%p, %d, %p, %p)\n", FileHandle, DigestLevel, DigestFunction, + TRACE("(%p, %ld, %p, %p)\n", FileHandle, DigestLevel, DigestFunction, DigestHandle); /* Get the file size */ @@ -891,7 +891,7 @@ BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index) LPVOID cert_data; BOOL r; - TRACE("(%p, %d)\n", FileHandle, Index); + TRACE("(%p, %ld)\n", FileHandle, Index); r = ImageEnumerateCertificates(FileHandle, CERT_SECTION_TYPE_ANY, &count, NULL, 0); diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index d740d221bfc..aa93ee63365 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -51,13 +51,13 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path, LOADED_IMAGE image; ULONG size; - TRACE("flags %#x, module %s, dll_path %s, symbol_path %s, cb %p.\n", + TRACE("flags %#lx, module %s, dll_path %s, symbol_path %s, cb %p.\n", flags, debugstr_a(module), debugstr_a(dll_path), debugstr_a(symbol_path), cb); if (!(flags & BIND_NO_UPDATE)) FIXME("Image modification is not implemented.\n"); if (flags & ~BIND_NO_UPDATE) - FIXME("Ignoring flags %#x.\n", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!MapAndLoad(module, dll_path, &image, TRUE, TRUE)) return FALSE; @@ -84,7 +84,7 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path, if (!(dll_name = ImageRvaToVa(image.FileHeader, image.MappedAddress, import->Name, 0))) { - ERR("Failed to get VA for import name RVA %#x.\n", import->Name); + ERR("Failed to get VA for import name RVA %#lx.\n", import->Name); continue; } @@ -99,7 +99,7 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path, thunk_rva = import->OriginalFirstThunk ? import->OriginalFirstThunk : import->FirstThunk; if (!(thunk = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk_rva, 0))) { - ERR("Failed to get VA for import thunk RVA %#x.\n", thunk_rva); + ERR("Failed to get VA for import thunk RVA %#lx.\n", thunk_rva); continue; } @@ -117,7 +117,7 @@ BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path, if (!(name = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk->u1.AddressOfData, 0))) { - ERR("Failed to get VA for name RVA %#x.\n", thunk->u1.AddressOfData); + ERR("Failed to get VA for name RVA %#Ix.\n", thunk->u1.AddressOfData); continue; } @@ -168,7 +168,7 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( DWORD CalcSum; DWORD HdrSum; - TRACE("(%p, %d, %p, %p)\n", BaseAddress, FileLength, HeaderSum, CheckSum); + TRACE("(%p, %ld, %p, %p)\n", BaseAddress, FileLength, HeaderSum, CheckSum); CalcSum = CalcCheckSum(0, BaseAddress, (FileLength + 1) / sizeof(WORD)); header = RtlImageNtHeader(BaseAddress); @@ -349,7 +349,7 @@ BOOL WINAPI ReBaseImage( ULONG_PTR *NewImageBase, ULONG TimeStamp) { FIXME( - "(%s, %s, %d, %d, %d, %d, %p, %p, %p, %p, %d): stub\n", + "(%s, %s, %d, %d, %d, %ld, %p, %p, %p, %p, %ld): stub\n", debugstr_a(CurrentImageName),debugstr_a(SymbolPath), fReBase, fRebaseSysfileOk, fGoingDown, CheckImageSize, OldImageSize, OldImageBase, NewImageSize, NewImageBase, TimeStamp @@ -387,7 +387,7 @@ BOOL WINAPI SplitSymbols( PSTR ImageName, PCSTR SymbolsPath, PSTR SymbolFilePath, ULONG Flags) { - FIXME("(%s, %s, %s, %d): stub\n", + FIXME("(%s, %s, %s, %ld): stub\n", debugstr_a(ImageName), debugstr_a(SymbolsPath), debugstr_a(SymbolFilePath), Flags ); @@ -417,7 +417,7 @@ BOOL WINAPI UpdateDebugInfoFileEx( PCSTR ImageFileName, PCSTR SymbolPath, PSTR DebugFilePath, PIMAGE_NT_HEADERS32 NtHeaders, DWORD OldChecksum) { - FIXME("(%s, %s, %s, %p, %d): stub\n", + FIXME("(%s, %s, %s, %p, %ld): stub\n", debugstr_a(ImageFileName), debugstr_a(SymbolPath), debugstr_a(DebugFilePath), NtHeaders, OldChecksum );

1 0

Nikolay Sivov : mfreadwrite/reader: Stop media source when shutdown is not allowed.
by Alexandre Julliard Feb. 11, 2022

Feb. 11, 2022

Module: wine Branch: master Commit: a5770a0402c44586aa2913a7f2e411795f51e567 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5770a0402c44586aa2913a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 11 09:51:21 2022 +0300 mfreadwrite/reader: Stop media source when shutdown is not allowed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 0b6c6fa8583..13fcc4278cc 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -72,6 +72,7 @@ enum media_stream_flags STREAM_FLAG_SAMPLE_REQUESTED = 0x1, /* Protects from making multiple sample requests. */ STREAM_FLAG_SELECTED = 0x2, /* Mirrors descriptor, used to simplify tests when starting the source. */ STREAM_FLAG_PRESENTED = 0x4, /* Set if stream was selected last time Start() was called. */ + STREAM_FLAG_STOPPED = 0x8, /* Received MEStreamStopped */ }; struct stream_transform @@ -172,6 +173,7 @@ struct source_reader CRITICAL_SECTION cs; CONDITION_VARIABLE sample_event; CONDITION_VARIABLE state_event; + CONDITION_VARIABLE stop_event; }; static inline struct source_reader *impl_from_IMFSourceReader(IMFSourceReader *iface) @@ -585,6 +587,8 @@ static HRESULT source_reader_source_state_handler(struct source_reader *reader, LeaveCriticalSection(&reader->cs); WakeAllConditionVariable(&reader->state_event); + if (event_type == MESourceStopped) + WakeAllConditionVariable(&reader->stop_event); return S_OK; } @@ -640,7 +644,8 @@ static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallba IMFMediaEvent_Release(event); - IMFMediaSource_BeginGetEvent(source, iface, (IUnknown *)source); + if (event_type != MESourceStopped) + IMFMediaSource_BeginGetEvent(source, iface, (IUnknown *)source); return S_OK; } @@ -856,6 +861,9 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re case MEStreamStarted: stream->state = STREAM_STATE_READY; break; + case MEStreamStopped: + stream->flags |= STREAM_FLAG_STOPPED; + break; case MEStreamTick: value.vt = VT_EMPTY; hr = SUCCEEDED(IMFMediaEvent_GetValue(event, &value)) && value.vt == VT_I8 ? S_OK : E_UNEXPECTED; @@ -875,6 +883,9 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re LeaveCriticalSection(&reader->cs); + if (event_type == MEStreamStopped) + WakeAllConditionVariable(&reader->stop_event); + return S_OK; } @@ -904,6 +915,7 @@ static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallba break; case MEStreamSeeked: case MEStreamStarted: + case MEStreamStopped: case MEStreamTick: case MEEndOfStream: hr = source_reader_media_stream_state_handler(reader, stream, event); @@ -917,7 +929,8 @@ static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallba IMFMediaEvent_Release(event); - IMFMediaStream_BeginGetEvent(stream, iface, (IUnknown *)stream); + if (event_type != MEStreamStopped) + IMFMediaStream_BeginGetEvent(stream, iface, (IUnknown *)stream); return S_OK; } @@ -1379,6 +1392,22 @@ static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) return refcount; } +static BOOL source_reader_is_source_stopped(const struct source_reader *reader) +{ + unsigned int i; + + if (reader->source_state != SOURCE_STATE_STOPPED) + return FALSE; + + for (i = 0; i < reader->stream_count; ++i) + { + if (reader->streams[i].stream && !(reader->streams[i].flags & STREAM_FLAG_STOPPED)) + return FALSE; + } + + return TRUE; +} + static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); @@ -1390,6 +1419,17 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { if (reader->flags & SOURCE_READER_SHUTDOWN_ON_RELEASE) IMFMediaSource_Shutdown(reader->source); + else if (SUCCEEDED(IMFMediaSource_Stop(reader->source))) + { + EnterCriticalSection(&reader->cs); + + while (!source_reader_is_source_stopped(reader)) + { + SleepConditionVariableCS(&reader->stop_event, &reader->cs, INFINITE); + } + + LeaveCriticalSection(&reader->cs); + } source_reader_release(reader); } @@ -2298,6 +2338,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri InitializeCriticalSection(&object->cs); InitializeConditionVariable(&object->sample_event); InitializeConditionVariable(&object->state_event); + InitializeConditionVariable(&object->stop_event); if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) goto failed;

1 0