wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Henri Verbeet : d3d10core: Implement d3d10_input_layout_SetPrivateDataInterface().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: e30032a64d6e7c836546e51ededcb8d3c73c0115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30032a64d6e7c836546e51ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:09 2015 +0100 d3d10core: Implement d3d10_input_layout_SetPrivateDataInterface(). --- dlls/d3d10core/inputlayout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index 79ebea3..a559b0b 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -185,9 +185,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLa static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&layout->private_store, guid, data); } static const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl =

1 0

Henri Verbeet : d3d10core: Implement d3d10_input_layout_SetPrivateData().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 2ffa29d66082808d20d7427831f620ec3a36d4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffa29d66082808d20d742783… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:08 2015 +0100 d3d10core: Implement d3d10_input_layout_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/inputlayout.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 5544dc7..e03a5cb 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -185,6 +185,7 @@ struct d3d10_input_layout ID3D10InputLayout ID3D10InputLayout_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_vertex_declaration *wined3d_decl; }; diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index 8350875..79ebea3 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -174,10 +174,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLa static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateData(ID3D10InputLayout *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_input_layout *layout = impl_from_ID3D10InputLayout(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&layout->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, @@ -203,6 +205,9 @@ static const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = static void STDMETHODCALLTYPE d3d10_input_layout_wined3d_object_destroyed(void *parent) { + struct d3d10_input_layout *layout = parent; + + wined3d_private_store_cleanup(&layout->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -221,12 +226,14 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ layout->ID3D10InputLayout_iface.lpVtbl = &d3d10_input_layout_vtbl; layout->refcount = 1; + wined3d_private_store_init(&layout->private_store); hr = d3d10_input_layout_to_wined3d_declaration(element_descs, element_count, shader_byte_code, shader_byte_code_length, &wined3d_elements, &wined3d_element_count); if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration elements, hr %#x.\n", hr); + wined3d_private_store_cleanup(&layout->private_store); return hr; } @@ -236,6 +243,7 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); + wined3d_private_store_cleanup(&layout->private_store); return hr; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_buffer_GetPrivateData().
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: e7c892850bf5119ded771ff0e82292105de57dee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c892850bf5119ded771ff0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:07 2015 +0100 d3d10core: Implement d3d10_buffer_GetPrivateData(). --- dlls/d3d10core/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index d261a8d..dcf323c 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -102,10 +102,12 @@ static void STDMETHODCALLTYPE d3d10_buffer_GetDevice(ID3D10Buffer *iface, ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_buffer_GetPrivateData(ID3D10Buffer *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&buffer->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_buffer_SetPrivateDataInterface( ).
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 3cf80b7fb78e07f2b92df24bf49b16da035e5c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf80b7fb78e07f2b92df24bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 25 09:34:06 2015 +0100 d3d10core: Implement d3d10_buffer_SetPrivateDataInterface(). --- dlls/d3d10core/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index ff94fbc..d261a8d 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -122,9 +122,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateData(ID3D10Buffer *iface static HRESULT STDMETHODCALLTYPE d3d10_buffer_SetPrivateDataInterface(ID3D10Buffer *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_buffer *buffer = impl_from_ID3D10Buffer(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&buffer->private_store, guid, data); } /* ID3D10Resource methods */

1 0

Matteo Bruni : opengl32: Return a NULL pointer for functions requiring unsupported or disabled extensions.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: bfd4836867d6d90eaeae6ccbc02e37678b59b8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd4836867d6d90eaeae6ccbc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:20 2015 +0100 opengl32: Return a NULL pointer for functions requiring unsupported or disabled extensions. --- dlls/opengl32/wgl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 1903807..9482c75 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -875,7 +875,10 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) void *driver_func = funcs->wgl.p_wglGetProcAddress( name ); if (!is_extension_supported(ext_ret->extension)) + { WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); + return NULL; + } if (driver_func == NULL) {

1 0

Matteo Bruni : opengl32: Filter disabled extensions on OpenGL core profile contexts too.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 9a1f66a4dbec1ec56148aef54f8b0b2fb3f6d525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a1f66a4dbec1ec56148aef54… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:19 2015 +0100 opengl32: Filter disabled extensions on OpenGL core profile contexts too. --- dlls/opengl32/wgl.c | 186 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 151 insertions(+), 35 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b028fe0..1903807 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -59,11 +59,12 @@ enum wgl_handle_type struct opengl_context { - DWORD tid; /* thread that the context is current in */ - HDC draw_dc; /* current drawing DC */ - HDC read_dc; /* current reading DC */ - GLubyte *extensions; /* extension string */ - struct wgl_context *drv_ctx; /* driver context */ + DWORD tid; /* thread that the context is current in */ + HDC draw_dc; /* current drawing DC */ + HDC read_dc; /* current reading DC */ + GLubyte *extensions; /* extension string */ + GLuint *disabled_exts; /* indices of disabled extensions */ + struct wgl_context *drv_ctx; /* driver context */ }; struct wgl_handle @@ -205,6 +206,7 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) } if (hglrc == NtCurrentTeb()->glCurrentRC) wglMakeCurrent( 0, 0 ); ptr->funcs->wgl.p_wglDeleteContext( ptr->u.context->drv_ctx ); + HeapFree( GetProcessHeap(), 0, ptr->u.context->disabled_exts ); HeapFree( GetProcessHeap(), 0, ptr->u.context->extensions ); HeapFree( GetProcessHeap(), 0, ptr->u.context ); free_handle_ptr( ptr ); @@ -687,11 +689,30 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, return 0; } +static BOOL filter_extensions(const char *extensions, GLubyte **exts_list, GLuint **disabled_exts); + void WINAPI glGetIntegerv(GLenum pname, GLint *data) { const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; TRACE("(%d, %p)\n", pname, data); + if (pname == GL_NUM_EXTENSIONS) + { + struct wgl_handle *ptr = get_current_context_ptr(); + + if (ptr->u.context->disabled_exts || + filter_extensions(NULL, NULL, &ptr->u.context->disabled_exts)) + { + const GLuint *disabled_exts = ptr->u.context->disabled_exts; + GLint count, disabled_count = 0; + + funcs->gl.p_glGetIntegerv(pname, &count); + while (*disabled_exts++ != ~0u) + disabled_count++; + *data = count - disabled_count; + return; + } + } funcs->gl.p_glGetIntegerv(pname, data); } @@ -707,6 +728,21 @@ const GLubyte * WINAPI glGetStringi(GLenum name, GLuint index) *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); } + if (name == GL_EXTENSIONS) + { + struct wgl_handle *ptr = get_current_context_ptr(); + + if (ptr->u.context->disabled_exts || + filter_extensions(NULL, NULL, &ptr->u.context->disabled_exts)) + { + const GLuint *disabled_exts = ptr->u.context->disabled_exts; + unsigned int disabled_count = 0; + + while (index + disabled_count >= *disabled_exts++) + disabled_count++; + return funcs->ext.p_glGetStringi(name, index + disabled_count); + } + } return funcs->ext.p_glGetStringi(name, index); } @@ -1708,23 +1744,116 @@ GLint WINAPI glDebugEntry( GLint unknown1, GLint unknown2 ) return 0; } +static GLubyte *filter_extensions_list(const char *extensions, const char *disabled) +{ + char *p, *str = NULL; + const char *end; + + p = str = HeapAlloc(GetProcessHeap(), 0, strlen(extensions) + 2); + if (!str) + return NULL; + for (;;) + { + while (*extensions == ' ') + extensions++; + if (!*extensions) + break; + if (!(end = strchr(extensions, ' '))) + end = extensions + strlen(extensions); + memcpy(p, extensions, end - extensions); + p[end - extensions] = 0; + if (!has_extension(disabled, p, strlen(p))) + { + TRACE("++ %s\n", p); + p += end - extensions; + *p++ = ' '; + } + else + { + TRACE("-- %s (disabled by config)\n", p); + } + extensions = end; + } + *p = 0; + return (GLubyte *)str; +} + +static GLuint *filter_extensions_index(const char *disabled) +{ + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + const char *ext, *end, *gl_ext; + GLuint *disabled_exts = NULL, *new_disabled_exts; + unsigned int i = 0, j, disabled_size; + GLint extensions_count; + + if (!funcs->ext.p_glGetStringi) + { + void **func_ptr = (void **)&funcs->ext.p_glGetStringi; + + *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); + if (!funcs->ext.p_glGetStringi) + return NULL; + } + + funcs->gl.p_glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); + disabled_size = 2; + disabled_exts = HeapAlloc(GetProcessHeap(), 0, disabled_size * sizeof(*disabled_exts)); + if (!disabled_exts) + return NULL; + for (j = 0; j < extensions_count; ++j) + { + gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, j); + ext = disabled; + for (;;) + { + while (*ext == ' ') + ext++; + if (!*ext) + { + TRACE("++ %s\n", gl_ext); + break; + } + if (!(end = strchr(ext, ' '))) + end = ext + strlen(ext); + + if (!strncmp(gl_ext, ext, end - ext) && !gl_ext[end - ext]) + { + if (i + 1 == disabled_size) + { + disabled_size *= 2; + new_disabled_exts = HeapReAlloc(GetProcessHeap(), 0, disabled_exts, + disabled_size * sizeof(*disabled_exts)); + if (!new_disabled_exts) + { + disabled_exts[i] = ~0u; + return disabled_exts; + } + disabled_exts = new_disabled_exts; + } + TRACE("-- %s (disabled by config)\n", gl_ext); + disabled_exts[i++] = j; + break; + } + ext = end; + } + } + disabled_exts[i] = ~0u; + return disabled_exts; +} + /* build the extension string by filtering out the disabled extensions */ -static GLubyte *filter_extensions( const char *extensions ) +static BOOL filter_extensions(const char *extensions, GLubyte **exts_list, GLuint **disabled_exts) { static const char *disabled; - char *p, *str; - const char *end; TRACE( "GL_EXTENSIONS:\n" ); - if (!extensions) extensions = ""; - if (!disabled) { HKEY hkey; DWORD size; + char *str = NULL; - str = NULL; /* @@ Wine registry key: HKCU\Software\Wine\OpenGL */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey )) { @@ -1743,29 +1872,16 @@ static GLubyte *filter_extensions( const char *extensions ) else disabled = ""; } - if (!disabled[0]) return NULL; - if ((str = HeapAlloc( GetProcessHeap(), 0, strlen(extensions) + 2 ))) - { - p = str; - for (;;) - { - while (*extensions == ' ') extensions++; - if (!*extensions) break; - if (!(end = strchr( extensions, ' ' ))) end = extensions + strlen( extensions ); - memcpy( p, extensions, end - extensions ); - p[end - extensions] = 0; - if (!has_extension( disabled, p , strlen( p ))) - { - TRACE("++ %s\n", p ); - p += end - extensions; - *p++ = ' '; - } - else TRACE("-- %s (disabled by config)\n", p ); - extensions = end; - } - *p = 0; - } - return (GLubyte *)str; + if (!disabled[0]) + return FALSE; + + if (extensions && !*exts_list) + *exts_list = filter_extensions_list(extensions, disabled); + + if (!*disabled_exts) + *disabled_exts = filter_extensions_index(disabled); + + return (exts_list && *exts_list) || *disabled_exts; } /*********************************************************************** @@ -1780,7 +1896,7 @@ const GLubyte * WINAPI glGetString( GLenum name ) { struct wgl_handle *ptr = get_current_context_ptr(); if (ptr->u.context->extensions || - ((ptr->u.context->extensions = filter_extensions( (const char *)ret )))) + filter_extensions((const char *)ret, &ptr->u.context->extensions, &ptr->u.context->disabled_exts)) ret = ptr->u.context->extensions; } return ret;

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 0f12a90e64cd2faaef5acb8213cdac80c8e39227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f12a90e64cd2faaef5acb821… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 10:04:29 2015 +0300 po: Update Russian translation. --- po/ru.po | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/po/ru.po b/po/ru.po index d6640e2..9d312e9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2731,11 +2731,6 @@ msgstr "" "Вы действительно хотите удалить его?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -3148,8 +3143,6 @@ msgid "&View Source" msgstr "&Открыть исходный текст" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" msgstr "Сво&йства" @@ -11519,10 +11512,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Ошибка: неправильные параметры командной строки\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Ошибка: нельзя добавлять разделы на удалённом компьютере\n" +msgstr "Ошибка: нет удалось получить доступ к удалённому компьютеру\n" #: reg.rc:38 msgid "" @@ -11530,10 +11521,8 @@ msgid "" msgstr "Ошибка: не удалось найти указанный раздел реестра или значение\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Неподдерживаемый тип.\n" +msgstr "Ошибка: тип не поддерживается\n" #: regedit.rc:34 msgid "&Registry"

1 0

Nikolay Sivov : services: Pass resume index to server.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: c0b0d3b4e25c01cf3ab734882af6b82589e9a53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b0d3b4e25c01cf3ab734882… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 09:07:59 2015 +0300 services: Pass resume index to server. --- dlls/advapi32/service.c | 5 +---- include/wine/svcctl.idl | 5 +++-- programs/services/rpc.c | 8 ++++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index e0f7312..ae002c9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1619,9 +1619,6 @@ EnumServicesStatusW( 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 (resume_handle) - FIXME("resume handle not supported\n"); - if (!hmngr) { SetLastError( ERROR_INVALID_HANDLE ); @@ -1637,7 +1634,7 @@ EnumServicesStatusW( SC_HANDLE hmngr, DWORD type, DWORD state, LPENUM_SERVICE_ST __TRY { - err = svcctl_EnumServicesStatusW( hmngr, type, state, (BYTE *)services, size, needed, returned ); + err = svcctl_EnumServicesStatusW( hmngr, type, state, (BYTE *)services, size, needed, returned, resume_handle ); } __EXCEPT(rpc_filter) { diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index b5a8c4d..7409b17 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -253,7 +253,7 @@ typedef struct _SC_RPC_CONFIG_INFOW { /* Not compatible with Windows function 0x0d */ DWORD svcctl_EnumDependentServicesW(/* FIXME */); - /* Not compatible with Windows function 0x0e */ + /* Compatible with Windows function 0x0e */ DWORD svcctl_EnumServicesStatusW( [in] SC_RPC_HANDLE hmngr, [in] DWORD type, @@ -261,7 +261,8 @@ typedef struct _SC_RPC_CONFIG_INFOW { [out,size_is(size)] BYTE *buffer, [in] DWORD size, [out] LPDWORD needed, - [out] LPDWORD returned + [out] LPDWORD returned, + [in,out,unique] LPDWORD resume ); /* Compatible with Windows function 0x0f */ diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 34d012d..3a206c7 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1276,7 +1276,8 @@ DWORD __cdecl svcctl_EnumServicesStatusW( BYTE *buffer, DWORD size, LPDWORD needed, - LPDWORD returned) + LPDWORD returned, + LPDWORD resume) { DWORD err, sz, total_size, num_services; DWORD_PTR offset; @@ -1284,7 +1285,7 @@ DWORD __cdecl svcctl_EnumServicesStatusW( struct service_entry *service; ENUM_SERVICE_STATUSW *s; - WINE_TRACE("(%p, 0x%x, 0x%x, %p, %u, %p, %p)\n", hmngr, type, state, buffer, size, needed, returned); + WINE_TRACE("(%p, 0x%x, 0x%x, %p, %u, %p, %p, %p)\n", hmngr, type, state, buffer, size, needed, returned, resume); if (!type || !state) return ERROR_INVALID_PARAMETER; @@ -1292,6 +1293,9 @@ DWORD __cdecl svcctl_EnumServicesStatusW( if ((err = validate_scm_handle(hmngr, SC_MANAGER_ENUMERATE_SERVICE, &manager)) != ERROR_SUCCESS) return err; + if (resume) + WINE_FIXME("resume index not supported\n"); + scmdatabase_lock_exclusive(manager->db); total_size = num_services = 0;

1 0

Nikolay Sivov : services: Make ChangeServiceConfig2W() rpc call compatible with native one.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 3c186a65d3e52428924ba3e513961b0c569e567c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c186a65d3e52428924ba3e51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 08:57:20 2015 +0300 services: Make ChangeServiceConfig2W() rpc call compatible with native one. --- dlls/advapi32/service.c | 6 +++++- include/wine/svcctl.idl | 40 +++++++++++++++++++++++++++++++--------- programs/services/rpc.c | 20 ++++++++++---------- 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 23ff2f0..e0f7312 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2155,7 +2155,11 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, __TRY { - err = svcctl_ChangeServiceConfig2W( hService, dwInfoLevel, lpInfo ); + SC_RPC_CONFIG_INFOW info; + + info.dwInfoLevel = dwInfoLevel; + info.descr = lpInfo; + err = svcctl_ChangeServiceConfig2W( hService, info ); } __EXCEPT(rpc_filter) { diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index f261702..b5a8c4d 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -114,6 +114,18 @@ typedef struct _SERVICE_FAILURE_ACTIONSW { [size_is(cActions)] SC_ACTION *lpsaActions; } SERVICE_FAILURE_ACTIONSW,*LPSERVICE_FAILURE_ACTIONSW; +typedef struct _SERVICE_DELAYED_AUTO_START_INFO { + BOOL fDelayedAutostart; +} SERVICE_DELAYED_AUTO_START_INFO; + +typedef struct _SERVICE_FAILURE_ACTIONS_FLAG { + BOOL fFailureActionsOnNonCrashFailures; +} SERVICE_FAILURE_ACTIONS_FLAG; + +typedef struct _SERVICE_SID_INFO { + DWORD dwServiceSidType; +} SERVICE_SID_INFO; + typedef struct _SERVICE_PRESHUTDOWN_INFO { DWORD dwPreshutdownTimeout; } SERVICE_PRESHUTDOWN_INFO,*LPSERVICE_PRESHUTDOWN_INFO; @@ -134,12 +146,23 @@ typedef struct _ENUM_SERVICE_STATUSW { cpp_quote("#endif") -typedef [switch_type(DWORD)] union -{ - [case (SERVICE_CONFIG_DESCRIPTION)] SERVICE_DESCRIPTIONW descr; - [case (SERVICE_CONFIG_FAILURE_ACTIONS)] SERVICE_FAILURE_ACTIONSW actions; - [case (SERVICE_CONFIG_PRESHUTDOWN_INFO)] SERVICE_PRESHUTDOWN_INFO preshutdown; -} SERVICE_CONFIG2W; +typedef struct _SERVICE_RPC_REQUIRED_PRIVILEGES_INFO { + DWORD cbRequiredPrivileges; + [size_is(cbRequiredPrivileges)] BYTE *pRequiredPrivileges; +} SERVICE_RPC_REQUIRED_PRIVILEGES_INFO; + +typedef struct _SC_RPC_CONFIG_INFOW { + DWORD dwInfoLevel; + [switch_is(dwInfoLevel)] union { + [case(SERVICE_CONFIG_DESCRIPTION)] SERVICE_DESCRIPTIONW *descr; + [case(SERVICE_CONFIG_FAILURE_ACTIONS)] SERVICE_FAILURE_ACTIONSW *actions; + [case(SERVICE_CONFIG_DELAYED_AUTO_START_INFO)] SERVICE_DELAYED_AUTO_START_INFO *delayedstart; + [case(SERVICE_CONFIG_FAILURE_ACTIONS_FLAG)] SERVICE_FAILURE_ACTIONS_FLAG *actionsflag; + [case(SERVICE_CONFIG_SERVICE_SID_INFO)] SERVICE_SID_INFO *sid; + [case(SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO)] SERVICE_RPC_REQUIRED_PRIVILEGES_INFO *privinfo; + [case(SERVICE_CONFIG_PRESHUTDOWN_INFO)] SERVICE_PRESHUTDOWN_INFO *preshutdown; + }; +} SC_RPC_CONFIG_INFOW; /* Compatible with Windows function 0x00 */ DWORD svcctl_CloseServiceHandle( @@ -331,11 +354,10 @@ typedef [switch_type(DWORD)] union /* Not compatible with Windows function 0x24 */ DWORD svcctl_ChangeServiceConfig2A(/* FIXME */); - /* Untested with Windows function 0x25 */ + /* Compatible with Windows function 0x25 */ DWORD svcctl_ChangeServiceConfig2W( [in] SC_RPC_HANDLE hService, - [in] DWORD InfoLevel, - [in,switch_is(InfoLevel)] SERVICE_CONFIG2W *config ); + [in] SC_RPC_CONFIG_INFOW config); /* Not compatible with Windows function 0x26 */ DWORD svcctl_QueryServiceConfig2A(/* FIXME */); diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 3955e09..34d012d 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -755,7 +755,7 @@ DWORD __cdecl svcctl_SetServiceStatus( return ERROR_SUCCESS; } -DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, SERVICE_CONFIG2W *config ) +DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFIG_INFOW config ) { struct sc_service_handle *service; DWORD err; @@ -763,15 +763,15 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, if ((err = validate_service_handle(hService, SERVICE_CHANGE_CONFIG, &service)) != 0) return err; - switch (level) + switch (config.dwInfoLevel) { case SERVICE_CONFIG_DESCRIPTION: { WCHAR *descr = NULL; - if (config->descr.lpDescription[0]) + if (config.descr->lpDescription[0]) { - if (!(descr = strdupW( config->descr.lpDescription ))) + if (!(descr = strdupW( config.descr->lpDescription ))) return ERROR_NOT_ENOUGH_MEMORY; } @@ -785,20 +785,20 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, break; case SERVICE_CONFIG_FAILURE_ACTIONS: WINE_FIXME( "SERVICE_CONFIG_FAILURE_ACTIONS not implemented: period %u msg %s cmd %s\n", - config->actions.dwResetPeriod, - wine_dbgstr_w(config->actions.lpRebootMsg), - wine_dbgstr_w(config->actions.lpCommand) ); + config.actions->dwResetPeriod, + wine_dbgstr_w(config.actions->lpRebootMsg), + wine_dbgstr_w(config.actions->lpCommand) ); break; case SERVICE_CONFIG_PRESHUTDOWN_INFO: WINE_TRACE( "changing service %p preshutdown timeout to %d\n", - service, config->preshutdown.dwPreshutdownTimeout ); + service, config.preshutdown->dwPreshutdownTimeout ); service_lock_exclusive( service->service_entry ); - service->service_entry->preshutdown_timeout = config->preshutdown.dwPreshutdownTimeout; + service->service_entry->preshutdown_timeout = config.preshutdown->dwPreshutdownTimeout; save_service_config( service->service_entry ); service_unlock( service->service_entry ); break; default: - WINE_FIXME("level %u not implemented\n", level); + WINE_FIXME("level %u not implemented\n", config.dwInfoLevel); err = ERROR_INVALID_LEVEL; break; }

1 0

Nikolay Sivov : scrrun: Implement HashVal for floating point keys.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 08900265a0aaba4c658f359acd90398e1aac8a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08900265a0aaba4c658f359ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 25 08:11:15 2015 +0300 scrrun: Implement HashVal for floating point keys. --- dlls/scrrun/dictionary.c | 19 ++++++++ dlls/scrrun/tests/dictionary.c | 104 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index b5edfc6..a33e1de 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -18,6 +18,8 @@ #define COBJMACROS #include "config.h" +#include "wine/port.h" + #include <stdarg.h> #include "windef.h" @@ -336,6 +338,23 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V case VT_I4: V_I4(hash) = get_num_hash(V_I4(key)); break; + case VT_R4: + case VT_R8: + { + FLOAT flt = V_VT(key) == VT_R4 ? V_R4(key) : V_R8(key); + + if (isinf(flt)) + { + V_I4(hash) = 0; + break; + } + else if (!isnan(flt)) + { + V_I4(hash) = get_num_hash(flt); + break; + } + /* fallthrough on NAN */ + } case VT_INT: case VT_UINT: case VT_I1: diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 0a168e0..0c3a92c 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -149,6 +149,29 @@ static DWORD get_num_hash(FLOAT num) return (*((DWORD*)&num)) % 1201; } +typedef union +{ + struct + { + unsigned int m : 23; + unsigned int exp_bias : 8; + unsigned int sign : 1; + } i; + float f; +} R4_FIELDS; + +typedef union +{ + struct + { + unsigned int m_lo : 32; /* 52 bits of precision */ + unsigned int m_hi : 20; + unsigned int exp_bias : 11; /* bias == 1023 */ + unsigned int sign : 1; + } i; + double d; +} R8_FIELDS; + static void test_hash_value(void) { /* string test data */ @@ -165,8 +188,14 @@ static void test_hash_value(void) 0, -1, 100, 1, 255 }; + static const FLOAT float_hash_tests[] = { + 0.0, -1.0, 100.0, 1.0, 255.0, 1.234 + }; + IDictionary *dict; VARIANT key, hash; + R8_FIELDS fx8; + R4_FIELDS fx4; HRESULT hr; unsigned i; @@ -307,6 +336,81 @@ static void test_hash_value(void) expected); } + /* nan */ + fx4.f = 10.0; + fx4.i.exp_bias = 0xff; + + V_VT(&key) = VT_R4; + V_R4(&key) = fx4.f; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0 /* win2k */ || + V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + + /* inf */ + fx4.f = 10.0; + fx4.i.m = 0; + fx4.i.exp_bias = 0xff; + + V_VT(&key) = VT_R4; + V_R4(&key) = fx4.f; + V_I4(&hash) = 10; + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); + + /* nan */ + fx8.d = 10.0; + fx8.i.exp_bias = 0x7ff; + + V_VT(&key) = VT_R8; + V_R8(&key) = fx8.d; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0 /* win2k */ || + V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + + /* inf */ + fx8.d = 10.0; + fx8.i.m_lo = 0; + fx8.i.m_hi = 0; + fx8.i.exp_bias = 0x7ff; + + V_VT(&key) = VT_R8; + V_R8(&key) = fx8.d; + V_I4(&hash) = 10; + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); + + for (i = 0; i < sizeof(float_hash_tests)/sizeof(float_hash_tests[0]); i++) { + DWORD expected = get_num_hash(float_hash_tests[i]); + + V_VT(&key) = VT_R4; + V_R4(&key) = float_hash_tests[i]; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + + V_VT(&key) = VT_R8; + V_R8(&key) = float_hash_tests[i]; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + } + IDictionary_Release(dict); }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
42
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 February 2015