wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

André Hentschel : comctl32/tests: Fix printing a NULL string.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 030ea68963c2e4947f5646cba88d61f84d8cf982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=030ea68963c2e4947f5646cba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 29 21:10:31 2011 +0200 comctl32/tests: Fix printing a NULL string. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 765992e..344df1d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -372,7 +372,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP /* always accept new item text */ NMLVDISPINFO *di = (NMLVDISPINFO*)lParam; g_editbox_disp_info = *di; - trace("LVN_ENDLABELEDIT: text=%s\n", di->item.pszText); + trace("LVN_ENDLABELEDIT: text=%s\n", di->item.pszText ? di->item.pszText : "(null)"); /* edit control still available from this notification */ edit = (HWND)SendMessageA(((NMHDR*)lParam)->hwndFrom, LVM_GETEDITCONTROL, 0, 0);

1 0

André Hentschel : rpcrt4/tests: Fix NULL string handling in an ok() check.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 328acc81fcbfce0a354555d214bb5b47d7686fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=328acc81fcbfce0a354555d21… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 29 21:10:12 2011 +0200 rpcrt4/tests: Fix NULL string handling in an ok() check. --- dlls/rpcrt4/tests/rpc.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index bdc1579..d914c97 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -594,8 +594,10 @@ static void test_RpcStringBindingParseA(void) ok(!strcmp((char *)protseq, "ncacn_np"), "protseq should have been ncacn_np instead of %s\n", protseq); ok(!strcmp((char *)network_addr, "."), "network_addr should have been . instead of %s\n", network_addr); ok(!strcmp((char *)endpoint, "pipetest"), "endpoint should have been pipetest instead of %s\n", endpoint); - todo_wine - ok(options && !strcmp((char *)options, ""), "options should have been \"\" of \"%s\"\n", options); + if (options) + ok(!strcmp((char *)options, ""), "options should have been \"\" of \"%s\"\n", options); + else + todo_wine ok(FALSE, "options is NULL\n"); RpcStringFreeA(&uuid); RpcStringFreeA(&protseq); RpcStringFreeA(&network_addr); @@ -609,8 +611,10 @@ static void test_RpcStringBindingParseA(void) ok(!strcmp((char *)protseq, "ncacn_np"), "protseq should have been ncacn_np instead of %s\n", protseq); ok(!strcmp((char *)network_addr, "."), "network_addr should have been . instead of %s\n", network_addr); ok(!strcmp((char *)endpoint, "pipetest"), "endpoint should have been pipetest instead of %s\n", endpoint); - todo_wine - ok(options && !strcmp((char *)options, ""), "options should have been \"\" of \"%s\"\n", options); + if (options) + ok(!strcmp((char *)options, ""), "options should have been \"\" of \"%s\"\n", options); + else + todo_wine ok(FALSE, "options is NULL\n"); RpcStringFreeA(&uuid); RpcStringFreeA(&protseq); RpcStringFreeA(&network_addr);

1 0

