wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Jacek Caban : wscript: Added tests using vbscript.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: ec3d0e9b5cb339c6014c001c484b1fcfee60ed39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3d0e9b5cb339c6014c001c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 13:16:30 2011 +0200 wscript: Added tests using vbscript. --- programs/wscript/tests/rsrc.rc | 3 +++ programs/wscript/tests/run.c | 20 ++++++++++++++++---- programs/wscript/tests/run.vbs | 30 ++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/programs/wscript/tests/rsrc.rc b/programs/wscript/tests/rsrc.rc index b1df1c5..87e9a73 100644 --- a/programs/wscript/tests/rsrc.rc +++ b/programs/wscript/tests/rsrc.rc @@ -18,3 +18,6 @@ /* @makedep: run.js */ run.js TESTSCRIPT "run.js" + +/* @makedep: run.vbs */ +run.vbs TESTSCRIPT "run.vbs" diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index b7d3c3c..163be22 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -170,16 +170,28 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { switch(dispIdMember) { - case DISPID_TESTOBJ_OK: + case DISPID_TESTOBJ_OK: { + VARIANT *expr, *msg; + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); - ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); - ok(V_BOOL(pdp->rgvarg+1), "%s: %s\n", script_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); + + expr = pdp->rgvarg+1; + if(V_VT(expr) == (VT_VARIANT|VT_BYREF)) + expr = V_VARIANTREF(expr); + + msg = pdp->rgvarg; + if(V_VT(msg) == (VT_VARIANT|VT_BYREF)) + msg = V_VARIANTREF(msg); + + ok(V_VT(msg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(msg)); + ok(V_VT(expr) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(expr)); + ok(V_BOOL(expr), "%s: %s\n", script_name, wine_dbgstr_w(V_BSTR(msg))); if(pVarResult) V_VT(pVarResult) = VT_EMPTY; break; + } case DISPID_TESTOBJ_TRACE: ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); diff --git a/programs/wscript/tests/run.vbs b/programs/wscript/tests/run.vbs new file mode 100644 index 0000000..785df78 --- /dev/null +++ b/programs/wscript/tests/run.vbs @@ -0,0 +1,30 @@ +' +' Copyright 2011 Jacek Caban for CodeWeavers +' +' This library is free software; you can redistribute it and/or +' modify it under the terms of the GNU Lesser General Public +' License as published by the Free Software Foundation; either +' version 2.1 of the License, or (at your option) any later version. +' +' This library is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +' Lesser General Public License for more details. +' +' You should have received a copy of the GNU Lesser General Public +' License along with this library; if not, write to the Free Software +' Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +' + +Option Explicit + +Dim winetest +Set winetest = CreateObject("Wine.Test") + +Sub ok(expr, msg) + Call winetest.ok(expr, msg) +End Sub + +Call ok(WScript is WSH, "WScript is not WSH") + +Call winetest.reportSuccess()

1 0

