wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Stefan Dösinger : wined3d: Silence R16 and AL16 fourcc warnings.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 2e3cf68e0b127d61f6951f332a31441cbb7955de URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3cf68e0b127d61f6951f332… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 2 23:42:21 2011 +0200 wined3d: Silence R16 and AL16 fourcc warnings. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/utils.c | 5 +++++ include/wine/wined3d.h | 2 ++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c2ca7a8..1dd2cba 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3410,6 +3410,8 @@ static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const case WINED3DFMT_R16G16B16A16_SNORM: case WINED3DFMT_R10G10B10_SNORM_A2_UNORM: case WINED3DFMT_R10G11B11_SNORM: + case WINED3DFMT_R16: + case WINED3DFMT_AL16: TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8f48e46..a72999c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -134,6 +134,9 @@ static const struct StaticPixelFormatDesc formats[] = {WINED3DFMT_NVHU, 0x0, 0x0, 0x0, 0x0, 2, 0, 0}, {WINED3DFMT_NVHS, 0x0, 0x0, 0x0, 0x0, 2, 0, 0}, {WINED3DFMT_NULL, 0xff000000, 0x000000ff, 0x0000ff00, 0x00ff0000, 4, 0, 0}, + /* Unsure about them, could not find a Windows driver that supports them */ + {WINED3DFMT_R16, 0x0, 0x0000ffff, 0x0, 0x0, 2, 0, 0}, + {WINED3DFMT_AL16, 0xffff0000, 0x0, 0x0, 0x0, 4, 0, 0}, }; struct wined3d_format_base_flags @@ -1765,6 +1768,8 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); FMT_TO_STR(WINED3DFMT_INTZ); FMT_TO_STR(WINED3DFMT_NULL); + FMT_TO_STR(WINED3DFMT_R16); + FMT_TO_STR(WINED3DFMT_AL16); #undef FMT_TO_STR default: { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index aadd5fd..b88d201 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -252,6 +252,8 @@ enum wined3d_format_id WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'), WINED3DFMT_INTZ = WINEMAKEFOURCC('I','N','T','Z'), WINED3DFMT_NULL = WINEMAKEFOURCC('N','U','L','L'), + WINED3DFMT_R16 = WINEMAKEFOURCC(' ','R','1','6'), + WINED3DFMT_AL16 = WINEMAKEFOURCC('A','L','1','6'), WINED3DFMT_FORCE_DWORD = 0xffffffff };

1 0

