wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Alex Henrie : d3dcompiler_43/tests: Avoid using GCC's typeof extension.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: 451e4d326e595e246362505d7abeb4a84aca9c5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=451e4d326e595e246362505d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 19 22:43:13 2018 -0600 d3dcompiler_43/tests: Avoid using GCC's typeof extension. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/blob.c | 6 +++--- dlls/d3dcompiler_43/tests/reflection.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index cc629fa..443ed27 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -33,9 +33,9 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -static typeof(D3DCreateBlob) *pD3DCreateBlob; -static typeof(D3DGetBlobPart) *pD3DGetBlobPart; -static typeof(D3DStripShader) *pD3DStripShader; +static HRESULT (WINAPI *pD3DCreateBlob)(SIZE_T, ID3DBlob **); +static HRESULT (WINAPI *pD3DGetBlobPart)(const void *, SIZE_T, D3D_BLOB_PART, UINT, ID3DBlob **); +static HRESULT (WINAPI *pD3DStripShader)(const void *, SIZE_T, UINT, ID3DBlob **); #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 5a85159..2c1c902 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -38,7 +38,7 @@ */ #define D3DERR_INVALIDCALL 0x8876086c -static typeof(D3DReflect) *pD3DReflect; +static HRESULT (WINAPI *pD3DReflect)(const void *, SIZE_T, REFIID, void **); /* Creator string for comparison - Version 9.29.952.3111 (43) */ static DWORD shader_creator[] = {

1 0

Andrew Wesie : wined3d: Add fast-path for texture download blit.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: 54a9e84952ce8f566f79ab92930faf84bad0cfc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a9e84952ce8f566f79ab92… Author: Andrew Wesie <awesie(a)gmail.com> Date: Thu Oct 4 01:16:44 2018 -0500 wined3d: Add fast-path for texture download blit. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 28 +++++++++++++++++++++++++--- dlls/wined3d/texture.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4942177..71693ad 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3257,6 +3257,29 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ return WINED3D_OK; } } + else if (!(src_sub_resource->locations & surface_simple_locations) + && (dst_sub_resource->locations & dst_texture->resource.map_binding)) + { + /* Download */ + if (scale) + TRACE("Not doing download because of scaling.\n"); + else if (convert) + TRACE("Not doing download because of format conversion.\n"); + else if (src_texture->resource.format->conv_byte_count) + TRACE("Not doing download because the source format needs conversion.\n"); + else if (is_multisample_location(src_texture, WINED3D_LOCATION_TEXTURE_RGB)) + TRACE("Not doing download because of multisample source.\n"); + else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) + TRACE("Not doing download because of partial download (src).\n"); + else if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) + TRACE("Not doing download because of partial download (dst).\n"); + else + { + wined3d_texture_download_from_texture(dst_texture, dst_sub_resource_idx, src_texture, + src_sub_resource_idx); + return WINED3D_OK; + } + } else if (dst_swapchain && dst_swapchain->back_buffers && dst_texture == dst_swapchain->front_buffer && src_texture == dst_swapchain->back_buffers[0]) @@ -3280,10 +3303,9 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ return WINED3D_OK; } - else if ((flags & WINED3D_BLT_RAW) || (!scale && !convert && !resolve)) - { + + if ((flags & WINED3D_BLT_RAW) || (blit_op == WINED3D_BLIT_OP_COLOR_BLIT && !scale && !convert && !resolve)) blit_op = WINED3D_BLIT_OP_RAW_BLIT; - } if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0b11c94..400d367 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3806,3 +3806,25 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } + +/* Partial downloads are not supported. */ +void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) +{ + struct wined3d_context *context; + struct wined3d_bo_address data; + DWORD dst_location = dst_texture->resource.map_binding; + + context = context_acquire(src_texture->resource.device, NULL, 0); + + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); + wined3d_texture_bind_and_dirtify(src_texture, context, + !(src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB)); + wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, &data); + + context_release(context); + + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, dst_location); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~dst_location); +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fadb607..9baefa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3349,6 +3349,8 @@ HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *textu unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; +void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : devenum: Zero-initialize REGFILTERPINS struct.
by Alexandre Julliard 04 Oct '18

04 Oct '18

Module: wine Branch: master Commit: cea76150385b0d3e380fdd4e0d6ab8042bb48989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cea76150385b0d3e380fdd4e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 3 22:41:02 2018 -0500 devenum: Zero-initialize REGFILTERPINS struct. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45923 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index e44e6ec..8a3160c 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -778,7 +778,7 @@ static void register_avicap_devices(void) WCHAR friendlyname[] = {'v','i','d','e','o','0',0}; IPropertyBag *prop_bag = NULL; WCHAR name[32], version[32]; - REGFILTERPINS2 rgpins; + REGFILTERPINS2 rgpins = {0}; REGPINTYPES rgtypes; REGFILTER2 rgf; VARIANT var;

