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

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_compile_compute_shader().
by Henri Verbeet July 3, 2019

July 3, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- 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 88f1cae0b1e..e7c7bca8e9e 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); } } -- 2.11.0

2 1

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_find_ffp_fragment_shader().
by Henri Verbeet July 3, 2019

July 3, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- 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 ed3ff541496..88f1cae0b1e 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; } -- 2.11.0

2 1

[PATCH] d3d10core/tests: Use d3d10 enumeration types.
by Nikolay Sivov July 3, 2019

July 3, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 a395467125..f65bd34a79 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); -- 2.20.1

3 2

[PATCH] wbemprox: Retrieve the system UUID from the SMBIOS table.
by Hans Leidekker July 3, 2019

July 3, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- 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 6c56d0d70a..6302cf574d 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 ) -- 2.20.1

2 1

[PATCH] quartz: Remove unused function.
by Nikolay Sivov July 3, 2019

July 3, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/quartz/filesource.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a7063fea78..9ab5d3e3cb 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); -- 2.20.1

2 1

[PATCH] kernel32: Remove unused functions.
by Nikolay Sivov July 3, 2019

July 3, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/sync.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 49374ccd62..d8d0f20ce6 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.@) */ -- 2.20.1

2 1

[PATCH] devenum: Don't free with uninitialized pointer value.
by Nikolay Sivov July 3, 2019

July 3, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 76bb0c249a..8e82fcdeac 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -379,9 +379,9 @@ static void free_regfilter2(REGFILTER2 *rgf) static void write_filter_data(IPropertyBag *prop_bag, REGFILTER2 *rgf) { + BYTE *data = NULL, *array; IAMFilterData *fildata; SAFEARRAYBOUND sabound; - BYTE *data, *array; VARIANT var = {}; ULONG size; HRESULT hr; -- 2.20.1

2 1

[PATCH 1/5] quartz/dsoundrender: Use flush_event instead of reimplementing it.
by Zebediah Figura July 2, 2019

July 2, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 39 +++----------------------------------- 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index f9fef51b562..8afb094af82 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -64,8 +64,6 @@ typedef struct DSoundRenderImpl REFERENCE_TIME play_time; - HANDLE blocked; - LONG volume; LONG pan; @@ -245,7 +243,7 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) This->in_loop = 1; LeaveCriticalSection(&This->renderer.filter.csFilter); LeaveCriticalSection(&This->renderer.csRenderLock); - WaitForSingleObject(This->blocked, 10); + WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); EnterCriticalSection(&This->renderer.filter.csFilter); This->in_loop = 0; @@ -270,7 +268,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM if (hr != S_OK) { This->in_loop = 1; LeaveCriticalSection(&This->renderer.csRenderLock); - ret = WaitForSingleObject(This->blocked, 10); + ret = WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); This->in_loop = 0; if (This->renderer.sink.flushing || This->renderer.filter.state == State_Stopped) @@ -434,7 +432,6 @@ static VOID WINAPI DSoundRender_OnStopStreaming(BaseRenderer * iface) IDirectSoundBuffer_Stop(This->dsbuffer); This->writepos = This->buf_size; - SetEvent(This->blocked); } static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) @@ -445,13 +442,7 @@ static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) if (This->renderer.sink.pin.pConnectedTo) { - if (This->renderer.filter.state == State_Paused) - { - /* Unblock our thread, state changing from paused to running doesn't need a reset for state change */ - SetEvent(This->blocked); - } IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); - ResetEvent(This->blocked); } } @@ -548,17 +539,6 @@ static HRESULT WINAPI DSoundRender_EndOfStream(BaseRenderer* iface) return hr; } -static HRESULT WINAPI DSoundRender_BeginFlush(BaseRenderer* iface) -{ - DSoundRenderImpl *This = impl_from_BaseRenderer(iface); - - TRACE("\n"); - BaseRendererImpl_BeginFlush(iface); - SetEvent(This->blocked); - - return S_OK; -} - static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -566,8 +546,6 @@ static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) TRACE("\n"); BaseRendererImpl_EndFlush(iface); - if (This->renderer.filter.state != State_Stopped) - ResetEvent(This->blocked); if (This->dsbuffer) { @@ -602,8 +580,6 @@ static void dsound_render_destroy(BaseRenderer *iface) IDirectSound8_Release(filter->dsound); filter->dsound = NULL; - CloseHandle(filter->blocked); - strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); } @@ -643,7 +619,7 @@ static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_CompleteConnect, DSoundRender_BreakConnect, DSoundRender_EndOfStream, - DSoundRender_BeginFlush, + NULL, DSoundRender_EndFlush, dsound_render_destroy, dsound_render_query_interface, @@ -694,14 +670,6 @@ HRESULT DSoundRender_create(IUnknown *outer, void **out) if (SUCCEEDED(hr)) { - pDSoundRender->blocked = CreateEventW(NULL, TRUE, TRUE, NULL); - - if (!pDSoundRender->blocked || FAILED(hr)) - { - IBaseFilter_Release(&pDSoundRender->renderer.filter.IBaseFilter_iface); - return HRESULT_FROM_WIN32(GetLastError()); - } - *out = &pDSoundRender->renderer.filter.IUnknown_inner; } else @@ -734,7 +702,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) if (SUCCEEDED(hr)) This->renderer.filter.state = State_Paused; - ResetEvent(This->blocked); ResetEvent(This->renderer.flush_event); } LeaveCriticalSection(&This->renderer.csRenderLock); -- 2.22.0

