December 2014 - Wine-commits

Francois Gouget : dwrite: Add a trailing '\n' to a FIXME().
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: eaf4f695d16a08b00440d5331d18a7a06a6e299f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf4f695d16a08b00440d5331… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 5 12:20:47 2014 +0100 dwrite: Add a trailing '\n' to a FIXME(). --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a76dd4b..9bd434c 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1196,7 +1196,7 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA heap_free(name_string); } else { - FIXME("handle NAME format 1"); + FIXME("handle NAME format 1\n"); continue; } }

1 0

Francois Gouget : dwrite: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: d1040304b2b507839a0c6cb7222a875ad8f6f5a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1040304b2b507839a0c6cb72… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 5 12:55:00 2014 +0100 dwrite: Fix compilation on systems that don't support nameless unions. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 135ea4d..df3d2dd 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2120,8 +2120,8 @@ static HRESULT WINAPI localfontfilestream_GetLastWriteTime(IDWriteFontFileStream TRACE("(%p)->(%p)\n", This, last_writetime); - li.LowPart = This->entry->key->writetime.dwLowDateTime; - li.HighPart = This->entry->key->writetime.dwHighDateTime; + li.u.LowPart = This->entry->key->writetime.dwLowDateTime; + li.u.HighPart = This->entry->key->writetime.dwHighDateTime; *last_writetime = li.QuadPart; return S_OK;

1 0

Piotr Caban : msvcrt: Use fd critical section in _eof.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 9a4cfbc3edce79a1cca12b7dbed39fa14a9d65c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4cfbc3edce79a1cca12b7db… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 5 14:42:44 2014 +0100 msvcrt: Use fd critical section in _eof. --- dlls/msvcrt/file.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5176f58..317e19e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1081,29 +1081,38 @@ int CDECL MSVCRT__dup(int od) */ int CDECL MSVCRT__eof(int fd) { + ioinfo *info = get_ioinfo(fd); DWORD curpos,endpos; LONG hcurpos,hendpos; - HANDLE hand = msvcrt_fdtoh(fd); - TRACE(":fd (%d) handle (%p)\n",fd,hand); + TRACE(":fd (%d) handle (%p)\n", fd, info->handle); - if (hand == INVALID_HANDLE_VALUE) + if (info->handle == INVALID_HANDLE_VALUE) + { + release_ioinfo(info); return -1; + } - if (get_ioinfo_nolock(fd)->wxflag & WX_ATEOF) return TRUE; + if (info->wxflag & WX_ATEOF) + { + release_ioinfo(info); + return TRUE; + } /* Otherwise we do it the hard way */ hcurpos = hendpos = 0; - curpos = SetFilePointer(hand, 0, &hcurpos, FILE_CURRENT); - endpos = SetFilePointer(hand, 0, &hendpos, FILE_END); + curpos = SetFilePointer(info->handle, 0, &hcurpos, FILE_CURRENT); + endpos = SetFilePointer(info->handle, 0, &hendpos, FILE_END); if (curpos == endpos && hcurpos == hendpos) { /* FIXME: shouldn't WX_ATEOF be set here? */ + release_ioinfo(info); return TRUE; } - SetFilePointer(hand, curpos, &hcurpos, FILE_BEGIN); + SetFilePointer(info->handle, curpos, &hcurpos, FILE_BEGIN); + release_ioinfo(info); return FALSE; }

1 0

Piotr Caban : msvcrt: Use fd critical section in _locking.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: ffdd16cc0d76be068f6a12ca88371e7d761165b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffdd16cc0d76be068f6a12ca8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 5 14:42:55 2014 +0100 msvcrt: Use fd critical section in _locking. --- dlls/msvcrt/file.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 317e19e..8c4a9f4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1252,16 +1252,20 @@ void CDECL MSVCRT__unlock_file(MSVCRT_FILE *file) */ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) { + ioinfo *info = get_ioinfo(fd); BOOL ret; DWORD cur_locn; - HANDLE hand = msvcrt_fdtoh(fd); - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) + TRACE(":fd (%d) handle (%p)\n", fd, info->handle); + if (info->handle == INVALID_HANDLE_VALUE) + { + release_ioinfo(info); return -1; + } if (mode < 0 || mode > 4) { + release_ioinfo(info); *MSVCRT__errno() = MSVCRT_EINVAL; return -1; } @@ -1274,8 +1278,9 @@ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) (mode==MSVCRT__LK_NBRLCK)?"_LK_NBRLCK": "UNKNOWN"); - if ((cur_locn = SetFilePointer(hand, 0L, NULL, SEEK_CUR)) == INVALID_SET_FILE_POINTER) + if ((cur_locn = SetFilePointer(info->handle, 0L, NULL, SEEK_CUR)) == INVALID_SET_FILE_POINTER) { + release_ioinfo(info); FIXME ("Seek failed\n"); *MSVCRT__errno() = MSVCRT_EINVAL; /* FIXME */ return -1; @@ -1286,16 +1291,17 @@ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) ret = 1; /* just to satisfy gcc */ while (nretry--) { - ret = LockFile(hand, cur_locn, 0L, nbytes, 0L); + ret = LockFile(info->handle, cur_locn, 0L, nbytes, 0L); if (ret) break; Sleep(1); } } else if (mode == MSVCRT__LK_UNLCK) - ret = UnlockFile(hand, cur_locn, 0L, nbytes, 0L); + ret = UnlockFile(info->handle, cur_locn, 0L, nbytes, 0L); else - ret = LockFile(hand, cur_locn, 0L, nbytes, 0L); + ret = LockFile(info->handle, cur_locn, 0L, nbytes, 0L); /* FIXME - what about error settings? */ + release_ioinfo(info); return ret ? 0 : -1; }

