wine-commits December 2017

wine-commits@winehq.org

2 participants
450 discussions

Matteo Bruni : d3d11: Implement GenerateMips().
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: bb3b55ce22f96d443c2053f6b1eb24e087ca1377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3b55ce22f96d443c2053f6b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:36:46 2017 +0100 d3d11: Implement GenerateMips(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7a8f3df..5281792 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1135,7 +1135,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearDepthStencilView(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_GenerateMips(ID3D11DeviceContext *iface, ID3D11ShaderResourceView *view) { - FIXME("iface %p, view %p stub!\n", iface, view); + struct d3d_shader_resource_view *srv = unsafe_impl_from_ID3D11ShaderResourceView(view); + + TRACE("iface %p, view %p.\n", iface, view); + + wined3d_mutex_lock(); + wined3d_shader_resource_view_generate_mipmaps(srv->wined3d_view); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_SetResourceMinLOD(ID3D11DeviceContext *iface, @@ -4193,9 +4199,15 @@ static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device1 * } static void STDMETHODCALLTYPE d3d10_device_GenerateMips(ID3D10Device1 *iface, - ID3D10ShaderResourceView *shader_resource_view) + ID3D10ShaderResourceView *view) { - FIXME("iface %p, shader_resource_view %p stub!\n", iface, shader_resource_view); + struct d3d_shader_resource_view *srv = unsafe_impl_from_ID3D10ShaderResourceView(view); + + TRACE("iface %p, view %p.\n", iface, view); + + wined3d_mutex_lock(); + wined3d_shader_resource_view_generate_mipmaps(srv->wined3d_view); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device1 *iface,

1 0

Matteo Bruni : wined3d: Implement manual mipmap generation.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 0daea6d2a08b76ff3548d8e16c44cf629d8afa9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0daea6d2a08b76ff3548d8e16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:31 2017 +0100 wined3d: Implement manual mipmap generation. Signed-off-by: Matteo Bruni <mbruni(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 | 30 ++++++++++++ dlls/wined3d/texture.c | 11 ----- dlls/wined3d/view.c | 102 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 + include/wine/wined3d.h | 2 +- 6 files changed, 136 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0daea6d2a08b76ff3548d…

1 0

Matteo Bruni : d3d9: Stop calling wined3d_texture_generate_mipmaps().
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: dfba903bb231f7357597c059b8709be74325ae09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfba903bb231f7357597c059b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:30 2017 +0100 d3d9: Stop calling wined3d_texture_generate_mipmaps(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 5080eb3..96c8bc3 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -273,13 +273,7 @@ static D3DTEXTUREFILTERTYPE WINAPI d3d9_texture_2d_GetAutoGenFilterType(IDirect3 static void WINAPI d3d9_texture_2d_GenerateMipSubLevels(IDirect3DTexture9 *iface) { - struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - wined3d_texture_generate_mipmaps(texture->wined3d_texture); - wined3d_mutex_unlock(); } static HRESULT WINAPI d3d9_texture_2d_GetLevelDesc(IDirect3DTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) @@ -658,13 +652,7 @@ static D3DTEXTUREFILTERTYPE WINAPI d3d9_texture_cube_GetAutoGenFilterType(IDirec static void WINAPI d3d9_texture_cube_GenerateMipSubLevels(IDirect3DCubeTexture9 *iface) { - struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - wined3d_texture_generate_mipmaps(texture->wined3d_texture); - wined3d_mutex_unlock(); } static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) @@ -1055,13 +1043,7 @@ static D3DTEXTUREFILTERTYPE WINAPI d3d9_texture_3d_GetAutoGenFilterType(IDirect3 static void WINAPI d3d9_texture_3d_GenerateMipSubLevels(IDirect3DVolumeTexture9 *iface) { - struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - wined3d_texture_generate_mipmaps(texture->wined3d_texture); - wined3d_mutex_unlock(); } static HRESULT WINAPI d3d9_texture_3d_GetLevelDesc(IDirect3DVolumeTexture9 *iface, UINT level, D3DVOLUME_DESC *desc)

1 0

Matteo Bruni : d3d11: Pass the WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag to wined3d.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: df461ce90be34353d03f5f9624a35575046119ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=df461ce90be34353d03f5f962… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:29 2017 +0100 d3d11: Pass the WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS flag to wined3d. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index e8870d5..177c0cc 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -526,6 +526,8 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE if (desc->MiscFlags & D3D11_RESOURCE_MISC_GDI_COMPATIBLE) flags |= WINED3D_TEXTURE_CREATE_GET_DC; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS) + flags |= WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS; if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, desc->ArraySize, levels, flags, (struct wined3d_sub_resource_data *)data, @@ -940,6 +942,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi { struct wined3d_resource_desc wined3d_desc; unsigned int levels; + DWORD flags = 0; HRESULT hr; if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS @@ -970,8 +973,11 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(max(max(desc->Width, desc->Height), desc->Depth)) + 1; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS) + flags |= WINED3D_TEXTURE_CREATE_GENERATE_MIPMAPS; + if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, - 1, levels, 0, (struct wined3d_sub_resource_data *)data, texture, + 1, levels, flags, (struct wined3d_sub_resource_data *)data, texture, &d3d_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr);

1 0

Matteo Bruni : d3d11: Validate buffer MiscFlags.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 8c3019ca711cef6b87d9482fd12f10984acad3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3019ca711cef6b87d9482fd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:28 2017 +0100 d3d11: Validate buffer MiscFlags. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 8233742..3ccccc8 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -422,6 +422,12 @@ static BOOL validate_buffer_desc(D3D11_BUFFER_DESC *desc) desc->StructureByteStride = 0; } + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS) + { + WARN("Buffer with the D3D11_RESOURCE_MISC_GENERATE_MIPS flag.\n"); + return FALSE; + } + return TRUE; }

1 0

Matteo Bruni : d3d11: Validate MiscFlags for 3D textures.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 72a60e445512a8580beaf580e1fc499908357b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a60e445512a8580beaf580e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:27 2017 +0100 d3d11: Validate MiscFlags for 3D textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 12186dc..e8870d5 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -942,6 +942,14 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi unsigned int levels; HRESULT hr; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS + && (~desc->BindFlags & (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE))) + { + WARN("D3D11_RESOURCE_MISC_GENERATE_MIPS used without D3D11_BIND_RENDER_TARGET " + "and D3D11_BIND_SHADER_RESOURCE.\n"); + return E_INVALIDARG; + } + texture->ID3D11Texture3D_iface.lpVtbl = &d3d11_texture3d_vtbl; texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 019d48f53bd61ef78020169d8e98231e386cec47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019d48f53bd61ef78020169d8… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Dec 5 08:42:41 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/po/lt.po b/po/lt.po index c8045ad..b85f823 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-18 20:45+0300\n" +"PO-Revision-Date: 2017-12-05 08:41+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -12019,17 +12019,6 @@ msgid "Icons (*.ico)" msgstr "Piktogramos (*.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" @@ -12045,7 +12034,7 @@ msgstr "" " REG [operacija] [parametrai]\n" "\n" "Palaikomos operacijos:\n" -" ADD | DELETE | IMPORT | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Pagalbai apie specifinę operaciją, įrašykite:\n" " REG [operacija] /?\n" @@ -12186,22 +12175,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Neatpažinta kaitos seka [\\%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 failas.reg\n" +msgstr "REG EXPORT rakto_vardas failas.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: Netinkamas sisteminis raktas [%1]\n" +msgstr "reg: Netinkamas sisteminis raktas [%1]\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 "Registro reikšmė „%1“ jau egzistuoja. Ar norite ją perrašyti?" +msgstr "Failas „%1“ jau egzistuoja. Ar norite jį perrašyti?" #: regedit.rc:34 msgid "&Registry"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 87e70c0398bcbe76d70587e5672be0c42a8fe2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e70c0398bcbe76d70587e56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 5 09:19:07 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/po/ru.po b/po/ru.po index f3e2baf..3b070da 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-18 12:12+0300\n" +"PO-Revision-Date: 2017-12-05 09:18+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12015,17 +12015,6 @@ msgid "Icons (*.ico)" msgstr "Значки (*.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" @@ -12041,7 +12030,7 @@ msgstr "" " REG [операция] [параметры]\n" "\n" "Поддерживаемые операции:\n" -" ADD | DELETE | IMPORT | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Для получения справки по конкретной операции используйте:\n" " REG [операция] /?\n" @@ -12184,22 +12173,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: неизвестная управляющая последовательность [\\%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 file.reg\n" +msgstr "REG EXPORT имя_ключа file.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: неверный системный ключ [%1]\n" +msgstr "reg: неверный системный ключ [%1]\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 "Значение «%1» уже существует. Вы хотите заменить его?" +msgstr "Файл «%1» уже существует. Вы хотите заменить его?" #: regedit.rc:34 msgid "&Registry"

1 0

Nikolay Sivov : user32/edit: Allow buffer access after EM_GETHANDLE.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: f62d8dc58fb3fb5f11a8ab55620ab9b2fbdaf967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62d8dc58fb3fb5f11a8ab556… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 5 15:09:03 2017 +0300 user32/edit: Allow buffer access after EM_GETHANDLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 8 ++------ dlls/user32/tests/edit.c | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index c8903e2..114d842 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1264,8 +1264,6 @@ static inline void text_buffer_changed(EDITSTATE *es) */ static void EDIT_LockBuffer(EDITSTATE *es) { - if (es->hlocapp) return; - if (!es->text) { if(!es->hloc32W) return; @@ -1306,8 +1304,6 @@ static void EDIT_LockBuffer(EDITSTATE *es) */ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) { - if (es->hlocapp) return; - /* Edit window might be already destroyed */ if(!IsWindow(es->hwndSelf)) { @@ -1323,7 +1319,6 @@ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) ERR("es->text == 0 ... please report\n"); return; } - if (force || (es->lock_count == 1)) { if (es->hloc32W) { UINT countA = 0; @@ -5205,7 +5200,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B break; } - if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); + if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) + EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 783ced6..9372c48 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2786,12 +2786,10 @@ static void test_EM_GETHANDLE(void) /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); @@ -2802,15 +2800,28 @@ todo_wine LocalUnlock(hmem); len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine - ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + ok(len == lstrlenA(str1_1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* See if WM_SETTEXT/EM_REPLACESEL work. */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + ok(r, "Failed to set text.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '1', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + r = SendMessageA(hEdit, EM_REPLACESEL, 0, (LPARAM)str1_1); + ok(r, "Failed to replace selection.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '2', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc);

1 0

Hugh McMaster : reg: Allow switches to be uppercase or lowercase.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: a0a12d9f417266d3b86b32de44e6f8e0fa066174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a12d9f417266d3b86b32de4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 5 11:25:19 2017 +0000 reg: Allow switches to be uppercase or lowercase. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 12 ++++++++++-- programs/reg/tests/reg.c | 10 +++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index f3718ed..8d510f7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -890,12 +890,20 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long return TRUE; } -static BOOL is_help_switch(const WCHAR *s) +static BOOL is_switch(const WCHAR *s, const WCHAR c) { if (strlenW(s) > 2) return FALSE; - if ((s[0] == '/' || s[0] == '-') && (s[1] == 'h' || s[1] == '?')) + if ((s[0] == '/' || s[0] == '-') && (s[1] == c || s[1] == toupperW(c))) + return TRUE; + + return FALSE; +} + +static BOOL is_help_switch(const WCHAR *s) +{ + if (is_switch(s, '?') || is_switch(s, 'h')) return TRUE; return FALSE; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 04c995e..50fae7f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -231,7 +231,7 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg add -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -618,7 +618,7 @@ static void test_delete(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg delete -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); @@ -676,7 +676,7 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg query -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &key); @@ -870,7 +870,7 @@ static void test_import(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg import -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg import missing.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -4419,7 +4419,7 @@ static void test_export(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg export -H", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg export \\\\remote-pc\\HKLM\\Wine file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
45
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 December 2017