May 2009 - Wine-commits - list.winehq.org

Paul Vriens : oleaut32/tests: Spelling fixes.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 31bb9219d6197475d1dde6e9c47bf5429a01413b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31bb9219d6197475d1dde6e9c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu May 28 19:49:15 2009 +0200 oleaut32/tests: Spelling fixes. --- dlls/oleaut32/tests/vartest.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f0a6deb..662c0a0 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5468,7 +5468,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: NUMBER concat with NUMBER returned inncorrect result\n"); + "VarCat: NUMBER concat with NUMBER returned incorrect result\n"); VariantClear(&left); VariantClear(&right); @@ -5482,7 +5482,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: NUMBER concat with VT_BSTR, inncorrect result\n"); + "VarCat: NUMBER concat with VT_BSTR, incorrect result\n"); VariantClear(&left); VariantClear(&right); @@ -5495,7 +5495,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_BSTR concat with NUMBER, inncorrect result\n"); + "VarCat: VT_BSTR concat with NUMBER, incorrect result\n"); VariantClear(&left); VariantClear(&right); @@ -5512,7 +5512,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_BSTR concat with VT_DATE returned inncorrect result\n"); + "VarCat: VT_BSTR concat with VT_DATE returned incorrect result\n"); VariantClear(&left); VariantClear(&right); @@ -5528,7 +5528,7 @@ static void test_VarCat(void) hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_DATE concat with VT_BSTR returned inncorrect result\n"); + "VarCat: VT_DATE concat with VT_BSTR returned incorrect result\n"); VariantClear(&left); VariantClear(&right);

1 0

Gerald Pfeifer : gphoto2.ds: Only provide GPHOTO2_StrDup() when we have HAVE_GPHOTO2.
by Alexandre Julliard 29 May '09

29 May '09

Module: wine Branch: master Commit: 96929d151ec5ddc162131d8bd4618371886588bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=96929d151ec5ddc162131d8bd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu May 28 21:25:35 2009 +0200 gphoto2.ds: Only provide GPHOTO2_StrDup() when we have HAVE_GPHOTO2. --- dlls/gphoto2.ds/gphoto2_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index ab4f392..5d80d4c 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -37,12 +37,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +#ifdef HAVE_GPHOTO2 static char* GPHOTO2_StrDup(const char* str) { char* dst = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); strcpy(dst, str); return dst; } +#endif static void load_filesystem(const char *folder) {

1 0

Maik Schulz : Website: German translation for the language choice page
by Maik Schulz 28 May '09

28 May '09

Module: website Branch: master Commit: 57ac75f24f01b0f2112e7cec3e2dfaf2de919df3 URL: http://source.winehq.org/git/website.git/?a=commit;h=57ac75f24f01b0f2112e7c… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Thu May 28 18:29:25 2009 +0200 Website: German translation for the language choice page --- templates/de/lang.template | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/templates/de/lang.template b/templates/de/lang.template new file mode 100644 index 0000000..4bc47ac --- /dev/null +++ b/templates/de/lang.template @@ -0,0 +1,37 @@ + + + +<h1 class="title">{$langChange}</h1> + + + +<p><b>Aktuelle Sprache: </b> {$langCur}</p> + +<ul style="list-style: none; margin-left: 20px; padding: 0;"> + + <li style="background-image: url('{$root}/images/lang/en.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/en" title="English">English</a> <small>(Englisch)</small> + </li></a> + + <li style="background-image: url('{$root}/images/lang/de.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/de" title="Deutsch">Deutsch</a> + </li></a> + + <li style="background-image: url('{$root}/images/lang/es.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/es" title="Español">Español</a> <small>(Spanisch)</small> + </li> + + <li style="background-image: url('{$root}/images/lang/fr.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/fr" title="Français">Français</a> <small>(Französisch)</small> + </li> + + <li style="background-image: url('{$root}/images/lang/pl.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/pl" title="Português">Polski</a> <small>(Polnisch)</small> + </li> + + <li style="background-image: url('{$root}/images/lang/pt.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;"> + <a href="{$root}/lang/pt" title="Português">Português</a> <small>(Portugiesisch)</small> + </li> + +</ul> +

1 0

