November 2020 - Wine-Devel - list.winehq.org

[PATCH 1/5] wined3d: Introduce wined3d_context_gl_destroy_bo().
by Henri Verbeet Nov. 30, 2020

Nov. 30, 2020

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/buffer.c | 5 +---- dlls/wined3d/context_gl.c | 12 ++++++++++++ dlls/wined3d/texture.c | 14 +++++--------- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 140948beb6d..cb382cd6734 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4778,7 +4778,7 @@ static void wined3d_view_gl_destroy_object(void *object) gl_info->gl_ops.gl.p_glDeleteTextures(1, &ctx->gl_view->name); } if (counter_id) - GL_EXTCALL(glDeleteBuffers(1, &counter_id)); + wined3d_context_gl_destroy_bo(wined3d_context_gl(context), ctx->counter_bo); checkGLcall("delete resources"); context_release(context); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f2817eeee04..2b24e071c05 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -142,7 +142,6 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_resource *resource = &buffer_gl->b.resource; struct wined3d_buffer *buffer = &buffer_gl->b; struct wined3d_cs *cs = resource->device->cs; @@ -185,10 +184,8 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu } } - GL_EXTCALL(glDeleteBuffers(1, &buffer_gl->bo.id)); - checkGLcall("glDeleteBuffers"); + wined3d_context_gl_destroy_bo(context_gl, &buffer_gl->bo); buffer_gl->b.buffer_object = 0; - buffer_gl->bo.id = 0; if (buffer_gl->b.fence) { diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f2b5e8697b6..3a5718e6308 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2681,6 +2681,18 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, } } +void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) +{ + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + + TRACE("context_gl %p, bo %p.\n", context_gl, bo); + + TRACE("Destroying GL buffer %u.\n", bo->id); + GL_EXTCALL(glDeleteBuffers(1, &bo->id)); + checkGLcall("buffer object destruction"); + bo->id = 0; +} + static void wined3d_context_gl_set_render_offscreen(struct wined3d_context_gl *context_gl, BOOL offscreen) { if (context_gl->c.render_offscreen == offscreen) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 41e4415f13f..0aef891547a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -751,18 +751,14 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su /* Context activation is done by the caller. */ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, - unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) + unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl) { struct wined3d_bo_gl *bo = &texture->sub_resources[sub_resource_idx].bo; - GL_EXTCALL(glDeleteBuffers(1, &bo->id)); - checkGLcall("glDeleteBuffers"); - - TRACE("Deleted buffer object %u for texture %p, sub-resource %u.\n", - bo->id, texture, sub_resource_idx); + TRACE("texture %p, sub_resource_idx %u, context_gl %p.\n", texture, sub_resource_idx, context_gl); + wined3d_context_gl_destroy_bo(context_gl, bo); wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); - bo->id = 0; } static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) @@ -781,7 +777,7 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) && !wined3d_texture_load_location(texture, i, context, map_binding)) ERR("Failed to load location %s.\n", wined3d_debug_location(map_binding)); if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER) - wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)->gl_info); + wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)); } context_release(context); @@ -3223,7 +3219,7 @@ static void wined3d_texture_gl_unload_location(struct wined3d_texture *texture, for (i = 0; i < sub_count; ++i) { if (texture_gl->t.sub_resources[i].bo.id) - wined3d_texture_remove_buffer_object(&texture_gl->t, i, context_gl->gl_info); + wined3d_texture_remove_buffer_object(&texture_gl->t, i, context_gl); } break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15380f5ac81..fa718501e45 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2256,6 +2256,7 @@ void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *contex void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -- 2.20.1

2 1

[PATCH] urlmon: Use wide-char string literals in struct initialization.
by Michael Stefaniuc Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Jacek, dlls/urlmon/mimefilter.c: text_plainW and app_octetstreamW cannot be inlined as there are 6 or so pointer comparisons for those in find_mime_from_buffer() Of course those can be changed to wcscmp() calls but it is simpler for me to keep them as is. dlls/urlmon/http.c | 9 ++- dlls/urlmon/internet.c | 119 +++++++++----------------------------- dlls/urlmon/mimefilter.c | 74 +++++++++--------------- dlls/urlmon/uri.c | 58 +++++++++---------- dlls/urlmon/urlmon_main.c | 19 ++---- 5 files changed, 93 insertions(+), 186 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 3663443a0a4..cf7a0b78231 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -304,9 +304,9 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques HRESULT hres; static const WCHAR wszBindVerb[BINDVERB_CUSTOM][5] = - {{'G','E','T',0}, - {'P','O','S','T',0}, - {'P','U','T',0}}; + {L"GET", + L"POST", + L"PUT"}; hres = IUri_GetPort(uri, &port); if(FAILED(hres)) @@ -345,8 +345,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques num = ARRAY_SIZE(accept_mimes) - 1; hres = IInternetBindInfo_GetBindString(bind_info, BINDSTRING_ACCEPT_MIMES, accept_mimes, num, &num); if(hres == INET_E_USE_DEFAULT_SETTING) { - static const WCHAR default_accept_mimeW[] = {'*','/','*',0}; - static const WCHAR *default_accept_mimes[] = {default_accept_mimeW, NULL}; + static const WCHAR *default_accept_mimes[] = {L"*/*", NULL}; accept_types = default_accept_mimes; num = 0; diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 7356fc8978d..ed95c069e22 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -32,69 +32,6 @@ static const WCHAR feature_control_keyW[] = 'M','a','i','n','\\', 'F','e','a','t','u','r','e','C','o','n','t','r','o','l',0}; -static const WCHAR feature_object_cachingW[] = - {'F','E','A','T','U','R','E','_','O','B','J','E','C','T','_','C','A','C','H','I','N','G',0}; -static const WCHAR feature_zone_elevationW[] = - {'F','E','A','T','U','R','E','_','Z','O','N','E','_','E','L','E','V','A','T','I','O','N',0}; -static const WCHAR feature_mime_handlingW[] = - {'F','E','A','T','U','R','E','_','M','I','M','E','_','H','A','N','D','L','I','N','G',0}; -static const WCHAR feature_mime_sniffingW[] = - {'F','E','A','T','U','R','E','_','M','I','M','E','_','S','N','I','F','F','I','N','G',0}; -static const WCHAR feature_window_restrictionsW[] = - {'F','E','A','T','U','R','E','_','W','I','N','D','O','W','_','R','E','S','T','R','I','C','T','I','O','N','S',0}; -static const WCHAR feature_weboc_popupmanagementW[] = - {'F','E','A','T','U','R','E','_','W','E','B','O','C','_','P','O','P','U','P','M','A','N','A','G','E','M','E','N','T',0}; -static const WCHAR feature_behaviorsW[] = - {'F','E','A','T','U','R','E','_','B','E','H','A','V','I','O','R','S',0}; -static const WCHAR feature_disable_mk_protocolW[] = - {'F','E','A','T','U','R','E','_','D','I','S','A','B','L','E','_','M','K','_','P','R','O','T','O','C','O','L',0}; -static const WCHAR feature_localmachine_lockdownW[] = - {'F','E','A','T','U','R','E','_','L','O','C','A','L','M','A','C','H','I','N','E','_','L','O','C','K','D','O','W','N',0}; -static const WCHAR feature_securitybandW[] = - {'F','E','A','T','U','R','E','_','S','E','C','U','R','I','T','Y','B','A','N','D',0}; -static const WCHAR feature_restrict_activexinstallW[] = - {'F','E','A','T','U','R','E','_','R','E','S','T','R','I','C','T','_','A','C','T','I','V','E','X','I','N','S','T','A','L','L',0}; -static const WCHAR feature_validate_navigate_urlW[] = - {'F','E','A','T','U','R','E','_','V','A','L','I','D','A','T','E','_','N','A','V','I','G','A','T','E','_','U','R','L',0}; -static const WCHAR feature_restrict_filedownloadW[] = - {'F','E','A','T','U','R','E','_','R','E','S','T','R','I','C','T','_','F','I','L','E','D','O','W','N','L','O','A','D',0}; -static const WCHAR feature_addon_managementW[] = - {'F','E','A','T','U','R','E','_','A','D','D','O','N','_','M','A','N','A','G','E','M','E','N','T',0}; -static const WCHAR feature_protocol_lockdownW[] = - {'F','E','A','T','U','R','E','_','P','R','O','T','O','C','O','L','_','L','O','C','K','D','O','W','N',0}; -static const WCHAR feature_http_username_password_disableW[] = - {'F','E','A','T','U','R','E','_','H','T','T','P','_','U','S','E','R','N','A','M','E','_', - 'P','A','S','S','W','O','R','D','_','D','I','S','A','B','L','E',0}; -static const WCHAR feature_safe_bindtoobjectW[] = - {'F','E','A','T','U','R','E','_','S','A','F','E','_','B','I','N','D','T','O','O','B','J','E','C','T',0}; -static const WCHAR feature_unc_savedfilecheckW[] = - {'F','E','A','T','U','R','E','_','U','N','C','_','S','A','V','E','D','F','I','L','E','C','H','E','C','K',0}; -static const WCHAR feature_get_url_dom_filepath_unencodedW[] = - {'F','E','A','T','U','R','E','_','G','E','T','_','U','R','L','_','D','O','M','_', - 'F','I','L','E','P','A','T','H','_','U','N','E','N','C','O','D','E','D',0}; -static const WCHAR feature_tabbed_browsingW[] = - {'F','E','A','T','U','R','E','_','T','A','B','B','E','D','_','B','R','O','W','S','I','N','G',0}; -static const WCHAR feature_ssluxW[] = - {'F','E','A','T','U','R','E','_','S','S','L','U','X',0}; -static const WCHAR feature_disable_navigation_soundsW[] = - {'F','E','A','T','U','R','E','_','D','I','S','A','B','L','E','_','N','A','V','I','G','A','T','I','O','N','_', - 'S','O','U','N','D','S',0}; -static const WCHAR feature_disable_legacy_compressionW[] = - {'F','E','A','T','U','R','E','_','D','I','S','A','B','L','E','_','L','E','G','A','C','Y','_', - 'C','O','M','P','R','E','S','S','I','O','N',0}; -static const WCHAR feature_force_addr_and_statusW[] = - {'F','E','A','T','U','R','E','_','F','O','R','C','E','_','A','D','D','R','_','A','N','D','_', - 'S','T','A','T','U','S',0}; -static const WCHAR feature_xmlhttpW[] = - {'F','E','A','T','U','R','E','_','X','M','L','H','T','T','P',0}; -static const WCHAR feature_disable_telnet_protocolW[] = - {'F','E','A','T','U','R','E','_','D','I','S','A','B','L','E','_','T','E','L','N','E','T','_', - 'P','R','O','T','O','C','O','L',0}; -static const WCHAR feature_feedsW[] = - {'F','E','A','T','U','R','E','_','F','E','E','D','S',0}; -static const WCHAR feature_block_input_promptsW[] = - {'F','E','A','T','U','R','E','_','B','L','O','C','K','_','I','N','P','U','T','_','P','R','O','M','P','T','S',0}; - static CRITICAL_SECTION process_features_cs; static CRITICAL_SECTION_DEBUG process_features_cs_dbg = { @@ -116,34 +53,34 @@ typedef struct feature_control { * appear in the same order as it does in INTERNETFEATURELIST. */ static feature_control process_feature_controls[FEATURE_ENTRY_COUNT] = { - {feature_object_cachingW, TRUE ,TRUE}, - {feature_zone_elevationW, FALSE,TRUE}, - {feature_mime_handlingW, FALSE,TRUE}, - {feature_mime_sniffingW, FALSE,TRUE}, - {feature_window_restrictionsW, FALSE,TRUE}, - {feature_weboc_popupmanagementW, FALSE,TRUE}, - {feature_behaviorsW, TRUE ,TRUE}, - {feature_disable_mk_protocolW, TRUE ,TRUE}, - {feature_localmachine_lockdownW, FALSE,TRUE}, - {feature_securitybandW, FALSE,TRUE}, - {feature_restrict_activexinstallW, FALSE,TRUE}, - {feature_validate_navigate_urlW, FALSE,TRUE}, - {feature_restrict_filedownloadW, FALSE,TRUE}, - {feature_addon_managementW, FALSE,TRUE}, - {feature_protocol_lockdownW, FALSE,TRUE}, - {feature_http_username_password_disableW, FALSE,TRUE}, - {feature_safe_bindtoobjectW, FALSE,TRUE}, - {feature_unc_savedfilecheckW, FALSE,TRUE}, - {feature_get_url_dom_filepath_unencodedW, TRUE ,TRUE}, - {feature_tabbed_browsingW, FALSE,TRUE}, - {feature_ssluxW, FALSE,TRUE}, - {feature_disable_navigation_soundsW, FALSE,TRUE}, - {feature_disable_legacy_compressionW, TRUE ,TRUE}, - {feature_force_addr_and_statusW, FALSE,TRUE}, - {feature_xmlhttpW, TRUE ,TRUE}, - {feature_disable_telnet_protocolW, FALSE,TRUE}, - {feature_feedsW, FALSE,TRUE}, - {feature_block_input_promptsW, FALSE,TRUE} + {L"FEATURE_OBJECT_CACHING", TRUE ,TRUE}, + {L"FEATURE_ZONE_ELEVATION", FALSE,TRUE}, + {L"FEATURE_MIME_HANDLING", FALSE,TRUE}, + {L"FEATURE_MIME_SNIFFING", FALSE,TRUE}, + {L"FEATURE_WINDOW_RESTRICTIONS", FALSE,TRUE}, + {L"FEATURE_WEBOC_POPUPMANAGEMENT", FALSE,TRUE}, + {L"FEATURE_BEHAVIORS", TRUE ,TRUE}, + {L"FEATURE_DISABLE_MK_PROTOCOL", TRUE ,TRUE}, + {L"FEATURE_LOCALMACHINE_LOCKDOWN", FALSE,TRUE}, + {L"FEATURE_SECURITYBAND", FALSE,TRUE}, + {L"FEATURE_RESTRICT_ACTIVEXINSTALL", FALSE,TRUE}, + {L"FEATURE_VALIDATE_NAVIGATE_URL", FALSE,TRUE}, + {L"FEATURE_RESTRICT_FILEDOWNLOAD", FALSE,TRUE}, + {L"FEATURE_ADDON_MANAGEMENT", FALSE,TRUE}, + {L"FEATURE_PROTOCOL_LOCKDOWN", FALSE,TRUE}, + {L"FEATURE_HTTP_USERNAME_PASSWORD_DISABLE", FALSE,TRUE}, + {L"FEATURE_SAFE_BINDTOOBJECT", FALSE,TRUE}, + {L"FEATURE_UNC_SAVEDFILECHECK", FALSE,TRUE}, + {L"FEATURE_GET_URL_DOM_FILEPATH_UNENCODED", TRUE ,TRUE}, + {L"FEATURE_TABBED_BROWSING", FALSE,TRUE}, + {L"FEATURE_SSLUX", FALSE,TRUE}, + {L"FEATURE_DISABLE_NAVIGATION_SOUNDS", FALSE,TRUE}, + {L"FEATURE_DISABLE_LEGACY_COMPRESSION", TRUE ,TRUE}, + {L"FEATURE_FORCE_ADDR_AND_STATUS", FALSE,TRUE}, + {L"FEATURE_XMLHTTP", TRUE ,TRUE}, + {L"FEATURE_DISABLE_TELNET_PROTOCOL", FALSE,TRUE}, + {L"FEATURE_FEEDS", FALSE,TRUE}, + {L"FEATURE_BLOCK_INPUT_PROMPTS", FALSE,TRUE} }; static HRESULT parse_schema(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, DWORD *rsize) diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index ebaed6b77d4..44b9e92994a 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -482,28 +482,6 @@ static HRESULT find_mime_from_url(const WCHAR *url, WCHAR **ret) return hres; } -static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; -static const WCHAR text_richtextW[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; -static const WCHAR text_xmlW[] = {'t','e','x','t','/','x','m','l',0}; -static const WCHAR audio_basicW[] = {'a','u','d','i','o','/','b','a','s','i','c',0}; -static const WCHAR audio_wavW[] = {'a','u','d','i','o','/','w','a','v',0}; -static const WCHAR image_gifW[] = {'i','m','a','g','e','/','g','i','f',0}; -static const WCHAR image_pjpegW[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; -static const WCHAR image_tiffW[] = {'i','m','a','g','e','/','t','i','f','f',0}; -static const WCHAR image_xpngW[] = {'i','m','a','g','e','/','x','-','p','n','g',0}; -static const WCHAR image_bmpW[] = {'i','m','a','g','e','/','b','m','p',0}; -static const WCHAR video_aviW[] = {'v','i','d','e','o','/','a','v','i',0}; -static const WCHAR video_mpegW[] = {'v','i','d','e','o','/','m','p','e','g',0}; -static const WCHAR app_postscriptW[] = - {'a','p','p','l','i','c','a','t','i','o','n','/','p','o','s','t','s','c','r','i','p','t',0}; -static const WCHAR app_pdfW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','p','d','f',0}; -static const WCHAR app_xzipW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; -static const WCHAR app_xgzipW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','g','z','i','p','-','c','o','m','p','r','e','s','s','e','d',0}; -static const WCHAR app_javaW[] = {'a','p','p','l','i','c','a','t','i','o','n','/','j','a','v','a',0}; -static const WCHAR app_xmsdownloadW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', - 'x','-','m','s','d','o','w','n','l','o','a','d',0}; static const WCHAR text_plainW[] = {'t','e','x','t','/','p','l','a','i','n','\0'}; static const WCHAR app_octetstreamW[] = {'a','p','p','l','i','c','a','t','i','o','n','/', 'o','c','t','e','t','-','s','t','r','e','a','m','\0'}; @@ -512,33 +490,33 @@ static const struct { const WCHAR *mime; BOOL (*filter)(const BYTE *,DWORD); } mime_filters_any_pos[] = { - {text_htmlW, text_html_filter}, - {text_xmlW, text_xml_filter} + {L"text/html", text_html_filter}, + {L"text/xml", text_xml_filter} }, mime_filters[] = { - {text_richtextW, text_richtext_filter}, - /* {audio_xaiffW, audio_xaiff_filter}, */ - {audio_basicW, audio_basic_filter}, - {audio_wavW, audio_wav_filter}, - {image_gifW, image_gif_filter}, - {image_pjpegW, image_pjpeg_filter}, - {image_tiffW, image_tiff_filter}, - {image_xpngW, image_xpng_filter}, - /* {image_xbitmapW, image_xbitmap_filter}, */ - {image_bmpW, image_bmp_filter}, - /* {image_xjgW, image_xjg_filter}, */ - /* {image_xemfW, image_xemf_filter}, */ - /* {image_xwmfW, image_xwmf_filter}, */ - {video_aviW, video_avi_filter}, - {video_mpegW, video_mpeg_filter}, - {app_postscriptW, application_postscript_filter}, - /* {app_base64W, application_base64_filter}, */ - /* {app_macbinhex40W, application_macbinhex40_filter}, */ - {app_pdfW, application_pdf_filter}, - /* {app_zcompressedW, application_xcompressed_filter}, */ - {app_xzipW, application_xzip_filter}, - {app_xgzipW, application_xgzip_filter}, - {app_javaW, application_java_filter}, - {app_xmsdownloadW, application_xmsdownload}, + {L"text/richtext", text_richtext_filter}, + /* {L"audio/x-aiff", audio_xaiff_filter}, */ + {L"audio/basic", audio_basic_filter}, + {L"audio/wav", audio_wav_filter}, + {L"image/gif", image_gif_filter}, + {L"image/pjpeg", image_pjpeg_filter}, + {L"image/tiff", image_tiff_filter}, + {L"image/x-png", image_xpng_filter}, + /* {L"image/x-bitmap", image_xbitmap_filter}, */ + {L"image/bmp", image_bmp_filter}, + /* {L"image/x-jg", image_xjg_filter}, */ + /* {L"image/x-emf", image_xemf_filter}, */ + /* {L"image/x-wmf", image_xwmf_filter}, */ + {L"video/avi", video_avi_filter}, + {L"video/mpeg", video_mpeg_filter}, + {L"application/postscript", application_postscript_filter}, + /* {L"application/base64", application_base64_filter}, */ + /* {L"application/mac-binhex40", application_macbinhex40_filter}, */ + {L"application/pdf", application_pdf_filter}, + /* {L"application/x-compressed", application_xcompressed_filter}, */ + {L"application/x-zip-compressed", application_xzip_filter}, + {L"application/x-gzip-compressed", application_xgzip_filter}, + {L"application/java", application_java_filter}, + {L"application/x-msdownload", application_xmsdownload}, {text_plainW, text_plain_filter}, {app_octetstreamW, application_octet_stream_filter} }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 3c42497bfaa..cf901dfd8b7 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -180,28 +180,28 @@ static const struct { URL_SCHEME scheme; WCHAR scheme_name[16]; } recognized_schemes[] = { - {URL_SCHEME_FTP, {'f','t','p',0}}, - {URL_SCHEME_HTTP, {'h','t','t','p',0}}, - {URL_SCHEME_GOPHER, {'g','o','p','h','e','r',0}}, - {URL_SCHEME_MAILTO, {'m','a','i','l','t','o',0}}, - {URL_SCHEME_NEWS, {'n','e','w','s',0}}, - {URL_SCHEME_NNTP, {'n','n','t','p',0}}, - {URL_SCHEME_TELNET, {'t','e','l','n','e','t',0}}, - {URL_SCHEME_WAIS, {'w','a','i','s',0}}, - {URL_SCHEME_FILE, {'f','i','l','e',0}}, - {URL_SCHEME_MK, {'m','k',0}}, - {URL_SCHEME_HTTPS, {'h','t','t','p','s',0}}, - {URL_SCHEME_SHELL, {'s','h','e','l','l',0}}, - {URL_SCHEME_SNEWS, {'s','n','e','w','s',0}}, - {URL_SCHEME_LOCAL, {'l','o','c','a','l',0}}, - {URL_SCHEME_JAVASCRIPT, {'j','a','v','a','s','c','r','i','p','t',0}}, - {URL_SCHEME_VBSCRIPT, {'v','b','s','c','r','i','p','t',0}}, - {URL_SCHEME_ABOUT, {'a','b','o','u','t',0}}, - {URL_SCHEME_RES, {'r','e','s',0}}, - {URL_SCHEME_MSSHELLROOTED, {'m','s','-','s','h','e','l','l','-','r','o','o','t','e','d',0}}, - {URL_SCHEME_MSSHELLIDLIST, {'m','s','-','s','h','e','l','l','-','i','d','l','i','s','t',0}}, - {URL_SCHEME_MSHELP, {'h','c','p',0}}, - {URL_SCHEME_WILDCARD, {'*',0}} + {URL_SCHEME_FTP, L"ftp"}, + {URL_SCHEME_HTTP, L"http"}, + {URL_SCHEME_GOPHER, L"gopher"}, + {URL_SCHEME_MAILTO, L"mailto"}, + {URL_SCHEME_NEWS, L"news"}, + {URL_SCHEME_NNTP, L"nntp"}, + {URL_SCHEME_TELNET, L"telnet"}, + {URL_SCHEME_WAIS, L"wais"}, + {URL_SCHEME_FILE, L"file"}, + {URL_SCHEME_MK, L"mk"}, + {URL_SCHEME_HTTPS, L"https"}, + {URL_SCHEME_SHELL, L"shell"}, + {URL_SCHEME_SNEWS, L"snews"}, + {URL_SCHEME_LOCAL, L"local"}, + {URL_SCHEME_JAVASCRIPT, L"javascript"}, + {URL_SCHEME_VBSCRIPT, L"vbscript"}, + {URL_SCHEME_ABOUT, L"about"}, + {URL_SCHEME_RES, L"res"}, + {URL_SCHEME_MSSHELLROOTED, L"ms-shell-rooted"}, + {URL_SCHEME_MSSHELLIDLIST, L"ms-shell-idlist"}, + {URL_SCHEME_MSHELP, L"hcp"}, + {URL_SCHEME_WILDCARD, L"*"} }; /* List of default ports Windows recognizes. */ @@ -224,13 +224,13 @@ static const struct { static const struct { WCHAR tld_name[4]; } recognized_tlds[] = { - {{'c','o','m',0}}, - {{'e','d','u',0}}, - {{'g','o','v',0}}, - {{'i','n','t',0}}, - {{'m','i','l',0}}, - {{'n','e','t',0}}, - {{'o','r','g',0}} + {L"com"}, + {L"edu"}, + {L"gov"}, + {L"int"}, + {L"mil"}, + {L"net"}, + {L"org"} }; static Uri *get_uri_obj(IUri *uri) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 0e98b9e3fc9..5d598830fdf 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -383,21 +383,14 @@ struct object_creation_info LPCWSTR protocol; }; -static const WCHAR wszFile[] = {'f','i','l','e',0}; -static const WCHAR wszFtp[] = {'f','t','p',0}; -static const WCHAR wszGopher[] = {'g','o','p','h','e','r',0}; -static const WCHAR wszHttp[] = {'h','t','t','p',0}; -static const WCHAR wszHttps[] = {'h','t','t','p','s',0}; -static const WCHAR wszMk[] = {'m','k',0}; - static const struct object_creation_info object_creation[] = { - { &CLSID_FileProtocol, &FileProtocolCF.IClassFactory_iface, wszFile }, - { &CLSID_FtpProtocol, &FtpProtocolCF.IClassFactory_iface, wszFtp }, - { &CLSID_GopherProtocol, &GopherProtocolCF.IClassFactory_iface, wszGopher }, - { &CLSID_HttpProtocol, &HttpProtocolCF.IClassFactory_iface, wszHttp }, - { &CLSID_HttpSProtocol, &HttpSProtocolCF.IClassFactory_iface, wszHttps }, - { &CLSID_MkProtocol, &MkProtocolCF.IClassFactory_iface, wszMk }, + { &CLSID_FileProtocol, &FileProtocolCF.IClassFactory_iface, L"file" }, + { &CLSID_FtpProtocol, &FtpProtocolCF.IClassFactory_iface, L"ftp" }, + { &CLSID_GopherProtocol, &GopherProtocolCF.IClassFactory_iface, L"gopher" }, + { &CLSID_HttpProtocol, &HttpProtocolCF.IClassFactory_iface, L"http" }, + { &CLSID_HttpSProtocol, &HttpSProtocolCF.IClassFactory_iface, L"https" }, + { &CLSID_MkProtocol, &MkProtocolCF.IClassFactory_iface, L"mk" }, { &CLSID_InternetSecurityManager, &SecurityManagerCF.IClassFactory_iface, NULL }, { &CLSID_InternetZoneManager, &ZoneManagerCF.IClassFactory_iface, NULL }, { &CLSID_StdURLMoniker, &StdURLMonikerCF.IClassFactory_iface, NULL }, -- 2.26.2

2 1

[PATCH] ntdll: fix backward compatibility for struct link_map on FreeBSD
by Damjan Jovanovic Nov. 30, 2020

Nov. 30, 2020

Checking for the _rtld_version_laddr_offset symbol only works when header and library versions match. Checking for the offset of l_addr instead lets us use the older header with the new library too. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/2] server: Set console renderer thread in get_next_console_request.
by Jacek Caban Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH 1/2] server: Remove no longer needed free_console.
by Jacek Caban Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 30 +++++++----------------------- server/process.c | 4 +--- server/process.h | 1 - 3 files changed, 8 insertions(+), 27 deletions(-)

1 0

[PATCH vkd3d 1/4] vkd3d-compiler: Rename the 'spirv' local variable to 'output_code'.
by Zebediah Figura Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 7a1a5b0b..bcca04c3 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -586,7 +586,7 @@ int main(int argc, char **argv) struct vkd3d_shader_hlsl_source_info hlsl_source_info = {0}; bool close_input = false, close_output = false; struct vkd3d_shader_compile_info info; - struct vkd3d_shader_code spirv; + struct vkd3d_shader_code output_code; struct options options; FILE *input, *output; char *messages; @@ -663,7 +663,7 @@ int main(int argc, char **argv) goto done; } - ret = vkd3d_shader_compile(&info, &spirv, &messages); + ret = vkd3d_shader_compile(&info, &output_code, &messages); if (messages) fputs(messages, stderr); vkd3d_shader_free_messages(messages); @@ -674,15 +674,15 @@ int main(int argc, char **argv) goto done; } - if (!write_shader(&spirv, output)) + if (!write_shader(&output_code, output)) { fprintf(stderr, "Failed to write output shader.\n"); - vkd3d_shader_free_shader_code(&spirv); + vkd3d_shader_free_shader_code(&output_code); goto done; } fail = 0; - vkd3d_shader_free_shader_code(&spirv); + vkd3d_shader_free_shader_code(&output_code); done: if (close_output) fclose(output); -- 2.29.2

