wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Hans Leidekker : msi: Only use Windows platform-specific encoded strings from the font naming table .
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: ca741823ddb404d8b11131bca674e9791376a8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca741823ddb404d8b11131bca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 23 11:13:04 2011 +0200 msi: Only use Windows platform-specific encoded strings from the font naming table. --- dlls/msi/font.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 528eab7..0b728a3 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -143,17 +143,28 @@ static WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) break; ttRecord.uNameID = SWAPWORD(ttRecord.uNameID); - if (ttRecord.uNameID == id) + ttRecord.uPlatformID = SWAPWORD(ttRecord.uPlatformID); + ttRecord.uEncodingID = SWAPWORD(ttRecord.uEncodingID); + if (ttRecord.uNameID == id && ttRecord.uPlatformID == 3 && + (ttRecord.uEncodingID == 0 || ttRecord.uEncodingID == 1)) { - LPSTR buf; + WCHAR *buf; + unsigned int i; ttRecord.uStringLength = SWAPWORD(ttRecord.uStringLength); ttRecord.uStringOffset = SWAPWORD(ttRecord.uStringOffset); SetFilePointer(handle, tblDir.uOffset + ttRecord.uStringOffset + ttNTHeader.uStorageOffset, NULL, FILE_BEGIN); - if (!(buf = msi_alloc_zero( ttRecord.uStringLength + 1 ))) goto end; + if (!(buf = msi_alloc_zero( ttRecord.uStringLength + sizeof(WCHAR) ))) goto end; + dwRead = 0; ReadFile(handle, buf, ttRecord.uStringLength, &dwRead, NULL); - ret = strdupAtoW(buf); + if (dwRead % sizeof(WCHAR)) + { + msi_free(buf); + goto end; + } + for (i = 0; i < dwRead / sizeof(WCHAR); i++) buf[i] = SWAPWORD(buf[i]); + ret = strdupW(buf); msi_free(buf); break; }

1 0

