December 2010 - Wine-commits

Erich Hoover : winex11: Add support for animated cursors in X11 driver.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: stable Commit: 9d13eb1b574a1d5c48b75952f2711a4ac3921fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d13eb1b574a1d5c48b75952f… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Oct 5 12:06:18 2010 -0600 winex11: Add support for animated cursors in X11 driver. (cherry picked from commit e84eb16c05559fea55f2219ea1a08e2efc0244ea) --- dlls/winex11.drv/mouse.c | 168 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 130 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index cf988c9..28b825d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -32,6 +32,9 @@ static void *xcursor_handle; MAKE_FUNCPTR(XcursorImageCreate); MAKE_FUNCPTR(XcursorImageDestroy); MAKE_FUNCPTR(XcursorImageLoadCursor); +MAKE_FUNCPTR(XcursorImagesCreate); +MAKE_FUNCPTR(XcursorImagesDestroy); +MAKE_FUNCPTR(XcursorImagesLoadCursor); # undef MAKE_FUNCPTR #endif /* SONAME_LIBXCURSOR */ @@ -114,6 +117,9 @@ void X11DRV_Xcursor_Init(void) LOAD_FUNCPTR(XcursorImageCreate); LOAD_FUNCPTR(XcursorImageDestroy); LOAD_FUNCPTR(XcursorImageLoadCursor); + LOAD_FUNCPTR(XcursorImagesCreate); + LOAD_FUNCPTR(XcursorImagesDestroy); + LOAD_FUNCPTR(XcursorImagesLoadCursor); #undef LOAD_FUNCPTR #endif /* SONAME_LIBXCURSOR */ } @@ -468,73 +474,159 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, #ifdef SONAME_LIBXCURSOR /*********************************************************************** - * create_xcursor_cursor + * create_xcursor_frame * - * Use Xcursor to create an X cursor from a Windows one. + * Use Xcursor to create a frame of an X cursor from a Windows one. */ -static Cursor create_xcursor_cursor( HDC hdc, ICONINFO *icon, int width, int height ) +static XcursorImage *create_xcursor_frame( HDC hdc, ICONINFO *iinfo, HANDLE icon, + HBITMAP hbmColor, unsigned char *color_bits, int color_size, + HBITMAP hbmMask, unsigned char *mask_bits, int mask_size, + int width, int height, int istep ) { + XcursorImage *image, *ret = NULL; int x, y, i, has_alpha; - BITMAPINFO *info; - Cursor cursor; - XcursorImage *image; XcursorPixel *ptr; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return 0; - wine_tsx11_lock(); image = pXcursorImageCreate( width, height ); wine_tsx11_unlock(); if (!image) { - HeapFree( GetProcessHeap(), 0, info ); - return 0; + ERR("X11 failed to produce a cursor frame!\n"); + goto cleanup; + } + + image->xhot = iinfo->xHotspot; + image->yhot = iinfo->yHotspot; + image->delay = 100; /* TODO: find a way to get the proper delay */ + + /* draw the cursor frame to a temporary buffer then copy it into the XcursorImage */ + memset( color_bits, 0x00, color_size ); + SelectObject( hdc, hbmColor ); + if (!DrawIconEx( hdc, 0, 0, icon, width, height, istep, NULL, DI_NORMAL )) + { + TRACE("Could not draw frame %d (walk past end of frames).\n", istep); + goto cleanup; + } + memcpy( image->pixels, color_bits, color_size ); + + /* check if the cursor frame was drawn with an alpha channel */ + for (i = 0, ptr = image->pixels; i < width * height; i++, ptr++) + if ((has_alpha = (*ptr & 0xff000000) != 0)) break; + + /* if no alpha channel was drawn then generate it from the mask */ + if (!has_alpha) + { + unsigned int width_bytes = (width + 31) / 32 * 4; + + /* draw the cursor mask to a temporary buffer */ + memset( mask_bits, 0xFF, mask_size ); + SelectObject( hdc, hbmMask ); + if (!DrawIconEx( hdc, 0, 0, icon, width, height, istep, NULL, DI_MASK )) + { + ERR("Failed to draw frame mask %d.\n", istep); + goto cleanup; + } + /* use the buffer to directly modify the XcursorImage alpha channel */ + for (y = 0, ptr = image->pixels; y < height; y++) + for (x = 0; x < width; x++, ptr++) + if (!((mask_bits[y * width_bytes + x / 8] << (x % 8)) & 0x80)) + *ptr |= 0xff000000; } + ret = image; + +cleanup: + if (ret == NULL) pXcursorImageDestroy( image ); + return ret; +} + +/*********************************************************************** + * create_xcursor_cursor + * + * Use Xcursor to create an X cursor from a Windows one. + */ +static Cursor create_xcursor_cursor( HDC hdc, ICONINFO *iinfo, HANDLE icon, int width, int height ) +{ + unsigned char *color_bits, *mask_bits; + HBITMAP hbmColor = 0, hbmMask = 0; + XcursorImage **imgs, *image; + int color_size, mask_size; + BITMAPINFO *info = NULL; + XcursorImages *images; + Cursor cursor = 0; + int nFrames = 0; - image->xhot = icon->xHotspot; - image->yhot = icon->yHotspot; - image->delay = 0; + if (!(imgs = HeapAlloc( GetProcessHeap(), 0, sizeof(XcursorImage*) ))) return 0; + /* Allocate all of the resources necessary to obtain a cursor frame */ + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto cleanup; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = width; info->bmiHeader.biHeight = -height; info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = 32; info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biSizeImage = width * height * 4; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - GetDIBits( hdc, icon->hbmColor, 0, height, image->pixels, info, DIB_RGB_COLORS ); - - for (i = 0, ptr = image->pixels; i < width * height; i++, ptr++) - if ((has_alpha = (*ptr & 0xff000000) != 0)) break; + info->bmiHeader.biBitCount = 32; + color_size = width * height * 4; + info->bmiHeader.biSizeImage = color_size; + hbmColor = CreateDIBSection( hdc, info, DIB_RGB_COLORS, (VOID **) &color_bits, NULL, 0); + if (!hbmColor) + { + ERR("Failed to create DIB section for cursor color data!\n"); + goto cleanup; + } + info->bmiHeader.biBitCount = 1; + mask_size = ((width + 31) / 32 * 4) * height; /* width_bytes * height */ + info->bmiHeader.biSizeImage = mask_size; + hbmMask = CreateDIBSection( hdc, info, DIB_RGB_COLORS, (VOID **) &mask_bits, NULL, 0); + if (!hbmMask) + { + ERR("Failed to create DIB section for cursor mask data!\n"); + goto cleanup; + } - if (!has_alpha) + /* Create an XcursorImage for each frame of the cursor */ + while (1) { - unsigned char *mask_bits; - unsigned int width_bytes = (width + 31) / 32 * 4; + XcursorImage **imgstmp; - /* generate alpha channel from the mask */ - info->bmiHeader.biBitCount = 1; - info->bmiHeader.biSizeImage = width_bytes * height; - if ((mask_bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) - { - GetDIBits( hdc, icon->hbmMask, 0, height, mask_bits, info, DIB_RGB_COLORS ); - for (y = 0, ptr = image->pixels; y < height; y++) - for (x = 0; x < width; x++, ptr++) - if (!((mask_bits[y * width_bytes + x / 8] << (x % 8)) & 0x80)) - *ptr |= 0xff000000; - HeapFree( GetProcessHeap(), 0, mask_bits ); - } + image = create_xcursor_frame( hdc, iinfo, icon, + hbmColor, color_bits, color_size, + hbmMask, mask_bits, mask_size, + width, height, nFrames ); + if (!image) break; /* no more drawable frames */ + + imgs[nFrames++] = image; + if (!(imgstmp = HeapReAlloc( GetProcessHeap(), 0, imgs, (nFrames+1)*sizeof(XcursorImage*) ))) goto cleanup; + imgs = imgstmp; } - HeapFree( GetProcessHeap(), 0, info ); + /* Build an X cursor out of all of the frames */ + if (!(images = pXcursorImagesCreate( nFrames ))) goto cleanup; + for (images->nimage = 0; images->nimage < nFrames; images->nimage++) + images->images[images->nimage] = imgs[images->nimage]; wine_tsx11_lock(); - cursor = pXcursorImageLoadCursor( gdi_display, image ); - pXcursorImageDestroy( image ); + cursor = pXcursorImagesLoadCursor( gdi_display, images ); wine_tsx11_unlock(); + pXcursorImagesDestroy( images ); /* Note: this frees each individual frame (calls XcursorImageDestroy) */ + HeapFree( GetProcessHeap(), 0, imgs ); + imgs = NULL; + +cleanup: + if (imgs) + { + /* Failed to produce a cursor, free previously allocated frames */ + for (nFrames--; nFrames >= 0; nFrames--) + pXcursorImageDestroy( imgs[nFrames] ); + HeapFree( GetProcessHeap(), 0, imgs ); + } + /* Cleanup all of the resources used to obtain the frame data */ + if (hbmColor) DeleteObject( hbmColor ); + if (hbmMask) DeleteObject( hbmMask ); + HeapFree( GetProcessHeap(), 0, info ); return cursor; } @@ -772,7 +864,7 @@ static Cursor create_cursor( HANDLE handle ) if (info.hbmColor) { #ifdef SONAME_LIBXCURSOR - if (pXcursorImageLoadCursor) cursor = create_xcursor_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); + if (pXcursorImagesLoadCursor) cursor = create_xcursor_cursor( hdc, &info, handle, bm.bmWidth, bm.bmHeight ); #endif if (!cursor) cursor = create_xlib_cursor( hdc, &info, bm.bmWidth, bm.bmHeight ); DeleteObject( info.hbmColor );

