wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

André Hentschel : ntdll: Adjust NtAreMappedFilesTheSame to win8 behaviour.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 4ecc9788bd9e8a997a7f41efbe944561d37990b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecc9788bd9e8a997a7f41efb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 12 21:39:06 2013 +0100 ntdll: Adjust NtAreMappedFilesTheSame to win8 behaviour. --- dlls/kernel32/tests/virtual.c | 6 ++++-- dlls/ntdll/virtual.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a77fdb9..0d417a6 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1053,10 +1053,12 @@ static void test_NtAreMappedFilesTheSame(void) CloseHandle( file2 ); status = pNtAreMappedFilesTheSame( ptr, ptr ); - ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_NOT_SAME_DEVICE), + "NtAreMappedFilesTheSame returned %x\n", status ); status = pNtAreMappedFilesTheSame( ptr, (char *)ptr + 30 ); - ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_NOT_SAME_DEVICE), + "NtAreMappedFilesTheSame returned %x\n", status ); status = pNtAreMappedFilesTheSame( ptr, GetModuleHandleA("kernel32.dll") ); ok( status == STATUS_NOT_SAME_DEVICE, "NtAreMappedFilesTheSame returned %x\n", status ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e438eaa..3b9cad8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2963,10 +2963,10 @@ NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) status = STATUS_INVALID_ADDRESS; else if ((view1->protect & VPROT_VALLOC) || (view2->protect & VPROT_VALLOC)) status = STATUS_CONFLICTING_ADDRESSES; - else if (!(view1->protect & VPROT_IMAGE) || !(view2->protect & VPROT_IMAGE)) - status = STATUS_NOT_SAME_DEVICE; else if (view1 == view2) status = STATUS_SUCCESS; + else if (!(view1->protect & VPROT_IMAGE) || !(view2->protect & VPROT_IMAGE)) + status = STATUS_NOT_SAME_DEVICE; else if (!stat_mapping_file( view1, &st1 ) && !stat_mapping_file( view2, &st2 ) && st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) status = STATUS_SUCCESS;

1 0