Hans Leidekker : msi: Improve font version parsing.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 19a965f581f719dce00c30294856b4804490bf69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a965f581f719dce00c30294… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 23 11:12:40 2011 +0200 msi: Improve font version parsing. --- dlls/msi/font.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index a7778f7..528eab7 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -145,24 +145,17 @@ static WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) ttRecord.uNameID = SWAPWORD(ttRecord.uNameID); if (ttRecord.uNameID == id) { - int nPos; LPSTR buf; ttRecord.uStringLength = SWAPWORD(ttRecord.uStringLength); ttRecord.uStringOffset = SWAPWORD(ttRecord.uStringOffset); - nPos = SetFilePointer(handle, 0, NULL, FILE_CURRENT); SetFilePointer(handle, tblDir.uOffset + ttRecord.uStringOffset + ttNTHeader.uStorageOffset, NULL, FILE_BEGIN); - buf = msi_alloc_zero( ttRecord.uStringLength + 1 ); + if (!(buf = msi_alloc_zero( ttRecord.uStringLength + 1 ))) goto end; ReadFile(handle, buf, ttRecord.uStringLength, &dwRead, NULL); - if (strlen(buf) > 0) - { - ret = strdupAtoW(buf); - msi_free(buf); - break; - } + ret = strdupAtoW(buf); msi_free(buf); - SetFilePointer(handle,nPos, NULL, FILE_BEGIN); + break; } } @@ -179,6 +172,12 @@ static WCHAR *font_name_from_file( const WCHAR *filename ) if ((name = load_ttf_name_id( filename, NAME_ID_FULL_FONT_NAME ))) { + if (!name[0]) + { + WARN("empty font name\n"); + msi_free( name ); + return NULL; + } ret = msi_alloc( (strlenW( name ) + strlenW( truetypeW ) + 1 ) * sizeof(WCHAR) ); strcpyW( ret, name ); strcatW( ret, truetypeW ); @@ -189,22 +188,26 @@ static WCHAR *font_name_from_file( const WCHAR *filename ) WCHAR *msi_font_version_from_file( const WCHAR *filename ) { - static const WCHAR dotzerodotzeroW[] = {'.','0','.','0',0}; - WCHAR *version, *p, *ret = NULL; - int len; + static const WCHAR fmtW[] = {'%','u','.','%','u','.','0','.','0',0}; + WCHAR *version, *p, *q, *ret = NULL; if ((version = load_ttf_name_id( filename, NAME_ID_VERSION ))) { + int len, major = 0, minor = 0; if ((p = strchrW( version, ';' ))) *p = 0; p = version; while (*p && !isdigitW( *p )) p++; - len = strlenW( p ) + strlenW(dotzerodotzeroW) + 1; - ret = msi_alloc( len * sizeof(WCHAR) ); - strcpyW( ret, p ); - if ((p = strchrW( p, '.' )) && !(p = strchrW( p + 1, '.' ))) + if ((q = strchrW( p, '.' ))) { - strcatW( ret, dotzerodotzeroW ); + major = atoiW( p ); + p = ++q; + while (*q && isdigitW( *q )) q++; + if (!*q || *q == ' ') minor = atoiW( p ); + else major = 0; } + len = strlenW( fmtW ) + 20; + ret = msi_alloc( len * sizeof(WCHAR) ); + sprintfW( ret, fmtW, major, minor ); msi_free( version ); } return ret;

1 0

Hans Leidekker : msi: MSI_SetFeatureStateW doesn't need to be WINAPI.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 7c7e0bd51d5195b9e058635f2b67a0060b79a188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7e0bd51d5195b9e058635f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 23 11:12:22 2011 +0200 msi: MSI_SetFeatureStateW doesn't need to be WINAPI. --- dlls/msi/install.c | 2 +- dlls/msi/msipriv.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 672c528..285d7c9 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -945,7 +945,7 @@ void ACTION_UpdateComponentStates( MSIPACKAGE *package, MSIFEATURE *feature ) } } -UINT WINAPI MSI_SetFeatureStateW( MSIPACKAGE *package, LPCWSTR szFeature, INSTALLSTATE iState ) +UINT MSI_SetFeatureStateW( MSIPACKAGE *package, LPCWSTR szFeature, INSTALLSTATE iState ) { UINT rc = ERROR_SUCCESS; MSIFEATURE *feature, *child; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2c38d66..2ebac31 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -848,7 +848,7 @@ extern INT MSI_ProcessMessage( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ) DECLS extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR ) DECLSPEC_HIDDEN; extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ) DECLSPEC_HIDDEN; extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ) DECLSPEC_HIDDEN; -extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ) DECLSPEC_HIDDEN; +extern UINT MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ) DECLSPEC_HIDDEN; extern UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ) DECLSPEC_HIDDEN; extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR) DECLSPEC_HIDDEN; extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Remove an unused parameter from msi_create_table.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 80438ef2ce49ecd138f0bc20fedba9c6709856c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80438ef2ce49ecd138f0bc20f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 23 11:12:02 2011 +0200 msi: Remove an unused parameter from msi_create_table. --- dlls/msi/create.c | 3 +-- dlls/msi/query.h | 2 +- dlls/msi/table.c | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 592d73b..c679d6b 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -61,7 +61,6 @@ static UINT CREATE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSICREATEVIEW *cv = (MSICREATEVIEW*)view; - MSITABLE *table; BOOL persist = (cv->bIsTemp) ? MSICONDITION_FALSE : MSICONDITION_TRUE; TRACE("%p Table %s (%s)\n", cv, debugstr_w(cv->name), @@ -70,7 +69,7 @@ static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if (cv->bIsTemp && !cv->hold) return ERROR_SUCCESS; - return msi_create_table( cv->db, cv->name, cv->col_info, persist, &table); + return msi_create_table( cv->db, cv->name, cv->col_info, persist ); } static UINT CREATE_close( struct tagMSIVIEW *view ) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index b9d34ad..76fd12e 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -138,6 +138,6 @@ int sqliteGetToken(const WCHAR *z, int *tokenType) DECLSPEC_HIDDEN; MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ) DECLSPEC_HIDDEN; UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - MSICONDITION persistent, MSITABLE **table_ret) DECLSPEC_HIDDEN; + MSICONDITION persistent ) DECLSPEC_HIDDEN; #endif /* __WINE_MSI_QUERY_H */ diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 0ea0727..c35a95d 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -725,7 +725,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF } UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - MSICONDITION persistent, MSITABLE **table_ret) + MSICONDITION persistent ) { enum StringPersistence string_persistence = (persistent) ? StringPersistent : StringNonPersistent; UINT r, nField; @@ -870,10 +870,7 @@ err: tv->ops->delete( tv ); if (r == ERROR_SUCCESS) - { list_add_head( &db->tables, &table->entry ); - *table_ret = table; - } else free_table( table );

