wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Dmitry Timoshkov : ntdll: Add a trace for transmitter's buffer empty flag.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: b299d4d4f805d6a41d2f8d742b9696723ef9b7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b299d4d4f805d6a41d2f8d742… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 28 12:29:45 2013 +0900 ntdll: Add a trace for transmitter's buffer empty flag. --- dlls/ntdll/serial.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 7f56cb5..a389d0f 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -781,8 +781,7 @@ static NTSTATUS set_XOn(int fd) */ typedef struct serial_irq_info { - int rx , tx, frame, overrun, parity, brk, buf_overrun; - DWORD temt; + int rx, tx, frame, overrun, parity, brk, buf_overrun, temt; }serial_irq_info; /*********************************************************************** @@ -869,6 +868,7 @@ static DWORD check_events(int fd, DWORD mask, TRACE("old->parity 0x%08x vs. new->parity 0x%08x\n", old->parity, new->parity); TRACE("old->brk 0x%08x vs. new->brk 0x%08x\n", old->brk, new->brk); TRACE("old->buf_overrun 0x%08x vs. new->buf_overrun 0x%08x\n", old->buf_overrun, new->buf_overrun); + TRACE("old->temt 0x%08x vs. new->temt 0x%08x\n", old->temt, new->temt); if (old->brk != new->brk) ret |= EV_BREAK; if ((old_mstat & MS_CTS_ON ) != (new_mstat & MS_CTS_ON )) ret |= EV_CTS;

1 0

André Hentschel : msvcr100: Add more ARM forwards.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 2123d94e83fd8fb8e76d356d7a85e8b123c3ea91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2123d94e83fd8fb8e76d356d7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 27 23:53:35 2013 +0200 msvcr100: Add more ARM forwards. --- dlls/msvcr100/msvcr100.spec | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 7e602ef..b4f020e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -194,6 +194,7 @@ @ stub -arch=win64 ??1scoped_lock@reader_writer_lock@Concurrency@@QEAA@XZ @ stub -arch=win32 ??1scoped_lock_read@reader_writer_lock@Concurrency@@QAE@XZ @ stub -arch=win64 ??1scoped_lock_read@reader_writer_lock@Concurrency@@QEAA@XZ +@ cdecl -arch=arm ??1type_info@@UAA@XZ(ptr) msvcrt.??1type_info@@UAA@XZ @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) msvcrt.??1type_info@@UAE@XZ @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) msvcrt.??1type_info@@UEAA@XZ @ cdecl -arch=win32 ??2@YAPAXI@Z(long) msvcrt.??2@YAPAXI@Z @@ -216,8 +217,10 @@ @ cdecl -arch=win64 ??4bad_typeid@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=i386 ??4exception@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4exception@@QAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4exception@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4exception@@QEAAAEAV0@AEBV0@@Z +@ cdecl -arch=arm ??8type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??8type_info@@QEBAHAEBV0@@Z +@ cdecl -arch=arm ??9type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??9type_info@@QEBAHAEBV0@@Z @ extern ??_7__non_rtti_object@std@@6B@ msvcrt.??_7__non_rtti_object@@6B@ @@ -466,6 +469,7 @@ @ stub -arch=win64 ?name@type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 @ stub -arch=win32 ?native_handle@critical_section@Concurrency@@QAEAAV12@XZ @ stub -arch=win64 ?native_handle@critical_section@Concurrency@@QEAAAEAV12@XZ +@ cdecl -arch=arm ?raw_name@type_info@@QBAPBDXZ(ptr) msvcrt.?raw_name@type_info@@QBAPBDXZ @ thiscall -arch=i386 ?raw_name@type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name@type_info@@QBEPBDXZ @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name@type_info@@QEBAPEBDXZ @ stub -arch=win32 ?reset@event@Concurrency@@QAEXXZ

1 0

André Hentschel : msvcr90/tests: Add more ARM forwards and use them in tests.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 7ae776c26b767989a7f43d88a657f2f5b5e0b630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae776c26b767989a7f43d88a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 27 23:52:38 2013 +0200 msvcr90/tests: Add more ARM forwards and use them in tests. --- dlls/msvcr90/msvcr90.spec | 5 +++++ dlls/msvcr90/tests/msvcr90.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d5eebb4..04fa199 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -28,6 +28,7 @@ @ cdecl -arch=win64 ??1bad_typeid@std@@UEAA@XZ(ptr) msvcrt.??1bad_typeid@@UEAA@XZ @ thiscall -arch=i386 ??1exception@std@@UAE@XZ(ptr) msvcrt.??1exception@@UAE@XZ @ cdecl -arch=win64 ??1exception@std@@UEAA@XZ(ptr) msvcrt.??1exception@@UEAA@XZ +@ cdecl -arch=arm ??1type_info@@UAA@XZ(ptr) msvcrt.??1type_info@@UAA@XZ @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) msvcrt.??1type_info@@UAE@XZ @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) msvcrt.??1type_info@@UEAA@XZ @ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCR90_operator_new @@ -44,8 +45,10 @@ @ cdecl -arch=win64 ??4bad_typeid@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=i386 ??4exception@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4exception@@QAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4exception@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4exception@@QEAAAEAV0@AEBV0@@Z +@ cdecl -arch=arm ??8type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??8type_info@@QEBAHAEBV0@@Z +@ cdecl -arch=arm ??9type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??9type_info@@QEBAHAEBV0@@Z @ extern ??_7__non_rtti_object@std@@6B@ msvcrt.??_7__non_rtti_object@@6B@ @@ -83,6 +86,7 @@ @ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) msvcrt._invalid_parameter @ stub -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const &,struct _EXCEPTION_POINTERS *) @ stub -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const & __ptr64,struct _EXCEPTION_POINTERS * __ptr64) +@ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z @ thiscall -arch=i386 ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z @ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) msvcrt._open @@ -111,6 +115,7 @@ @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z @ stub -arch=win32 ?name@type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name@type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ cdecl -arch=arm ?raw_name@type_info@@QBAPBDXZ(ptr) msvcrt.?raw_name@type_info@@QBAPBDXZ @ thiscall -arch=i386 ?raw_name@type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name@type_info@@QBEPBDXZ @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name@type_info@@QEBAPEBDXZ @ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_new_handler@@YAP6AXXZP6AXXZ@Z diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index fa2b445..2a3124d 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -315,8 +315,13 @@ static BOOL init(void) } else { +#ifdef __arm__ + SET(p_type_info_name_internal_method, "?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z"); + SET(ptype_info_dtor, "??1type_info@@UAA@XZ"); +#else SET(p_type_info_name_internal_method, "?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z"); SET(ptype_info_dtor, "??1type_info@@UAE@XZ"); +#endif } hkernel32 = GetModuleHandleA("kernel32.dll");

1 0

André Hentschel : msvcr80: Add more ARM forwards.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: feffbd5d86f71fdc0477f6e157c6acc460befabb URL: http://source.winehq.org/git/wine.git/?a=commit;h=feffbd5d86f71fdc0477f6e15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 27 23:52:17 2013 +0200 msvcr80: Add more ARM forwards. --- dlls/msvcr80/msvcr80.spec | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ec886eb..6eeb602 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -28,6 +28,7 @@ @ cdecl -arch=win64 ??1bad_typeid@std@@UEAA@XZ(ptr) msvcrt.??1bad_typeid@@UEAA@XZ @ thiscall -arch=i386 ??1exception@std@@UAE@XZ(ptr) msvcrt.??1exception@@UAE@XZ @ cdecl -arch=win64 ??1exception@std@@UEAA@XZ(ptr) msvcrt.??1exception@@UEAA@XZ +@ cdecl -arch=arm ??1type_info@@UAA@XZ(ptr) msvcrt.??1type_info@@UAA@XZ @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) msvcrt.??1type_info@@UAE@XZ @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) msvcrt.??1type_info@@UEAA@XZ @ cdecl -arch=win32 ??2@YAPAXI@Z(long) msvcrt.??2@YAPAXI@Z @@ -44,8 +45,10 @@ @ cdecl -arch=win64 ??4bad_typeid@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QEAAAEAV0@AEBV0@@Z @ thiscall -arch=i386 ??4exception@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4exception@@QAEAAV0@ABV0@@Z @ cdecl -arch=win64 ??4exception@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4exception@@QEAAAEAV0@AEBV0@@Z +@ cdecl -arch=arm ??8type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??8type_info@@QEBAHAEBV0@@Z +@ cdecl -arch=arm ??9type_info@@QBA_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBA_NABV0@@Z @ thiscall -arch=i386 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBEHABV0@@Z @ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??9type_info@@QEBAHAEBV0@@Z @ extern ??_7__non_rtti_object@std@@6B@ msvcrt.??_7__non_rtti_object@@6B@ @@ -83,6 +86,7 @@ @ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) msvcrt._invalid_parameter @ stub -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const &,struct _EXCEPTION_POINTERS *) @ stub -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z # int __cdecl _is_exception_typeof(class type_info const & __ptr64,struct _EXCEPTION_POINTERS * __ptr64) +@ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z @ thiscall -arch=i386 ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) msvcr100.?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z @ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) msvcrt._open @@ -111,6 +115,7 @@ @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z @ stub -arch=win32 ?name@type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name@type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 +@ cdecl -arch=arm ?raw_name@type_info@@QBAPBDXZ(ptr) msvcrt.?raw_name@type_info@@QBAPBDXZ @ thiscall -arch=i386 ?raw_name@type_info@@QBEPBDXZ(ptr) msvcrt.?raw_name@type_info@@QBEPBDXZ @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?raw_name@type_info@@QEBAPEBDXZ @ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_new_handler@@YAP6AXXZP6AXXZ@Z

1 0

André Hentschel : secur32/tests: Better defined InitializeSecurityContext tests.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 3a0961aced2b3dde44cd7bc726b96e73b7d0918e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0961aced2b3dde44cd7bc72… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 27 22:17:35 2013 +0200 secur32/tests: Better defined InitializeSecurityContext tests. --- dlls/secur32/tests/schannel.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 0bb07bf..e0d550c 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -694,10 +694,20 @@ static void test_communication(void) buffers[1].cBuffers = 1; buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[0].pBuffers[0].cbBuffer = 1; status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); +todo_wine + ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); + + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); +todo_wine + ok(status == SEC_E_INSUFFICIENT_MEMORY || status == SEC_E_INVALID_TOKEN, + "Expected SEC_E_INSUFFICIENT_MEMORY or SEC_E_INVALID_TOKEN, got %08x\n", status); buffers[0].pBuffers[0].cbBuffer = buf_size;

1 0

Henri Verbeet : d3dx9: Simplify D3DXLoadSurfaceFromResourceW().
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 9595dd873e7cc0065d16d1421b651e54de78d4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9595dd873e7cc0065d16d1421… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:10:00 2013 +0200 d3dx9: Simplify D3DXLoadSurfaceFromResourceW(). --- dlls/d3dx9_36/surface.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a2b553b..9b76457 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1268,7 +1268,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceW(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, HMODULE src_module, const WCHAR *resource, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - HRSRC hResInfo; + UINT data_size; + HRSRC resinfo; + void *data; TRACE("dst_surface %p, dst_palette %p, dst_rect %s, src_module %p, resource %s, " "src_rect %s, filter %#x, color_key 0x%08x, src_info %p.\n", @@ -1278,23 +1280,16 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceW(IDirect3DSurface9 *dst_surface, if (!dst_surface) return D3DERR_INVALIDCALL; - hResInfo = FindResourceW(src_module, resource, (const WCHAR *)RT_RCDATA); - if (!hResInfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ - hResInfo = FindResourceW(src_module, resource, (const WCHAR *)RT_BITMAP); - - if (hResInfo) - { - UINT data_size; - void *data; - - if (FAILED(load_resource_into_memory(src_module, hResInfo, &data, &data_size))) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceW(src_module, resource, (const WCHAR *)RT_RCDATA)) + /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ + && !(resinfo = FindResourceW(src_module, resource, (const WCHAR *)RT_BITMAP))) + return D3DXERR_INVALIDDATA; - return D3DXLoadSurfaceFromFileInMemory(dst_surface, dst_palette, dst_rect, - data, data_size, src_rect, filter, color_key, src_info); - } + if (FAILED(load_resource_into_memory(src_module, resinfo, &data, &data_size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXLoadSurfaceFromFileInMemory(dst_surface, dst_palette, dst_rect, + data, data_size, src_rect, filter, color_key, src_info); }

1 0

Henri Verbeet : d3dx9: Simplify D3DXLoadSurfaceFromResourceA().
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: d16402b10cca1d939387b8a8976d27c49487d6ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d16402b10cca1d939387b8a89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:09:59 2013 +0200 d3dx9: Simplify D3DXLoadSurfaceFromResourceA(). --- dlls/d3dx9_36/surface.c | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4b86f1c..a2b553b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1240,7 +1240,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceA(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, HMODULE src_module, const char *resource, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - HRSRC hResInfo; + UINT data_size; + HRSRC resinfo; + void *data; TRACE("dst_surface %p, dst_palette %p, dst_rect %s, src_module %p, resource %s, " "src_rect %s, filter %#x, color_key 0x%08x, src_info %p.\n", @@ -1250,23 +1252,16 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceA(IDirect3DSurface9 *dst_surface, if (!dst_surface) return D3DERR_INVALIDCALL; - hResInfo = FindResourceA(src_module, resource, (const char *)RT_RCDATA); - if (!hResInfo) /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ - hResInfo = FindResourceA(src_module, resource, (const char *)RT_BITMAP); - - if (hResInfo) - { - UINT data_size; - void *data; - - if (FAILED(load_resource_into_memory(src_module, hResInfo, &data, &data_size))) - return D3DXERR_INVALIDDATA; + if (!(resinfo = FindResourceA(src_module, resource, (const char *)RT_RCDATA)) + /* Try loading the resource as bitmap data (which is in DIB format D3DXIFF_DIB) */ + && !(resinfo = FindResourceA(src_module, resource, (const char *)RT_BITMAP))) + return D3DXERR_INVALIDDATA; - return D3DXLoadSurfaceFromFileInMemory(dst_surface, dst_palette, dst_rect, - data, data_size, src_rect, filter, color_key, src_info); - } + if (FAILED(load_resource_into_memory(src_module, resinfo, &data, &data_size))) + return D3DXERR_INVALIDDATA; - return D3DXERR_INVALIDDATA; + return D3DXLoadSurfaceFromFileInMemory(dst_surface, dst_palette, dst_rect, + data, data_size, src_rect, filter, color_key, src_info); } HRESULT WINAPI D3DXLoadSurfaceFromResourceW(IDirect3DSurface9 *dst_surface,

1 0

Henri Verbeet : wined3d: Get rid of RTL_READDRAW.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: ac54753e7c9f0798afa4397b6dc42f7f17c95793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac54753e7c9f0798afa4397b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:09:58 2013 +0200 wined3d: Get rid of RTL_READDRAW. I don't think we ever want to use glDrawPixels(). --- dlls/wined3d/surface.c | 156 ++-------------------------------------- dlls/wined3d/wined3d_main.c | 14 ---- dlls/wined3d/wined3d_private.h | 4 - 3 files changed, 5 insertions(+), 169 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e001185..66f15fb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4439,76 +4439,6 @@ void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl } } -static void flush_to_framebuffer_drawpixels(struct wined3d_surface *surface, - const RECT *rect, GLenum fmt, GLenum type, UINT bpp, const BYTE *mem) -{ - struct wined3d_device *device = surface->resource.device; - UINT pitch = wined3d_surface_get_pitch(surface); - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - RECT local_rect; - UINT w, h; - - surface_get_rect(surface, rect, &local_rect); - - mem += local_rect.top * pitch + local_rect.left * bpp; - w = local_rect.right - local_rect.left; - h = local_rect.bottom - local_rect.top; - - /* Activate the correct context for the render target */ - context = context_acquire(device, surface); - context_apply_blit_state(context, device); - gl_info = context->gl_info; - - if (!surface_is_offscreen(surface)) - { - GLenum buffer = surface_get_gl_buffer(surface); - TRACE("Unlocking %#x buffer.\n", buffer); - context_set_draw_buffer(context, buffer); - - surface_translate_drawable_coords(surface, context->win_handle, &local_rect); - gl_info->gl_ops.gl.p_glPixelZoom(1.0f, -1.0f); - } - else - { - /* Primary offscreen render target */ - TRACE("Offscreen render target.\n"); - context_set_draw_buffer(context, device->offscreenBuffer); - - gl_info->gl_ops.gl.p_glPixelZoom(1.0f, 1.0f); - } - - gl_info->gl_ops.gl.p_glRasterPos3i(local_rect.left, local_rect.top, 1); - checkGLcall("glRasterPos3i"); - - /* If not fullscreen, we need to skip a number of bytes to find the next row of data */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, surface->resource.width); - - if (surface->flags & SFLAG_PBO) - { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - checkGLcall("glBindBufferARB"); - } - - gl_info->gl_ops.gl.p_glDrawPixels(w, h, fmt, type, mem); - checkGLcall("glDrawPixels"); - - if (surface->flags & SFLAG_PBO) - { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } - - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - checkGLcall("glPixelStorei(GL_UNPACK_ROW_LENGTH, 0)"); - - if (wined3d_settings.strict_draw_ordering - || (surface->swapchain && surface->swapchain->front_buffer == surface)) - gl_info->gl_ops.gl.p_glFlush(); - - context_release(context); -} - static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD color) { /* FIXME: Is this really how color keys are supposed to work? I think it @@ -5860,11 +5790,7 @@ static void surface_load_sysmem(struct wined3d_surface *surface, static HRESULT surface_load_drawable(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const RECT *rect) { - struct wined3d_device *device = surface->resource.device; - enum wined3d_conversion_type convert; - struct wined3d_format format; - UINT byte_count; - BYTE *mem; + RECT r; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface)) { @@ -5872,82 +5798,10 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, return WINED3DERR_INVALIDCALL; } - if (wined3d_settings.rendertargetlock_mode == RTL_READTEX) - surface_load_location(surface, SFLAG_INTEXTURE, NULL); - - if (surface->flags & SFLAG_INTEXTURE) - { - RECT r; - - surface_get_rect(surface, rect, &r); - surface_blt_to_drawable(device, WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); - - return WINED3D_OK; - } - - if ((surface->flags & SFLAG_LOCATIONS) == SFLAG_INSRGBTEX) - { - /* This needs colorspace conversion from sRGB to RGB. We take the slow - * path through sysmem. */ - surface_load_location(surface, SFLAG_INSYSMEM, rect); - } - - d3dfmt_get_conv(surface, FALSE, FALSE, &format, &convert); - - /* Don't use PBOs for converted surfaces. During PBO conversion we look at - * SFLAG_CONVERTED but it isn't set (yet) in all cases where it is getting - * called. */ - if ((convert != WINED3D_CT_NONE) && (surface->flags & SFLAG_PBO)) - { - struct wined3d_context *context; - - TRACE("Removing the pbo attached to surface %p.\n", surface); - - /* TODO: Use already acquired context when possible. */ - context = context_acquire(device, NULL); - - surface_remove_pbo(surface, gl_info); - - context_release(context); - } - - if ((convert != WINED3D_CT_NONE) && surface->resource.allocatedMemory) - { - UINT height = surface->resource.height; - UINT width = surface->resource.width; - UINT src_pitch, dst_pitch; - - byte_count = format.conv_byte_count; - src_pitch = wined3d_surface_get_pitch(surface); - - /* Stick to the alignment for the converted surface too, makes it - * easier to load the surface. */ - dst_pitch = width * byte_count; - dst_pitch = (dst_pitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1); - - if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) - { - ERR("Out of memory (%u).\n", dst_pitch * height); - return E_OUTOFMEMORY; - } - - d3dfmt_convert_surface(surface->resource.allocatedMemory, mem, - src_pitch, width, height, dst_pitch, convert, surface); - - surface->flags |= SFLAG_CONVERTED; - } - else - { - surface->flags &= ~SFLAG_CONVERTED; - mem = surface->resource.allocatedMemory; - byte_count = format.byte_count; - } - - flush_to_framebuffer_drawpixels(surface, rect, format.glFormat, format.glType, byte_count, mem); - - /* Don't delete PBO memory. */ - if ((mem != surface->resource.allocatedMemory) && !(surface->flags & SFLAG_PBO)) - HeapFree(GetProcessHeap(), 0, mem); + surface_get_rect(surface, rect, &r); + surface_load_location(surface, SFLAG_INTEXTURE, NULL); + surface_blt_to_drawable(surface->resource.device, + WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 62dc462..a897bdc 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -74,7 +74,6 @@ struct wined3d_settings wined3d_settings = { TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ - RTL_READTEX, /* Default render target locking method */ PCI_VENDOR_NONE,/* PCI Vendor ID */ PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in init_driver_info */ @@ -223,19 +222,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.offscreen_rendering_mode = ORM_FBO; } } - if ( !get_config_key( hkey, appkey, "RenderTargetLockMode", buffer, size) ) - { - if (!strcmp(buffer,"readdraw")) - { - TRACE("Using glReadPixels for render target reading and glDrawPixels for writing\n"); - wined3d_settings.rendertargetlock_mode = RTL_READDRAW; - } - else if (!strcmp(buffer,"readtex")) - { - TRACE("Using glReadPixels for render target reading and textures for writing\n"); - wined3d_settings.rendertargetlock_mode = RTL_READTEX; - } - } if ( !get_config_key_dword( hkey, appkey, "VideoPciDeviceID", &tmpvalue) ) { int pci_device_id = tmpvalue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1746417..c320b65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -241,9 +241,6 @@ static inline float float_24_to_32(DWORD in) #define ORM_BACKBUFFER 0 #define ORM_FBO 1 -#define RTL_READDRAW 1 -#define RTL_READTEX 2 - #define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */ #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */ @@ -256,7 +253,6 @@ struct wined3d_settings * implemented, we'll leave it as a registry setting for developers. */ BOOL glslRequested; int offscreen_rendering_mode; - int rendertargetlock_mode; unsigned short pci_vendor_id; unsigned short pci_device_id; /* Memory tracking and object counting. */

1 0

Henri Verbeet : wined3d: Get rid of GL_EXT_paletted_texture support.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: f5f7a4e4578e541b07ac324667874c26374ccc7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f7a4e4578e541b07ac32466… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:09:57 2013 +0200 wined3d: Get rid of GL_EXT_paletted_texture support. No current drivers support this, and it's probably broken. Also note that since we removed paletted texture support from wined3d, this would only be used for WINED3DFMT_P8_UINT blits. --- dlls/wined3d/directx.c | 1 - dlls/wined3d/surface.c | 72 ++++----------------------------------------- dlls/wined3d/texture.c | 10 ++---- dlls/wined3d/utils.c | 6 +--- dlls/wined3d/wined3d_gl.h | 3 -- 5 files changed, 10 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5f7a4e4578e541b07ac3…

1 0

Henri Verbeet : wined3d: Get rid of the unused MAX_PALETTES constant.
by Alexandre Julliard 28 Aug '13

28 Aug '13

Module: wine Branch: master Commit: 00ffc0c24ba754063b205b4cfce843048ac551a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ffc0c24ba754063b205b4cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 28 10:09:56 2013 +0200 wined3d: Get rid of the unused MAX_PALETTES constant. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a01c3a4..1746417 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -155,7 +155,6 @@ void *wined3d_rb_realloc(void *ptr, size_t size) DECLSPEC_HIDDEN; void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; /* Device caps */ -#define MAX_PALETTES 65536 #define MAX_STREAM_OUT 4 #define MAX_STREAMS 16 #define MAX_TEXTURES 8

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
47
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 August 2013