December 2017 - Wine-devel - list.winehq.org

[PATCH 9/9] rsaenh: Removed no longer needed ALG_ID argument from helper functions.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 8 +++----- dlls/rsaenh/implglue.h | 6 +++--- dlls/rsaenh/rsaenh.c | 21 +++++++++------------ 3 files changed, 15 insertions(+), 20 deletions(-)

1 0

[PATCH 8/9] rsaenh: Use bcrypt for MD5 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 43 ++++++------------------------------------- dlls/rsaenh/implglue.h | 10 ---------- 2 files changed, 6 insertions(+), 47 deletions(-)

1 0

[PATCH 7/9] rsaenh: Use bcrypt for MD4 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 18 ++---------------- dlls/rsaenh/implglue.h | 9 --------- 2 files changed, 2 insertions(+), 25 deletions(-)

1 0

[PATCH 5/9] rsaenh: Use bcrypt for SHA1 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 17 ++--------------- dlls/rsaenh/implglue.h | 10 ---------- 2 files changed, 2 insertions(+), 25 deletions(-)

1 0

[PATCH 4/9] rsaenh: Use bcrypt for MD2 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/Makefile.in | 1 - dlls/rsaenh/implglue.c | 13 +---- dlls/rsaenh/implglue.h | 1 - dlls/rsaenh/md2.c | 151 ------------------------------------------------ dlls/rsaenh/tomcrypt.h | 9 --- 5 files changed, 2 insertions(+), 173 deletions(-) delete mode 100644 dlls/rsaenh/md2.c

1 0

[PATCH 1/9] bcrypt/tests: Use common helper for testing different hash types.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 431 ++++++++------------------------------------- 1 file changed, 69 insertions(+), 362 deletions(-)

1 0

[PATCH 1/9] ddraw: Also store supported user clip planes.
by Józef Kucia 07 Dec '17

07 Dec '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/device.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 32a2f1a6be50..542f23a0ef26 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6469,11 +6469,14 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV wined3d_mutex_lock(); hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); - if (hr == WINED3DERR_INVALIDCALL && idx < ARRAY_SIZE(device->user_clip_planes)) + if (idx < ARRAY_SIZE(device->user_clip_planes)) { - WARN("Clip plane %u is not supported.\n", idx); device->user_clip_planes[idx] = *wined3d_plane; - hr = D3D_OK; + if (hr == WINED3DERR_INVALIDCALL) + { + WARN("Clip plane %u is not supported.\n", idx); + hr = D3D_OK; + } } wined3d_mutex_unlock(); -- 2.13.6

4 18

[PATCH] wined3d: Raise the default max_gl_version for specific cases.
by Henri Verbeet 07 Dec '17

07 Dec '17

Effectively, this will enable Direct3D 11 by default on AMD and Intel hardware. Yes, this patch is awful. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 22 ++++++++++++++++++++-- dlls/wined3d/wined3d_main.c | 11 +++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cc8a78c..c145944 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6527,6 +6527,22 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc } } +static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD flags) +{ + const char *gl_vendor, *gl_renderer; + + if (wined3d_settings.explicit_gl_version || (flags & WINED3D_PIXEL_CENTER_INTEGER)) + return wined3d_settings.max_gl_version; + + gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR); + gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER); + if (!gl_vendor || !gl_renderer + || wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA) + return wined3d_settings.max_gl_version; + + return MAKEDWORD_VERSION(4, 4); +} + static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = @@ -6539,6 +6555,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; unsigned int i; DISPLAY_DEVICEW display_device; + DWORD max_gl_version; TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); @@ -6583,15 +6600,16 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return FALSE; } + max_gl_version = get_max_gl_version(gl_info, wined3d_creation_flags); for (i = 0; i < ARRAY_SIZE(supported_gl_versions); ++i) { - if (supported_gl_versions[i] <= wined3d_settings.max_gl_version) + if (supported_gl_versions[i] <= max_gl_version) break; } if (i == ARRAY_SIZE(supported_gl_versions)) { ERR_(winediag)("Requested invalid GL version %u.%u.\n", - wined3d_settings.max_gl_version >> 16, wined3d_settings.max_gl_version & 0xffff); + max_gl_version >> 16, max_gl_version & 0xffff); i = ARRAY_SIZE(supported_gl_versions) - 1; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 54ddc23..28a34a7 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -73,6 +73,7 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, struct wined3d_settings wined3d_settings = { FALSE, /* No multithreaded CS by default. */ + FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ @@ -215,12 +216,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("Setting multithreaded command stream to %#x.\n", wined3d_settings.cs_multithreaded); if (!get_config_key_dword(hkey, appkey, "MaxVersionGL", &tmpvalue)) { - if (tmpvalue != wined3d_settings.max_gl_version) - { - ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", - tmpvalue >> 16, tmpvalue & 0xffff); - wined3d_settings.max_gl_version = tmpvalue; - } + ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", + tmpvalue >> 16, tmpvalue & 0xffff); + wined3d_settings.explicit_gl_version = TRUE; + wined3d_settings.max_gl_version = tmpvalue; } if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a79a68f..f03733d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -382,6 +382,7 @@ static inline void wined3d_pause(void) struct wined3d_settings { unsigned int cs_multithreaded; + BOOL explicit_gl_version; DWORD max_gl_version; BOOL glslRequested; int offscreen_rendering_mode; -- 2.1.4

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 07 Dec '17

07 Dec '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/po/fi.po b/po/fi.po index 9809abeac6..0c4fa20d60 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11993,17 +11993,6 @@ msgid "Icons (*.ico)" msgstr "Kuvakkeet (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12019,7 +12008,7 @@ msgstr "" " REG [toiminto] [parametrit]\n" "\n" "Tuetut toiminnot:\n" -" ADD, DELETE, IMPORT, QUERY\n" +" ADD, DELETE, IMPORT, EXPORT, QUERY\n" "\n" "Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" @@ -12163,22 +12152,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Tuntematon merkintä [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG IMPORT file.reg\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG IMPORT tiedosto.reg\n" +msgstr "REG EXPORT avaimen_nimi tiedosto.reg\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: Järjestelmäavain [%1] ei kelpaa\n" +msgstr "reg: Järjestelmäavain [%1] ei kelpaa\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Rekisterin arvo '%1' on jo olemassa. Haluatko korvata sen?" +msgstr "Tiedosto '%1' on jo olemassa. Haluatko korvata sen?" #: regedit.rc:34 msgid "&Registry" -- 2.15.1

1 0

[PATCH 1/2] wined3d: Correctly restore texture max level in shader_resource_view_generate_mipmaps().
by Józef Kucia 07 Dec '17

07 Dec '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/view.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4463fabb6ae5..3322baa2b5b7 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -842,7 +842,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * base_level = view->desc.u.texture.level_idx; max_level = base_level + level_count - 1; - srgb = !!(texture->flags & WINED3D_TEXTURE_IS_SRGB); + srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) wined3d_texture_load_location(texture, i * level_count + base_level, context, location); @@ -874,11 +874,8 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } } - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, level_count - 1); - if (srgb) - texture->texture_srgb.base_level = base_level; - else - texture->texture_rgb.base_level = base_level; + gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + gl_tex->base_level = base_level; context_release(context); } -- 2.13.6

3 3