December 2014 - Wine-Commits

Piotr Caban : msvcrt: Use fd critical section in _fstat64.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

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

Piotr Caban : msvcrt: Use fd critical section in _locking.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

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 _eof.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

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

Bruno Jesus : ws2_32: Filter unset bits when argument is smaller than 32 bits.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

Module: wine Branch: master Commit: d7a8beb0f766d2cbbbf682ca8846ce6ab96ca855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a8beb0f766d2cbbbf682ca8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Dec 5 02:26:34 2014 -0200 ws2_32: Filter unset bits when argument is smaller than 32 bits. --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ebafed5..1864dfd 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5013,6 +5013,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, { woptval= *((const INT16 *) optval); optval= (char*) &woptval; + woptval&= (1 << optlen * 8) - 1; optlen=sizeof(int); } fd = get_sock_fd( s, 0, NULL ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 52a4e1e..f0946c9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1374,6 +1374,23 @@ todo_wine closesocket(s); + /* Test WS_IP_MULTICAST_TTL with 8, 16, 24 and 32 bits values */ + s = socket(AF_INET, SOCK_DGRAM, 0); + ok(s != INVALID_SOCKET, "Failed to create socket\n"); + size = sizeof(i); + for (i = 0; i < 4; i++) + { + int k, j; + const int tests[] = {0xffffff0a, 0xffff000b, 0xff00000c, 0x0000000d}; + err = setsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &tests[i], i + 1); + ok(!err, "Test [%d] Expected 0, got %d\n", i, err); + err = getsockopt(s, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &k, &size); + ok(!err, "Test [%d] Expected 0, got %d\n", i, err); + j = i != 3 ? tests[i] & ((1 << (i + 1) * 8) - 1) : tests[i]; + ok(k == j, "Test [%d] Expected 0x%x, got 0x%x\n", i, j, k); + } + closesocket(s); + /* test SO_PROTOCOL_INFOA invalid parameters */ ok(getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, NULL), "getsockopt should have failed\n");

1 0

Stefan Leichter : kernel32: Add stubs for CreateSymbolicLinkA/W.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

