wine-commits July 2009

wine-commits@winehq.org

4 participants
1067 discussions

Piotr Caban : jscript: Added Array_slice implementation.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: 2325e2cdb8fe9b7c7eb5de4f4be4a5f4ad3e5909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2325e2cdb8fe9b7c7eb5de4f4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 14 01:36:43 2009 +0200 jscript: Added Array_slice implementation. --- dlls/jscript/array.c | 77 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 17 ++++++++++ 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index e5d6b2d..9b43142 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -421,8 +421,81 @@ static HRESULT Array_shift(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT Array_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *arr; + VARIANT v; + DOUBLE range; + DWORD length, start, end, idx; + HRESULT hres; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_ARRAY)) { + length = ((ArrayInstance*)dispex)->length; + }else { + FIXME("not Array this\n"); + return E_NOTIMPL; + } + + if(arg_cnt(dp)) { + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) == VT_I4) + range = V_I4(&v); + else + range = floor(V_R8(&v)); + + if(-range>length || isnan(range)) start = 0; + else if(range < 0) start = range+length; + else if(range <= length) start = range; + else start = length; + } + else start = 0; + + if(arg_cnt(dp)>1) { + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) == VT_I4) + range = V_I4(&v); + else + range = floor(V_R8(&v)); + + if(-range>length) end = 0; + else if(range < 0) end = range+length; + else if(range <= length) end = range; + else end = length; + } + else end = length; + + hres = create_array(dispex->ctx, (end>start)?end-start:0, &arr); + if(FAILED(hres)) + return hres; + + for(idx=start; idx<end; idx++) { + hres = jsdisp_propget_idx(dispex, idx, lcid, &v, ei, sp); + if(hres == DISP_E_UNKNOWNNAME) + continue; + + if(SUCCEEDED(hres)) + hres = jsdisp_propput_idx(arr, idx-start, lcid, &v, ei, sp); + + if(FAILED(hres)) { + jsdisp_release(arr); + return hres; + } + } + + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(arr); + } + else + jsdisp_release(arr); + + return S_OK; } static HRESULT sort_cmp(script_ctx_t *ctx, DispatchEx *cmp_func, VARIANT *v1, VARIANT *v2, jsexcept_t *ei, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7e3df38..1e3a6dc 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -524,6 +524,23 @@ tmp = arr.concat([2]); ok(tmp.length === 3, "tmp.length = " + tmp.length); ok(tmp[1] === undefined, "tmp[1] = " + tmp[1]); +arr = [1,false,'a',null,undefined,'a']; +ok(arr.slice(0,6).toString() === "1,false,a,,,a", "arr.slice(0,6).toString() = " + arr.slice(0,6)); +ok(arr.slice(0,6).length === 6, "arr.slice(0,6).length = " + arr.slice(0,6).length); +ok(arr.slice().toString() === "1,false,a,,,a", "arr.slice().toString() = " + arr.slice()); +ok(arr.slice("abc").toString() === "1,false,a,,,a", "arr.slice(\"abc\").toString() = " + arr.slice("abc")); +ok(arr.slice(3,8).toString() === ",,a", "arr.slice(3,8).toString() = " + arr.slice(3,8)); +ok(arr.slice(3,8).length === 3, "arr.slice(3,8).length = " + arr.slice(3,8).length); +ok(arr.slice(1).toString() === "false,a,,,a", "arr.slice(1).toString() = " + arr.slice(1)); +ok(arr.slice(-2).toString() === ",a", "arr.slice(-2).toString() = " + arr.slice(-2)); +ok(arr.slice(3,1).toString() === "", "arr.slice(3,1).toString() = " + arr.slice(3,1)); +tmp = arr.slice(0,6); +for(var i=0; i < arr.length; i++) + ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +arr[12] = 2; +ok(arr.slice(5).toString() === "a,,,,,,,2", "arr.slice(5).toString() = " + arr.slice(5).toString()); +ok(arr.slice(5).length === 8, "arr.slice(5).length = " + arr.slice(5).length); + var num = new Number(2); ok(num.toString() === "2", "num(2).toString !== 2"); var num = new Number();

1 0

Piotr Caban : jscript: Added call_expression_eval implementation for EXPRVAL_VARIANT values.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: b6b520e0ed3a78eb0ca0aec260bd2a785501543d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b520e0ed3a78eb0ca0aec26… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 14 01:36:27 2009 +0200 jscript: Added call_expression_eval implementation for EXPRVAL_VARIANT values. --- dlls/jscript/engine.c | 24 ++++++++++++++++++------ dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 00eb087..b744904 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1536,11 +1536,19 @@ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, hres = args_to_param(ctx, expr->argument_list, ei, &dp); if(SUCCEEDED(hres)) { switch(exprval.type) { + case EXPRVAL_VARIANT: + if(V_VT(&exprval.u.var) != VT_DISPATCH) { + FIXME("throw TypeError\n"); + hres = E_NOTIMPL; + break; + } + + hres = disp_call(V_DISPATCH(&exprval.u.var), DISPID_VALUE, ctx->parser->script->lcid, + DISPATCH_METHOD, &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); + break; case EXPRVAL_IDREF: - hres = disp_call(exprval.u.idref.disp, exprval.u.idref.id, ctx->parser->script->lcid, DISPATCH_METHOD, - &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); - if(flags & EXPR_NOVAL) - V_VT(&var) = VT_EMPTY; + hres = disp_call(exprval.u.idref.disp, exprval.u.idref.id, ctx->parser->script->lcid, + DISPATCH_METHOD, &dp, flags & EXPR_NOVAL ? NULL : &var, ei, NULL/*FIXME*/); break; default: FIXME("unimplemented type %d\n", exprval.type); @@ -1554,9 +1562,13 @@ HRESULT call_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, if(FAILED(hres)) return hres; - TRACE("= %s\n", debugstr_variant(&var)); ret->type = EXPRVAL_VARIANT; - ret->u.var = var; + if(flags & EXPR_NOVAL) { + V_VT(&ret->u.var) = VT_EMPTY; + }else { + TRACE("= %s\n", debugstr_variant(&var)); + ret->u.var = var; + } return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b865ad5..a9e0459 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -894,4 +894,6 @@ ok(""+str === "valueOf", "''+str = " + str); str.valueOf = function() { return new Date(); } ok(""+str === "test", "''+str = " + str); +ok((function (){return 1;})() === 1, "(function (){return 1;})() = " + (function (){return 1;})()); + reportSuccess();

1 0

Piotr Caban : jscript: Added implementation of Array constructor called as a function.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: 75cce3cdcdac1c3896c3a3732bf19ce67dfb8a9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cce3cdcdac1c3896c3a3732… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 14 01:36:13 2009 +0200 jscript: Added implementation of Array constructor called as a function. --- dlls/jscript/array.c | 1 + dlls/jscript/tests/api.js | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 6db4d89..e5d6b2d 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -774,6 +774,7 @@ static HRESULT ArrayConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISP TRACE("\n"); switch(flags) { + case DISPATCH_METHOD: case DISPATCH_CONSTRUCT: { if(arg_cnt(dp) == 1 && V_VT((arg_var = get_arg(dp, 0))) == VT_I4) { if(V_I4(arg_var) < 0) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a6895e3..7e3df38 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -501,6 +501,9 @@ arr.length = 3; ok(arr.length === 3, "arr.length = " + arr.length); ok(arr.toString() === "1,,", "arr.toString() = " + arr.toString()); +arr = Array("a","b","c"); +ok(arr.toString() === "a,b,c", "arr.toString() = " + arr.toString()); + ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.valueOf"); ok(arr === arr.valueOf(), "arr !== arr.valueOf");

1 0

Piotr Caban : jscript: Added Array length setting implementation.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: 346619d0933f4b27c344d6b3ac4a626ee5292701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=346619d0933f4b27c344d6b3a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 14 02:06:59 2009 +0200 jscript: Added Array length setting implementation. --- dlls/jscript/array.c | 28 ++++++++++++++++++++++++++++ dlls/jscript/dispex.c | 16 ++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/tests/api.js | 7 +++++++ 4 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 75d3871..6db4d89 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "jscript.h" #include "wine/debug.h" @@ -60,6 +62,32 @@ static HRESULT Array_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM V_VT(retv) = VT_I4; V_I4(retv) = This->length; break; + case DISPATCH_PROPERTYPUT: { + VARIANT num; + DOUBLE len = -1; + DWORD i; + HRESULT hres; + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &num); + if(V_VT(&num) == VT_I4) + len = V_I4(&num); + else + len = floor(V_R8(&num)); + + if(len!=(DWORD)len) { + FIXME("Throw RangeError\n"); + return E_FAIL; + } + + for(i=len; i<This->length; i++) { + hres = jsdisp_delete_idx(dispex, i); + if(FAILED(hres)) + return hres; + } + + This->length = len; + break; + } default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 01f4d49..509fb50 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1010,3 +1010,19 @@ HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexce return hres; } + +HRESULT jsdisp_delete_idx(DispatchEx *obj, DWORD idx) +{ + static const WCHAR formatW[] = {'%','d',0}; + WCHAR buf[12]; + dispex_prop_t *prop; + HRESULT hres; + + sprintfW(buf, formatW, idx); + + hres = find_prop_name(obj, buf, &prop); + if(FAILED(hres) || !prop) + return hres; + + return delete_prop(prop); +} diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 258f3d3..a6c34ba 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -132,6 +132,7 @@ HRESULT jsdisp_propput_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceP HRESULT jsdisp_propget_name(DispatchEx*,LPCWSTR,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propget_idx(DispatchEx*,DWORD,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_get_id(DispatchEx*,const WCHAR*,DWORD,DISPID*); +HRESULT jsdisp_delete_idx(DispatchEx*,DWORD); HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const builtin_info_t*,DWORD, DispatchEx*,DispatchEx**); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index db03fdb..a6895e3 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -494,6 +494,13 @@ ok(arr.sort() === arr, "arr.sort() !== arr"); for(var i=0; i < arr.length; i++) ok(arr[i] === tmp[i], "arr[" + i + "] = " + arr[i] + " expected " + tmp[i]); +arr = ["1", "2", "3"]; +arr.length = 1; +ok(arr.length === 1, "arr.length = " + arr.length); +arr.length = 3; +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr.toString() === "1,,", "arr.toString() = " + arr.toString()); + ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.valueOf"); ok(arr === arr.valueOf(), "arr !== arr.valueOf");

1 0

Roderick Colenbrander : winex11: Use set_xrender_transformation in AlphaBlend.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: eeeb349eee5e25cdf56bda4401a4ef9a621c3a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeeb349eee5e25cdf56bda440… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Jul 13 23:33:15 2009 +0200 winex11: Use set_xrender_transformation in AlphaBlend. --- dlls/winex11.drv/xrender.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cacd30e..6d290ba 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1910,18 +1910,10 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid HeapFree( GetProcessHeap(), 0, rgndata ); } -#ifdef HAVE_XRENDERSETPICTURETRANSFORM - if(!repeat_src && (widthDst != widthSrc || heightDst != heightSrc)) { - double xscale = widthSrc/(double)widthDst; - double yscale = heightSrc/(double)heightDst; - XTransform xform = {{ - { XDoubleToFixed(xscale), XDoubleToFixed(0), XDoubleToFixed(0) }, - { XDoubleToFixed(0), XDoubleToFixed(yscale), XDoubleToFixed(0) }, - { XDoubleToFixed(0), XDoubleToFixed(0), XDoubleToFixed(1) } - }}; - pXRenderSetPictureTransform(gdi_display, src_pict, &xform); - } -#endif + /* Make sure we ALWAYS set the transformation matrix even if we don't need to scale. The reason is + * that later on we want to reuse pictures (it can bring a lot of extra performance) and each time + * a different transformation matrix might have been used. */ + set_xrender_transformation(src_pict, widthSrc/(double)widthDst, heightSrc/(double)heightDst, 0, 0); pXRenderComposite(gdi_display, PictOpOver, src_pict, 0, dst_pict, 0, 0, 0, 0, xDst + devDst->dc_rect.left, yDst + devDst->dc_rect.top, widthDst, heightDst);

1 0

Andrew Talbot : dbghelp: Constify some variables.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: c702da34da98a725898f9bb42436bd5049f1d5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c702da34da98a725898f9bb42… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jul 13 22:12:01 2009 +0100 dbghelp: Constify some variables. --- dlls/dbghelp/minidump.c | 2 +- dlls/dbghelp/pe_module.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 7c624c9..a786d29 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -428,7 +428,7 @@ static void writeat(struct dump_context* dc, RVA rva, const void* data, unsigned * writes a new chunk of data to the minidump, increasing the current * rva in dc */ -static void append(struct dump_context* dc, void* data, unsigned size) +static void append(struct dump_context* dc, const void* data, unsigned size) { writeat(dc, dc->rva, data, size); dc->rva += size; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 91c7d80..44a4d6a 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -134,7 +134,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, */ static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* module, - void* mapping, IMAGE_NT_HEADERS* nth) + void* mapping, const IMAGE_NT_HEADERS* nth) { BOOL ret = FALSE; const IMAGE_DATA_DIRECTORY* dir; @@ -182,7 +182,7 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs, */ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* module, - void* mapping, IMAGE_NT_HEADERS* nth) + void* mapping, const IMAGE_NT_HEADERS* nth) { unsigned int i; const IMAGE_EXPORT_DIRECTORY* exports;

1 0

Austin English : shell32: Fix folder names for Dutch locale.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: 6d474663c1efd886a49a9074de5c8147d34b0c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d474663c1efd886a49a9074d… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 13 11:43:46 2009 -0500 shell32: Fix folder names for Dutch locale. --- dlls/shell32/shell32_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 33a65bc..560c7c7 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -273,9 +273,9 @@ STRINGTABLE IDS_INTERNET_CACHE "Lokale Instellingen\\Tijdelijke Internet Bestanden" IDS_COOKIES "Koekies" IDS_HISTORY "Lokale Instellingen\\Geschiedenis" - IDS_PROGRAM_FILES "Programma Bestanden" + IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "Mijn Afbeeldingen" - IDS_PROGRAM_FILES_COMMON "Programma Bestanden\\Gemeenschappelijke Bestanden" + IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" IDS_COMMON_DOCUMENTS "Documenten" IDS_ADMINTOOLS "Start Menu\\Programmas\\Administratieve Tools" IDS_COMMON_MUSIC "Documenten\\Mijn Muziek"

1 0

André Hentschel : cmd: Fix German translation.
by Alexandre Julliard 14 Jul '09

14 Jul '09

Module: wine Branch: master Commit: 4e223262de04aaf6b275742be7dbabef4efc755e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e223262de04aaf6b275742be… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 13 17:24:02 2009 +0200 cmd: Fix German translation. --- programs/cmd/De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 1db2231..01a928a 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -177,9 +177,9 @@ Um eine Umgebungsvariable zu erschaffen oder zu ändern, ist der Syntax nötig:\ \n\ SET <Variable>=<Wert>\n\ \n\ -Wobei <Variable> und <Wert> Zeichenkette sind. Es müssen keine Leerzeichen vor\n\ -dem Gleichheitszeichen sein, noch muss der Variablenname in Anführungszeichen\n\ -eingeschlossen sein.\n\ +Wobei <Variable> und <Wert> Zeichenkette sind. Es dürfen keine Leerzeichen vor\n\ +dem Gleichheitszeichen sein, noch darf der Variablenname in Leerzeichen\n\ +enthalten.\n\ \n\ In Wine werden die Umgebungsvariablen des darunterliegenden Betriebssystems\n\ mit in die Win32 Umgebung eingebunden, deshalb gibt es gewöhnlich mehr Werte\n\

1 0

Alexander Nicolaysen Sørnes : Account creation: Add a note saying password will be e-mailed
by Alexander Nicolaysen Sørnes 13 Jul '09

13 Jul '09

Module: appdb Branch: master Commit: 8c5be3a10dac47ad32ac7a086c880640123ad98d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8c5be3a10dac47ad32ac7a08… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 13 16:29:16 2009 +0200 Account creation: Add a note saying password will be e-mailed --- account.php | 1 - include/form_new.php | 1 + 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/account.php b/account.php index 1ecff46..eaeadf2 100644 --- a/account.php +++ b/account.php @@ -110,7 +110,6 @@ function cmd_do_new() if($iResult == SUCCESS) { mail_appdb($oUser->sEmail, "New account", "Your password is ".$sPassword); - addmsg("Account created! Check your email for your password. (".$aClean['sUserEmail'].")", "green"); util_redirect_and_exit(apidb_fullurl()); } else if($iResult == USER_CREATE_EXISTS) diff --git a/include/form_new.php b/include/form_new.php index 560b4bd..1906225 100644 --- a/include/form_new.php +++ b/include/form_new.php @@ -11,6 +11,7 @@ echo html_frame_start("Create New Application DB Account","400","",0) ?>  +The password will be sent to your e-mail <table border=0 width="100%" cellspacing=0 cellpadding=20> <tr> <td class=color1> E-mail </td>

1 0

Alexander Nicolaysen Sørnes : create_tables: Fix MySQL commands for when the apidb DB is not present
by Alexander Nicolaysen Sørnes 13 Jul '09

13 Jul '09

Module: appdb Branch: master Commit: d7bcdc23ec12d5a36a0341875020aaa317eb56dd URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d7bcdc23ec12d5a36a034187… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 13 16:18:28 2009 +0200 create_tables: Fix MySQL commands for when the apidb DB is not present --- tables/create_tables | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tables/create_tables b/tables/create_tables index d41e1bd..e7d53aa 100755 --- a/tables/create_tables +++ b/tables/create_tables @@ -5,7 +5,7 @@ echo NOTE: It is ok for this to fail if the user already exists echo there does not appear to be a way to create a user only echo if they do not exist so we have to live with a potential echo error after we try. -mysql -p -u root apidb < create_user.sql +mysql -p -u root < create_user.sql echo Create the apidb database, and tables cat create_apidb_base.sql appdb_tables.sql \ @@ -13,4 +13,4 @@ cat create_apidb_base.sql appdb_tables.sql \ user_privs.sql app_category.sql \ maintainers.sql buglinks.sql monitors.sql \ error_log.sql distributions.sql testResults.sql \ - | mysql -p -u root apidb + | mysql -p -u root

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 2009