July 2010 - Wine-Commits - list.winehq.org

Stefan Dösinger : d3d9: Remove the shader version varying tests.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: a554d1e2968de4eb21f1d20a7c40ff7fdb0bb7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a554d1e2968de4eb21f1d20a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 6 13:00:17 2010 +0200 d3d9: Remove the shader version varying tests. My Windows 7 installation rejects mixing ps_3_0 with anything other than vs_3_0 and vice versa, making testing how those versions pass varyings moot. Since I have never seen an app mixing 3.0 and non-3.0 shaders I see no reason to keep the tests. --- dlls/d3d9/tests/visual.c | 393 ---------------------------------------------- 1 files changed, 0 insertions(+), 393 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a554d1e2968de4eb21f1d…

1 0

Dmitry Timoshkov : winex11: Remember last window that had the XIC focus and use it in ToUnicode() to make dead keys work more reliably.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: a56df96a0e6063a44c83ffd8fc330b1f92c02f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56df96a0e6063a44c83ffd8f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jul 23 22:21:58 2010 +0900 winex11: Remember last window that had the XIC focus and use it in ToUnicode() to make dead keys work more reliably. --- dlls/winex11.drv/keyboard.c | 10 +++++++--- dlls/winex11.drv/window.c | 3 +++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d9da4d2..02fd6bb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2541,9 +2541,13 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState e.state = 0; e.type = KeyPress; - focus = GetFocus(); - if (focus) focus = GetAncestor( focus, GA_ROOT ); - if (!focus) focus = GetActiveWindow(); + focus = x11drv_thread_data()->last_xic_hwnd; + if (!focus) + { + focus = GetFocus(); + if (focus) focus = GetAncestor( focus, GA_ROOT ); + if (!focus) focus = GetActiveWindow(); + } e.window = X11DRV_get_whole_window( focus ); xic = X11DRV_get_ic( focus ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index eb6432e..b3118cc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1862,6 +1862,7 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) } if (thread_data->last_focus == hwnd) thread_data->last_focus = 0; + if (thread_data->last_xic_hwnd == hwnd) thread_data->last_xic_hwnd = 0; if (data->hWMIconBitmap) DeleteObject( data->hWMIconBitmap ); if (data->hWMIconMask) DeleteObject( data->hWMIconMask); wine_tsx11_lock(); @@ -2080,6 +2081,8 @@ XIC X11DRV_get_ic( HWND hwnd ) XIM xim; if (!data) return 0; + + x11drv_thread_data()->last_xic_hwnd = hwnd; if (data->xic) return data->xic; if (!(xim = x11drv_thread_data()->xim)) return 0; return X11DRV_CreateIC( xim, data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b8362fa..4aaab35 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -548,6 +548,7 @@ struct x11drv_thread_data Window grab_window; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ + HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ HKL kbd_layout; /* active keyboard layout */

1 0

Alexandre Julliard : gdi.exe: Disable the remaining 16-bit visible region functions, they can't work.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: b644c8538ab81be7e057f8bd2c36d4f15cdee403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b644c8538ab81be7e057f8bd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:26:38 2010 +0200 gdi.exe: Disable the remaining 16-bit visible region functions, they can't work. --- dlls/gdi.exe16/gdi.c | 38 ++++++-------------------------------- 1 files changed, 6 insertions(+), 32 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 85dfef8..4eff2bc 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -1776,7 +1776,8 @@ BOOL16 WINAPI PtVisible16( HDC16 hdc, INT16 x, INT16 y ) */ INT16 WINAPI SelectVisRgn16( HDC16 hdc, HRGN16 hrgn ) { - return SelectVisRgn( HDC_32(hdc), HRGN_32(hrgn) ); + FIXME( "%04x %04x no longer supported\n", hdc, hrgn ); + return ERROR; } @@ -3703,21 +3704,8 @@ INT16 WINAPI IntersectVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right */ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc16 ) { - struct saved_visrgn *saved; - HDC hdc = HDC_32( hdc16 ); - - TRACE("%p\n", hdc ); - - if (!(saved = HeapAlloc( GetProcessHeap(), 0, sizeof(*saved) ))) return 0; - if (!(saved->hrgn = CreateRectRgn( 0, 0, 0, 0 ))) - { - HeapFree( GetProcessHeap(), 0, saved ); - return 0; - } - saved->hdc = hdc; - GetRandomRgn( hdc, saved->hrgn, SYSRGN ); - list_add_head( &saved_regions, &saved->entry ); - return HRGN_16(saved->hrgn); + FIXME( "%04x no longer supported\n", hdc16 ); + return 0; } @@ -3726,22 +3714,8 @@ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc16 ) */ INT16 WINAPI RestoreVisRgn16( HDC16 hdc16 ) { - struct saved_visrgn *saved; - HDC hdc = HDC_32( hdc16 ); - INT16 ret = ERROR; - - TRACE("%p\n", hdc ); - - LIST_FOR_EACH_ENTRY( saved, &saved_regions, struct saved_visrgn, entry ) - { - if (saved->hdc != hdc) continue; - ret = SelectVisRgn( hdc, saved->hrgn ); - list_remove( &saved->entry ); - DeleteObject( saved->hrgn ); - HeapFree( GetProcessHeap(), 0, saved ); - break; - } - return ret; + FIXME( "%04x no longer supported\n", hdc16 ); + return ERROR; }

