May 2019 - Wine-Commits - list.winehq.org

Piotr Caban : hid: Change format of preparsed data.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 395d268565893c10875cbe903d2e1b77d6d7e3a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=395d268565893c10875cbe90… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 13 12:33:56 2019 +0200 hid: Change format of preparsed data. Advantages of this format: - all table elements have constant size, that makes iterating table easier - allow report lookup by report ID in O(1) time - doesn't sort reports, it makes it possible to preserve original order of elements making output of functions more similar to native - preparsed data is created from collection, this will allow to add support for multiple top-most collections Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 239 ++++++++-------------- dlls/hid/parse.h | 39 ++-- dlls/hidclass.sys/descriptor.c | 437 +++++++++++++---------------------------- dlls/hidclass.sys/device.c | 4 +- dlls/hidclass.sys/parse.h | 25 ++- 5 files changed, 250 insertions(+), 494 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=395d268565893c10875c…

1 0

Roman Stingler : include: Added some process creation Flags.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 9a64bfc533cc4fede49a5cba6b1e456560f50966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a64bfc533cc4fede49a5cba… Author: Roman Stingler <roman.stingler(a)gmail.com> Date: Wed May 8 22:34:07 2019 +0200 include: Added some process creation Flags. Signed-off-by: Roman Stingler <roman.stingler(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 53 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 314a8b7..887e1c1 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -672,29 +672,38 @@ typedef struct _TIME_ZONE_INFORMATION{ /* CreateProcess: dwCreationFlag values */ -#define DEBUG_PROCESS 0x00000001 -#define DEBUG_ONLY_THIS_PROCESS 0x00000002 -#define CREATE_SUSPENDED 0x00000004 -#define DETACHED_PROCESS 0x00000008 -#define CREATE_NEW_CONSOLE 0x00000010 -#define NORMAL_PRIORITY_CLASS 0x00000020 -#define IDLE_PRIORITY_CLASS 0x00000040 -#define HIGH_PRIORITY_CLASS 0x00000080 -#define REALTIME_PRIORITY_CLASS 0x00000100 -#define BELOW_NORMAL_PRIORITY_CLASS 0x00004000 -#define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 -#define CREATE_NEW_PROCESS_GROUP 0x00000200 -#define CREATE_UNICODE_ENVIRONMENT 0x00000400 -#define CREATE_SEPARATE_WOW_VDM 0x00000800 -#define CREATE_SHARED_WOW_VDM 0x00001000 -#define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 -#define CREATE_BREAKAWAY_FROM_JOB 0x01000000 -#define CREATE_DEFAULT_ERROR_MODE 0x04000000 -#define CREATE_NO_WINDOW 0x08000000 -#define PROFILE_USER 0x10000000 -#define PROFILE_KERNEL 0x20000000 -#define PROFILE_SERVER 0x40000000 +#define DEBUG_PROCESS 0x00000001 +#define DEBUG_ONLY_THIS_PROCESS 0x00000002 +#define CREATE_SUSPENDED 0x00000004 +#define DETACHED_PROCESS 0x00000008 +#define CREATE_NEW_CONSOLE 0x00000010 +#define NORMAL_PRIORITY_CLASS 0x00000020 +#define IDLE_PRIORITY_CLASS 0x00000040 +#define HIGH_PRIORITY_CLASS 0x00000080 +#define REALTIME_PRIORITY_CLASS 0x00000100 +#define CREATE_NEW_PROCESS_GROUP 0x00000200 +#define CREATE_UNICODE_ENVIRONMENT 0x00000400 +#define CREATE_SEPARATE_WOW_VDM 0x00000800 +#define CREATE_SHARED_WOW_VDM 0x00001000 +#define CREATE_FORCEDOS 0x00002000 +#define BELOW_NORMAL_PRIORITY_CLASS 0x00004000 +#define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 +#define INHERIT_PARENT_AFFINITY 0x00010000 +#define INHERIT_CALLER_PRIORITY 0x00020000 +#define CREATE_PROTECTED_PROCESS 0x00040000 +#define EXTENDED_STARTUPINFO_PRESENT 0x00080000 +#define PROCESS_MODE_BACKGROUND_BEGIN 0x00100000 +#define PROCESS_MODE_BACKGROUND_END 0x00200000 +#define CREATE_SECURE_PROCESS 0x00400000 +#define CREATE_BREAKAWAY_FROM_JOB 0x01000000 +#define CREATE_PRESERVE_CODE_AUTHZ_LEVEL 0x02000000 +#define CREATE_DEFAULT_ERROR_MODE 0x04000000 +#define CREATE_NO_WINDOW 0x08000000 +#define PROFILE_USER 0x10000000 +#define PROFILE_KERNEL 0x20000000 +#define PROFILE_SERVER 0x40000000 +#define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 /* File object type definitions */

1 0

Akihiro Sagawa : advapi32: Remove useless RegLoadMUIStringA implementation.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 2d9a7cd39de010e7a11e9e7c919b1dcf7082ccbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d9a7cd39de010e7a11e9e7c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 9 22:07:32 2019 +0900 advapi32: Remove useless RegLoadMUIStringA implementation. This commit avoids brokeness in advance. Otherwise, it will be broken when we support ERROR_MORE_DATA in RegLoadMUIStringW. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 32 ++------------------------------ dlls/advapi32/tests/registry.c | 6 +++--- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 328ae39..97561e2 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -3280,40 +3280,12 @@ cleanup: /****************************************************************************** * RegLoadMUIStringA [ADVAPI32.@] * - * See RegLoadMUIStringW + * Not implemented on native. */ LSTATUS WINAPI RegLoadMUIStringA(HKEY hKey, LPCSTR pszValue, LPSTR pszBuffer, DWORD cbBuffer, LPDWORD pcbData, DWORD dwFlags, LPCSTR pszBaseDir) { - UNICODE_STRING valueW, baseDirW; - WCHAR *pwszBuffer; - DWORD cbData = cbBuffer * sizeof(WCHAR); - LONG result; - - valueW.Buffer = baseDirW.Buffer = pwszBuffer = NULL; - if (!RtlCreateUnicodeStringFromAsciiz(&valueW, pszValue) || - !RtlCreateUnicodeStringFromAsciiz(&baseDirW, pszBaseDir) || - !(pwszBuffer = heap_alloc(cbData))) - { - result = ERROR_NOT_ENOUGH_MEMORY; - goto cleanup; - } - - result = RegLoadMUIStringW(hKey, valueW.Buffer, pwszBuffer, cbData, NULL, dwFlags, - baseDirW.Buffer); - - if (result == ERROR_SUCCESS) { - cbData = WideCharToMultiByte(CP_ACP, 0, pwszBuffer, -1, pszBuffer, cbBuffer, NULL, NULL); - if (pcbData) - *pcbData = cbData; - } - -cleanup: - heap_free(pwszBuffer); - RtlFreeUnicodeString(&baseDirW); - RtlFreeUnicodeString(&valueW); - - return result; + return ERROR_CALL_NOT_IMPLEMENTED; } /****************************************************************************** diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index cadb936..a1fcb5e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3917,7 +3917,7 @@ static void test_RegLoadMUIString(void) wine_dbgstr_wn(bufW, size / sizeof(WCHAR)), wine_dbgstr_wn(textW, text_size / sizeof(WCHAR))); ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); - todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); /* change the current direcoty to other than system32 directory */ SetCurrentDirectoryA("\\"); @@ -3932,13 +3932,13 @@ static void test_RegLoadMUIString(void) wine_dbgstr_wn(bufW, size / sizeof(WCHAR)), wine_dbgstr_wn(textW, text_size / sizeof(WCHAR))); ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, sysdir); - todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, NULL); ok(ret == ERROR_FILE_NOT_FOUND, "got %d, expected ERROR_FILE_NOT_FOUND\n", ret); ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); - todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); RegCloseKey(hkey); SetCurrentDirectoryW(curdirW);

