wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

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

16 Mar '15

Module: wine Branch: master Commit: b6ab2b626820eebaf140cc29fbeb6637962457f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ab2b626820eebaf140cc29f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 16 21:48:46 2015 +0900 msvcrt: Add _mbctohira 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 | 31 +++++++++++++++++++++++++++++++ 10 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a7df4b5..7ca7f8c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1082,7 +1082,7 @@ @ stub _mbcjmstojis_l @ cdecl _mbclen(ptr) @ stub _mbclen_l -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctohira_l @ stub _mbctokata(long) @ stub _mbctokata_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f696aaf..d4459a6 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1440,7 +1440,7 @@ @ stub _mbcjmstojis_l @ cdecl _mbclen(ptr) @ stub _mbclen_l -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctohira_l @ stub _mbctokata(long) @ stub _mbctokata_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 58e708d..03fff1a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1448,7 +1448,7 @@ @ stub _mbcjmstojis_l @ cdecl _mbclen(ptr) @ stub _mbclen_l -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctohira_l @ stub _mbctokata(long) @ stub _mbctokata_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index fb47e78..9881eca 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -423,7 +423,7 @@ @ cdecl _mbcjistojms(long) @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctokata(long) @ cdecl _mbctolower(long) @ cdecl _mbctombb(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 8b868db..6e1d309 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -418,7 +418,7 @@ @ cdecl _mbcjistojms(long) @ cdecl _mbcjmstojis(long) @ cdecl _mbclen(ptr) -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctokata(long) @ cdecl _mbctolower(long) @ cdecl _mbctombb(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 68e7097..5709319 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -755,7 +755,7 @@ @ stub _mbcjmstojis_l @ cdecl _mbclen(ptr) @ stub _mbclen_l -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctohira_l @ stub _mbctokata(long) @ stub _mbctokata_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2d88683..167e0f9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -732,7 +732,7 @@ @ stub _mbcjmstojis_l @ cdecl _mbclen(ptr) @ stub _mbclen_l -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) @ stub _mbctohira_l @ stub _mbctokata(long) @ stub _mbctokata_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index ba88ff2..b76157f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2276,3 +2276,15 @@ MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr, return ret; } + +/********************************************************************* + * _mbctohira (MSVCRT.@) + * + * Converts a sjis katakana character to hiragana. + */ +unsigned int CDECL _mbctohira(unsigned int c) +{ + if(_ismbckata(c) && c <= 0x8393) + return (c - 0x8340 - (c >= 0x837f ? 1 : 0)) + 0x829f; + return c; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6d9b4c3..ea7dd90 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -698,7 +698,7 @@ # stub _mbcjmstojis_l(long ptr) @ cdecl _mbclen(ptr) # stub _mbclen_l(ptr ptr) -@ stub _mbctohira(long) +@ cdecl _mbctohira(long) # stub _mbctohira_l(long ptr) @ stub _mbctokata(long) # stub _mbctokata_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4388085..4e48cd2 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1142,6 +1142,36 @@ static void test_mbcjmsjis(void) _setmbcp(prev_cp); } +static void test_mbctohira(void) +{ + static const unsigned int mbchira_932[][2] = { + {0x8152, 0x8152}, {0x8153, 0x8153}, {0x8154, 0x8154}, {0x8155, 0x8155}, + {0x82a0, 0x82a0}, {0x833f, 0x833f}, {0x8340, 0x829f}, {0x837e, 0x82dd}, + {0x837f, 0x837f}, {0x8380, 0x82de}, {0x8393, 0x82f1}, {0x8394, 0x8394}, + {0x8396, 0x8396}, {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(mbchira_932)/sizeof(mbchira_932[0]); i++) + { + int ret, exp = mbchira_932[i][0]; + ret = _mbctohira(mbchira_932[i][0]); + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + + _setmbcp(932); + for (i = 0; i < sizeof(mbchira_932)/sizeof(mbchira_932[0]); i++) + { + unsigned int ret, exp; + ret = _mbctohira(mbchira_932[i][0]); + exp = mbchira_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] = { @@ -2888,6 +2918,7 @@ START_TEST(string) test__mbscpy_s(); test_mbcjisjms(); test_mbcjmsjis(); + test_mbctohira(); test_mbbtombc(); test_mbctombb(); test_ismbckata();

1 0

Akihiro Sagawa : msvcrt: Fix _ismbckata() for Halfwidth Katakana characters.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: a2149ba7bab0ecf812ab3608eb07a6b8bed1566d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2149ba7bab0ecf812ab3608e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 16 21:48:45 2015 +0900 msvcrt: Fix _ismbckata() for Halfwidth Katakana characters. --- dlls/msvcrt/mbcs.c | 4 ---- dlls/msvcrt/tests/string.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index d2c12d3..ba88ff2 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1350,7 +1350,6 @@ int CDECL _ismbcpunct(unsigned int ch) */ int CDECL _ismbchira(unsigned int c) { - /* FIXME: use lc_ctype when supported, not lc_all */ if(get_mbcinfo()->mbcodepage == 932) { /* Japanese/Hiragana, CP 932 */ @@ -1364,11 +1363,8 @@ int CDECL _ismbchira(unsigned int c) */ int CDECL _ismbckata(unsigned int c) { - /* FIXME: use lc_ctype when supported, not lc_all */ if(get_mbcinfo()->mbcodepage == 932) { - if(c < 256) - return _ismbbkana(c); /* Japanese/Katakana, CP 932 */ return (c >= 0x8340 && c <= 0x8396 && c != 0x837f); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index e2d53d4..4388085 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1190,6 +1190,37 @@ static void test_mbctombb(void) _setmbcp(prev_cp); } +static void test_ismbckata(void) { + struct katakana_pair { + UINT c; + BOOL exp; + }; + static const struct katakana_pair tests[] = { + {0x8152, FALSE}, {0x8153, FALSE}, {0x8154, FALSE}, {0x8155, FALSE}, + {0x82a0, FALSE}, {0x833f, FALSE}, {0x8340, TRUE }, {0x837e, TRUE }, + {0x837f, FALSE}, {0x8380, TRUE }, {0x8396, TRUE }, {0x8397, FALSE}, + {0xa5, FALSE}, {0xb0, FALSE}, {0xdd, FALSE} + }; + unsigned int prev_cp = _getmbcp(); + int ret; + unsigned int i; + + _setmbcp(_MB_CP_SBCS); + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + ret = _ismbckata(tests[i].c); + ok(!ret, "expected 0, got %d for %04x\n", ret, tests[i].c); + } + + _setmbcp(932); + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) { + ret = _ismbckata(tests[i].c); + ok(!!ret == tests[i].exp, "expected %d, got %d for %04x\n", + tests[i].exp, !!ret, tests[i].c); + } + + _setmbcp(prev_cp); +} + static void test_ismbclegal(void) { unsigned int prev_cp = _getmbcp(); int ret, exp, err; @@ -2859,6 +2890,7 @@ START_TEST(string) test_mbcjmsjis(); test_mbbtombc(); test_mbctombb(); + test_ismbckata(); test_ismbclegal(); test_strtok(); test__mbstok();

1 0

Alexandre Julliard : server: Copy completion information for accepted socket into the new file descriptor.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 5db44d15ac6f87f8ef340a837955050870ca4246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db44d15ac6f87f8ef340a837… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 16 22:16:50 2015 +0900 server: Copy completion information for accepted socket into the new file descriptor. --- server/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/sock.c b/server/sock.c index f3bab85..823c846 100644 --- a/server/sock.c +++ b/server/sock.c @@ -828,6 +828,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->wparam = 0; acceptsock->deferred = NULL; acceptsock->connect_time = current_time; + fd_copy_completion( acceptsock->fd, newfd ); release_object( acceptsock->fd ); acceptsock->fd = newfd;

1 0

Hans Leidekker : netapi32: Add support for info level 20 in NetUserEnum.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: df5b8e417fd9ebfe08750e6fae2c2e15f4906095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5b8e417fd9ebfe08750e6fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 16 10:57:41 2015 +0100 netapi32: Add support for info level 20 in NetUserEnum. --- dlls/netapi32/netapi32.c | 97 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 67 insertions(+), 30 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 3823fa9..f7701e3 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -2291,9 +2291,8 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, LPDWORD resume_handle) { NET_API_STATUS status; - USER_INFO_0 *info; - WCHAR *user; - DWORD size; + WCHAR user[UNLEN + 1]; + DWORD size, len = sizeof(user)/sizeof(user[0]); TRACE("(%s, %u, 0x%x, %p, %u, %p, %p, %p)\n", debugstr_w(servername), level, filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); @@ -2309,43 +2308,81 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, return NERR_InvalidComputer; } - if (level) + if (!GetUserNameW(user, &len)) return GetLastError(); + + switch (level) { - FIXME("level %u not supported\n", level); - return ERROR_INVALID_LEVEL; - } + case 0: + { + USER_INFO_0 *info; - size = UNLEN + 1; - status = NetApiBufferAllocate(size * sizeof(WCHAR), (void **)&user); - if (status != NERR_Success) - return status; + size = sizeof(*info) + (strlenW(user) + 1) * sizeof(WCHAR); - if (!GetUserNameW(user, &size)) - { - NetApiBufferFree(user); - return ERROR_NOT_ENOUGH_MEMORY; - } + if (prefmaxlen < size) + status = ERROR_MORE_DATA; + else + status = NetApiBufferAllocate(size, (void **)&info); - size = sizeof(*info) + (strlenW(user) + 1) * sizeof(WCHAR); + if (status != NERR_Success) + return status; - if (prefmaxlen < size) - status = ERROR_MORE_DATA; - else - status = NetApiBufferAllocate(size, (void **)&info); + info->usri0_name = (WCHAR *)((char *)info + sizeof(*info)); + strcpyW(info->usri0_name, user); - if (status != NERR_Success) - { - NetApiBufferFree(user); - return status; + *bufptr = (BYTE *)info; + *entriesread = *totalentries = 1; + break; } + case 20: + { + USER_INFO_20 *info; + SID *sid; + UCHAR *count; + DWORD *rid; + SID_NAME_USE use; - info->usri0_name = (WCHAR *)((char *)info + sizeof(*info)); - strcpyW(info->usri0_name, user); + size = sizeof(*info) + (strlenW(user) + 1) * sizeof(WCHAR); - *bufptr = (BYTE *)info; - *entriesread = *totalentries = 1; + if (prefmaxlen < size) + status = ERROR_MORE_DATA; + else + status = NetApiBufferAllocate(size, (void **)&info); + + if (status != NERR_Success) + return status; + + size = len = 0; + LookupAccountNameW(NULL, user, NULL, &size, NULL, &len, &use); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return GetLastError(); + + status = NetApiBufferAllocate(size, (void **)&sid); + if (status != NERR_Success) + return status; - NetApiBufferFree(user); + if (!LookupAccountNameW(NULL, user, sid, &size, NULL, &len, &use)) + return GetLastError(); + + count = GetSidSubAuthorityCount(sid); + rid = GetSidSubAuthority(sid, *count - 1); + + info->usri20_name = (WCHAR *)((char *)info + sizeof(*info)); + strcpyW(info->usri20_name, user); + info->usri20_full_name = NULL; + info->usri20_comment = NULL; + info->usri20_flags = UF_NORMAL_ACCOUNT; + info->usri20_user_id = *rid; + + *bufptr = (BYTE *)info; + *entriesread = *totalentries = 1; + + NetApiBufferFree(sid); + break; + } + default: + FIXME("level %u not supported\n", level); + return ERROR_INVALID_LEVEL; + } return NERR_Success; }

1 0

Hans Leidekker : winhttp: Don' t try to read more data than available in the current chunk in refill_buffer.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: e27a9bc6bc6f849e9dc2f2eda0d81a738d1d0fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27a9bc6bc6f849e9dc2f2eda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 16 10:57:07 2015 +0100 winhttp: Don't try to read more data than available in the current chunk in refill_buffer. --- dlls/winhttp/request.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4efe2d8..d615011 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2056,9 +2056,13 @@ static BOOL refill_buffer( request_t *request, BOOL notify ) { if (!start_next_chunk( request, notify )) return FALSE; } + len = min( len, request->read_chunked_size ); } - if (!request->read_chunked && request->content_length != ~0u) + else if (request->content_length != ~0u) + { len = min( len, request->content_length - request->content_read ); + } + if (len <= request->read_size) return TRUE; if (!read_more_data( request, len, notify )) return FALSE; if (!request->read_size) request->content_length = request->content_read = 0;