Maik Schulz : Website: German translation for search results page
by Maik Schulz 28 May '09

28 May '09

Module: website Branch: master Commit: 9c86931ec448127482896188cf07c61cf8f97c06 URL: http://source.winehq.org/git/website.git/?a=commit;h=9c86931ec4481274828961… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Thu May 28 17:11:05 2009 +0200 Website: German translation for search results page --- templates/de/search.template | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/templates/de/search.template b/templates/de/search.template new file mode 100644 index 0000000..dbb99a0 --- /dev/null +++ b/templates/de/search.template @@ -0,0 +1,26 @@ + + + +<h1 class="title" style="margin-bottom: 10px;">Suchergebnisse</h1> + +<div id="cse-search-results"></div> +<script type="text/javascript"> + $.gglclientCoords = function() { + var dimensions = {width: 0, height: 0}; + if (document.documentElement) { + dimensions.width = document.documentElement.offsetWidth; + dimensions.height = document.documentElement.offsetHeight; + } else if (window.innerWidth && window.innerHeight) { + dimensions.width = window.innerWidth; + dimensions.height = window.innerHeight; + } + return dimensions; + } + var googleSearchIframeName = "cse-search-results"; + var googleSearchFormName = "cse-search-box"; + var googleSearchFrameWidth = ($.gglclientCoords().width - 250); + var googleSearchDomain = "www.google.com"; + var googleSearchPath = "/cse"; +</script> +<script type="text/javascript" src="http://www.google.com/afsonline/show_afs_search.js"></script> +

1 0

