November 2011 - Wine-commits

Hans Leidekker : winhttp: Implement WinHttpGetIEProxyConfigForCurrentUser.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: f6c46dd0743def8e015bc0390924ab1980206805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c46dd0743def8e015bc0390… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 16 09:42:17 2011 +0100 winhttp: Implement WinHttpGetIEProxyConfigForCurrentUser. --- dlls/winhttp/session.c | 109 ++++++++++++++++++++++++++++++++--------- dlls/winhttp/tests/winhttp.c | 26 ++++++++++ 2 files changed, 111 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index c187079..42ef85b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1234,15 +1234,18 @@ static const WCHAR Connections[] = { 'C','o','n','n','e','c','t','i','o','n','s',0 }; static const WCHAR WinHttpSettings[] = { 'W','i','n','H','t','t','p','S','e','t','t','i','n','g','s',0 }; -static const DWORD WINHTTPSETTINGS_MAGIC = 0x18; -static const DWORD WINHTTP_PROXY_TYPE_DIRECT = 1; -static const DWORD WINHTTP_PROXY_TYPE_PROXY = 2; - -struct winhttp_settings_header +static const DWORD WINHTTP_SETTINGS_MAGIC = 0x18; +static const DWORD WININET_SETTINGS_MAGIC = 0x46; +static const DWORD PROXY_TYPE_DIRECT = 1; +static const DWORD PROXY_TYPE_PROXY = 2; +static const DWORD PROXY_USE_PAC_SCRIPT = 4; +static const DWORD PROXY_AUTODETECT_SETTINGS = 8; + +struct connection_settings_header { DWORD magic; DWORD unknown; /* always zero? */ - DWORD flags; /* one of WINHTTP_PROXY_TYPE_* */ + DWORD flags; /* one or more of PROXY_* */ }; static inline void copy_char_to_wchar_sz(const BYTE *src, DWORD len, WCHAR *dst) @@ -1273,22 +1276,22 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) l = RegQueryValueExW( key, WinHttpSettings, NULL, &type, NULL, &size ); if (!l && type == REG_BINARY && - size >= sizeof(struct winhttp_settings_header) + 2 * sizeof(DWORD)) + size >= sizeof(struct connection_settings_header) + 2 * sizeof(DWORD)) { BYTE *buf = heap_alloc( size ); if (buf) { - struct winhttp_settings_header *hdr = - (struct winhttp_settings_header *)buf; + struct connection_settings_header *hdr = + (struct connection_settings_header *)buf; DWORD *len = (DWORD *)(hdr + 1); l = RegQueryValueExW( key, WinHttpSettings, NULL, NULL, buf, &size ); - if (!l && hdr->magic == WINHTTPSETTINGS_MAGIC && + if (!l && hdr->magic == WINHTTP_SETTINGS_MAGIC && hdr->unknown == 0) { - if (hdr->flags & WINHTTP_PROXY_TYPE_PROXY) + if (hdr->flags & PROXY_TYPE_PROXY) { BOOL sane = FALSE; LPWSTR proxy = NULL; @@ -1394,6 +1397,13 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) */ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *config ) { + static const WCHAR settingsW[] = + {'D','e','f','a','u','l','t','C','o','n','n','e','c','t','i','o','n','S','e','t','t','i','n','g','s',0}; + HKEY hkey = NULL; + struct connection_settings_header *hdr = NULL; + DWORD type, offset, len, size = 0; + BOOL ret = FALSE; + TRACE("%p\n", config); if (!config) @@ -1401,16 +1411,67 @@ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } + memset( config, 0, sizeof(*config) ); + config->fAutoDetect = TRUE; - /* FIXME: read from HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings */ + if (RegOpenKeyExW( HKEY_CURRENT_USER, Connections, 0, KEY_READ, &hkey ) || + RegQueryValueExW( hkey, settingsW, NULL, &type, NULL, &size ) || + type != REG_BINARY || size < sizeof(struct connection_settings_header)) + { + ret = TRUE; + goto done; + } + if (!(hdr = heap_alloc( size ))) goto done; + if (RegQueryValueExW( hkey, settingsW, NULL, &type, (BYTE *)hdr, &size ) || + hdr->magic != WININET_SETTINGS_MAGIC) + { + ret = TRUE; + goto done; + } - FIXME("returning no proxy used\n"); - config->fAutoDetect = FALSE; - config->lpszAutoConfigUrl = NULL; - config->lpszProxy = NULL; - config->lpszProxyBypass = NULL; + config->fAutoDetect = (hdr->flags & PROXY_AUTODETECT_SETTINGS) != 0; + offset = sizeof(*hdr); + if (offset + sizeof(DWORD) > size) goto done; + len = *(DWORD *)((char *)hdr + offset); + offset += sizeof(DWORD); + if (len && hdr->flags & PROXY_TYPE_PROXY) + { + if (!(config->lpszProxy = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) goto done; + copy_char_to_wchar_sz( (const BYTE *)hdr + offset , len, config->lpszProxy ); + } + offset += len; + if (offset + sizeof(DWORD) > size) goto done; + len = *(DWORD *)((char *)hdr + offset); + offset += sizeof(DWORD); + if (len && (hdr->flags & PROXY_TYPE_PROXY)) + { + if (!(config->lpszProxyBypass = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) goto done; + copy_char_to_wchar_sz( (const BYTE *)hdr + offset , len, config->lpszProxyBypass ); + } + offset += len; + if (offset + sizeof(DWORD) > size) goto done; + len = *(DWORD *)((char *)hdr + offset); + offset += sizeof(DWORD); + if (len && (hdr->flags & PROXY_USE_PAC_SCRIPT)) + { + if (!(config->lpszAutoConfigUrl = GlobalAlloc( 0, (len + 1) * sizeof(WCHAR) ))) goto done; + copy_char_to_wchar_sz( (const BYTE *)hdr + offset , len, config->lpszAutoConfigUrl ); + } + ret = TRUE; - return TRUE; +done: + RegCloseKey( hkey ); + heap_free( hdr ); + if (!ret) + { + heap_free( config->lpszAutoConfigUrl ); + config->lpszAutoConfigUrl = NULL; + heap_free( config->lpszProxy ); + config->lpszProxy = NULL; + heap_free( config->lpszProxyBypass ); + config->lpszProxyBypass = NULL; + } + return ret; } /*********************************************************************** @@ -1478,7 +1539,7 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) KEY_WRITE, NULL, &key, NULL ); if (!l) { - DWORD size = sizeof(struct winhttp_settings_header) + 2 * sizeof(DWORD); + DWORD size = sizeof(struct connection_settings_header) + 2 * sizeof(DWORD); BYTE *buf; if (info->dwAccessType == WINHTTP_ACCESS_TYPE_NAMED_PROXY) @@ -1490,17 +1551,17 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) buf = heap_alloc( size ); if (buf) { - struct winhttp_settings_header *hdr = - (struct winhttp_settings_header *)buf; + struct connection_settings_header *hdr = + (struct connection_settings_header *)buf; DWORD *len = (DWORD *)(hdr + 1); - hdr->magic = WINHTTPSETTINGS_MAGIC; + hdr->magic = WINHTTP_SETTINGS_MAGIC; hdr->unknown = 0; if (info->dwAccessType == WINHTTP_ACCESS_TYPE_NAMED_PROXY) { BYTE *dst; - hdr->flags = WINHTTP_PROXY_TYPE_PROXY; + hdr->flags = PROXY_TYPE_PROXY; *len++ = strlenW( info->lpszProxy ); for (dst = (BYTE *)len, src = info->lpszProxy; *src; src++, dst++) @@ -1518,7 +1579,7 @@ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } else { - hdr->flags = WINHTTP_PROXY_TYPE_DIRECT; + hdr->flags = PROXY_TYPE_DIRECT; *len++ = 0; *len++ = 0; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f481a82..5e4892c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2556,6 +2556,31 @@ static void test_WinHttpDetectAutoProxyConfigUrl(void) } } +static void test_WinHttpGetIEProxyConfigForCurrentUser(void) +{ + BOOL ret; + DWORD error; + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG cfg; + + memset( &cfg, 0, sizeof(cfg) ); + + SetLastError(0xdeadbeef); + ret = WinHttpGetIEProxyConfigForCurrentUser( NULL ); + error = GetLastError(); + ok( !ret, "expected failure\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + ret = WinHttpGetIEProxyConfigForCurrentUser( &cfg ); + ok( ret, "expected success\n" ); + trace("%d\n", cfg.fAutoDetect); + trace("%s\n", wine_dbgstr_w(cfg.lpszAutoConfigUrl)); + trace("%s\n", wine_dbgstr_w(cfg.lpszProxy)); + trace("%s\n", wine_dbgstr_w(cfg.lpszProxyBypass)); + GlobalFree( cfg.lpszAutoConfigUrl ); + GlobalFree( cfg.lpszProxy ); + GlobalFree( cfg.lpszProxyBypass ); +} + START_TEST (winhttp) { static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; @@ -2579,6 +2604,7 @@ START_TEST (winhttp) test_credentials(); test_IWinHttpRequest(); test_WinHttpDetectAutoProxyConfigUrl(); + test_WinHttpGetIEProxyConfigForCurrentUser(); si.event = CreateEvent(NULL, 0, 0, NULL); si.port = 7532;

1 0

Jacek Caban : urlmon: Get rid of create_todo_* from uri_equality struct.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 11835771501dee5d16ed1ccc77332deb25fb47eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=11835771501dee5d16ed1ccc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 16 12:51:04 2011 +0100 urlmon: Get rid of create_todo_* from uri_equality struct. --- dlls/urlmon/tests/uri.c | 173 ++++++++++++++++++++--------------------------- 1 files changed, 74 insertions(+), 99 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 327b9a2..478a5f0 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4418,91 +4418,89 @@ static const invalid_uri invalid_uri_tests[] = { typedef struct _uri_equality { const char* a; DWORD create_flags_a; - BOOL create_todo_a; const char* b; DWORD create_flags_b; - BOOL create_todo_b; BOOL equal; BOOL todo; } uri_equality; static const uri_equality equality_tests[] = { { - "HTTP://www.winehq.org/test dir/./",0,FALSE, - "http://www.winehq.org/test dir/../test dir/",0,FALSE, - TRUE, FALSE + "HTTP://www.winehq.org/test dir/./",0, + "http://www.winehq.org/test dir/../test dir/",0, + TRUE }, { /* http://www.winehq.org/test%20dir */ - "http://%77%77%77%2E%77%69%6E%65%68%71%2E%6F%72%67/%74%65%73%74%20%64%69%72",0,FALSE, - "http://www.winehq.org/test dir",0,FALSE, - TRUE, FALSE + "http://%77%77%77%2E%77%69%6E%65%68%71%2E%6F%72%67/%74%65%73%74%20%64%69%72",0, + "http://www.winehq.org/test dir",0, + TRUE }, { - "c:\\test.mp3",Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME,FALSE, - "file:///c:/test.mp3",0,FALSE, - TRUE, FALSE + "c:\\test.mp3",Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + "file:///c:/test.mp3",0, + TRUE }, { - "ftp://ftp.winehq.org/",0,FALSE, - "ftp://ftp.winehq.org",0,FALSE, - TRUE, FALSE + "ftp://ftp.winehq.org/",0, + "ftp://ftp.winehq.org",0, + TRUE }, { - "ftp://ftp.winehq.org/test/test2/../../testB/",0,FALSE, - "ftp://ftp.winehq.org/t%45stB/",0,FALSE, - FALSE, FALSE + "ftp://ftp.winehq.org/test/test2/../../testB/",0, + "ftp://ftp.winehq.org/t%45stB/",0, + FALSE }, { - "http://google.com/TEST",0,FALSE, - "http://google.com/test",0,FALSE, - FALSE, FALSE + "http://google.com/TEST",0, + "http://google.com/test",0, + FALSE }, { - "http://GOOGLE.com/",0,FALSE, - "http://google.com/",0,FALSE, - TRUE, FALSE + "http://GOOGLE.com/",0, + "http://google.com/",0, + TRUE }, /* Performs case insensitive compare of host names (for known scheme types). */ { - "ftp://GOOGLE.com/",Uri_CREATE_NO_CANONICALIZE,FALSE, - "ftp://google.com/",0,FALSE, - TRUE, FALSE + "ftp://GOOGLE.com/",Uri_CREATE_NO_CANONICALIZE, + "ftp://google.com/",0, + TRUE }, { - "zip://GOOGLE.com/",0,FALSE, - "zip://google.com/",0,FALSE, - FALSE, FALSE + "zip://GOOGLE.com/",0, + "zip://google.com/",0, + FALSE }, { - "file:///c:/TEST/TeST/",0,FALSE, - "file:///c:/test/test/",0,FALSE, - TRUE, FALSE + "file:///c:/TEST/TeST/",0, + "file:///c:/test/test/",0, + TRUE }, { - "file:///server/TEST",0,FALSE, - "file:///SERVER/TEST",0,FALSE, - TRUE, FALSE + "file:///server/TEST",0, + "file:///SERVER/TEST",0, + TRUE }, { - "http://google.com",Uri_CREATE_NO_CANONICALIZE,FALSE, - "http://google.com/",0,FALSE, - TRUE, FALSE + "http://google.com",Uri_CREATE_NO_CANONICALIZE, + "http://google.com/",0, + TRUE }, { - "ftp://google.com:21/",0,FALSE, - "ftp://google.com/",0,FALSE, - TRUE, FALSE + "ftp://google.com:21/",0, + "ftp://google.com/",0, + TRUE }, { - "http://google.com:80/",Uri_CREATE_NO_CANONICALIZE,FALSE, - "http://google.com/",0,FALSE, - TRUE, FALSE + "http://google.com:80/",Uri_CREATE_NO_CANONICALIZE, + "http://google.com/",0, + TRUE }, { - "http://google.com:70/",0,FALSE, - "http://google.com:71/",0,FALSE, - FALSE, FALSE + "http://google.com:70/",0, + "http://google.com:71/",0, + FALSE } }; @@ -7625,27 +7623,28 @@ static void test_IUri_HasProperty(void) { static void test_IUri_IsEqual(void) { IUri *uriA, *uriB; - HRESULT hrA, hrB; + BOOL equal; + HRESULT hres; DWORD i; uriA = uriB = NULL; /* Make sure IsEqual handles invalid args correctly. */ - hrA = pCreateUri(http_urlW, 0, 0, &uriA); - hrB = pCreateUri(http_urlW, 0, 0, &uriB); - ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hrA, S_OK); - ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hrB, S_OK); - if(SUCCEEDED(hrA) && SUCCEEDED(hrB)) { - BOOL equal = -1; - hrA = IUri_IsEqual(uriA, NULL, &equal); - ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hrA, S_OK); - ok(equal == FALSE, "Error: Expected equal to be FALSE, but was %d instead.\n", equal); - - hrA = IUri_IsEqual(uriA, uriB, NULL); - ok(hrA == E_POINTER, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hrA, E_POINTER); - } - if(uriA) IUri_Release(uriA); - if(uriB) IUri_Release(uriB); + hres = pCreateUri(http_urlW, 0, 0, &uriA); + ok(hres == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hres, S_OK); + hres = pCreateUri(http_urlW, 0, 0, &uriB); + ok(hres == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hres, S_OK); + + equal = -1; + hres = IUri_IsEqual(uriA, NULL, &equal); + ok(hres == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hres, S_OK); + ok(!equal, "Error: Expected equal to be FALSE, but was %d instead.\n", equal); + + hres = IUri_IsEqual(uriA, uriB, NULL); + ok(hres == E_POINTER, "Error: IsEqual returned 0x%08x, expected 0x%08x.\n", hres, E_POINTER); + + IUri_Release(uriA); + IUri_Release(uriB); for(i = 0; i < sizeof(equality_tests)/sizeof(equality_tests[0]); ++i) { uri_equality test = equality_tests[i]; @@ -7656,44 +7655,20 @@ static void test_IUri_IsEqual(void) { uriA_W = a2w(test.a); uriB_W = a2w(test.b); - hrA = pCreateUri(uriA_W, test.create_flags_a, 0, &uriA); - if(test.create_todo_a) { - todo_wine { - ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].a\n", - hrA, S_OK, i); - } - } else { - ok(hrA == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].a\n", - hrA, S_OK, i); - } - - hrB = pCreateUri(uriB_W, test.create_flags_b, 0, &uriB); - if(test.create_todo_b) { - todo_wine { - ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].b\n", - hrB, S_OK, i); - } - } else { - ok(hrB == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].b\n", - hrB, S_OK, i); - } + hres = pCreateUri(uriA_W, test.create_flags_a, 0, &uriA); + ok(hres == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].a\n", hres, S_OK, i); - if(SUCCEEDED(hrA) && SUCCEEDED(hrB)) { - BOOL equal = -1; + hres = pCreateUri(uriB_W, test.create_flags_b, 0, &uriB); + ok(hres == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x on equality_tests[%d].b\n", hres, S_OK, i); - hrA = IUri_IsEqual(uriA, uriB, &equal); - if(test.todo) { - todo_wine { - ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", - hrA, S_OK, i); - } - todo_wine { - ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); - } - } else { - ok(hrA == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", hrA, S_OK, i); - ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); - } + equal = -1; + hres = IUri_IsEqual(uriA, uriB, &equal); + if(test.todo) todo_wine { + ok(hres == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", hres, S_OK, i); + ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); + } else { + ok(hres == S_OK, "Error: IsEqual returned 0x%08x, expected 0x%08x on equality_tests[%d].\n", hres, S_OK, i); + ok(equal == test.equal, "Error: Expected the comparison to be %d on equality_tests[%d].\n", test.equal, i); } if(uriA) IUri_Release(uriA); if(uriB) IUri_Release(uriB);

1 0

Alexandre Julliard : comctl32: Add a couple of DIB helper functions for imagelists.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 4c785235d024883e9c97cef060a0ed808665306f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c785235d024883e9c97cef06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 22:10:45 2011 +0100 comctl32: Add a couple of DIB helper functions for imagelists. --- dlls/comctl32/imagelist.c | 119 ++++++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 55 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index accbf58..9d2b6f9 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -114,6 +114,17 @@ static inline void imagelist_get_bitmap_size( HIMAGELIST himl, UINT count, SIZE sz->cy = imagelist_height( count ) * himl->cy; } +static inline int get_dib_stride( int width, int bpp ) +{ + return ((width * bpp + 31) >> 3) & ~3; +} + +static inline int get_dib_image_size( const BITMAPINFO *info ) +{ + return get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ) + * abs( info->bmiHeader.biHeight ); +} + /* * imagelist_copy_images() * @@ -139,6 +150,56 @@ static inline void imagelist_copy_images( HIMAGELIST himl, HDC hdcSrc, HDC hdcDe } } +static void add_dib_bits( HIMAGELIST himl, int pos, int count, int width, int height, + BITMAPINFO *info, BITMAPINFO *mask_info, DWORD *bits, BYTE *mask_bits ) +{ + int i, j, n; + POINT pt; + int stride = info->bmiHeader.biWidth; + int mask_stride = (info->bmiHeader.biWidth + 31) / 32 * 4; + + for (n = 0; n < count; n++) + { + int has_alpha = 0; + + imagelist_point_from_index( himl, pos + n, &pt ); + + /* check if bitmap has an alpha channel */ + for (i = 0; i < height && !has_alpha; i++) + for (j = n * width; j < (n + 1) * width; j++) + if ((has_alpha = ((bits[i * stride + j] & 0xff000000) != 0))) break; + + if (!has_alpha) /* generate alpha channel from the mask */ + { + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + if (!mask_info || !((mask_bits[i * mask_stride + j / 8] << (j % 8)) & 0x80)) + bits[i * stride + j] |= 0xff000000; + else + bits[i * stride + j] = 0; + } + else + { + himl->has_alpha[pos + n] = 1; + + if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ + { + for (i = 0; i < height; i++) + for (j = n * width; j < (n + 1) * width; j++) + if ((bits[i * stride + j] >> 24) > 25) /* more than 10% alpha */ + mask_bits[i * mask_stride + j / 8] &= ~(0x80 >> (j % 8)); + else + mask_bits[i * mask_stride + j / 8] |= 0x80 >> (j % 8); + } + } + StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, + n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); + if (mask_info) + StretchDIBits( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, + n * width, 0, width, height, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY ); + } +} + /* add images with an alpha channel when the image list is 32 bpp */ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, int width, int height, HBITMAP hbmImage, HBITMAP hbmMask ) @@ -148,8 +209,6 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, BITMAPINFO *info, *mask_info = NULL; DWORD *bits = NULL; BYTE *mask_bits = NULL; - int i, j, n; - POINT pt; DWORD mask_width; if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE; @@ -188,46 +247,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; } - for (n = 0; n < count; n++) - { - int has_alpha = 0; - - imagelist_point_from_index( himl, pos + n, &pt ); - - /* check if bitmap has an alpha channel */ - for (i = 0; i < height && !has_alpha; i++) - for (j = n * width; j < (n + 1) * width; j++) - if ((has_alpha = ((bits[i * bm.bmWidth + j] & 0xff000000) != 0))) break; - - if (!has_alpha) /* generate alpha channel from the mask */ - { - for (i = 0; i < height; i++) - for (j = n * width; j < (n + 1) * width; j++) - if (!mask_bits || !((mask_bits[i * mask_width + j / 8] << (j % 8)) & 0x80)) - bits[i * bm.bmWidth + j] |= 0xff000000; - else - bits[i * bm.bmWidth + j] = 0; - } - else - { - himl->has_alpha[pos + n] = 1; - - if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ - { - for (i = 0; i < height; i++) - for (j = n * width; j < (n + 1) * width; j++) - if ((bits[i * bm.bmWidth + j] >> 24) > 25) /* more than 10% alpha */ - mask_bits[i * mask_width + j / 8] &= ~(0x80 >> (j % 8)); - else - mask_bits[i * mask_width + j / 8] |= 0x80 >> (j % 8); - } - } - StretchDIBits( himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, - n * width, 0, width, height, bits, info, DIB_RGB_COLORS, SRCCOPY ); - if (mask_info) - StretchDIBits( himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, - n * width, 0, width, height, mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY ); - } + add_dib_bits( himl, pos, count, width, height, info, mask_info, bits, mask_bits ); ret = TRUE; done: @@ -2069,17 +2089,6 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, } -/*********************************************************************** - * DIB_GetDIBImageBytes - * - * Return the number of bytes used to hold the image in a DIB bitmap. - */ -static int DIB_GetDIBImageBytes( int width, int height, int depth ) -{ - return (((width * depth + 31) / 8) & ~3) * abs( height ); -} - - /* helper for ImageList_Read, see comments below */ static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) { @@ -2112,7 +2121,7 @@ static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) else palspace = 0; - bmi->bmiHeader.biSizeImage = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, bitsperpixel); + bmi->bmiHeader.biSizeImage = get_dib_image_size( bmi ); /* read the palette right after the end of the bitmapinfoheader */ if (palspace && FAILED(IStream_Read(pstm, bmi->bmiColors, palspace, NULL))) @@ -2902,7 +2911,7 @@ _write_bitmap(HBITMAP hBitmap, LPSTREAM pstm) return FALSE; bitCount = bm.bmBitsPixel == 1 ? 1 : 24; - sizeImage = DIB_GetDIBImageBytes(bm.bmWidth, bm.bmHeight, bitCount); + sizeImage = get_dib_stride(bm.bmWidth, bitCount) * bm.bmHeight; totalSize = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER); if(bitCount != 24)

