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

Łukasz Wojniłowicz : Polish translation for release 1.3.25
by Jeremy Newman 25 Jul '11

25 Jul '11

Module: website Branch: master Commit: 3fd15605539a3e00e1e14dc793bd13c6123e2eb5 URL: http://source.winehq.org/git/website.git/?a=commit;h=3fd15605539a3e00e1e14d… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Jul 25 10:50:07 2011 +0200 Polish translation for release 1.3.25 --- news/pl/2011072201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2011072201.xml b/news/pl/2011072201.xml new file mode 100644 index 0000000..c895a1f --- /dev/null +++ b/news/pl/2011072201.xml @@ -0,0 +1,18 @@ +<news> +<date>Lipiec 22, 2011</date> +<title>Wydano Wine 1.3.25</title> +<body> + Wydanie rozwojowe Wine 1.3.25 jest już dostępne. + <a href="{$root}/announce/1.3.25">Co nowego</a> w tym wydaniu: +<ul> + <li>Przepisana obsługa dźwięku, przy wykorzystaniu architektury Win7.</li> + <li>Stare sterowniki dźwięku dla Jack, NAS oraz ESD zostały usunięte.</li> + <li>Zmiany architektury sterownika grafiki dla silnika DIB.</li> + <li>Ulepszona obsługa kosza w powłoce.</li> + <li>Lepsze wsparcie dżojstika w DirectInput.</li> + <li>Wstępny zalążek wsparcia dla VBScript.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.25.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : cmd/tests: Add tests for || on failure conditional execution.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 3d9245830f1739781797cd07bb52dc159715897a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9245830f1739781797cd07b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 23 15:34:22 2011 +0200 cmd/tests: Add tests for || on failure conditional execution. --- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a4b4594..d94c3e7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -113,6 +113,13 @@ if exist foo3 ( del foo3 ) else echo foo3 not created echo bar4 && echo foo4 +echo ...on failure conditional ^|^| +call :setError 789 || echo foo5 +echo foo6 || echo bar6 > bar6 +if exist bar6 ( + echo bar6 created + del bar6 +) echo ------------ Testing type ------------ echo bar> foobaz diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index de98364..6e842b8 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -100,6 +100,9 @@ foo2 @todo_wine(a)foo3 not created bar4(a)space@ foo4 +(a)todo_wine@...on failure conditional || +(a)todo_wine@foo5 +(a)todo_wine@foo6(a)space@ ------------ Testing type ------------ @pwd@>type foobaz(a)space@

1 0

Frédéric Delanoy : cmd/tests: Add ^ escape character tests.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 1e28bbb88ebef47dadced18c8cadc83afc381d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e28bbb88ebef47dadced18c8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 23 20:13:50 2011 +0200 cmd/tests: Add ^ escape character tests. --- programs/cmd/tests/test_builtins.cmd | 36 +++++++++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 21 ++++++++++++++++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index d94c3e7..8e2539c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -28,8 +28,42 @@ echo .word echo word(a)space@ echo word(a)space@@space@ -echo ------------ Testing 'set' -------------- +echo ------------ Testing ^^ escape character -------------- +rem Using something like "echo foo^" asks for an additional char after a "More?" prompt on the following line; it's not possible to currently test that non-interactively +echo ^hell^o, world +echo hell^o, world +echo hell^^o, world +echo hell^^^o, world +mkdir foobar +echo baz> foobar\baz +type foobar\baz +type foobar^\baz +rd /s/q foobar +echo foo ^| echo bar +echo foo ^& echo bar +call :setError 0 +echo bak ^&& echo baz 2> nul echo %ErrorLevel% +echo foo ^> foo +echo ^<> foo +type foo +del foo +set FOO=oof +echo ff^%FOO% +set FOO=bar ^| baz +set FOO +rem FIXME: echoing %FOO% gives an error (baz not recognized) but prematurely +rem exits the script on windows; redirecting stdout and/or stderr doesn't help +echo %ErrorLevel% +call :setError 0 +set FOO=bar ^^^| baz +set FOO +echo %FOO% +echo %ErrorLevel% +set FOO= + +echo ------------ Testing 'set' -------------- +call :setError 0 set FOOBAR 2> nul > nul echo %ErrorLevel% set FOOBAR = baz diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 6e842b8..267f83e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -47,8 +47,27 @@ word .word word(a)space@ word(a)space@@space@ +(a)todo_wine@------------ Testing ^ escape character -------------- +(a)todo_wine@hello, world +(a)todo_wine@hello, world +(a)todo_wine@hell^o, world +(a)todo_wine@hell^o, world +baz +(a)todo_wine@baz +(a)todo_wine@foo | echo bar +(a)todo_wine@foo & echo bar +(a)todo_wine@bak & +(a)todo_wine@baz(a)space@ +(a)todo_wine@0(a)or_broken@1 +(a)todo_wine@foo > foo +(a)todo_wine@< +(a)todo_wine@ffoof +(a)todo_wine@FOO=bar | baz +(a)todo_wine@0 +(a)todo_wine@FOO=bar ^| baz +(a)todo_wine@bar | baz +(a)todo_wine@0 ------------ Testing 'set' -------------- -0 1 @todo_wine(a)0 FOOBAR not defined

