January 2008 - Wine-Commits

Gerald Pfeifer : kernel32: Use setproctitle where applicable to set the process name.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 39f672798ba4ff3173e7f9e5f7820237c1e31eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f672798ba4ff3173e7f9e5f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 20 21:23:08 2008 +0100 kernel32: Use setproctitle where applicable to set the process name. Based on a patch by Kris Moore. --- configure | 2 ++ configure.ac | 1 + dlls/kernel32/process.c | 4 ++++ include/config.h.in | 3 +++ 4 files changed, 10 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 90c012f..238a278 100755 --- a/configure +++ b/configure @@ -16536,6 +16536,7 @@ esac + for ac_func in \ _pclose \ _popen \ @@ -16581,6 +16582,7 @@ for ac_func in \ rfork \ sched_yield \ select \ + setproctitle \ setrlimit \ settimeofday \ sigaltstack \ diff --git a/configure.ac b/configure.ac index 6f7f063..b81e11c 100644 --- a/configure.ac +++ b/configure.ac @@ -1364,6 +1364,7 @@ AC_CHECK_FUNCS(\ rfork \ sched_yield \ select \ + setproctitle \ setrlimit \ settimeofday \ sigaltstack \ diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4b4d3cd..6156203 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -897,6 +897,10 @@ static void start_process( void *arg ) */ static void set_process_name( int argc, char *argv[] ) { +#ifdef HAVE_SETPROCTITLE + setproctitle("-%s", argv[1]); +#endif + #ifdef HAVE_PRCTL int i, offset; char *p, *prctl_name = argv[1]; diff --git a/include/config.h.in b/include/config.h.in index 14a2648..1b2c828 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -588,6 +588,9 @@ /* Define to 1 if you have the `sendmsg' function. */ #undef HAVE_SENDMSG +/* Define to 1 if you have the `setproctitle' function. */ +#undef HAVE_SETPROCTITLE + /* Define to 1 if you have the `setrlimit' function. */ #undef HAVE_SETRLIMIT

1 0

Alexander Nicolaysen Sørnes : riched20: Don't clear CFM_UNDERLINE flag when applying styles where it is set.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 9f41a53c2aa89655054888a69dfc72de993fc1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f41a53c2aa89655054888a69… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 20 17:50:52 2008 +0100 riched20: Don't clear CFM_UNDERLINE flag when applying styles where it is set. --- dlls/riched20/style.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 06d76cf..8d67de3 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -218,7 +218,6 @@ ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) if (style->dwMask & CFM_UNDERLINE) { s->fmt.dwMask |= CFM_UNDERLINETYPE; - s->fmt.dwMask &= ~CFM_UNDERLINE; s->fmt.bUnderlineType = (style->dwEffects & CFM_UNDERLINE) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; }

1 0

Marcus Meissner : msi: Replaced msi_free() by LocalAlloc() since ConvertSidToStringSidW uses LocalAlloc().
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 943ac9795bfa2128d1b83294a646ef0a04e4a3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=943ac9795bfa2128d1b83294a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 20 21:11:19 2008 +0100 msi: Replaced msi_free() by LocalAlloc() since ConvertSidToStringSidW uses LocalAlloc(). Spotted by Christoph von Wittich <Christoph(a)ApiViewer.de>. --- dlls/msi/registry.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bf06d9d..ac89186 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -662,7 +662,7 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create) else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -739,7 +739,7 @@ UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -764,7 +764,7 @@ UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent) sprintfW(keypath, szUserDataComp_fmt, usersid, comp); - msi_free(usersid); + LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -794,7 +794,7 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -824,7 +824,7 @@ UINT MSIREG_OpenInstallPropertiesKey(LPCWSTR szProduct, HKEY *key, BOOL create) else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -849,7 +849,7 @@ UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); - msi_free(usersid); + LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -1039,7 +1039,7 @@ UINT MSIREG_OpenLocalManagedProductKey(LPCWSTR szProductCode, HKEY *key, BOOL cr } sprintfW(keypath, szInstaller_LocalManagedProd_fmt, usersid, squished_pc); - msi_free(usersid); + LocalFree(usersid); if (create) return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key);

1 0

Marcus Meissner : gdi32: Fix possible NULL ptr in TRACE.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: a63664f1ecc54db63fb19eafdcfe390583490485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63664f1ecc54db63fb19eafd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 20 20:59:16 2008 +0100 gdi32: Fix possible NULL ptr in TRACE. --- dlls/gdi32/font.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2789df5..5cec471 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -848,8 +848,9 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, if (!dc) return 0; - TRACE("lfFaceName = %s lfCharset = %d\n", debugstr_w(plf->lfFaceName), - plf->lfCharSet); + if (plf) + TRACE("lfFaceName = %s lfCharset = %d\n", debugstr_w(plf->lfFaceName), + plf->lfCharSet); fe32.lpLogFontParam = plf; fe32.lpEnumFunc = efproc; fe32.lpData = lParam;

1 0

Hans Leidekker : msvcr71: Add an implementation that forwards to msvcrt.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 67815c6b9e663a18f624b73271e35331a7b35833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67815c6b9e663a18f624b7327… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 20 19:34:01 2008 +0100 msvcr71: Add an implementation that forwards to msvcrt. --- .gitignore | 1 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 5 + dlls/msvcr71/Makefile.in | 14 + dlls/msvcr71/msvcr71.c | 42 +++ dlls/msvcr71/msvcr71.spec | 837 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 905 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67815c6b9e663a18f624b…

1 0

