Nabble - Wine - Patches

[PATCH 2/2] dsound: Add support for loading openal, try X

2009-12-09T03:01:28Z

---
configure.ac | 15 ++-
dlls/dsound/Makefile.in | 1 +
dlls/dsound/dsound_main.c | 242 ++++++++++++++++++++++++++++++++++++++++++
dlls/dsound/dsound_private.h | 217 +++++++++++++++++++++++++++++++++++++-
dlls/openal32/Makefile.in | 2 +-
include/config.h.in | 6 +
6 files changed, 475 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index e5ff544..d93e1d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -633,8 +633,9 @@ case $host_os in
fi
if test "$ac_cv_header_OpenAL_al_h" = "yes"
then
- AC_SUBST(LIBOPENAL,"-framework OpenAL")
- ac_cv_lib_openal_alGetSource3i=yes
+ AC_SUBST(FRAMEWORK_OPENAL,"-framework OpenAL")
+ AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])
+ ac_cv_lib_openal=yes
fi
if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes"
then
@@ -1432,11 +1433,13 @@ test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_winemp3_acm=${enable_wine
dnl **** Check for OpenAL 1.1 ****
if test "$ac_cv_header_AL_al_h" = "yes"
then
- AC_CHECK_LIB(openal,alGetSource3i,[AC_SUBST(LIBOPENAL,"-lopenal")])
+ WINE_CHECK_SONAME(openal,alGetSource3i,[AC_SUBST(LIBOPENAL,"-lopenal")
+ ac_cv_lib_openal=yes
+ AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])],,)
fi
-WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal_alGetSource3i" != xyes],
- [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.])
-test "x$ac_cv_lib_openal_alGetSource3i" = xyes || enable_openal32=${enable_openal32:-no}
+WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes],
+ [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported, and DirectSound will not be available.])
+test "x$ac_cv_lib_openal" = xyes || enable_openal32=${enable_openal32:-no}

dnl **** Check for libkstat ****
if test "$ac_cv_header_kstat_h" = "yes"
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index bbac7f9..34e4c7f 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -5,6 +5,7 @@ VPATH = @srcdir@
MODULE = dsound.dll
IMPORTLIB = dsound
IMPORTS = dxguid uuid winmm ole32 advapi32 kernel32 ntdll
+EXTRALIBS = @FRAMEWORK_OPENAL@

C_SRCS = \
buffer.c \
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 3fcabdb..71047d8 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -32,7 +32,10 @@
* Remove DS_HEL_FRAGS and use mixer fragment length for it
*/

+#include "config.h"
+#include "wine/port.h"
#include <stdarg.h>
+#include "wine/library.h"

#define COBJMACROS
#define NONAMELESSSTRUCT
@@ -61,6 +64,238 @@ DirectSoundDevice* DSOUND_renderer[MAXWAVEDRIVERS];
GUID DSOUND_renderer_guid = { 0xbd6dd71a,0x3deb,0x11d1, {0xb1,0x71,0x00,0xc0,0x4f,0xc2,0x00,0x00} };
GUID DSOUND_capture_guid = { 0xbd6dd71b,0x3deb,0x11d1, {0xb1,0x71,0x00,0xc0,0x4f,0xc2,0x00,0x00} };

