April 2011 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Add support for 32 bpp BI_BITFIELDS.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: ba3d34875a844ec09648499fba226241ad34f1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3d34875a844ec09648499fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 5 13:26:08 2011 +0100 gdi32: Add support for 32 bpp BI_BITFIELDS. --- dlls/gdi32/dibdrv/dc.c | 28 ++++++++++++++++++++++++---- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 30 ++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 ++ 4 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index a230fbf..473bf82 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -36,11 +36,34 @@ static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) return 0; } +static void calc_shift_and_len(DWORD mask, int *shift, int *len) +{ + int s, l; + + s = 0; + while ((mask & 1) == 0) + { + mask >>= 1; + s++; + } + l = 0; + while ((mask & 1) == 1) + { + mask >>= 1; + l++; + } + *shift = s; + *len = l; +} + static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) { dib->red_mask = bit_fields[0]; dib->green_mask = bit_fields[1]; dib->blue_mask = bit_fields[2]; + calc_shift_and_len(dib->red_mask, &dib->red_shift, &dib->red_len); + calc_shift_and_len(dib->green_mask, &dib->green_shift, &dib->green_len); + calc_shift_and_len(dib->blue_mask, &dib->blue_shift, &dib->blue_len); } static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) @@ -71,10 +94,7 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) dib->funcs = &funcs_8888; else - { - TRACE("32 bpp bitmasks not supported, will forward to graphics driver.\n"); - return FALSE; - } + dib->funcs = &funcs_32; break; default: diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index da41f21..9ed7661 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -29,4 +29,5 @@ typedef struct primitive_funcs } primitive_funcs; extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; +extern const primitive_funcs funcs_32 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 8bbfc4d..92559d2 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -26,6 +26,31 @@ static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color) return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) ); } +static inline DWORD put_field(DWORD field, int shift, int len) +{ + shift = shift - (8 - len); + if (len <= 8) + field &= (((1 << len) - 1) << (8 - len)); + if (shift < 0) + field >>= -shift; + else + field <<= shift; + return field; +} + +static DWORD colorref_to_pixel_masks(const dib_info *dib, COLORREF colour) +{ + DWORD r,g,b; + + r = GetRValue(colour); + g = GetGValue(colour); + b = GetBValue(colour); + + return put_field(r, dib->red_shift, dib->red_len) | + put_field(g, dib->green_shift, dib->green_len) | + put_field(b, dib->blue_shift, dib->blue_len); +} + static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) { return 0; @@ -36,6 +61,11 @@ const primitive_funcs funcs_8888 = colorref_to_pixel_888 }; +const primitive_funcs funcs_32 = +{ + colorref_to_pixel_masks +}; + const primitive_funcs funcs_null = { colorref_to_pixel_null diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 8aa23bd..5f27106 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -86,6 +86,8 @@ typedef struct void *bits; /* points to the top-left corner of the dib. */ DWORD red_mask, green_mask, blue_mask; + int red_shift, green_shift, blue_shift; + int red_len, green_len, blue_len; const struct primitive_funcs *funcs; } dib_info;

1 0

