wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Francois Gouget : odbccp32: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 8110b3cb09c395ac49777a3e590ac503537e7440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8110b3cb09c395ac49777a3e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:06:34 2015 +0100 odbccp32: Remove an uneeded NONAMELESSUNION directive. --- dlls/odbccp32/odbccp32.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index fb4ea2c..0483f1e 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -24,7 +24,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : devenum: Mark internal symbols with hidden visibility.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 8c3170d7f47c4a5e8f7161c827b5f545e445de0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3170d7f47c4a5e8f7161c82… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 18:59:09 2015 +0100 devenum: Mark internal symbols with hidden visibility. --- dlls/devenum/devenum_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 4f14423..347aebb 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -82,8 +82,8 @@ HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR /********************************************************************** * Global string constant declarations */ -extern const WCHAR clsid_keyname[6]; -extern const WCHAR wszInstanceKeyName[]; +extern const WCHAR clsid_keyname[6] DECLSPEC_HIDDEN; +extern const WCHAR wszInstanceKeyName[] DECLSPEC_HIDDEN; #define CLSID_STR_LEN (sizeof(clsid_keyname) / sizeof(WCHAR)) /**********************************************************************

1 0

Francois Gouget : d3dx9_36: Make d3dx_decltype_size[] static.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 3266ff8ab2dcdb81d29a758b85a98895297dca2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3266ff8ab2dcdb81d29a758b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 18:58:56 2015 +0100 d3dx9_36: Make d3dx_decltype_size[] static. --- dlls/d3dx9_36/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6f268f2..b1a1a76 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -69,7 +69,7 @@ struct d3dx9_mesh D3DXATTRIBUTERANGE *attrib_table; }; -const UINT d3dx_decltype_size[] = +static const UINT d3dx_decltype_size[] = { /* D3DDECLTYPE_FLOAT1 */ sizeof(FLOAT), /* D3DDECLTYPE_FLOAT2 */ sizeof(D3DXVECTOR2),

1 0

Francois Gouget : d3drm: Mark internal symbols with hidden visibility.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: f289bab06a144f13a00f06a48372ec20f21a2619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f289bab06a144f13a00f06a48… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 18:58:17 2015 +0100 d3drm: Mark internal symbols with hidden visibility. --- dlls/d3drm/d3drm_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 3daf96a..80da952 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -44,6 +44,6 @@ struct d3drm_file_header DWORD flags; }; -extern char templates[]; +extern char templates[] DECLSPEC_HIDDEN; #endif /* __D3DRM_PRIVATE_INCLUDED__ */

1 0

Francois Gouget : ws2_32: Add support for WSA_FLAG_NO_HANDLE_INHERIT.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: ae6e1e2e38a50c6c7b14cb1febd421ba744197e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6e1e2e38a50c6c7b14cb1fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 17:45:40 2015 +0100 ws2_32: Add support for WSA_FLAG_NO_HANDLE_INHERIT. --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 960556d..e7e3de5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6386,8 +6386,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, req->type = unixtype; req->protocol = protocol; req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; - req->attributes = OBJ_INHERIT; - req->flags = dwFlags; + req->attributes = (dwFlags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT; + req->flags = dwFlags & ~WSA_FLAG_NO_HANDLE_INHERIT; set_error( wine_server_call( req ) ); ret = HANDLE2SOCKET( wine_server_ptr_handle( reply->handle )); }

1 0

