November 2011 - Wine-Commits

Alexandre Julliard : winex11: Don' t allow setting the cursor across processes while clipping.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 098b11e995860e6074a7a42de7464db683ca8d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098b11e995860e6074a7a42de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 9 14:26:34 2011 +0100 winex11: Don't allow setting the cursor across processes while clipping. --- dlls/winex11.drv/mouse.c | 13 ++++++++++--- dlls/winex11.drv/window.c | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 033f94c..83c714a 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -420,6 +420,7 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) } clip_rect = *clip; if (!data->clip_hwnd) sync_window_cursor( clip_window ); + InterlockedExchangePointer( (void **)&cursor_window, msg_hwnd ); data->clip_hwnd = msg_hwnd; SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); return TRUE; @@ -542,9 +543,16 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU if (!hwnd) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); + HWND clip_hwnd = thread_data->clip_hwnd; - if (!thread_data->clip_hwnd) return; + if (!clip_hwnd) return; if (thread_data->clip_window != window) return; + if (InterlockedExchangePointer( (void **)&cursor_window, clip_hwnd ) != clip_hwnd || + GetTickCount() - last_cursor_change > 100) + { + sync_window_cursor( window ); + last_cursor_change = GetTickCount(); + } input->u.mi.dx += clip_rect.left; input->u.mi.dy += clip_rect.top; __wine_send_input( hwnd, input ); @@ -1215,8 +1223,7 @@ void CDECL X11DRV_SetCursor( HCURSOR handle ) GetTickCount() - last_cursor_change > 100) { last_cursor_change = GetTickCount(); - if (clipping_cursor) set_window_cursor( init_clip_window(), handle ); - else if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); } } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6a87afc..ed4f570 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2699,6 +2699,8 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_SET_CURSOR: if ((data = X11DRV_get_win_data( hwnd )) && data->whole_window) set_window_cursor( data->whole_window, (HCURSOR)lp ); + else if (hwnd == x11drv_thread_data()->clip_hwnd) + set_window_cursor( x11drv_thread_data()->clip_window, (HCURSOR)lp ); return 0; case WM_X11DRV_CLIP_CURSOR: return clip_cursor_notify( hwnd, (HWND)lp );

1 0

