wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Alexandre Julliard : winex11: Ignore WM_PAINT for layered system tray icons .
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 0eef9075f3ebe4d05e700e20950c817bf1ca423b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eef9075f3ebe4d05e700e209… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 25 11:53:57 2012 +0200 winex11: Ignore WM_PAINT for layered system tray icons. --- dlls/winex11.drv/systray.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 5f0791e..a694610 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -462,6 +462,7 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; case WM_PAINT: + if (!icon->layered) { PAINTSTRUCT ps; RECT rc; @@ -477,6 +478,7 @@ static LRESULT WINAPI tray_icon_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR EndPaint(hwnd, &ps); return 0; } + break; case WM_MOUSEMOVE: case WM_LBUTTONDOWN:

1 0

Jörg Höhle : mciseq: The code can only handle up to 128 MIDI tracks.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: c347af5c6743a20c8aeeaf6540c27300ff2484f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c347af5c6743a20c8aeeaf654… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Sep 26 09:04:39 2012 +0200 mciseq: The code can only handle up to 128 MIDI tracks. --- dlls/mciseq/mcimidi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 49435c8..4fcfb48 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -488,10 +488,10 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset) return MCIERR_INVALID_FILE; } - if (wmm->nTracks & 0x8000) { - /* this shouldn't be a problem... */ - WARN("Ouch !! Implementation limitation to 32k tracks per MIDI file is overflowed\n"); - wmm->nTracks = 0x7FFF; + if (wmm->nTracks > 0x80) { + /* wTrackNr is 7 bits only */ + FIXME("Truncating MIDI file with %u tracks\n", wmm->nTracks); + wmm->nTracks = 0x80; } if ((wmm->tracks = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_MIDITRACK) * wmm->nTracks)) == NULL) {

1 0

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

25 Oct '12

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 25 Oct '12

25 Oct '12

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

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

25 Oct '12

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

Marcus Meissner : dbghelp: Size of the floating point stack registers is 10 bytes (Coverity).
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 6d6b2160020df41b114bd74b0d3f48bf7009d734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6b2160020df41b114bd74b0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 24 23:11:29 2012 +0200 dbghelp: Size of the floating point stack registers is 10 bytes (Coverity). --- dlls/dbghelp/cpu_i386.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index d15afdd..c912a0a 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -575,14 +575,16 @@ static void* i386_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size case CV_REG_ESP: *size = sizeof(ctx->Esp); return &ctx->Esp; case CV_REG_EIP: *size = sizeof(ctx->Eip); return &ctx->Eip; - case CV_REG_ST0 + 0: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[0*sizeof(long double)]; - case CV_REG_ST0 + 1: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[1*sizeof(long double)]; - case CV_REG_ST0 + 2: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[2*sizeof(long double)]; - case CV_REG_ST0 + 3: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[3*sizeof(long double)]; - case CV_REG_ST0 + 4: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[4*sizeof(long double)]; - case CV_REG_ST0 + 5: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[5*sizeof(long double)]; - case CV_REG_ST0 + 6: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[6*sizeof(long double)]; - case CV_REG_ST0 + 7: *size = sizeof(long double); return &ctx->FloatSave.RegisterArea[7*sizeof(long double)]; + /* These are x87 floating point registers... They do not match a C type in + * the Linux ABI, so hardcode their 80-bitness. */ + case CV_REG_ST0 + 0: *size = 10; return &ctx->FloatSave.RegisterArea[0*10]; + case CV_REG_ST0 + 1: *size = 10; return &ctx->FloatSave.RegisterArea[1*10]; + case CV_REG_ST0 + 2: *size = 10; return &ctx->FloatSave.RegisterArea[2*10]; + case CV_REG_ST0 + 3: *size = 10; return &ctx->FloatSave.RegisterArea[3*10]; + case CV_REG_ST0 + 4: *size = 10; return &ctx->FloatSave.RegisterArea[4*10]; + case CV_REG_ST0 + 5: *size = 10; return &ctx->FloatSave.RegisterArea[5*10]; + case CV_REG_ST0 + 6: *size = 10; return &ctx->FloatSave.RegisterArea[6*10]; + case CV_REG_ST0 + 7: *size = 10; return &ctx->FloatSave.RegisterArea[7*10]; case CV_REG_CTRL: *size = sizeof(DWORD); return &ctx->FloatSave.ControlWord; case CV_REG_STAT: *size = sizeof(DWORD); return &ctx->FloatSave.StatusWord;

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DTEXTURE9.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 32809395630d6ee4c79c7388b14726b04f72b416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32809395630d6ee4c79c7388b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:39 2012 +0200 d3dx9: Avoid LPDIRECT3DTEXTURE9. --- dlls/d3dx9_36/texture.c | 147 +++++++++++------------------------------- include/d3dx9core.h | 12 ++-- include/d3dx9mesh.h | 19 +++--- include/d3dx9tex.h | 162 ++++++++++++----------------------------------- 4 files changed, 96 insertions(+), 244 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32809395630d6ee4c79c7…

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DCUBETEXTURE9.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 9b19d755198e70d82263e5235e13fdd57f5f30b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b19d755198e70d82263e5235… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:38 2012 +0200 d3dx9: Avoid LPDIRECT3DCUBETEXTURE9. --- dlls/d3dx9_36/texture.c | 19 ++---- include/d3dx9core.h | 2 +- include/d3dx9tex.h | 152 ++++++++++++----------------------------------- 3 files changed, 45 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b19d755198e70d82263e…

1 0

Henri Verbeet : wined3d: Make the shader backend responsible for controlling the fixed function fragment pipe .
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 17e33e9b27ced39a93e61dad20cba9195b2e18e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e33e9b27ced39a93e61dad2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:37 2012 +0200 wined3d: Make the shader backend responsible for controlling the fixed function fragment pipe. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++++++- dlls/wined3d/context.c | 11 +++-- dlls/wined3d/device.c | 85 ++++++++++++------------------------- dlls/wined3d/glsl_shader.c | 32 +++++++++++++- dlls/wined3d/shader.c | 56 +++++++++++++++++++++++- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 6 ++- 7 files changed, 157 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17e33e9b27ced39a93e61…

1 0

Henri Verbeet : wined3d: Replace the face and level parameters to device_parent_create_texture_surface () with the sub-resource index.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: wine Branch: master Commit: 2bf46c60fbb6999ce155f644077e5a2e899a006f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf46c60fbb6999ce155f6440… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 24 21:23:36 2012 +0200 wined3d: Replace the face and level parameters to device_parent_create_texture_surface() with the sub-resource index. --- dlls/d3d10core/device.c | 6 +++--- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 6 +++--- dlls/ddraw/ddraw.c | 8 ++++---- dlls/wined3d/texture.c | 8 ++++---- include/wine/wined3d.h | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index cd2d710..8dd5b95 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1440,13 +1440,13 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); return wined3d_surface_create(device->wined3d_device, width, height, format, usage, pool, WINED3D_MULTISAMPLE_NONE, 0, WINED3D_SURFACE_TYPE_OPENGL, 0, container_parent, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 58aaf3c..c73f065 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2739,7 +2739,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct d3d8_device *device = device_from_device_parent(device_parent); struct d3d8_surface *d3d_surface; @@ -2747,8 +2747,8 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); if (pool == WINED3D_POOL_DEFAULT && !(usage & WINED3DUSAGE_DYNAMIC)) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6c9ccc9..ce5bf1a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3106,7 +3106,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct d3d9_device *device = device_from_device_parent(device_parent); struct d3d9_surface *d3d_surface; @@ -3114,8 +3114,8 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); if (pool == WINED3D_POOL_DEFAULT && !(usage & D3DUSAGE_DYNAMIC)) lockable = FALSE; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 014ad27..376db17 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5197,7 +5197,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - enum wined3d_pool pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) + enum wined3d_pool pool, UINT sub_resource_idx, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); struct ddraw_surface *tex_root = container_parent; @@ -5206,11 +5206,11 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ HRESULT hr; TRACE("device_parent %p, container_parent %p, width %u, height %u, format %#x, usage %#x,\n" - "\tpool %#x, level %u, face %u, surface %p.\n", - device_parent, container_parent, width, height, format, usage, pool, level, face, surface); + "\tpool %#x, sub_resource_idx %u, surface %p.\n", + device_parent, container_parent, width, height, format, usage, pool, sub_resource_idx, surface); /* The ddraw root surface is created before the wined3d texture. */ - if (!level && face == WINED3D_CUBEMAP_FACE_POSITIVE_X) + if (!sub_resource_idx) { ddraw_surface = tex_root; goto done; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9fb6b80..d9152b1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -859,8 +859,8 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, UINT edge_lengt UINT idx = j * texture->level_count + i; struct wined3d_surface *surface; - if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, parent, - tmp_w, tmp_w, format_id, usage, pool, i /* Level */, j, &surface))) + if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, + parent, tmp_w, tmp_w, format_id, usage, pool, idx, &surface))) { FIXME("(%p) Failed to create surface, hr %#x.\n", texture, hr); wined3d_texture_cleanup(texture); @@ -1014,8 +1014,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, UINT width, UINT he struct wined3d_surface *surface; /* Use the callback to create the texture surface. */ - if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, parent, - tmp_w, tmp_h, format->id, usage, pool, i, 0, &surface))) + if (FAILED(hr = device->device_parent->ops->create_texture_surface(device->device_parent, + parent, tmp_w, tmp_h, format->id, usage, pool, i, &surface))) { FIXME("Failed to create surface %p, hr %#x\n", texture, hr); wined3d_texture_cleanup(texture); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 05af2ee..e201c2e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2004,7 +2004,7 @@ struct wined3d_device_parent_ops struct wined3d_surface **surface); HRESULT (__cdecl *create_texture_surface)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, DWORD usage, enum wined3d_pool pool, - UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface); + UINT sub_resource_idx, struct wined3d_surface **surface); HRESULT (__cdecl *create_volume)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, UINT depth, enum wined3d_format_id format_id, enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012