April 2013 - Wine-commits - list.winehq.org

Nozomi Kodama : d3dx9: Floatify sqrt into sqrtf.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: e2d3553642402b661b8fbad66905127d112f74c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d3553642402b661b8fbad66… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Thu Apr 4 09:07:38 2013 -1000 d3dx9: Floatify sqrt into sqrtf. --- dlls/d3dx9_36/math.c | 68 +++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index ae9daac..207d152 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2394,54 +2394,54 @@ FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir if ((order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER)) return out; - out[0] = 0.5f / sqrt(D3DX_PI); - out[1] = -0.5f / sqrt(D3DX_PI / 3.0f) * dir->y; - out[2] = 0.5f / sqrt(D3DX_PI / 3.0f) * dir->z; - out[3] = -0.5f / sqrt(D3DX_PI / 3.0f) * dir->x; + out[0] = 0.5f / sqrtf(D3DX_PI); + out[1] = -0.5f / sqrtf(D3DX_PI / 3.0f) * dir->y; + out[2] = 0.5f / sqrtf(D3DX_PI / 3.0f) * dir->z; + out[3] = -0.5f / sqrtf(D3DX_PI / 3.0f) * dir->x; if (order == 2) return out; - out[4] = 0.5f / sqrt(D3DX_PI / 15.0f) * dirxy; - out[5] = -0.5f / sqrt(D3DX_PI / 15.0f) * diryz; - out[6] = 0.25f / sqrt(D3DX_PI / 5.0f) * (3.0f * dirzz - 1.0f); - out[7] = -0.5f / sqrt(D3DX_PI / 15.0f) * dirxz; - out[8] = 0.25f / sqrt(D3DX_PI / 15.0f) * (dirxx - diryy); + out[4] = 0.5f / sqrtf(D3DX_PI / 15.0f) * dirxy; + out[5] = -0.5f / sqrtf(D3DX_PI / 15.0f) * diryz; + out[6] = 0.25f / sqrtf(D3DX_PI / 5.0f) * (3.0f * dirzz - 1.0f); + out[7] = -0.5f / sqrtf(D3DX_PI / 15.0f) * dirxz; + out[8] = 0.25f / sqrtf(D3DX_PI / 15.0f) * (dirxx - diryy); if (order == 3) return out; - out[9] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->y * (3.0f * dirxx - diryy); - out[10] = sqrt(105.0f / D3DX_PI) / 2.0f * dirxy * dir->z; - out[11] = -sqrt(42.0 / D3DX_PI) / 8.0f * dir->y * (-1.0f + 5.0f * dirzz); - out[12] = sqrt(7.0f / D3DX_PI) / 4.0f * dir->z * (5.0f * dirzz - 3.0f); - out[13] = sqrt(42.0 / D3DX_PI) / 8.0f * dir->x * (1.0f - 5.0f * dirzz); - out[14] = sqrt(105.0f / D3DX_PI) / 4.0f * dir->z * (dirxx - diryy); - out[15] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->x * (dirxx - 3.0f * diryy); + out[9] = -sqrtf(70.0f / D3DX_PI) / 8.0f * dir->y * (3.0f * dirxx - diryy); + out[10] = sqrtf(105.0f / D3DX_PI) / 2.0f * dirxy * dir->z; + out[11] = -sqrtf(42.0 / D3DX_PI) / 8.0f * dir->y * (-1.0f + 5.0f * dirzz); + out[12] = sqrtf(7.0f / D3DX_PI) / 4.0f * dir->z * (5.0f * dirzz - 3.0f); + out[13] = sqrtf(42.0 / D3DX_PI) / 8.0f * dir->x * (1.0f - 5.0f * dirzz); + out[14] = sqrtf(105.0f / D3DX_PI) / 4.0f * dir->z * (dirxx - diryy); + out[15] = -sqrtf(70.0f / D3DX_PI) / 8.0f * dir->x * (dirxx - 3.0f * diryy); if (order == 4) return out; - out[16] = 0.75f * sqrt(35.0f / D3DX_PI) * dirxy * (dirxx - diryy); + out[16] = 0.75f * sqrtf(35.0f / D3DX_PI) * dirxy * (dirxx - diryy); out[17] = 3.0f * dir->z * out[9]; - out[18] = 0.75f * sqrt(5.0f / D3DX_PI) * dirxy * (7.0f * dirzz - 1.0f); - out[19] = 0.375f * sqrt(10.0f / D3DX_PI) * diryz * (3.0f - 7.0f * dirzz); - out[20] = 3.0f / (16.0f * sqrt(D3DX_PI)) * (35.0f * dirzzzz - 30.f * dirzz + 3.0f); - out[21] = 0.375f * sqrt(10.0f / D3DX_PI) * dirxz * (3.0f - 7.0f * dirzz); - out[22] = 0.375f * sqrt(5.0f / D3DX_PI) * (dirxx - diryy) * (7.0f * dirzz - 1.0f); + out[18] = 0.75f * sqrtf(5.0f / D3DX_PI) * dirxy * (7.0f * dirzz - 1.0f); + out[19] = 0.375f * sqrtf(10.0f / D3DX_PI) * diryz * (3.0f - 7.0f * dirzz); + out[20] = 3.0f / (16.0f * sqrtf(D3DX_PI)) * (35.0f * dirzzzz - 30.f * dirzz + 3.0f); + out[21] = 0.375f * sqrtf(10.0f / D3DX_PI) * dirxz * (3.0f - 7.0f * dirzz); + out[22] = 0.375f * sqrtf(5.0f / D3DX_PI) * (dirxx - diryy) * (7.0f * dirzz - 1.0f); out[23] = 3.0 * dir->z * out[15]; - out[24] = 3.0f / 16.0f * sqrt(35.0f / D3DX_PI) * (dirxxxx - 6.0f * dirxyxy + diryyyy); + out[24] = 3.0f / 16.0f * sqrtf(35.0f / D3DX_PI) * (dirxxxx - 6.0f * dirxyxy + diryyyy); if (order == 5) return out; - out[25] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->y * (5.0f * dirxxxx - 10.0f * dirxyxy + diryyyy); - out[26] = 0.75f * sqrt(385.0f / D3DX_PI) * dirxy * dir->z * (dirxx - diryy); - out[27] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->y * (3.0f * dirxx - diryy) * (1.0f - 9.0f * dirzz); - out[28] = sqrt(1155.0f / D3DX_PI) / 4.0f * dirxy * dir->z * (3.0f * dirzz - 1.0f); - out[29] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->y * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); - out[30] = sqrt(11.0f / D3DX_PI) / 16.0f * dir->z * (63.0f * dirzzzz - 70.0f * dirzz + 15.0f); - out[31] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->x * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); - out[32] = sqrt(1155.0f / D3DX_PI) / 8.0f * dir->z * (dirxx - diryy) * (3.0f * dirzz - 1.0f); - out[33] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->x * (dirxx - 3.0f * diryy) * (1.0f - 9.0f * dirzz); - out[34] = 3.0f / 16.0f * sqrt(385.0f / D3DX_PI) * dir->z * (dirxxxx - 6.0 * dirxyxy + diryyyy); - out[35] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->x * (dirxxxx - 10.0f * dirxyxy + 5.0f * diryyyy); + out[25] = -3.0f/ 32.0f * sqrtf(154.0f / D3DX_PI) * dir->y * (5.0f * dirxxxx - 10.0f * dirxyxy + diryyyy); + out[26] = 0.75f * sqrtf(385.0f / D3DX_PI) * dirxy * dir->z * (dirxx - diryy); + out[27] = sqrtf(770.0f / D3DX_PI) / 32.0f * dir->y * (3.0f * dirxx - diryy) * (1.0f - 9.0f * dirzz); + out[28] = sqrtf(1155.0f / D3DX_PI) / 4.0f * dirxy * dir->z * (3.0f * dirzz - 1.0f); + out[29] = sqrtf(165.0f / D3DX_PI) / 16.0f * dir->y * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); + out[30] = sqrtf(11.0f / D3DX_PI) / 16.0f * dir->z * (63.0f * dirzzzz - 70.0f * dirzz + 15.0f); + out[31] = sqrtf(165.0f / D3DX_PI) / 16.0f * dir->x * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); + out[32] = sqrtf(1155.0f / D3DX_PI) / 8.0f * dir->z * (dirxx - diryy) * (3.0f * dirzz - 1.0f); + out[33] = sqrtf(770.0f / D3DX_PI) / 32.0f * dir->x * (dirxx - 3.0f * diryy) * (1.0f - 9.0f * dirzz); + out[34] = 3.0f / 16.0f * sqrtf(385.0f / D3DX_PI) * dir->z * (dirxxxx - 6.0 * dirxyxy + diryyyy); + out[35] = -3.0f/ 32.0f * sqrtf(154.0f / D3DX_PI) * dir->x * (dirxxxx - 10.0f * dirxyxy + 5.0f * diryyyy); return out; }

