wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Aric Stewart : usp10: Resync script_props table.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 0d15c70a60e5ace9c5e2dca53eb9933e2d35f92b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d15c70a60e5ace9c5e2dca53… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 12 07:31:35 2011 -0600 usp10: Resync script_props table. --- dlls/usp10/usp10.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a358f33..1f225b0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -416,7 +416,8 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[40].props, &scriptInformation[41].props, &scriptInformation[42].props, &scriptInformation[43].props, &scriptInformation[44].props, &scriptInformation[45].props, - &scriptInformation[46].props, &scriptInformation[47].props + &scriptInformation[46].props, &scriptInformation[47].props, + &scriptInformation[48].props }; typedef struct {

1 0

Jörg Höhle : winealsa: Implement IAudioClock:: GetPosition() using snd_pcm_delay.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 62017964bead565a1da427faaf083e5103c27440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62017964bead565a1da427faa… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Fri Dec 9 17:12:54 2011 +0100 winealsa: Implement IAudioClock::GetPosition() using snd_pcm_delay. --- dlls/winealsa.drv/mmdevdrv.c | 50 ++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index bfff159..359997e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -109,7 +109,7 @@ struct ACImpl { BOOL initted, started; REFERENCE_TIME mmdev_period_rt; - UINT64 written_frames; + UINT64 written_frames, last_pos_frames; UINT32 bufsize_frames, held_frames, tmp_buffer_frames; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ @@ -1790,6 +1790,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) if(snd_pcm_prepare(This->pcm_handle) < 0) WARN("snd_pcm_prepare failed\n"); + This->last_pos_frames = 0; This->held_frames = 0; This->written_frames = 0; This->lcl_offs_frames = 0; @@ -2291,8 +2292,12 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, UINT64 *qpctime) { ACImpl *This = impl_from_IAudioClock(iface); - UINT32 pad; - HRESULT hr; + UINT64 written_frames, position; + UINT32 held_frames; + int err; + snd_pcm_state_t alsa_state; + snd_pcm_uframes_t avail_frames; + snd_pcm_sframes_t delay_frames; TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); @@ -2301,19 +2306,42 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, EnterCriticalSection(&This->lock); - hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); - if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); - return hr; + /* call required to get accurate snd_pcm_state() */ + avail_frames = snd_pcm_avail_update(This->pcm_handle); + alsa_state = snd_pcm_state(This->pcm_handle); + written_frames = This->written_frames; + held_frames = This->held_frames; + + err = snd_pcm_delay(This->pcm_handle, &delay_frames); + if(err < 0){ + /* old Pulse, shortly after start */ + WARN("snd_pcm_delay failed in state %u: %d (%s)\n", alsa_state, err, snd_strerror(err)); } - if(This->dataflow == eRender) - *pos = This->written_frames - pad; - else if(This->dataflow == eCapture) - *pos = This->written_frames + pad; + if(This->dataflow == eRender){ + position = written_frames - held_frames; /* maximum */ + if(!This->started || alsa_state > SND_PCM_STATE_RUNNING) + ; /* mmdevapi stopped or ALSA underrun: pretend everything was played */ + else if(err<0 || delay_frames > position - This->last_pos_frames) + /* Pulse bug: past underrun, despite recovery, avail_frames & delay + * may be larger than alsa_bufsize_frames, as if cumulating frames. */ + /* Pulse bug: EIO(-5) shortly after starting: nothing played */ + position = This->last_pos_frames; + else if(delay_frames > 0) + position -= delay_frames; + }else + position = written_frames + held_frames; + + /* ensure monotic growth */ + This->last_pos_frames = position; LeaveCriticalSection(&This->lock); + TRACE("frames written: %u, held: %u, avail: %ld, delay: %ld state %d, pos: %u\n", + (UINT32)(written_frames%1000000000), held_frames, + avail_frames, delay_frames, alsa_state, (UINT32)(position%1000000000)); + *pos = position; + if(qpctime){ LARGE_INTEGER stamp, freq; QueryPerformanceCounter(&stamp);

1 0

Piotr Caban : services: Terminate service when its status is set to SERVICE_STOPPED.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: c21ede4474af3f2307bdc3178ae3cb5b0c26dbe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21ede4474af3f2307bdc3178… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 12 11:04:58 2011 +0100 services: Terminate service when its status is set to SERVICE_STOPPED. --- programs/services/rpc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 0de183a..579602a 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -697,7 +697,9 @@ DWORD __cdecl svcctl_SetServiceStatus( service->service_entry->status.dwWaitHint = lpServiceStatus->dwWaitHint; service_unlock(service->service_entry); - if (service->service_entry->status_changed_event) + if (lpServiceStatus->dwCurrentState == SERVICE_STOPPED) + service_terminate(service->service_entry); + else if (service->service_entry->status_changed_event) SetEvent(service->service_entry->status_changed_event); return ERROR_SUCCESS;

1 0

Piotr Caban : services: Move service cleanup code to separate function.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 01ef66cb1eeefa418bd4122b84c977e52490b350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ef66cb1eeefa418bd4122b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 12 11:04:46 2011 +0100 services: Move service cleanup code to separate function. --- programs/services/rpc.c | 5 +++++ programs/services/services.c | 37 +++++++++++++++++++++---------------- programs/services/services.h | 1 + 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 2337667..0de183a 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1062,6 +1062,11 @@ DWORD __cdecl svcctl_ControlService( break; } + if (result==ERROR_SUCCESS && !service->service_entry->control_mutex) { + result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; + service_terminate(service->service_entry); + } + if (result != ERROR_SUCCESS) { if (lpServiceStatus) diff --git a/programs/services/services.c b/programs/services/services.c index 865cb55..86d4d8c 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -847,22 +847,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (err == ERROR_SUCCESS) ReleaseMutex(service->control_mutex); else - { - CloseHandle(service->overlapped_event); - service->overlapped_event = NULL; - CloseHandle(service->status_changed_event); - service->status_changed_event = NULL; - CloseHandle(service->control_mutex); - service->control_mutex = NULL; - if (service->control_pipe != INVALID_HANDLE_VALUE) - CloseHandle(service->control_pipe); - service->control_pipe = INVALID_HANDLE_VALUE; - - service->status.dwProcessId = 0; - service_lock_exclusive(service); - service->status.dwCurrentState = SERVICE_STOPPED; - service_unlock(service); - } + service_terminate(service); scmdatabase_unlock_startup(service->db); WINE_TRACE("returning %d\n", err); @@ -870,6 +855,26 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * return err; } +void service_terminate(struct service_entry *service) +{ + service_lock_exclusive(service); + TerminateProcess(service->process, 0); + CloseHandle(service->process); + service->process = NULL; + CloseHandle(service->overlapped_event); + service->overlapped_event = NULL; + CloseHandle(service->status_changed_event); + service->status_changed_event = NULL; + CloseHandle(service->control_mutex); + service->control_mutex = NULL; + CloseHandle(service->control_pipe); + service->control_pipe = INVALID_HANDLE_VALUE; + + service->status.dwProcessId = 0; + service->status.dwCurrentState = SERVICE_STOPPED; + service_unlock(service); +} + static void load_registry_parameters(void) { static const WCHAR controlW[] = diff --git a/programs/services/services.h b/programs/services/services.h index 6a968d9..b4b895e 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -78,6 +78,7 @@ void service_lock_shared(struct service_entry *service); void service_lock_exclusive(struct service_entry *service); void service_unlock(struct service_entry *service); DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR *service_argv); +void service_terminate(struct service_entry *service); BOOL service_send_command( struct service_entry *service, HANDLE pipe, const void *data, DWORD size, DWORD *result );

1 0

Piotr Caban : services: Don' t close control_pipe when SERVICE_CONTROL_STOP is sent.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: bc866c899f8fd68bc5602401fb2fbc5348ede2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc866c899f8fd68bc5602401f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 12 11:04:28 2011 +0100 services: Don't close control_pipe when SERVICE_CONTROL_STOP is sent. This prevents service_control_dispatcher from being stopped. Thanks to it the service may continue to work and do the clean up. --- programs/services/rpc.c | 18 ++++-------------- programs/services/services.c | 1 + 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 5fe8585..2337667 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1015,7 +1015,6 @@ DWORD __cdecl svcctl_ControlService( DWORD result; BOOL ret; HANDLE control_mutex; - HANDLE control_pipe; WINE_TRACE("(%p, %d, %p)\n", hService, dwControl, lpServiceStatus); @@ -1085,22 +1084,19 @@ DWORD __cdecl svcctl_ControlService( return ERROR_INVALID_SERVICE_CONTROL; } - /* prevent races by caching these variables and clearing them on - * stop here instead of outside the services lock */ + /* prevent races by caching control_mutex and clearing it on + * stop instead of outside the services lock */ control_mutex = service->service_entry->control_mutex; - control_pipe = service->service_entry->control_pipe; if (dwControl == SERVICE_CONTROL_STOP) - { service->service_entry->control_mutex = NULL; - service->service_entry->control_pipe = INVALID_HANDLE_VALUE; - } service_unlock(service->service_entry); ret = WaitForSingleObject(control_mutex, 30000); if (ret == WAIT_OBJECT_0) { - service_send_control(service->service_entry, control_pipe, dwControl, &result); + service_send_control(service->service_entry, service->service_entry->control_pipe, + dwControl, &result); if (lpServiceStatus) { @@ -1116,10 +1112,7 @@ DWORD __cdecl svcctl_ControlService( } if (dwControl == SERVICE_CONTROL_STOP) - { CloseHandle(control_mutex); - CloseHandle(control_pipe); - } else ReleaseMutex(control_mutex); @@ -1128,10 +1121,7 @@ DWORD __cdecl svcctl_ControlService( else { if (dwControl == SERVICE_CONTROL_STOP) - { CloseHandle(control_mutex); - CloseHandle(control_pipe); - } return ERROR_SERVICE_REQUEST_TIMEOUT; } } diff --git a/programs/services/services.c b/programs/services/services.c index f2c5d26..865cb55 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -813,6 +813,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * return ERROR_SERVICE_ALREADY_RUNNING; } + CloseHandle(service->control_pipe); service->control_mutex = CreateMutexW(NULL, TRUE, NULL); if (!service->status_changed_event)

1 0

Piotr Caban : services: Check process status to determine if service has terminated.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: b9797b5caa5a9ec03574fbd3552d31250cb74a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9797b5caa5a9ec03574fbd35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 12 11:04:07 2011 +0100 services: Check process status to determine if service has terminated. --- programs/services/services.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 4a4aeb8..f2c5d26 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -807,7 +807,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (err != ERROR_SUCCESS) return err; - if (service->control_pipe != INVALID_HANDLE_VALUE) + if (WaitForSingleObject(service->process, 0) == WAIT_TIMEOUT) { scmdatabase_unlock_startup(service->db); return ERROR_SERVICE_ALREADY_RUNNING;

1 0

Piotr Caban : services: Fix SERVICE_STATUS initialization in svcctl_ControlService.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: c11e163eb789d099b70261afd3303d8ff8e826ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11e163eb789d099b70261afd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 12 11:03:55 2011 +0100 services: Fix SERVICE_STATUS initialization in svcctl_ControlService. --- programs/services/rpc.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 806e65d..5fe8585 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1048,29 +1048,35 @@ DWORD __cdecl svcctl_ControlService( service_lock_exclusive(service->service_entry); - if (lpServiceStatus) - { - lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; - lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; - lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; - lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; - lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; - lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; - lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; - } - + result = ERROR_SUCCESS; switch (service->service_entry->status.dwCurrentState) { case SERVICE_STOPPED: - service_unlock(service->service_entry); - return ERROR_SERVICE_NOT_ACTIVE; + result = ERROR_SERVICE_NOT_ACTIVE; + break; case SERVICE_START_PENDING: if (dwControl==SERVICE_CONTROL_STOP) break; /* fall thru */ case SERVICE_STOP_PENDING: + result = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; + break; + } + + if (result != ERROR_SUCCESS) + { + if (lpServiceStatus) + { + lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; + lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; + lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; + lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; + lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; + lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; + lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; + } service_unlock(service->service_entry); - return ERROR_SERVICE_CANNOT_ACCEPT_CTRL; + return result; } if (!service_accepts_control(service->service_entry, dwControl)) @@ -1096,6 +1102,19 @@ DWORD __cdecl svcctl_ControlService( { service_send_control(service->service_entry, control_pipe, dwControl, &result); + if (lpServiceStatus) + { + service_lock_shared(service->service_entry); + lpServiceStatus->dwServiceType = service->service_entry->status.dwServiceType; + lpServiceStatus->dwCurrentState = service->service_entry->status.dwCurrentState; + lpServiceStatus->dwControlsAccepted = service->service_entry->status.dwControlsAccepted; + lpServiceStatus->dwWin32ExitCode = service->service_entry->status.dwWin32ExitCode; + lpServiceStatus->dwServiceSpecificExitCode = service->service_entry->status.dwServiceSpecificExitCode; + lpServiceStatus->dwCheckPoint = service->service_entry->status.dwCheckPoint; + lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; + service_unlock(service->service_entry); + } + if (dwControl == SERVICE_CONTROL_STOP) { CloseHandle(control_mutex);

1 0

Hans Leidekker : msi: Format the value name from the RegLocator table.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 0f3eb5f689542f04240c8763f724203dcf653f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3eb5f689542f04240c8763f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 12 10:47:25 2011 +0100 msi: Format the value name from the RegLocator table. --- dlls/msi/appsearch.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index f93e05d..0010fd8 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -371,14 +371,11 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { static const WCHAR query[] = { - 's','e','l','e','c','t',' ','*',' ', - 'f','r','o','m',' ', - 'R','e','g','L','o','c','a','t','o','r',' ', - 'w','h','e','r','e',' ', + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'R','e','g','L','o','c','a','t','o','r',' ','W','H','E','R','E',' ', 'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; - LPWSTR keyPath = NULL, valueName = NULL; - LPWSTR deformatted = NULL; - LPWSTR ptr = NULL, end; + const WCHAR *keyPath, *valueName; + WCHAR *deformatted = NULL, *ptr = NULL, *end; int root, type; HKEY rootKey, key = NULL; DWORD sz = 0, regType; @@ -397,10 +394,10 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT return ERROR_SUCCESS; } - root = MSI_RecordGetInteger(row,2); - keyPath = msi_dup_record_field(row,3); - valueName = msi_dup_record_field(row,4); - type = MSI_RecordGetInteger(row,5); + root = MSI_RecordGetInteger(row, 2); + keyPath = MSI_RecordGetString(row, 3); + valueName = MSI_RecordGetString(row, 4); + type = MSI_RecordGetInteger(row, 5); deformat_string(package, keyPath, &deformatted); @@ -430,7 +427,10 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT goto end; } - rc = RegQueryValueExW(key, valueName, NULL, NULL, NULL, &sz); + msi_free(deformatted); + deformat_string(package, valueName, &deformatted); + + rc = RegQueryValueExW(key, deformatted, NULL, NULL, NULL, &sz); if (rc) { TRACE("RegQueryValueExW returned %d\n", rc); @@ -440,7 +440,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT * on the value of a property?) */ value = msi_alloc( sz ); - rc = RegQueryValueExW(key, valueName, NULL, &regType, value, &sz); + rc = RegQueryValueExW(key, deformatted, NULL, &regType, value, &sz); if (rc) { TRACE("RegQueryValueExW returned %d\n", rc); @@ -475,9 +475,6 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT end: msi_free( value ); RegCloseKey( key ); - - msi_free( keyPath ); - msi_free( valueName ); msi_free( deformatted ); msiobj_release(&row->hdr);

1 0

Alexandre Julliard : gdi32: Pass the correct depth to PutImage for SetBitmapBits on a DIB.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 70d8341a674582d2c1b9e99b7ea25c7d1110d8e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d8341a674582d2c1b9e99b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 14:34:48 2011 +0100 gdi32: Pass the correct depth to PutImage for SetBitmapBits on a DIB. --- dlls/gdi32/bitmap.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index af9012b..0d637ec 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -481,7 +481,7 @@ LONG WINAPI SetBitmapBits( /* query the color info */ info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; + info->bmiHeader.biBitCount = bmp->dib ? bmp->dib->dsBmih.biBitCount : bmp->bitmap.bmBitsPixel; info->bmiHeader.biCompression = BI_RGB; info->bmiHeader.biXPelsPerMeter = 0; info->bmiHeader.biYPelsPerMeter = 0; @@ -494,11 +494,9 @@ LONG WINAPI SetBitmapBits( if (!err || err == ERROR_BAD_FORMAT) { - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - info->bmiHeader.biWidth = bmp->bitmap.bmWidth; - info->bmiHeader.biHeight = -dst.height; - info->bmiHeader.biSizeImage = dst.height * dst_stride; + info->bmiHeader.biWidth = bmp->bitmap.bmWidth; + info->bmiHeader.biHeight = -dst.height; + info->bmiHeader.biSizeImage = dst.height * dst_stride; err = funcs->pPutImage( NULL, hbitmap, clip, info, &src_bits, &src, &dst, SRCCOPY ); } if (err) count = 0;

1 0

Alexandre Julliard : gdi32/tests: Add tests for 1-bpp DDB pattern brushes.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: f85a28faf6d7f2131c857b6ac9fe34d5437a6e56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85a28faf6d7f2131c857b6ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 13:38:55 2011 +0100 gdi32/tests: Add tests for 1-bpp DDB pattern brushes. --- dlls/gdi32/tests/dib.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 909457d..5d1eb8b 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -101,6 +101,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "5246ef357e7317b9d141a3294d300c195da76cb7", "87f6b6a19f021ca5912d285e14ce2ff9474d79f3", + "3d8244b665ecdb104087bad171b0b0f83545133c", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -163,6 +164,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "a78b28472bb7ff480ddedd06b9cf2daa775fa7ae", "5246ef357e7317b9d141a3294d300c195da76cb7", "87f6b6a19f021ca5912d285e14ce2ff9474d79f3", + "3d8244b665ecdb104087bad171b0b0f83545133c", "e2a8eef4aeda3a0f6c950075acba38f1f9e0814d", "8b66f14d51ecdeea12bc993302bb9b7d3ec085a1", "7da9dd3d40d44d92deb9883fb7110443c2d5769a", @@ -225,6 +227,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "473a1fd07df800c87a5d3286b642ace10c61c6af", "10cd25a0ed5cd8f978d7d68236f81d949b938e84", "b8951d2b20518fd129e5113a5f429626893913bf", + "e81fc45962f861d53f420e29cb5d33faf5adbec8", "4851c5b7d5bc18590e787c0c218a592ef504e738", "9aa506e3df33e0d5298755aa4144e10eb4b5adcf", "abdf003699364fe45fab7dc61e67c606d0063b40", @@ -287,6 +290,7 @@ static const char *sha1_graphics_r10g10b10[] = "92cddcabf5365eef1e037f488af52b31669d987f", "2c9c4f27bade080a2cd6f9160422762e267c2f5f", "c7ce29d189dc06ba57e64f0cc32202f5a25ba48d", + "717778cc9ab30bcfc026a4344ea1bdef870bd247", "7ac4cb547c8f4ce5079c95afad9d0e2b0cd76a0e", "d578210815e27fe210eb678a71e6d22ba4b4c196", "c7a027c7079dfcc831ca8bc134a509958273073c", @@ -349,6 +353,7 @@ static const char *sha1_graphics_r6g6b6[] = "2128157e601ef0d6b3636b7387d3b28e876de728", "8bdcdcd463f0052279d070ac763757f4db975483", "9ea0ad22d7b61598fe36e9c942242e8e07e32edb", + "8b6452ebd1f6d189d10ee6647e7704821559cfcb", "c39a25a61c4eade48dea62a97c9fb8714c06a8af", "66b130f83381957cfc4763558c5f5cddf2e3b564", "d548135ce2320499277ce12b80bc35004f8a9787", @@ -411,6 +416,7 @@ static const char *sha1_graphics_24[] = "adc20832d8c43f1cf372d8392535492013cd2306", "45649794dcbcabda487f66f7a80fc1bec79047a1", "367c2dc1e91ff9ea0e984d6fb3000cfb4e0ae7e9", + "9c6afd47dd748a33c585e6655fd4ec1c28976a47", "b4df692ac70a5f9f303270df4641ab014c6cbf46", "8bc3128ba47891366fd7b02fde7ca19100e64b9f", "e649e00efe7fea1eb8b17f7867fe089e5270c44b", @@ -473,6 +479,7 @@ static const char *sha1_graphics_r5g5b5[] = "6daaf945a955928c5c124c880522ca4634fb2343", "12a288390d16e1efa99d4185301de48a4d433b14", "ea92af2538b76f41a3a03eaa11ac395c9b6197c4", + "1d3af561605fd61433035600d8962cb8d266fdd0", "3a50ce21b3563a604b4fc9f247a30f5a981f1ba6", "d7d97e28ed316f6596c737eb83baa5948d86b673", "ecc2991277d7314f55b00e0f284ae3703aeef81e", @@ -539,6 +546,7 @@ static const char *sha1_graphics_r4g4b4[] = "1d283aa4d2b2114f7809fe59357d590c7c779aa7", "29640e2ddd2d3016da14507c3ce9b2ce32f39bb4", "57ebf8becac1524543da120e88e9cc57ecfdec49", + "e68ef3ffd7401244cdea79781eab12d7a5e8ca18", "d591232bbc2592462c819a9486750f64180518fd", "0e183a4c30b3da345129cffe33fe0fc593d8666b", "f14d9a4bd8a365b7c8f068a0dad481b6eb2b178b", @@ -600,6 +608,7 @@ static const char *sha1_graphics_8_color[] = "940db409d4c3e5640275724f9e5f7c1a0d2e21b2", "242ce86967ea62fa69c1e6f597ccbcf2f0b1602c", "5092b22af85a08f10a2899888bb9d552f25f828e", + "f5dafef807237fe72c74c0bbd47c382ace45bfde", "e91973be2651eeef568700463652838d8cbba976", "1df851515ecf46df5c2d3279535c1763f72353dd", "b68922915ebc2797d58deecf983f7d0cf9a5efbd", @@ -671,6 +680,7 @@ static const char *sha1_graphics_8_grayscale[] = "15b991814d84d6aa252696dd0c6150ef88a8db3f", "1cb52f2a4d17b9b0d8375d016aa8cf0677fcd29a", "9a6cfd68523e40ea1d52847d7747da912cfe2ca9", + "b6785a410048bb85e7ea3f0492459972103c935e", "82e641ebe47d9f8cc229b82b8315e69e52f812b1", "15db343049e3a9b31addc5d2ffebc3fe91b39c51", "a895daf1f20371d4d1c3f93c070124cc13e341c3", @@ -739,6 +749,7 @@ static const char *sha1_graphics_8[] = "7262364067e03c7fa498af1d59d228d6c63b460e", "5241241a355a667ef0834049adf4218e8b3f16b8", "db22d666690948eb966f75b796c72c7150a5c4b9", + "af21fb2645b568b049549de375584c4aa3055143", "1f13ea0034db4b0ffa4ddcff9664fd892058f9cd", "3caf512cfddfd463d0750cfe3cadb58548eb2ae8", "4e5e7d5fd64818b2b3d3e793c88f603b699d2f0f", @@ -804,6 +815,7 @@ static const char *sha1_graphics_4[] = "eb38683e812fd13dca971ba8f4cfd2b6820d3524", "73bbc83f88f1aaa6df0158b63e70bb3165163163", "0dc2690a5c58a2907a8ab06693ebfab6698172eb", + "df5f0d6574bdf1781754b5b9f98232a77e439e33", "39c16648cf6c261be71a33cec41867f28e119b94", "26ad5116562e7b58c76a26eaf521e2e40899e944", "1bcc54eaf8e3c2b7c59ecccb23c240181d7ba8b8", @@ -865,6 +877,7 @@ static const char *sha1_graphics_4_grayscale[] = "b067f0421cb2c83b218b8ab6edbede2ff5723b57", "c8de76f9c0900e5f86c7584fe94d5749376b7b49", "43ee3e187dda14b86aef12371041ae70313b5a65", + "7fab79b7f1a5cb2ec31ed8eeaf213b3d8dcde4d8", "d4930552a7845111ffd9db57260be1ab97967c06", "afdf41fca7951c6dd6193320de1295f2c68fe52a", "f2f1f331fe6b1b31d7c9ddd37793b375fc01d3d4", @@ -939,6 +952,9 @@ static const char *sha1_graphics_1[] = "4d95c3d1e170f004c80aa8c52feafb8e0e90760e", "c14832e69ec3585c15987b3d69d5007236fa9814", "e44ea620b0c47125a34193537ab9d219a52ad028", + "ef2db9fb75a672f69bab88e5d08fe64f50ec2bc4", + "8819bf7a43295161fe045a42936000b3a51fe200", + "e08dbc26469c229f75ccbf1a38a133401f270b84", "d1e6091caa4482d3142df3b958606c41ebf4698e", "07c1116d8286fb665a1005de220eadc3d5999aaf", "4afb0649488f6e6f7d3a2b8bf438d82f2c88f4d1", @@ -1196,6 +1212,9 @@ static const DWORD four_by_four_data[16] = { 0x000000, 0xff0000, 0x00ff00, 0x000 0x000000, 0xff0000, 0x00ff00, 0x0000ff, 0xffffff, 0x00ffff, 0xff00ff, 0xffff00 }; +static const DWORD ddb_brush_bits[8] = { 0x11112222, 0x33334444, 0x55556666, 0x77778888, + 0xaaaaaaaa, 0x00000000, 0x98765432, 0xabcdef00 }; + static inline void solid_patblt( HDC hdc, int x, int y, int width, int height, COLORREF color ) { HBRUSH brush = CreateSolidBrush( color ); @@ -1222,6 +1241,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh BOOL ret, dib_is_1bpp = (bmi->bmiHeader.biBitCount == 1); BOOL dib_is_8bpp_gray = (bmi->bmiHeader.biBitCount == 8 && bmi->bmiColors[1].rgbRed == 1); BLENDFUNCTION blend; + COLORREF old_text, old_bkgnd; blend.BlendOp = AC_SRC_OVER; blend.BlendFlags = 0; @@ -1606,7 +1626,35 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); + DeleteObject(dib_brush); + + /* 1 bpp ddb pattern brush */ + + old_text = GetTextColor( hdc ); + old_bkgnd = GetBkColor( hdc ); + bmp = CreateBitmap( 16, 16, 1, 1, ddb_brush_bits ); + dib_brush = CreatePatternBrush( bmp ); + SelectObject(hdc, dib_brush); + for(i = 0, y = 10; i < 256; i++) + { + SetTextColor(hdc, RGB( i, 2*i, 255 - i ) ); + SetBkColor(hdc, RGB( 255 - i, i / 3, i ) ); + if(!rop_uses_src(rop3[i])) + { + ret = PatBlt(hdc, 10 + i, y, 100, 20, rop3[i]); + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 25; + } + } + + compare_hash_broken_todo(bmi, bits, sha1, "1 bpp ddb brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); + memset(bits, 0xcc, dib_size); + + DeleteObject(bmp); + SelectObject(hdc, orig_brush); SetBrushOrgEx(hdc, 0, 0, NULL); + SetTextColor(hdc, old_text); + SetBkColor(hdc, old_bkgnd); /* Rectangle */

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
81
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 December 2011