April 2010 - Wine-Commits - list.winehq.org

Michael Stefaniuc : user32: Avoid using HIWORD on a string pointer.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 8797fb52cf7ffb8a98473bf84b0290104bb0f759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8797fb52cf7ffb8a98473bf84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 19 10:29:49 2010 +0200 user32: Avoid using HIWORD on a string pointer. --- dlls/user32/lstr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index 8fff22f..25a935a 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -230,7 +230,7 @@ BOOL WINAPI OemToCharW( LPCSTR s, LPWSTR d ) */ LPSTR WINAPI CharLowerA(LPSTR str) { - if (!HIWORD(str)) + if (IS_INTRESOURCE(str)) { char ch = LOWORD(str); CharLowerBuffA( &ch, 1 ); @@ -256,7 +256,7 @@ LPSTR WINAPI CharLowerA(LPSTR str) */ LPSTR WINAPI CharUpperA(LPSTR str) { - if (!HIWORD(str)) + if (IS_INTRESOURCE(str)) { char ch = LOWORD(str); CharUpperBuffA( &ch, 1 ); @@ -282,7 +282,7 @@ LPSTR WINAPI CharUpperA(LPSTR str) */ LPWSTR WINAPI CharLowerW(LPWSTR x) { - if (HIWORD(x)) return strlwrW(x); + if (!IS_INTRESOURCE(x)) return strlwrW(x); else return (LPWSTR)((UINT_PTR)tolowerW(LOWORD(x))); } @@ -292,7 +292,7 @@ LPWSTR WINAPI CharLowerW(LPWSTR x) */ LPWSTR WINAPI CharUpperW(LPWSTR x) { - if (HIWORD(x)) return struprW(x); + if (!IS_INTRESOURCE(x)) return struprW(x); else return (LPWSTR)((UINT_PTR)toupperW(LOWORD(x))); }

1 0

Henri Verbeet : wined3d: Get rid of "myDevice".
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 10c5a8ac9e921f63df2c4d4565c87b5cf2e76f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c5a8ac9e921f63df2c4d456… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:42 2010 +0200 wined3d: Get rid of "myDevice". --- dlls/wined3d/surface.c | 162 ++++++++++++++++++++++++----------------------- 1 files changed, 83 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10c5a8ac9e921f63df2c4…

1 0

Hans Leidekker : msi: Make the name parameter of create_storage and create_stream constant.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: fc15e565d308437477302695a72e8feaf2e4d955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc15e565d308437477302695a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:37:20 2010 +0200 msi: Make the name parameter of create_storage and create_stream constant. --- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 144f8fd..5b555ba 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -69,7 +69,7 @@ static BOOL storages_set_table_size(MSISTORAGESVIEW *sv, UINT size) return TRUE; } -static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPWSTR name, IStorage *stg) +static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) { STORAGE *storage; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index fc660c8..e4204a2 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -68,7 +68,7 @@ static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) return TRUE; } -static STREAM *create_stream(MSISTREAMSVIEW *sv, LPWSTR name, BOOL encoded, IStream *stm) +static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, IStream *stm) { STREAM *stream; WCHAR decoded[MAX_STREAM_NAME_LEN];

1 0

Hans Leidekker : msi: Remove the string index parameter from msi_addstringW .
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 8f534055444f992bcce91f437bc8f88569729c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f534055444f992bcce91f437… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:37:38 2010 +0200 msi: Remove the string index parameter from msi_addstringW. --- dlls/msi/msipriv.h | 3 +-- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 2 +- dlls/msi/string.c | 36 +++++++++++------------------------- dlls/msi/table.c | 2 +- 5 files changed, 15 insertions(+), 30 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2b7d6ba..fada8c6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -660,8 +660,7 @@ enum StringPersistence StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); - +extern BOOL msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); extern const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ); diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 5b555ba..3e88874 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -77,7 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) if (!storage) return NULL; - storage->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); + storage->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent); storage->storage = stg; if (storage->storage) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index e4204a2..59e845d 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -84,7 +84,7 @@ static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, ISt name = decoded; } - stream->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); + stream->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent); stream->stream = stm; return stream; } diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 84f4e71..21b1db2 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -288,42 +288,28 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U return n; } -int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { + UINT n; LPWSTR str; - /* TRACE("[%2d] = %s\n", string_no, debugstr_an(data,len) ); */ - if( !data ) return 0; if( !data[0] ) return 0; - if( n > 0 ) - { - if( st->strings[n].persistent_refcount || - st->strings[n].nonpersistent_refcount ) - return -1; - } - else + + if( msi_string2idW( st, data, &n ) == ERROR_SUCCESS ) { - if( ERROR_SUCCESS == msi_string2idW( st, data, &n ) ) - { - if (persistence == StringPersistent) - st->strings[n].persistent_refcount += refcount; - else - st->strings[n].nonpersistent_refcount += refcount; - return n; - } - n = st_find_free_entry( st ); - if( n == -1 ) - return -1; + if (persistence == StringPersistent) + st->strings[n].persistent_refcount += refcount; + else + st->strings[n].nonpersistent_refcount += refcount; + return n; } - if( n < 1 ) - { - ERR("invalid index adding %s (%d)\n", debugstr_w( data ), n ); + n = st_find_free_entry( st ); + if( n == -1 ) return -1; - } /* allocate a new string */ if(len<0) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 6737ac5..3b117ae 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1383,7 +1383,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI if ( r != ERROR_SUCCESS ) { LPCWSTR sval = MSI_RecordGetString( rec, i + 1 ); - val = msi_addstringW( tv->db->strings, 0, sval, -1, 1, + val = msi_addstringW( tv->db->strings, sval, -1, 1, persistent ? StringPersistent : StringNonPersistent ); }

1 0

Hans Leidekker : msi: Remove unused and redundant name field from STORAGE structure.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 111d33b393b359dc9a8c7a500cb2a1d9c50d9ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=111d33b393b359dc9a8c7a500… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 19 12:37:02 2010 +0200 msi: Remove unused and redundant name field from STORAGE structure. --- dlls/msi/storages.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 6a8134b..144f8fd 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -43,7 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct tabSTORAGE { UINT str_index; - LPWSTR name; IStorage *storage; } STORAGE; @@ -78,14 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPWSTR name, IStorage *stg) if (!storage) return NULL; - storage->name = strdupW(name); - if (!storage->name) - { - msi_free(storage); - return NULL; - } - - storage->str_index = msi_addstringW(sv->db->strings, 0, storage->name, -1, 1, StringNonPersistent); + storage->str_index = msi_addstringW(sv->db->strings, 0, name, -1, 1, StringNonPersistent); storage->storage = stg; if (storage->storage) @@ -436,8 +428,6 @@ static UINT STORAGES_delete(struct tagMSIVIEW *view) { if (sv->storages[i]->storage) IStorage_Release(sv->storages[i]->storage); - - msi_free(sv->storages[i]->name); msi_free(sv->storages[i]); }

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_load_ds_location().
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: ae46589f535010e497965b97c5689841224b504c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae46589f535010e497965b97c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:43 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_load_ds_location(). --- dlls/wined3d/device.c | 4 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 69 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 44 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae46589f535010e497965…

1 0

Davide Pizzetti : winedbg: Italian translation update.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: d084a6894743d99851448824aca8112398629b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d084a6894743d99851448824a… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Sat Apr 17 23:59:47 2010 +0200 winedbg: Italian translation update. --- programs/winedbg/rsrc_It.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/rsrc_It.rc b/programs/winedbg/rsrc_It.rc index 29a8005..b74c31c 100644 --- a/programs/winedbg/rsrc_It.rc +++ b/programs/winedbg/rsrc_It.rc @@ -43,10 +43,10 @@ BEGIN chiudersi. Siamo spiacenti per l'inconveniente.", IDC_STATIC_TXT1,27,10,224,30 LTEXT "Questo può essere causato da un problema nel programma o da una mancanza in Wine. \ - Potresti voler vedere http://appdb.winehq.org per consigli su \ + Potresti voler consultare http://appdb.winehq.org per consigli su \ questa applicazione.\n\n\ Se questo problema non è presente sotto Windows e non è stato ancora riportato, \ - puoi riportarlo a http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + puoi riportarlo su http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 DEFPUSHBUTTON "Chiudi", IDOK, 205, 151, 60, 16, WS_TABSTOP END

1 0

Austin English : winedump: Output Makefile. in the right way for the new build system.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 62781a6b3cec40844071ba742c9fffb386ae6ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62781a6b3cec40844071ba742… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 16 15:21:50 2010 -0500 winedump: Output Makefile.in the right way for the new build system. --- tools/winedump/output.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index c2a69d3..e0697f8 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -459,9 +459,7 @@ void output_makefile (void) if (globals.forward_dll) fprintf (makefile, " %s", globals.forward_dll); - fprintf (makefile, - "\n\nC_SRCS = \\\n\t%s_main.c\n\n(a)MAKE_DLL_RULES@\n\n" - "@DEPENDENCIES@ # everything below this line is overwritten by make depend", + fprintf (makefile, "\n\nC_SRCS = \\\n\t%s_main.c\n\n(a)MAKE_DLL_RULES@\n\n", OUTPUT_DLL_NAME); if (globals.forward_dll)

1 0

Vincent Povirk : gdiplus: Fix the non-trivial case in color_over.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 6b53cb27bc51b53c2ce10e7e177c7b74bfd3264a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b53cb27bc51b53c2ce10e7e1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Apr 17 11:31:15 2010 -0500 gdiplus: Fix the non-trivial case in color_over. --- dlls/gdiplus/gdiplus_private.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5ff7125..2313cd5 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -94,9 +94,9 @@ static inline ARGB color_over(ARGB bg, ARGB fg) if (bg_alpha == 0) return fg; a = bg_alpha + fg_alpha; - b = ((bg&0xff)*bg_alpha + (fg&0xff)*fg_alpha)*0xff/a; - g = (((bg>>8)&0xff)*bg_alpha + ((fg>>8)&0xff)*fg_alpha)*0xff/a; - r = (((bg>>16)&0xff)*bg_alpha + ((fg>>16)&0xff)*fg_alpha)*0xff/a; + b = ((bg&0xff)*bg_alpha + (fg&0xff)*fg_alpha)/a; + g = (((bg>>8)&0xff)*bg_alpha + ((fg>>8)&0xff)*fg_alpha)/a; + r = (((bg>>16)&0xff)*bg_alpha + ((fg>>16)&0xff)*fg_alpha)/a; return (a<<24)|(r<<16)|(g<<8)|b; }

1 0

Davide Pizzetti : net: Italian translation update.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: e2e87ed2281e35382d2d9bef1568a53ce85a93d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e87ed2281e35382d2d9bef1… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Sat Apr 17 23:32:13 2010 +0200 net: Italian translation update. --- programs/net/It.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/net/It.rc b/programs/net/It.rc index 3c026af..15a78c3 100644 --- a/programs/net/It.rc +++ b/programs/net/It.rc @@ -28,20 +28,20 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE { - STRING_USAGE, "La sistassi di questo comando è:\n\nNET [ HELP | START | STOP | USE ]\n" + STRING_USAGE, "La sintassi di questo comando è:\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "Specificare il nome del servizio da avviare.\n" STRING_STOP_USAGE, "Specificare il nome del servizio da fermare.\n" STRING_STOP_DEP, "Fermando il servizio dipendente: %s\n" STRING_CANT_STOP, "Impossibile fermare il servizio %s\n" - STRING_NO_SCM, "Impossibile ottenere l'handle del service control manager.\n" - STRING_NO_SVCHANDLE, "Impossibile ottenere l'handle del service.\n" + STRING_NO_SCM, "Impossibile ottenere l'handle del gestore del controllo del servizio.\n" + STRING_NO_SVCHANDLE, "Impossibile ottenere l'handle del servizio.\n" STRING_START_SVC, "Il servizio %s sarà avviato.\n" STRING_START_SVC_SUCCESS, "Il servizio %s è stato avviato con successo.\n" STRING_START_SVC_FAIL, "Impossibile avviare il servizio %s.\n" STRING_STOP_SVC, "Il servizio %s sarà fermato.\n" STRING_STOP_SVC_SUCCESS, "Il servizio %s è stato fermato con successo.\n" - STRING_STOP_SVC_FAIL, "IMpossibile fermare il servizio %s.\n" - STRING_HELP_USAGE, "La sistassi di questo comando è:\n\nNET HELP comando\n -o-\nNET comando /HELP\n\n"\ + STRING_STOP_SVC_FAIL, "Impossibile fermare il servizio %s.\n" + STRING_HELP_USAGE, "La sintassi di questo comando è:\n\nNET HELP comando\n -o-\nNET comando /HELP\n\n"\ " Comandi disponibili:\n NET HELP NET START NET STOP NET USE\n" STRING_NO_ENTRIES, "Non ci sono elementi nella lista.\n" STRING_USE_HEADER, "\nStato Locale Remoto\n---------------------------------------------------------------\n"

1 0