February 2018 - Wine-commits

Józef Kucia : wined3d: Do not validate texture type in resolve_depth_buffer().
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 89eaa4aa37c111bccbc17557ec0e13fdcd70100e URL: https://source.winehq.org/git/wine.git/?a=commit;h=89eaa4aa37c111bccbc17557… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 5 13:13:40 2018 +0100 wined3d: Do not validate texture type in resolve_depth_buffer(). It's validated in wined3d_texture_blt(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0c415d1..2d1603f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1931,8 +1931,7 @@ static void resolve_depth_buffer(struct wined3d_state *state) struct wined3d_rendertarget_view *src_view; RECT src_rect, dst_rect; - if (!dst_texture || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!dst_texture || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) return; if (!(src_view = state->fb->depth_stencil))

1 0

Hans Leidekker : wbemprox: Add more Win32_ComputerSystemProduct properties.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 7c0025b60851b67cae036ce74403e41d4088da9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0025b60851b67cae036ce7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 5 16:08:15 2018 +0100 wbemprox: Add more Win32_ComputerSystemProduct properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 93bea52..dd5b9ac 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 79b09c0..7f2e864 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 );

1 0

Hans Leidekker : wbemprox: Add more Win32_BIOS properties.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: bc07327c15d27360417811064fd218b8e0cd0001 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc07327c15d2736041781106… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 5 16:08:16 2018 +0100 wbemprox: Add more Win32_BIOS properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 dd5b9ac..b699724 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 7f2e864..c2d0eba 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 ) );

1 0

Hans Leidekker : wbemprox: Add more Win32_Processor properties.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 4f640fa9b693b8d730817f76fefc909e49106b19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f640fa9b693b8d730817f76… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 5 16:08:17 2018 +0100 wbemprox: Add more Win32_Processor properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 21 ++++++++ dlls/wbemprox/tests/query.c | 113 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f640fa9b693b8d73081…

1 0

Alexandre Julliard : ntdll: Block signals during process-wide exit.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 4a5890811d21b58a81b79a4158f00354abadd88b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a5890811d21b58a81b79a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 16:43:34 2018 +0100 ntdll: Block signals during process-wide exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index b36b265..c999d4b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -475,6 +475,7 @@ void WINAPI RtlExitUserThread( ULONG status ) if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) { LdrShutdownProcess(); + pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); signal_exit_process( status ); }

1 0

Alexandre Julliard : krnl386: Remove support for DPMI real-mode calls.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: ed6bdb3c51cd4b8c94f9839806321703e7aa9765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed6bdb3c51cd4b8c94f98398… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 17:03:48 2018 +0100 krnl386: Remove support for DPMI real-mode calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosaspi.c | 234 ------------ dlls/krnl386.exe16/dosexe.h | 23 -- dlls/krnl386.exe16/dosvm.c | 105 +----- dlls/krnl386.exe16/instr.c | 2 - dlls/krnl386.exe16/int21.c | 16 +- dlls/krnl386.exe16/int2f.c | 20 +- dlls/krnl386.exe16/int31.c | 807 ++-------------------------------------- dlls/krnl386.exe16/interrupts.c | 190 ++-------- 9 files changed, 56 insertions(+), 1342 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed6bdb3c51cd4b8c94f9…

1 0