1 0

Serge Gautherie : credui: Use SecureZeroMemory().
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: adf451279837743a3b19787eb1e1b9c2b239bcd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adf451279837743a3b19787e… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Oct 3 00:21:54 2018 +0200 credui: Use SecureZeroMemory(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index bf9f7d1..1b9c71b 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -89,7 +89,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HeapFree(GetProcessHeap(), 0, entry->pszTargetName); HeapFree(GetProcessHeap(), 0, entry->pszUsername); - ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(entry->pszPassword, strlenW(entry->pszPassword) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); HeapFree(GetProcessHeap(), 0, entry); } @@ -673,7 +673,7 @@ DWORD WINAPI CredUIPromptForCredentialsW(PCREDUI_INFOW pUIInfo, { found = TRUE; HeapFree(GetProcessHeap(), 0, entry->pszUsername); - ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(entry->pszPassword, strlenW(entry->pszPassword) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); } @@ -733,7 +733,7 @@ DWORD WINAPI CredUIConfirmCredentialsW(PCWSTR pszTargetName, BOOL bConfirm) HeapFree(GetProcessHeap(), 0, entry->pszTargetName); HeapFree(GetProcessHeap(), 0, entry->pszUsername); - ZeroMemory(entry->pszPassword, (strlenW(entry->pszPassword) + 1) * sizeof(WCHAR)); + SecureZeroMemory(entry->pszPassword, strlenW(entry->pszPassword) * sizeof(WCHAR)); HeapFree(GetProcessHeap(), 0, entry->pszPassword); HeapFree(GetProcessHeap(), 0, entry);

1 0

Jacek Caban : mshtml: Use set_document_mode in process_document_response_headers.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 89f5a9df39d7310823e60d45f33140f35d7d0fa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89f5a9df39d7310823e60d45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 19:20:19 2018 +0200 mshtml: Use set_document_mode in process_document_response_headers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 6508270..dd46dd8 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -461,7 +461,7 @@ void process_document_response_headers(HTMLDocumentNode *doc, IBinding *binding) header = heap_strdupAtoW(buf); if(header && parse_ua_compatible(header, &document_mode)) { TRACE("setting document mode %d\n", document_mode); - doc->document_mode = document_mode; + set_document_mode(doc, document_mode, FALSE); } heap_free(header); }

1 0

Louis Lenders : ucrtbase: Add version resource.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 1622abbb081c1afe052d16769898976e90f98062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1622abbb081c1afe052d1676… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Oct 3 19:35:33 2018 +0200 ucrtbase: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45928 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/Makefile.in | 2 ++ dlls/ucrtbase/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index d44b17a..23d8292 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -33,3 +33,5 @@ C_SRCS = \ time.c \ undname.c \ wcs.c + +RC_SRCS = version.rc diff --git a/dlls/ucrtbase/version.rc b/dlls/ucrtbase/version.rc new file mode 100644 index 0000000..f034bc3 --- /dev/null +++ b/dlls/ucrtbase/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2018 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine runtime library" +#define WINE_FILENAME_STR "ucrtbase.dll" +#define WINE_FILEVERSION 10,0,14393,2247 +#define WINE_FILEVERSION_STR "10.0.14393.2247" +#define WINE_PRODUCTVERSION 10,0,14393,2247 +#define WINE_PRODUCTVERSION_STR "10.0.14393.2247" + +#include "wine/wine_common_ver.rc"

1 0

