June 2015 - Wine-commits - list.winehq.org

Frédéric Delanoy : French translation for release 1.7.44
by Jeremy Newman 19 Jun '15

19 Jun '15

Module: website Branch: master Commit: 62c6ff08055e59ccf67c7db234f76d2b0f6c4ede URL: http://source.winehq.org/git/website.git/?a=commit;h=62c6ff08055e59ccf67c7d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jun 19 14:35:04 2015 +0200 French translation for release 1.7.44 --- news/fr/2015052901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015052901.xml b/news/fr/2015052901.xml new file mode 100644 index 0000000..61ed810 --- /dev/null +++ b/news/fr/2015052901.xml @@ -0,0 +1,15 @@ +<news> +<date>29 mai 2015</date> +<title>Sortie de Wine 1.7.44</title> +<body> + La version de développement 1.7.44 de Wine est disponible. + <a href="{$root}/announce/1.7.44">Nouveautés</a> de cette version : +<ul> + <li>Support complémentaire des interfaces COM dans le contrôle RichEdit.</li> + <li>Version initiale d'un filtre SmartTee.</li> + <li>Meilleure prise en charge de la plate-forme ARM64.</li> + <li>Prise en charge de l'objet noyau du périphérique null.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.44.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.45
by Jeremy Newman 19 Jun '15

19 Jun '15

Module: website Branch: master Commit: e24104d411d5db276014021236a26bbacdd27869 URL: http://source.winehq.org/git/website.git/?a=commit;h=e24104d411d5db27601402… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jun 19 14:35:05 2015 +0200 French translation for release 1.7.45 --- news/fr/2015061201.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2015061201.xml b/news/fr/2015061201.xml new file mode 100644 index 0000000..ebcede3 --- /dev/null +++ b/news/fr/2015061201.xml @@ -0,0 +1,15 @@ +<news> +<date>12 juin 2015</date> +<title>Sortie de Wine 1.7.45</title> +<body> + La version de développement 1.7.45 de Wine est disponible. + <a href="{$root}/announce/1.7.45">Nouveautés</a> de cette version : +<ul> + <li>Meilleure prise en charge du débogage sous Mac OS X 64 bits.</li> + <li>Progrès dans l'implémentation de DirectWrite.</li> + <li>Quelques correctifs dans le contrôle RichEdit.</li> + <li>Début d'implémentation de l'ancien moteur d'exécution C++ MSVCIRT.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.45.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.44
by Jeremy Newman 19 Jun '15

19 Jun '15

