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

Andrew Eikum : gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 1d5914b77784de4118f4df3f6de6c6792b104b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5914b77784de4118f4df3f6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 3 14:26:35 2015 -0500 gdiplus: Avoid unnecessary pre-multiplied alpha conversions in GdipDrawImagePointsRect. We can avoid doing a pre-multiplied alpha conversion by detecting whether we need to perform any graphics operations ahead of time. --- dlls/gdiplus/gdiplus_private.h | 20 +++++++++++++ dlls/gdiplus/graphics.c | 66 ++++++++++++++++++++++++++++-------------- 2 files changed, 65 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d5914b77784de4118f4d…

1 0

Alexandre Julliard : ws2_32: Include wsnwlink.h even without IPX support.
by Alexandre Julliard April 6, 2015

April 6, 2015

Module: wine Branch: master Commit: 125b079f6015686d23982ea3e58580758a393cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=125b079f6015686d23982ea3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 4 11:55:32 2015 +0900 ws2_32: Include wsnwlink.h even without IPX support. --- dlls/ws2_32/socket.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 09c8416..d8d724b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -146,6 +146,7 @@ #include "ws2tcpip.h" #include "ws2spi.h" #include "wsipx.h" +#include "wsnwlink.h" #include "wshisotp.h" #include "mstcpip.h" #include "af_irda.h" @@ -157,10 +158,6 @@ #include "wine/exception.h" #include "wine/unicode.h" -#ifdef HAS_IPX -# include "wsnwlink.h" -#endif - #if defined(linux) && !defined(IP_UNICAST_IF) #define IP_UNICAST_IF 50 #endif

1 0

Alexandre Julliard : Wine release 1.7.40
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: website Branch: master Commit: 5029e9d69eacc18b4de8ccd39b4790ef6f6c216f URL: http://source.winehq.org/git/website.git/?a=commit;h=5029e9d69eacc18b4de8cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:58:22 2015 +0900 Wine release 1.7.40 --- news/en/2015040301.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2015040301.xml b/news/en/2015040301.xml new file mode 100644 index 0000000..036e32d --- /dev/null +++ b/news/en/2015040301.xml @@ -0,0 +1,18 @@ +<news> +<date>April 3, 2015</date> +<title>Wine 1.7.40 Released</title> +<body> + The Wine development release 1.7.40 is now available. + <a href="{$root}/announce/1.7.40">What's new</a> in this release: +<ul> + <li>Support for kernel job objects.</li> + <li>Various fixes to the ListView control.</li> + <li>Better support for OOB data in Windows Sockets.</li> + <li>Support for DIB images in the OLE data cache.</li> + <li>Improved support for MSI patches.</li> + <li>Some fixes for ACL file permissions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.40.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.40 : Alexandre Julliard : Release 1.7.40
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: refs/tags/wine-1.7.40 Tag: 63539596fdc3c7381b9856dde20c99f740b6d9ae URL: http://source.winehq.org/git/wine.git/?a=tag;h=63539596fdc3c7381b9856dde20c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:56:34 2015 +0900 Release 1.7.40

1 0

Alexandre Julliard : Release 1.7.40.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 22b6a2c01d8551a8fb753bc41eb36ad370840176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b6a2c01d8551a8fb753bc41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 22:56:33 2015 +0900 Release 1.7.40. --- ANNOUNCE | 865 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 444 insertions(+), 445 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22b6a2c01d8551a8fb753…

1 0

Piotr Caban : advapi32: Handle NULL DACL in SetSecurityInfo.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 52df833a726f3a8132fbdaab00d82dc2b142f005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52df833a726f3a8132fbdaab0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 3 10:04:03 2015 +0200 advapi32: Handle NULL DACL in SetSecurityInfo. --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/security.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 71a8c92..2cd3f74 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5743,7 +5743,7 @@ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, SetSecurityDescriptorGroup(&sd, psidGroup, FALSE); if (SecurityInfo & DACL_SECURITY_INFORMATION) { - if (ObjectType == SE_FILE_OBJECT) + if (ObjectType == SE_FILE_OBJECT && pDacl) { SECURITY_DESCRIPTOR_CONTROL control; PSECURITY_DESCRIPTOR psd; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3789d72..466100d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3633,6 +3633,22 @@ static void test_GetNamedSecurityInfoA(void) ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); CloseHandle(h); + /* test setting NULL DACL */ + error = pSetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL); + ok(!error, "SetNamedSecurityInfoA failed with error %d\n", error); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + todo_wine ok(!pDacl, "pDacl != NULL\n"); + LocalFree(pSD); + + h = CreateFileA(tmpfile, GENERIC_READ, FILE_SHARE_DELETE|FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + CloseHandle(h); + /* NtSetSecurityObject doesn't inherit DACL entries */ pSD = sd+sizeof(void*)-((ULONG_PTR)sd)%sizeof(void*); InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION);

