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

Ken Thomases : winemac: Enable pasteboard functions to operate on arbitrary pasteboards.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 4ae5b106f80eb29ed0b05b74edf054b622fb7ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae5b106f80eb29ed0b05b74e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:04 2013 -0500 winemac: Enable pasteboard functions to operate on arbitrary pasteboards. ... not just the general pasteboard (although the general pasteboard is still the default). --- dlls/winemac.drv/clipboard.c | 12 ++++++------ dlls/winemac.drv/cocoa_clipboard.m | 22 ++++++++++++++-------- dlls/winemac.drv/macdrv_cocoa.h | 4 ++-- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 2219df6..4a6f859 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1326,7 +1326,7 @@ INT CDECL macdrv_CountClipboardFormats(void) return 0; } - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1396,7 +1396,7 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) TRACE("prev_format %s\n", debugstr_format(prev_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1490,7 +1490,7 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1526,7 +1526,7 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) if (best_format) { - CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(best_type); + CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(NULL, best_type); TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); @@ -1556,7 +1556,7 @@ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1758,7 +1758,7 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) if (!types) { - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 8d29326..b8ca796 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -53,8 +53,9 @@ int macdrv_is_pasteboard_owner(void) * the pasteboard, or NULL on error. The caller is responsible for * releasing the returned array with CFRelease(). */ -CFArrayRef macdrv_copy_pasteboard_types(void) +CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) { + NSPasteboard* pb = (NSPasteboard*)pasteboard; __block CFArrayRef ret = NULL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -79,8 +80,11 @@ CFArrayRef macdrv_copy_pasteboard_types(void) OnMainThread(^{ @try { - NSPasteboard* pb = [NSPasteboard generalPasteboard]; - NSArray* types = [pb types]; + NSPasteboard* local_pb = pb; + NSArray* types; + + if (!local_pb) local_pb = [NSPasteboard generalPasteboard]; + types = [local_pb types]; // If there are any types understood by NSBitmapImageRep, then we // can offer all of the types that it can output, too. For example, @@ -115,22 +119,24 @@ CFArrayRef macdrv_copy_pasteboard_types(void) * if there's no such type on the pasteboard. The caller is responsible * for releasing the returned data object with CFRelease(). */ -CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) +CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) { + NSPasteboard* pb = (NSPasteboard*)pasteboard; __block NSData* ret = nil; OnMainThread(^{ @try { - NSPasteboard* pb = [NSPasteboard generalPasteboard]; - if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) - ret = [[pb dataForType:(NSString*)type] copy]; + NSPasteboard* local_pb = pb; + if (!local_pb) local_pb = [NSPasteboard generalPasteboard]; + if ([local_pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) + ret = [[local_pb dataForType:(NSString*)type] copy]; else { NSNumber* bitmapType = [BitmapOutputTypeMap objectForKey:(NSString*)type]; if (bitmapType) { - NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:pb]; + NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:local_pb]; ret = [NSBitmapImageRep representationOfImageRepsInArray:reps usingType:[bitmapType unsignedIntegerValue] properties:nil]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index bbd3424..95a3720 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -304,8 +304,8 @@ extern CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard /* clipboard */ -extern CFArrayRef macdrv_copy_pasteboard_types(void) DECLSPEC_HIDDEN; -extern CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) DECLSPEC_HIDDEN; +extern CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) DECLSPEC_HIDDEN; +extern CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) DECLSPEC_HIDDEN; extern int macdrv_is_pasteboard_owner(void) DECLSPEC_HIDDEN; extern void macdrv_clear_pasteboard(void) DECLSPEC_HIDDEN; extern int macdrv_set_pasteboard_data(CFStringRef type, CFDataRef data, macdrv_window w) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot: Integrate the WineTestBot with the patches website.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: tools Branch: master Commit: 62142e91529892c3d7a70b842c31158d2ca00203 URL: http://source.winehq.org/git/tools.git/?a=commit;h=62142e91529892c3d7a70b84… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:03:36 2013 +0100 testbot: Integrate the WineTestBot with the patches website. This lets the WineTestBot create jobs for each patch sent to wine-patches. However for now the part that sends the results back to the patches website is disabled to preserve compatibility with the old WineTestBot (see WineSendLog.pl). --- testbot/bin/Engine.pl | 65 -------------- testbot/bin/WinePatchesWebGet.pl | 108 ------------------------ testbot/bin/WinePatchesWebNotify.pl | 55 ------------ testbot/bin/WinePatchesWebSubmit.pl | 92 ++++++++++++++++++++ testbot/bin/WineSendLog.pl | 92 ++++++++++---------- testbot/doc/INSTALL.txt | 21 +---- testbot/lib/WineTestBot/Config.pm | 4 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 4 - testbot/lib/WineTestBot/Engine/Notify.pm | 20 +---- 9 files changed, 146 insertions(+), 315 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=62142e91529892c3d7a7…

1 0

Piotr Caban : wininet: Rename CACHEFILE_ENTRY to entry_header.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 9d98ced7eccd200d81d625828c20ae499bca0b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d98ced7eccd200d81d625828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:16:23 2013 +0100 wininet: Rename CACHEFILE_ENTRY to entry_header. --- dlls/wininet/urlcache.c | 156 +++++++++++++++++++++++------------------------ 1 files changed, 76 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d98ced7eccd200d81d62…

1 0

Piotr Caban : wininet: Test if cache entry is created when INTERNET_FLAG_NO_CACHE_WRITE flag is used .
by Alexandre Julliard March 13, 2013

March 13, 2013

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: Don't create cache file if it's forbidden.
by Alexandre Julliard March 13, 2013

March 13, 2013

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

Alexandre Julliard : msi: Avoid intermediate variables when calling create_record.
by Alexandre Julliard March 13, 2013

March 13, 2013

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

Alexandre Julliard : exception.h: Android doesn't have sigsetjmp.
by Alexandre Julliard March 13, 2013

March 13, 2013

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

Jacek Caban : vbscript: Use DEFAULT_UNREACHABLE macro where appropriate.
by Alexandre Julliard March 13, 2013

March 13, 2013

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

Dmitry Timoshkov : gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region .
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 61dafbb7012061fda7a737daf24340ce927ce2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=61dafbb7012061fda7a737daf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 13 16:30:45 2013 +0900 gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a450ded..eb3f228 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -349,7 +349,7 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) { - return GdipGetRegionHRgn(graphics->clip, graphics, hrgn); + return GdipGetRegionHRgn(graphics->clip, NULL, hrgn); } /* Draw non-premultiplied ARGB data to the given graphics object */

1 0

Alexandre Julliard : winefile: Pass a value instead of a pointer to avoid type mismatch warnings.
by Alexandre Julliard March 13, 2013

March 13, 2013

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

Jacek Caban : jscript: Use DEFAULT_UNREACHABLE macro where appropriate.
by Alexandre Julliard March 13, 2013

March 13, 2013

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

Andrew Talbot : wininet: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: ae77b3d368519b5518dbe485dfac2e8123b5a477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae77b3d368519b5518dbe485d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 12 22:28:49 2013 +0000 wininet: Avoid signed-unsigned integer comparisons. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 6 +++--- dlls/wininet/netconnection.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 498e848..a019095 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4050,7 +4050,7 @@ static WORD HTTP_ParseWkday(LPCWSTR day) { 't','h','u',0 }, { 'f','r','i',0 }, { 's','a','t',0 }}; - int i; + unsigned int i; for (i = 0; i < sizeof(days)/sizeof(*days); i++) if (!strcmpiW(day, days[i])) return i; @@ -4313,7 +4313,7 @@ static WORD HTTP_ParseWeekday(LPCWSTR day) { 't','h','u','r','s','d','a','y',0 }, { 'f','r','i','d','a','y',0 }, { 's','a','t','u','r','d','a','y',0 }}; - int i; + unsigned int i; for (i = 0; i < sizeof(days)/sizeof(*days); i++) if (!strcmpiW(day, days[i])) return i; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 384516c..b6e6948 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2836,7 +2836,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_PER_CONNECTION_OPTION: { INTERNET_PER_CONN_OPTION_LISTW *con = lpBuffer; LONG res; - int i; + unsigned int i; proxyinfo_t pi; INTERNET_LoadProxySettings(&pi); @@ -2950,7 +2950,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, wbuffer, wlen ); break; case INTERNET_OPTION_PER_CONNECTION_OPTION: { - int i; + unsigned int i; INTERNET_PER_CONN_OPTION_LISTW *listW; INTERNET_PER_CONN_OPTION_LISTA *listA = lpBuffer; wlen = sizeof(INTERNET_PER_CONN_OPTION_LISTW); @@ -3019,7 +3019,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, if (dwOption == INTERNET_OPTION_PER_CONNECTION_OPTION) { INTERNET_PER_CONN_OPTION_LISTW *list = wbuffer; - int i; + unsigned int i; for (i = 0; i < list->dwOptionCount; ++i) { INTERNET_PER_CONN_OPTIONW *opt = list->pOptions + i; switch (opt->dwOption) { diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 3564282..c33f45a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -477,7 +477,7 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static DWORD init_openssl(void) { #ifdef SONAME_LIBCRYPTO - int i; + unsigned int i; if(OpenSSL_ssl_handle) return ERROR_SUCCESS; @@ -730,7 +730,7 @@ void NETCON_unload(void) } if (ssl_locks) { - int i; + unsigned int i; for (i = 0; i < num_ssl_locks; i++) { ssl_locks[i].DebugInfo->Spare[0] = 0;

1 0

Vincent Povirk : gdiplus: Correct EMF record size calculation.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: a424968482d10356a5987bc08c66061dca5402e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a424968482d10356a5987bc08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 12 15:54:41 2013 -0500 gdiplus: Correct EMF record size calculation. --- dlls/gdiplus/metafile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ae905fc..f03557b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -410,7 +410,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (record) { record->iType = recordType; - record->nSize = dataSize; + record->nSize = dataSize + 8; memcpy(record->dParm, data, dataSize); PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table,

1 0

Piotr Caban : wininet: Rename URL_CACHEFILE_ENTRY to entry_url.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: a448427bf957be91395ed087a3d3d9777ab85a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a448427bf957be91395ed087a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:16:42 2013 +0100 wininet: Rename URL_CACHEFILE_ENTRY to entry_url. --- dlls/wininet/urlcache.c | 382 +++++++++++++++++++++++------------------------ 1 files changed, 190 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a448427bf957be91395ed…

1 0

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

March 13, 2013

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

Nikolay Sivov : msxml3: Process CDATA section before reporting it.
by Alexandre Julliard March 13, 2013

March 13, 2013

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

Jacek Caban : winnt.h: Added GCC variant of DEFAULT_UNREACHABLE macro.
by Alexandre Julliard March 13, 2013

March 13, 2013

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

Vincent Povirk : gdiplus: Also get a DC for drawing WMF images.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 6214e5b92cf79eade02fc5abaa72b38ef78c2d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6214e5b92cf79eade02fc5aba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 12 15:53:55 2013 -0500 gdiplus: Also get a DC for drawing WMF images. --- dlls/gdiplus/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4345ece..ae905fc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -536,7 +536,9 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, memcpy(real_metafile->playback_points, destPoints, sizeof(PointF) * 3); stat = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, real_metafile->playback_points, 3); - if (stat == Ok && metafile->metafile_type == MetafileTypeEmf) + if (stat == Ok && (metafile->metafile_type == MetafileTypeEmf || + metafile->metafile_type == MetafileTypeWmfPlaceable || + metafile->metafile_type == MetafileTypeWmf)) stat = METAFILE_PlaybackGetDC((GpMetafile*)metafile); if (stat == Ok)

1 0

Francois Gouget : testbot: Tighten handling of the VM status in the task scripts.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: aae43a05737a693f784c8a719b6084b44c5411fc URL: http://source.winehq.org/git/tools.git/?a=commit;h=aae43a05737a693f784c8a71… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:52:30 2013 +0100 testbot: Tighten handling of the VM status in the task scripts. --- testbot/bin/WineRunBuild.pl | 15 +++++++++++++-- testbot/bin/WineRunReconfig.pl | 17 ++++++++++++++--- testbot/bin/WineRunTask.pl | 15 ++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 236d3d0..3f5b592 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -61,8 +61,11 @@ sub FatalError($$$$) $Job->UpdateStatus(); my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + } TaskComplete($JobKey, $StepKey, $TaskKey); exit 1; @@ -217,6 +220,13 @@ if (! defined($BaseName)) FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) @@ -224,6 +234,7 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + my $FileName = $Step->FileName; if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 7588045..0333705 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -61,8 +61,11 @@ sub FatalError($$$$) $Job->UpdateStatus(); my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + } TaskComplete($JobKey, $StepKey, $TaskKey); exit 1; @@ -190,13 +193,21 @@ my $FullRawlogFileName = "$TaskDir/rawlog"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +if (defined $ErrMessage) { FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + my $Script = "#!/bin/sh\n" . "rm -f Reconfig.log\n" . "../bin/build/Reconfig.pl >>Reconfig.log 2>&1\n"; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ffbb421..abb92e0 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -204,9 +204,16 @@ my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; my $FullScreenshotFileName = "$TaskDir/screenshot.png"; +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Step, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +if (defined $ErrMessage) { FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; @@ -349,10 +356,8 @@ if (!defined $TestFailures) $Task->TestFailures($TestFailures); $Task->Save(); $Job->UpdateStatus(); -if ($Task->VM->Role ne "base") -{ - $Task->VM->PowerOff(); -} + +$VM->PowerOff() if ($VM->Role ne "base"); $VM->Status('dirty'); $VM->Save();

1 0

Francois Gouget : testbot/build: Staging is handled before starting the build task.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 90a5a8d483a7132871465580f8f841e9fa97eb21 URL: http://source.winehq.org/git/tools.git/?a=commit;h=90a5a8d483a7132871465580… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:51:08 2013 +0100 testbot/build: Staging is handled before starting the build task. --- testbot/bin/WineRunBuild.pl | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 7fd87b2..236d3d0 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -217,15 +217,8 @@ if (! defined($BaseName)) FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } -my $ErrMessage = $Step->HandleStaging($JobId); -if (defined($ErrMessage)) -{ - FatalError "$ErrMessage\n", $FullErrFileName, $Job, $Task; -} - $VM->Status('running'); -my $ErrProperty; -($ErrProperty, $ErrMessage) = $VM->Save(); +my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) { FatalError "Can't set VM status to running: $ErrMessage\n",

1 0

Francois Gouget : testbot/build: Remove an unused variable in WineRunBuild. pl.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: d26f41afd04edda9c8a23a56217ab6922deadbb2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d26f41afd04edda9c8a23a56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:49:58 2013 +0100 testbot/build: Remove an unused variable in WineRunBuild.pl. --- testbot/bin/WineRunBuild.pl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 20a43da..728777a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -186,7 +186,6 @@ my $TA = $VM->GetAgent(); LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; -my $RptFileName = $VM->Name . ".rpt"; my $StepDir = "$DataDir/jobs/$JobId/$StepNo"; my $TaskDir = "$StepDir/$TaskNo"; my $FullRawlogFileName = "$TaskDir/rawlog";

1 0

Francois Gouget : testbot/TestAgent: Enable libssh2 compression.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: b64151902405857b6a193e60782872470c482e96 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b64151902405857b6a193e60… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:51 2013 +0100 testbot/TestAgent: Enable libssh2 compression. --- testbot/lib/WineTestBot/TestAgent.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f3d5f0a..2b834f7 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -858,6 +858,11 @@ sub _Connect($) require Net::SSH2; $self->{ssh} = Net::SSH2->new(); $self->{ssh}->debug(1) if ($Debug > 1); + + # Set up compression + $self->{ssh}->method('COMP_CS', 'zlib', 'none'); + $self->{ssh}->method('COMP_SC', 'zlib', 'none'); + if (!$self->{ssh}->connect($self->{sshfd})) { $self->_SetError($FATAL, "Unable to connect to the SSH server: " . $self->_ssherror());

1 0

Francois Gouget : testbot/build: Clean up FatalError() and stop abusing it.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 4c9e159874c219053ce5e9ba1d3964912f8d0987 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4c9e159874c219053ce5e9ba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:51:01 2013 +0100 testbot/build: Clean up FatalError() and stop abusing it. If not given an error file and a task it's equivalent to a simple LogMsg() + exit(). --- testbot/bin/WineRunBuild.pl | 91 +++++++++++++++++++--------------------- testbot/bin/WineRunReconfig.pl | 85 ++++++++++++++++++------------------- testbot/bin/WineRunTask.pl | 90 ++++++++++++++++++--------------------- 3 files changed, 125 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=4c9e159874c219053ce5…

1 0

Francois Gouget : testbot: Document the user account management procedures.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: eb909209aa2686f6fd5ba093e39fbb11b9ce35d6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eb909209aa2686f6fd5ba093… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:37:38 2013 +0100 testbot: Document the user account management procedures. --- testbot/README | 25 +++++++++++++++++++++++++ testbot/doc/INSTALL.txt | 3 +++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/testbot/README b/testbot/README index 4f4cbc9..f15f82a 100644 --- a/testbot/README +++ b/testbot/README @@ -68,3 +68,28 @@ WineTestBot: --------------- See the doc/INSTALL.txt file. + + +5. USER ACCOUNT MANAGEMENT +-------------------------- + +When a user asks for an account, a provisional account is created immediately +but has to be 'activated' before it can be used. Also an email is sent to the +WineTestBot administrators. + +If the request is considered to be illegitimate / spam, the administrator +should directly delete the provisional account. Otherwise the account should +be approved. + +Approving the account will generate a 'password reset code' and send an email +to the user with a URL to visit to set the account password. That will activate +the account and make it usable. + + +Notes: +* Existing accounts can be suspended by unchecking the 'active' field. This + prevents the user from logging in and changing the password. +* Only accounts that have the 'wine-devel' role can submit jobs. So + administrators who also want to submit jobs should add it to their account + (see the doc/INSTALL.txt file). +* FIXME: Document how the LDAP integration works. diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4c14668..a5655ec 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -58,6 +58,9 @@ General setup for the web site: the resetcode you just updated and a new password. - Make yourself admin by adding a row to UserRoles: mysql> insert into UserRoles values('<username>', 'admin'); +- If you want to be able to submit jobs from the same account you will likely + need to also give it the 'wine-devel' role: + mysql> insert into UserRoles values('<username>', wine-devel); - When you refresh the home page, you should now have an "Admin" menu in the sidebar.

1 0

Francois Gouget : testbot/TestAgent: Time the file transfers to provide speed statistics.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 0dede3eb003bb3682ec3ce22ba10fb8daa2880a2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0dede3eb003bb3682ec3ce22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:45 2013 +0100 testbot/TestAgent: Time the file transfers to provide speed statistics. --- testbot/lib/WineTestBot/TestAgent.pm | 37 ++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 074e4f0..f3d5f0a 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -53,6 +53,36 @@ sub debug(@) print STDERR @_ if ($Debug); } +my $time_hires; +sub now() +{ + local $@; + $time_hires=eval { require Time::HiRes } if (!defined $time_hires); + return eval { Time::HiRes::time() } if ($time_hires); + return time(); +} + +sub trace_speed($$) +{ + if ($Debug) + { + my ($Bytes, $Elapsed) = @_; + my $Speed = ""; + if ($Elapsed) + { + $Speed = $Bytes * 8 / $Elapsed / 1000; + $Speed = $Speed < 1000 ? sprintf(" (%.1fKb/s)", $Speed) : + sprintf(" (%.1fMb/s)", $Speed / 1000); + } + $Bytes = $Bytes < 8 * 1024 ? "$Bytes bytes" : + $Bytes < 8 * 1024 * 1024 ? sprintf("%.1fKiB", $Bytes / 1024) : + sprintf("%.1fMiB", $Bytes / 1024 / 1024); + $Elapsed = $Elapsed < 1 ? sprintf("%.1fms", $Elapsed * 1000) : + sprintf("%.1fs", $Elapsed); + debug("Transferred $Bytes in $Elapsed$Speed\n"); + } +} + sub new($$$;$) { my ($class, $Hostname, $Port, $Tunnel) = @_; @@ -396,6 +426,7 @@ sub _RecvFile($$$) my $Size = $self->_ExpectEntryHeader('d'); return undef if (!defined $Size); + my ($Bytes, $Start) = (0, now()); my $Success; eval { @@ -421,6 +452,7 @@ sub _RecvFile($$$) } $Size -= $r; my $w = syswrite($Dst, $Buffer, $r, 0); + $Bytes += $w if (defined $w); if (!defined $w or $w != $r) { alarm(0); @@ -437,6 +469,8 @@ sub _RecvFile($$$) $@ = "timed out while receiving '$Filename'" if ($@ =~ /^timeout /); $self->_SetError($FATAL, $@); } + + trace_speed($Bytes, now() - $Start); return $Success; } @@ -701,6 +735,7 @@ sub _SendFile($$$) return undef if (!defined $self->{fd}); debug(" SendFile($Filename)\n"); + my ($Bytes, $Start) = (0, now()); my $Success; eval { @@ -743,6 +778,8 @@ sub _SendFile($$$) $@ = "timed out while sending '$Filename'" if ($@ =~ /^timeout /); $self->_SetError($FATAL, $@); } + + trace_speed($Bytes, now() - $Start); return $Success; }

1 0