wine-commits July 2014

wine-commits@winehq.org

2 participants
287 discussions

Jacek Caban : urlmon.idl: Added missing Uri_CREATE_* flags.
by Alexandre Julliard 02 Jul '14

02 Jul '14

Module: wine Branch: master Commit: 1b5a12618408e42b7062aede0bf31abe3dbffa93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5a12618408e42b7062aede0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 2 13:28:01 2014 +0200 urlmon.idl: Added missing Uri_CREATE_* flags. --- include/urlmon.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/urlmon.idl b/include/urlmon.idl index 2ccba5b..a9b665c 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1848,6 +1848,8 @@ cpp_quote("#define Uri_CREATE_NO_PRE_PROCESS_HTML_URI 0x1000") cpp_quote("#define Uri_CREATE_IE_SETTINGS 0x2000") cpp_quote("#define Uri_CREATE_NO_IE_SETTINGS 0x4000") cpp_quote("#define Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS 0x8000") +cpp_quote("#define Uri_CREATE_NORMALIZE_INTL_CHARACTERS 0x00010000") +cpp_quote("#define Uri_CREATE_CANONICALIZE_ABSOLUTE 0x00020000") cpp_quote("#define Uri_DISPLAY_NO_FRAGMENT 0x00000001") cpp_quote("#define Uri_PUNYCODE_IDN_HOST 0x00000002")

1 0

Jacek Caban : urlmon: Don' t decode percent-encoded characters in file URLs with implicit scheme.
by Alexandre Julliard 02 Jul '14

02 Jul '14

Module: wine Branch: master Commit: e656914fbf4cdb774c8db8dc9ebf631693a1fdb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e656914fbf4cdb774c8db8dc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 2 13:22:50 2014 +0200 urlmon: Don't decode percent-encoded characters in file URLs with implicit scheme. --- dlls/urlmon/uri.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 2fe0113..1f18bc6 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2838,7 +2838,7 @@ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags * file:///c:/test%test -> file:///c:/test%25test */ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, URL_SCHEME scheme_type, BOOL has_host, DWORD flags, - WCHAR *ret_path) { + BOOL is_implicit_scheme, WCHAR *ret_path) { const BOOL known_scheme = scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = scheme_type == URL_SCHEME_FILE; const BOOL is_res = scheme_type == URL_SCHEME_RES; @@ -2904,7 +2904,7 @@ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, U len += 3; do_default_action = FALSE; } else if((is_unreserved(val) && known_scheme) || - (is_file && (is_unreserved(val) || is_reserved(val) || + (is_file && !is_implicit_scheme && (is_unreserved(val) || is_reserved(val) || (val && flags&Uri_CREATE_FILE_USE_DOS_PATH && !is_forbidden_dos_path_char(val))))) { if(ret_path) ret_path[len] = val; @@ -2929,7 +2929,7 @@ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, U } } else if(known_scheme && !is_res && !is_unreserved(*ptr) && !is_reserved(*ptr) && (!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS) || is_file)) { - if(!(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH))) { + if(!is_file || !(flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Escape the forbidden character. */ if(ret_path) pct_encode_val(*ptr, ret_path+len); @@ -3122,7 +3122,7 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, if(!computeOnly) uri->path_start = uri->canon_len; uri->path_len = canonicalize_path_hierarchical(data->path, data->path_len, data->scheme_type, data->host_len != 0, - flags, computeOnly ? NULL : uri->canon_uri+uri->canon_len); + flags, data->has_implicit_scheme, computeOnly ? NULL : uri->canon_uri+uri->canon_len); uri->canon_len += uri->path_len; if(!computeOnly && !uri->path_len) uri->path_start = -1; @@ -3889,8 +3889,8 @@ static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) return S_OK; } - len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, NULL); - len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, NULL); + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, FALSE, NULL); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, FALSE, NULL); canon_path_a = heap_alloc(len_a*sizeof(WCHAR)); if(!canon_path_a) @@ -3901,8 +3901,8 @@ static HRESULT compare_file_paths(const Uri *a, const Uri *b, BOOL *ret) return E_OUTOFMEMORY; } - len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, canon_path_a); - len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, canon_path_b); + len_a = canonicalize_path_hierarchical(a->canon_uri+a->path_start, a->path_len, a->scheme_type, FALSE, 0, FALSE, canon_path_a); + len_b = canonicalize_path_hierarchical(b->canon_uri+b->path_start, b->path_len, b->scheme_type, FALSE, 0, FALSE, canon_path_b); *ret = len_a == len_b && !memicmpW(canon_path_a, canon_path_b, len_a);