5 15

[PATCH v2 1/2] winegstreamer: Implement IMFMediaSource::Stop.
by Derek Lesho Nov. 30, 2020

Nov. 30, 2020

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Style error. --- dlls/winegstreamer/media_source.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 5c502cf3ed5..655e765fee7 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -64,6 +64,7 @@ struct media_stream enum source_async_op { SOURCE_ASYNC_START, + SOURCE_ASYNC_STOP, SOURCE_ASYNC_REQUEST_SAMPLE, }; @@ -343,6 +344,24 @@ static void start_pipeline(struct media_source *source, struct source_async_comm gst_element_set_state(source->container, GST_STATE_PLAYING); } +static void stop_pipeline(struct media_source *source) +{ + unsigned int i; + + gst_element_set_state(source->container, GST_STATE_PAUSED); + + for (i = 0; i < source->stream_count; i++) + { + struct media_stream *stream = source->streams[i]; + if (stream->state != STREAM_INACTIVE) + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamStopped, &GUID_NULL, S_OK, NULL); + } + + IMFMediaEventQueue_QueueEventParamVar(source->event_queue, MESourceStopped, &GUID_NULL, S_OK, NULL); + + source->state = SOURCE_STOPPED; +} + static void dispatch_end_of_presentation(struct media_source *source) { PROPVARIANT empty = {.vt = VT_EMPTY}; @@ -417,6 +436,9 @@ static HRESULT WINAPI source_async_commands_Invoke(IMFAsyncCallback *iface, IMFA case SOURCE_ASYNC_START: start_pipeline(source, command); break; + case SOURCE_ASYNC_STOP: + stop_pipeline(source); + break; case SOURCE_ASYNC_REQUEST_SAMPLE: wait_on_sample(command->u.request_sample.stream, command->u.request_sample.token); break; @@ -1087,13 +1109,18 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); + struct source_async_command *command; + HRESULT hr; - FIXME("(%p): stub\n", source); + TRACE("(%p)\n", source); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_STOP, &command))) + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); + + return hr; } static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) -- 2.29.2

