October 2012 - Wine-Commits

Daniel Lehman : msvcp: Sync istream<>::_ignore.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: c9a505258f146d6e95ceb8e68511f4a7f4a42bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9a505258f146d6e95ceb8e68… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 24 13:47:05 2012 -0700 msvcp: Sync istream<>::_ignore. --- dlls/msvcp100/ios.c | 30 ++++++++++++++++++++++-------- dlls/msvcp60/ios.c | 32 +++++++++++++++++++++++--------- dlls/msvcp71/ios.c | 32 +++++++++++++++++++++++--------- 3 files changed, 68 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 9583ae1..83a2c3a 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -5747,6 +5747,7 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi { basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(count), delim); @@ -5754,22 +5755,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==(unsigned char)delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -6871,6 +6878,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(count), delim); @@ -6878,22 +6886,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; } diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 48de106..82015547 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7137,7 +7137,8 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_ignore, 12) basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *this, streamsize count, int delim) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); - int ch = delim; + int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -7145,22 +7146,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -8389,6 +8396,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -8396,22 +8404,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; } diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 148f2c8..34404b5 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -7469,7 +7469,8 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_ignore, 12) basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *this, streamsize count, int delim) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); - int ch = delim; + int ch = (unsigned char)delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -7477,22 +7478,28 @@ basic_istream_char* __thiscall basic_istream_char_ignore(basic_istream_char *thi if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_char_sbumpc(strbuf); - if(ch==EOF || ch==delim) + if(ch==EOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==(unsigned char)delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_char_sentry_destroy(this); - if(ch == EOF) - basic_ios_char_setstate(base, IOSTATE_eofbit); + basic_ios_char_setstate(base, state); return this; } @@ -8724,6 +8731,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; + unsigned int state; TRACE("(%p %ld %d)\n", this, count, delim); @@ -8731,22 +8739,28 @@ basic_istream_wchar* __thiscall basic_istream_wchar_ignore(basic_istream_wchar * if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + state = IOSTATE_goodbit; while(count > 0) { ch = basic_streambuf_wchar_sbumpc(strbuf); - if(ch==WEOF || ch==delim) + if(ch==WEOF) { + state = IOSTATE_eofbit; + break; + } + + if(ch==delim) break; this->count++; if(count != INT_MAX) count--; } - } + }else + state = IOSTATE_failbit; basic_istream_wchar_sentry_destroy(this); - if(ch == WEOF) - basic_ios_wchar_setstate(base, IOSTATE_eofbit); + basic_ios_wchar_setstate(base, state); return this; }

1 0

