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

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