1 0

Gerald Pfeifer : mshtml: Handle the failure case in get_nsstyle_attr.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 03cc8eea6fc397e46e0ec85ede510c64e1055c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cc8eea6fc397e46e0ec85ed… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jul 24 01:45:14 2011 +0200 mshtml: Handle the failure case in get_nsstyle_attr. --- dlls/mshtml/htmlstyle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ae2cf93..027a2fb 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -480,7 +480,7 @@ HRESULT get_nsstyle_attr(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, BSTR nsAString_Finish(&str_value); TRACE("%s -> %s\n", debugstr_w(style_tbl[sid].name), debugstr_w(*p)); - return S_OK; + return hres; } HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, VARIANT *p, DWORD flags)

1 0

André Hentschel : winevdm: Try using the new DOSBox command to remap Z to a free drive.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: e5fdf97c66296aafec4713ed4087af8ef3c7c0ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5fdf97c66296aafec4713ed4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 24 15:27:07 2011 +0200 winevdm: Try using the new DOSBox command to remap Z to a free drive. --- programs/winevdm/winevdm.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 8abc282..affac51 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -161,12 +161,6 @@ static void start_dosbox( const char *appname, const char *args ) char *dosbox = find_dosbox(); if (!dosbox) return; - if (tolower(appname[0]) == 'z') - { - WINE_MESSAGE( "winevdm: Cannot start DOS application %s\n", appname ); - WINE_MESSAGE( " because DOSBox doesn't support running from the Z: drive.\n" ); - ExitProcess(1); - } if (!GetTempPathW( MAX_PATH, path )) return; if (!GetTempFileNameW( path, cfgW, 0, config )) return; if (!GetCurrentDirectoryW( MAX_PATH, path )) return; @@ -174,12 +168,19 @@ static void start_dosbox( const char *appname, const char *args ) if (file == INVALID_HANDLE_VALUE) return; buffer = HeapAlloc( GetProcessHeap(), 0, sizeof("[autoexec]") + + sizeof("mount -z c") + sizeof("config -securemode") + 25 * (strlen(config_dir) + sizeof("mount c /dosdevices/c:")) + 4 * strlenW( path ) + 6 + strlen( appname ) + strlen( args ) + 20 ); p = buffer; p += sprintf( p, "[autoexec]\n" ); - for (i = 0; i < 25; i++) + for (i = 25; i >= 0; i--) + if (!(drives & (1 << i))) + { + p += sprintf( p, "mount -z %c\n", 'a' + i ); + break; + } + for (i = 0; i <= 25; i++) if (drives & (1 << i)) p += sprintf( p, "mount %c %s/dosdevices/%c:\n", 'a' + i, config_dir, 'a' + i ); p += sprintf( p, "%c:\ncd ", path[0] );

1 0

