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

Frédéric Delanoy : cmd/tests: Add tests for stdout redirection and appending operators.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 011d5c331c8d2ef161e2fda4ea8282466e33d347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=011d5c331c8d2ef161e2fda4e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 26 21:32:07 2011 +0200 cmd/tests: Add tests for stdout redirection and appending operators. --- programs/cmd/tests/test_builtins.cmd | 32 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 21 +++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2062a9d..572fb38 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -28,6 +28,38 @@ echo .word echo word(a)space@ echo word(a)space@@space@ +echo ------------ Testing redirection operators -------------- +mkdir foobar & cd foobar +echo ...stdout redirection +echo foo>foo +type foo +echo foo 1> foo +type foo +echo foo1> foo +type foo +echo foo11> foo +type foo +echo foo12> foo +type foo +echo ...stdout appending +echo foo>foo +echo foo >>foo +type foo +del foo +echo foob >> foo +type foo +echo fooc 1>>foo +type foo +echo food1>>foo +type foo +echo food2>>foo +type foo +del foo +echo food21>>foo +type foo +cd .. +rd /s/q foobar + 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 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index d939ec5..d10aa4c 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -47,6 +47,27 @@ word .word word(a)space@ word(a)space@@space@ +------------ Testing redirection operators -------------- +...stdout redirection +foo +foo(a)space@ +(a)todo_wine@foo1 +(a)todo_wine@foo11 +(a)todo_wine@foo12 +...stdout appending +foo +foo(a)space@ +foob(a)space@ +foob(a)space@ +fooc(a)space@ +foob(a)space@ +fooc(a)space@ +(a)todo_wine@food1 +(a)todo_wine@foob(a)space@ +(a)todo_wine@fooc(a)space@ +(a)todo_wine@food1 +(a)todo_wine@food2 +(a)todo_wine@food21 @todo_wine(a)------------ Testing ^ escape character -------------- @todo_wine(a)hello, world @todo_wine(a)hello, world

1 0

