October 2006 - Wine-commits

Mike McCormack : msi: Allow rows in the _Columns table to be unordered.
by Alexandre Julliard 19 Oct '06

19 Oct '06

Module: wine Branch: master Commit: 8ecd34b97132bde3638c56f7e71dd0213af0159d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ecd34b97132bde3638c56f7e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 20 01:53:51 2006 +0900 msi: Allow rows in the _Columns table to be unordered. --- dlls/msi/table.c | 74 ++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 50 insertions(+), 24 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 15f4da2..8d416f2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -34,6 +34,7 @@ #include "objidl.h" #include "winnls.h" #include "msipriv.h" #include "query.h" +#include "assert.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -81,7 +82,7 @@ #define MAX_STREAM_NAME 0x1f static UINT table_get_column_info( MSIDATABASE *db, LPCWSTR name, MSICOLUMNINFO **pcols, UINT *pcount ); -static UINT get_tablecolumns( MSIDATABASE *db, +static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz); static void msi_free_colinfo( MSICOLUMNINFO *colinfo, UINT count ); @@ -926,12 +927,14 @@ static LPWSTR msi_makestring( MSIDATABAS return strdupW(msi_string_lookup_id( db->strings, stringid )); } -static UINT get_tablecolumns( MSIDATABASE *db, +static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINFO *colinfo, UINT *sz) { UINT r, i, n=0, table_id, count, maxcount = *sz; MSITABLE *table = NULL; + TRACE("%s\n", debugstr_w(szTableName)); + /* first check if there is a default table with that name */ r = get_defaulttablecolumns( szTableName, colinfo, sz ); if( ( r == ERROR_SUCCESS ) && *sz ) @@ -954,6 +957,8 @@ static UINT get_tablecolumns( MSIDATABAS TRACE("Table id is %d, row count is %d\n", table_id, table->row_count); + /* if maxcount is non-zero, assume it's exactly right for this table */ + memset( colinfo, 0, maxcount*sizeof(*colinfo) ); count = table->row_count; for( i=0; i<count; i++ ) { @@ -962,32 +967,53 @@ static UINT get_tablecolumns( MSIDATABAS if( colinfo ) { UINT id = table->data[ i ] [ 2 ]; - colinfo[n].tablename = msi_makestring( db, table_id ); - colinfo[n].number = table->data[ i ][ 1 ] - (1<<15); - colinfo[n].colname = msi_makestring( db, id ); - colinfo[n].type = table->data[ i ] [ 3 ] ^ 0x8000; - colinfo[n].hash_table = NULL; - /* this assumes that columns are in order in the table */ - if( n ) - colinfo[n].offset = colinfo[n-1].offset - + bytes_per_column( &colinfo[n-1] ); - else - colinfo[n].offset = 0; - TRACE("table %s column %d is [%s] (%d) with type %08x " - "offset %d at row %d\n", debugstr_w(szTableName), - colinfo[n].number, debugstr_w(colinfo[n].colname), - id, colinfo[n].type, colinfo[n].offset, i); - if( n != (colinfo[n].number-1) ) + UINT col = table->data[ i ][ 1 ] - (1<<15); + + /* check the column number is in range */ + if (col<1 || col>maxcount) { - ERR("oops. data in the _Columns table isn't in the right " - "order for table %s\n", debugstr_w(szTableName)); - msi_free_colinfo(colinfo, n+1 ); - return ERROR_FUNCTION_FAILED; + ERR("column %d out of range\n", col); + continue; } + + /* check if this column was already set */ + if (colinfo[ col - 1 ].number) + { + ERR("duplicate column %d\n", col); + continue; + } + + colinfo[ col - 1 ].tablename = msi_makestring( db, table_id ); + colinfo[ col - 1 ].number = col; + colinfo[ col - 1 ].colname = msi_makestring( db, id ); + colinfo[ col - 1 ].type = table->data[ i ] [ 3 ] - (1<<15); + colinfo[ col - 1 ].offset = 0; + colinfo[ col - 1 ].hash_table = NULL; } n++; - if( colinfo && ( n >= maxcount ) ) - break; + } + + TRACE("%s has %d columns\n", debugstr_w(szTableName), n); + + if (maxcount && n != maxcount) + { + ERR("missing column in table %s\n", debugstr_w(szTableName)); + msi_free_colinfo(colinfo, maxcount ); + return ERROR_FUNCTION_FAILED; + } + + /* calculate the offsets */ + for( i=0; maxcount && (i<maxcount); i++ ) + { + assert( (i+1) == colinfo[ i ].number ); + if (i) + colinfo[i].offset = colinfo[ i - 1 ].offset + + bytes_per_column( &colinfo[ i - 1 ] ); + else + colinfo[i].offset = 0; + TRACE("column %d is [%s] with type %08x ofs %d\n", + colinfo[i].number, debugstr_w(colinfo[i].colname), + colinfo[i].type, colinfo[i].offset); } *sz = n;