1 0

Sebastian Lackner : wininet: Fix invalid memory access in HTTP_QUERY_RAW_HEADERS (Valgrind).
by Alexandre Julliard 02 Jul '14

02 Jul '14

Module: wine Branch: master Commit: 8fd44a3d2b7438fbf1e7fcfa7482147999ff4851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd44a3d2b7438fbf1e7fcfa7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 2 01:23:40 2014 +0200 wininet: Fix invalid memory access in HTTP_QUERY_RAW_HEADERS (Valgrind). --- dlls/wininet/http.c | 4 ++-- dlls/wininet/tests/http.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b5e6a73..bb53a03 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3589,12 +3589,12 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, TRACE("returning data: %s\n", debugstr_wn(headers, len / sizeof(WCHAR))); - for (i=0; i<len; i++) + for (i = 0; i < len / sizeof(WCHAR); i++) { if (headers[i] == '\n') headers[i] = 0; } - memcpy(lpBuffer, headers, len + sizeof(WCHAR)); + memcpy(lpBuffer, headers, len); } *lpdwBufferLength = len - sizeof(WCHAR); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4e8ea5b..a8b55fd 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -465,6 +465,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; + WCHAR wbuffer[4000]; DWORD length, length2, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -649,6 +650,37 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(buffer[length2+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length2+1]); ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); + length = sizeof(wbuffer)-sizeof(WCHAR); + memset(wbuffer, 0x77, sizeof(wbuffer)); + res = HttpQueryInfoW(hor, HTTP_QUERY_RAW_HEADERS, wbuffer, &length, 0x0); + ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(length % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length); + length /= sizeof(WCHAR); + /* show that the function writes data past the length returned */ + ok(wbuffer[length-2], "Expected any header character, got 0x0000\n"); + ok(!wbuffer[length-1], "Expected 0x0000, got %04X\n", wbuffer[length-1]); + ok(!wbuffer[length], "Expected 0x0000, got %04X\n", wbuffer[length]); + ok(wbuffer[length+1] == 0x7777 || broken(wbuffer[length+1] != 0x7777), + "Expected 0x7777, got %04X\n", wbuffer[length+1]); + + length2 = length*sizeof(WCHAR); + res = HttpQueryInfoW(hor,HTTP_QUERY_RAW_HEADERS,wbuffer,&length2,0x0); + ok(!res, "Expected 0x00, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(length2 % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length2); + length2 /= sizeof(WCHAR); + ok(length2 == length+1, "Expected %d, got %d\n", length+1, length2); + /* the in length of the buffer must be +1 but the length returned does not count this */ + length2 = (length+1)*sizeof(WCHAR); + memset(wbuffer, 0x77, sizeof(wbuffer)); + res = HttpQueryInfoW(hor,HTTP_QUERY_RAW_HEADERS,wbuffer,&length2,0x0); + ok(res, "HttpQueryInfoW(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(length2 % sizeof(WCHAR) == 0, "Expected that length is a multiple of sizeof(WCHAR), got %d.\n", length2); + length2 /= sizeof(WCHAR); + ok(!wbuffer[length2], "Expected 0x0000, got %04X\n", wbuffer[length2]); + ok(wbuffer[length2+1] == 0x7777, "Expected 0x7777, got %04X\n", wbuffer[length2+1]); + ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); + length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError());

1 0

Andrew Eikum : winecoreaudio.drv: Use AUHAL API instead of AudioQueue.
by Alexandre Julliard 02 Jul '14