Frédéric Delanoy : cmd: Fix some comments.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 8b73720d4e587c4b4e08d624b2dfd632ce6d3b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b73720d4e587c4b4e08d624b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 27 02:21:01 2011 +0200 cmd: Fix some comments. --- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 1bf0485..939e404 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -151,7 +151,7 @@ typedef struct _DIRECTORY_STACK /* * Serial nos of builtin commands. These constants must be in step with - * the list of strings defined in WCMD.C, and WCMD_EXIT *must* always be + * the list of strings defined in wcmd.rc, and WCMD_EXIT *must* always be * the last one. * * Yes it *would* be nice to use an enumeration here, but the Resource diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index bd572d2..f3fa129 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -903,8 +903,8 @@ static void init_msvcrt_io_block(STARTUPINFOW* st) if (st_p.cbReserved2 && st_p.lpReserved2) { /* Override the entries for fd 0,1,2 if we happened - * to change those std handles (this depends on the way wcmd sets - * it's new input & output handles) + * to change those std handles (this depends on the way cmd sets + * its new input & output handles) */ size_t sz = max(sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * 3, st_p.cbReserved2); BYTE* ptr = HeapAlloc(GetProcessHeap(), 0, sz); @@ -1661,7 +1661,7 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, /*************************************************************************** * WCMD_IsEndQuote * - * Checks if the quote pointet to is the end-quote. + * Checks if the quote pointed to is the end-quote. * * Quotes end if: * @@ -1716,7 +1716,7 @@ static BOOL WCMD_IsEndQuote(WCHAR *quote, int quoteIndex) * * Either uses supplied input or * Reads a file from the handle, and then... - * Parse the text buffer, spliting into separate commands + * Parse the text buffer, splitting into separate commands * - unquoted && strings split 2 commands but the 2nd is flagged as * following an && * - ( as the first character just ups the bracket depth @@ -2422,7 +2422,7 @@ int wmain (int argc, WCHAR *argvW[]) } if (opt_c) { - /* If we do a "wcmd /c command", we don't want to allocate a new + /* If we do a "cmd /c command", we don't want to allocate a new * console since the command returns immediately. Rather, we use * the currently allocated input and output handles. This allows * us to pipe to and read from the command interpreter.

1 0

Alexandre Julliard : widl: Clear out more types of parameters in the proxy error handlers.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 0d76bb7ec34d37a861845e47ab14ae4cd375840e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d76bb7ec34d37a861845e47a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 16:04:22 2011 +0200 widl: Clear out more types of parameters in the proxy error handlers. --- tools/widl/proxy.c | 33 +++++---------------------------- tools/widl/typegen.c | 17 +++++++++++------ tools/widl/typegen.h | 2 ++ 3 files changed, 18 insertions(+), 34 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 8e2db07..5129971 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -147,20 +147,9 @@ static int need_delegation_indirect(const type_t *iface) static void free_variable( const var_t *arg, const char *local_var_prefix ) { unsigned int type_offset = arg->type->typestring_offset; - expr_t *iid; type_t *type = arg->type; - expr_t *size = get_size_is_expr(type, arg->name); - if (size) - { - print_proxy( "__frame->_StubMsg.MaxCount = " ); - write_expr(proxy, size, 0, 1, NULL, NULL, local_var_prefix); - fprintf(proxy, ";\n\n"); - print_proxy( "NdrClearOutParameters( &__frame->_StubMsg, "); - fprintf(proxy, "&__MIDL_TypeFormatString.Format[%u], ", type_offset ); - fprintf(proxy, "(void*)%s );\n", arg->name ); - return; - } + write_parameter_conf_or_var_exprs(proxy, indent, local_var_prefix, PHASE_FREE, arg, FALSE); switch (typegen_detect_type(type, arg->attrs, TDT_IGNORE_STRINGS)) { @@ -174,23 +163,11 @@ static void free_variable( const var_t *arg, const char *local_var_prefix ) break; case TGT_IFACE_POINTER: - iid = get_attrp( arg->attrs, ATTR_IIDIS ); - if( iid ) - { - print_proxy( "__frame->_StubMsg.MaxCount = (ULONG_PTR) " ); - write_expr(proxy, iid, 1, 1, NULL, NULL, local_var_prefix); - print_proxy( ";\n\n" ); - } - /* fall through */ case TGT_POINTER: - if (get_pointer_fc(type, arg->attrs, TRUE) == RPC_FC_FP) - { - print_proxy( "NdrClearOutParameters( &__frame->_StubMsg, "); - fprintf(proxy, "&__MIDL_TypeFormatString.Format[%u], ", type_offset ); - fprintf(proxy, "(void*)%s );\n", arg->name ); - } - else - print_proxy("/* FIXME: %s code for %s type %d missing */\n", __FUNCTION__, arg->name, type_get_type(type) ); + case TGT_ARRAY: + print_proxy( "NdrClearOutParameters( &__frame->_StubMsg, "); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%u], ", type_offset ); + fprintf(proxy, "(void *)%s );\n", arg->name ); break; default: diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 847e10b..dfc5a50 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4035,8 +4035,8 @@ expr_t *get_size_is_expr(const type_t *t, const char *name) return x; } -static void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char *local_var_prefix, - enum remoting_phase phase, const var_t *var) +void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char *local_var_prefix, + enum remoting_phase phase, const var_t *var, int valid_variance) { const type_t *type = var->type; /* get fundamental type for the argument */ @@ -4057,9 +4057,14 @@ static void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char if (type_array_has_variance(type)) { print_file(file, indent, "__frame->_StubMsg.Offset = 0;\n"); /* FIXME */ - print_file(file, indent, "__frame->_StubMsg.ActualCount = (ULONG_PTR)"); - write_expr(file, type_array_get_variance(type), 1, 1, NULL, NULL, local_var_prefix); - fprintf(file, ";\n\n"); + if (valid_variance) + { + print_file(file, indent, "__frame->_StubMsg.ActualCount = (ULONG_PTR)"); + write_expr(file, type_array_get_variance(type), 1, 1, NULL, NULL, local_var_prefix); + fprintf(file, ";\n\n"); + } + else + print_file(file, indent, "__frame->_StubMsg.ActualCount = __frame->_StubMsg.MaxCount;\n\n"); } } break; @@ -4135,7 +4140,7 @@ static void write_remoting_arg(FILE *file, int indent, const var_t *func, const if (phase == PHASE_BUFFERSIZE && get_required_buffer_size( var, &alignment, pass )) return; - write_parameter_conf_or_var_exprs(file, indent, local_var_prefix, phase, var); + write_parameter_conf_or_var_exprs(file, indent, local_var_prefix, phase, var, TRUE); switch (typegen_detect_type(type, var->attrs, TDT_ALL_TYPES)) { diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index c98aff8..b6540e2 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -68,6 +68,8 @@ void write_typeformatstring(FILE *file, const statement_list_t *stmts, type_pred void write_procformatstring_offsets( FILE *file, const type_t *iface ); void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, enum remoting_phase phase, enum pass pass, const var_t *var, const char *varname); +void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char *local_var_prefix, + enum remoting_phase phase, const var_t *var, int valid_variance); void write_remoting_arguments(FILE *file, int indent, const var_t *func, const char *local_var_prefix, enum pass pass, enum remoting_phase phase); unsigned int get_size_procformatstring_func(const type_t *iface, const var_t *func);