1 0

Józef Kucia : setupapi: Avoid debugstr buffer overflow.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 88e28d971bd119f214e29d4ebfa819af9f18f5b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88e28d971bd119f214e29d4e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun May 12 15:50:09 2019 +0200 setupapi: Avoid debugstr buffer overflow. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index c108689..69376c4 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1853,13 +1853,8 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, } buffer[i - index] = value; } - if (TRACE_ON(setupapi)) - { - TRACE( "%p/%p/%d/%d index %d returning", - context->Inf, context->CurrentInf, context->Section, context->Line, index ); - for (i = index; i < line->nb_fields; i++) TRACE( " %02x", buffer[i - index] ); - TRACE( "\n" ); - } + TRACE( "%p/%p/%d/%d index %d\n", + context->Inf, context->CurrentInf, context->Section, context->Line, index ); return TRUE; }

1 0

Zebediah Figura : quartz: Make Parser_OutputPin_BreakConnect() a local helper.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: f789c70dddf1e608f92ffb81dc5848abba1520e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f789c70dddf1e608f92ffb81… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 11 14:46:18 2019 -0500 quartz: Make Parser_OutputPin_BreakConnect() a local helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/parser.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 9278a58..d92161f 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -46,7 +46,6 @@ static HRESULT WINAPI Parser_OutputPin_DecideBufferSize(BaseOutputPin *iface, IM static HRESULT WINAPI Parser_OutputPin_CheckMediaType(BasePin *pin, const AM_MEDIA_TYPE *pmt); static HRESULT WINAPI Parser_OutputPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDIA_TYPE *pmt); static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); -static HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This); static inline ParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { @@ -429,7 +428,7 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, Parser_OutputPin_DecideBufferSize, Parser_OutputPin_DecideAllocator, - Parser_OutputPin_BreakConnect + NULL, }; HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt) @@ -468,6 +467,22 @@ HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PR return hr; } +static HRESULT WINAPI break_connection(IPin *iface) +{ + Parser_OutputPin *pin = unsafe_impl_Parser_OutputPin_from_IPin(iface); + HRESULT hr; + + if (!pin->pin.pin.pConnectedTo || !pin->pin.pMemInputPin) + hr = VFW_E_NOT_CONNECTED; + else + { + hr = IPin_Disconnect(pin->pin.pin.pConnectedTo); + IPin_Disconnect(iface); + } + + return hr; +} + static HRESULT Parser_RemoveOutputPins(ParserImpl * This) { /* NOTE: should be in critical section when calling this function */ @@ -483,7 +498,7 @@ static HRESULT Parser_RemoveOutputPins(ParserImpl * This) for (i = 0; i < This->cStreams; i++) { - hr = ((BaseOutputPin *)ppOldPins[i + 1])->pFuncsTable->pfnBreakConnect((BaseOutputPin *)ppOldPins[i + 1]); + hr = break_connection(ppOldPins[i + 1]); TRACE("Disconnect: %08x\n", hr); IPin_Release(ppOldPins[i + 1]); } @@ -609,26 +624,6 @@ static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *iface, IMe return hr; } -static HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This) -{ - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(This->pin.pCritSec); - if (!This->pin.pConnectedTo || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else - { - hr = IPin_Disconnect(This->pin.pConnectedTo); - IPin_Disconnect(&This->pin.IPin_iface); - } - LeaveCriticalSection(This->pin.pCritSec); - - return hr; -} - - static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { Parser_OutputPin *This = unsafe_impl_Parser_OutputPin_from_IPin(iface);

1 0

Henri Verbeet : wined3d: Move the "blit_vbo" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: de16768de7f08cc1677df6aac9b5c666732f958b URL: https://source.winehq.org/git/wine.git/?a=commit;h=de16768de7f08cc1677df6aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 10 21:19:06 2019 +0430 wined3d: Move the "blit_vbo" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c291c4c..443c6d5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1444,9 +1444,6 @@ void wined3d_context_cleanup(struct wined3d_context *context) } } - if (context->blit_vbo) - GL_EXTCALL(glDeleteBuffers(1, &context->blit_vbo)); - checkGLcall("context cleanup"); } @@ -1494,6 +1491,9 @@ void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (context_gl->dummy_arbfp_prog) GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog)); + if (context_gl->blit_vbo) + GL_EXTCALL(glDeleteBuffers(1, &context_gl->blit_vbo)); + checkGLcall("context cleanup"); } @@ -5630,9 +5630,9 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te /* Draw a quad. */ if (gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) { - if (!context->blit_vbo) - GL_EXTCALL(glGenBuffers(1, &context->blit_vbo)); - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context->blit_vbo)); + if (!context_gl->blit_vbo) + GL_EXTCALL(glGenBuffers(1, &context_gl->blit_vbo)); + GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo)); context_unload_vertex_data(context); context_unload_numbered_arrays(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48b97d7..c308b31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2013,8 +2013,6 @@ struct wined3d_context struct wined3d_fence *buffer_fences[MAX_ATTRIBS]; unsigned int buffer_fence_count; - GLuint blit_vbo; - unsigned int viewport_count; unsigned int scissor_rect_count; }; @@ -2033,6 +2031,8 @@ struct wined3d_context_gl GLenum *texture_type; + GLuint blit_vbo; + unsigned int tex_unit_map[WINED3D_MAX_COMBINED_SAMPLERS]; unsigned int rev_tex_unit_map[MAX_GL_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS];

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_update_tex_unit_map().
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 48b0c209554977a38d011a6bedc5ff31a27a7f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48b0c209554977a38d011a6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 10 21:19:03 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_update_tex_unit_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a197604..f62ba27 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3435,15 +3435,15 @@ static void wined3d_context_gl_map_vsamplers(struct wined3d_context_gl *context_ } } -static void context_update_tex_unit_map(struct wined3d_context *context, const struct wined3d_state *state) +static void wined3d_context_gl_update_tex_unit_map(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; BOOL vs = use_vs(state); BOOL ps = use_ps(state); if (!ps) - context_update_fixed_function_usage_map(context, state); + context_update_fixed_function_usage_map(&context_gl->c, state); /* Try to go for a 1:1 mapping of the samplers when possible. Pixel shaders * need a 1:1 map at the moment. @@ -3956,7 +3956,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, /* Preload resources before FBO setup. Texture preload in particular may * result in changes to the current FBO, due to using e.g. FBO blits for * updating a resource location. */ - context_update_tex_unit_map(context, state); + wined3d_context_gl_update_tex_unit_map(context_gl, state); context_preload_textures(context, state); context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL],

1 0

Akihiro Sagawa : advapi32/tests: Add basic RegLoadMUIString tests.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: c29a5560a682ac59d87c5d9c3420840d03eede60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29a5560a682ac59d87c5d9c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 9 22:07:24 2019 +0900 advapi32/tests: Add basic RegLoadMUIString tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 115 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d1fe3f0..f5bcbf3 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -51,6 +51,8 @@ static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(UNICODE_STRING*); static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); static LONG (WINAPI *pRegDeleteKeyValueA)(HKEY,LPCSTR,LPCSTR); static LONG (WINAPI *pRegSetKeyValueW)(HKEY,LPCWSTR,LPCWSTR,DWORD,const void*,DWORD); +static LONG (WINAPI *pRegLoadMUIStringA)(HKEY,LPCSTR,LPSTR,DWORD,LPDWORD,DWORD,LPCSTR); +static LONG (WINAPI *pRegLoadMUIStringW)(HKEY,LPCWSTR,LPWSTR,DWORD,LPDWORD,DWORD,LPCWSTR); static BOOL limited_user; @@ -142,6 +144,8 @@ static void InitFunctionPtrs(void) ADVAPI32_GET_PROC(RegDeleteKeyExA); ADVAPI32_GET_PROC(RegDeleteKeyValueA); ADVAPI32_GET_PROC(RegSetKeyValueW); + ADVAPI32_GET_PROC(RegLoadMUIStringA); + ADVAPI32_GET_PROC(RegLoadMUIStringW); pIsWow64Process = (void *)GetProcAddress( hkernel32, "IsWow64Process" ); pRtlFormatCurrentUserKeyPath = (void *)GetProcAddress( hntdll, "RtlFormatCurrentUserKeyPath" ); @@ -3830,6 +3834,116 @@ todo_wine ok(dwret == ERROR_SUCCESS, "got %u\n", dwret); } +static void test_RegLoadMUIString(void) +{ + HMODULE hUser32, hResDll; + int (WINAPI *pLoadStringW)(HMODULE, UINT, WCHAR *, int); + LONG ret; + HKEY hkey; + DWORD type, size, text_size; + UINT i; + char buf[64], *p, sysdir[MAX_PATH]; + WCHAR textW[64], bufW[64]; + WCHAR curdirW[MAX_PATH], sysdirW[MAX_PATH]; + const static char tz_value[] = "MUI_Std"; + const static WCHAR tz_valueW[] = {'M','U','I','_','S','t','d', 0}; + + if (!pRegLoadMUIStringA || !pRegLoadMUIStringW) + { + win_skip("RegLoadMUIString is not available\n"); + return; + } + + hUser32 = LoadLibraryA("user32.dll"); + ok(hUser32 != NULL, "cannot load user32.dll\n"); + pLoadStringW = (void *)GetProcAddress(hUser32, "LoadStringW"); + ok(pLoadStringW != NULL, "failed to get LoadStringW address\n"); + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\UTC", 0, + KEY_READ, &hkey); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + size = ARRAY_SIZE(buf); + ret = RegQueryValueExA(hkey, tz_value, NULL, &type, (BYTE *)buf, &size); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(buf[0] == '@', "got %s\n", buf); + + p = strrchr(buf, ','); + *p = '\0'; + i = atoi(p + 2); /* skip ',-' */ + hResDll = LoadLibraryExA(&buf[1], NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); + memset(textW, 0xaa, sizeof(textW)); + ret = pLoadStringW(hResDll, i, textW, ARRAY_SIZE(textW)); + ok(ret > 0, "failed to load string resource\n"); + text_size = (ret + 1) * sizeof(WCHAR); + FreeLibrary(hResDll); + FreeLibrary(hUser32); + + ret = GetSystemDirectoryW(sysdirW, ARRAY_SIZE(sysdirW)); + ok(ret > 0, "GetSystemDirectoryW failed\n"); + ret = GetSystemDirectoryA(sysdir, ARRAY_SIZE(sysdir)); + ok(ret > 0, "GetSystemDirectoryA failed\n"); + + /* change the current direcoty to system32 */ + GetCurrentDirectoryW(ARRAY_SIZE(curdirW), curdirW); + SetCurrentDirectoryW(sysdirW); + + size = 0xdeadbeef; + ret = pRegLoadMUIStringW(hkey, tz_valueW, NULL, 0, &size, 0, NULL); + todo_wine ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); + todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); + + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)+1, &size, 0, NULL); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret); + todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + + size = 0xdeadbeef; + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)*2, &size, 0, NULL); + todo_wine ok(ret == ERROR_MORE_DATA, "got %d, expected ERROR_MORE_DATA\n", ret); + todo_wine ok(size == text_size || broken(size == text_size + sizeof(WCHAR) /* vista */), + "got %u, expected %u\n", size, text_size); + todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]); + + size = 0xdeadbeef; + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, NULL); + ok(ret == ERROR_SUCCESS, "got %d, expected ERROR_SUCCESS\n", ret); + todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); + size = min(size, sizeof(bufW)); + todo_wine ok(!memcmp(textW, bufW, size), "got %s, expected %s\n", + wine_dbgstr_wn(bufW, size / sizeof(WCHAR)), wine_dbgstr_wn(textW, text_size / sizeof(WCHAR))); + + ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); + todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + + /* change the current direcoty to other than system32 directory */ + SetCurrentDirectoryA("\\"); + + size = 0xdeadbeef; + memset(bufW, 0xff, sizeof(bufW)); + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, sysdirW); + todo_wine ok(ret == ERROR_SUCCESS, "got %d, expected ERROR_SUCCESS\n", ret); + todo_wine ok(size == text_size, "got %u, expected %u\n", size, text_size); + size = min(size, sizeof(bufW)); + todo_wine ok(!memcmp(textW, bufW, size), "got %s, expected %s\n", + wine_dbgstr_wn(bufW, size / sizeof(WCHAR)), wine_dbgstr_wn(textW, text_size / sizeof(WCHAR))); + + ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, sysdir); + todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + + ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, ARRAY_SIZE(bufW), &size, 0, NULL); + todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %d, expected ERROR_FILE_NOT_FOUND\n", ret); + + ret = pRegLoadMUIStringA(hkey, tz_value, buf, ARRAY_SIZE(buf), &size, 0, NULL); + todo_wine ok(ret == ERROR_CALL_NOT_IMPLEMENTED, "got %d, expected ERROR_CALL_NOT_IMPLEMENTED\n", ret); + + RegCloseKey(hkey); + SetCurrentDirectoryW(curdirW); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -3866,6 +3980,7 @@ START_TEST(registry) test_RegOpenCurrentUser(); test_RegNotifyChangeKeyValue(); test_RegQueryValueExPerformanceData(); + test_RegLoadMUIString(); /* cleanup */ delete_key( hkey_main );