Module: website Branch: master Commit: 0adbf7c80d43a4c254b74e568300a4c1428cafb5 URL: http://source.winehq.org/git/website.git/?a=commit;h=0adbf7c80d43a4c254b74e… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jun 9 20:55:44 2015 +0200 German translation for release 1.7.44 --- news/de/2015052901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015052901.xml b/news/de/2015052901.xml new file mode 100644 index 0000000..bc9a92b --- /dev/null +++ b/news/de/2015052901.xml @@ -0,0 +1,16 @@ +<news> +<date>29. Mai 2015</date> +<title>Wine 1.7.44 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.44 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.44">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Mehr Unterstützung der COM-Schnittstellen des RichEdit-Steuerelements.</li> + <li>Anfängliche Version eines SmartTee-Filters.</li> + <li>Ein wenig mehr Unterstüztung für die ARM64-Plattform.</li> + <li>Unterstützung des Null-Device Kernelobjekts.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.44.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Sebastian Lackner : ntoskrnl: Add initial code to emulate memory access to USER_SHARED_DATA on x86_64.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: 0b06d4c4a36e34b314c1886a30423aa9faa3faa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b06d4c4a36e34b314c1886a3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 19 03:58:41 2015 +0200 ntoskrnl: Add initial code to emulate memory access to USER_SHARED_DATA on x86_64. --- dlls/ntoskrnl.exe/instr.c | 263 ++++++++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 2 files changed, 261 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 45021c6..5a469cf 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -4,6 +4,7 @@ * Copyright 1995 Alexandre Julliard * Copyright 2005 Ivan Leo Puoti * Copyright 2005 Laurent Pinchart + * Copyright 2014-2015 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,17 +24,19 @@ #include "config.h" #include "wine/port.h" -#ifdef __i386__ - #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winternl.h" +#define WIN32_NO_STATUS +#include "ddk/wdm.h" #include "excpt.h" #include "wine/debug.h" #include "wine/exception.h" +#ifdef __i386__ + WINE_DEFAULT_DEBUG_CHANNEL(int); #include "pshpack1.h" @@ -475,4 +478,258 @@ LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ) return EXCEPTION_CONTINUE_SEARCH; } -#endif /* __i386__ */ +#elif defined(__x86_64__) /* __i386__ */ + +WINE_DEFAULT_DEBUG_CHANNEL(int); + +#define REX_B 1 +#define REX_X 2 +#define REX_R 4 +#define REX_W 8 + +#define REGMODRM_MOD( regmodrm, rex ) ((regmodrm) >> 6) +#define REGMODRM_REG( regmodrm, rex ) (((regmodrm) >> 3) & 7) | (((rex) & REX_R) ? 8 : 0) +#define REGMODRM_RM( regmodrm, rex ) (((regmodrm) & 7) | (((rex) & REX_B) ? 8 : 0)) + +#define SIB_SS( sib, rex ) ((sib) >> 6) +#define SIB_INDEX( sib, rex ) (((sib) >> 3) & 7) | (((rex) & REX_R) ? 8 : 0) +#define SIB_BASE( sib, rex ) (((sib) & 7) | (((rex) & REX_B) ? 8 : 0)) + +/* keep in sync with dlls/ntdll/thread.c:thread_init */ +static const BYTE *wine_user_shared_data = (BYTE *)0x7ffe0000; +static const BYTE *user_shared_data = (BYTE *)0xfffff78000000000; + +static inline DWORD64 *get_int_reg( CONTEXT *context, int index ) +{ + return &context->Rax + index; /* index should be in range 0 .. 15 */ +} + +static inline int get_op_size( int long_op, int rex ) +{ + if (rex & REX_W) + return sizeof(DWORD64); + else if (long_op) + return sizeof(DWORD); + else + return sizeof(WORD); +} + +/* store an operand into a register */ +static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op, int rex ) +{ + int index = REGMODRM_REG( regmodrm, rex ); + BYTE *reg = (BYTE *)get_int_reg( context, index ); + memcpy( reg, addr, get_op_size( long_op, rex ) ); +} + +/* store an operand into a byte register */ +static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int rex ) +{ + int index = REGMODRM_REG( regmodrm, rex ); + BYTE *reg = (BYTE *)get_int_reg( context, index ); + if (!rex && index >= 4 && index < 8) reg -= (4 * sizeof(DWORD64) - 1); /* special case: ah, ch, dh, bh */ + *reg = *addr; +} + +/*********************************************************************** + * INSTR_GetOperandAddr + * + * Return the address of an instruction operand (from the mod/rm byte). + */ +static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, + int long_addr, int rex, int segprefix, int *len ) +{ + int mod, rm, ss = 0, off, have_sib = 0; + DWORD64 base = 0, index = 0; + +#define GET_VAL( val, type ) \ + { *val = *(type *)instr; instr += sizeof(type); *len += sizeof(type); } + + *len = 0; + GET_VAL( &mod, BYTE ); + rm = REGMODRM_RM( mod, rex ); + mod = REGMODRM_MOD( mod, rex ); + + if (mod == 3) + return (BYTE *)get_int_reg( context, rm ); + + if ((rm & 7) == 4) + { + BYTE sib; + int id; + + GET_VAL( &sib, BYTE ); + rm = SIB_BASE( sib, rex ); + id = SIB_INDEX( sib, rex ); + ss = SIB_SS( sib, rex ); + + index = (id != 4) ? *get_int_reg( context, id ) : 0; + if (!long_addr) index &= 0xffffffff; + have_sib = 1; + } + + base = *get_int_reg( context, rm ); + if (!long_addr) base &= 0xffffffff; + + switch (mod) + { + case 0: + if (rm == 5) /* special case */ + { + base = have_sib ? 0 : context->Rip; + if (!long_addr) base &= 0xffffffff; + GET_VAL( &off, DWORD ); + base += (signed long)off; + } + break; + + case 1: /* 8-bit disp */ + GET_VAL( &off, BYTE ); + base += (signed char)off; + break; + + case 2: /* 32-bit disp */ + GET_VAL( &off, DWORD ); + base += (signed long)off; + break; + } + + /* FIXME: we assume that all segments have a base of 0 */ + return (BYTE *)(base + (index << ss)); +#undef GET_VAL +} + + +/*********************************************************************** + * emulate_instruction + * + * Emulate a privileged instruction. + * Returns exception continuation status. + */ +static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + int prefix, segprefix, prefixlen, len, long_op, long_addr, rex; + BYTE *instr; + + long_op = long_addr = 1; + instr = (BYTE *)context->Rip; + if (!instr) return ExceptionContinueSearch; + + /* First handle any possible prefix */ + + segprefix = -1; /* no seg prefix */ + rex = 0; /* no rex prefix */ + prefix = 1; + prefixlen = 0; + while(prefix) + { + switch(*instr) + { + case 0x2e: + segprefix = context->SegCs; + break; + case 0x36: + segprefix = context->SegSs; + break; + case 0x3e: + segprefix = context->SegDs; + break; + case 0x26: + segprefix = context->SegEs; + break; + case 0x64: + segprefix = context->SegFs; + break; + case 0x65: + segprefix = context->SegGs; + break; + case 0x66: + long_op = !long_op; /* opcode size prefix */ + break; + case 0x67: + long_addr = !long_addr; /* addr size prefix */ + break; + case 0xf0: /* lock */ + break; + case 0xf2: /* repne */ + break; + case 0xf3: /* repe */ + break; + default: + prefix = 0; /* no more prefixes */ + break; + } + if (*instr >= 0x40 && *instr < 0x50) /* rex */ + { + rex = *instr; + prefix = TRUE; + } + if (prefix) + { + instr++; + prefixlen++; + } + } + + /* Now look at the actual instruction */ + + switch(*instr) + { + case 0x8a: /* mov Eb, Gb */ + case 0x8b: /* mov Ev, Gv */ + { + BYTE *data = INSTR_GetOperandAddr( context, instr + 1, long_addr, + rex, segprefix, &len ); + unsigned int data_size = (*instr == 0x8b) ? get_op_size( long_op, rex ) : 1; + unsigned int offset = data - user_shared_data; + + if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + { + switch (*instr) + { + case 0x8a: store_reg_byte( context, instr[1], wine_user_shared_data + offset, rex ); break; + case 0x8b: store_reg_word( context, instr[1], wine_user_shared_data + offset, long_op, rex ); break; + } + context->Rip += prefixlen + len + 1; + return ExceptionContinueExecution; + } + break; /* Unable to emulate it */ + } + } + return ExceptionContinueSearch; /* Unable to emulate it */ +} + + +/*********************************************************************** + * vectored_handler + * + * Vectored exception handler used to emulate protected instructions + * from 64-bit code. + */ +LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ) +{ + EXCEPTION_RECORD *record = ptrs->ExceptionRecord; + CONTEXT *context = ptrs->ContextRecord; + + if (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && + record->ExceptionInformation[0] == EXCEPTION_READ_FAULT) + { + if (emulate_instruction( record, context ) == ExceptionContinueExecution) + { + TRACE( "next instruction rip=%lx\n", context->Rip ); + TRACE( " rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + context->Rax, context->Rbx, context->Rcx, context->Rdx ); + TRACE( " rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + context->Rsi, context->Rdi, context->Rbp, context->Rsp ); + TRACE( " r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + context->R8, context->R9, context->R10, context->R11 ); + TRACE( " r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + context->R12, context->R13, context->R14, context->R15 ); + + return EXCEPTION_CONTINUE_EXECUTION; + } + } + return EXCEPTION_CONTINUE_SEARCH; +} + +#endif /* __x86_64__ */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2051939..35454a5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2069,7 +2069,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( inst ); -#ifdef __i386__ +#if defined(__i386__) || defined(__x86_64__) handler = RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); #endif KeQueryTickCount( &count ); /* initialize the global KeTickCount */