02 Jul '14

Module: wine Branch: master Commit: 46928d381ee4dcf95a0ac409be52729407f4eaca URL: http://source.winehq.org/git/wine.git/?a=commit;h=46928d381ee4dcf95a0ac409b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 1 14:53:45 2014 -0500 winecoreaudio.drv: Use AUHAL API instead of AudioQueue. --- dlls/winecoreaudio.drv/mmdevdrv.c | 1181 +++++++++++++++++++------------------ 1 file changed, 603 insertions(+), 578 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46928d381ee4dcf95a0ac…

1 0

Jacek Caban : iphlpapi: Protect res_init call with critical section.
by Alexandre Julliard 02 Jul '14

02 Jul '14

Module: wine Branch: master Commit: ef1342bae711aa798f5fa6e5cb9260237395b304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1342bae711aa798f5fa6e5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 1 17:00:36 2014 +0200 iphlpapi: Protect res_init call with critical section. --- dlls/iphlpapi/iphlpapi_main.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8c55048..70a063b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1068,10 +1068,21 @@ static void sockaddr_in6_to_WS_storage( SOCKADDR_STORAGE *dst, const struct sock #ifdef HAVE_STRUCT___RES_STATE /* call res_init() just once because of a bug in Mac OS X 10.4 */ /* Call once per thread on systems that have per-thread _res. */ + +static CRITICAL_SECTION res_init_cs; +static CRITICAL_SECTION_DEBUG res_init_cs_debug = { + 0, 0, &res_init_cs, + { &res_init_cs_debug.ProcessLocksList, &res_init_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": res_init_cs") } +}; +static CRITICAL_SECTION res_init_cs = { &res_init_cs_debug, -1, 0, 0, 0, 0 }; + static void initialise_resolver(void) { + EnterCriticalSection(&res_init_cs); if ((_res.options & RES_INIT) == 0) res_init(); + LeaveCriticalSection(&res_init_cs); } static int get_dns_servers( SOCKADDR_STORAGE *servers, int num, BOOL ip4_only )

1 0

Frédéric Delanoy : Assorted spelling/ grammar fixes.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 95ae71f3ab47c57b6a3af58e787976436b5b3e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ae71f3ab47c57b6a3af58e7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jun 29 13:12:33 2014 +0200 Assorted spelling/grammar fixes. --- dlls/d3dx9_36/surface.c | 6 +++--- dlls/msvfw32/msvideo_main.c | 2 +- dlls/urlmon/sec_mgr.c | 2 +- dlls/urlmon/tests/uri.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/ws2_32/socket.c | 2 +- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 4 ++-- tools/c2man.pl | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 09c2fce..ad38444 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1030,7 +1030,7 @@ HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, const WCHAR *resour * * RETURNS * Success: D3D_OK - * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcData or SrcDataSize are NULL + * Failure: D3DERR_INVALIDCALL, if pDestSurface, pSrcData or SrcDataSize is NULL * D3DXERR_INVALIDDATA, if pSrcData is no valid image file * */ @@ -1720,7 +1720,7 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic * RETURNS * Success: D3D_OK, if we successfully load the pixel data into our surface or * if pSrcMemory is NULL but the other parameters are valid - * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect are NULL or + * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect is NULL or * if SrcFormat is an invalid format (other than D3DFMT_UNKNOWN) or * if DestRect is invalid * D3DXERR_INVALIDDATA, if we fail to lock pDestSurface @@ -1871,7 +1871,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, * * RETURNS * Success: D3D_OK - * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcSurface are NULL + * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcSurface is NULL * D3DXERR_INVALIDDATA, if one of the surfaces is not lockable * */ diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index ea38e0f..b6b7507 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -67,7 +67,7 @@ struct _reg_driver static reg_driver* reg_driver_list = NULL; -/* This one is a macro such that it works for both ASCII and Unicode */ +/* This one is a macro in order to work for both ASCII and Unicode */ #define fourcc_to_string(str, fcc) do { \ (str)[0] = LOBYTE(LOWORD(fcc)); \ (str)[1] = HIBYTE(LOWORD(fcc)); \ diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index dc57c88..5c145ae 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -2077,7 +2077,7 @@ HRESULT WINAPI CompareSecurityIds(BYTE *secid1, DWORD size1, BYTE *secid2, DWORD /******************************************************************** * IsInternetESCEnabledLocal (URLMON.108) * - * Undocumented, returns if IE is running in Enhanced Security Configuration. + * Undocumented, returns TRUE if IE is running in Enhanced Security Configuration. */ BOOL WINAPI IsInternetESCEnabledLocal(void) { diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index f142ffb..737d1bb 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4583,7 +4583,7 @@ typedef struct _invalid_uri { static const invalid_uri invalid_uri_tests[] = { /* Has to have a scheme name. */ {"://www.winehq.org",0,FALSE}, - /* Window's doesn't like URI's which are implicitly file paths without the + /* Windows doesn't like URIs which are implicitly file paths without the * ALLOW_IMPLICIT_FILE_SCHEME flag set. */ {"C:/test/test.mp3",0,FALSE}, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 229d04c..faefd71 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -99,7 +99,7 @@ typedef struct _tagAFM { const AFMMETRICS *Metrics; } AFM; -/* Note no 'next' in AFM. Use AFMLISTENTRY as a container. This allow more than +/* Note no 'next' in AFM. Use AFMLISTENTRY as a container. This allows more than one list to exist without having to reallocate the entire AFM structure. We keep a global list of all afms (PSDRV_AFMFontList) plus a list of available fonts for each DC (dc->physDev->Fonts) */ diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 10857dc..e1d0ce5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4758,7 +4758,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, switch(optname) { /* Some options need some conversion before they can be sent to - * setsockopt. The conversions are done here, then they will fall though + * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to * setsockopt follow below that.*/ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 53229a7..4c95b43 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -874,7 +874,7 @@ void WCMD_copy(WCHAR * args) { if (thiscopy->binarycopy == -1) thiscopy->binarycopy = !anyconcats; /* Convert to fully qualified path/filename in srcpath, file filenamepart pointing - to where the filename portion begins (used for wildcart expansion. */ + to where the filename portion begins (used for wildcard expansion). */ GetFullPathNameW(thiscopy->name, sizeof(srcpath)/sizeof(WCHAR), srcpath, &filenamepart); WINE_TRACE("Full src name is '%s'\n", wine_dbgstr_w(srcpath)); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 647f988..c475ad2 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1605,8 +1605,8 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, case WCMD_FOR: case WCMD_IF: /* Very oddly, probably because of all the special parsing required for - these two commands, neither for nor if are supported when called, - ie call if 1==1... will fail. */ + these two commands, neither 'for' nor 'if' is supported when called, + i.e. 'call if 1==1...' will fail. */ if (!retrycall) { if (i==WCMD_FOR) WCMD_for (p, cmdList); else if (i==WCMD_IF) WCMD_if (p, cmdList); diff --git a/tools/c2man.pl b/tools/c2man.pl index 029f460..fba17ab 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -521,7 +521,7 @@ sub process_comment_text($) s/\[I\]|\[i\]|\[in\]|\[IN\]/\[In\] /g; s/\[O\]|\[o\]|\[out\]|\[OUT\]/\[Out\]/g; s/\[I\/O\]|\[I\,O\]|\[i\/o\]|\[in\/out\]|\[IN\/OUT\]/\[In\/Out\]/g; - # TRUE/FALSE/NULL are defines, capitilise them + # TRUE/FALSE/NULL are defines, capitalise them s/True|true/TRUE/g; s/False|false/FALSE/g; s/Null|null/NULL/g;

1 0

Joris van der Wel : advapi32/tests: Refactor the retrieval of a security descriptor into a separate function so that it can be used in other tests.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 6930012f86531e78eac7da55e04b3f9454a5ba84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6930012f86531e78eac7da55e… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Jun 25 23:53:23 2014 +0200 advapi32/tests: Refactor the retrieval of a security descriptor into a separate function so that it can be used in other tests. --- dlls/advapi32/tests/security.c | 47 +++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a394620..f3ccc8e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -208,6 +208,32 @@ static void init(void) myARGC = winetest_get_mainargs( &myARGV ); } +static SECURITY_DESCRIPTOR* test_get_security_descriptor(HANDLE handle, int line) +{ + /* use HeapFree(GetProcessHeap(), 0, sd); when done */ + DWORD ret, length, needed; + SECURITY_DESCRIPTOR *sd; + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + NULL, 0, &needed); + ok_(__FILE__, line)(!ret, "GetKernelObjectSecurity should fail\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok_(__FILE__, line)(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); + + length = needed; + sd = HeapAlloc(GetProcessHeap(), 0, length); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + sd, length, &needed); + ok_(__FILE__, line)(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); + ok_(__FILE__, line)(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); + return sd; +} + static void test_sid(void) { struct sidRef refs[] = { @@ -4432,29 +4458,12 @@ todo_wine static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MAPPING *mapping) { - DWORD ret, length, needed, granted, priv_set_len; + DWORD ret, granted, priv_set_len; BOOL status; PRIVILEGE_SET priv_set; SECURITY_DESCRIPTOR *sd; - needed = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - NULL, 0, &needed); - ok(!ret, "GetKernelObjectSecurity should fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - ok(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); - - length = needed; - sd = HeapAlloc(GetProcessHeap(), 0, length); - - needed = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - sd, length, &needed); - ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); - ok(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); - + sd = test_get_security_descriptor(handle, __LINE__); validate_default_security_descriptor(sd); priv_set_len = sizeof(priv_set);

