May 2014 - Wine-Commits - list.winehq.org

Vincent Povirk : shell32/tests: Use SW_HIDE with ShellExecuteA in tests.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 3ebb9b7b7530a14acec574af127aec5d7a26b053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebb9b7b7530a14acec574af1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 7 13:55:01 2014 -0500 shell32/tests: Use SW_HIDE with ShellExecuteA in tests. --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index e3169c8..7f07c70 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -118,7 +118,7 @@ static INT_PTR shell_execute(LPCSTR verb, LPCSTR file, LPCSTR parameters, LPCSTR * association it displays the 'Open With' dialog and I could not find * a flag to prevent this. */ - rc=(INT_PTR)ShellExecuteA(NULL, verb, file, parameters, directory, SW_SHOWNORMAL); + rc=(INT_PTR)ShellExecuteA(NULL, verb, file, parameters, directory, SW_HIDE); if (rc > 32) {

1 0

Aric Stewart : user32: Pass WM_IME_CONTROL messages to the IME.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: dfa65a52bbc84b03709fd3d3f7c569b4d9e1642f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa65a52bbc84b03709fd3d3f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 7 10:27:51 2014 -0500 user32: Pass WM_IME_CONTROL messages to the IME. --- dlls/user32/defwnd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index b359c06..bcd6f91 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -831,6 +831,7 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: case WM_IME_NOTIFY: + case WM_IME_CONTROL: { HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); if (hwndIME) @@ -983,6 +984,7 @@ LRESULT WINAPI DefWindowProcW( case WM_IME_ENDCOMPOSITION: case WM_IME_SELECT: case WM_IME_NOTIFY: + case WM_IME_CONTROL: { HWND hwndIME = ImmGetDefaultIMEWnd( hwnd ); if (hwndIME)

1 0

Huw Davies : gdi32: In a Hebrew locale the last char of a symbol font is reported as 0xf896 rather than 0xf0ff.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: c66f0019fff40b4755e217ce555d5147b78d523f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66f0019fff40b4755e217ce5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 14:51:11 2014 +0100 gdi32: In a Hebrew locale the last char of a symbol font is reported as 0xf896 rather than 0xf0ff. --- dlls/gdi32/freetype.c | 3 +++ dlls/gdi32/tests/font.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 54241a5..fae9ffe 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7390,6 +7390,9 @@ static BOOL get_outline_text_metrics(GdiFont *font) TM.tmFirstChar = 0; switch(GetACP()) { + case 1255: /* Hebrew */ + TM.tmLastChar = 0xf896; + break; case 1257: /* Baltic */ TM.tmLastChar = 0xf8fd; break; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fa3b420..255771a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3543,6 +3543,9 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) expect_first_W = 0; switch(GetACP()) { + case 1255: /* Hebrew */ + expect_last_W = 0xf896; + break; case 1257: /* Baltic */ expect_last_W = 0xf8fd; break;

1 0

Stefan Dösinger : gdi32/tests: Test RGBQUAD.rgbReserved in SetDIBColorTable.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: a373c35371016b6fb1129da02f4a5f4da756709b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a373c35371016b6fb1129da02… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:35 2014 +0200 gdi32/tests: Test RGBQUAD.rgbReserved in SetDIBColorTable. --- dlls/gdi32/tests/bitmap.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 39ca454..2a2dd3a 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -854,6 +854,21 @@ static void test_dibsections(void) i, colors[i].rgbRed, colors[i].rgbGreen, colors[i].rgbBlue, colors[i].rgbReserved); } + rgb[0].rgbRed = 1; + rgb[0].rgbGreen = 2; + rgb[0].rgbBlue = 3; + rgb[0].rgbReserved = 123; + ret = SetDIBColorTable( hdcmem, 0, 1, rgb ); + ok( ret == 1, "SetDIBColorTable returned unexpected result %u\n", ret ); + ok( rgb[0].rgbReserved == 123, "Expected rgbReserved = 123, got %u\n", rgb[0].rgbReserved ); + + ret = GetDIBColorTable( hdcmem, 0, 1, rgb ); + ok( ret == 1, "GetDIBColorTable returned unexpected result %u\n", ret ); + ok( rgb[0].rgbRed == 1, "Expected rgbRed = 1, got %u\n", rgb[0].rgbRed ); + ok( rgb[0].rgbGreen == 2, "Expected rgbGreen = 2, got %u\n", rgb[0].rgbGreen ); + ok( rgb[0].rgbBlue == 3, "Expected rgbBlue = 3, got %u\n", rgb[0].rgbBlue ); + todo_wine ok( rgb[0].rgbReserved == 0, "Expected rgbReserved = 0, got %u\n", rgb[0].rgbReserved ); + SelectObject(hdcmem, oldbm); DeleteObject(hdib); DeleteObject(hpal);

1 0

Huw Davies : advapi32/tests: Fix access rights tests in win 8.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 0451a89ca12690e1d97a69fb1b178f10f74da909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0451a89ca12690e1d97a69fb1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 09:42:16 2014 +0100 advapi32/tests: Fix access rights tests in win 8. --- dlls/advapi32/tests/security.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a0574c4..05da0ae 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5073,12 +5073,16 @@ static void test_thread_security(void) { case GENERIC_READ: case GENERIC_EXECUTE: - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */, + ok(access == map[i].mapped || + access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */ || + access == (map[i].mapped | THREAD_QUERY_LIMITED_INFORMATION | THREAD_RESUME) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: todo_wine - ok(access == map[i].mapped || access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */, + ok(access == map[i].mapped || + access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION) /* Vista+ */ || + access == (map[i].mapped | THREAD_SET_LIMITED_INFORMATION | THREAD_RESUME) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_ALL: @@ -5144,7 +5148,9 @@ static void test_process_access(void) "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_WRITE: - ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */, + ok(access == map[i].mapped || + access == (map[i].mapped | PROCESS_TERMINATE) /* before Vista */ || + access == (map[i].mapped | PROCESS_SET_LIMITED_INFORMATION) /* win8 */, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); break; case GENERIC_EXECUTE:

1 0

Huw Davies : include: Add a couple of new win 8 access rights.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 76fca0f953505209fd9b2a12f506895ffbfb40a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fca0f953505209fd9b2a12f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 7 09:42:15 2014 +0100 include: Add a couple of new win 8 access rights. --- include/winnt.h | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 3f33c6b..bae8aed 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4533,31 +4533,33 @@ typedef enum tagSID_NAME_USE { #define TIMER_MODIFY_STATE 0x0002 #define TIMER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3) -#define PROCESS_TERMINATE 0x0001 -#define PROCESS_CREATE_THREAD 0x0002 -#define PROCESS_VM_OPERATION 0x0008 -#define PROCESS_VM_READ 0x0010 -#define PROCESS_VM_WRITE 0x0020 -#define PROCESS_DUP_HANDLE 0x0040 -#define PROCESS_CREATE_PROCESS 0x0080 -#define PROCESS_SET_QUOTA 0x0100 -#define PROCESS_SET_INFORMATION 0x0200 -#define PROCESS_QUERY_INFORMATION 0x0400 -#define PROCESS_SUSPEND_RESUME 0x0800 +#define PROCESS_TERMINATE 0x0001 +#define PROCESS_CREATE_THREAD 0x0002 +#define PROCESS_VM_OPERATION 0x0008 +#define PROCESS_VM_READ 0x0010 +#define PROCESS_VM_WRITE 0x0020 +#define PROCESS_DUP_HANDLE 0x0040 +#define PROCESS_CREATE_PROCESS 0x0080 +#define PROCESS_SET_QUOTA 0x0100 +#define PROCESS_SET_INFORMATION 0x0200 +#define PROCESS_QUERY_INFORMATION 0x0400 +#define PROCESS_SUSPEND_RESUME 0x0800 #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000 +#define PROCESS_SET_LIMITED_INFORMATION 0x2000 #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff) -#define THREAD_TERMINATE 0x0001 -#define THREAD_SUSPEND_RESUME 0x0002 -#define THREAD_GET_CONTEXT 0x0008 -#define THREAD_SET_CONTEXT 0x0010 -#define THREAD_SET_INFORMATION 0x0020 -#define THREAD_QUERY_INFORMATION 0x0040 -#define THREAD_SET_THREAD_TOKEN 0x0080 -#define THREAD_IMPERSONATE 0x0100 -#define THREAD_DIRECT_IMPERSONATION 0x0200 -#define THREAD_SET_LIMITED_INFORMATION 0x0400 -#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#define THREAD_TERMINATE 0x0001 +#define THREAD_SUSPEND_RESUME 0x0002 +#define THREAD_GET_CONTEXT 0x0008 +#define THREAD_SET_CONTEXT 0x0010 +#define THREAD_SET_INFORMATION 0x0020 +#define THREAD_QUERY_INFORMATION 0x0040 +#define THREAD_SET_THREAD_TOKEN 0x0080 +#define THREAD_IMPERSONATE 0x0100 +#define THREAD_DIRECT_IMPERSONATION 0x0200 +#define THREAD_SET_LIMITED_INFORMATION 0x0400 +#define THREAD_QUERY_LIMITED_INFORMATION 0x0800 +#define THREAD_RESUME 0x1000 #define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff) #define THREAD_BASE_PRIORITY_LOWRT 15

1 0

Qian Hong : include: Added atlcom.h.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: e7aaeae73ba94e51c09c2198a9e680cdbb0339f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7aaeae73ba94e51c09c2198a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed May 7 15:38:46 2014 +0800 include: Added atlcom.h. --- include/Makefile.in | 1 + include/atlcom.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index cdb7b09..383bef28 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -160,6 +160,7 @@ SRCDIR_INCLUDES = \ asynot.idl \ asysta.idl \ atlbase.h \ + atlcom.h \ atlwin.h \ audevcod.h \ audiosessiontypes.h \ diff --git a/include/atlcom.h b/include/atlcom.h new file mode 100644 index 0000000..c141fbe --- /dev/null +++ b/include/atlcom.h @@ -0,0 +1,50 @@ +/* + * Copyright 2014 Qian Hong for CodeWeavers + * + * 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 + */ + +#ifndef __WINE_ATLCOM_H__ +#define __WINE_ATLCOM_H__ + +#ifndef __WINE_ATLBASE_H__ +# error You must include atlbase.h to use this header +#endif + +typedef struct ATL_PROPMAP_ENTRY +{ + LPCOLESTR szDesc; +#if _ATL_VER < _ATL_VER_100 + DISPID dispid; + const CLSID *pclsidPropPage; + const IID *piidDispatch; +#else + const CLSID *pclsidPropPage; + const IID *piidDispatch; + void *rgclsidAllowed; + DWORD cclsidAllowed; + DISPID dispid; +#endif + DWORD dwOffsetData; + DWORD dwSizeData; + VARTYPE vt; +} ATL_PROPMAP_ENTRY; + +HRESULT WINAPI AtlIPersistStreamInit_Load(IStream*, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistStreamInit_Save(IStream*, BOOL, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistPropertyBag_Load(IPropertyBag*, IErrorLog*, ATL_PROPMAP_ENTRY*, void*, IUnknown*); +HRESULT WINAPI AtlIPersistPropertyBag_Save(IPropertyBag*, BOOL, BOOL, ATL_PROPMAP_ENTRY*, void*, IUnknown*); + +#endif /* __WINE_ATLCOM_H__ */

1 0

Stefan Dösinger : wined3d: Copy the DIB to sysmem when PIN_SYSMEM is set.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 19f45af19cd0c1162f15d6779506431d1cd99d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f45af19cd0c1162f15d6779… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:34 2014 +0200 wined3d: Copy the DIB to sysmem when PIN_SYSMEM is set. --- dlls/wined3d/surface.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cd3b5a2..dc8c595 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3234,8 +3234,19 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) surface->resource.map_count--; surface->flags &= ~SFLAG_DCINUSE; - if (surface->map_binding == WINED3D_LOCATION_USER_MEMORY) - surface_load_location(surface, WINED3D_LOCATION_USER_MEMORY); + if (surface->map_binding == WINED3D_LOCATION_USER_MEMORY || (surface->flags & SFLAG_PIN_SYSMEM + && surface->map_binding != WINED3D_LOCATION_DIB)) + { + /* The game Salammbo modifies the surface contents without mapping the surface between + * a GetDC/ReleaseDC operation and flipping the surface. If the DIB remains the active + * copy and is copied to the screen, this update, which draws the mouse pointer, is lost. + * Do not only copy the DIB to the map location, but also make sure the map location is + * copied back to the DIB in the next getdc call. + * + * The same consideration applies to user memory surfaces. */ + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, WINED3D_LOCATION_DIB); + } return WINED3D_OK; }

1 0

Stefan Dösinger : ddraw/tests: Test palette alpha behavior.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 8ca711f4286343fb4e5a8116722771a1334f60e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca711f4286343fb4e5a81167… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:38 2014 +0200 ddraw/tests: Test palette alpha behavior. What I care about here is that setting peFlags != 0 doesn't cause errors either during ddraw palette creation or DIB section creation. peFlags isn't an alpha channel, but P8 textures abuse it that way, hence the name of the test. It probably has deeper meaning in DDSCL_NORMAL when the X server is running in 8 bit paletteindexed mode, but I don't think we really care about this. --- dlls/ddraw/tests/ddraw1.c | 158 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 166 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 154 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 154 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 632 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ca711f4286343fb4e5a8…

1 0

Stefan Dösinger : ddraw: Alpha palettes can only be attached to textures.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: a227188573dc727dd6d2c53059c1c093a595be05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a227188573dc727dd6d2c5305… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 15:16:37 2014 +0200 ddraw: Alpha palettes can only be attached to textures. --- dlls/ddraw/surface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d192348..349bbda 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -454,6 +454,13 @@ static HRESULT ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectD TRACE("iface %p, palette %p.\n", surface, palette); + if (palette_impl && palette_impl->flags & DDPCAPS_ALPHA + && !(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + WARN("Alpha palette set on non-texture surface, returning DDERR_INVALIDSURFACETYPE.\n"); + return DDERR_INVALIDSURFACETYPE; + } + if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) return DDERR_INVALIDPIXELFORMAT;

1 0