May 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: Check the active window instead of the foreground to show/ hide owned popups.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 7ea98f680d051aeda02705d1520e4d636cc181b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea98f680d051aeda02705d15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 10:39:01 2010 +0200 user32: Check the active window instead of the foreground to show/hide owned popups. --- dlls/user32/nonclient.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index c8d19d9..a685370 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1548,19 +1548,19 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) break; case SC_MINIMIZE: - if (hwnd == GetForegroundWindow()) + if (hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,FALSE); ShowWindow( hwnd, SW_MINIMIZE ); break; case SC_MAXIMIZE: - if (IsIconic(hwnd) && hwnd == GetForegroundWindow()) + if (IsIconic(hwnd) && hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_MAXIMIZE ); break; case SC_RESTORE: - if (IsIconic(hwnd) && hwnd == GetForegroundWindow()) + if (IsIconic(hwnd) && hwnd == GetActiveWindow()) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_RESTORE ); break;

1 0

Alexandre Julliard : comctl32/imagelist: Add support for 25% and 50% blending when using an alpha channel.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 5572fc57ef6e60c69bc885f6fd2110c14a4f13cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5572fc57ef6e60c69bc885f6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 15:39:17 2010 +0200 comctl32/imagelist: Add support for 25% and 50% blending when using an alpha channel. --- dlls/comctl32/imagelist.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 11ff27f..7ca1fc9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1157,7 +1157,8 @@ ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y, static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y, - int src_x, int src_y, int cx, int cy, BLENDFUNCTION func ) + int src_x, int src_y, int cx, int cy, BLENDFUNCTION func, + UINT style, COLORREF blend_col ) { BOOL ret = FALSE; HDC hdc; @@ -1184,6 +1185,30 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des SelectObject( hdc, bmp ); BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY ); + if (blend_col != CLR_NONE) + { + BYTE r = GetRValue( blend_col ); + BYTE g = GetGValue( blend_col ); + BYTE b = GetBValue( blend_col ); + + if (style & ILD_BLEND25) + { + for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) + *ptr = ((*ptr & 0xff000000) | + ((((*ptr & 0x00ff0000) * 3 + (r << 16)) / 4) & 0x00ff0000) | + ((((*ptr & 0x0000ff00) * 3 + (g << 8)) / 4) & 0x0000ff00) | + ((((*ptr & 0x000000ff) * 3 + (b << 0)) / 4) & 0x000000ff)); + } + else if (style & ILD_BLEND50) + { + for (i = 0, ptr = bits; i < cx * cy; i++, ptr++) + *ptr = ((*ptr & 0xff000000) | + ((((*ptr & 0x00ff0000) + (r << 16)) / 2) & 0x00ff0000) | + ((((*ptr & 0x0000ff00) + (g << 8)) / 2) & 0x0000ff00) | + ((((*ptr & 0x000000ff) + (b << 0)) / 2) & 0x000000ff)); + } + } + if (himl->uBitsPixel == 32) /* we already have an alpha channel in this case */ { /* pre-multiply by the alpha channel */ @@ -1302,9 +1327,16 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); if (!bMask && (has_alpha || (fState & ILS_ALPHA))) { - COLORREF colour; + COLORREF colour, blend_col = CLR_NONE; BLENDFUNCTION func; + if (bBlend) + { + blend_col = pimldp->rgbFg; + if (blend_col == CLR_DEFAULT) blend_col = GetSysColor( COLOR_HIGHLIGHT ); + else if (blend_col == CLR_NONE) blend_col = GetTextColor( pimldp->hdcDst ); + } + func.BlendOp = AC_SRC_OVER; func.BlendFlags = 0; func.SourceConstantAlpha = (fState & ILS_ALPHA) ? pimldp->Frame : 255; @@ -1313,7 +1345,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (bIsTransparent) { bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y, - pt.x, pt.y, cx, cy, func ); + pt.x, pt.y, cx, cy, func, fStyle, blend_col ); goto end; } colour = pimldp->rgbBk; @@ -1322,7 +1354,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); - alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func ); + alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col ); DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end;

1 0

