November 2011 - Wine-Commits

Aric Stewart : usp10: Devanagari danda and double danda are used for all Indic scripts.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: e5d33f08c7282935c2c5315b1fa8eb154eedbf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d33f08c7282935c2c5315b1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 15 11:02:31 2011 -0700 usp10: Devanagari danda and double danda are used for all Indic scripts. --- dlls/usp10/usp10.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 50e8471..94c49fe 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -772,6 +772,11 @@ HRESULT WINAPI ScriptApplyDigitSubstitution(const SCRIPT_DIGITSUBSTITUTE *sds, } } +static inline BOOL is_indic(WORD script) +{ + return (script >= Script_Devanagari && script <= Script_Malayalam_Numeric); +} + /*********************************************************************** * ScriptItemizeOpenType (USP10.@) * @@ -808,6 +813,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int WORD *scripts = NULL; WORD baselevel = 0; BOOL new_run; + WORD last_indic = -1; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -820,7 +826,15 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int return E_OUTOFMEMORY; for (i = 0; i < cInChars; i++) + { scripts[i] = get_char_script(pwcInChars[i]); + /* Devanagari danda (U+0964) and double danda (U+0965) are used for + all Indic scripts */ + if ((pwcInChars[i] == 0x964 || pwcInChars[i] ==0x965) && last_indic > 0) + scripts[i] = last_indic; + else if (is_indic(scripts[i])) + last_indic = scripts[i]; + } if (psState && psControl) {

1 0

Aric Stewart : usp10: Pay attention to script changes for bidi run itemization.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 6c3398d9574e449628bfdaf250661104935db7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3398d9574e449628bfdaf25… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 13:17:37 2011 -0700 usp10: Pay attention to script changes for bidi run itemization. --- dlls/usp10/usp10.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0ffab66..50e8471 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -859,7 +859,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int for (i = 0; i < cInChars; i++) { if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && inNumber && strchrW(math_punc,pwcInChars[i])) + { + scripts[i] = Script_Numeric; levels[i] = 2; + } else if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric) { levels[i] = 2; @@ -982,7 +985,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int new_run = TRUE; } /* changes in script */ - else if ((!levels) && (((pwcInChars[cnt] != Numeric_space) && (New_Script != -1) && (New_Script != pItems[index].a.eScript)) || (New_Script == Script_Control))) + else if (((pwcInChars[cnt] != Numeric_space) && (New_Script != -1) && (New_Script != pItems[index].a.eScript)) || (New_Script == Script_Control)) { TRACE("Script break(%i/%i)\n",pItems[index].a.eScript,New_Script); new_run = TRUE;

1 0

Aric Stewart : usp10: Break with a better understanding on the handling of bidi strengths.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 9c9513f94a632241ed7be0e9bd724696ed677d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9513f94a632241ed7be0e9b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 13:16:59 2011 -0700 usp10: Break with a better understanding on the handling of bidi strengths. --- dlls/usp10/bidi.c | 10 ++++++-- dlls/usp10/usp10.c | 44 +++++++++++++++++++++++++++++++++++------- dlls/usp10/usp10_internal.h | 3 ++ 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 9c3942c..a2edfa6 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -901,7 +901,7 @@ BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c, case AL: case RLE: case RLO: - lpStrength[i] = 1; + lpStrength[i] = BIDI_STRONG; break; case PDF: case EN: @@ -910,10 +910,14 @@ BOOL BIDI_GetStrengths(LPCWSTR lpString, INT uCount, const SCRIPT_CONTROL *c, case AN: case CS: case BN: - lpStrength[i] = 2; + lpStrength[i] = BIDI_WEAK; break; + case B: + case S: + case WS: + case ON: default: /* Neutrals and NSM */ - lpStrength[i] = 0; + lpStrength[i] = BIDI_NEUTRAL; } } return TRUE; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 4ac7b8f..0496a56 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -805,6 +805,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int WORD *levels = NULL; WORD *strength = NULL; WORD baselevel = 0; + BOOL new_run; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -876,10 +877,13 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int pItems[index].a = scriptInformation[get_char_script(pwcInChars[cnt])].a; pScriptTags[index] = scriptInformation[get_char_script(pwcInChars[cnt])].scriptTag; - if (strength) + if (strength && strength[cnt] == BIDI_STRONG) str = strength[cnt]; + else if (strength) + str = strength[0]; cnt = 0; + if (levels) { pItems[index].a.fRTL = odd(levels[cnt]); @@ -899,9 +903,6 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int for (cnt=1; cnt < cInChars; cnt++) { - if (levels && (levels[cnt] == pItems[index].a.s.uBidiLevel && (!strength || (strength[cnt] == 0 || strength[cnt] == str)))) - continue; - if(pwcInChars[cnt] != Numeric_space && pwcInChars[cnt] != ZWJ && pwcInChars[cnt] != ZWNJ) New_Script = get_char_script(pwcInChars[cnt]); else if (levels) @@ -915,17 +916,44 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int New_Script = get_char_script(pwcInChars[cnt]); } - if ((levels && (levels[cnt] != pItems[index].a.s.uBidiLevel || (strength && (strength[cnt] != str)))) || (New_Script != -1 && New_Script != pItems[index].a.eScript) || New_Script == Script_Control) + new_run = FALSE; + /* merge space strengths*/ + if (strength && strength[cnt] == BIDI_STRONG && str != BIDI_STRONG && New_Script == pItems[index].a.eScript) + str = BIDI_STRONG; + + if (strength && strength[cnt] == BIDI_NEUTRAL && str == BIDI_STRONG && pwcInChars[cnt] != Numeric_space && New_Script == pItems[index].a.eScript) + str = BIDI_NEUTRAL; + + /* changes in level */ + if (levels && (levels[cnt] != pItems[index].a.s.uBidiLevel)) { - TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d\n", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript); + TRACE("Level break(%i/%i)\n",pItems[index].a.s.uBidiLevel,levels[cnt]); + new_run = TRUE; + } + /* changes in strength */ + else if (strength && pwcInChars[cnt] != Numeric_space && str != strength[cnt]) + { + TRACE("Strength break (%i/%i)\n",str,strength[cnt]); + new_run = TRUE; + } + /* changes in script */ + else if ((!levels) && (((pwcInChars[cnt] != Numeric_space) && (New_Script != -1) && (New_Script != pItems[index].a.eScript)) || (New_Script == Script_Control))) + { + TRACE("Script break(%i/%i)\n",pItems[index].a.eScript,New_Script); + new_run = TRUE; + } - if (strength && strength[cnt] != 0) - str = strength[cnt]; + if (new_run) + { + TRACE("New_Level = %i, New_Strength = %i, New_Script=%d, eScript=%d\n", levels?levels[cnt]:-1, strength?strength[cnt]:str, New_Script, pItems[index].a.eScript); index++; if (index+1 > cMaxItems) return E_OUTOFMEMORY; + if (strength) + str = strength[cnt]; + pItems[index].iCharPos = cnt; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 7a88ac7..9f13b40 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -122,6 +122,9 @@ typedef int (*lexical_function)(WCHAR c); typedef void (*reorder_function)(LPWSTR pwChar, IndicSyllable *syllable, lexical_function lex); #define odd(x) ((x) & 1) +#define BIDI_STRONG 1 +#define BIDI_WEAK 2 +#define BIDI_NEUTRAL 0 BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s, const SCRIPT_CONTROL *c, WORD *lpOutLevels ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSHADER_PARAM_SRCMOD_TYPE typedef.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 563edce2fa6d116c94598fb99de4dfdad6720acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=563edce2fa6d116c94598fb99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 21:11:42 2011 +0100 wined3d: Get rid of the WINED3DSHADER_PARAM_SRCMOD_TYPE typedef. --- dlls/wined3d/arb_program_shader.c | 5 +++-- dlls/wined3d/glsl_shader.c | 11 +++++++---- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 19e565e..17c5ba4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1951,8 +1951,9 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) } else if (shader_version < WINED3D_SHADER_VERSION(2,0)) { - DWORD src_mod = ins->src[0].modifiers; - if (src_mod == WINED3DSPSM_DZ) { + enum wined3d_shader_src_modifier src_mod = ins->src[0].modifiers; + if (src_mod == WINED3DSPSM_DZ) + { /* TXP cannot handle DZ natively, so move the z coordinate to .w. reg_coord is a read-only * varying register, so we need a temp reg */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff17fcf..1746cb4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1234,7 +1234,8 @@ static const char * const shift_glsl_tab[] = { }; /* Generate a GLSL parameter that does the input modifier computation and return the input register/mask to use */ -static void shader_glsl_gen_modifier(DWORD src_modifier, const char *in_reg, const char *in_regswizzle, char *out_str) +static void shader_glsl_gen_modifier(enum wined3d_shader_src_modifier src_modifier, + const char *in_reg, const char *in_regswizzle, char *out_str) { out_str[0] = 0; @@ -3054,7 +3055,7 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) } else if (shader_version < WINED3D_SHADER_VERSION(2,0)) { - DWORD src_mod = ins->src[0].modifiers; + enum wined3d_shader_src_modifier src_mod = ins->src[0].modifiers; if (src_mod == WINED3DSPSM_DZ) { sample_flags |= WINED3D_GLSL_SAMPLE_PROJECTED; @@ -3187,9 +3188,11 @@ static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins) shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_addline(buffer, "clamp(gl_TexCoord[%u], 0.0, 1.0)%s);\n", ins->dst[0].reg.idx, dst_mask); - } else { + } + else + { + enum wined3d_shader_src_modifier src_mod = ins->src[0].modifiers; DWORD reg = ins->src[0].reg.idx; - DWORD src_mod = ins->src[0].modifiers; char dst_swizzle[6]; shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 24b577a..447de8f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1099,7 +1099,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, void shader_dump_src_param(const struct wined3d_shader_src_param *param, const struct wined3d_shader_version *shader_version) { - DWORD src_modifier = param->modifiers; + enum wined3d_shader_src_modifier src_modifier = param->modifiers; DWORD swizzle = param->swizzle; if (src_modifier == WINED3DSPSM_NEG diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a331f4e..460c911 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -324,7 +324,7 @@ enum wined3d_immconst_type #define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6)) -typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE +enum wined3d_shader_src_modifier { WINED3DSPSM_NONE = 0, WINED3DSPSM_NEG = 1, @@ -340,7 +340,7 @@ typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE WINED3DSPSM_ABS = 11, WINED3DSPSM_ABSNEG = 12, WINED3DSPSM_NOT = 13, -} WINED3DSHADER_PARAM_SRCMOD_TYPE; +}; #define WINED3DSP_WRITEMASK_0 0x1 /* .x r */ #define WINED3DSP_WRITEMASK_1 0x2 /* .y g */ @@ -617,7 +617,7 @@ struct wined3d_shader_src_param { struct wined3d_shader_register reg; DWORD swizzle; - DWORD modifiers; + enum wined3d_shader_src_modifier modifiers; }; struct wined3d_shader_instruction

1 0

Henri Verbeet : d3d10: Add a stub ID3D10StateBlock implementation.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 84f90f6ea8359231fa8d835981a8f19028e2e9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f90f6ea8359231fa8d83598… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 20:45:25 2011 +0100 d3d10: Add a stub ID3D10StateBlock implementation. --- dlls/d3d10/Makefile.in | 1 + dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index feca50e..6e3f311 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ d3d10_main.c \ effect.c \ shader.c \ + stateblock.c \ utils.c RC_SRCS = version.rc diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 94e2424..16d2d5f 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -5,7 +5,7 @@ @ stdcall D3D10CreateDeviceAndSwapChain(ptr long ptr long long ptr ptr ptr) @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) @ stub D3D10CreateEffectPoolFromMemory -@ stub D3D10CreateStateBlock +@ stdcall D3D10CreateStateBlock(ptr ptr ptr) @ stub D3D10DisassembleEffect @ stub D3D10DisassembleShader @ stdcall D3D10GetGeometryShaderProfile(ptr) diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c new file mode 100644 index 0000000..a254704 --- /dev/null +++ b/dlls/d3d10/stateblock.c @@ -0,0 +1,145 @@ +/* + * Copyright 2011 Henri Verbeet 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 "wine/port.h" + +#include "d3d10_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10); + +struct d3d10_stateblock +{ + ID3D10StateBlock ID3D10StateBlock_iface; + LONG refcount; +}; + +static inline struct d3d10_stateblock *impl_from_ID3D10StateBlock(ID3D10StateBlock *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_stateblock, ID3D10StateBlock_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d10_stateblock_QueryInterface(ID3D10StateBlock *iface, REFIID iid, void **object) +{ + struct d3d10_stateblock *stateblock; + + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + stateblock = impl_from_ID3D10StateBlock(iface); + + if (IsEqualGUID(iid, &IID_ID3D10StateBlock) + || IsEqualGUID(iid, &IID_IUnknown)) + { + IUnknown_AddRef(&stateblock->ID3D10StateBlock_iface); + *object = &stateblock->ID3D10StateBlock_iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *object = NULL; + + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_stateblock_AddRef(ID3D10StateBlock *iface) +{ + struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface); + ULONG refcount = InterlockedIncrement(&stateblock->refcount); + + TRACE("%p increasing refcount to %u.\n", stateblock, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_stateblock_Release(ID3D10StateBlock *iface) +{ + struct d3d10_stateblock *stateblock = impl_from_ID3D10StateBlock(iface); + ULONG refcount = InterlockedDecrement(&stateblock->refcount); + + TRACE("%p decreasing refcount to %u.\n", stateblock, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, stateblock); + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d3d10_stateblock_Capture(ID3D10StateBlock *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_stateblock_Apply(ID3D10StateBlock *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_stateblock_ReleaseAllDeviceObjects(ID3D10StateBlock *iface) +{ + FIXME("iface %p stub!\n", iface); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_stateblock_GetDevice(ID3D10StateBlock *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); + + return E_NOTIMPL; +} + +static const struct ID3D10StateBlockVtbl d3d10_stateblock_vtbl = +{ + /* IUnknown methods */ + d3d10_stateblock_QueryInterface, + d3d10_stateblock_AddRef, + d3d10_stateblock_Release, + /* ID3D10StateBlock methods */ + d3d10_stateblock_Capture, + d3d10_stateblock_Apply, + d3d10_stateblock_ReleaseAllDeviceObjects, + d3d10_stateblock_GetDevice, +}; + +HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, + D3D10_STATE_BLOCK_MASK *mask, ID3D10StateBlock **stateblock) +{ + struct d3d10_stateblock *object; + + FIXME("device %p, mask %p, stateblock %p stub!\n", device, mask, stateblock); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 stateblock object memory.\n"); + return E_OUTOFMEMORY; + } + + object->ID3D10StateBlock_iface.lpVtbl = &d3d10_stateblock_vtbl; + object->refcount = 1; + + TRACE("Created stateblock %p.\n", object); + *stateblock = &object->ID3D10StateBlock_iface; + + return S_OK; +}

1 0

André Hentschel : wininet: Improve stub message for InternetSetFilePointer.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 4896f94aaf22053fc76fcf3f3e39ac2080c74de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4896f94aaf22053fc76fcf3f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 19:20:38 2011 +0100 wininet: Improve stub message for InternetSetFilePointer. --- dlls/wininet/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 43be36d..391a525 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2108,7 +2108,7 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW( DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove, PVOID pReserved, DWORD dwMoveContext, DWORD_PTR dwContext) { - FIXME("stub\n"); + FIXME("(%p %d %p %d %lx): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext); return FALSE; }

1 0

André Hentschel : msvcrt: Implement _wfreopen_s.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 947d1bf588319383ed43920fafcf62e41cb7659e URL: http://source.winehq.org/git/wine.git/?a=commit;h=947d1bf588319383ed43920fa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 18:33:47 2011 +0100 msvcrt: Implement _wfreopen_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 19 +++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 87cae04..0925c1f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1350,7 +1350,7 @@ @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen -@ stub _wfreopen_s +@ cdecl _wfreopen_s(ptr wstr wstr ptr) msvcrt._wfreopen_s @ cdecl _wfsopen(wstr wstr long) msvcrt._wfsopen @ cdecl _wfullpath(ptr wstr long) msvcrt._wfullpath @ cdecl _wgetcwd(wstr long) msvcrt._wgetcwd diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 06751ef..4cde658 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1203,7 +1203,7 @@ @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen -@ stub _wfreopen_s +@ cdecl _wfreopen_s(ptr wstr wstr ptr) msvcrt._wfreopen_s @ cdecl _wfsopen(wstr wstr long) msvcrt._wfsopen @ cdecl _wfullpath(ptr wstr long) msvcrt._wfullpath @ cdecl _wgetcwd(wstr long) msvcrt._wgetcwd diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 688bdc6..9d0d9e6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1197,7 +1197,7 @@ @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen -@ stub _wfreopen_s +@ cdecl _wfreopen_s(ptr wstr wstr ptr) msvcrt._wfreopen_s @ cdecl _wfsopen(wstr wstr long) msvcrt._wfsopen @ cdecl _wfullpath(ptr wstr long) msvcrt._wfullpath @ cdecl _wgetcwd(wstr long) msvcrt._wgetcwd diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f3200eb..07fed45 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3277,6 +3277,25 @@ MSVCRT_FILE* CDECL MSVCRT__wfreopen(const MSVCRT_wchar_t *path, const MSVCRT_wch } /********************************************************************* + * _wfreopen_s (MSVCRT.@) + */ +int CDECL MSVCRT__wfreopen_s(MSVCRT_FILE** pFile, + const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode, MSVCRT_FILE* file) +{ + if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(path != NULL) || + !MSVCRT_CHECK_PMT(mode != NULL) || !MSVCRT_CHECK_PMT(file != NULL)) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *pFile = MSVCRT__wfreopen(path, mode, file); + + if(!*pFile) + return *MSVCRT__errno(); + return 0; +} + +/********************************************************************* * freopen (MSVCRT.@) * */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f2b5e33..fac2104 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1133,7 +1133,7 @@ @ cdecl _wfopen(wstr wstr) MSVCRT__wfopen @ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s @ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen -# stub _wfreopen_s(ptr wstr wstr ptr) +@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s @ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen @ cdecl _wfullpath(ptr wstr long) # stub _wfullpath_dbg(ptr wstr long long str long)

1 0

Frédéric Delanoy : cmd: Avoid duplication of commonly used strings.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 5fc25686a41084beb3974ef50139ea82124144b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc25686a41084beb3974ef50… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 12 13:58:01 2011 +0100 cmd: Avoid duplication of commonly used strings. --- programs/cmd/batch.c | 1 - programs/cmd/builtins.c | 12 ++++++------ programs/cmd/directory.c | 17 +++++------------ programs/cmd/wcmd.h | 7 +++++++ programs/cmd/wcmdmain.c | 10 ++++------ 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 7edb8df..10af36b 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -317,7 +317,6 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, static const WCHAR validmodifiers[NUMMODIFIERS] = { '~', 'f', 'd', 'p', 'n', 'x', 's', 'a', 't', 'z', '$' }; - static const WCHAR space[] = {' ', '\0'}; WIN32_FILE_ATTRIBUTE_DATA fileInfo; WCHAR outputparam[MAX_PATH]; diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 770a78a..59fbc8e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -58,17 +58,17 @@ extern DWORD errorlevel; static BOOL verify_mode = FALSE; -static const WCHAR dotW[] = {'.','\0'}; -static const WCHAR dotdotW[] = {'.','.','\0'}; -static const WCHAR slashW[] = {'\\','\0'}; -static const WCHAR starW[] = {'*','\0'}; -static const WCHAR equalW[] = {'=','\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 const WCHAR nullW[] = {'\0'}; /************************************************************************** * WCMD_ask_confirm diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 3634ded..03cb952 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -59,13 +59,6 @@ static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse, orderByCol; static BOOL paged_mode, recurse, wide, bare, lower, shortname, usernames, separator; static ULONG showattrs, attrsbits; -static const WCHAR dotW[] = {'.','\0'}; -static const WCHAR dotdotW[] = {'.','.','\0'}; -static const WCHAR starW[] = {'*','\0'}; -static const WCHAR slashW[] = {'\\','\0'}; -static const WCHAR emptyW[] = {'\0'}; -static const WCHAR spaceW[] = {' ','\0'}; - /***************************************************************************** * WCMD_strrev * @@ -432,14 +425,14 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Note: WCMD_output uses wvsprintf which does not allow %* so manually pad with spaces to appropriate width */ - strcpyW(temp, emptyW); + strcpyW(temp, nullW); while (padding > 0) { - strcatW(&temp[toWrite], spaceW); + strcatW(&temp[toWrite], space); toWrite++; if (toWrite > 99) { WCMD_output(temp); toWrite = 0; - strcpyW(temp, emptyW); + strcpyW(temp, nullW); } padding--; } @@ -457,7 +450,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le } else { if (!((strcmpW((fd+i)->cFileName, dotW) == 0) || (strcmpW((fd+i)->cFileName, dotdotW) == 0))) { - WCMD_output (fmt5, recurse?inputparms->dirName:emptyW, (fd+i)->cFileName); + WCMD_output (fmt5, recurse?inputparms->dirName:nullW, (fd+i)->cFileName); } else { addNewLine = FALSE; } @@ -475,7 +468,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (usernames) WCMD_output (fmt3, username); WCMD_output(fmt4,(fd+i)->cFileName); } else { - WCMD_output (fmt5, recurse?inputparms->dirName:emptyW, (fd+i)->cFileName); + WCMD_output (fmt5, recurse?inputparms->dirName:nullW, (fd+i)->cFileName); } } } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 205d31c..88b28c1 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -220,6 +220,13 @@ extern const WCHAR externals[NUM_EXTERNALS][10]; /* Some standard messages */ extern const WCHAR newline[]; +extern const WCHAR space[]; +extern const WCHAR nullW[]; +extern const WCHAR dotW[]; +extern const WCHAR dotdotW[]; +extern const WCHAR starW[]; +extern const WCHAR slashW[]; +extern const WCHAR equalW[]; extern WCHAR anykey[]; extern WCHAR version_string[]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b529672..e306d52 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -90,7 +90,7 @@ int defaultColor = 7; BOOL echo_mode = TRUE; static int opt_c, opt_k, opt_s; const WCHAR newline[] = {'\r','\n','\0'}; -static const WCHAR equalsW[] = {'=','\0'}; +const WCHAR space[] = {' ','\0'}; static const WCHAR closeBW[] = {')','\0'}; WCHAR anykey[100]; WCHAR version_string[100]; @@ -747,7 +747,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, /* search and replace manipulation */ } else { - WCHAR *equalspos = strstrW(colonpos, equalsW); + WCHAR *equalspos = strstrW(colonpos, equalW); WCHAR *replacewith = equalspos+1; WCHAR *found = NULL; WCHAR *searchIn; @@ -1084,7 +1084,6 @@ void WCMD_run_program (WCHAR *command, int called) { WCHAR thisDir[MAX_PATH] = {'\0'}; WCHAR *pos = NULL; BOOL found = FALSE; - static const WCHAR slashW[] = {'\\','\0'}; /* Work on the first directory on the search path */ pos = strchrW(pathposn, ';'); @@ -1332,7 +1331,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, /* According to MSDN CreateProcess docs, special env vars record the current directory on each drive, in the form =C: so see if one specified, and if so go back to it */ - strcpyW(envvar, equalsW); + strcpyW(envvar, equalW); strcatW(envvar, cmd); if (GetEnvironmentVariableW(envvar, dir, MAX_PATH) == 0) { static const WCHAR fmt[] = {'%','s','\\','\0'}; @@ -1835,7 +1834,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); /* Show prompt before batch line IF echo is on and in batch program */ if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { - static const WCHAR spc[]={' ','\0'}; static const WCHAR echoDot[] = {'e','c','h','o','.'}; static const WCHAR echoCol[] = {'e','c','h','o',':'}; const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); @@ -1850,7 +1848,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, extraSpace, min_len, echoCol, len) != CSTR_EQUAL) { - WCMD_output_asis(spc); + WCMD_output_asis(space); } WCMD_output_asis(newline); }

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSHADER_PARAM_DSTMOD_TYPE typedef.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: e43a185c173eb2705f077052d326a88cc5eef5fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43a185c173eb2705f077052d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 21:11:43 2011 +0100 wined3d: Get rid of the WINED3DSHADER_PARAM_DSTMOD_TYPE typedef. --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 460c911..b8f3e84 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -348,13 +348,13 @@ enum wined3d_shader_src_modifier #define WINED3DSP_WRITEMASK_3 0x8 /* .w a */ #define WINED3DSP_WRITEMASK_ALL 0xf /* all */ -typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE +enum wined3d_shader_dst_modifier { WINED3DSPDM_NONE = 0, WINED3DSPDM_SATURATE = 1, WINED3DSPDM_PARTIALPRECISION = 2, WINED3DSPDM_MSAMPCENTROID = 4, -} WINED3DSHADER_PARAM_DSTMOD_TYPE; +}; /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ #define WINED3DSI_TEXLD_PROJECT 1

1 0

Alexandre Julliard : server: Cope with stdio file descriptors being closed on startup.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 3acc2068a00e3de505373c75656e3816a6c05710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acc2068a00e3de505373c756… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 11:39:42 2011 +0100 server: Cope with stdio file descriptors being closed on startup. --- server/request.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/request.c b/server/request.c index cea23ef..05c7464 100644 --- a/server/request.c +++ b/server/request.c @@ -758,6 +758,10 @@ void open_master_socket(void) assert( sizeof(union generic_request) == sizeof(struct request_max_size) ); assert( sizeof(union generic_reply) == sizeof(struct request_max_size) ); + /* make sure the stdio fds are open */ + fd = open( "/dev/null", O_RDWR ); + while (fd >= 0 && fd <= 2) fd = dup( fd ); + if (!server_dir) fatal_error( "directory %s cannot be accessed\n", config_dir ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s", config_dir ); if ((config_dir_fd = open( ".", O_RDONLY )) == -1) fatal_perror( "open %s", config_dir ); @@ -777,12 +781,8 @@ void open_master_socket(void) acquire_lock(); /* close stdin and stdout */ - if ((fd = open( "/dev/null", O_RDWR )) != -1) - { - dup2( fd, 0 ); - dup2( fd, 1 ); - close( fd ); - } + dup2( fd, 0 ); + dup2( fd, 1 ); /* signal parent */ dummy = 0; @@ -813,6 +813,7 @@ void open_master_socket(void) /* init the process tracing mechanism */ init_tracing_mechanism(); + close( fd ); } /* master socket timer expiration handler */

1 0