August 2011 - Wine-commits - list.winehq.org

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

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

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 : d3dx9_36/tests: Fix printing a NULL string.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 3ddda7b66b343f34b5e4ebc37a6f55aa878268b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ddda7b66b343f34b5e4ebc37… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 29 21:11:01 2011 +0200 d3dx9_36/tests: Fix printing a NULL string. --- dlls/d3dx9_36/tests/asm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 72a2da9..023236d 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -52,7 +52,7 @@ static HRESULT WINAPI testD3DXInclude_open(ID3DXInclude *iface, const char include3[] = "vs.1.1\n"; trace("filename = %s\n", filename); - trace("parent_data = (%p) -> %s\n", parent_data, (char *)parent_data); + trace("parent_data (%p) -> %s\n", parent_data, parent_data ? (char *)parent_data : "(null)"); if(!strcmp(filename,"incl.vsh")) { buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include));

1 0

André Hentschel : winspool.drv/tests: Fix tracing a NULL string.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 7d13898fbb2e2576bba82e0251cb4783a7cd77fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d13898fbb2e2576bba82e025… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 29 21:11:23 2011 +0200 winspool.drv/tests: Fix tracing a NULL string. --- dlls/winspool.drv/tests/info.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index dbdedad..462f6ef 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -147,7 +147,7 @@ static void find_default_printer(VOID) needed = sizeof(buffer); res = pGetDefaultPrinterA(buffer, &needed); if(res) default_printer = buffer; - trace("default_printer: '%s'\n", default_printer); + trace("default_printer: '%s'\n", default_printer ? default_printer : "(null)"); } if (default_printer == NULL) { @@ -170,7 +170,7 @@ static void find_default_printer(VOID) } RegCloseKey(hwindows); } - trace("default_printer: '%s'\n", default_printer); + trace("default_printer: '%s'\n", default_printer ? default_printer : "(null)"); } if (default_printer == NULL) { @@ -184,7 +184,7 @@ static void find_default_printer(VOID) default_printer = buffer; } } - trace("default_printer: '%s'\n", default_printer); + trace("default_printer: '%s'\n", default_printer ? default_printer : "(null)"); } }

1 0

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

30 Aug '11

Module: wine Branch: master Commit: 550e2a9f6af429fffbf205a7fc6fc8be65ff9620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=550e2a9f6af429fffbf205a7f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 29 21:10:56 2011 +0200 d3dcompiler_43/tests: Fix printing a NULL string. --- dlls/d3dcompiler_43/tests/asm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 5c01983..18bdd16 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1440,7 +1440,7 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i char include3[] = "vs.1.1\n"; trace("filename %s\n", filename); - trace("parent_data (%p) -> %s\n", parent_data, (char *)parent_data); + trace("parent_data (%p) -> %s\n", parent_data, parent_data ? (char *)parent_data : "(null)"); if (!strcmp(filename, "incl.vsh")) {

1 0

André Hentschel : version: Return VIF_CANNOTREADSRC if no source path could be generated.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 87ebfe5d18b59017feb70a98aa8db0b2c745799e URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ebfe5d18b59017feb70a98a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 29 21:11:28 2011 +0200 version: Return VIF_CANNOTREADSRC if no source path could be generated. --- dlls/version/version.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 1e581ee..8ea0209 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1341,6 +1341,7 @@ DWORD WINAPI VerInstallFileA( flags,srcfilename,destfilename,srcdir,destdir,curdir,tmpfile,*tmpfilelen ); xret = 0; + if (!srcdir || !srcfilename) return VIF_CANNOTREADSRC; sprintf(srcfn,"%s\\%s",srcdir,srcfilename); if (!destdir || !*destdir) pdest = srcdir; else pdest = destdir;

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_available_texture_mem() const.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: e7f61b8c616e676c3bae8e9c7883adf84d4665cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f61b8c616e676c3bae8e9c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 18:58:55 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_available_texture_mem() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8593a6a..a4c3696 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1696,7 +1696,7 @@ HRESULT CDECL wined3d_device_get_wined3d(const struct wined3d_device *device, st return WINED3D_OK; } -UINT CDECL wined3d_device_get_available_texture_mem(struct wined3d_device *device) +UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device) { TRACE("device %p.\n", device); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3a1cb87..4cdc1d7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2205,7 +2205,7 @@ HRESULT __cdecl wined3d_device_draw_tri_patch(struct wined3d_device *device, UIN HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device); -UINT __cdecl wined3d_device_get_available_texture_mem(struct wined3d_device *device); +UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); INT __cdecl wined3d_device_get_base_vertex_index(struct wined3d_device *device);

1 0

Henri Verbeet : wined3d: Replace "DirectDraw stuff" with per-adapter screen information.
by Alexandre Julliard 30 Aug '11

30 Aug '11