Alexandre Julliard : comctl32/imagelist: Fix a copy/ paste typo in ImageList_Merge.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: f90b6d5af634dd5c93fd5d054c7c44b3057c90c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90b6d5af634dd5c93fd5d054… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 17:36:23 2010 +0200 comctl32/imagelist: Fix a copy/paste typo in ImageList_Merge. --- dlls/comctl32/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 7ca1fc9..d67672f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2037,7 +2037,7 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, if (himlDst) { imagelist_point_from_index( himl1, i1, &pt1 ); - imagelist_point_from_index( himl1, i2, &pt2 ); + imagelist_point_from_index( himl2, i2, &pt2 ); /* copy image */ BitBlt (himlDst->hdcImage, 0, 0, cxDst, cyDst, himl1->hdcImage, 0, 0, BLACKNESS);

1 0

Alexandre Julliard : user32: Copy icon bits by hand in CreateIconIndirect if the bitmaps can' t be selected into a DC.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: e2cb88ec2de717b844c2564e4b0ddc6f09e4e76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cb88ec2de717b844c2564e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 26 15:57:41 2010 +0200 user32: Copy icon bits by hand in CreateIconIndirect if the bitmaps can't be selected into a DC. --- dlls/user32/cursoricon.c | 59 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 45 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1217440..8910985 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1830,6 +1830,43 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) return TRUE; } +/* copy an icon bitmap, even when it can't be selected into a DC */ +/* helper for CreateIconIndirect */ +static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, int dst_height, + HBITMAP src, int width, int height ) +{ + HDC hdc = CreateCompatibleDC( 0 ); + + if (!SelectObject( hdc, src ) || 1) /* do it the hard way */ + { + BITMAPINFO *info; + void *bits; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = height; + info->bmiHeader.biPlanes = GetDeviceCaps( hdc_dst, PLANES ); + info->bmiHeader.biBitCount = GetDeviceCaps( hdc_dst, BITSPIXEL ); + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = height * get_dib_width_bytes( width, info->bmiHeader.biBitCount ); + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + if (bits && GetDIBits( hdc, src, 0, height, bits, info, DIB_RGB_COLORS )) + StretchDIBits( hdc_dst, dst_x, dst_y, dst_width, dst_height, + 0, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, bits ); + HeapFree( GetProcessHeap(), 0, info ); + } + else StretchBlt( hdc_dst, dst_x, dst_y, dst_width, dst_height, hdc, 0, 0, width, height, SRCCOPY ); + + DeleteDC( hdc ); +} + /********************************************************************** * CreateIconIndirect (USER32.@) */ @@ -1839,7 +1876,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) HICON hObj; HBITMAP color = 0, mask; int width, height; - HDC src, dst; + HDC hdc; TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", iconinfo->hbmColor, iconinfo->hbmMask, @@ -1875,28 +1912,22 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) mask = CreateBitmap( width, height, 1, 1, NULL ); } - src = CreateCompatibleDC( 0 ); - dst = CreateCompatibleDC( 0 ); - - SelectObject( src, iconinfo->hbmMask ); - SelectObject( dst, mask ); - StretchBlt( dst, 0, 0, width, height, src, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, SRCCOPY ); + hdc = CreateCompatibleDC( 0 ); + SelectObject( hdc, mask ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmMask, bmpAnd.bmWidth, bmpAnd.bmHeight ); if (color) { - SelectObject( src, iconinfo->hbmColor ); - SelectObject( dst, color ); - BitBlt( dst, 0, 0, width, height, src, 0, 0, SRCCOPY ); + SelectObject( hdc, color ); + stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmColor, width, height ); } else if (iconinfo->hbmColor) { - SelectObject( src, iconinfo->hbmColor ); - BitBlt( dst, 0, height, width, height, src, 0, 0, SRCCOPY ); + stretch_blt_icon( hdc, 0, height, width, height, iconinfo->hbmColor, width, height ); } else height /= 2; - DeleteDC( src ); - DeleteDC( dst ); + DeleteDC( hdc ); hObj = alloc_icon_handle(); if (hObj)

1 0