Francois Gouget : ws2_32: Add more WSA_FLAG_XXX values.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 7bf46e46c518642d5219d9eabbb6b43ca21a4695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf46e46c518642d5219d9eab… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 17:45:36 2015 +0100 ws2_32: Add more WSA_FLAG_XXX values. --- include/winsock2.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index 04f3aea..fa3d26b 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -184,11 +184,14 @@ extern "C" { #endif /* USE_WS_PREFIX */ /* Constants for WSAIoctl() */ -#define WSA_FLAG_OVERLAPPED 0x01 -#define WSA_FLAG_MULTIPOINT_C_ROOT 0x02 -#define WSA_FLAG_MULTIPOINT_C_LEAF 0x04 -#define WSA_FLAG_MULTIPOINT_D_ROOT 0x08 -#define WSA_FLAG_MULTIPOINT_D_LEAF 0x10 +#define WSA_FLAG_OVERLAPPED 0x0001 +#define WSA_FLAG_MULTIPOINT_C_ROOT 0x0002 +#define WSA_FLAG_MULTIPOINT_C_LEAF 0x0004 +#define WSA_FLAG_MULTIPOINT_D_ROOT 0x0008 +#define WSA_FLAG_MULTIPOINT_D_LEAF 0x0010 +#define WSA_FLAG_ACCESS_SYSTEM_SECURITY 0x0040 +#define WSA_FLAG_NO_HANDLE_INHERIT 0x0080 +#define WSA_FLAG_REGISTERED_IO 0x0100 /* Constants for WSAJoinLeaf() */ #define JL_SENDER_ONLY 0x01

1 0

Francois Gouget : winemenubuilder: Handle icons disguised as executables and better validate icon streams.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: 520dcb4c23d7aad280ddaee8254cd847c5baf038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520dcb4c23d7aad280ddaee82… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 17:44:43 2015 +0100 winemenubuilder: Handle icons disguised as executables and better validate icon streams. For some applications the shortcut's icon points to a .exe file which in fact contains a .ico file. This means open_icon() cannot rely on the file extension. Also reject icon streams that don't actually contain a valid icon and use the next source as a fallback. --- programs/winemenubuilder/winemenubuilder.c | 84 ++++++++++++++++++------------ 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 2bdbdbf..4a5639b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -103,7 +103,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder); (csidl)==CSIDL_COMMON_DESKTOPDIRECTORY) #define in_startmenu(csidl) ((csidl)==CSIDL_STARTMENU || \ (csidl)==CSIDL_COMMON_STARTMENU) - + /* link file formats */ #include "pshpack1.h" @@ -964,20 +964,32 @@ end: return hr; } -static HRESULT write_native_icon(IStream *iconStream, const char *icon_name, LPCWSTR szFileName) +static HRESULT validate_ico(IStream **ppStream, ICONDIRENTRY **ppIconDirEntries, int *numEntries) +{ + HRESULT hr; + + hr = read_ico_direntries(*ppStream, ppIconDirEntries, numEntries); + if (SUCCEEDED(hr)) + { + if (*numEntries) + return hr; + HeapFree(GetProcessHeap(), 0, *ppIconDirEntries); + *ppIconDirEntries = NULL; + } + IStream_Release(*ppStream); + *ppStream = NULL; + return E_FAIL; +} + +static HRESULT write_native_icon(IStream *iconStream, ICONDIRENTRY *pIconDirEntry, + int numEntries, const char *icon_name, LPCWSTR szFileName) { - ICONDIRENTRY *pIconDirEntry = NULL; - int numEntries; int nMax = 0, nMaxBits = 0; int nIndex = 0; int i; LARGE_INTEGER position; HRESULT hr; - hr = read_ico_direntries(iconStream, &pIconDirEntry, &numEntries); - if (FAILED(hr)) - goto end; - for (i = 0; i < numEntries; i++) { WINE_TRACE("[%d]: %d x %d @ %d\n", i, pIconDirEntry[i].bWidth, pIconDirEntry[i].bHeight, pIconDirEntry[i].wBitCount); @@ -1069,7 +1081,7 @@ static HRESULT open_default_icon(IStream **ppStream) return open_module_icon(user32W, -(INT_PTR)IDI_WINLOGO, ppStream); } -static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream) +static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream, ICONDIRENTRY **ppIconDirEntries, int *numEntries) { HRESULT hr; @@ -1084,16 +1096,25 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt } else { - static const WCHAR dot_icoW[] = {'.','i','c','o',0}; - int len = strlenW(filename); - if (len >= 4 && strcmpiW(&filename[len - 4], dot_icoW) == 0) - hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); + /* This might be a raw .ico file */ + hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); } } + if (SUCCEEDED(hr)) + hr = validate_ico(ppStream, ppIconDirEntries, numEntries); + if (FAILED(hr)) + { hr = open_file_type_icon(filename, ppStream); + if (SUCCEEDED(hr)) + hr = validate_ico(ppStream, ppIconDirEntries, numEntries); + } if (FAILED(hr) && !bWait) + { hr = open_default_icon(ppStream); + if (SUCCEEDED(hr)) + hr = validate_ico(ppStream, ppIconDirEntries, numEntries); + } return hr; } @@ -1147,11 +1168,10 @@ static inline int size_to_slot(int size) #define CLASSIC_SLOT 3 -static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR icoPathW, +static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *pIconDirEntry, + int numEntries, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) { - ICONDIRENTRY *iconDirEntries = NULL; - int numEntries; struct { int index; int maxBits; @@ -1164,9 +1184,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico LARGE_INTEGER zero; HRESULT hr; - hr = read_ico_direntries(icoStream, &iconDirEntries, &numEntries); - if (FAILED(hr)) - goto end; for (i = 0; i < ICNS_SLOTS; i++) { best[i].index = -1; @@ -1254,7 +1271,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico } end: - HeapFree(GetProcessHeap(), 0, iconDirEntries); HeapFree(GetProcessHeap(), 0, icnsPath); return hr; } @@ -1279,20 +1295,15 @@ static void refresh_icon_cache(const char *iconsDir) } } -static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR icoPathW, +static HRESULT platform_write_icon(IStream *icoStream, ICONDIRENTRY *iconDirEntries, + int numEntries, int exeIndex, LPCWSTR icoPathW, const char *destFilename, char **nativeIdentifier) { - ICONDIRENTRY *iconDirEntries = NULL; - int numEntries; int i; char *iconsDir = NULL; HRESULT hr = S_OK; LARGE_INTEGER zero; - hr = read_ico_direntries(icoStream, &iconDirEntries, &numEntries); - if (FAILED(hr)) - goto end; - if (destFilename) *nativeIdentifier = heap_printf("%s", destFilename); else @@ -1372,7 +1383,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico refresh_icon_cache(iconsDir); end: - HeapFree(GetProcessHeap(), 0, iconDirEntries); HeapFree(GetProcessHeap(), 0, iconsDir); return hr; } @@ -1382,24 +1392,27 @@ end: static char *extract_icon(LPCWSTR icoPathW, int index, const char *destFilename, BOOL bWait) { IStream *stream = NULL; + ICONDIRENTRY *pIconDirEntries = NULL; + int numEntries; HRESULT hr; char *nativeIdentifier = NULL; WINE_TRACE("path=[%s] index=%d destFilename=[%s]\n", wine_dbgstr_w(icoPathW), index, wine_dbgstr_a(destFilename)); - hr = open_icon(icoPathW, index, bWait, &stream); + hr = open_icon(icoPathW, index, bWait, &stream, &pIconDirEntries, &numEntries); if (FAILED(hr)) { WINE_WARN("opening icon %s index %d failed, hr=0x%08X\n", wine_dbgstr_w(icoPathW), index, hr); goto end; } - hr = platform_write_icon(stream, index, icoPathW, destFilename, &nativeIdentifier); + hr = platform_write_icon(stream, pIconDirEntries, numEntries, index, icoPathW, destFilename, &nativeIdentifier); if (FAILED(hr)) WINE_WARN("writing icon failed, error 0x%08X\n", hr); end: if (stream) IStream_Release(stream); + HeapFree(GetProcessHeap(), 0, pIconDirEntries); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, nativeIdentifier); @@ -3472,6 +3485,8 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) WCHAR szIconPath[MAX_PATH]; int iconId; IStream *stream = NULL; + ICONDIRENTRY *pIconDirEntries = NULL; + int numEntries; HRESULT hr; utf8lnkPath = wchars_to_utf8_chars(lnkPath); @@ -3533,15 +3548,15 @@ static void thumbnail_lnk(LPCWSTR lnkPath, LPCWSTR outputPath) if (szIconPath[0]) { - hr = open_icon(szIconPath, iconId, FALSE, &stream); + hr = open_icon(szIconPath, iconId, FALSE, &stream, &pIconDirEntries, &numEntries); if (SUCCEEDED(hr)) - hr = write_native_icon(stream, utf8OutputPath, NULL); + hr = write_native_icon(stream, pIconDirEntries, numEntries, utf8OutputPath, NULL); } else { - hr = open_icon(szPath, iconId, FALSE, &stream); + hr = open_icon(szPath, iconId, FALSE, &stream, &pIconDirEntries, &numEntries); if (SUCCEEDED(hr)) - hr = write_native_icon(stream, utf8OutputPath, NULL); + hr = write_native_icon(stream, pIconDirEntries, numEntries, utf8OutputPath, NULL); } end: @@ -3554,6 +3569,7 @@ end: IPersistFile_Release(persistFile); if (stream != NULL) IStream_Release(stream); + HeapFree(GetProcessHeap(), 0, pIconDirEntries); } static WCHAR *next_token( LPWSTR *p )