1 0

Alexandre Julliard : winex11.drv: Hack to work around an Xlib bug when XInitThreads is used.
by Alexandre Julliard 19 Oct '06

19 Oct '06

Module: wine Branch: master Commit: 8532cc5654feb5cdb38ab8bd46b65d4e3864f769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8532cc5654feb5cdb38ab8bd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 19 13:36:33 2006 +0200 winex11.drv: Hack to work around an Xlib bug when XInitThreads is used. --- dlls/winex11.drv/x11drv_main.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index ea50cfb..068db14 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -514,7 +514,14 @@ #ifdef HAVE_XKB if (use_xkb) { use_xkb = XkbUseExtension( data->display, NULL, NULL ); - if (use_xkb) XkbSetDetectableAutoRepeat( data->display, True, NULL ); + if (use_xkb) + { + /* Hack: dummy call to XkbKeysymToModifiers to force initialisation of Xkb internals */ + /* This works around an Xlib bug where it tries to get the display lock */ + /* twice during XFilterEvents if Xkb hasn't been initialised yet. */ + XkbKeysymToModifiers( data->display, 'A' ); + XkbSetDetectableAutoRepeat( data->display, True, NULL ); + } } #endif

1 0

Andrew Talbot : dbghelp: Cast-qual warnings fix.
by Alexandre Julliard 19 Oct '06

19 Oct '06

