June 2014 - Wine-commits - list.winehq.org

Bruno Jesus : opengl32/tests: Test glGetString() without an active GL context.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: d0803ef1d0cba0e2f412622a6b2d53fe965f4888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0803ef1d0cba0e2f412622a6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 24 21:39:07 2014 -0300 opengl32/tests: Test glGetString() without an active GL context. --- dlls/opengl32/tests/opengl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 7384cb4..e5e1507 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -715,6 +715,9 @@ static DWORD WINAPI wgl_thread(void *param) struct wgl_thread_param *p = param; HDC hdc = GetDC( p->hwnd ); + ok(!glGetString(GL_RENDERER) && !glGetString(GL_VERSION) && !glGetString(GL_VENDOR), + "Expected NULL string when no active context is set\n"); + SetLastError(0xdeadbeef); p->make_current = wglMakeCurrent(hdc, p->hglrc); p->make_current_error = GetLastError(); @@ -1668,6 +1671,8 @@ START_TEST(opengl) test_message_window(); test_dc(hwnd, hdc); + ok(!glGetString(GL_RENDERER) && !glGetString(GL_VERSION) && !glGetString(GL_VENDOR), + "Expected NULL string when no active context is set\n"); hglrc = wglCreateContext(hdc); res = wglMakeCurrent(hdc, hglrc); ok(res, "wglMakeCurrent failed!\n");

1 0

