wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Jacek Caban : jscript: Moved property creation out of find_prop_name_prot.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 10c99b5735e4a868f076036b2cf08e704741a5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c99b5735e4a868f076036b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:15:07 2010 +0100 jscript: Moved property creation out of find_prop_name_prot. --- dlls/jscript/dispex.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 19fdd56..f2c22a9 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -160,7 +160,7 @@ static HRESULT find_prop_name(DispatchEx *This, const WCHAR *name, dispex_prop_t return S_OK; } -static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, BOOL alloc, dispex_prop_t **ret) +static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, dispex_prop_t **ret) { dispex_prop_t *prop; HRESULT hres; @@ -174,7 +174,7 @@ static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, BOOL all } if(This->prototype) { - hres = find_prop_name_prot(This->prototype, name, FALSE, &prop); + hres = find_prop_name_prot(This->prototype, name, &prop); if(FAILED(hres)) return hres; if(prop) { @@ -186,17 +186,27 @@ static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, BOOL all } } - if(alloc) { + *ret = prop; + return S_OK; +} + +static HRESULT ensure_prop_name(DispatchEx *This, const WCHAR *name, DWORD create_flags, dispex_prop_t **ret) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name_prot(This, name, &prop); + if(SUCCEEDED(hres) && !prop) { TRACE("creating prop %s\n", debugstr_w(name)); - prop = alloc_prop(This, name, PROP_VARIANT, PROPF_ENUM); + prop = alloc_prop(This, name, PROP_VARIANT, create_flags); if(!prop) return E_OUTOFMEMORY; VariantInit(&prop->u.var); } *ret = prop; - return S_OK; + return hres; } static HRESULT set_this(DISPPARAMS *dp, DISPPARAMS *olddp, IDispatch *jsthis) @@ -789,7 +799,7 @@ HRESULT init_dispex_from_constr(DispatchEx *dispex, script_ctx_t *ctx, const bui static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; - hres = find_prop_name_prot(constr, prototypeW, FALSE, &prop); + hres = find_prop_name_prot(constr, prototypeW, &prop); if(SUCCEEDED(hres) && prop) { jsexcept_t jsexcept; VARIANT var; @@ -831,7 +841,10 @@ HRESULT jsdisp_get_id(DispatchEx *jsdisp, const WCHAR *name, DWORD flags, DISPID dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(jsdisp, name, (flags&fdexNameEnsure) != 0, &prop); + if(flags & fdexNameEnsure) + hres = ensure_prop_name(jsdisp, name, PROPF_ENUM, &prop); + else + hres = find_prop_name_prot(jsdisp, name, &prop); if(FAILED(hres)) return hres; @@ -878,7 +891,7 @@ HRESULT jsdisp_call_name(DispatchEx *disp, const WCHAR *name, WORD flags, DISPPA dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(disp, name, FALSE, &prop); + hres = find_prop_name_prot(disp, name, &prop); if(FAILED(hres)) return hres; @@ -933,7 +946,7 @@ HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, VARIANT *val, js dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(obj, name, TRUE, &prop); + hres = ensure_prop_name(obj, name, PROPF_ENUM, &prop); if(FAILED(hres)) return hres; @@ -992,7 +1005,7 @@ HRESULT jsdisp_propget_name(DispatchEx *obj, const WCHAR *name, VARIANT *var, js dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(obj, name, FALSE, &prop); + hres = find_prop_name_prot(obj, name, &prop); if(FAILED(hres)) return hres; @@ -1014,7 +1027,7 @@ HRESULT jsdisp_get_idx(DispatchEx *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, sprintfW(name, formatW, idx); - hres = find_prop_name_prot(obj, name, FALSE, &prop); + hres = find_prop_name_prot(obj, name, &prop); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Don't try to create property in jsdisp_call_name.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: bf17483a195493bb5016ef604b91be04c8a9d5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf17483a195493bb5016ef604… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:14:35 2010 +0100 jscript: Don't try to create property in jsdisp_call_name. --- dlls/jscript/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 492623e..19fdd56 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -878,7 +878,7 @@ HRESULT jsdisp_call_name(DispatchEx *disp, const WCHAR *name, WORD flags, DISPPA dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(disp, name, TRUE, &prop); + hres = find_prop_name_prot(disp, name, FALSE, &prop); if(FAILED(hres)) return hres;

1 0

Alistair Leslie-Hughes : dbghelp: Add basic support for PVOID64.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: d02040d98a7e689dcaf26dc2c9fbc112e523f7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02040d98a7e689dcaf26dc2c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 3 12:41:51 2010 +1100 dbghelp: Add basic support for PVOID64. --- dlls/dbghelp/msc.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b7adabd..ee394cd 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -95,7 +95,7 @@ static void dump(const void* ptr, unsigned len) * Process CodeView type information. */ -#define MAX_BUILTIN_TYPES 0x0480 +#define MAX_BUILTIN_TYPES 0x0604 #define FIRST_DEFINABLE_TYPE 0x1000 static struct symt* cv_basic_types[MAX_BUILTIN_TYPES]; @@ -113,6 +113,7 @@ static struct cv_defined_module*cv_current_module; static void codeview_init_basic_types(struct module* module) { + struct symt_udt* udt; /* * These are the common builtin types that are used by VC++. */ @@ -169,6 +170,12 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_32PINT8] = &symt_new_pointer(module, cv_basic_types[T_INT8])->symt; cv_basic_types[T_32PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8])->symt; cv_basic_types[T_32PHRESULT]= &symt_new_pointer(module, cv_basic_types[T_HRESULT])->symt; + + /* The .pdb file can refer to 64 bit pointers values even on 32 bits applications. */ + udt = symt_new_udt(module, "PVOID64", 8, UdtStruct); + symt_add_udt_element(module, udt, "ptr64_low", cv_basic_types[T_LONG], 0, 32); + symt_add_udt_element(module, udt, "ptr64_high", cv_basic_types[T_LONG], 32, 32); + cv_basic_types[0x603]= &udt->symt; } static int leaf_as_variant(VARIANT* v, const unsigned short int* leaf)

1 0

Vincent Povirk : winemenubuilder: Use a custom error function.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 7f8279e1277f4495c1ab8fd624c73581ec1da2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8279e1277f4495c1ab8fd62… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 5 12:14:18 2010 -0600 winemenubuilder: Use a custom error function. --- programs/winemenubuilder/winemenubuilder.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e14fe81..62165f6 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -188,8 +188,10 @@ static void *libpng_handle; MAKE_FUNCPTR(png_create_info_struct); MAKE_FUNCPTR(png_create_write_struct); MAKE_FUNCPTR(png_destroy_write_struct); +MAKE_FUNCPTR(png_get_error_ptr); MAKE_FUNCPTR(png_init_io); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_error_fn); MAKE_FUNCPTR(png_set_text); MAKE_FUNCPTR(png_set_IHDR); MAKE_FUNCPTR(png_write_end); @@ -209,8 +211,10 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_create_info_struct); LOAD_FUNCPTR(png_create_write_struct); LOAD_FUNCPTR(png_destroy_write_struct); + LOAD_FUNCPTR(png_get_error_ptr); LOAD_FUNCPTR(png_init_io); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_error_fn); LOAD_FUNCPTR(png_set_IHDR); LOAD_FUNCPTR(png_set_text); LOAD_FUNCPTR(png_write_end); @@ -221,6 +225,23 @@ static void *load_libpng(void) return libpng_handle; } +static void user_error_fn(png_structp png_ptr, png_const_charp error_message) +{ + jmp_buf *pjmpbuf; + + /* This uses setjmp/longjmp just like the default. We can't use the + * default because there's no way to access the jmp buffer in the png_struct + * that works in 1.2 and 1.4 and allows us to dynamically load libpng. */ + WINE_ERR("PNG error: %s\n", wine_dbgstr_an(error_message, -1)); + pjmpbuf = ppng_get_error_ptr(png_ptr); + longjmp(*pjmpbuf, 1); +} + +static void user_warning_fn(png_structp png_ptr, png_const_charp warning_message) +{ + WINE_WARN("PNG warning: %s\n", wine_dbgstr_an(warning_message, -1)); +} + static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, LPCWSTR commentW) { static const char comment_key[] = "Created from"; @@ -234,6 +255,7 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, int nWidth = pIcon->bmiHeader.biWidth; int nHeight = pIcon->bmiHeader.biHeight; int nBpp = pIcon->bmiHeader.biBitCount; + jmp_buf jmpbuf; switch (nBpp) { @@ -306,12 +328,12 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, !(info_ptr = ppng_create_info_struct(png_ptr))) goto error; - if (setjmp(png_jmpbuf(png_ptr))) + if (setjmp(jmpbuf)) { /* All future errors jump here */ - WINE_ERR("png error\n"); goto error; } + ppng_set_error_fn(png_ptr, &jmpbuf, user_error_fn, user_warning_fn); ppng_init_io(png_ptr, fp); ppng_set_IHDR(png_ptr, info_ptr, nWidth, nHeight, 8,

1 0

Vitaly Perov : setupapi: Add stub for SetupLogFile{A,W}.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: c7d4b0c69fb8de9a2344c7d9d4bcda6e3feef094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d4b0c69fb8de9a2344c7d9d… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Fri Feb 5 19:46:02 2010 +0300 setupapi: Add stub for SetupLogFile{A,W}. --- dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/stubs.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index bcf88f4..51a5c2e 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -456,8 +456,8 @@ @ stdcall SetupIterateCabinetW(wstr long ptr ptr) @ stub SetupLogErrorA @ stdcall SetupLogErrorW(wstr long) -@ stub SetupLogFileA -@ stub SetupLogFileW +@ stdcall SetupLogFileA(ptr str str str long str str str long) +@ stdcall SetupLogFileW(ptr wstr wstr wstr long wstr wstr wstr long) @ stdcall SetupOpenAppendInfFileA(str long ptr) @ stdcall SetupOpenAppendInfFileW(wstr long ptr) @ stdcall SetupOpenFileQueue() diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 3496c6b..f8e99e0 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -348,3 +348,48 @@ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) FIXME("%u %p 0x%08x: stub\n", index, class, flags); return CR_NO_SUCH_VALUE; } + +/*********************************************************************** + * SetupLogFileW (SETUPAPI.@) + */ +BOOL WINAPI SetupLogFileW( + HSPFILELOG FileLogHandle, + PCWSTR LogSectionName, + PCWSTR SourceFileName, + PCWSTR TargetFileName, + DWORD Checksum, + PCWSTR DiskTagfile, + PCWSTR DiskDescription, + PCWSTR OtherInfo, + DWORD Flags ) +{ + FIXME("(%p, %p, '%s', '%s', %d, %p, %p, %p, %d): stub\n", FileLogHandle, + debugstr_w(LogSectionName), debugstr_w(SourceFileName), + debugstr_w(TargetFileName), Checksum, debugstr_w(DiskTagfile), + debugstr_w(DiskDescription), debugstr_w(OtherInfo), Flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * SetupLogFileA (SETUPAPI.@) + */ +BOOL WINAPI SetupLogFileA( + HSPFILELOG FileLogHandle, + PCSTR LogSectionName, + PCSTR SourceFileName, + PCSTR TargetFileName, + DWORD Checksum, + PCSTR DiskTagfile, + PCSTR DiskDescription, + PCSTR OtherInfo, + DWORD Flags ) +{ + FIXME("(%p, %p, '%s', '%s', %d, %p, %p, %p, %d): stub\n", FileLogHandle, + LogSectionName, SourceFileName, TargetFileName, Checksum, DiskTagfile, + DiskDescription, OtherInfo, Flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Nikolay Sivov : msxml3: Use libxml2 functionality to skip top XML declaration node while writing to file .
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: afad45fffea6be29e7a989d610f3753247f01a79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afad45fffea6be29e7a989d61… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Feb 5 16:25:02 2010 +0300 msxml3: Use libxml2 functionality to skip top XML declaration node while writing to file. --- dlls/msxml3/domdoc.c | 56 +++++++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 4914a7c..a7c1680 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -47,6 +47,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +#include <libxml/xmlsave.h> + static const WCHAR SZ_PROPERTY_SELECTION_LANGUAGE[] = {'S','e','l','e','c','t','i','o','n','L','a','n','g','u','a','g','e',0}; static const WCHAR SZ_VALUE_XPATH[] = {'X','P','a','t','h',0}; static const WCHAR SZ_VALUE_XSLPATTERN[] = {'X','S','L','P','a','t','t','e','r','n',0}; @@ -1651,6 +1653,24 @@ static HRESULT WINAPI domdoc_loadXML( return hr; } +static int XMLCALL domdoc_save_writecallback(void *ctx, const char *buffer, + int len) +{ + DWORD written = -1; + + if(!WriteFile(ctx, buffer, len, &written, NULL)) + { + WARN("write error\n"); + return -1; + } + else + return written; +} + +static int XMLCALL domdoc_save_closecallback(void *ctx) +{ + return CloseHandle(ctx) ? 0 : -1; +} static HRESULT WINAPI domdoc_save( IXMLDOMDocument2 *iface, @@ -1658,10 +1678,8 @@ static HRESULT WINAPI domdoc_save( { domdoc *This = impl_from_IXMLDOMDocument2( iface ); HANDLE handle; - xmlChar *mem, *p; - int size; + xmlSaveCtxtPtr ctx; HRESULT ret = S_OK; - DWORD written; TRACE("(%p)->(var(vt %d, %s))\n", This, V_VT(&destination), V_VT(&destination) == VT_BSTR ? debugstr_w(V_BSTR(&destination)) : NULL); @@ -1707,31 +1725,19 @@ static HRESULT WINAPI domdoc_save( return S_FALSE; } - xmlDocDumpMemory(get_doc(This), &mem, &size); - - /* - * libxml2 always adds XML declaration on top of the file and one for each processing instruction node in DOM tree. - * MSXML adds XML declaration only for processing instruction nodes. - * We skip the first XML declaration generated by libxml2 to get exactly what we need. - */ - p = mem; - if(size > 2 && p[0] == '<' && p[1] == '?') { - while(p < mem+size && (p[0] != '?' || p[1] != '>')) - p++; - p += 2; - while(p < mem+size && isspace(*p)) - p++; - size -= p-mem; - } - - if(!WriteFile(handle, p, (DWORD)size, &written, NULL) || written != (DWORD)size) + /* disable top XML declaration */ + ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, + handle, NULL, XML_SAVE_NO_DECL); + if (!ctx) { - WARN("write error\n"); - ret = S_FALSE; + CloseHandle(handle); + return S_FALSE; } - xmlFree(mem); - CloseHandle(handle); + if (xmlSaveDoc(ctx, get_doc(This)) == -1) ret = S_FALSE; + /* will close file through close callback */ + xmlSaveClose(ctx); + return ret; }

1 0

Alexandre Julliard : winetest: Report the correct source directory for program tests.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: ecb2d7bd935665b51025e1a643efc9e3b4d37d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb2d7bd935665b51025e1a64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 6 20:36:12 2010 +0100 winetest: Report the correct source directory for program tests. --- programs/winetest/main.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a20fa06..e0b9ced 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -300,16 +300,24 @@ static const char* get_test_source_file(const char* test, const char* subtest) { 0, 0 } }; static char buffer[MAX_PATH]; - int i; + int i, len = strlen(test); + + if (len > 4 && !strcmp( test + len - 4, ".exe" )) + { + len = sprintf(buffer, "programs/%s", test) - 4; + buffer[len] = 0; + } + else len = sprintf(buffer, "dlls/%s", test); for (i = 0; special_dirs[i][0]; i++) { if (strcmp(test, special_dirs[i][0]) == 0) { - test = special_dirs[i][1]; + strcpy( buffer, special_dirs[i][1] ); + len = strlen(buffer); break; } } - snprintf(buffer, sizeof(buffer), "dlls/%s/tests/%s.c", test, subtest); + sprintf(buffer + len, "/tests/%s.c", subtest); return buffer; }

1 0

Alexandre Julliard : winetest: Require an email address to submit a report.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 6fae8e1df1bc604b491c75c4d227b66fc33b5f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fae8e1df1bc604b491c75c4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 6 10:21:22 2010 +0100 winetest: Require an email address to submit a report. --- programs/winetest/gui.c | 33 +++++++++++++++++++++++++++++++++ programs/winetest/main.c | 17 +++++++++++++++++ programs/winetest/resource.h | 2 ++ programs/winetest/winetest.h | 2 ++ programs/winetest/winetest.rc | 11 +++++++++++ 5 files changed, 65 insertions(+), 0 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index cb59ac2..7a7b1e0 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -361,6 +361,39 @@ guiAskTag (void) dialog, AskTagProc); } +static INT_PTR CALLBACK +AskEmailProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + int len; + + switch (msg) + { + case WM_COMMAND: + switch (LOWORD (wParam)) { + case IDOK: + len = GetWindowTextLengthA (GetDlgItem (hwnd, IDC_EMAIL)); + if(!len) { + report (R_WARNING, "You must enter an email address to continue"); + return FALSE; + } + email = heap_alloc (len+1); + GetDlgItemTextA (hwnd, IDC_EMAIL, email, len+1); + EndDialog (hwnd, IDOK); + return TRUE; + case IDABORT: + EndDialog (hwnd, IDABORT); + return TRUE; + } + } + return FALSE; +} + +int +guiAskEmail (void) +{ + return DialogBox (GetModuleHandle (NULL), MAKEINTRESOURCE (IDD_EMAIL), dialog, AskEmailProc); +} + /* Quiet functions */ static int qNoOp (va_list ap) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 69b7da6..a20fa06 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -48,6 +48,7 @@ struct wine_test }; char *tag = NULL; +char *email = NULL; static struct wine_test *wine_tests; static int nr_of_files, nr_of_tests; static int nr_native_dlls; @@ -221,6 +222,7 @@ static void print_version (void) xprintf (" Platform=%s%s\n", platform, wow64 ? " (WOW64)" : ""); xprintf (" bRunningUnderWine=%d\n", running_under_wine ()); xprintf (" bRunningOnVisibleDesktop=%d\n", running_on_visible_desktop ()); + xprintf (" Submitter=%s\n", email ); xprintf (" dwMajorVersion=%u\n dwMinorVersion=%u\n" " dwBuildNumber=%u\n PlatformId=%u\n szCSDVersion=%s\n", ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, @@ -921,6 +923,7 @@ usage (void) " -d DIR Use DIR as temp directory (default: %%TEMP%%\\wct)\n" " -e preserve the environment\n" " -h print this message and exit\n" +" -m MAIL an email address to enable developers to contact you\n" " -p shutdown when the tests are done\n" " -q quiet mode, no output at all\n" " -o FILE put report into FILE, do not submit\n" @@ -971,6 +974,13 @@ int main( int argc, char *argv[] ) case '?': usage (); exit (0); + case 'm': + if (!(email = argv[++i])) + { + usage(); + exit( 2 ); + } + break; case 'p': poweroff = 1; break; @@ -1056,6 +1066,13 @@ int main( int argc, char *argv[] ) } report (R_TAG); + while (!email) { + if (!interactive) + report (R_FATAL, "Please specify an email address (-m option) to enable developers\n" + " to contact you about your report if necessary."); + if (guiAskEmail () == IDABORT) exit (1); + } + if (!build_id[0]) report( R_WARNING, "You won't be able to submit results without a valid build id.\n" "To submit results, winetest needs to be built from a git checkout." ); diff --git a/programs/winetest/resource.h b/programs/winetest/resource.h index b0f1646..be71274 100644 --- a/programs/winetest/resource.h +++ b/programs/winetest/resource.h @@ -23,6 +23,7 @@ #define IDD_STATUS 100 #define IDD_ABOUT 101 #define IDD_TAG 102 +#define IDD_EMAIL 103 #define IDC_STATIC -1 @@ -36,6 +37,7 @@ #define IDC_DIR 2000 #define IDC_OUT 2001 #define IDC_TAG 2002 +#define IDC_EMAIL 2002 #define IDC_SB 3000 diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index 945586c..a0d2fbd 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -68,7 +68,9 @@ enum report_type { #define MAXTAGLEN 20 extern char *tag; +extern char *email; int guiAskTag (void); +int guiAskEmail (void); int report (enum report_type t, ...); #endif /* __WINETESTS_H */ diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 52c3430..5b5d6e0 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -35,6 +35,17 @@ BEGIN PUSHBUTTON "Abort", IDABORT, 85, 45, 40, 14 END +IDD_EMAIL DIALOG 0, 0, 150, 65 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "No email supplied" +BEGIN + CTEXT "Please supply an email address to enable developers to contact you about your report." + IDC_STATIC, 10, 5, 130, 30 + EDITTEXT IDC_EMAIL, 10, 30, 130, 10, ES_AUTOHSCROLL + DEFPUSHBUTTON "Start", IDOK, 25, 45, 40, 14 + PUSHBUTTON "Abort", IDABORT, 85, 45, 40, 14 +END + IDD_STATUS DIALOG 0, 0, 160, 150 STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX CAPTION "Wine Test Shell"

