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

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_WritePixels.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 20521a5bb70cfdfb25d8daf48f2e7d4d0079f4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=20521a5bb70cfdfb25d8daf48… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 16:37:56 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_WritePixels. --- dlls/windowscodecs/jpegformat.c | 109 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 2ae1fc7..ac11654 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -69,8 +69,11 @@ MAKE_FUNCPTR(jpeg_destroy_decompress); MAKE_FUNCPTR(jpeg_read_header); MAKE_FUNCPTR(jpeg_read_scanlines); MAKE_FUNCPTR(jpeg_resync_to_restart); +MAKE_FUNCPTR(jpeg_set_defaults); +MAKE_FUNCPTR(jpeg_start_compress); MAKE_FUNCPTR(jpeg_start_decompress); MAKE_FUNCPTR(jpeg_std_error); +MAKE_FUNCPTR(jpeg_write_scanlines); #undef MAKE_FUNCPTR static void *load_libjpeg(void) @@ -90,8 +93,11 @@ static void *load_libjpeg(void) LOAD_FUNCPTR(jpeg_read_header); LOAD_FUNCPTR(jpeg_read_scanlines); LOAD_FUNCPTR(jpeg_resync_to_restart); + LOAD_FUNCPTR(jpeg_set_defaults); + LOAD_FUNCPTR(jpeg_start_compress); LOAD_FUNCPTR(jpeg_start_decompress); LOAD_FUNCPTR(jpeg_std_error); + LOAD_FUNCPTR(jpeg_write_scanlines); #undef LOAD_FUNCPTR } return libjpeg_handle; @@ -727,6 +733,7 @@ typedef struct JpegEncoder { int frame_count; int frame_initialized; int started_compress; + int lines_written; UINT width, height; double xres, yres; const jpeg_compress_format *format; @@ -949,8 +956,105 @@ static HRESULT WINAPI JpegEncoder_Frame_SetThumbnail(IWICBitmapFrameEncode *ifac static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { - FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + jmp_buf jmpbuf; + BYTE *swapped_data = NULL, *current_row; + int line, row_size; + TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || !This->width || !This->height || !This->format) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + if (lineCount == 0 || lineCount + This->lines_written > This->height) + { + LeaveCriticalSection(&This->lock); + return E_INVALIDARG; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, swapped_data); + return E_FAIL; + } + This->cinfo.client_data = &jmpbuf; + + if (!This->started_compress) + { + This->cinfo.image_width = This->width; + This->cinfo.image_height = This->height; + This->cinfo.input_components = This->format->num_components; + This->cinfo.in_color_space = This->format->color_space; + + pjpeg_set_defaults(&This->cinfo); + + if (This->xres != 0.0 && This->yres != 0.0) + { + This->cinfo.density_unit = 1; /* dots per inch */ + This->cinfo.X_density = This->xres; + This->cinfo.Y_density = This->yres; + } + + pjpeg_start_compress(&This->cinfo, TRUE); + + This->started_compress = 1; + } + + row_size = This->format->bpp / 8 * This->width; + + if (This->format->swap_rgb) + { + swapped_data = HeapAlloc(GetProcessHeap(), 0, row_size); + if (!swapped_data) + { + LeaveCriticalSection(&This->lock); + return E_OUTOFMEMORY; + } + } + + for (line=0; line < lineCount; line++) + { + if (This->format->swap_rgb) + { + int x; + + memcpy(swapped_data, pbPixels + (cbStride * line), row_size); + + for (x=0; x < This->width; x++) + { + BYTE b; + + b = swapped_data[x*3]; + swapped_data[x*3] = swapped_data[x*3+2]; + swapped_data[x*3+2] = b; + } + + current_row = swapped_data; + } + else + current_row = pbPixels + (cbStride * line); + + if (!pjpeg_write_scanlines(&This->cinfo, &current_row, 1)) + { + ERR("failed writing scanlines\n"); + LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, swapped_data); + return E_FAIL; + } + + This->lines_written++; + } + + LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, swapped_data); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface, @@ -1228,6 +1332,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_count = 0; This->frame_initialized = 0; This->started_compress = 0; + This->lines_written = 0; This->width = This->height = 0; This->xres = This->yres = 0.0; This->format = NULL;

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_Commit.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: df3da729fe14f397f5c75448e5b40a03520bb32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df3da729fe14f397f5c75448e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 16:45:25 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_Commit. --- dlls/windowscodecs/jpegformat.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index ac11654..cd453cf 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -66,6 +66,7 @@ MAKE_FUNCPTR(jpeg_CreateCompress); MAKE_FUNCPTR(jpeg_CreateDecompress); MAKE_FUNCPTR(jpeg_destroy_compress); MAKE_FUNCPTR(jpeg_destroy_decompress); +MAKE_FUNCPTR(jpeg_finish_compress); MAKE_FUNCPTR(jpeg_read_header); MAKE_FUNCPTR(jpeg_read_scanlines); MAKE_FUNCPTR(jpeg_resync_to_restart); @@ -90,6 +91,7 @@ static void *load_libjpeg(void) LOAD_FUNCPTR(jpeg_CreateDecompress); LOAD_FUNCPTR(jpeg_destroy_compress); LOAD_FUNCPTR(jpeg_destroy_decompress); + LOAD_FUNCPTR(jpeg_finish_compress); LOAD_FUNCPTR(jpeg_read_header); LOAD_FUNCPTR(jpeg_read_scanlines); LOAD_FUNCPTR(jpeg_resync_to_restart); @@ -734,6 +736,7 @@ typedef struct JpegEncoder { int frame_initialized; int started_compress; int lines_written; + int frame_committed; UINT width, height; double xres, yres; const jpeg_compress_format *format; @@ -1066,8 +1069,33 @@ static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface static HRESULT WINAPI JpegEncoder_Frame_Commit(IWICBitmapFrameEncode *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + jmp_buf jmpbuf; + TRACE("(%p)\n", iface); + + EnterCriticalSection(&This->lock); + + if (!This->started_compress || This->lines_written != This->height || This->frame_committed) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + LeaveCriticalSection(&This->lock); + return E_FAIL; + } + This->cinfo.client_data = &jmpbuf; + + pjpeg_finish_compress(&This->cinfo); + + This->frame_committed = TRUE; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, @@ -1333,6 +1361,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_initialized = 0; This->started_compress = 0; This->lines_written = 0; + This->frame_committed = 0; This->width = This->height = 0; This->xres = This->yres = 0.0; This->format = NULL;

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Commit.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 4b9fabefd4575e97057fa71a33aa0ef93d6ead8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9fabefd4575e97057fa71a3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 17:15:48 2012 -0500 windowscodecs: Implement JpegEncoder_Commit. --- dlls/windowscodecs/jpegformat.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index cd453cf..3a9b095 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -737,6 +737,7 @@ typedef struct JpegEncoder { int started_compress; int lines_written; int frame_committed; + int committed; UINT width, height; double xres, yres; const jpeg_compress_format *format; @@ -1306,8 +1307,22 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, static HRESULT WINAPI JpegEncoder_Commit(IWICBitmapEncoder *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); + TRACE("(%p)\n", iface); + + EnterCriticalSection(&This->lock); + + if (!This->frame_committed || This->committed) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->committed = TRUE; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, @@ -1362,6 +1377,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->started_compress = 0; This->lines_written = 0; This->frame_committed = 0; + This->committed = 0; This->width = This->height = 0; This->xres = This->yres = 0.0; This->format = NULL;

1 0

Piotr Caban : msvcr90: Added _byteswap_{ushort, ulong, uint64} implementation .
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: e24e6eb278f601fcb7ea5086ec5c8dbf38008eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24e6eb278f601fcb7ea5086e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 16 18:11:37 2012 +0200 msvcr90: Added _byteswap_{ushort,ulong,uint64} implementation. --- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.c | 25 +++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcr90/tests/msvcr90.c | 14 ++++++++++++++ 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index ade980c..bf3a068 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -517,9 +517,9 @@ @ cdecl _beep(long long) msvcrt._beep @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread @ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex -@ stub _byteswap_uint64 -@ stub _byteswap_ulong -@ stub _byteswap_ushort +@ cdecl _byteswap_uint64(int64) msvcr90._byteswap_uint64 +@ cdecl _byteswap_ulong(long) msvcr90._byteswap_ulong +@ cdecl _byteswap_ushort(long) msvcr90._byteswap_ushort @ cdecl _c_exit() msvcrt._c_exit @ cdecl _cabs(long) msvcrt._cabs @ cdecl _callnewh(long) msvcrt._callnewh diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d4d7a86..8686359 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -356,9 +356,9 @@ @ cdecl _beep(long long) msvcrt._beep @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread @ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex -@ stub _byteswap_uint64 -@ stub _byteswap_ulong -@ stub _byteswap_ushort +@ cdecl _byteswap_uint64(int64) msvcr90._byteswap_uint64 +@ cdecl _byteswap_ulong(long) msvcr90._byteswap_ulong +@ cdecl _byteswap_ushort(long) msvcr90._byteswap_ushort @ cdecl _c_exit() msvcrt._c_exit @ cdecl _cabs(long) msvcrt._cabs @ cdecl _callnewh(long) msvcrt._callnewh diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 663dd37..2caf60d 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -366,3 +366,28 @@ int CDECL MSVCR90__vswprintf_p(wchar_t *buffer, size_t length, const wchar_t *fo { return _vswprintf_p_l(buffer, length, format, NULL, args); } + +/********************************************************************* + * _byteswap_ushort (MSVCR90.@) + */ +unsigned short CDECL _byteswap_ushort(unsigned short s) +{ + return (s<<8) + (s>>8); +} + +/********************************************************************* + * _byteswap_ulong (MSVCR90.@) + */ +unsigned long CDECL _byteswap_ulong(unsigned long l) +{ + return (l<<24) + ((l<<8)&0xFF0000) + ((l>>8)&0xFF00) + (l>>24); +} + +/********************************************************************* + * _byteswap_uint64 (MSVCR90.@) + */ +unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) +{ + return (i<<56) + ((i&0xFF00)<<40) + ((i&0xFF0000)<<24) + ((i&0xFF000000)<<8) + + ((i>>8)&0xFF000000) + ((i>>24)&0xFF0000) + ((i>>40)&0xFF00) + (i>>56); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 70bc2b3..6aefe20 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -348,9 +348,9 @@ @ cdecl _beep(long long) msvcrt._beep @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread @ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex -@ stub _byteswap_uint64 -@ stub _byteswap_ulong -@ stub _byteswap_ushort +@ cdecl _byteswap_uint64(int64) +@ cdecl _byteswap_ulong(long) +@ cdecl _byteswap_ushort(long) @ cdecl _c_exit() msvcrt._c_exit @ cdecl _cabs(long) msvcrt._cabs @ cdecl _callnewh(long) msvcrt._callnewh diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 09b4a40..dc15472 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -109,6 +109,7 @@ static int (__cdecl *p_fileno)(FILE*); static int (__cdecl *p_feof)(FILE*); static int (__cdecl *p_ferror)(FILE*); static int (__cdecl *p_flsbuf)(int, FILE*); +static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); /* type info */ @@ -286,6 +287,7 @@ static BOOL init(void) SET(p_feof, "feof"); SET(p_ferror, "ferror"); SET(p_flsbuf, "_flsbuf"); + SET(p_byteswap_ulong, "_byteswap_ulong"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -1137,6 +1139,17 @@ static void test_nonblocking_file_access(void) p_unlink("test_file"); } +static void test_byteswap(void) +{ + unsigned long ret; + + ret = p_byteswap_ulong(0x12345678); + ok(ret == 0x78563412, "ret = %lx\n", ret); + + ret = p_byteswap_ulong(0); + ok(ret == 0, "ret = %lx\n", ret); +} + START_TEST(msvcr90) { if(!init()) @@ -1159,4 +1172,5 @@ START_TEST(msvcr90) test_getptd(); test__vswprintf_l(); test_nonblocking_file_access(); + test_byteswap(); }

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_GetCubeMapSurface ().
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: cae90acb7aa03e0682ce9c5b402d0e98e1f554bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae90acb7aa03e0682ce9c5b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 21:16:09 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_GetCubeMapSurface(). --- dlls/d3d8/cubetexture.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index c28eeb6..5a3496a 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -285,6 +285,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(IDirect3DCubeT { IDirect3DCubeTexture8Impl *texture = impl_from_IDirect3DCubeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface8Impl *surface_impl; UINT sub_resource_idx; TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, face, level, surface); @@ -297,7 +298,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(IDirect3DCubeT return D3DERR_INVALIDCALL; } - *surface = wined3d_resource_get_parent(sub_resource); + surface_impl = wined3d_resource_get_parent(sub_resource); + *surface = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*surface); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_LockRect ().
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 883e7bbe87276277da4b976a5e8f5e84a069a3ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=883e7bbe87276277da4b976a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 21:16:10 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_LockRect(). --- dlls/d3d8/cubetexture.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 5a3496a..ebfff7f 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -312,6 +312,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(IDirect3DCubeTexture8 * { IDirect3DCubeTexture8Impl *texture = impl_from_IDirect3DCubeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface8Impl *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -323,8 +324,10 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(IDirect3DCubeTexture8 * if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DSurface8_LockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource), - locked_rect, rect, flags); + { + surface_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DSurface8_LockRect(&surface_impl->IDirect3DSurface8_iface, locked_rect, rect, flags); + } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_UnlockRect ().
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: e0390da628cc9365c28360a514a01327e2bca5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0390da628cc9365c28360a51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 21:16:11 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DCubeTexture8Impl_UnlockRect(). --- dlls/d3d8/cubetexture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index ebfff7f..ff41e1c 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -338,6 +338,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(IDirect3DCubeTexture8 { IDirect3DCubeTexture8Impl *texture = impl_from_IDirect3DCubeTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface8Impl *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -348,7 +349,10 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(IDirect3DCubeTexture8 if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DSurface8_UnlockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource)); + { + surface_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DSurface8_UnlockRect(&surface_impl->IDirect3DSurface8_iface); + } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DTexture8Impl.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 7bb17f49e3303ee49da7b97fb5080781cd0a4617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb17f49e3303ee49da7b97fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 21:16:12 2012 +0200 d3d8: Get rid of IDirect3DTexture8Impl. --- dlls/d3d8/d3d8_private.h | 26 ++---- dlls/d3d8/device.c | 2 +- dlls/d3d8/texture.c | 194 ++++++++++++++++++++++------------------------ 3 files changed, 104 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7bb17f49e3303ee49da7b…

1 0

Henri Verbeet : d3d8: Get rid of IDirect3DCubeTexture8Impl.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: b8d07a2b44f9ae7594d6a6c8805f8f559168c775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d07a2b44f9ae7594d6a6c88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 16 21:16:13 2012 +0200 d3d8: Get rid of IDirect3DCubeTexture8Impl. --- dlls/d3d8/cubetexture.c | 209 ++++++++++++++++++++++------------------------ dlls/d3d8/d3d8_private.h | 20 +---- dlls/d3d8/device.c | 6 +- dlls/d3d8/texture.c | 4 +- 4 files changed, 108 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8d07a2b44f9ae7594d6a…

1 0

André Hentschel : winedbg: Fix parsing table for ARM disassembler.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: ad1d7450d9c960cb27036da6c38a3e588008ab66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad1d7450d9c960cb27036da6c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 16 23:52:30 2012 +0200 winedbg: Fix parsing table for ARM disassembler. --- programs/winedbg/be_arm.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index fbf6954..93f12d6 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -102,12 +102,19 @@ static UINT arm_disasm_branch(UINT inst) return 0; } +static UINT arm_disasm_branchreg(UINT inst) +{ + dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); + return 0; +} + static UINT arm_disasm_dataprocessing(UINT inst) { short condcodes = (inst >> 20) & 0x01; short opcode = (inst >> 21) & 0x0f; short immediate = (inst >> 25) & 0x01; short no_op1 = (opcode & 0x0d) == 0x0d; + short no_dst = (opcode & 0x0c) == 0x08; /* check for nop */ if (get_nibble(inst, 3) == 15 /* r15 */ && condcodes == 0 && @@ -118,7 +125,9 @@ static UINT arm_disasm_dataprocessing(UINT inst) } dbg_printf("\n\t%s%s%s", tbl_dataops[opcode], condcodes ? "s" : "", get_cond(inst)); - dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); + if (!no_dst) dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); + else dbg_printf("\t"); + if (no_op1) { if (immediate) @@ -395,9 +404,10 @@ struct inst_arm static const struct inst_arm tbl_arm[] = { { 0x0e000000, 0x0a000000, arm_disasm_branch }, + { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, + { 0x0fffff00, 0x012fff00, arm_disasm_branchreg }, { 0x0c000000, 0x00000000, arm_disasm_dataprocessing }, { 0x0c000000, 0x04000000, arm_disasm_singletrans }, - { 0x0e000090, 0x00000090, arm_disasm_halfwordtrans }, { 0x0e000000, 0x08000000, arm_disasm_blocktrans }, { 0x0f000000, 0x0f000000, arm_disasm_swi }, { 0x0f000010, 0x0e000010, arm_disasm_coproctrans },

1 0