January 2011 - Wine-Commits

Eric Pouech : winedump: Added definition and dumping of thread local variables.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 5b4e192aca75d338181e6f262a0f39e1731e142a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4e192aca75d338181e6f262… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:37:58 2011 +0100 winedump: Added definition and dumping of thread local variables. --- include/wine/mscvpdb.h | 32 ++++++++++++++++++++++++++++++++ tools/winedump/msc.c | 23 +++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index e72bee5..4755c5a 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1554,6 +1554,36 @@ union codeview_symbol short int id; unsigned int offset; unsigned short segment; + unsigned short symtype; + struct p_string p_name; + } thread_v1; + + struct + { + short int len; + short int id; + unsigned int symtype; + unsigned int offset; + unsigned short segment; + struct p_string p_name; + } thread_v2; + + struct + { + short int len; + short int id; + unsigned int symtype; + unsigned int offset; + unsigned short segment; + char name[1]; + } thread_v3; + + struct + { + short int len; + short int id; + unsigned int offset; + unsigned short segment; } ssearch_v1; struct @@ -1646,6 +1676,8 @@ union codeview_symbol #define S_LPROC_V3 0x110F #define S_GPROC_V3 0x1110 #define S_REGREL_V3 0x1111 +#define S_LTHREAD_V3 0x1112 +#define S_GTHREAD_V3 0x1113 #define S_MSTOOL_V3 0x1116 /* compiler command line options and build information */ #define S_PUB_FUNC1_V3 0x1125 /* didn't get the difference between the two */ #define S_PUB_FUNC2_V3 0x1127 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5b276fb..950eb59 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1352,6 +1352,29 @@ int codeview_dump_symbols(const void* root, unsigned long size) *(const unsigned*)((const char*)sym + 4), (const char*)sym + 8); break; + case S_LTHREAD_V1: + case S_GTHREAD_V1: + printf("\tS-Thread %s Var V1 '%s' seg=%04x offset=%08x type=%x\n", + sym->generic.id == S_LTHREAD_V1 ? "global" : "local", + p_string(&sym->thread_v1.p_name), + sym->thread_v1.segment, sym->thread_v1.offset, sym->thread_v1.symtype); + break; + + case S_LTHREAD_V2: + case S_GTHREAD_V2: + printf("\tS-Thread %s Var V2 '%s' seg=%04x offset=%08x type=%x\n", + sym->generic.id == S_LTHREAD_V2 ? "global" : "local", + p_string(&sym->thread_v2.p_name), + sym->thread_v2.segment, sym->thread_v2.offset, sym->thread_v2.symtype); + break; + + case S_LTHREAD_V3: + case S_GTHREAD_V3: + printf("\tS-Thread %s Var V3 '%s' seg=%04x offset=%08x type=%x\n", + sym->generic.id == S_LTHREAD_V3 ? "global" : "local", sym->thread_v3.name, + sym->thread_v3.segment, sym->thread_v3.offset, sym->thread_v3.symtype); + break; + default: printf(">>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Alexander Scott-Johns : winex11.drv: Remove broken HeapFree call.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: e81e49787c5f4313f4f34f8986e639cf5d1173e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81e49787c5f4313f4f34f898… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jan 28 20:35:33 2011 +0000 winex11.drv: Remove broken HeapFree call. --- dlls/winex11.drv/clipboard.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index c3f1b55..75f94e1 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1546,7 +1546,6 @@ static HANDLE X11DRV_CLIPBOARD_ExportXAString(LPWINE_CLIPDATA lpData, LPDWORD lp *lpBytes = j; /* Number of bytes in string */ done: - HeapFree(GetProcessHeap(), 0, text); GlobalUnlock(lpData->hData); return lpstr;

1 0