1 0

Sebastian Lackner : ntoskrnl: Add emulation for 'mov Ob, AL' and 'mov Ovqp , rAX' instruction.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: 411cdebaede4274d43e1ad4d1b3ada15321b1f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=411cdebaede4274d43e1ad4d1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 19 04:07:08 2015 +0200 ntoskrnl: Add emulation for 'mov Ob, AL' and 'mov Ovqp, rAX' instruction. --- dlls/ntoskrnl.exe/instr.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 5a469cf..7684b24 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -695,6 +695,23 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) } break; /* Unable to emulate it */ } + + case 0xa0: /* mov Ob, AL */ + case 0xa1: /* mov Ovqp, rAX */ + { + BYTE *data = (BYTE *)(long_addr ? *(DWORD64 *)(instr + 1) : *(DWORD *)(instr + 1)); + unsigned int data_size = (*instr == 0xa1) ? get_op_size( long_op, rex ) : 1; + unsigned int offset = data - user_shared_data; + len = long_addr ? sizeof(DWORD64) : sizeof(DWORD); + + if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + { + memcpy( &context->Rax, wine_user_shared_data + offset, data_size ); + context->Rip += prefixlen + len + 1; + return ExceptionContinueExecution; + } + break; /* Unable to emulate it */ + } } return ExceptionContinueSearch; /* Unable to emulate it */ }