Jacek Caban : mshtml: Properly handle upload streams containing headers.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 589c213890f2ae749359ab5d7016d9c579ea1445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589c213890f2ae749359ab5d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 5 15:23:25 2011 +0200 mshtml: Properly handle upload streams containing headers. --- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/navigate.c | 125 +++++++++++++++++++++++++++++------------ dlls/mshtml/nsio.c | 5 +- 3 files changed, 94 insertions(+), 39 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a449b18..44b6b1d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -500,6 +500,7 @@ typedef struct { nsWineURI *uri; nsIInputStream *post_data_stream; + BOOL post_data_contains_headers; nsILoadGroup *load_group; nsIInterfaceRequestor *notif_callback; nsISupports *owner; @@ -687,7 +688,7 @@ HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*); HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsWineURI**); HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD); -HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsIInputStream*,DWORD,BOOL*); +HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*); HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*); HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*); HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index db624d8..446b57b 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -684,33 +684,6 @@ static HRESULT parse_headers(const WCHAR *headers, struct list *headers_list) return S_OK; } -static HRESULT read_post_data_stream(nsIInputStream *stream, HGLOBAL *post_data, - ULONG *post_data_len) -{ - PRUint32 data_len = 0, available = 0; - char *data; - nsresult nsres; - - nsres = nsIInputStream_Available(stream, &available); - if(NS_FAILED(nsres)) - return E_FAIL; - - data = GlobalAlloc(0, available+1); - if(!data) - return E_OUTOFMEMORY; - - nsres = nsIInputStream_Read(stream, data, available, &data_len); - if(NS_FAILED(nsres)) { - GlobalFree(data); - return E_FAIL; - } - - data[data_len] = 0; - *post_data = data; - *post_data_len = data_len; - return S_OK; -} - HRESULT start_binding(HTMLWindow *window, HTMLDocumentNode *doc, BSCallback *bscallback, IBindCtx *bctx) { IStream *str = NULL; @@ -899,6 +872,90 @@ struct nsChannelBSC { nsProtocolStream *nsstream; }; +static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) +{ + PRUint32 data_len = 0, available = 0; + char *data, *post_data; + nsresult nsres; + HRESULT hres = S_OK; + + if(!nschannel->post_data_stream) + return S_OK; + + nsres = nsIInputStream_Available(nschannel->post_data_stream, &available); + if(NS_FAILED(nsres)) + return E_FAIL; + + post_data = data = GlobalAlloc(0, available+1); + if(!data) + return E_OUTOFMEMORY; + + nsres = nsIInputStream_Read(nschannel->post_data_stream, data, available, &data_len); + if(NS_FAILED(nsres)) { + GlobalFree(data); + return E_FAIL; + } + + data[data_len++] = 0; + + if(nschannel->post_data_contains_headers) { + if(data[0] == '\r' && data[1] == '\n') { + post_data = data+2; + data_len -= 2; + }else { + WCHAR *headers; + DWORD size; + + post_data = strstr(data, "\r\n\r\n"); + if(post_data) + post_data += 4; + else + post_data = data+data_len; + + data_len -= post_data-data; + + size = MultiByteToWideChar(CP_ACP, 0, data, post_data-data, NULL, 0); + headers = heap_alloc((size+1)*sizeof(WCHAR)); + if(headers) { + MultiByteToWideChar(CP_ACP, 0, data, post_data-data, headers, size); + headers[size] = 0; + hres = parse_headers(headers , &nschannel->request_headers); + if(SUCCEEDED(hres)) + This->bsc.headers = headers; + else + heap_free(headers); + }else { + hres = E_OUTOFMEMORY; + } + } + } + + if(FAILED(hres)) { + GlobalFree(data); + return hres; + } + + if(!data_len) { + GlobalFree(data); + post_data = NULL; + }else if(post_data != data) { + char *new_data; + + new_data = GlobalAlloc(0, data_len); + if(new_data) + memcpy(new_data, post_data, data_len); + GlobalFree(data); + if(!new_data) + return E_OUTOFMEMORY; + post_data = new_data; + } + + This->bsc.post_data = post_data; + This->bsc.post_data_len = data_len; + TRACE("post_data = %s\n", debugstr_a(This->bsc.post_data)); + return S_OK; +} + static HRESULT on_start_nsrequest(nsChannelBSC *This) { nsresult nsres; @@ -1068,12 +1125,9 @@ static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) HRESULT hres; if(This->nschannel && This->nschannel->post_data_stream) { - hres = read_post_data_stream(This->nschannel->post_data_stream, - &This->bsc.post_data, &This->bsc.post_data_len); + hres = read_post_data_stream(This, This->nschannel); if(FAILED(hres)) return hres; - - TRACE("post_data = %s\n", debugstr_an(This->bsc.post_data, This->bsc.post_data_len)); } return S_OK; @@ -1512,8 +1566,7 @@ void channelbsc_set_channel(nsChannelBSC *This, nsChannel *channel, nsIStreamLis } } -HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, - nsIInputStream *post_data_stream, DWORD hlnf, BOOL *cancel) +HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, nsChannel *nschannel, DWORD hlnf, BOOL *cancel) { IHlinkFrame *hlink_frame; nsChannelBSC *callback; @@ -1542,10 +1595,8 @@ HRESULT hlink_frame_navigate(HTMLDocument *doc, LPCWSTR url, return hres; } - if(post_data_stream) { - read_post_data_stream(post_data_stream, &callback->bsc.post_data, &callback->bsc.post_data_len); - TRACE("post_data = %s\n", debugstr_an(callback->bsc.post_data, callback->bsc.post_data_len)); - } + if(nschannel) + read_post_data_stream(callback, nschannel); hres = CreateAsyncBindCtx(0, &callback->bsc.IBindStatusCallback_iface, NULL, &bindctx); if(SUCCEEDED(hres)) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b2dab98..b25aae0 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -149,7 +149,7 @@ static BOOL before_async_open(nsChannel *channel, NSContainer *container) if(!hlnf && !exec_shldocvw_67(doc, channel->uri->wine_url)) return FALSE; - hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel->post_data_stream, hlnf, &cancel); + hres = hlink_frame_navigate(&doc->basedoc, channel->uri->wine_url, channel, hlnf, &cancel); return FAILED(hres) || cancel; } @@ -1304,6 +1304,8 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, TRACE("(%p)->(%p %s %d)\n", This, aStream, debugstr_nsacstr(aContentType), aContentLength); + This->post_data_contains_headers = TRUE; + if(aContentType) { nsACString_GetData(aContentType, &content_type); if(*content_type) { @@ -1316,6 +1318,7 @@ static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, set_http_header(&This->request_headers, content_typeW, sizeof(content_typeW)/sizeof(WCHAR), ct, strlenW(ct)); heap_free(ct); + This->post_data_contains_headers = FALSE; } }