Alexander Scott-Johns : user32: Partially fix clipboard viewer infinite recursion bug.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 6c6b15f2d4c929f2e74837d7d424d130bdc400a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6b15f2d4c929f2e74837d7d… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Tue Jan 25 22:38:49 2011 +0000 user32: Partially fix clipboard viewer infinite recursion bug. --- dlls/user32/clipboard.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 99733c3..7b84686 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -291,7 +291,7 @@ BOOL WINAPI CloseClipboard(void) { BOOL bRet = FALSE; - TRACE("(%d)\n", bCBHasChanged); + TRACE("() Changed=%d\n", bCBHasChanged); if (CLIPBOARD_CloseClipboard()) { @@ -301,10 +301,10 @@ BOOL WINAPI CloseClipboard(void) USER_Driver->pEndClipboardUpdate(); + bCBHasChanged = FALSE; + if (hWndViewer) SendMessageW(hWndViewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); - - bCBHasChanged = FALSE; } bRet = TRUE;

1 0

Alexander Scott-Johns : ole32: Fix error handling in get_data_from_metafilepict and get_data_from_bitmap.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: e39fc20638d384a2c9b2ae5469565709c0d2637e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39fc20638d384a2c9b2ae546… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jan 28 19:49:50 2011 +0000 ole32: Fix error handling in get_data_from_metafilepict and get_data_from_bitmap. --- dlls/ole32/clipboard.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b59b554..b98404f 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -876,9 +876,8 @@ static HRESULT get_data_from_metafilepict(IDataObject *data, FORMATETC *fmt, HGL if(FAILED(hr)) return hr; hr = dup_metafilepict(med.u.hMetaFilePict, &copy); - if(FAILED(hr)) return hr; - *mem = copy; + if(SUCCEEDED(hr)) *mem = copy; ReleaseStgMedium(&med); @@ -906,10 +905,8 @@ static HRESULT get_data_from_bitmap(IDataObject *data, FORMATETC *fmt, HBITMAP * if(FAILED(hr)) return hr; hr = dup_bitmap(med.u.hBitmap, &copy); - if(FAILED(hr)) return hr; - if(hbm) *hbm = copy; - else hr = E_FAIL; + if(SUCCEEDED(hr)) *hbm = copy; ReleaseStgMedium(&med);

1 0

Charles Davis : winecoreaudio: Fix deprecation warnings in audio.c.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 94d1e8ec7faaf97a4863ff3d21cb385ed2aea548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d1e8ec7faaf97a4863ff3d2… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sat Jan 29 16:42:25 2011 -0700 winecoreaudio: Fix deprecation warnings in audio.c. --- dlls/winecoreaudio.drv/audio.c | 52 ++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 15 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index cf876ff..ded830d 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -486,27 +486,44 @@ BOOL CoreAudio_GetDevCaps (void) OSStatus status; UInt32 propertySize; AudioDeviceID devId = CoreAudio_DefaultDevice.outputDeviceID; + AudioObjectPropertyAddress propertyAddress; - char name[MAXPNAMELEN]; + CFStringRef name; + CFRange range; - propertySize = MAXPNAMELEN; - status = AudioDeviceGetProperty(devId, 0 , FALSE, kAudioDevicePropertyDeviceName, &propertySize, name); + propertySize = sizeof(name); + propertyAddress.mSelector = kAudioObjectPropertyName; + propertyAddress.mScope = kAudioDevicePropertyScopeOutput; + propertyAddress.mElement = kAudioObjectPropertyElementMaster; + status = AudioObjectGetPropertyData(devId, &propertyAddress, 0, NULL, &propertySize, &name); if (status) { - ERR("AudioHardwareGetProperty for kAudioDevicePropertyDeviceName return %s\n", wine_dbgstr_fourcc(status)); + ERR("AudioObjectGetPropertyData for kAudioObjectPropertyName return %s\n", wine_dbgstr_fourcc(status)); return FALSE; } - memcpy(CoreAudio_DefaultDevice.ds_desc.szDesc, name, sizeof(name)); + CFStringGetCString(name, CoreAudio_DefaultDevice.ds_desc.szDesc, + sizeof(CoreAudio_DefaultDevice.ds_desc.szDesc), + kCFStringEncodingUTF8); strcpy(CoreAudio_DefaultDevice.ds_desc.szDrvname, "winecoreaudio.drv"); - MultiByteToWideChar(CP_UNIXCP, 0, name, sizeof(name), - CoreAudio_DefaultDevice.out_caps.szPname, - sizeof(CoreAudio_DefaultDevice.out_caps.szPname) / sizeof(WCHAR)); - memcpy(CoreAudio_DefaultDevice.dev_name, name, 32); + range = CFRangeMake(0, min(sizeof(CoreAudio_DefaultDevice.out_caps.szPname) / sizeof(WCHAR) - 1, CFStringGetLength(name))); + CFStringGetCharacters(name, range, CoreAudio_DefaultDevice.out_caps.szPname); + CoreAudio_DefaultDevice.out_caps.szPname[range.length] = 0; + CFStringGetCString(name, CoreAudio_DefaultDevice.dev_name, 32, kCFStringEncodingUTF8); + CFRelease(name); propertySize = sizeof(CoreAudio_DefaultDevice.streamDescription); - status = AudioDeviceGetProperty(devId, 0, FALSE , kAudioDevicePropertyStreamFormat, &propertySize, &CoreAudio_DefaultDevice.streamDescription); + /* FIXME: kAudioDevicePropertyStreamFormat is deprecated. We're + * "supposed" to get an AudioStream object from the AudioDevice, + * then query it for the format with kAudioStreamPropertyVirtualFormat. + * Apple says that this is for our own good, because this property + * "has been shown to lead to programming mistakes by clients when + * working with devices with multiple streams." Only one problem: + * which stream? For now, just query the device. + */ + propertyAddress.mSelector = kAudioDevicePropertyStreamFormat; + status = AudioObjectGetPropertyData(devId, &propertyAddress, 0, NULL, &propertySize, &CoreAudio_DefaultDevice.streamDescription); if (status != noErr) { - ERR("AudioHardwareGetProperty for kAudioDevicePropertyStreamFormat return %s\n", wine_dbgstr_fourcc(status)); + ERR("AudioObjectGetPropertyData for kAudioDevicePropertyStreamFormat return %s\n", wine_dbgstr_fourcc(status)); return FALSE; } @@ -549,6 +566,7 @@ LONG CoreAudio_WaveInit(void) { OSStatus status; UInt32 propertySize; + AudioObjectPropertyAddress propertyAddress; int i; CFStringRef messageThreadPortName; CFMessagePortRef port_ReceiveInMessageThread; @@ -557,19 +575,23 @@ LONG CoreAudio_WaveInit(void) TRACE("()\n"); /* number of sound cards */ - AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices, &propertySize, NULL); + propertyAddress.mSelector = kAudioHardwarePropertyDevices; + propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; + propertyAddress.mElement = kAudioObjectPropertyElementMaster; + AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propertySize); propertySize /= sizeof(AudioDeviceID); TRACE("sound cards : %lu\n", propertySize); /* Get the output device */ propertySize = sizeof(CoreAudio_DefaultDevice.outputDeviceID); - status = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &propertySize, &CoreAudio_DefaultDevice.outputDeviceID); + propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice; + status = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propertySize, &CoreAudio_DefaultDevice.outputDeviceID); if (status) { - ERR("AudioHardwareGetProperty return %s for kAudioHardwarePropertyDefaultOutputDevice\n", wine_dbgstr_fourcc(status)); + ERR("AudioObjectGetPropertyData return %s for kAudioHardwarePropertyDefaultOutputDevice\n", wine_dbgstr_fourcc(status)); return DRV_FAILURE; } if (CoreAudio_DefaultDevice.outputDeviceID == kAudioDeviceUnknown) { - ERR("AudioHardwareGetProperty: CoreAudio_DefaultDevice.outputDeviceID == kAudioDeviceUnknown\n"); + ERR("AudioObjectGetPropertyData: CoreAudio_DefaultDevice.outputDeviceID == kAudioDeviceUnknown\n"); return DRV_FAILURE; }