1 0

Hans Leidekker : msi: Handle errors from IStorage_CreateStream instead of trying to open the stream first in msi_commit_streams.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: fa23c7fcb33a8c01189316c3b0a3600b078bd145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa23c7fcb33a8c01189316c3b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 16 10:56:35 2015 +0100 msi: Handle errors from IStorage_CreateStream instead of trying to open the stream first in msi_commit_streams. --- dlls/msi/streams.c | 21 ++++++++++----------- dlls/msi/tests/db.c | 3 ++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 4b151bb..7f9582c 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -613,30 +613,29 @@ UINT msi_commit_streams( MSIDATABASE *db ) name = msi_string_lookup( db->strings, db->streams[i].str_index, NULL ); if (!(encname = encode_streamname( FALSE, name ))) return ERROR_OUTOFMEMORY; - hr = open_stream( db, encname, &stream ); - if (FAILED( hr )) /* new stream */ + hr = IStorage_CreateStream( db->storage, encname, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stream ); + if (SUCCEEDED( hr )) { - hr = IStorage_CreateStream( db->storage, encname, STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, 0, &stream ); + hr = write_stream( stream, db->streams[i].stream ); if (FAILED( hr )) { - ERR("failed to create stream %s (hr = %08x)\n", debugstr_w(encname), hr); + ERR("failed to write stream %s (hr = %08x)\n", debugstr_w(encname), hr); msi_free( encname ); + IStream_Release( stream ); return ERROR_FUNCTION_FAILED; } - hr = write_stream( stream, db->streams[i].stream ); + hr = IStream_Commit( stream, 0 ); + IStream_Release( stream ); if (FAILED( hr )) { - ERR("failed to write stream %s (hr = %08x)\n", debugstr_w(encname), hr); + ERR("failed to commit stream %s (hr = %08x)\n", debugstr_w(encname), hr); msi_free( encname ); - IStream_Release( stream ); return ERROR_FUNCTION_FAILED; } } - hr = IStream_Commit( stream, 0 ); - IStream_Release( stream ); - if (FAILED( hr )) + else if (hr != STG_E_FILEALREADYEXISTS) { - WARN("failed to commit stream %s (hr = %08x)\n", debugstr_w(encname), hr); + ERR("failed to create stream %s (hr = %08x)\n", debugstr_w(encname), hr); msi_free( encname ); return ERROR_FUNCTION_FAILED; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 3d8568d..d629e1c 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3189,7 +3189,8 @@ static void test_try_transform(void) r = MsiDatabaseApplyTransformA( hdb, mstfile, 0 ); ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); - MsiDatabaseCommit( hdb ); + r = MsiDatabaseCommit( hdb ); + ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); /* check new values */ hrec = 0;