Zhenbo Li : shell32: Fix SHFileOperation when deleting a nonexistent directory.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: 2ba9ee018bce4953feb728595f4a4a6e47b186a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba9ee018bce4953feb728595… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Jun 21 22:34:58 2014 +0800 shell32: Fix SHFileOperation when deleting a nonexistent directory. --- dlls/shell32/shlfileop.c | 68 +++++++++++++++++++++--------------------- dlls/shell32/tests/shlfileop.c | 4 --- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index e6d44b0..62d7880 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -347,36 +347,36 @@ HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) * Asks for confirmation when bShowUI is true and deletes the directory and * all its subdirectories and files if necessary. */ -static BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) +static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) { - BOOL ret = TRUE; - HANDLE hFind; - WIN32_FIND_DATAW wfd; - WCHAR szTemp[MAX_PATH]; - - /* Make sure the directory exists before eventually prompting the user */ - PathCombineW(szTemp, pszDir, wWildcardFile); - hFind = FindFirstFileW(szTemp, &wfd); - if (hFind == INVALID_HANDLE_VALUE) - return FALSE; + DWORD ret = 0; + HANDLE hFind; + WIN32_FIND_DATAW wfd; + WCHAR szTemp[MAX_PATH]; + + PathCombineW(szTemp, pszDir, wWildcardFile); + hFind = FindFirstFileW(szTemp, &wfd); + + if (hFind != INVALID_HANDLE_VALUE) { + if (!bShowUI || SHELL_ConfirmDialogW(hwnd, ASK_DELETE_FOLDER, pszDir, NULL)) { + do { + if (IsDotDir(wfd.cFileName)) + continue; + PathCombineW(szTemp, pszDir, wfd.cFileName); + if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) + ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); + else + ret = SHNotifyDeleteFileW(szTemp); + } while (!ret && FindNextFileW(hFind, &wfd)); + } + FindClose(hFind); + } + if (ret == ERROR_SUCCESS) + ret = SHNotifyRemoveDirectoryW(pszDir); - if (!bShowUI || (ret = SHELL_ConfirmDialogW(hwnd, ASK_DELETE_FOLDER, pszDir, NULL))) - { - do - { - if (IsDotDir(wfd.cFileName)) - continue; - PathCombineW(szTemp, pszDir, wfd.cFileName); - if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) - ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); - else - ret = (SHNotifyDeleteFileW(szTemp) == ERROR_SUCCESS); - } while (ret && FindNextFileW(hFind, &wfd)); - } - FindClose(hFind); - if (ret) - ret = (SHNotifyRemoveDirectoryW(pszDir) == ERROR_SUCCESS); - return ret; + return ret == ERROR_PATH_NOT_FOUND ? + 0x7C: /* DE_INVALIDFILES (legacy Windows error) */ + ret; } /************************************************************************** @@ -1331,8 +1331,7 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE static DWORD delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) { const FILE_ENTRY *fileEntry; - DWORD i; - BOOL bPathExists; + DWORD i, ret; BOOL bTrash; if (!flFrom->dwNumFiles) @@ -1378,12 +1377,13 @@ static DWORD delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) /* delete the file or directory */ if (IsAttribFile(fileEntry->attributes)) - bPathExists = DeleteFileW(fileEntry->szFullPath); + ret = DeleteFileW(fileEntry->szFullPath) ? + ERROR_SUCCESS : GetLastError(); else - bPathExists = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); + ret = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); - if (!bPathExists) - return ERROR_PATH_NOT_FOUND; + if (ret) + return ret; } return ERROR_SUCCESS; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index eba5450..3468fcc 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -622,7 +622,6 @@ static void test_delete(void) shfo.pFrom = "nonexistent.txt\0"; shfo.wFunc = FO_DELETE; ret = SHFileOperationA(&shfo); - todo_wine ok(ret == 1026 || ret == ERROR_FILE_NOT_FOUND || /* Vista */ broken(ret == ERROR_SUCCESS), /* NT4 */ @@ -651,7 +650,6 @@ static void test_delete(void) shfo.pFrom = "test1.txt\0nonexistent.txt\0test2.txt\0"; shfo.wFunc = FO_DELETE; ret = SHFileOperationA(&shfo); - todo_wine ok(ret == 1026 || ret == ERROR_FILE_NOT_FOUND || /* Vista */ broken(ret == ERROR_SUCCESS), /* NT4 */ @@ -664,14 +662,12 @@ static void test_delete(void) init_shfo_tests(); shfo.pFrom = "testdir2\\nonexistent.txt\0"; ret = SHFileOperationA(&shfo); - todo_wine ok(ret == ERROR_FILE_NOT_FOUND || /* Vista */ broken(ret == 0x402) || /* XP */ broken(ret == ERROR_SUCCESS), /* NT4 */ "Expected 0x402 or ERROR_FILE_NOT_FOUND, got %x\n", ret); shfo.pFrom = "nonexistent\\one.txt\0"; ret = SHFileOperationA(&shfo); - todo_wine ok(ret == DE_INVALIDFILES || /* Vista or later */ broken(ret == 0x402), /* XP */ "Expected 0x402 or DE_INVALIDFILES, got %x\n", ret);

1 0

Jacek Caban : wininet: Don' t try to read content in response to HEAD request.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: 4e53f0caa08b24bf7747c37f8c09d3e0bf40bd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e53f0caa08b24bf7747c37f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 25 14:41:47 2014 +0200 wininet: Don't try to read content in response to HEAD request. --- dlls/wininet/http.c | 3 ++- dlls/wininet/tests/http.c | 56 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 6c60c3a..b5e6a73 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2881,10 +2881,11 @@ static const data_stream_vtbl_t chunked_stream_vtbl = { static DWORD set_content_length(http_request_t *request) { static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; + static const WCHAR headW[] = {'H','E','A','D',0}; WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || !strcmpW(request->verb, headW)) { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6e30ad4..4e8ea5b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1979,7 +1979,7 @@ static const char *send_buffer; static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; - int r, c, i, on, count = 0; + int r, c = -1, i, on, count = 0; SOCKET s; struct sockaddr_in sa; char buffer[0x100]; @@ -2015,7 +2015,8 @@ static DWORD CALLBACK server_thread(LPVOID param) do { - c = accept(s, NULL, NULL); + if(c == -1) + c = accept(s, NULL, NULL); memset(buffer, 0, sizeof buffer); for(i=0; i<(sizeof buffer-1); i++) @@ -2221,6 +2222,16 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof(notokmsg)-1, 0); } + if (strstr(buffer, "HEAD /test_head")) { + static const char head_response[] = + "HTTP/1.1 200 OK\r\n" + "Connection: Keep-Alive\r\n" + "Content-Length: 100\r\n" + "\r\n"; + + send(c, head_response, sizeof(head_response), 0); + continue; + } if (strstr(buffer, "GET /send_from_buffer")) send(c, send_buffer, strlen(send_buffer), 0); if (strstr(buffer, "/test_cache_control_verb")) @@ -2235,6 +2246,7 @@ static DWORD CALLBACK server_thread(LPVOID param) shutdown(c, 2); closesocket(c); + c = -1; } while (!last_request); closesocket(s); @@ -3635,6 +3647,45 @@ static void test_response_without_headers(int port) InternetCloseHandle(hi); } +static void test_head_request(int port) +{ + DWORD len, content_length; + HINTERNET ses, con, req; + BYTE buf[100]; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, "HEAD", "/test_head", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + + len = sizeof(content_length); + content_length = -1; + ret = HttpQueryInfoA(req, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, &content_length, &len, 0); + ok(ret, "HttpQueryInfo dailed: %u\n", GetLastError()); + ok(len == sizeof(DWORD), "len = %u\n", len); + ok(content_length == 100, "content_length = %u\n", content_length); + + len = -1; + ret = InternetReadFile(req, buf, sizeof(buf), &len); + ok(ret, "InternetReadFile failed: %u\n", GetLastError()); + + len = -1; + ret = InternetReadFile(req, buf, sizeof(buf), &len); + ok(ret, "InternetReadFile failed: %u\n", GetLastError()); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_HttpQueryInfo(int port) { HINTERNET hi, hc, hr; @@ -4048,6 +4099,7 @@ static void test_http_connection(void) test_connection_closing(si.port); test_cache_control_verb(si.port); test_successive_HttpSendRequest(si.port); + test_head_request(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Piotr Caban : kernel32: Fix typo in enum_locale_ex_proc.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: 4eaa85ad560b0f9a921f2e78aa6285c2dcfff92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eaa85ad560b0f9a921f2e78a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 25 14:40:55 2014 +0200 kernel32: Fix typo in enum_locale_ex_proc. --- dlls/kernel32/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index eca0e39..26c00f5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2392,7 +2392,7 @@ static BOOL CALLBACK enum_locale_ex_proc( HMODULE module, LPCWSTR type, neutral = 0; flags = LOCALE_WINDOWS; flags |= neutral ? LOCALE_NEUTRALDATA : LOCALE_SPECIFICDATA; - if (data->flags && ~(data->flags & flags)) return TRUE; + if (data->flags && !(data->flags & flags)) return TRUE; return data->proc( buffer, flags, data->lparam ); }

1 0

Huw Davies : fonts: Add some barb arrow glyphs.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: 258942f28f4a5127789b5a443f20bec476c52141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258942f28f4a5127789b5a443… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 25 16:23:32 2014 +0100 fonts: Add some barb arrow glyphs. --- fonts/wingding.sfd | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/wingding.ttf | Bin 6296 -> 6720 bytes 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index f30ffec..55723b4 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -50,9 +50,9 @@ NameList: Adobe Glyph List DisplaySize: -48 AntiAlias: 1 FitToEm: 1 -WinInfo: 0 33 12 +WinInfo: 0 29 12 TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 256 30 +BeginChars: 256 38 StartChar: f020 Encoding: 0 61472 0 @@ -687,5 +687,106 @@ SplineSet 172 0 l 1,4,-1 EndSplineSet EndChar + +StartChar: barb2left +Encoding: 223 8659 30 +Width: 2006 +VWidth: 0 +LayerCount: 2 +Fore +SplineSet +1830 820 m 25,0,-1 + 550 820 l 25,1,-1 + 1190 1460 l 17,2,-1 + 900 1460 l 1,3,-1 + 170 730 l 1,4,-1 + 900 0 l 1,5,-1 + 1190 0 l 9,6,-1 + 550 640 l 25,7,-1 + 1830 640 l 25,8,-1 + 1830 820 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: barb2right +Encoding: 224 8900 31 +Width: 2006 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 30 8659 N -1 0 0 1 2006 0 2 +EndChar + +StartChar: barb2up +Encoding: 225 9001 32 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 30 8659 N 0 -1 1 0 173 1653 2 +EndChar + +StartChar: barb2down +Encoding: 226 63720 33 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 30 8659 N 0 1 -1 0 1653 -173 2 +EndChar + +StartChar: barb4left +Encoding: 231 63724 34 +Width: 2186 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +SplineSet +2010 940 m 25,0,-1 + 925 940 l 25,1,-1 + 1465 1480 l 17,2,-1 + 915 1480 l 1,3,-1 + 165 730 l 1,4,-1 + 915 0 l 1,5,-1 + 1465 0 l 9,6,-1 + 925 520 l 25,7,-1 + 2010 520 l 25,8,-1 + 2010 940 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: barb4right +Encoding: 232 63725 35 +Width: 2186 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 34 63724 N -1 0 0 1 2186 0 2 +EndChar + +StartChar: barb4up +Encoding: 233 63726 36 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 34 63724 N 0 -1 1 0 173 1653 2 +EndChar + +StartChar: barb4down +Encoding: 234 63727 37 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 34 63724 N 0 1 -1 0 1653 -173 2 +EndChar EndChars EndSplineFont diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf index f867b97..b1e9d58 100644 Binary files a/fonts/wingding.ttf and b/fonts/wingding.ttf differ

1 0

Nikolay Sivov : scrrun: Implement get_VolumeName().
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: a0954a193053cf402ff9d8702d9cd81ac6230397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0954a193053cf402ff9d8702… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 24 06:35:43 2014 +0400 scrrun: Implement get_VolumeName(). --- dlls/scrrun/filesystem.c | 15 +++++++++++++-- dlls/scrrun/tests/filesystem.c | 9 +++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index fc8531c..434b402 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -957,8 +957,19 @@ static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, name); - return E_NOTIMPL; + WCHAR nameW[MAX_PATH+1]; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, name); + + if (!name) + return E_POINTER; + + *name = NULL; + ret = GetVolumeInformationW(This->root, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, NULL, NULL, NULL, 0); + if (ret) + *name = SysAllocString(nameW); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_put_VolumeName(IDrive *iface, BSTR name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ac78483..9410732 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1830,6 +1830,15 @@ static void test_SerialNumber(void) ok(name != NULL, "got %p\n", name); SysFreeString(name); + hr = IDrive_get_VolumeName(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = NULL; + hr = IDrive_get_VolumeName(drive, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name != NULL, "got %p\n", name); + SysFreeString(name); + IDrive_Release(drive); IEnumVARIANT_Release(iter); IDriveCollection_Release(drives);

1 0

Piotr Caban : msvcr100: Add critical_section class stub.
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: 6c35e765c836b1f5f855215bdf7b5d42c4177c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c35e765c836b1f5f855215bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 11:57:37 2014 +0200 msvcr100: Add critical_section class stub. --- dlls/msvcr100/msvcr100.spec | 24 +++++++++---------- dlls/msvcr110/msvcr110.spec | 36 ++++++++++++++-------------- dlls/msvcrt/lock.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c35e765c836b1f5f8552…

1 0

Piotr Caban : msvcr100: Add critical_section::scoped_lock implementation.
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: dab64179236c7c23fc2832d56dc41b8985401595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab64179236c7c23fc2832d56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 11:57:43 2014 +0200 msvcr100: Add critical_section::scoped_lock implementation. --- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcrt/lock.c | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 32fee76..aee50c0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -144,8 +144,8 @@ @ stub -arch=win64 ??0scheduler_resource_allocation_error(a)Concurrency@@QEAA(a)J@Z @ stub -arch=win32 ??0scheduler_resource_allocation_error(a)Concurrency@@QAE(a)PBDJ@Z @ stub -arch=win64 ??0scheduler_resource_allocation_error(a)Concurrency@@QEAA(a)PEBDJ@Z -@ stub -arch=win32 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z -@ stub -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z +@ thiscall -arch=win32 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor +@ cdecl -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor @ stub -arch=win32 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)AAV12@@Z @ stub -arch=win64 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)AEAV12@@Z @ stub -arch=win32 ??0scoped_lock_read(a)reader_writer_lock@Concurrency@@QAE(a)AAV12@@Z @@ -188,8 +188,8 @@ @ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) MSVCRT_exception_dtor @ stub -arch=win32 ??1reader_writer_lock(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1reader_writer_lock(a)Concurrency@@QEAA(a)XZ -@ stub -arch=win32 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ +@ thiscall -arch=win32 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ(ptr) critical_section_scoped_lock_dtor +@ cdecl -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ(ptr) critical_section_scoped_lock_dtor @ stub -arch=win32 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)XZ @ stub -arch=win32 ??1scoped_lock_read(a)reader_writer_lock@Concurrency@@QAE(a)XZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f457285..57d7950 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -248,9 +248,9 @@ @ stub -arch=arm ??0scheduler_worker_creation_error(a)Concurrency@@QAA(a)PBDJ@Z @ stub -arch=i386 ??0scheduler_worker_creation_error(a)Concurrency@@QAE(a)PBDJ@Z @ stub -arch=win64 ??0scheduler_worker_creation_error(a)Concurrency@@QEAA(a)PEBDJ@Z -@ stub -arch=arm ??0scoped_lock(a)critical_section@Concurrency@@QAA(a)AAV12@@Z -@ stub -arch=i386 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z -@ stub -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z +@ cdecl -arch=arm ??0scoped_lock(a)critical_section@Concurrency@@QAA(a)AAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor +@ thiscall -arch=i386 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor +@ cdecl -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor @ stub -arch=arm ??0scoped_lock(a)reader_writer_lock@Concurrency@@QAA(a)AAV12@@Z @ stub -arch=i386 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)AAV12@@Z @ stub -arch=win64 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)AEAV12@@Z @@ -323,9 +323,9 @@ @ stub -arch=arm ??1reader_writer_lock(a)Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1reader_writer_lock(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1reader_writer_lock(a)Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??1scoped_lock(a)critical_section@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??1scoped_lock(a)critical_section@Concurrency@@QAA(a)XZ(ptr) critical_section_scoped_lock_dtor +@ thiscall -arch=i386 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ(ptr) critical_section_scoped_lock_dtor +@ cdecl -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ(ptr) critical_section_scoped_lock_dtor @ stub -arch=arm ??1scoped_lock(a)reader_writer_lock@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index e4ec6ce..09ff1af 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -366,4 +366,31 @@ critical_section* __thiscall critical_section_native_handle(critical_section *th TRACE("(%p)\n", this); return this; } + +typedef struct +{ + critical_section *cs; + void *unknown[3]; +} critical_section_scoped_lock; + +/* ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z */ +/* ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(critical_section_scoped_lock_ctor, 8) +critical_section_scoped_lock* __thiscall critical_section_scoped_lock_ctor( + critical_section_scoped_lock *this, critical_section *cs) +{ + TRACE("(%p %p)\n", this, cs); + this->cs = cs; + critical_section_lock(this->cs); + return this; +} + +/* ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ */ +/* ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(critical_section_scoped_lock_dtor, 4) +void __thiscall critical_section_scoped_lock_dtor(critical_section_scoped_lock *this) +{ + TRACE("(%p)\n", this); + critical_section_unlock(this->cs); +} #endif

1 0

Piotr Caban : msvcr100: Add critical_section class implementation.
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: 7f23c57d09746ee8d14893f982052b08a2c675ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f23c57d09746ee8d14893f98… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 11:57:47 2014 +0200 msvcr100: Add critical_section class implementation. --- dlls/msvcrt/lock.c | 160 +++++++++++++++++++++++++++++++++++++++++---------- dlls/msvcrt/main.c | 4 +- dlls/msvcrt/msvcrt.h | 2 +- 3 files changed, 132 insertions(+), 34 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 09ff1af..94599d1 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -83,30 +83,6 @@ void msvcrt_init_mt_locks(void) } /********************************************************************** - * msvcrt_free_mt_locks (internal) - * - * Uninitialize all mt locks. Assume that neither _lock or _unlock will - * be called once we're calling this routine (ie _LOCKTAB_LOCK can be deleted) - * - */ -void msvcrt_free_mt_locks(void) -{ - int i; - - TRACE( ": uninitializing all mtlocks\n" ); - - /* Uninitialize the table */ - for( i=0; i < _TOTAL_LOCKS; i++ ) - { - if( lock_table[ i ].bInit ) - { - msvcrt_uninitialize_mlock( i ); - } - } -} - - -/********************************************************************** * _lock (MSVCRT.@) */ void CDECL _lock( int locknum ) @@ -309,10 +285,24 @@ MSVCRT_bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +static HANDLE keyed_event; + +typedef struct cs_queue +{ + struct cs_queue *next; +} cs_queue; + typedef struct { - void *unknown[3]; - void *head; + ULONG_PTR unk_thread_id; + cs_queue unk_active; +#if _MSVCR_VER >= 110 + void *unknown[2]; + int unknown2[2]; +#else + void *unknown[1]; +#endif + cs_queue *head; void *tail; } critical_section; @@ -321,7 +311,18 @@ typedef struct DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4) critical_section* __thiscall critical_section_ctor(critical_section *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if(!keyed_event) { + HANDLE event; + + NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); + if(InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) + NtClose(event); + } + + this->unk_thread_id = 0; + this->head = this->tail = NULL; return this; } @@ -330,7 +331,32 @@ critical_section* __thiscall critical_section_ctor(critical_section *this) DEFINE_THISCALL_WRAPPER(critical_section_dtor, 4) void __thiscall critical_section_dtor(critical_section *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); +} + +static void __cdecl spin_wait_yield(void) +{ + Sleep(0); +} + +static inline void spin_wait_for_next_cs(cs_queue *q) +{ + SpinWait sw; + + if(q->next) return; + + SpinWait_ctor(&sw, &spin_wait_yield); + SpinWait__Reset(&sw); + while(!q->next) + SpinWait__SpinOnce(&sw); + SpinWait_dtor(&sw); +} + +static inline void cs_set_head(critical_section *cs, cs_queue *q) +{ + cs->unk_thread_id = GetCurrentThreadId(); + cs->unk_active.next = q->next; + cs->head = &cs->unk_active; } /* ?lock(a)critical_section@Concurrency@@QAEXXZ */ @@ -338,7 +364,26 @@ void __thiscall critical_section_dtor(critical_section *this) DEFINE_THISCALL_WRAPPER(critical_section_lock, 4) void __thiscall critical_section_lock(critical_section *this) { - FIXME("(%p) stub\n", this); + cs_queue q, *last; + + TRACE("(%p)\n", this); + + if(this->unk_thread_id == GetCurrentThreadId()) { + FIXME("throw exception\n"); + return; + } + + q.next = NULL; + last = InterlockedExchangePointer(&this->tail, &q); + if(last) { + last->next = &q; + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } + + this->unk_active.next = NULL; + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) + spin_wait_for_next_cs(&q); + cs_set_head(this, &q); } /* ?try_lock(a)critical_section@Concurrency@@QAE_NXZ */ @@ -346,7 +391,24 @@ void __thiscall critical_section_lock(critical_section *this) DEFINE_THISCALL_WRAPPER(critical_section_try_lock, 4) MSVCRT_bool __thiscall critical_section_try_lock(critical_section *this) { - FIXME("(%p) stub\n", this); + cs_queue q; + + TRACE("(%p)\n", this); + + if(this->unk_thread_id == GetCurrentThreadId()) { + FIXME("throw exception\n"); + return FALSE; + } + + q.next = NULL; + if(!InterlockedCompareExchangePointer(&this->tail, &q, NULL)) { + this->unk_active.next = NULL; + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) + spin_wait_for_next_cs(&q); + + cs_set_head(this, &q); + return TRUE; + } return FALSE; } @@ -355,7 +417,15 @@ MSVCRT_bool __thiscall critical_section_try_lock(critical_section *this) DEFINE_THISCALL_WRAPPER(critical_section_unlock, 4) void __thiscall critical_section_unlock(critical_section *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + this->unk_thread_id = 0; + this->head = NULL; + if(InterlockedCompareExchangePointer(&this->tail, NULL, &this->unk_active) + == &this->unk_active) return; + spin_wait_for_next_cs(&this->unk_active); + + NtReleaseKeyedEvent(keyed_event, this->unk_active.next, 0, NULL); } /* ?native_handle(a)critical_section@Concurrency@@QAEAAV12(a)XZ */ @@ -394,3 +464,31 @@ void __thiscall critical_section_scoped_lock_dtor(critical_section_scoped_lock * critical_section_unlock(this->cs); } #endif + +/********************************************************************** + * msvcrt_free_locks (internal) + * + * Uninitialize all mt locks. Assume that neither _lock or _unlock will + * be called once we're calling this routine (ie _LOCKTAB_LOCK can be deleted) + * + */ +void msvcrt_free_locks(void) +{ + int i; + + TRACE( ": uninitializing all mtlocks\n" ); + + /* Uninitialize the table */ + for( i=0; i < _TOTAL_LOCKS; i++ ) + { + if( lock_table[ i ].bInit ) + { + msvcrt_uninitialize_mlock( i ); + } + } + +#if _MSVCR_VER >= 100 + if(keyed_event) + NtClose(keyed_event); +#endif +} diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 5a3bba7..1deb080 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -106,7 +106,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } msvcrt_init_mt_locks(); if(!msvcrt_init_locale()) { - msvcrt_free_mt_locks(); + msvcrt_free_locks(); msvcrt_free_tls_mem(); msvcrt_destroy_heap(); return FALSE; @@ -130,7 +130,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) msvcrt_free_io(); if (lpvReserved) break; msvcrt_free_popen_data(); - msvcrt_free_mt_locks(); + msvcrt_free_locks(); msvcrt_free_console(); msvcrt_free_args(); msvcrt_free_signals(); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9069b79..22ba0d4 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -261,7 +261,7 @@ typedef void (__cdecl *free_func_t)(void*); /* Setup and teardown multi threaded locks */ extern void msvcrt_init_mt_locks(void) DECLSPEC_HIDDEN; -extern void msvcrt_free_mt_locks(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_locks(void) DECLSPEC_HIDDEN; extern void msvcrt_init_exception(void*) DECLSPEC_HIDDEN; extern BOOL msvcrt_init_locale(void) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcr110: Add critical_section::try_lock_for implementation.
by Alexandre Julliard 24 Jun '14

24 Jun '14

Module: wine Branch: master Commit: 5175037b635d638e16396bee7890e4512031f866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5175037b635d638e16396bee7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 11:57:53 2014 +0200 msvcr110: Add critical_section::try_lock_for implementation. --- dlls/msvcr110/msvcr110.spec | 6 ++-- dlls/msvcrt/lock.c | 72 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 57d7950..4127725 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -794,9 +794,9 @@ @ stub -arch=arm ?try_lock(a)reader_writer_lock@Concurrency@@QAA_NXZ @ stub -arch=i386 ?try_lock(a)reader_writer_lock@Concurrency@@QAE_NXZ @ stub -arch=win64 ?try_lock(a)reader_writer_lock@Concurrency@@QEAA_NXZ -@ stub -arch=arm ?try_lock_for(a)critical_section@Concurrency@@QAA_NI(a)Z -@ stub -arch=i386 ?try_lock_for(a)critical_section@Concurrency@@QAE_NI(a)Z -@ stub -arch=win64 ?try_lock_for(a)critical_section@Concurrency@@QEAA_NI(a)Z +@ cdecl -arch=arm ?try_lock_for(a)critical_section@Concurrency@@QAA_NI(a)Z(ptr long) critical_section_try_lock_for +@ thiscall -arch=i386 ?try_lock_for(a)critical_section@Concurrency@@QAE_NI(a)Z(ptr long) critical_section_try_lock_for +@ cdecl -arch=win64 ?try_lock_for(a)critical_section@Concurrency@@QEAA_NI(a)Z(ptr long) critical_section_try_lock_for @ stub -arch=arm ?try_lock_read(a)reader_writer_lock@Concurrency@@QAA_NXZ @ stub -arch=i386 ?try_lock_read(a)reader_writer_lock@Concurrency@@QAE_NXZ @ stub -arch=win64 ?try_lock_read(a)reader_writer_lock@Concurrency@@QEAA_NXZ diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 94599d1..aee8d2b 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -290,6 +290,10 @@ static HANDLE keyed_event; typedef struct cs_queue { struct cs_queue *next; +#if _MSVCR_VER >= 110 + BOOL free; + int unknown; +#endif } cs_queue; typedef struct @@ -298,7 +302,6 @@ typedef struct cs_queue unk_active; #if _MSVCR_VER >= 110 void *unknown[2]; - int unknown2[2]; #else void *unknown[1]; #endif @@ -373,7 +376,7 @@ void __thiscall critical_section_lock(critical_section *this) return; } - q.next = NULL; + memset(&q, 0, sizeof(q)); last = InterlockedExchangePointer(&this->tail, &q); if(last) { last->next = &q; @@ -400,7 +403,7 @@ MSVCRT_bool __thiscall critical_section_try_lock(critical_section *this) return FALSE; } - q.next = NULL; + memset(&q, 0, sizeof(q)); if(!InterlockedCompareExchangePointer(&this->tail, &q, NULL)) { this->unk_active.next = NULL; if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) @@ -425,6 +428,23 @@ void __thiscall critical_section_unlock(critical_section *this) == &this->unk_active) return; spin_wait_for_next_cs(&this->unk_active); +#if _MSVCR_VER >= 110 + while(1) { + cs_queue *next; + + if(!InterlockedExchange(&this->unk_active.next->free, TRUE)) + break; + + next = this->unk_active.next; + if(InterlockedCompareExchangePointer(&this->tail, NULL, next) == next) + return; + spin_wait_for_next_cs(next); + + this->unk_active.next = next->next; + HeapFree(GetProcessHeap(), 0, next); + } +#endif + NtReleaseKeyedEvent(keyed_event, this->unk_active.next, 0, NULL); } @@ -437,6 +457,52 @@ critical_section* __thiscall critical_section_native_handle(critical_section *th return this; } +#if _MSVCR_VER >= 110 +/* ?try_lock_for(a)critical_section@Concurrency@@QAE_NI(a)Z */ +/* ?try_lock_for(a)critical_section@Concurrency@@QEAA_NI(a)Z */ +DEFINE_THISCALL_WRAPPER(critical_section_try_lock_for, 8) +MSVCRT_bool __thiscall critical_section_try_lock_for( + critical_section *this, unsigned int timeout) +{ + cs_queue *q, *last; + + TRACE("(%p %d)\n", this, timeout); + + if(this->unk_thread_id == GetCurrentThreadId()) { + FIXME("throw exception\n"); + return FALSE; + } + + if(!(q = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*q)))) + return critical_section_try_lock(this); + + last = InterlockedExchangePointer(&this->tail, q); + if(last) { + LARGE_INTEGER to; + NTSTATUS status; + FILETIME ft; + + last->next = q; + GetSystemTimeAsFileTime(&ft); + to.QuadPart = ((LONGLONG)ft.dwHighDateTime<<32) + + ft.dwLowDateTime + (LONGLONG)timeout*10000; + status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); + if(status == STATUS_TIMEOUT) { + if(!InterlockedExchange(&q->free, TRUE)) + return FALSE; + } + } + + this->unk_active.next = NULL; + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, q) != q) + spin_wait_for_next_cs(q); + + cs_set_head(this, q); + HeapFree(GetProcessHeap(), 0, q); + return TRUE; +} +#endif + typedef struct { critical_section *cs;

1 0