1 0

Charles Davis : winecoreaudio: Fix deprecation warnings in mixer.c.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 8c6353ea7ed5f740cea72c94fb8edfb964acbf18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6353ea7ed5f740cea72c94f… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sat Jan 29 16:44:24 2011 -0700 winecoreaudio: Fix deprecation warnings in mixer.c. --- dlls/winecoreaudio.drv/mixer.c | 97 +++++++++++++++++++++++++++------------- 1 files changed, 66 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c6353ea7ed5f740cea72…

1 0

Charles Davis : winecoreaudio: Fix deprecation warnings in audiounit.c.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: b149d7bc7bf28dc13919a2d6d2c4b79e519e7a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b149d7bc7bf28dc13919a2d6d… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sat Jan 29 16:45:54 2011 -0700 winecoreaudio: Fix deprecation warnings in audiounit.c. --- configure | 14 ++++++++++++ configure.ac | 5 ++++ dlls/winecoreaudio.drv/audiounit.c | 40 +++++++++++++++++++++++++++-------- include/config.h.in | 3 ++ 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 89bfefa..c178d92 100755 --- a/configure +++ b/configure @@ -6535,6 +6535,20 @@ fi COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" fi + ac_save_LIBS="$LIBS" + LIBS="$LIBS $COREAUDIO" + for ac_func in AUGraphAddNode +do : + ac_fn_c_check_func "$LINENO" "AUGraphAddNode" "ac_cv_func_AUGraphAddNode" +if test "x$ac_cv_func_AUGraphAddNode" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_AUGRAPHADDNODE 1 +_ACEOF + +fi +done + + LIBS="$ac_save_LIBS" fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/configure.ac b/configure.ac index c0a9d7f..b4be299 100644 --- a/configure.ac +++ b/configure.ac @@ -719,6 +719,11 @@ case $host_os in dnl CoreServices needed by AudioUnit AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") fi + dnl Check for the AUGraphAddNode function + ac_save_LIBS="$LIBS" + LIBS="$LIBS $COREAUDIO" + AC_CHECK_FUNCS(AUGraphAddNode) + LIBS="$ac_save_LIBS" fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 5191669..bd0ad17 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -59,6 +59,18 @@ static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) } #endif +#ifndef HAVE_AUGRAPHADDNODE +static inline OSStatus AUGraphAddNode(AUGraph graph, const AudioComponentDescription *desc, AUNode *node) +{ + return AUGraphNewNode(graph, desc, 0, NULL, node); +} + +static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponentDescription *desc, AudioUnit *au) +{ + return AUGraphGetNodeInfo(graph, node, desc, 0, NULL, au); +} +#endif + WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); @@ -194,11 +206,15 @@ int AudioUnit_GetInputDeviceSampleRate(void) { AudioDeviceID defaultInputDevice; UInt32 param; + AudioObjectPropertyAddress propertyAddress; Float64 sampleRate; OSStatus err; param = sizeof(defaultInputDevice); - err = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice, &param, &defaultInputDevice); + propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice; + propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; + propertyAddress.mElement = kAudioObjectPropertyElementMaster; + err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &param, &defaultInputDevice); if (err != noErr || defaultInputDevice == kAudioDeviceUnknown) { ERR("Couldn't get the default audio input device ID: %08lx\n", err); @@ -206,7 +222,9 @@ int AudioUnit_GetInputDeviceSampleRate(void) } param = sizeof(sampleRate); - err = AudioDeviceGetProperty(defaultInputDevice, 0, 1, kAudioDevicePropertyNominalSampleRate, &param, &sampleRate); + propertyAddress.mSelector = kAudioDevicePropertyNominalSampleRate; + propertyAddress.mScope = kAudioDevicePropertyScopeInput; + err = AudioObjectGetPropertyData(defaultInputDevice, &propertyAddress, 0, NULL, &param, &sampleRate); if (err != noErr) { ERR("Couldn't get the device sample rate: %08lx\n", err); @@ -226,6 +244,7 @@ int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, AudioComponent component; AudioUnit au; UInt32 param; + AudioObjectPropertyAddress propertyAddress; AURenderCallbackStruct callback; AudioDeviceID defaultInputDevice; AudioStreamBasicDescription desiredFormat; @@ -291,7 +310,10 @@ int AudioUnit_CreateInputUnit(void* wwi, AudioUnit* out_au, /* Find the default input device */ param = sizeof(defaultInputDevice); - err = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice, &param, &defaultInputDevice); + propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice; + propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; + propertyAddress.mElement = kAudioObjectPropertyElementMaster; + err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &param, &defaultInputDevice); if (err != noErr || defaultInputDevice == kAudioDeviceUnknown) { ERR("Couldn't get the default audio device ID: %08lx\n", err); @@ -396,10 +418,10 @@ int SynthUnit_CreateDefaultSynthUnit(AUGraph *graph, AudioUnit *synth) desc.componentType = kAudioUnitType_MusicDevice; desc.componentSubType = kAudioUnitSubType_DLSSynth; - err = AUGraphNewNode(*graph, &desc, 0, NULL, &synthNode); + err = AUGraphAddNode(*graph, &desc, &synthNode); if (err != noErr) { - ERR_(midi)("AUGraphNewNode cannot create synthNode : %s\n", wine_dbgstr_fourcc(err)); + ERR_(midi)("AUGraphAddNode cannot create synthNode : %s\n", wine_dbgstr_fourcc(err)); return 0; } @@ -407,10 +429,10 @@ int SynthUnit_CreateDefaultSynthUnit(AUGraph *graph, AudioUnit *synth) desc.componentType = kAudioUnitType_Output; desc.componentSubType = kAudioUnitSubType_DefaultOutput; - err = AUGraphNewNode(*graph, &desc, 0, NULL, &outNode); + err = AUGraphAddNode(*graph, &desc, &outNode); if (err != noErr) { - ERR_(midi)("AUGraphNewNode cannot create outNode %s\n", wine_dbgstr_fourcc(err)); + ERR_(midi)("AUGraphAddNode cannot create outNode %s\n", wine_dbgstr_fourcc(err)); return 0; } @@ -430,10 +452,10 @@ int SynthUnit_CreateDefaultSynthUnit(AUGraph *graph, AudioUnit *synth) } /* Get the synth unit */ - err = AUGraphGetNodeInfo(*graph, synthNode, 0, 0, 0, synth); + err = AUGraphNodeInfo(*graph, synthNode, 0, synth); if (err != noErr) { - ERR_(midi)("AUGraphGetNodeInfo return %s\n", wine_dbgstr_fourcc(err)); + ERR_(midi)("AUGraphNodeInfo return %s\n", wine_dbgstr_fourcc(err)); return 0; } diff --git a/include/config.h.in b/include/config.h.in index 5cae81b..0b16b35 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -52,6 +52,9 @@ /* Define to 1 if you have the <audio/soundlib.h> header file. */ #undef HAVE_AUDIO_SOUNDLIB_H +/* Define to 1 if you have the `AUGraphAddNode' function. */ +#undef HAVE_AUGRAPHADDNODE + /* Define to 1 if you have the <capi20.h> header file. */ #undef HAVE_CAPI20_H