1 0

Piotr Caban : msvcrt: Use fd critical section in _lseeki64.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: fa6de59770003958d2e6999a4bbaa5a9f1cc0d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6de59770003958d2e6999a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 5 14:42:50 2014 +0100 msvcrt: Use fd critical section in _lseeki64. --- dlls/msvcrt/file.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8c4a9f4..174ec64 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1180,15 +1180,20 @@ void msvcrt_free_io(void) */ __int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence) { - HANDLE hand = msvcrt_fdtoh(fd); + ioinfo *info = get_ioinfo(fd); LARGE_INTEGER ofs; - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) + TRACE(":fd (%d) handle (%p)\n", fd, info->handle); + + if (info->handle == INVALID_HANDLE_VALUE) + { + release_ioinfo(info); return -1; + } if (whence < 0 || whence > 2) { + release_ioinfo(info); *MSVCRT__errno() = MSVCRT_EINVAL; return -1; } @@ -1202,14 +1207,16 @@ __int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence) /* The MoleBox protection scheme expects msvcrt to use SetFilePointer only, * so a LARGE_INTEGER offset cannot be passed directly via SetFilePointerEx. */ ofs.QuadPart = offset; - if ((ofs.u.LowPart = SetFilePointer(hand, ofs.u.LowPart, &ofs.u.HighPart, whence)) != INVALID_SET_FILE_POINTER || + if ((ofs.u.LowPart = SetFilePointer(info->handle, ofs.u.LowPart, &ofs.u.HighPart, whence)) != INVALID_SET_FILE_POINTER || GetLastError() == ERROR_SUCCESS) { - get_ioinfo_nolock(fd)->wxflag &= ~WX_ATEOF; + info->wxflag &= ~WX_ATEOF; /* FIXME: What if we seek _to_ EOF - is EOF set? */ + release_ioinfo(info); return ofs.QuadPart; } + release_ioinfo(info); TRACE(":error-last error (%d)\n",GetLastError()); msvcrt_set_errno(GetLastError()); return -1;

1 0

Piotr Caban : msvcrt: Use fd critical section in _chsize_s.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: f2f45d5fe67cd8e4129e5ec409fde10fb62b87bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f45d5fe67cd8e4129e5ec40… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 5 14:43:07 2014 +0100 msvcrt: Use fd critical section in _chsize_s. --- dlls/msvcrt/file.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 174ec64..3eae1f1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1377,18 +1377,17 @@ int CDECL MSVCRT__fseek_nolock(MSVCRT_FILE* file, MSVCRT_long offset, int whence */ int CDECL MSVCRT__chsize_s(int fd, __int64 size) { + ioinfo *info; __int64 cur, pos; - HANDLE handle; BOOL ret = FALSE; TRACE("(fd=%d, size=%s)\n", fd, wine_dbgstr_longlong(size)); if (!MSVCRT_CHECK_PMT(size >= 0)) return MSVCRT_EINVAL; - LOCK_FILES(); - handle = msvcrt_fdtoh(fd); - if (handle != INVALID_HANDLE_VALUE) + info = get_ioinfo(fd); + if (info->handle != INVALID_HANDLE_VALUE) { /* save the current file pointer */ cur = MSVCRT__lseeki64(fd, 0, SEEK_CUR); @@ -1397,7 +1396,7 @@ int CDECL MSVCRT__chsize_s(int fd, __int64 size) pos = MSVCRT__lseeki64(fd, size, SEEK_SET); if (pos >= 0) { - ret = SetEndOfFile(handle); + ret = SetEndOfFile(info->handle); if (!ret) msvcrt_set_errno(GetLastError()); } @@ -1406,7 +1405,7 @@ int CDECL MSVCRT__chsize_s(int fd, __int64 size) } } - UNLOCK_FILES(); + release_ioinfo(info); return ret ? 0 : *MSVCRT__errno(); }

1 0

Piotr Caban : msvcrt: Use fd critical section in _fstat64.
by Alexandre Julliard 05 Dec '14

05 Dec '14

Module: wine Branch: master Commit: 6c2d4f1092d044a2fc949e7189a30fcd4d96099f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2d4f1092d044a2fc949e718… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 5 14:43:17 2014 +0100 msvcrt: Use fd critical section in _fstat64. --- dlls/msvcrt/file.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 3eae1f1..ff1f5d6 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1651,25 +1651,29 @@ int CDECL MSVCRT__fileno(MSVCRT_FILE* file) */ int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf) { + ioinfo *info = get_ioinfo(fd); DWORD dw; DWORD type; BY_HANDLE_FILE_INFORMATION hfi; - HANDLE hand = msvcrt_fdtoh(fd); - TRACE(":fd (%d) stat (%p)\n",fd,buf); - if (hand == INVALID_HANDLE_VALUE) + TRACE(":fd (%d) stat (%p)\n", fd, buf); + if (info->handle == INVALID_HANDLE_VALUE) + { + release_ioinfo(info); return -1; + } if (!buf) { WARN(":failed-NULL buf\n"); msvcrt_set_errno(ERROR_INVALID_PARAMETER); + release_ioinfo(info); return -1; } memset(&hfi, 0, sizeof(hfi)); memset(buf, 0, sizeof(struct MSVCRT__stat64)); - type = GetFileType(hand); + type = GetFileType(info->handle); if (type == FILE_TYPE_PIPE) { buf->st_dev = buf->st_rdev = fd; @@ -1684,10 +1688,11 @@ int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf) } else /* FILE_TYPE_DISK etc. */ { - if (!GetFileInformationByHandle(hand, &hfi)) + if (!GetFileInformationByHandle(info->handle, &hfi)) { WARN(":failed-last error (%d)\n",GetLastError()); msvcrt_set_errno(ERROR_INVALID_PARAMETER); + release_ioinfo(info); return -1; } buf->st_mode = S_IFREG | 0444; @@ -1702,6 +1707,7 @@ int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf) } TRACE(":dwFileAttributes = 0x%x, mode set to 0x%x\n",hfi.dwFileAttributes, buf->st_mode); + release_ioinfo(info); return 0; }