Piotr Caban : mshtml: Support retrieving command output in Exec( OLECMDID_OPTICAL_ZOOM).
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 29674a2c34816058eab367519d7a9768cfe3dd72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29674a2c34816058eab36751… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 3 21:43:44 2018 +0200 mshtml: Support retrieving command output in Exec(OLECMDID_OPTICAL_ZOOM). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 23 +++++++++++++++++++++++ dlls/mshtml/olecmd.c | 9 +++++++-- dlls/mshtml/tests/htmldoc.c | 17 +++++++++++++++-- 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d551693..ddc8df5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -928,6 +928,7 @@ void init_nsio(nsIComponentManager*) DECLSPEC_HIDDEN; void release_nsio(void) DECLSPEC_HIDDEN; BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN; void set_viewer_zoom(NSContainer*,float) DECLSPEC_HIDDEN; +float get_viewer_zoom(NSContainer*) DECLSPEC_HIDDEN; void init_node_cc(void) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6aae9c2..9acb0d2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1191,6 +1191,29 @@ void set_viewer_zoom(NSContainer *nscontainer, float factor) nsIContentViewer_Release(content_viewer); } +float get_viewer_zoom(NSContainer *nscontainer) +{ + nsIContentViewer *content_viewer; + nsIDocShell *doc_shell; + nsresult nsres; + float factor; + + nsres = get_nsinterface((nsISupports*)nscontainer->navigation, &IID_nsIDocShell, (void**)&doc_shell); + assert(nsres == NS_OK); + + nsres = nsIDocShell_GetContentViewer(doc_shell, &content_viewer); + assert(nsres == NS_OK && content_viewer); + nsIDocShell_Release(doc_shell); + + nsres = nsIContentViewer_GetFullZoom(content_viewer, &factor); + if(NS_FAILED(nsres)) + ERR("GetFullZoom failed: %08x\n", nsres); + TRACE("Got %f\n", factor); + + nsIContentViewer_Release(content_viewer); + return factor; +} + struct nsWeakReference { nsIWeakReference nsIWeakReference_iface; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index e5fc474..2baf715 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -558,12 +558,17 @@ static HRESULT exec_optical_zoom(HTMLDocument *This, DWORD nCmdexecopt, VARIANT { TRACE("(%p)->(%d %s %p)\n", This, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); - if(!pvaIn || V_VT(pvaIn) != VT_I4) { + if(pvaIn && V_VT(pvaIn) != VT_I4) { FIXME("Unsupported argument %s\n", debugstr_variant(pvaIn)); return E_NOTIMPL; } - set_viewer_zoom(This->doc_obj->nscontainer, (float)V_I4(pvaIn)/100); + if(pvaIn) + set_viewer_zoom(This->doc_obj->nscontainer, (float)V_I4(pvaIn)/100); + if(pvaOut) { + V_VT(pvaOut) = VT_I4; + V_I4(pvaOut) = get_viewer_zoom(This->doc_obj->nscontainer)*100; + } return S_OK; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 3729fc3..25cdf80 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6702,7 +6702,7 @@ static void test_exec_noargs(IUnknown *unk, DWORD cmdid) static void test_exec_optical_zoom(IHTMLDocument2 *doc, int factor) { IOleCommandTarget *cmdtrg; - VARIANT v; + VARIANT v, out; HRESULT hres; hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleCommandTarget, (void**)&cmdtrg); @@ -6715,10 +6715,23 @@ static void test_exec_optical_zoom(IHTMLDocument2 *doc, int factor) SET_EXPECT(GetOverrideKeyPath); hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_OPTICAL_ZOOM, - OLECMDEXECOPT_DODEFAULT, &v, NULL); + OLECMDEXECOPT_DODEFAULT, &v, &out); ok(hres == S_OK || broken(hres == OLECMDERR_E_NOTSUPPORTED) /* IE6 */, "Exec failed: %08x\n", hres); CLEAR_CALLED(GetOverrideKeyPath); + if(hres != OLECMDERR_E_NOTSUPPORTED) { + ok(V_VT(&out) == VT_I4, "V_VT(&out) = %d\n", V_VT(&out)); + ok(V_I4(&out) == factor, "V_I4(&out) = %d, expected %d\n", V_I4(&out), factor); + + SET_EXPECT(GetOverrideKeyPath); + hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_OPTICAL_ZOOM, + OLECMDEXECOPT_DODEFAULT, NULL, &out); + ok(hres == S_OK, "Exec failed: %08x\n", hres); + ok(V_VT(&out) == VT_I4, "V_VT(&out) = %d\n", V_VT(&out)); + ok(V_I4(&out) == factor, "V_I4(&out) = %d, expected %d\n", V_I4(&out), factor); + CLEAR_CALLED(GetOverrideKeyPath); + } + IOleCommandTarget_Release(cmdtrg); test_QueryStatus((IUnknown*)doc, NULL, OLECMDID_OPTICAL_ZOOM, 0);

1 0

Andrew Wesie : wined3d: Unify the texture download functions.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: 843ccd2d5be80db996c98cdd6f75da6dca71d835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=843ccd2d5be80db996c98cdd… Author: Andrew Wesie <awesie(a)gmail.com> Date: Wed Oct 3 21:34:20 2018 +0330 wined3d: Unify the texture download functions. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 233 +------------------------- dlls/wined3d/texture.c | 363 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 299 insertions(+), 299 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=843ccd2d5be80db996c9…

1 0

Piotr Caban : msvcp140: Added _Winerror_message implementation.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: c69eba9278597935a3a3eb75071a40e7a63fd7aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c69eba9278597935a3a3eb75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 3 18:49:43 2018 +0200 msvcp140: Added _Winerror_message implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp140/tests/msvcp140.c | 23 +++++++++++++++++++++++ dlls/msvcp90/misc.c | 12 ++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 29d0e19..296d06c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1670,8 +1670,8 @@ @ stub -arch=i386 ?_W_Gettnames@_Locinfo@std@@QBE?AV_Timevec@2@XZ @ stub -arch=win64 ?_W_Gettnames@_Locinfo@std@@QEBA?AV_Timevec@2@XZ @ stub ?_Winerror_map@std@@YAHH@Z -@ stub -arch=win32 ?_Winerror_message@std@@YAKKPADK@Z -@ stub -arch=win64 ?_Winerror_message@std@@YAKKPEADK@Z +@ cdecl -arch=win32 ?_Winerror_message@std@@YAKKPADK@Z(long ptr long) _Winerror_message +@ cdecl -arch=win64 ?_Winerror_message@std@@YAKKPEADK@Z(long ptr long) _Winerror_message @ stub ?_XGetLastError@std@@YAXXZ @ stub ?_XLgamma@std@@YAMM@Z @ stub ?_XLgamma@std@@YANN@Z diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 03350d3..a3f9211 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -191,6 +191,7 @@ static WCHAR* (__cdecl *p_Temp_get)(WCHAR *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); +static ULONG (__cdecl *p__Winerror_message)(ULONG, char*, ULONG); static BOOLEAN (WINAPI *pCreateSymbolicLinkW)(const WCHAR *, const WCHAR *, DWORD); @@ -227,6 +228,7 @@ static BOOL init(void) SET(p__Schedule_chore, "?_Schedule_chore@details@Concurrency@@YAHPEAU_Threadpool_chore@12@@Z"); SET(p__Reschedule_chore, "?_Reschedule_chore@details@Concurrency@@YAHPEBU_Threadpool_chore@12@@Z"); SET(p__Release_chore, "?_Release_chore@details@Concurrency@@YAXPEAU_Threadpool_chore@12@@Z"); + SET(p__Winerror_message, "?_Winerror_message@std@@YAKKPEADK@Z"); } else { #ifdef __arm__ SET(p_task_continuation_context_ctor, "??0task_continuation_context@Concurrency@@AAA@XZ"); @@ -256,6 +258,7 @@ static BOOL init(void) SET(p__Schedule_chore, "?_Schedule_chore@details@Concurrency@@YAHPAU_Threadpool_chore@12@@Z"); SET(p__Reschedule_chore, "?_Reschedule_chore@details@Concurrency@@YAHPBU_Threadpool_chore@12@@Z"); SET(p__Release_chore, "?_Release_chore@details@Concurrency@@YAXPAU_Threadpool_chore@12@@Z"); + SET(p__Winerror_message, "?_Winerror_message@std@@YAKKPADK@Z"); } SET(p_Close_dir, "_Close_dir"); @@ -1281,6 +1284,25 @@ static void test_Last_write_time(void) ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } +static void test__Winerror_message(void) +{ + char buf[256], buf_fm[256]; + ULONG ret, ret_fm; + + ret_fm = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, 0, 0, buf_fm, sizeof(buf_fm), NULL); + + memset(buf, 'a', sizeof(buf)); + ret = p__Winerror_message(0, buf, sizeof(buf)); + ok(ret == ret_fm, "ret = %u, expected %u\n", ret, ret_fm); + ok(!strcmp(buf, buf_fm), "buf = %s, expected %s\n", buf, buf_fm); + + memset(buf, 'a', sizeof(buf)); + ret = p__Winerror_message(0, buf, 2); + ok(!ret, "ret = %u\n", ret); + ok(buf[0] == 'a', "buf = %s\n", buf); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1302,5 +1324,6 @@ START_TEST(msvcp140) test_Temp_get(); test_Rename(); test_Last_write_time(); + test__Winerror_message(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ef02129..ae7a129 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2790,3 +2790,15 @@ const char* __cdecl _Syserror_map(int err) return NULL; } #endif + +#if _MSVCP_VER >= 140 +/* ?_Winerror_message@std@@YAKKPADK@Z */ +/* ?_Winerror_message@std@@YAKKPEADK@Z */ +ULONG __cdecl _Winerror_message(ULONG err, char *buf, ULONG size) +{ + TRACE("(%u %p %u)\n", err, buf, size); + + return FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, err, 0, buf, size, NULL); +} +#endif

1 0

Piotr Caban : msvcr100: Added _Scoped_lock::_NonReentrantPPLLock class.
by Alexandre Julliard 03 Oct '18

03 Oct '18

Module: wine Branch: master Commit: c3445197b2575556e0bb789198b8abf45f3573cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3445197b2575556e0bb7891… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 3 17:23:50 2018 +0200 msvcr100: Added _Scoped_lock::_NonReentrantPPLLock class. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ dlls/msvcrt/lock.c | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3445197b2575556e0bb…

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018