March 2013 - Wine-commits - list.winehq.org

Jacek Caban : winnt.h: Added GCC variant of DEFAULT_UNREACHABLE macro.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 15448724be0cd8eec6bb137f85c5f226d915a1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15448724be0cd8eec6bb137f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 10:43:46 2013 +0100 winnt.h: Added GCC variant of DEFAULT_UNREACHABLE macro. --- include/winnt.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 0dac8b1..b701de3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -376,8 +376,10 @@ extern "C" { /* Eliminate Microsoft C/C++ compiler warning 4715 */ #if defined(_MSC_VER) && (_MSC_VER > 1200) # define DEFAULT_UNREACHABLE default: __assume(0) +#elif defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))) +# define DEFAULT_UNREACHABLE default: __builtin_unreachable() #else -# define DEFAULT_UNREACHABLE +# define DEFAULT_UNREACHABLE default: #endif /* Error Masks */

1 0

Jacek Caban : vbscript: Use DEFAULT_UNREACHABLE macro where appropriate.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 9eed654e054520888429fb7ea1c9d8cce1c7c776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eed654e054520888429fb7ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 10:43:56 2013 +0100 vbscript: Use DEFAULT_UNREACHABLE macro where appropriate. --- dlls/vbscript/compile.c | 7 ++----- dlls/vbscript/global.c | 4 +--- dlls/vbscript/vbdisp.c | 3 +-- dlls/vbscript/vbscript.c | 3 +-- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index fb1974b..c5f3797 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -98,8 +98,7 @@ static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) break; case ARG_NONE: break; - default: - assert(0); + DEFAULT_UNREACHABLE; } } @@ -1398,9 +1397,7 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d case FUNC_PROPSET: invoke_type = VBDISP_SET; break; - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } assert(!desc->entries[invoke_type]); diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9c9cd41..4a5a277 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1010,9 +1010,7 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA case 4: FIXME("unsupported compare argument %s\n", debugstr_variant(args)); return E_NOTIMPL; - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } if(startv) { diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index f06a5b6..f075163 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -172,8 +172,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f V_BSTR(res) = ret; break; } - default: - assert(0); + DEFAULT_UNREACHABLE; } return S_OK; } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 48dd18c..b594b07 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -216,8 +216,7 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) break; case SCRIPTSTATE_CLOSED: break; - default: - assert(0); + DEFAULT_UNREACHABLE; } }

1 0