Hans Leidekker : winhttp: Use a separate function to set request parameters .
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 5d6425498695ca26791301f23af5f2ef95f1b07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6425498695ca26791301f23… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:05:07 2011 +0100 winhttp: Use a separate function to set request parameters. --- dlls/winhttp/request.c | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 899e8b5..51c433e 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2841,6 +2841,25 @@ error: return HRESULT_FROM_WIN32( err ); } +static DWORD request_set_parameters( struct winhttp_request *request ) +{ + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_PROXY, &request->proxy, + sizeof(request->proxy) )) return get_last_error(); + + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_AUTOLOGON_POLICY, &request->logon_policy, + sizeof(request->logon_policy) )) return get_last_error(); + + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &request->disable_feature, + sizeof(request->disable_feature) )) return get_last_error(); + + if (!WinHttpSetTimeouts( request->hrequest, + request->resolve_timeout, + request->connect_timeout, + request->send_timeout, + request->receive_timeout )) return get_last_error(); + return ERROR_SUCCESS; +} + static HRESULT request_send( struct winhttp_request *request ) { SAFEARRAY *sa = NULL; @@ -2851,28 +2870,7 @@ static HRESULT request_send( struct winhttp_request *request ) BOOL ret; DWORD err; - if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_PROXY, &request->proxy, sizeof(request->proxy) )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } - if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_AUTOLOGON_POLICY, &request->logon_policy, - sizeof(request->logon_policy) )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } - if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &request->disable_feature, - sizeof(request->disable_feature) )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } - if (!WinHttpSetTimeouts( request->hrequest, - request->resolve_timeout, - request->connect_timeout, - request->send_timeout, - request->receive_timeout )) - { - return HRESULT_FROM_WIN32( get_last_error() ); - } + if ((err = request_set_parameters( request ))) return HRESULT_FROM_WIN32( err ); VariantInit( &data ); if (strcmpW( request->verb, getW ) && VariantChangeType( &data, &request->data, 0, VT_ARRAY|VT_UI1 ) == S_OK) {

1 0

Hans Leidekker : scrrun: New dll.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 8e74ee58d510eb1c770941a6b0fdca83147aa195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e74ee58d510eb1c770941a6b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:03:53 2011 +0100 scrrun: New dll. --- configure | 1 + configure.ac | 1 + dlls/scrrun/Makefile.in | 5 +++++ dlls/scrrun/scrrun.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/scrrun/scrrun.spec | 6 ++++++ 5 files changed, 56 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 46cbd5f..6762f90 100755 --- a/configure +++ b/configure @@ -15138,6 +15138,7 @@ wine_fn_config_dll scarddlg enable_scarddlg wine_fn_config_dll sccbase enable_sccbase wine_fn_config_dll schannel enable_schannel wine_fn_config_test dlls/schannel/tests schannel_test +wine_fn_config_dll scrrun enable_scrrun wine_fn_config_dll secur32 enable_secur32 implib wine_fn_config_test dlls/secur32/tests secur32_test wine_fn_config_dll security enable_security diff --git a/configure.ac b/configure.ac index 76e8e95..36a7642 100644 --- a/configure.ac +++ b/configure.ac @@ -2756,6 +2756,7 @@ WINE_CONFIG_DLL(scarddlg) WINE_CONFIG_DLL(sccbase) WINE_CONFIG_DLL(schannel) WINE_CONFIG_TEST(dlls/schannel/tests) +WINE_CONFIG_DLL(scrrun) WINE_CONFIG_DLL(secur32,,[implib]) WINE_CONFIG_TEST(dlls/secur32/tests) WINE_CONFIG_DLL(security) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in new file mode 100644 index 0000000..46d8748 --- /dev/null +++ b/dlls/scrrun/Makefile.in @@ -0,0 +1,5 @@ +MODULE = scrrun.dll + +C_SRCS = scrrun.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c new file mode 100644 index 0000000..84a7bef --- /dev/null +++ b/dlls/scrrun/scrrun.c @@ -0,0 +1,43 @@ +/* + * Copyright 2011 Hans Leidekker 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 + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scrrun); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + TRACE("%p, %u, %p\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/scrrun/scrrun.spec b/dlls/scrrun/scrrun.spec new file mode 100644 index 0000000..5316d8f --- /dev/null +++ b/dlls/scrrun/scrrun.spec @@ -0,0 +1,6 @@ +@ stub DLLGetDocumentation +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub DoOpenPipeStream

1 0

Dmitry Timoshkov : gdi32: Remove a duplicated line of code.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 6acf226fa11efcf0832548aee377fdc4931e80b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6acf226fa11efcf0832548aee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 9 12:50:27 2011 +0800 gdi32: Remove a duplicated line of code. --- dlls/gdi32/tests/brush.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index c6c7678..4f44d03 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -287,10 +287,7 @@ static void test_palette_brush(void) DWORD expect = (pal->palPalEntry[255 - i].peRed << 16 | pal->palPalEntry[255 - i].peGreen << 8 | pal->palPalEntry[255 - i].peBlue); - if (expect) - ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); - else - ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); + ok( dib_bits[i] == expect, "wrong bits %x/%x at %u,%u\n", dib_bits[i], expect, i % 16, i / 16 ); } DeleteDC( hdc ); DeleteObject( dib );

1 0

Hans Leidekker : winhttp: Fix sending data with synchronous requests.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 82965248d141042ad712a2b6aedd80010ce8a12e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82965248d141042ad712a2b6a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 9 15:04:41 2011 +0100 winhttp: Fix sending data with synchronous requests. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0d9e60a..899e8b5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2931,9 +2931,9 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return S_OK; } + request->data = body; if (request->wait) /* async request */ { - request->data = body; if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) { LeaveCriticalSection( &request->cs );

1 0

Alexandre Julliard : gdi32: Add a CopyBitmap driver entry point.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 9391c6a757bb9441064c27250d8733ab596b3563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9391c6a757bb9441064c27250… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 21:46:25 2011 +0100 gdi32: Add a CopyBitmap driver entry point. --- dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/path.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 10 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 5a7d011..3adf246 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -523,6 +523,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ dibdrv_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 0986d68..b72d6d7 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -209,6 +209,11 @@ static BOOL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom return TRUE; } +static BOOL nulldrv_CopyBitmap( HBITMAP src, HBITMAP dst ) +{ + return TRUE; +} + static BOOL nulldrv_CreateBitmap( PHYSDEV dev, HBITMAP bitmap ) { return TRUE; @@ -747,6 +752,7 @@ const struct gdi_dc_funcs null_driver = nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */ nulldrv_Chord, /* pChord */ nulldrv_CloseFigure, /* pCloseFigure */ + nulldrv_CopyBitmap, /* pCopyBitmap */ nulldrv_CreateBitmap, /* pCreateBitmap */ nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */ nulldrv_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 11918c1..f4fa4d3 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -47,6 +47,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = NULL, /* pChoosePixelFormat */ EMFDRV_Chord, /* pChord */ EMFDRV_CloseFigure, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1fedc74..9137322 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7117,6 +7117,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ freetype_CreateDC, /* pCreateDC */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index d738725..b837d84 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -92,6 +92,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pChoosePixelFormat */ MFDRV_Chord, /* pChord */ MFDRV_CloseFigure, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index d908774..dfe15ed 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2265,6 +2265,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pChoosePixelFormat */ pathdrv_Chord, /* pChord */ pathdrv_CloseFigure, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ pathdrv_CreateDC, /* pCreateDC */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e6a0254..e61df3e 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -829,6 +829,7 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pChoosePixelFormat */ PSDRV_Chord, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ NULL, /* pCreateBitmap */ PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ PSDRV_CreateDC, /* pCreateDC */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 484ab7f..6574270 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -476,6 +476,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_ChoosePixelFormat, /* pChoosePixelFormat */ X11DRV_Chord, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ X11DRV_CreateBitmap, /* pCreateBitmap */ X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */ X11DRV_CreateDC, /* pCreateDC */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a61568e..30b9553 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -3060,6 +3060,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pChoosePixelFormat */ NULL, /* pChord */ NULL, /* pCloseFigure */ + NULL, /* pCopyBitmap */ xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateDC, /* pCreateDC */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index cb12145..d996fb4 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -65,6 +65,7 @@ struct gdi_dc_funcs INT (*pChoosePixelFormat)(PHYSDEV,const PIXELFORMATDESCRIPTOR *); BOOL (*pChord)(PHYSDEV,INT,INT,INT,INT,INT,INT,INT,INT); BOOL (*pCloseFigure)(PHYSDEV); + BOOL (*pCopyBitmap)(HBITMAP,HBITMAP); BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP); BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); @@ -204,7 +205,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 18 +#define WINE_GDI_DRIVER_VERSION 19 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Henri Verbeet : wined3d: Simplify context_choose_pixel_format().
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 81ae0cea7c56aa6a472dbf43f6c9d89bfc5ff612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ae0cea7c56aa6a472dbf43f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 8 20:48:57 2011 +0100 wined3d: Simplify context_choose_pixel_format(). Simply rank the formats instead of doing multiple passes over the list. --- dlls/wined3d/context.c | 150 +++++++++++++--------------------------- dlls/wined3d/directx.c | 20 ----- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 49 insertions(+), 122 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 31a604c..355dccf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1124,33 +1124,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC BOOL auxBuffers, BOOL findCompatible) { int iPixelFormat=0; - unsigned int matchtry; BYTE redBits, greenBits, blueBits, alphaBits, colorBits; BYTE depthBits=0, stencilBits=0; - - static const struct - { - BOOL require_aux; - BOOL exact_alpha; - BOOL exact_color; - } - matches[] = - { - /* First, try without alpha match buffers. MacOS supports aux buffers only - * on A8R8G8B8, and we prefer better offscreen rendering over an alpha match. - * Then try without aux buffers - this is the most common cause for not - * finding a pixel format. Also some drivers(the open source ones) - * only offer 32 bit ARB pixel formats. First try without an exact alpha - * match, then try without an exact alpha and color match. - */ - { TRUE, TRUE, TRUE }, - { TRUE, FALSE, TRUE }, - { FALSE, TRUE, TRUE }, - { FALSE, FALSE, TRUE }, - { TRUE, FALSE, FALSE }, - { FALSE, FALSE, FALSE }, - }; - + unsigned int current_value; unsigned int cfg_count = device->adapter->cfg_count; unsigned int i; @@ -1167,84 +1143,56 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC getDepthStencilBits(ds_format, &depthBits, &stencilBits); - for (matchtry = 0; matchtry < (sizeof(matches) / sizeof(*matches)) && !iPixelFormat; ++matchtry) - { - for (i = 0; i < cfg_count; ++i) - { - const struct wined3d_pixel_format *cfg = &device->adapter->cfgs[i]; - BOOL exactDepthMatch = TRUE; - - /* For now only accept RGBA formats. Perhaps some day we will - * allow floating point formats for pbuffers. */ - if(cfg->iPixelType != WGL_TYPE_RGBA_ARB) - continue; - - /* In window mode we need a window drawable format and double buffering. */ - if(!(cfg->windowDrawable && cfg->doubleBuffer)) - continue; - - /* We like to have aux buffers in backbuffer mode */ - if(auxBuffers && !cfg->auxBuffers && matches[matchtry].require_aux) - continue; - - if(matches[matchtry].exact_color) { - if(cfg->redSize != redBits) - continue; - if(cfg->greenSize != greenBits) - continue; - if(cfg->blueSize != blueBits) - continue; - } else { - if(cfg->redSize < redBits) - continue; - if(cfg->greenSize < greenBits) - continue; - if(cfg->blueSize < blueBits) - continue; - } - if(matches[matchtry].exact_alpha) { - if(cfg->alphaSize != alphaBits) - continue; - } else { - if(cfg->alphaSize < alphaBits) - continue; - } - - /* We try to locate a format which matches our requirements exactly. In case of - * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ - if(cfg->depthSize < depthBits) - continue; - else if(cfg->depthSize > depthBits) - exactDepthMatch = FALSE; - - /* In all cases make sure the number of stencil bits matches our requirements - * even when we don't need stencil because it could affect performance EXCEPT - * on cards which don't offer depth formats without stencil like the i915 drivers - * on Linux. */ - if (stencilBits != cfg->stencilSize - && !(device->adapter->brokenStencil && stencilBits <= cfg->stencilSize)) - continue; - - /* Check multisampling support */ - if (cfg->numSamples) - continue; - - /* When we have passed all the checks then we have found a format which matches our - * requirements. Note that we only check for a limit number of capabilities right now, - * so there can easily be a dozen of pixel formats which appear to be the 'same' but - * can still differ in things like multisampling, stereo, SRGB and other flags. - */ - - /* Exit the loop as we have found a format :) */ - if(exactDepthMatch) { - iPixelFormat = cfg->iPixelFormat; - break; - } else if(!iPixelFormat) { - /* In the end we might end up with a format which doesn't exactly match our depth - * requirements. Accept the first format we found because formats with higher iPixelFormat - * values tend to have more extended capabilities (e.g. multisampling) which we don't need. */ - iPixelFormat = cfg->iPixelFormat; - } + current_value = 0; + for (i = 0; i < cfg_count; ++i) + { + const struct wined3d_pixel_format *cfg = &device->adapter->cfgs[i]; + unsigned int value; + + /* For now only accept RGBA formats. Perhaps some day we will + * allow floating point formats for pbuffers. */ + if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) + continue; + /* In window mode we need a window drawable format and double buffering. */ + if (!(cfg->windowDrawable && cfg->doubleBuffer)) + continue; + if (cfg->redSize < redBits) + continue; + if (cfg->greenSize < greenBits) + continue; + if (cfg->blueSize < blueBits) + continue; + if (cfg->alphaSize < alphaBits) + continue; + if (cfg->depthSize < depthBits) + continue; + if (stencilBits && cfg->stencilSize != stencilBits) + continue; + /* Check multisampling support. */ + if (cfg->numSamples) + continue; + + value = 1; + /* We try to locate a format which matches our requirements exactly. In case of + * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ + if (cfg->depthSize == depthBits) + value += 1; + if (cfg->stencilSize == stencilBits) + value += 2; + if (cfg->alphaSize == alphaBits) + value += 4; + /* We like to have aux buffers in backbuffer mode */ + if (auxBuffers && cfg->auxBuffers) + value += 8; + if (cfg->redSize == redBits + && cfg->greenSize == greenBits + && cfg->blueSize == blueBits) + value += 16; + + if (value > current_value) + { + iPixelFormat = cfg->iPixelFormat; + current_value = value; } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 44fd88d..ad79276 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5260,7 +5260,6 @@ static BOOL InitAdapters(struct wined3d *wined3d) struct wined3d_pixel_format *cfgs; int iPixelFormat; int res; - int i; DISPLAY_DEVICEW DisplayDevice; HDC hdc; @@ -5439,25 +5438,6 @@ static BOOL InitAdapters(struct wined3d *wined3d) } } - /* D16, D24X8 and D24S8 are common depth / depth+stencil formats. All drivers support them though this doesn't - * mean that the format is offered in hardware. For instance Geforce8 cards don't have offer D16 in hardware - * but just fake it using D24(X8?) which is fine. D3D also allows that. - * Some display drivers (i915 on Linux) only report mixed depth+stencil formats like D24S8. MSDN clearly mentions - * that only on lockable formats (e.g. D16_locked) the bit order is guaranteed and that on other formats the - * driver is allowed to consume more bits EXCEPT for stencil bits. - * - * Mark an adapter with this broken stencil behavior. - */ - adapter->brokenStencil = TRUE; - for (i = 0, cfgs = adapter->cfgs; i < adapter->cfg_count; ++i) - { - /* Nearly all drivers offer depth formats without stencil, only on i915 this if-statement won't be entered. */ - if(cfgs[i].depthSize && !cfgs[i].stencilSize) { - adapter->brokenStencil = FALSE; - break; - } - } - WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48a302a..ef09e26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1527,7 +1527,6 @@ struct wined3d_adapter WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ unsigned int cfg_count; struct wined3d_pixel_format *cfgs; - BOOL brokenStencil; /* Set on cards which only offer mixed depth+stencil */ unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */ unsigned int UsedTextureRam; LUID luid;

1 0

Andrew Talbot : user32: Suppress sign-extension through integer promotion.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 7e31baba31880e1859e3ab107db8daaf403059ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e31baba31880e1859e3ab107… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 8 22:23:49 2011 +0000 user32: Suppress sign-extension through integer promotion. --- dlls/user32/wsprintf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index 5e618d6..17d39a4 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -475,7 +475,7 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a case WPR_STRING: { LPCSTR ptr = argData.lpcstr_view; - for (i = 0; i < len; i++) *p++ = (WCHAR)*ptr++; + for (i = 0; i < len; i++) *p++ = (BYTE)*ptr++; } break; case WPR_WSTRING: @@ -501,7 +501,7 @@ static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list a /* fall through */ case WPR_UNSIGNED: for (i = len; i < format.precision; i++, maxlen--) *p++ = '0'; - for (i = sign; i < len; i++) *p++ = (WCHAR)number[i]; + for (i = sign; i < len; i++) *p++ = (BYTE)number[i]; break; case WPR_UNKNOWN: continue;

1 0

Aric Stewart : usp10: Better understand and handle numbers level in RTL runs.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 65710af292995683537bdf707313e8638da81cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=65710af292995683537bdf707… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 8 14:41:53 2011 -0600 usp10: Better understand and handle numbers level in RTL runs. --- dlls/usp10/tests/usp10.c | 2 +- dlls/usp10/usp10.c | 30 +++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 13211de..a6e75a1 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -153,7 +153,7 @@ static void test_ScriptItemize( void ) /* Arabic, English*/ static const WCHAR test2[] = {'1','2','3','-','5','2',0x064a,0x064f,0x0633,0x0627,0x0648,0x0650,0x064a,'7','1','.',0}; static const itemTest t21[7] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},3,0,0,0,0},{{0,0,0,0,0},4,0,0,0,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,0,0,0},13,0,0,0,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; - static const itemTest t22[5] = {{{0,0,0,1,0},0,0,0,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,1,0,0},13,0,1,2,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; + static const itemTest t22[5] = {{{0,0,0,0,0},0,0,0,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,1,0,0},13,0,1,2,0},{{0,0,0,0,0},15,0,0,0,0},{{0,0,0,0,0},16,0,0,0,-1}}; static const itemTest t23[5] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,1,0,0},13,0,1,2,0},{{0,0,0,0,0},15,1,1,1,0},{{0,0,0,0,0},16,0,0,0,-1}}; static const WCHAR test2b[] = {'A','B','C','-','D','E','F',' ',0x0621,0x0623,0x0624,0}; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c1837d9..a811cad 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -806,10 +806,34 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } else { - if (!psControl->fMergeNeutralItems) + BOOL inNumber = FALSE; + static WCHAR math_punc[] = {'#','$','%','+',',','-','.','/',':',0x2212, 0x2044, 0x00a0,0}; + + strength = heap_alloc_zero(cInChars * sizeof(WORD)); + if (!strength) + { + heap_free(levels); + return E_OUTOFMEMORY; + } + BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength); + + /* Script_Numeric and select puncuation at level 0 get bumped to level 2 */ + for (i = 0; i < cInChars; i++) + { + if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && inNumber && strchrW(math_punc,pwcInChars[i])) + levels[i] = 2; + else if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && get_char_script(pwcInChars[i]) == Script_Numeric) + { + levels[i] = 2; + inNumber = TRUE; + } + else + inNumber = FALSE; + } + if (psControl->fMergeNeutralItems) { - strength = heap_alloc_zero(cInChars * sizeof(WORD)); - BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength); + HeapFree(GetProcessHeap(),0,strength); + strength = NULL; } } }