1 0

[PATCH] user32: Set font smoothing type to FE_FONTSMOOTHINGCLEARTYPE by default.
by Paul Gofman Nov. 30, 2020

Nov. 30, 2020

That is the case on the newer Windows. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a620116053a..128aaa014e8 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1230,7 +1230,7 @@ static DWORD_ENTRY( FOCUSBORDERHEIGHT, 1, DESKTOP_KEY, L"FocusBorderHeight" ); static DWORD_ENTRY( FOCUSBORDERWIDTH, 1, DESKTOP_KEY, L"FocusBorderWidth" ); static DWORD_ENTRY( FONTSMOOTHINGCONTRAST, 0, DESKTOP_KEY, L"FontSmoothingGamma" ); static DWORD_ENTRY( FONTSMOOTHINGORIENTATION, FE_FONTSMOOTHINGORIENTATIONRGB, DESKTOP_KEY, L"FontSmoothingOrientation" ); -static DWORD_ENTRY( FONTSMOOTHINGTYPE, FE_FONTSMOOTHINGSTANDARD, DESKTOP_KEY, L"FontSmoothingType" ); +static DWORD_ENTRY( FONTSMOOTHINGTYPE, FE_FONTSMOOTHINGCLEARTYPE, DESKTOP_KEY, L"FontSmoothingType" ); static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3, DESKTOP_KEY, L"ForegroundFlashCount" ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0, DESKTOP_KEY, L"ForegroundLockTimeout" ); static DWORD_ENTRY( LOGPIXELS, 0, DESKTOP_KEY, L"LogPixels" ); -- 2.28.0

