November 2011 - Wine-Commits

Alexandre Julliard : ole32: Process all pending messages in CoWaitForMultipleHandles before waiting again , otherwise we may not wake up.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 0f3e60747f1958eaa6ef5ff31f65eb3e77da146f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3e60747f1958eaa6ef5ff31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 21:22:40 2011 +0100 ole32: Process all pending messages in CoWaitForMultipleHandles before waiting again, otherwise we may not wake up. --- dlls/ole32/compobj.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4579f0a..72ba32a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3650,7 +3650,7 @@ HRESULT WINAPI CoRevertToSelf(void) static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) { /* first try to retrieve messages for incoming COM calls to the apartment window */ - return PeekMessageW(msg, apt->win, WM_USER, WM_APP - 1, PM_REMOVE|PM_NOYIELD) || + return PeekMessageW(msg, apt->win, 0, 0, PM_REMOVE|PM_NOYIELD) || /* next retrieve other messages necessary for the app to remain responsive */ PeekMessageW(msg, NULL, WM_DDE_FIRST, WM_DDE_LAST, PM_REMOVE|PM_NOYIELD) || PeekMessageW(msg, NULL, 0, 0, PM_QS_PAINT|PM_QS_SENDMESSAGE|PM_REMOVE|PM_NOYIELD); @@ -3712,7 +3712,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, res = MsgWaitForMultipleObjectsEx(cHandles, pHandles, (dwTimeout == INFINITE) ? INFINITE : start_time + dwTimeout - now, - QS_ALLINPUT, wait_flags); + QS_SENDMESSAGE | QS_ALLPOSTMESSAGE | QS_PAINT, wait_flags); if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { @@ -3746,11 +3746,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } } - /* note: using "if" here instead of "while" might seem less - * efficient, but only if we are optimising for quick delivery - * of pending messages, rather than quick completion of the - * COM call */ - if (COM_PeekMessage(apt, &msg)) + while (COM_PeekMessage(apt, &msg)) { TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); TranslateMessage(&msg); @@ -3761,6 +3757,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, PostQuitMessage(msg.wParam); /* no longer need to process messages */ message_loop = FALSE; + break; } } continue;

1 0

