wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

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: 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: 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

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

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

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 : winedump: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 03 Apr '15

03 Apr '15

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 : widl: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 03 Apr '15

03 Apr '15

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 : shell32: Point the 'My Documents' symbolic link to the XDG or OS X 'Documents' folder if they exist.
by Alexandre Julliard 03 Apr '15

03 Apr '15

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 : wmp: Mark internal symbols with hidden visibility.
by Alexandre Julliard 02 Apr '15

02 Apr '15

Module: wine Branch: master Commit: d46e6fe6b6d700e872d21a5cc49e1e33048fbf8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46e6fe6b6d700e872d21a5cc… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 2 12:26:32 2015 +0200 wmp: Mark internal symbols with hidden visibility. --- dlls/wmp/wmp_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index f022ea4..91e8465 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -44,7 +44,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) void unregister_wmp_class(void) DECLSPEC_HIDDEN; -extern HINSTANCE wmp_instance; +extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; static inline void *heap_alloc(size_t len) {

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2015