Module: wine Branch: master Commit: 4c4d4386ed889ad5da3f4bd2fa4bb166ba1077e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4d4386ed889ad5da3f4bd2f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Oct 18 22:04:43 2006 +0100 dbghelp: Cast-qual warnings fix. --- dlls/dbghelp/stabs.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 57aa82f..e8fec4b 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -278,20 +278,25 @@ static struct symt** stabs_find_ref(long static struct symt** stabs_read_type_enum(const char** x) { long filenr, subnr; + const char* iter; + char* end; - if (**x == '(') + iter = *x; + if (*iter == '(') { - (*x)++; /* '(' */ - filenr = strtol(*x, (char**)x, 10); /* <int> */ - (*x)++; /* ',' */ - subnr = strtol(*x, (char**)x, 10); /* <int> */ - (*x)++; /* ')' */ + ++iter; /* '(' */ + filenr = strtol(iter, &end, 10); /* <int> */ + iter = ++end; /* ',' */ + subnr = strtol(iter, &end, 10); /* <int> */ + iter = ++end; /* ')' */ } else { - filenr = 0; - subnr = strtol(*x, (char**)x, 10); /* <int> */ + filenr = 0; + subnr = strtol(iter, &end, 10); /* <int> */ + iter = end; } + *x = iter; return stabs_find_ref(filenr, subnr); }

1 0

Jesse Allen : include: Fix out of place comment for DLGC_* codes.
by Alexandre Julliard 19 Oct '06

19 Oct '06

Module: wine Branch: master Commit: 4087669a4a9fb722551359725e31680c82e33732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4087669a4a9fb722551359725… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Wed Oct 18 13:21:02 2006 -0700 include: Fix out of place comment for DLGC_* codes. --- include/winuser.h | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 3d4795b..62ad63d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -961,10 +961,6 @@ #define SM_CARETBLINKINGENABLED 0x2002 #define PMB_ACTIVE 0x00000001 /* Messages */ - - /* WM_GETDLGCODE values */ - - #define WM_NULL 0x0000 #define WM_CREATE 0x0001 #define WM_DESTROY 0x0002 @@ -1310,6 +1306,7 @@ #define MWMO_WAITALL 0x0001 #define MWMO_ALERTABLE 0x0002 #define MWMO_INPUTAVAILABLE 0x0004 +/* WM_GETDLGCODE values */ #define DLGC_WANTARROWS 0x0001 #define DLGC_WANTTAB 0x0002 #define DLGC_WANTALLKEYS 0x0004

1 0

Francois Gouget : Fix compilation with gcc 2.95.
by Alexandre Julliard 19 Oct '06

19 Oct '06

Module: wine Branch: master Commit: 22288de73223d52e874d0bcf0ad7d63d86ff58f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22288de73223d52e874d0bcf0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 18 21:24:50 2006 +0200 Fix compilation with gcc 2.95. --- dlls/crypt32/cert.c | 10 ++++++---- dlls/d3d9/tests/stateblock.c | 8 ++++---- dlls/ole32/tests/hglobalstream.c | 8 ++++---- dlls/shell32/recyclebin.c | 11 ++++++----- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c1a638a..fd39ef3 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -19,6 +19,8 @@ #include <assert.h> #include <stdarg.h> + +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wincrypt.h" @@ -1241,7 +1243,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTP { if (!hCryptProv) hCryptProv = CRYPT_GetDefaultProvider(); - ret = CryptCreateHash(hCryptProv, info->Algid, 0, 0, &hHash); + ret = CryptCreateHash(hCryptProv, info->u.Algid, 0, 0, &hHash); if (ret) { ret = CryptHashData(hHash, pbEncodedToBeSigned, @@ -1261,7 +1263,7 @@ BOOL WINAPI CryptSignCertificate(HCRYPTP } else { - ret = CryptCreateHash(hCryptProv, info->Algid, 0, 0, &hHash); + ret = CryptCreateHash(hCryptProv, info->u.Algid, 0, 0, &hHash); if (ret) { ret = CryptHashData(hHash, pbEncodedToBeSigned, @@ -1365,7 +1367,7 @@ static BOOL CRYPT_VerifyCertSignatureFro } if (info->dwGroupId == CRYPT_PUBKEY_ALG_OID_GROUP_ID) { - switch (info->Algid) + switch (info->u.Algid) { case CALG_RSA_KEYX: pubKeyID = CALG_RSA_SIGN; @@ -1382,7 +1384,7 @@ static BOOL CRYPT_VerifyCertSignatureFro } else { - hashID = info->Algid; + hashID = info->u.Algid; if (info->ExtraInfo.cbData >= sizeof(ALG_ID)) pubKeyID = *(ALG_ID *)info->ExtraInfo.pbData; else diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 983a852..32d8508 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -786,10 +786,10 @@ static inline void print_matrix( const char* name, const D3DMATRIX* matrix) { trace("%s Matrix = {\n", name); - trace(" %f %f %f %f\n", matrix->m[0][0], matrix->m[1][0], matrix->m[2][0], matrix->m[3][0]); - trace(" %f %f %f %f\n", matrix->m[0][1], matrix->m[1][1], matrix->m[2][1], matrix->m[3][1]); - trace(" %f %f %f %f\n", matrix->m[0][2], matrix->m[1][2], matrix->m[2][2], matrix->m[3][2]); - trace(" %f %f %f %f\n", matrix->m[0][3], matrix->m[1][3], matrix->m[2][3], matrix->m[3][3]); + trace(" %f %f %f %f\n", U(*matrix).m[0][0], U(*matrix).m[1][0], U(*matrix).m[2][0], U(*matrix).m[3][0]); + trace(" %f %f %f %f\n", U(*matrix).m[0][1], U(*matrix).m[1][1], U(*matrix).m[2][1], U(*matrix).m[3][1]); + trace(" %f %f %f %f\n", U(*matrix).m[0][2], U(*matrix).m[1][2], U(*matrix).m[2][2], U(*matrix).m[3][2]); + trace(" %f %f %f %f\n", U(*matrix).m[0][3], U(*matrix).m[1][3], U(*matrix).m[2][3], U(*matrix).m[3][3]); trace("}\n"); } diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 0402696..4fc6ef9 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -57,8 +57,8 @@ static void test_streamonhglobal(IStream ok(read == sizeof(data), "IStream_Read returned read %d\n", read); /* ignores HighPart */ - ull.HighPart = -1; - ull.LowPart = 0; + ull.u.HighPart = -1; + ull.u.LowPart = 0; hr = IStream_SetSize(pStream, ull); ok_ole_success(hr, "IStream_SetSize"); @@ -76,8 +76,8 @@ static void test_streamonhglobal(IStream ok(statstg.type == STGTY_STREAM, "statstg.type should have been STGTY_STREAM instead of %d\n", statstg.type); /* test OOM condition */ - ull.HighPart = -1; - ull.LowPart = -1; + ull.u.HighPart = -1; + ull.u.LowPart = -1; hr = IStream_SetSize(pStream, ull); todo_wine { ok(hr == E_OUTOFMEMORY, "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 1582dee..440ed70 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -21,6 +21,7 @@ #include "config.h" #define COBJMACROS +#define NONAMELESSUNION #include <stdarg.h> @@ -312,8 +313,8 @@ static HRESULT WINAPI RecycleBin_GetDisp TRACE("(%p, %p, %x, %p)\n", This, pidl, (unsigned int)uFlags, pName); TRASH_UnpackItemID(&pidl->mkid, NULL, &data); pName->uType = STRRET_WSTR; - pName->pOleStr = StrDupW(PathFindFileNameW(data.cFileName)); - if (pName->pOleStr == NULL) + pName->u.pOleStr = StrDupW(PathFindFileNameW(data.cFileName)); + if (pName->u.pOleStr == NULL) return E_OUTOFMEMORY; return S_OK; @@ -407,7 +408,7 @@ static HRESULT WINAPI RecycleBin_GetDeta { pDetails->str.uType = STRRET_WSTR; LoadStringW(shell32_hInstance, RecycleBinColumns[iColumn].column_name_id, buffer, MAX_PATH); - return SHStrDupW(buffer, &pDetails->str.pOleStr); + return SHStrDupW(buffer, &pDetails->str.u.pOleStr); } if (iColumn == COLUMN_NAME) @@ -438,8 +439,8 @@ static HRESULT WINAPI RecycleBin_GetDeta } pDetails->str.uType = STRRET_WSTR; - pDetails->str.pOleStr = StrDupW(buffer); - return (pDetails->str.pOleStr != NULL ? S_OK : E_OUTOFMEMORY); + pDetails->str.u.pOleStr = StrDupW(buffer); + return (pDetails->str.u.pOleStr != NULL ? S_OK : E_OUTOFMEMORY); } static HRESULT WINAPI RecycleBin_MapColumnToSCID(IShellFolder2 *iface, UINT iColumn, SHCOLUMNID *pscid)

1 0

Jonathan Ernst : taskmgr: Fix an error in French translation.
by Alexandre Julliard 19 Oct '06

19 Oct '06

Module: wine Branch: master Commit: 034cefafc28d35d8cb85cbc19536b1c2631ba86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=034cefafc28d35d8cb85cbc19… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Wed Oct 18 20:46:38 2006 +0200 taskmgr: Fix an error in French translation. --- programs/taskmgr/Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index f897ded..e191ceb 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -135,7 +135,7 @@ BEGIN MENUITEM "&Restaurer", ID_RESTORE MENUITEM "&Fermer", ID_FILE_EXIT MENUITEM SEPARATOR - MENUITEM "Toujours &visible", ID_OPTIONS_ALWAYSONTOP, CHECKED + MENUITEM "Toujours &visible", ID_OPTIONS_ALWAYSONTOP END END

1 0

Jonathan Ernst : Use SUBLANG_NEUTRAL in French resources.
by Alexandre Julliard 19 Oct '06

19 Oct '06

Module: wine Branch: master Commit: a34e04eaf47749d9ce4c4ecc8cada45755581b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34e04eaf47749d9ce4c4ecc8… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Wed Oct 18 20:47:25 2006 +0200 Use SUBLANG_NEUTRAL in French resources. --- dlls/devenum/devenum.rc | 2 +- dlls/gphoto2.ds/gphoto2_Fr.rc | 2 +- dlls/iccvid/iccvid_Fr.rc | 2 +- dlls/msvfw32/msvfw32_Fr.rc | 2 +- dlls/msvidc32/msvidc32_Fr.rc | 2 +- dlls/sane.ds/sane_Fr.rc | 2 +- dlls/shlwapi/shlwapi_Fr.rc | 2 +- dlls/wldap32/wldap32_Fr.rc | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index c075632..31eb893 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -43,7 +43,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT } STRINGTABLE DISCARDABLE -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { 7 "DirectSound par d�faut" 8 "DirectSound�: %s" diff --git a/dlls/gphoto2.ds/gphoto2_Fr.rc b/dlls/gphoto2.ds/gphoto2_Fr.rc index 7151416..c8a53be 100644 --- a/dlls/gphoto2.ds/gphoto2_Fr.rc +++ b/dlls/gphoto2.ds/gphoto2_Fr.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | diff --git a/dlls/iccvid/iccvid_Fr.rc b/dlls/iccvid/iccvid_Fr.rc index 78ff8dc..4d276e6 100644 --- a/dlls/iccvid/iccvid_Fr.rc +++ b/dlls/iccvid/iccvid_Fr.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { diff --git a/dlls/msvfw32/msvfw32_Fr.rc b/dlls/msvfw32/msvfw32_Fr.rc index 9eb7511..9318ee4 100644 --- a/dlls/msvfw32/msvfw32_Fr.rc +++ b/dlls/msvfw32/msvfw32_Fr.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU diff --git a/dlls/msvidc32/msvidc32_Fr.rc b/dlls/msvidc32/msvidc32_Fr.rc index bc85e58..3592f31 100644 --- a/dlls/msvidc32/msvidc32_Fr.rc +++ b/dlls/msvidc32/msvidc32_Fr.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { diff --git a/dlls/sane.ds/sane_Fr.rc b/dlls/sane.ds/sane_Fr.rc index 9acc461..c9b7b83 100644 --- a/dlls/sane.ds/sane_Fr.rc +++ b/dlls/sane.ds/sane_Fr.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND diff --git a/dlls/shlwapi/shlwapi_Fr.rc b/dlls/shlwapi/shlwapi_Fr.rc index e80b870..842a67c 100644 --- a/dlls/shlwapi/shlwapi_Fr.rc +++ b/dlls/shlwapi/shlwapi_Fr.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/dlls/wldap32/wldap32_Fr.rc b/dlls/wldap32/wldap32_Fr.rc index f4a4abe..d4b7458 100644 --- a/dlls/wldap32/wldap32_Fr.rc +++ b/dlls/wldap32/wldap32_Fr.rc @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE {

1 0

James Hawkins : msi: Run SetProperty events before all other events no matter what the order is .
by Alexandre Julliard 19 Oct '06

19 Oct '06

Module: wine Branch: master Commit: 8321276cd34486bc6bf1e07c0e99c73423288854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8321276cd34486bc6bf1e07c0… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 18 11:25:14 2006 -0700 msi: Run SetProperty events before all other events no matter what the order is. --- dlls/msi/dialog.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index f40ed76..5c4ca26 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2886,6 +2886,38 @@ static UINT msi_dialog_control_event( MS return ERROR_SUCCESS; } +struct rec_list +{ + struct list entry; + MSIRECORD *rec; +}; + +static UINT add_rec_to_list( MSIRECORD *rec, LPVOID param ) +{ + struct rec_list *add_rec; + struct list *records = (struct list *)param; + + msiobj_addref( &rec->hdr ); + + add_rec = msi_alloc( sizeof( *add_rec ) ); + if (!add_rec) + { + msiobj_release( &rec->hdr ); + return ERROR_OUTOFMEMORY; + } + + add_rec->rec = rec; + list_add_tail( records, &add_rec->entry ); + return ERROR_SUCCESS; +} + +static inline void remove_rec_from_list( struct rec_list *rec_entry ) +{ + msiobj_release( &rec_entry->rec->hdr ); + list_remove( &rec_entry->entry ); + msi_free( rec_entry ); +} + static UINT msi_dialog_button_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) { @@ -2899,11 +2931,15 @@ static UINT msi_dialog_button_handler( m 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','i','n','g','`',0 }; MSIQUERY *view = NULL; + struct rec_list *rec_entry, *next; + struct list events; UINT r; if( HIWORD(param) != BN_CLICKED ) return ERROR_SUCCESS; + list_init( &events ); + r = MSI_OpenQuery( dialog->package->db, &view, query, dialog->name, control->name ); if( r != ERROR_SUCCESS ) @@ -2912,8 +2948,41 @@ static UINT msi_dialog_button_handler( m return 0; } - r = MSI_IterateRecords( view, 0, msi_dialog_control_event, dialog ); + r = MSI_IterateRecords( view, 0, add_rec_to_list, &events ); msiobj_release( &view->hdr ); + if (r != ERROR_SUCCESS) + goto done; + + /* handle all SetProperty events first */ + LIST_FOR_EACH_ENTRY_SAFE( rec_entry, next, &events, struct rec_list, entry ) + { + LPCWSTR event = MSI_RecordGetString( rec_entry->rec, 3 ); + + if ( event[0] != '[' ) + continue; + + r = msi_dialog_control_event( rec_entry->rec, dialog ); + remove_rec_from_list( rec_entry ); + + if ( r != ERROR_SUCCESS ) + goto done; + } + + /* handle all other events */ + LIST_FOR_EACH_ENTRY_SAFE( rec_entry, next, &events, struct rec_list, entry ) + { + r = msi_dialog_control_event( rec_entry->rec, dialog ); + remove_rec_from_list( rec_entry ); + + if ( r != ERROR_SUCCESS ) + goto done; + } + +done: + LIST_FOR_EACH_ENTRY_SAFE( rec_entry, next, &events, struct rec_list, entry ) + { + remove_rec_from_list( rec_entry ); + } return r; }

1 0

James Hawkins : msi: Set the USERNAME and COMPANYNAME properties when initializing a package.
by Alexandre Julliard 19 Oct '06

19 Oct '06

Module: wine Branch: master Commit: 08831b4a1e38afa8a5f56da6deef1527df4bbb50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08831b4a1e38afa8a5f56da6d… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 18 11:26:49 2006 -0700 msi: Set the USERNAME and COMPANYNAME properties when initializing a package. --- dlls/msi/package.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/package.c | 26 +++++++++++++++++++++++++- 2 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index aae868c..3aaad69 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -141,6 +141,9 @@ static VOID set_installer_properties(MSI DWORD verval; WCHAR verstr[10], bufstr[20]; HDC dc; + LPWSTR check; + HKEY hkey; + LONG res; static const WCHAR cszbs[]={'\\',0}; static const WCHAR CFF[] = @@ -210,6 +213,18 @@ static VOID set_installer_properties(MSI static const WCHAR szScreenFormat[] = {'%','d',0}; static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; static const WCHAR szAllUsers[] = { 'A','L','L','U','S','E','R','S',0 }; + static const WCHAR szCurrentVersion[] = { + 'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0 + }; + static const WCHAR szRegisteredUser[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; + static const WCHAR szRegisteredOrg[] = { + 'R','e','g','i','s','t','e','r','e','d','O','r','g','a','n','i','z','a','t','i','o','n',0 + }; + static const WCHAR szUSERNAME[] = {'U','S','E','R','N','A','M','E',0}; + static const WCHAR szCOMPANYNAME[] = {'C','O','M','P','A','N','Y','N','A','M','E',0}; SYSTEM_INFO sys_info; /* @@ -353,6 +368,32 @@ static VOID set_installer_properties(MSI sprintfW( bufstr, szScreenFormat, GetDeviceCaps( dc, BITSPIXEL )); MSI_SetPropertyW( package, szColorBits, bufstr ); ReleaseDC(0, dc); + + /* USERNAME and COMPANYNAME */ + res = RegOpenKeyW( HKEY_LOCAL_MACHINE, szCurrentVersion, &hkey ); + if (res != ERROR_SUCCESS) + return; + + check = msi_dup_property( package, szUSERNAME ); + if (!check) + { + LPWSTR user = msi_reg_get_val_str( hkey, szRegisteredUser ); + MSI_SetPropertyW( package, szUSERNAME, user ); + msi_free( user ); + } + + msi_free( check ); + + check = msi_dup_property( package, szCOMPANYNAME ); + if (!check) + { + LPWSTR company = msi_reg_get_val_str( hkey, szRegisteredOrg ); + MSI_SetPropertyW( package, szCOMPANYNAME, company ); + msi_free( company ); + } + + msi_free( check ); + CloseHandle( hkey ); } static UINT msi_get_word_count( MSIPACKAGE *package ) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index cdb71f6..f507451 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2706,7 +2706,8 @@ static void test_installprops(void) MSIHANDLE hpkg, hdb; CHAR path[MAX_PATH]; CHAR buf[MAX_PATH]; - DWORD size; + DWORD size, type; + HKEY hkey; UINT r; GetCurrentDirectory(MAX_PATH, path); @@ -2725,7 +2726,30 @@ static void test_installprops(void) r = MsiGetProperty(hpkg, "DATABASE", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); + + RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", &hkey); + + size = MAX_PATH; + type = REG_SZ; + RegQueryValueEx(hkey, "RegisteredOwner", NULL, &type, (LPBYTE)path, &size); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "USERNAME", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); + + size = MAX_PATH; + type = REG_SZ; + RegQueryValueEx(hkey, "RegisteredOrganization", NULL, &type, (LPBYTE)path, &size); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "COMPANYNAME", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); + + CloseHandle(hkey); MsiCloseHandle(hpkg); + DeleteFile(msifile); } static void test_sourcedirprop(void)

1 0

Kirill K. Smirnov : winhelp: Improved metafile support.
by Alexandre Julliard 18 Oct '06

18 Oct '06

Module: wine Branch: master Commit: f9bfbe2e315c42eb7a63f1dfefcff9fcbc5e237f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9bfbe2e315c42eb7a63f1dfe… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Oct 16 21:02:23 2006 +0400 winhelp: Improved metafile support. --- programs/winhelp/hlpfile.c | 22 +++++++----------- programs/winhelp/hlpfile.h | 6 +---- programs/winhelp/winhelp.c | 54 ++++++++++++++++++++++++++++++++++++++------ programs/winhelp/winhelp.h | 1 + 4 files changed, 58 insertions(+), 25 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index 2e64270..04e5645 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -654,16 +654,17 @@ static BOOL HLPFILE_LoadMetaFile(BYT unsigned long size, csize; unsigned long off, hsoff; BYTE* bits; - METAFILEPICT mfp; + LPMETAFILEPICT lpmfp; WINE_TRACE("Loading metafile\n"); ptr = beg + 2; /* for type and pack */ - mfp.mm = fetch_ushort(&ptr); /* mapping mode */ + lpmfp = &paragraph->u.gfx.u.mfp; + lpmfp->mm = fetch_ushort(&ptr); /* mapping mode */ - mfp.xExt = GET_USHORT(ptr, 0); - mfp.yExt = GET_USHORT(ptr, 2); + lpmfp->xExt = GET_USHORT(ptr, 0); + lpmfp->yExt = GET_USHORT(ptr, 2); ptr += 4; size = fetch_ulong(&ptr); /* decompressed size */ @@ -674,25 +675,20 @@ static BOOL HLPFILE_LoadMetaFile(BYT ptr += 8; WINE_TRACE("sz=%lu csz=%lu (%d,%d) offs=%lu/%u,%lu\n", - size, csize, mfp.xExt, mfp.yExt, off, ptr - beg, hsoff); + size, csize, lpmfp->xExt, lpmfp->yExt, off, ptr - beg, hsoff); bits = HLPFILE_DecompressGfx(beg + off, csize, size, pack); if (!bits) return FALSE; paragraph->cookie = para_metafile; - mfp.hMF = NULL; + lpmfp->hMF = SetMetaFileBitsEx(size, bits); - paragraph->u.gfx.u.mf.hMetaFile = SetMetaFileBitsEx(size, bits); - - if (!paragraph->u.gfx.u.mf.hMetaFile) + if (!lpmfp->hMF) WINE_FIXME("Couldn't load metafile\n"); if (bits != beg + off) HeapFree(GetProcessHeap(), 0, bits); - paragraph->u.gfx.u.mf.mfSize.cx = mfp.xExt; - paragraph->u.gfx.u.mf.mfSize.cy = mfp.yExt; - return TRUE; } @@ -1930,7 +1926,7 @@ static void HLPFILE_DeleteParagraph(HLPF next = paragraph->next; if (paragraph->cookie == para_metafile) - DeleteMetaFile(paragraph->u.gfx.u.mf.hMetaFile); + DeleteMetaFile(paragraph->u.gfx.u.mfp.hMF); HLPFILE_FreeLink(paragraph->link); diff --git a/programs/winhelp/hlpfile.h b/programs/winhelp/hlpfile.h index 0818ca1..2f3ffed 100644 --- a/programs/winhelp/hlpfile.h +++ b/programs/winhelp/hlpfile.h @@ -69,11 +69,7 @@ typedef struct tagHlpFileParagraph { HBITMAP hBitmap; } bmp; - struct - { - HMETAFILE hMetaFile; - SIZE mfSize; - } mf; + METAFILEPICT mfp; } u; } gfx; /* for bitmaps and metafiles */ } u; diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 6f68f82..28d464d 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -1051,11 +1051,35 @@ static LRESULT CALLBACK WINHELP_TextWndP break; case hlp_line_part_metafile: { - POINT pt; + HDC hMemDC; + HBITMAP hBitmap; + SIZE sz; + RECT rc; - SetViewportOrgEx(hDc, part->rect.left, part->rect.top - scroll_pos, &pt); - PlayMetaFile(hDc, part->u.metafile.hMetaFile); - SetViewportOrgEx(hDc, pt.x, pt.y, NULL); + sz.cx = part->rect.right - part->rect.left; + sz.cy = part->rect.bottom - part->rect.top; + hMemDC = CreateCompatibleDC(hDc); + hBitmap = CreateCompatibleBitmap(hDc, sz.cx, sz.cy); + SelectObject(hMemDC, hBitmap); + SelectObject(hMemDC, win->hBrush); + rc.left = 0; + rc.top = 0; + rc.right = sz.cx; + rc.bottom = sz.cy; + FillRect(hMemDC, &rc, win->hBrush); + SetMapMode(hMemDC, part->u.metafile.mm); + SetWindowExtEx(hMemDC, sz.cx, sz.cy, 0); + SetViewportExtEx(hMemDC, sz.cx, sz.cy, 0); + SetWindowOrgEx(hMemDC, 0, 0, 0); + SetViewportOrgEx(hMemDC, 0, 0, 0); + PlayMetaFile(hMemDC, part->u.metafile.hMetaFile); + SetMapMode(hMemDC, MM_TEXT); + SetWindowOrgEx(hMemDC, 0, 0, 0); + SetViewportOrgEx(hMemDC, 0, 0, 0); + BitBlt(hDc, part->rect.left, part->rect.top - scroll_pos, + sz.cx, sz.cy, hMemDC, 0, 0, SRCCOPY); + DeleteDC(hMemDC); + DeleteObject(hBitmap); } break; } @@ -1578,8 +1602,23 @@ static BOOL WINHELP_SplitLines(HWND hWnd gfxSize.cx = dibs.dsBm.bmWidth; gfxSize.cy = dibs.dsBm.bmHeight; } - else gfxSize = p->u.gfx.u.mf.mfSize; - + else + { + LPMETAFILEPICT lpmfp = &p->u.gfx.u.mfp; + if (lpmfp->mm == MM_ANISOTROPIC || lpmfp->mm == MM_ISOTROPIC) + { + gfxSize.cx = MulDiv(lpmfp->xExt, GetDeviceCaps(hDc, HORZRES), + 100*GetDeviceCaps(hDc, HORZSIZE)); + gfxSize.cy = MulDiv(lpmfp->yExt, GetDeviceCaps(hDc, VERTRES), + 100*GetDeviceCaps(hDc, VERTSIZE)); + } + else + { + gfxSize.cx = lpmfp->xExt; + gfxSize.cy = lpmfp->yExt; + } + } + free_width = rect.right - ((part && *line) ? (*line)->rect.right : rect.left) - space.cx; if (free_width <= 0) { @@ -1601,7 +1640,8 @@ static BOOL WINHELP_SplitLines(HWND hWnd else { ref_part->cookie = hlp_line_part_metafile; - ref_part->u.metafile.hMetaFile = p->u.gfx.u.mf.hMetaFile; + ref_part->u.metafile.hMetaFile = p->u.gfx.u.mfp.hMF; + ref_part->u.metafile.mm = p->u.gfx.u.mfp.mm; } } break; diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index b7227bf..7b10019 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -62,6 +62,7 @@ typedef struct tagHelpLinePart struct { HMETAFILE hMetaFile; + INT mm; } metafile; } u; HLPFILE_LINK* link;

1 0