1 0

Aric Stewart : usp10: Better handle the absorption of whitespace in bidi runs.
by Alexandre Julliard Nov. 9, 2011

Nov. 9, 2011

Module: wine Branch: master Commit: 2781ac1e6d7c6a83f7601aab0def68cd6345f9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2781ac1e6d7c6a83f7601aab0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 8 14:41:42 2011 -0600 usp10: Better handle the absorption of whitespace in bidi runs. --- dlls/usp10/tests/usp10.c | 6 +++--- dlls/usp10/usp10.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 955e19d..13211de 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -164,7 +164,7 @@ static void test_ScriptItemize( void ) /* leading space */ static const WCHAR test2c[] = {' ',0x0621,0x0623,0x0624,'A','B','C','-','D','E','F',0}; static const itemTest t2c1[5] = {{{0,0,0,0,0},0,1,1,1,arab_tag},{{0,0,0,0,0},4,0,0,0,latn_tag},{{0,0,0,0,0},7,0,0,0,0},{{0,0,0,0,0},8,0,0,0,latn_tag},{{0,0,0,0,0},11,0,0,0,-1}}; - static const itemTest t2c2[6] = {{{0,0,0,0,1},0,0,0,0,0},{{0,0,0,0,0},1,1,1,1,arab_tag},{{0,0,0,0,0},4,0,0,0,latn_tag},{{0,0,0,0,0},7,0,0,0,0},{{0,0,0,0,0},8,0,0,0,latn_tag},{{0,0,0,0,0},11,0,0,0,-1}}; + static const itemTest t2c2[6] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},1,1,1,1,arab_tag},{{0,0,0,0,0},4,0,0,0,latn_tag},{{0,0,0,0,0},7,0,0,0,0},{{0,0,0,0,0},8,0,0,0,latn_tag},{{0,0,0,0,0},11,0,0,0,-1}}; static const itemTest t2c3[5] = {{{0,0,0,0,0},0,1,1,1,arab_tag},{{0,0,0,0,0},4,0,0,2,latn_tag},{{0,0,0,0,0},7,0,0,2,0},{{0,0,0,0,0},8,0,0,2,latn_tag},{{0,0,0,0,0},11,0,0,0,-1}}; static const itemTest t2c4[3] = {{{0,0,0,0,0},0,1,1,1,arab_tag},{{0,0,0,0,0},4,0,0,2,latn_tag},{{0,0,0,0,0},11,0,0,0,-1}}; @@ -188,8 +188,8 @@ static void test_ScriptItemize( void ) static const WCHAR test4[] = {'1','2','3','-','5','2',' ','i','s',' ','7','1','.',0}; static const itemTest t41[6] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},3,0,0,0,0},{{0,0,0,0,0},4,0,0,0,0},{{0,0,0,0,0},7,0,0,0,latn_tag},{{0,0,0,0,0},10,0,0,0,0},{{0,0,0,0,0},12,0,0,0,-1}}; - static const itemTest t42[5] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,1},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},10,0,0,2,0},{{0,0,0,0,0},12,0,0,0,-1}}; - static const itemTest t43[4] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,1},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},12,0,0,0,-1}}; + static const itemTest t42[5] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},10,0,0,2,0},{{0,0,0,0,0},12,0,0,0,-1}}; + static const itemTest t43[4] = {{{0,0,1,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,0},{{0,0,0,0,0},7,0,0,2,latn_tag},{{0,0,0,0,0},12,0,0,0,-1}}; /* Arabic */ static const WCHAR test5[] = diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a19ed81..c1837d9 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -814,7 +814,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } } - while ((pwcInChars[cnt] == Numeric_space || pwcInChars[cnt] == ZWJ || pwcInChars[cnt] == ZWNJ) && cnt < cInChars) + while ((!levels || (levels && levels[cnt+1] == levels[0])) && (pwcInChars[cnt] == Numeric_space || pwcInChars[cnt] == ZWJ || pwcInChars[cnt] == ZWNJ) && cnt < cInChars) cnt++; if (cnt == cInChars) /* All Spaces */ @@ -858,9 +858,9 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int else if (levels) { int j = 1; - while (cnt + j < cInChars - 1 && (pwcInChars[cnt+j] == Numeric_space || pwcInChars[cnt+j] == ZWJ || pwcInChars[cnt+j] == ZWNJ)) + while (cnt + j < cInChars - 1 && (pwcInChars[cnt+j] == Numeric_space || pwcInChars[cnt+j] == ZWJ || pwcInChars[cnt+j] == ZWNJ) && levels[cnt] == levels[cnt+j]) j++; - if (cnt + j < cInChars) + if (cnt + j < cInChars && levels[cnt] == levels[cnt+j]) New_Script = get_char_script(pwcInChars[cnt+j]); else New_Script = get_char_script(pwcInChars[cnt]);

1 0