1 0

Mark Harmstone : winecfg: Add manifest.
by Alexandre Julliard April 3, 2015

April 3, 2015

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

Sebastian Lackner : ntdll: Fix various bugs RtlUnwindEx on x86_64.
by Alexandre Julliard April 3, 2015

April 3, 2015

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

Hans Leidekker : wbemprox: Implement more properties of Win32_Processor.
by Alexandre Julliard April 3, 2015

April 3, 2015

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: Make sure to allocate sufficient memory in resize_table.
by Alexandre Julliard April 3, 2015

April 3, 2015

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

Nikolay Sivov : dwrite: Fix cluster width and length calculation.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 0c116d773613e433a13b5bcc9eb5d04f4f789f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c116d773613e433a13b5bcc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 3 11:38:23 2015 +0300 dwrite: Fix cluster width and length calculation. --- dlls/dwrite/layout.c | 76 ++++++++++++++++++++++++++++------------------ dlls/dwrite/tests/layout.c | 26 +++++++++++----- 2 files changed, 64 insertions(+), 38 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 28889a7..f28214f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -362,14 +362,34 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, static struct layout_range *get_layout_range_by_pos(struct dwrite_textlayout *layout, UINT32 pos); -static void init_cluster_metrics(const struct layout_run *run, DWRITE_CLUSTER_METRICS *metrics) +static inline DWRITE_LINE_BREAKPOINT get_effective_breakpoint(const struct dwrite_textlayout *layout, UINT32 pos) { + if (layout->actual_breakpoints) + return layout->actual_breakpoints[pos]; + return layout->nominal_breakpoints[pos]; +} + +static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, const struct layout_run *run, + UINT16 start_glyph, UINT16 stop_glyph, UINT32 stop_position, DWRITE_CLUSTER_METRICS *metrics) +{ + UINT8 breakcondition; + UINT16 j; + metrics->width = 0.0; - metrics->length = 1; - metrics->canWrapLineAfter = FALSE; - metrics->isWhitespace = FALSE; - metrics->isNewline = FALSE; - metrics->isSoftHyphen = FALSE; + for (j = start_glyph; j < stop_glyph; j++) + metrics->width += run->run.glyphAdvances[j]; + metrics->length = 0; + + if (stop_glyph == run->run.glyphCount) + breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionAfter; + else + breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionBefore; + + metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || + breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; + metrics->isWhitespace = FALSE; /* FIXME */ + metrics->isNewline = FALSE; /* FIXME */ + metrics->isSoftHyphen = FALSE; /* FIXME */ metrics->isRightToLeft = run->run.bidiLevel & 1; metrics->padding = 0; } @@ -378,42 +398,34 @@ static void init_cluster_metrics(const struct layout_run *run, DWRITE_CLUSTER_ME All clusters in a 'run' will be added to 'layout' data, starting at index pointed to by 'cluster'. On return 'cluster' is updated to point to next metrics struct to be filled in on next call. + Note that there's no need to reallocate anything at this point as we allocate one cluster per + codepoint initially. */ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const struct layout_run *run, UINT32 *cluster) { DWRITE_CLUSTER_METRICS *metrics = &layout->clusters[*cluster]; - UINT16 glyph; - UINT32 i; - - glyph = run->descr.clusterMap[0]; - init_cluster_metrics(run, metrics); + UINT32 i, start = 0; for (i = 0; i < run->descr.stringLength; i++) { - BOOL newcluster = glyph != run->descr.clusterMap[i]; + BOOL end = i == run->descr.stringLength - 1; - /* add new cluster on starting glyph change or simply when run is over */ - if (newcluster || i == run->descr.stringLength - 1) { - UINT8 breakcondition; - UINT16 j; + if (run->descr.clusterMap[start] != run->descr.clusterMap[i]) { + init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->descr.clusterMap[i], i, metrics); + metrics->length = i - start; - for (j = glyph; j < run->descr.clusterMap[i]; j++) - metrics->width += run->run.glyphAdvances[j]; + *cluster += 1; + metrics++; + start = i; + } - /* FIXME: also set isWhitespace, isNewline and isSoftHyphen */ - breakcondition = newcluster ? layout->nominal_breakpoints[i].breakConditionBefore : - layout->nominal_breakpoints[i].breakConditionAfter; - metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || - breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; + if (end) { + init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->run.glyphCount, i, metrics); + metrics->length = i - start + 1; - /* advance to next cluster */ - glyph = run->descr.clusterMap[i]; *cluster += 1; - metrics++; - init_cluster_metrics(run, metrics); + return; } - else - metrics->length++; } } @@ -583,7 +595,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) } if (hr == S_OK) - layout->clusters_count = cluster + 1; + layout->clusters_count = cluster; IDWriteTextAnalyzer_Release(analyzer); return hr; @@ -613,6 +625,10 @@ static HRESULT layout_compute(struct dwrite_textlayout *layout) 0, layout->len, &layout->IDWriteTextAnalysisSink_iface); IDWriteTextAnalyzer_Release(analyzer); } + if (layout->actual_breakpoints) { + heap_free(layout->actual_breakpoints); + layout->actual_breakpoints = NULL; + } hr = layout_compute_runs(layout); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index f36c01e..cf0e1f8 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -993,13 +993,13 @@ static void test_GetClusterMetrics(void) { static const WCHAR strW[] = {'a','b','c','d',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; - DWRITE_CLUSTER_METRICS metrics; + DWRITE_CLUSTER_METRICS metrics[4]; IDWriteInlineObject *trimm; IDWriteTextFormat *format; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; IDWriteFactory *factory; - UINT32 count; + UINT32 count, i; HRESULT hr; factory = create_factory(); @@ -1016,6 +1016,16 @@ static void test_GetClusterMetrics(void) ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(count == 4, "got %u\n", count); + /* check every cluster width */ + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, sizeof(metrics)/sizeof(metrics[0]), &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 4, "got %u\n", count); + for (i = 0; i < count; i++) { + ok(metrics[i].width > 0.0, "%u: got width %.2f\n", i, metrics[i].width); + ok(metrics[i].length == 1, "%u: got length %u\n", i, metrics[i].length); + } + hr = IDWriteFactory_CreateEllipsisTrimmingSign(factory, format, &trimm); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1033,17 +1043,17 @@ todo_wine count = 0; memset(&metrics, 0, sizeof(metrics)); - hr = IDWriteTextLayout_GetClusterMetrics(layout, &metrics, 1, &count); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 1, &count); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); -todo_wine +todo_wine { ok(count == 3, "got %u\n", count); - ok(metrics.length == 2, "got %u\n", metrics.length); - + ok(metrics[0].length == 2, "got %u\n", metrics[0].length); +} hr = IDWriteInlineObject_GetMetrics(trimm, &inline_metrics); todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); - ok(inline_metrics.width == metrics.width, "got %.2f, expected %.2f\n", inline_metrics.width, - metrics.width); + ok(inline_metrics.width == metrics[0].width, "got %.2f, expected %.2f\n", inline_metrics.width, + metrics[0].width); } IDWriteInlineObject_Release(trimm); IDWriteTextLayout_Release(layout);

1 0

Thomas Faber : setupapi/tests: Avoid side-effect in an assert.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 655e7f98dba96bef8db711c5859e271a0c26122c URL: http://source.winehq.org/git/wine.git/?a=commit;h=655e7f98dba96bef8db711c58… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Apr 3 07:55:50 2015 +0200 setupapi/tests: Avoid side-effect in an assert. --- dlls/setupapi/tests/install.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index fdee524..a98cbec 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -63,10 +63,12 @@ static BOOL (WINAPI *pSetupGetInfFileListW)(PCWSTR, DWORD, PWSTR, DWORD, PDWORD) static void create_inf_file(LPCSTR filename, const char *data) { DWORD res; + BOOL ret; HANDLE handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); assert(handle != INVALID_HANDLE_VALUE); - assert(WriteFile(handle, data, strlen(data), &res, NULL)); + ret = WriteFile(handle, data, strlen(data), &res, NULL); + assert(ret != 0); CloseHandle(handle); }

1 0

Andrew Cook : server: Track handle count of objects.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 5d85f57814f023c105948636094e5e07654605ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d85f57814f023c1059486360… Author: Andrew Cook <ariscop(a)gmail.com> Date: Thu Apr 2 10:24:24 2015 +1100 server: Track handle count of objects. --- dlls/ntdll/om.c | 2 +- include/wine/server_protocol.h | 4 ++-- server/handle.c | 23 +++++++++++++++++++---- server/object.c | 10 ++++++---- server/object.h | 1 + server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 8 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index f5f75c6..b337444 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -77,7 +77,7 @@ NTSTATUS WINAPI NtQueryObject(IN HANDLE handle, memset( p, 0, sizeof(*p) ); p->GrantedAccess = reply->access; p->PointerCount = reply->ref_count; - p->HandleCount = 1; /* at least one */ + p->HandleCount = reply->handle_count; if (used_len) *used_len = sizeof(*p); } } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 3e61c5c..de6302c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4690,9 +4690,9 @@ struct get_object_info_reply struct reply_header __header; unsigned int access; unsigned int ref_count; + unsigned int handle_count; data_size_t total; /* VARARG(name,unicode_str); */ - char __pad_20[4]; }; @@ -5955,6 +5955,6 @@ union generic_reply struct set_job_completion_port_reply set_job_completion_port_reply; }; -#define SERVER_PROTOCOL_VERSION 465 +#define SERVER_PROTOCOL_VERSION 466 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/handle.c b/server/handle.c index 0293ed6..5043ff7 100644 --- a/server/handle.c +++ b/server/handle.c @@ -97,6 +97,20 @@ static inline obj_handle_t handle_global_to_local( obj_handle_t handle ) return handle ^ HANDLE_OBFUSCATOR; } +/* grab an object and increment its handle count */ +static struct object *grab_object_for_handle( struct object *obj ) +{ + obj->handle_count++; + return grab_object( obj ); +} + +/* release an object and decrement its handle count */ +static void release_object_from_handle( struct object *obj ) +{ + assert( obj->handle_count ); + obj->handle_count--; + release_object( obj ); +} static void handle_table_dump( struct object *obj, int verbose ); static void handle_table_destroy( struct object *obj ); @@ -166,7 +180,7 @@ static void handle_table_destroy( struct object *obj ) { struct object *obj = entry->ptr; entry->ptr = NULL; - if (obj) release_object( obj ); + if (obj) release_object_from_handle( obj ); } free( table->entries ); } @@ -229,7 +243,7 @@ static obj_handle_t alloc_entry( struct handle_table *table, void *obj, unsigned table->last = i; found: table->free = i + 1; - entry->ptr = grab_object( obj ); + entry->ptr = grab_object_for_handle( obj ); entry->access = access; return index_to_handle(i); } @@ -355,7 +369,7 @@ struct handle_table *copy_handle_table( struct process *process, struct process for (i = 0; i <= table->last; i++, ptr++) { if (!ptr->ptr) continue; - if (ptr->access & RESERVED_INHERIT) grab_object( ptr->ptr ); + if (ptr->access & RESERVED_INHERIT) grab_object_for_handle( ptr->ptr ); else ptr->ptr = NULL; /* don't inherit this entry */ } } @@ -379,7 +393,7 @@ unsigned int close_handle( struct process *process, obj_handle_t handle ) table = handle_is_global(handle) ? global_table : process->handles; if (entry < table->entries + table->free) table->free = entry - table->entries; if (entry == table->entries + table->last) shrink_handle_table( table ); - release_object( obj ); + release_object_from_handle( obj ); return STATUS_SUCCESS; } @@ -630,6 +644,7 @@ DECL_HANDLER(get_object_info) reply->access = get_handle_access( current->process, req->handle ); reply->ref_count = obj->refcount; + reply->handle_count = obj->handle_count; if ((name = get_object_full_name( obj, &reply->total ))) set_reply_data_ptr( name, min( reply->total, get_reply_max_size() )); release_object( obj ); diff --git a/server/object.c b/server/object.c index d4afefd..965c11c 100644 --- a/server/object.c +++ b/server/object.c @@ -206,10 +206,11 @@ void *alloc_object( const struct object_ops *ops ) struct object *obj = mem_alloc( ops->size ); if (obj) { - obj->refcount = 1; - obj->ops = ops; - obj->name = NULL; - obj->sd = NULL; + obj->refcount = 1; + obj->handle_count = 0; + obj->ops = ops; + obj->name = NULL; + obj->sd = NULL; list_init( &obj->wait_queue ); #ifdef DEBUG_OBJECTS list_add_head( &object_list, &obj->obj_list ); @@ -306,6 +307,7 @@ void release_object( void *ptr ) assert( obj->refcount ); if (!--obj->refcount) { + assert( !obj->handle_count ); /* if the refcount is 0, nobody can be in the wait queue */ assert( list_empty( &obj->wait_queue )); obj->ops->destroy( obj ); diff --git a/server/object.h b/server/object.h index 3817c75..72b52ee 100644 --- a/server/object.h +++ b/server/object.h @@ -95,6 +95,7 @@ struct object_ops struct object { unsigned int refcount; /* reference count */ + unsigned int handle_count;/* handle count */ const struct object_ops *ops; struct list wait_queue; struct object_name *name; diff --git a/server/protocol.def b/server/protocol.def index 9199c7f..625b3c9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3269,6 +3269,7 @@ enum coords_relative @REPLY unsigned int access; /* granted access mask */ unsigned int ref_count; /* object ref count */ + unsigned int handle_count; /* object handle count */ data_size_t total; /* total needed size for name */ VARARG(name,unicode_str); /* object name */ @END diff --git a/server/request.h b/server/request.h index ba699d1..dd6e4e2 100644 --- a/server/request.h +++ b/server/request.h @@ -2088,7 +2088,8 @@ C_ASSERT( FIELD_OFFSET(struct get_object_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_object_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, access) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, ref_count) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, total) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, handle_count) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, total) == 20 ); C_ASSERT( sizeof(struct get_object_info_reply) == 24 ); C_ASSERT( FIELD_OFFSET(struct unlink_object_request, handle) == 12 ); C_ASSERT( sizeof(struct unlink_object_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index e4188ba..0e2e7e2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3842,6 +3842,7 @@ static void dump_get_object_info_reply( const struct get_object_info_reply *req { fprintf( stderr, " access=%08x", req->access ); fprintf( stderr, ", ref_count=%08x", req->ref_count ); + fprintf( stderr, ", handle_count=%08x", req->handle_count ); fprintf( stderr, ", total=%u", req->total ); dump_varargs_unicode_str( ", name=", cur_size ); }

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_Printer.
by Alexandre Julliard April 3, 2015

