April 2015 - Wine-commits - list.winehq.org

Francois Gouget : winhlp32: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: ddcbbb6943b1e202ac55bdb41dec2789f6f54387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddcbbb6943b1e202ac55bdb41… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 3 01:25:36 2015 +0200 winhlp32: Remove an unneeded NONAMELESSSTRUCT directive. --- programs/winhlp32/winhelp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 17fe90c..49fdf5d 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -29,7 +29,6 @@ #include <stdlib.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : winefile: Remove an unneeded NONAMELESSUNION directive.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: 7f977e5d2f80d683a8923061eb06d85a9735f438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f977e5d2f80d683a8923061e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 3 01:25:50 2015 +0200 winefile: Remove an unneeded NONAMELESSUNION directive. --- programs/winefile/winefile.h | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/winefile/winefile.h b/programs/winefile/winefile.h index 60b4aa1..31a1868 100644 --- a/programs/winefile/winefile.h +++ b/programs/winefile/winefile.h @@ -28,7 +28,6 @@ #define NOIMAGE #define NOTAPE -#define NONAMELESSUNION #include <windows.h> #include <commdlg.h>

1 0

Shuai Meng : vbscript: Fixed Hex.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: 287d419e5e4553dd28bfe6205f5ec5643d8205b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287d419e5e4553dd28bfe6205… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Thu Apr 2 22:20:49 2015 +0800 vbscript: Fixed Hex. --- dlls/vbscript/global.c | 15 +++++++-------- dlls/vbscript/tests/api.vbs | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ee9168b..1a20527 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -544,6 +544,8 @@ static HRESULT Global_Hex(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA { WCHAR buf[17], *ptr; DWORD n; + HRESULT hres; + int ret; TRACE("%s\n", debugstr_variant(arg)); @@ -551,19 +553,16 @@ static HRESULT Global_Hex(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA case VT_I2: n = (WORD)V_I2(arg); break; - case VT_I4: - n = V_I4(arg); - break; - case VT_EMPTY: - n = 0; - break; case VT_NULL: if(res) V_VT(res) = VT_NULL; return S_OK; default: - FIXME("unsupported type %s\n", debugstr_variant(arg)); - return E_NOTIMPL; + hres = to_int(arg, &ret); + if(FAILED(hres)) + return hres; + else + n = ret; } buf[16] = 0; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 7b97df4..2a365c7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -233,10 +233,31 @@ TestHex -1, "FFFF" TestHex -16, "FFF0" TestHex -934859845, "C8472BBB" TestHex empty, "0" +TestHex "17", "11" +TestHex 228.5, "E4" +TestHex -32767, "8001" +TestHex -32768, "FFFF8000" +TestHex 2147483647.49, "7FFFFFFF" +TestHex -2147483647.5, "80000000" +newObject.myval = 30.5 +TestHex newObject, "1E" +newObject.myval = "27" +TestHex newObject, "1B" + Call ok(getVT(hex(null)) = "VT_NULL", "getVT(hex(null)) = " & getVT(hex(null))) Call ok(getVT(hex(empty)) = "VT_BSTR", "getVT(hex(empty)) = " & getVT(hex(empty))) +Sub TestHexError(num, err_num) + On Error Resume Next + Call Hex(num) + Call ok(Err.number = err_num, "Hex(" & num & ") returns error number " & Err.number & " expected " & err_num) +End Sub + +TestHexError 2147483647.5, 6 +TestHexError 2147483648.51, 6 +TestHexError "test", 13 + Sub TestOct(x, ex, res_type) Call ok(Oct(x) = ex, "Oct(" & x & ") = " & Oct(x) & " expected " & ex) Call ok(getVT(Oct(x)) = res_type, "getVT(Oct(" &x & ")) = " & getVT(Oct(x)) & "expected " & res_type)

1 0

Hans Leidekker : wbemprox: Make sure to allocate sufficient memory in resize_table.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: 3c5ef7c4ad138ee675520f5a8c325a00a737a352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5ef7c4ad138ee675520f5a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 2 16:16:04 2015 +0200 wbemprox: Make sure to allocate sufficient memory in resize_table. --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3548c61..f7a9fc7 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1018,10 +1018,10 @@ static BOOL resize_table( struct table *table, UINT row_count, UINT row_size ) table->num_rows_allocated = row_count; return TRUE; } - if (row_count >= table->num_rows_allocated) + if (row_count > table->num_rows_allocated) { BYTE *data; - UINT count = table->num_rows_allocated * 2; + UINT count = max( row_count, table->num_rows_allocated * 2 ); if (!(data = heap_realloc( table->data, count * row_size ))) return FALSE; table->data = data; table->num_rows_allocated = count;

1 0

Hans Leidekker : wbemprox: Fix a memory leak.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: db6d7dd0600ca6a4dd97f2d6b9c6dff02f32b11a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6d7dd0600ca6a4dd97f2d6b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 2 16:19:12 2015 +0200 wbemprox: Fix a memory leak. --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f7a9fc7..917ae28 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -361,7 +361,7 @@ static const struct column col_compsys[] = { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 }, - { prop_usernameW, CIM_STRING } + { prop_usernameW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_compsysproduct[] = {

1 0

Hans Leidekker : wbemprox: Implement more properties of Win32_Processor.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: 1f004b34ade39c107796470b83c6d3e116106384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f004b34ade39c107796470b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 2 16:19:32 2015 +0200 wbemprox: Implement more properties of Win32_Processor. --- dlls/wbemprox/builtin.c | 55 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 917ae28..e37912e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -148,6 +148,8 @@ static const WCHAR prop_currenthorizontalresW[] = {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_currentverticalresW[] = {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; +static const WCHAR prop_datawidthW[] = + {'D','a','t','a','W','i','d','t','h',0}; static const WCHAR prop_defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; static const WCHAR prop_descriptionW[] = @@ -494,8 +496,11 @@ static const struct column col_process[] = static const struct column col_processor[] = { { prop_addresswidthW, CIM_UINT16, VT_I4 }, + { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_cpustatusW, CIM_UINT16 }, { prop_currentclockspeedW, CIM_UINT32, VT_I4 }, + { prop_datawidthW, CIM_UINT16, VT_I4 }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_familyW, CIM_UINT16, VT_I4 }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -505,7 +510,8 @@ static const struct column col_processor[] = { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_processortypeW, CIM_UINT16, VT_I4 }, - { prop_uniqueidW, CIM_STRING } + { prop_uniqueidW, CIM_STRING }, + { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_qualifier[] = { @@ -841,8 +847,11 @@ struct record_process struct record_processor { UINT16 addresswidth; + const WCHAR *caption; UINT16 cpu_status; UINT32 currentclockspeed; + UINT16 datawidth; + const WCHAR *description; const WCHAR *device_id; UINT16 family; const WCHAR *manufacturer; @@ -853,6 +862,7 @@ struct record_processor const WCHAR *processor_id; UINT16 processortype; const WCHAR *unique_id; + const WCHAR *version; }; struct record_qualifier { @@ -2086,7 +2096,35 @@ static inline void do_cpuid( unsigned int ax, unsigned int *p ) #endif #endif } +static const WCHAR *get_osarchitecture(void) +{ + SYSTEM_INFO info; + GetNativeSystemInfo( &info ); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; + return os_32bitW; +} +static void get_processor_caption( WCHAR *caption ) +{ + static const WCHAR fmtW[] = + {'%','s',' ','F','a','m','i','l','y',' ','%','u',' ', + 'M','o','d','e','l',' ','%','u',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; + static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; + const WCHAR *arch = (get_osarchitecture() == os_32bitW) ? x86W : intel64W; + unsigned int regs[4] = {0, 0, 0, 0}; + do_cpuid( 1, regs ); + sprintfW( caption, fmtW, arch, (regs[0] & (15 << 8)) >> 8, (regs[0] & (15 << 4)) >> 4, regs[0] & 15 ); +} +static void get_processor_version( WCHAR *version ) +{ + static const WCHAR fmtW[] = + {'M','o','d','e','l',' ','%','u',',',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; + unsigned int regs[4] = {0, 0, 0, 0}; + + do_cpuid( 1, regs ); + sprintfW( version, fmtW, (regs[0] & (15 << 4)) >> 4, regs[0] & 15 ); +} static void get_processor_id( WCHAR *processor_id ) { static const WCHAR fmtW[] = {'%','0','8','X','%','0','8','X',0}; @@ -2157,27 +2195,22 @@ static UINT get_processor_maxclockspeed( UINT index ) } return ret; } -static const WCHAR *get_osarchitecture(void) -{ - SYSTEM_INFO info; - GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; - return os_32bitW; -} static enum fill_status fill_processor( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = {'C','P','U','%','u',0}; - WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; + WCHAR caption[100], device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; struct record_processor *rec; UINT i, offset = 0, num_cores, num_logical_processors, count = get_processor_count(); enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; + get_processor_caption( caption ); get_processor_id( processor_id ); get_processor_manufacturer( manufacturer ); get_processor_name( name ); + get_processor_version( version ); num_logical_processors = get_logical_processor_count( &num_cores ) / count; num_cores /= count; @@ -2186,8 +2219,11 @@ static enum fill_status fill_processor( struct table *table, const struct expr * { rec = (struct record_processor *)(table->data + offset); rec->addresswidth = get_osarchitecture() == os_32bitW ? 32 : 64; + rec->caption = heap_strdupW( caption ); rec->cpu_status = 1; /* CPU Enabled */ rec->currentclockspeed = get_processor_currentclockspeed( i ); + rec->datawidth = get_osarchitecture() == os_32bitW ? 32 : 64; + rec->description = heap_strdupW( caption ); sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); rec->family = 2; /* Unknown */ @@ -2199,6 +2235,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->processor_id = heap_strdupW( processor_id ); rec->processortype = 3; /* central processor */ rec->unique_id = NULL; + rec->version = heap_strdupW( version ); if (!match_row( table, i, cond, &status )) { free_row_values( table, i );

1 0

Hans Leidekker : wbemprox: Implement more properties of Win32_VideoController.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: 64823801fcc15b00d169e494c07852d4af830ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64823801fcc15b00d169e494c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 2 16:19:58 2015 +0200 wbemprox: Implement more properties of Win32_VideoController. --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e37912e..df3bf3f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -146,6 +146,10 @@ static const WCHAR prop_currentclockspeedW[] = {'C','u','r','r','e','n','t','C','l','o','c','k','S','p','e','e','d',0}; static const WCHAR prop_currenthorizontalresW[] = {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; +static const WCHAR prop_currentrefreshrateW[] = + {'C','u','r','r','e','n','t','R','e','f','r','e','s','h','R','a','t','e',0}; +static const WCHAR prop_currentscanmodeW[] = + {'C','u','r','r','e','n','t','S','c','a','n','M','o','d','e',0}; static const WCHAR prop_currentverticalresW[] = {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_datawidthW[] = @@ -316,6 +320,10 @@ static const WCHAR prop_varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR prop_videoarchitectureW[] = + {'V','i','d','e','o','A','r','c','h','i','t','e','c','t','u','r','e',0}; +static const WCHAR prop_videomemorytypeW[] = + {'V','i','d','e','o','M','e','m','o','r','y','T','y','p','e',0}; static const WCHAR prop_videoprocessorW[] = {'V','i','d','e','o','P','r','o','c','e','s','s','o','r',0}; static const WCHAR prop_volumenameW[] = @@ -570,14 +578,19 @@ static const struct column col_videocontroller[] = { prop_adapterdactypeW, CIM_STRING }, { prop_adapterramW, CIM_UINT32, VT_I4 }, { prop_availabilityW, CIM_UINT16 }, + { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_currentbitsperpixelW, CIM_UINT32, VT_I4 }, { prop_currenthorizontalresW, CIM_UINT32, VT_I4 }, + { prop_currentrefreshrateW, CIM_UINT32, VT_I4 }, + { prop_currentscanmodeW, CIM_UINT16, VT_I4 }, { prop_currentverticalresW, CIM_UINT32, VT_I4 }, { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_driverversionW, CIM_STRING }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_videoarchitectureW, CIM_UINT16, VT_I4 }, + { prop_videomemorytypeW, CIM_UINT16, VT_I4 }, { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC } }; @@ -921,14 +934,19 @@ struct record_videocontroller const WCHAR *adapter_dactype; UINT32 adapter_ram; UINT16 availability; + const WCHAR *caption; UINT32 current_bitsperpixel; UINT32 current_horizontalres; + UINT32 current_refreshrate; + UINT16 current_scanmode; UINT32 current_verticalres; const WCHAR *description; const WCHAR *device_id; const WCHAR *driverversion; const WCHAR *name; const WCHAR *pnpdevice_id; + UINT16 videoarchitecture; + UINT16 videomemorytype; const WCHAR *videoprocessor; }; #include "poppack.h" @@ -2659,14 +2677,19 @@ done: rec->adapter_dactype = videocontroller_dactypeW; rec->adapter_ram = vidmem; rec->availability = 3; /* Running or Full Power */ + rec->caption = heap_strdupW( name ); rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); rec->current_horizontalres = hres; + rec->current_refreshrate = 0; /* default refresh rate */ + rec->current_scanmode = 2; /* Unknown */ rec->current_verticalres = vres; rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; rec->driverversion = videocontroller_driverversionW; rec->name = heap_strdupW( name ); rec->pnpdevice_id = get_pnpdeviceid( &desc ); + rec->videoarchitecture = 2; /* Unknown */ + rec->videomemorytype = 2; /* Unknown */ rec->videoprocessor = heap_strdupW( name ); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++;

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_Printer.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: 09aec5987019328ec9d6b006a45cd9f1fe4c8d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09aec5987019328ec9d6b006a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 2 16:20:27 2015 +0200 wbemprox: Add a partial implementation of Win32_Printer. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 0307e0e..3b17afb 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 +IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index df3bf3f..8ba2642 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -41,6 +41,7 @@ #include "winver.h" #include "sddl.h" #include "ntsecapi.h" +#include "winspool.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -84,6 +85,8 @@ static const WCHAR class_physicalmemoryW[] = {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR class_qualifiersW[] = {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; +static const WCHAR class_printerW[] = + {'W','i','n','3','2','_','P','r','i','n','t','e','r',0}; static const WCHAR class_process_getowner_outW[] = {'_','_','W','I','N','3','2','_','P','R','O','C','E','S','S','_','G','E','T','O','W', 'N','E','R','_','O','U','T',0}; @@ -114,6 +117,8 @@ static const WCHAR prop_adaptertypeW[] = {'A','d','a','p','t','e','r','T','y','p','e',0}; static const WCHAR prop_addresswidthW[] = {'A','d','d','r','e','s','s','W','i','d','t','h',0}; +static const WCHAR prop_attributesW[] = + {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR prop_availabilityW[] = {'A','v','a','i','l','a','b','i','l','i','t','y',0}; static const WCHAR prop_binaryrepresentationW[] = @@ -174,6 +179,8 @@ static const WCHAR prop_domainroleW[] = {'D','o','m','a','i','n','R','o','l','e',0}; static const WCHAR prop_driveW[] = {'D','r','i','v','e',0}; +static const WCHAR prop_drivernameW[] = + {'D','r','i','v','e','r','N','a','m','e',0}; static const WCHAR prop_driverversionW[] = {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_drivetypeW[] = @@ -188,6 +195,8 @@ static const WCHAR prop_freespaceW[] = {'F','r','e','e','S','p','a','c','e',0}; static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; +static const WCHAR prop_horizontalresolutionW[] = + {'H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_idW[] = {'I','D',0}; static const WCHAR prop_identificationcodeW[] = @@ -210,6 +219,8 @@ static const WCHAR prop_ipenabledW[] = {'I','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_lastbootuptimeW[] = {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; +static const WCHAR prop_localW[] = + {'L','o','c','a','l',0}; static const WCHAR prop_localdatetimeW[] = {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; static const WCHAR prop_localeW[] = @@ -230,6 +241,8 @@ static const WCHAR prop_modelW[] = {'M','o','d','e','l',0}; static const WCHAR prop_netconnectionstatusW[] = {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; +static const WCHAR prop_networkW[] = + {'N','e','t','w','o','r','k',0}; static const WCHAR prop_numcoresW[] = {'N','u','m','b','e','r','O','f','C','o','r','e','s',0}; static const WCHAR prop_numlogicalprocessorsW[] = @@ -488,6 +501,15 @@ static const struct column col_physicalmemory[] = { { prop_capacityW, CIM_UINT64 } }; +static const struct column col_printer[] = +{ + { prop_attributesW, CIM_UINT32 }, + { prop_drivernameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_horizontalresolutionW, CIM_UINT32 }, + { prop_localW, CIM_BOOLEAN }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_networkW, CIM_BOOLEAN } +}; static const struct column col_process[] = { { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -844,6 +866,15 @@ struct record_physicalmemory { UINT64 capacity; }; +struct record_printer +{ + UINT32 attributes; + const WCHAR *drivername; + UINT32 horizontalresolution; + int local; + const WCHAR *name; + int network; +}; struct record_process { const WCHAR *caption; @@ -2043,6 +2074,51 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e return status; } +static enum fill_status fill_printer( struct table *table, const struct expr *cond ) +{ + struct record_printer *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + PRINTER_INFO_2W *info; + DWORD i, offset = 0, count = 0, size = 0; + + EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; + + if (!(info = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (!EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, (BYTE *)info, size, &size, &count )) + { + heap_free( info ); + return FILL_STATUS_FAILED; + } + if (!resize_table( table, count, sizeof(*rec) )) + { + heap_free( info ); + return FILL_STATUS_FAILED; + } + + for (i = 0; i < count; i++) + { + rec = (struct record_printer *)(table->data + offset); + rec->attributes = info[i].Attributes; + rec->drivername = heap_strdupW( info[i].pDriverName ); + rec->horizontalresolution = info[i].pDevMode->u1.s1.dmPrintQuality; + rec->local = -1; + rec->name = heap_strdupW( info[i].pPrinterName ); + rec->network = 0; + if (!match_row( table, i, cond, &status )) + { + free_row_values( table, i ); + continue; + } + offset += sizeof(*rec); + } + TRACE("created %u rows\n", count); + table->num_rows = count; + + heap_free( info ); + return status; +} + static WCHAR *get_cmdline( DWORD process_id ) { if (process_id == GetCurrentProcessId()) return heap_strdupW( GetCommandLineW() ); @@ -2721,6 +2797,7 @@ static struct table builtin_classes[] = { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, + { class_printerW, SIZEOF(col_printer), col_printer, 0, 0, NULL, fill_printer }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_processor2W, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor },

1 0

Sebastian Lackner : ntdll: Fix various bugs RtlUnwindEx on x86_64.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: 33c3990e4d5f637807eee55367b9f49f761571ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c3990e4d5f637807eee5536… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 25 15:46:05 2015 +0100 ntdll: Fix various bugs RtlUnwindEx on x86_64. --- dlls/ntdll/signal_x86_64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 551687f..493a9f7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1407,8 +1407,8 @@ static NTSTATUS dwarf_virtual_unwind( ULONG64 ip, ULONG64 *frame,CONTEXT *contex TRACE( "fde %p len %x personality %p lsda %p code %lx-%lx\n", fde, fde->length, *handler, *handler_data, info.ip, code_end ); execute_cfa_instructions( ptr, end, ip, &info ); - apply_frame_state( context, &info.state ); *frame = context->Rsp; + apply_frame_state( context, &info.state ); TRACE( "next function rip=%016lx\n", context->Rip ); TRACE( " rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", @@ -3214,6 +3214,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } else /* hack: call builtin handlers registered in the tib list */ { + DWORD64 backup_frame = dispatch.EstablisherFrame; while ((ULONG64)teb_frame < new_context.Rsp && (ULONG64)teb_frame < (ULONG64)end_frame) { TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); @@ -3222,10 +3223,10 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec teb_frame = __wine_pop_frame( teb_frame ); } if ((ULONG64)teb_frame == (ULONG64)end_frame && (ULONG64)end_frame < new_context.Rsp) break; - dispatch.EstablisherFrame = new_context.Rsp; + dispatch.EstablisherFrame = backup_frame; } - if (context->Rsp == (ULONG64)end_frame) break; + if (dispatch.EstablisherFrame == (ULONG64)end_frame) break; *context = new_context; }

1 0

Mark Harmstone : winecfg: Add manifest.
by Alexandre Julliard 03 Apr '15

03 Apr '15

Module: wine Branch: master Commit: 8cf9108b2d5c88e85b55cd5c976fb1f940be0735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf9108b2d5c88e85b55cd5c9… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Apr 2 00:17:18 2015 +0100 winecfg: Add manifest. --- programs/winecfg/winecfg.manifest | 16 ++++++++++++++++ programs/winecfg/winecfg.rc | 3 +++ 2 files changed, 19 insertions(+) diff --git a/programs/winecfg/winecfg.manifest b/programs/winecfg/winecfg.manifest new file mode 100644 index 0000000..a7e4d88 --- /dev/null +++ b/programs/winecfg/winecfg.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winecfg" version="0.0.0.0" processorArchitecture=""/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 9b8791e..f82159e 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -316,3 +316,6 @@ IDI_LOGO ICON logo.ico /* @makedep: idw_testsound.wav */ IDW_TESTSOUND WAVE idw_testsound.wav + +/* @makedep: winecfg.manifest */ +1 RT_MANIFEST winecfg.manifest

1 0