Stefan Dösinger : wined3d: Set last_was_blit to FALSE in the if condition that checks for it.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 663fac5bcd9fd6242a9a3e879ecb37e93343fb0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=663fac5bcd9fd6242a9a3e879… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 2 19:54:37 2011 +0200 wined3d: Set last_was_blit to FALSE in the if condition that checks for it. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3eb6c7d..40b9cee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2221,6 +2221,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d if (context->last_was_blit) { device->frag_pipe->enable_extension(TRUE); + context->last_was_blit = FALSE; } /* Blending and clearing should be orthogonal, but tests on the nvidia @@ -2231,7 +2232,6 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d checkGLcall("glEnable GL_SCISSOR_TEST"); LEAVE_GL(); - context->last_was_blit = FALSE; context_invalidate_state(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_table); context_invalidate_state(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_table); context_invalidate_state(context, STATE_SCISSORRECT, state_table);

1 0

Stefan Dösinger : wined3d: Don' t check the FBO status if FIXMEs are off.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 7b39005256d2179b74e1962b1ba6d6555112d206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b39005256d2179b74e1962b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 27 16:17:25 2011 +0200 wined3d: Don't check the FBO status if FIXMEs are off. --- dlls/wined3d/context.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b077c5f..3eb6c7d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -304,6 +304,8 @@ void context_check_fbo_status(struct wined3d_context *context, GLenum target) const struct wined3d_gl_info *gl_info = context->gl_info; GLenum status; + if (!FIXME_ON(d3d)) return; + status = gl_info->fbo_ops.glCheckFramebufferStatus(target); if (status == GL_FRAMEBUFFER_COMPLETE) {

1 0

Henri Verbeet : wined3d: Move PBO handling mostly out of surface_upload_data().
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 980c50a0875bb14016a7c8c6a5ba6ce1ec05bcbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=980c50a0875bb14016a7c8c6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 9 20:40:49 2011 +0200 wined3d: Move PBO handling mostly out of surface_upload_data(). Currently we essentially get half of the address from the caller and half from the destination surface. Since we'd like to use surface_upload_data() for wined3d_device_update_surface() as well, we should get all of it from the caller. --- dlls/wined3d/surface.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 6 ++++++ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 25b99fd..77a4f2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2162,7 +2162,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * correct texture. */ /* Context activation is done by the caller. */ static void surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - const struct wined3d_format *format, BOOL srgb, const GLvoid *data) + const struct wined3d_format *format, BOOL srgb, const struct wined3d_bo_address *data) { GLsizei width = surface->resource.width; GLsizei height = surface->resource.height; @@ -2181,8 +2181,8 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi internal = format->glInternal; } - TRACE("surface %p, internal %#x, width %d, height %d, format %#x, type %#x, data %p.\n", - surface, internal, width, height, format->glFormat, format->glType, data); + TRACE("surface %p, internal %#x, width %d, height %d, format %#x, type %#x, data {%#x:%p}.\n", + surface, internal, width, height, format->glFormat, format->glType, data->buffer_object, data->addr); TRACE("target %#x, level %u, resource size %u.\n", surface->texture_target, surface->texture_level, surface->resource.size); @@ -2190,13 +2190,10 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi ENTER_GL(); - if (surface->flags & SFLAG_PBO) + if (data->buffer_object) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, data->buffer_object)); checkGLcall("glBindBufferARB"); - - TRACE("(%p) pbo: %#x, data: %p.\n", surface, surface->pbo, data); - data = NULL; } /* Make sure the correct pitch is used */ @@ -2207,7 +2204,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi TRACE("Calling glCompressedTexSubImage2DARB.\n"); GL_EXTCALL(glCompressedTexSubImage2DARB(surface->texture_target, surface->texture_level, - 0, 0, width, height, internal, surface->resource.size, data)); + 0, 0, width, height, internal, surface->resource.size, data->addr)); checkGLcall("glCompressedTexSubImage2DARB"); } else @@ -2215,14 +2212,14 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi TRACE("Calling glTexSubImage2D.\n"); glTexSubImage2D(surface->texture_target, surface->texture_level, - 0, 0, width, height, format->glFormat, format->glType, data); + 0, 0, width, height, format->glFormat, format->glType, data->addr); checkGLcall("glTexSubImage2D"); } /* Restore the default pitch */ glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - if (surface->flags & SFLAG_PBO) + if (data->buffer_object) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); @@ -6072,6 +6069,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const /* Upload from system memory */ BOOL srgb = flag == SFLAG_INSRGBTEX; struct wined3d_context *context = NULL; + struct wined3d_bo_address data; d3dfmt_get_conv(surface, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &convert); @@ -6165,7 +6163,9 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const mem = surface->resource.allocatedMemory; } - surface_upload_data(surface, gl_info, &format, srgb, mem); + data.buffer_object = surface->flags & SFLAG_PBO ? surface->pbo : 0; + data.addr = mem; + surface_upload_data(surface, gl_info, &format, srgb, &data); if (context) context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d898654..44efb85 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -894,6 +894,12 @@ enum wined3d_ffp_emit_idx WINED3D_FFP_EMIT_COUNT = 17 }; +struct wined3d_bo_address +{ + GLuint buffer_object; + const BYTE *addr; +}; + struct wined3d_stream_info_element { const struct wined3d_format *format;

1 0

Henri Verbeet : wined3d: Get rid of a NULL check for surface_upload_data().
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: a1b8f254b109ae92cbedc8acd39c395130369acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b8f254b109ae92cbedc8acd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 9 20:40:48 2011 +0200 wined3d: Get rid of a NULL check for surface_upload_data(). --- dlls/wined3d/surface.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06f38b0..25b99fd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6165,8 +6165,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const mem = surface->resource.allocatedMemory; } - if (mem || (surface->flags & SFLAG_PBO)) - surface_upload_data(surface, gl_info, &format, srgb, mem); + surface_upload_data(surface, gl_info, &format, srgb, mem); if (context) context_release(context);

1 0

Henri Verbeet : wined3d: Handle unpack row length inside surface_upload_data().
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 9f3e6a20e81546979e6a2fae41d15897ade9aa46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3e6a20e81546979e6a2fae4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 9 20:40:47 2011 +0200 wined3d: Handle unpack row length inside surface_upload_data(). --- dlls/wined3d/surface.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ad217fc..06f38b0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2199,6 +2199,9 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi data = NULL; } + /* Make sure the correct pitch is used */ + glPixelStorei(GL_UNPACK_ROW_LENGTH, width); + if (format->flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("Calling glCompressedTexSubImage2DARB.\n"); @@ -2216,6 +2219,9 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi checkGLcall("glTexSubImage2D"); } + /* Restore the default pitch */ + glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + if (surface->flags & SFLAG_PBO) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); @@ -6159,19 +6165,9 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const mem = surface->resource.allocatedMemory; } - /* Make sure the correct pitch is used */ - ENTER_GL(); - glPixelStorei(GL_UNPACK_ROW_LENGTH, width); - LEAVE_GL(); - if (mem || (surface->flags & SFLAG_PBO)) surface_upload_data(surface, gl_info, &format, srgb, mem); - /* Restore the default pitch */ - ENTER_GL(); - glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - LEAVE_GL(); - if (context) context_release(context); /* Don't delete PBO memory */