1 0

Juan Lang : wininet: Don' t call SSL_connect until initialization is complete.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: stable Commit: 2df1064e69fb3df6dcf35e32b77b78e6f80d3ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df1064e69fb3df6dcf35e32b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 18:15:58 2010 -0700 wininet: Don't call SSL_connect until initialization is complete. (cherry picked from commit 98dbdadcdafaa3708e36074708ade5782f892fe4) --- dlls/wininet/netconnection.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 08152f5..5676020 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -666,14 +666,6 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) goto fail; } - if (pSSL_connect(connection->ssl_s) <= 0) - { - res = (DWORD_PTR)pSSL_get_ex_data(connection->ssl_s, error_idx); - if (!res) - res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; - ERR("SSL_connect failed: %d\n", res); - goto fail; - } if (!pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname)) { ERR("SSL_set_ex_data failed: %s\n", @@ -688,6 +680,14 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; goto fail; } + if (pSSL_connect(connection->ssl_s) <= 0) + { + res = (DWORD_PTR)pSSL_get_ex_data(connection->ssl_s, error_idx); + if (!res) + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + ERR("SSL_connect failed: %d\n", res); + goto fail; + } verify_res = pSSL_get_verify_result(connection->ssl_s); if (verify_res != X509_V_OK) {

1 0

Hans Leidekker : advapi32: Fix handling of zero account and domain size parameters in LookupAccountSid .
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: stable Commit: ad1883d251a0a0357941db688d1577d9d93ba77e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1883d251a0a0357941db688… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 21 12:54:50 2010 +0200 advapi32: Fix handling of zero account and domain size parameters in LookupAccountSid. (cherry picked from commit 0cffcb77d6e624bcc7567ebcfaecb0ef730e7a7e) --- dlls/advapi32/security.c | 15 ++++++++++++--- dlls/advapi32/tests/security.c | 12 +++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 821fb86..2d0ed48 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2069,6 +2069,11 @@ LookupAccountSidA( } else *domainSize = domainSizeW + 1; } + else + { + *accountSize = accountSizeW + 1; + *domainSize = domainSizeW + 1; + } HeapFree( GetProcessHeap(), 0, systemW ); HeapFree( GetProcessHeap(), 0, accountW ); @@ -2225,8 +2230,11 @@ LookupAccountSidW( if (domain) lstrcpyW(domain, dm); } - if (((*accountSize != 0) && (*accountSize < ac_len)) || - ((*domainSize != 0) && (*domainSize < dm_len))) { + if ((*accountSize && *accountSize < ac_len) || + (!account && !*accountSize && ac_len) || + (*domainSize && *domainSize < dm_len) || + (!domain && !*domainSize && dm_len)) + { SetLastError(ERROR_INSUFFICIENT_BUFFER); status = FALSE; } @@ -2238,9 +2246,10 @@ LookupAccountSidW( *accountSize = ac_len; else *accountSize = ac_len + 1; - *name_use = use; + HeapFree(GetProcessHeap(), 0, account_name); HeapFree(GetProcessHeap(), 0, computer_name); + if (status) *name_use = use; return status; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cd4624a..c9408ad 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1505,7 +1505,7 @@ static void test_LookupAccountSid(void) PSID pUsersSid = NULL; SID_NAME_USE use; BOOL ret; - DWORD size,cbti = 0; + DWORD error, size, cbti = 0; MAX_SID max_sid; CHAR *str_sidA; int i; @@ -1667,6 +1667,16 @@ static void test_LookupAccountSid(void) "LookupAccountSidW() Expected dom_size = %u, got %u\n", real_dom_sizeW + 1, dom_sizeW); + acc_sizeW = dom_sizeW = use = 0; + SetLastError(0xdeadbeef); + ret = LookupAccountSidW(NULL, pUsersSid, NULL, &acc_sizeW, NULL, &dom_sizeW, &use); + error = GetLastError(); + ok(!ret, "LookupAccountSidW failed %u\n", GetLastError()); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(acc_sizeW, "expected non-zero account size\n"); + ok(dom_sizeW, "expected non-zero domain size\n"); + ok(!use, "expected zero use %u\n", use); + FreeSid(pUsersSid); /* Test LookupAccountSid with Sid retrieved from token information.

1 0

Hans Leidekker : advapi32: Fix a buffer size query in LsaLookupSids.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: stable Commit: 11d86f08dd12a565710be6b46622cac99ac5935b URL: http://source.winehq.org/git/wine.git/?a=commit;h=11d86f08dd12a565710be6b46… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 6 15:45:30 2010 +0200 advapi32: Fix a buffer size query in LsaLookupSids. (cherry picked from commit ee18ead5457761c2a330d0005bb5bf1b8711ca80) --- dlls/advapi32/lsa.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index e12e312..863ddb2 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -483,7 +483,9 @@ NTSTATUS WINAPI LsaLookupSids( (*Names)[i].Name.Length = 0; (*Names)[i].Name.MaximumLength = 0; (*Names)[i].Name.Buffer = NULL; - if (LookupAccountSidW(NULL, Sids[i], NULL, &name_size, NULL, &domain_size, &use)) + + if (!LookupAccountSidW(NULL, Sids[i], NULL, &name_size, NULL, &domain_size, &use) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) { LSA_UNICODE_STRING domain; @@ -502,11 +504,11 @@ NTSTATUS WINAPI LsaLookupSids( domain.Buffer = NULL; } - (*Names)[i].Use = use; (*Names)[i].Name.Length = (name_size - 1) * sizeof(WCHAR); (*Names)[i].Name.MaximumLength = name_size * sizeof(WCHAR); - (*Names)[i].Name.Buffer = HeapAlloc(GetProcessHeap(),0,name_size * sizeof(WCHAR)); + (*Names)[i].Name.Buffer = HeapAlloc(GetProcessHeap(), 0, name_size * sizeof(WCHAR)); LookupAccountSidW(NULL, Sids[i], (*Names)[i].Name.Buffer, &name_size, domain.Buffer, &domain_size, &use); + (*Names)[i].Use = use; if (domain_size) (*Names)[i].DomainIndex = build_domain(*ReferencedDomains, &domain);

1 0

Andrew Eikum : hlink: Implement HLINKGETREF flags handling.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: stable Commit: 5c924530daec6095864e87f64ea0c8984b531fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c924530daec6095864e87f64… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 16 13:55:14 2010 -0500 hlink: Implement HLINKGETREF flags handling. (cherry picked from commit cb5eb331590c96c26ab50cfe9ae96692dfcca34f) --- dlls/hlink/link.c | 101 ++++++++++++----- dlls/hlink/tests/hlink.c | 272 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 334 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c924530daec6095864e8…

1 0

Andrew Bogott : shdocvw: Test read/ write of a couple of properties on IUniformResourceLocator.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: f471883ade5bbb5ca1443a5fc7d451062f96595e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f471883ade5bbb5ca1443a5fc… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Wed Nov 10 23:55:48 2010 -0600 shdocvw: Test read/write of a couple of properties on IUniformResourceLocator. --- dlls/shdocvw/tests/intshcut.c | 58 +++++++++++++++++++++++++++++++++++++++++ include/shlobj.h | 17 ++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index af34614..4cf289d 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -173,6 +173,63 @@ static BOOL check_ie(void) return TRUE; } +static void test_ReadAndWriteProperties(void) +{ + HRESULT hr; + IUniformResourceLocatorA *urlA; + IPropertySetStorage *pPropSetStg; + + hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); + if (hr == S_OK) + { + WCHAR iconPath[] = {'f','i','l','e',':','/','/','/','C',':','/','a','r','b','i','t','r','a','r','y','/','i','c','o','n','/','p','a','t','h',0}; + int iconIndex = 7; + IPropertyStorage *pPropStgWrite; + IPropertyStorage *pPropStgRead; + PROPSPEC ps[2]; + PROPVARIANT pv[2]; + PROPVARIANT pvread[2]; + ps[0].ulKind = PRSPEC_PROPID; + ps[0].propid = PID_IS_ICONFILE; + ps[1].ulKind = PRSPEC_PROPID; + ps[1].propid = PID_IS_ICONINDEX; + pv[0].vt = VT_LPWSTR; + pv[0].pwszVal = (void *) iconPath; + pv[1].vt = VT_I4; + pv[1].iVal = iconIndex; + + hr = urlA->lpVtbl->QueryInterface(urlA, &IID_IPropertySetStorage, (void **) &pPropSetStg); + ok(hr == S_OK, "Unable to get an IPropertySetStorage, hr=0x%x\n", hr); + + hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStgWrite); + ok(hr == S_OK, "Unable to get an IPropertyStorage for writing, hr=0x%x\n", hr); + + hr = IPropertyStorage_WriteMultiple(pPropStgWrite, 2, ps, pv, 0); + ok(hr == S_OK, "Unable to set properties, hr=0x%x\n", hr); + + hr = IPropertyStorage_Commit(pPropStgWrite, STGC_DEFAULT); + ok(hr == S_OK, "Failed to commit properties, hr=0x%x\n", hr); + + pPropStgWrite->lpVtbl->Release(pPropStgWrite); + + hr = IPropertySetStorage_Open(pPropSetStg, &FMTID_Intshcut, STGM_READ | STGM_SHARE_EXCLUSIVE, &pPropStgRead); + ok(hr == S_OK, "Unable to get an IPropertyStorage for reading, hr=0x%x\n", hr); + + hr = IPropertyStorage_ReadMultiple(pPropStgRead, 2, ps, pvread); + ok(hr == S_OK, "Unable to read properties, hr=0x%x\n", hr); + + ok(pvread[1].iVal == iconIndex, "Read wrong icon index: %d\n", pvread[1].iVal); + + ok(lstrcmpW(pvread[0].pwszVal, iconPath) == 0, "Wrong icon path read: %s\n",wine_dbgstr_w(pvread[0].pwszVal)); + + IPropertyStorage_Release(pPropStgRead); + IPropertySetStorage_Release(pPropSetStg); + urlA->lpVtbl->Release(urlA); + } + else + skip("could not create a CLSID_InternetShortcut for property tests, hr=0x%x\n", hr); +} + static void test_NullURLs(void) { HRESULT hr; @@ -231,6 +288,7 @@ static void test_InternetShortcut(void) test_QueryInterface(); test_NullURLs(); test_SetURLFlags(); + test_ReadAndWriteProperties(); } } diff --git a/include/shlobj.h b/include/shlobj.h index f3aa3b6..aab93fc 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1661,6 +1661,23 @@ BOOL WINAPI DAD_DragLeave(void); BOOL WINAPI DAD_AutoScroll(HWND,AUTO_SCROLL_DATA*,LPPOINT); HRESULT WINAPI SHDoDragDrop(HWND,IDataObject*,IDropSource*,DWORD,LPDWORD); +/**************************************************************************** + * Internet shortcut properties + */ + +#define PID_IS_URL 2 +#define PID_IS_NAME 4 +#define PID_IS_WORKINGDIR 5 +#define PID_IS_HOTKEY 6 +#define PID_IS_SHOWCMD 7 +#define PID_IS_ICONINDEX 8 +#define PID_IS_ICONFILE 9 +#define PID_IS_WHATSNEW 10 +#define PID_IS_AUTHOR 11 +#define PID_IS_DESCRIPTION 12 +#define PID_IS_COMMENT 13 + + LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST,LPCSHITEMID,BOOL); LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST); LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST);

1 0

Andrew Bogott : shdocvw: Add the IPropertySet interface to an internet shortcut, and partially implement it.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: cc34ca4c5122b47a4d528e5a79352195f8666adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc34ca4c5122b47a4d528e5a7… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Fri Nov 19 21:54:26 2010 -0600 shdocvw: Add the IPropertySet interface to an internet shortcut, and partially implement it. --- dlls/shdocvw/intshcut.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index a5ad1b7..8f55a20 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -46,9 +46,11 @@ typedef struct IUniformResourceLocatorA uniformResourceLocatorA; IUniformResourceLocatorW uniformResourceLocatorW; IPersistFile persistFile; + IPropertySetStorage IPropertySetStorage_iface; LONG refCount; + IPropertySetStorage *property_set_storage; WCHAR *url; BOOLEAN isDirty; LPOLESTR currentFile; @@ -71,6 +73,11 @@ static inline InternetShortcut* impl_from_IPersistFile(IPersistFile *iface) return CONTAINING_RECORD(iface, InternetShortcut, persistFile); } +static inline InternetShortcut* impl_from_IPropertySetStorage(IPropertySetStorage *iface) +{ + return (InternetShortcut*)((char*)iface - FIELD_OFFSET(InternetShortcut, IPropertySetStorage_iface)); +} + static BOOL run_winemenubuilder( const WCHAR *args ) { static const WCHAR menubuilder[] = {'\\','w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e',0}; @@ -145,6 +152,8 @@ static HRESULT Unknown_QueryInterface(InternetShortcut *This, REFIID riid, PVOID *ppvObject = &This->uniformResourceLocatorW; else if (IsEqualGUID(&IID_IPersistFile, riid)) *ppvObject = &This->persistFile; + else if (IsEqualGUID(&IID_IPropertySetStorage, riid)) + *ppvObject = &This->IPropertySetStorage_iface; else if (IsEqualGUID(&IID_IShellLinkA, riid)) { FIXME("The IShellLinkA interface is not yet supported by InternetShortcut\n"); @@ -179,6 +188,7 @@ static ULONG Unknown_Release(InternetShortcut *This) { CoTaskMemFree(This->url); CoTaskMemFree(This->currentFile); + IPropertySetStorage_Release(This->property_set_storage); heap_free(This); SHDOCVW_UnlockModule(); } @@ -537,8 +547,78 @@ static HRESULT WINAPI PersistFile_GetCurFile(IPersistFile *pFile, LPOLESTR *ppsz return hr; } +static HRESULT WINAPI PropertySetStorage_QueryInterface(IPropertySetStorage *iface, REFIID riid, PVOID *ppvObject) +{ + InternetShortcut *This = impl_from_IPropertySetStorage(iface); + TRACE("(%p)\n", iface); + return Unknown_QueryInterface(This, riid, ppvObject); +} + +static ULONG WINAPI PropertySetStorage_AddRef(IPropertySetStorage *iface) +{ + InternetShortcut *This = impl_from_IPropertySetStorage(iface); + TRACE("(%p)\n", iface); + return Unknown_AddRef(This); +} + +static ULONG WINAPI PropertySetStorage_Release(IPropertySetStorage *iface) +{ + InternetShortcut *This = impl_from_IPropertySetStorage(iface); + TRACE("(%p)\n", iface); + return Unknown_Release(This); +} + +static HRESULT WINAPI PropertySetStorage_Create( + IPropertySetStorage* iface, + REFFMTID rfmtid, + const CLSID *pclsid, + DWORD grfFlags, + DWORD grfMode, + IPropertyStorage **ppprstg) +{ + InternetShortcut *This = impl_from_IPropertySetStorage(iface); + TRACE("(%s, %p, 0x%x, 0x%x, %p)\n", debugstr_guid(rfmtid), pclsid, grfFlags, grfMode, ppprstg); + + return IPropertySetStorage_Create(This->property_set_storage, + rfmtid, + pclsid, + grfFlags, + grfMode, + ppprstg); +} + +static HRESULT WINAPI PropertySetStorage_Open( + IPropertySetStorage* iface, + REFFMTID rfmtid, + DWORD grfMode, + IPropertyStorage **ppprstg) +{ + InternetShortcut *This = impl_from_IPropertySetStorage(iface); + TRACE("(%s, 0x%x, %p)\n", debugstr_guid(rfmtid), grfMode, ppprstg); + + /* Note: The |STGM_SHARE_EXCLUSIVE is to cope with a bug in the implementation. Should be fixed in ole32. */ + return IPropertySetStorage_Open(This->property_set_storage, + rfmtid, + grfMode|STGM_SHARE_EXCLUSIVE, + ppprstg); +} + +static HRESULT WINAPI PropertySetStorage_Delete(IPropertySetStorage *iface, REFFMTID rfmtid) +{ + InternetShortcut *This = impl_from_IPropertySetStorage(iface); + TRACE("(%s)\n", debugstr_guid(rfmtid)); + return IPropertySetStorage_Delete(This->property_set_storage, + rfmtid); +} + +static HRESULT WINAPI PropertySetStorage_Enum(IPropertySetStorage *iface, IEnumSTATPROPSETSTG **ppenum) +{ + FIXME("(%p): stub\n", ppenum); + return E_NOTIMPL; +} + static const IUniformResourceLocatorWVtbl uniformResourceLocatorWVtbl = { UniformResourceLocatorW_QueryInterface, UniformResourceLocatorW_AddRef, @@ -569,6 +649,16 @@ static const IPersistFileVtbl persistFileVtbl = { PersistFile_GetCurFile }; +static const IPropertySetStorageVtbl propertySetStorageVtbl = { + PropertySetStorage_QueryInterface, + PropertySetStorage_AddRef, + PropertySetStorage_Release, + PropertySetStorage_Create, + PropertySetStorage_Open, + PropertySetStorage_Delete, + PropertySetStorage_Enum +}; + static InternetShortcut *create_shortcut(void) { InternetShortcut *newshortcut; @@ -576,10 +666,31 @@ static InternetShortcut *create_shortcut(void) newshortcut = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(InternetShortcut)); if (newshortcut) { + HRESULT hr; + IPropertyStorage *dummy; + newshortcut->uniformResourceLocatorA.lpVtbl = &uniformResourceLocatorAVtbl; newshortcut->uniformResourceLocatorW.lpVtbl = &uniformResourceLocatorWVtbl; newshortcut->persistFile.lpVtbl = &persistFileVtbl; + newshortcut->IPropertySetStorage_iface.lpVtbl = &propertySetStorageVtbl; newshortcut->refCount = 0; + hr = StgCreateStorageEx(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, STGFMT_STORAGE, 0, NULL, NULL, &IID_IPropertySetStorage, (void **) &newshortcut->property_set_storage); + if FAILED(hr) + { + TRACE("Failed to create the storage object needed for the shortcut.\n"); + heap_free(newshortcut); + return NULL; + } + + hr = IPropertySetStorage_Create(newshortcut->property_set_storage, &FMTID_Intshcut, NULL, PROPSETFLAG_DEFAULT, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &dummy); + if FAILED(hr) + { + TRACE("Failed to create the property object needed for the shortcut.\n"); + IPropertySetStorage_Release(newshortcut->property_set_storage); + heap_free(newshortcut); + return NULL; + } + IPropertySetStorage_Release(dummy); } return newshortcut;

1 0

Aric Stewart : secur32/tests: Skip test on failure to acquire cred_handle.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: fe05a73042edb378e47e1be3b1f7817a00e64031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe05a73042edb378e47e1be3b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Dec 1 20:28:50 2010 -0600 secur32/tests: Skip test on failure to acquire cred_handle. --- dlls/secur32/tests/schannel.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index c35c2dd..18a5c1e 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -625,6 +625,7 @@ static void test_communication(void) status = pAcquireCredentialsHandleA(NULL, (SEC_CHAR *)UNISP_NAME, SECPKG_CRED_OUTBOUND, NULL, &cred, NULL, NULL, &cred_handle, NULL); ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); + if (status != SEC_E_OK) return; /* Initialize the connection */ init_buffers(&buffers[0], 4, buf_size);

1 0

Wolfram Sang : winex11.drv: In GetDIBits() with DIB sections, always use dibpitch from the target.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 27d2b9b81490ca41c23ac3ad1fe057a8d8f44aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d2b9b81490ca41c23ac3ad1… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Dec 1 18:10:49 2010 +0100 winex11.drv: In GetDIBits() with DIB sections, always use dibpitch from the target. --- dlls/gdi32/tests/bitmap.c | 15 +++++++++++++-- dlls/winex11.drv/dib.c | 3 +-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index aa723bd..d0d7a9c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1218,7 +1218,8 @@ static void test_GetDIBits_selected_DIB(UINT bpp) BITMAPINFO * info2; void * bits; void * bits2; - UINT dib_size; + UINT dib_size, dib32_size; + DWORD pixel; HDC dib_dc, dc; HBITMAP old_bmp; BOOL equalContents; @@ -1254,6 +1255,7 @@ static void test_GetDIBits_selected_DIB(UINT bpp) dib = CreateDIBSection(NULL, info, DIB_RGB_COLORS, &bits, NULL, 0); assert(dib); dib_size = bpp * (info->bmiHeader.biWidth * info->bmiHeader.biHeight) / 8; + dib32_size = 32 * (info->bmiHeader.biWidth * info->bmiHeader.biHeight) / 8; /* Set the bits of the DIB section */ for (i=0; i < dib_size; i++) @@ -1265,7 +1267,7 @@ static void test_GetDIBits_selected_DIB(UINT bpp) dib_dc = CreateCompatibleDC(NULL); old_bmp = SelectObject(dib_dc, dib); dc = CreateCompatibleDC(NULL); - bits2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dib_size); + bits2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dib32_size); assert(bits2); /* Copy the DIB attributes but not the color table */ @@ -1300,6 +1302,15 @@ static void test_GetDIBits_selected_DIB(UINT bpp) } ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp); + /* Map into a 32bit-DIB */ + info2->bmiHeader.biBitCount = 32; + res = GetDIBits(dc, dib, 0, info->bmiHeader.biHeight, bits2, info2, DIB_RGB_COLORS); + ok(res, "GetDIBits failed\n"); + + /* Check if last pixel was set */ + pixel = ((DWORD *)bits2)[info->bmiHeader.biWidth * info->bmiHeader.biHeight - 1]; + ok(pixel != 0, "Pixel: 0x%08x\n", pixel); + HeapFree(GetProcessHeap(), 0, bits2); DeleteDC(dc); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 11157f1..05bd30c 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4210,8 +4210,7 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.ySrc = startscan; } descr.shm_mode = physBitmap->shm_mode; - descr.dibpitch = (obj_size == sizeof(DIBSECTION)) ? dib.dsBm.bmWidthBytes - : (((descr.infoWidth * descr.infoBpp + 31) &~31) / 8); + descr.dibpitch = (((descr.infoWidth * descr.infoBpp + 31) &~31) / 8); X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod ); X11DRV_DIB_GetImageBits( &descr );

1 0

Alexandre Julliard : inetcomm: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 7e8634448e1a40e4a4e2d167e1224b686b524a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8634448e1a40e4a4e2d167e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 14:50:13 2010 +0100 inetcomm: Convert dll registration to the IRegistrar mechanism. --- dlls/inetcomm/Makefile.in | 3 +- dlls/inetcomm/inetcomm.idl | 124 ++++++++++ dlls/inetcomm/inetcomm_main.c | 22 ++ dlls/inetcomm/regsvr.c | 512 ----------------------------------------- 4 files changed, 148 insertions(+), 513 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e8634448e1a40e4a4e2d…

1 0