Dmitry Timoshkov : server: Make it possible for WaitCommEvent to detect recursive requests.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: a890d0f030a864d893646bd0c29dd761781bcdd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a890d0f030a864d893646bd0c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 31 16:58:19 2013 +0900 server: Make it possible for WaitCommEvent to detect recursive requests. --- dlls/kernel32/tests/comm.c | 1 - dlls/ntdll/serial.c | 30 ++++++++++++++++++++++++++---- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/serial.c | 26 +++++++++++++++++++++++++- 5 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 1f88707..cbd276b 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -966,7 +966,6 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait2); ok(!res, "WaitCommEvent should fail if there is a pending wait\n"); -todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); CloseHandle(ovl_wait2.hEvent); diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 04aacf0..b03ac61 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -381,7 +381,21 @@ static NTSTATUS get_timeouts(HANDLE handle, SERIAL_TIMEOUTS* st) return status; } -static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie, DWORD *pending_write) +static void stop_waiting( HANDLE handle ) +{ + NTSTATUS status; + + SERVER_START_REQ( set_serial_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->flags = SERIALINFO_PENDING_WAIT; + if ((status = wine_server_call( req ))) + ERR("failed to clear waiting state: %#x\n", status); + } + SERVER_END_REQ; +} + +static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie, DWORD *pending_write, BOOL start_wait) { NTSTATUS status; @@ -389,6 +403,7 @@ static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie, DWORD { req->handle = wine_server_obj_handle( hDevice ); req->flags = pending_write ? SERIALINFO_PENDING_WRITE : 0; + if (start_wait) req->flags |= SERIALINFO_PENDING_WAIT; if (!(status = wine_server_call( req ))) { *mask = reply->eventmask; @@ -940,7 +955,7 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) &new_irq_info, &commio->irq_info, new_mstat, commio->mstat, commio->pending_write); if (*commio->events) break; - get_wait_mask(commio->hDevice, &dummy, &cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL); + get_wait_mask(commio->hDevice, &dummy, &cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL, FALSE); if (commio->cookie != cookie) { *commio->events = 0; @@ -959,6 +974,7 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) else commio->iosb->u.Status = STATUS_CANCELLED; } + stop_waiting(commio->hDevice); if (commio->hEvent) NtSetEvent(commio->hEvent, NULL); RtlFreeHeap(GetProcessHeap(), 0, commio); return 0; @@ -980,7 +996,12 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK commio->iosb = piosb; commio->hEvent = hEvent; commio->pending_write = 0; - get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL); + status = get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie, (commio->evtmask & EV_TXEMPTY) ? &commio->pending_write : NULL, TRUE); + if (status) + { + RtlFreeHeap(GetProcessHeap(), 0, commio); + return status; + } /* We may never return, if some capabilities miss * Return error in that case @@ -1045,6 +1066,7 @@ error_caps: status = STATUS_INVALID_PARAMETER; #endif out_now: + stop_waiting(commio->hDevice); RtlFreeHeap(GetProcessHeap(), 0, commio); return status; } @@ -1175,7 +1197,7 @@ static inline NTSTATUS io_control(HANDLE hDevice, case IOCTL_SERIAL_GET_WAIT_MASK: if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) { - if (!(status = get_wait_mask(hDevice, lpOutBuffer, NULL, NULL))) + if (!(status = get_wait_mask(hDevice, lpOutBuffer, NULL, NULL, FALSE))) sz = sizeof(DWORD); } else diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 604affd..dc83806 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3083,6 +3083,7 @@ struct set_serial_info_reply #define SERIALINFO_SET_TIMEOUTS 0x01 #define SERIALINFO_SET_MASK 0x02 #define SERIALINFO_PENDING_WRITE 0x04 +#define SERIALINFO_PENDING_WAIT 0x08 @@ -5845,6 +5846,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 451 +#define SERVER_PROTOCOL_VERSION 452 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 31b85f8..3c3b0b5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2239,6 +2239,7 @@ enum message_type #define SERIALINFO_SET_TIMEOUTS 0x01 #define SERIALINFO_SET_MASK 0x02 #define SERIALINFO_PENDING_WRITE 0x04 +#define SERIALINFO_PENDING_WAIT 0x08 /* Create an async I/O */ diff --git a/server/serial.c b/server/serial.c index 25587a7..880f5e3 100644 --- a/server/serial.c +++ b/server/serial.c @@ -77,7 +77,8 @@ struct serial unsigned int eventmask; unsigned int generation; /* event mask change counter */ - unsigned int pending_write; + unsigned int pending_write : 1; + unsigned int pending_wait : 1; struct termios original; @@ -139,6 +140,7 @@ struct object *create_serial( struct fd *fd ) serial->eventmask = 0; serial->generation = 0; serial->pending_write = 0; + serial->pending_wait = 0; serial->fd = (struct fd *)grab_object( fd ); set_fd_user( fd, &serial_fd_ops, &serial->obj ); return &serial->obj; @@ -205,6 +207,17 @@ DECL_HANDLER(get_serial_info) if ((serial = get_serial_obj( current->process, req->handle, 0 ))) { + if (req->flags & SERIALINFO_PENDING_WAIT) + { + if (serial->pending_wait) + { + release_object( serial ); + set_error( STATUS_INVALID_PARAMETER ); + return; + } + serial->pending_wait = 1; + } + /* timeouts */ reply->readinterval = serial->readinterval; reply->readconst = serial->readconst; @@ -231,6 +244,17 @@ DECL_HANDLER(set_serial_info) if ((serial = get_serial_obj( current->process, req->handle, 0 ))) { + if (req->flags & SERIALINFO_PENDING_WAIT) + { + if (!serial->pending_wait) + { + release_object( serial ); + set_error( STATUS_INVALID_PARAMETER ); + return; + } + serial->pending_wait = 0; + } + /* timeouts */ if (req->flags & SERIALINFO_SET_TIMEOUTS) {

1 0

Jacek Caban : widl: Include resource id in typelib path if not default.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 318931bd46e3c526b2ec5e2d5bcecaa704e123be URL: http://source.winehq.org/git/wine.git/?a=commit;h=318931bd46e3c526b2ec5e2d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 12 17:30:45 2013 +0100 widl: Include resource id in typelib path if not default. --- tools/widl/register.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index d8b34d9..9a4f219 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -280,6 +280,8 @@ void output_typelib_regscript( const typelib_t *typelib ) const expr_t *lcid_expr = get_attrp( typelib->attrs, ATTR_LIBLCID ); unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); unsigned int flags = 0; + char id_part[12] = ""; + expr_t *expr; if (is_attr( typelib->attrs, ATTR_RESTRICTED )) flags |= 1; /* LIBFLAG_FRESTRICTED */ if (is_attr( typelib->attrs, ATTR_CONTROL )) flags |= 2; /* LIBFLAG_FCONTROL */ @@ -295,8 +297,11 @@ void output_typelib_regscript( const typelib_t *typelib ) put_str( indent, "'%u.%u' = s '%s'\n", MAJORVERSION(version), MINORVERSION(version), descr ? descr : typelib->name ); put_str( indent++, "{\n" ); - put_str( indent, "'%x' { %s = s '%%MODULE%%' }\n", - lcid_expr ? lcid_expr->cval : 0, typelib_kind == SYS_WIN64 ? "win64" : "win32" ); + expr = get_attrp( typelib->attrs, ATTR_ID ); + if (expr) + sprintf(id_part, "\\%d", expr->cval); + put_str( indent, "'%x' { %s = s '%%MODULE%%%s' }\n", + lcid_expr ? lcid_expr->cval : 0, typelib_kind == SYS_WIN64 ? "win64" : "win32", id_part ); put_str( indent, "FLAGS = s '%u'\n", flags ); put_str( --indent, "}\n" ); put_str( --indent, "}\n" );

1 0

Andrew Eikum : mmdevapi: Fill buffer with silence in IAudioRenderClient:: GetBuffer.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: a5975bb6013a45d36b4b554e6e31cf087ab30982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5975bb6013a45d36b4b554e6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 12 10:17:21 2013 -0600 mmdevapi: Fill buffer with silence in IAudioRenderClient::GetBuffer. --- dlls/mmdevapi/tests/render.c | 15 +++++++++++++-- dlls/winealsa.drv/mmdevdrv.c | 22 ++++++++++++++++------ dlls/winecoreaudio.drv/mmdevdrv.c | 27 +++++++++++++++------------ dlls/wineoss.drv/mmdevdrv.c | 20 +++++++++++++------- 4 files changed, 57 insertions(+), 27 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 2755dbf..38495df 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -692,8 +692,8 @@ static void test_padding(void) IAudioRenderClient *arc; WAVEFORMATEX *pwfx; REFERENCE_TIME minp, defp; - BYTE *buf; - UINT32 psize, pad, written; + BYTE *buf, silence; + UINT32 psize, pad, written, i; hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); @@ -712,6 +712,11 @@ static void test_padding(void) if(hr != S_OK) return; + if(pwfx->wBitsPerSample == 8) + silence = 128; + else + silence = 0; + /** GetDevicePeriod * Default (= shared) device period is 10ms (e.g. 441 frames at 44100), * except when the HW/OS forces a particular alignment, @@ -738,6 +743,12 @@ static void test_padding(void) hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); ok(buf != NULL, "NULL buffer returned\n"); + for(i = 0; i < psize * pwfx->nBlockAlign; ++i){ + if(buf[i] != silence){ + ok(0, "buffer has data in it already\n"); + break; + } + } hr = IAudioRenderClient_GetBuffer(arc, 0, &buf); ok(hr == AUDCLNT_E_OUT_OF_ORDER, "GetBuffer 0 size failed: %08x\n", hr); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ba70b02..6e854e4 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2466,6 +2466,18 @@ static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) return AudioClient_Release(&This->IAudioClient_iface); } +static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; + if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || + (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + This->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * This->fmt->nBlockAlign); + else + memset(buffer, 0, frames * This->fmt->nBlockAlign); +} + static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { @@ -2515,6 +2527,8 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->getbuf_last = frames; } + silence_buffer(This, *data, frames); + LeaveCriticalSection(&This->lock); return S_OK; @@ -2568,12 +2582,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( else buffer = This->tmp_buffer; - if(flags & AUDCLNT_BUFFERFLAGS_SILENT){ - if(This->fmt->wBitsPerSample == 8) - memset(buffer, 128, written_frames * This->fmt->nBlockAlign); - else - memset(buffer, 0, written_frames * This->fmt->nBlockAlign); - } + if(flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(This, buffer, written_frames); if(This->getbuf_last < 0) alsa_wrap_buffer(This, buffer, written_frames); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index bfc6eb8..914baa9 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2024,6 +2024,18 @@ static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) return AudioClient_Release(&This->IAudioClient_iface); } +static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; + if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || + (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + This->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * This->fmt->nBlockAlign); + else + memset(buffer, 0, frames * This->fmt->nBlockAlign); +} + static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { @@ -2094,6 +2106,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->getbuf_last = frames; *data = This->public_buffer->mAudioData; + silence_buffer(This, *data, frames); OSSpinLockUnlock(&This->lock); @@ -2133,18 +2146,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( return AUDCLNT_E_INVALID_SIZE; } - if(flags & AUDCLNT_BUFFERFLAGS_SILENT){ - WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; - if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || - (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && - This->fmt->wBitsPerSample == 8) - memset(This->public_buffer->mAudioData, 128, - frames * This->fmt->nBlockAlign); - else - memset(This->public_buffer->mAudioData, 0, - frames * This->fmt->nBlockAlign); - } + if(flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(This, This->public_buffer->mAudioData, frames); This->public_buffer->mAudioDataByteSize = frames * This->fmt->nBlockAlign; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index bbc26b1..eab4723 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1367,12 +1367,16 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, return S_OK; } -static void oss_silence_buffer(ACImpl *This, BYTE *buf, UINT32 frames) -{ - if(This->fmt->wBitsPerSample == 8) - memset(buf, 128, frames * This->fmt->nBlockAlign); +static void silence_buffer(ACImpl *This, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)This->fmt; + if((This->fmt->wFormatTag == WAVE_FORMAT_PCM || + (This->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + This->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * This->fmt->nBlockAlign); else - memset(buf, 0, frames * This->fmt->nBlockAlign); + memset(buffer, 0, frames * This->fmt->nBlockAlign); } static void oss_write_data(ACImpl *This) @@ -1419,7 +1423,7 @@ static void oss_write_data(ACImpl *This) to_write_bytes = to_write_frames * This->fmt->nBlockAlign; if(This->session->mute) - oss_silence_buffer(This, buf, to_write_frames); + silence_buffer(This, buf, to_write_frames); written_bytes = write(This->fd, buf, to_write_bytes); if(written_bytes < 0){ @@ -1445,7 +1449,7 @@ static void oss_write_data(ACImpl *This) to_write_bytes = to_write_frames * This->fmt->nBlockAlign; if(This->session->mute) - oss_silence_buffer(This, This->local_buffer, to_write_frames); + silence_buffer(This, This->local_buffer, to_write_frames); written_bytes = write(This->fd, This->local_buffer, to_write_bytes); if(written_bytes < 0){ @@ -1846,6 +1850,8 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->getbuf_last = frames; } + silence_buffer(This, *data, frames); + LeaveCriticalSection(&This->lock); return S_OK; @@ -1902,7 +1908,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( buffer = This->tmp_buffer; if(flags & AUDCLNT_BUFFERFLAGS_SILENT) - oss_silence_buffer(This, buffer, written_frames); + silence_buffer(This, buffer, written_frames); if(This->getbuf_last < 0) oss_wrap_buffer(This, buffer, written_frames);

1 0

Henri Verbeet : ddrawex: Get rid of the IDirectDrawSurfaceImpl typedef.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 8c97327da613a1eddecc02410ead27060c5d6ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c97327da613a1eddecc02410… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:29 2013 +0100 ddrawex: Get rid of the IDirectDrawSurfaceImpl typedef. --- dlls/ddrawex/ddraw.c | 2 +- dlls/ddrawex/ddrawex_private.h | 10 +- dlls/ddrawex/surface.c | 1423 +++++++++++++++++++++------------------- 3 files changed, 766 insertions(+), 669 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c97327da613a1eddecc0…

1 0

Henri Verbeet : ddrawex: Get rid of the IDirectDrawImpl typedef.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 38b4364ce4039d9f0bb2ec5fd7c53b1e5d65a3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b4364ce4039d9f0bb2ec5fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:28 2013 +0100 ddrawex: Get rid of the IDirectDrawImpl typedef. --- dlls/ddrawex/ddraw.c | 1566 +++++++++++++++++++++------------------ dlls/ddrawex/ddrawex_private.h | 7 +- 2 files changed, 845 insertions(+), 728 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38b4364ce4039d9f0bb2e…

1 0

Henri Verbeet : ddraw: Create wined3d textures before ddraw surfaces.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 3d452ed95a11becb56c4fbc2145e3ff9aba43d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d452ed95a11becb56c4fbc21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:27 2013 +0100 ddraw: Create wined3d textures before ddraw surfaces. --- dlls/ddraw/ddraw.c | 35 +++++++++-------------------------- dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/surface.c | 33 ++++++++++++++++++++------------- 3 files changed, 31 insertions(+), 40 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f9a4b09..1dafa1e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3116,8 +3116,15 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - /* Create the first surface */ - if (FAILED(hr = ddraw_create_surface(ddraw, &desc2, flags, &object, version))) + if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) + { + if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, flags, &object))) + { + WARN("Failed to create texture, hr %#x.\n", hr); + return hr; + } + } + else if (FAILED(hr = ddraw_create_surface(ddraw, &desc2, flags, &object, version))) { WARN("ddraw_create_surface failed, hr %#x.\n", hr); return hr; @@ -3168,22 +3175,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) - { - hr = ddraw_surface_create_texture(object, flags); - if (FAILED(hr)) - { - if (version == 7) - IDirectDrawSurface7_Release(&object->IDirectDrawSurface7_iface); - else if (version == 4) - IDirectDrawSurface4_Release(&object->IDirectDrawSurface4_iface); - else - IDirectDrawSurface_Release(&object->IDirectDrawSurface_iface); - - return hr; - } - } - if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) ddraw->primary = object; @@ -5160,13 +5151,6 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ TRACE("device_parent %p, container_parent %p, wined3d_desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", device_parent, container_parent, wined3d_desc, sub_resource_idx, flags, surface); - /* The ddraw root surface is created before the wined3d texture. */ - if (!sub_resource_idx) - { - ddraw_surface = texture->root; - goto done; - } - desc.dwWidth = wined3d_desc->width; desc.dwHeight = wined3d_desc->height; @@ -5174,7 +5158,6 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ if (FAILED(hr = ddraw_create_surface(ddraw, &desc, flags, &ddraw_surface, texture->version))) return hr; -done: *surface = ddraw_surface->wined3d_surface; wined3d_surface_incref(*surface); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 24a02de..8c37a1e 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -193,7 +193,8 @@ struct ddraw_texture struct ddraw_surface *root; }; -HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surface_flags) DECLSPEC_HIDDEN; +HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 *desc, + unsigned int version, DWORD surface_flags, struct ddraw_surface **surface) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, DDSURFACEDESC2 *desc, DWORD flags, UINT version) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 13dc1a6..808cd5f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5588,11 +5588,12 @@ static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops = ddraw_texture_wined3d_object_destroyed, }; -HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surface_flags) +HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 *desc, + unsigned int version, DWORD surface_flags, struct ddraw_surface **surface) { - const DDSURFACEDESC2 *desc = &surface->surface_desc; + struct ddraw_surface *root, *mip, **attach; struct wined3d_resource_desc wined3d_desc; - struct ddraw_surface *mip, **attach; + struct wined3d_texture *wined3d_texture; struct wined3d_resource *resource; struct ddraw_texture *texture; UINT layers, levels, i, j; @@ -5603,9 +5604,8 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) return E_OUTOFMEMORY; - texture->version = surface->version; + texture->version = version; texture->surface_desc = *desc; - texture->root = surface; if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) levels = desc->u2.dwMipMapCount; @@ -5636,7 +5636,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac pool = WINED3D_POOL_DEFAULT; } - wined3d_desc.format = wined3dformat_from_ddrawformat(&surface->surface_desc.u4.ddpfPixelFormat); + wined3d_desc.format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.pool = pool; @@ -5648,14 +5648,14 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) { wined3d_desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE; - hr = wined3d_texture_create_cube(surface->ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); + hr = wined3d_texture_create_cube(ddraw->wined3d_device, &wined3d_desc, levels, + surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); } else { wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE; - hr = wined3d_texture_create_2d(surface->ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); + hr = wined3d_texture_create_2d(ddraw->wined3d_device, &wined3d_desc, levels, + surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); } if (FAILED(hr)) @@ -5675,16 +5675,21 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac return hr; } + resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); + root = wined3d_resource_get_parent(resource); + root->wined3d_texture = wined3d_texture; + texture->root = root; + for (i = 0; i < layers; ++i) { - attach = &surface->complex_array[layers - 1 - i]; + attach = &root->complex_array[layers - 1 - i]; for (j = 0; j < levels; ++j) { - resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, i * levels + j); + resource = wined3d_texture_get_sub_resource(wined3d_texture, i * levels + j); mip = wined3d_resource_get_parent(resource); - if (mip == surface) + if (mip == root) continue; mip_desc = &mip->surface_desc; @@ -5727,6 +5732,8 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac } } + *surface = root; + return DD_OK; }