1 0

Henri Verbeet : wined3d: Rename IWineD3DImpl_FillGLCaps() to wined3d_adapter_init_gl_caps().
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: ee6d550b2e30f808348c8dccc873c8bda2968276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6d550b2e30f808348c8dccc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 9 20:40:46 2011 +0200 wined3d: Rename IWineD3DImpl_FillGLCaps() to wined3d_adapter_init_gl_caps(). --- dlls/wined3d/directx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 502b5d7..c2ca7a8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -796,7 +796,7 @@ static void quirk_no_np2(struct wined3d_gl_info *gl_info) * Note that wine_normalized_texrect can't be used in this case because internally it uses ARB_tex_npot, * triggering the software fallback. There is not much we can do here apart from disabling the * software-emulated extension and reenable ARB_tex_rect (which was previously disabled - * in IWineD3DImpl_FillGLCaps). + * in wined3d_adapter_init_gl_caps). * This fixup removes performance problems on both the FX 5900 and FX 5700 (e.g. for framebuffer * post-processing effects in the game "Max Payne 2"). * The behaviour can be verified through a simple test app attached in bugreport #14724. */ @@ -2110,7 +2110,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info, DWORD gl_version) } /* Context activation is done by the caller. */ -static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) +static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) { struct wined3d_driver_info *driver_info = &adapter->driver_info; struct wined3d_gl_info *gl_info = &adapter->gl_info; @@ -5155,7 +5155,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) goto nogl_adapter; } - ret = IWineD3DImpl_FillGLCaps(adapter); + ret = wined3d_adapter_init_gl_caps(adapter); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx);

1 0

