July 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : kernel32: Remove unused functions.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 8f1caca469781ea23d0c8868b93b627196447d64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1caca469781ea23d0c8868… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 3 11:11:36 2019 +0300 kernel32: Remove unused functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 49374cc..d8d0f20 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -50,12 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync); -/* check if current version is NT or Win95 */ -static inline BOOL is_version_nt(void) -{ - return !(GetVersion() & 0x80000000); -} - static void get_create_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *nameW, SECURITY_ATTRIBUTES *sa, const WCHAR *name ) { @@ -89,14 +83,6 @@ static BOOL get_open_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING return TRUE; } -/* helper for kernel32->ntdll timeout format conversion */ -static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, DWORD timeout ) -{ - if (timeout == INFINITE) return NULL; - pTime->QuadPart = (ULONGLONG)timeout * -10000; - return pTime; -} - /*********************************************************************** * SwitchToThread (KERNEL32.@) */

1 0

Nikolay Sivov : quartz: Remove unused function.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 5d7d940114767c4b12f7694c2e7e3a59590cdc43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d7d940114767c4b12f7694c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 3 11:11:48 2019 +0300 quartz: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a7063fe..9ab5d3e 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -647,11 +647,6 @@ static inline AsyncReader *impl_from_BaseOutputPin(BaseOutputPin *iface) return CONTAINING_RECORD(iface, AsyncReader, source); } -static inline BaseOutputPin *impl_BaseOutputPin_from_BasePin(BasePin *iface) -{ - return CONTAINING_RECORD(iface, BaseOutputPin, pin); -} - static inline AsyncReader *impl_from_IAsyncReader(IAsyncReader *iface) { return CONTAINING_RECORD(iface, AsyncReader, IAsyncReader_iface);

1 0

Alexandre Julliard : configure: Error on unused command line argument to catch unknown options with clang.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 3b5f48abc5bd84b153649deabbfcadf6161d3689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b5f48abc5bd84b153649dea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 3 11:00:17 2019 +0200 configure: Error on unused command line argument to catch unknown options with clang. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 29 +++++++++++++++++++++++++++-- configure.ac | 5 +++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 3b6d744..20d8ced 100755 --- a/configure +++ b/configure @@ -16737,6 +16737,31 @@ $as_echo "$ac_cv_cflags__Werror_unknown_warning_option" >&6; } if test "x$ac_cv_cflags__Werror_unknown_warning_option" = xyes; then : CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking whether the compiler supports -Werror=unused-command-line-argument... " >&6; } +if ${ac_cv_cflags__Werror_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Werror=unused-command-line-argument" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Werror_unused_command_line_argument=yes +else + ac_cv_cflags__Werror_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_unused_command_line_argument" >&5 +$as_echo "$ac_cv_cflags__Werror_unused_command_line_argument" >&6; } +if test "x$ac_cv_cflags__Werror_unused_command_line_argument" = xyes; then : + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wdeclaration-after-statement" >&5 $as_echo_n "checking whether the compiler supports -Wdeclaration-after-statement... " >&6; } if ${ac_cv_cflags__Wdeclaration_after_statement+:} false; then : @@ -17122,8 +17147,6 @@ $as_echo "$ac_cv_c_logicalop_noisy" >&6; } test "$ac_cv_c_logicalop_noisy" = yes || EXTRACFLAGS="$EXTRACFLAGS -Wlogical-op" fi - CFLAGS=$saved_CFLAGS - for ac_flag in $CFLAGS; do case $ac_flag in -g) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5 @@ -17316,6 +17339,8 @@ fi ;; esac ;; esac + CFLAGS=$saved_CFLAGS + if test "x$enable_maintainer_mode" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5 diff --git a/configure.ac b/configure.ac index 709b43b..a7c45ac 100644 --- a/configure.ac +++ b/configure.ac @@ -1975,6 +1975,7 @@ then dnl clang needs to be told to fail on unknown options saved_CFLAGS=$CFLAGS WINE_TRY_CFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) + WINE_TRY_CFLAGS([-Werror=unused-command-line-argument],[CFLAGS="$CFLAGS -Werror=unused-command-line-argument"]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) @@ -2006,8 +2007,6 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= CFLAGS=$saved_string_h_CFLAGS test "$ac_cv_c_logicalop_noisy" = yes || EXTRACFLAGS="$EXTRACFLAGS -Wlogical-op"]) - CFLAGS=$saved_CFLAGS - dnl Default to dwarf-2 debug info for ac_flag in $CFLAGS; do case $ac_flag in @@ -2036,6 +2035,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= esac ;; esac + CFLAGS=$saved_CFLAGS + dnl Enable -Werror for maintainer mode if test "x$enable_maintainer_mode" = "xyes" then