André Hentschel : winejack.drv: Use jack_client_open instead of deprecated function.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: b4d895b3d2705de41474137f7ace743173a479a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d895b3d2705de41474137f7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 25 19:12:30 2010 +0200 winejack.drv: Use jack_client_open instead of deprecated function. --- dlls/winejack.drv/audio.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index ffaffae..da04824 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -68,10 +68,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); #define MAKE_FUNCPTR(f) static typeof(f) * fp_##f = NULL; /* Function pointers for dynamic loading of libjack */ -/* these are prefixed with "fp_", ie. "fp_jack_client_new" */ +/* these are prefixed with "fp_", ie. "fp_jack_client_open" */ MAKE_FUNCPTR(jack_activate); MAKE_FUNCPTR(jack_connect); -MAKE_FUNCPTR(jack_client_new); +MAKE_FUNCPTR(jack_client_open); MAKE_FUNCPTR(jack_client_close); MAKE_FUNCPTR(jack_deactivate); MAKE_FUNCPTR(jack_set_process_callback); @@ -633,12 +633,12 @@ static int JACK_OpenWaveOutDevice(WINE_WAVEOUT* wwo) /* try to become a client of the JACK server */ snprintf(client_name, sizeof(client_name), "wine_jack_out_%d", wwo->wDevID); TRACE("client name '%s'\n", client_name); - if ((client = fp_jack_client_new (client_name)) == 0) + if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0) { /* jack has problems with shutting down clients, so lets */ /* wait a short while and try once more before we give up */ Sleep(250); - if ((client = fp_jack_client_new (client_name)) == 0) + if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0) { ERR("jack server not running?\n"); return 0; @@ -904,7 +904,7 @@ static LONG JACK_WaveInit(void) #define LOAD_FUNCPTR(f) if((fp_##f = wine_dlsym(jackhandle, #f, NULL, 0)) == NULL) goto sym_not_found; LOAD_FUNCPTR(jack_activate); LOAD_FUNCPTR(jack_connect); - LOAD_FUNCPTR(jack_client_new); + LOAD_FUNCPTR(jack_client_open); LOAD_FUNCPTR(jack_client_close); LOAD_FUNCPTR(jack_deactivate); LOAD_FUNCPTR(jack_set_process_callback); @@ -1911,12 +1911,12 @@ static int JACK_OpenWaveInDevice(WINE_WAVEIN* wwi, WORD nChannels) /* try to become a client of the JACK server */ snprintf(client_name, sizeof(client_name), "wine_jack_in_%d", wwi->wDevID); TRACE("client name '%s'\n", client_name); - if ((client = fp_jack_client_new (client_name)) == 0) + if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0) { /* jack has problems with shutting down clients, so lets */ /* wait a short while and try once more before we give up */ Sleep(250); - if ((client = fp_jack_client_new (client_name)) == 0) + if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0) { ERR("jack server not running?\n"); return 0;

1 0

Juan Lang : crypt32/tests: Improve granularity of testing a store' s serialized form.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: d0b7cc5bb9ed95748c7238d5edb176e9f67a23fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b7cc5bb9ed95748c7238d5e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 24 14:15:34 2010 -0700 crypt32/tests: Improve granularity of testing a store's serialized form. --- dlls/crypt32/tests/store.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index cab74c6..598af93 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2064,21 +2064,32 @@ static void testAddSerialized(void) } static void compareStore(HCERTSTORE store, LPCSTR name, const BYTE *pb, - DWORD cb) + DWORD cb, BOOL todo) { BOOL ret; CRYPT_DATA_BLOB blob = { 0, NULL }; ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_MEMORY, &blob, 0); - ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb, - blob.cbData); + ok(ret, "CertSaveStore failed: %08x\n", GetLastError()); + if (todo) + todo_wine + ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb, + blob.cbData); + else + ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb, + blob.cbData); blob.pbData = HeapAlloc(GetProcessHeap(), 0, blob.cbData); if (blob.pbData) { ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_MEMORY, &blob, 0); - ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); + ok(ret, "CertSaveStore failed: %08x\n", GetLastError()); + if (todo) + todo_wine + ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); + else + ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); HeapFree(GetProcessHeap(), 0, blob.pbData); } } @@ -2330,7 +2341,7 @@ static void testAddCertificateLink(void) CertFreeCertificateContext(linked); compareStore(store2, "file store -> file store", serializedStoreWithCertWithFriendlyName, - sizeof(serializedStoreWithCertWithFriendlyName)); + sizeof(serializedStoreWithCertWithFriendlyName), FALSE); } CertCloseStore(store2, 0); DeleteFileW(filename2); @@ -2380,10 +2391,9 @@ static void testAddCertificateLink(void) ok(linked->hCertStore == store2, "unexpected store"); ret = pCertControlStore(store2, 0, CERT_STORE_CTRL_COMMIT, NULL); ok(ret, "CertControlStore failed: %d\n", ret); - todo_wine compareStore(store2, "file store -> system store", serializedStoreWithCertAndHash, - sizeof(serializedStoreWithCertAndHash)); + sizeof(serializedStoreWithCertAndHash), TRUE); CertFreeCertificateContext(linked); }