1 0

Alexandre Julliard : Wine release 1.1.38
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: website Branch: master Commit: a9ef6bd5e5b5d9399c37674922e00562c134f016 URL: http://source.winehq.org/git/website.git/?a=commit;h=a9ef6bd5e5b5d9399c3767… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 18:38:24 2010 +0100 Wine release 1.1.38 --- news/en/2010020501.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2010020501.xml b/news/en/2010020501.xml new file mode 100644 index 0000000..4f6c19e --- /dev/null +++ b/news/en/2010020501.xml @@ -0,0 +1,18 @@ +<news> +<date>February 5, 2010</date> +<title>Wine 1.1.38 Released</title> +<body> + The Wine development release 1.1.38 is now available. + <a href="{$root}/announce/1.1.38">What's new</a> in this release: +<ul> + <li>Better support for memory allocations debugging.</li> + <li>Improved MIDI support.</li> + <li>A wide range of Direct3D fixes.</li> + <li>OLEDB fixes (should fix Clipart in Office).</li> + <li>Improved debugger support on x86-64.</li> + <li>Many MSI fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.38.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.38 : Alexandre Julliard : Release 1.1.38
by Alexandre Julliard 05 Feb '10

05 Feb '10

Module: wine Branch: refs/tags/wine-1.1.38 Tag: 4fc02f4a34ca127a8943c2d8d14432f588ac2788 URL: http://source.winehq.org/git/wine.git/?a=tag;h=4fc02f4a34ca127a8943c2d8d144… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 5 18:31:35 2010 +0100 Release 1.1.38

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010