Daniel Lehman : kernel32: Change error return from GlobalFree.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: fe09e2dba66095f1494946226c911a2acc65c9c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe09e2dba66095f149494622… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jan 30 12:18:02 2018 -0800 kernel32: Change error return from GlobalFree. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 4 ++-- dlls/kernel32/tests/heap.c | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index fd6414a..e68420a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -784,8 +784,8 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) } __EXCEPT_PAGE_FAULT { - ERR("(%p): Page fault occurred ! Caused by bug ?\n", hmem); - SetLastError( ERROR_INVALID_PARAMETER ); + ERR("invalid handle %p\n", hmem); + SetLastError(ERROR_INVALID_HANDLE); hreturned = hmem; } __ENDTRY diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 67dc8b6..fefd3e7 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -208,7 +208,7 @@ static void test_heap(void) ((GetLastError() == ERROR_NOT_LOCKED) || (GetLastError() == MAGIC_DEAD)), "returned %d with %d (expected '0' with: ERROR_NOT_LOCKED or " "MAGIC_DEAD)\n", res, GetLastError()); - + GlobalFree(gbl); /* invalid handles are caught in windows: */ SetLastError(MAGIC_DEAD); @@ -217,6 +217,18 @@ static void test_heap(void) "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); SetLastError(MAGIC_DEAD); + hsecond = GlobalFree(LongToHandle(0xdeadbeef)); /* bogus handle */ + ok( (hsecond == LongToHandle(0xdeadbeef)) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned %p with 0x%08x (expected %p with ERROR_INVALID_HANDLE)\n", + hsecond, GetLastError(), LongToHandle(0xdeadbeef)); + SetLastError(MAGIC_DEAD); + hsecond = GlobalFree(LongToHandle(0xdeadbee0)); /* bogus pointer */ + ok( (hsecond == LongToHandle(0xdeadbee0)) && + ((GetLastError() == ERROR_INVALID_HANDLE) || broken(GetLastError() == ERROR_NOACCESS) /* wvista+ */), + "returned %p with 0x%08x (expected %p with ERROR_NOACCESS)\n", + hsecond, GetLastError(), LongToHandle(0xdeadbee0)); + + SetLastError(MAGIC_DEAD); flags = GlobalFlags(gbl); ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), "returned 0x%04x with 0x%08x (expected GMEM_INVALID_HANDLE with " @@ -250,7 +262,7 @@ static void test_heap(void) ok(mem == NULL, "Expected NULL, got %p\n", mem); /* invalid free */ - if (sizeof(void *) != 8) /* crashes on 64-bit Vista */ + if (sizeof(void *) != 8) /* crashes on 64-bit */ { SetLastError(MAGIC_DEAD); mem = GlobalFree(gbl);

1 0

André Hentschel : ws2_32/tests: Don' t test WSAGetLastError() value on success.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 67b690dba94d9671a8b5b33e51bf3102133ec100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67b690dba94d9671a8b5b33e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 2 20:34:26 2018 +0100 ws2_32/tests: Don't test WSAGetLastError() value on success. This cuts the test output from around 1600 to around 1100 lines Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e188724..3bc3d66 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1250,7 +1250,8 @@ static void test_WithWSAStartup(void) res = getsockname(sock, (struct sockaddr *)&saddr, &size); error = WSAGetLastError(); ok(res == SOCKET_ERROR, "Test[%d]: getsockname should have failed\n", i); - ok(error == WSAENOTSOCK, "Test[%d]: expected 10038, got %d\n", i, error); + if (res == SOCKET_ERROR) + ok(error == WSAENOTSOCK, "Test[%d]: expected 10038, got %d\n", i, error); } }

1 0

André Hentschel : ws2_32/tests: Test with less socket pairs.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 57b76f0d1a8a6f3e58a320e00f933e1e061a3934 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b76f0d1a8a6f3e58a320e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 2 20:35:53 2018 +0100 ws2_32/tests: Test with less socket pairs. about 400 lines less in output Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3bc3d66..17b59a4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1181,7 +1181,7 @@ static void test_WithWSAStartup(void) struct { SOCKET src, dst, dup_src, dup_dst; - } pairs[128]; + } pairs[32]; DWORD error; res = WSAStartup( version, &data );

1 0

Michael Stefaniuc : pdh: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: d6e503a20a9260004597e2fc6afb9845a8ccb144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e503a20a9260004597e2fc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:50 2018 +0100 pdh: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh_main.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 0d7c5ef..fb131bd 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -32,6 +32,7 @@ #include "winperf.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -47,21 +48,6 @@ static CRITICAL_SECTION_DEBUG pdh_handle_cs_debug = }; static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 }; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *pdh_strdup( const WCHAR *src ) { WCHAR *dst;

1 0