1 0

André Hentschel : uxtheme/tests: Mark XP SP1 behaviour as broken.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 85c989be49ba646242b88c47358d049cbe8c6d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c989be49ba646242b88c473… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 1 18:50:30 2011 +0200 uxtheme/tests: Mark XP SP1 behaviour as broken. --- dlls/uxtheme/tests/system.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b730246..a63b6c4 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -507,7 +507,7 @@ static void test_GetCurrentThemeName(void) SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, 0, NULL, 0, NULL, 0); if (bThemeActive) - ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); + ok( hRes == S_OK || broken(hRes == E_FAIL /* WinXP SP1 */), "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef, @@ -523,7 +523,9 @@ static void test_GetCurrentThemeName(void) hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + broken(hRes == E_FAIL /* WinXP SP1 */), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef, @@ -537,7 +539,9 @@ static void test_GetCurrentThemeName(void) currentSize, sizeof(currentSize) / sizeof(WCHAR)); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + broken(hRes == E_FAIL /* WinXP SP1 */), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef,

1 0

André Hentschel : uxtheme/tests: Remove unneeded comment.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: b0696b8b4a9ee4c0eefaf7d8a9f453aaaed9ed44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0696b8b4a9ee4c0eefaf7d8a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 1 18:51:59 2011 +0200 uxtheme/tests: Remove unneeded comment. --- dlls/uxtheme/tests/system.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index a63b6c4..0aaadbd 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -514,11 +514,6 @@ static void test_GetCurrentThemeName(void) "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); - /* When the number of characters given is too small (not 0, see above), GetCurrentThemeName returns 0x8007007a. - * The only definition I found was in strsafe.h: - * - * #define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) // 0x7A = 122L = ERROR_INSUFFICIENT_BUFFER - */ SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); if (bThemeActive)

1 0

Joris Huizer : dxdiagn: Plug memory leak.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 8c6c2261b3cb59fec6913f68ce1960730fd0a315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6c2261b3cb59fec6913f68c… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Tue Apr 5 16:01:04 2011 +0200 dxdiagn: Plug memory leak. --- dlls/dxdiagn/provider.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 459f8e9..1731b8f 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -433,8 +433,12 @@ static BOOL is_netmeeting_running(void) { if (get_process_name_from_pid(pid_list[i], process_name, sizeof(process_name)/sizeof(WCHAR)) && !lstrcmpW(conf_exe, process_name)) + { + HeapFree(GetProcessHeap(), 0, pid_list); return TRUE; + } } + HeapFree(GetProcessHeap(), 0, pid_list); } return FALSE;