1 0

Marcus Meissner : server: Removed NULL check after usage (Coverity).
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: df92979b39c5efc4820431737890ad457f030c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df92979b39c5efc4820431737… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Sep 23 02:11:57 2011 +0200 server: Removed NULL check after usage (Coverity). --- server/queue.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server/queue.c b/server/queue.c index 3fa546e..7de6d88 100644 --- a/server/queue.c +++ b/server/queue.c @@ -957,11 +957,8 @@ static void msg_queue_destroy( struct object *obj ) free( timer ); } if (queue->timeout) remove_timeout_user( queue->timeout ); - if (queue->input) - { - queue->input->cursor_count -= queue->cursor_count; - release_object( queue->input ); - } + queue->input->cursor_count -= queue->cursor_count; + release_object( queue->input ); if (queue->hooks) release_object( queue->hooks ); if (queue->fd) release_object( queue->fd ); }

1 0

David Kiefer : winex11.drv: Remove x86 inline assembly for performing palettized blits.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 74c741ad55e02043f70e8078d37d2b3cb9ebb2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c741ad55e02043f70e8078d… Author: David Kiefer <hevanen(a)googlemail.com> Date: Fri Sep 23 02:43:46 2011 +0200 winex11.drv: Remove x86 inline assembly for performing palettized blits. --- dlls/winex11.drv/dib.c | 42 ------------------------------------------ 1 files changed, 0 insertions(+), 42 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 1e608ba..bde614e 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -1276,26 +1276,6 @@ static void X11DRV_DIB_SetImageBits_8( int lines, const BYTE *srcbits, /* ==== pal 8 dib -> rgb or bgr 555 or 565 bmp ==== */ dstbits=(BYTE*)bmpImage->data+left*2+(lines-1)*bmpImage->bytes_per_line; for (h = lines ; h--; ) { -#if defined(__i386__) && defined(__GNUC__) - int _cl1,_cl2; /* temp outputs for asm below */ - /* Borrowed from DirectDraw */ - __asm__ __volatile__( - "xor %%eax,%%eax\n" - "cld\n" - "1:\n" - " lodsb\n" - " movw (%%edx,%%eax,4),%%ax\n" - " stosw\n" - " xor %%eax,%%eax\n" - " loop 1b\n" - :"=S" (srcbyte), "=D" (_cl1), "=c" (_cl2) - :"S" (srcbyte), - "D" (dstbits), - "c" (width), - "d" (colors) - :"eax", "cc", "memory" - ); -#else DWORD* dstpixel=(DWORD*)dstbits; for (x=0; x<width/2; x++) { /* Do 2 pixels at a time */ @@ -1306,7 +1286,6 @@ static void X11DRV_DIB_SetImageBits_8( int lines, const BYTE *srcbits, /* And then the odd pixel */ *((WORD*)dstpixel)=colors[srcbyte[0]]; } -#endif srcbyte = (srcbits += linebytes); dstbits -= bmpImage->bytes_per_line; } @@ -1321,31 +1300,10 @@ static void X11DRV_DIB_SetImageBits_8( int lines, const BYTE *srcbits, dstbits=(BYTE*)bmpImage->data+left*4+(lines-1)*bmpImage->bytes_per_line; /* ==== pal 8 dib -> rgb or bgr 0888 bmp ==== */ for (h = lines ; h--; ) { -#if defined(__i386__) && defined(__GNUC__) - int _cl1,_cl2; /* temp outputs for asm below */ - /* Borrowed from DirectDraw */ - __asm__ __volatile__( - "xor %%eax,%%eax\n" - "cld\n" - "1:\n" - " lodsb\n" - " movl (%%edx,%%eax,4),%%eax\n" - " stosl\n" - " xor %%eax,%%eax\n" - " loop 1b\n" - :"=S" (srcbyte), "=D" (_cl1), "=c" (_cl2) - :"S" (srcbyte), - "D" (dstbits), - "c" (width), - "d" (colors) - :"eax", "cc", "memory" - ); -#else DWORD* dstpixel=(DWORD*)dstbits; for (x=0; x<width; x++) { *dstpixel++=colors[*srcbyte++]; } -#endif srcbyte = (srcbits += linebytes); dstbits -= bmpImage->bytes_per_line; }

1 0

André Hentschel : shell32/tests: Fix typos.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 8c3ffea63cc9bddc92a87c4cce2d4370b8b8556a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3ffea63cc9bddc92a87c4cc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 22 22:35:32 2011 +0200 shell32/tests: Fix typos. --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index bae0c21..9c0bc58 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2220,10 +2220,10 @@ static void test_directory(void) /* copy this executable to a new folder and cd to it */ sprintf(newdir, "%s\\newfolder", tmpdir); rc = CreateDirectoryA( newdir, NULL ); - ok( rc, "failed to create %s err %u\n", path, GetLastError() ); + ok( rc, "failed to create %s err %u\n", newdir, GetLastError() ); sprintf(path, "%s\\%s", newdir, path_find_file_name(argv0)); CopyFileA(argv0, path, FALSE); - SetCurrentDirectory(tmpdir), + SetCurrentDirectory(tmpdir); sprintf(params, "shlexec \"%s\" Exec", child_file);

1 0

Henri Verbeet : rpcrt4: Properly size complex reference pointers.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: f687728c43011900f25007fe9d90139634afaa51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f687728c43011900f25007fe9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 22 21:40:06 2011 +0200 rpcrt4: Properly size complex reference pointers. --- dlls/rpcrt4/ndr_stubless.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index b68ff32..5eb699e 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -149,6 +149,15 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) DWORD size; switch(*pFormat) { + case RPC_FC_RP: + if (pFormat[1] & RPC_FC_P_SIMPLEPOINTER) + { + FIXME("Simple reference pointer (type %#x).\n", pFormat[2]); + size = sizeof(void *); + break; + } + size = calc_arg_size(pStubMsg, &pFormat[2] + *(WORD *)&pFormat[2]); + break; case RPC_FC_STRUCT: case RPC_FC_PSTRUCT: size = *(const WORD*)(pFormat + 2); @@ -202,8 +211,6 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) break; default: FIXME("Unhandled type %02x\n", *pFormat); - /* fallthrough */ - case RPC_FC_RP: size = sizeof(void *); break; }