Alexandre Julliard : winex11: Return color information in GetImage when passed null bits.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 57a050048aba647cac8478c60c3d919271952e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a050048aba647cac8478c60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 15:23:47 2011 +0200 winex11: Return color information in GetImage when passed null bits. --- dlls/winex11.drv/bitblt.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 2f09517..ee60ef8 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2044,6 +2044,17 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, FIXME( "depth %u bpp %u not supported yet\n", depth, format->bits_per_pixel ); return ERROR_BAD_FORMAT; } + + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = format->bits_per_pixel; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrImportant = 0; + set_color_info( dev, color_shifts, info ); + + if (!bits) return ERROR_SUCCESS; /* just querying the color information */ + x = src->visrect.left & ~(align - 1); y = src->visrect.top; width = src->visrect.right - x; @@ -2093,16 +2104,9 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, } if (!image) return ERROR_OUTOFMEMORY; - info->bmiHeader.biSize = sizeof(info->bmiHeader); - info->bmiHeader.biWidth = width; - info->bmiHeader.biHeight = -height; - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = image->bits_per_pixel; - info->bmiHeader.biSizeImage = height * image->bytes_per_line; - info->bmiHeader.biXPelsPerMeter = 0; - info->bmiHeader.biYPelsPerMeter = 0; - info->bmiHeader.biClrImportant = 0; - set_color_info( dev, color_shifts, info ); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = -height; + info->bmiHeader.biSizeImage = height * image->bytes_per_line; src_bits.ptr = image->data; src_bits.is_copy = TRUE;

1 0

Hans Leidekker : msi: Don't duplicate column string data.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 911ad2bdabac3599a9a0cf6f816db702cf50b3f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=911ad2bdabac3599a9a0cf6f8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 25 15:57:43 2011 +0200 msi: Don't duplicate column string data. --- dlls/msi/table.c | 65 ++++++++++++++++------------------------------------- 1 files changed, 20 insertions(+), 45 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 3d062fd..aec257f 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -52,13 +52,13 @@ typedef struct tagMSICOLUMNHASHENTRY typedef struct tagMSICOLUMNINFO { - LPWSTR tablename; - UINT number; - LPWSTR colname; - UINT type; - UINT offset; - INT ref_count; - BOOL temporary; + LPCWSTR tablename; + UINT number; + LPCWSTR colname; + UINT type; + UINT offset; + INT ref_count; + BOOL temporary; MSICOLUMNHASHENTRY **hash_table; } MSICOLUMNINFO; @@ -83,12 +83,12 @@ struct tagMSITABLE }; /* information for default tables */ -static WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; -static WCHAR szTable[] = { 'T','a','b','l','e',0 }; -static WCHAR szName[] = { 'N','a','m','e',0 }; -static WCHAR szColumns[] = { '_','C','o','l','u','m','n','s',0 }; -static WCHAR szNumber[] = { 'N','u','m','b','e','r',0 }; -static WCHAR szType[] = { 'T','y','p','e',0 }; +static const WCHAR szTables[] = {'_','T','a','b','l','e','s',0}; +static const WCHAR szTable[] = {'T','a','b','l','e',0}; +static const WCHAR szName[] = {'N','a','m','e',0}; +static const WCHAR szColumns[] = {'_','C','o','l','u','m','n','s',0}; +static const WCHAR szNumber[] = {'N','u','m','b','e','r',0}; +static const WCHAR szType[] = {'T','y','p','e',0}; static const MSICOLUMNINFO _Columns_cols[4] = { { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, 0, NULL }, @@ -376,13 +376,7 @@ end: static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ) { UINT i; - - for (i = 0; i < count; i++) - { - msi_free( colinfo[i].tablename ); - msi_free( colinfo[i].colname ); - msi_free( colinfo[i].hash_table ); - } + for (i = 0; i < count; i++) msi_free( colinfo[i].hash_table ); } static void free_table( MSITABLE *table ) @@ -553,15 +547,9 @@ static UINT get_defaulttablecolumns( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINF } else return ERROR_FUNCTION_FAILED; - /* duplicate the string data so we can free it in msi_free_colinfo */ for (i = 0; i < n; i++) { - if (colinfo && i < *sz) - { - colinfo[i] = p[i]; - colinfo[i].tablename = strdupW( p[i].tablename ); - colinfo[i].colname = strdupW( p[i].colname ); - } + if (colinfo && i < *sz) colinfo[i] = p[i]; if (colinfo && i >= *sz) break; } table_calc_column_offsets( db, colinfo, n ); @@ -660,11 +648,6 @@ static UINT read_table_int( BYTE *const *data, UINT row, UINT col, UINT bytes ) return ret; } -static LPWSTR msi_makestring( const MSIDATABASE *db, UINT string_id ) -{ - return strdupW( msi_string_lookup_id( db->strings, string_id ) ); -} - static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz ) { UINT r, i, n = 0, table_id, count, maxcount = *sz; @@ -718,9 +701,9 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF ERR("duplicate column %d\n", col); continue; } - colinfo[col - 1].tablename = msi_makestring( db, table_id ); + colinfo[col - 1].tablename = msi_string_lookup_id( db->strings, table_id ); colinfo[col - 1].number = col; - colinfo[col - 1].colname = msi_makestring( db, id ); + colinfo[col - 1].colname = msi_string_lookup_id( db->strings, id ); colinfo[col - 1].type = read_table_int( table->data, i, table->colinfo[3].offset, sizeof(USHORT) ) - (1 << 15); colinfo[col - 1].offset = 0; @@ -972,22 +955,17 @@ err: static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) { MSITABLE *table; - LPWSTR tablename; UINT size, offset, old_count; UINT n; - /* We may free name in msi_free_colinfo. */ - tablename = strdupW( name ); - - table = find_cached_table( db, tablename ); + table = find_cached_table( db, name ); old_count = table->col_count; msi_free_colinfo( table->colinfo, table->col_count ); msi_free( table->colinfo ); table->colinfo = NULL; - table_get_column_info( db, tablename, &table->colinfo, &table->col_count ); - if (!table->col_count) - goto done; + table_get_column_info( db, name, &table->colinfo, &table->col_count ); + if (!table->col_count) return; size = msi_table_get_row_size( db, table->colinfo, table->col_count, LONG_STR_BYTES ); offset = table->colinfo[table->col_count - 1].offset; @@ -998,9 +976,6 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) if (old_count < table->col_count) memset( &table->data[n][offset], 0, size - offset ); } - -done: - msi_free(tablename); } /* try to find the table name in the _Tables table */