1 0

Hans Leidekker : msi/tests: Skip a test if the current user has insufficient rights.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 9686c95749ed604d13fac1504b30c953897e1ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9686c95749ed604d13fac1504… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 26 12:09:12 2010 +0200 msi/tests: Skip a test if the current user has insufficient rights. --- dlls/msi/tests/msi.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 06f85b5..dc023f4 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -297,6 +297,13 @@ static void test_null(void) } r = RegSetValueA(hkey, NULL, REG_SZ, "test", strlen("test")); + if (r == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to perform tests\n"); + HeapFree(GetProcessHeap(), 0, lpData); + RegCloseKey(hkey); + return; + } ok( r == ERROR_SUCCESS, "wrong error %d\n", r); r = MsiGetProductInfoA("", "", NULL, NULL);

1 0

Hans Leidekker : include: Add the TOKEN_ELEVATION_TYPE enumeration.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: deb1c552d6d9f998c77fc599ddc5ccde5eb85df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb1c552d6d9f998c77fc599d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 26 12:09:37 2010 +0200 include: Add the TOKEN_ELEVATION_TYPE enumeration. --- include/winnt.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e29444a..0bcb31b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3800,6 +3800,12 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _TOKEN_ELEVATION_TYPE { + TokenElevationTypeDefault = 1, + TokenElevationTypeFull, + TokenElevationTypeLimited +} TOKEN_ELEVATION_TYPE, *PTOKEN_ELEVATION_TYPE; + /* * TOKEN_INFORMATION_CLASS */

1 0

Hans Leidekker : msi/tests: Skip tests if UAC is enabled and the process is not running elevated.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 33b6ad7f73ea511939a0f4ddf79f125f0dec3ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33b6ad7f73ea511939a0f4ddf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 26 12:09:57 2010 +0200 msi/tests: Skip tests if UAC is enabled and the process is not running elevated. --- dlls/msi/tests/install.c | 362 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/package.c | 35 +++++ dlls/msi/tests/patch.c | 40 +++++ 3 files changed, 437 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33b6ad7f73ea511939a0f…

1 0

Henri Verbeet : wined3d: Cleanup Get/SetRenderState traces a bit.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 3e37b27d37f23c676c73d0e900cf26e42080376a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e37b27d37f23c676c73d0e90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:35 2010 +0200 wined3d: Cleanup Get/SetRenderState traces a bit. --- dlls/wined3d/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d59a5e7..be473d7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3018,7 +3018,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; DWORD oldValue = This->stateBlock->renderState[State]; - TRACE("(%p)->state = %s(%d), value = %d\n", This, debug_d3drenderstate(State), State, Value); + TRACE("iface %p, state %s (%#x), value %#x.\n", iface, debug_d3drenderstate(State), State, Value); This->updateStateBlock->changed.renderState[State >> 5] |= 1 << (State & 0x1f); This->updateStateBlock->renderState[State] = Value; @@ -3041,7 +3041,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderState(IWineD3DDevice *iface, WINED3DRENDERSTATETYPE State, DWORD *pValue) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) for State %d = %d\n", This, State, This->stateBlock->renderState[State]); + + TRACE("iface %p, state %s (%#x), value %p.\n", iface, debug_d3drenderstate(State), State, pValue); + *pValue = This->stateBlock->renderState[State]; return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Add a missing return statement to surface_prepare_texture().
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 6874743e78c718ffe318646ece04d79f2dfc161a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6874743e78c718ffe318646ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:34 2010 +0200 wined3d: Add a missing return statement to surface_prepare_texture(). Calling surface_prepare_texture_internal() twice on the same surface is harmless, but unnecessary. --- dlls/wined3d/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 662cdb8..561e9c9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1569,6 +1569,8 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ } IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture); + + return; } surface_prepare_texture_internal(surface, gl_info, srgb);

1 0

Henri Verbeet : wined3d: Merge strect_rect_fbo() and surface_load_srgb_fbo( ).
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 0bf68b846adde16fe19d4b7814d866ba1e4d012a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf68b846adde16fe19d4b781… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:33 2010 +0200 wined3d: Merge strect_rect_fbo() and surface_load_srgb_fbo(). --- dlls/wined3d/device.c | 132 --------------------------- dlls/wined3d/surface.c | 196 +++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 4 - 3 files changed, 155 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf68b846adde16fe19d4…

1 0

Henri Verbeet : wined3d: Do RGB <=> sRGB transfers using FBO blits.
by Alexandre Julliard July 26, 2010

July 26, 2010

Module: wine Branch: master Commit: 943fb2fb578b9d3d2fcd9c4e72bf465fde8e245d URL: http://source.winehq.org/git/wine.git/?a=commit;h=943fb2fb578b9d3d2fcd9c4e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 26 12:06:32 2010 +0200 wined3d: Do RGB <=> sRGB transfers using FBO blits. Concept based on a patch by Stefan. --- dlls/wined3d/context.c | 104 +++++++++++++++++++++++++++------------- dlls/wined3d/device.c | 4 +- dlls/wined3d/surface.c | 47 ++++++++++++++++++ dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/utils.c | 20 ++++++++ dlls/wined3d/wined3d_private.h | 6 ++- 6 files changed, 145 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=943fb2fb578b9d3d2fcd9…

1 0