1 0

Hans Leidekker : winhttp: Don't send any data if the verb is GET.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: ae05ce459fb929471d9498fd7e96414f6b07daaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae05ce459fb929471d9498fd7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 07:57:37 2011 +0200 winhttp: Don't send any data if the verb is GET. --- dlls/winhttp/request.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4da4508..ef5c2cb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2162,6 +2162,7 @@ struct winhttp_request HINTERNET hsession; HINTERNET hconnect; HINTERNET hrequest; + WCHAR *verb; HANDLE wait; HANDLE cancel; char *buffer; @@ -2202,6 +2203,7 @@ static ULONG WINAPI winhttp_request_Release( CloseHandle( request->wait ); CloseHandle( request->cancel ); heap_free( request->buffer ); + heap_free( request->verb ); heap_free( request ); } return refs; @@ -2444,6 +2446,7 @@ static HRESULT WINAPI winhttp_request_Open( debugstr_variant(&async)); if (!method || !url) return E_INVALIDARG; + if (!(request->verb = strdupW( method ))) return E_OUTOFMEMORY; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); @@ -2703,7 +2706,7 @@ static HRESULT WINAPI winhttp_request_Send( return HRESULT_FROM_WIN32( get_last_error() ); } VariantInit( &array ); - if (VariantChangeType( &array, &body, 0, VT_ARRAY|VT_UI1 ) == S_OK) + if (strcmpW( request->verb, getW ) && VariantChangeType( &array, &body, 0, VT_ARRAY|VT_UI1 ) == S_OK) { SAFEARRAY *sa = V_ARRAY( &array ); if ((hr = SafeArrayAccessData( sa, (void **)&ptr )) != S_OK) return hr; @@ -2986,6 +2989,7 @@ static HRESULT WINAPI winhttp_request_Abort( CloseHandle( request->wait ); CloseHandle( request->cancel ); heap_free( request->buffer ); + heap_free( request->verb ); request->state = REQUEST_STATE_INVALID; request->hrequest = NULL; request->hconnect = NULL; @@ -2993,6 +2997,7 @@ static HRESULT WINAPI winhttp_request_Abort( request->wait = NULL; request->cancel = NULL; request->buffer = NULL; + request->verb = NULL; request->offset = 0; request->bytes_available = 0; request->bytes_read = 0;

1 0

Hans Leidekker : msi: Store table and column names in the string table.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: d38ace6d4cf31d409f64e2ce930fbfe1f4c9a2a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38ace6d4cf31d409f64e2ce9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 10:52:48 2011 +0200 msi: Store table and column names in the string table. --- dlls/msi/table.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index aec257f..5bc1e3d 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -728,6 +728,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) { + enum StringPersistence string_persistence = (persistent) ? StringPersistent : StringNonPersistent; UINT r, nField; MSIVIEW *tv = NULL; MSIRECORD *rec = NULL; @@ -767,9 +768,12 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, for( i = 0, col = col_info; col; i++, col = col->next ) { - table->colinfo[ i ].tablename = strdupW( col->table ); + UINT table_id = msi_addstringW( db->strings, col->table, -1, 1, string_persistence ); + UINT col_id = msi_addstringW( db->strings, col->column, -1, 1, string_persistence ); + + table->colinfo[ i ].tablename = msi_string_lookup_id( db->strings, table_id ); table->colinfo[ i ].number = i + 1; - table->colinfo[ i ].colname = strdupW( col->column ); + table->colinfo[ i ].colname = msi_string_lookup_id( db->strings, col_id ); table->colinfo[ i ].type = col->type; table->colinfo[ i ].offset = 0; table->colinfo[ i ].ref_count = 0;

1 0

Hans Leidekker : msi: Make the column and table name parameters of get_column_info const.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: d1b20585003748b5b7f3fc80a1c56f59cbce0e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b20585003748b5b7f3fc80a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 10:53:10 2011 +0200 msi: Make the column and table name parameters of get_column_info const. --- dlls/msi/alter.c | 5 ++--- dlls/msi/create.c | 5 ++--- dlls/msi/delete.c | 5 ++--- dlls/msi/distinct.c | 5 ++--- dlls/msi/insert.c | 28 ++++++---------------------- dlls/msi/join.c | 6 ++---- dlls/msi/msipriv.h | 7 ++++--- dlls/msi/msiquery.c | 14 +++----------- dlls/msi/select.c | 9 +++------ dlls/msi/storages.c | 39 +++++++-------------------------------- dlls/msi/streams.c | 37 ++++++------------------------------- dlls/msi/table.c | 9 ++++----- dlls/msi/update.c | 5 ++--- dlls/msi/where.c | 5 ++--- 14 files changed, 47 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1b20585003748b5b7f3f…

1 0

Hans Leidekker : msi: Clean up the database queries.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: e1c2e8828f835e2b38169d5e2448590324da8fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c2e8828f835e2b38169d5e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 10:53:26 2011 +0200 msi: Clean up the database queries. --- dlls/msi/action.c | 558 +++++++++++++++++++++----------------------------- dlls/msi/alter.c | 6 +- dlls/msi/appsearch.c | 12 +- dlls/msi/classes.c | 133 +++++-------- dlls/msi/custom.c | 16 +- dlls/msi/database.c | 9 +- dlls/msi/dialog.c | 76 +++---- dlls/msi/files.c | 38 ++-- dlls/msi/font.c | 24 +-- dlls/msi/install.c | 8 +- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 102 ++++----- dlls/msi/patch.c | 12 +- dlls/msi/table.c | 17 +- dlls/msi/upgrade.c | 12 +- 15 files changed, 432 insertions(+), 593 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1c2e8828f835e2b38169…

1 0

Hans Leidekker : msi: Always check the return value of MSI_IterateRecords.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: fe404d1d88568803e2332b4899e01cd99b2d66a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe404d1d88568803e2332b489… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 27 10:53:44 2011 +0200 msi: Always check the return value of MSI_IterateRecords. --- dlls/msi/action.c | 123 +++++++++++++++++++++++++++++++--------------------- dlls/msi/classes.c | 92 +++++++++++++++++++++++++++----------- dlls/msi/files.c | 4 +- dlls/msi/font.c | 8 ++-- 4 files changed, 146 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe404d1d88568803e2332…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 1bc0737dc191a76d8b3a925907fc5bedd4cc9d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc0737dc191a76d8b3a92590… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 26 20:41:32 2011 +0200 po: Update French translation. --- po/fr.po | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index cb0c481..220c1e4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-07-14 22:15+0100\n" +"PO-Revision-Date: 2011-07-26 20:25+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -8270,6 +8270,8 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file\n" "which were introduced by a preceding SETLOCAL.\n" msgstr "" +"ENDLOCAL met fin aux modifications locales de l'environnement dans\n" +"un fichier batch, introduites à la suite d'un SETLOCAL préalable.\n" #: cmd.rc:218 msgid "" @@ -8280,6 +8282,15 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" +"SETLOCAL entame les modifications locales à l'environnement dans un\n" +"fichier batch.\n" +"\n" +"Les modifications apportées à l'environnement après un SETLOCAL sont " +"locales\n" +"au fichier batch, et sont préservées jusqu'au prochain ENDLOCAL (ou à " +"défaut\n" +"jusqu'à la fin du fichier), après quoi les réglages antérieurs de\n" +"l'environnement sont restaurés.\n" #: cmd.rc:221 msgid "" @@ -8321,7 +8332,6 @@ msgstr "" "au système d'exploitation ou au shell où vous avez invoqué cmd.\n" #: cmd.rc:267 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ATTRIB\t\tShow or change DOS file attributes\n" @@ -8369,6 +8379,8 @@ msgstr "" "DEL (ERASE)\tEfface un fichier ou un groupe de fichiers\n" "DIR\t\tListe le contenu d'un répertoire\n" "ECHO\t\tAffiche du texte sur la console\n" +"ENDLOCAL\tMet fin aux modifications locales de l'environnement dans un\n" +"\t\tfichier batch\n" "HELP\t\tAffiche de brefs détails sur l'utilisation d'une commande\n" "MD (MKDIR)\tCrée un répertoire\n" "MORE\t\tAffiche du texte par pages\n" @@ -8381,6 +8393,8 @@ msgstr "" "REN (RENAME)\tRenomme un fichier\n" "RD (RMDIR)\tEfface un répertoire\n" "SET\t\tRègle ou affiche les variables d'environnement\n" +"SETLOCAL\tEntame les modifications locales à l'environnement dans un\n" +"\t\tfichier batch\n" "TIME\t\tRègle ou affiche l'heure système courante\n" "TITLE\t\tRègle le titre de la fenêtre pour la session CMD\n" "TYPE\t\tAffiche le contenu d'un fichier texte\n"

1 0

Austin English : hlink: Remove win9x hacks.
by Alexandre Julliard 27 Jul '11

27 Jul '11

Module: wine Branch: master Commit: 5c1febe68ec1562ce45c4939543587d3ba1aba3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1febe68ec1562ce45c49395… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 26 12:23:55 2011 -0700 hlink: Remove win9x hacks. --- dlls/hlink/tests/browse_ctx.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 78df8fa..e9293d1 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -24,16 +24,6 @@ #include "wine/test.h" -/* Win9x and WinMe don't have lstrcmpW */ -static int strcmp_ww(const WCHAR *str1, const WCHAR *str2) -{ - DWORD len1 = lstrlenW(str1); - DWORD len2 = lstrlenW(str2); - - if (len1 != len2) return 1; - return memcmp(str1, str2, len1 * sizeof(WCHAR)); -} - static void test_SetInitialHlink(void) { IHlinkBrowseContext *bc; @@ -68,7 +58,7 @@ static void test_SetInitialHlink(void) hres = IMoniker_GetDisplayName(found_moniker, bindctx, NULL, &found_name); ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); - ok(!strcmp_ww(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); + ok(!lstrcmpW(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); CoTaskMemFree(exp_name); CoTaskMemFree(found_name);

1 0