wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Nikolay Sivov : msxml3: Fix putProperty() for declaration handler.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 7db7d857c503581c845ed1cac2e4b2f4e7bb4cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db7d857c503581c845ed1cac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 22 10:50:41 2011 +0400 msxml3: Fix putProperty() for declaration handler. --- dlls/msxml3/saxreader.c | 58 ++++++++--- dlls/msxml3/tests/saxreader.c | 226 ++++++++++++++++++++++++++++------------ 2 files changed, 201 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7db7d857c503581c845ed…

1 0

Nikolay Sivov : msxml3: Fix putProperty() for lexical handler case.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 864f17016f5658ebb2299c7d6ce279945cdb29e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864f17016f5658ebb2299c7d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 21 21:01:10 2011 +0400 msxml3: Fix putProperty() for lexical handler case. --- dlls/msxml3/saxreader.c | 203 ++++++++++++++++++++++++----------------- dlls/msxml3/tests/saxreader.c | 177 +++++++++++++++++++++++++++++++++++ 2 files changed, 295 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=864f17016f5658ebb2299…

1 0

Juan Lang : crypt32: Fix memory leak in failure cases.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: be0d294485b38e40f5f270c143d18d48c8c3dbe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0d294485b38e40f5f270c14… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 22 05:23:21 2011 -0700 crypt32: Fix memory leak in failure cases. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/crl.c | 2 +- dlls/crypt32/ctl.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 0117f27..63107e1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -160,7 +160,7 @@ PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, data = CryptMemAlloc(cbCertEncoded); if (!data) { - CryptMemFree(cert); + CertFreeCertificateContext(cert); cert = NULL; goto end; } diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index cafe564..5b5a455 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -58,7 +58,7 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType, data = CryptMemAlloc(cbCrlEncoded); if (!data) { - CryptMemFree(crl); + CertFreeCRLContext(crl); crl = NULL; goto end; } diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 09ebf26..9a8f176 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -447,7 +447,7 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, end: if (!ret) { - CryptMemFree(ctl); + CertFreeCTLContext(ctl); ctl = NULL; LocalFree(ctlInfo); CryptMemFree(content);

1 0

Juan Lang : crypt32: Test CertCreateCertificateContext, and fix an error code in a failure case.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 546bfa2c1ce82f80613cce7870d306faf2de653a URL: http://source.winehq.org/git/wine.git/?a=commit;h=546bfa2c1ce82f80613cce787… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 22 05:20:50 2011 -0700 crypt32: Test CertCreateCertificateContext, and fix an error code in a failure case. --- dlls/crypt32/cert.c | 6 +++++ dlls/crypt32/tests/cert.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 75b0e12..0117f27 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -141,6 +141,12 @@ PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, TRACE("(%08x, %p, %d)\n", dwCertEncodingType, pbCertEncoded, cbCertEncoded); + if ((dwCertEncodingType & CERT_ENCODING_TYPE_MASK) != X509_ASN_ENCODING) + { + SetLastError(E_INVALIDARG); + return NULL; + } + ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED, pbCertEncoded, cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &certInfo, &size); diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e338740..9e7104a 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -634,6 +634,51 @@ static void testCertProperties(void) CertFreeCertificateContext(context); } +static void testCreateCert(void) +{ + PCCERT_CONTEXT cert, enumCert; + DWORD count, size; + BOOL ret; + + SetLastError(0xdeadbeef); + cert = CertCreateCertificateContext(0, NULL, 0); + ok(!cert && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + cert = CertCreateCertificateContext(0, selfSignedCert, + sizeof(selfSignedCert)); + ok(!cert && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + cert = CertCreateCertificateContext(X509_ASN_ENCODING, NULL, 0); + ok(!cert && + (GetLastError() == CRYPT_E_ASN1_EOD || + broken(GetLastError() == OSS_MORE_INPUT /* NT4 */)), + "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, + selfSignedCert, sizeof(selfSignedCert)); + ok(cert != NULL, "creating cert failed: %08x\n", GetLastError()); + /* Even in-memory certs are expected to have a store associated with them */ + todo_wine + ok(cert->hCertStore != NULL, "expected created cert to have a store\n"); + /* The cert doesn't have the archived property set (which would imply it + * doesn't show up in enumerations.) + */ + size = 0; + ret = CertGetCertificateContextProperty(cert, CERT_ARCHIVED_PROP_ID, + NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + /* Strangely, enumerating the certs in the store finds none. */ + enumCert = NULL; + count = 0; + while ((enumCert = CertEnumCertificatesInStore(cert->hCertStore, enumCert))) + count++; + ok(!count, "expected 0, got %d\n", count); + CertFreeCertificateContext(cert); +} + static void testDupCert(void) { HCERTSTORE store; @@ -3634,6 +3679,7 @@ START_TEST(cert) testAddCert(); testCertProperties(); + testCreateCert(); testDupCert(); testFindCert(); testGetSubjectCert();

1 0

Francois Gouget : winmm/tests: Make it clear that no msrle. avi file is needed for the standard tests.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 5619b2154b90d34219ef881b2e4f4600fb8a80a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5619b2154b90d34219ef881b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 22 12:37:34 2011 +0200 winmm/tests: Make it clear that no msrle.avi file is needed for the standard tests. --- dlls/winmm/tests/mmio.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e175083..ea8faed 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -74,7 +74,7 @@ static void test_mmioDescend(char *fname) hmmio = mmioOpen(fname, &mmio, MMIO_READ); if (fname && !hmmio) { - skip("%s file is missing, skipping the test\n", fname); + trace("No optional %s file. Skipping the test\n", fname); return; } ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); @@ -241,7 +241,7 @@ static void test_mmioOpen(char *fname) hmmio = mmioOpen(fname, &mmio, MMIO_READ); if (fname && !hmmio) { - skip("%s file is missing, skipping the test\n", fname); + trace("No optional %s file. Skipping the test\n", fname); return; } ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); @@ -494,7 +494,7 @@ static void test_mmioSetBuffer(char *fname) hmmio = mmioOpen(fname, &mmio, MMIO_READ); if (fname && !hmmio) { - skip("%s file is missing, skipping the test\n", fname); + trace("No optional %s file. Skipping the test\n", fname); return; } ok(hmmio != 0, "mmioOpen error %u\n", mmio.wErrorRet); @@ -671,6 +671,10 @@ static void test_mmioOpen_fourcc(void) START_TEST(mmio) { + /* Make it possible to run the tests against a specific AVI file in + * addition to the builtin test data. This is mostly meant as a + * debugging aid and is not part of the standard tests. + */ char fname[] = "msrle.avi"; test_mmioDescend(NULL);

1 0

Nikolay Sivov : comctl32/monthcal: Enable multiple calendars support.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 23dfef0d9ecda65a01992a7ac9dfbe9df67b93bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=23dfef0d9ecda65a01992a7ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 22 17:56:40 2011 +0400 comctl32/monthcal: Enable multiple calendars support. --- dlls/comctl32/monthcal.c | 108 ++++++++++++++++++++++++++-------------- dlls/comctl32/tests/monthcal.c | 22 +++----- 2 files changed, 78 insertions(+), 52 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 762a792..5f8a36c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -71,6 +71,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal); #define MC_PREVNEXTMONTHTIMER 1 /* Timer IDs */ #define MC_TODAYUPDATETIMER 2 +#define MC_CALENDAR_PADDING 6 + #define countof(arr) (sizeof(arr)/sizeof(arr[0])) /* convert from days to 100 nanoseconds unit - used as FILETIME unit */ @@ -2392,7 +2394,6 @@ MONTHCAL_SetFocus(const MONTHCAL_INFO *infoPtr) static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) { static const WCHAR O0W[] = { '0','0',0 }; - HDC hdc = GetDC(infoPtr->hwndSelf); RECT *title=&infoPtr->calendars[0].title; RECT *prev=&infoPtr->titlebtnprev; RECT *next=&infoPtr->titlebtnnext; @@ -2402,16 +2403,19 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) RECT *weeknumrect=&infoPtr->calendars[0].weeknums; RECT *days=&infoPtr->calendars[0].days; RECT *todayrect=&infoPtr->todayrect; - SIZE size, sz; + + INT xdiv, dx, dy, i, j, x, y, c_dx, c_dy; + WCHAR buff[80]; TEXTMETRICW tm; - HFONT currentFont; - INT xdiv, dx, dy, i; + SIZE size, sz; RECT client; - WCHAR buff[80]; + HFONT font; + HDC hdc; GetClientRect(infoPtr->hwndSelf, &client); - currentFont = SelectObject(hdc, infoPtr->hFont); + hdc = GetDC(infoPtr->hwndSelf); + font = SelectObject(hdc, infoPtr->hFont); /* get the height and width of each day's text */ GetTextMetricsW(hdc, &tm); @@ -2441,6 +2445,10 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) /* recalculate the height and width increments and offsets */ GetTextExtentPoint32W(hdc, O0W, 2, &size); + /* restore the originally selected font */ + SelectObject(hdc, font); + ReleaseDC(infoPtr->hwndSelf, hdc); + xdiv = (infoPtr->dwStyle & MCS_WEEKNUMBERS) ? 8 : 7; infoPtr->width_increment = size.cx * 2 + 4; @@ -2461,21 +2469,17 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) next->right = title->right - 4; next->left = next->right - (title->bottom - title->top); - /* titlemonth->left and right change based upon the current month */ - /* and are recalculated in refresh as the current month may change */ - /* without the control being resized */ + /* titlemonth->left and right change based upon the current month + and are recalculated in refresh as the current month may change + without the control being resized */ titlemonth->top = titleyear->top = title->top + (infoPtr->height_increment)/2; titlemonth->bottom = titleyear->bottom = title->bottom - (infoPtr->height_increment)/2; - /* setup the dimensions of the rectangle we draw the names of the */ - /* days of the week in */ - weeknumrect->left = 0; - - if(infoPtr->dwStyle & MCS_WEEKNUMBERS) - weeknumrect->right = prev->right; - else - weeknumrect->right = weeknumrect->left; + /* week numbers */ + weeknumrect->left = 0; + weeknumrect->right = infoPtr->dwStyle & MCS_WEEKNUMBERS ? prev->right : 0; + /* days abbreviated names */ wdays->left = days->left = weeknumrect->right; wdays->right = days->right = wdays->left + 7 * infoPtr->width_increment; wdays->top = title->bottom; @@ -2489,29 +2493,62 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) todayrect->top = days->bottom; todayrect->bottom = days->bottom + infoPtr->height_increment; + /* compute calendar count, update all calendars */ + x = (client.right + MC_CALENDAR_PADDING) / (title->right - title->left + MC_CALENDAR_PADDING); + /* today label affects whole height */ + if (infoPtr->dwStyle & MCS_NOTODAY) + y = (client.bottom + MC_CALENDAR_PADDING) / (days->bottom - title->top + MC_CALENDAR_PADDING); + else + y = (client.bottom - todayrect->bottom + todayrect->top + MC_CALENDAR_PADDING) / + (days->bottom - title->top + MC_CALENDAR_PADDING); + + /* TODO: ensure that count is properly adjusted to fit 12 months constraint */ + if (x == 0) x = 1; + if (y == 0) y = 1; + + infoPtr->dim.cx = x; + infoPtr->dim.cy = y; + infoPtr->calendars = ReAlloc(infoPtr->calendars, MONTHCAL_GetCalCount(infoPtr) * sizeof(CALENDAR_INFO)); + + for (i = 1; i < MONTHCAL_GetCalCount(infoPtr); i++) + { + /* set months */ + infoPtr->calendars[i] = infoPtr->calendars[0]; + MONTHCAL_GetMonth(&infoPtr->calendars[i].month, i); + } + /* offset all rectangles to center in client area */ - dx = (client.right - title->right) / 2; - dy = (client.bottom - todayrect->bottom) / 2; + c_dx = (client.right - x * title->right - MC_CALENDAR_PADDING * (x-1)) / 2; + c_dy = (client.bottom - y * todayrect->bottom - MC_CALENDAR_PADDING * (y-1)) / 2; /* if calendar doesn't fit client area show it at left/top bounds */ - if (title->left + dx < 0) dx = 0; - if (title->top + dy < 0) dy = 0; + if (title->left + c_dx < 0) c_dx = 0; + if (title->top + c_dy < 0) c_dy = 0; - if (dx != 0 || dy != 0) + for (i = 0; i < y; i++) { - OffsetRect(title, dx, dy); - OffsetRect(prev, dx, dy); - OffsetRect(next, dx, dy); - OffsetRect(titlemonth, dx, dy); - OffsetRect(titleyear, dx, dy); - OffsetRect(wdays, dx, dy); - OffsetRect(weeknumrect, dx, dy); - OffsetRect(days, dx, dy); - OffsetRect(todayrect, dx, dy); + for (j = 0; j < x; j++) + { + dx = j*(title->right - title->left + MC_CALENDAR_PADDING) + c_dx; + dy = i*(days->bottom - title->top + MC_CALENDAR_PADDING) + c_dy; + + OffsetRect(&infoPtr->calendars[i*x+j].title, dx, dy); + OffsetRect(&infoPtr->calendars[i*x+j].titlemonth, dx, dy); + OffsetRect(&infoPtr->calendars[i*x+j].titleyear, dx, dy); + OffsetRect(&infoPtr->calendars[i*x+j].wdays, dx, dy); + OffsetRect(&infoPtr->calendars[i*x+j].weeknums, dx, dy); + OffsetRect(&infoPtr->calendars[i*x+j].days, dx, dy); + } } - /* TODO: update calendars count */ - infoPtr->dim.cx = infoPtr->dim.cy = 1; + OffsetRect(prev, c_dx, c_dy); + OffsetRect(next, (x-1)*(title->right - title->left + MC_CALENDAR_PADDING) + c_dx, c_dy); + + i = infoPtr->dim.cx * infoPtr->dim.cy - infoPtr->dim.cx; + todayrect->left = infoPtr->calendars[i].title.left; + todayrect->right = infoPtr->calendars[i].title.right; + todayrect->top = infoPtr->calendars[i].days.bottom; + todayrect->bottom = infoPtr->calendars[i].days.bottom + infoPtr->height_increment; TRACE("dx=%d dy=%d client[%s] title[%s] wdays[%s] days[%s] today[%s]\n", infoPtr->width_increment,infoPtr->height_increment, @@ -2520,11 +2557,6 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) wine_dbgstr_rect(wdays), wine_dbgstr_rect(days), wine_dbgstr_rect(todayrect)); - - /* restore the originally selected font */ - SelectObject(hdc, currentFont); - - ReleaseDC(infoPtr->hwndSelf, hdc); } static LRESULT MONTHCAL_Size(MONTHCAL_INFO *infoPtr, int Width, int Height) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 87aadec..ccf8881 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1316,18 +1316,15 @@ static void test_monthrange(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible); - todo_wine { - expect(2, res); - } + expect(2, res); + expect(2000, st_visible[0].wYear); expect(11, st_visible[0].wMonth); expect(1, st_visible[0].wDay); expect(2000, st_visible[1].wYear); + expect(12, st_visible[1].wMonth); + expect(31, st_visible[1].wDay); - todo_wine { - expect(12, st_visible[1].wMonth); - expect(31, st_visible[1].wDay); - } res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_DAYSTATE, (LPARAM)st_daystate); todo_wine { expect(4, res); @@ -1335,12 +1332,9 @@ static void test_monthrange(void) expect(2000, st_daystate[0].wYear); expect(10, st_daystate[0].wMonth); expect(29, st_daystate[0].wDay); - - todo_wine { - expect(2001, st_daystate[1].wYear); - expect(1, st_daystate[1].wMonth); - expect(6, st_daystate[1].wDay); - } + expect(2001, st_daystate[1].wYear); + expect(1, st_daystate[1].wMonth); + expect(6, st_daystate[1].wDay); ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_monthrange_seq, "monthcal monthrange", FALSE); @@ -1814,7 +1808,7 @@ static void test_MCM_GETCALENDARCOUNT(void) return; } - todo_wine expect(2, ret); + expect(2, ret); DestroyWindow(hwnd); }

