wine-devel February 2018

wine-devel@winehq.org

74 participants
746 discussions

[PATCH 2/3] wbemprox: Add more Win32_BIOS properties.
by Hans Leidekker 05 Feb '18

05 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 10 +++++++++- dlls/wbemprox/tests/query.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index dd5b9ac9cf..b699724a2d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -335,6 +335,10 @@ static const WCHAR prop_skunumberW[] = {'S','K','U','N','u','m','b','e','r',0}; static const WCHAR prop_smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; +static const WCHAR prop_smbiosmajorversionW[] = + {'S','M','B','I','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; +static const WCHAR prop_smbiosminorversionW[] = + {'S','M','B','I','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = {'S','t','a','r','t','M','o','d','e',0}; static const WCHAR prop_sidW[] = @@ -418,6 +422,8 @@ static const struct column col_bios[] = { prop_releasedateW, CIM_DATETIME }, { prop_serialnumberW, CIM_STRING }, { prop_smbiosbiosversionW, CIM_STRING }, + { prop_smbiosmajorversionW, CIM_UINT16, VT_I4 }, + { prop_smbiosminorversionW, CIM_UINT16, VT_I4 }, { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_cdromdrive[] = @@ -818,6 +824,8 @@ struct record_bios const WCHAR *releasedate; const WCHAR *serialnumber; const WCHAR *smbiosbiosversion; + UINT16 smbiosmajorversion; + UINT16 smbiosminorversion; const WCHAR *version; }; struct record_cdromdrive @@ -1113,7 +1121,7 @@ static const struct record_baseboard data_baseboard[] = static const struct record_bios data_bios[] = { { bios_descriptionW, NULL, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW, - bios_smbiosbiosversionW, bios_versionW } + bios_smbiosbiosversionW, 1, 0, bios_versionW } }; static const struct record_param data_param[] = { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7f2e864eea..c2d0eba792 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -288,6 +288,8 @@ static void test_Win32_Bios( IWbemServices *services ) static const WCHAR releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; static const WCHAR smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; + static const WCHAR smbiosmajorversionW[] = {'S','M','B','I','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR smbiosminorversionW[] = {'S','M','B','I','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR versionW[] = {'V','e','r','s','i','o','n',0}; BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); IEnumWbemClassObject *result; @@ -367,6 +369,22 @@ static void test_Win32_Bios( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, smbiosmajorversionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get bios major version %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "bios major version: %u\n", V_I4( &val ) ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, smbiosminorversionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get bios minor version %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "bios minor version: %u\n", V_I4( &val ) ); + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, versionW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get version %08x\n", hr ); ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); -- 2.11.0

1 0

[PATCH 1/3] wbemprox: Add more Win32_ComputerSystemProduct properties.
by Hans Leidekker 05 Feb '18

05 Feb '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 24 +++++++++++++++++- dlls/wbemprox/tests/query.c | 59 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 93bea5280c..dd5b9ac9cf 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -331,6 +331,8 @@ static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; static const WCHAR prop_settingidW[] = {'S','e','t','t','i','n','g','I','D',0}; +static const WCHAR prop_skunumberW[] = + {'S','K','U','N','u','m','b','e','r',0}; static const WCHAR prop_smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = @@ -377,6 +379,8 @@ static const WCHAR prop_uuidW[] = {'U','U','I','D',0}; static const WCHAR prop_varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; +static const WCHAR prop_vendorW[] = + {'V','e','n','d','o','r',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; static const WCHAR prop_videoarchitectureW[] = @@ -440,7 +444,11 @@ static const struct column col_compsys[] = static const struct column col_compsysproduct[] = { { prop_identifyingnumberW, CIM_STRING|COL_FLAG_KEY }, - { prop_uuidW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_nameW, CIM_STRING|COL_FLAG_KEY }, + { prop_skunumberW, CIM_STRING }, + { prop_uuidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_vendorW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; static const struct column col_datafile[] = { @@ -738,9 +746,15 @@ static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; static const WCHAR compsysproduct_identifyingnumberW[] = {'0',0}; +static const WCHAR compsysproduct_nameW[] = + {'W','i','n','e',0}; static const WCHAR compsysproduct_uuidW[] = {'d','e','a','d','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-', 'd','e','a','d','d','e','a','d','d','e','a','d',0}; +static const WCHAR compsysproduct_vendorW[] = + {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; +static const WCHAR compsysproduct_versionW[] = + {'1','.','0',0}; static const WCHAR diskdrive_interfacetypeW[] = {'I','D','E',0}; static const WCHAR diskdrive_manufacturerW[] = @@ -830,7 +844,11 @@ struct record_computersystem struct record_computersystemproduct { const WCHAR *identifyingnumber; + const WCHAR *name; + const WCHAR *skunumber; const WCHAR *uuid; + const WCHAR *vendor; + const WCHAR *version; }; struct record_datafile { @@ -1417,7 +1435,11 @@ static enum fill_status fill_compsysproduct( struct table *table, const struct e rec = (struct record_computersystemproduct *)table->data; rec->identifyingnumber = compsysproduct_identifyingnumberW; + rec->name = compsysproduct_nameW; + rec->skunumber = NULL; rec->uuid = get_compsysproduct_uuid(); + rec->vendor = compsysproduct_vendorW; + rec->version = compsysproduct_versionW; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 79b09c0966..7f2e864eea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1223,7 +1223,18 @@ static void test_OperatingSystem( IWbemServices *services ) static void test_ComputerSystemProduct( IWbemServices *services ) { - static const WCHAR uuidW[] = {'U','U','I','D',0}; + static const WCHAR identifyingnumberW[] = + {'I','d','e','n','t','i','f','y','i','n','g','N','u','m','b','e','r',0}; + static const WCHAR nameW[] = + {'N','a','m','e',0}; + static const WCHAR skunumberW[] = + {'S','K','U','N','u','m','b','e','r',0}; + static const WCHAR uuidW[] = + {'U','U','I','D',0}; + static const WCHAR vendorW[] = + {'V','e','n','d','o','r',0}; + static const WCHAR versionW[] = + {'V','e','r','s','i','o','n',0}; static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; @@ -1247,13 +1258,57 @@ static void test_ComputerSystemProduct( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &value ); + hr = IWbemClassObject_Get( obj, identifyingnumberW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "identifyingnumber %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, nameW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "name %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, skunumberW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + VariantClear( &value ); + + type = 0xdeadbeef; + VariantInit( &value ); hr = IWbemClassObject_Get( obj, uuidW, 0, &value, &type, NULL ); - ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); trace( "uuid %s\n", wine_dbgstr_w(V_BSTR(&value)) ); VariantClear( &value ); + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, vendorW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "vendor %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( obj, versionW, 0, &value, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "version %s\n", wine_dbgstr_w(V_BSTR(&value)) ); + VariantClear( &value ); + IWbemClassObject_Release( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query ); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Add ARB_texture_multisample extension.
by Józef Kucia 05 Feb '18

05 Feb '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1586bdc82147..4a69b287e226 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -184,6 +184,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, + {"GL_ARB_texture_multisample", ARB_TEXTURE_MULTISAMPLE }, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_query_levels", ARB_TEXTURE_QUERY_LEVELS }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, @@ -2888,6 +2889,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage2DARB) USE_GL_FUNC(glCompressedTexSubImage3DARB) USE_GL_FUNC(glGetCompressedTexImageARB) + /* GL_ARB_texture_multisample */ + USE_GL_FUNC(glGetMultisamplefv); + USE_GL_FUNC(glSampleMaski); + USE_GL_FUNC(glTexImage2DMultisample); + USE_GL_FUNC(glTexImage3DMultisample); /* GL_ARB_texture_storage */ USE_GL_FUNC(glTexStorage1D) USE_GL_FUNC(glTexStorage2D) @@ -3868,6 +3874,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, {ARB_SEAMLESS_CUBE_MAP, MAKEDWORD_VERSION(3, 2)}, {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, + {ARB_TEXTURE_MULTISAMPLE, MAKEDWORD_VERSION(3, 2)}, {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0894c946db83..1bbdaa20c7cb 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -117,6 +117,7 @@ enum wined3d_gl_extension ARB_TEXTURE_GATHER, ARB_TEXTURE_MIRRORED_REPEAT, ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, + ARB_TEXTURE_MULTISAMPLE, ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_QUERY_LEVELS, ARB_TEXTURE_RECTANGLE, -- 2.13.6

2 9

[PATCH vkd3d 1/7] libs/vkd3d-shader: Translate dcl_input_siv instructions.
by Józef Kucia 05 Feb '18

05 Feb '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f984e624b466..ca0beb8b95ae 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3542,7 +3542,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_input_ps_sysval(struct vkd3d_dxbc_compi vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); } -static void vkd3d_dxbc_compiler_emit_dcl_input_sgv(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_emit_dcl_input_sysval(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.register_semantic.reg, @@ -5530,7 +5530,8 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler vkd3d_dxbc_compiler_emit_dcl_input_ps_sysval(compiler, instruction); break; case VKD3DSIH_DCL_INPUT_SGV: - vkd3d_dxbc_compiler_emit_dcl_input_sgv(compiler, instruction); + case VKD3DSIH_DCL_INPUT_SIV: + vkd3d_dxbc_compiler_emit_dcl_input_sysval(compiler, instruction); break; case VKD3DSIH_DCL_OUTPUT: vkd3d_dxbc_compiler_emit_dcl_output(compiler, instruction); -- 2.13.6

2 13

[PATCH 8/9] kerberos: Don't include GSS_C_DCE_STYLE in default gss_init_sec_context() flags.
by Dmitry Timoshkov 05 Feb '18

05 Feb '18

Otherwise the returned ticket won't be accepted by WWW server when wrapped in an HTTP request. Original Rob's patch doesn't have this flag either. This patch is one of the fixes to make Kerberos Authentication Tester work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ba89806957..66c795c377 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -326,7 +326,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam static ULONG flags_isc_req_to_gss( ULONG flags ) { - ULONG ret = GSS_C_DCE_STYLE; + ULONG ret = 0; if (flags & ISC_REQ_DELEGATE) ret |= GSS_C_DELEG_FLAG; if (flags & ISC_REQ_MUTUAL_AUTH) ret |= GSS_C_MUTUAL_FLAG; if (flags & ISC_REQ_REPLAY_DETECT) ret |= GSS_C_REPLAY_FLAG; -- 2.15.1

2 19

[PATCH 4/4] riched20: Get rid of the ALLOC_N_OBJ macro
by Michael Stefaniuc 05 Feb '18

05 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- I see opportunities for some heap_strdupX() in here but that's something for later. dlls/riched20/editor.c | 8 ++++---- dlls/riched20/editor.h | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 53d0950bd4..c4425127e7 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2136,7 +2136,7 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, return ME_GetTextW(editor, strText, INT_MAX, start, nLen, FALSE, FALSE); } else { int nChars; - WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); + WCHAR *p = heap_alloc((nLen+1) * sizeof(*p)); if (!p) return 0; nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE, FALSE); WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, @@ -3021,7 +3021,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) * or paragraph selection. */ ed->nCursors = 4; - ed->pCursors = ALLOC_N_OBJ(ME_Cursor, ed->nCursors); + ed->pCursors = heap_alloc(ed->nCursors * sizeof(*ed->pCursors)); ME_SetCursorToStart(ed, &ed->pCursors[0]); ed->pCursors[1] = ed->pCursors[0]; ed->pCursors[2] = ed->pCursors[0]; @@ -4295,7 +4295,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int nChars = MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, NULL, 0); WCHAR *tmp; - if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) + if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); heap_free(tmp); @@ -4313,7 +4313,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int nChars = MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, NULL, 0); WCHAR *tmp; - if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) + if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); heap_free(tmp); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6215068cdd..0db532640b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,8 +25,6 @@ struct _RTF_Info; extern HANDLE me_heap DECLSPEC_HIDDEN; -#define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) - #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) -- 2.14.3

2 1

[PATCH 3/4] riched20: Get rid of the ALLOC_OBJ macro
by Michael Stefaniuc 05 Feb '18

05 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 14 ++++---------- dlls/riched20/editor.h | 1 - dlls/riched20/list.c | 4 ++-- dlls/riched20/style.c | 2 +- dlls/riched20/table.c | 4 ++-- dlls/riched20/writer.c | 8 ++------ 7 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 8a99394dcb..d676a1bc38 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -484,7 +484,7 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, MERF_GRAPHICS); - di->member.run.ole_obj = ALLOC_OBJ(*reo); + di->member.run.ole_obj = heap_alloc(sizeof(*reo)); ME_CopyReObject(di->member.run.ole_obj, reo); ME_ReleaseStyle(pStyle); } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index da7d62b095..53d0950bd4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -261,9 +261,7 @@ static inline BOOL is_version_nt(void) } static ME_TextBuffer *ME_MakeText(void) { - - ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); - + ME_TextBuffer *buf = heap_alloc(sizeof(*buf)); ME_DisplayItem *p1 = ME_MakeDI(diTextStart); ME_DisplayItem *p2 = ME_MakeDI(diTextEnd); @@ -606,8 +604,7 @@ void ME_RTFParAttrHook(RTF_Info *info) if (!info->editor->bEmulateVersion10) /* v4.1 */ { while (info->rtfParam > info->nestingLevel) { - RTFTable *tableDef = ALLOC_OBJ(RTFTable); - ZeroMemory(tableDef, sizeof(RTFTable)); + RTFTable *tableDef = heap_alloc_zero(sizeof(*tableDef)); tableDef->parent = info->tableDef; info->tableDef = tableDef; @@ -641,10 +638,7 @@ void ME_RTFParAttrHook(RTF_Info *info) { RTFTable *tableDef; if (!info->tableDef) - { - info->tableDef = ALLOC_OBJ(RTFTable); - ZeroMemory(info->tableDef, sizeof(RTFTable)); - } + info->tableDef = heap_alloc_zero(sizeof(*info->tableDef)); tableDef = info->tableDef; RTFFlushOutputBuffer(info); if (tableDef->tableRowStart && @@ -2993,7 +2987,7 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) { - ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); + ME_TextEditor *ed = heap_alloc(sizeof(*ed)); int i; DWORD props; LONG selbarwidth; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 55e259afb2..6215068cdd 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,7 +25,6 @@ struct _RTF_Info; extern HANDLE me_heap DECLSPEC_HIDDEN; -#define ALLOC_OBJ(type) heap_alloc(sizeof(type)) #define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 7cb9927712..58b64e8081 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -179,8 +179,8 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) ME_DisplayItem *ME_MakeDI(ME_DIType type) { - ME_DisplayItem *item = ALLOC_OBJ(ME_DisplayItem); - ZeroMemory(item, sizeof(ME_DisplayItem)); + ME_DisplayItem *item = heap_alloc_zero(sizeof(*item)); + item->type = type; item->prev = item->next = NULL; return item; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 546258027c..48d57e8b43 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -113,7 +113,7 @@ void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) ME_Style *ME_MakeStyle(CHARFORMAT2W *style) { - ME_Style *s = ALLOC_OBJ(ME_Style); + ME_Style *s = heap_alloc(sizeof(*s)); assert(style->cbSize == sizeof(CHARFORMAT2W)); s->fmt = *style; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index d2cab9a817..4cd77eb399 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -637,8 +637,8 @@ void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) { - RTFTable *tableDef = ALLOC_OBJ(RTFTable); - ZeroMemory(tableDef, sizeof(RTFTable)); + RTFTable *tableDef = heap_alloc_zero(sizeof(*tableDef)); + if (!editor->bEmulateVersion10) /* v4.1 */ tableDef->gapH = 10; return tableDef; diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index de0bb8d72f..aad2e44879 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -57,15 +57,11 @@ ME_StreamOutRTFText(ME_OutStream *pStream, const WCHAR *text, LONG nChars); static ME_OutStream* ME_StreamOutInit(ME_TextEditor *editor, EDITSTREAM *stream) { - ME_OutStream *pStream = ALLOC_OBJ(ME_OutStream); + ME_OutStream *pStream = heap_alloc_zero(sizeof(*pStream)); + pStream->stream = stream; pStream->stream->dwError = 0; - pStream->pos = 0; - pStream->written = 0; - pStream->nFontTblLen = 0; pStream->nColorTblLen = 1; - pStream->nNestingLevel = 0; - memset(&pStream->cur_fmt, 0, sizeof(pStream->cur_fmt)); pStream->cur_fmt.dwEffects = CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR; pStream->cur_fmt.bUnderlineType = CFU_UNDERLINE; return pStream; -- 2.14.3

2 1

[PATCH 2/4] riched20: Get rid of the FREE_OBJ() macro
by Michael Stefaniuc 05 Feb '18

05 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- New heap_realloc(NULL, ...) functionality comes in handy. dlls/riched20/editor.c | 13 ++++++------- dlls/riched20/editor.h | 1 - dlls/riched20/list.c | 2 +- dlls/riched20/richole.c | 2 +- dlls/riched20/style.c | 2 +- dlls/riched20/writer.c | 7 +++---- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index daafe80055..da7d62b095 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2147,7 +2147,7 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, nChars = ME_GetTextW(editor, p, nLen, start, nLen, FALSE, FALSE); WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, nLen+1, NULL, NULL); - FREE_OBJ(p); + heap_free(p); return nChars; } } @@ -3160,10 +3160,9 @@ void ME_DestroyEditor(ME_TextEditor *editor) } OleUninitialize(); - FREE_OBJ(editor->pBuffer); - FREE_OBJ(editor->pCursors); - - FREE_OBJ(editor); + heap_free(editor->pBuffer); + heap_free(editor->pCursors); + heap_free(editor); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -4305,7 +4304,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); - FREE_OBJ( tmp ); + heap_free(tmp); }else{ FINDTEXTW *ft = (FINDTEXTW *)lParam; r = ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL); @@ -4323,7 +4322,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if ((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); - FREE_OBJ( tmp ); + heap_free(tmp); }else{ FINDTEXTEXW *ex = (FINDTEXTEXW *)lParam; r = ME_FindText(editor, wParam, &ex->chrg, ex->lpstrText, &ex->chrgText); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7d4a8ef979..55e259afb2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -27,7 +27,6 @@ extern HANDLE me_heap DECLSPEC_HIDDEN; #define ALLOC_OBJ(type) heap_alloc(sizeof(type)) #define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) -#define FREE_OBJ(ptr) heap_free(ptr) #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index d321446684..7cb9927712 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -174,7 +174,7 @@ void ME_DestroyDisplayItem(ME_DisplayItem *item) heap_free( item->member.run.clusters ); ME_ReleaseStyle(item->member.run.style); } - FREE_OBJ(item); + heap_free(item); } ME_DisplayItem *ME_MakeDI(ME_DIType type) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 120bcf8190..30331572e8 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5383,7 +5383,7 @@ void ME_DeleteReObject(REOBJECT* reo) if (reo->poleobj) IOleObject_Release(reo->poleobj); if (reo->pstg) IStorage_Release(reo->pstg); if (reo->polesite) IOleClientSite_Release(reo->polesite); - FREE_OBJ(reo); + heap_free(reo); } void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 4f08b3b133..546258027c 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -425,7 +425,7 @@ void ME_DestroyStyle(ME_Style *s) s->font_cache = NULL; } ScriptFreeCache( &s->script_cache ); - FREE_OBJ(s); + heap_free(s); } void ME_AddRefStyle(ME_Style *s) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 5494afef50..de0bb8d72f 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -101,7 +101,7 @@ ME_StreamOutFree(ME_OutStream *pStream) LONG written = pStream->written; TRACE("total length = %u\n", written); - FREE_OBJ(pStream); + heap_free(pStream); return written; } @@ -1148,8 +1148,7 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, nSize = WideCharToMultiByte(nCodePage, 0, get_text( &cursor.pRun->member.run, cursor.nOffset ), nLen, NULL, 0, NULL, NULL); if (nSize > nBufLen) { - FREE_OBJ(buffer); - buffer = ALLOC_N_OBJ(char, nSize); + buffer = heap_realloc(buffer, nSize); nBufLen = nSize; } WideCharToMultiByte(nCodePage, 0, get_text( &cursor.pRun->member.run, cursor.nOffset ), @@ -1163,7 +1162,7 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, cursor.pRun = ME_FindItemFwd(cursor.pRun, diRun); } - FREE_OBJ(buffer); + heap_free(buffer); return success; } -- 2.14.3

2 1

[PATCH 1/4] riched20: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 05 Feb '18

05 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/editor.h | 15 --------------- dlls/riched20/editstr.h | 1 + 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index aba3026496..7d4a8ef979 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -25,21 +25,6 @@ struct _RTF_Info; extern HANDLE me_heap DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( me_heap, 0, len ); -} - -static inline BOOL heap_free( void *ptr ) -{ - return HeapFree( me_heap, 0, ptr ); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc( void *ptr, size_t len ) -{ - return HeapReAlloc( me_heap, 0, ptr, len ); -} - #define ALLOC_OBJ(type) heap_alloc(sizeof(type)) #define ALLOC_N_OBJ(type, count) heap_alloc((count)*sizeof(type)) #define FREE_OBJ(ptr) heap_free(ptr) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2bf680ed64..a37c4de46e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -48,6 +48,7 @@ #include "usp10.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #ifdef __i386__ -- 2.14.3

2 1

[PATCH] kerberos: Calling InitializeSecurityContext without a token buffer is not an error.
by Dmitry Timoshkov 05 Feb '18

05 Feb '18

This patch makes Kerberos Authentication Tester work with https and dotnet40. Apparently that's a dotnet40 quirk that it passes not NULL input buffers but doesn't mark any of buffers as a token, dotnet20 passes NULL input. Note, that in order to make version 2.0 applications work (Kerberos Authentication Tester is such an application) with dotnet40+ one needs to add to the registry key [Software\\Microsoft\\.NETFramework] "OnlyUseLatestCLR"=dword:00000001 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 8b5b6128ac..1bba926a7e 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -913,9 +913,13 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, if (!input) input_token.length = 0; else { - if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - input_token.length = input->pBuffers[idx].cbBuffer; - input_token.value = input->pBuffers[idx].pvBuffer; + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) + input_token.length = 0; + else + { + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } } if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; -- 2.16.1

2 1

← Newer
1
...
61
62
63
64
65
66
67
...
75
Older →

Jump to page:

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-devel February 2018