1 0

Alexandre Julliard : msvcrt: Constify the arguments of execv functions.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: d95857d6698b0b4d6bbd7427a3ba3f6febf27b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95857d6698b0b4d6bbd7427a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 13:45:48 2013 +0200 msvcrt: Constify the arguments of execv functions. --- dlls/msvcrt/process.c | 28 ++++++++++++++-------------- include/msvcrt/process.h | 16 ++++++++-------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 872edf8..b61eea1 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -600,9 +600,9 @@ MSVCRT_intptr_t CDECL _execlpe(const char* name, const char* arg0, ...) * * Unicode version of _execv */ -MSVCRT_intptr_t CDECL _wexecv(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv) +MSVCRT_intptr_t CDECL _wexecv(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv) { - return MSVCRT__wspawnve(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, NULL); + return MSVCRT__wspawnve(MSVCRT__P_OVERLAY, name, argv, NULL); } /********************************************************************* @@ -611,9 +611,9 @@ MSVCRT_intptr_t CDECL _wexecv(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* * Like on Windows, this function does not handle arguments with spaces * or double-quotes. */ -MSVCRT_intptr_t CDECL _execv(const char* name, char* const* argv) +MSVCRT_intptr_t CDECL _execv(const char* name, const char* const* argv) { - return MSVCRT__spawnve(MSVCRT__P_OVERLAY, name, (const char* const*) argv, NULL); + return MSVCRT__spawnve(MSVCRT__P_OVERLAY, name, argv, NULL); } /********************************************************************* @@ -621,9 +621,9 @@ MSVCRT_intptr_t CDECL _execv(const char* name, char* const* argv) * * Unicode version of _execve */ -MSVCRT_intptr_t CDECL _wexecve(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) +MSVCRT_intptr_t CDECL _wexecve(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) { - return MSVCRT__wspawnve(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, envv); + return MSVCRT__wspawnve(MSVCRT__P_OVERLAY, name, argv, envv); } /********************************************************************* @@ -632,9 +632,9 @@ MSVCRT_intptr_t CDECL _wexecve(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const * Like on Windows, this function does not handle arguments with spaces * or double-quotes. */ -MSVCRT_intptr_t CDECL MSVCRT__execve(const char* name, char* const* argv, const char* const* envv) +MSVCRT_intptr_t CDECL MSVCRT__execve(const char* name, const char* const* argv, const char* const* envv) { - return MSVCRT__spawnve(MSVCRT__P_OVERLAY, name, (const char* const*) argv, envv); + return MSVCRT__spawnve(MSVCRT__P_OVERLAY, name, argv, envv); } /********************************************************************* @@ -642,9 +642,9 @@ MSVCRT_intptr_t CDECL MSVCRT__execve(const char* name, char* const* argv, const * * Unicode version of _execvpe */ -MSVCRT_intptr_t CDECL _wexecvpe(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) +MSVCRT_intptr_t CDECL _wexecvpe(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv) { - return MSVCRT__wspawnvpe(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, envv); + return MSVCRT__wspawnvpe(MSVCRT__P_OVERLAY, name, argv, envv); } /********************************************************************* @@ -653,9 +653,9 @@ MSVCRT_intptr_t CDECL _wexecvpe(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* cons * Like on Windows, this function does not handle arguments with spaces * or double-quotes. */ -MSVCRT_intptr_t CDECL _execvpe(const char* name, char* const* argv, const char* const* envv) +MSVCRT_intptr_t CDECL _execvpe(const char* name, const char* const* argv, const char* const* envv) { - return MSVCRT__spawnvpe(MSVCRT__P_OVERLAY, name, (const char* const*) argv, envv); + return MSVCRT__spawnvpe(MSVCRT__P_OVERLAY, name, argv, envv); } /********************************************************************* @@ -663,7 +663,7 @@ MSVCRT_intptr_t CDECL _execvpe(const char* name, char* const* argv, const char* * * Unicode version of _execvp */ -MSVCRT_intptr_t CDECL _wexecvp(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv) +MSVCRT_intptr_t CDECL _wexecvp(const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv) { return _wexecvpe(name, argv, NULL); } @@ -674,7 +674,7 @@ MSVCRT_intptr_t CDECL _wexecvp(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const * Like on Windows, this function does not handle arguments with spaces * or double-quotes. */ -MSVCRT_intptr_t CDECL _execvp(const char* name, char* const* argv) +MSVCRT_intptr_t CDECL _execvp(const char* name, const char* const* argv) { return _execvpe(name, argv, NULL); } diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index 7530ab0..f9ab2a4 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -36,10 +36,10 @@ intptr_t __cdecl _execl(const char*,const char*,...); intptr_t __cdecl _execle(const char*,const char*,...); intptr_t __cdecl _execlp(const char*,const char*,...); intptr_t __cdecl _execlpe(const char*,const char*,...); -intptr_t __cdecl _execv(const char*,char* const *); -intptr_t __cdecl _execve(const char*,char* const *,const char* const *); -intptr_t __cdecl _execvp(const char*,char* const *); -intptr_t __cdecl _execvpe(const char*,char* const *,const char* const *); +intptr_t __cdecl _execv(const char*,const char* const *); +intptr_t __cdecl _execve(const char*,const char* const *,const char* const *); +intptr_t __cdecl _execvp(const char*,const char* const *); +intptr_t __cdecl _execvpe(const char*,const char* const *,const char* const *); int __cdecl _getpid(void); intptr_t __cdecl _spawnl(int,const char*,const char*,...); intptr_t __cdecl _spawnle(int,const char*,const char*,...); @@ -94,10 +94,10 @@ int __cdecl _wsystem(const wchar_t*); static inline intptr_t cwait(int *status, intptr_t pid, int action) { return _cwait(status, pid, action); } static inline int getpid(void) { return _getpid(); } -static inline intptr_t execv(const char* name, char* const* argv) { return _execv(name, argv); } -static inline intptr_t execve(const char* name, char* const* argv, const char* const* envv) { return _execve(name, argv, envv); } -static inline intptr_t execvp(const char* name, char* const* argv) { return _execvp(name, argv); } -static inline intptr_t execvpe(const char* name, char* const* argv, const char* const* envv) { return _execvpe(name, argv, envv); } +static inline intptr_t execv(const char* name, const char* const* argv) { return _execv(name, argv); } +static inline intptr_t execve(const char* name, const char* const* argv, const char* const* envv) { return _execve(name, argv, envv); } +static inline intptr_t execvp(const char* name, const char* const* argv) { return _execvp(name, argv); } +static inline intptr_t execvpe(const char* name, const char* const* argv, const char* const* envv) { return _execvpe(name, argv, envv); } static inline intptr_t spawnv(int flags, const char* name, const char* const* argv) { return _spawnv(flags, name, argv); } static inline intptr_t spawnve(int flags, const char* name, const char* const* argv, const char* const* envv) { return _spawnve(flags, name, argv, envv); } static inline intptr_t spawnvp(int flags, const char* name, const char* const* argv) { return _spawnvp(flags, name, argv); }

1 0

Alexandre Julliard : makefiles: Don't link against libport in the tests.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: c8ada1fc0663f77f3790babc51c3872ed7d7a4cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ada1fc0663f77f3790babc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 15:25:56 2013 +0200 makefiles: Don't link against libport in the tests. --- Maketest.rules.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Maketest.rules.in b/Maketest.rules.in index 828c375..4ee50a0 100644 --- a/Maketest.rules.in +++ b/Maketest.rules.in @@ -30,10 +30,10 @@ MAKEDEPFLAGS = -xo -xcross.o all: $(TESTPROGRAM) $(WINETEST_RES) $(MODULE) $(MODULE).so: $(OBJS) Makefile.in - $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS) + $(WINEGCC) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(WINETEST_EXE): $(OBJS) Makefile.in - $(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(LIBPORT) $(ALL_LIBS) + $(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(WINETEST_RES): $(WINETEST_EXE) echo "$(MODULE) TESTRES \"$(WINETEST_EXE)\"" | $(LDPATH) $(WRC) $(RCFLAGS) -o $@

1 0

Alexandre Julliard : libport: Rename spawnvp to _spawnvp to avoid the deprecated name.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 43ac582d7dd74acd5e1ac91ebecbe302611b298d URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ac582d7dd74acd5e1ac91eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 13:50:40 2013 +0200 libport: Rename spawnvp to _spawnvp to avoid the deprecated name. --- configure | 1 - configure.ac | 1 - include/config.h.in | 3 --- include/wine/port.h | 4 ++-- libs/port/spawn.c | 12 +++++------- programs/explorer/desktop.c | 2 +- programs/winebrowser/main.c | 2 +- programs/winemenubuilder/winemenubuilder.c | 4 ++-- programs/winevdm/winevdm.c | 2 +- tools/winebuild/utils.c | 2 +- tools/winegcc/utils.c | 2 +- 11 files changed, 14 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 6997375..8d6d227 100755 --- a/configure +++ b/configure @@ -13066,7 +13066,6 @@ for ac_func in \ sigaltstack \ sigprocmask \ snprintf \ - spawnvp \ statfs \ statvfs \ strcasecmp \ diff --git a/configure.ac b/configure.ac index 080e961..084a2d6 100644 --- a/configure.ac +++ b/configure.ac @@ -2011,7 +2011,6 @@ AC_CHECK_FUNCS(\ sigaltstack \ sigprocmask \ snprintf \ - spawnvp \ statfs \ statvfs \ strcasecmp \ diff --git a/include/config.h.in b/include/config.h.in index 2f30549..0a1d78a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -734,9 +734,6 @@ /* Define to 1 if you have the `socketpair' function. */ #undef HAVE_SOCKETPAIR -/* Define to 1 if you have the `spawnvp' function. */ -#undef HAVE_SPAWNVP - /* Define to 1 if the system has the type `ssize_t'. */ #undef HAVE_SSIZE_T diff --git a/include/wine/port.h b/include/wine/port.h index d6904c0..76a0b3e 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -353,8 +353,8 @@ extern int mkstemps(char *template, int suffix_len); # define _P_NOWAITO 3 # define _P_DETACH 4 #endif -#ifndef HAVE_SPAWNVP -extern int spawnvp(int mode, const char *cmdname, const char * const argv[]); +#ifndef HAVE__SPAWNVP +extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]); #endif /* Interlocked functions */ diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 0cdc08c..97364e7 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -21,6 +21,8 @@ #include "config.h" #include "wine/port.h" +#ifndef HAVE__SPAWNVP + #include <errno.h> #include <signal.h> #include <stdlib.h> @@ -32,10 +34,8 @@ # include <unistd.h> #endif -#ifndef HAVE_SPAWNVP -int spawnvp(int mode, const char *cmdname, const char *const argv[]) +int _spawnvp(int mode, const char *cmdname, const char *const argv[]) { -#ifndef HAVE__SPAWNVP int pid, status, wret; if (mode == _P_OVERLAY) @@ -93,8 +93,6 @@ int spawnvp(int mode, const char *cmdname, const char *const argv[]) } return pid; -#else /* HAVE__SPAWNVP */ - return _spawnvp(mode, cmdname, argv); -#endif /* HAVE__SPAWNVP */ } -#endif /* HAVE_SPAWNVP */ + +#endif /* HAVE__SPAWNVP */ diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4c8e599..7cfa0d1 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -45,7 +45,7 @@ static BOOL start_screensaver( void ) if (using_root) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; - int pid = spawnvp( _P_DETACH, argv[0], argv ); + int pid = _spawnvp( _P_DETACH, argv[0], argv ); if (pid > 0) { WINE_TRACE( "started process %d\n", pid ); diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index ad46b20..22f3a93 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -90,7 +90,7 @@ static int launch_app( WCHAR *candidates, const WCHAR *argv1 ) argv_new[1] = cmdline; argv_new[2] = NULL; - spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */ + _spawnvp( _P_OVERLAY, app, argv_new ); /* only returns on error */ app = strtok( NULL, "," ); /* grab the next app */ } WINE_ERR( "could not find a suitable app to run\n" ); diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index c931363..9c81ab8 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3371,11 +3371,11 @@ static void RefreshFileTypeAssociations(void) argv[0] = "update-mime-database"; argv[1] = mime_dir; argv[2] = NULL; - spawnvp( _P_DETACH, argv[0], argv ); + _spawnvp( _P_DETACH, argv[0], argv ); argv[0] = "update-desktop-database"; argv[1] = applications_dir; - spawnvp( _P_DETACH, argv[0], argv ); + _spawnvp( _P_DETACH, argv[0], argv ); } end: diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index d297551..b818d76 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -198,7 +198,7 @@ static void start_dosbox( const char *appname, const char *args ) args[1] = "-conf"; args[2] = config_file; args[3] = NULL; - ret = spawnvp( _P_WAIT, args[0], args ); + ret = _spawnvp( _P_WAIT, args[0], args ); } CloseHandle( file ); DeleteFileW( config ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 40a9afe..1c77e41 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -268,7 +268,7 @@ void spawn( struct strarray *args ) for (i = 0; args->str[i]; i++) fprintf( stderr, "%s%c", args->str[i], args->str[i+1] ? ' ' : '\n' ); - if ((status = spawnvp( _P_WAIT, args->str[0], args->str ))) + if ((status = _spawnvp( _P_WAIT, args->str[0], args->str ))) { if (status > 0) fatal_error( "%s failed with status %u\n", args->str[0], status ); else fatal_perror( "winebuild" ); diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 05b9a65..75fb20b 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -334,7 +334,7 @@ void spawn(const strarray* prefix, const strarray* args, int ignore_errors) printf("\n"); } - if ((status = spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors) + if ((status = _spawnvp( _P_WAIT, argv[0], argv)) && !ignore_errors) { if (status > 0) error("%s failed\n", argv[0]); else perror("winegcc");

1 0

Ken Thomases : winemac: Handle failure to get clipboard format name; don' t use uninitialized buffer.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: cba4bcb47fee29f993d9b722e1d133a85a019add URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba4bcb47fee29f993d9b722e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 8 15:43:13 2013 -0500 winemac: Handle failure to get clipboard format name; don't use uninitialized buffer. --- dlls/winemac.drv/clipboard.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 6dfb2a2..53b1448 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -292,7 +292,13 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) { WCHAR buffer[256]; - GetClipboardFormatNameW(format->format_id, buffer, 256); + if (!GetClipboardFormatNameW(format->format_id, buffer, sizeof(buffer) / sizeof(buffer[0]))) + { + WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), GetLastError()); + HeapFree(GetProcessHeap(), 0, format); + return NULL; + } + if (!strncmpW(buffer, mac_type_name_prefix, strlenW(mac_type_name_prefix))) { const WCHAR *p = buffer + strlenW(mac_type_name_prefix);

1 0

Michael Stefaniuc : dplayx/tests: Deal with broken COM aggregation handling on NT4.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: df39c470ed613e7315c0749275c163be997c9b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df39c470ed613e7315c074927… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:16:26 2013 +0200 dplayx/tests: Deal with broken COM aggregation handling on NT4. --- dlls/dplayx/tests/dplayx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 31cddee..619425d 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6380,9 +6380,9 @@ static void test_COM(void) /* COM aggregation */ hr = CoCreateInstance(&CLSID_DirectPlay, (IUnknown*)&dp4, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dp4); - ok(hr == CLASS_E_NOAGGREGATION, + ok(hr == CLASS_E_NOAGGREGATION || broken(hr == E_INVALIDARG), "DirectPlay create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); - ok(!dp4, "dp4 = %p\n", dp4); + ok(!dp4 || dp4 == (IDirectPlay4*)0xdeadbeef, "dp4 = %p\n", dp4); /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlayLobby,

1 0

Michael Stefaniuc : dplayx: Add a stub IDirectPlay iface.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: de65abb20094f8ce2bce32ddc71a0b999c7fabeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=de65abb20094f8ce2bce32ddc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:17:36 2013 +0200 dplayx: Add a stub IDirectPlay iface. --- dlls/dplayx/dplay.c | 245 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dplayx/dplay_global.h | 3 +- 2 files changed, 247 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de65abb20094f8ce2bce3…

1 0

Michael Stefaniuc : dplayx: IDirectPlay and IUnknown share a refcount.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 3b7f969a6bd22e062e388d716fb7f7d9d1dba959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7f969a6bd22e062e388d716… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:19:09 2013 +0200 dplayx: IDirectPlay and IUnknown share a refcount. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/tests/dplayx.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index ac39651..c276dba 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -643,7 +643,7 @@ static HRESULT WINAPI IDirectPlay4Impl_QueryInterface( IDirectPlay4 *iface, REFI if ( IsEqualGUID( &IID_IUnknown, riid ) ) { TRACE( "(%p)->(IID_IUnknown %p)\n", This, ppv ); - *ppv = &This->IDirectPlay4A_iface; + *ppv = &This->IDirectPlay_iface; } else if ( IsEqualGUID( &IID_IDirectPlay, riid ) ) { diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 619425d..0e7aafb 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6367,6 +6367,7 @@ static void test_host_migration(void) static void test_COM(void) { + IDirectPlay *dp; IDirectPlay2A *dp2A; IDirectPlay2 *dp2; IDirectPlay3A *dp3A; @@ -6426,14 +6427,22 @@ static void test_COM(void) ok(refcount == 2, "refcount == %u, expected 2\n", refcount); IDirectPlayX_Release(dp4A); + /* IDirectPlay and IUnknown share a refcount */ + hr = IDirectPlayX_QueryInterface(dp4, &IID_IDirectPlay, (void**)&dp); + ok(hr == S_OK, "QueryInterface for IID_IDirectPlay failed: %08x\n", hr); + refcount = IDirectPlayX_AddRef(dp); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + IDirectPlay_Release(dp); + hr = IDirectPlayX_QueryInterface(dp4, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); - todo_wine ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + ok(refcount == 3, "refcount == %u, expected 3\n", refcount); refcount = IUnknown_Release(unk); - todo_wine ok(refcount == 1, "refcount == %u, expected 1\n", refcount); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); IUnknown_Release(unk); + IDirectPlay_Release(dp); IDirectPlayX_Release(dp4A); IDirectPlay3_Release(dp3); IDirectPlay3_Release(dp3A);

1 0

Michael Stefaniuc : dplayx: Forward directly to IDirectPlay4 QueryInterface .
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 3147647b4492bbb1b9072bf979b17f0327d78384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3147647b4492bbb1b9072bf97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Apr 8 23:20:24 2013 +0200 dplayx: Forward directly to IDirectPlay4 QueryInterface. --- dlls/dplayx/dplay.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index c276dba..67e3c18 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -604,7 +604,7 @@ static HRESULT WINAPI IDirectPlay2AImpl_QueryInterface( IDirectPlay2A *iface, RE void **ppv ) { IDirectPlayImpl *This = impl_from_IDirectPlay2A( iface ); - return IDirectPlayX_QueryInterface( &This->IDirectPlay4A_iface, riid, ppv ); + return IDirectPlayX_QueryInterface( &This->IDirectPlay4_iface, riid, ppv ); } static HRESULT WINAPI IDirectPlay2Impl_QueryInterface( IDirectPlay2 *iface, REFIID riid, @@ -5713,17 +5713,17 @@ HRESULT dplay_create( REFIID riid, void **ppv ) obj->ref2 = 0; obj->ref3A = 0; obj->ref3 = 0; - obj->ref4A = 1; - obj->ref4 = 0; + obj->ref4A = 0; + obj->ref4 = 1; InitializeCriticalSection( &obj->lock ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); if ( DP_CreateDirectPlay2( obj ) ) - hr = IDirectPlayX_QueryInterface( &obj->IDirectPlay4A_iface, riid, ppv ); + hr = IDirectPlayX_QueryInterface( &obj->IDirectPlay4_iface, riid, ppv ); else hr = DPERR_NOMEMORY; - IDirectPlayX_Release( &obj->IDirectPlay4A_iface ); + IDirectPlayX_Release( &obj->IDirectPlay4_iface ); return hr; }

1 0

Dmitry Timoshkov : include: Add COM interface definitions needed for PrintDlgEx implementation.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 04d3f6c1f5c0942b20217fb6b9f85886e7c09d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d3f6c1f5c0942b20217fb6b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 9 12:50:10 2013 +0900 include: Add COM interface definitions needed for PrintDlgEx implementation. --- dlls/uuid/uuid.c | 1 + include/commdlg.h | 34 ++++++++++++++++++++++++++++++++++ programs/oleview/main.h | 1 + programs/oleview/typelib.c | 1 - 4 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index fd96fe3..fb06f2d 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -83,6 +83,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "sensevts.h" #include "ocmm.h" #include "commoncontrols.h" +#include "commdlg.h" #include "tlogstg.h" #include "msdasc.h" diff --git a/include/commdlg.h b/include/commdlg.h index 1a6e1d9..db5aaaa 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -762,6 +762,40 @@ typedef struct tagPDEXW DECL_WINELIB_TYPE_AW(PRINTDLGEX) DECL_WINELIB_TYPE_AW(LPPRINTDLGEX) +#ifdef STDMETHOD + +DEFINE_GUID(IID_IPrintDialogCallback, 0x5852a2c3,0x6530,0x11d1,0xb6,0xa3,0x00,0x00,0xf8,0x75,0x7b,0xf9); +#define INTERFACE IPrintDialogCallback +DECLARE_INTERFACE_(IPrintDialogCallback,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IPrintDialogCallback methods ***/ + STDMETHOD(InitDone)(THIS) PURE; + STDMETHOD(SelectionChange)(THIS) PURE; + STDMETHOD(HandleMessage)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT *) PURE; +}; +#undef INTERFACE + +DEFINE_GUID(IID_IPrintDialogServices, 0x509aaeda,0x5639,0x11d1,0xb6,0xa1,0x00,0x00,0xf8,0x75,0x7b,0xf9); +#define INTERFACE IPrintDialogServices +DECLARE_INTERFACE_(IPrintDialogServices,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID,void **) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IPrintDialogServices methods ***/ + STDMETHOD(GetCurrentDevMode)(THIS_ LPDEVMODEW,UINT *) PURE; + STDMETHOD(GetCurrentPrinterName)(THIS_ LPWSTR,UINT *) PURE; + STDMETHOD(GetCurrentPortName)(THIS_ LPWSTR,UINT *) PURE; +}; +#undef INTERFACE + +#endif /* STDMETHOD */ + BOOL WINAPI ChooseColorA(LPCHOOSECOLORA lpChCol); BOOL WINAPI ChooseColorW(LPCHOOSECOLORW lpChCol); #define ChooseColor WINELIB_NAME_AW(ChooseColor) diff --git a/programs/oleview/main.h b/programs/oleview/main.h index c3c358d..66bf70e 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -23,6 +23,7 @@ #include <windows.h> #include <winreg.h> #include <commctrl.h> +#include <commdlg.h> #include <unknwn.h> #ifdef NONAMELESSUNION diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index c6aec5f..21e9d96 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -19,7 +19,6 @@ */ #include "main.h" -#include "commdlg.h" #include "wine/debug.h" #include "wine/unicode.h"

1 0