Frédéric Delanoy : cmd: Reorder global vars declarations/definitions to improve readability.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: a5becedd0e869ec979e933fda61a8010aedca9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5becedd0e869ec979e933fda… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:52 2011 +0100 cmd: Reorder global vars declarations/definitions to improve readability. --- programs/cmd/builtins.c | 23 ++++++++++------------- programs/cmd/wcmdmain.c | 29 ++++++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7a8f897..60f9f99 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -37,12 +37,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern int defaultColor; extern BOOL echo_mode; -static HINSTANCE hinst; -static struct env_stack *saved_environment; struct env_stack *pushd_directories; - -static BOOL verify_mode = FALSE; - +const WCHAR dotW[] = {'.','\0'}; +const WCHAR dotdotW[] = {'.','.','\0'}; +const WCHAR nullW[] = {'\0'}; +const WCHAR starW[] = {'*','\0'}; +const WCHAR slashW[] = {'\\','\0'}; +const WCHAR equalW[] = {'=','\0'}; const WCHAR inbuilt[][10] = { {'C','A','L','L','\0'}, {'C','D','\0'}, @@ -90,24 +91,20 @@ const WCHAR inbuilt[][10] = { {'C','H','O','I','C','E','\0'}, {'E','X','I','T','\0'} }; - static const WCHAR externals[][10] = { {'A','T','T','R','I','B','\0'}, {'X','C','O','P','Y','\0'} }; - -const WCHAR dotW[] = {'.','\0'}; -const WCHAR dotdotW[] = {'.','.','\0'}; -const WCHAR nullW[] = {'\0'}; -const WCHAR starW[] = {'*','\0'}; -const WCHAR slashW[] = {'\\','\0'}; -const WCHAR equalW[] = {'=','\0'}; static const WCHAR fslashW[] = {'/','\0'}; static const WCHAR onW[] = {'O','N','\0'}; static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'}; +static HINSTANCE hinst; +static struct env_stack *saved_environment; +static BOOL verify_mode = FALSE; + /************************************************************************** * WCMD_ask_confirm * diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 94ce9de..df4f9cb 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -32,19 +32,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern const WCHAR inbuilt[][10]; +extern struct env_stack *pushd_directories; + +BATCH_CONTEXT *context = NULL; DWORD errorlevel; +WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; + int defaultColor = 7; BOOL echo_mode = TRUE; -static BOOL opt_c, opt_k, opt_s; + +WCHAR anykey[100], version_string[100]; const WCHAR newline[] = {'\r','\n','\0'}; const WCHAR space[] = {' ','\0'}; -WCHAR anykey[100]; -WCHAR version_string[100]; -WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; -BATCH_CONTEXT *context = NULL; -extern struct env_stack *pushd_directories; + +static BOOL opt_c, opt_k, opt_s, unicodeOutput = FALSE; + +/* Variables pertaining to paging */ +static BOOL paged_mode; static const WCHAR *pagedMessage = NULL; -static BOOL unicodeOutput = FALSE; +static int line_count; +static int max_height; +static int max_width; +static int numChars; #define MAX_WRITECONSOLE_SIZE 65535 @@ -151,12 +160,6 @@ void WCMD_output_stderr (const WCHAR *format, ...) { WCMD_output_asis_len(string, ret, GetStdHandle(STD_ERROR_HANDLE)); } -static int line_count; -static int max_height; -static int max_width; -static BOOL paged_mode; -static int numChars; - void WCMD_enter_paged_mode(const WCHAR *msg) { CONSOLE_SCREEN_BUFFER_INFO consoleInfo;

1 0

André Hentschel : configure: Add checks for sparc64 and powerpc64.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: fca621f20b27ca5cfbbd502042444ed52fec59b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca621f20b27ca5cfbbd50204… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 30 01:07:33 2011 +0100 configure: Add checks for sparc64 and powerpc64. --- configure | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 ++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 76c7995..f573540 100755 --- a/configure +++ b/configure @@ -14123,6 +14123,32 @@ if test $ac_cv_cpp_def___x86_64__ = yes; then : CFLAGS="$CFLAGS -D__x86_64__" LINTFLAGS="$LINTFLAGS -D__x86_64__" fi ;; + *sparc64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __sparc64__" >&5 +$as_echo_n "checking whether we need to define __sparc64__... " >&6; } +if ${ac_cv_cpp_def___sparc64__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __sparc64__ +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + ac_cv_cpp_def___sparc64__=yes +else + ac_cv_cpp_def___sparc64__=no +fi +rm -f conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___sparc64__" >&5 +$as_echo "$ac_cv_cpp_def___sparc64__" >&6; } +if test $ac_cv_cpp_def___sparc64__ = yes; then : + CFLAGS="$CFLAGS -D__sparc64__" + LINTFLAGS="$LINTFLAGS -D__sparc64__" +fi ;; *sparc*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __sparc__" >&5 $as_echo_n "checking whether we need to define __sparc__... " >&6; } if ${ac_cv_cpp_def___sparc__+:} false; then : @@ -14149,6 +14175,32 @@ if test $ac_cv_cpp_def___sparc__ = yes; then : CFLAGS="$CFLAGS -D__sparc__" LINTFLAGS="$LINTFLAGS -D__sparc__" fi ;; + *powerpc64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __powerpc64__" >&5 +$as_echo_n "checking whether we need to define __powerpc64__... " >&6; } +if ${ac_cv_cpp_def___powerpc64__+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __powerpc64__ +yes +#endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + ac_cv_cpp_def___powerpc64__=yes +else + ac_cv_cpp_def___powerpc64__=no +fi +rm -f conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___powerpc64__" >&5 +$as_echo "$ac_cv_cpp_def___powerpc64__" >&6; } +if test $ac_cv_cpp_def___powerpc64__ = yes; then : + CFLAGS="$CFLAGS -D__powerpc64__" + LINTFLAGS="$LINTFLAGS -D__powerpc64__" +fi ;; *powerpc*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __powerpc__" >&5 $as_echo_n "checking whether we need to define __powerpc__... " >&6; } if ${ac_cv_cpp_def___powerpc__+:} false; then : diff --git a/configure.ac b/configure.ac index dda1684..d6f5e6a 100644 --- a/configure.ac +++ b/configure.ac @@ -2314,7 +2314,9 @@ dnl *** check for the need to define platform-specific symbols case $host_cpu in *i[[3456789]]86*) WINE_CHECK_DEFINE([__i386__]) ;; *x86_64*) WINE_CHECK_DEFINE([__x86_64__]) ;; + *sparc64*) WINE_CHECK_DEFINE([__sparc64__]) ;; *sparc*) WINE_CHECK_DEFINE([__sparc__]) ;; + *powerpc64*) WINE_CHECK_DEFINE([__powerpc64__]) ;; *powerpc*) WINE_CHECK_DEFINE([__powerpc__]) ;; *arm*) WINE_CHECK_DEFINE([__arm__]) ;; esac

1 0

Ken Thomases : secur32: Eliminate broken clean-up "cheat".
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: d977044e7680362d89de101fc866b12cda40577c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d977044e7680362d89de101fc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 29 19:16:32 2011 -0600 secur32: Eliminate broken clean-up "cheat". --- dlls/secur32/ntlm.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index c1e4466..d002b37 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -2030,21 +2030,17 @@ void SECUR32_initNTLMSP(void) NULL }; if(fork_helper(&helper, ntlm_auth, args) != SEC_E_OK) - { - /* Cheat and allocate a helper anyway, so cleanup later will work. */ - helper = HeapAlloc(GetProcessHeap(),0, sizeof(NegoHelper)); - helper->major = helper->minor = helper->micro = -1; - helper->pipe_in = helper->pipe_out = -1; - } + helper = NULL; else check_version(helper); - if( (helper->major > MIN_NTLM_AUTH_MAJOR_VERSION) || - (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && - helper->minor > MIN_NTLM_AUTH_MINOR_VERSION) || - (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && - helper->minor == MIN_NTLM_AUTH_MINOR_VERSION && - helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION) ) + if( helper && + ((helper->major > MIN_NTLM_AUTH_MAJOR_VERSION) || + (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && + helper->minor > MIN_NTLM_AUTH_MINOR_VERSION) || + (helper->major == MIN_NTLM_AUTH_MAJOR_VERSION && + helper->minor == MIN_NTLM_AUTH_MINOR_VERSION && + helper->micro >= MIN_NTLM_AUTH_MICRO_VERSION)) ) { SecureProvider *provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL); SecureProvider *nego_provider = SECUR32_addProvider(&ntlmTableA, &ntlmTableW, NULL);