Hans Leidekker : include: Sync definition of CERT_CHAIN_PARA and SCHANNEL_CRED with the latest SDK.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 50d75d480e3824442aa12dd2e7090b4b39e97e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d75d480e3824442aa12dd2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 28 15:02:08 2009 +0200 include: Sync definition of CERT_CHAIN_PARA and SCHANNEL_CRED with the latest SDK. --- include/schannel.h | 4 ++-- include/wincrypt.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/schannel.h b/include/schannel.h index 1e7dfcc..d522edf 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -163,9 +163,9 @@ typedef struct _SCHANNEL_CRED DWORD grbitEnabledProtocols; DWORD dwMinimumCipherStrength; DWORD dwMaximumCipherStrength; - DWORD dwSessionLength; + DWORD dwSessionLifespan; DWORD dwFlags; - DWORD reserved; + DWORD dwCredFormat; } SCHANNEL_CRED, *PSCHANNEL_CRED; typedef struct _SecPkgCred_SupportedAlgs diff --git a/include/wincrypt.h b/include/wincrypt.h index 75017fe..067dd7c 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1041,6 +1041,7 @@ typedef struct _CERT_CHAIN_PARA { DWORD dwUrlRetrievalTimeout; BOOL fCheckRevocationFreshnessTime; DWORD dwRevocationFreshnessTime; + LPFILETIME pftCacheResync; #endif } CERT_CHAIN_PARA, *PCERT_CHAIN_PARA;

1 0

Hans Leidekker : msi: Constify some parameters.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 2018de00e195f501979569569e8c8c4788375fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=2018de00e195f501979569569… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 28 15:02:50 2009 +0200 msi: Constify some parameters. --- dlls/msi/create.c | 8 ++++---- dlls/msi/query.h | 2 +- dlls/msi/sql.y | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 05c40cf..89d3288 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -42,7 +42,7 @@ typedef struct tagMSICREATEVIEW { MSIVIEW view; MSIDATABASE *db; - LPWSTR name; + LPCWSTR name; BOOL bIsTemp; BOOL hold; column_info *col_info; @@ -145,9 +145,9 @@ static const MSIVIEWOPS create_ops = NULL, }; -static UINT check_columns( column_info *col_info ) +static UINT check_columns( const column_info *col_info ) { - column_info *c1, *c2; + const column_info *c1, *c2; /* check for two columns with the same name */ for( c1 = col_info; c1; c1 = c1->next ) @@ -158,7 +158,7 @@ static UINT check_columns( column_info *col_info ) return ERROR_SUCCESS; } -UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, +UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *col_info, BOOL hold ) { MSICREATEVIEW *cv = NULL; diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 93b13fd..eb11a1c 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -98,7 +98,7 @@ UINT ORDER_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, struct expr *cond ); -UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, +UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *col_info, BOOL hold ); UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 8f241b1..6634f61 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -54,7 +54,7 @@ static UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *st static INT SQL_getint( void *info ); static int sql_lex( void *SQL_lval, SQL_input *info ); -static LPWSTR parser_add_table( LPWSTR list, LPWSTR table ); +static LPWSTR parser_add_table( LPWSTR list, LPCWSTR table ); static void *parser_alloc( void *info, unsigned int sz ); static column_info *parser_alloc_column( void *info, LPCWSTR table, LPCWSTR column ); @@ -696,7 +696,7 @@ number: %% -static LPWSTR parser_add_table(LPWSTR list, LPWSTR table) +static LPWSTR parser_add_table(LPWSTR list, LPCWSTR table) { DWORD size = lstrlenW(list) + lstrlenW(table) + 2; static const WCHAR space[] = {' ',0};

1 0

Hans Leidekker : msi: Don't duplicate the table name in CREATE_CreateView.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 5922de46dec881d59cc7ea2383c763538dedd87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5922de46dec881d59cc7ea238… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 28 15:03:19 2009 +0200 msi: Don't duplicate the table name in CREATE_CreateView. The table name is tracked in the list attached to the parent query object, which is destroyed after the view object. This plugs a leak since the duplicated table name was never freed. --- dlls/msi/create.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 89d3288..63cd373 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -180,7 +180,7 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, for( col = col_info; col; col = col->next ) { if (!col->table) - col->table = strdupW(table); + col->table = table; if( !col->temporary ) temp = FALSE;

1 0

Hans Leidekker : msi: Consistently use the parser allocator when parsing a query.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: a4b76ceee7bd30c100b33a6f1e0fd0405c792b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b76ceee7bd30c100b33a6f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 28 15:03:49 2009 +0200 msi: Consistently use the parser allocator when parsing a query. --- dlls/msi/sql.y | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 6634f61..969c92c 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -32,6 +32,7 @@ #include "query.h" #include "wine/list.h" #include "wine/debug.h" +#include "wine/unicode.h" #define YYLEX_PARAM info #define YYPARSE_PARAM info @@ -54,7 +55,7 @@ static UINT SQL_getstring( void *info, const struct sql_str *strdata, LPWSTR *st static INT SQL_getint( void *info ); static int sql_lex( void *SQL_lval, SQL_input *info ); -static LPWSTR parser_add_table( LPWSTR list, LPCWSTR table ); +static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table ); static void *parser_alloc( void *info, unsigned int sz ); static column_info *parser_alloc_column( void *info, LPCWSTR table, LPCWSTR column ); @@ -492,7 +493,6 @@ fromtable: UINT r; r = JOIN_CreateView( sql->db, &$$, $2 ); - msi_free( $2 ); if( r != ERROR_SUCCESS ) YYABORT; } @@ -501,12 +501,12 @@ fromtable: tablelist: table { - $$ = strdupW($1); + $$ = $1; } | table TK_COMMA tablelist { - $$ = parser_add_table($3, $1); + $$ = parser_add_table( info, $3, $1 ); if (!$$) YYABORT; } @@ -696,17 +696,20 @@ number: %% -static LPWSTR parser_add_table(LPWSTR list, LPCWSTR table) +static LPWSTR parser_add_table( void *info, LPCWSTR list, LPCWSTR table ) { - DWORD size = lstrlenW(list) + lstrlenW(table) + 2; static const WCHAR space[] = {' ',0}; + DWORD len = strlenW( list ) + strlenW( table ) + 2; + LPWSTR ret; - list = msi_realloc(list, size * sizeof(WCHAR)); - if (!list) return NULL; - - lstrcatW(list, space); - lstrcatW(list, table); - return list; + ret = parser_alloc( info, len * sizeof(WCHAR) ); + if( ret ) + { + strcpyW( ret, list ); + strcatW( ret, space ); + strcatW( ret, table ); + } + return ret; } static void *parser_alloc( void *info, unsigned int sz )

1 0

Hans Leidekker : msi: Fix some memory leaks.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 22a277cc2ea99285c4be50633edb3db1a526dc1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a277cc2ea99285c4be50633… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 28 15:04:17 2009 +0200 msi: Fix some memory leaks. --- dlls/msi/alter.c | 5 ++++- dlls/msi/drop.c | 5 ++++- dlls/msi/join.c | 5 ++++- dlls/msi/storages.c | 4 +++- dlls/msi/streams.c | 3 +++ dlls/msi/update.c | 3 +++ 6 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index c31aae1..0f750d0 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -257,8 +257,11 @@ UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_inf return ERROR_FUNCTION_FAILED; r = TABLE_CreateView( db, name, &av->table ); - if (r != ERROR_SUCCESS || !av->table) + if (r != ERROR_SUCCESS) + { + msi_free( av ); return r; + } if (colinfo) colinfo->table = name; diff --git a/dlls/msi/drop.c b/dlls/msi/drop.c index 20ab441..a385633 100644 --- a/dlls/msi/drop.c +++ b/dlls/msi/drop.c @@ -113,8 +113,11 @@ UINT DROP_CreateView(MSIDATABASE *db, MSIVIEW **view, LPCWSTR name) return ERROR_FUNCTION_FAILED; r = TABLE_CreateView(db, name, &dv->table); - if (r != ERROR_SUCCESS || !dv->table) + if (r != ERROR_SUCCESS) + { + msi_free( dv ); return r; + } dv->view.ops = &drop_ops; dv->db = db; diff --git a/dlls/msi/join.c b/dlls/msi/join.c index 572e84b..35db2fe 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -338,7 +338,10 @@ UINT JOIN_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables ) table = msi_alloc(sizeof(JOINTABLE)); if (!table) - return ERROR_OUTOFMEMORY; + { + r = ERROR_OUTOFMEMORY; + goto end; + } r = TABLE_CreateView( db, tables, &table->view ); if( r != ERROR_SUCCESS ) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 3a54822..16b323c 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -559,8 +559,10 @@ UINT STORAGES_CreateView(MSIDATABASE *db, MSIVIEW **view) rows = add_storages_to_table(sv); if (rows < 0) + { + msi_free( sv ); return ERROR_FUNCTION_FAILED; - + } sv->num_rows = rows; *view = (MSIVIEW *)sv; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 065f8ed..2d869cc 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -523,7 +523,10 @@ UINT STREAMS_CreateView(MSIDATABASE *db, MSIVIEW **view) sv->db = db; rows = add_streams_to_table(sv); if (rows < 0) + { + msi_free( sv ); return ERROR_FUNCTION_FAILED; + } sv->num_rows = rows; *view = (MSIVIEW *)sv; diff --git a/dlls/msi/update.c b/dlls/msi/update.c index 31e5e25..56d2391 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -261,7 +261,10 @@ UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, uv = msi_alloc_zero( sizeof *uv ); if( !uv ) + { + wv->ops->delete( wv ); return ERROR_FUNCTION_FAILED; + } /* fill the structure */ uv->view.ops = &update_ops;

1 0

Hans Leidekker : kernel32: Improve the GetSystemPowerStatus stub.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 7797bc07148d00b49b5e0919c06f0e53548aaf0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7797bc07148d00b49b5e0919c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 28 15:01:47 2009 +0200 kernel32: Improve the GetSystemPowerStatus stub. --- dlls/kernel32/powermgnt.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 9236d8f..8d41044 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -37,10 +37,21 @@ BOOL WINAPI GetDevicePowerState(HANDLE hDevice, BOOL* pfOn) /*********************************************************************** * GetSystemPowerStatus (KERNEL32.@) */ -BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS sps_ptr) +BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS ps) { - WARN("(): stub, harmless.\n"); - return FALSE; /* no power management support */ + WARN("(%p): stub, harmless.\n", ps); + + if (ps) + { + ps->ACLineStatus = 255; + ps->BatteryFlag = 255; + ps->BatteryLifePercent = 255; + ps->Reserved1 = 0; + ps->BatteryLifeTime = ~0u; + ps->BatteryFullLifeTime = ~0u; + return TRUE; + } + return FALSE; } /***********************************************************************

1 0