Hans Leidekker : msvcrt: _ftol returns a 64-bit value.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: b284dfd7abad56228ae66173df4fb9ad1eca7263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b284dfd7abad56228ae66173d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 20 19:34:44 2008 +0100 msvcrt: _ftol returns a 64-bit value. --- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index c09fda9..339cb1c 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -596,7 +596,7 @@ @ cdecl _fsopen(str str long) msvcrt._fsopen @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl _ftol() msvcrt._ftol +@ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt( double long str) msvcrt._gcvt diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index d44a767..e46b157 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -653,7 +653,7 @@ @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl _ftol() msvcrt._ftol +@ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt( double long str) msvcrt._gcvt

1 0

Hans Leidekker : msvcrt: Fix _execv spec entries for the forwarding variants too.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 93661611e524bf354157a8cb6ec256a7ae405b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93661611e524bf354157a8cb6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 20 19:34:29 2008 +0100 msvcrt: Fix _execv spec entries for the forwarding variants too. --- dlls/msvcrt20/msvcrt20.spec | 8 ++++---- dlls/msvcrt40/msvcrt40.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 8282130..c09fda9 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -566,10 +566,10 @@ @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @ varargs _execlpe(str str) msvcrt._execlpe -@ cdecl _execv(str str) msvcrt._execv -@ cdecl _execve(str str str) msvcrt._execve -@ cdecl _execvp(str str) msvcrt._execvp -@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _execv(str ptr) msvcrt._execv +@ cdecl _execve(str ptr ptr) msvcrt._execve +@ cdecl _execvp(str ptr) msvcrt._execvp +@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe @ cdecl _exit(long) msvcrt._exit @ cdecl _expand(ptr long) msvcrt._expand @ cdecl _fcloseall() msvcrt._fcloseall diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 4657ccf..d44a767 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -619,10 +619,10 @@ @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @ varargs _execlpe(str str) msvcrt._execlpe -@ cdecl _execv(str str) msvcrt._execv -@ cdecl _execve(str str str) msvcrt._execve -@ cdecl _execvp(str str) msvcrt._execvp -@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _execv(str ptr) msvcrt._execv +@ cdecl _execve(str ptr ptr) msvcrt._execve +@ cdecl _execvp(str ptr) msvcrt._execvp +@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe @ cdecl _exit(long) msvcrt._exit @ cdecl _expand(ptr long) msvcrt._expand @ cdecl _fcloseall() msvcrt._fcloseall diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 9e94364..ec1a4b7 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -235,10 +235,10 @@ @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @ varargs _execlpe(str str) msvcrt._execlpe -@ cdecl _execv(str str) msvcrt._execv -@ cdecl _execve(str str str) msvcrt._execve -@ cdecl _execvp(str str) msvcrt._execvp -@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _execv(str ptr) msvcrt._execv +@ cdecl _execve(str ptr ptr) msvcrt._execve +@ cdecl _execvp(str ptr) msvcrt._execvp +@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe @ cdecl _exit(long) msvcrt._exit @ cdecl _expand(ptr long) msvcrt._expand @ cdecl _expand_dbg(ptr long) msvcrt._expand

1 0

Christoph von Wittich : msi: Fix process token leak.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 007833f1302dff64dcdf1c58332b2f086eef5dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=007833f1302dff64dcdf1c583… Author: Christoph von Wittich <Christoph(a)ApiViewer.de> Date: Sun Jan 20 17:58:40 2008 +0100 msi: Fix process token leak. --- dlls/msi/registry.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 12d2c9a..bf06d9d 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -478,13 +478,17 @@ static UINT get_user_sid(LPWSTR *usersid) return ERROR_FUNCTION_FAILED; size = sizeof(buf); - if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) + if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) { + CloseHandle(token); return ERROR_FUNCTION_FAILED; + } user = (PTOKEN_USER)buf; - if (!ConvertSidToStringSidW(user->User.Sid, usersid)) + if (!ConvertSidToStringSidW(user->User.Sid, usersid)) { + CloseHandle(token); return ERROR_FUNCTION_FAILED; - + } + CloseHandle(token); return ERROR_SUCCESS; }

1 0

Andrew Talbot : shell32: Remove unneeded casts.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 6994071269184c5db7b9ede376e3519cb0e518b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6994071269184c5db7b9ede37… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 19 16:54:31 2008 +0000 shell32: Remove unneeded casts. --- dlls/shell32/shlfolder.c | 2 +- dlls/shell32/shv_item_cmenu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 11aeab5..cff924f 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -135,7 +135,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) while (*pszTail && (*pszTail != (WCHAR) '\\')) pszTail++; - dwCopy = (const WCHAR *) pszTail - (const WCHAR *) pszNext + 1; + dwCopy = pszTail - pszNext + 1; lstrcpynW (pszOut, pszNext, (dwOut < dwCopy) ? dwOut : dwCopy); if (*pszTail) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index b0ec250..6beb08f 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -472,7 +472,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( switch(idCommand) { case FCIDM_SHVIEW_RENAME: - strcpy((LPSTR)lpszName, "rename"); + strcpy(lpszName, "rename"); hr = NOERROR; break; }

1 0

Rob Shearman : widl: Write out code for initialising out-only client context handles.
by Alexandre Julliard Jan. 21, 2008

Jan. 21, 2008

Module: wine Branch: master Commit: 5af6012fbadf5948dfef4502e91fc3e91c476089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af6012fbadf5948dfef4502e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 20 10:56:15 2008 +0000 widl: Write out code for initialising out-only client context handles. --- tools/widl/typegen.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4fdc84f..0e8a096 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2724,6 +2724,8 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, { if (pass == PASS_OUT) { + if (!in_attr) + print_file(file, indent, "*%s = 0;\n", var->name); print_file(file, indent, "NdrClientContextUnmarshall(\n"); print_file(file, indent + 1, "&_StubMsg,\n"); print_file(file, indent + 1, "(NDR_CCONTEXT *)%s,\n", var->name);

1 0