August 2013 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Reset ppem to zero if we fail to find a matching height .
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: d089ca67e3df8b930ebebb29dd9bf2a80ecda726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d089ca67e3df8b930ebebb29d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 28 14:21:12 2013 +0100 gdi32: Reset ppem to zero if we fail to find a matching height. --- dlls/gdi32/freetype.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3f3b480..3d61ad1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4580,14 +4580,20 @@ static LONG load_VDMX(GdiFont *font, LONG height) } else { ppem = -height; if(ppem < startsz || ppem > endsz) - goto end; + { + ppem = 0; + goto end; + } for(i = 0; i < recs; i++) { USHORT yPelHeight; yPelHeight = GET_BE_WORD(vTable[i * 3]); if(yPelHeight > ppem) - break; /* failed */ + { + ppem = 0; + break; /* failed */ + } if(yPelHeight == ppem) { font->yMax = GET_BE_WORD(vTable[(i * 3) + 1]);

1 0

André Hentschel : msvcr100: Add more ARM forwards.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 2123d94e83fd8fb8e76d356d7a85e8b123c3ea91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2123d94e83fd8fb8e76d356d7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 27 23:53:35 2013 +0200 msvcr100: Add more ARM forwards. --- dlls/msvcr100/msvcr100.spec | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7e602ef..b4f020e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -194,6 +194,7 @@ @ stub -arch=win64 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)XZ @ stub -arch=win32 ??1scoped_lock_read(a)reader_writer_lock@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1scoped_lock_read(a)reader_writer_lock@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??1type_info@@UAA(a)XZ(ptr) msvcrt.??1type_info@@UAA(a)XZ @ thiscall -arch=i386 ??1type_info@@UAE(a)XZ(ptr) msvcrt.??1type_info@@UAE(a)XZ @ cdecl -arch=win64 ??1type_info@@UEAA(a)XZ(ptr) msvcrt.??1type_info@@UEAA(a)XZ @ cdecl -arch=win32 ??2(a)YAPAXI@Z(long) msvcrt.??2(a)YAPAXI@Z @@ -216,8 +217,10 @@ @ cdecl -arch=win64 ??4bad_typeid(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=i386 ??4exception(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4exception@@QAEAAV0(a)ABV0@@Z @ cdecl -arch=win64 ??4exception(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4exception@@QEAAAEAV0(a)AEBV0@@Z +@ cdecl -arch=arm ??8type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??8type_info@@QEBAHAEBV0@@Z +@ cdecl -arch=arm ??9type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??9type_info@@QEBAHAEBV0@@Z @ extern ??_7__non_rtti_object(a)std@@6B@ msvcrt.??_7__non_rtti_object@@6B@ @@ -466,6 +469,7 @@ @ stub -arch=win64 ?name(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 @ stub -arch=win32 ?native_handle(a)critical_section@Concurrency@@QAEAAV12(a)XZ @ stub -arch=win64 ?native_handle(a)critical_section@Concurrency@@QEAAAEAV12(a)XZ +@ cdecl -arch=arm ?raw_name(a)type_info@@QBAPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBAPBDXZ @ thiscall -arch=i386 ?raw_name(a)type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QBEPBDXZ @ cdecl -arch=win64 ?raw_name(a)type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name(a)type_info@@QEBAPEBDXZ @ stub -arch=win32 ?reset(a)event@Concurrency@@QAEXXZ

1 0

Dmitry Timoshkov : ntdll: Add a trace for transmitter's buffer empty flag.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: b299d4d4f805d6a41d2f8d742b9696723ef9b7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b299d4d4f805d6a41d2f8d742… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 28 12:29:45 2013 +0900 ntdll: Add a trace for transmitter's buffer empty flag. --- dlls/ntdll/serial.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 7f56cb5..a389d0f 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -781,8 +781,7 @@ static NTSTATUS set_XOn(int fd) */ typedef struct serial_irq_info { - int rx , tx, frame, overrun, parity, brk, buf_overrun; - DWORD temt; + int rx, tx, frame, overrun, parity, brk, buf_overrun, temt; }serial_irq_info; /*********************************************************************** @@ -869,6 +868,7 @@ static DWORD check_events(int fd, DWORD mask, TRACE("old->parity 0x%08x vs. new->parity 0x%08x\n", old->parity, new->parity); TRACE("old->brk 0x%08x vs. new->brk 0x%08x\n", old->brk, new->brk); TRACE("old->buf_overrun 0x%08x vs. new->buf_overrun 0x%08x\n", old->buf_overrun, new->buf_overrun); + TRACE("old->temt 0x%08x vs. new->temt 0x%08x\n", old->temt, new->temt); if (old->brk != new->brk) ret |= EV_BREAK; if ((old_mstat & MS_CTS_ON ) != (new_mstat & MS_CTS_ON )) ret |= EV_CTS;

1 0

Dmitry Timoshkov : ntdll: Stop waiting for COM-port events if the device handle gets closed.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: f4f5d06df44dcd9b52ce7b701b9d38df71318409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f5d06df44dcd9b52ce7b701… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 28 16:15:13 2013 +0900 ntdll: Stop waiting for COM-port events if the device handle gets closed. --- dlls/ntdll/serial.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index a389d0f..93991f9 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -306,7 +306,7 @@ static NTSTATUS get_modem_status(int fd, DWORD* lpModemStat) (*lpModemStat & MS_CTS_ON) ? "MS_CTS_ON " : ""); return STATUS_SUCCESS; } - WARN("ioctl failed\n"); + WARN("TIOCMGET err %s\n", strerror(errno)); status = FILE_GetNtStatus(); #endif return status; @@ -928,7 +928,11 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) NtDelayExecution(FALSE, &time); get_irq_info(fd, &new_irq_info); if (get_modem_status(fd, &new_mstat)) + { TRACE("get_modem_status failed\n"); + *commio->events = 0; + break; + } *commio->events = check_events(fd, commio->evtmask, &new_irq_info, &commio->irq_info, new_mstat, commio->mstat);

1 0

Dmitry Timoshkov : kernel32/tests: Remove a useless trace.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: c7d27e18e5946f0c2f6ae01e4c0cf21f3ced6324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d27e18e5946f0c2f6ae01e4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 28 12:30:28 2013 +0900 kernel32/tests: Remove a useless trace. --- dlls/kernel32/tests/comm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 75944e9..18a5987 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -891,7 +891,6 @@ static void test_ClearCommError(void) ok(lpStat.cbInQue == 0, "Unexpected %d chars in InQueue\n", lpStat.cbInQue); ok(lpStat.cbOutQue == 0, "Unexpected %d chars in OutQueue\n", lpStat.cbOutQue); ok(errors == 0, "ClearCommErrors: Unexpected error 0x%08x\n", errors); - trace("test_ClearCommErrors done\n"); CloseHandle(hcom); }

1 0

Dmitry Timoshkov : kernel32/tests: Increase time interval that WriteFile could spend for an overlapped IO write .
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 723d22f6aace6e1cb76e46361ebd32a738db8f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=723d22f6aace6e1cb76e46361… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 28 17:55:02 2013 +0900 kernel32/tests: Increase time interval that WriteFile could spend for an overlapped IO write. --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 18a5987..4b0eb82 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -832,7 +832,7 @@ todo_wine ok(!res && GetLastError() == ERROR_IO_PENDING, "WriteFile returned %d, error %d\n", res, GetLastError()); todo_wine ok(!bytes, "expected 0, got %u\n", bytes); - ok(after - before == 0, "WriteFile took %d ms to write %d Bytes at %d Baud\n", + ok(after - before < 30, "WriteFile took %d ms to write %d Bytes at %d Baud\n", after - before, bytes, baud); /* don't wait for WriteFile completion */

1 0

Piotr Caban : oleaut32: Fix memory leaks in typelib tests.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 6ab3ba13738ed1c948493d790c9b7423267376a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab3ba13738ed1c948493d790… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 28 10:42:03 2013 +0200 oleaut32: Fix memory leaks in typelib tests. --- dlls/oleaut32/tests/typelib.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index bc759c0..57e289a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3131,12 +3131,14 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(docstring == NULL, "got docstring: %s\n", wine_dbgstr_w(docstring)); ok(helpcontext == 0x201, "got helpcontext: 0x%x\n", helpcontext); ok(!memcmp(helpfile, helpfileW, sizeof(helpfileW)), "got helpfile: %s\n", wine_dbgstr_w(helpfile)); + SysFreeString(name); SysFreeString(helpfile); hres = ITypeInfo_GetNames(ti, pfuncdesc->memid, names, sizeof(names) / sizeof(*names), &cnames); ok(hres == S_OK, "got: %08x\n", hres); ok(cnames == 1, "got: %u\n", cnames); ok(!memcmp(names[0], func1W, sizeof(func1W)), "got names[0]: %s\n", wine_dbgstr_w(names[0])); + SysFreeString(names[0]); ITypeInfo_ReleaseFuncDesc(ti, pfuncdesc); hres = ITypeInfo_GetFuncDesc(ti, 10, &pfuncdesc); @@ -3250,6 +3252,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(hres == S_OK, "got: %08x\n", hres); ok(cnames == 1, "got: %u\n", cnames); ok(!memcmp(names[0], func1W, sizeof(func1W)), "got names[0]: %s\n", wine_dbgstr_w(names[0])); + SysFreeString(names[0]); ITypeInfo_ReleaseFuncDesc(ti, pfuncdesc); hres = ITypeInfo_GetFuncDesc(ti, 13, &pfuncdesc); @@ -4825,6 +4828,7 @@ static void testTDA(ITypeLib *tl, struct _TDATest *TDATest, break; } + ITypeInfo_ReleaseTypeAttr(ti, typeattr); ITypeInfo_Release(ti); }

1 0

Piotr Caban : oleaut32: Allocate bigger buffer in WMSFT_compile_names function.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 3f4b06edf15d546cb7965234484896cf55e8ca04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f4b06edf15d546cb79652344… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 28 10:42:15 2013 +0200 oleaut32: Allocate bigger buffer in WMSFT_compile_names function. --- dlls/oleaut32/typelib.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 02f9ced..4f55755 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8905,7 +8905,8 @@ static HRESULT WMSFT_compile_names(ITypeLibImpl *This, str->offset = size; } - file->name_seg.data = data = heap_alloc(file->name_seg.len); + /* Allocate bigger buffer so we can temporarily NULL terminate the name */ + file->name_seg.data = data = heap_alloc(file->name_seg.len+1); last_offs = 0; LIST_FOR_EACH_ENTRY(str, &This->name_list, TLBString, entry) {

1 0

Alexandre Julliard : kernel32/tests: Add more tests for the InitOnce functions.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: af896103641fac6e110ba670d149aedc9f076e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af896103641fac6e110ba670d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 27 20:17:28 2013 +0200 kernel32/tests: Add more tests for the InitOnce functions. --- dlls/kernel32/tests/sync.c | 165 +++++++++++++++++++++++++++++++++++++++++--- dlls/ntdll/tests/om.c | 10 ++-- 2 files changed, 160 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af896103641fac6e110ba…

1 0

Hans Leidekker : rpcrt4: Add support for session cookies.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: a2f6e92acd549122c4a38c274963547a01d73249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f6e92acd549122c4a38c274… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 28 13:30:03 2013 +0200 rpcrt4: Add support for session cookies. --- dlls/rpcrt4/rpc_assoc.c | 4 +- dlls/rpcrt4/rpc_assoc.h | 4 ++- dlls/rpcrt4/rpc_binding.c | 27 +++++++++++++++++++++- dlls/rpcrt4/rpc_binding.h | 6 ++++- dlls/rpcrt4/rpc_transport.c | 50 +++++++++++++++++++++++++++++++++++------- include/rpcdcep.h | 8 +++++++ 6 files changed, 84 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2f6e92acd549122c4a38…

1 0