1 0

Henri Verbeet : ddraw: Introduce a ddraw_texture structure as parent for textures.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: 80dbeb9699d3fe4afa5e38391cb21cad03c4b2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=80dbeb9699d3fe4afa5e38391… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:26 2013 +0100 ddraw: Introduce a ddraw_texture structure as parent for textures. --- dlls/ddraw/ddraw.c | 8 ++++---- dlls/ddraw/ddraw_private.h | 8 ++++++++ dlls/ddraw/device.c | 10 +++++----- dlls/ddraw/surface.c | 20 +++++++++++++++----- 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 964428a..f9a4b09 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5152,8 +5152,8 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ DWORD flags, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - struct ddraw_surface *tex_root = container_parent; - DDSURFACEDESC2 desc = tex_root->surface_desc; + struct ddraw_texture *texture = container_parent; + DDSURFACEDESC2 desc = texture->surface_desc; struct ddraw_surface *ddraw_surface; HRESULT hr; @@ -5163,7 +5163,7 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ /* The ddraw root surface is created before the wined3d texture. */ if (!sub_resource_idx) { - ddraw_surface = tex_root; + ddraw_surface = texture->root; goto done; } @@ -5171,7 +5171,7 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ desc.dwHeight = wined3d_desc->height; /* FIXME: Validate that format, usage, pool, etc. really make sense. */ - if (FAILED(hr = ddraw_create_surface(ddraw, &desc, flags, &ddraw_surface, tex_root->version))) + if (FAILED(hr = ddraw_create_surface(ddraw, &desc, flags, &ddraw_surface, texture->version))) return hr; done: diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 21e0ca8..24a02de 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -185,6 +185,14 @@ struct ddraw_surface DWORD Handle; }; +struct ddraw_texture +{ + unsigned int version; + DDSURFACEDESC2 surface_desc; + + struct ddraw_surface *root; +}; + HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surface_flags) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, DDSURFACEDESC2 *desc, DWORD flags, UINT version) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f1b1346..b7511bc 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2454,9 +2454,9 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, { /* The parent of the texture is the IDirectDrawSurface7 * interface of the ddraw surface. */ - struct ddraw_surface *parent = wined3d_texture_get_parent(tex); + struct ddraw_texture *parent = wined3d_texture_get_parent(tex); if (parent) - *value = parent->Handle; + *value = parent->root->Handle; } wined3d_mutex_unlock(); @@ -4586,7 +4586,7 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct wined3d_texture *wined3d_texture; - struct ddraw_surface *surface; + struct ddraw_texture *ddraw_texture; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); @@ -4601,8 +4601,8 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface, return D3D_OK; } - surface = wined3d_texture_get_parent(wined3d_texture); - *texture = &surface->IDirectDrawSurface7_iface; + ddraw_texture = wined3d_texture_get_parent(wined3d_texture); + *texture = &ddraw_texture->root->IDirectDrawSurface7_iface; IDirectDrawSurface7_AddRef(*texture); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index bbe7d0e..13dc1a6 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5575,11 +5575,12 @@ static const struct wined3d_parent_ops ddraw_surface_wined3d_parent_ops = static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void *parent) { - struct ddraw_surface *surface = parent; + struct ddraw_texture *texture = parent; - TRACE("surface %p.\n", surface); + TRACE("texture %p.\n", texture); - ddraw_surface_cleanup(surface); + ddraw_surface_cleanup(texture->root); + HeapFree(GetProcessHeap(), 0, parent); } static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops = @@ -5593,11 +5594,19 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac struct wined3d_resource_desc wined3d_desc; struct ddraw_surface *mip, **attach; struct wined3d_resource *resource; + struct ddraw_texture *texture; UINT layers, levels, i, j; DDSURFACEDESC2 *mip_desc; enum wined3d_pool pool; HRESULT hr; + if (!(texture = HeapAlloc(GetProcessHeap(), 0, sizeof(*texture)))) + return E_OUTOFMEMORY; + + texture->version = surface->version; + texture->surface_desc = *desc; + texture->root = surface; + if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) levels = desc->u2.dwMipMapCount; else @@ -5640,13 +5649,13 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac { wined3d_desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE; hr = wined3d_texture_create_cube(surface->ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); + surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); } else { wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE; hr = wined3d_texture_create_2d(surface->ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, surface, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); + surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &surface->wined3d_texture); } if (FAILED(hr)) @@ -5662,6 +5671,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac FIXME("Unexpected wined3d error %#x.\n", hr); break; } + HeapFree(GetProcessHeap(), 0, texture); return hr; }