1 0

André Hentschel : gdiplus: Fix height calculation.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 6b7ccdb734bebda64f5a71a5d087645cd4a110cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b7ccdb734bebda64f5a71a5d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 22 19:21:41 2011 +0200 gdiplus: Fix height calculation. Spotted by Roman Shchekin. --- 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 7fcff02..50d2f7c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4329,7 +4329,7 @@ GpStatus gdip_format_string(HDC hdc, nheight = roundr(rect->Height); if (rect->Width >= INT_MAX || rect->Width < 0.5) nwidth = INT_MAX; - if (rect->Height >= INT_MAX || rect->Width < 0.5) nheight = INT_MAX; + if (rect->Height >= INT_MAX || rect->Height < 0.5) nheight = INT_MAX; for(i = 0, j = 0; i < length; i++){ /* FIXME: This makes the indexes passed to callback inaccurate. */

1 0

Alexandre Julliard : Make the regression SHA1 a URL in bug lists.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: bugzilla Branch: master Commit: 7570aa2efdc918d1ef822596834a4e2ab2599942 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=7570aa2efdc918d1ef822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 12:25:38 2011 +0200 Make the regression SHA1 a URL in bug lists. --- template/en/default/list/table.html.tmpl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index d23d4c6..331f402 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -208,6 +208,9 @@ [% bug.${login_column}.truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %] + [% ELSIF column == 'cf_regression_sha1sum' && bug.cf_regression_sha1sum %] + <a href="http://source.winehq.org/git/wine.git/commit/[% bug.cf_regression_sha1sum FILTER html %]"> + [% bug.cf_regression_sha1sum.truncate(16) FILTER html %]</a> [% ELSE %] [%- display_value(column, bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html -%] [% END %]

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 September 2011