Alexandre Julliard : ntdll: Unwind the stack before calling exit/ abort_thread on i386 the same way we do on x86_64.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 62b7069fa941c6ac1c923f0a7986261e290862c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62b7069fa941c6ac1c923f0a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 12:59:58 2011 +0200 ntdll: Unwind the stack before calling exit/abort_thread on i386 the same way we do on x86_64. --- dlls/ntdll/ntdll_misc.h | 4 +++ dlls/ntdll/signal_i386.c | 49 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 4956537..20f1c45 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -224,6 +224,10 @@ struct ntdll_thread_data int wait_fd[2]; /* 1ec/300 fd for sleeping server requests */ BOOL wow64_redir; /* 1f4/308 Wow64 filesystem redirection flag */ pthread_t pthread_id; /* 1f8/310 pthread thread id */ +#ifdef __i386__ + WINE_VM86_TEB_INFO vm86; /* 1fc vm86 private data */ + void *exit_frame; /* 204 exit frame pointer */ +#endif }; static inline struct ntdll_thread_data *ntdll_get_thread_data(void) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 6c8e8e2..e839994 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2473,9 +2473,41 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +extern void DECLSPEC_NORETURN call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC( call_thread_entry_point, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") + "pushl %ebp\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("call_thread_func") ); + +extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int), void *frame ); +__ASM_GLOBAL_FUNC( call_thread_exit_func, + "movl 4(%esp),%eax\n\t" + "movl 8(%esp),%ecx\n\t" + "movl 12(%esp),%ebp\n\t" + __ASM_CFI(".cfi_def_cfa %ebp,4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") + __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") + "leal -20(%ebp),%esp\n\t" + "pushl %eax\n\t" + "call *%ecx" ); + /* wrapper for apps that don't declare the thread function correctly */ -extern void DECLSPEC_NORETURN call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg ); -__ASM_GLOBAL_FUNC(call_thread_func, +extern void DECLSPEC_NORETURN call_thread_func_wrapper( LPTHREAD_START_ROUTINE entry, void *arg ); +__ASM_GLOBAL_FUNC(call_thread_func_wrapper, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") @@ -2490,13 +2522,14 @@ __ASM_GLOBAL_FUNC(call_thread_func, "int $3" ) /*********************************************************************** - * call_thread_entry_point + * call_thread_func */ -void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) +void call_thread_func( LPTHREAD_START_ROUTINE entry, void *arg, void *frame ) { + ntdll_get_thread_data()->exit_frame = frame; __TRY { - call_thread_func( entry, arg ); + call_thread_func_wrapper( entry, arg ); } __EXCEPT(unhandled_exception_filter) { @@ -2511,7 +2544,8 @@ void call_thread_entry_point( LPTHREAD_START_ROUTINE entry, void *arg ) */ void WINAPI RtlExitUserThread( ULONG status ) { - exit_thread( status ); + if (!ntdll_get_thread_data()->exit_frame) exit_thread( status ); + call_thread_exit_func( status, exit_thread, ntdll_get_thread_data()->exit_frame ); } /*********************************************************************** @@ -2519,7 +2553,8 @@ void WINAPI RtlExitUserThread( ULONG status ) */ void abort_thread( int status ) { - terminate_thread( status ); + if (!ntdll_get_thread_data()->exit_frame) terminate_thread( status ); + call_thread_exit_func( status, terminate_thread, ntdll_get_thread_data()->exit_frame ); } /**********************************************************************

1 0

Frédéric Delanoy : mlang/tests: Fix a typo.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 241ccd9ab9d98574f6310fcfb05b3d3539e5f561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241ccd9ab9d98574f6310fcfb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 19 11:35:54 2011 +0200 mlang/tests: Fix a typo. --- dlls/mlang/tests/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 42ad1f8..65244bb 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1202,7 +1202,7 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) ok(!lstrcmpA(rfc1766A, info_table[i].rfc1766), "#%02d: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766); - /* Some IE versions truncate an oversized name one character to short */ + /* Some IE versions truncate an oversized name one character too short */ if (info_table[i].broken_name) { lstrcpyW(short_broken_name, info_table[i].broken_name); short_broken_name[MAX_LOCALE_NAME - 2] = 0;

1 0

Frédéric Delanoy : dmime: Avoid idempotent operation (Clang).
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: f9ecfff4bfd66106b49234582e06a1a819d00919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ecfff4bfd66106b49234582… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 19 11:33:56 2011 +0200 dmime: Avoid idempotent operation (Clang). --- dlls/dmime/segment.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 9f968e6..82ea753 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1226,8 +1226,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_Load (LPPERSISTSTR IStream_Clone (pStm, &pClonedStream); - liMove.QuadPart = 0; - liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); + liMove.QuadPart = - (LONGLONG)(sizeof(FOURCC) * 2 + sizeof(DWORD)); IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); hr = IDirectMusicSegment8Impl_IPersistStream_LoadWave (iface, pClonedStream, &pWave);

1 0

