November 2011 - Wine-Commits

Aric Stewart : usp10: Move scripts to an array initialized once to minimize get_char_script calls .
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 3767cebc8846529d1dbf8b16d6959f128dd2450a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3767cebc8846529d1dbf8b16d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 13:17:11 2011 -0700 usp10: Move scripts to an array initialized once to minimize get_char_script calls. --- dlls/usp10/usp10.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0496a56..f297125 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -802,8 +802,10 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int int cnt = 0, index = 0, str = 0; int New_Script = -1; + int i; WORD *levels = NULL; WORD *strength = NULL; + WORD *scripts = NULL; WORD baselevel = 0; BOOL new_run; @@ -813,12 +815,21 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2) return E_INVALIDARG; + scripts = heap_alloc(cInChars * sizeof(WORD)); + if (!scripts) + return E_OUTOFMEMORY; + + for (i = 0; i < cInChars; i++) + scripts[i] = get_char_script(pwcInChars[i]); + if (psState && psControl) { - int i; levels = heap_alloc_zero(cInChars * sizeof(WORD)); if (!levels) + { + heap_free(scripts); return E_OUTOFMEMORY; + } BIDI_DetermineLevels(pwcInChars, cInChars, psState, psControl, levels); baselevel = levels[0]; @@ -838,6 +849,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int strength = heap_alloc_zero(cInChars * sizeof(WORD)); if (!strength) { + heap_free(scripts); heap_free(levels); return E_OUTOFMEMORY; } @@ -848,7 +860,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int { 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) + else if ((levels[i] == 0 || (odd(psState->uBidiLevel) && levels[i] == psState->uBidiLevel+1)) && scripts[i] == Script_Numeric) { levels[i] = 2; inNumber = TRUE; @@ -870,12 +882,12 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int if (cnt == cInChars) /* All Spaces */ { cnt = 0; - New_Script = get_char_script(pwcInChars[cnt]); + New_Script = scripts[cnt]; } pItems[index].iCharPos = 0; - pItems[index].a = scriptInformation[get_char_script(pwcInChars[cnt])].a; - pScriptTags[index] = scriptInformation[get_char_script(pwcInChars[cnt])].scriptTag; + pItems[index].a = scriptInformation[scripts[cnt]].a; + pScriptTags[index] = scriptInformation[scripts[cnt]].scriptTag; if (strength && strength[cnt] == BIDI_STRONG) str = strength[cnt]; @@ -904,16 +916,16 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int for (cnt=1; cnt < cInChars; cnt++) { if(pwcInChars[cnt] != Numeric_space && pwcInChars[cnt] != ZWJ && pwcInChars[cnt] != ZWNJ) - New_Script = get_char_script(pwcInChars[cnt]); + New_Script = scripts[cnt]; else if (levels) { int j = 1; 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 && levels[cnt] == levels[cnt+j]) - New_Script = get_char_script(pwcInChars[cnt+j]); + New_Script = scripts[cnt+j]; else - New_Script = get_char_script(pwcInChars[cnt]); + New_Script = scripts[cnt]; } new_run = FALSE; @@ -992,6 +1004,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int pItems[index].iCharPos = cnt; /* the last item contains the ptr to the lastchar */ heap_free(levels); heap_free(strength); + heap_free(scripts); return S_OK; }

1 0

Henri Verbeet : d3d10: Add the ID3D10StateBlock interface.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 2112f48eeee15b734a7ff20e69b7b99a25dcc7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2112f48eeee15b734a7ff20e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 21:11:39 2011 +0100 d3d10: Add the ID3D10StateBlock interface. --- include/d3d10effect.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 772d424..8c5cc63 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -778,12 +778,31 @@ DECLARE_INTERFACE(ID3D10EffectPass) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10StateBlock, 0x0803425a, 0x57f5, 0x4dd6, 0x94, 0x65, 0xa8, 0x75, 0x70, 0x83, 0x4a, 0x08); + +#define INTERFACE ID3D10StateBlock +DECLARE_INTERFACE_(ID3D10StateBlock, IUnknown) +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* ID3D10StateBlock methods */ + STDMETHOD(Capture)(THIS) PURE; + STDMETHOD(Apply)(THIS) PURE; + STDMETHOD(ReleaseAllDeviceObjects)(THIS) PURE; + STDMETHOD(GetDevice)(THIS_ ID3D10Device **device) PURE; +}; +#undef INTERFACE + #ifdef __cplusplus extern "C" { #endif HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect); +HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, + D3D10_STATE_BLOCK_MASK *mask, ID3D10StateBlock **stateblock); #ifdef __cplusplus }

