December 2011 - Wine-commits

Aric Stewart : usp10: Handle dangling joiners when processing Indic GlyphProps.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 746679e186c1dfa50b799407d315e8fd030374a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=746679e186c1dfa50b799407d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 7 08:30:49 2011 -0600 usp10: Handle dangling joiners when processing Indic GlyphProps. --- dlls/usp10/shape.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5b9bb56..4ee658e 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3302,7 +3302,11 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL break; case lex_ZWJ: case lex_ZWNJ: - k = char_count; + /* check for dangling joiners */ + if (pwcChars[char_index[k]-1] == 0x0020 || pwcChars[char_index[k]+1] == 0x0020) + pGlyphProp[i].sva.fClusterStart = 1; + else + k = char_count; break; default: pGlyphProp[i].sva.fClusterStart = 1;

1 0

Jacek Caban : appwiz.cpl: Run winebrowser directly instead of using ShellExecute.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: fd230c5d15b63883211ae1f7e7bea62b99664107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd230c5d15b63883211ae1f7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 7 18:28:04 2011 +0100 appwiz.cpl: Run winebrowser directly instead of using ShellExecute. --- dlls/appwiz.cpl/addons.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4987ea3..9a410b8 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -434,10 +434,45 @@ static DWORD WINAPI download_proc(PVOID arg) return 0; } -static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +static void run_winebrowser(const WCHAR *url) { - static const WCHAR openW[] = {'o','p','e','n',0}; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + WCHAR app[MAX_PATH]; + LONG len, url_len; + WCHAR *args; + BOOL ret; + + static const WCHAR winebrowserW[] = {'\\','w','i','n','e','b','r','o','w','s','e','r','.','e','x','e',0}; + + url_len = strlenW(url); + + len = GetSystemDirectoryW(app, MAX_PATH-sizeof(winebrowserW)/sizeof(WCHAR)); + memcpy(app+len, winebrowserW, sizeof(winebrowserW)); + len += sizeof(winebrowserW)/sizeof(WCHAR) -1; + + args = heap_alloc((len+1+url_len)*sizeof(WCHAR)); + if(!args) + return; + + memcpy(args, app, len*sizeof(WCHAR)); + args[len++] = ' '; + memcpy(args+len, url, (url_len+1) * sizeof(WCHAR)); + TRACE("starting %s\n", debugstr_w(args)); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + heap_free(args); + if (ret) { + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + } +} + +static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ switch(msg) { case WM_INITDIALOG: ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_HIDE); @@ -450,7 +485,7 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case NM_CLICK: case NM_RETURN: if (wParam == ID_DWL_STATUS) - ShellExecuteW( NULL, openW, ((NMLINK *)lParam)->item.szUrl, NULL, NULL, SW_SHOW ); + run_winebrowser(((NMLINK*)lParam)->item.szUrl); break; } break;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DBOX typedef.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 5c5216e609cfa81a40ad6d53f8316ff3f415f735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5216e609cfa81a40ad6d53f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 6 22:57:47 2011 +0100 wined3d: Get rid of the WINED3DBOX typedef. --- dlls/d3d8/cubetexture.c | 16 +++++----- dlls/d3d8/texture.c | 16 +++++----- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- dlls/d3d9/cubetexture.c | 16 +++++----- dlls/d3d9/texture.c | 16 +++++----- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/wined3d/surface.c | 26 ++++++++-------- dlls/wined3d/texture.c | 6 ++-- dlls/wined3d/volume.c | 62 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 10 +++--- include/wine/wined3d.h | 22 +++++++------- 13 files changed, 99 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c5216e609cfa81a40ad6…

1 0

Henri Verbeet : wined3d: Get rid of the WineDirect3DStridedData typedef.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 4c3dfa1bca2827dd8ccccff510f08f99e8626af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3dfa1bca2827dd8ccccff51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 6 22:57:48 2011 +0100 wined3d: Get rid of the WineDirect3DStridedData typedef. --- dlls/ddraw/device.c | 40 ++++++++++++++++++++-------------------- dlls/wined3d/device.c | 16 ++++++++-------- dlls/wined3d/drawprim.c | 23 ++++++++++++----------- include/wine/wined3d.h | 20 ++++++++++---------- 4 files changed, 50 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c3dfa1bca2827dd8cccc…

1 0