1 0

Joris van der Wel : advapi32/tests: Changed an invalid comment.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: c3f87add45d1172ede6de0e12093657cb9e9a4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f87add45d1172ede6de0e12… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Jun 25 23:47:37 2014 +0200 advapi32/tests: Changed an invalid comment. --- dlls/advapi32/tests/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d75354f..a394620 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2547,7 +2547,7 @@ static void test_process_security(void) CHECK_SET_SECURITY( event, GROUP_SECURITY_INFORMATION, ERROR_INVALID_SECURITY_DESCR ); CHECK_SET_SECURITY( event, SACL_SECURITY_INFORMATION, ERROR_ACCESS_DENIED ); CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS ); - /* NULL DACL is valid and means default DACL from token */ + /* NULL DACL is valid and means that everyone has access */ SecurityDescriptor->Control |= SE_DACL_PRESENT; CHECK_SET_SECURITY( event, DACL_SECURITY_INFORMATION, ERROR_SUCCESS );

1 0

Joris van der Wel : server: Any of the 4 SE_*_DEFAULTED controls should not be stored on objects, their usage is transient.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 11674b2f61554ce8b573e345a5c2a716fe484028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11674b2f61554ce8b573e345a… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Jun 25 23:08:47 2014 +0200 server: Any of the 4 SE_*_DEFAULTED controls should not be stored on objects, their usage is transient. --- dlls/advapi32/tests/security.c | 4 ++-- server/object.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 05da0ae..d75354f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5341,7 +5341,7 @@ static void test_default_dacl_owner_sid(void) ret = GetSecurityDescriptorOwner( sd, &owner, &defaulted ); ok( ret, "error %u\n", GetLastError() ); ok( owner != (void *)0xdeadbeef, "owner not set\n" ); - todo_wine ok( !defaulted, "owner defaulted\n" ); + ok( !defaulted, "owner defaulted\n" ); dacl = (void *)0xdeadbeef; present = FALSE; @@ -5350,7 +5350,7 @@ static void test_default_dacl_owner_sid(void) ok( ret, "error %u\n", GetLastError() ); ok( present, "dacl not present\n" ); ok( dacl != (void *)0xdeadbeef, "dacl not set\n" ); - todo_wine ok( !defaulted, "dacl defaulted\n" ); + ok( !defaulted, "dacl defaulted\n" ); index = 0; found = FALSE; diff --git a/server/object.c b/server/object.c index c206747..021c741 100644 --- a/server/object.c +++ b/server/object.c @@ -443,7 +443,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, { owner = token_get_user( current->process->token ); new_sd.owner_len = security_sid_len( owner ); - new_sd.control |= SE_OWNER_DEFAULTED; } group = sd_get_group( sd ); @@ -453,7 +452,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, { group = token_get_primary_group( current->process->token ); new_sd.group_len = security_sid_len( group ); - new_sd.control |= SE_GROUP_DEFAULTED; } new_sd.control |= SE_SACL_PRESENT; @@ -469,7 +467,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, else { new_sd.sacl_len = 0; - new_sd.control |= SE_SACL_DEFAULTED; } } @@ -487,7 +484,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, { dacl = token_get_default_dacl( current->process->token ); new_sd.dacl_len = dacl->AclSize; - new_sd.control |= SE_DACL_DEFAULTED; } }