1 0

ntdll:info win32k.sys is sometimes loaded at 0x00000000
by Francois Gouget Nov. 30, 2020

Nov. 30, 2020

So we get ntdll:info failures because win32k.sys appears to sometimes be loaded at the NULL address. This seems to impact only two VMs: wvistau64 and w7pro64. https://test.winehq.org/data/tests/ntdll:info.html Checking the win32k.sys load addresses I get: https://testbot.winehq.org/JobDetails.pl?Key=82496 32-bit BF800000 wxppro BF800000 w2003std 00000000 wvistau64 00010000 w2008s64 92F60000 w7u 00080000 win7u-64 (personal VMware VM) 00000000 w7pro64 8EA28000 w8 0002A000 w864 3E760000 w10pro64 64-bit FFFFF96000000000 wvistau64 FFFFF96000010000 w2008s64 FFFFF96000000000 w7pro64 FFFFF9600002A000 w864 FFFFF8AD3E760000 w10pro64 So the lower 32 bits of the 64 bit load address always match the 32 bit load address for 32-bit processes. Except that for 64-bit processes this is not a NULL pointer because the upper 32 bits are non-zero. Could it be that on Windows 7 and lower 64-bit OSes the 32-bit win32k.sys load address is accidentally NULL because Microsoft overlooked this? Maybe because of the (then) new ASLR code? Would the following patch be ok? commit 41ebdf0560a41b130a798ca1f14ffcd6f6feaaa9 Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Nov 25 20:15:09 2020 +0100 ntdll/tests: win32k.sys is sometimes loaded at 0x0 on 64-bit Win <= 7. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5db7a800cbe..ed8a9354bdc 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -490,7 +490,9 @@ static void test_query_module(void) const SYSTEM_MODULE *module = &info->Modules[i]; ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); - ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); + ok(module->ImageBaseAddress || + (!module->ImageBaseAddress && strstr((char*)module->Name, "\\win32k.sys")), /* 64-bit Vista and Win7 */ + "%u: got NULL address for %s\n", i, module->Name); ok(module->ImageSize, "%u: got 0 size\n", i); ok(module->LoadCount, "%u: got 0 load count\n", i); } @@ -516,7 +518,9 @@ static void test_query_module(void) const SYSTEM_MODULE *module = &infoex->BaseInfo; ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); - ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); + ok(module->ImageBaseAddress || + (!module->ImageBaseAddress && strstr((char*)module->Name, "\\win32k.sys")), /* 64-bit Vista and Win7 */ + "%u: got NULL address for %s\n", i, module->Name); ok(module->ImageSize, "%u: got 0 size\n", i); ok(module->LoadCount, "%u: got 0 load count\n", i); -- Francois Gouget <fgouget(a)codeweavers.com>

3 3

[PATCH] conhost: Respect the StartupInfo's wShowWindow.
by Gabriel Ivăncescu Nov. 30, 2020

Nov. 30, 2020

Since 859b526c81a2af841b5b7b28d06f3d782bccdab5, console windows are always shown even if they're supposed to start in some other state, e.g. minimized. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This fixes the regression. programs/conhost/conhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index e3a9a25..24a9397 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2756,7 +2756,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!init_window( &console )) return 1; GetStartupInfoW( &si ); set_console_title( &console, si.lpTitle, wcslen( si.lpTitle ) * sizeof(WCHAR) ); - ShowWindow( console.win, SW_SHOW ); + ShowWindow( console.win, (si.dwFlags & STARTF_USESHOWWINDOW) && si.wShowWindow != SW_SHOWDEFAULT + ? si.wShowWindow : SW_SHOW ); } return main_loop( &console, signal ); -- 2.21.0

2 3