1 4

[PATCH] ntoskrnl.exe: Use the registered interface class in IoSetDeviceInterfaceState().
by Zebediah Figura July 2, 2019

July 2, 2019

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntoskrnl.exe/pnp.c | 77 +---------------------------------------- 1 file changed, 1 insertion(+), 76 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 4ec8aaaed27..30865a05dcb 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -71,77 +71,6 @@ static int interface_rb_compare( const void *key, const struct wine_rb_entry *en static struct wine_rb_tree device_interfaces = { interface_rb_compare }; -static inline BOOL is_valid_hex(WCHAR c) -{ - if (!(((c >= '0') && (c <= '9')) || - ((c >= 'a') && (c <= 'f')) || - ((c >= 'A') && (c <= 'F')))) - return FALSE; - return TRUE; -} - -static const BYTE guid_conv_table[256] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ -}; - -static BOOL guid_from_string(const WCHAR *s, GUID *id) -{ - int i; - - if (!s || s[0] != '{') - { - memset( id, 0, sizeof (CLSID) ); - return FALSE; - } - - id->Data1 = 0; - for (i = 1; i < 9; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; - } - if (s[9] != '-') return FALSE; - - id->Data2 = 0; - for (i = 10; i < 14; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; - } - if (s[14] != '-') return FALSE; - - id->Data3 = 0; - for (i = 15; i < 19; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; - } - if (s[19] != '-') return FALSE; - - for (i = 20; i < 37; i += 2) - { - if (i == 24) - { - if (s[i] != '-') return FALSE; - i++; - } - if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; - id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; - } - - if (s[37] == '}') - return TRUE; - - return FALSE; -} - static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void *context ) { HANDLE event = context; @@ -594,7 +523,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable UNICODE_STRING string; DWORD data = enable; NTSTATUS ret; - GUID class; ULONG len; TRACE("device %s, enable %u.\n", debugstr_us(name), enable); @@ -615,9 +543,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if (*p == '\\') refstr = p; if (!refstr) refstr = p; - if (!guid_from_string( refstr - 38, &class )) - return STATUS_INVALID_PARAMETER; - len = lstrlenW(DeviceClassesW) + 38 + 1 + namelen + 2 + 1; if (!(path = heap_alloc( len * sizeof(WCHAR) ))) @@ -676,7 +601,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable { broadcast->dbcc_size = len; broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; - broadcast->dbcc_classguid = class; + broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast ); -- 2.20.1

1 0

Ubuntu 19.10 will be 64 bit only
by Rosanne DiMesio July 2, 2019

July 2, 2019

https://discourse.ubuntu.com/t/i386-architecture-will-be-dropped-starting-w… A user has already asked about this on the forum. https://forum.winehq.org/viewtopic.php?f=8&t=32565 The immediate question for me is whether to even bother trying to package Wine for Ubuntu 19.10 and up. The suggestion from Ubuntu is to use the 32 bit libraries from 18.04, which will be supported until 2023. It's theoretically possible for me to build the 32 bit side on the OBS using the libraries from 18.04, but that would lead to a mismatch in library versions the 32 and 64 bit sides were built against. Apt requires the i386 and amd64 versions of packages match or it will refuse to install them, so unless that changes, users of 19.10 and up will be unable to install the 32 bit libraries they need to run Wine, unless they downgrade a significant part of their system to the 18.04 versions. I could build pure 64 bit Wine packages for Ubuntu. We've been telling users for 10 years that pure 64 bit Wine is not supported, but with so many systems going 64 bit only, perhaps it's time to reconsider that policy. There are certainly more 64 bit Windows apps now than there used to be, so it wouldn't be completely useless. The downside of doing that is that we will spend a lot of time explaining to users that pure 64 bit Wine will not run 32 bit programs, no matter how many places we plaster that information. The upside is that if we change that policy, I'm ready to go with pure 64 bit CentOS 7 packages. Thoughts? Perhaps this should be discussed at WineConf? -- Rosanne DiMesio dimesio(a)earthlink.net

16 29