December 2011 - Wine-commits

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

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

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

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: 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: 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: 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

Nikolay Sivov : msxml3: Use IXMLDOMDocument3 as a latest interface version.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 01ed475c7c277ac4068e942f925967e4b3469b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ed475c7c277ac4068e942f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 14:02:18 2011 +0300 msxml3: Use IXMLDOMDocument3 as a latest interface version. --- dlls/msxml3/attribute.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index aec1679..58be87d 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -432,17 +432,17 @@ static HRESULT WINAPI domattr_get_nodeTypedValue( hr = IXMLDOMAttribute_get_ownerDocument(iface, &doc); if (hr == S_OK) { - IXMLDOMDocument2 *doc2; + IXMLDOMDocument3 *doc3; - hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMDocument2, (void**)&doc2); + hr = IXMLDOMDocument_QueryInterface(doc, &IID_IXMLDOMDocument3, (void**)&doc3); IXMLDOMDocument_Release(doc); if (hr == S_OK) { VARIANT schemas; - hr = IXMLDOMDocument2_get_schemas(doc2, &schemas); - IXMLDOMDocument2_Release(doc2); + hr = IXMLDOMDocument3_get_schemas(doc3, &schemas); + IXMLDOMDocument3_Release(doc3); if (hr != S_OK) return IXMLDOMAttribute_get_value(iface, value);

1 0

Nikolay Sivov : msxml3: IDispatchEx support for MXNamespaceManager.
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: e191b051b18df52f2e61bb9cfa3f4891d56852c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e191b051b18df52f2e61bb9cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 11 14:31:05 2011 +0300 msxml3: IDispatchEx support for MXNamespaceManager. --- dlls/msxml3/mxnamespace.c | 96 ++++++++++++++------------------- dlls/msxml3/tests/domdoc.c | 129 +++++++++++++++++++++++-------------------- 2 files changed, 109 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e191b051b18df52f2e61b…

1 0

Henri Verbeet : ddraw: Destroy the swapchain after the D3D device in DllMain().
by Alexandre Julliard 12 Dec '11

12 Dec '11

Module: wine Branch: master Commit: 9d55388156e5b95104d4c8566739ce6e9b81ba24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d55388156e5b95104d4c8566… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Dec 11 21:43:28 2011 +0100 ddraw: Destroy the swapchain after the D3D device in DllMain(). --- dlls/ddraw/main.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 9d5bb53..1477913 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -941,9 +941,6 @@ DllMain(HINSTANCE hInstDLL, IDirectDraw4_AddRef(&ddraw->IDirectDraw4_iface); IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); - if (ddraw->wined3d_swapchain) - ddraw_destroy_swapchain(ddraw); - /* Does a D3D device exist? Destroy it * TODO: Destroy all Vertex buffers, Lights, Materials * and execute buffers too @@ -954,6 +951,12 @@ DllMain(HINSTANCE hInstDLL, while(IDirect3DDevice7_Release(&ddraw->d3ddevice->IDirect3DDevice7_iface)); } + /* Destroy the swapchain after any 3D device. The 3D device + * cleanup code needs a swapchain. Specifically, it tries to + * set the current render target to the front buffer. */ + if (ddraw->wined3d_swapchain) + ddraw_destroy_swapchain(ddraw); + /* Try to release the objects * Do an EnumSurfaces to find any hanging surfaces */

1 0