1 0

Sebastian Lackner : ntoskrnl: Add emulation for 'movzx {Eb, Ew}, Gv' instruction.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: 9c789f2949faa14dc98df6a42b7e04b2af3e9ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c789f2949faa14dc98df6a42… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 19 04:07:58 2015 +0200 ntoskrnl: Add emulation for 'movzx {Eb,Ew}, Gv' instruction. --- dlls/ntoskrnl.exe/instr.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 7684b24..1306d5f 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -675,6 +675,30 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) switch(*instr) { + case 0x0f: /* extended instruction */ + switch(instr[1]) + { + case 0xb6: /* movzx Eb, Gv */ + case 0xb7: /* movzx Ew, Gv */ + { + BYTE *data = INSTR_GetOperandAddr( context, instr + 2, long_addr, + rex, segprefix, &len ); + unsigned int data_size = (instr[1] == 0xb7) ? 2 : 1; + unsigned int offset = data - user_shared_data; + + if (offset <= sizeof(KSHARED_USER_DATA) - data_size) + { + ULONGLONG temp = 0; + memcpy( &temp, wine_user_shared_data + offset, data_size ); + store_reg_word( context, instr[2], (BYTE *)&temp, long_op, rex ); + context->Rip += prefixlen + len + 2; + return ExceptionContinueExecution; + } + break; /* Unable to emulate it */ + } + } + break; /* Unable to emulate it */ + case 0x8a: /* mov Eb, Gb */ case 0x8b: /* mov Ev, Gv */ {

1 0

Hugh McMaster : net: WriteFile should output the number of bytes in the char array, not the length of the WCHAR array.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: ba7d599b6f661ef16a337e5b433c0c392948a799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7d599b6f661ef16a337e5b4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 19 11:35:58 2015 +1000 net: WriteFile should output the number of bytes in the char array, not the length of the WCHAR array. --- programs/net/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/net/net.c b/programs/net/net.c index 0d5de52..7149ea8 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -49,7 +49,7 @@ static int output_write(const WCHAR* str, int len) WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, NULL, NULL); - WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, len, &count, FALSE); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); HeapFree(GetProcessHeap(), 0, strA); } return count;