1 0

Francois Gouget : winemenubuilder: Avoid a couple of forward declarations.
by Alexandre Julliard 17 Mar '15

17 Mar '15

Module: wine Branch: master Commit: d4b9ac46a0a474d6f2cd3514db7ef07e7a3e6178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b9ac46a0a474d6f2cd3514d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 16 17:44:39 2015 +0100 winemenubuilder: Avoid a couple of forward declarations. --- programs/winemenubuilder/winemenubuilder.c | 46 ++++++++++++++---------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d902e93..2bdbdbf 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -195,8 +195,6 @@ static char *xdg_config_dir; static char *xdg_data_dir; static char *xdg_desktop_dir; -static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra); -static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream); /* Utility routines */ static unsigned short crc16(const char* string) @@ -1004,6 +1002,28 @@ end: return hr; } +static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra) +{ + HRESULT hr; + WCHAR *value = NULL; + DWORD size = 0; + hr = AssocQueryStringW(0, assocStr, name, extra, NULL, &size); + if (SUCCEEDED(hr)) + { + value = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (value) + { + hr = AssocQueryStringW(0, assocStr, name, extra, value, &size); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, value); + value = NULL; + } + } + } + return value; +} + static HRESULT open_file_type_icon(LPCWSTR szFileName, IStream **ppStream) { static const WCHAR openW[] = {'o','p','e','n',0}; @@ -1939,28 +1959,6 @@ static HRESULT get_cmdline( IShellLinkW *sl, LPWSTR szPath, DWORD pathSize, return hr; } -static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra) -{ - HRESULT hr; - WCHAR *value = NULL; - DWORD size = 0; - hr = AssocQueryStringW(0, assocStr, name, extra, NULL, &size); - if (SUCCEEDED(hr)) - { - value = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (value) - { - hr = AssocQueryStringW(0, assocStr, name, extra, value, &size); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, value); - value = NULL; - } - } - } - return value; -} - static char *slashes_to_minuses(const char *string) { int i;

1 0

Mark Harmstone : uxtheme: Support images in GetThemeBackgroundRegion.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 8fa8a2368494ab667a7f0c0cc145f6e5fe37f5a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa8a2368494ab667a7f0c0cc… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Mar 15 16:59:37 2015 +0000 uxtheme: Support images in GetThemeBackgroundRegion. --- dlls/uxtheme/draw.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 3ef8d81..19df3c8 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1734,6 +1734,120 @@ HRESULT WINAPI GetThemeBackgroundExtent(HTHEME hTheme, HDC hdc, int iPartId, return S_OK; } +static inline void flush_rgn_data( HRGN rgn, RGNDATA *data ) +{ + HRGN tmp = ExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); + + CombineRgn( rgn, rgn, tmp, RGN_OR ); + DeleteObject( tmp ); + data->rdh.nCount = 0; +} + +static inline void add_row( HRGN rgn, RGNDATA *data, int x, int y, int len ) +{ + RECT *rect = (RECT *)data->Buffer + data->rdh.nCount; + + if (len <= 0) return; + rect->left = x; + rect->top = y; + rect->right = x + len; + rect->bottom = y + 1; + data->rdh.nCount++; + if (data->rdh.nCount * sizeof(RECT) > data->rdh.nRgnSize - sizeof(RECT)) + flush_rgn_data( rgn, data ); +} + +static HRESULT create_image_bg_region(HTHEME theme, int part, int state, const RECT *rect, HRGN *rgn) +{ + RECT r; + HDC dc; + HBITMAP bmp; + HRGN hrgn; + BOOL istrans; + COLORREF transcolour; + HBRUSH transbrush; + unsigned int x, y, start; + BITMAPINFO bitmapinfo; + DWORD *bits; + char buffer[4096]; + RGNDATA *data = (RGNDATA *)buffer; + + if (FAILED(GetThemeBool(theme, part, state, TMT_TRANSPARENT, &istrans)) || !istrans) { + *rgn = CreateRectRgn(rect->left, rect->top, rect->right, rect->bottom); + return S_OK; + } + + r = *rect; + OffsetRect(&r, -r.left, -r.top); + + if (FAILED(GetThemeColor(theme, part, state, TMT_TRANSPARENTCOLOR, &transcolour))) + transcolour = RGB(255, 0, 255); /* defaults to magenta */ + + dc = CreateCompatibleDC(NULL); + if (!dc) { + WARN("CreateCompatibleDC failed\n"); + return E_FAIL; + } + + bitmapinfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapinfo.bmiHeader.biWidth = rect->right - rect->left; + bitmapinfo.bmiHeader.biHeight = -(rect->bottom - rect->top); + bitmapinfo.bmiHeader.biPlanes = 1; + bitmapinfo.bmiHeader.biBitCount = 32; + bitmapinfo.bmiHeader.biCompression = BI_RGB; + bitmapinfo.bmiHeader.biSizeImage = bitmapinfo.bmiHeader.biWidth * bitmapinfo.bmiHeader.biHeight * 4; + bitmapinfo.bmiHeader.biXPelsPerMeter = 0; + bitmapinfo.bmiHeader.biYPelsPerMeter = 0; + bitmapinfo.bmiHeader.biClrUsed = 0; + bitmapinfo.bmiHeader.biClrImportant = 0; + + bmp = CreateDIBSection(dc, &bitmapinfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + if (!bmp) { + WARN("CreateDIBSection failed\n"); + DeleteDC(dc); + return E_FAIL; + } + + SelectObject(dc, bmp); + + transbrush = CreateSolidBrush(transcolour); + FillRect(dc, &r, transbrush); + DeleteObject(transbrush); + + if (FAILED(DrawThemeBackground(theme, dc, part, state, &r, NULL))) { + WARN("DrawThemeBackground failed\n"); + DeleteObject(bmp); + DeleteDC(dc); + return E_FAIL; + } + + data->rdh.dwSize = sizeof(data->rdh); + data->rdh.iType = RDH_RECTANGLES; + data->rdh.nCount = 0; + data->rdh.nRgnSize = sizeof(buffer) - sizeof(data->rdh); + + hrgn = CreateRectRgn(0, 0, 0, 0); + + for (y = 0; y < r.bottom; y++, bits += r.right) { + x = 0; + while (x < r.right) { + while (x < r.right && (bits[x] & 0xffffff) == transcolour) x++; + start = x; + while (x < r.right && !((bits[x] & 0xffffff) == transcolour)) x++; + add_row( hrgn, data, rect->left + start, rect->top + y, x - start ); + } + } + + if (data->rdh.nCount > 0) flush_rgn_data(hrgn, data); + + *rgn = hrgn; + + DeleteObject(bmp); + DeleteDC(dc); + + return S_OK; +} + /*********************************************************************** * GetThemeBackgroundRegion (UXTHEME.@) * @@ -1755,8 +1869,7 @@ HRESULT WINAPI GetThemeBackgroundRegion(HTHEME hTheme, HDC hdc, int iPartId, GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_BGTYPE, &bgtype); if(bgtype == BT_IMAGEFILE) { - FIXME("Images not handled yet\n"); - hr = ERROR_CALL_NOT_IMPLEMENTED; + hr = create_image_bg_region(hTheme, iPartId, iStateId, pRect, pRegion); } else if(bgtype == BT_BORDERFILL) { *pRegion = CreateRectRgn(pRect->left, pRect->top, pRect->right, pRect->bottom);

1 0

Akihiro Sagawa : msvcrt: Add _mbctokata implementation.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: cd5a76b182dad336b007746d8cf744154b1a8966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5a76b182dad336b007746d8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 16 21:48:48 2015 +0900 msvcrt: Add _mbctokata implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 12 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 30 ++++++++++++++++++++++++++++++ 10 files changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7ca7f8c..b7d4945 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1084,7 +1084,7 @@ @ stub _mbclen_l @ cdecl _mbctohira(long) @ stub _mbctohira_l -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) @ stub _mbctolower_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d4459a6..c7222b9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1442,7 +1442,7 @@ @ stub _mbclen_l @ cdecl _mbctohira(long) @ stub _mbctohira_l -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) @ stub _mbctolower_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 03fff1a..c7df42f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1450,7 +1450,7 @@ @ stub _mbclen_l @ cdecl _mbctohira(long) @ stub _mbctohira_l -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) @ stub _mbctolower_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 9881eca..c494ce0 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -424,7 +424,7 @@ @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) @ cdecl _mbctohira(long) -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ cdecl _mbctolower(long) @ cdecl _mbctombb(long) @ cdecl _mbctoupper(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 6e1d309..f8a52f1 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -419,7 +419,7 @@ @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) @ cdecl _mbctohira(long) -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ cdecl _mbctolower(long) @ cdecl _mbctombb(long) @ cdecl _mbctoupper(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5709319..8b40e2e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -757,7 +757,7 @@ @ stub _mbclen_l @ cdecl _mbctohira(long) @ stub _mbctohira_l -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) @ stub _mbctolower_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 167e0f9..5c65b2f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -734,7 +734,7 @@ @ stub _mbclen_l @ cdecl _mbctohira(long) @ stub _mbctohira_l -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) @ stub _mbctokata_l @ cdecl _mbctolower(long) @ stub _mbctolower_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b76157f..044c2bd 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2288,3 +2288,15 @@ unsigned int CDECL _mbctohira(unsigned int c) return (c - 0x8340 - (c >= 0x837f ? 1 : 0)) + 0x829f; return c; } + +/********************************************************************* + * _mbctokata (MSVCRT.@) + * + * Converts a sjis hiragana character to katakana. + */ +unsigned int CDECL _mbctokata(unsigned int c) +{ + if(_ismbchira(c)) + return (c - 0x829f) + 0x8340 + (c >= 0x82de ? 1 : 0); + return c; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ea7dd90..1f2a8ce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -700,7 +700,7 @@ # stub _mbclen_l(ptr ptr) @ cdecl _mbctohira(long) # stub _mbctohira_l(long ptr) -@ stub _mbctokata(long) +@ cdecl _mbctokata(long) # stub _mbctokata_l(long ptr) @ cdecl _mbctolower(long) # stub _mbctolower_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4e48cd2..cf609f7 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1172,6 +1172,35 @@ static void test_mbctohira(void) _setmbcp(prev_cp); } +static void test_mbctokata(void) +{ + static const unsigned int mbckata_932[][2] = { + {0x8152, 0x8152}, {0x8153, 0x8153}, {0x8154, 0x8154}, {0x8155, 0x8155}, + {0x833f, 0x833f}, {0x829f, 0x8340}, {0x82dd, 0x837e}, {0x837f, 0x837f}, + {0x82de, 0x8380}, {0x8394, 0x8394}, {0x8397, 0x8397}, + {0xa5, 0xa5}, {0xb0, 0xb0}, {0xdd, 0xdd} }; + unsigned int i; + unsigned int prev_cp = _getmbcp(); + + _setmbcp(_MB_CP_SBCS); + for (i = 0; i < sizeof(mbckata_932)/sizeof(mbckata_932[0]); i++) + { + int ret, exp = mbckata_932[i][0]; + ret = _mbctokata(mbckata_932[i][0]); + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + + _setmbcp(932); + for (i = 0; i < sizeof(mbckata_932)/sizeof(mbckata_932[0]); i++) + { + unsigned int ret, exp; + ret = _mbctokata(mbckata_932[i][0]); + exp = mbckata_932[i][1]; + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + _setmbcp(prev_cp); +} + static void test_mbbtombc(void) { static const unsigned int mbbmbc[][2] = { @@ -2919,6 +2948,7 @@ START_TEST(string) test_mbcjisjms(); test_mbcjmsjis(); test_mbctohira(); + test_mbctokata(); test_mbbtombc(); test_mbctombb(); test_ismbckata();

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015