1 0

Michael Stefaniuc : gdi32/tests: Remove casts to the type of the casted expression.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: a68cbe98d4ca0990c04691c35e21a7c1c6c387a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a68cbe98d4ca0990c04691c35… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 22 15:58:54 2011 +0200 gdi32/tests: Remove casts to the type of the casted expression. --- dlls/gdi32/tests/bitmap.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 89d2c9c..78c79c0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -879,7 +879,7 @@ static void test_dib_formats(void) bi->bmiHeader.biSizeImage = 0; memset( bi->bmiColors, 0xaa, sizeof(RGBQUAD) * 256 ); - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); if (expect_ok && (planes == 1 || planes * bpp <= 16)) ok( hdib != NULL, "CreateDIBSection failed for %u/%u/%u\n", bpp, planes, compr ); else @@ -1006,7 +1006,7 @@ static void test_dib_formats(void) *(DWORD *)&bi->bmiColors[1] = 0; *(DWORD *)&bi->bmiColors[2] = 0; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); ok( !ret, "SetDIBits succeeded with null bitfields\n" ); @@ -1034,7 +1034,7 @@ static void test_dib_formats(void) *(DWORD *)&bi->bmiColors[0] = 3; *(DWORD *)&bi->bmiColors[1] = 0; *(DWORD *)&bi->bmiColors[2] = 7; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); ok( !ret, "SetDIBits succeeded with null bitfields\n" ); @@ -1043,7 +1043,7 @@ static void test_dib_formats(void) *(DWORD *)&bi->bmiColors[0] = 0x55; *(DWORD *)&bi->bmiColors[1] = 0x44; *(DWORD *)&bi->bmiColors[2] = 0x33; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib != NULL, "CreateDIBSection failed with bad bitfields\n" ); if (hdib) DeleteObject( hdib ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); @@ -1053,7 +1053,7 @@ static void test_dib_formats(void) bi->bmiHeader.biHeight = 2; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with negative width\n" ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib == NULL, "CreateDIBitmap succeeded with negative width\n" ); @@ -1076,7 +1076,7 @@ static void test_dib_formats(void) bi->bmiHeader.biHeight = 2; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with zero width\n" ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib != NULL, "CreateDIBitmap failed with zero width\n" ); @@ -1100,7 +1100,7 @@ static void test_dib_formats(void) bi->bmiHeader.biHeight = 0; bi->bmiHeader.biBitCount = 32; bi->bmiHeader.biCompression = BI_RGB; - hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with zero height\n" ); hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib != NULL, "CreateDIBitmap failed with zero height\n" );