+#ifdef HAVE_OPENAL
+
+static CRITICAL_SECTION_DEBUG openal_crst_debug =
+{
+ 0, 0, &openal_crst,
+ { &openal_crst_debug.ProcessLocksList,
+ &openal_crst_debug.ProcessLocksList },
+ 0, 0, { (DWORD_PTR)(__FILE__ ": openal_crst_debug") }
+};
+CRITICAL_SECTION openal_crst = { &openal_crst_debug, -1, 0, 0, 0, 0 };
+
+static void *openal_handle = RTLD_DEFAULT;
+int openal_loaded = 0;
+#ifdef SONAME_LIBOPENAL
+LPALCCREATECONTEXT palcCreateContext = NULL;
+LPALCMAKECONTEXTCURRENT palcMakeContextCurrent = NULL;
+LPALCPROCESSCONTEXT palcProcessContext = NULL;
+LPALCSUSPENDCONTEXT palcSuspendContext = NULL;
+LPALCDESTROYCONTEXT palcDestroyContext = NULL;
+LPALCGETCURRENTCONTEXT palcGetCurrentContext = NULL;
+LPALCGETCONTEXTSDEVICE palcGetContextsDevice = NULL;
+LPALCOPENDEVICE palcOpenDevice = NULL;
+LPALCCLOSEDEVICE palcCloseDevice = NULL;
+LPALCGETERROR palcGetError = NULL;
+LPALCISEXTENSIONPRESENT palcIsExtensionPresent = NULL;
+LPALCGETPROCADDRESS palcGetProcAddress = NULL;
+LPALCGETENUMVALUE palcGetEnumValue = NULL;
+LPALCGETSTRING palcGetString = NULL;
+LPALCGETINTEGERV palcGetIntegerv = NULL;
+LPALCCAPTUREOPENDEVICE palcCaptureOpenDevice = NULL;
+LPALCCAPTURECLOSEDEVICE palcCaptureCloseDevice = NULL;
+LPALCCAPTURESTART palcCaptureStart = NULL;
+LPALCCAPTURESTOP palcCaptureStop = NULL;
+LPALCCAPTURESAMPLES palcCaptureSamples = NULL;
+LPALENABLE palEnable = NULL;
+LPALDISABLE palDisable = NULL;
+LPALISENABLED palIsEnabled = NULL;
+LPALGETSTRING palGetString = NULL;
+LPALGETBOOLEANV palGetBooleanv = NULL;
+LPALGETINTEGERV palGetIntegerv = NULL;
+LPALGETFLOATV palGetFloatv = NULL;
+LPALGETDOUBLEV palGetDoublev = NULL;
+LPALGETBOOLEAN palGetBoolean = NULL;
+LPALGETINTEGER palGetInteger = NULL;
+LPALGETFLOAT palGetFloat = NULL;
+LPALGETDOUBLE palGetDouble = NULL;
+LPALGETERROR palGetError = NULL;
+LPALISEXTENSIONPRESENT palIsExtensionPresent = NULL;
+LPALGETPROCADDRESS palGetProcAddress = NULL;
+LPALGETENUMVALUE palGetEnumValue = NULL;
+LPALLISTENERF palListenerf = NULL;
+LPALLISTENER3F palListener3f = NULL;
+LPALLISTENERFV palListenerfv = NULL;
+LPALLISTENERI palListeneri = NULL;
+LPALLISTENER3I palListener3i = NULL;
+LPALLISTENERIV palListeneriv = NULL;
+LPALGETLISTENERF palGetListenerf = NULL;
+LPALGETLISTENER3F palGetListener3f = NULL;
+LPALGETLISTENERFV palGetListenerfv = NULL;
+LPALGETLISTENERI palGetListeneri = NULL;
+LPALGETLISTENER3I palGetListener3i = NULL;
+LPALGETLISTENERIV palGetListeneriv = NULL;
+LPALGENSOURCES palGenSources = NULL;
+LPALDELETESOURCES palDeleteSources = NULL;
+LPALISSOURCE palIsSource = NULL;
+LPALSOURCEF palSourcef = NULL;
+LPALSOURCE3F palSource3f = NULL;
+LPALSOURCEFV palSourcefv = NULL;
+LPALSOURCEI palSourcei = NULL;
+LPALSOURCE3I palSource3i = NULL;
+LPALSOURCEIV palSourceiv = NULL;
+LPALGETSOURCEF palGetSourcef = NULL;
+LPALGETSOURCE3F palGetSource3f = NULL;
+LPALGETSOURCEFV palGetSourcefv = NULL;
+LPALGETSOURCEI palGetSourcei = NULL;
+LPALGETSOURCE3I palGetSource3i = NULL;
+LPALGETSOURCEIV palGetSourceiv = NULL;
+LPALSOURCEPLAYV palSourcePlayv = NULL;
+LPALSOURCESTOPV palSourceStopv = NULL;
+LPALSOURCEREWINDV palSourceRewindv = NULL;
+LPALSOURCEPAUSEV palSourcePausev = NULL;
+LPALSOURCEPLAY palSourcePlay = NULL;
+LPALSOURCESTOP palSourceStop = NULL;
+LPALSOURCEREWIND palSourceRewind = NULL;
+LPALSOURCEPAUSE palSourcePause = NULL;
+LPALSOURCEQUEUEBUFFERS palSourceQueueBuffers = NULL;
+LPALSOURCEUNQUEUEBUFFERS palSourceUnqueueBuffers = NULL;
+LPALGENBUFFERS palGenBuffers = NULL;
+LPALDELETEBUFFERS palDeleteBuffers = NULL;
+LPALISBUFFER palIsBuffer = NULL;
+LPALBUFFERF palBufferf = NULL;
+LPALBUFFER3F palBuffer3f = NULL;
+LPALBUFFERFV palBufferfv = NULL;
+LPALBUFFERI palBufferi = NULL;
+LPALBUFFER3I palBuffer3i = NULL;
+LPALBUFFERIV palBufferiv = NULL;
+LPALGETBUFFERF palGetBufferf = NULL;
+LPALGETBUFFER3F palGetBuffer3f = NULL;
+LPALGETBUFFERFV palGetBufferfv = NULL;
+LPALGETBUFFERI palGetBufferi = NULL;
+LPALGETBUFFER3I palGetBuffer3i = NULL;
+LPALGETBUFFERIV palGetBufferiv = NULL;
+LPALBUFFERDATA palBufferData = NULL;
+LPALDOPPLERFACTOR palDopplerFactor = NULL;
+LPALDOPPLERVELOCITY palDopplerVelocity = NULL;
+LPALDISTANCEMODEL palDistanceModel = NULL;
+LPALSPEEDOFSOUND palSpeedOfSound = NULL;
+#endif
+
+static void load_libopenal(void)
+{
+ DWORD failed = 0;
+
+#ifdef SONAME_LIBOPENAL
+ char error[128];
+ openal_handle = wine_dlopen(SONAME_LIBOPENAL, RTLD_NOW, error, sizeof(error));
+ if (!openal_handle)
+ ERR("Couldn't load " SONAME_LIBOPENAL ": %s\n", error);
+#define LOAD_FUNCPTR(f) \
+ if((p##f = wine_dlsym(openal_handle, #f, NULL, 0)) == NULL) { \
+ ERR("Couldn't lookup %s in libopenal\n", #f); \
+ failed = 1; \
+ }
+
+ LOAD_FUNCPTR(alcCreateContext);
+ LOAD_FUNCPTR(alcMakeContextCurrent);
+ LOAD_FUNCPTR(alcProcessContext);
+ LOAD_FUNCPTR(alcSuspendContext);
+ LOAD_FUNCPTR(alcDestroyContext);
+ LOAD_FUNCPTR(alcGetCurrentContext);
+ LOAD_FUNCPTR(alcGetContextsDevice);
+ LOAD_FUNCPTR(alcOpenDevice);
+ LOAD_FUNCPTR(alcCloseDevice);
+ LOAD_FUNCPTR(alcGetError);
+ LOAD_FUNCPTR(alcIsExtensionPresent);
+ LOAD_FUNCPTR(alcGetProcAddress);
+ LOAD_FUNCPTR(alcGetEnumValue);
+ LOAD_FUNCPTR(alcGetString);
+ LOAD_FUNCPTR(alcGetIntegerv);
+ LOAD_FUNCPTR(alcCaptureOpenDevice);
+ LOAD_FUNCPTR(alcCaptureCloseDevice);
+ LOAD_FUNCPTR(alcCaptureStart);
+ LOAD_FUNCPTR(alcCaptureStop);
+ LOAD_FUNCPTR(alcCaptureSamples);
+ LOAD_FUNCPTR(alEnable);
+ LOAD_FUNCPTR(alDisable);
+ LOAD_FUNCPTR(alIsEnabled);
+ LOAD_FUNCPTR(alGetString);
+ LOAD_FUNCPTR(alGetBooleanv);
+ LOAD_FUNCPTR(alGetIntegerv);
+ LOAD_FUNCPTR(alGetFloatv);
+ LOAD_FUNCPTR(alGetDoublev);
+ LOAD_FUNCPTR(alGetBoolean);
+ LOAD_FUNCPTR(alGetInteger);
+ LOAD_FUNCPTR(alGetFloat);
+ LOAD_FUNCPTR(alGetDouble);
+ LOAD_FUNCPTR(alGetError);
+ LOAD_FUNCPTR(alIsExtensionPresent);
+ LOAD_FUNCPTR(alGetProcAddress);
+ LOAD_FUNCPTR(alGetEnumValue);
+ LOAD_FUNCPTR(alListenerf);
+ LOAD_FUNCPTR(alListener3f);
+ LOAD_FUNCPTR(alListenerfv);
+ LOAD_FUNCPTR(alListeneri);
+ LOAD_FUNCPTR(alListener3i);
+ LOAD_FUNCPTR(alListeneriv);
+ LOAD_FUNCPTR(alGetListenerf);
+ LOAD_FUNCPTR(alGetListener3f);
+ LOAD_FUNCPTR(alGetListenerfv);
+ LOAD_FUNCPTR(alGetListeneri);
+ LOAD_FUNCPTR(alGetListener3i);
+ LOAD_FUNCPTR(alGetListeneriv);
+ LOAD_FUNCPTR(alGenSources);
+ LOAD_FUNCPTR(alDeleteSources);
+ LOAD_FUNCPTR(alIsSource);
+ LOAD_FUNCPTR(alSourcef);
+ LOAD_FUNCPTR(alSource3f);
+ LOAD_FUNCPTR(alSourcefv);
+ LOAD_FUNCPTR(alSourcei);
+ LOAD_FUNCPTR(alSource3i);
+ LOAD_FUNCPTR(alSourceiv);
+ LOAD_FUNCPTR(alGetSourcef);
+ LOAD_FUNCPTR(alGetSource3f);
+ LOAD_FUNCPTR(alGetSourcefv);
+ LOAD_FUNCPTR(alGetSourcei);
+ LOAD_FUNCPTR(alGetSource3i);
+ LOAD_FUNCPTR(alGetSourceiv);
+ LOAD_FUNCPTR(alSourcePlayv);
+ LOAD_FUNCPTR(alSourceStopv);
+ LOAD_FUNCPTR(alSourceRewindv);
+ LOAD_FUNCPTR(alSourcePausev);
+ LOAD_FUNCPTR(alSourcePlay);
+ LOAD_FUNCPTR(alSourceStop);
+ LOAD_FUNCPTR(alSourceRewind);
+ LOAD_FUNCPTR(alSourcePause);
+ LOAD_FUNCPTR(alSourceQueueBuffers);
+ LOAD_FUNCPTR(alSourceUnqueueBuffers);
+ LOAD_FUNCPTR(alGenBuffers);
+ LOAD_FUNCPTR(alDeleteBuffers);
+ LOAD_FUNCPTR(alIsBuffer);
+ LOAD_FUNCPTR(alBufferf);
+ LOAD_FUNCPTR(alBuffer3f);
+ LOAD_FUNCPTR(alBufferfv);
+ LOAD_FUNCPTR(alBufferi);
+ LOAD_FUNCPTR(alBuffer3i);
+ LOAD_FUNCPTR(alBufferiv);
+ LOAD_FUNCPTR(alGetBufferf);
+ LOAD_FUNCPTR(alGetBuffer3f);
+ LOAD_FUNCPTR(alGetBufferfv);
+ LOAD_FUNCPTR(alGetBufferi);
+ LOAD_FUNCPTR(alGetBuffer3i);
+ LOAD_FUNCPTR(alGetBufferiv);
+ LOAD_FUNCPTR(alBufferData);
+ LOAD_FUNCPTR(alDopplerFactor);
+ LOAD_FUNCPTR(alDopplerVelocity);
+ LOAD_FUNCPTR(alDistanceModel);
+ LOAD_FUNCPTR(alSpeedOfSound);
+#undef LOAD_FUNCPTR
+#endif
+ if (failed)
+ {
+ WARN("Unloading openal\n");
+ if (openal_handle != RTLD_DEFAULT)
+ wine_dlclose(openal_handle, NULL, 0);
+ openal_handle = NULL;
+ }
+ else
+ openal_loaded = 1;
+}
+
+#endif /*HAVE_OPENAL*/
+
HRESULT mmErr(UINT err)
{
switch(err) {
@@ -665,6 +900,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
TRACE("DLL_PROCESS_ATTACH\n");
+#ifdef HAVE_OPENAL
+ load_libopenal();
+#endif /*HAVE_OPENAL*/
for (i = 0; i < MAXWAVEDRIVERS; i++) {
DSOUND_renderer[i] = NULL;
DSOUND_capture[i] = NULL;
@@ -675,6 +913,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
break;
case DLL_PROCESS_DETACH:
TRACE("DLL_PROCESS_DETACH\n");
+#ifdef SONAME_LIBOPENAL
+ if (openal_handle)
+ wine_dlclose(openal_handle, NULL, 0);
+#endif /*SONAME_LIBOPENAL*/
break;
default:
TRACE("UNKNOWN REASON\n");
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 33c2f98..daa509d 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -22,8 +22,223 @@
/* Linux does not support better timing than 10ms */
#define DS_TIME_RES 2 /* Resolution of multimedia timer */
#define DS_TIME_DEL 10 /* Delay of multimedia timer callback, and duration of HEL fragment */
-
+/* Default refresh count, can be overridden */
+#define FAKE_REFRESH_COUNT (1000/DS_TIME_DEL/2)
+
#include "wine/list.h"
+
+#ifdef HAVE_OPENAL
+
+#ifdef HAVE_AL_AL_H
+#include <AL/al.h>
+#include <AL/alc.h>
+#elif defined(HAVE_OPENAL_AL_H)
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#else
+#error No OpenAL headers found?
+#endif
+
+/* All openal functions */
+extern int openal_loaded;
+#ifdef SONAME_LIBOPENAL
+extern LPALCCREATECONTEXT palcCreateContext;
+extern LPALCMAKECONTEXTCURRENT palcMakeContextCurrent;
+extern LPALCPROCESSCONTEXT palcProcessContext;
+extern LPALCSUSPENDCONTEXT palcSuspendContext;
+extern LPALCDESTROYCONTEXT palcDestroyContext;
+extern LPALCGETCURRENTCONTEXT palcGetCurrentContext;
+extern LPALCGETCONTEXTSDEVICE palcGetContextsDevice;
+extern LPALCOPENDEVICE palcOpenDevice;
+extern LPALCCLOSEDEVICE palcCloseDevice;
+extern LPALCGETERROR palcGetError;
+extern LPALCISEXTENSIONPRESENT palcIsExtensionPresent;
+extern LPALCGETPROCADDRESS palcGetProcAddress;
+extern LPALCGETENUMVALUE palcGetEnumValue;
+extern LPALCGETSTRING palcGetString;
+extern LPALCGETINTEGERV palcGetIntegerv;
+extern LPALCCAPTUREOPENDEVICE palcCaptureOpenDevice;
+extern LPALCCAPTURECLOSEDEVICE palcCaptureCloseDevice;
+extern LPALCCAPTURESTART palcCaptureStart;
+extern LPALCCAPTURESTOP palcCaptureStop;
+extern LPALCCAPTURESAMPLES palcCaptureSamples;
+extern LPALENABLE palEnable;
+extern LPALDISABLE palDisable;
+extern LPALISENABLED palIsEnabled;
+extern LPALGETSTRING palGetString;
+extern LPALGETBOOLEANV palGetBooleanv;
+extern LPALGETINTEGERV palGetIntegerv;
+extern LPALGETFLOATV palGetFloatv;
+extern LPALGETDOUBLEV palGetDoublev;
+extern LPALGETBOOLEAN palGetBoolean;
+extern LPALGETINTEGER palGetInteger;
+extern LPALGETFLOAT palGetFloat;
+extern LPALGETDOUBLE palGetDouble;
+extern LPALGETERROR palGetError;
+extern LPALISEXTENSIONPRESENT palIsExtensionPresent;
+extern LPALGETPROCADDRESS palGetProcAddress;
+extern LPALGETENUMVALUE palGetEnumValue;
+extern LPALLISTENERF palListenerf;
+extern LPALLISTENER3F palListener3f;
+extern LPALLISTENERFV palListenerfv;
+extern LPALLISTENERI palListeneri;
+extern LPALLISTENER3I palListener3i;
+extern LPALLISTENERIV palListeneriv;
+extern LPALGETLISTENERF palGetListenerf;
+extern LPALGETLISTENER3F palGetListener3f;
+extern LPALGETLISTENERFV palGetListenerfv;
+extern LPALGETLISTENERI palGetListeneri;
+extern LPALGETLISTENER3I palGetListener3i;
+extern LPALGETLISTENERIV palGetListeneriv;
+extern LPALGENSOURCES palGenSources;
+extern LPALDELETESOURCES palDeleteSources;
+extern LPALISSOURCE palIsSource;
+extern LPALSOURCEF palSourcef;
+extern LPALSOURCE3F palSource3f;
+extern LPALSOURCEFV palSourcefv;
+extern LPALSOURCEI palSourcei;
+extern LPALSOURCE3I palSource3i;
+extern LPALSOURCEIV palSourceiv;
+extern LPALGETSOURCEF palGetSourcef;
+extern LPALGETSOURCE3F palGetSource3f;
+extern LPALGETSOURCEFV palGetSourcefv;
+extern LPALGETSOURCEI palGetSourcei;
+extern LPALGETSOURCE3I palGetSource3i;
+extern LPALGETSOURCEIV palGetSourceiv;
+extern LPALSOURCEPLAYV palSourcePlayv;
+extern LPALSOURCESTOPV palSourceStopv;
+extern LPALSOURCEREWINDV palSourceRewindv;
+extern LPALSOURCEPAUSEV palSourcePausev;
+extern LPALSOURCEPLAY palSourcePlay;
+extern LPALSOURCESTOP palSourceStop;
+extern LPALSOURCEREWIND palSourceRewind;
+extern LPALSOURCEPAUSE palSourcePause;
+extern LPALSOURCEQUEUEBUFFERS palSourceQueueBuffers;
+extern LPALSOURCEUNQUEUEBUFFERS palSourceUnqueueBuffers;
+extern LPALGENBUFFERS palGenBuffers;
+extern LPALDELETEBUFFERS palDeleteBuffers;
+extern LPALISBUFFER palIsBuffer;
+extern LPALBUFFERF palBufferf;
+extern LPALBUFFER3F palBuffer3f;
+extern LPALBUFFERFV palBufferfv;
+extern LPALBUFFERI palBufferi;
+extern LPALBUFFER3I palBuffer3i;
+extern LPALBUFFERIV palBufferiv;
+extern LPALGETBUFFERF palGetBufferf;
+extern LPALGETBUFFER3F palGetBuffer3f;
+extern LPALGETBUFFERFV palGetBufferfv;
+extern LPALGETBUFFERI palGetBufferi;
+extern LPALGETBUFFER3I palGetBuffer3i;
+extern LPALGETBUFFERIV palGetBufferiv;
+extern LPALBUFFERDATA palBufferData;
+extern LPALDOPPLERFACTOR palDopplerFactor;
+extern LPALDOPPLERVELOCITY palDopplerVelocity;
+extern LPALDISTANCEMODEL palDistanceModel;
+extern LPALSPEEDOFSOUND palSpeedOfSound;
+#else
+#define palcCreateContext alcCreateContext
+#define palcMakeContextCurrent alcMakeContextCurrent
+#define palcProcessContext alcProcessContext
+#define palcSuspendContext alcSuspendContext
+#define palcDestroyContext alcDestroyContext
+#define palcGetCurrentContext alcGetCurrentContext
+#define palcGetContextsDevice alcGetContextsDevice
+#define palcOpenDevice alcOpenDevice
+#define palcCloseDevice alcCloseDevice
+#define palcGetError alcGetError
+#define palcIsExtensionPresent alcIsExtensionPresent
+#define palcGetProcAddress alcGetProcAddress
+#define palcGetEnumValue alcGetEnumValue
+#define palcGetString alcGetString
+#define palcGetIntegerv alcGetIntegerv
+#define palcCaptureOpenDevice alcCaptureOpenDevice
+#define palcCaptureCloseDevice alcCaptureCloseDevice
+#define palcCaptureStart alcCaptureStart
+#define palcCaptureStop alcCaptureStop
+#define palcCaptureSamples alcCaptureSamples
+#define palEnable alEnable
+#define palDisable alDisable
+#define palIsEnabled alIsEnabled
+#define palGetString alGetString
+#define palGetBooleanv alGetBooleanv
+#define palGetIntegerv alGetIntegerv
+#define palGetFloatv alGetFloatv
+#define palGetDoublev alGetDoublev
+#define palGetBoolean alGetBoolean
+#define palGetInteger alGetInteger
+#define palGetFloat alGetFloat
+#define palGetDouble alGetDouble
+#define palGetError alGetError
+#define palIsExtensionPresent alIsExtensionPresent
+#define palGetProcAddress alGetProcAddress
+#define palGetEnumValue alGetEnumValue
+#define palListenerf alListenerf
+#define palListener3f alListener3f
+#define palListenerfv alListenerfv
+#define palListeneri alListeneri
+#define palListener3i alListener3i
+#define palListeneriv alListeneriv
+#define palGetListenerf alGetListenerf
+#define palGetListener3f alGetListener3f
+#define palGetListenerfv alGetListenerfv
+#define palGetListeneri alGetListeneri
+#define palGetListener3i alGetListener3i
+#define palGetListeneriv alGetListeneriv
+#define palGenSources alGenSources
+#define palDeleteSources alDeleteSources
+#define palIsSource alIsSource
+#define palSourcef alSourcef
+#define palSource3f alSource3f
+#define palSourcefv alSourcefv
+#define palSourcei alSourcei
+#define palSource3i alSource3i
+#define palSourceiv alSourceiv
+#define palGetSourcef alGetSourcef
+#define palGetSource3f alGetSource3f
+#define palGetSourcefv alGetSourcefv
+#define palGetSourcei alGetSourcei
+#define palGetSource3i alGetSource3i
+#define palGetSourceiv alGetSourceiv
+#define palSourcePlayv alSourcePlayv
+#define palSourceStopv alSourceStopv
+#define palSourceRewindv alSourceRewindv
+#define palSourcePausev alSourcePausev
+#define palSourcePlay alSourcePlay
+#define palSourceStop alSourceStop
+#define palSourceRewind alSourceRewind
+#define palSourcePause alSourcePause
+#define palSourceQueueBuffers alSourceQueueBuffers
+#define palSourceUnqueueBuffers alSourceUnqueueBuffers
+#define palGenBuffers alGenBuffers
+#define palDeleteBuffers alDeleteBuffers
+#define palIsBuffer alIsBuffer
+#define palBufferf alBufferf
+#define palBuffer3f alBuffer3f
+#define palBufferfv alBufferfv
+#define palBufferi alBufferi
+#define palBuffer3i alBuffer3i
+#define palBufferiv alBufferiv
+#define palGetBufferf alGetBufferf
+#define palGetBuffer3f alGetBuffer3f
+#define palGetBufferfv alGetBufferfv
+#define palGetBufferi alGetBufferi
+#define palGetBuffer3i alGetBuffer3i
+#define palGetBufferiv alGetBufferiv
+#define palBufferData alBufferData
+#define palDopplerFactor alDopplerFactor
+#define palDopplerVelocity alDopplerVelocity
+#define palDistanceModel alDistanceModel
+#define palSpeedOfSound alSpeedOfSound
+#endif
+
+#include <math.h>
+#include "wingdi.h"
+#include "mmreg.h"
+
+/* OpenAL only allows for 1 single access to the device at the same time */
+extern CRITICAL_SECTION openal_crst;
+
+#endif

/* direct sound hardware acceleration levels */
#define DS_HW_ACCEL_FULL 0 /* default on Windows 98 */
diff --git a/dlls/openal32/Makefile.in b/dlls/openal32/Makefile.in
index b237706..9c2ac8f 100644
--- a/dlls/openal32/Makefile.in
+++ b/dlls/openal32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = openal32.dll
IMPORTS = kernel32 ntdll
-EXTRALIBS = @LIBOPENAL@
+EXTRALIBS = @LIBOPENAL@ @FRAMEWORK_OPENAL@

C_SRCS = \
openal.c
diff --git a/include/config.h.in b/include/config.h.in
index 7a77d1f..cb4c61d 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -558,6 +558,9 @@
/* Define if mkdir takes only one argument */
#undef HAVE_ONE_ARG_MKDIR

+/* Define to 1 if OpenAL is available */
+#undef HAVE_OPENAL
+
/* Define to 1 if you have the <OpenAL/al.h> header file. */
#undef HAVE_OPENAL_AL_H

@@ -1185,6 +1188,9 @@
/* Define to the soname of the libodbc library. */
#undef SONAME_LIBODBC

+/* Define to the soname of the libopenal library. */
+#undef SONAME_LIBOPENAL
+
/* Define to the soname of the libpng library. */
#undef SONAME_LIBPNG

--
1.6.5.3

[PATCH 1/2] dsound: Only initialize 1 guid for capture and renderer

2009-12-09T03:01:27Z

---
Since the guids are static anyway, the code can be simplified
---
dlls/dsound/capture.c | 11 ++++-------
dlls/dsound/dsound.c | 10 ++++------
dlls/dsound/dsound_main.c | 39 +++++++++++++++++++++------------------
dlls/dsound/dsound_private.h | 5 ++---
dlls/dsound/propset.c | 14 ++++++++------
5 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 26c86b8..f2a26bc 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -1059,13 +1059,10 @@ static HRESULT DirectSoundCaptureDevice_Initialize(
return DSERR_NODRIVER;
}

- /* enumerate WINMM audio devices and find the one we want */
- for (wid=0; wid<widn; wid++) {
- if (IsEqualGUID( &devGUID, &DSOUND_capture_guids[wid]) ) {
- found = TRUE;
- break;
- }
- }
+ wid = devGUID.Data4[7];
+ if (!memcmp(&devGUID, &DSOUND_capture_guid, sizeof(GUID)-1)
+ && wid < widn)
+ found = TRUE;

if (found == FALSE) {
WARN("No device found matching given ID!\n");
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index 83636c2..2a50329 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -1373,12 +1373,10 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG
return DSERR_NODRIVER;
}

- for (wod=0; wod<wodn; wod++) {
- if (IsEqualGUID( &devGUID, &DSOUND_renderer_guids[wod])) {
- found = TRUE;
- break;
- }
- }
+ wod = devGUID.Data4[7];
+ if (!memcmp(&devGUID, &DSOUND_renderer_guid, sizeof(GUID)-1)
+ && wod < wodn)
+ found = TRUE;

if (found == FALSE) {
WARN("No device found matching given ID!\n");
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index bfb8708..3fcabdb 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -58,8 +58,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(dsound);

DirectSoundDevice* DSOUND_renderer[MAXWAVEDRIVERS];
-GUID DSOUND_renderer_guids[MAXWAVEDRIVERS];
-GUID DSOUND_capture_guids[MAXWAVEDRIVERS];
+GUID DSOUND_renderer_guid = { 0xbd6dd71a,0x3deb,0x11d1, {0xb1,0x71,0x00,0xc0,0x4f,0xc2,0x00,0x00} };
+GUID DSOUND_capture_guid = { 0xbd6dd71b,0x3deb,0x11d1, {0xb1,0x71,0x00,0xc0,0x4f,0xc2,0x00,0x00} };

HRESULT mmErr(UINT err)
{
@@ -253,17 +253,19 @@ HRESULT WINAPI GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest)
}

if ( IsEqualGUID( &DSDEVID_DefaultPlayback, pGuidSrc ) ||
- IsEqualGUID( &DSDEVID_DefaultVoicePlayback, pGuidSrc ) ) {
- *pGuidDest = DSOUND_renderer_guids[ds_default_playback];
+ IsEqualGUID( &DSDEVID_DefaultVoicePlayback, pGuidSrc ) ) {
+ *pGuidDest = DSOUND_renderer_guid;
+ pGuidDest->Data4[7] = ds_default_playback;
TRACE("returns %s\n", get_device_id(pGuidDest));
- return DS_OK;
+ return DS_OK;
}

if ( IsEqualGUID( &DSDEVID_DefaultCapture, pGuidSrc ) ||
- IsEqualGUID( &DSDEVID_DefaultVoiceCapture, pGuidSrc ) ) {
- *pGuidDest = DSOUND_capture_guids[ds_default_capture];
+ IsEqualGUID( &DSDEVID_DefaultVoiceCapture, pGuidSrc ) ) {
+ *pGuidDest = DSOUND_capture_guid;
+ pGuidDest->Data4[7] = ds_default_capture;
TRACE("returns %s\n", get_device_id(pGuidDest));
- return DS_OK;
+ return DS_OK;
}

*pGuidDest = *pGuidSrc;
@@ -355,8 +357,8 @@ HRESULT WINAPI DirectSoundEnumerateW(
if (devs > 0) {
if (GetDeviceID(&DSDEVID_DefaultPlayback, &guid) == DS_OK) {
static const WCHAR empty[] = { 0 };
- for (wod = 0; wod < devs; ++wod) {
- if (IsEqualGUID( &guid, &DSOUND_renderer_guids[wod] ) ) {
+ wod = guid.Data4[7];
+ if (wod < devs) { {
err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
if (err == DS_OK) {
TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n",
@@ -374,13 +376,14 @@ HRESULT WINAPI DirectSoundEnumerateW(
for (wod = 0; wod < devs; ++wod) {
err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
if (err == DS_OK) {
+ guid.Data4[7] = wod;
TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n",
- debugstr_guid(&DSOUND_renderer_guids[wod]),desc.szDesc,desc.szDrvname,lpContext);
+ debugstr_guid(&guid),desc.szDesc,desc.szDrvname,lpContext);
MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1,
wDesc, sizeof(wDesc)/sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1,
wName, sizeof(wName)/sizeof(WCHAR) );
- if (lpDSEnumCallback(&DSOUND_renderer_guids[wod], wDesc, wName, lpContext) == FALSE)
+ if (lpDSEnumCallback(&guid, wDesc, wName, lpContext) == FALSE)
return DS_OK;
}
}
@@ -452,8 +455,8 @@ DirectSoundCaptureEnumerateW(
devs = waveInGetNumDevs();
if (devs > 0) {
if (GetDeviceID(&DSDEVID_DefaultCapture, &guid) == DS_OK) {
- for (wid = 0; wid < devs; ++wid) {
- if (IsEqualGUID( &guid, &DSOUND_capture_guids[wid] ) ) {
+ wid = guid.Data4[7];
+ if (wid < devs) { {
err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
if (err == DS_OK) {
TRACE("calling lpDSEnumCallback(NULL,\"%s\",\"%s\",%p)\n",
@@ -473,13 +476,14 @@ DirectSoundCaptureEnumerateW(
for (wid = 0; wid < devs; ++wid) {
err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
if (err == DS_OK) {
+ guid.Data4[7] = wid;
TRACE("calling lpDSEnumCallback(%s,\"%s\",\"%s\",%p)\n",
- debugstr_guid(&DSOUND_capture_guids[wid]),desc.szDesc,desc.szDrvname,lpContext);
+ debugstr_guid(&guid),desc.szDesc,desc.szDrvname,lpContext);
MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1,
wDesc, sizeof(wDesc)/sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1,
wName, sizeof(wName)/sizeof(WCHAR) );
- if (lpDSEnumCallback(&DSOUND_capture_guids[wid], wDesc, wName, lpContext) == FALSE)
+ if (lpDSEnumCallback(&guid, wDesc, wName, lpContext) == FALSE)
return DS_OK;
}
}
@@ -664,8 +668,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
for (i = 0; i < MAXWAVEDRIVERS; i++) {
DSOUND_renderer[i] = NULL;
DSOUND_capture[i] = NULL;
- INIT_GUID(DSOUND_renderer_guids[i], 0xbd6dd71a, 0x3deb, 0x11d1, 0xb1, 0x71, 0x00, 0xc0, 0x4f, 0xc2, 0x00, 0x00 + i);
- INIT_GUID(DSOUND_capture_guids[i], 0xbd6dd71b, 0x3deb, 0x11d1, 0xb1, 0x71, 0x00, 0xc0, 0x4f, 0xc2, 0x00, 0x00 + i);
}
DisableThreadLibraryCalls(hInstDLL);
/* Increase refcount on dsound by 1 */
@@ -680,3 +682,4 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
}
return TRUE;
}
+
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 1b25ddd..33c2f98 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -414,10 +414,9 @@ HRESULT DSOUND_CaptureCreate8(REFIID riid, LPDIRECTSOUNDCAPTURE8 *ppDSC8);
#define DSOUND_FREQSHIFT (20)

extern DirectSoundDevice* DSOUND_renderer[MAXWAVEDRIVERS];
-extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS];
-
extern DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS];
-extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS];
+extern GUID DSOUND_capture_guid;
+extern GUID DSOUND_renderer_guid;

HRESULT mmErr(UINT err);
void setup_dsound_options(void);
diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index fb9f280..cef31a1 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -116,7 +116,8 @@ static HRESULT DSPROPERTY_WaveDeviceMappingW(
res = waveOutGetDevCapsW(wod, &capsW, sizeof(capsW));
if (res == MMSYSERR_NOERROR) {
if (lstrcmpW(capsW.szPname, ppd->DeviceName) == 0) {
- ppd->DeviceId = DSOUND_renderer_guids[wod];
+ ppd->DeviceId = DSOUND_renderer_guid;
+ ppd->DeviceId.Data4[7] = wod;
hr = DS_OK;
TRACE("found %s for %s\n", debugstr_guid(&ppd->DeviceId),
debugstr_w(ppd->DeviceName));
@@ -135,7 +136,8 @@ static HRESULT DSPROPERTY_WaveDeviceMappingW(
res = waveInGetDevCapsW(wid, &capsW, sizeof(capsW));
if (res == MMSYSERR_NOERROR) {
if (lstrcmpW(capsW.szPname, ppd->DeviceName) == 0) {
- ppd->DeviceId = DSOUND_capture_guids[wid];
+ ppd->DeviceId = DSOUND_capture_guid;
+ ppd->DeviceId.Data4[7] = wid;
hr = DS_OK;
TRACE("found %s for %s\n", debugstr_guid(&ppd->DeviceId),
debugstr_w(ppd->DeviceName));
@@ -220,13 +222,13 @@ static HRESULT DSPROPERTY_DescriptionW(
wodn = waveOutGetNumDevs();
widn = waveInGetNumDevs();
wid = wod = dev_guid.Data4[7];
- if (!memcmp(&dev_guid, &DSOUND_renderer_guids[0], sizeof(GUID)-1)
+ if (!memcmp(&dev_guid, &DSOUND_renderer_guid, sizeof(GUID)-1)
&& wod < wodn)
{
ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
ppd->WaveDeviceId = wod;
}
- else if (!memcmp(&dev_guid, &DSOUND_capture_guids[0], sizeof(GUID)-1)
+ else if (!memcmp(&dev_guid, &DSOUND_capture_guid, sizeof(GUID)-1)
&& wid < widn)
{
ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
@@ -306,7 +308,7 @@ static HRESULT DSPROPERTY_EnumerateW(
wodn = waveOutGetNumDevs();
widn = waveInGetNumDevs();

- data.DeviceId = DSOUND_renderer_guids[0];
+ data.DeviceId = DSOUND_renderer_guid;
for (i = 0; i < wodn; ++i)
{
HRESULT hr;
@@ -324,7 +326,7 @@ static HRESULT DSPROPERTY_EnumerateW(
return S_OK;
}

- data.DeviceId = DSOUND_capture_guids[0];
+ data.DeviceId = DSOUND_capture_guid;
for (i = 0; i < widn; ++i)
{
HRESULT hr;
--
1.6.5.3

[PATCH 5/5] wined3d: Only disable blending for offscreen targets.

2009-12-09T02:51:19Z

---
dlls/wined3d/state.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 6df6e54..716ec48 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -252,7 +252,8 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, struct

/* Disable blending in all cases even without pixelshaders. With blending on we could face a big performance penalty.
* The d3d9 visual test confirms the behavior. */
- if (!(target->resource.format_desc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING))
+ if (context->render_offscreen
+ && !(target->resource.format_desc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING))
{
glDisable(GL_BLEND);
checkGLcall("glDisable GL_BLEND");
--
1.6.4.4

[PATCH 4/5] wined3d: Remove unused GetDevice() implementations.

2009-12-09T02:51:18Z

---
dlls/wined3d/buffer.c | 6 ------
dlls/wined3d/cubetexture.c | 5 -----
dlls/wined3d/pixelshader.c | 10 ----------
dlls/wined3d/query.c | 12 ------------
dlls/wined3d/resource.c | 9 ---------
dlls/wined3d/stateblock.c | 11 -----------
dlls/wined3d/surface.c | 1 -
dlls/wined3d/surface_base.c | 4 ----
dlls/wined3d/surface_gdi.c | 1 -
dlls/wined3d/texture.c | 5 -----
dlls/wined3d/vertexdeclaration.c | 11 -----------
dlls/wined3d/vertexshader.c | 9 ---------
dlls/wined3d/volume.c | 5 -----
dlls/wined3d/volumetexture.c | 5 -----
dlls/wined3d/wined3d_private.h | 2 --
include/wine/wined3d.idl | 15 ---------------
16 files changed, 0 insertions(+), 111 deletions(-)

diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
index 24b58a5..fa79340 100644
--- a/dlls/wined3d/buffer.c
+++ b/dlls/wined3d/buffer.c
@@ -657,11 +657,6 @@ static HRESULT STDMETHODCALLTYPE buffer_GetParent(IWineD3DBuffer *iface, IUnknow

/* IWineD3DResource methods */

-static HRESULT STDMETHODCALLTYPE buffer_GetDevice(IWineD3DBuffer *iface, IWineD3DDevice **device)
-{
- return resource_get_device((IWineD3DResource *)iface, device);
-}
-
static HRESULT STDMETHODCALLTYPE buffer_SetPrivateData(IWineD3DBuffer *iface,
REFGUID guid, const void *data, DWORD data_size, DWORD flags)
{
@@ -1064,7 +1059,6 @@ static const struct IWineD3DBufferVtbl wined3d_buffer_vtbl =
/* IWineD3DBase methods */
buffer_GetParent,
/* IWineD3DResource methods */
- buffer_GetDevice,
buffer_SetPrivateData,
buffer_GetPrivateData,
buffer_FreePrivateData,
diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c
index f22845b..8d257aa 100644
--- a/dlls/wined3d/cubetexture.c
+++ b/dlls/wined3d/cubetexture.c
@@ -183,10 +183,6 @@ static ULONG WINAPI IWineD3DCubeTextureImpl_Release(IWineD3DCubeTexture *iface)
/* ****************************************************
IWineD3DCubeTexture IWineD3DResource parts follow
**************************************************** */
-static HRESULT WINAPI IWineD3DCubeTextureImpl_GetDevice(IWineD3DCubeTexture *iface, IWineD3DDevice** ppDevice) {
- return resource_get_device((IWineD3DResource *)iface, ppDevice);
-}
-
static HRESULT WINAPI IWineD3DCubeTextureImpl_SetPrivateData(IWineD3DCubeTexture *iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {
return resource_set_private_data((IWineD3DResource *)iface, refguid, pData, SizeOfData, Flags);
}
@@ -404,7 +400,6 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl =
IWineD3DCubeTextureImpl_Release,
/* IWineD3DResource */
IWineD3DCubeTextureImpl_GetParent,
- IWineD3DCubeTextureImpl_GetDevice,
IWineD3DCubeTextureImpl_SetPrivateData,
IWineD3DCubeTextureImpl_GetPrivateData,
IWineD3DCubeTextureImpl_FreePrivateData,
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index d156498..a531f09 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -90,15 +90,6 @@ static HRESULT WINAPI IWineD3DPixelShaderImpl_GetParent(IWineD3DPixelShader *if
return WINED3D_OK;
}

-static HRESULT WINAPI IWineD3DPixelShaderImpl_GetDevice(IWineD3DPixelShader* iface, IWineD3DDevice **pDevice){
- IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface;
- IWineD3DDevice_AddRef(This->baseShader.device);
- *pDevice = This->baseShader.device;
- TRACE("(%p) returning %p\n", This, *pDevice);
- return WINED3D_OK;
-}
-
-
static HRESULT WINAPI IWineD3DPixelShaderImpl_GetFunction(IWineD3DPixelShader* impl, VOID* pData, UINT* pSizeOfData) {
IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)impl;
TRACE("(%p) : pData(%p), pSizeOfData(%p)\n", This, pData, pSizeOfData);
@@ -353,7 +344,6 @@ static const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl =
/*** IWineD3DBase methods ***/
IWineD3DPixelShaderImpl_GetParent,
/*** IWineD3DBaseShader methods ***/
- IWineD3DPixelShaderImpl_GetDevice,
IWineD3DPixelShaderImpl_GetFunction
/*** IWineD3DPixelShader methods ***/
};
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 76f519d..ff4021d 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -98,15 +98,6 @@ static HRESULT WINAPI IWineD3DQueryImpl_GetParent(IWineD3DQuery *iface, IUnknow
return WINED3D_OK;
}

-static HRESULT WINAPI IWineD3DQueryImpl_GetDevice(IWineD3DQuery* iface, IWineD3DDevice **pDevice){
- IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface;
- IWineD3DDevice_AddRef((IWineD3DDevice *)This->wineD3DDevice);
- *pDevice = (IWineD3DDevice *)This->wineD3DDevice;
- TRACE("(%p) returning %p\n", This, *pDevice);
- return WINED3D_OK;
-}
-
-
static HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags){
IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface;
HRESULT res = S_OK;
@@ -640,7 +631,6 @@ const IWineD3DQueryVtbl IWineD3DQuery_Vtbl =
IWineD3DQueryImpl_Release,
/*** IWineD3Dquery methods ***/
IWineD3DQueryImpl_GetParent,
- IWineD3DQueryImpl_GetDevice,
IWineD3DQueryImpl_GetData,
IWineD3DQueryImpl_GetDataSize,
IWineD3DQueryImpl_GetType,
@@ -655,7 +645,6 @@ const IWineD3DQueryVtbl IWineD3DEventQuery_Vtbl =
IWineD3DQueryImpl_Release,
/*** IWineD3Dquery methods ***/
IWineD3DQueryImpl_GetParent,
- IWineD3DQueryImpl_GetDevice,
IWineD3DEventQueryImpl_GetData,
IWineD3DEventQueryImpl_GetDataSize,
IWineD3DQueryImpl_GetType,
@@ -670,7 +659,6 @@ const IWineD3DQueryVtbl IWineD3DOcclusionQuery_Vtbl =
IWineD3DQueryImpl_Release,
/*** IWineD3Dquery methods ***/
IWineD3DQueryImpl_GetParent,
- IWineD3DQueryImpl_GetDevice,
IWineD3DOcclusionQueryImpl_GetData,
IWineD3DOcclusionQueryImpl_GetDataSize,
IWineD3DQueryImpl_GetType,
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index ea61c59..629d59e 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -105,15 +105,6 @@ void resource_cleanup(IWineD3DResource *iface)
if (This->resource.wineD3DDevice) device_resource_released(This->resource.wineD3DDevice, iface);
}

-HRESULT resource_get_device(IWineD3DResource *iface, IWineD3DDevice** ppDevice)
-{
- IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface;
- TRACE("(%p) : returning %p\n", This, This->resource.wineD3DDevice);
- *ppDevice = (IWineD3DDevice *) This->resource.wineD3DDevice;
- IWineD3DDevice_AddRef(*ppDevice);
- return WINED3D_OK;
-}
-
static PrivateData* resource_find_private_data(IWineD3DResourceImpl *This, REFGUID tag)
{
PrivateData *data;
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index b3cae54..8abe70e 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -535,16 +535,6 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) {
/**********************************************************
* IWineD3DStateBlockImpl parts follows
**********************************************************/
-static HRESULT WINAPI IWineD3DStateBlockImpl_GetDevice(IWineD3DStateBlock *iface, IWineD3DDevice** ppDevice){
-
- IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface;
-
- *ppDevice = (IWineD3DDevice*)This->wineD3DDevice;
- IWineD3DDevice_AddRef(*ppDevice);
- return WINED3D_OK;
-
-}
-
static void record_lights(IWineD3DStateBlockImpl *This, const IWineD3DStateBlockImpl *targetStateBlock)
{
UINT i;
@@ -1321,7 +1311,6 @@ static const IWineD3DStateBlockVtbl IWineD3DStateBlock_Vtbl =
IWineD3DStateBlockImpl_AddRef,
IWineD3DStateBlockImpl_Release,
/* IWineD3DStateBlock */
- IWineD3DStateBlockImpl_GetDevice,
IWineD3DStateBlockImpl_Capture,
IWineD3DStateBlockImpl_Apply,
IWineD3DStateBlockImpl_InitStartupStateBlock
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index ed4e9aa..141eaaf 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -5154,7 +5154,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl =
IWineD3DSurfaceImpl_Release,
/* IWineD3DResource */
IWineD3DBaseSurfaceImpl_GetParent,
- IWineD3DBaseSurfaceImpl_GetDevice,
IWineD3DBaseSurfaceImpl_SetPrivateData,
IWineD3DBaseSurfaceImpl_GetPrivateData,
IWineD3DBaseSurfaceImpl_FreePrivateData,
diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index ca715f5..98fe372 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -117,10 +117,6 @@ ULONG WINAPI IWineD3DBaseSurfaceImpl_AddRef(IWineD3DSurface *iface) {
/* ****************************************************
IWineD3DSurface IWineD3DResource parts follow
**************************************************** */
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDevice(IWineD3DSurface *iface, IWineD3DDevice** ppDevice) {
- return resource_get_device((IWineD3DResource *)iface, ppDevice);
-}
-
HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPrivateData(IWineD3DSurface *iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {
return resource_set_private_data((IWineD3DResource *)iface, refguid, pData, SizeOfData, Flags);
}
diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c
index 7867008..350be43 100644
--- a/dlls/wined3d/surface_gdi.c
+++ b/dlls/wined3d/surface_gdi.c
@@ -646,7 +646,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl =
IWineGDISurfaceImpl_Release,
/* IWineD3DResource */
IWineD3DBaseSurfaceImpl_GetParent,
- IWineD3DBaseSurfaceImpl_GetDevice,
IWineD3DBaseSurfaceImpl_SetPrivateData,
IWineD3DBaseSurfaceImpl_GetPrivateData,
IWineD3DBaseSurfaceImpl_FreePrivateData,
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index b568005..ffc27e2 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -171,10 +171,6 @@ static ULONG WINAPI IWineD3DTextureImpl_Release(IWineD3DTexture *iface) {
/* ****************************************************
IWineD3DTexture IWineD3DResource parts follow
**************************************************** */
-static HRESULT WINAPI IWineD3DTextureImpl_GetDevice(IWineD3DTexture *iface, IWineD3DDevice** ppDevice) {
- return resource_get_device((IWineD3DResource *)iface, ppDevice);
-}
-
static HRESULT WINAPI IWineD3DTextureImpl_SetPrivateData(IWineD3DTexture *iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {
return resource_set_private_data((IWineD3DResource *)iface, refguid, pData, SizeOfData, Flags);
}
@@ -405,7 +401,6 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl =
IWineD3DTextureImpl_Release,
/* IWineD3DResource */
IWineD3DTextureImpl_GetParent,
- IWineD3DTextureImpl_GetDevice,
IWineD3DTextureImpl_SetPrivateData,
IWineD3DTextureImpl_GetPrivateData,
IWineD3DTextureImpl_FreePrivateData,
diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c
index 88b3f27..58df345 100644
--- a/dlls/wined3d/vertexdeclaration.c
+++ b/dlls/wined3d/vertexdeclaration.c
@@ -88,16 +88,6 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetParent(IWineD3DVertexDecl
return WINED3D_OK;
}

-static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDevice(IWineD3DVertexDeclaration *iface, IWineD3DDevice** ppDevice) {
- IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface;
- TRACE("(%p) : returning %p\n", This, This->wineD3DDevice);
-
- *ppDevice = (IWineD3DDevice *) This->wineD3DDevice;
- IWineD3DDevice_AddRef(*ppDevice);
-
- return WINED3D_OK;
-}
-
static BOOL declaration_element_valid_ffp(const WINED3DVERTEXELEMENT *element)
{
switch(element->usage)
@@ -194,7 +184,6 @@ static const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl =
IWineD3DVertexDeclarationImpl_Release,
/* IWineD3DVertexDeclaration */
IWineD3DVertexDeclarationImpl_GetParent,
- IWineD3DVertexDeclarationImpl_GetDevice,
};

HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *declaration, IWineD3DDeviceImpl *device,
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index 63d8c9b..f08fd06 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -194,14 +194,6 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_GetParent(IWineD3DVertexShader *i
return WINED3D_OK;
}

-static HRESULT WINAPI IWineD3DVertexShaderImpl_GetDevice(IWineD3DVertexShader* iface, IWineD3DDevice **pDevice){
- IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)iface;
- IWineD3DDevice_AddRef(This->baseShader.device);
- *pDevice = This->baseShader.device;
- TRACE("(%p) returning %p\n", This, *pDevice);
- return WINED3D_OK;
-}
-
static HRESULT WINAPI IWineD3DVertexShaderImpl_GetFunction(IWineD3DVertexShader* impl, VOID* pData, UINT* pSizeOfData) {
IWineD3DVertexShaderImpl *This = (IWineD3DVertexShaderImpl *)impl;
TRACE("(%p) : pData(%p), pSizeOfData(%p)\n", This, pData, pSizeOfData);
@@ -348,7 +340,6 @@ static const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl =
/*** IWineD3DBase methods ***/
IWineD3DVertexShaderImpl_GetParent,
/*** IWineD3DBaseShader methods ***/
- IWineD3DVertexShaderImpl_GetDevice,
IWineD3DVertexShaderImpl_GetFunction,
/*** IWineD3DVertexShader methods ***/
IWIneD3DVertexShaderImpl_SetLocalConstantsF
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 5a80cb6..bb6c676 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -138,10 +138,6 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetParent(IWineD3DVolume *iface, IUnkno
return resource_get_parent((IWineD3DResource *)iface, pParent);
}

-static HRESULT WINAPI IWineD3DVolumeImpl_GetDevice(IWineD3DVolume *iface, IWineD3DDevice** ppDevice) {
- return resource_get_device((IWineD3DResource *)iface, ppDevice);
-}
-
static HRESULT WINAPI IWineD3DVolumeImpl_SetPrivateData(IWineD3DVolume *iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {
return resource_set_private_data((IWineD3DResource *)iface, refguid, pData, SizeOfData, Flags);
}
@@ -361,7 +357,6 @@ static const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl =
IWineD3DVolumeImpl_Release,
/* IWineD3DResource */
IWineD3DVolumeImpl_GetParent,
- IWineD3DVolumeImpl_GetDevice,
IWineD3DVolumeImpl_SetPrivateData,
IWineD3DVolumeImpl_GetPrivateData,
IWineD3DVolumeImpl_FreePrivateData,
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c
index 4cea3a0..26aacad 100644
--- a/dlls/wined3d/volumetexture.c
+++ b/dlls/wined3d/volumetexture.c
@@ -139,10 +139,6 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DVolumeTexture *ifa
/* ****************************************************
IWineD3DVolumeTexture IWineD3DResource parts follow
**************************************************** */
-static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetDevice(IWineD3DVolumeTexture *iface, IWineD3DDevice** ppDevice) {
- return resource_get_device((IWineD3DResource *)iface, ppDevice);
-}
-
static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetPrivateData(IWineD3DVolumeTexture *iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {
return resource_set_private_data((IWineD3DResource *)iface, refguid, pData, SizeOfData, Flags);
}
@@ -322,7 +318,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl =
IWineD3DVolumeTextureImpl_Release,
/* resource */
IWineD3DVolumeTextureImpl_GetParent,
- IWineD3DVolumeTextureImpl_GetDevice,
IWineD3DVolumeTextureImpl_SetPrivateData,
IWineD3DVolumeTextureImpl_GetPrivateData,
IWineD3DVolumeTextureImpl_FreePrivateData,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 34f9f33..b5e61b6 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1653,7 +1653,6 @@ typedef struct IWineD3DResourceImpl

void resource_cleanup(IWineD3DResource *iface) DECLSPEC_HIDDEN;
HRESULT resource_free_private_data(IWineD3DResource *iface, REFGUID guid) DECLSPEC_HIDDEN;
-HRESULT resource_get_device(IWineD3DResource *iface, IWineD3DDevice **device) DECLSPEC_HIDDEN;
HRESULT resource_get_parent(IWineD3DResource *iface, IUnknown **parent) DECLSPEC_HIDDEN;
DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN;
HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID guid,
@@ -1974,7 +1973,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_QueryInterface(IWineD3DSurface *iface,
REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN;
ULONG WINAPI IWineD3DBaseSurfaceImpl_AddRef(IWineD3DSurface *iface) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface, IUnknown **pParent) DECLSPEC_HIDDEN;
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetDevice(IWineD3DSurface *iface, IWineD3DDevice** ppDevice) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPrivateData(IWineD3DSurface *iface,
REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) DECLSPEC_HIDDEN;
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPrivateData(IWineD3DSurface *iface,
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index 8bcc2a8..27267c2 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2327,9 +2327,6 @@ interface IWineD3D : IWineD3DBase
]
interface IWineD3DResource : IWineD3DBase
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
HRESULT SetPrivateData(
[in] REFGUID guid,
[in] const void *data,
@@ -2715,9 +2712,6 @@ interface IWineD3DVolumeTexture : IWineD3DBaseTexture
]
interface IWineD3DVertexDeclaration : IWineD3DBase
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
}

[
@@ -2727,9 +2721,6 @@ interface IWineD3DVertexDeclaration : IWineD3DBase
]
interface IWineD3DStateBlock : IUnknown
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
HRESULT Capture(
);
HRESULT Apply(
@@ -2745,9 +2736,6 @@ interface IWineD3DStateBlock : IUnknown
]
interface IWineD3DQuery : IWineD3DBase
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
HRESULT GetData(
[out] void *data,
[in] DWORD data_size,
@@ -2837,9 +2825,6 @@ interface IWineD3DBuffer : IWineD3DResource
]
interface IWineD3DBaseShader : IWineD3DBase
{
- HRESULT GetDevice(
- [out] IWineD3DDevice **device
- );
HRESULT GetFunction(
[out] void *data,
[in, out] UINT *data_size
--
1.6.4.4

[PATCH 3/5] d3d9: Forward the volume's GetDevice() to the texture instead of the wined3d volume.

2009-12-09T02:51:17Z

---
dlls/d3d9/volume.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c
index 0d83ce1..baa286b 100644
--- a/dlls/d3d9/volume.c
+++ b/dlls/d3d9/volume.c
@@ -94,21 +94,24 @@ static ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) {
}

/* IDirect3DVolume9 Interface follow: */
-static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(LPDIRECT3DVOLUME9 iface, IDirect3DDevice9** ppDevice) {
+static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(IDirect3DVolume9 *iface, IDirect3DDevice9 **device)
+{
IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface;
- IWineD3DDevice *myDevice = NULL;
+ IDirect3DResource9 *resource;
+ HRESULT hr;

- TRACE("iface %p, device %p.\n", iface, ppDevice);
+ TRACE("iface %p, device %p.\n", iface, device);

- wined3d_mutex_lock();
-
- IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice);
- IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice);
- IWineD3DDevice_Release(myDevice);
+ hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource9, (void **)&resource);
+ if (SUCCEEDED(hr))
+ {
+ hr = IDirect3DResource9_GetDevice(resource, device);
+ IDirect3DResource9_Release(resource);

- wined3d_mutex_unlock();
+ TRACE("Returning device %p.\n", *device);
+ }

- return D3D_OK;
+ return hr;
}

static HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(LPDIRECT3DVOLUME9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {
--
1.6.4.4

[PATCH 2/5] d3d8: Forward the volume's GetDevice() to the texture instead of the wined3d volume.

2009-12-09T02:51:16Z

---
dlls/d3d8/volume.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c
index 8948997..8e8dc60 100644
--- a/dlls/d3d8/volume.c
+++ b/dlls/d3d8/volume.c
@@ -94,19 +94,24 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) {
}

/* IDirect3DVolume8 Interface follow: */
-static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, IDirect3DDevice8 **ppDevice) {
+static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, IDirect3DDevice8 **device)
+{
IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface;
- IWineD3DDevice *myDevice = NULL;
+ IDirect3DResource8 *resource;
+ HRESULT hr;

- TRACE("iface %p, device %p.\n", iface, ppDevice);
+ TRACE("iface %p, device %p.\n", iface, device);

- wined3d_mutex_lock();
- IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice);
- IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice);
- IWineD3DDevice_Release(myDevice);
- wined3d_mutex_unlock();
+ hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource8, (void **)&resource);
+ if (SUCCEEDED(hr))
+ {
+ hr = IDirect3DResource8_GetDevice(resource, device);
+ IDirect3DResource8_Release(resource);

- return D3D_OK;
+ TRACE("Returning device %p.\n", *device);
+ }
+
+ return hr;
}

static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) {
--
1.6.4.4

[PATCH 1/5] wined3d: Remove a few redundant assignments.

2009-12-09T02:51:15Z

---
dlls/wined3d/arb_program_shader.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 6401407..42ed898 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5275,7 +5275,6 @@ static void state_texfactor_arbfp(DWORD state, IWineD3DStateBlockImpl *statebloc
if(device->shader_backend == &arb_program_shader_backend) {
if (use_ps(stateblock)) return;

- device = stateblock->wineD3DDevice;
context->pshader_const_dirty[ARB_FFP_CONST_TFACTOR] = 1;
device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_TFACTOR + 1);
}
@@ -5297,7 +5296,6 @@ static void state_arb_specularenable(DWORD state, IWineD3DStateBlockImpl *stateb
if(device->shader_backend == &arb_program_shader_backend) {
if (use_ps(stateblock)) return;

- device = stateblock->wineD3DDevice;
context->pshader_const_dirty[ARB_FFP_CONST_SPECULAR_ENABLE] = 1;
device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_SPECULAR_ENABLE + 1);
}
--
1.6.4.4

ntdll/tests: Free Unicode string before reuse.

2009-12-09T02:45:49Z

Thanks Paul.
---
dlls/ntdll/tests/file.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 7e8f101..9aade11 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -254,6 +254,7 @@ static void open_file_test(void)
status = pNtOpenFile( &dir, GENERIC_READ, &attr, &io,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE );
ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status );
+ pRtlFreeUnicodeString( &nameW );

/* test opening system dir with RootDirectory set to windows dir */
GetSystemDirectoryW( path, MAX_PATH );
@@ -337,7 +338,6 @@ static void open_file_test(void)
}

CloseHandle( dir );
- pRtlFreeUnicodeString( &nameW );
}

static void delete_file_test(void)
--
1.6.3.3

gdiplus/tests: Fix a matrix leak in test

2009-12-09T02:34:50Z

Fix a matrix leak in test (Valgrind)

0001-Fix-a-matrix-leak-in-test.diff (800 bytes) Download Attachment

winedbg: Add spanish translation

2009-12-08T18:30:45Z

--
Jaime Rave Torres
Ingeniero de Sistemas
Miembro de la Fundación de Software Libre de Colombia
http://www.fslcol.org/
http://sobrelibertad.blogspot.com/
3003160361

[0001-winedbg-Add-spanish-translation.patch]

From f57f0404c180d076f27ee4461bbce463346c5b80 Mon Sep 17 00:00:00 2001 From: Jaime Rave <jaimerave@...> Date: Tue, 8 Dec 2009 21:28:56 -0500 Subject: winedbg: Add spanish translation --- programs/winedbg/Makefile.in | 1 + programs/winedbg/rsrc_Es.rc | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) create mode 100644 programs/winedbg/rsrc_Es.rc diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index f23298c..435c9e7 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -33,6 +33,7 @@ C_SRCS = \ RC_SRCS = \ rsrc_De.rc \ rsrc_En.rc \ + rsrc_Es.rc \ rsrc_Fr.rc \ rsrc_Ko.rc \ rsrc_Lt.rc \ diff --git a/programs/winedbg/rsrc_Es.rc b/programs/winedbg/rsrc_Es.rc new file mode 100644 index 0000000..f4f64cd --- /dev/null +++ b/programs/winedbg/rsrc_Es.rc @@ -0,0 +1,58 @@ +/* + * Spanish Language Support + * + * Copyright 2009 Jaime Rave + * + * 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 + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Depurar", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Error del programa" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "El programa %s ha encontrado un serio problema y necesita \ + cerrarse. Nos disculpamos por los inconvenientes.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Esto puede ser causado por un problema en el programa o a una deficiencia en Wine. \ + Quizá quieras verificar en http://appdb.winehq.org consejos sobre cómo ejecutar \ + esta aplicación.\n\n\ + Si este problema no esta presente en Windows y no ha sido reportado \ + todavía, lo puedes reportar en http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Cerrar", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Caida del programa Wine" + IDS_INVALID_PARAMS "Errores internos - parámetros invalidos recibidos" + IDS_UNIDENTIFIED "(no identificado)" +END -- 1.6.3.3

[website] Added home spanish translation

2009-12-08T18:05:24Z

From 2b09bc57162c4e0a979576a8cdd4e59b5b124c63 Mon Sep 17 00:00:00 2001 From: Jaime Rave <jaimerave@...> Date: Tue, 8 Dec 2009 20:59:36 -0500 Subject: Added home spanish translation --- templates/es/home.template | 90 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) create mode 100644 templates/es/home.template diff --git a/templates/es/home.template b/templates/es/home.template new file mode 100644 index 0000000..da2c31e --- /dev/null +++ b/templates/es/home.template @@ -0,0 +1,90 @@ + + + + +<div id="main_left"> + + <div class="rbox"> + <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> + <div class="content" style="padding: 25px 10px 10px 60px; height: 445px; overflow: auto;"> + <ul class="winehq_menu"> + + <li class="info" onClick="document.location='{$root}/about/';"> + <div class="title"><a href="{$root}/about/">Acerca de</a></div> + <div class="subtitle">Aprende sobre el proyecto Wine.</div> + </li> + + <li class="dl" onClick="document.location='{$root}/download/';"> + <div class="title"><a href="{$root}/download/">Descarga</a></div> + <div class="subtitle">Instala la última versión de Wine.</div> + </li> + + <li class="help" onClick="document.location='{$root}/help/';"> + <div class="title"><a href="{$root}/help/">Soporte</a></div> + <div class="subtitle">Obtén ayuda para usar Wine.</div> + </li> + + <li class="devel" onClick="document.location='{$root}/devel/';"> + <div class="title"><a href="{$root}/devel/">Desarrollo</a></div> + <div class="subtitle">Conviértete en un desarrollador de Wine.</div> + </li> + + <li class="donate" onClick="document.donateForm.submit();"> + <form action="https://www.paypal.com/cgi-bin/webscr" method="post" name="donateForm" style="margin: 0; padding: 0;"> + <div class="title"><a href="javascript:document.donateForm.submit();">Dona</a></div> + <input type="hidden" name="cmd" value="_xclick"> + <input type="hidden" name="business" value="donate@..."> + <input type="hidden" name="item_name" value="Wine donation"> + </form> + <div class="subtitle">Haz una donación al proyecto Wine.</div> + </li> + + </ul> + </div> + <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> + </div> + + +</div> +<div id="main_right"> + + <div class="rbox"> + <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> + <div class="content" style="padding: 5px 10px 5px 10px; height: 85px; overflow: auto;"> + + <h3 class="title" style="margin: 0;">Último lanzamiento</h3> + <table style="margin: 7px 0 0 15px; border-spacing: 0; border: 0;"> + <tr><td>Estable:</td> + <td style="padding-left: 15px; padding-bottom: 2px;"> + <b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> + <span class="small"> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_stable_release}">shortlog</a>) + </span> + </td></tr> + <tr><td>Desarrollo:</td> + <td style="padding-left: 15px;"> + <b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> + <span class="small"> + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_master_release}">shortlog</a>) + </span> + </td></tr> + </table> + </div> + <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> + </div> + + <div class="rbox" style="margin-top: 15px;"> + <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> + <div class="content" style="padding: 10px; height: 340px; overflow: auto;"> + + <h3 class="title"><a href="{$root}/news/">Noticias</a></h3> + +  + + <p><a href="{$root}/news/">más noticias...</a></p> + </div> + <b class="rbottom"><b class="r4"></b><b class="r3"></b><b class="r2"></b><b class="r1"></b></b> + </div> + +</div> + -- 1.6.3.3

shdocvw: Implement refresh in webbbrowser.c

2009-12-08T16:58:24Z

Implements WebBrowser_Refresh in shdocvw/webbrowser.c .

Now a VB app with a 'refresh' button works, refreshing a web page
displayed by gecko with the current web page (it used to crash the app
because refresh returned an E_NOTIMPL).

Tested with linux winetest.exe.so on Ubuntu 9.10
with ATI graphics card. No new fails (retests are not 100% stable, but
close to stable), I tested several times before and after the change.
Fails are like other linux-wine results shown on test.winehq.org.

DavidAnderson

From 10d0f6cfc9ef8e068654d3d86e5281ca5f564a8d Mon Sep 17 00:00:00 2001
From: D <davea@ubuntu.(none)>
Date: Tue, 8 Dec 2009 14:44:15 -0800
Subject: Implements new Refresh code.

---
dlls/shdocvw/webbrowser.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c
index 6c3c671..420aa34 100644
--- a/dlls/shdocvw/webbrowser.c
+++ b/dlls/shdocvw/webbrowser.c
@@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);

#define WEBBROWSER_THIS(iface) DEFINE_THIS(WebBrowser, WebBrowser2, iface)

+static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL);
+
static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid, LPVOID *ppv)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
@@ -279,8 +281,17 @@ static HRESULT WINAPI WebBrowser_Navigate(IWebBrowser2 *iface, BSTR szUrl,
static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface)
{
WebBrowser *This = WEBBROWSER_THIS(iface);
- FIXME("(%p)\n", This);
- return E_NOTIMPL;
+ BSTR url;
+ HRESULT res;
+
+ TRACE("(%p)\n", This);
+ res = WebBrowser_get_LocationURL(iface, &url);
+ if( res != S_OK) {
+ FIXME("(%p)-> ERROR calling WebBrowser_get_LocationURL\n", This);
+ return res;
+ }
+ TRACE("(%p)->(%s )\n", This, debugstr_w(url));
+ return navigate_url(&This->doc_host, url, NULL,NULL,NULL,NULL);
}

static HRESULT WINAPI WebBrowser_Refresh2(IWebBrowser2 *iface, VARIANT *Level)
--
1.6.3.3

[PATCH 3/3] gdiplus: Add missing declaration for customlinecap.c.

2009-12-08T16:08:46Z

---
include/gdiplusflat.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
index 5fc4ed5..cd97a70 100644
--- a/include/gdiplusflat.h
+++ b/include/gdiplusflat.h
@@ -90,6 +90,7 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap,
GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin*);
GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin);
GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap*,REAL*);
+GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap*,REAL);
GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL);

/* Font */
--
1.6.5.5

[PATCH 2/3] gdiplus: Add missing declarations for pen.c.

2009-12-08T16:08:45Z

---
include/gdiplusflat.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
index 7c4fa70..5fc4ed5 100644
--- a/include/gdiplusflat.h
+++ b/include/gdiplusflat.h
@@ -594,6 +594,8 @@ GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen*,INT*);
GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*);
GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*);
GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*);
+GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*);
+GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder);
GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*);
GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB);
GpStatus WINGDIPAPI GdipSetPenCompoundArray(GpPen*,GDIPCONST REAL*,INT);
--
1.6.5.5

[PATCH 1/3] gdiplus: Add missing declarations for gdiplus.c.

2009-12-08T16:08:44Z

---
include/gdiplusflat.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
index 4aed5d3..7c4fa70 100644
--- a/include/gdiplusflat.h
+++ b/include/gdiplusflat.h
@@ -528,6 +528,10 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader
GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream*,MetafileHeader*);
GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE,GDIPCONST WmfPlaceableFileHeader*,MetafileHeader*);

+/* Notification */
+GpStatus WINAPI GdiplusNotificationHook(ULONG_PTR*);
+void WINAPI GdiplusNotificationUnhook(ULONG_PTR);
+
/* PathGradientBrush */
GpStatus WINGDIPAPI GdipCreatePathGradient(GDIPCONST GpPointF*,INT,GpWrapMode,GpPathGradient**);
GpStatus WINGDIPAPI GdipCreatePathGradientI(GDIPCONST GpPoint*,INT,GpWrapMode,GpPathGradient**);
--
1.6.5.5

inetmib1(2/2): Copy an IP net row's physical address using a type-specific helper function, rather than using a generic helper function which made an invalid alignment assumption

2009-12-08T15:53:06Z

--Juan

[0017-Copy-an-IP-net-row-s-physical-address-using-a-type-s.patch]

From c6ea18800779d3cd1c38d29ce37a10b4fe98ab88 Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang@...> Date: Mon, 7 Dec 2009 13:37:29 -0800 Subject: [PATCH] Copy an IP net row's physical address using a type-specific helper function, rather than using a generic helper function which made an invalid alignment assumption --- dlls/inetmib1/main.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index f11bc3b..9aef4d5 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -50,14 +50,6 @@ static void setStringValue(AsnAny *value, BYTE type, DWORD len, BYTE *str) SnmpUtilAsnAnyCpy(value, &strValue); } -static DWORD copyLengthPrecededString(AsnAny *value, void *src) -{ - DWORD len = *(DWORD *)src; - - setStringValue(value, ASN_OCTETSTRING, len, (BYTE *)src + sizeof(DWORD)); - return SNMP_ERRORSTATUS_NOERROR; -} - typedef DWORD (*copyValueFunc)(AsnAny *value, void *src); struct structToAsnValue @@ -919,9 +911,18 @@ static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, static UINT mib2IpNet[] = { 1,3,6,1,2,1,4,22,1 }; static PMIB_IPNETTABLE ipNetTable; +static DWORD copyIpNetPhysAddr(AsnAny *value, void *src) +{ + PMIB_IPNETROW row = (PMIB_IPNETROW)((BYTE *)src - FIELD_OFFSET(MIB_IPNETROW, + dwPhysAddrLen)); + + setStringValue(value, ASN_OCTETSTRING, row->dwPhysAddrLen, row->bPhysAddr); + return SNMP_ERRORSTATUS_NOERROR; +} + static struct structToAsnValue mib2IpNetMap[] = { { FIELD_OFFSET(MIB_IPNETROW, dwIndex), copyInt }, - { FIELD_OFFSET(MIB_IPNETROW, dwPhysAddrLen), copyLengthPrecededString }, + { FIELD_OFFSET(MIB_IPNETROW, dwPhysAddrLen), copyIpNetPhysAddr }, { FIELD_OFFSET(MIB_IPNETROW, dwAddr), copyIpAddr }, { FIELD_OFFSET(MIB_IPNETROW, dwType), copyInt }, }; -- 1.5.2.2

inetmib1(1/2): Return SNMP_ERRORSTATUS_NOSUCHNAME for an interface's description if it has none

2009-12-08T15:52:52Z

This little patch series gets rid of an alignment assumption that may
not be valid on 64-bit.
--Juan

[0016-Return-SNMP_ERRORSTATUS_NOSUCHNAME-for-an-interface.patch]

From 2c5b27b9d55696a8ebb6e8af23ad0d834de70e92 Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang@...> Date: Mon, 7 Dec 2009 13:32:57 -0800 Subject: [PATCH] Return SNMP_ERRORSTATUS_NOSUCHNAME for an interface's description if it has none --- dlls/inetmib1/main.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 2a5f97a..f11bc3b 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -553,6 +553,22 @@ static INT setOidWithItemAndInteger(AsnObjectIdentifier *dst, return ret; } +static DWORD copyIfRowDescr(AsnAny *value, void *src) +{ + PMIB_IFROW row = (PMIB_IFROW)((BYTE *)src - + FIELD_OFFSET(MIB_IFROW, dwDescrLen)); + DWORD ret; + + if (row->dwDescrLen) + { + setStringValue(value, ASN_OCTETSTRING, row->dwDescrLen, row->bDescr); + ret = SNMP_ERRORSTATUS_NOERROR; + } + else + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + return ret; +} + static DWORD copyIfRowPhysAddr(AsnAny *value, void *src) { PMIB_IFROW row = (PMIB_IFROW)((BYTE *)src - @@ -572,7 +588,7 @@ static DWORD copyIfRowPhysAddr(AsnAny *value, void *src) static struct structToAsnValue mib2IfEntryMap[] = { { FIELD_OFFSET(MIB_IFROW, dwIndex), copyInt }, - { FIELD_OFFSET(MIB_IFROW, dwDescrLen), copyLengthPrecededString }, + { FIELD_OFFSET(MIB_IFROW, dwDescrLen), copyIfRowDescr }, { FIELD_OFFSET(MIB_IFROW, dwType), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwMtu), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwSpeed), copyInt }, -- 1.5.2.2

[PATCH] dbghelp: Add a missing NULL check (Coverity)

2009-12-08T15:01:29Z

Hi,

all other functions check the return value of process_find_by_handle,
so this function should do it too.

Ciao, Marcus
---
dlls/dbghelp/symbol.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c
index c322a62..c266ce2 100644
--- a/dlls/dbghelp/symbol.c
+++ b/dlls/dbghelp/symbol.c
@@ -1034,6 +1034,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Mask,
regex_t mod_regex, sym_regex;

pair.pcs = process_find_by_handle(hProcess);
+ if (!pair.pcs) return FALSE;
if (BaseOfDll == 0)
{
/* do local variables ? */
--
1.5.6

wininet: Correctly handle dwContentRead for gzip encoded requests.

2009-12-08T14:51:46Z

---
dlls/wininet/http.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 6123c5f..824a282 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1967,6 +1967,7 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync,
zstream->avail_out = size-read;
zres = inflate(zstream, Z_FULL_FLUSH);
read = size - zstream->avail_out;
+ req->dwContentRead += req->read_size-zstream->avail_in;
remove_data(req, req->read_size-zstream->avail_in);
if(zres == Z_STREAM_END) {
TRACE("end of data\n");
@@ -2086,9 +2087,9 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD *
}

finished_reading = !bytes_read && req->dwContentRead == req->dwContentLength;
+ req->dwContentRead += bytes_read;
}
done:
- req->dwContentRead += bytes_read;
*read = bytes_read;

TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, req->dwContentRead, req->dwContentLength );

winhttp/tests: Only free a certificate context if retrieving it succeeded

2009-12-08T13:44:40Z

Fixes a crash if a test fails, see e.g.
http://test.winehq.org/data/578881f600e20fbef51df2fdebc5ea641de6f24f/wine_ae-ub910-x64/winhttp:winhttp.html
--Juan

[0015-Only-free-a-certificate-context-if-retrieving-it-suc.patch]

From ed39146a0065ecc736c74f26a9dfd6dde443994a Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang@...> Date: Tue, 8 Dec 2009 13:43:49 -0800 Subject: [PATCH] Only free a certificate context if retrieving it succeeded --- dlls/winhttp/tests/winhttp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2810fbb..342dde2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -787,7 +787,8 @@ static void test_secure_connection(void) size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size ); ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); - CertFreeCertificateContext(cert); + if (ret) + CertFreeCertificateContext(cert); size = sizeof(bitness); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size ); -- 1.5.2.2

rsaenh(2/2): Free a verify context's keys when it's destroyed

2009-12-08T13:34:49Z

Fixes a memory leak.
--Juan

[0014-Free-a-verify-context-s-keys-when-it-s-destroyed.patch]

From 70de333a405bffd3e67eaa8944b64c7b102909fa Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang@...> Date: Tue, 8 Dec 2009 13:32:19 -0800 Subject: [PATCH] Free a verify context's keys when it's destroyed --- dlls/rsaenh/rsaenh.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2ccbf5c..5c2b8b0 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1219,6 +1219,8 @@ static void destroy_key_container(OBJECTHDR *pObjectHdr) store_key_container_permissions(pKeyContainer); release_key_container_keys(pKeyContainer); } + else + release_key_container_keys(pKeyContainer); HeapFree( GetProcessHeap(), 0, pKeyContainer ); } -- 1.5.2.2

rsaenh(1/2): Use helper function to release and install a key into a crypt provider

2009-12-08T13:34:17Z

No-op, just makes CPGenKey more similar to the import functions.
--Juan

[0013-Use-helper-function-to-release-and-install-a-key-int.patch]

From 27afa220f83e476a80c9e9856a3a868870dff143 Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang@...> Date: Tue, 8 Dec 2009 13:17:59 -0800 Subject: [PATCH] Use helper function to release and install a key into a crypt provider --- dlls/rsaenh/rsaenh.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0228696..2ccbf5c 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3065,9 +3065,9 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP if (pCryptKey) { new_key_impl(pCryptKey->aiAlgid, &pCryptKey->context, pCryptKey->dwKeyLen); setup_key(pCryptKey); - RSAENH_CPDestroyKey(hProv, pKeyContainer->hSignatureKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hSignatureKeyPair); + release_and_install_key(hProv, *phKey, + &pKeyContainer->hSignatureKeyPair, + FALSE); } break; @@ -3077,9 +3077,9 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP if (pCryptKey) { new_key_impl(pCryptKey->aiAlgid, &pCryptKey->context, pCryptKey->dwKeyLen); setup_key(pCryptKey); - RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hKeyExchangeKeyPair); + release_and_install_key(hProv, *phKey, + &pKeyContainer->hKeyExchangeKeyPair, + FALSE); } break; -- 1.5.2.2

[5/5] ole32: Add an attribute to StorageBaseImpl to track its reverted status.

2009-12-08T11:46:37Z

[5/5] ole32: Add an attribute to StorageBaseImpl to track its reverted status.

From b7c11588bb485d61a91b1ced3001a2d8fe23168a Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@...>
Date: Mon, 30 Nov 2009 17:07:37 -0600
Subject: [PATCH 5/5] ole32: Add an attribute to StorageBaseImpl to track its reverted status.

---
dlls/ole32/storage32.c | 28 ++++++++++++++++++----------
dlls/ole32/storage32.h | 5 +++++
2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index c39915e..266d677 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -425,7 +425,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream(
goto end;
}

- if (!This->ancestorStorage)
+ if (This->reverted)
{
res = STG_E_REVERTED;
goto end;
@@ -553,7 +553,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage(
goto end;
}

- if (!This->ancestorStorage)
+ if (This->reverted)
return STG_E_REVERTED;

/*
@@ -638,7 +638,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements(
if ( (This==0) || (ppenum==0))
return E_INVALIDARG;

- if (!This->ancestorStorage)
+ if (This->reverted)
return STG_E_REVERTED;

newEnum = IEnumSTATSTGImpl_Construct(
@@ -682,7 +682,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat(
goto end;
}

- if (!This->ancestorStorage)
+ if (This->reverted)
{
res = STG_E_REVERTED;
goto end;
@@ -733,7 +733,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement(
TRACE("(%p, %s, %s)\n",
iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName));

- if (!This->ancestorStorage)
+ if (This->reverted)
return STG_E_REVERTED;

currentEntryRef = findElement(This->ancestorStorage,
@@ -830,7 +830,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
if (STGM_SHARE_MODE(grfMode) != STGM_SHARE_EXCLUSIVE)
return STG_E_INVALIDFLAG;

- if (!This->ancestorStorage)
+ if (This->reverted)
return STG_E_REVERTED;

/*
@@ -959,7 +959,7 @@ static HRESULT WINAPI StorageBaseImpl_SetClass(

TRACE("(%p, %p)\n", iface, clsid);

- if (!This->ancestorStorage)
+ if (This->reverted)
return STG_E_REVERTED;

hRes = StorageBaseImpl_ReadDirEntry(This,
@@ -1028,7 +1028,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage(
return STG_E_INVALIDFLAG;
}

- if (!This->ancestorStorage)
+ if (This->reverted)
return STG_E_REVERTED;

/*
@@ -1772,7 +1772,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement(
if (pwcsName==NULL)
return STG_E_INVALIDPOINTER;

- if (!This->ancestorStorage)
+ if (This->reverted)
return STG_E_REVERTED;

if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ )
@@ -2173,7 +2173,7 @@ static HRESULT WINAPI StorageBaseImpl_SetStateBits(
{
StorageBaseImpl* const This = (StorageBaseImpl*)iface;

- if (!This->ancestorStorage)
+ if (This->reverted)
return STG_E_REVERTED;

This->stateBits = (This->stateBits & ~grfMask) | (grfStateBits & grfMask);
@@ -2465,6 +2465,8 @@ static HRESULT StorageImpl_Construct(
*/
This->base.ancestorStorage = This;

+ This->base.reverted = 0;
+
This->hFile = hFile;

if(pwcsName) {
@@ -3826,6 +3828,10 @@ static void StorageInternalImpl_Invalidate( StorageInternalImpl *This )

This->base.ancestorStorage = NULL;

+ This->base.reverted = 1;
+
+ This->parentStorage = NULL;
+
StorageBaseImpl_DeleteAll(&This->base);

list_remove(&This->ParentListEntry);
@@ -4387,6 +4393,8 @@ static StorageInternalImpl* StorageInternalImpl_Construct(
*/
newStorage->base.ancestorStorage = parentStorage->ancestorStorage;

+ newStorage->base.reverted = 0;
+
newStorage->parentStorage = parentStorage;

/*
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index ba4288d..ff526bf 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -219,6 +219,11 @@ struct StorageBaseImpl
StorageImpl* ancestorStorage;

/*
+ * TRUE if this object has been invalidated
+ */
+ int reverted;
+
+ /*
* Index of the directory entry of this storage
*/
DirRef storageDirEntry;
--
1.6.3.3

[4/5] ole32: Store the parent of internal storage objects.

2009-12-08T11:46:03Z

[4/5] ole32: Store the parent of internal storage objects.

From 416d12b8268b585319df94d1e33b27be27e3b761 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@...>
Date: Mon, 30 Nov 2009 17:02:52 -0600
Subject: [PATCH 4/5] ole32: Store the parent of internal storage objects.

---
dlls/ole32/storage32.c | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 9652077..c39915e 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -82,11 +82,13 @@ struct StorageInternalImpl
* Entry in the parent's stream tracking list
*/
struct list ParentListEntry;
+
+ StorageBaseImpl *parentStorage;
};
typedef struct StorageInternalImpl StorageInternalImpl;

/* Method definitions for the Storage32InternalImpl class. */
-static StorageInternalImpl* StorageInternalImpl_Construct(StorageImpl* ancestorStorage,
+static StorageInternalImpl* StorageInternalImpl_Construct(StorageBaseImpl* parentStorage,
DWORD openFlags, DirRef storageDirEntry);
static void StorageImpl_Destroy(StorageBaseImpl* iface);
static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer);
@@ -585,7 +587,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage(
}

newStorage = StorageInternalImpl_Construct(
- This->ancestorStorage,
+ This,
grfMode,
storageEntryRef);

@@ -3842,49 +3844,63 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface)
static HRESULT StorageInternalImpl_CreateDirEntry(StorageBaseImpl *base,
const DirEntry *newData, DirRef *index)
{
- return StorageBaseImpl_CreateDirEntry(&base->ancestorStorage->base,
+ StorageInternalImpl* This = (StorageInternalImpl*) base;
+
+ return StorageBaseImpl_CreateDirEntry(This->parentStorage,
newData, index);
}

static HRESULT StorageInternalImpl_WriteDirEntry(StorageBaseImpl *base,
DirRef index, const DirEntry *data)
{
- return StorageBaseImpl_WriteDirEntry(&base->ancestorStorage->base,
+ StorageInternalImpl* This = (StorageInternalImpl*) base;
+
+ return StorageBaseImpl_WriteDirEntry(This->parentStorage,
index, data);
}

static HRESULT StorageInternalImpl_ReadDirEntry(StorageBaseImpl *base,
DirRef index, DirEntry *data)
{
- return StorageBaseImpl_ReadDirEntry(&base->ancestorStorage->base,
+ StorageInternalImpl* This = (StorageInternalImpl*) base;
+
+ return StorageBaseImpl_ReadDirEntry(This->parentStorage,
index, data);
}

static HRESULT StorageInternalImpl_DestroyDirEntry(StorageBaseImpl *base,
DirRef index)
{
- return StorageBaseImpl_DestroyDirEntry(&base->ancestorStorage->base,
+ StorageInternalImpl* This = (StorageInternalImpl*) base;
+
+ return StorageBaseImpl_DestroyDirEntry(This->parentStorage,
index);
}

static HRESULT StorageInternalImpl_StreamReadAt(StorageBaseImpl *base,
DirRef index, ULARGE_INTEGER offset, ULONG size, void *buffer, ULONG *bytesRead)
{
- return StorageBaseImpl_StreamReadAt(&base->ancestorStorage->base,
+ StorageInternalImpl* This = (StorageInternalImpl*) base;
+
+ return StorageBaseImpl_StreamReadAt(This->parentStorage,
index, offset, size, buffer, bytesRead);
}

static HRESULT StorageInternalImpl_StreamWriteAt(StorageBaseImpl *base,
DirRef index, ULARGE_INTEGER offset, ULONG size, const void *buffer, ULONG *bytesWritten)
{
- return StorageBaseImpl_StreamWriteAt(&base->ancestorStorage->base,
+ StorageInternalImpl* This = (StorageInternalImpl*) base;
+
+ return StorageBaseImpl_StreamWriteAt(This->parentStorage,
index, offset, size, buffer, bytesWritten);
}

static HRESULT StorageInternalImpl_StreamSetSize(StorageBaseImpl *base,
DirRef index, ULARGE_INTEGER newsize)
{
- return StorageBaseImpl_StreamSetSize(&base->ancestorStorage->base,
+ StorageInternalImpl* This = (StorageInternalImpl*) base;
+
+ return StorageBaseImpl_StreamSetSize(This->parentStorage,
index, newsize);
}

@@ -4345,7 +4361,7 @@ static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl =
*/

static StorageInternalImpl* StorageInternalImpl_Construct(
- StorageImpl* ancestorStorage,
+ StorageBaseImpl* parentStorage,
DWORD openFlags,
DirRef storageDirEntry)
{
@@ -4369,7 +4385,9 @@ static StorageInternalImpl* StorageInternalImpl_Construct(
/*
* Keep the ancestor storage pointer but do not nail a reference to it.
*/
- newStorage->base.ancestorStorage = ancestorStorage;
+ newStorage->base.ancestorStorage = parentStorage->ancestorStorage;
+
+ newStorage->parentStorage = parentStorage;

/*
* Keep a reference to the directory entry of this storage
--
1.6.3.3

[3/5] ole32: Don't track the stream size in storage stream objects.

2009-12-08T11:45:44Z

[3/5] ole32: Don't track the stream size in storage stream objects.

From bc8c8c5955c908c0126457048972886bcf64a588 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@...>
Date: Mon, 30 Nov 2009 15:40:53 -0600
Subject: [PATCH 3/5] ole32: Don't track the stream size in storage stream objects.

We can't do this safely when there are multiple objects for a single stream.
---
dlls/ole32/stg_stream.c | 128 ++---------------------------------------------
dlls/ole32/storage32.c | 14 ++++--
dlls/ole32/storage32.h | 16 +-----
3 files changed, 17 insertions(+), 141 deletions(-)

diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index 00a61a2..bfecbc7 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -75,21 +75,6 @@ static void StgStreamImpl_Destroy(StgStreamImpl* This)
This->parentStorage = 0;

/*
- * Make sure we clean-up the block chain stream objects that we were using.
- */
- if (This->bigBlockChain != 0)
- {
- BlockChainStream_Destroy(This->bigBlockChain);
- This->bigBlockChain = 0;
- }
-
- if (This->smallBlockChain != 0)
- {
- SmallBlockChainStream_Destroy(This->smallBlockChain);
- This->smallBlockChain = 0;
- }
-
- /*
* Finally, free the memory used-up by the class.
*/
HeapFree(GetProcessHeap(), 0, This);
@@ -180,73 +165,6 @@ static ULONG WINAPI StgStreamImpl_Release(
}

/***
- * This method will open the block chain pointed by the directory entry
- * that describes the stream.
- * If the stream's size is null, no chain is opened.
- */
-static void StgStreamImpl_OpenBlockChain(
- StgStreamImpl* This)
-{
- DirEntry currentEntry;
- HRESULT hr;
-
- /*
- * Make sure no old object is left over.
- */
- if (This->smallBlockChain != 0)
- {
- SmallBlockChainStream_Destroy(This->smallBlockChain);
- This->smallBlockChain = 0;
- }
-
- if (This->bigBlockChain != 0)
- {
- BlockChainStream_Destroy(This->bigBlockChain);
- This->bigBlockChain = 0;
- }
-
- /*
- * Read the information from the directory entry.
- */
- hr = StorageBaseImpl_ReadDirEntry(This->parentStorage,
- This->dirEntry,
- ¤tEntry);
-
- if (SUCCEEDED(hr))
- {
- This->streamSize = currentEntry.size;
-
- /*
- * This code supports only streams that are <32 bits in size.
- */
- assert(This->streamSize.u.HighPart == 0);
-
- if(currentEntry.startingBlock == BLOCK_END_OF_CHAIN)
- {
- assert( (This->streamSize.u.HighPart == 0) && (This->streamSize.u.LowPart == 0) );
- }
- else
- {
- if ( (This->streamSize.u.HighPart == 0) &&
- (This->streamSize.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
- {
- This->smallBlockChain = SmallBlockChainStream_Construct(
- This->parentStorage->ancestorStorage,
- NULL,
- This->dirEntry);
- }
- else
- {
- This->bigBlockChain = BlockChainStream_Construct(
- This->parentStorage->ancestorStorage,
- NULL,
- This->dirEntry);
- }
- }
- }
-}
-
-/***
* This method is part of the ISequentialStream interface.
*
* It reads a block of information from the stream at the current
@@ -319,7 +237,6 @@ static HRESULT WINAPI StgStreamImpl_Write(
{
StgStreamImpl* const This=(StgStreamImpl*)iface;

- ULARGE_INTEGER newSize;
ULONG bytesWritten = 0;
HRESULT res;

@@ -365,22 +282,6 @@ static HRESULT WINAPI StgStreamImpl_Write(
TRACE("<-- S_OK, written 0\n");
return S_OK;
}
- else
- {
- newSize.u.HighPart = 0;
- newSize.u.LowPart = This->currentPosition.u.LowPart + cb;
- }
-
- /*
- * Verify if we need to grow the stream
- */
- if (newSize.u.LowPart > This->streamSize.u.LowPart)
- {
- /* grow stream */
- res = IStream_SetSize(iface, newSize);
- if (FAILED(res))
- return res;
- }

res = StorageBaseImpl_StreamWriteAt(This->parentStorage,
This->dirEntry,
@@ -415,6 +316,8 @@ static HRESULT WINAPI StgStreamImpl_Seek(
StgStreamImpl* const This=(StgStreamImpl*)iface;

ULARGE_INTEGER newPosition;
+ DirEntry currentEntry;
+ HRESULT hr;

TRACE("(%p, %d, %d, %p)\n",
iface, dlibMove.u.LowPart, dwOrigin, plibNewPosition);
@@ -453,7 +356,9 @@ static HRESULT WINAPI StgStreamImpl_Seek(
*plibNewPosition = This->currentPosition;
break;
case STREAM_SEEK_END:
- *plibNewPosition = This->streamSize;
+ hr = StorageBaseImpl_ReadDirEntry(This->parentStorage, This->dirEntry, ¤tEntry);
+ if (FAILED(hr)) return hr;
+ *plibNewPosition = currentEntry.size;
break;
default:
WARN("invalid dwOrigin %d\n", dwOrigin);
@@ -511,16 +416,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
return STG_E_ACCESSDENIED;
}

- if (This->streamSize.u.LowPart == libNewSize.u.LowPart)
- return S_OK;
-
hr = StorageBaseImpl_StreamSetSize(This->parentStorage, This->dirEntry, libNewSize);
-
- if (SUCCEEDED(hr))
- {
- This->streamSize = libNewSize;
- }
-
return hr;
}

@@ -853,20 +749,6 @@ StgStreamImpl* StgStreamImpl_Construct(
newStream->currentPosition.u.HighPart = 0;
newStream->currentPosition.u.LowPart = 0;

- /*
- * Initialize the rest of the data.
- */
- newStream->streamSize.u.HighPart = 0;
- newStream->streamSize.u.LowPart = 0;
- newStream->bigBlockChain = 0;
- newStream->smallBlockChain = 0;
-
- /*
- * Read the size from the directory entry and determine if the blocks forming
- * this stream are large or small.
- */
- StgStreamImpl_OpenBlockChain(newStream);
-
/* add us to the storage's list of active streams */
StorageBaseImpl_AddStream(parentStorage, newStream);
}
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index ec38adb..9652077 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -2339,16 +2339,22 @@ static HRESULT StorageImpl_StreamWriteAt(StorageBaseImpl *base, DirRef index,
StorageImpl *This = (StorageImpl*)base;
DirEntry data;
HRESULT hr;
+ ULARGE_INTEGER newSize;

hr = StorageImpl_ReadDirEntry(This, index, &data);
if (FAILED(hr)) return hr;

- /* FIXME: Enlarge the stream first if necessary. */
+ /* Grow the stream if necessary */
+ newSize.QuadPart = 0;
+ newSize.QuadPart = offset.QuadPart + size;

- if (data.size.QuadPart == 0)
+ if (newSize.QuadPart > data.size.QuadPart)
{
- /* This shouldn't happen for now, because the stream object will set the size. */
- assert(FALSE);
+ hr = StorageImpl_StreamSetSize(base, index, newSize);
+ if (FAILED(hr))
+ return hr;
+
+ data.size = newSize;
}

if (data.size.QuadPart < LIMIT_TO_USE_SMALL_BLOCK)
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 53cb76a..ba4288d 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -293,7 +293,8 @@ static inline HRESULT StorageBaseImpl_StreamReadAt(StorageBaseImpl *This,
return This->baseVtbl->StreamReadAt(This, index, offset, size, buffer, bytesRead);
}

-/* Write size bytes to this directory entry's stream at the given offset. */
+/* Write size bytes to this directory entry's stream at the given offset,
+ * growing the stream if necessary. */
static inline HRESULT StorageBaseImpl_StreamWriteAt(StorageBaseImpl *This,
DirRef index, ULARGE_INTEGER offset, ULONG size, const void *buffer, ULONG *bytesWritten)
{
@@ -431,22 +432,9 @@ struct StgStreamImpl
DirRef dirEntry;

/*
- * Helper variable that contains the size of the stream
- */
- ULARGE_INTEGER streamSize;
-
- /*
* This is the current position of the cursor in the stream
*/
ULARGE_INTEGER currentPosition;
-
- /*
- * The information in the stream is represented by a chain of small blocks
- * or a chain of large blocks. Depending on the case, one of the two
- * following variables points to that information.
- */
- BlockChainStream* bigBlockChain;
- SmallBlockChainStream* smallBlockChain;
};

/*
--
1.6.3.3

[2/5] ole32: Use the storage vtable to resize streams.

2009-12-08T11:45:25Z

[2/5] ole32: Use the storage vtable to resize streams.

From 98133dfd6d7e0a04463aea0a184565490a035504 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@...>
Date: Mon, 30 Nov 2009 15:05:41 -0600
Subject: [PATCH 2/5] ole32: Use the storage vtable to resize streams.

---
dlls/ole32/stg_stream.c | 89 +----------------------------------------
dlls/ole32/storage32.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++-
dlls/ole32/storage32.h | 7 +++
3 files changed, 108 insertions(+), 88 deletions(-)

diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index e02a3f5..00a61a2 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -483,7 +483,6 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
{
StgStreamImpl* const This=(StgStreamImpl*)iface;

- DirEntry currentEntry;
HRESULT hr;

TRACE("(%p, %d)\n", iface, libNewSize.u.LowPart);
@@ -512,99 +511,17 @@ static HRESULT WINAPI StgStreamImpl_SetSize(
return STG_E_ACCESSDENIED;
}

- /* In simple mode keep the stream size above the small block limit */
- if (This->parentStorage->openFlags & STGM_SIMPLE)
- libNewSize.u.LowPart = max(libNewSize.u.LowPart, LIMIT_TO_USE_SMALL_BLOCK);
-
if (This->streamSize.u.LowPart == libNewSize.u.LowPart)
return S_OK;

- /*
- * This will happen if we're creating a stream
- */
- if ((This->smallBlockChain == 0) && (This->bigBlockChain == 0))
- {
- if (libNewSize.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK)
- {
- This->smallBlockChain = SmallBlockChainStream_Construct(
- This->parentStorage->ancestorStorage,
- NULL,
- This->dirEntry);
- }
- else
- {
- This->bigBlockChain = BlockChainStream_Construct(
- This->parentStorage->ancestorStorage,
- NULL,
- This->dirEntry);
- }
- }
-
- /*
- * Read this stream's size to see if it's small blocks or big blocks
- */
- StorageBaseImpl_ReadDirEntry(This->parentStorage,
- This->dirEntry,
- ¤tEntry);
- /*
- * Determine if we have to switch from small to big blocks or vice versa
- */
- if ( (This->smallBlockChain!=0) &&
- (currentEntry.size.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK) )
- {
- if (libNewSize.u.LowPart >= LIMIT_TO_USE_SMALL_BLOCK)
- {
- /*
- * Transform the small block chain into a big block chain
- */
- This->bigBlockChain = Storage32Impl_SmallBlocksToBigBlocks(
- This->parentStorage->ancestorStorage,
- &This->smallBlockChain);
- }
- }
- else if ( (This->bigBlockChain!=0) &&
- (currentEntry.size.u.LowPart >= LIMIT_TO_USE_SMALL_BLOCK) )
- {
- if (libNewSize.u.LowPart < LIMIT_TO_USE_SMALL_BLOCK)
- {
- /*
- * Transform the big block chain into a small block chain
- */
- This->smallBlockChain = Storage32Impl_BigBlocksToSmallBlocks(
- This->parentStorage->ancestorStorage,
- &This->bigBlockChain);
- }
- }
-
- if (This->smallBlockChain!=0)
- {
- SmallBlockChainStream_SetSize(This->smallBlockChain, libNewSize);
- }
- else
- {
- BlockChainStream_SetSize(This->bigBlockChain, libNewSize);
- }
-
- /*
- * Write the new information about this stream to the directory entry
- */
- hr = StorageBaseImpl_ReadDirEntry(This->parentStorage,
- This->dirEntry,
- ¤tEntry);
-
- currentEntry.size.u.HighPart = libNewSize.u.HighPart;
- currentEntry.size.u.LowPart = libNewSize.u.LowPart;
+ hr = StorageBaseImpl_StreamSetSize(This->parentStorage, This->dirEntry, libNewSize);

if (SUCCEEDED(hr))
{
- StorageBaseImpl_WriteDirEntry(This->parentStorage,
- This->dirEntry,
- ¤tEntry);
+ This->streamSize = libNewSize;
}

- This->streamSize = libNewSize;
-
- return S_OK;
+ return hr;
}

/***
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index f34dadd..ec38adb 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -2246,6 +2246,93 @@ static HRESULT StorageImpl_StreamReadAt(StorageBaseImpl *base, DirRef index,
}
}

+static HRESULT StorageImpl_StreamSetSize(StorageBaseImpl *base, DirRef index,
+ ULARGE_INTEGER newsize)
+{
+ StorageImpl *This = (StorageImpl*)base;
+ DirEntry data;
+ HRESULT hr;
+ SmallBlockChainStream *smallblock=NULL;
+ BlockChainStream *bigblock=NULL;
+
+ hr = StorageImpl_ReadDirEntry(This, index, &data);
+ if (FAILED(hr)) return hr;
+
+ /* In simple mode keep the stream size above the small block limit */
+ if (This->base.openFlags & STGM_SIMPLE)
+ newsize.QuadPart = max(newsize.QuadPart, LIMIT_TO_USE_SMALL_BLOCK);
+
+ if (data.size.QuadPart == newsize.QuadPart)
+ return S_OK;
+
+ /* Create a block chain object of the appropriate type */
+ if (data.size.QuadPart == 0)
+ {
+ if (newsize.QuadPart < LIMIT_TO_USE_SMALL_BLOCK)
+ {
+ smallblock = SmallBlockChainStream_Construct(This, NULL, index);
+ if (!smallblock) return E_OUTOFMEMORY;
+ }
+ else
+ {
+ bigblock = BlockChainStream_Construct(This, NULL, index);
+ if (!bigblock) return E_OUTOFMEMORY;
+ }
+ }
+ else if (data.size.QuadPart < LIMIT_TO_USE_SMALL_BLOCK)
+ {
+ smallblock = SmallBlockChainStream_Construct(This, NULL, index);
+ if (!smallblock) return E_OUTOFMEMORY;
+ }
+ else
+ {
+ bigblock = BlockChainStream_Construct(This, NULL, index);
+ if (!bigblock) return E_OUTOFMEMORY;
+ }
+
+ /* Change the block chain type if necessary. */
+ if (smallblock && newsize.QuadPart >= LIMIT_TO_USE_SMALL_BLOCK)
+ {
+ bigblock = Storage32Impl_SmallBlocksToBigBlocks(This, &smallblock);
+ if (!bigblock)
+ {
+ SmallBlockChainStream_Destroy(smallblock);
+ return E_FAIL;
+ }
+ }
+ else if (bigblock && newsize.QuadPart < LIMIT_TO_USE_SMALL_BLOCK)
+ {
+ smallblock = Storage32Impl_BigBlocksToSmallBlocks(This, &bigblock);
+ if (!smallblock)
+ {
+ BlockChainStream_Destroy(bigblock);
+ return E_FAIL;
+ }
+ }
+
+ /* Set the size of the block chain. */
+ if (smallblock)
+ {
+ SmallBlockChainStream_SetSize(smallblock, newsize);
+ SmallBlockChainStream_Destroy(smallblock);
+ }
+ else
+ {
+ BlockChainStream_SetSize(bigblock, newsize);
+ BlockChainStream_Destroy(bigblock);
+ }
+
+ /* Set the size in the directory entry. */
+ hr = StorageImpl_ReadDirEntry(This, index, &data);
+ if (SUCCEEDED(hr))
+ {
+ data.size = newsize;
+
+ hr = StorageImpl_WriteDirEntry(This, index, &data);
+ }
+ return hr;
+}
+
static HRESULT StorageImpl_StreamWriteAt(StorageBaseImpl *base, DirRef index,
ULARGE_INTEGER offset, ULONG size, const void *buffer, ULONG *bytesWritten)
{
@@ -2325,7 +2412,8 @@ static const StorageBaseImplVtbl StorageImpl_BaseVtbl =
StorageImpl_BaseReadDirEntry,
StorageImpl_DestroyDirEntry,
StorageImpl_StreamReadAt,
- StorageImpl_StreamWriteAt
+ StorageImpl_StreamWriteAt,
+ StorageImpl_StreamSetSize
};

static HRESULT StorageImpl_Construct(
@@ -3787,6 +3875,13 @@ static HRESULT StorageInternalImpl_StreamWriteAt(StorageBaseImpl *base,
index, offset, size, buffer, bytesWritten);
}

+static HRESULT StorageInternalImpl_StreamSetSize(StorageBaseImpl *base,
+ DirRef index, ULARGE_INTEGER newsize)
+{
+ return StorageBaseImpl_StreamSetSize(&base->ancestorStorage->base,
+ index, newsize);
+}
+
/******************************************************************************
**
** Storage32InternalImpl_Commit
@@ -4235,7 +4330,8 @@ static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl =
StorageInternalImpl_ReadDirEntry,
StorageInternalImpl_DestroyDirEntry,
StorageInternalImpl_StreamReadAt,
- StorageInternalImpl_StreamWriteAt
+ StorageInternalImpl_StreamWriteAt,
+ StorageInternalImpl_StreamSetSize
};

/******************************************************************************
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index ef8c894..53cb76a 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -254,6 +254,7 @@ struct StorageBaseImplVtbl {
HRESULT (*DestroyDirEntry)(StorageBaseImpl*,DirRef);
HRESULT (*StreamReadAt)(StorageBaseImpl*,DirRef,ULARGE_INTEGER,ULONG,void*,ULONG*);
HRESULT (*StreamWriteAt)(StorageBaseImpl*,DirRef,ULARGE_INTEGER,ULONG,const void*,ULONG*);
+ HRESULT (*StreamSetSize)(StorageBaseImpl*,DirRef,ULARGE_INTEGER);
};

static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This)
@@ -299,6 +300,12 @@ static inline HRESULT StorageBaseImpl_StreamWriteAt(StorageBaseImpl *This,
return This->baseVtbl->StreamWriteAt(This, index, offset, size, buffer, bytesWritten);
}

+static inline HRESULT StorageBaseImpl_StreamSetSize(StorageBaseImpl *This,
+ DirRef index, ULARGE_INTEGER newsize)
+{
+ return This->baseVtbl->StreamSetSize(This, index, newsize);
+}
+
/****************************************************************************
* StorageBaseImpl stream list handlers
*/
--
1.6.3.3

[1/5] ole32: Use the storage vtable to write to streams.

2009-12-08T11:44:28Z

[1/5] ole32: Use the storage vtable to write to streams.

From 4598622ebfa23468c6d3d2afab444fbec9afec94 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@...>
Date: Mon, 30 Nov 2009 11:38:45 -0600
Subject: [PATCH 1/5] ole32: Use the storage vtable to write to streams.

---
dlls/ole32/stg_stream.c | 34 ++++----------------------
dlls/ole32/storage32.c | 59 +++++++++++++++++++++++++++++++++++++++++++++-
dlls/ole32/storage32.h | 8 ++++++
3 files changed, 71 insertions(+), 30 deletions(-)

diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index 0888180..e02a3f5 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -382,34 +382,12 @@ static HRESULT WINAPI StgStreamImpl_Write(
return res;
}

- /*
- * Depending on the type of chain that was opened when the stream was constructed,
- * we delegate the work to the method that readwrites to the block chains.
- */
- if (This->smallBlockChain!=0)
- {
- res = SmallBlockChainStream_WriteAt(This->smallBlockChain,
- This->currentPosition,
- cb,
- pv,
- pcbWritten);
-
- }
- else if (This->bigBlockChain!=0)
- {
- res = BlockChainStream_WriteAt(This->bigBlockChain,
- This->currentPosition,
- cb,
- pv,
- pcbWritten);
- }
- else
- {
- /* this should never happen because the IStream_SetSize call above will
- * make sure a big or small block chain is created */
- assert(FALSE);
- res = 0;
- }
+ res = StorageBaseImpl_StreamWriteAt(This->parentStorage,
+ This->dirEntry,
+ This->currentPosition,
+ cb,
+ pv,
+ pcbWritten);

/*
* Advance the position pointer for the number of positions written.
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 0e5861d..f34dadd 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -2246,6 +2246,52 @@ static HRESULT StorageImpl_StreamReadAt(StorageBaseImpl *base, DirRef index,
}
}

+static HRESULT StorageImpl_StreamWriteAt(StorageBaseImpl *base, DirRef index,
+ ULARGE_INTEGER offset, ULONG size, const void *buffer, ULONG *bytesWritten)
+{
+ StorageImpl *This = (StorageImpl*)base;
+ DirEntry data;
+ HRESULT hr;
+
+ hr = StorageImpl_ReadDirEntry(This, index, &data);
+ if (FAILED(hr)) return hr;
+
+ /* FIXME: Enlarge the stream first if necessary. */
+
+ if (data.size.QuadPart == 0)
+ {
+ /* This shouldn't happen for now, because the stream object will set the size. */
+ assert(FALSE);
+ }
+
+ if (data.size.QuadPart < LIMIT_TO_USE_SMALL_BLOCK)
+ {
+ SmallBlockChainStream *stream;
+
+ stream = SmallBlockChainStream_Construct(This, NULL, index);
+ if (!stream) return E_OUTOFMEMORY;
+
+ hr = SmallBlockChainStream_WriteAt(stream, offset, size, buffer, bytesWritten);
+
+ SmallBlockChainStream_Destroy(stream);
+
+ return hr;
+ }
+ else
+ {
+ BlockChainStream *stream;
+
+ stream = BlockChainStream_Construct(This, NULL, index);
+ if (!stream) return E_OUTOFMEMORY;
+
+ hr = BlockChainStream_WriteAt(stream, offset, size, buffer, bytesWritten);
+
+ BlockChainStream_Destroy(stream);
+
+ return hr;
+ }
+}
+
/*
* Virtual function table for the IStorage32Impl class.
*/
@@ -2278,7 +2324,8 @@ static const StorageBaseImplVtbl StorageImpl_BaseVtbl =
StorageImpl_BaseWriteDirEntry,
StorageImpl_BaseReadDirEntry,
StorageImpl_DestroyDirEntry,
- StorageImpl_StreamReadAt
+ StorageImpl_StreamReadAt,
+ StorageImpl_StreamWriteAt
};

static HRESULT StorageImpl_Construct(
@@ -3733,6 +3780,13 @@ static HRESULT StorageInternalImpl_StreamReadAt(StorageBaseImpl *base,
index, offset, size, buffer, bytesRead);
}

+static HRESULT StorageInternalImpl_StreamWriteAt(StorageBaseImpl *base,
+ DirRef index, ULARGE_INTEGER offset, ULONG size, const void *buffer, ULONG *bytesWritten)
+{
+ return StorageBaseImpl_StreamWriteAt(&base->ancestorStorage->base,
+ index, offset, size, buffer, bytesWritten);
+}
+
/******************************************************************************
**
** Storage32InternalImpl_Commit
@@ -4180,7 +4234,8 @@ static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl =
StorageInternalImpl_WriteDirEntry,
StorageInternalImpl_ReadDirEntry,
StorageInternalImpl_DestroyDirEntry,
- StorageInternalImpl_StreamReadAt
+ StorageInternalImpl_StreamReadAt,
+ StorageInternalImpl_StreamWriteAt
};

/******************************************************************************
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 24070d1..ef8c894 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -253,6 +253,7 @@ struct StorageBaseImplVtbl {
HRESULT (*ReadDirEntry)(StorageBaseImpl*,DirRef,DirEntry*);
HRESULT (*DestroyDirEntry)(StorageBaseImpl*,DirRef);
HRESULT (*StreamReadAt)(StorageBaseImpl*,DirRef,ULARGE_INTEGER,ULONG,void*,ULONG*);
+ HRESULT (*StreamWriteAt)(StorageBaseImpl*,DirRef,ULARGE_INTEGER,ULONG,const void*,ULONG*);
};

static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This)
@@ -291,6 +292,13 @@ static inline HRESULT StorageBaseImpl_StreamReadAt(StorageBaseImpl *This,
return This->baseVtbl->StreamReadAt(This, index, offset, size, buffer, bytesRead);
}

+/* Write size bytes to this directory entry's stream at the given offset. */
+static inline HRESULT StorageBaseImpl_StreamWriteAt(StorageBaseImpl *This,
+ DirRef index, ULARGE_INTEGER offset, ULONG size, const void *buffer, ULONG *bytesWritten)
+{
+ return This->baseVtbl->StreamWriteAt(This, index, offset, size, buffer, bytesWritten);
+}
+
/****************************************************************************
* StorageBaseImpl stream list handlers
*/
--
1.6.3.3

rsaenh/tests: Fix memory leak

2009-12-08T11:41:01Z

--Juan

[0012-Fix-memory-leak.patch]

From 3876073c5ce919f0ee758c9b2b0869cef5b5f141 Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang@...> Date: Tue, 8 Dec 2009 11:40:37 -0800 Subject: [PATCH] Fix memory leak --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 2c7ca0e..83ec872 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2355,9 +2355,9 @@ static void test_null_provider(void) CryptDestroyKey(key); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(result, "CryptGetUserKey with AT_KEYEXCHANGE failed: %08x\n", GetLastError()); + CryptDestroyKey(key); result = CryptGetUserKey(prov, AT_SIGNATURE, &key); ok(!result, "expected CryptGetUserKey to fail\n"); - CryptDestroyKey(key); CryptReleaseContext(prov, 0); CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, -- 1.5.2.2

wineserver: Use existing file permissions as base for applying ACLs, change mapping logic

2009-12-08T11:26:55Z

Changelog:
wineserver: Use existing file permissions as base for applying ACLs, change
mapping logic.

ACLs are applied over existing permissions. An ACCESS_ALLOWED_ACE by itself
will never reduce permissions.

Group permissions are handled together with user and other to avoid weird
situations.

Access vs. ownership logic is changed to not cause illogical POSIX
permissions:
- Allow owner: sets only owner bits (as before)
- Allow world: sets all permissions (as before)
- Deny user: resets permissions for all (wouldn't make sense a ---??????)
- Deny world: resets only group and other permissions, don't touch user
- Null ACL sets rwxrwxrwx not rwx???rwx

This should fix bug #20643 and several other "Access Denied" related bugs.

[wineserver_fix_file_acl.patch]

--- ./server/change.c 8 Dec 2009 17:37:35 -0000 1.73 +++ ./server/change.c 8 Dec 2009 19:07:08 -0000 @@ -373,8 +373,8 @@ static int dir_set_sd( struct object *ob if (set_info & DACL_SECURITY_INFORMATION) { /* keep the bits that we don't map to access rights in the ACL */ - mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); - mode |= sd_to_mode( sd, owner ); + mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX); + mode |= sd_to_mode( sd, owner, st.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO) ); if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) { --- ./server/file.c 8 Dec 2009 17:37:35 -0000 1.145 +++ ./server/file.c 8 Dec 2009 19:07:08 -0000 @@ -190,7 +190,7 @@ static struct object *create_file( struc const SID *owner = sd_get_owner( sd ); if (!owner) owner = token_get_user( current->process->token ); - mode = sd_to_mode( sd, owner ); + mode = sd_to_mode( sd, owner, 0 ); } else mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0444 : 0666; @@ -441,9 +441,8 @@ static struct security_descriptor *file_ return sd; } -mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ) +mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner, mode_t new_mode ) { - mode_t new_mode = 0; mode_t denied_mode = 0; int present; const ACL *dacl = sd_get_dacl( sd, &present ); @@ -468,21 +467,21 @@ mode_t sd_to_mode( const struct security { unsigned int access = generic_file_map_access( ad_ace->Mask ); if (access & FILE_READ_DATA) - denied_mode |= S_IRUSR|S_IRGRP|S_IROTH; + denied_mode |= S_IRGRP|S_IROTH; if (access & FILE_WRITE_DATA) - denied_mode |= S_IWUSR|S_IWGRP|S_IWOTH; + denied_mode |= S_IWGRP|S_IWOTH; if (access & FILE_EXECUTE) - denied_mode |= S_IXUSR|S_IXGRP|S_IXOTH; + denied_mode |= S_IXGRP|S_IXOTH; } else if (security_equal_sid( sid, owner )) { unsigned int access = generic_file_map_access( ad_ace->Mask ); if (access & FILE_READ_DATA) - denied_mode |= S_IRUSR; + denied_mode |= S_IRUSR|S_IRGRP|S_IROTH; if (access & FILE_WRITE_DATA) - denied_mode |= S_IWUSR; + denied_mode |= S_IWUSR|S_IWGRP|S_IWOTH; if (access & FILE_EXECUTE) - denied_mode |= S_IXUSR; + denied_mode |= S_IXUSR|S_IXGRP|S_IXOTH; } break; case ACCESS_ALLOWED_ACE_TYPE: @@ -514,7 +513,7 @@ mode_t sd_to_mode( const struct security } else /* no ACL means full access rights to anyone */ - new_mode = S_IRWXU | S_IRWXO; + new_mode = S_IRWXU | S_IRWXG | S_IRWXO; return new_mode & ~denied_mode; } @@ -557,8 +556,8 @@ static int file_set_sd( struct object *o if (set_info & DACL_SECURITY_INFORMATION) { /* keep the bits that we don't map to access rights in the ACL */ - mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); - mode |= sd_to_mode( sd, owner ); + mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX); + mode |= sd_to_mode( sd, owner, st.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO) ); if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) { --- ./server/file.h 2 Dec 2009 16:37:03 -0000 1.81 +++ ./server/file.h 8 Dec 2009 19:07:08 -0000 @@ -118,7 +118,7 @@ extern struct file *create_file_for_fd( extern struct file *grab_file_unless_removable( struct file *file ); extern void file_set_error(void); extern struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID *group ); -extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ); +extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner, mode_t new_mode ); /* change notification functions */

crypt32: Compare CRL's authority key identifier against the certificate's subject key identifier property, which also decodes the certificate's extension if necessary

2009-12-08T10:23:43Z

--Juan

[0011-Compare-CRL-s-authority-key-identifier-against-the-c.patch]

From 6afc6a227bae58004b6afb119877846e5d7a379a Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang@...> Date: Tue, 8 Dec 2009 10:18:27 -0800 Subject: [PATCH] Compare CRL's authority key identifier against the certificate's subject key identifier property, which also decodes the certificate's extension if necessary --- dlls/crypt32/crl.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index a24e6ad..72180c5 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -167,14 +167,21 @@ static BOOL compare_crl_issued_by(PCCRL_CONTEXT pCrlContext, DWORD dwType, } else if (info->KeyId.cbData) { - if ((ext = CertFindExtension( - szOID_SUBJECT_KEY_IDENTIFIER, - issuer->pCertInfo->cExtension, - issuer->pCertInfo->rgExtension))) + DWORD size; + + ret = CertGetCertificateContextProperty(issuer, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + if (ret && size == info->KeyId.cbData) { - if (info->KeyId.cbData == ext->Value.cbData) - ret = !memcmp(info->KeyId.pbData, - ext->Value.pbData, info->KeyId.cbData); + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + CertGetCertificateContextProperty(issuer, + CERT_KEY_IDENTIFIER_PROP_ID, buf, &size); + ret = !memcmp(buf, info->KeyId.pbData, size); + CryptMemFree(buf); + } else ret = FALSE; } -- 1.5.2.2

winhttp: Fix test error when run as non-administrator (try 2)

2009-12-08T09:49:32Z

This version uses skip() when GetLastError() == ERROR_ACCESS_DENIED,
as Paul Vriens suggested.
--Juan

[0010-Fix-test-error-when-run-as-non-administrator.patch]

From bac44aa70ab2e0fc21a4be752d9628817d3f3190 Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang@...> Date: Tue, 8 Dec 2009 09:47:08 -0800 Subject: [PATCH] Fix test error when run as non-administrator --- dlls/winhttp/tests/winhttp.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index fe9bb05..2810fbb 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1000,9 +1000,16 @@ static void test_set_default_proxy_config(void) info.lpszProxy = normalString; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); - ok(ret, "WinHttpSetDefaultProxyConfiguration failed: %d\n", GetLastError()); - - set_default_proxy_reg_value( saved_proxy_settings, len, type ); + if (ret) + { + ok(ret, "always true\n"); + set_default_proxy_reg_value( saved_proxy_settings, len, type ); + } + else if (GetLastError() == ERROR_ACCESS_DENIED) + skip("couldn't set default proxy configuration: access denied\n"); + else + ok(ret, "WinHttpSetDefaultProxyConfiguration failed: %d\n", + GetLastError()); } START_TEST (winhttp) -- 1.5.2.2

wininet(2/2): Fix an apparent typo

2009-12-08T09:42:16Z

I'm pretty sure this is what was intended: rather than logging the
same value in hex and decimal, the decimal variant is the result of
masking off flags to yield the requested datum.
--Juan

[0009-Fix-an-apparent-typo.patch]

From 3cf794eeccbeca3a4da55f8041d3efec159fecdc Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang@...> Date: Fri, 4 Dec 2009 14:39:37 -0800 Subject: [PATCH] Fix an apparent typo --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1f7dcfd..b75986f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2953,7 +2953,7 @@ BOOL WINAPI HttpQueryInfoW(HINTERNET hHttpRequest, DWORD dwInfoLevel, DWORD info = dwInfoLevel & HTTP_QUERY_HEADER_MASK; DWORD i; - TRACE("(%p, 0x%08x)--> %d\n", hHttpRequest, dwInfoLevel, dwInfoLevel); + TRACE("(%p, 0x%08x)--> %d\n", hHttpRequest, dwInfoLevel, info); TRACE(" Attribute:"); for (i = 0; i < (sizeof(query_flags) / sizeof(query_flags[0])); i++) { if (query_flags[i].val == info) { -- 1.5.2.2

wininet(1/2): Trace more parameters to HTTP_GetCustomHeaderIndex

2009-12-08T09:40:38Z

These couple of patches just improve the traces for HttpQueryInfoW.
--Juan

[0008-Trace-more-parameters-to-HTTP_GetCustomHeaderIndex.patch]

From 2656b0e034c64fa52e9831727b925a8a1d097999 Mon Sep 17 00:00:00 2001 From: Juan Lang <juan.lang@...> Date: Fri, 4 Dec 2009 14:37:46 -0800 Subject: [PATCH] Trace more parameters to HTTP_GetCustomHeaderIndex --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 6123c5f..1f7dcfd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4797,7 +4797,7 @@ static INT HTTP_GetCustomHeaderIndex(http_request_t *lpwhr, LPCWSTR lpszField, { DWORD index; - TRACE("%s\n", debugstr_w(lpszField)); + TRACE("%s, %d, %d\n", debugstr_w(lpszField), requested_index, request_only); for (index = 0; index < lpwhr->nCustHeaders; index++) { -- 1.5.2.2

[PATCH 7/7] dsound: Clean up DSPROPERTY_Description1

2009-12-08T08:43:42Z

---
dlls/dsound/propset.c | 206 ++++++-------------------------------------------
1 files changed, 25 insertions(+), 181 deletions(-)

diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index 9b3fc51..fb9f280 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -186,187 +186,6 @@ static HRESULT DSPROPERTY_WaveDeviceMappingA(
return hr;
}

-
-static HRESULT DSPROPERTY_Description1(
- LPVOID pPropData,
- ULONG cbPropData,
- PULONG pcbReturned )
-{
- HRESULT err;
- GUID dev_guid;
- PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA ppd;
- TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n",
- pPropData,cbPropData,pcbReturned);
-
- ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA) pPropData;
-
- if (!ppd) {
- WARN("invalid parameter: pPropData\n");
- return DSERR_INVALIDPARAM;
- }
-
- TRACE("DeviceId=%s\n",debugstr_guid(&ppd->DeviceId));
- if ( IsEqualGUID( &ppd->DeviceId , &GUID_NULL) ) {
- /* default device of type specified by ppd->DataFlow */
- if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE) {
- TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n");
- } else if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER) {
- TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n");
- } else {
- TRACE("DataFlow=Unknown(%d)\n", ppd->DataFlow);
- }
- FIXME("(pPropData=%p,cbPropData=%d,pcbReturned=%p) GUID_NULL not implemented!\n",
- pPropData,cbPropData,pcbReturned);
- return E_PROP_ID_UNSUPPORTED;
- }
-
- ppd->Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
- GetDeviceID(&ppd->DeviceId, &dev_guid);
-
- if ( IsEqualGUID( &ppd->DeviceId, &DSDEVID_DefaultPlayback) ||
- IsEqualGUID( &ppd->DeviceId, &DSDEVID_DefaultVoicePlayback) ) {
- ULONG wod;
- unsigned int wodn;
- TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n");
- ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
- wodn = waveOutGetNumDevs();
- for (wod = 0; wod < wodn; wod++) {
- if (IsEqualGUID( &dev_guid, &DSOUND_renderer_guids[wod] ) ) {
- DSDRIVERDESC desc;
- ppd->WaveDeviceId = wod;
- ppd->Devnode = wod;
- err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- PIDSDRIVER drv = NULL;
- lstrcpynA(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA));
- lstrcpynA(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA));
- MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) );
- MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) );
- err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- break;
- } else {
- WARN("waveOutMessage(DRV_QUERYDSOUNDDESC) failed\n");
- return E_PROP_ID_UNSUPPORTED;
- }
- }
- }
- } else if ( IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultCapture) ||
- IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultVoiceCapture) ) {
- ULONG wid;
- unsigned int widn;
- TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n");
- ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
- widn = waveInGetNumDevs();
- for (wid = 0; wid < widn; wid++) {
- if (IsEqualGUID( &dev_guid, &DSOUND_capture_guids[wid] ) ) {
- DSDRIVERDESC desc;
- ppd->WaveDeviceId = wid;
- ppd->Devnode = wid;
- err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- PIDSCDRIVER drv;
- lstrcpynA(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA));
- lstrcpynA(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA));
- MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) );
- MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) );
- err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDIFACE,(DWORD_PTR)&drv,0));
- if (err == DS_OK && drv)
- ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- break;
- } else {
- WARN("waveInMessage(DRV_QUERYDSOUNDDESC) failed\n");
- return E_PROP_ID_UNSUPPORTED;
- }
- }
- }
- } else {
- BOOL found = FALSE;
- ULONG wod;
- unsigned int wodn;
- /* given specific device so try the render devices first */
- wodn = waveOutGetNumDevs();
- for (wod = 0; wod < wodn; wod++) {
- if (IsEqualGUID( &ppd->DeviceId, &DSOUND_renderer_guids[wod] ) ) {
- DSDRIVERDESC desc;
- TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n");
- ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
- ppd->WaveDeviceId = wod;
- ppd->Devnode = wod;
- err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- PIDSDRIVER drv = NULL;
- lstrcpynA(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA));
- lstrcpynA(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA));
- MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) );
- MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) );
- err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- found = TRUE;
- break;
- } else {
- WARN("waveOutMessage(DRV_QUERYDSOUNDDESC) failed\n");
- return E_PROP_ID_UNSUPPORTED;
- }
- }
- }
-
- if (found == FALSE) {
- ULONG wid;
- unsigned int widn;
- /* given specific device so try the capture devices next */
- widn = waveInGetNumDevs();
- for (wid = 0; wid < widn; wid++) {
- if (IsEqualGUID( &ppd->DeviceId, &DSOUND_capture_guids[wid] ) ) {
- DSDRIVERDESC desc;
- TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n");
- ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
- ppd->WaveDeviceId = wid;
- ppd->Devnode = wid;
- err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- PIDSDRIVER drv = NULL;
- lstrcpynA(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA));
- lstrcpynA(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA));
- MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) );
- MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) );
- err = mmErr(waveInMessage(UlongToHandle(wid), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- found = TRUE;
- break;
- } else {
- WARN("waveInMessage(DRV_QUERYDSOUNDDESC) failed\n");
- return E_PROP_ID_UNSUPPORTED;
- }
- }
- }
-
- if (found == FALSE) {
- WARN("device not found\n");
- return E_PROP_ID_UNSUPPORTED;
- }
- }
- }
-
- if (pcbReturned) {
- *pcbReturned = cbPropData;
- TRACE("*pcbReturned=%d\n", *pcbReturned);
- }
-
- return S_OK;
-}
-
static HRESULT DSPROPERTY_DescriptionW(
LPVOID pPropData,
ULONG cbPropData,
@@ -648,6 +467,31 @@ static HRESULT DSPROPERTY_DescriptionA(
return hr;
}

+static HRESULT DSPROPERTY_Description1(
+ LPVOID pPropData,
+ ULONG cbPropData,
+ PULONG pcbReturned)
+{
+ DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data;
+ DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA *ppd = pPropData;
+ HRESULT hr;
+
+ if (pcbReturned)
+ *pcbReturned = sizeof(*ppd);
+ if (!pPropData)
+ return S_OK;
+
+ data.DeviceId = ppd->DeviceId;
+ data.DataFlow = ppd->DataFlow;
+ hr = DSPROPERTY_DescriptionW(&data, sizeof(data), NULL);
+ if (FAILED(hr))
+ return hr;
+ DSPROPERTY_descWto1(&data, ppd);
+ HeapFree(GetProcessHeap(), 0, data.Module);
+ HeapFree(GetProcessHeap(), 0, data.Interface);
+ return hr;
+}
+
static HRESULT WINAPI IKsPrivatePropertySetImpl_Get(
LPKSPROPERTYSET iface,
REFGUID guidPropSet,
--
1.6.5.3

[PATCH 6/7] dsound: Clean up DSPROPERTY_DescriptionA

2009-12-08T08:43:41Z

---
dlls/dsound/propset.c | 265 +++++--------------------------------------------
1 files changed, 25 insertions(+), 240 deletions(-)

diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index 1b6e7ce..9b3fc51 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -367,246 +367,6 @@ static HRESULT DSPROPERTY_Description1(
return S_OK;
}

-static HRESULT DSPROPERTY_DescriptionA(
- LPVOID pPropData,
- ULONG cbPropData,
- PULONG pcbReturned )
-{
- PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA ppd = pPropData;
- HRESULT err;
- GUID dev_guid;
- TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n",
- pPropData,cbPropData,pcbReturned);
-
- TRACE("DeviceId=%s\n",debugstr_guid(&ppd->DeviceId));
- if ( IsEqualGUID( &ppd->DeviceId , &GUID_NULL) ) {
- /* default device of type specified by ppd->DataFlow */
- if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE) {
- TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE\n");
- } else if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER) {
- TRACE("DataFlow=DIRECTSOUNDDEVICE_DATAFLOW_RENDER\n");
- } else {
- TRACE("DataFlow=Unknown(%d)\n", ppd->DataFlow);
- }
- FIXME("(pPropData=%p,cbPropData=%d,pcbReturned=%p) GUID_NULL not implemented!\n",
- pPropData,cbPropData,pcbReturned);
- return E_PROP_ID_UNSUPPORTED;
- }
-
- ppd->Type = DIRECTSOUNDDEVICE_TYPE_EMULATED;
- GetDeviceID(&ppd->DeviceId, &dev_guid);
-
- if ( IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultPlayback) ||
- IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultVoicePlayback) ) {
- ULONG wod;
- unsigned int wodn;
- if (IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultPlayback) )
- TRACE("DSDEVID_DefaultPlayback\n");
- else
- TRACE("DSDEVID_DefaultVoicePlayback\n");
- ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
- wodn = waveOutGetNumDevs();
- for (wod = 0; wod < wodn; wod++) {
- if (IsEqualGUID( &dev_guid, &DSOUND_renderer_guids[wod] ) ) {
- DSDRIVERDESC desc;
- ppd->WaveDeviceId = wod;
- err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- PIDSDRIVER drv = NULL;
- /* FIXME: this is a memory leak */
- CHAR * szDescription = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDesc) + 1);
- CHAR * szModule = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDrvname) + 1);
- CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,strlen("Interface") + 1);
-
- if (szDescription && szModule && szInterface) {
- strcpy(szDescription, desc.szDesc);
- strcpy(szModule, desc.szDrvname);
- strcpy(szInterface, "Interface");
-
- ppd->Description = szDescription;
- ppd->Module = szModule;
- ppd->Interface = szInterface;
- err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- break;
- } else {
- WARN("no memory\n");
- HeapFree(GetProcessHeap(), 0, szDescription);
- HeapFree(GetProcessHeap(), 0, szModule);
- HeapFree(GetProcessHeap(), 0, szInterface);
- return E_OUTOFMEMORY;
- }
- } else {
- WARN("waveOutMessage(DRV_QUERYDSOUNDDESC) failed\n");
- return E_PROP_ID_UNSUPPORTED;
- }
- }
- }
- } else if (IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultCapture) ||
- IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultVoiceCapture) ) {
- ULONG wid;
- unsigned int widn;
- if (IsEqualGUID( &ppd->DeviceId , &DSDEVID_DefaultCapture) )
- TRACE("DSDEVID_DefaultCapture\n");
- else
- TRACE("DSDEVID_DefaultVoiceCapture\n");
- ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
- widn = waveInGetNumDevs();
- for (wid = 0; wid < widn; wid++) {
- if (IsEqualGUID( &dev_guid, &DSOUND_capture_guids[wid] ) ) {
- DSDRIVERDESC desc;
- ppd->WaveDeviceId = wid;
- err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- PIDSCDRIVER drv;
- /* FIXME: this is a memory leak */
- CHAR * szDescription = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDesc) + 1);
- CHAR * szModule = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDrvname) + 1);
- CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,strlen("Interface") + 1);
-
- if (szDescription && szModule && szInterface) {
- strcpy(szDescription, desc.szDesc);
- strcpy(szModule, desc.szDrvname);
- strcpy(szInterface, "Interface");
-
- ppd->Description = szDescription;
- ppd->Module = szModule;
- ppd->Interface = szInterface;
- err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDIFACE,(DWORD_PTR)&drv,0));
- if (err == DS_OK && drv)
- ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- break;
- } else {
- WARN("no memory\n");
- HeapFree(GetProcessHeap(), 0, szDescription);
- HeapFree(GetProcessHeap(), 0, szModule);
- HeapFree(GetProcessHeap(), 0, szInterface);
- return E_OUTOFMEMORY;
- }
- } else {
- WARN("waveInMessage(DRV_QUERYDSOUNDDESC) failed\n");
- return E_PROP_ID_UNSUPPORTED;
- }
- }
- }
- } else {
- BOOL found = FALSE;
- ULONG wod;
- unsigned int wodn;
- /* given specific device so try the render devices first */
- TRACE("Checking renderer devices\n");
- wodn = waveOutGetNumDevs();
- for (wod = 0; wod < wodn; wod++) {
- if (IsEqualGUID( &ppd->DeviceId, &DSOUND_renderer_guids[wod] ) ) {
- DSDRIVERDESC desc;
- TRACE("DSOUND_renderer_guids[%d]\n", wod);
- ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER;
- ppd->WaveDeviceId = wod;
- err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- PIDSDRIVER drv = NULL;
- /* FIXME: this is a memory leak */
- CHAR * szDescription = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDesc) + 1);
- CHAR * szModule = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDrvname) + 1);
- CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,strlen("Interface") + 1);
-
- if (szDescription && szModule && szInterface) {
- strcpy(szDescription, desc.szDesc);
- strcpy(szModule, desc.szDrvname);
- strcpy(szInterface, "Interface");
-
- ppd->Description = szDescription;
- ppd->Module = szModule;
- ppd->Interface = szInterface;
- err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0));
- if (err == DS_OK && drv)
- ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- found = TRUE;
- break;
- } else {
- WARN("no memory\n");
- HeapFree(GetProcessHeap(), 0, szDescription);
- HeapFree(GetProcessHeap(), 0, szModule);
- HeapFree(GetProcessHeap(), 0, szInterface);
- return E_OUTOFMEMORY;
- }
- } else {
- WARN("waveOutMessage(DRV_QUERYDSOUNDDESC) failed\n");
- return E_PROP_ID_UNSUPPORTED;
- }
- }
- }
-
- if (found == FALSE) {
- ULONG wid;
- unsigned int widn;
- TRACE("Checking capture devices\n");
- ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE;
- widn = waveInGetNumDevs();
- for (wid = 0; wid < widn; wid++) {
- if (IsEqualGUID( &ppd->DeviceId, &DSOUND_capture_guids[wid] ) ) {
- DSDRIVERDESC desc;
- TRACE("DSOUND_capture_guids[%d]\n", wid);
- ppd->WaveDeviceId = wid;
- err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0));
- if (err == DS_OK) {
- PIDSCDRIVER drv;
- /* FIXME: this is a memory leak */
- CHAR * szDescription = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDesc) + 1);
- CHAR * szModule = HeapAlloc(GetProcessHeap(),0,strlen(desc.szDrvname) + 1);
- CHAR * szInterface = HeapAlloc(GetProcessHeap(),0,strlen("Interface") + 1);
-
- if (szDescription && szModule && szInterface) {
- strcpy(szDescription, desc.szDesc);
- strcpy(szModule, desc.szDrvname);
- strcpy(szInterface, "Interface");
-
- ppd->Description = szDescription;
- ppd->Module = szModule;
- ppd->Interface = szInterface;
- err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDIFACE,(DWORD_PTR)&drv,0));
- if (err == DS_OK && drv)
- ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
- else
- WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n");
- found = TRUE;
- break;
- } else {
- WARN("no memory\n");
- HeapFree(GetProcessHeap(), 0, szDescription);
- HeapFree(GetProcessHeap(), 0, szModule);
- HeapFree(GetProcessHeap(), 0, szInterface);
- return E_OUTOFMEMORY;
- }
- } else {
- WARN("waveInMessage(DRV_QUERYDSOUNDDESC) failed\n");
- return E_PROP_ID_UNSUPPORTED;
- }
- }
- }
- }
-
- if (found == FALSE) {
- WARN("device not found\n");
- return E_PROP_ID_UNSUPPORTED;
- }
- }
-
- if (pcbReturned) {
- *pcbReturned = cbPropData;
- TRACE("*pcbReturned=%d\n", *pcbReturned);
- }
-
- return S_OK;
-}
-
static HRESULT DSPROPERTY_DescriptionW(
LPVOID pPropData,
ULONG cbPropData,
@@ -863,6 +623,31 @@ static HRESULT DSPROPERTY_Enumerate1(
return DSPROPERTY_EnumerateW(&data, cbPropData, pcbReturned);
}

+static HRESULT DSPROPERTY_DescriptionA(
+ LPVOID pPropData,
+ ULONG cbPropData,
+ PULONG pcbReturned)
+{
+ DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA data;
+ DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA *ppd = pPropData;
+ HRESULT hr;
+
+ if (pcbReturned)
+ *pcbReturned = sizeof(*ppd);
+ if (!pPropData)
+ return S_OK;
+
+ data.DeviceId = ppd->DeviceId;
+ data.DataFlow = ppd->DataFlow;
+ hr = DSPROPERTY_DescriptionW(&data, sizeof(data), NULL);
+ if (FAILED(hr))
+ return hr;
+ DSPROPERTY_descWtoA(&data, ppd);
+ HeapFree(GetProcessHeap(), 0, data.Module);
+ HeapFree(GetProcessHeap(), 0, data.Interface);
+ return hr;
+}
+
static HRESULT WINAPI IKsPrivatePropertySetImpl_Get(
LPKSPROPERTYSET iface,
REFGUID guidPropSet,
--
1.6.5.3