April 3, 2015

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

Hans Leidekker : wbemprox: Implement more properties of Win32_VideoController.
by Alexandre Julliard April 3, 2015

April 3, 2015

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

Francois Gouget : winefile: Remove an unneeded NONAMELESSUNION directive.
by Alexandre Julliard April 3, 2015

April 3, 2015

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

Francois Gouget : winhlp32: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard April 3, 2015

April 3, 2015

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

Thomas Faber : winegstreamer: Avoid side-effects in asserts.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: fd8a33fde8b847f38315a28333a612e357f43830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8a33fde8b847f38315a2833… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Apr 3 08:03:51 2015 +0200 winegstreamer: Avoid side-effects in asserts. --- dlls/winegstreamer/gstdemux.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index de48efd..c17fc2f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1074,6 +1074,7 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *punkout, HRESULT *phr) { static void GST_Destroy(GSTImpl *This) { IPin *connected = NULL; ULONG pinref; + HRESULT hr; TRACE("Destroying\n"); @@ -1082,9 +1083,11 @@ static void GST_Destroy(GSTImpl *This) { /* Don't need to clean up output pins, disconnecting input pin will do that */ IPin_ConnectedTo((IPin *)&This->pInputPin, &connected); if (connected) { - assert(IPin_Disconnect(connected) == S_OK); + hr = IPin_Disconnect(connected); + assert(hr == S_OK); IPin_Release(connected); - assert(IPin_Disconnect((IPin *)&This->pInputPin) == S_OK); + hr = IPin_Disconnect((IPin *)&This->pInputPin); + assert(hr == S_OK); } pinref = IPin_Release((IPin *)&This->pInputPin); if (pinref) {

1 0

Thomas Faber : user32/tests: Avoid side-effect in an assert.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 2885e712f7ef0fcf94a8110326c9df6d84173351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2885e712f7ef0fcf94a811032… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Apr 3 08:02:19 2015 +0200 user32/tests: Avoid side-effect in an assert. --- dlls/user32/tests/win.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6869a20..3a0548d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4883,6 +4883,7 @@ static void test_IsWindowUnicode(void) WNDCLASSA classA; WNDCLASSW classW; HWND hwnd; + ATOM atom; memset(&classW, 0, sizeof(classW)); classW.hInstance = GetModuleHandleA(0); @@ -4894,7 +4895,8 @@ static void test_IsWindowUnicode(void) classA.hInstance = GetModuleHandleA(0); classA.lpfnWndProc = def_window_procA; classA.lpszClassName = ansi_class_nameA; - assert(RegisterClassA(&classA)); + atom = RegisterClassA(&classA); + assert(atom); /* unicode class: window proc */ hwnd = CreateWindowExW(0, unicode_class_nameW, NULL, WS_POPUP,

1 0

Hans Leidekker : wbemprox: Fix a memory leak.
by Alexandre Julliard April 3, 2015

April 3, 2015

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

Shuai Meng : vbscript: Fixed Hex.
by Alexandre Julliard April 3, 2015

April 3, 2015

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

Francois Gouget : winedump: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: f635beea751323001b4dd7297584968e7d6c6c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f635beea751323001b4dd7297… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 3 01:25:28 2015 +0200 winedump: Remove unneeded NONAMELESSXXX directives. --- tools/winedump/dos.c | 2 -- tools/winedump/dump.c | 2 -- tools/winedump/font.c | 2 -- tools/winedump/lib.c | 2 +- tools/winedump/msc.c | 2 -- tools/winedump/pdb.c | 2 +- tools/winedump/winedump.h | 2 -- 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/tools/winedump/dos.c b/tools/winedump/dos.c index 8424f79..2ec38b7 100644 --- a/tools/winedump/dos.c +++ b/tools/winedump/dos.c @@ -39,8 +39,6 @@ #endif #include <fcntl.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winedump.h" diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 7ca4dc0..e84e473 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -39,8 +39,6 @@ #endif #include <fcntl.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winedump.h" diff --git a/tools/winedump/font.c b/tools/winedump/font.c index 76710b8..3257fce 100644 --- a/tools/winedump/font.c +++ b/tools/winedump/font.c @@ -35,8 +35,6 @@ #endif #include <fcntl.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index 6c926d4..f593515 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -36,7 +36,7 @@ #include <fcntl.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index bb7a981..5890b29 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -39,8 +39,6 @@ #endif #include <fcntl.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winedump.h" diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 1b713b1..6a6a9b4 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -40,7 +40,7 @@ #include <fcntl.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winedump.h" diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 88fa0e7..339cee3 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -42,8 +42,6 @@ #include <assert.h> #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : shell32: Point the 'My Documents' symbolic link to the XDG or OS X 'Documents' folder if they exist.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: e4c285b0742e8bbeb8c0b744cc7023c985d65dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c285b0742e8bbeb8c0b744c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 3 01:25:04 2015 +0200 shell32: Point the 'My Documents' symbolic link to the XDG or OS X 'Documents' folder if they exist. --- dlls/shell32/shellpath.c | 54 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e184434..cfd3094 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2786,7 +2786,7 @@ static void _SHCreateSymbolicLinks(void) { UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC }, i; int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; - static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DESKTOP" }; + static const char * const xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC", "DOCUMENTS", "DESKTOP" }; static const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]); WCHAR wszTempPath[MAX_PATH]; char szPersonalTarget[FILENAME_MAX], *pszPersonal; @@ -2809,23 +2809,47 @@ static void _SHCreateSymbolicLinks(void) if (FAILED(hr)) xdg_results = NULL; pszHome = getenv("HOME"); - if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) { - strcpy(szPersonalTarget, pszHome); - if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && - !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) + { + while (1) { - /* '$HOME/My Documents' exists. Create 'My Pictures', 'My Videos' and - * 'My Music' subfolders or fail silently if they already exist. */ - for (i = 0; i < sizeof(aidsMyStuff)/sizeof(aidsMyStuff[0]); i++) { - strcpy(szMyStuffTarget, szPersonalTarget); - if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) - mkdir(szMyStuffTarget, 0777); + /* Check if there's already a Wine-specific 'My Documents' folder */ + strcpy(szPersonalTarget, pszHome); + if (_SHAppendToUnixPath(szPersonalTarget, MAKEINTRESOURCEW(IDS_PERSONAL)) && + !stat(szPersonalTarget, &statFolder) && S_ISDIR(statFolder.st_mode)) + { + /* '$HOME/My Documents' exists. Create 'My Pictures', + * 'My Videos' and 'My Music' subfolders or fail silently if + * they already exist. + */ + for (i = 0; i < sizeof(aidsMyStuff)/sizeof(*aidsMyStuff); i++) + { + strcpy(szMyStuffTarget, szPersonalTarget); + if (_SHAppendToUnixPath(szMyStuffTarget, MAKEINTRESOURCEW(aidsMyStuff[i]))) + mkdir(szMyStuffTarget, 0777); + } + break; } - } - else - { - /* '$HOME/My Documents' doesn't exists, but '$HOME' does. */ + + /* Try to point to the XDG Documents folder */ + if (xdg_results && xdg_results[num-2] && + !stat(xdg_results[num-2], &statFolder) && + S_ISDIR(statFolder.st_mode)) + { + strcpy(szPersonalTarget, xdg_results[num-2]); + break; + } + + /* Or the hardcoded / OS X Documents folder */ strcpy(szPersonalTarget, pszHome); + if (_SHAppendToUnixPath(szPersonalTarget, DocumentsW) && + !stat(szPersonalTarget, &statFolder) && + S_ISDIR(statFolder.st_mode)) + break; + + /* As a last resort point to $HOME. */ + strcpy(szPersonalTarget, pszHome); + break; } /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */

1 0

Francois Gouget : widl: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard April 3, 2015

April 3, 2015

Module: wine Branch: master Commit: 8a63982f73e0ccd8c79b7be33634eae17b1ae808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a63982f73e0ccd8c79b7be33… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 3 01:25:16 2015 +0200 widl: Remove unneeded NONAMELESSXXX directives. --- tools/widl/typelib.c | 3 --- tools/widl/write_msft.c | 1 - 2 files changed, 4 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 8632fdf..6ac748f 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -32,9 +32,6 @@ #include <string.h> #include <ctype.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "windef.h" #include "winbase.h" diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index adffe85..4c85849 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -38,7 +38,6 @@ #include <time.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "winerror.h" #include "windef.h"

1 0

Francois Gouget : wineps.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard April 2, 2015

April 2, 2015

Module: wine Branch: master Commit: 6027c88cdf8a4ffdded935de6fb70496941871cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6027c88cdf8a4ffdded935de6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:26:07 2015 +0200 wineps.drv: Mark internal symbols with hidden visibility. --- dlls/wineps.drv/psdrv.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index faefd71..75c062a 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -393,7 +393,7 @@ static inline PSDRV_PDEVICE *get_psdrv_dev( PHYSDEV dev ) * Every glyph name in the Adobe Glyph List and the 35 core PostScript fonts */ -extern const INT PSDRV_AGLGlyphNamesSize; +extern const INT PSDRV_AGLGlyphNamesSize DECLSPEC_HIDDEN; extern GLYPHNAME PSDRV_AGLGlyphNames[] DECLSPEC_HIDDEN; @@ -401,19 +401,19 @@ extern GLYPHNAME PSDRV_AGLGlyphNames[] DECLSPEC_HIDDEN; * The AGL encoding vector */ -extern const INT PSDRV_AGLbyNameSize; /* sorted by name - */ -extern const UNICODEGLYPH PSDRV_AGLbyName[] DECLSPEC_HIDDEN; /* duplicates omitted */ +extern const INT PSDRV_AGLbyNameSize DECLSPEC_HIDDEN; /* sorted by name */ +extern const UNICODEGLYPH PSDRV_AGLbyName[] DECLSPEC_HIDDEN; /* duplicates omitted */ -extern const INT PSDRV_AGLbyUVSize; /* sorted by UV - */ -extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates included */ +extern const INT PSDRV_AGLbyUVSize DECLSPEC_HIDDEN; /* sorted by UV */ +extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates included */ extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; -extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ); -extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ); -extern DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ); +extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; +extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; +extern DUPLEX *find_duplex( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,

1 0