Module: wine Branch: master Commit: 1870353c7ab9e31a51aa104a364d2629ba612fa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1870353c7ab9e31a51aa104a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 29 18:58:56 2011 +0200 wined3d: Replace "DirectDraw stuff" with per-adapter screen information. --- dlls/wined3d/device.c | 33 ++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 10 +++++----- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a4c3696..82dcd65 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1627,7 +1627,8 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device) HRESULT CDECL wined3d_device_set_display_mode(struct wined3d_device *device, UINT swapchain_idx, const WINED3DDISPLAYMODE *mode) { - const struct wined3d_format *format = wined3d_get_format(&device->adapter->gl_info, mode->Format); + struct wined3d_adapter *adapter = device->adapter; + const struct wined3d_format *format = wined3d_get_format(&adapter->gl_info, mode->Format); DEVMODEW devmode; LONG ret; RECT clip_rc; @@ -1653,8 +1654,8 @@ HRESULT CDECL wined3d_device_set_display_mode(struct wined3d_device *device, devmode.dmFields |= DM_DISPLAYFREQUENCY; /* Only change the mode if necessary */ - if (device->ddraw_width == mode->Width && device->ddraw_height == mode->Height - && device->ddraw_format == mode->Format && !mode->RefreshRate) + if (adapter->screen_size.cx == mode->Width && adapter->screen_size.cy == mode->Height + && adapter->screen_format == mode->Format && !mode->RefreshRate) return WINED3D_OK; ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL); @@ -1673,9 +1674,9 @@ HRESULT CDECL wined3d_device_set_display_mode(struct wined3d_device *device, } /* Store the new values */ - device->ddraw_width = mode->Width; - device->ddraw_height = mode->Height; - device->ddraw_format = mode->Format; + adapter->screen_size.cx = mode->Width; + adapter->screen_size.cy = mode->Height; + adapter->screen_format = mode->Format; /* And finally clip mouse to our screen */ SetRect(&clip_rc, 0, 0, mode->Width, mode->Height); @@ -3939,6 +3940,8 @@ HRESULT CDECL wined3d_device_get_display_mode(struct wined3d_device *device, } else { + const struct wined3d_adapter *adapter = device->adapter; + /* Don't read the real display mode, but return the stored mode * instead. X11 can't change the color depth, and some apps are * pretty angry if they SetDisplayMode from 24 to 16 bpp and find out @@ -3946,9 +3949,9 @@ HRESULT CDECL wined3d_device_get_display_mode(struct wined3d_device *device, * * Also don't relay to the swapchain because with ddraw it's possible * that there isn't a swapchain at all. */ - mode->Width = device->ddraw_width; - mode->Height = device->ddraw_height; - mode->Format = device->ddraw_format; + mode->Width = adapter->screen_size.cx; + mode->Height = adapter->screen_size.cy; + mode->Format = adapter->screen_format; mode->RefreshRate = 0; hr = WINED3D_OK; } @@ -5291,12 +5294,12 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device } /* MSDN: Cursor must be smaller than the display mode */ - if (cursor_image->resource.width > device->ddraw_width - || cursor_image->resource.height > device->ddraw_height) + if (cursor_image->resource.width > device->adapter->screen_size.cx + || cursor_image->resource.height > device->adapter->screen_size.cy) { WARN("Surface %p dimensions are %ux%u, but screen dimensions are %ux%u.\n", cursor_image, cursor_image->resource.width, cursor_image->resource.height, - device->ddraw_width, device->ddraw_height); + device->adapter->screen_size.cx, device->adapter->screen_size.cy); return WINED3DERR_INVALIDCALL; } @@ -6190,9 +6193,9 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wined3d_decref(device->wined3d); return hr; } - device->ddraw_width = mode.Width; - device->ddraw_height = mode.Height; - device->ddraw_format = mode.Format; + adapter->screen_size.cx = mode.Width; + adapter->screen_size.cy = mode.Height; + adapter->screen_format = mode.Format; /* Save the creation parameters. */ device->createParms.AdapterOrdinal = adapter_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 05f2bf4..516e14c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1509,7 +1509,11 @@ struct wined3d_adapter { UINT ordinal; BOOL opengl; - POINT monitorPoint; + + POINT monitorPoint; + SIZE screen_size; + enum wined3d_format_id screen_format; + struct wined3d_gl_info gl_info; struct wined3d_driver_info driver_info; WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ @@ -1729,10 +1733,6 @@ struct wined3d_device UINT dummy_texture_3d[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_cube[MAX_COMBINED_SAMPLERS]; - /* DirectDraw stuff */ - DWORD ddraw_width, ddraw_height; - enum wined3d_format_id ddraw_format; - /* With register combiners we can skip junk texture stages */ DWORD texUnitMap[MAX_COMBINED_SAMPLERS]; DWORD rev_tex_unit_map[MAX_COMBINED_SAMPLERS];

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