Module: wine Branch: master Commit: 9668dddfc93a5241121137d6a9ad89aa0009ac08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9668dddfc93a5241121137d6a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 2 21:35:06 2014 +0100 kernel32: Add stubs for CreateSymbolicLinkA/W. --- .../api-ms-win-core-file-l2-1-0.spec | 2 +- .../api-ms-win-core-file-l2-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/path.c | 18 ++++++++++++++++++ include/winbase.h | 3 +++ 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec index 914e0c0..3c1e59c 100644 --- a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec +++ b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec @@ -2,7 +2,7 @@ @ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) kernel32.CopyFileExW @ stdcall CreateDirectoryExW(wstr wstr ptr) kernel32.CreateDirectoryExW @ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW -@ stub CreateSymbolicLinkW +@ stdcall CreateSymbolicLinkW(wstr wstr long) kernel32.CreateSymbolicLinkW @ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW diff --git a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec index 36cf6c3..6bfcb08 100644 --- a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec +++ b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec @@ -2,7 +2,7 @@ @ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) kernel32.CopyFileExW @ stdcall CreateDirectoryExW(wstr wstr ptr) kernel32.CreateDirectoryExW @ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW -@ stub CreateSymbolicLinkW +@ stdcall CreateSymbolicLinkW(wstr wstr long) kernel32.CreateSymbolicLinkW @ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c072780..80c7a87 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -264,6 +264,8 @@ @ stdcall CreateSemaphoreExW(ptr long long wstr long long) @ stdcall CreateSemaphoreW(ptr long long wstr) @ stdcall CreateSocketHandle() +@ stdcall CreateSymbolicLinkA(str str long) +@ stdcall CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) @ stdcall CreateTimerQueue () diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c4a37b2..bb167a0 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1954,3 +1954,21 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) nt_name.Buffer[1] = '\\'; return nt_name.Buffer; } + +/************************************************************************* + * CreateSymbolicLinkW (KERNEL32.@) + */ +BOOL WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) +{ + FIXME("(%s %s %d): stub\n", debugstr_w(link), debugstr_w(target), flags); + return TRUE; +} + +/************************************************************************* + * CreateSymbolicLinkA (KERNEL32.@) + */ +BOOL WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags) +{ + FIXME("(%s %s %d): stub\n", debugstr_a(link), debugstr_a(target), flags); + return TRUE; +} diff --git a/include/winbase.h b/include/winbase.h index 723da26..5ac55b7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1684,6 +1684,9 @@ WINBASEAPI HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,L WINBASEAPI HANDLE WINAPI CreateSemaphoreExA(SECURITY_ATTRIBUTES*,LONG,LONG,LPCSTR,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateSemaphoreExW(SECURITY_ATTRIBUTES*,LONG,LONG,LPCWSTR,DWORD,DWORD); #define CreateSemaphoreEx WINELIB_NAME_AW(CreateSemaphoreEx) +WINBASEAPI BOOL WINAPI CreateSymbolicLinkA(LPCSTR,LPCSTR,DWORD); +WINBASEAPI BOOL WINAPI CreateSymbolicLinkW(LPCWSTR,LPCWSTR,DWORD); +#define CreateSymbolicLink WINELIB_NAME_AW(CreateSymbolicLink) WINBASEAPI DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateTimerQueue(void);

1 0

Michael Stefaniuc : comctl32: Merge two if blocks with identical condition (PVS-Studio).
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

Module: wine Branch: master Commit: 2db0a3d01e21fc3f87d45eaca71f1b6d2ed7a94f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db0a3d01e21fc3f87d45eaca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 5 10:37:44 2014 +0100 comctl32: Merge two if blocks with identical condition (PVS-Studio). --- dlls/comctl32/listview.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bc748c6..57f19e4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4005,10 +4005,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN rect.top = rect.bottom = infoPtr->ptClickPos.y; InflateRect(&rect, GetSystemMetrics(SM_CXDRAG), GetSystemMetrics(SM_CYDRAG)); - } - if (infoPtr->bLButtonDown) - { if (infoPtr->bMarqueeSelect) { POINT coords_orig;

1 0

Piotr Caban : msvcrt: Use fd critical section in _chsize_s.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

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 _lseeki64.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

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

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

Module: wine Branch: master Commit: ea932fbcc15951a13a12cfca8949597ebd9d6fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea932fbcc15951a13a12cfca8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 5 12:21:02 2014 +0100 Assorted spelling fixes. --- dlls/dwrite/tests/font.c | 2 +- dlls/kernel32/tests/virtual.c | 4 ++-- dlls/user32/tests/input.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2fe845c..49e7154 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1513,7 +1513,7 @@ static void test_CustomFontCollection(void) ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(idfont2, 1); EXPECT_REF(idfont, 1); - ok(idfont2 != idfont, "Font instances shoudl not match\n"); + ok(idfont2 != idfont, "Font instances should not match\n"); idfontface2 = NULL; hr = IDWriteFont_CreateFontFace(idfont2, &idfontface2); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 0015f98..75e91d5 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1618,7 +1618,7 @@ static void test_guard_page(void) /* test behaviour of VirtualLock - first attempt should fail */ SetLastError( 0xdeadbeef ); success = VirtualLock( base, size ); - ok( !success, "VirtualLock unexpectedly succeded\n" ); + ok( !success, "VirtualLock unexpectedly succeeded\n" ); todo_wine ok( GetLastError() == STATUS_GUARD_PAGE_VIOLATION, "wrong error %u\n", GetLastError() ); @@ -1770,7 +1770,7 @@ static void test_guard_page(void) /* test behaviour of VirtualLock - first attempt should fail without triggering write watches */ SetLastError( 0xdeadbeef ); success = VirtualLock( base, size ); - ok( !success, "VirtualLock unexpectedly succeded\n" ); + ok( !success, "VirtualLock unexpectedly succeeded\n" ); todo_wine ok( GetLastError() == STATUS_GUARD_PAGE_VIOLATION, "wrong error %u\n", GetLastError() ); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 9b898d3..39afeb7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1863,8 +1863,8 @@ static void test_Input_mouse(void) ok(!got_button_down, "unexpected WM_RBUTTONDOWN message\n"); ok(!got_button_up, "unexpected WM_RBUTTONUP message\n"); - /* click on HTTRANSPARENT top-level window that belongs to ther thread, - * threads input queues are attached */ + /* click on HTTRANSPARENT top-level window that belongs to other thread, + * thread input queues are attached */ thread = CreateThread(NULL, 0, create_static_win, &thread_data, 0, &thread_id); ok(thread != NULL, "CreateThread failed\n"); hittest_no = 0;

1 0

Nikolay Sivov : shell32: Added a stub for SHAssocEnumHandlers().
by Alexandre Julliard Dec. 5, 2014

Dec. 5, 2014

Module: wine Branch: master Commit: 717385b0ba2cc63410e06805c50d857220522e64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=717385b0ba2cc63410e06805c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 5 13:30:08 2014 +0300 shell32: Added a stub for SHAssocEnumHandlers(). --- dlls/shell32/assoc.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + 2 files changed, 91 insertions(+) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index b0d815a..39e210d 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -77,6 +77,17 @@ static inline IQueryAssociationsImpl *impl_from_IQueryAssociations(IQueryAssocia return CONTAINING_RECORD(iface, IQueryAssociationsImpl, IQueryAssociations_iface); } +struct enumassochandlers +{ + IEnumAssocHandlers IEnumAssocHandlers_iface; + LONG ref; +}; + +static inline struct enumassochandlers *impl_from_IEnumAssocHandlers(IEnumAssocHandlers *iface) +{ + return CONTAINING_RECORD(iface, struct enumassochandlers, IEnumAssocHandlers_iface); +} + /************************************************************************** * IQueryAssociations_QueryInterface * @@ -965,3 +976,82 @@ HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, R TRACE("returning 0x%x with %p\n", hr, *ppv); return hr; } + +static HRESULT WINAPI enumassochandlers_QueryInterface(IEnumAssocHandlers *iface, REFIID riid, void **obj) +{ + struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); + + TRACE("(%p %s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IEnumAssocHandlers) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IEnumAssocHandlers_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI enumassochandlers_AddRef(IEnumAssocHandlers *iface) +{ + struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI enumassochandlers_Release(IEnumAssocHandlers *iface) +{ + struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (!ref) + SHFree(This); + + return ref; +} + +static HRESULT WINAPI enumassochandlers_Next(IEnumAssocHandlers *iface, ULONG count, IAssocHandler **handlers, + ULONG *fetched) +{ + struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); + + FIXME("(%p)->(%u %p %p): stub\n", This, count, handlers, fetched); + + return E_NOTIMPL; +} + +static const IEnumAssocHandlersVtbl enumassochandlersvtbl = { + enumassochandlers_QueryInterface, + enumassochandlers_AddRef, + enumassochandlers_Release, + enumassochandlers_Next +}; + +/************************************************************************** + * SHAssocEnumHandlers [SHELL32.@] + */ +HRESULT WINAPI SHAssocEnumHandlers(const WCHAR *extra, ASSOC_FILTER filter, IEnumAssocHandlers **enumhandlers) +{ + struct enumassochandlers *enumassoc; + + FIXME("(%s %d %p\n): stub", debugstr_w(extra), filter, enumhandlers); + + *enumhandlers = NULL; + + enumassoc = SHAlloc(sizeof(*enumassoc)); + if (!enumassoc) + return E_OUTOFMEMORY; + + enumassoc->IEnumAssocHandlers_iface.lpVtbl = &enumassochandlersvtbl; + enumassoc->ref = 1; + + *enumhandlers = &enumassoc->IEnumAssocHandlers_iface; + return S_OK; +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index e6858c8..0a8d448 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -328,6 +328,7 @@ @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SHAddToRecentDocs (long ptr) @ stdcall SHAppBarMessage(long ptr) +@ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr)

1 0