Frédéric Delanoy : cmd: Rename WCMD_opt_s_strip_quotes function.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: d19455e8958dc828a5c180cb8da96e45901a0324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19455e8958dc828a5c180cb8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 19 09:47:58 2011 +0200 cmd: Rename WCMD_opt_s_strip_quotes function. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5a890c7..79e1ced 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2229,7 +2229,7 @@ void WCMD_setshow_env (WCHAR *s) { s += 2; while (*s && (*s==' ' || *s=='\t')) s++; if (*s=='\"') - WCMD_opt_s_strip_quotes(s); + WCMD_strip_quotes(s); /* If no parameter, or no '=' sign, return an error */ if (!(*s) || ((p = strchrW (s, '=')) == NULL )) { @@ -2255,7 +2255,7 @@ void WCMD_setshow_env (WCHAR *s) { DWORD gle; if (*s=='\"') - WCMD_opt_s_strip_quotes(s); + WCMD_strip_quotes(s); p = strchrW (s, '='); if (p == NULL) { env = GetEnvironmentStringsW(); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 61cef8f..e025484 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -108,7 +108,7 @@ BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, const WCHAR *forValue, BOOL justFors); void WCMD_splitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); -void WCMD_opt_s_strip_quotes(WCHAR *cmd); +void WCMD_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); WCHAR *WCMD_strdupW(const WCHAR *input); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index a4726e8..56aa85f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -506,11 +506,11 @@ BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr) { } /************************************************************************* - * WCMD_opt_s_strip_quotes + * WCMD_strip_quotes * * Remove first and last quote WCHARacters, preserving all other text */ -void WCMD_opt_s_strip_quotes(WCHAR *cmd) { +void WCMD_strip_quotes(WCHAR *cmd) { WCHAR *src = cmd + 1, *dest = cmd, *lastq = NULL; while((*dest=*src) != '\0') { if (*src=='\"') @@ -1204,7 +1204,7 @@ void WCMD_run_program (WCHAR *command, int called) { if ((opt_c || opt_k) && !opt_s && !status && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') { /* strip first and last quote WCHARacters and try again */ - WCMD_opt_s_strip_quotes(command); + WCMD_strip_quotes(command); opt_s=1; WCMD_run_program(command, called); return; @@ -2478,7 +2478,7 @@ int wmain (int argc, WCHAR *argvW[]) /* strip first and last quote characters if opt_s; check for invalid * executable is done later */ if (opt_s && *cmd=='\"') - WCMD_opt_s_strip_quotes(cmd); + WCMD_strip_quotes(cmd); } if (opt_c) {

1 0

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

19 Oct '11

Module: wine Branch: master Commit: 1b4b274f6959aee43324c5037c95158dfd6f8a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4b274f6959aee43324c5037… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 18 22:27:45 2011 +0200 po: Update French translation. --- po/fr.po | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5790885..835e89a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6750,9 +6750,8 @@ msgid "Trash" msgstr "Corbeille" #: shlwapi.rc:27 -#, fuzzy msgid "%d bytes" -msgstr "%ld octets" +msgstr "%d octets" #: shlwapi.rc:28 msgctxt "time unit: hours" @@ -11462,60 +11461,51 @@ msgstr "" "Nombre invalide de paramètres - Utilisez xcopy /? pour obtenir de l'aide\n" #: xcopy.rc:28 -#, fuzzy msgid "Invalid parameter '%1' - Use xcopy /? for help\n" msgstr "" -"Paramètre invalide « %s » - Utilisez xcopy /? pour obtenir de l'aide\n" +"Paramètre « %1 » invalide - Utilisez xcopy /? pour obtenir de l'aide\n" #: xcopy.rc:29 msgid "Press <enter> to begin copying\n" msgstr "Appuyez sur ENTRÉE pour démarrer la copie\n" #: xcopy.rc:30 -#, fuzzy msgid "%1!d! file(s) would be copied\n" -msgstr "%d fichier(s) seront copiés\n" +msgstr "%1!d! fichier(s) seront copiés\n" #: xcopy.rc:31 -#, fuzzy msgid "%1!d! file(s) copied\n" -msgstr "%d fichier(s) copiés\n" +msgstr "%1!d! fichier(s) copiés\n" #: xcopy.rc:34 -#, fuzzy msgid "" "Is '%1' a filename or directory\n" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" -"« %s » est-il un fichier ou un répertoire\n" +"« %1 » est-il un fichier ou un répertoire\n" "dans la destination ?\n" "(F - Fichier, R - Répertoire)\n" #: xcopy.rc:35 -#, fuzzy msgid "%1? (Yes|No)\n" -msgstr "%s ? (Oui|Non)\n" +msgstr "%1 ? (Oui|Non)\n" #: xcopy.rc:36 -#, fuzzy msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "Écraser %s ? (Oui|Non|Tous)\n" +msgstr "Écraser %1 ? (Oui|Non|Tous)\n" #: xcopy.rc:37 -#, fuzzy msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" -msgstr "La copie de « %s » vers « %s » a échoué avec le code de retour %d\n" +msgstr "La copie de « %1 » vers « %2 » a échoué avec le code de retour %3!d!\n" #: xcopy.rc:38 -#, fuzzy msgid "Failed to open '%1'\n" -msgstr "Impossible d'ouvrir « %s »\n" +msgstr "Impossible d'ouvrir « %1 »\n" #: xcopy.rc:39 -#, fuzzy msgid "Failed during reading of '%1'\n" -msgstr "Impossible de lire « %s »\n" +msgstr "Impossible de lire « %1 »\n" #: xcopy.rc:43 msgctxt "File key"

1 0

Andrew Eikum : shell32: ShellExec with empty operation should behave same as with NULL operation.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 3f3e42b6bc296af9f18a4b3eff6610590db033c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3e42b6bc296af9f18a4b3ef… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 18 15:19:17 2011 -0500 shell32: ShellExec with empty operation should behave same as with NULL operation. --- dlls/shell32/classes.c | 2 +- dlls/shell32/shlexec.c | 4 ++-- dlls/shell32/tests/shlexec.c | 9 ++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 9fbdf0e..a56af62 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -129,7 +129,7 @@ BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD l TRACE("%p %s %p\n", hkeyClass, debugstr_w(szVerb), szDest); - if (szVerb) + if (szVerb && *szVerb) { lstrcpynW(szDest, szVerb, len); return TRUE; diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 7fd485e..77212f0 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1517,7 +1517,7 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, TRACE("Got URL: %s\n", debugstr_w(lpFile)); /* Looking for ...protocol\shell\lpOperation\command */ len = iSize + lstrlenW(wShell) + lstrlenW(wCommand) + 1; - if (psei->lpVerb) + if (psei->lpVerb && *psei->lpVerb) len += lstrlenW(psei->lpVerb); else len += lstrlenW(wszOpen); @@ -1525,7 +1525,7 @@ static UINT_PTR SHELL_execute_url( LPCWSTR lpFile, LPCWSTR wFile, LPCWSTR wcmd, memcpy(lpstrProtocol, lpFile, iSize*sizeof(WCHAR)); lpstrProtocol[iSize] = '\0'; strcatW(lpstrProtocol, wShell); - strcatW(lpstrProtocol, psei->lpVerb? psei->lpVerb: wszOpen); + strcatW(lpstrProtocol, psei->lpVerb && *psei->lpVerb ? psei->lpVerb: wszOpen); strcatW(lpstrProtocol, wCommand); /* Remove File Protocol from lpFile */ diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9c0bc58..5542ea5 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -92,7 +92,10 @@ static void strcat_param(char* str, const char* param) static char shell_call[2048]=""; static int shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCSTR directory) { - INT_PTR rc; + INT_PTR rc, rcEmpty = 0; + + if(!operation) + rcEmpty = shell_execute("", file, parameters, directory); strcpy(shell_call, "ShellExecute("); strcat_param(shell_call, operation); @@ -139,6 +142,10 @@ static int shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, LPCST if (rc > 32) dump_child(); + if(!operation) + ok(rc == rcEmpty || broken(rc > 32 && rcEmpty == SE_ERR_NOASSOC) /* NT4 */, + "Got different return value with empty string: %lu %lu\n", rc, rcEmpty); + return rc; }

1 0

Marcus Meissner : user.exe16: Fixed incorrect sizeof() (Coverity).
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 90ca362013855872729aeb8794ce2d867371e5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ca362013855872729aeb879… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 18 22:10:11 2011 +0200 user.exe16: Fixed incorrect sizeof() (Coverity). --- dlls/user.exe16/user.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 01125ff..705620b 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1357,7 +1357,7 @@ LONG WINAPI TabbedTextOut16( HDC16 hdc, INT16 x, INT16 y, LPCSTR lpstr, INT16 count, INT16 nb_tabs, const INT16 *tabs16, INT16 tab_org ) { LONG ret; - INT i, *tabs = HeapAlloc( GetProcessHeap(), 0, nb_tabs * sizeof(tabs) ); + INT i, *tabs = HeapAlloc( GetProcessHeap(), 0, nb_tabs * sizeof(*tabs) ); if (!tabs) return 0; for (i = 0; i < nb_tabs; i++) tabs[i] = tabs16[i]; ret = TabbedTextOutA( HDC_32(hdc), x, y, lpstr, count, nb_tabs, tabs, tab_org ); @@ -1373,7 +1373,7 @@ DWORD WINAPI GetTabbedTextExtent16( HDC16 hdc, LPCSTR lpstr, INT16 count, INT16 nb_tabs, const INT16 *tabs16 ) { LONG ret; - INT i, *tabs = HeapAlloc( GetProcessHeap(), 0, nb_tabs * sizeof(tabs) ); + INT i, *tabs = HeapAlloc( GetProcessHeap(), 0, nb_tabs * sizeof(*tabs) ); if (!tabs) return 0; for (i = 0; i < nb_tabs; i++) tabs[i] = tabs16[i]; ret = GetTabbedTextExtentA( HDC_32(hdc), lpstr, count, nb_tabs, tabs );

1 0

Andrew Talbot : wininet: Add a break to a switch statement.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 31b3cbfb93a36aac85a0d174d59bc804fe65f93f URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b3cbfb93a36aac85a0d174d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 18 20:56:32 2011 +0100 wininet: Add a break to a switch statement. --- dlls/wininet/internet.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f9e8dea..020fe2c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -287,15 +287,16 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) g_dwTlsErrIndex = TlsAlloc(); - if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) - return FALSE; + if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) + return FALSE; URLCacheContainers_CreateDefaults(); WININET_hModule = hinstDLL; + break; case DLL_THREAD_ATTACH: - break; + break; case DLL_THREAD_DETACH: if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES)

1 0

Austin English : configure: Use -fno-omit-frame-pointer when available.
by Alexandre Julliard 19 Oct '11

19 Oct '11

Module: wine Branch: master Commit: 5cfe7db1854ff1142d598eaf49f6050676c8d547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cfe7db1854ff1142d598eaf4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 18 12:17:37 2011 -0700 configure: Use -fno-omit-frame-pointer when available. --- configure | 28 ++++++++++++++++++++++++++++ configure.ac | 5 +++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7325264..138fa8d 100755 --- a/configure +++ b/configure @@ -12014,6 +12014,34 @@ if test $ac_cv_cflags__Wwrite_strings = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi + case $host_cpu in + *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 +$as_echo_n "checking whether the compiler supports -fno-omit-frame-pointer... " >&6; } +if ${ac_cv_cflags__fno_omit_frame_pointer+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -fno-omit-frame-pointer" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__fno_omit_frame_pointer=yes +else + ac_cv_cflags__fno_omit_frame_pointer=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__fno_omit_frame_pointer" >&5 +$as_echo "$ac_cv_cflags__fno_omit_frame_pointer" >&6; } +if test $ac_cv_cflags__fno_omit_frame_pointer = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -fno-omit-frame-pointer" +fi ;; + esac + saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken string.h that generates warnings with -Wpointer-arith" >&5 diff --git a/configure.ac b/configure.ac index 5a9fd2b..363d08f 100644 --- a/configure.ac +++ b/configure.ac @@ -1684,6 +1684,11 @@ then WINE_TRY_CFLAGS([-Wunused-but-set-parameter]) WINE_TRY_CFLAGS([-Wwrite-strings]) + dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections + case $host_cpu in + *i[[3456789]]86*) WINE_TRY_CFLAGS([-fno-omit-frame-pointer]) ;; + esac + dnl Check for noisy string.h saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror"

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
79
Older →

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