1 0

Hans Leidekker : mountmgr: Add a stub implementation of ioctl 0x560000.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: d49134686190c31d5054b6778ffe7af6d3b51bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49134686190c31d5054b6778… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 31 11:31:46 2011 +0100 mountmgr: Add a stub implementation of ioctl 0x560000. --- dlls/mountmgr.sys/device.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 6c182e8..e23d741 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -896,6 +896,16 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_CDROM_READ_TOC: irp->IoStatus.u.Status = STATUS_INVALID_DEVICE_REQUEST; break; + case 0x560000: + { + DWORD len = min( 32, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + + FIXME( "returning zero-filled buffer for ioctl 0x560000\n" ); + memset( irp->MdlAddress->StartVa, 0, len ); + irp->IoStatus.Information = len; + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + } default: FIXME( "unsupported ioctl %x\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED;

1 0

Eric Pouech : kernel32: Store key len in dbkey_pair structure for efficiency reasons.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 00767952e7dbebea06c4e4e083db2ee4812d6de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00767952e7dbebea06c4e4e08… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 20:02:15 2011 +0100 kernel32: Store key len in dbkey_pair structure for efficiency reasons. --- dlls/kernel32/term.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index f3dd77b..dd3b788 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -223,6 +223,7 @@ struct dbkey_descr struct dbkey_pair { const char* string; + unsigned string_len; struct dbkey_descr descr; }; @@ -300,8 +301,9 @@ static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) TERM_dbkey = new; TERM_dbkey_size *= 2; } - TERM_dbkey[TERM_dbkey_index].string = string; - TERM_dbkey[TERM_dbkey_index].descr = *descr; + TERM_dbkey[TERM_dbkey_index].string = string; + TERM_dbkey[TERM_dbkey_index].string_len = strlen(string); + TERM_dbkey[TERM_dbkey_index].descr = *descr; TERM_dbkey_index++; return TRUE; } @@ -352,7 +354,7 @@ int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir) { if (!memcmp(TERM_dbkey[i].string, in, len)) { - if (len < strlen(TERM_dbkey[i].string)) return 0; + if (len < TERM_dbkey[i].string_len) return 0; if (found) return 0; found = &TERM_dbkey[i].descr; }

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DCubeTexture8 iface.
by Alexandre Julliard Jan. 31, 2011

Jan. 31, 2011

Module: wine Branch: master Commit: 8a13f059eaa454685325047610921c6754008d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a13f059eaa45468532504761… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 31 01:46:17 2011 +0100 d3d8: COM cleanup for the IDirect3DCubeTexture8 iface. --- dlls/d3d8/cubetexture.c | 104 +++++++++++++++++++++++++++++----------------- dlls/d3d8/d3d8_private.h | 9 ++-- dlls/d3d8/device.c | 2 +- 3 files changed, 71 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a13f059eaa4546853250…

1 0