1 0

Matteo Bruni : wined3d: Drop unused gl_info parameter from shader_glsl_ffp_vertex_lighting().
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: 438f68cc3831852f36aad191a337d98a91e02f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438f68cc3831852f36aad191a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 19 00:07:38 2015 +0200 wined3d: Drop unused gl_info parameter from shader_glsl_ffp_vertex_lighting(). --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 00701b8..dd8f65d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5389,8 +5389,7 @@ static const char *shader_glsl_ffp_mcs(enum wined3d_material_color_source mcs, c } static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer, - const struct wined3d_ffp_vs_settings *settings, const struct wined3d_gl_info *gl_info, - BOOL legacy_lighting) + const struct wined3d_ffp_vs_settings *settings, BOOL legacy_lighting) { const char *diffuse, *specular, *emissive, *ambient; enum wined3d_light_type light_type; @@ -5666,7 +5665,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe else shader_addline(buffer, "vec3 normal = ffp_normal_matrix * ffp_attrib_normal;\n"); - shader_glsl_ffp_vertex_lighting(buffer, settings, gl_info, legacy_lighting); + shader_glsl_ffp_vertex_lighting(buffer, settings, legacy_lighting); for (i = 0; i < MAX_TEXTURES; ++i) {

1 0

Matteo Bruni : wined3d: Don' t flag WINED3D_SHADER_CONST_FFP_PROJ on transformed <-> untransformed vdecl change.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: af55ae137965512a1635e69b8f41849114f60012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af55ae137965512a1635e69b8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 19 00:07:39 2015 +0200 wined3d: Don't flag WINED3D_SHADER_CONST_FFP_PROJ on transformed <-> untransformed vdecl change. It's unnecessary since the vertex shader is going to change and shader_glsl_select() flags all the constants used by the shader anyway. --- dlls/wined3d/glsl_shader.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dd8f65d..1f6ce09 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7767,9 +7767,6 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, clipplane(context, state, STATE_CLIPPLANE(i)); } - if (transformed != wasrhw) - context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PROJ; - context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_TEXMATRIX; /* Because of settings->texcoords, we have to always regenerate the

1 0

Jacek Caban : wininet: Don't use blocking_mode_t in netconn.c.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: 9d7d27ea7f8781e81f8efa343f4f12b998f156ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7d27ea7f8781e81f8efa343… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 18 15:17:46 2015 +0200 wininet: Don't use blocking_mode_t in netconn.c. --- dlls/wininet/http.c | 6 ++++++ dlls/wininet/internet.h | 6 ------ dlls/wininet/netconnection.c | 35 ++++++++++++++--------------------- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 42654a2..3be88b7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -380,6 +380,12 @@ static WCHAR *get_host_header( http_request_t *req ) return ret; } +typedef enum { + BLOCKING_ALLOW, + BLOCKING_DISALLOW, + BLOCKING_WAITALL +} blocking_mode_t; + struct data_stream_vtbl_t { DWORD (*get_avail_data)(data_stream_t*,http_request_t*); BOOL (*end_of_data)(data_stream_t*,http_request_t*); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 955c7c5..4044bbf 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -415,12 +415,6 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen) DECLSPEC_HIDDEN; -typedef enum { - BLOCKING_ALLOW, - BLOCKING_DISALLOW, - BLOCKING_WAITALL -} blocking_mode_t; - DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e82dd30..40f53de 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -280,9 +280,9 @@ void init_winsock(void) InitOnceExecuteOnce(&init_once, winsock_startup, NULL, NULL); } -static void set_socket_blocking(int socket, blocking_mode_t mode) +static void set_socket_blocking(int socket, BOOL is_blocking) { - ULONG arg = mode == BLOCKING_DISALLOW; + ULONG arg = !is_blocking; ioctlsocket(socket, FIONBIO, &arg); } @@ -297,7 +297,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t assert(server->addr_len); result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); if(result != -1) { - set_socket_blocking(netconn->socket, BLOCKING_DISALLOW); + set_socket_blocking(netconn->socket, FALSE); result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { @@ -326,7 +326,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t netconn->socket = -1; } else { - set_socket_blocking(netconn->socket, BLOCKING_ALLOW); + set_socket_blocking(netconn->socket, TRUE); } } if(result == -1) @@ -688,22 +688,17 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, } } -static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking_mode_t mode, SIZE_T *ret_size, BOOL *eof) +static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, BOOL blocking, SIZE_T *ret_size, BOOL *eof) { const SIZE_T ssl_buf_size = conn->ssl_sizes.cbHeader+conn->ssl_sizes.cbMaximumMessage+conn->ssl_sizes.cbTrailer; SecBuffer bufs[4]; SecBufferDesc buf_desc = {SECBUFFER_VERSION, sizeof(bufs)/sizeof(*bufs), bufs}; SSIZE_T size, buf_len = 0; - blocking_mode_t tmp_mode; int i; SECURITY_STATUS res; assert(conn->extra_len < ssl_buf_size); - /* BLOCKING_WAITALL is handled by caller */ - if(mode == BLOCKING_WAITALL) - mode = BLOCKING_ALLOW; - if(conn->extra_len) { memcpy(conn->ssl_buf, conn->extra_buf, conn->extra_len); buf_len = conn->extra_len; @@ -712,8 +707,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking conn->extra_buf = NULL; } - tmp_mode = buf_len ? BLOCKING_DISALLOW : mode; - set_socket_blocking(conn->socket, tmp_mode); + set_socket_blocking(conn->socket, blocking && !buf_len); size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 0) { if(!buf_len) { @@ -728,11 +722,10 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking buf_len += size; } - *ret_size = buf_len; - if(!buf_len) { TRACE("EOF\n"); *eof = TRUE; + *ret_size = 0; return ERROR_SUCCESS; } @@ -755,7 +748,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking case SEC_E_INCOMPLETE_MESSAGE: assert(buf_len < ssl_buf_size); - set_socket_blocking(conn->socket, mode); + set_socket_blocking(conn->socket, blocking); size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 1) { if(size < 0 && WSAGetLastError() == WSAEWOULDBLOCK) { @@ -826,9 +819,9 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, i if (!connection->secure) { - set_socket_blocking(connection->socket, blocking ? BLOCKING_ALLOW : BLOCKING_DISALLOW); - *recvd = sock_recv(connection->socket, buf, len, 0); - return *recvd == -1 ? WSAGetLastError() : ERROR_SUCCESS; + set_socket_blocking(connection->socket, blocking); + *recvd = sock_recv(connection->socket, buf, len, 0); + return *recvd == -1 ? WSAGetLastError() : ERROR_SUCCESS; } else { @@ -852,7 +845,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, i } do { - res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, blocking ? BLOCKING_ALLOW : BLOCKING_DISALLOW, &size, &eof); + res = read_ssl_chunk(connection, (BYTE*)buf, len, blocking, &size, &eof); if(res != ERROR_SUCCESS) { if(res == WSAEWOULDBLOCK) { if(size) @@ -901,9 +894,9 @@ BOOL NETCON_is_alive(netconn_t *netconn) int len; char b; - set_socket_blocking(netconn->socket, BLOCKING_DISALLOW); + set_socket_blocking(netconn->socket, FALSE); len = sock_recv(netconn->socket, &b, 1, MSG_PEEK); - set_socket_blocking(netconn->socket, BLOCKING_ALLOW); + set_socket_blocking(netconn->socket, TRUE); return len == 1 || (len == -1 && WSAGetLastError() == WSAEWOULDBLOCK); }

1 0