1 0

André Hentschel : ole32: Implement writing VT_CLSID properties.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 09202ee949f3797ca756ad39a20fc859373e7d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09202ee949f3797ca756ad39a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 18:02:15 2011 +0100 ole32: Implement writing VT_CLSID properties. --- dlls/ole32/stg_prop.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 5eb0371..53c2a99 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1746,6 +1746,15 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count + sizeof cf_hdr; break; } + case VT_CLSID: + { + CLSID temp; + + StorageUtl_WriteGUID((BYTE *)&temp, 0, var->u.puuid); + hr = IStream_Write(This->stm, &temp, sizeof(temp), &count); + bytesWritten = count; + break; + } default: FIXME("unsupported type: %d\n", var->vt); return STG_E_INVALIDPARAMETER;

1 0

Aric Stewart : usp10: Merge neutral scripts.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 145102c7fdd5968afa3a16135ed8478a2e642714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145102c7fdd5968afa3a16135… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 13:17:25 2011 -0700 usp10: Merge neutral scripts. --- dlls/usp10/usp10.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f297125..0ffab66 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -870,8 +870,41 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int } if (psControl->fMergeNeutralItems) { - HeapFree(GetProcessHeap(),0,strength); - strength = NULL; + /* Merge the neutrals */ + for (i = 0; i < cInChars; i++) + { + if (strength[i] == BIDI_NEUTRAL || strength[i] == BIDI_WEAK) + { + int j; + for (j = i; j > 0; j--) + { + if (levels[i] != levels[j]) + break; + if ((strength[j] == BIDI_STRONG) || (strength[i] == BIDI_NEUTRAL && strength[j] == BIDI_WEAK)) + { + scripts[i] = scripts[j]; + strength[i] = strength[j]; + break; + } + } + } + /* Try going the other way */ + if (strength[i] == BIDI_NEUTRAL || strength[i] == BIDI_WEAK) + { + int j; + for (j = i; j < cInChars; j++) + { + if (levels[i] != levels[j]) + break; + if ((strength[j] == BIDI_STRONG) || (strength[i] == BIDI_NEUTRAL && strength[j] == BIDI_WEAK)) + { + scripts[i] = scripts[j]; + strength[i] = strength[j]; + break; + } + } + } + } } } }

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskDifference().
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: a11a171366d8626c1a0042f9c545b24689c63e75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11a171366d8626c1a0042f9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 21:11:41 2011 +0100 d3d10: Implement D3D10StateBlockMaskDifference(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 23 +++++++++++++++++++++++ dlls/d3d10/tests/device.c | 27 +++++++++++++++++++++++++++ include/d3d10effect.h | 3 +++ 4 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 16d2d5f..baa0c10 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -19,7 +19,7 @@ @ stub D3D10PreprocessShader @ stdcall D3D10ReflectShader(ptr long ptr) @ stub D3D10RegisterLayers -@ stub D3D10StateBlockMaskDifference +@ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) @ stub D3D10StateBlockMaskDisableAll @ stub D3D10StateBlockMaskDisableCapture @ stub D3D10StateBlockMaskEnableAll diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index a254704..f121a5c 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -143,3 +143,26 @@ HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, return S_OK; } + +HRESULT WINAPI D3D10StateBlockMaskDifference(D3D10_STATE_BLOCK_MASK *mask_x, + D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result) +{ + UINT count = sizeof(*result) / sizeof(DWORD); + UINT i; + + TRACE("mask_x %p, mask_y %p, result %p.\n", mask_x, mask_y, result); + + if (!mask_x || !mask_y || !result) + return E_INVALIDARG; + + for (i = 0; i < count; ++i) + { + ((DWORD *)result)[i] = ((DWORD *)mask_x)[i] ^ ((DWORD *)mask_y)[i]; + } + for (i = count * sizeof(DWORD); i < sizeof(*result); ++i) + { + ((BYTE *)result)[i] = ((BYTE *)mask_x)[i] ^ ((BYTE *)mask_y)[i]; + } + + return S_OK; +} diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 8399cdb..1fc3a3b 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -64,6 +64,32 @@ static void test_device_interfaces(ID3D10Device *device) ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIDevice (%#x)\n", hr); } +static void test_stateblock_mask(void) +{ + D3D10_STATE_BLOCK_MASK mask_x, mask_y, result; + HRESULT hr; + + memset(&mask_x, 0, sizeof(mask_x)); + memset(&mask_y, 0, sizeof(mask_y)); + memset(&result, 0, sizeof(result)); + + mask_x.VS = 0x33; + mask_y.VS = 0x55; + mask_x.Predication = 0x99; + mask_y.Predication = 0xaa; + + hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, &result); + ok(SUCCEEDED(hr), "D3D10StateBlockMaskDifference failed, hr %#x.\n", hr); + ok(result.VS == 0x66, "Got unexpected result.VS %#x.\n", result.VS); + ok(result.Predication == 0x33, "Got unexpected result.Predication %#x.\n", result.Predication); + hr = D3D10StateBlockMaskDifference(NULL, &mask_y, &result); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + hr = D3D10StateBlockMaskDifference(&mask_x, NULL, &result); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); +} + START_TEST(device) { ID3D10Device *device; @@ -77,6 +103,7 @@ START_TEST(device) } test_device_interfaces(device); + test_stateblock_mask(); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left\n", refcount); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 8c5cc63..d36c3da 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -804,6 +804,9 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, D3D10_STATE_BLOCK_MASK *mask, ID3D10StateBlock **stateblock); +HRESULT WINAPI D3D10StateBlockMaskDifference(D3D10_STATE_BLOCK_MASK *mask_x, + D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result); + #ifdef __cplusplus } #endif

1 0

André Hentschel : kernel32/tests: Fix two typos.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 62d719419c875f3dd5c9ee7f5becdf4c18b1b3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d719419c875f3dd5c9ee7f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 19:20:34 2011 +0100 kernel32/tests: Fix two typos. --- dlls/kernel32/tests/actctx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index b7f3010..3af6e63 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -591,7 +591,7 @@ static HANDLE test_create(const char *file, const char *manifest) ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); ok(actctx.cbSize == sizeof(actctx), "actctx.cbSize=%d\n", actctx.cbSize); - ok(actctx.dwFlags == 0, "actctx.=%d\n", actctx.dwFlags); + ok(actctx.dwFlags == 0, "actctx.dwFlags=%d\n", actctx.dwFlags); ok(actctx.lpSource == path, "actctx.lpSource=%p\n", actctx.lpSource); ok(actctx.wProcessorArchitecture == 0, "actctx.wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); @@ -599,7 +599,7 @@ static HANDLE test_create(const char *file, const char *manifest) ok(actctx.lpAssemblyDirectory == NULL, "actctx.lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); ok(actctx.lpResourceName == NULL, "actctx.lpResourceName=%p\n", actctx.lpResourceName); - ok(actctx.lpApplicationName == NULL, "actctx.lpApplocationName=%p\n", + ok(actctx.lpApplicationName == NULL, "actctx.lpApplicationName=%p\n", actctx.lpApplicationName); ok(actctx.hModule == NULL, "actctx.hModule=%p\n", actctx.hModule);

1 0

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

Nov. 15, 2011

Module: wine Branch: master Commit: ba5b0c34a83bbf939f5ad70239c4c0c1d5a5e0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5b0c34a83bbf939f5ad7023… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 18:33:00 2011 +0100 msvcrt: Implement freopen_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 76618ea..87cae04 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1469,7 +1469,7 @@ @ stub fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen -@ stub freopen_s +@ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s @ cdecl frexp(double ptr) msvcrt.frexp @ varargs fscanf(ptr str) msvcrt.fscanf @ varargs fscanf_s(ptr str) msvcrt.fscanf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f3c0a94..06751ef 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1325,7 +1325,7 @@ @ stub fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen -@ stub freopen_s +@ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s @ cdecl frexp(double ptr) msvcrt.frexp @ varargs fscanf(ptr str) msvcrt.fscanf @ varargs fscanf_s(ptr str) msvcrt.fscanf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e40d2e9..688bdc6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1326,7 +1326,7 @@ @ stub fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen -@ stub freopen_s +@ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s @ cdecl frexp(double ptr) msvcrt.frexp @ varargs fscanf(ptr str) msvcrt.fscanf @ varargs fscanf_s(ptr str) msvcrt.fscanf_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b6af98f..f3200eb 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3300,6 +3300,25 @@ MSVCRT_FILE* CDECL MSVCRT_freopen(const char *path, const char *mode, MSVCRT_FIL } /********************************************************************* + * freopen_s (MSVCRT.@) + */ +int CDECL MSVCRT_freopen_s(MSVCRT_FILE** pFile, + const char *path, const char *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_freopen(path, mode, file); + + if(!*pFile) + return *MSVCRT__errno(); + return 0; +} + +/********************************************************************* * fsetpos (MSVCRT.@) */ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c8c710d..f2b5e33 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1269,7 +1269,7 @@ @ cdecl fread(ptr long long ptr) MSVCRT_fread @ cdecl free(ptr) MSVCRT_free @ cdecl freopen(str str ptr) MSVCRT_freopen -# stub freopen_s(ptr str str ptr) +@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp @ cdecl -arch=x86_64 frexpf(float ptr) MSVCRT_frexpf @ varargs fscanf(ptr str) MSVCRT_fscanf

1 0

Maarten Lankhorst : ntdll: Use VALGRIND_RESIZEINPLACE_BLOCK when available.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: d9889cfd632b0ac27026fdd92b5cae879bce62fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9889cfd632b0ac27026fdd92… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 11 22:12:25 2011 +0100 ntdll: Use VALGRIND_RESIZEINPLACE_BLOCK when available. --- dlls/ntdll/heap.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 022045f..6ca509a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -263,6 +263,13 @@ static inline void notify_free( void const *ptr ) #endif } +static inline void notify_realloc( void const *ptr, SIZE_T size_old, SIZE_T size_new ) +{ +#ifdef VALGRIND_RESIZEINPLACE_BLOCK + VALGRIND_RESIZEINPLACE_BLOCK( ptr, size_old, size_new, 0 ); +#endif +} + static void subheap_notify_free_all(SUBHEAP const *subheap) { #ifdef VALGRIND_FREELIKE_BLOCK @@ -753,6 +760,11 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz SIZE_T unused = arena->block_size - sizeof(*arena) - size; /* FIXME: we could remap zero-pages instead */ +#ifdef VALGRIND_RESIZEINPLACE_BLOCK + if (RUNNING_ON_VALGRIND) + notify_realloc( arena + 1, arena->data_size, size ); + else +#endif if (size > arena->data_size) initialize_block( (char *)ptr + arena->data_size, size - arena->data_size, unused, flags ); else @@ -1844,11 +1856,8 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size list_remove( &pFree->entry ); pArena->size += (pFree->size & ARENA_SIZE_MASK) + sizeof(*pFree); if (!HEAP_Commit( subheap, pArena, rounded_size )) goto oom; - notify_free( pArena + 1 ); + notify_realloc( pArena + 1, oldActualSize, size ); HEAP_ShrinkBlock( subheap, pArena, rounded_size ); - notify_alloc( pArena + 1, size, FALSE ); - /* FIXME: this is wrong as we may lose old VBits settings */ - mark_block_initialized( pArena + 1, oldActualSize ); } else /* Do it the hard way */ { @@ -1883,12 +1892,8 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size } else { - /* Shrink the block */ - notify_free( pArena + 1 ); HEAP_ShrinkBlock( subheap, pArena, rounded_size ); - notify_alloc( pArena + 1, size, FALSE ); - /* FIXME: this is wrong as we may lose old VBits settings */ - mark_block_initialized( pArena + 1, size ); + notify_realloc( pArena + 1, oldActualSize, size ); } pArena->unused_bytes = (pArena->size & ARENA_SIZE_MASK) - size;

1 0

Frédéric Delanoy : cmd: Trim whitespace in echo on/off.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: e8d8df3c542548c329d3deca62d0352b531222d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d8df3c542548c329d3deca6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 11 19:27:43 2011 +0100 cmd: Trim whitespace in echo on/off. --- programs/cmd/builtins.c | 54 +++++++++++++++++++++++------ programs/cmd/tests/test_builtins.cmd | 2 + programs/cmd/tests/test_builtins.cmd.exp | 2 + 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5272bfc..770a78a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -854,6 +854,35 @@ BOOL WCMD_delete (WCHAR *command) { return foundAny; } +/* + * WCMD_strtrim + * + * Returns a trimmed version of s with all leading and trailing whitespace removed + * Pre: s non NULL + * + */ +static WCHAR *WCMD_strtrim(const WCHAR *s) +{ + DWORD len = strlenW(s); + const WCHAR *start = s; + WCHAR* result; + + if (!(result = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) + return NULL; + + while (isspaceW(*start)) start++; + if (*start) { + const WCHAR *end = s + len - 1; + while (end > start && isspaceW(*end)) end--; + memcpy(result, start, (end - start + 2) * sizeof(WCHAR)); + result[end - start + 1] = '\0'; + } else { + result[0] = '\0'; + } + + return result; +} + /**************************************************************************** * WCMD_echo * @@ -861,33 +890,36 @@ BOOL WCMD_delete (WCHAR *command) { * in DOS (try typing "ECHO ON AGAIN" for an example). */ -void WCMD_echo (const WCHAR *command) { - +void WCMD_echo (const WCHAR *command) +{ int count; const WCHAR *origcommand = command; + WCHAR *trimmed; if ( command[0]==' ' || command[0]=='\t' || command[0]=='.' || command[0]==':' || command[0]==';') command++; - count = strlenW(command); + trimmed = WCMD_strtrim(command); + if (!trimmed) return; + + count = strlenW(trimmed); if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':' && origcommand[0]!=';') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); return; } - if (lstrcmpiW(command, onW) == 0) { + + if (lstrcmpiW(trimmed, onW) == 0) echo_mode = TRUE; - return; - } - if (lstrcmpiW(command, offW) == 0) { + else if (lstrcmpiW(trimmed, offW) == 0) echo_mode = FALSE; - return; + else { + WCMD_output_asis (command); + WCMD_output (newline); } - WCMD_output_asis (command); - WCMD_output (newline); - + HeapFree(GetProcessHeap(), 0, trimmed); } /************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 13c9393..bcaccb2 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -26,8 +26,10 @@ echo(a)tab@word(a)tab@@space@ echo @tab(a)word echo @tab(a)word echo(a)tab@@tab(a)word +echo @tab@ on @space@ @echo off +echo off(a)tab@@space@ echo ------------ Testing 'echo' [OFF] -------------- echo word echo 'singlequotedword' diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7a0eec3..e35b710 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -74,6 +74,8 @@ word @pwd@>echo(a)tab@@tab(a)word@space@ @tab(a)word + +(a)pwd@>echo @tab@ on @space@@space@ ------------ Testing 'echo' [OFF] -------------- word 'singlequotedword'

1 0

Aric Stewart : usp10: Properly set LayoutRTL.
by Alexandre Julliard Nov. 15, 2011

Nov. 15, 2011

Module: wine Branch: master Commit: 7868be6e707404229ca7eedea743d280d146995b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7868be6e707404229ca7eedea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 14 13:18:02 2011 -0700 usp10: Properly set LayoutRTL. --- dlls/usp10/tests/usp10.c | 10 +++++----- dlls/usp10/usp10.c | 19 ++++++++++++++++--- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index a6e75a1..0718451 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -148,13 +148,13 @@ static void test_ScriptItemize( void ) static const WCHAR test1c[] = {' ', ' ', ' ', '1', '2', ' ',0}; static const itemTest t1c1[2] = {{{0,0,0,0,0},0,0,0,0,0},{{0,0,0,0,0},6,0,0,0,-1}}; - static const itemTest t1c2[4] = {{{0,0,0,0,0},0,1,1,1,0},{{0,0,1,0,0},3,0,1,2,0},{{0,0,0,0,0},5,1,1,1,0},{{0,0,0,0,0},6,0,0,0,-1}}; + static const itemTest t1c2[4] = {{{0,0,0,0,0},0,1,1,1,0},{{0,0,0,0,0},3,0,1,2,0},{{0,0,0,0,0},5,1,1,1,0},{{0,0,0,0,0},6,0,0,0,-1}}; /* 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,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 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,0,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,0,0,0},0,0,1,2,0},{{0,0,0,0,0},6,1,1,1,arab_tag},{{0,0,0,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}; static const itemTest t2b1[5] = {{{0,0,0,0,0},0,0,0,0,latn_tag},{{0,0,0,0,0},3,0,0,0,0},{{0,0,0,0,0},4,0,0,0,latn_tag},{{0,0,0,0,0},8,1,1,1,arab_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,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}}; + static const itemTest t42[5] = {{{0,0,0,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,0,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 94c49fe..589711d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -814,6 +814,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int WORD baselevel = 0; BOOL new_run; WORD last_indic = -1; + WORD layoutRTL = 0; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -948,12 +949,14 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int if (levels) { + layoutRTL = (psState->uBidiLevel || odd(levels[cnt]))?1:0; pItems[index].a.fRTL = odd(levels[cnt]); - pItems[index].a.fLayoutRTL = odd(levels[cnt]); + pItems[index].a.fLayoutRTL = layoutRTL; pItems[index].a.s.uBidiLevel = levels[cnt]; } else if (!pItems[index].a.s.uBidiLevel) { + layoutRTL = (odd(baselevel))?1:0; pItems[index].a.s.uBidiLevel = baselevel; pItems[index].a.fLayoutRTL = odd(baselevel); pItems[index].a.fRTL = odd(baselevel); @@ -1005,6 +1008,12 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int new_run = TRUE; } + if (!new_run && strength && str == BIDI_STRONG) + { + layoutRTL = odd(levels[cnt])?1:0; + pItems[index].a.fLayoutRTL = layoutRTL; + } + 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); @@ -1023,14 +1032,18 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int pScriptTags[index] = scriptInformation[New_Script].scriptTag; if (levels) { + if (levels[cnt] == 0) + layoutRTL = 0; + else + layoutRTL = (layoutRTL || odd(levels[cnt]))?1:0; pItems[index].a.fRTL = odd(levels[cnt]); - pItems[index].a.fLayoutRTL = odd(levels[cnt]); + pItems[index].a.fLayoutRTL = layoutRTL; pItems[index].a.s.uBidiLevel = levels[cnt]; } else if (!pItems[index].a.s.uBidiLevel) { pItems[index].a.s.uBidiLevel = baselevel; - pItems[index].a.fLayoutRTL = odd(baselevel); + pItems[index].a.fLayoutRTL = layoutRTL; pItems[index].a.fRTL = odd(baselevel); }

1 0