Francois Gouget : services: If a service is not started, then say so when ControlService() is called on it.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: fe3f2e3258164fbffb060c134e2d3ab7ad74037a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3f2e3258164fbffb060c134… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 29 19:55:17 2011 +0200 services: If a service is not started, then say so when ControlService() is called on it. --- dlls/advapi32/tests/service.c | 2 +- programs/services/rpc.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index d2ef54d..d594416 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2095,7 +2095,7 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, DWORD is_nt4 ret = ControlService(svc_handle, SERVICE_CONTROL_STOP, &status); le2 = GetLastError(); ok(!ret, "%s: ControlService() should have failed\n", name); - todo_wine ok(le2 == ERROR_SERVICE_NOT_ACTIVE, "%s: %d != ERROR_SERVICE_NOT_ACTIVE\n", name, le2); + ok(le2 == ERROR_SERVICE_NOT_ACTIVE, "%s: %d != ERROR_SERVICE_NOT_ACTIVE\n", name, le2); ok(status.dwCurrentState == SERVICE_STOPPED || broken(is_nt4), /* NT4 returns a random value */ "%s: should be stopped state=%x\n", name, status.dwCurrentState); diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 573b748..2d853c0 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1023,12 +1023,6 @@ DWORD __cdecl svcctl_ControlService( lpServiceStatus->dwWaitHint = service->service_entry->status.dwWaitHint; } - if (!service_accepts_control(service->service_entry, dwControl)) - { - service_unlock(service->service_entry); - return ERROR_INVALID_SERVICE_CONTROL; - } - switch (service->service_entry->status.dwCurrentState) { case SERVICE_STOPPED: @@ -1043,6 +1037,12 @@ DWORD __cdecl svcctl_ControlService( return ERROR_SERVICE_CANNOT_ACCEPT_CTRL; } + if (!service_accepts_control(service->service_entry, dwControl)) + { + service_unlock(service->service_entry); + return ERROR_INVALID_SERVICE_CONTROL; + } + /* prevent races by caching these variables and clearing them on * stop here instead of outside the services lock */ control_mutex = service->service_entry->control_mutex;

1 0

Francois Gouget : services: Refuse to start disabled services.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: eafb44d4e1fd6ac455e9529b1d74385c2163b1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafb44d4e1fd6ac455e9529b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 29 19:53:04 2011 +0200 services: Refuse to start disabled services. --- dlls/advapi32/tests/service.c | 2 +- programs/services/rpc.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 044394a..d2ef54d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2151,7 +2151,7 @@ static void test_start_stop(void) goto cleanup; } le = try_start_stop(svc_handle, displayname, is_nt4); - todo_wine ok(le == ERROR_SERVICE_DISABLED, "%d != ERROR_SERVICE_DISABLED\n", le); + ok(le == ERROR_SERVICE_DISABLED, "%d != ERROR_SERVICE_DISABLED\n", le); /* Then one with a bad path */ displayname = "Winetest Bad Path"; diff --git a/programs/services/rpc.c b/programs/services/rpc.c index fe33ce1..573b748 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -961,6 +961,9 @@ DWORD __cdecl svcctl_StartServiceW( if ((err = validate_service_handle(hService, SERVICE_START, &service)) != 0) return err; + if (service->service_entry->config.dwStartType == SERVICE_DISABLED) + return ERROR_SERVICE_DISABLED; + err = service_start(service->service_entry, dwNumServiceArgs, lpServiceArgVectors); return err;

1 0

Francois Gouget : services: Cleanup when a service fails to start so it is still fully considered to be stopped .
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 9183a171f16aec2c5c2c0d2746d8a6e3a2d3e134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9183a171f16aec2c5c2c0d274… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 29 19:52:45 2011 +0200 services: Cleanup when a service fails to start so it is still fully considered to be stopped. --- dlls/advapi32/tests/service.c | 25 ++++++++++------------- programs/services/services.c | 44 ++++++++++++++++++++++++++++------------ 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 9b6e313..044394a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2065,7 +2065,7 @@ cleanup: CloseServiceHandle(scm_handle); } -static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, int todo, DWORD is_nt4) +static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, DWORD is_nt4) { BOOL ret; DWORD le1, le2; @@ -2082,24 +2082,21 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, int todo, DW ret = pQueryServiceStatusEx(svc_handle, SC_STATUS_PROCESS_INFO, (BYTE*)&statusproc, sizeof(statusproc), &needed); ok(ret, "%s: QueryServiceStatusEx() failed le=%u\n", name, GetLastError()); - todo_wine ok(statusproc.dwCurrentState == SERVICE_STOPPED, "%s: should be stopped state=%x\n", name, statusproc.dwCurrentState); - todo_wine ok(statusproc.dwProcessId == 0, "%s: ProcessId should be 0 instead of %x\n", name, statusproc.dwProcessId); + ok(statusproc.dwCurrentState == SERVICE_STOPPED, "%s: should be stopped state=%x\n", name, statusproc.dwCurrentState); + ok(statusproc.dwProcessId == 0, "%s: ProcessId should be 0 instead of %x\n", name, statusproc.dwProcessId); } ret = StartServiceA(svc_handle, 0, NULL); le2 = GetLastError(); ok(!ret, "%s: StartServiceA() should have failed\n", name); - if (todo) - todo_wine ok(le2 == le1, "%s: the second try should yield the same error: %u != %u\n", name, le1, le2); - else - ok(le2 == le1, "%s: the second try should yield the same error: %u != %u\n", name, le1, le2); + ok(le2 == le1, "%s: the second try should yield the same error: %u != %u\n", name, le1, le2); status.dwCurrentState = 0xdeadbeef; ret = ControlService(svc_handle, SERVICE_CONTROL_STOP, &status); le2 = GetLastError(); ok(!ret, "%s: ControlService() should have failed\n", name); todo_wine ok(le2 == ERROR_SERVICE_NOT_ACTIVE, "%s: %d != ERROR_SERVICE_NOT_ACTIVE\n", name, le2); - todo_wine ok(status.dwCurrentState == SERVICE_STOPPED || + ok(status.dwCurrentState == SERVICE_STOPPED || broken(is_nt4), /* NT4 returns a random value */ "%s: should be stopped state=%x\n", name, status.dwCurrentState); @@ -2153,14 +2150,14 @@ static void test_start_stop(void) ok(FALSE, "Could not create the service: %d\n", GetLastError()); goto cleanup; } - le = try_start_stop(svc_handle, displayname, 1, is_nt4); + le = try_start_stop(svc_handle, displayname, is_nt4); todo_wine ok(le == ERROR_SERVICE_DISABLED, "%d != ERROR_SERVICE_DISABLED\n", le); /* Then one with a bad path */ displayname = "Winetest Bad Path"; ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_DEMAND_START, SERVICE_NO_CHANGE, "c:\\no_such_file.exe", NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - try_start_stop(svc_handle, displayname, 0, is_nt4); + try_start_stop(svc_handle, displayname, is_nt4); if (is_nt4) { @@ -2175,8 +2172,8 @@ static void test_start_stop(void) displayname = "Winetest Exit Service"; ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - le = try_start_stop(svc_handle, displayname, 0, is_nt4); - todo_wine ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); + le = try_start_stop(svc_handle, displayname, is_nt4); + ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); /* And finally with a service that plays dead, forcing a timeout. * This time we will put no quotes. That should work too, even if there are @@ -2187,8 +2184,8 @@ static void test_start_stop(void) ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - le = try_start_stop(svc_handle, displayname, 0, is_nt4); - todo_wine ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); + le = try_start_stop(svc_handle, displayname, is_nt4); + ok(le == ERROR_SERVICE_REQUEST_TIMEOUT, "%d != ERROR_SERVICE_REQUEST_TIMEOUT\n", le); cleanup: if (svc_handle) diff --git a/programs/services/services.c b/programs/services/services.c index 35edbba..742f17d 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -772,25 +772,43 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * { WINE_ERR("failed to create pipe for %s, error = %d\n", wine_dbgstr_w(service->name), GetLastError()); - scmdatabase_unlock_startup(service->db); - return GetLastError(); + err = GetLastError(); } + else + { + err = service_start_process(service, &process_handle); + if (err == ERROR_SUCCESS) + { + if (!service_send_start_message(service, process_handle, service_argv, service_argc)) + err = ERROR_SERVICE_REQUEST_TIMEOUT; + } - err = service_start_process(service, &process_handle); + if (err == ERROR_SUCCESS) + err = service_wait_for_startup(service, process_handle); - if (err == ERROR_SUCCESS) - { - if (!service_send_start_message(service, process_handle, service_argv, service_argc)) - err = ERROR_SERVICE_REQUEST_TIMEOUT; + if (process_handle) + CloseHandle(process_handle); } if (err == ERROR_SUCCESS) - err = service_wait_for_startup(service, process_handle); - - if (process_handle) - CloseHandle(process_handle); - - ReleaseMutex(service->control_mutex); + 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); + } scmdatabase_unlock_startup(service->db); WINE_TRACE("returning %d\n", err);

1 0

Alexandre Julliard : gdi32: Add a helper function to initialize DIB info from a bitmap object.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 79ef408cd76d41c4d3ecfb0ac9f5534c8ea46503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ef408cd76d41c4d3ecfb0ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 15:26:50 2011 +0200 gdi32: Add a helper function to initialize DIB info from a bitmap object. --- dlls/gdi32/dibdrv/bitblt.c | 10 ++-------- dlls/gdi32/dibdrv/dc.c | 10 ++++++++-- dlls/gdi32/dibdrv/dibdrv.h | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 646aaf0..563cb0a 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -621,10 +621,7 @@ DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); if (!bmp) return ERROR_INVALID_HANDLE; - assert(bmp->dib); - - if (!init_dib_info( &stand_alone, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, 0 )) + if (!init_dib_info_from_bitmapobj( &stand_alone, bmp, 0 )) { ret = ERROR_BAD_FORMAT; goto done; @@ -722,10 +719,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); if (!bmp) return ERROR_INVALID_HANDLE; - assert(bmp->dib); - - if (!init_dib_info( &stand_alone, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, 0 )) + if (!init_dib_info_from_bitmapobj( &stand_alone, bmp, 0 )) { ret = ERROR_BAD_FORMAT; goto done; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 234f827..245e7c7 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -211,6 +211,13 @@ BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void * return init_dib_info( dib, &info->bmiHeader, bitfields, colors ? colorptr : NULL, colors, bits, flags ); } +BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) +{ + assert(bmp->dib); + return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, + bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, flags ); +} + static void clear_dib_info(dib_info *dib) { dib->color_table = NULL; @@ -368,8 +375,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) clear_dib_info(&pdev->brush_dib); pdev->brush_and_bits = pdev->brush_xor_bits = NULL; - if(!init_dib_info(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, - bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, private_color_table)) + if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, private_color_table)) pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2e555e3..23a59ee 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -80,6 +80,7 @@ extern BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD extern BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE pal) DECLSPEC_HIDDEN; extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) DECLSPEC_HIDDEN; +extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) DECLSPEC_HIDDEN; extern void free_dib_info(dib_info *dib) DECLSPEC_HIDDEN; extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Store the initial bitmap bits with DIB alignment.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: a13df5ce6c15df1e14ee7e05f943b3faa31a720a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13df5ce6c15df1e14ee7e05f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 15:09:45 2011 +0200 gdi32: Store the initial bitmap bits with DIB alignment. --- dlls/gdi32/bitmap.c | 74 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 55 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index e5008fb..226f358 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -87,7 +87,7 @@ DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, src->y -= src->visrect.top; offset_rect( &src->visrect, 0, -src->visrect.top ); - if (bmp->bitmap.bmBits && bmp->bitmap.bmWidthBytes == width_bytes) + if (bmp->bitmap.bmBits) { bits->ptr = (char *)bmp->bitmap.bmBits + src->visrect.top * width_bytes; bits->is_copy = FALSE; @@ -95,20 +95,10 @@ DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, } else { - bits->ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + /* return all-zero bits */ + bits->ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ); bits->is_copy = TRUE; bits->free = free_heap_bits; - if (bmp->bitmap.bmBits) - { - /* fixup the line alignment */ - char *src = bmp->bitmap.bmBits, *dst = bits->ptr; - for ( ; height > 0; height--, src += bmp->bitmap.bmWidthBytes, dst += width_bytes) - { - memcpy( dst, src, bmp->bitmap.bmWidthBytes ); - memset( dst + bmp->bitmap.bmWidthBytes, 0, width_bytes - bmp->bitmap.bmWidthBytes ); - } - } - else memset( bits->ptr, 0, info->bmiHeader.biSizeImage ); } done: GDI_ReleaseObj( hbitmap ); @@ -153,12 +143,13 @@ DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *inf } if (!bmp->bitmap.bmBits && - !(bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), 0, - bmp->bitmap.bmHeight * bmp->bitmap.bmWidthBytes ))) + !(bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + bmp->bitmap.bmHeight * width_bytes ))) { GDI_ReleaseObj( hbitmap ); return ERROR_OUTOFMEMORY; } + dst_bits = (unsigned char *)bmp->bitmap.bmBits + dst->visrect.top * width_bytes; src_bits = bits->ptr; if (info->bmiHeader.biHeight > 0) { @@ -168,14 +159,13 @@ DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *inf else src_bits += src->visrect.top * width_bytes; - dst_bits = (unsigned char *)bmp->bitmap.bmBits + dst->visrect.top * bmp->bitmap.bmWidthBytes; if (width_bytes != bmp->bitmap.bmWidthBytes) { for (i = 0; i < dst->visrect.bottom - dst->visrect.top; i++) { - memcpy( dst_bits, src_bits, min( abs(width_bytes), bmp->bitmap.bmWidthBytes )); + memcpy( dst_bits, src_bits, bmp->bitmap.bmWidthBytes ); src_bits += width_bytes; - dst_bits += bmp->bitmap.bmWidthBytes; + dst_bits += abs(width_bytes); } } else memcpy( dst_bits, src_bits, width_bytes * (dst->visrect.bottom - dst->visrect.top) ); @@ -691,8 +681,54 @@ HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) static void set_initial_bitmap_bits( HBITMAP hbitmap, BITMAPOBJ *bmp ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + DWORD err; + int width_bytes; + struct bitblt_coords src, dst; + struct gdi_image_bits bits; + if (!bmp->bitmap.bmBits) return; - SetBitmapBits( hbitmap, bmp->bitmap.bmHeight * bmp->bitmap.bmWidthBytes, bmp->bitmap.bmBits ); + if (bmp->funcs->pPutImage == nulldrv_PutImage) return; + + width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); + + src.visrect.left = src.x = 0; + src.visrect.top = src.y = 0; + src.visrect.right = src.width = bmp->bitmap.bmWidth; + src.visrect.bottom = src.height = bmp->bitmap.bmHeight; + dst = src; + + bits.ptr = bmp->bitmap.bmBits; + bits.is_copy = TRUE; + bits.free = free_heap_bits; + bmp->bitmap.bmBits = NULL; + + /* query the color info */ + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + info->bmiHeader.biWidth = 0; + info->bmiHeader.biHeight = 0; + info->bmiHeader.biSizeImage = 0; + err = bmp->funcs->pPutImage( NULL, hbitmap, 0, info, NULL, NULL, NULL, SRCCOPY ); + + 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 * width_bytes; + bmp->funcs->pPutImage( NULL, hbitmap, 0, info, &bits, &src, &dst, SRCCOPY ); + } + + if (bits.free) bits.free( &bits ); } /***********************************************************************

1 0

Henri Verbeet : ddraw: Introduce a separate function for setting the focus window.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 8f46cb6b8b685a8b07b3e6d83fa1834f28c73ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f46cb6b8b685a8b07b3e6d83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 18:58:59 2011 +0200 ddraw: Introduce a separate function for setting the focus window. --- dlls/ddraw/ddraw.c | 52 +++++++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 99eb1d6..1813b88 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -596,6 +596,31 @@ static ULONG WINAPI d3d1_Release(IDirect3D *iface) * IDirectDraw methods *****************************************************************************/ +static HRESULT ddraw_set_focus_window(IDirectDrawImpl *ddraw, HWND window) +{ + /* FIXME: This looks wrong, exclusive mode should imply a destination + * window. */ + if ((ddraw->cooperative_level & DDSCL_EXCLUSIVE) && ddraw->dest_window) + { + TRACE("Setting DDSCL_SETFOCUSWINDOW with an already set window, returning DDERR_HWNDALREADYSET.\n"); + return DDERR_HWNDALREADYSET; + } + + ddraw->focuswindow = window; + + /* Use the focus window for drawing too. */ + ddraw->dest_window = ddraw->focuswindow; + + /* Destroy the device window, if we have one. */ + if (ddraw->devicewindow) + { + DestroyWindow(ddraw->devicewindow); + ddraw->devicewindow = NULL; + } + + return DD_OK; +} + /***************************************************************************** * IDirectDraw7::SetCooperativeLevel * @@ -644,6 +669,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, { IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); HWND window; + HRESULT hr; TRACE("iface %p, window %p, flags %#x.\n", iface, hwnd, cooplevel); DDRAW_dump_cooperativelevel(cooplevel); @@ -683,29 +709,9 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return DDERR_INVALIDPARAMS; } - if( (This->cooperative_level & DDSCL_EXCLUSIVE) && window ) - { - TRACE("Setting DDSCL_SETFOCUSWINDOW with an already set window, returning DDERR_HWNDALREADYSET\n"); - LeaveCriticalSection(&ddraw_cs); - return DDERR_HWNDALREADYSET; - } - - This->focuswindow = hwnd; - /* Won't use the hwnd param for anything else */ - hwnd = NULL; - - /* Use the focus window for drawing too */ - This->dest_window = This->focuswindow; - - /* Destroy the device window, if we have one */ - if(This->devicewindow) - { - DestroyWindow(This->devicewindow); - This->devicewindow = NULL; - } - + hr = ddraw_set_focus_window(This, hwnd); LeaveCriticalSection(&ddraw_cs); - return DD_OK; + return hr; } if(cooplevel & DDSCL_EXCLUSIVE) @@ -740,7 +746,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, if ((cooplevel & DDSCL_EXCLUSIVE) && (hwnd != window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) { - HRESULT hr = wined3d_device_acquire_focus_window(This->wined3d_device, hwnd); + hr = wined3d_device_acquire_focus_window(This->wined3d_device, hwnd); if (FAILED(hr)) { ERR("Failed to acquire focus window, hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw: Remove a redundant check from ddraw7_SetCooperativeLevel().
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 93b5f681d9c98b29491cea6b901002d8e1c4e714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b5f681d9c98b29491cea6b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 18:58:58 2011 +0200 ddraw: Remove a redundant check from ddraw7_SetCooperativeLevel(). --- dlls/ddraw/ddraw.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 20c8df7..99eb1d6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -717,12 +717,6 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return DDERR_INVALIDPARAMS; } } - else if( !(cooplevel & DDSCL_NORMAL) ) - { - TRACE("(%p) SetCooperativeLevel needs at least SetFocusWindow or Exclusive or Normal mode\n", This); - LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDPARAMS; - } if ((This->cooperative_level & DDSCL_EXCLUSIVE) && (hwnd != window || !(cooplevel & DDSCL_EXCLUSIVE)))

1 0

Henri Verbeet : ddraw: Trace which surfaces we enumerate in ddraw7_EnumSurfaces().
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: cad9cbe445f860afa2cbbbc96c2796a4d26caa55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad9cbe445f860afa2cbbbc96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 18:58:57 2011 +0200 ddraw: Trace which surfaces we enumerate in ddraw7_EnumSurfaces(). --- dlls/ddraw/ddraw.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a404d4f..20c8df7 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3886,6 +3886,7 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags, surf = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); if (all || (nomatch != ddraw_match_surface_desc(DDSD, &surf->surface_desc))) { + TRACE("Enumerating surface %p.\n", surf); desc = surf->surface_desc; IDirectDrawSurface7_AddRef(&surf->IDirectDrawSurface7_iface); if (Callback(&surf->IDirectDrawSurface7_iface, &desc, Context) != DDENUMRET_OK)

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
77
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 2011