Jacek Caban : jscript: Use DEFAULT_UNREACHABLE macro where appropriate.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 3faeffc5f474db6c835e035734a4dd96999af234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3faeffc5f474db6c835e03573… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 10:44:07 2013 +0100 jscript: Use DEFAULT_UNREACHABLE macro where appropriate. --- dlls/jscript/compile.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 84d3d5f..516de49 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -92,8 +92,7 @@ static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) case ARG_FUNC: case ARG_NONE: break; - default: - assert(0); + DEFAULT_UNREACHABLE; } } @@ -447,8 +446,7 @@ static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *ex hres = push_instr_uint(ctx, OP_memberid, flags); break; } - default: - assert(0); + DEFAULT_UNREACHABLE; } return hres; @@ -771,9 +769,7 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) instr_ptr(ctx, instr)->u.arg[1].uint = literal->u.regexp.flags; return S_OK; } - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } } @@ -797,9 +793,7 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st jsstr_release(jsstr); break; } - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } return *str ? S_OK : E_OUTOFMEMORY; @@ -1050,9 +1044,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr, BOOL case EXPR_BXOR: hres = compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); break; - default: - assert(0); - hres = E_FAIL; + DEFAULT_UNREACHABLE; } if(FAILED(hres)) @@ -1769,9 +1761,7 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_WITH: hres = compile_with_statement(ctx, (with_statement_t*)stat); break; - default: - assert(0); - hres = E_FAIL; + DEFAULT_UNREACHABLE; } if(stat_ctx) {

1 0

Alexandre Julliard : exception.h: Android doesn't have sigsetjmp.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 34ff565708e6462940019a8d342ac823220f0794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ff565708e6462940019a8d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 12:04:38 2013 +0100 exception.h: Android doesn't have sigsetjmp. --- include/wine/exception.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 8b807c1..9f9b339 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -88,7 +88,7 @@ extern "C" { #else /* USE_COMPILER_EXCEPTIONS */ -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__ANDROID__) #define sigjmp_buf jmp_buf #define sigsetjmp(buf,sigs) setjmp(buf) #define siglongjmp(buf,val) longjmp(buf,val)

1 0

Alexandre Julliard : winefile: Pass a value instead of a pointer to avoid type mismatch warnings.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: c0e85b9fe6a1d4a58b621e29e0cd0359c2685d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e85b9fe6a1d4a58b621e29e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 12:47:07 2013 +0100 winefile: Pass a value instead of a pointer to avoid type mismatch warnings. --- programs/winefile/winefile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 23388c1..65f0149 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -465,9 +465,9 @@ static Entry* read_tree_win(Root* root, LPCWSTR path, SORT_ORDER sortOrder, HWND #ifdef __WINE__ -static BOOL time_to_filetime(const time_t* t, FILETIME* ftime) +static BOOL time_to_filetime(time_t t, FILETIME* ftime) { - struct tm* tm = gmtime(t); + struct tm* tm = gmtime(&t); SYSTEMTIME stime; if (!tm) @@ -534,8 +534,8 @@ static void read_directory_unix(Entry* dir, LPCWSTR path) entry->data.nFileSizeHigh = st.st_size >> 32; memset(&entry->data.ftCreationTime, 0, sizeof(FILETIME)); - time_to_filetime(&st.st_atime, &entry->data.ftLastAccessTime); - time_to_filetime(&st.st_mtime, &entry->data.ftLastWriteTime); + time_to_filetime(st.st_atime, &entry->data.ftLastAccessTime); + time_to_filetime(st.st_mtime, &entry->data.ftLastWriteTime); entry->bhfi.nFileIndexLow = ent->d_ino; entry->bhfi.nFileIndexHigh = 0;

1 0

Alexandre Julliard : msi: Avoid intermediate variables when calling create_record.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 33aa647e64bc310575443955131bdcae5c32e7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=33aa647e64bc3105754439551… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 12:47:30 2013 +0100 msi: Avoid intermediate variables when calling create_record. --- dlls/msi/automation.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 0b12e29..228d887 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1203,11 +1203,7 @@ static HRESULT view_invoke( V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiViewFetch(This->msiHandle, &msiHandle)) == ERROR_SUCCESS) { - IDispatch *dispatch = NULL; - - if (SUCCEEDED(hr = create_record(msiHandle, &dispatch))) - V_DISPATCH(pVarResult) = dispatch; - else + if (FAILED(hr = create_record(msiHandle, &V_DISPATCH(pVarResult)))) ERR("Failed to create Record object, hresult 0x%08x\n", hr); } else if (ret == ERROR_NO_MORE_ITEMS) @@ -1684,7 +1680,6 @@ static HRESULT InstallerImpl_CreateRecord(WORD wFlags, HRESULT hr; VARIANTARG varg0; MSIHANDLE hrec; - IDispatch* dispatch; if (!(wFlags & DISPATCH_METHOD)) return DISP_E_MEMBERNOTFOUND; @@ -1700,11 +1695,7 @@ static HRESULT InstallerImpl_CreateRecord(WORD wFlags, if (!hrec) return DISP_E_EXCEPTION; - hr = create_record(hrec, &dispatch); - if (SUCCEEDED(hr)) - V_DISPATCH(pVarResult) = dispatch; - - return hr; + return create_record(hrec, &V_DISPATCH(pVarResult)); } static HRESULT InstallerImpl_OpenPackage(AutomationObject* This,

1 0

Nikolay Sivov : msxml3: Process CDATA section before reporting it.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 6874bf3c4ed75c0acb2b1f15fb00278656b44200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6874bf3c4ed75c0acb2b1f15f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 15:04:59 2013 +0400 msxml3: Process CDATA section before reporting it. --- dlls/msxml3/saxreader.c | 155 +++++++++++++++++++++++-------------- dlls/msxml3/tests/saxreader.c | 175 ++++++++++++++++++++++++++++++----------- 2 files changed, 225 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6874bf3c4ed75c0acb2b1…

1 0

Piotr Caban : wininet: Don't create cache file if it's forbidden.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: bbbc6d119bd353a71dc475d61358372342a388b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbc6d119bd353a71dc475d61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:05:41 2013 +0100 wininet: Don't create cache file if it's forbidden. --- dlls/wininet/http.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a019095..a3f68ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2261,15 +2261,35 @@ static void commit_cache_entry(http_request_t *req) static void create_cache_entry(http_request_t *req) { + static const WCHAR no_cacheW[] = {'n','o','-','c','a','c','h','e',0}; + static const WCHAR no_storeW[] = {'n','o','-','s','t','o','r','e',0}; + WCHAR url[INTERNET_MAX_URL_LENGTH]; WCHAR file_name[MAX_PATH+1]; - BOOL b; + BOOL b = TRUE; /* FIXME: We should free previous cache file earlier */ heap_free(req->cacheFile); CloseHandle(req->hCacheFile); req->hCacheFile = NULL; + if(req->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) + b = FALSE; + + if(b) { + int header_idx = HTTP_GetCustomHeaderIndex(req, szCache_Control, 0, FALSE); + if(header_idx!=-1 && (!strcmpiW(req->custHeaders[header_idx].lpszValue, no_cacheW) + || !strcmpiW(req->custHeaders[header_idx].lpszValue, no_storeW))) + b = FALSE; + } + + if(!b) { + if(!(req->hdr.dwFlags & INTERNET_FLAG_NEED_FILE)) + return; + + FIXME("INTERNET_FLAG_NEED_FILE is not supported correctly\n"); + } + b = HTTP_GetRequestURL(req, url); if(!b) { WARN("Could not get URL\n");

1 0

Piotr Caban : wininet: Test if cache entry is created when INTERNET_FLAG_NO_CACHE_WRITE flag is used .
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 9d6843a8c1f0eaa041e49126f3318055976f216f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6843a8c1f0eaa041e49126f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:05:51 2013 +0100 wininet: Test if cache entry is created when INTERNET_FLAG_NO_CACHE_WRITE flag is used. --- dlls/wininet/tests/http.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c2607dc..eeec7c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1072,6 +1072,10 @@ static void InternetOpenUrlA_test(void) DWORD size, readbytes, totalbytes=0; BOOL ret; + ret = DeleteUrlCacheEntry(TEST_URL); + ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, + "DeleteUrlCacheEntry returned %x, GetLastError() = %d\n", ret, GetLastError()); + myhinternet = InternetOpen("Winetest",0,NULL,NULL,INTERNET_FLAG_NO_CACHE_WRITE); ok((myhinternet != 0), "InternetOpen failed, error %u\n",GetLastError()); size = 0x400; @@ -1093,6 +1097,9 @@ static void InternetOpenUrlA_test(void) InternetCloseHandle(myhttp); InternetCloseHandle(myhinternet); + + ret = DeleteUrlCacheEntry(TEST_URL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "INTERNET_FLAG_NO_CACHE_WRITE flag doesn't work\n"); } static void HttpSendRequestEx_test(void)

1 0

Piotr Caban : wininet: Added tests for Cache-Control: no-cache and no-store HTTP headers.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 0e0f06412af753cf1925074fd52f859f27a697b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0f06412af753cf1925074fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:06:01 2013 +0100 wininet: Added tests for Cache-Control: no-cache and no-store HTTP headers. --- dlls/wininet/tests/http.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index eeec7c5..ae7f436 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2015,6 +2015,16 @@ static DWORD CALLBACK server_thread(LPVOID param) WaitForSingleObject(conn_close_event, INFINITE); trace("closing connection\n"); } + if (strstr(buffer, "GET /test_cache_control_no_cache")) + { + static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n\r\nsome content"; + send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + } + if (strstr(buffer, "GET /test_cache_control_no_store")) + { + static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: No-StOrE\r\n\r\nsome content"; + send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + } shutdown(c, 2); closesocket(c); @@ -2474,6 +2484,63 @@ static void test_conn_close(int port) CloseHandle(hCompleteEvent); } +static void test_no_cache(int port) +{ + static const char cache_control_no_cache[] = "/test_cache_control_no_cache"; + static const char cache_control_no_store[] = "/test_cache_control_no_store"; + static const char cache_url_fmt[] = "http://localhost:%d%s"; + + char cache_url[256], buf[256]; + HINTERNET ses, con, req; + DWORD read, size; + BOOL ret; + + trace("Testing no-cache header\n"); + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed with error %u\n", GetLastError()); + + req = HttpOpenRequest(con, NULL, cache_control_no_cache, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + sprintf(cache_url, cache_url_fmt, port, cache_control_no_cache); + DeleteUrlCacheEntry(cache_url); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf, sizeof(buf), &read) && read) + size += read; + ok(size == 12, "read %d bytes of data\n", size); + InternetCloseHandle(req); + + ret = DeleteUrlCacheEntry(cache_url); + ok(!ret && GetLastError()==ERROR_FILE_NOT_FOUND, "cache entry should not exist\n"); + + req = HttpOpenRequest(con, NULL, cache_control_no_store, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + sprintf(cache_url, cache_url_fmt, port, cache_control_no_store); + DeleteUrlCacheEntry(cache_url); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf, sizeof(buf), &read) && read) + size += read; + ok(size == 12, "read %d bytes of data\n", size); + InternetCloseHandle(req); + + ret = DeleteUrlCacheEntry(cache_url); + ok(!ret && GetLastError()==ERROR_FILE_NOT_FOUND, "cache entry should not exist\n"); + + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_HttpSendRequestW(int port) { static const WCHAR header[] = {'U','A','-','C','P','U',':',' ','x','8','6',0}; @@ -2951,6 +3018,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_conn_close(si.port); + test_no_cache(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0