July 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Additional CALL tests.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: ce57ebe32dfcad4556d1e0db1958067ce8326e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce57ebe32dfcad4556d1e0db1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 29 13:59:51 2011 +0200 cmd/tests: Additional CALL tests. --- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f3b1fc5..04d8fdd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -542,6 +542,13 @@ rem External script echo echo foo %%1> foo.cmd call foo call foo.cmd 8 +echo echo %%1 %%2 > foo.cmd +call foo.cmd foo +call foo.cmd foo bar +call foo.cmd foo "" +call foo.cmd "" bar +call foo.cmd foo '' +call foo.cmd '' bar del foo.cmd rem Internal routines call :testRoutine :testRoutine @@ -550,6 +557,19 @@ goto :endTestRoutine echo bar %1 goto :eof :endTestRoutine + +call :testRoutineArgs foo +call :testRoutineArgs foo bar +call :testRoutineArgs foo "" +call :testRoutineArgs "" bar +call :testRoutineArgs foo '' +call :testRoutineArgs '' bar +goto :endTestRoutineArgs +:testRoutineArgs +echo %1 %2 +goto :eof +:endTestRoutineArgs + rem Should work for builtins... call mkdir foo echo %ErrorLevel% diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 51239b0..d7ac58a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -288,7 +288,19 @@ bar\baz removed ------------ Testing CALL -------------- foo(a)space@ @todo_wine(a)foo 8 +foo(a)space@@space@ +foo bar(a)space@ +(a)todo_wine@foo ""@space@ +(a)todo_wine@"" bar(a)space@ +foo ''@space@ +'' bar(a)space@ bar :testRoutine +foo(a)space@ +foo bar +(a)todo_wine@foo "" +(a)todo_wine@"" bar +foo '' +'' bar @todo_wine(a)0 @todo_wine(a)foo created @todo_wine(a)Should expand foobaz

1 0

Jacek Caban : mshtml: Improved handling empty dispex_data_t in preprocess_dispex_data.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 8cbc34e40fc3ae6d65f3ced298cbe509eaaa5210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbc34e40fc3ae6d65f3ced29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 14:31:22 2011 +0200 mshtml: Improved handling empty dispex_data_t in preprocess_dispex_data. --- dlls/mshtml/dispex.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 09de654..98f73b6 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -248,21 +248,19 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) if(!data->func_cnt) { heap_free(data->funcs); + data->name_table = NULL; data->funcs = NULL; - }else if(data->func_cnt != size) { - data->funcs = heap_realloc(data->funcs, data->func_cnt * sizeof(func_info_t)); + return data; } + + data->funcs = heap_realloc(data->funcs, data->func_cnt * sizeof(func_info_t)); qsort(data->funcs, data->func_cnt, sizeof(func_info_t), dispid_cmp); - if(data->funcs) { - data->name_table = heap_alloc(data->func_cnt * sizeof(func_info_t*)); - for(i=0; i < data->func_cnt; i++) - data->name_table[i] = data->funcs+i; - qsort(data->name_table, data->func_cnt, sizeof(func_info_t*), func_name_cmp); - }else { - data->name_table = NULL; - } + data->name_table = heap_alloc(data->func_cnt * sizeof(func_info_t*)); + for(i=0; i < data->func_cnt; i++) + data->name_table[i] = data->funcs+i; + qsort(data->name_table, data->func_cnt, sizeof(func_info_t*), func_name_cmp); return data; }

1 0

Jacek Caban : mshtml: Fixed HTMLHeadElement_QI implementation.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: bc9850b42c9a342120f06566281e53b96ac32bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9850b42c9a342120f065662… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 13:06:35 2011 +0200 mshtml: Fixed HTMLHeadElement_QI implementation. --- dlls/mshtml/htmlhead.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 51095ee..69e4edf 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -295,7 +295,7 @@ static HRESULT HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) TRACE("(%p)->(IID_IHTMLHeadElement %p)\n", This, ppv); *ppv = &This->IHTMLHeadElement_iface; }else { - HTMLElement_QI(&This->element.node, riid, ppv); + return HTMLElement_QI(&This->element.node, riid, ppv); } IUnknown_AddRef((IUnknown*)*ppv);

