wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

André Hentschel : msxml3: Fix remaining memory leak ( coverity).
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 5e031741cd02785348da0d0c51d12e1a3c517c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e031741cd02785348da0d0c5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 15:57:22 2012 +0100 msxml3: Fix remaining memory leak (coverity). --- dlls/msxml3/httprequest.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 9a9d93e..62fff98 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -685,7 +685,11 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * case VT_ARRAY|VT_UI1: { sa = V_ARRAY(body); - if ((hr = SafeArrayAccessData(sa, (void **)&ptr)) != S_OK) return hr; + if ((hr = SafeArrayAccessData(sa, (void **)&ptr)) != S_OK) + { + heap_free(bsc); + return hr; + } if ((hr = SafeArrayGetUBound(sa, 1, &size) != S_OK)) { SafeArrayUnaccessData(sa);

1 0

André Hentschel : oleaut32: Fix remaining memory leak (coverity).
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 43ffbe5611161d1227baa710c541c22b94794204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ffbe5611161d1227baa710c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 10 15:56:58 2012 +0100 oleaut32: Fix remaining memory leak (coverity). --- dlls/oleaut32/typelib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index cb179f9..83ea7e1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4079,6 +4079,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) pTIHeader = pBlk; if(pTIHeader->magic != SLTG_TIHEADER_MAGIC) { FIXME_(typelib)("TypeInfoHeader magic = %04x\n", pTIHeader->magic); + heap_free(pOtherTypeInfoBlks); return NULL; } TRACE_(typelib)("pTIHeader->res06 = %x, pTIHeader->res0e = %x, "

1 0

Akihiro Sagawa : winmm: Fix SEEK_END direction of mmio files without buffering.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 2d3f3204633388e0bba5ace02ebd370a9be1692d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3f3204633388e0bba5ace02… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Nov 13 00:26:45 2012 +0900 winmm: Fix SEEK_END direction of mmio files without buffering. --- dlls/winmm/mmio.c | 5 ++++- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 7f35480..b6f60d1 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -127,7 +127,10 @@ static LRESULT CALLBACK mmioDosIOProc(LPMMIOINFO lpmmioinfo, UINT uMessage, * lParam2 = from whence to seek (SEEK_SET, SEEK_CUR, SEEK_END) * Returns: new file position, -1 on error */ - ret = _llseek((HFILE)lpmmioinfo->adwInfo[0], (LONG)lParam1, (LONG)lParam2); + if (lParam2 == SEEK_END) + ret = _llseek((HFILE)lpmmioinfo->adwInfo[0], -(LONG)lParam1, (LONG)lParam2); + else + ret = _llseek((HFILE)lpmmioinfo->adwInfo[0], (LONG)lParam1, (LONG)lParam2); if (ret != -1) lpmmioinfo->lDiskOffset = ret; return ret; diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 64f0149..a4e7a2d 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -750,7 +750,7 @@ static void test_mmioSeek(void) /* seek backward from the end */ pos = mmioSeek(hmmio, offset, SEEK_END); - todo_wine ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); + ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); mmioClose(hmmio, 0); }

1 0

