wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Dmitry Timoshkov : kernel32/tests: Make serial tests self-contained.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 4654e7977690f27ebd2323342306bf00ac98df24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4654e7977690f27ebd2323342… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:39:45 2013 +0900 kernel32/tests: Make serial tests self-contained. --- dlls/kernel32/tests/comm.c | 284 ++++++++++++++++++++++++++------------------ 1 files changed, 167 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4654e7977690f27ebd232…

1 0

Dmitry Timoshkov : kernel32/tests: Constify test data.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: a1b08f39a68499770d8c9b72bac8d75bd46be10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b08f39a68499770d8c9b72b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:39:01 2013 +0900 kernel32/tests: Constify test data. --- dlls/kernel32/tests/comm.c | 46 +++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 38a8bbc..765b54f 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -51,7 +51,7 @@ typedef struct COMMTIMEOUTS timeouts1, timeouts2; } TEST; -static TEST test[] = +static const TEST test[] = { { "baud=9600 parity=e data=5 stop=1 xon=on odsr=off octs=off dtr=on rts=on idsr=on", @@ -428,7 +428,7 @@ static TEST test[] = pdcb->wReserved1 & 0xffff ); } */ -static void check_result(const char *function, TEST *ptest, int initial_value, BOOL result) +static void check_result(const char *function, const TEST *ptest, int initial_value, BOOL result) { DWORD LastError = GetLastError(); DWORD CorrectError = (ptest->result ? 0xdeadbeef : ERROR_INVALID_PARAMETER); @@ -440,7 +440,7 @@ static void check_result(const char *function, TEST *ptest, int initial_value, B #define check_dcb_member(a,b) ok(pdcb1->a == pdcb2->a, "%s(\"%s\"), 0x%02x: "#a" is "b", should be "b"\n", function, ptest->string, initial_value, pdcb1->a, pdcb2->a) #define check_dcb_member2(a,c,b) if(pdcb2->a == c) { check_dcb_member(a,b); } else { ok(pdcb1->a == pdcb2->a || pdcb1->a == c, "%s(\"%s\"), 0x%02x: "#a" is "b", should be "b" or "b"\n", function, ptest->string, initial_value, pdcb1->a, pdcb2->a, c); } -static void check_dcb(const char *function, TEST *ptest, int initial_value, DCB *pdcb1, DCB *pdcb2) +static void check_dcb(const char *function, const TEST *ptest, int initial_value, const DCB *pdcb1, const DCB *pdcb2) { /* DCBlength is a special case since Win 9x sets it but NT does not. We will accept either as correct. */ @@ -512,7 +512,7 @@ static void check_dcb(const char *function, TEST *ptest, int initial_value, DCB #define check_timeouts_member(a) ok(ptimeouts1->a == ptimeouts2->a, "%s(\"%s\"), 0x%02x: "#a" is %u, should be %u\n", function, ptest->string, initial_value, ptimeouts1->a, ptimeouts2->a); -static void check_timeouts(const char *function, TEST *ptest, int initial_value, COMMTIMEOUTS *ptimeouts1, COMMTIMEOUTS *ptimeouts2) +static void check_timeouts(const char *function, const TEST *ptest, int initial_value, const COMMTIMEOUTS *ptimeouts1, const COMMTIMEOUTS *ptimeouts2) { check_timeouts_member(ReadIntervalTimeout); check_timeouts_member(ReadTotalTimeoutMultiplier); @@ -521,7 +521,7 @@ static void check_timeouts(const char *function, TEST *ptest, int initial_value, check_timeouts_member(WriteTotalTimeoutConstant); } -static void test_BuildCommDCBA(TEST *ptest, int initial_value, DCB *pexpected_dcb) +static void test_BuildCommDCBA(const char *string, const TEST *ptest, int initial_value, const DCB *pexpected_dcb) { BOOL result; DCB dcb; @@ -530,14 +530,14 @@ static void test_BuildCommDCBA(TEST *ptest, int initial_value, DCB *pexpected_dc memset(&dcb, initial_value, sizeof(DCB)); SetLastError(0xdeadbeef); - result = BuildCommDCBA(ptest->string, &dcb); + result = BuildCommDCBA(string, &dcb); /* check results */ check_result("BuildCommDCBA", ptest, initial_value, result); check_dcb("BuildCommDCBA", ptest, initial_value, &dcb, pexpected_dcb); } -static void test_BuildCommDCBAndTimeoutsA(TEST *ptest, int initial_value, DCB *pexpected_dcb, COMMTIMEOUTS *pexpected_timeouts) +static void test_BuildCommDCBAndTimeoutsA(const char *string, const TEST *ptest, int initial_value, const DCB *pexpected_dcb, const COMMTIMEOUTS *pexpected_timeouts) { BOOL result; DCB dcb; @@ -548,7 +548,7 @@ static void test_BuildCommDCBAndTimeoutsA(TEST *ptest, int initial_value, DCB *p memset(&timeouts, initial_value, sizeof(COMMTIMEOUTS)); SetLastError(0xdeadbeef); - result = BuildCommDCBAndTimeoutsA(ptest->string, &dcb, &timeouts); + result = BuildCommDCBAndTimeoutsA(string, &dcb, &timeouts); /* check results */ check_result("BuildCommDCBAndTimeoutsA", ptest, initial_value, result); @@ -556,14 +556,14 @@ static void test_BuildCommDCBAndTimeoutsA(TEST *ptest, int initial_value, DCB *p check_timeouts("BuildCommDCBAndTimeoutsA", ptest, initial_value, &timeouts, pexpected_timeouts); } -static void test_BuildCommDCBW(TEST *ptest, int initial_value, DCB *pexpected_dcb) +static void test_BuildCommDCBW(const char *string, const TEST *ptest, int initial_value, const DCB *pexpected_dcb) { BOOL result; DCB dcb; WCHAR wide_string[sizeof(ptest->string)]; static int reportedDCBW = 0; - MultiByteToWideChar(CP_ACP, 0, ptest->string, -1, wide_string, sizeof(wide_string) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, string, -1, wide_string, sizeof(wide_string) / sizeof(WCHAR)); /* set initial conditions */ memset(&dcb, initial_value, sizeof(DCB)); @@ -583,7 +583,7 @@ static void test_BuildCommDCBW(TEST *ptest, int initial_value, DCB *pexpected_dc check_dcb("BuildCommDCBW", ptest, initial_value, &dcb, pexpected_dcb); } -static void test_BuildCommDCBAndTimeoutsW(TEST *ptest, int initial_value, DCB *pexpected_dcb, COMMTIMEOUTS *pexpected_timeouts) +static void test_BuildCommDCBAndTimeoutsW(const char *string, const TEST *ptest, int initial_value, const DCB *pexpected_dcb, const COMMTIMEOUTS *pexpected_timeouts) { BOOL result; DCB dcb; @@ -591,7 +591,7 @@ static void test_BuildCommDCBAndTimeoutsW(TEST *ptest, int initial_value, DCB *p WCHAR wide_string[sizeof(ptest->string)]; static int reportedDCBAndTW = 0; - MultiByteToWideChar(CP_ACP, 0, ptest->string, -1, wide_string, sizeof(wide_string) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, string, -1, wide_string, sizeof(wide_string) / sizeof(WCHAR)); /* set initial conditions */ memset(&dcb, initial_value, sizeof(DCB)); @@ -639,8 +639,12 @@ static void test_BuildCommDCB(void) for(i = 0; i < TEST_COUNT; i++) { + char string[sizeof(test[i].string)]; + + strcpy(string, test[i].string); + /* Check if this test case needs a valid COM port. */ - ptr = strstr(test[i].string, "COMx"); + ptr = strstr(string, "COMx"); /* If required, substitute valid port number into device control string. */ if(ptr) @@ -651,15 +655,15 @@ static void test_BuildCommDCB(void) continue; } - test_BuildCommDCBA(&test[i], 0x00, &test[i].dcb1); - test_BuildCommDCBA(&test[i], 0xff, &test[i].dcb2); - test_BuildCommDCBAndTimeoutsA(&test[i], 0x00, &test[i].dcb1, &test[i].timeouts1); - test_BuildCommDCBAndTimeoutsA(&test[i], 0xff, &test[i].dcb2, &test[i].timeouts2); + test_BuildCommDCBA(string, &test[i], 0x00, &test[i].dcb1); + test_BuildCommDCBA(string, &test[i], 0xff, &test[i].dcb2); + test_BuildCommDCBAndTimeoutsA(string, &test[i], 0x00, &test[i].dcb1, &test[i].timeouts1); + test_BuildCommDCBAndTimeoutsA(string, &test[i], 0xff, &test[i].dcb2, &test[i].timeouts2); - test_BuildCommDCBW(&test[i], 0x00, &test[i].dcb1); - test_BuildCommDCBW(&test[i], 0xff, &test[i].dcb2); - test_BuildCommDCBAndTimeoutsW(&test[i], 0x00, &test[i].dcb1, &test[i].timeouts1); - test_BuildCommDCBAndTimeoutsW(&test[i], 0xff, &test[i].dcb2, &test[i].timeouts2); + test_BuildCommDCBW(string, &test[i], 0x00, &test[i].dcb1); + test_BuildCommDCBW(string, &test[i], 0xff, &test[i].dcb2); + test_BuildCommDCBAndTimeoutsW(string, &test[i], 0x00, &test[i].dcb1, &test[i].timeouts1); + test_BuildCommDCBAndTimeoutsW(string, &test[i], 0xff, &test[i].dcb2, &test[i].timeouts2); } }

1 0

Dmitry Timoshkov : kernel32/tests: Make ClearCommError very first test since it depends on device queue being empty .
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: b288f0a8790dbcb79332de4e2af9f6674c5d3484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b288f0a8790dbcb79332de4e2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:38:15 2013 +0900 kernel32/tests: Make ClearCommError very first test since it depends on device queue being empty. --- dlls/kernel32/tests/comm.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index e9a8690..38a8bbc 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1671,6 +1671,7 @@ START_TEST(comm) hcom = test_OpenComm(FALSE); if (hcom != INVALID_HANDLE_VALUE) { + test_ClearCommErrors(hcom); /* keep it the very first test */ test_GetModemStatus(hcom); test_ReadTimeOut(hcom); test_waittxempty(hcom); @@ -1679,13 +1680,6 @@ START_TEST(comm) hcom = test_OpenComm(FALSE); if (hcom != INVALID_HANDLE_VALUE) { - Sleep(200); /* Give the laster character of test_waittxempty to drop into the receiver */ - test_ClearCommErrors(hcom); - CloseHandle(hcom); - } - hcom = test_OpenComm(FALSE); - if (hcom != INVALID_HANDLE_VALUE) - { test_non_pending_errors(hcom); CloseHandle(hcom); }

1 0

Dmitry Timoshkov : kernel32/tests: Fix some typos.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: ab7dac6886c2946848635185b4903f7d5ee28ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7dac6886c2946848635185b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 15 16:37:28 2013 +0900 kernel32/tests: Fix some typos. --- dlls/kernel32/tests/comm.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index bdc1cc1..e9a8690 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -682,7 +682,7 @@ static HANDLE test_OpenComm(BOOL doOverlap) if(!shown) { if (hcom == INVALID_HANDLE_VALUE) - trace("Could not find a valid COM port. Skipping test_ReadTimeOut\n"); + trace("Could not find a valid COM port.\n"); else trace("Found Com port %s. Connected devices may disturb results\n", port_name); /*shown = TRUE; */ @@ -1126,7 +1126,7 @@ static void test_WaitRx(HANDLE hcom) after = GetTickCount(); trace("Success 0x%08x err %d evtmask 0x%08x\n", success_wait, err_wait, evtmask); ok(success_wait || err_wait == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); success_write= WriteFile(hcom, "X", 1, &written, &overlapped_w); err_write = GetLastError(); @@ -1242,7 +1242,7 @@ static void test_WaitCts(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0, "WaitCts hComPortEvent failed\n"); @@ -1330,7 +1330,7 @@ static void test_AbortWaitCts(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0, "AbortWaitCts hComPortEvent failed\n"); @@ -1393,7 +1393,7 @@ static void test_WaitDsr(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0, "wait hComPortEvent failed\n"); @@ -1471,7 +1471,7 @@ static void test_WaitRing(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0, "wait hComPortEvent failed\n"); @@ -1482,7 +1482,7 @@ static void test_WaitRing(HANDLE hcom) success, err, evtmask, after-before, after1-before); ok(evtmask & EV_RING, "Failed to detect EV_RING: 0x%08x, expected 0x%08x\n", - evtmask, EV_CTS); + evtmask, EV_RING); ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n"); if(defaultStat & MS_RING_ON) ok((evtmask & MS_RING_ON) == 0,"DTR didn't change state!\n"); @@ -1543,7 +1543,7 @@ static void test_WaitDcd(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) ok(WaitForSingleObjectEx(hComPortEvent, TIMEOUT, TRUE) == 0, "wait hComPortEvent failed\n"); @@ -1554,7 +1554,7 @@ static void test_WaitDcd(HANDLE hcom) success, err, evtmask, after-before, after1-before); ok(evtmask & EV_RLSD, "Failed to detect EV_RLSD: 0x%08x, expected 0x%08x\n", - evtmask, EV_CTS); + evtmask, EV_RLSD); ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n"); if(defaultStat & MS_RLSD_ON) ok((evtmask & MS_RLSD_ON) == 0,"DTR didn't change state!\n"); @@ -1623,7 +1623,7 @@ static void test_WaitBreak(HANDLE hcom) trace("Success 0x%08x err %d evtmask 0x%08x\n", success, err, evtmask); ok(success || err == ERROR_IO_PENDING, "overlapped WaitCommEvent failed\n"); - trace("overlapped WriteCommEvent returned.\n"); + trace("overlapped WaitCommEvent returned.\n"); if (!success && (err == ERROR_IO_PENDING)) {

1 0

Charles Davis : configure: Use a real header guard for config.h.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 7fcb736d511084bff60e73e4e803ef3b5590594b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcb736d511084bff60e73e4e… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Aug 12 15:07:06 2013 -0600 configure: Use a real header guard for config.h. --- configure.ac | 8 +++++--- include/config.h.in | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ca3d038..07ee2f0 100644 --- a/configure.ac +++ b/configure.ac @@ -2527,9 +2527,11 @@ esac dnl **** Generate output files **** -AH_TOP([#ifndef WINE_CROSSTEST -#define __WINE_CONFIG_H]) -AH_BOTTOM([#endif /* WINE_CROSSTEST */]) +AH_TOP([#ifndef __WINE_CONFIG_H +#define __WINE_CONFIG_H +#ifndef WINE_CROSSTEST]) +AH_BOTTOM([#endif /* WINE_CROSSTEST */ +#endif /* __WINE_CONFIG_H */]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) diff --git a/include/config.h.in b/include/config.h.in index e7b1898..014c78a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1,7 +1,8 @@ /* include/config.h.in. Generated from configure.ac by autoheader. */ -#ifndef WINE_CROSSTEST +#ifndef __WINE_CONFIG_H #define __WINE_CONFIG_H +#ifndef WINE_CROSSTEST /* Define to a function attribute for Microsoft hotpatch assembly prefix. */ #undef DECLSPEC_HOTPATCH @@ -1366,3 +1367,4 @@ #endif #endif /* WINE_CROSSTEST */ +#endif /* __WINE_CONFIG_H */

1 0

Vincent Povirk : gdiplus: Copy custom dashes in GdipClonePen.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 2c3142f0ee4a5fa3aff658b9b46a9f91aea030d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3142f0ee4a5fa3aff658b9b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 14 16:35:11 2013 -0500 gdiplus: Copy custom dashes in GdipClonePen. --- dlls/gdiplus/pen.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 80ede40..9b63db9 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -102,6 +102,7 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) (*clonepen)->customstart = NULL; (*clonepen)->customend = NULL; (*clonepen)->brush = NULL; + (*clonepen)->dashes = NULL; stat = GdipCloneBrush(pen->brush, &(*clonepen)->brush); @@ -111,6 +112,15 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) if (stat == Ok && pen->customend) stat = GdipCloneCustomLineCap(pen->customend, &(*clonepen)->customend); + if (stat == Ok && pen->dashes) + { + (*clonepen)->dashes = GdipAlloc(pen->numdashes * sizeof(REAL)); + if ((*clonepen)->dashes) + memcpy((*clonepen)->dashes, pen->dashes, pen->numdashes * sizeof(REAL)); + else + stat = OutOfMemory; + } + if (stat != Ok) { GdipDeletePen(*clonepen);

1 0

Vincent Povirk : gdiplus: Add error checking to GdipClonePen.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: dc047ecdaaee5e2b2dae6e665b51dc57764b2091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc047ecdaaee5e2b2dae6e665… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 14 16:34:25 2013 -0500 gdiplus: Add error checking to GdipClonePen. --- dlls/gdiplus/pen.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index a022cfb..80ede40 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -87,6 +87,8 @@ static GpPenType bt_to_pt(GpBrushType bt) GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) { + GpStatus stat; + TRACE("(%p, %p)\n", pen, clonepen); if(!pen || !clonepen) @@ -97,9 +99,24 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen) **clonepen = *pen; - GdipCloneCustomLineCap(pen->customstart, &(*clonepen)->customstart); - GdipCloneCustomLineCap(pen->customend, &(*clonepen)->customend); - GdipCloneBrush(pen->brush, &(*clonepen)->brush); + (*clonepen)->customstart = NULL; + (*clonepen)->customend = NULL; + (*clonepen)->brush = NULL; + + stat = GdipCloneBrush(pen->brush, &(*clonepen)->brush); + + if (stat == Ok && pen->customstart) + stat = GdipCloneCustomLineCap(pen->customstart, &(*clonepen)->customstart); + + if (stat == Ok && pen->customend) + stat = GdipCloneCustomLineCap(pen->customend, &(*clonepen)->customend); + + if (stat != Ok) + { + GdipDeletePen(*clonepen); + *clonepen = NULL; + return stat; + } TRACE("<-- %p\n", *clonepen);

1 0

Vincent Povirk : gdiplus: Only clip strings if rectangle width and height are positive.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 814f9cf7e4af9afd91196b75c581de792a239338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=814f9cf7e4af9afd91196b75c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 13 16:52:18 2013 -0500 gdiplus: Only clip strings if rectangle width and height are positive. --- dlls/gdiplus/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 76af444..79e4c7c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5000,7 +5000,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; if (!(format_flags & StringFormatFlagsNoClip) && - scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) + scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23 && + rect->Width > 0.0 && rect->Height > 0.0) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE);