1 0

Piotr Caban : msvcp90: Added _Locinfo class stub.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: dca8da61c11a31674c4b5643a19f8ae614cd7968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca8da61c11a31674c4b5643a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 29 12:29:32 2011 +0200 msvcp90: Added _Locinfo class stub. --- dlls/msvcp90/locale.c | 289 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 112 +++++++++--------- 2 files changed, 341 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dca8da61c11a31674c4b5…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 48ccf4f9f83b081dd87c303588db748e17bafe83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ccf4f9f83b081dd87c30358… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 29 12:29:54 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 100 ++++++++++++++++++++-------------------- dlls/msvcp60/msvcp60.spec | 84 +++++++++++++++++----------------- dlls/msvcp70/msvcp70.spec | 88 ++++++++++++++++++------------------ dlls/msvcp71/msvcp71.spec | 88 ++++++++++++++++++------------------ dlls/msvcp80/msvcp80.spec | 104 +++++++++++++++++++++--------------------- 5 files changed, 232 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48ccf4f9f83b081dd87c3…

1 0

Hans Leidekker : winhttp: Fix some valgrind warnings.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: c54772c114150c5d787712f2ed1156269baeabf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54772c114150c5d787712f2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:25:04 2011 +0200 winhttp: Fix some valgrind warnings. --- dlls/winhttp/request.c | 5 +++-- dlls/winhttp/tests/winhttp.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 01fdc20..a57f801 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2446,7 +2446,6 @@ static HRESULT WINAPI winhttp_request_Open( debugstr_variant(&async)); if (!method || !url) return E_INVALIDARG; - if (!(request->verb = strdupW( method ))) return E_OUTOFMEMORY; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); @@ -2455,6 +2454,7 @@ static HRESULT WINAPI winhttp_request_Open( uc.dwUrlPathLength = ~0u; uc.dwExtraInfoLength = ~0u; if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( get_last_error() ); + if (!(request->verb = strdupW( method ))) return E_OUTOFMEMORY; if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); @@ -2541,7 +2541,7 @@ static HRESULT WINAPI winhttp_request_SetRequestHeader( } len = strlenW( header ) + 4; if (value) len += strlenW( value ); - if (!(str = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(str = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; sprintfW( str, fmtW, header, value ? value : emptyW ); ret = WinHttpAddRequestHeaders( request->hrequest, str, len, WINHTTP_ADDREQ_FLAG_REPLACE ); @@ -2795,6 +2795,7 @@ static DWORD request_read_body( struct winhttp_request *request, DWORD timeout ) request->state = REQUEST_STATE_RESPONSE_RECEIVED; if (!(request->buffer = heap_alloc( buflen ))) return E_OUTOFMEMORY; + request->buffer[0] = 0; size = total_bytes_read = 0; do { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index df8dd40..b450df7 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2473,6 +2473,7 @@ static void test_IWinHttpRequest(void) SysFreeString( url ); SysFreeString( username ); SysFreeString( password ); + SysFreeString( connection ); SysFreeString( date ); SysFreeString( today ); VariantClear( &proxy_server );

1 0

Hans Leidekker : winhttp: Set an appropriate error when the request is cancelled.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: fb7fc894f055e43e539174d242a3f9a6419f9558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7fc894f055e43e539174d24… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:25:24 2011 +0200 winhttp: Set an appropriate error when the request is cancelled. --- dlls/winhttp/request.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a57f801..3efa8a3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2565,6 +2565,9 @@ static DWORD wait_for_completion( struct winhttp_request *request, DWORD timeout { case WAIT_OBJECT_0: break; + case WAIT_OBJECT_0 + 1: + request->error = ERROR_CANCELLED; + break; case WAIT_TIMEOUT: request->error = ERROR_TIMEOUT; break;

1 0

Henri Verbeet : wined3d: Complain about users disabling GLSL.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 64f71fda6d3f3ec1dddf4cbeecaeaad63b3c893e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f71fda6d3f3ec1dddf4cbee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 22:27:55 2011 +0200 wined3d: Complain about users disabling GLSL. --- dlls/wined3d/wined3d_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5976c83..7a0d4b6 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -28,6 +28,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(winediag); struct wined3d_wndproc { @@ -238,6 +239,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { if (!strcmp(buffer,"disabled")) { + ERR_(winediag)("The GLSL shader backend has been disabled. You get to keep all the pieces if it breaks.\n"); TRACE("Use of GL Shading Language disabled\n"); wined3d_settings.glslRequested = FALSE; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: 35979eb2314a2454fcc4f245f2fe72f7cde1d564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35979eb2314a2454fcc4f245f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 28 19:22:14 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index ba5a4f8..41479f1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-07-13 22:17+0300\n" +"PO-Revision-Date: 2011-07-28 19:21+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -171,7 +171,6 @@ msgid "System Path" msgstr "Sistemos kelias" #: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103 -#, fuzzy msgctxt "display name" msgid "Desktop" msgstr "Darbalaukis" @@ -6374,7 +6373,6 @@ msgid "Properties" msgstr "Savybės" #: shell32.rc:82 -#, fuzzy msgctxt "recycle bin" msgid "&Restore" msgstr "&Atkurti" @@ -6509,7 +6507,6 @@ msgid "My Videos" msgstr "Vaizdai" #: shell32.rc:207 -#, fuzzy msgctxt "directory" msgid "Desktop" msgstr "Darbalaukis" @@ -6861,7 +6858,6 @@ msgid " sec" msgstr " sek" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 -#, fuzzy msgctxt "window" msgid "&Restore" msgstr "&Atkurti" @@ -8209,6 +8205,8 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file\n" "which were introduced by a preceding SETLOCAL.\n" msgstr "" +"ENDLOCAL komandų faile baigia aplinkos pakeitimų lokalizavimą,\n" +"kuris buvo padarytas ankstesnio SETLOCAL.\n" #: cmd.rc:218 msgid "" @@ -8219,6 +8217,11 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" +"SETLOCAL pradeda aplinkos pakeitimų lokalizavimą komandų faile.\n" +"\n" +"Aplinkos pakeitimai padaryti po SETLOCAL yra lokalūs komandų faile ir yra\n" +"išlaikomi iki kol sutinkamas kitas ENDLOCAL (arba failo pabaiga, kas\n" +"pasitaiko pirmiau), tada atkuriami ankstesnės aplinkos nustatymai.\n" #: cmd.rc:221 msgid "" @@ -8257,7 +8260,6 @@ msgstr "" "ar apvalkalą iš kur CMD buvo iškviestas.\n" #: cmd.rc:267 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ATTRIB\t\tShow or change DOS file attributes\n" @@ -8305,6 +8307,7 @@ msgstr "" "DEL (ERASE)\tŠalinti failą ar failų aibę\n" "DIR\t\tPateikti katalogo turinį\n" "ECHO\t\tKopijuoti tekstą tiesiai į pulto išvedimą\n" +"ENDLOCAL\tBaigia aplinkos pakeitimų lokalizavimą komandų faile\n" "HELP\t\tParodyti trumpą pagalbą apie temą\n" "MD (MKDIR)\tSukurti pakatalogį\n" "MORE\t\tRodyti išvedimą puslapiais\n" @@ -8316,6 +8319,7 @@ msgstr "" "REN (RENAME)\tPervadinti failą\n" "RD (RMDIR)\tŠalinti pakatalogį\n" "SET\t\tNustatyti ar parodyti aplinkos kintamuosius\n" +"SETLOCAL\tPradeda aplinkos pakeitimų lokalizavimą komandų faile\n" "TIME\t\tNustatyti ar parodyti dabartinį sistemos laiką\n" "TITLE\t\tNustatyti CMD seanso lango antraštę\n" "TYPE\t\tIšvesti tekstinio failo turinį\n"

1 0

Michael Stefaniuc : dmcompos: Merge the IClassFactory implementations.
by Alexandre Julliard 29 Jul '11

29 Jul '11

Module: wine Branch: master Commit: a0e46698adf8263c771b646924622f555dcb5538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e46698adf8263c771b64692… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 11:55:51 2011 +0200 dmcompos: Merge the IClassFactory implementations. --- dlls/dmcompos/dmcompos_main.c | 286 +++++++++-------------------------------- 1 files changed, 61 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0e46698adf8263c771b6…

1 0