1 0

André Hentschel : windowscodecs: Remove unused strings (Clang).
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: ef9562a42fcd86501157e3170bcc572334157bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef9562a42fcd86501157e3170… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:44 2014 +0100 windowscodecs: Remove unused strings (Clang). --- dlls/windowscodecs/regsvr.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 4c86478..91df294 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -154,21 +154,6 @@ static HRESULT unregister_pixelformats(struct regsvr_pixelformat const *list); */ static const WCHAR clsid_keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; -static const WCHAR curver_keyname[] = { - 'C', 'u', 'r', 'V', 'e', 'r', 0 }; -static const WCHAR ips_keyname[] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - 0 }; -static const WCHAR ips32_keyname[] = { - 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', - '3', '2', 0 }; -static const WCHAR progid_keyname[] = { - 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static const WCHAR viprogid_keyname[] = { - 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', - 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', - 0 }; -static const char tmodel_valuename[] = "ThreadingModel"; static const char author_valuename[] = "Author"; static const char friendlyname_valuename[] = "FriendlyName"; static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0};

1 0

André Hentschel : wineoss.drv: Remove unused string ( Clang).
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: d12e65af70d9c17e4082365dae05fdb73aec3526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12e65af70d9c17e4082365da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:48 2014 +0100 wineoss.drv: Remove unused string (Clang). --- dlls/wineoss.drv/mmdevdrv.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ce95138..d64fa54 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -150,9 +150,6 @@ typedef struct _OSSDevice { static struct list g_devices = LIST_INIT(g_devices); -static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', - 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', - 'w','i','n','e','o','s','s','.','d','r','v',0}; static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','o','s','s','.','d','r','v','\\','d','e','v','i','c','e','s',0};

1 0

André Hentschel : winex11.drv: Remove unused code ( Clang).
by Alexandre Julliard 04 Dec '14

04 Dec '14

Module: wine Branch: master Commit: 3bddfebe992079e551acad2ac969cbe1bf8bedfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bddfebe992079e551acad2ac… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 3 23:53:52 2014 +0100 winex11.drv: Remove unused code (Clang). --- dlls/winex11.drv/opengl.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index cf5d440..7b8ba82 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -272,13 +272,6 @@ static XContext gl_hwnd_context; /* X context to associate a struct gl_drawable to a pbuffer hdc */ static XContext gl_pbuffer_context; -static const struct gdi_dc_funcs glxdrv_funcs; - -static inline struct glx_physdev *get_glxdrv_dev( PHYSDEV dev ) -{ - return (struct glx_physdev *)dev; -} - static struct list context_list = LIST_INIT( context_list ); static struct WineGLInfo WineGLInfo = { 0 }; static struct wgl_pixel_format *pixel_formats;

1 0