1 0

Jacek Caban : widl: Define __REQUIRED_RPCNDR_H_VERSION__ in generated headers.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: c7602d51b33e6fd74ef7cb87a5f50616f5a8a31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7602d51b33e6fd74ef7cb87a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 15:01:50 2011 +0200 widl: Define __REQUIRED_RPCNDR_H_VERSION__ in generated headers. --- tools/widl/header.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 579ef5c..fc9cbf1 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1358,6 +1358,11 @@ void write_header(const statement_list_t *stmts) return; } fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n\n", PACKAGE_VERSION, input_name); + + fprintf(header, "#ifndef __REQUIRED_RPCNDR_H_VERSION__\n"); + fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n"); + fprintf(header, "#endif\n\n"); + fprintf(header, "#include <rpc.h>\n" ); fprintf(header, "#include <rpcndr.h>\n\n" );

1 0

Huw Davies : gdi32/tests: Add some tests to show the 1 pixel dst sizes are a special case.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 4156460d49cd87f93322630ec2ca34f8bb143a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4156460d49cd87f93322630ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 22 13:56:29 2011 +0100 gdi32/tests: Add some tests to show the 1 pixel dst sizes are a special case. --- dlls/gdi32/tests/bitmap.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 16dfcb2..89d2c9c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2826,6 +2826,7 @@ static void test_StretchBlt(void) check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); + /* This is an example of the dst width (height) == 1 exception, explored below */ expected[0] = 0xCAFED00D, expected[1] = 0x00000000; expected[16] = 0x00000000, expected[17] = 0x00000000; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, @@ -2853,10 +2854,63 @@ static void test_StretchBlt(void) check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); + /* when dst width is 1 merge src width - 1 pixels */ + memset( srcBuffer, 0, get_dib_image_size( &biSrc ) ); + srcBuffer[0] = 0x0000ff00, srcBuffer[1] = 0x0000f0f0, srcBuffer[2] = 0x0000cccc, srcBuffer[3] = 0x0000aaaa; + srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = srcBuffer[0]; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 2, 1, expected, __LINE__); + + expected[0] = srcBuffer[0] & srcBuffer[1]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 3, 1, expected, __LINE__); + + expected[0] = srcBuffer[0] & srcBuffer[1] & srcBuffer[2]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 4, 1, expected, __LINE__); + + /* this doesn't happen if the src width is -ve */ + expected[0] = srcBuffer[1] & srcBuffer[2]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 2, 0, -2, 1, expected, __LINE__); + + /* when dst width > 1 behaviour reverts to what one would expect */ + expected[0] = srcBuffer[0] & srcBuffer[1], expected[1] = srcBuffer[2] & srcBuffer[3]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 1, 0, 0, 4, 1, expected, __LINE__); + + /* similarly in the vertical direction */ + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = srcBuffer[0]; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 1, 2, expected, __LINE__); + + /* check that it's the dst size in device units that needs to be 1 */ + SetMapMode( hdcDst, MM_ISOTROPIC ); + SetWindowExtEx( hdcDst, 200, 200, NULL ); + SetViewportExtEx( hdcDst, 100, 100, NULL ); + + expected[0] = srcBuffer[0] & srcBuffer[1] & srcBuffer[2]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 4, 1, expected, __LINE__); + SetMapMode( hdcDst, MM_TEXT ); + SelectObject(hdcDst, oldDst); DeleteObject(bmpDst); /* Top-down to bottom-up tests */ + memset( srcBuffer, 0, get_dib_image_size( &biSrc ) ); + srcBuffer[0] = 0xCAFED00D, srcBuffer[1] = 0xFEEDFACE; + srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + biDst.bmiHeader.biHeight = 16; bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0);

1 0

Huw Davies : gdi32/tests: Update the StretchBlt tests to use a 16x16 bitmap .
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: abc76c27a72d5fc8d06046a7d73ce3bddfd3e843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc76c27a72d5fc8d06046a7d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 22 13:56:28 2011 +0100 gdi32/tests: Update the StretchBlt tests to use a 16x16 bitmap. --- dlls/gdi32/tests/bitmap.c | 161 +++++++++++++++++++++----------------------- 1 files changed, 77 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abc76c27a72d5fc8d0604…

1 0

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 September 2011