Aric Stewart : usp10: Unicode does not compose the Gurmukhi letter SHA.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: c481cdd25e0c37e9359244c1129e17a6eae37740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c481cdd25e0c37e9359244c11… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 07:57:02 2011 -0600 usp10: Unicode does not compose the Gurmukhi letter SHA. --- dlls/usp10/shape.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8d3a355..5b9bb56 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2625,7 +2625,6 @@ static int gurmukhi_lex(WCHAR c) static const ConsonantComponents Gurmukhi_consonants[] = { {{0x0A32,0x0A3C,0x0000}, 0x0A33}, - {{0x0A38,0x0A3C,0x0000}, 0x0A36}, {{0x0A16,0x0A3C,0x0000}, 0x0A59}, {{0x0A17,0x0A3C,0x0000}, 0x0A5A}, {{0x0A1C,0x0A3C,0x0000}, 0x0A5B},

1 0

Frédéric Delanoy : cmd: Avoid duplication of commonly used strings.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 0eec6b5de0a4d728a87b094d4c767c5cf1db0f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eec6b5de0a4d728a87b094d4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 6 23:08:00 2011 +0100 cmd: Avoid duplication of commonly used strings. --- programs/cmd/directory.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 1134f23..d58351e 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -410,8 +410,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le cur_width = 0; } else { static const WCHAR padfmt[] = {'%','1','!','*','s','!','\0'}; - static const WCHAR empty[] = {'\0'}; - WCMD_output(padfmt, cur_width - tmp_width, empty); + WCMD_output(padfmt, cur_width - tmp_width, nullW); } } else if ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {

1 0

Pierre Schweitzer : kernel32: Fix memory leak.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: d5642a47ed6a80537011d15e4a987c8b982c3787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5642a47ed6a80537011d15e4… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Dec 6 21:51:45 2011 +0100 kernel32: Fix memory leak. --- dlls/kernel32/sync.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 9630258..7d5d45c 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1529,6 +1529,8 @@ BOOL WINAPI WaitNamedPipeW (LPCWSTR name, DWORD nTimeOut) FILE_SYNCHRONOUS_IO_NONALERT); if (status != ERROR_SUCCESS) { + HeapFree( GetProcessHeap(), 0, pipe_wait); + RtlFreeUnicodeString( &nt_name ); SetLastError( ERROR_PATH_NOT_FOUND ); return FALSE; }

1 0

Pierre Schweitzer : usp10: Fix memory leaks.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 783683be2decd90079e484e6d12eee958da29754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=783683be2decd90079e484e6d… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Dec 6 21:54:25 2011 +0100 usp10: Fix memory leaks. --- dlls/usp10/usp10.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index fdd8750..1506bd5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1439,7 +1439,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, { int tab_x = 0; if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) + { + heap_free(BidiLevel); goto error; + } for (i = 0; i < analysis->numItems; i++) { @@ -2422,8 +2425,16 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, if (!(pwOutGlyphs[i] = get_cache_glyph(psc, chInput))) { WORD glyph; - if (!hdc) return E_PENDING; - if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR) return S_FALSE; + if (!hdc) + { + heap_free(rChars); + return E_PENDING; + } + if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR) + { + heap_free(rChars); + return S_FALSE; + } pwOutGlyphs[i] = set_cache_glyph(psc, chInput, glyph); } rChars[i] = chInput; @@ -2487,7 +2498,11 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars); if (!charProps) return E_OUTOFMEMORY; glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs); - if (!glyphProps) return E_OUTOFMEMORY; + if (!glyphProps) + { + heap_free(charProps); + return E_OUTOFMEMORY; + } hr = ScriptShapeOpenType(hdc, psc, psa, scriptInformation[psa->eScript].scriptTag, 0, NULL, NULL, 0, pwcChars, cChars, cMaxGlyphs, pwLogClust, charProps, pwOutGlyphs, glyphProps, pcGlyphs);

1 0

Pierre Schweitzer : msctf: Fix memory leaks.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: f566f38e2fd85f05f1291d7b6154440887c15a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f566f38e2fd85f05f1291d7b6… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Dec 6 21:53:20 2011 +0100 msctf: Fix memory leaks. --- dlls/msctf/context.c | 3 +++ dlls/msctf/inputprocessor.c | 6 ++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index fbd7229..c013cf9 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -1013,7 +1013,10 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, sinkcookie = HeapAlloc(GetProcessHeap(),0,sizeof(EditCookie)); if (!sinkcookie) + { + HeapFree(GetProcessHeap(), 0, cookie); return E_OUTOFMEMORY; + } cookie->lockType = dwLockFlags; cookie->pOwningContext = This->pContext; diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 62b93c6..5242f14 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -924,7 +924,10 @@ static HRESULT ProfilesEnumGuid_Constructor(IEnumGUID **ppOut) if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szwSystemTIPKey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &This->key, NULL) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, This); return E_FAIL; + } TRACE("returning %p\n", This); *ppOut = (IEnumGUID*)This; @@ -1161,7 +1164,10 @@ static HRESULT EnumTfLanguageProfiles_Constructor(LANGID langid, IEnumTfLanguage if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szwSystemTIPKey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &This->tipkey, NULL) != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, This); return E_FAIL; + } TRACE("returning %p\n", This); *ppOut = (IEnumTfLanguageProfiles*)This;

1 0

Pierre Schweitzer : msacm32: Fix buffer double free.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 1ac7096728dbb46a56f84fa0d25fdc3cc5282519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac7096728dbb46a56f84fa0d… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Dec 6 21:52:51 2011 +0100 msacm32: Fix buffer double free. --- dlls/msacm32/internal.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 239f4d3..b3f6bf3 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -1016,6 +1016,9 @@ PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER paldrv, LPAR PWINE_ACMLOCALDRIVERINST pDrvInst; pDrvInst = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMLOCALDRIVERINST)); + if (!pDrvInst) + return NULL; + pDrvInst->pLocalDriver = paldrv; pDrvInst->dwDriverID = 0; pDrvInst->pNextACMInst = NULL; @@ -1037,9 +1040,14 @@ PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER paldrv, LPAR ret = MSACM_OpenLocalDriver(paldrv, lParam2); if (!ret) { - MSACM_CloseLocalDriver(pDrvInst); ERR("load1 failed\n"); - goto exit; + /* If MSACM_CloseLocalDriver returns TRUE, + * then pDrvInst has been freed + */ + if (!MSACM_CloseLocalDriver(pDrvInst)) + goto exit; + + return NULL; } pDrvInst->bSession = TRUE; return ret;

1 0