1 0

Jactry Zeng : riched20: Don' t create too many IRichEditOle interface for a RichEdit.
by Alexandre Julliard 01 Jul '14

01 Jul '14

Module: wine Branch: master Commit: 6ea4da40381bd6a8634457a4291878920f1ad9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea4da40381bd6a8634457a42… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Jul 1 00:08:28 2014 +0800 riched20: Don't create too many IRichEditOle interface for a RichEdit. --- dlls/riched20/editor.c | 13 +++++++++++-- dlls/riched20/editstr.h | 1 + dlls/riched20/tests/richole.c | 19 ++++++++++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2af2582..06d8690 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2886,6 +2886,11 @@ static void ME_DestroyEditor(ME_TextEditor *editor) if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); ITextHost_Release(editor->texthost); + if (editor->reOle) + { + IRichEditOle_Release(editor->reOle); + editor->reOle = NULL; + } OleUninitialize(); FREE_OBJ(editor->pBuffer); @@ -4467,8 +4472,12 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_GETOLEINTERFACE: { - LPVOID *ppvObj = (LPVOID*) lParam; - return CreateIRichEditOle(editor, ppvObj); + if (!editor->reOle) + if (!CreateIRichEditOle(editor, (LPVOID *)&editor->reOle)) + return 0; + *(LPVOID *)lParam = editor->reOle; + IRichEditOle_AddRef(editor->reOle); + return 1; } case EM_GETPASSWORDCHAR: { diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index f139c29..4fd965c 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -388,6 +388,7 @@ typedef struct tagME_TextEditor { HWND hWnd, hwndParent; ITextHost *texthost; + IRichEditOle *reOle; BOOL bEmulateVersion10; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 5a3ffbe..d10c063 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -92,15 +92,22 @@ static void release_interfaces(HWND *w, IRichEditOle **reOle, ITextDocument **tx ITextSelection_Release(*txtSel); } +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + static void test_Interfaces(void) { - IRichEditOle *reOle = NULL; + IRichEditOle *reOle = NULL, *reOle1 = NULL; ITextDocument *txtDoc = NULL; ITextSelection *txtSel = NULL; IUnknown *punk; HRESULT hres; LRESULT res; HWND w; + ULONG refcount; w = new_richedit(NULL); if (!w) { @@ -111,6 +118,14 @@ static void test_Interfaces(void) res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle); ok(res, "SendMessage\n"); ok(reOle != NULL, "EM_GETOLEINTERFACE\n"); + refcount = get_refcount((IUnknown *)reOle); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle1); + ok(res == 1, "SendMessage\n"); + ok(reOle1 == reOle, "Should not return a new IRichEditOle interface\n"); + refcount = get_refcount((IUnknown *)reOle); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument, (void **) &txtDoc); @@ -142,6 +157,8 @@ static void test_Interfaces(void) ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); + refcount = IRichEditOle_Release(reOle); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); DestroyWindow(w); /* Methods should return CO_E_RELEASED if the backing document has

1 0

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 July 2014