1 0

Hans Leidekker : msi: Allow read sharing if the package is openend in transacted mode.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: b5ea0030f0ba6beefdba5325e37d85070cfb8935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ea0030f0ba6beefdba5325e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 25 15:58:01 2011 +0200 msi: Allow read sharing if the package is openend in transacted mode. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 333746e..549cb16 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -358,7 +358,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) else if( szPersist == MSIDBOPEN_TRANSACT ) { r = StgOpenStorage( szDBPath, NULL, - STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); + STGM_TRANSACTED|STGM_READWRITE|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); } else if( szPersist == MSIDBOPEN_DIRECT ) {

1 0

Mariusz Pluciński : shell32/tests: Fix mistake in checking known folder to verify all known folders.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: d471b4d475c71f41cad996cd3e8227e1958e70ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d471b4d475c71f41cad996cd3… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sun Jul 24 13:43:30 2011 +0200 shell32/tests: Fix mistake in checking known folder to verify all known folders. --- dlls/shell32/tests/shellpath.c | 68 ++++++++++++++++++++-------------------- 1 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d471b4d475c71f41cad99…

1 0

Mariusz Pluciński : shell32/tests: Add verification of known folders categories.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 07d3786f4eef46b8f928bac88517ed385e5cac17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d3786f4eef46b8f928bac88… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sun Jul 24 13:44:54 2011 +0200 shell32/tests: Add verification of known folders categories. --- dlls/shell32/tests/shellpath.c | 209 ++++++++++++++++++++-------------------- 1 files changed, 106 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07d3786f4eef46b8f928b…

1 0