1 0

Juan Lang : crypt32/tests: Test an otherwise unused return value.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 6451b9621ec79a29e91a555f6b1da7c692427645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6451b9621ec79a29e91a555f6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 24 14:16:22 2010 -0700 crypt32/tests: Test an otherwise unused return value. --- dlls/crypt32/tests/store.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 598af93..410b923 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2329,6 +2329,8 @@ static void testAddCertificateLink(void) if (buf) { ret = CertSerializeCertificateStoreElement(linked, 0, buf, &size); + ok(ret, "CertSerializeCertificateStoreElement failed: %08x\n", + GetLastError()); /* The serialized linked certificate now contains the friendly * name property. */

1 0

Juan Lang : crypt32/tests: Always compare serialized stores in memory.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 1d947024319f7b75f4a28032ec76354cce5f37b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d947024319f7b75f4a28032e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 24 14:21:28 2010 -0700 crypt32/tests: Always compare serialized stores in memory. --- dlls/crypt32/tests/store.c | 100 +++++++++++++++++--------------------------- 1 files changed, 38 insertions(+), 62 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 410b923..de5a9d4 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -277,29 +277,35 @@ static void testMemStore(void) CertCloseStore(store1, 0); } -static void compareFile(LPCWSTR filename, const BYTE *pb, DWORD cb) +static void compareStore(HCERTSTORE store, LPCSTR name, const BYTE *pb, + DWORD cb, BOOL todo) { - HANDLE h; - BYTE buf[200]; BOOL ret; - DWORD cbRead = 0, totalRead = 0; + CRYPT_DATA_BLOB blob = { 0, NULL }; - h = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, NULL); - if (h == INVALID_HANDLE_VALUE) - return; - do { - ret = ReadFile(h, buf, sizeof(buf), &cbRead, NULL); - if (ret && cbRead) - { - ok(totalRead + cbRead <= cb, "Expected total count %d, see %d\n", - cb, totalRead + cbRead); - ok(!memcmp(pb + totalRead, buf, cbRead), - "Unexpected data in file\n"); - totalRead += cbRead; - } - } while (ret && cbRead); - CloseHandle(h); + ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, + CERT_STORE_SAVE_TO_MEMORY, &blob, 0); + ok(ret, "CertSaveStore failed: %08x\n", GetLastError()); + if (todo) + todo_wine + ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb, + blob.cbData); + else + ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb, + blob.cbData); + blob.pbData = HeapAlloc(GetProcessHeap(), 0, blob.cbData); + if (blob.pbData) + { + ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, + CERT_STORE_SAVE_TO_MEMORY, &blob, 0); + ok(ret, "CertSaveStore failed: %08x\n", GetLastError()); + if (todo) + todo_wine + ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); + else + ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); + HeapFree(GetProcessHeap(), 0, blob.pbData); + } } static const BYTE serializedStoreWithCert[] = { @@ -689,11 +695,10 @@ static void testCollectionStore(void) GetLastError()); ret = pCertControlStore(collection, 0, CERT_STORE_CTRL_COMMIT, NULL); ok(ret, "CertControlStore failed: %d\n", ret); - + compareStore(collection, "serialized store with cert", + serializedStoreWithCert, sizeof(serializedStoreWithCert), FALSE); CertCloseStore(collection, 0); - compareFile(filename, serializedStoreWithCert, - sizeof(serializedStoreWithCert)); DeleteFileW(filename); } @@ -1294,8 +1299,8 @@ static void testFileStore(void) /* with commits enabled, commit is allowed */ ret = pCertControlStore(store, 0, CERT_STORE_CTRL_COMMIT, NULL); ok(ret, "CertControlStore failed: %d\n", ret); - compareFile(filename, serializedStoreWithCert, - sizeof(serializedStoreWithCert)); + compareStore(store, "serialized store with cert", + serializedStoreWithCert, sizeof(serializedStoreWithCert), FALSE); CertCloseStore(store, 0); } file = CreateFileW(filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, @@ -1311,9 +1316,10 @@ static void testFileStore(void) ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); ok(ret, "CertAddEncodedCRLToStore failed: %08x\n", GetLastError()); + compareStore(store, "serialized store with cert and CRL", + serializedStoreWithCertAndCRL, sizeof(serializedStoreWithCertAndCRL), + FALSE); CertCloseStore(store, 0); - compareFile(filename, serializedStoreWithCertAndCRL, - sizeof(serializedStoreWithCertAndCRL)); } DeleteFileW(filename); @@ -1517,9 +1523,9 @@ static void testFileNameStore(void) bigCert, sizeof(bigCert), CERT_STORE_ADD_ALWAYS, NULL); ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); + compareStore(store, "serialized store with cert", + serializedStoreWithCert, sizeof(serializedStoreWithCert), FALSE); CertCloseStore(store, 0); - compareFile(filename, serializedStoreWithCert, - sizeof(serializedStoreWithCert)); } store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, 0, 0, CERT_FILE_STORE_COMMIT_ENABLE_FLAG, filename); @@ -1529,9 +1535,10 @@ static void testFileNameStore(void) ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); ok(ret, "CertAddEncodedCRLToStore failed: %08x\n", GetLastError()); + compareStore(store, "serialized store with cert and CRL", + serializedStoreWithCertAndCRL, sizeof(serializedStoreWithCertAndCRL), + FALSE); CertCloseStore(store, 0); - compareFile(filename, serializedStoreWithCertAndCRL, - sizeof(serializedStoreWithCertAndCRL)); } DeleteFileW(filename); @@ -2063,37 +2070,6 @@ static void testAddSerialized(void) CertCloseStore(store, 0); } -static void compareStore(HCERTSTORE store, LPCSTR name, const BYTE *pb, - DWORD cb, BOOL todo) -{ - BOOL ret; - CRYPT_DATA_BLOB blob = { 0, NULL }; - - ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, - CERT_STORE_SAVE_TO_MEMORY, &blob, 0); - ok(ret, "CertSaveStore failed: %08x\n", GetLastError()); - if (todo) - todo_wine - ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb, - blob.cbData); - else - ok(blob.cbData == cb, "%s: expected size %d, got %d\n", name, cb, - blob.cbData); - blob.pbData = HeapAlloc(GetProcessHeap(), 0, blob.cbData); - if (blob.pbData) - { - ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, - CERT_STORE_SAVE_TO_MEMORY, &blob, 0); - ok(ret, "CertSaveStore failed: %08x\n", GetLastError()); - if (todo) - todo_wine - ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); - else - ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); - HeapFree(GetProcessHeap(), 0, blob.pbData); - } -} - static const BYTE serializedCertWithFriendlyName[] = { 0x0b,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x12,0x00,0x00,0x00,0x57,0x00,0x69, 0x00,0x6e,0x00,0x65,0x00,0x54,0x00,0x65,0x00,0x73,0x00,0x74,0x00,0x00,0x00,

1 0

André Hentschel : oledb32: Fix dst_len in DataConvert.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 0ed2288552f4fa63506a45c783d29c18b1dba2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed2288552f4fa63506a45c78… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 25 19:40:36 2010 +0200 oledb32: Fix dst_len in DataConvert. --- dlls/oledb32/convert.c | 5 ++++- dlls/oledb32/tests/convert.c | 19 ++----------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 6338090..01c304c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -161,7 +161,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, src_type, dst_type, src_len, dst_len, src, dst, dst_max_len, src_status, dst_status, precision, scale, flags); - *dst_len = get_length(dst_type); *dst_status = DBSTATUS_E_BADACCESSOR; if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK) @@ -571,10 +570,14 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, if(hr == DISP_E_OVERFLOW) { *dst_status = DBSTATUS_E_DATAOVERFLOW; + *dst_len = get_length(dst_type); hr = DB_E_ERRORSOCCURRED; } else if(hr == S_OK) + { *dst_status = DBSTATUS_S_OK; + *dst_len = get_length(dst_type); + } return hr; } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index c6a749d..2eb3951 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -370,7 +370,6 @@ static void test_converttoi2(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(dst == 0x1234, "got %08x\n", dst); @@ -454,7 +453,6 @@ todo_wine hr = IDataConvert_DataConvert(convert, DBTYPE_ERROR, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(dst == 0x1234, "got %08x\n", dst); @@ -482,10 +480,9 @@ todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); -} ok(dst_len == sizeof(dst), "got %d\n", dst_len); -todo_wine ok(dst == 0x4321, "got %08x\n", dst); +} dst_len = dst = 0x1234; memset(src, 0, sizeof(DECIMAL)); @@ -650,7 +647,6 @@ static void test_converttoi4(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(i4 == 0x12345678, "got %08x\n", i4); @@ -733,7 +729,6 @@ todo_wine hr = IDataConvert_DataConvert(convert, DBTYPE_ERROR, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(i4 == 0x12345678, "got %08x\n", i4); @@ -764,10 +759,9 @@ todo_wine { ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); -} ok(dst_len == sizeof(i4), "got %d\n", dst_len); -todo_wine ok(i4 == 0x1234, "got %08x\n", i4); +} i4 = 0x12345678; memset(src, 0, sizeof(DECIMAL)); @@ -984,7 +978,6 @@ static void test_converttowstr(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_WSTR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(dst[0] == 0xcccc, "got %02x\n", dst[0]); @@ -1466,7 +1459,6 @@ static void test_converttostr(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_STR, 0, &dst_len, src, dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(dst[0] == (char)0xcc, "got %02x\n", dst[0]); @@ -1964,7 +1956,6 @@ static void test_converttobyrefwstr(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_BYREF | DBTYPE_WSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(dst == (void*)0x12345678, "got %p\n", dst); @@ -2057,7 +2048,6 @@ static void test_converttoguid(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_GUID, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(IsEqualGUID(&dst, &IID_IDCInfo), "dst has changed\n"); @@ -2137,7 +2127,6 @@ static void test_converttoui1(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_UI1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(dst == 0x12, "got %08x\n", dst); @@ -2191,7 +2180,6 @@ static void test_converttoui4(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_UI4, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(dst == 0x12345678, "got %08x\n", dst); @@ -2256,7 +2244,6 @@ static void test_converttor4(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_R4, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(dst == 1.0, "got %f\n", dst); @@ -2310,7 +2297,6 @@ static void test_converttocy(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_CY, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(dst.int64 == 0xcc, "dst changed\n"); @@ -2364,7 +2350,6 @@ static void test_converttoui8(void) hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_UI8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); -todo_wine ok(dst_len == 0x1234, "got %d\n", dst_len); ok(dst.QuadPart == 0xcc, "dst changed\n");

1 0

André Hentschel : oledb32: Add Variant to Integer conversion.
by Alexandre Julliard 26 May '10

26 May '10

Module: wine Branch: master Commit: 0ff9d8c290e7a5423bd4f38a902188c2a7e2f254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff9d8c290e7a5423bd4f38a9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 25 19:41:11 2010 +0200 oledb32: Add Variant to Integer conversion. --- dlls/oledb32/convert.c | 2 ++ dlls/oledb32/tests/convert.c | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 01c304c..c9206ba 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -231,6 +231,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_UI4: hr = VarI2FromUI4(*(DWORD*)src, d); break; case DBTYPE_I8: hr = VarI2FromI8(*(LONGLONG*)src, d); break; case DBTYPE_UI8: hr = VarI2FromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_VARIANT: *d = V_I2((VARIANT*)src); hr = S_OK; break; default: FIXME("Unimplemented conversion %04x -> I2\n", src_type); return E_NOTIMPL; } break; @@ -257,6 +258,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_UI4: hr = VarI4FromUI4(*(DWORD*)src, d); break; case DBTYPE_I8: hr = VarI4FromI8(*(LONGLONG*)src, d); break; case DBTYPE_UI8: hr = VarI4FromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_VARIANT: *d = V_I4((VARIANT*)src); hr = S_OK; break; default: FIXME("Unimplemented conversion %04x -> I4\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 2eb3951..60698a6 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -476,13 +476,10 @@ todo_wine V_VT((VARIANT*)src) = VT_I2; V_I2((VARIANT*)src) = 0x4321; hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine -{ ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %d\n", dst_len); ok(dst == 0x4321, "got %08x\n", dst); -} dst_len = dst = 0x1234; memset(src, 0, sizeof(DECIMAL)); @@ -755,13 +752,10 @@ static void test_converttoi4(void) V_I2((VARIANT*)src) = 0x1234; dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); -todo_wine -{ ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_len == sizeof(i4), "got %d\n", dst_len); ok(i4 == 0x1234, "got %08x\n", i4); -} i4 = 0x12345678; memset(src, 0, sizeof(DECIMAL));

1 0