1 0

Frédéric Delanoy : cmd: Move commonly used global vars declarations to header file.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 44a1e7d1993596c012334ed903bb85b315a8d0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a1e7d1993596c012334ed90… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:51 2011 +0100 cmd: Move commonly used global vars declarations to header file. --- programs/cmd/batch.c | 4 ---- programs/cmd/builtins.c | 10 ---------- programs/cmd/directory.c | 10 ---------- programs/cmd/wcmd.h | 15 ++++++++++++--- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 10af36b..bf8f1b7 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -24,10 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; -extern BATCH_CONTEXT *context; -extern DWORD errorlevel; - /**************************************************************************** * WCMD_batch * diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a418d92..7a8f897 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -20,13 +20,6 @@ */ /* - * NOTES: - * On entry to each function, global variables quals, param1, param2 contain - * the qualifiers (uppercased and concatenated) and parameters entered, with - * environment-variable and batch parameter substitution already done. - */ - -/* * FIXME: * - No support for pipes, shell parameters * - Lots of functionality missing from builtins @@ -43,9 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); extern int defaultColor; extern BOOL echo_mode; -extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; -extern BATCH_CONTEXT *context; -extern DWORD errorlevel; static HINSTANCE hinst; static struct env_stack *saved_environment; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index a5447f5..7fc60a7 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -19,13 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - * NOTES: - * On entry, global variables quals, param1, param2 contain - * the qualifiers (uppercased and concatenated) and parameters entered, with - * environment-variable and batch parameter substitution already done. - */ - #define WIN32_LEAN_AND_MEAN #include "wcmd.h" @@ -33,9 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; -extern DWORD errorlevel; - typedef enum _DISPLAYTIME { Creation = 0, diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c45bc88..fe16805 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -30,6 +30,9 @@ #include <ctype.h> #include <wine/unicode.h> +/* msdn specified max for Win XP */ +#define MAXSTRING 8192 + /* Data structure to hold commands delimitors/separators */ typedef enum _CMDdelimiters { @@ -155,6 +158,15 @@ typedef struct _DIRECTORY_STACK WCHAR *fileName; } DIRECTORY_STACK; +/* + * Global variables quals, param1, param2 contain the current qualifiers + * (uppercased and concatenated) and parameters entered, with environment + * variables and batch parameters substitution already done. + */ +extern WCHAR quals[MAX_PATH], param1[MAXSTRING], param2[MAXSTRING]; +extern DWORD errorlevel; +extern BATCH_CONTEXT *context; + #endif /* !RC_INVOKED */ /* @@ -264,6 +276,3 @@ extern WCHAR version_string[]; #define WCMD_VERSION 1033 #define WCMD_MOREPROMPT 1034 #define WCMD_LINETOOLONG 1035 - -/* msdn specified max for Win XP */ -#define MAXSTRING 8192