1 0

Henri Verbeet : d3d8: Clear pBits and Pitch when d3d8_surface_LockRect() fails.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: b83a0b9d3ee88b5a09700bc3a25d3ae3a49aa84f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83a0b9d3ee88b5a09700bc3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 12 11:00:25 2013 +0100 d3d8: Clear pBits and Pitch when d3d8_surface_LockRect() fails. This is a only slightly modified version of a patch by Lasse Rasinen. --- dlls/d3d8/surface.c | 12 ++++++++++-- dlls/d3d8/tests/device.c | 4 ++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index a157c51..0b40c46 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -273,8 +273,16 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags); wined3d_mutex_unlock(); - locked_rect->Pitch = map_desc.row_pitch; - locked_rect->pBits = map_desc.data; + if (SUCCEEDED(hr)) + { + locked_rect->Pitch = map_desc.row_pitch; + locked_rect->pBits = map_desc.data; + } + else + { + locked_rect->Pitch = 0; + locked_rect->pBits = NULL; + } return hr; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a0fcd71..f5afbc4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4039,8 +4039,12 @@ static void test_lockrect_invalid(void) hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); ok(SUCCEEDED(hr), "Failed to lock surface with rect NULL, hr %#x.\n", hr); + locked_rect.pBits = (void *)0xdeadbeef; + locked_rect.Pitch = 1; hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(!locked_rect.pBits, "Got unexpected pBits %p.\n", locked_rect.pBits); + ok(!locked_rect.Pitch, "Got unexpected Pitch %u.\n", locked_rect.Pitch); hr = IDirect3DSurface8_UnlockRect(surface); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr);