1 0

Michael Stefaniuc : wininet: Move "inline" right after the storage specifier.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 9bf247d44eda5cb5396610c51057c8e91e24ce82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf247d44eda5cb5396610c51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 5 16:18:38 2011 +0200 wininet: Move "inline" right after the storage specifier. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5258c2e..e775bc0 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -254,7 +254,7 @@ typedef struct { DWORD chunk_size; } chunked_stream_t; -static void inline destroy_data_stream(data_stream_t *stream) +static inline void destroy_data_stream(data_stream_t *stream) { stream->vtbl->destroy(stream); }

1 0

Huw Davies : gdi32/tests: Start of a framework for writing dib driver tests .
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 0aebe831b441046e306f616c864023880221ecc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aebe831b441046e306f616c8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 5 14:23:49 2011 +0100 gdi32/tests: Start of a framework for writing dib driver tests. --- dlls/gdi32/tests/Makefile.in | 3 +- dlls/gdi32/tests/dib.c | 152 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 90f937e..c77f9e2 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -1,11 +1,12 @@ TESTDLL = gdi32.dll -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 advapi32 C_SRCS = \ bitmap.c \ brush.c \ clipping.c \ dc.c \ + dib.c \ font.c \ gdiobj.c \ generated.c \ diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c new file mode 100644 index 0000000..7dd1ba3 --- /dev/null +++ b/dlls/gdi32/tests/dib.c @@ -0,0 +1,152 @@ +/* + * DIB driver tests. + * + * Copyright 2011 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wincrypt.h" + +#include "wine/test.h" + +static HCRYPTPROV crypt_prov; + +static const char *sha1_graphics_a8r8g8b8[] = +{ + "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", + NULL +}; + +static inline DWORD get_stride(BITMAPINFO *bmi) +{ + return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; +} + +static inline DWORD get_dib_size(BITMAPINFO *bmi) +{ + return get_stride(bmi) * abs(bmi->bmiHeader.biHeight); +} + +static char *hash_dib(BITMAPINFO *bmi, void *bits) +{ + DWORD dib_size = get_dib_size(bmi); + HCRYPTHASH hash; + char *buf; + BYTE hash_buf[20]; + DWORD hash_size = sizeof(hash_buf); + int i; + static const char *hex = "0123456789abcdef"; + + if(!crypt_prov) return NULL; + + if(!CryptCreateHash(crypt_prov, CALG_SHA1, 0, 0, &hash)) return NULL; + + CryptHashData(hash, bits, dib_size, 0); + + CryptGetHashParam(hash, HP_HASHVAL, NULL, &hash_size, 0); + if(hash_size != sizeof(hash_buf)) return NULL; + + CryptGetHashParam(hash, HP_HASHVAL, hash_buf, &hash_size, 0); + CryptDestroyHash(hash); + + buf = HeapAlloc(GetProcessHeap(), 0, hash_size * 2 + 1); + + for(i = 0; i < hash_size; i++) + { + buf[i * 2] = hex[hash_buf[i] >> 4]; + buf[i * 2 + 1] = hex[hash_buf[i] & 0xf]; + } + buf[i * 2] = '\0'; + + return buf; +} + +static void compare_hash(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const char *info) +{ + char *hash = hash_dib(bmi, bits); + + if(!hash) + { + skip("SHA1 hashing unavailable on this platform\n"); + return; + } + + if(**sha1) + { + ok(!strcmp(hash, **sha1), "%d: %s: expected hash %s got %s\n", + bmi->bmiHeader.biBitCount, info, **sha1, hash); + (*sha1)++; + } + else trace("\"%s\",\n", hash); + + HeapFree(GetProcessHeap(), 0, hash); +} + +static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) +{ + DWORD dib_size = get_dib_size(bmi); + + memset(bits, 0xcc, dib_size); + compare_hash(bmi, bits, sha1, "empty"); +} + +static void test_simple_graphics(void) +{ + char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + HDC mem_dc; + BYTE *bits; + HBITMAP dib, orig_bm; + const char **sha1; + + /* a8r8g8b8 */ + trace("8888\n"); + memset(bmi, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = 512; + bmi->bmiHeader.biWidth = 512; + bmi->bmiHeader.biBitCount = 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + + dib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(dib != NULL, "ret NULL\n"); + mem_dc = CreateCompatibleDC(NULL); + orig_bm = SelectObject(mem_dc, dib); + + sha1 = sha1_graphics_a8r8g8b8; + draw_graphics(mem_dc, bmi, bits, &sha1); + + SelectObject(mem_dc, orig_bm); + DeleteObject(dib); + DeleteDC(mem_dc); +} + +START_TEST(dib) +{ + CryptAcquireContextW(&crypt_prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + + test_simple_graphics(); + + CryptReleaseContext(crypt_prov, 0); +}

1 0

Dmitry Timoshkov : user32: DefDlgProc on WM_QUIT should repost it and terminate the dialog message loop .
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: bb411cfb6560c9fb0e38bbfb11493c5d8e8093b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb411cfb6560c9fb0e38bbfb1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 4 20:40:58 2011 +0900 user32: DefDlgProc on WM_QUIT should repost it and terminate the dialog message loop. --- dlls/user32/dialog.c | 8 +++++++- dlls/user32/tests/msg.c | 6 +----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 052fbff..b7b3cce 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -805,7 +805,13 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) /* No message present -> send ENTERIDLE and wait */ SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); } - if (!GetMessageW( &msg, 0, 0, 0 )) break; + GetMessageW( &msg, 0, 0, 0 ); + } + + if (msg.message == WM_QUIT) + { + PostQuitMessage( msg.wParam ); + dlgInfo->flags |= DF_END; } if (!IsWindow( hwnd )) return 0; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 65e417a..4be4c38 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10124,19 +10124,15 @@ static void test_quit_message(void) flush_events(); flush_sequence(); ret = DialogBoxParam(GetModuleHandle(0), "TEST_EMPTY_DIALOG", 0, wm_quit_dlg_proc, 0); -todo_wine ok(ret == 1, "expected 1, got %d\n", ret); - ok_sequence(WmQuitDialogSeq, "WmQuitDialogSeq", TRUE); + ok_sequence(WmQuitDialogSeq, "WmQuitDialogSeq", FALSE); memset(&msg, 0xab, sizeof(msg)); ret = PeekMessage(&msg, NULL, 0, 0, PM_REMOVE); -todo_wine ok(ret, "PeekMessage failed\n"); -if (ret) { ok(msg.message == WM_QUIT, "Received message 0x%04x instead of WM_QUIT\n", msg.message); ok(msg.wParam == 0x1234, "wParam was 0x%lx instead of 0x1234\n", msg.wParam); ok(msg.lParam == 0, "lParam was 0x%lx instead of 0\n", msg.lParam); } -} static const struct message WmMouseHoverSeq[] = { { WM_MOUSEACTIVATE, sent|optional }, /* we can get those when moving the mouse in focus-follow-mouse mode under X11 */

1 0

Alexandre Julliard : server: Don' t run low-level hooks in debugged processes.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 437a838470af2f1ba57c7cce16618d0bfc9fdf19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=437a838470af2f1ba57c7cce1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 5 11:12:57 2011 +0200 server: Don't run low-level hooks in debugged processes. --- server/hook.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/server/hook.c b/server/hook.c index c9df5d3..180ddf1 100644 --- a/server/hook.c +++ b/server/hook.c @@ -191,19 +191,6 @@ static inline struct hook *get_first_hook( struct hook_table *table, int index ) return elem ? HOOK_ENTRY( elem ) : NULL; } -/* check if a given hook should run in the current thread */ -static inline int run_hook_in_current_thread( struct hook *hook ) -{ - if ((!hook->process || hook->process == current->process) && - (!(hook->flags & WINEVENT_SKIPOWNPROCESS) || hook->process != current->process)) - { - if ((!hook->thread || hook->thread == current) && - (!(hook->flags & WINEVENT_SKIPOWNTHREAD) || hook->thread != current)) - return 1; - } - return 0; -} - /* check if a given hook should run in the owner thread instead of the current thread */ static inline int run_hook_in_owner_thread( struct hook *hook ) { @@ -213,6 +200,18 @@ static inline int run_hook_in_owner_thread( struct hook *hook ) return 0; } +/* check if a given hook should run in the current thread */ +static inline int run_hook_in_current_thread( struct hook *hook ) +{ + if (hook->process && hook->process != current->process) return 0; + if ((hook->flags & WINEVENT_SKIPOWNPROCESS) && hook->process == current->process) return 0; + if (hook->thread && hook->thread != current) return 0; + if ((hook->flags & WINEVENT_SKIPOWNTHREAD) && hook->thread == current) return 0; + /* don't run low-level hooks in debugged processes */ + if (run_hook_in_owner_thread( hook ) && hook->owner->process->debugger) return 0; + return 1; +} + /* find the first non-deleted hook in the chain */ static inline struct hook *get_first_valid_hook( struct hook_table *table, int index, int event, user_handle_t win,

1 0

Alexandre Julliard : server: Add a more general way of posting messages to the desktop window.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 85358b10f35e829ba42da8f46a40a8fd7eee6f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=85358b10f35e829ba42da8f46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 20:25:45 2011 +0200 server: Add a more general way of posting messages to the desktop window. --- server/user.h | 3 ++- server/window.c | 7 ++++--- server/winstation.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/user.h b/server/user.h index cc603cf..2a3f369 100644 --- a/server/user.h +++ b/server/user.h @@ -143,7 +143,8 @@ extern int rect_in_region( struct region *region, const rectangle_t *rect ); extern struct process *get_top_window_owner( struct desktop *desktop ); extern void get_top_window_rectangle( struct desktop *desktop, rectangle_t *rect ); -extern void close_desktop_window( struct desktop *desktop ); +extern void post_desktop_message( struct desktop *desktop, unsigned int message, + lparam_t wparam, lparam_t lparam ); extern void destroy_window( struct window *win ); extern void destroy_thread_windows( struct thread *thread ); extern int is_child_window( user_handle_t parent, user_handle_t child ); diff --git a/server/window.c b/server/window.c index 0fbce24..3465eba 100644 --- a/server/window.c +++ b/server/window.c @@ -402,11 +402,12 @@ void get_top_window_rectangle( struct desktop *desktop, rectangle_t *rect ) else *rect = win->window_rect; } -/* attempt to close the desktop window when the last process using it is gone */ -void close_desktop_window( struct desktop *desktop ) +/* post a message to the desktop window */ +void post_desktop_message( struct desktop *desktop, unsigned int message, + lparam_t wparam, lparam_t lparam ) { struct window *win = desktop->top_window; - if (win && win->thread) post_message( win->handle, WM_CLOSE, 0, 0 ); + if (win && win->thread) post_message( win->handle, message, wparam, lparam ); } /* create a new window structure (note: the window is not linked in the window tree) */ diff --git a/server/winstation.c b/server/winstation.c index 7b01919..20656aa 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -376,7 +376,7 @@ static void close_desktop_timeout( void *private ) desktop->close_timeout = NULL; unlink_named_object( &desktop->obj ); /* make sure no other process can open it */ - close_desktop_window( desktop ); /* and signal the owner to quit */ + post_desktop_message( desktop, WM_CLOSE, 0, 0 ); /* and signal the owner to quit */ } /* close the desktop of a given process */

1 0