1 0

Ken Thomases : secur32: Eliminate a dead store.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: e39e67ec3deefa048b950513cad038fc62052a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39e67ec3deefa048b950513c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 29 19:15:46 2011 -0600 secur32: Eliminate a dead store. --- dlls/secur32/dispatcher.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 666baea0..ba59231 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -285,7 +285,6 @@ void cleanup_helper(PNegoHelper helper) close(helper->pipe_out); close(helper->pipe_in); - helper->helper_pid = 0; HeapFree(GetProcessHeap(), 0, helper); }

1 0

Ken Thomases : secur32: Clean up the helper in all cases where it was allocated.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: f4ac641af55be232781018ff3939132c7f86df81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ac641af55be232781018ff3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 29 19:16:13 2011 -0600 secur32: Clean up the helper in all cases where it was allocated. --- dlls/secur32/ntlm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 4c353c3..c1e4466 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -694,7 +694,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( lstrcpynA(buffer, want_flags, max_len-1); if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != SEC_E_OK) + { + cleanup_helper(helper); goto isc_end; + } if(!strncmp(buffer, "BH", 2)) ERR("Helper doesn't understand new command set. Expect more things to fail.\n"); }

1 0

Henri Verbeet : wined3d: Add a flags parameter to wined3d_surface_create().
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 3430e1160524801b1e6aebc1283120d5e7dc7528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3430e1160524801b1e6aebc12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 30 06:01:45 2011 +0100 wined3d: Add a flags parameter to wined3d_surface_create(). --- dlls/d3d10core/texture.c | 4 ++-- dlls/d3d8/surface.c | 10 ++++++++-- dlls/d3d9/surface.c | 10 ++++++++-- dlls/ddraw/ddraw.c | 8 ++++++-- dlls/ddraw/surface.c | 7 +++---- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/surface.c | 28 +++++++++++++++------------- include/wine/wined3d.h | 7 +++++-- 8 files changed, 50 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3430e1160524801b1e6ae…

