wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Dmitry Timoshkov : user32: Add more window style tests, make them pass under Wine.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 8f565eb6ae2663e2ef11342e85ce1cada1f6404c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f565eb6ae2663e2ef11342e8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 7 16:06:23 2011 +0800 user32: Add more window style tests, make them pass under Wine. --- dlls/user32/tests/win.c | 56 +++++++++++++++++++++++++++++++++++++--------- dlls/user32/win.c | 23 +++++++++++------- 2 files changed, 59 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index a090389..a85c8ad 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3696,6 +3696,7 @@ static void register_style_check_class(void) }; atomStyleCheckClass = RegisterClass(&wc); + assert(atomStyleCheckClass); } static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyleOut, DWORD dwExStyleOut) @@ -3723,12 +3724,23 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle dwActualStyle = GetWindowLong(hwnd, GWL_STYLE); dwActualExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); - ok((dwActualStyle == dwStyleOut) && (dwActualExStyle == dwExStyleOut), - "Style (0x%08x) should really be 0x%08x and/or Ex style (0x%08x) should really be 0x%08x\n", - dwActualStyle, dwStyleOut, dwActualExStyle, dwExStyleOut); + ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); /* try setting the styles explicitly */ SetWindowLong( hwnd, GWL_EXSTYLE, dwExStyleIn ); + dwActualStyle = GetWindowLong(hwnd, GWL_STYLE); + dwActualExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); + /* WS_EX_WINDOWEDGE can't always be changed */ + if (dwExStyleIn & WS_EX_DLGMODALFRAME) + dwExStyleOut = dwExStyleIn | WS_EX_WINDOWEDGE; + else if ((dwActualStyle & (WS_DLGFRAME | WS_THICKFRAME)) && !(dwExStyleIn & WS_EX_STATICEDGE)) + dwExStyleOut = dwExStyleIn | WS_EX_WINDOWEDGE; + else + dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; + ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); + SetWindowLong( hwnd, GWL_STYLE, dwStyleIn ); dwActualStyle = GetWindowLong(hwnd, GWL_STYLE); dwActualExStyle = GetWindowLong(hwnd, GWL_EXSTYLE); @@ -3736,15 +3748,18 @@ static void check_window_style(DWORD dwStyleIn, DWORD dwExStyleIn, DWORD dwStyle if ((dwStyleIn & (WS_CHILD|WS_POPUP)) == WS_CHILD) dwStyleOut = dwStyleIn; else dwStyleOut = dwStyleIn | WS_CLIPSIBLINGS; /* WS_EX_WINDOWEDGE can't always be changed */ - if ((dwExStyleIn & WS_EX_DLGMODALFRAME) || (dwStyleIn & WS_THICKFRAME)) + if (dwExStyleIn & WS_EX_DLGMODALFRAME) dwExStyleOut = dwExStyleIn | WS_EX_WINDOWEDGE; - else if (dwStyleIn & (WS_CHILD | WS_POPUP)) + else if ((dwActualStyle & (WS_DLGFRAME | WS_THICKFRAME)) && !(dwExStyleIn & WS_EX_STATICEDGE)) + dwExStyleOut = dwExStyleIn | WS_EX_WINDOWEDGE; + else dwExStyleOut = dwExStyleIn & ~WS_EX_WINDOWEDGE; + ok(dwActualStyle == dwStyleOut, "expected style %#x, got %#x\n", dwStyleOut, dwActualStyle); + /* FIXME: Remove the condition below once Wine is fixed */ + if (dwActualExStyle != dwExStyleOut) + todo_wine ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); else - dwExStyleOut = dwExStyleIn; - ok((dwActualStyle == dwStyleOut) && (dwActualExStyle == dwExStyleOut), - "%08x/%08x: Style (0x%08x) should really be 0x%08x and/or Ex style (0x%08x) should really be 0x%08x\n", - dwStyleIn, dwExStyleIn, dwActualStyle, dwStyleOut, dwActualExStyle, dwExStyleOut); + ok(dwActualExStyle == dwExStyleOut, "expected ex_style %#x, got %#x\n", dwExStyleOut, dwActualExStyle); DestroyWindow(hwnd); if (hwndParent) DestroyWindow(hwndParent); @@ -3756,17 +3771,36 @@ static void test_window_styles(void) register_style_check_class(); check_window_style(0, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); + check_window_style(WS_DLGFRAME, 0, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); + check_window_style(WS_THICKFRAME, 0, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE); + check_window_style(WS_DLGFRAME, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE); + check_window_style(WS_THICKFRAME, WS_EX_STATICEDGE, WS_THICKFRAME|WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_STATICEDGE); check_window_style(WS_OVERLAPPEDWINDOW, 0, WS_CLIPSIBLINGS|WS_OVERLAPPEDWINDOW, WS_EX_WINDOWEDGE); check_window_style(WS_CHILD, 0, WS_CHILD, 0); + check_window_style(WS_CHILD|WS_DLGFRAME, 0, WS_CHILD|WS_DLGFRAME, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD|WS_THICKFRAME, 0, WS_CHILD|WS_THICKFRAME, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_DLGFRAME, WS_EX_STATICEDGE); + check_window_style(WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_THICKFRAME, WS_EX_STATICEDGE); + check_window_style(WS_CHILD|WS_CAPTION, 0, WS_CHILD|WS_CAPTION, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD|WS_CAPTION|WS_SYSMENU, 0, WS_CHILD|WS_CAPTION|WS_SYSMENU, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); + check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME, WS_CHILD, WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); + check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME|WS_EX_STATICEDGE, WS_CHILD, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); check_window_style(WS_CHILD|WS_POPUP, 0, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); + check_window_style(WS_CHILD|WS_POPUP|WS_DLGFRAME, 0, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD|WS_POPUP|WS_THICKFRAME, 0, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); + check_window_style(WS_CHILD|WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); + check_window_style(WS_CHILD|WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_CHILD|WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); check_window_style(WS_CHILD|WS_POPUP, WS_EX_APPWINDOW, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, WS_EX_APPWINDOW); check_window_style(WS_CHILD|WS_POPUP, WS_EX_WINDOWEDGE, WS_CHILD|WS_POPUP|WS_CLIPSIBLINGS, 0); check_window_style(WS_CHILD, WS_EX_WINDOWEDGE, WS_CHILD, 0); check_window_style(0, WS_EX_TOOLWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW); check_window_style(WS_POPUP, 0, WS_POPUP|WS_CLIPSIBLINGS, 0); check_window_style(WS_POPUP, WS_EX_WINDOWEDGE, WS_POPUP|WS_CLIPSIBLINGS, 0); - check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME, WS_CHILD, WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); - check_window_style(WS_CHILD, WS_EX_DLGMODALFRAME|WS_EX_STATICEDGE, WS_CHILD, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE|WS_EX_DLGMODALFRAME); + check_window_style(WS_POPUP|WS_DLGFRAME, 0, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); + check_window_style(WS_POPUP|WS_THICKFRAME, 0, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_WINDOWEDGE); + check_window_style(WS_POPUP|WS_DLGFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_DLGFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); + check_window_style(WS_POPUP|WS_THICKFRAME, WS_EX_STATICEDGE, WS_POPUP|WS_THICKFRAME|WS_CLIPSIBLINGS, WS_EX_STATICEDGE); check_window_style(WS_CAPTION, WS_EX_STATICEDGE, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_STATICEDGE|WS_EX_WINDOWEDGE); check_window_style(0, WS_EX_APPWINDOW, WS_CLIPSIBLINGS|WS_CAPTION, WS_EX_APPWINDOW|WS_EX_WINDOWEDGE); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f94b181..74e8d6b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1324,14 +1324,15 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, wndPtr->dwStyle |= WS_CAPTION; } - /* - * WS_EX_WINDOWEDGE appears to be enforced based on the other styles, so - * why does the user get to set it? - */ - - if ((wndPtr->dwExStyle & WS_EX_DLGMODALFRAME) || - (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME))) + /* WS_EX_WINDOWEDGE depends on some other styles */ + if (wndPtr->dwExStyle & WS_EX_DLGMODALFRAME) wndPtr->dwExStyle |= WS_EX_WINDOWEDGE; + else if (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) + { + if (!((wndPtr->dwExStyle & WS_EX_STATICEDGE) && + (wndPtr->dwStyle & (WS_CHILD | WS_POPUP)))) + wndPtr->dwExStyle |= WS_EX_WINDOWEDGE; + } else wndPtr->dwExStyle &= ~WS_EX_WINDOWEDGE; @@ -2176,6 +2177,8 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B newval = style.styleNew; /* WS_CLIPSIBLINGS can't be reset on top-level windows */ if (wndPtr->parent == GetDesktopWindow()) newval |= WS_CLIPSIBLINGS; + /* FIXME: changing WS_DLGFRAME | WS_THICKFRAME is supposed to change + WS_EX_WINDOWEDGE too */ break; case GWL_EXSTYLE: style.styleOld = wndPtr->dwExStyle; @@ -2186,9 +2189,11 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B /* WS_EX_TOPMOST can only be changed through SetWindowPos */ newval = (style.styleNew & ~WS_EX_TOPMOST) | (wndPtr->dwExStyle & WS_EX_TOPMOST); /* WS_EX_WINDOWEDGE depends on some other styles */ - if ((newval & WS_EX_DLGMODALFRAME) || (wndPtr->dwStyle & WS_THICKFRAME)) + if (newval & WS_EX_DLGMODALFRAME) + newval |= WS_EX_WINDOWEDGE; + else if (!(newval & WS_EX_STATICEDGE) && (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME))) newval |= WS_EX_WINDOWEDGE; - else if (wndPtr->dwStyle & (WS_CHILD|WS_POPUP)) + else newval &= ~WS_EX_WINDOWEDGE; break; case GWLP_HWNDPARENT:

1 0

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

07 Dec '11

Module: wine Branch: master Commit: 0652bbc3d56b7e63f8188598da65bf4f06b2a244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0652bbc3d56b7e63f8188598d… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Dec 6 21:54:42 2011 +0100 wineps.drv: Fix memory leak. --- dlls/wineps.drv/download.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 6996205..6af4841 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -258,15 +258,18 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev) assert(physDev->font.fontloc == Download); + if (!GetObjectW( GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf )) + return FALSE; + potm = HeapAlloc(GetProcessHeap(), 0, len); + if (!potm) + return FALSE; + GetOutlineTextMetricsA(dev->hdc, len, potm); get_download_name(dev, potm, &ps_name); physDev->font.fontinfo.Download = is_font_downloaded(physDev, ps_name); - if (!GetObjectW( GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf )) - return FALSE; - ppem = calc_ppem_for_height(dev->hdc, lf.lfHeight); /* Retrieve the world -> device transform */

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

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 : 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 : 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

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

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

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

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

← Newer
1
...
60
61
62
63
64
65
66
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011