Jörg Höhle : mciseq: Fix reading MCI_INFO_NAME and COPYRIGHT from MIDI file.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 4c4a0875dab7b125ba015a7cb84395eee4d28128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4a0875dab7b125ba015a7cb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 19 22:26:17 2012 +0200 mciseq: Fix reading MCI_INFO_NAME and COPYRIGHT from MIDI file. --- dlls/mciseq/mcimidi.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 7fbbafb..49435c8 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -347,10 +347,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) switch (LOWORD(mmt->dwEventData)) { case 0x02FF: case 0x03FF: - /* position after meta data header */ - mmioSeek(wmm->hFile, mmt->dwIndex + HIWORD(mmt->dwEventData), SEEK_SET); len = mmt->wEventLength - HIWORD(mmt->dwEventData); - if (len >= sizeof(buf)) { WARN("Buffer for text is too small (%u are needed)\n", len); len = sizeof(buf) - 1; @@ -361,20 +358,20 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) case 0x02: if (wmm->lpstrCopyright) { WARN("Two copyright notices (%s|%s)\n", debugstr_w(wmm->lpstrCopyright), buf); - } else { - len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); - wmm->lpstrCopyright = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrCopyright, len ); + HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright); } + len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); + wmm->lpstrCopyright = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrCopyright, len ); break; case 0x03: if (wmm->lpstrName) { WARN("Two names (%s|%s)\n", debugstr_w(wmm->lpstrName), buf); - } else { - len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); - wmm->lpstrName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrName, len ); - } + HeapFree(GetProcessHeap(), 0, wmm->lpstrName); + } /* last name or name from last track wins */ + len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); + wmm->lpstrName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrName, len ); break; } } @@ -1524,7 +1521,7 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp case MCI_INFO_NAME: str = wmm->lpstrName; break; default: WARN("Don't know this info command (%u)\n", dwFlags); - return MCIERR_UNRECOGNIZED_COMMAND; + return MCIERR_MISSING_PARAMETER; /* not MCIERR_FLAGS_... */ } if (!ret) { if (lpParms->dwRetSize) {

1 0

Jörg Höhle : mciseq: Fix some MCIERROR_* codes ( MCI_STATUS).
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 3c640b8df9994d7505b433049563c393f72483cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c640b8df9994d7505b433049… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Sep 16 01:07:12 2012 +0200 mciseq: Fix some MCIERROR_* codes (MCI_STATUS). --- dlls/mciseq/mcimidi.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index abea412..7fbbafb 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1331,13 +1331,14 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS case MCI_STATUS_LENGTH: if ((dwFlags & MCI_TRACK) && wmm->wFormat == 2) { if (lpParms->dwTrack >= wmm->nTracks) - return MCIERR_BAD_INTEGER; + return MCIERR_OUTOFRANGE; /* FIXME: this is wrong if there is a tempo change inside the file */ lpParms->dwReturn = MIDI_ConvertPulseToMS(wmm, wmm->tracks[lpParms->dwTrack].dwLength); } else { lpParms->dwReturn = MIDI_GetMThdLengthMS(wmm); } lpParms->dwReturn = MIDI_ConvertMSToTimeFormat(wmm, lpParms->dwReturn); + /* FIXME: ret = MCI_COLONIZED4_RETURN if SMPTE */ TRACE("MCI_STATUS_LENGTH => %lu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: @@ -1355,9 +1356,10 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %lu\n", lpParms->dwReturn); break; case MCI_STATUS_POSITION: - /* FIXME: do I need to use MCI_TRACK ? */ + /* FIXME: check MCI_TRACK == 1 if set */ lpParms->dwReturn = MIDI_ConvertMSToTimeFormat(wmm, (dwFlags & MCI_STATUS_START) ? 0 : wmm->dwPositionMS); + /* FIXME: ret = MCI_COLONIZED4_RETURN if SMPTE */ TRACE("MCI_STATUS_POSITION %s => %lu\n", (dwFlags & MCI_STATUS_START) ? "start" : "current", lpParms->dwReturn); break; @@ -1375,7 +1377,7 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS case MCI_SEQ_STATUS_DIVTYPE: TRACE("MCI_SEQ_STATUS_DIVTYPE !\n"); if (wmm->nDivision > 0x8000) { - switch (wmm->nDivision) { + switch (HIBYTE(wmm->nDivision)) { case 0xE8: lpParms->dwReturn = MCI_SEQ_DIV_SMPTE_24; break; /* -24 */ case 0xE7: lpParms->dwReturn = MCI_SEQ_DIV_SMPTE_25; break; /* -25 */ case 0xE3: lpParms->dwReturn = MCI_SEQ_DIV_SMPTE_30DROP; break; /* -29 */ /* is the MCI constant correct ? */ @@ -1390,11 +1392,13 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS break; case MCI_SEQ_STATUS_MASTER: TRACE("MCI_SEQ_STATUS_MASTER !\n"); - lpParms->dwReturn = 0; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_SEQ_NONE, MCI_SEQ_NONE_S); + ret = MCI_RESOURCE_RETURNED; break; case MCI_SEQ_STATUS_SLAVE: TRACE("MCI_SEQ_STATUS_SLAVE !\n"); - lpParms->dwReturn = 0; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_SEQ_FILE, MCI_SEQ_FILE_S); + ret = MCI_RESOURCE_RETURNED; break; case MCI_SEQ_STATUS_OFFSET: TRACE("MCI_SEQ_STATUS_OFFSET !\n"); @@ -1415,11 +1419,10 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS break; default: FIXME("Unknown command %08X !\n", lpParms->dwItem); - return MCIERR_UNRECOGNIZED_COMMAND; + return MCIERR_UNSUPPORTED_FUNCTION; } } else { - WARN("No Status-Item!\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + return MCIERR_MISSING_PARAMETER; } if ((dwFlags & MCI_NOTIFY) && HRESULT_CODE(ret)==0) MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL);

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::onblur property implementation.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 2c6cbf75d4290875d725dc461637b29240a06f70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6cbf75d4290875d725dc461… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 25 15:11:53 2012 +0200 mshtml: Added IHTMLWindow2::onblur property implementation. --- dlls/mshtml/htmlwindow.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0fad7aa..28b3b7f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -958,15 +958,19 @@ static HRESULT WINAPI HTMLWindow2_get_onfocus(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_put_onblur(IHTMLWindow2 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_BLUR, &v); } static HRESULT WINAPI HTMLWindow2_get_onblur(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_BLUR, p); } static HRESULT WINAPI HTMLWindow2_put_onload(IHTMLWindow2 *iface, VARIANT v)

1 0

André Hentschel : d3dx9_36: Fix free of address-of expression (coverity).
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 8f6b6303ecbb081e84f70d5258bc50ae7dde4549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6b6303ecbb081e84f70d525… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:00 2012 +0200 d3dx9_36: Fix free of address-of expression (coverity). --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index ded0848..3e8fc1f 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3590,7 +3590,7 @@ static HRESULT filedata_get_name(IDirectXFileData *filedata, char **name) hr = IDirectXFileObject_GetName(filedata, *name, &name_len); if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, *name); if (!name_len) (*name)[0] = 0;

1 0

André Hentschel : ieframe: Check for null before dereferencing it (coverity).
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 07fd75baddcf2818a8118db35ebc932b00a188b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07fd75baddcf2818a8118db35… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:52:55 2012 +0200 ieframe: Check for null before dereferencing it (coverity). --- dlls/ieframe/shellbrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 91a3bf6..6e84264 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -663,9 +663,9 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( if(cbPostData) { post_data = SafeArrayCreateVector(VT_UI1, 0, cbPostData); - memcpy(post_data->pvData, pPostData, cbPostData); if(!post_data) return E_OUTOFMEMORY; + memcpy(post_data->pvData, pPostData, cbPostData); }else { post_data = NULL; }

1 0

Henri Verbeet : ddraw: Move the mipmap desc fixup code to ddraw_surface_create_texture() from device_parent_create_texture_surface().
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 191db92fd59073242600c90cb58e5cf27ebda325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=191db92fd59073242600c90cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:35 2012 +0200 ddraw: Move the mipmap desc fixup code to ddraw_surface_create_texture() from device_parent_create_texture_surface(). --- dlls/ddraw/ddraw.c | 41 ----------------------------------------- dlls/ddraw/surface.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 41 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fa1beff..014ad27 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5218,47 +5218,6 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ desc.dwWidth = width; desc.dwHeight = height; - if (level) - desc.ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; - else - desc.ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; - - if (desc.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - { - desc.ddsCaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; - - switch (face) - { - case WINED3D_CUBEMAP_FACE_POSITIVE_X: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; - break; - - case WINED3D_CUBEMAP_FACE_NEGATIVE_X: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEX; - break; - - case WINED3D_CUBEMAP_FACE_POSITIVE_Y: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEY; - break; - - case WINED3D_CUBEMAP_FACE_NEGATIVE_Y: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEY; - break; - - case WINED3D_CUBEMAP_FACE_POSITIVE_Z: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEZ; - break; - - case WINED3D_CUBEMAP_FACE_NEGATIVE_Z: - desc.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEZ; - break; - - default: - ERR("Unexpected cube face.\n"); - return DDERR_INVALIDPARAMS; - } - - } /* FIXME: Validate that format, usage, pool, etc. really make sense. */ if (FAILED(hr = ddraw_create_surface(ddraw, &desc, &ddraw_surface, tex_root->version))) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 51bd876..1c548a5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5592,6 +5592,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface) struct wined3d_resource *resource; enum wined3d_format_id format; UINT layers, levels, i, j; + DDSURFACEDESC2 *mip_desc; enum wined3d_pool pool; HRESULT hr; @@ -5638,6 +5639,41 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface) if (mip == surface) continue; + mip_desc = &mip->surface_desc; + + if (j) + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; + else + mip_desc->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; + + if (mip_desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + { + mip_desc->ddsCaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; + + switch (i) + { + case WINED3D_CUBEMAP_FACE_POSITIVE_X: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; + break; + case WINED3D_CUBEMAP_FACE_NEGATIVE_X: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEX; + break; + case WINED3D_CUBEMAP_FACE_POSITIVE_Y: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEY; + break; + case WINED3D_CUBEMAP_FACE_NEGATIVE_Y: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEY; + break; + case WINED3D_CUBEMAP_FACE_POSITIVE_Z: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEZ; + break; + case WINED3D_CUBEMAP_FACE_NEGATIVE_Z: + mip_desc->ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEZ; + break; + } + + } + *attach = mip; attach = &mip->complex_array[0]; }

1 0

Jörg Höhle : mciseq: Correct MCI_SEEK return codes.
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: c3842bc03c92a37fbb237df2f0666977ff99c216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3842bc03c92a37fbb237df2f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Sep 16 00:50:15 2012 +0200 mciseq: Correct MCI_SEEK return codes. --- dlls/mciseq/mcimidi.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 3b544c3..abea412 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1541,32 +1541,32 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp */ static DWORD MIDI_mciSeek(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) { - DWORD ret = 0; + DWORD position; TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); - if (lpParms == NULL) { - ret = MCIERR_NULL_PARAMETER_BLOCK; - } else { - MIDI_mciStop(wmm, MCI_WAIT, 0); - - if (dwFlags & MCI_SEEK_TO_START) { - wmm->dwPositionMS = 0; - } else if (dwFlags & MCI_SEEK_TO_END) { - wmm->dwPositionMS = 0xFFFFFFFF; /* FIXME */ - } else if (dwFlags & MCI_TO) { - wmm->dwPositionMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); - } else { - WARN("dwFlag doesn't tell where to seek to...\n"); - return MCIERR_MISSING_PARAMETER; - } + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - TRACE("Seeking to position=%u ms\n", wmm->dwPositionMS); + position = dwFlags & (MCI_SEEK_TO_START|MCI_SEEK_TO_END|MCI_TO); + if (!position) return MCIERR_MISSING_PARAMETER; + if (position&(position-1)) return MCIERR_FLAGS_NOT_COMPATIBLE; - if (dwFlags & MCI_NOTIFY) - MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL); + MIDI_mciStop(wmm, MCI_WAIT, 0); + + if (dwFlags & MCI_TO) { /* FIXME: compare with length */ + wmm->dwPositionMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); + } else if (dwFlags & MCI_SEEK_TO_START) { + wmm->dwPositionMS = 0; + } else { + wmm->dwPositionMS = 0xFFFFFFFF; /* FIXME */ } - return ret; + + TRACE("Seeking to position=%u ms\n", wmm->dwPositionMS); + + if (dwFlags & MCI_NOTIFY) + MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL); + + return 0; } /*======================================================================*

1 0

André Hentschel : gdi32: Fix free of address-of expression (coverity).
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: f5df798611e37a5f2d885f20b852b74d86b41026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5df798611e37a5f2d885f20b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:53:03 2012 +0200 gdi32: Fix free of address-of expression (coverity). --- dlls/gdi32/freetype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 20186fa..b22fb52 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1024,8 +1024,8 @@ static BOOL add_font_subst(struct list *subst_list, FontSubst *subst, INT flags) if(from_exist && (flags & ADD_FONT_SUBST_FORCE)) { list_remove(&from_exist->entry); - HeapFree(GetProcessHeap(), 0, &from_exist->from.name); - HeapFree(GetProcessHeap(), 0, &from_exist->to.name); + HeapFree(GetProcessHeap(), 0, from_exist->from.name); + HeapFree(GetProcessHeap(), 0, from_exist->to.name); HeapFree(GetProcessHeap(), 0, from_exist); from_exist = NULL; }

1 0

André Hentschel : gameux: Avoid double free (coverity) .
by Alexandre Julliard Oct. 25, 2012

Oct. 25, 2012

Module: wine Branch: master Commit: 97dbccf5f254648fd96e011adeba0136af340658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dbccf5f254648fd96e011ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 20:52:57 2012 +0200 gameux: Avoid double free (coverity). --- dlls/gameux/gameexplorer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 1f51f12..8f30601 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -783,13 +783,15 @@ HRESULT GAMEUX_FindGameInstanceId( sConfigGDFBinaryPath, &lpValue); if(SUCCEEDED(hr)) + { if(lstrcmpW(lpValue, sGDFBinaryPath)==0) { /* key found, let's copy instance id and exit */ hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); found = TRUE; } - HeapFree(GetProcessHeap(), 0, lpValue); + HeapFree(GetProcessHeap(), 0, lpValue); + } } }

1 0