1 0

Alexandre Julliard : gdi32: Implement 16-bpp gradient dithering.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: ce2f54226741d2e60752532ba2853cd5cb71aeeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2f54226741d2e60752532ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 14:18:02 2011 +0100 gdi32: Implement 16-bpp gradient dithering. --- dlls/gdi32/dibdrv/primitives.c | 81 ++++++++++++++++++++++++--------------- 1 files changed, 50 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index e882b8a..00213de 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -3996,6 +3996,25 @@ static inline DWORD gradient_rgb_24( const TRIVERTEX *v, unsigned int pos, unsig return r << 16 | g << 8 | b; } +static inline WORD gradient_rgb_555( const TRIVERTEX *v, unsigned int pos, unsigned int len, + unsigned int x, unsigned int y ) +{ + static const BYTE matrix[4][4] = + { + { 0, 8, 2, 10 }, + { 12, 4, 14, 6 }, + { 3, 11, 1, 9 }, + { 15, 7, 13, 5 } + }; + int r = (v[0].Red * (len - pos) + v[1].Red * pos) / len / 128 + matrix[y % 4][x % 4]; + int g = (v[0].Green * (len - pos) + v[1].Green * pos) / len / 128 + matrix[y % 4][x % 4]; + int b = (v[0].Blue * (len - pos) + v[1].Blue * pos) / len / 128 + matrix[y % 4][x % 4]; + r = min( 31, max( 0, r / 16 )); + g = min( 31, max( 0, g / 16 )); + b = min( 31, max( 0, b / 16 )); + return (r << 10) | (g << 5) | b; +} + static void gradient_rect_8888( const dib_info *dib, const RECT *rc, const TRIVERTEX *v, int mode ) { DWORD *ptr = get_pixel_ptr_32( dib, rc->left, rc->top ); @@ -4113,29 +4132,25 @@ static void gradient_rect_24( const dib_info *dib, const RECT *rc, const TRIVERT static void gradient_rect_555( const dib_info *dib, const RECT *rc, const TRIVERTEX *v, int mode ) { - WORD *ptr = get_pixel_ptr_16( dib, rc->left, rc->top ); + WORD *ptr = get_pixel_ptr_16( dib, 0, rc->top ); int x, y; switch (mode) { case GRADIENT_FILL_RECT_H: - for (x = 0; x < rc->right - rc->left; x++) - { - DWORD val = gradient_rgb_24( v, x + rc->left - v[0].x, v[1].x - v[0].x ); - ptr[x] = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); - } - - for (y = rc->top + 1; y < rc->bottom; y++, ptr += dib->stride / 2) - memcpy( ptr + dib->stride / 2, ptr, (rc->right - rc->left) * 2 ); + for (y = rc->top; y < min( rc->top + 4, rc->bottom ); y++, ptr += dib->stride / 2) + for (x = rc->left; x < rc->right; x++) + ptr[x] = gradient_rgb_555( v, x - v[0].x, v[1].x - v[0].x, x, y ); + for (ptr += rc->left; y < rc->bottom; y++, ptr += dib->stride / 2) + memcpy( ptr, ptr - dib->stride * 2, (rc->right - rc->left) * 2 ); break; case GRADIENT_FILL_RECT_V: - for (y = rc->top; y < rc->bottom; y++) + for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride / 2) { - DWORD val = gradient_rgb_24( v, y - v[0].y, v[1].y - v[0].y ); - val = ((val >> 9) & 0x7c00) | ((val >> 6) & 0x03e0) | ((val >> 3) & 0x001f); - for (x = 0; x < rc->right - rc->left; x++) ptr[x] = val; - ptr += dib->stride / 2; + WORD values[4]; + for (x = 0; x < 4; x++) values[x] = gradient_rgb_555( v, y - v[0].y, v[1].y - v[0].y, x, y ); + for (x = rc->left; x < rc->right; x++) ptr[x] = values[x % 4]; } break; } @@ -4143,33 +4158,37 @@ static void gradient_rect_555( const dib_info *dib, const RECT *rc, const TRIVER static void gradient_rect_16( const dib_info *dib, const RECT *rc, const TRIVERTEX *v, int mode ) { - WORD *ptr = get_pixel_ptr_16( dib, rc->left, rc->top ); + WORD *ptr = get_pixel_ptr_16( dib, 0, rc->top ); int x, y; switch (mode) { case GRADIENT_FILL_RECT_H: - for (x = 0; x < rc->right - rc->left; x++) - { - DWORD val = gradient_rgb_24( v, x + rc->left - v[0].x, v[1].x - v[0].x ); - ptr[x] = (put_field((val >> 16), dib->red_shift, dib->red_len) | - put_field((val >> 8), dib->green_shift, dib->green_len) | - put_field( val, dib->blue_shift, dib->blue_len)); - } + for (y = rc->top; y < min( rc->top + 4, rc->bottom ); y++, ptr += dib->stride / 2) + for (x = rc->left; x < rc->right; x++) + { + WORD val = gradient_rgb_555( v, x - v[0].x, v[1].x - v[0].x, x, y ); + ptr[x] = (put_field(((val >> 7) & 0xf8) | ((val >> 12) & 0x07), dib->red_shift, dib->red_len) | + put_field(((val >> 2) & 0xf8) | ((val >> 7) & 0x07), dib->green_shift, dib->green_len) | + put_field(((val << 3) & 0xf8) | ((val >> 2) & 0x07), dib->blue_shift, dib->blue_len)); - for (y = rc->top + 1; y < rc->bottom; y++, ptr += dib->stride / 2) - memcpy( ptr + dib->stride / 2, ptr, (rc->right - rc->left) * 2 ); + } + for (ptr += rc->left; y < rc->bottom; y++, ptr += dib->stride / 2) + memcpy( ptr, ptr - dib->stride * 2, (rc->right - rc->left) * 2 ); break; case GRADIENT_FILL_RECT_V: - for (y = rc->top; y < rc->bottom; y++) + for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride / 2) { - DWORD val = gradient_rgb_24( v, y - v[0].y, v[1].y - v[0].y ); - val = (put_field((val >> 16), dib->red_shift, dib->red_len) | - put_field((val >> 8), dib->green_shift, dib->green_len) | - put_field( val, dib->blue_shift, dib->blue_len)); - for (x = 0; x < rc->right - rc->left; x++) ptr[x] = val; - ptr += dib->stride / 2; + WORD values[4]; + for (x = 0; x < 4; x++) + { + WORD val = gradient_rgb_555( v, y - v[0].y, v[1].y - v[0].y, x, y ); + values[x] = (put_field(((val >> 7) & 0xf8) | ((val >> 12) & 0x07), dib->red_shift, dib->red_len) | + put_field(((val >> 2) & 0xf8) | ((val >> 7) & 0x07), dib->green_shift, dib->green_len) | + put_field(((val << 3) & 0xf8) | ((val >> 2) & 0x07), dib->blue_shift, dib->blue_len)); + } + for (x = rc->left; x < rc->right; x++) ptr[x] = values[x % 4]; } break; }

1 0

Vitaliy Margolen : dinput: Stub IDirectInputJoyConfig8 interface.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: a84d2fe20e5479fae8ea9660167ebfac95eafa99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84d2fe20e5479fae8ea96601… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Nov 26 10:30:07 2011 -0700 dinput: Stub IDirectInputJoyConfig8 interface. --- dlls/dinput/dinput_main.c | 159 +++++++++++++++++++++++++++ dlls/dinput/dinput_private.h | 2 + dlls/dinput8/tests/dinput.c | 17 +++- include/Makefile.in | 1 + include/dinputd.h | 243 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 420 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a84d2fe20e5479fae8ea9…

1 0