1 0

Alexandre Julliard : comctl32: Setup the alpha channel also when reading an imagelist from a stream.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 73b9dc98eb9ab371f92d8c0a054c71f3d9b194ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b9dc98eb9ab371f92d8c0a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 22:11:15 2011 +0100 comctl32: Setup the alpha channel also when reading an imagelist from a stream. --- dlls/comctl32/imagelist.c | 83 +++++++++++++++++++++++++++++++------------- 1 files changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 9d2b6f9..c32cb0b 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2090,26 +2090,23 @@ ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2, /* helper for ImageList_Read, see comments below */ -static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) +static void *read_bitmap(LPSTREAM pstm, BITMAPINFO *bmi) { BITMAPFILEHEADER bmfh; int bitsperpixel, palspace; - char bmi_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; - LPBITMAPINFO bmi = (LPBITMAPINFO)bmi_buf; - int result = FALSE; - LPBYTE bits = NULL; + void *bits; if (FAILED(IStream_Read ( pstm, &bmfh, sizeof(bmfh), NULL))) - return FALSE; + return NULL; if (bmfh.bfType != (('M'<<8)|'B')) - return FALSE; + return NULL; if (FAILED(IStream_Read ( pstm, &bmi->bmiHeader, sizeof(bmi->bmiHeader), NULL))) - return FALSE; + return NULL; if ((bmi->bmiHeader.biSize != sizeof(bmi->bmiHeader))) - return FALSE; + return NULL; TRACE("width %u, height %u, planes %u, bpp %u\n", bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, @@ -2125,23 +2122,17 @@ static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) /* read the palette right after the end of the bitmapinfoheader */ if (palspace && FAILED(IStream_Read(pstm, bmi->bmiColors, palspace, NULL))) - goto error; + return NULL; bits = Alloc(bmi->bmiHeader.biSizeImage); - if (!bits) - goto error; - if (FAILED(IStream_Read(pstm, bits, bmi->bmiHeader.biSizeImage, NULL))) - goto error; - - if (!StretchDIBits(hdcIml, 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, - 0, 0, bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, - bits, bmi, DIB_RGB_COLORS, SRCCOPY)) - goto error; - result = TRUE; + if (!bits) return NULL; -error: - Free(bits); - return result; + if (FAILED(IStream_Read(pstm, bits, bmi->bmiHeader.biSizeImage, NULL))) + { + Free(bits); + return NULL; + } + return bits; } /************************************************************************* @@ -2177,6 +2168,11 @@ error: */ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) { + char image_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; + char mask_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; + BITMAPINFO *image_info = (BITMAPINFO *)image_buf; + BITMAPINFO *mask_info = (BITMAPINFO *)mask_buf; + void *image_bits, *mask_bits = NULL; ILHEAD ilHead; HIMAGELIST himl; int i; @@ -2197,19 +2193,56 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) if (!himl) return NULL; - if (!_read_bitmap(himl->hdcImage, pstm)) + if (!(image_bits = read_bitmap(pstm, image_info))) { WARN("failed to read bitmap from stream\n"); return NULL; } if (ilHead.flags & ILC_MASK) { - if (!_read_bitmap(himl->hdcMask, pstm)) + if (!(mask_bits = read_bitmap(pstm, mask_info))) { WARN("failed to read mask bitmap from stream\n"); return NULL; } } + else mask_info = NULL; + + if (himl->has_alpha && image_info->bmiHeader.biBitCount == 32) + { + DWORD *ptr = image_bits; + BYTE *mask_ptr = mask_bits; + int stride = himl->cy * image_info->bmiHeader.biWidth; + + if (image_info->bmiHeader.biHeight > 0) /* bottom-up */ + { + ptr += (imagelist_height( ilHead.cCurImage ) - 1) * stride; + mask_ptr += (imagelist_height( ilHead.cCurImage ) - 1) * stride / 8; + stride = -stride; + image_info->bmiHeader.biHeight = himl->cy; + } + else image_info->bmiHeader.biHeight = -himl->cy; + + for (i = 0; i < ilHead.cCurImage; i += TILE_COUNT) + { + add_dib_bits( himl, i, min( ilHead.cCurImage - i, TILE_COUNT ), + himl->cx, himl->cy, image_info, mask_info, ptr, mask_ptr ); + ptr += stride; + mask_ptr += stride / 8; + } + } + else + { + StretchDIBits( himl->hdcImage, 0, 0, image_info->bmiHeader.biWidth, image_info->bmiHeader.biHeight, + 0, 0, image_info->bmiHeader.biWidth, image_info->bmiHeader.biHeight, + image_bits, image_info, DIB_RGB_COLORS, SRCCOPY); + if (mask_info) + StretchDIBits( himl->hdcMask, 0, 0, mask_info->bmiHeader.biWidth, mask_info->bmiHeader.biHeight, + 0, 0, mask_info->bmiHeader.biWidth, mask_info->bmiHeader.biHeight, + mask_bits, mask_info, DIB_RGB_COLORS, SRCCOPY); + } + Free( image_bits ); + Free( mask_bits ); himl->cCurImage = ilHead.cCurImage; himl->cMaxImage = ilHead.cMaxImage;

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskDisableAll().
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 88a55a04a3cd149f6fa3e4402c236c590c4c1836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a55a04a3cd149f6fa3e4402… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 15 21:18:24 2011 +0100 d3d10: Implement D3D10StateBlockMaskDisableAll(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 12 ++++++++++++ dlls/d3d10/tests/device.c | 8 ++++++++ include/d3d10effect.h | 1 + 4 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index baa0c10..1a09f4a 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -20,7 +20,7 @@ @ stdcall D3D10ReflectShader(ptr long ptr) @ stub D3D10RegisterLayers @ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) -@ stub D3D10StateBlockMaskDisableAll +@ stdcall D3D10StateBlockMaskDisableAll(ptr) @ stub D3D10StateBlockMaskDisableCapture @ stub D3D10StateBlockMaskEnableAll @ stub D3D10StateBlockMaskEnableCapture diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index f121a5c..76a27f9 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -166,3 +166,15 @@ HRESULT WINAPI D3D10StateBlockMaskDifference(D3D10_STATE_BLOCK_MASK *mask_x, return S_OK; } + +HRESULT WINAPI D3D10StateBlockMaskDisableAll(D3D10_STATE_BLOCK_MASK *mask) +{ + TRACE("mask %p.\n", mask); + + if (!mask) + return E_INVALIDARG; + + memset(mask, 0, sizeof(*mask)); + + return S_OK; +} diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 1fc3a3b..2197002 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -88,6 +88,14 @@ static void test_stateblock_mask(void) ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); hr = D3D10StateBlockMaskDifference(&mask_x, &mask_y, NULL); ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + + memset(&result, 0xff, sizeof(result)); + hr = D3D10StateBlockMaskDisableAll(&result); + ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableAll failed, hr %#x.\n", hr); + ok(!result.VS, "Got unexpected result.VS %#x.\n", result.VS); + ok(!result.Predication, "Got unexpected result.Predication %#x.\n", result.Predication); + hr = D3D10StateBlockMaskDisableAll(NULL); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); } START_TEST(device) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index d36c3da..e293d3b 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -806,6 +806,7 @@ HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, HRESULT WINAPI D3D10StateBlockMaskDifference(D3D10_STATE_BLOCK_MASK *mask_x, D3D10_STATE_BLOCK_MASK *mask_y, D3D10_STATE_BLOCK_MASK *result); +HRESULT WINAPI D3D10StateBlockMaskDisableAll(D3D10_STATE_BLOCK_MASK *mask); #ifdef __cplusplus }

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskDisableCapture().
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 5ffa2aba23fc67160c81e2f51fc276d072d303a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffa2aba23fc67160c81e2f51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 20:45:25 2011 +0100 d3d10: Implement D3D10StateBlockMaskDisableCapture(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/stateblock.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d10/tests/device.c | 50 +++++++++++++++++++++ dlls/d3d10/utils.c | 34 ++++++++++++++ include/d3d10effect.h | 30 ++++++++++++ 6 files changed, 222 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ffa2aba23fc67160c81e…

1 0

Henri Verbeet : d3d10: Implement D3D10StateBlockMaskEnableAll().
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: be7122034fa1d9a0e58fce9f468ec97b14f28c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7122034fa1d9a0e58fce9f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 15 21:18:26 2011 +0100 d3d10: Implement D3D10StateBlockMaskEnableAll(). --- dlls/d3d10/d3d10.spec | 2 +- dlls/d3d10/stateblock.c | 12 ++++++++++++ dlls/d3d10/tests/device.c | 8 ++++++++ include/d3d10effect.h | 1 + 4 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 49733de..865ded5 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -22,7 +22,7 @@ @ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) @ stdcall D3D10StateBlockMaskDisableAll(ptr) @ stdcall D3D10StateBlockMaskDisableCapture(ptr long long long) -@ stub D3D10StateBlockMaskEnableAll +@ stdcall D3D10StateBlockMaskEnableAll(ptr) @ stub D3D10StateBlockMaskEnableCapture @ stub D3D10StateBlockMaskGetSetting @ stub D3D10StateBlockMaskIntersect diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index bf3d64c..7fd2aa2 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -284,3 +284,15 @@ HRESULT WINAPI D3D10StateBlockMaskDisableCapture(D3D10_STATE_BLOCK_MASK *mask, return E_INVALIDARG; } } + +HRESULT WINAPI D3D10StateBlockMaskEnableAll(D3D10_STATE_BLOCK_MASK *mask) +{ + TRACE("mask %p.\n", mask); + + if (!mask) + return E_INVALIDARG; + + memset(mask, 0xff, sizeof(*mask)); + + return S_OK; +} diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index c29f65b..894fd1d 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -123,6 +123,14 @@ static void test_stateblock_mask(void) hr = D3D10StateBlockMaskDisableAll(NULL); ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + memset(&result, 0, sizeof(result)); + hr = D3D10StateBlockMaskEnableAll(&result); + ok(SUCCEEDED(hr), "D3D10StateBlockMaskEnableAll failed, hr %#x.\n", hr); + ok(result.VS == 0xff, "Got unexpected result.VS %#x.\n", result.VS); + ok(result.Predication == 0xff, "Got unexpected result.Predication %#x.\n", result.Predication); + hr = D3D10StateBlockMaskEnableAll(NULL); + ok(hr == E_INVALIDARG, "Got unexpect hr %#x.\n", hr); + result.VS = 0xff; hr = D3D10StateBlockMaskDisableCapture(&result, D3D10_DST_VS, 0, 1); ok(SUCCEEDED(hr), "D3D10StateBlockMaskDisableCapture failed, hr %#x.\n", hr); diff --git a/include/d3d10effect.h b/include/d3d10effect.h index b195dff..697d1c4 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -837,6 +837,7 @@ HRESULT WINAPI D3D10StateBlockMaskDifference(D3D10_STATE_BLOCK_MASK *mask_x, HRESULT WINAPI D3D10StateBlockMaskDisableAll(D3D10_STATE_BLOCK_MASK *mask); HRESULT WINAPI D3D10StateBlockMaskDisableCapture(D3D10_STATE_BLOCK_MASK *mask, D3D10_DEVICE_STATE_TYPES state_type, UINT start_idx, UINT count); +HRESULT WINAPI D3D10StateBlockMaskEnableAll(D3D10_STATE_BLOCK_MASK *mask); #ifdef __cplusplus }

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DCOLORVALUE typedef.
by Alexandre Julliard 16 Nov '11

16 Nov '11

Module: wine Branch: master Commit: 7459180a51135fb4194a8524f7c70f2e513e5485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7459180a51135fb4194a8524f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 15 21:18:27 2011 +0100 wined3d: Get rid of the WINED3DCOLORVALUE typedef. --- dlls/d3d10core/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 9 +++++---- include/wine/wined3d.h | 22 +++++++++++----------- 8 files changed, 30 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7459180a51135fb4194a8…

1 0

Jacek Caban : mshtml: Fixed script tests on IE9.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: e7bbb4ef1e95396b72a58f813b4346d9abccb699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bbb4ef1e95396b72a58f813… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 15 19:58:27 2011 +0100 mshtml: Fixed script tests on IE9. --- dlls/mshtml/tests/script.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 5cac14a..d1a4d4a 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2115,7 +2115,6 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { - ok(!punkContext, "punkContext = %p\n", punkContext); ok(pvarResult != NULL, "pvarResult == NULL\n"); ok(pexcepinfo != NULL, "pexcepinfo == NULL\n"); @@ -2185,7 +2184,7 @@ static HRESULT WINAPI ActiveScript_QueryInterface(IActiveScript *iface, REFIID r if(IsEqualGUID(&IID_IActiveScriptDebug, riid)) return E_NOINTERFACE; - ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + trace("QI(%s)\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Piotr Caban : msvcp90: Don't define empty structure.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 9b60ef7e12ceef342a4da99705f956f4f5fd4b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b60ef7e12ceef342a4da9970… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 15 14:33:00 2011 +0100 msvcp90: Don't define empty structure. --- dlls/msvcp90/string.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 2dd9f52..6460f02 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -49,6 +49,7 @@ typedef struct { /* allocator class */ typedef struct { + char empty_struct; } allocator; /* char_traits<char> */ @@ -652,7 +653,7 @@ MSVCP_size_t __cdecl MSVCP_basic_string_char_Pdif(String_iterator_char i1, Strin DEFINE_THISCALL_WRAPPER_RETPTR(basic_string_char_get_allocator, 4) allocator __thiscall basic_string_char_get_allocator(const basic_string_char *this) { - allocator ret; + allocator ret = {0}; TRACE("%p\n", this); return ret; } @@ -2316,7 +2317,7 @@ MSVCP_size_t __cdecl MSVCP_basic_string_wchar_Pdif(String_iterator_wchar i1, Str DEFINE_THISCALL_WRAPPER(basic_string_wchar_get_allocator, 4) allocator __thiscall basic_string_wchar_get_allocator(const basic_string_wchar *this) { - allocator ret; + allocator ret = {0}; TRACE("%p\n", this); return ret; }

1 0