1 0

Dmitry Timoshkov : gdiplus: Get rid of no longer needed path and region fields.
by Alexandre Julliard 12 Nov '13

12 Nov '13

Module: wine Branch: master Commit: f5d807b7d7f284e2037397007c73e5d73f77138f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d807b7d7f284e2037397007… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 12 18:16:28 2013 +0900 gdiplus: Get rid of no longer needed path and region fields. --- dlls/gdiplus/gdiplus.c | 2 +- dlls/gdiplus/gdiplus_private.h | 20 +----------------- dlls/gdiplus/region.c | 41 ++++++++++++++++----------------------- 3 files changed, 20 insertions(+), 43 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index a76143e..8cef167 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -459,7 +459,7 @@ void delete_element(region_element* element) case RegionDataRect: break; case RegionDataPath: - GdipDeletePath(element->elementdata.pathdata.path); + GdipDeletePath(element->elementdata.path); break; case RegionDataEmptyRect: case RegionDataInfiniteRect: diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 19b2130..b2327f9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -404,17 +404,7 @@ struct region_element union { GpRectF rect; - struct - { - GpPath* path; - struct - { - DWORD size; - DWORD magic; - DWORD count; - DWORD flags; - } pathheader; - } pathdata; + GpPath *path; struct { struct region_element *left; /* the original region */ @@ -424,13 +414,7 @@ struct region_element }; struct GpRegion{ - struct - { - DWORD size; - DWORD checksum; - DWORD magic; - DWORD num_children; - } header; + DWORD num_children; region_element node; }; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 4f16f62..aef2ac7 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -123,7 +123,7 @@ static inline INT get_element_size(const region_element* element) return needed + sizeof(GpRect); case RegionDataPath: { - const GpPath *path = element->elementdata.pathdata.path; + const GpPath *path = element->elementdata.path; DWORD flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; /* 3 for headers, once again size doesn't count itself */ needed += sizeof(DWORD) * 3; @@ -151,11 +151,8 @@ static inline INT get_element_size(const region_element* element) /* Does not check parameters, caller must do that */ static inline GpStatus init_region(GpRegion* region, const RegionType type) { - region->node.type = type; - region->header.checksum = 0xdeadbeef; - region->header.magic = VERSION_MAGIC; - region->header.num_children = 0; - region->header.size = 0; + region->node.type = type; + region->num_children = 0; return Ok; } @@ -183,9 +180,7 @@ static inline GpStatus clone_element(const region_element* element, case RegionDataInfiniteRect: return Ok; case RegionDataPath: - (*element2)->elementdata.pathdata.pathheader = element->elementdata.pathdata.pathheader; - stat = GdipClonePath(element->elementdata.pathdata.path, - &(*element2)->elementdata.pathdata.path); + stat = GdipClonePath(element->elementdata.path, &(*element2)->elementdata.path); if (stat == Ok) return Ok; break; default: @@ -217,9 +212,7 @@ static inline void fuse_region(GpRegion* region, region_element* left, region->node.type = mode; region->node.elementdata.combine.left = left; region->node.elementdata.combine.right = right; - - region->header.size = sizeheader_size + get_element_size(&region->node); - region->header.num_children += 2; + region->num_children += 2; } /***************************************************************************** @@ -249,7 +242,7 @@ GpStatus WINGDIPAPI GdipCloneRegion(GpRegion *region, GpRegion **clone) return OutOfMemory; element = &(*clone)->node; - (*clone)->header = region->header; + (*clone)->num_children = region->num_children; return clone_element(&region->node, &element); } @@ -406,7 +399,7 @@ GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, } fuse_region(region1, left, right, mode); - region1->header.num_children += region2->header.num_children; + region1->num_children += region2->num_children; return Ok; } @@ -470,7 +463,7 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) } element = &(*region)->node; - stat = GdipClonePath(path, &element->elementdata.pathdata.path); + stat = GdipClonePath(path, &element->elementdata.path); if (stat != Ok) { GdipDeleteRegion(*region); @@ -741,7 +734,7 @@ static void write_element(const region_element* element, DWORD *buffer, case RegionDataPath: { INT i; - const GpPath* path = element->elementdata.pathdata.path; + const GpPath* path = element->elementdata.path; struct _pathheader { DWORD size; @@ -845,7 +838,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, region_header->size = sizeheader_size + get_element_size(&region->node); region_header->checksum = 0; region_header->magic = VERSION_MAGIC; - region_header->num_children = region->header.num_children; + region_header->num_children = region->num_children; filled += 4; /* With few exceptions, everything written is DWORD aligned, * so use that as our base */ @@ -938,7 +931,7 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap *hrgn = CreateRectRgn(0, 0, 0, 0); return *hrgn ? Ok : OutOfMemory; case RegionDataPath: - return get_path_hrgn(element->elementdata.pathdata.path, graphics, hrgn); + return get_path_hrgn(element->elementdata.path, graphics, hrgn); case RegionDataRect: { GpPath* path; @@ -1298,12 +1291,12 @@ static GpStatus transform_region_element(region_element* element, GpMatrix *matr } /* Fall-through to do the actual conversion. */ case RegionDataPath: - if (!element->elementdata.pathdata.path->pathdata.Count) + if (!element->elementdata.path->pathdata.Count) return Ok; stat = GdipTransformMatrixPoints(matrix, - element->elementdata.pathdata.path->pathdata.Points, - element->elementdata.pathdata.path->pathdata.Count); + element->elementdata.path->pathdata.Points, + element->elementdata.path->pathdata.Count); return stat; default: stat = transform_region_element(element->elementdata.combine.left, matrix); @@ -1338,9 +1331,9 @@ static void translate_region_element(region_element* element, REAL dx, REAL dy) element->elementdata.rect.Y += dy; return; case RegionDataPath: - for(i = 0; i < element->elementdata.pathdata.path->pathdata.Count; i++){ - element->elementdata.pathdata.path->pathdata.Points[i].X += dx; - element->elementdata.pathdata.path->pathdata.Points[i].Y += dy; + for(i = 0; i < element->elementdata.path->pathdata.Count; i++){ + element->elementdata.path->pathdata.Points[i].X += dx; + element->elementdata.path->pathdata.Points[i].Y += dy; } return; default:

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
57
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 November 2013