Akihiro Sagawa : winmm/tests: Add more mmioSeek tests.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 10c7f5859cc7300ca3a356c1dbd5e6b5522dc972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c7f5859cc7300ca3a356c1d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Nov 13 00:26:42 2012 +0900 winmm/tests: Add more mmioSeek tests. --- dlls/winmm/tests/mmio.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 120 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index a76de7a..64f0149 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -668,6 +668,125 @@ static void test_mmioOpen_fourcc(void) mmioInstallIOProc(FOURCC_DOS, NULL, MMIO_REMOVEPROC); } +static BOOL create_test_file(char *temp_file) +{ + char temp_path[MAX_PATH]; + DWORD ret, written; + HANDLE h; + + ret = GetTempPath(sizeof(temp_path), temp_path); + ok(ret, "Failed to get a temp path, err %d\n", GetLastError()); + if (!ret) + return FALSE; + + ret = GetTempFileName(temp_path, "mmio", 0, temp_file); + ok(ret, "Failed to get a temp name, err %d\n", GetLastError()); + if (!ret) + return FALSE; + + h = CreateFileA(temp_file, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(h != INVALID_HANDLE_VALUE, "Failed to create a file, err %d\n", GetLastError()); + if (h == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(h, RIFF_buf, sizeof(RIFF_buf), &written, NULL); + ok(ret, "Failed to write a file, err %d\n", GetLastError()); + CloseHandle(h); + if (!ret) DeleteFileA(temp_file); + return ret; +} + +static void test_mmioSeek(void) +{ + HMMIO hmmio; + MMIOINFO mmio; + LONG end, pos; + const LONG size = sizeof(RIFF_buf), offset = 16; + char test_file[MAX_PATH]; + MMRESULT res; + + /* test memory file */ + memset(&mmio, 0, sizeof(mmio)); + mmio.fccIOProc = FOURCC_MEM; + mmio.pchBuffer = (char*)&RIFF_buf; + mmio.cchBuffer = sizeof(RIFF_buf); + hmmio = mmioOpen(NULL, &mmio, MMIO_READ); + ok(hmmio != NULL, "mmioOpen error %u\n", mmio.wErrorRet); + if (hmmio != NULL) { + /* seek to the end */ + end = mmioSeek(hmmio, 0, SEEK_END); + todo_wine ok(end == size, "expected %d, got %d\n", size, end); + + /* seek backward from the end */ + pos = mmioSeek(hmmio, offset, SEEK_END); + ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); + + mmioClose(hmmio, 0); + } + + if (!create_test_file(test_file)) return; + + /* test standard file without buffering */ + hmmio = NULL; + memset(&mmio, 0, sizeof(mmio)); + mmio.fccIOProc = FOURCC_DOS; + mmio.pchBuffer = 0; + mmio.cchBuffer = 0; + hmmio = mmioOpen(test_file, &mmio, MMIO_READ); + ok(hmmio != NULL, "mmioOpen error %u\n", mmio.wErrorRet); + if (hmmio != NULL) { + /* seek to the end */ + end = mmioSeek(hmmio, 0, SEEK_END); + ok(end == size, "expected %d, got %d\n", size, end); + + /* test MMIOINFO values */ + res = mmioGetInfo(hmmio, &mmio, 0); + ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); + ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); + ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); + todo_wine ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); + ok(mmio.lDiskOffset == size, "expected %d, got %d\n", size, mmio.lDiskOffset); + + /* seek backward from the end */ + pos = mmioSeek(hmmio, offset, SEEK_END); + todo_wine ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); + + mmioClose(hmmio, 0); + } + + /* test standard file with buffering */ + hmmio = NULL; + memset(&mmio, 0, sizeof(mmio)); + mmio.fccIOProc = FOURCC_DOS; + mmio.pchBuffer = 0; + mmio.cchBuffer = 0; + hmmio = mmioOpen(test_file, &mmio, MMIO_READ | MMIO_ALLOCBUF); + ok(hmmio != NULL, "mmioOpen error %u\n", mmio.wErrorRet); + if (hmmio != NULL) { + /* seek to the end */ + end = mmioSeek(hmmio, 0, SEEK_END); + ok(end == size, "expected %d, got %d\n", size, end); + + /* test MMIOINFO values */ + res = mmioGetInfo(hmmio, &mmio, 0); + ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); + ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); + ok(mmio.pchEndWrite == mmio.pchBuffer + mmio.cchBuffer, "expected %p + %d, got %p\n", mmio.pchBuffer, mmio.cchBuffer, mmio.pchEndWrite); + ok(mmio.lBufOffset == end, "expected %d, got %d\n", end, mmio.lBufOffset); + ok(mmio.lDiskOffset == size, "expected %d, got %d\n", size, mmio.lDiskOffset); + + /* seek backward from the end */ + pos = mmioSeek(hmmio, offset, SEEK_END); + ok(pos == size-offset, "expected %d, got %d\n", size-offset, pos); + + mmioClose(hmmio, 0); + } + + DeleteFileA(test_file); +} + START_TEST(mmio) { /* Make it possible to run the tests against a specific AVI file in @@ -683,4 +802,5 @@ START_TEST(mmio) test_mmioSetBuffer(NULL); test_mmioSetBuffer(fname); test_mmioOpen_fourcc(); + test_mmioSeek(); }

1 0

Jörg Höhle : mciavi: Fix player deadlock when starting to play.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 42bdb48c675be7bc1b38a76554d2eb78fd64026c URL: http://source.winehq.org/git/wine.git/?a=commit;h=42bdb48c675be7bc1b38a7655… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 6 22:59:55 2012 +0100 mciavi: Fix player deadlock when starting to play. --- dlls/mciavi32/mciavi.c | 265 +++++++++++++++++++++------------------- dlls/mciavi32/private_mciavi.h | 1 - 2 files changed, 138 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42bdb48c675be7bc1b38a…

1 0

Piotr Caban : gdi32: Added GetGlyphOutlineW tests on glyph that contains empty contour.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 4f07c49547cc110323b9201c51514d4f10c11b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f07c49547cc110323b9201c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 13 16:51:51 2012 +0100 gdi32: Added GetGlyphOutlineW tests on glyph that contains empty contour. --- dlls/gdi32/tests/font.c | 42 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_test.sfd | 29 +++++++++++++++++++++++++- dlls/gdi32/tests/wine_test.ttf | Bin 1552 -> 1652 bytes 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4d41388..1064ce2 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4277,6 +4277,46 @@ static BOOL write_ttf_file(const char *fontname, char *tmp_name) return ret; } +static void test_GetGlyphOutline_empty_contour(void) +{ + HDC hdc; + LOGFONTA lf; + HFONT hfont, hfont_prev; + TTPOLYGONHEADER *header; + GLYPHMETRICS gm; + char buf[1024]; + DWORD ret; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "wine_test"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + ret = GetGlyphOutlineW(hdc, 0xa8, GGO_NATIVE, &gm, 0, NULL, &mat); + ok(ret == 228, "GetGlyphOutline returned %d, expected 228\n", ret); + + header = (TTPOLYGONHEADER*)buf; + ret = GetGlyphOutlineW(hdc, 0xa8, GGO_NATIVE, &gm, sizeof(buf), buf, &mat); + ok(ret == 228, "GetGlyphOutline returned %d, expected 228\n", ret); + ok(header->cb == 36, "header->cb = %d, expected 36\n", header->cb); + ok(header->dwType == TT_POLYGON_TYPE, "header->dwType = %d, expected TT_POLYGON_TYPE\n", header->dwType); + header = (TTPOLYGONHEADER*)((char*)header+header->cb); + ok(header->cb == 96, "header->cb = %d, expected 96\n", header->cb); + header = (TTPOLYGONHEADER*)((char*)header+header->cb); + ok(header->cb == 96, "header->cb = %d, expected 96\n", header->cb); + + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_CreateScalableFontResource(void) { char ttf_name[MAX_PATH]; @@ -4358,6 +4398,8 @@ todo_wine ret = is_truetype_font_installed("wine_test"); ok(ret, "font wine_test should be enumerated\n"); + test_GetGlyphOutline_empty_contour(); + ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); todo_wine ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); diff --git a/dlls/gdi32/tests/wine_test.sfd b/dlls/gdi32/tests/wine_test.sfd index 5b73545..5adf7cf 100644 --- a/dlls/gdi32/tests/wine_test.sfd +++ b/dlls/gdi32/tests/wine_test.sfd @@ -20,7 +20,7 @@ OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1288336343 -ModificationTime: 1288336873 +ModificationTime: 1352483620 PfmFamily: 17 TTFWeight: 500 TTFWidth: 5 @@ -86,7 +86,7 @@ DisplaySize: -24 AntiAlias: 1 FitToEm: 1 WinInfo: 65 65 19 -BeginChars: 65539 4 +BeginChars: 65539 5 StartChar: .notdef Encoding: 65536 -1 0 @@ -176,5 +176,30 @@ Width: 0 Flags: W LayerCount: 2 EndChar + +StartChar: dieresis +Encoding: 168 168 0 +Width: 1000 +VWidth: 0 +Flags: HW +LayerCount: 2 +Fore +SplineSet +620.215 824.429 m 1,0,1 + 760.84 777.554 760.84 777.554 713.965 636.929 c 1,2,-1 + 620.215 824.429 l 1,0,1 +154.883 324.971 m 0,3,-1 +254.492 773.213 m 1,4,5 + 310.707 834.805 310.707 834.805 374.609 767.354 c 1,6,7 + 410.471 728.672 410.471 728.672 374.609 691.182 c 0,8,9 + 308.375 621.934 308.375 621.934 254.492 688.252 c 0,10,11 + 216.406 735.127 216.406 735.127 254.492 773.213 c 1,4,5 +254.492 773.213 m 1,12,13 + 216.406 735.127 216.406 735.127 254.492 688.252 c 0,14,15 + 308.375 621.934 308.375 621.934 374.609 691.182 c 0,16,17 + 410.471 728.672 410.471 728.672 374.609 767.354 c 1,18,19 + 310.707 834.805 310.707 834.805 254.492 773.213 c 1,12,13 +EndSplineSet +EndChar EndChars EndSplineFont diff --git a/dlls/gdi32/tests/wine_test.ttf b/dlls/gdi32/tests/wine_test.ttf index badef18..1e546eb 100644 Binary files a/dlls/gdi32/tests/wine_test.ttf and b/dlls/gdi32/tests/wine_test.ttf differ

1 0

Piotr Caban : gdi32: Ignore contours containing one point in get_glyph_outline function.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: b696558f04511f86bff73e20adebed7f422b15c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b696558f04511f86bff73e20a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 13 16:51:29 2012 +0100 gdi32: Ignore contours containing one point in get_glyph_outline function. --- dlls/gdi32/freetype.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8b56330..79a0975 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6377,6 +6377,12 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } for(contour = 0; contour < outline->n_contours; contour++) { + /* Ignore contours containing one point */ + if(point == outline->contours[contour]) { + point++; + continue; + } + pph_start = needed; pph = (TTPOLYGONHEADER *)((char *)buf + needed); first_pt = point;

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement::get_text implementation.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 95f3c6402a01021a78dfd8ceaa93d481764179dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f3c6402a01021a78dfd8cea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 13 13:35:49 2012 +0100 mshtml: Added IHTMLScriptElement::get_text implementation. --- dlls/mshtml/htmlscript.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 2dc25de..d08c9cb 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -199,8 +199,14 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR static HRESULT WINAPI HTMLScriptElement_get_text(IHTMLScriptElement *iface, BSTR *p) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLScriptElement_GetText(This->nsscript, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLScriptElement_put_defer(IHTMLScriptElement *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3f9bd5f..6bd7837 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3559,6 +3559,19 @@ static void _test_link_type(unsigned line, IHTMLElement *elem, const char *v) IHTMLLinkElement_Release(link); } +#define test_script_text(a,b) _test_script_text(__LINE__,a,b) +static void _test_script_text(unsigned line, IHTMLScriptElement *script, const char *extext) +{ + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLScriptElement_get_text(script, &str); + ok_(__FILE__,line)(hres == S_OK, "get_text failed: %08x\n", hres); + ok(!strcmp_wa(str, extext), "text = %s, expected \"%s\"\n", wine_dbgstr_w(str), extext); + SysFreeString(str); +} + #define link_put_type(a,b) _link_put_type(__LINE__,a,b) static void _link_put_type(unsigned line, IHTMLElement *elem, const char *v) { @@ -5822,9 +5835,10 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLScriptElement_get_type(script, &type); ok(hres == S_OK, "get_type failed: %08x\n", hres); ok(!strcmp_wa(type, "text/javascript"), "Unexpected type %s\n", wine_dbgstr_w(type)); - SysFreeString(type); + test_script_text(script, "\n"); + /* test defer */ hres = IHTMLScriptElement_put_defer(script, VARIANT_TRUE); ok(hres == S_OK, "put_defer failed: %08x\n", hres);

1 0

Daniel Jelinski : comctl32: Move WM_SIZE handling into WM_WINDOWPOSCHANGED.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: e9e09b66a0eca2cec97faa71cffa9ea7269fc681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e09b66a0eca2cec97faa71c… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Nov 12 19:03:24 2012 +0100 comctl32: Move WM_SIZE handling into WM_WINDOWPOSCHANGED. --- dlls/comctl32/listview.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2525dfe..d8d11ca 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11584,9 +11584,6 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SHOWWINDOW: return LISTVIEW_ShowWindow(infoPtr, wParam, lParam); - case WM_SIZE: - return LISTVIEW_Size(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); - case WM_STYLECHANGED: return LISTVIEW_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); @@ -11612,13 +11609,14 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_WINDOWPOSCHANGED: if (!(((WINDOWPOS *)lParam)->flags & SWP_NOSIZE)) { - SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | - SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE); + SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | + SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE); - if ((infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (infoPtr->uView == LV_VIEW_DETAILS)) - { - if (notify_measureitem(infoPtr)) LISTVIEW_InvalidateList(infoPtr); - } + if ((infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (infoPtr->uView == LV_VIEW_DETAILS)) + { + if (notify_measureitem(infoPtr)) LISTVIEW_InvalidateList(infoPtr); + } + LISTVIEW_Size(infoPtr, ((WINDOWPOS *)lParam)->cx, ((WINDOWPOS *)lParam)->cy); } return DefWindowProcW(hwnd, uMsg, wParam, lParam);

1 0

Alexandre Julliard : user32: Add some defines to reduce Unicode string duplication.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Module: wine Branch: master Commit: 44423f915ca87bb83a4cff3107cfa2ef797e4d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44423f915ca87bb83a4cff310… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 16:09:22 2012 +0100 user32: Add some defines to reduce Unicode string duplication. --- dlls/user32/sysparams.c | 123 +++++++++++++++++++++++------------------------ 1 files changed, 61 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44423f915ca87bb83a4cf…

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
71
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 November 2012