1 0

Nikolay Sivov : d3d10core/tests: Use d3d10 enumeration types.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: b8f032e6c0504bed6367b7afa83a87166f87e25c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f032e6c0504bed6367b7af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 3 11:11:03 2019 +0300 d3d10core/tests: Use d3d10 enumeration types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a395467..f65bd34 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1835,7 +1835,7 @@ static void test_texture1d_interfaces(void) desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - desc.Usage = D3D11_USAGE_DEFAULT; + desc.Usage = D3D10_USAGE_DEFAULT; desc.BindFlags = current->bind_flags; desc.CPUAccessFlags = 0; desc.MiscFlags = current->misc_flags; @@ -17524,8 +17524,8 @@ static void test_multiple_viewports(void) /* Two viewports, only first scissor rectangle set. */ memset(&rasterizer_desc, 0, sizeof(rasterizer_desc)); - rasterizer_desc.FillMode = D3D11_FILL_SOLID; - rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.FillMode = D3D10_FILL_SOLID; + rasterizer_desc.CullMode = D3D10_CULL_BACK; rasterizer_desc.DepthClipEnable = TRUE; rasterizer_desc.ScissorEnable = TRUE; hr = ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_find_ffp_fragment_shader ().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: d86f6a4ab735d8aeab4964036d5cc72e5a1900a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86f6a4ab735d8aeab496403… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 3 16:37:03 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_find_ffp_fragment_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ed3ff54..88f1cae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9793,9 +9793,8 @@ static struct glsl_ffp_vertex_shader *shader_glsl_find_ffp_vertex_shader(struct } static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(struct shader_glsl_priv *priv, - const struct ffp_frag_settings *args, const struct wined3d_context *context) + const struct ffp_frag_settings *args, const struct wined3d_context_gl *context_gl) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ffp_fragment_shader *glsl_desc; const struct ffp_frag_desc *desc; @@ -10207,7 +10206,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct ffp_frag_settings settings; gen_ffp_frag_op(context, state, &settings, FALSE); - ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context); + ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_compile_compute_shader ().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: dbb0139e3eb3136274d3f0c2a02baa0cc6ffe1f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb0139e3eb3136274d3f0c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 3 16:37:04 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_compile_compute_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 88f1cae..e7c7bca 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9964,12 +9964,11 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * } static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, - const struct wined3d_context *context, struct wined3d_shader *shader) + const struct wined3d_context_gl *context_gl, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - struct glsl_context_data *ctx_data = context->shader_backend_data; + struct glsl_context_data *ctx_data = context_gl->c.shader_backend_data; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; struct glsl_cs_compiled_shader *gl_shaders; struct glsl_shader_private *shader_data; struct glsl_shader_prog_link *entry; @@ -10047,12 +10046,13 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, static GLuint find_glsl_compute_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_private *shader_data; if (!shader->backend_data) { WARN("Failed to find GLSL program for compute shader %p.\n", shader); - if (FAILED(shader_glsl_compile_compute_shader(priv, context, shader))) + if (FAILED(shader_glsl_compile_compute_shader(priv, context_gl, shader))) { ERR("Failed to compile compute shader %p.\n", shader); return 0; @@ -10522,7 +10522,7 @@ static void shader_glsl_precompile(void *shader_priv, struct wined3d_shader *sha if (shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) { context = context_acquire(device, NULL, 0); - shader_glsl_compile_compute_shader(shader_priv, context, shader); + shader_glsl_compile_compute_shader(shader_priv, wined3d_context_gl(context), shader); context_release(context); } }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to find_glsl_compute_shader().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 7d8ad2e8d8ccbd4dc8118c6173e97dbd26b42a87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8ad2e8d8ccbd4dc8118c61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 3 16:37:05 2019 +0430 wined3d: Pass a wined3d_context_gl structure to find_glsl_compute_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e7c7bca..34bb0b7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10043,10 +10043,9 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, return WINED3D_OK; } -static GLuint find_glsl_compute_shader(const struct wined3d_context *context, +static GLuint find_glsl_compute_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_private *shader_data; if (!shader->backend_data) @@ -10066,6 +10065,7 @@ static GLuint find_glsl_compute_shader(const struct wined3d_context *context, static void set_glsl_compute_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_prog_link *entry; struct wined3d_shader *shader; struct glsl_program_key key; @@ -10081,7 +10081,7 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex return; } - cs_id = find_glsl_compute_shader(context, priv, shader); + cs_id = find_glsl_compute_shader(context_gl, priv, shader); memset(&key, 0, sizeof(key)); key.cs_id = cs_id; if (!(entry = get_glsl_program_entry(priv, &key)))

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to set_glsl_compute_shader_program().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 3d8c15dc85cf0251420593170a705f1088a8a083 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d8c15dc85cf025142059317… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 3 16:37:06 2019 +0430 wined3d: Pass a wined3d_context_gl structure to set_glsl_compute_shader_program(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34bb0b7..1cd6bb6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10062,16 +10062,15 @@ static GLuint find_glsl_compute_shader(const struct wined3d_context_gl *context_ } /* Context activation is done by the caller. */ -static void set_glsl_compute_shader_program(const struct wined3d_context *context, +static void set_glsl_compute_shader_program(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_prog_link *entry; struct wined3d_shader *shader; struct glsl_program_key key; GLuint cs_id; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE))) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE))) return; if (!(shader = state->shader[WINED3D_SHADER_TYPE_COMPUTE])) @@ -10591,13 +10590,14 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex static void shader_glsl_select_compute(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; GLuint program_id, prev_id; prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; - set_glsl_compute_shader_program(context, state, priv, ctx_data); + set_glsl_compute_shader_program(context_gl, state, priv, ctx_data); program_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; TRACE("Using GLSL program %u.\n", program_id);

1 0

Henri Verbeet : wined3d: Also try to create a depth/ stencil buffer for WINED3D_NO3D devices in swapchain_init().
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: 4ed190e8ac50de60bfcd0c54462b690bf83c44b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed190e8ac50de60bfcd0c54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 3 16:37:07 2019 +0430 wined3d: Also try to create a depth/stencil buffer for WINED3D_NO3D devices in swapchain_init(). If requested. It will fail as it should, but the client library should never request it. I.e., the additional check is redundant. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9be6658..69580ad 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -938,7 +938,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } /* Swapchains share the depth/stencil buffer, so only create a single depthstencil surface. */ - if (desc->enable_auto_depth_stencil && !(device->wined3d->flags & WINED3D_NO3D)) + if (desc->enable_auto_depth_stencil) { TRACE("Creating depth/stencil buffer.\n"); if (!device->auto_depth_stencil_view)

1 0

Hans Leidekker : wbemprox: Retrieve the system UUID from the SMBIOS table.
by Alexandre Julliard 03 Jul '19

03 Jul '19

Module: wine Branch: master Commit: ea3caa2d83d1dfa85b7830e7f8f431b51b77377e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea3caa2d83d1dfa85b7830e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 3 12:38:30 2019 +0200 wbemprox: Retrieve the system UUID from the SMBIOS table. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 124 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 41 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6c56d0d..6302cf5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1493,52 +1493,94 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co return status; } +#include "pshpack1.h" +struct smbios_prologue +{ + BYTE calling_method; + BYTE major_version; + BYTE minor_version; + BYTE revision; + DWORD length; +}; + +struct smbios_header +{ + BYTE type; + BYTE length; + WORD handle; +}; + +struct smbios_system +{ + struct smbios_header hdr; + BYTE vendor; + BYTE product; + BYTE version; + BYTE serial; + BYTE uuid[16]; +}; +#include "poppack.h" + +#define RSMB (('R' << 24) | ('S' << 16) | ('M' << 8) | 'B') + static WCHAR *get_compsysproduct_uuid(void) { -#ifdef __APPLE__ - unsigned char uuid[16]; - const struct timespec timeout = {1, 0}; - if (!gethostuuid( uuid, &timeout )) - { - static const WCHAR fmtW[] = - {'%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X',0}; - WCHAR *ret = heap_alloc( 37 * sizeof(WCHAR) ); - if (!ret) return NULL; - sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], - uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); - return ret; - } -#endif -#ifdef __linux__ - int file; - if ((file = open( "/var/lib/dbus/machine-id", O_RDONLY )) != -1) - { - unsigned char buf[32]; - if (read( file, buf, sizeof(buf) ) == sizeof(buf)) + static const WCHAR fmtW[] = + {'%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-', + '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X',0}; + static const BYTE none[] = {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; + ULONG len; + char *buf = NULL; + const char *ptr, *start; + const struct smbios_prologue *prologue; + const struct smbios_header *hdr; + const struct smbios_system *system; + const BYTE *uuid = NULL; + WCHAR *ret = NULL; + + if ((len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 )) < sizeof(*prologue) ) goto done; + if (!(buf = heap_alloc( len ))) goto done; + GetSystemFirmwareTable( RSMB, 0, buf, len ); + + prologue = (const struct smbios_prologue *)buf; + if (prologue->length < sizeof(*hdr)) goto done; + start = (const char *)(prologue + 1); + hdr = (const struct smbios_header *)start; + + for (;;) + { + if (uuid || (const char *)hdr - start >= prologue->length - sizeof(*hdr)) break; + if (!hdr->length) + { + WARN( "invalid entry\n" ); + break; + } + + switch (hdr->type) { - unsigned int i, j; - WCHAR *ret, *p; - - close( file ); - if (!(p = ret = heap_alloc( 37 * sizeof(WCHAR) ))) return NULL; - for (i = 0, j = 0; i < 8; i++) p[i] = toupperW( buf[j++] ); - p[8] = '-'; - for (i = 9; i < 13; i++) p[i] = toupperW( buf[j++] ); - p[13] = '-'; - for (i = 14; i < 18; i++) p[i] = toupperW( buf[j++] ); - p[18] = '-'; - for (i = 19; i < 23; i++) p[i] = toupperW( buf[j++] ); - p[23] = '-'; - for (i = 24; i < 36; i++) p[i] = toupperW( buf[j++] ); - ret[i] = 0; - return ret; + case 1: /* system entry */ + if (hdr->length < sizeof(*system) || (const char *)hdr - start + hdr->length > prologue->length) break; + system = (const struct smbios_system *)hdr; + uuid = system->uuid; + break; + + default: /* skip other entries */ + for (ptr = (const char *)hdr + hdr->length; *ptr; ptr += strlen(ptr) + 1) { /* nothing */ } + if (ptr == (const char *)hdr + hdr->length) ptr++; + hdr = (const struct smbios_header *)(ptr + 1); + break; } - close( file ); } -#endif - return heap_strdupW( compsysproduct_uuidW ); + if (!uuid || !memcmp( uuid, none, sizeof(none) ) || !(ret = heap_alloc( 37 * sizeof(WCHAR) ))) goto done; + + sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], uuid[8], + uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); + +done: + heap_free( buf ); + if (!ret) ret = heap_strdupW( compsysproduct_uuidW ); + return ret; } static enum fill_status fill_compsysproduct( struct table *table, const struct expr *cond )

1 0