1 0

Hans Leidekker : msi: Fix the case where the summary information stream is already open in MsiGetSummaryInformationW.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: db3fdbe1e3570f9b79f5c00fd166881e78c5f9a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3fdbe1e3570f9b79f5c00fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 16 10:55:58 2015 +0100 msi: Fix the case where the summary information stream is already open in MsiGetSummaryInformationW. --- dlls/msi/msi.c | 6 +-- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 14 +++--- dlls/msi/patch.c | 22 +++++----- dlls/msi/suminfo.c | 126 +++++++++++++++++++++++++++++++++++++---------------- 5 files changed, 112 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db3fdbe1e3570f9b79f5c…

1 0

Hans Leidekker : msi: Improve tracing.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 7a4d8f57c7c603569f1966bf5970a5f5b74ce9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4d8f57c7c603569f1966bf5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 16 10:55:21 2015 +0100 msi: Improve tracing. --- dlls/msi/action.c | 8 +++---- dlls/msi/files.c | 43 ++++++++++++++++++++++++------------- dlls/msi/font.c | 1 - dlls/msi/msi.c | 63 +++++++++++++++++++++++++++--------------------------- dlls/msi/msipriv.h | 1 + dlls/msi/patch.c | 4 +++- 6 files changed, 66 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a4d8f57c7c603569f196…