1 0

Tim Schumacher : services: Allow reading binary registry values as DWORDs.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: 7b139bbb5cb1da4c443e8163c2a14adc8ba93a29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b139bbb5cb1da4c443e8163… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sun May 12 23:12:41 2019 +0200 services: Allow reading binary registry values as DWORDs. Some programs/services actually save those values as a registry value of the type REG_BINARY. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/services/utils.c b/programs/services/utils.c index c59b003..f787990 100644 --- a/programs/services/utils.c +++ b/programs/services/utils.c @@ -149,7 +149,7 @@ DWORD load_reg_dword(HKEY hKey, LPCWSTR szValue, DWORD *output) return ERROR_SUCCESS; goto failed; } - if (type != REG_DWORD || size != sizeof(DWORD)) + if ((type != REG_DWORD && type != REG_BINARY) || size != sizeof(DWORD)) { err = ERROR_INVALID_DATATYPE; goto failed;

1 0

Zebediah Figura : strmbase: Get rid of the "pfnBreakConnect" field from BaseOutputPinFuncTable.
by Alexandre Julliard May 13, 2019

May 13, 2019

Module: wine Branch: master Commit: df05902b96734005f1ab31e689b9ddb1455add32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df05902b96734005f1ab31e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 11 14:46:21 2019 -0500 strmbase: Get rid of the "pfnBreakConnect" field from BaseOutputPinFuncTable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 7 ------- dlls/qcap/avimux.c | 7 ------- dlls/qcap/smartteefilter.c | 16 ---------------- dlls/qcap/vfwcapture.c | 1 - dlls/quartz/filesource.c | 1 - dlls/quartz/parser.c | 1 - dlls/strmbase/pin.c | 25 ------------------------- dlls/strmbase/transform.c | 1 - dlls/winegstreamer/gstdemux.c | 1 - dlls/wineqtdecoder/qtsplitter.c | 1 - include/wine/strmbase.h | 3 --- 11 files changed, 64 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 49ac2d8..f8eade9 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -657,12 +657,6 @@ static HRESULT WINAPI AVICompressorOut_DecideAllocator(BaseOutputPin *base, return BaseOutputPinImpl_DecideAllocator(base, pPin, pAlloc); } -static HRESULT WINAPI AVICompressorOut_BreakConnect(BaseOutputPin *base) -{ - FIXME("(%p)\n", base); - return E_NOTIMPL; -} - static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = { { NULL, @@ -671,7 +665,6 @@ static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = { BaseOutputPinImpl_AttemptConnection, AVICompressorOut_DecideBufferSize, AVICompressorOut_DecideAllocator, - AVICompressorOut_BreakConnect }; IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 2bb6e12..dd78d71 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1292,12 +1292,6 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(BaseOutputPin *base, return IMemInputPin_NotifyAllocator(pPin, *pAlloc, TRUE); } -static HRESULT WINAPI AviMuxOut_BreakConnect(BaseOutputPin *base) -{ - FIXME("(%p)\n", base); - return E_NOTIMPL; -} - static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = { { AviMuxOut_CheckMediaType, @@ -1306,7 +1300,6 @@ static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = { AviMuxOut_AttemptConnection, NULL, AviMuxOut_DecideAllocator, - AviMuxOut_BreakConnect }; static inline AviMux* impl_from_out_IPin(IPin *iface) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index 72794d0..4e22b95 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -498,13 +498,6 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(BaseOutputPin *base, return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE); } -static HRESULT WINAPI SmartTeeFilterCapture_BreakConnect(BaseOutputPin *base) -{ - SmartTeeFilter *This = impl_from_BasePin(&base->pin); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = { { SmartTeeFilterCapture_CheckMediaType, @@ -513,7 +506,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = { BaseOutputPinImpl_AttemptConnection, NULL, SmartTeeFilterCapture_DecideAllocator, - SmartTeeFilterCapture_BreakConnect }; static ULONG WINAPI SmartTeeFilterPreview_AddRef(IPin *iface) @@ -589,13 +581,6 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(BaseOutputPin *base, return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE); } -static HRESULT WINAPI SmartTeeFilterPreview_BreakConnect(BaseOutputPin *base) -{ - SmartTeeFilter *This = impl_from_BasePin(&base->pin); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; -} - static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = { { SmartTeeFilterPreview_CheckMediaType, @@ -604,7 +589,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = { BaseOutputPinImpl_AttemptConnection, NULL, SmartTeeFilterPreview_DecideAllocator, - SmartTeeFilterPreview_BreakConnect }; IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr) { diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 3d737bb..178609a 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -707,7 +707,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, VfwPin_DecideBufferSize, BaseOutputPinImpl_DecideAllocator, - BaseOutputPinImpl_BreakConnect }; static HRESULT diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 293914d..a54e948 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -914,7 +914,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { FileAsyncReaderPin_AttemptConnection, FileAsyncReaderPin_DecideBufferSize, BaseOutputPinImpl_DecideAllocator, - BaseOutputPinImpl_BreakConnect }; static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index d92161f..c3b69cd 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -428,7 +428,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, Parser_OutputPin_DecideBufferSize, Parser_OutputPin_DecideAllocator, - NULL, }; HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 58fe0e5..2fa0b9a 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -639,31 +639,6 @@ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This) return hr; } -/* replaces OutputPin_DeliverDisconnect */ -HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin *This) -{ - HRESULT hr; - - TRACE("(%p)->()\n", This); - - EnterCriticalSection(This->pin.pCritSec); - { - if (!This->pin.pConnectedTo || !This->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else - { - hr = IMemAllocator_Decommit(This->pAllocator); - - if (SUCCEEDED(hr)) - hr = IPin_Disconnect(This->pin.pConnectedTo); - } - IPin_Disconnect(&This->pin.IPin_iface); - } - LeaveCriticalSection(This->pin.pCritSec); - - return hr; -} - HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocator **pMemAlloc) { return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 1ce6283..544b77a 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -165,7 +165,6 @@ static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, TransformFilter_Output_DecideBufferSize, BaseOutputPinImpl_DecideAllocator, - BaseOutputPinImpl_BreakConnect }; static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* pClsid, const TransformFilterFuncTable* pFuncsTable, TransformFilter* pTransformFilter) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1a369a1..32b871d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1879,7 +1879,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, GSTOutPin_DecideBufferSize, GSTOutPin_DecideAllocator, - NULL, }; static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index cd146db..4855069 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1520,7 +1520,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = { BaseOutputPinImpl_AttemptConnection, QTOutPin_DecideBufferSize, QTOutPin_DecideAllocator, - NULL, }; static const OutputQueueFuncTable output_OutputQueueFuncTable = { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cb7112b..120642c 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -67,7 +67,6 @@ typedef struct BaseOutputPin typedef HRESULT (WINAPI *BaseOutputPin_AttemptConnection)(BaseOutputPin *pin, IPin *peer, const AM_MEDIA_TYPE *mt); typedef HRESULT (WINAPI *BaseOutputPin_DecideBufferSize)(BaseOutputPin *This, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest); typedef HRESULT (WINAPI *BaseOutputPin_DecideAllocator)(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc); -typedef HRESULT (WINAPI *BaseOutputPin_BreakConnect)(BaseOutputPin * This); typedef struct BaseOutputPinFuncTable { BasePinFuncTable base; @@ -78,7 +77,6 @@ typedef struct BaseOutputPinFuncTable { BaseOutputPin_DecideBufferSize pfnDecideBufferSize; /* Required for BaseOutputPinImpl_AttemptConnection */ BaseOutputPin_DecideAllocator pfnDecideAllocator; - BaseOutputPin_BreakConnect pfnBreakConnect; } BaseOutputPinFuncTable; typedef struct BaseInputPin @@ -129,7 +127,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags); HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin * This, IMediaSample * pSample); -HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin * This); HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin * This); HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin * This); HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocator **pMemAlloc);

1 0