Henri Verbeet : wined3d: Rename IWineD3DDeviceImpl_UpdateVolume() to device_update_volume().
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: d5c9523a83d0a31db81ba564d8ba788cdc1be75e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c9523a83d0a31db81ba564d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 9 20:40:45 2011 +0200 wined3d: Rename IWineD3DDeviceImpl_UpdateVolume() to device_update_volume(). --- dlls/wined3d/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 632f102..5bc5a08 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4282,7 +4282,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_strided(struct wined3d_devic } /* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */ -static HRESULT IWineD3DDeviceImpl_UpdateVolume(struct wined3d_device *device, +static HRESULT device_update_volume(struct wined3d_device *device, struct wined3d_volume *src_volume, struct wined3d_volume *dst_volume) { WINED3DLOCKED_BOX src; @@ -4400,12 +4400,12 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, { for (i = 0; i < level_count; ++i) { - hr = IWineD3DDeviceImpl_UpdateVolume(device, + hr = device_update_volume(device, volume_from_resource(wined3d_texture_get_sub_resource(src_texture, i)), volume_from_resource(wined3d_texture_get_sub_resource(dst_texture, i))); if (FAILED(hr)) { - WARN("IWineD3DDeviceImpl_UpdateVolume failed, hr %#x.\n", hr); + WARN("Failed to update volume, hr %#x.\n", hr); return hr; } }

1 0

Juan Lang : setupapi: Make sure machine name is non-empty before failing.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: 4fe8cc61642c462883e748b566f93f984e3b4f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe8cc61642c462883e748b56… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 9 11:35:11 2011 -0700 setupapi: Make sure machine name is non-empty before failing. --- dlls/setupapi/devinst.c | 6 +++--- dlls/setupapi/tests/devinst.c | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 0a3c3bd..9176554 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1163,7 +1163,7 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, debugstr_w(MachineName), Reserved); - if (MachineName != NULL) + if (MachineName && *MachineName) { FIXME("remote support is not implemented\n"); SetLastError(ERROR_INVALID_MACHINENAME); @@ -2371,7 +2371,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW( set = SetupDiCreateDeviceInfoListExW(class, parent, machine, reserved); if (set) { - if (machine) + if (machine && *machine) FIXME("%s: unimplemented for remote machines\n", debugstr_w(machine)); else if (flags & DIGCF_DEVICEINTERFACE) @@ -3562,7 +3562,7 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( LPCWSTR lpKeyName; LONG l; - if (MachineName != NULL) + if (MachineName && *MachineName) { FIXME("Remote access not supported yet!\n"); return INVALID_HANDLE_VALUE; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 1905406..3c01f32 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -261,6 +261,7 @@ static void test_SetupDiCreateDeviceInfoListEx(void) DWORD error; static CHAR notnull[] = "NotNull"; static const WCHAR machine[] = { 'd','u','m','m','y',0 }; + static const WCHAR empty[] = { 0 }; SetLastError(0xdeadbeef); /* create empty DeviceInfoList, but set Reserved to a value, which is not NULL */ @@ -290,6 +291,14 @@ static void test_SetupDiCreateDeviceInfoListEx(void) /* destroy DeviceInfoList */ ret = pSetupDiDestroyDeviceInfoList(devlist); ok(ret, "SetupDiDestroyDeviceInfoList failed : %d\n", error); + + /* create empty DeviceInfoList with empty machine name */ + devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); + ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %d (expected != %p)\n", devlist, error, INVALID_HANDLE_VALUE); + + /* destroy DeviceInfoList */ + ret = pSetupDiDestroyDeviceInfoList(devlist); + ok(ret, "SetupDiDestroyDeviceInfoList failed : %d\n", error); } static void test_SetupDiOpenClassRegKeyExA(void)

1 0

Alexandre Julliard : advapi32: Always pass valid buffers in the EnumServicesStatus requests.
by Alexandre Julliard 10 Jun '11

10 Jun '11

Module: wine Branch: master Commit: ad4c995c3f9f844a35f3ee9cc9479bdb9b26e75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4c995c3f9f844a35f3ee9cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 9 22:00:15 2011 +0200 advapi32: Always pass valid buffers in the EnumServicesStatus requests. --- dlls/advapi32/service.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 1674c6f..88a15b9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1486,13 +1486,14 @@ EnumServicesStatusA( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST TRACE("%p 0x%x 0x%x %p %u %p %p %p\n", hmngr, type, state, services, size, needed, returned, resume_handle); - if (size && !(servicesW = HeapAlloc( GetProcessHeap(), 0, 2 * size ))) + sz = max( 2 * size, sizeof(*servicesW) ); + if (!(servicesW = HeapAlloc( GetProcessHeap(), 0, sz ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } - ret = EnumServicesStatusW( hmngr, type, state, servicesW, 2 * size, needed, returned, resume_handle ); + ret = EnumServicesStatusW( hmngr, type, state, servicesW, sz, needed, returned, resume_handle ); if (!ret) goto done; p = (char *)services + *returned * sizeof(ENUM_SERVICE_STATUSA); @@ -1532,6 +1533,7 @@ EnumServicesStatusW( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST LPDWORD resume_handle ) { DWORD err, i; + ENUM_SERVICE_STATUSW dummy_status; TRACE("%p 0x%x 0x%x %p %u %p %p %p\n", hmngr, type, state, services, size, needed, returned, resume_handle); @@ -1545,6 +1547,13 @@ EnumServicesStatusW( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST return FALSE; } + /* make sure we pass a valid pointer */ + if (!services || size < sizeof(*services)) + { + services = &dummy_status; + size = sizeof(dummy_status); + } + __TRY { err = svcctl_EnumServicesStatusW( hmngr, type, state, (BYTE *)services, size, needed, returned ); @@ -1591,7 +1600,8 @@ EnumServicesStatusExA( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st TRACE("%p %u 0x%x 0x%x %p %u %p %p %p %s\n", hmngr, level, type, state, buffer, size, needed, returned, resume_handle, debugstr_a(group)); - if (size && !(servicesW = HeapAlloc( GetProcessHeap(), 0, 2 * size ))) + sz = max( 2 * size, sizeof(*servicesW) ); + if (!(servicesW = HeapAlloc( GetProcessHeap(), 0, sz ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; @@ -1608,7 +1618,7 @@ EnumServicesStatusExA( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st MultiByteToWideChar( CP_ACP, 0, group, -1, groupW, len * sizeof(WCHAR) ); } - ret = EnumServicesStatusExW( hmngr, level, type, state, (BYTE *)servicesW, 2 * size, + ret = EnumServicesStatusExW( hmngr, level, type, state, (BYTE *)servicesW, sz, needed, returned, resume_handle, groupW ); if (!ret) goto done; @@ -1650,6 +1660,7 @@ EnumServicesStatusExW( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st LPDWORD resume_handle, LPCWSTR group ) { DWORD err, i; + ENUM_SERVICE_STATUS_PROCESSW dummy_status; ENUM_SERVICE_STATUS_PROCESSW *services = (ENUM_SERVICE_STATUS_PROCESSW *)buffer; TRACE("%p %u 0x%x 0x%x %p %u %p %p %p %s\n", hmngr, level, type, state, buffer, @@ -1669,6 +1680,13 @@ EnumServicesStatusExW( SC_HANDLE hmngr, SC_ENUM_TYPE level, DWORD type, DWORD st return FALSE; } + /* make sure we pass a valid buffer pointer */ + if (!services || size < sizeof(*services)) + { + buffer = (BYTE *)&dummy_status; + size = sizeof(dummy_status); + } + __TRY { err = svcctl_EnumServicesStatusExW( hmngr, type, state, buffer, size, needed,

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
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 June 2011