1 0

Jactry Zeng : riched20: Implement IOleWindow::GetWindow.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: f1d22c0ebdab26fee8b29dd9bc861b81d894186b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d22c0ebdab26fee8b29dd9b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Mar 16 17:27:38 2015 +0800 riched20: Implement IOleWindow::GetWindow. --- dlls/riched20/richole.c | 9 +++++++-- dlls/riched20/tests/richole.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 47f2964..c62998a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -363,8 +363,13 @@ static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) { IOleClientSiteImpl *This = impl_from_IOleWindow(iface); - FIXME("not implemented: (%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, phwnd); + + if (!phwnd) + return E_INVALIDARG; + + *phwnd = This->reOle->editor->hWnd; + return S_OK; } static const IOleWindowVtbl olewinvt = { diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 22d2048..a89ee55 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1000,6 +1000,34 @@ static void test_IOleClientSite_QueryInterface(void) release_interfaces(&w, &reOle, &txtDoc, NULL); } +static void test_IOleWindow_GetWindow(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + IOleClientSite *clientSite = NULL; + IOleWindow *oleWin = NULL; + HRESULT hres; + HWND hwnd; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + hres = IRichEditOle_GetClientSite(reOle, &clientSite); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleWindow, (void **)&oleWin); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + hres = IOleWindow_GetWindow(oleWin, &hwnd); + ok(hres == S_OK, "IOleClientSite_GetWindow: 0x%08x\n", hres); + ok(w == hwnd, "got wrong pointer\n"); + + hres = IOleWindow_GetWindow(oleWin, NULL); + ok(hres == E_INVALIDARG, "IOleClientSite_GetWindow: 0x%08x\n", hres); + + IOleWindow_Release(oleWin); + IOleClientSite_Release(clientSite); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -1019,4 +1047,5 @@ START_TEST(richole) test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); test_IOleClientSite_QueryInterface(); + test_IOleWindow_GetWindow(); }

1 0

Jactry Zeng : riched20: Implement IOleWindow interface.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: bbb9755896f9660ace3c4e1c353baad180f00d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb9755896f9660ace3c4e1c3… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Mar 16 17:27:21 2015 +0800 riched20: Implement IOleWindow interface. --- dlls/riched20/richole.c | 51 ++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/tests/richole.c | 52 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 1280016..47f2964 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -82,6 +82,7 @@ struct ITextSelectionImpl { struct IOleClientSiteImpl { IOleClientSite IOleClientSite_iface; + IOleWindow IOleWindow_iface; LONG ref; IRichEditOleImpl *reOle; @@ -219,12 +220,15 @@ static inline IOleClientSiteImpl *impl_from_IOleClientSite(IOleClientSite *iface static HRESULT WINAPI IOleClientSite_fnQueryInterface(IOleClientSite *me, REFIID riid, LPVOID *ppvObj) { + IOleClientSiteImpl *This = impl_from_IOleClientSite(me); TRACE("%p %s\n", me, debugstr_guid(riid) ); *ppvObj = NULL; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IOleClientSite)) *ppvObj = me; + else if (IsEqualGUID(riid, &IID_IOleWindow)) + *ppvObj = &This->IOleWindow_iface; if (*ppvObj) { IOleClientSite_AddRef(me); @@ -325,6 +329,52 @@ static const IOleClientSiteVtbl ocst = { IOleClientSite_fnRequestNewObjectLayout }; +/* IOleWindow interface */ +static inline IOleClientSiteImpl *impl_from_IOleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, IOleClientSiteImpl, IOleWindow_iface); +} + +static HRESULT WINAPI IOleWindow_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObj) +{ + IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppvObj); +} + +static ULONG WINAPI IOleWindow_fnAddRef(IOleWindow *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + return IOleClientSite_AddRef(&This->IOleClientSite_iface); +} + +static ULONG WINAPI IOleWindow_fnRelease(IOleWindow *iface) +{ + IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + return IOleClientSite_Release(&This->IOleClientSite_iface); +} + +static HRESULT WINAPI IOleWindow_fnContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) +{ + IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + FIXME("not implemented: (%p)->(%d)\n", This, fEnterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI IOleWindow_fnGetWindow(IOleWindow *iface, HWND *phwnd) +{ + IOleClientSiteImpl *This = impl_from_IOleWindow(iface); + FIXME("not implemented: (%p)->(%p)\n", This, phwnd); + return E_NOTIMPL; +} + +static const IOleWindowVtbl olewinvt = { + IOleWindow_fnQueryInterface, + IOleWindow_fnAddRef, + IOleWindow_fnRelease, + IOleWindow_fnGetWindow, + IOleWindow_fnContextSensitiveHelp +}; + static IOleClientSiteImpl * CreateOleClientSite(IRichEditOleImpl *reOle) { @@ -333,6 +383,7 @@ CreateOleClientSite(IRichEditOleImpl *reOle) return NULL; clientSite->IOleClientSite_iface.lpVtbl = &ocst; + clientSite->IOleWindow_iface.lpVtbl = &olewinvt; clientSite->ref = 1; clientSite->reOle = reOle; return clientSite; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index ee31a16..22d2048 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -949,6 +949,57 @@ static void test_ITextSelection_Collapse(void) release_interfaces(&w, &reOle, &txtDoc, &txtSel); } +static void test_IOleClientSite_QueryInterface(void) +{ + HWND w; + IRichEditOle *reOle = NULL, *reOle1 = NULL; + ITextDocument *txtDoc = NULL; + IOleClientSite *clientSite = NULL, *clientSite1 = NULL, *clientSite2 = NULL; + IOleWindow *oleWin = NULL, *oleWin1 = NULL; + HRESULT hres; + LONG refcount1, refcount2; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + hres = IRichEditOle_GetClientSite(reOle, &clientSite); + ok(hres == S_OK, "IRichEditOle_QueryInterface: 0x%08x\n", hres); + refcount1 = get_refcount((IUnknown *)clientSite); + todo_wine ok(refcount1 == 1, "got wrong ref count: %d\n", refcount1); + + hres = IOleClientSite_QueryInterface(clientSite, &IID_IRichEditOle, (void **)&reOle1); + ok(hres == E_NOINTERFACE, "IOleClientSite_QueryInterface: %x\n", hres); + + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleClientSite, (void **)&clientSite1); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + ok(clientSite == clientSite1, "Should not return a new pointer.\n"); + refcount1 = get_refcount((IUnknown *)clientSite); + todo_wine ok(refcount1 == 2, "got wrong ref count: %d\n", refcount1); + + /* IOleWindow interface */ + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleWindow, (void **)&oleWin); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + refcount1 = get_refcount((IUnknown *)clientSite); + refcount2 = get_refcount((IUnknown *)oleWin); + ok(refcount1 == refcount2, "got wrong ref count.\n"); + + hres = IOleClientSite_QueryInterface(clientSite, &IID_IOleWindow, (void **)&oleWin1); + ok(hres == S_OK, "IOleClientSite_QueryInterface: 0x%08x\n", hres); + ok(oleWin == oleWin1, "Should not return a new pointer.\n"); + refcount1 = get_refcount((IUnknown *)clientSite); + refcount2 = get_refcount((IUnknown *)oleWin); + ok(refcount1 == refcount2, "got wrong ref count.\n"); + + hres = IOleWindow_QueryInterface(oleWin, &IID_IOleClientSite, (void **)&clientSite2); + ok(hres == S_OK, "IOleWindow_QueryInterface: 0x%08x\n", hres); + ok(clientSite2 == clientSite1, "got wrong pointer\n"); + + IOleWindow_Release(oleWin1); + IOleWindow_Release(oleWin); + IOleClientSite_Release(clientSite2); + IOleClientSite_Release(clientSite1); + IOleClientSite_Release(clientSite); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -967,4 +1018,5 @@ START_TEST(richole) test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); + test_IOleClientSite_QueryInterface(); }

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
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