1 0

Jacek Caban : urlmon: Added support for ROT in BindToObject.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 1c66fdd03b50e8ce8891609ab0d0ea11aae48355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c66fdd03b50e8ce8891609ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 10:41:51 2013 +0200 urlmon: Added support for ROT in BindToObject. --- dlls/urlmon/umon.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 5cb3631..9e46319 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -233,7 +233,22 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM hres = IBindCtx_GetRunningObjectTable(pbc, &obj_tbl); if(SUCCEEDED(hres)) { - FIXME("use running object table\n"); + hres = IRunningObjectTable_IsRunning(obj_tbl, &This->IMoniker_iface); + if(hres == S_OK) { + IUnknown *unk = NULL; + + TRACE("Found in running object table\n"); + + hres = IRunningObjectTable_GetObject(obj_tbl, &This->IMoniker_iface, &unk); + if(SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(unk, riid, ppv); + IUnknown_Release(unk); + } + + IRunningObjectTable_Release(obj_tbl); + return hres; + } + IRunningObjectTable_Release(obj_tbl); }

1 0

Jacek Caban : urlmon: Added more BindToObject tests.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: e61c50f0007a43055d419d4ebedcdce6ba7153aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61c50f0007a43055d419d4eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 13 10:41:39 2013 +0200 urlmon: Added more BindToObject tests. --- dlls/urlmon/tests/url.c | 86 +++++++++++++++++++++++++++++++--------------- 1 files changed, 58 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e61c50f0007a43055d419…

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
47
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 August 2013