wine-commits June 2014

4 participants
378 discussions

Jacek Caban : shdocvw: Added ResetProfileSharing stub.

by Alexandre Julliard

Module: wine Branch: master Commit: bf2d38fbc1224f14674f58485d34eeff70a1b3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2d38fbc1224f14674f58485… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 26 11:35:30 2014 +0200 shdocvw: Added ResetProfileSharing stub. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 1cdeff4..96bc44b 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -46,7 +46,7 @@ 161 stub @ # CSearchAssistantOC::OnDraw 162 stub -noname CDDEAuto_Navigate 163 stub SHAddSubscribeFavorite -164 stub -noname ResetProfileSharing +164 stdcall -noname ResetProfileSharing(long) 165 stub -noname URLSubstitution 167 stub -noname IsIEDefaultBrowser 169 stdcall -noname ParseURLFromOutsideSourceA(str ptr ptr ptr) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5095696..57945b0 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -533,3 +533,12 @@ BOOL WINAPI ImportPrivacySettings(LPCWSTR filename, BOOL *pGlobalPrefs, BOOL * p return TRUE; } + +/****************************************************************** + * ResetProfileSharing (SHDOCVW.164) + */ +HRESULT WINAPI ResetProfileSharing(HWND hwnd) +{ + FIXME("(%p) stub\n", hwnd); + return E_NOTIMPL; +}

9 years, 10 months

Huw Davies : fonts: Add some barb arrow glyphs.

by Alexandre Julliard

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

9 years, 10 months

Piotr Caban : kernel32: Fix typo in enum_locale_ex_proc.

by Alexandre Julliard

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 ); }

9 years, 10 months

Jacek Caban : wininet: Don' t try to read content in response to HEAD request.

by Alexandre Julliard

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");

9 years, 10 months

Zhenbo Li : shell32: Fix SHFileOperation when deleting a nonexistent directory.

by Alexandre Julliard

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);

9 years, 10 months

Bruno Jesus : opengl32/tests: Test glGetString() without an active GL context.

by Alexandre Julliard

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");

9 years, 10 months

Alexandre Julliard : opengl32: Make sure the function table is initialized in all threads.

by Alexandre Julliard

Module: wine Branch: master Commit: b72c8a7680ad2b5bc1963f63fd342f60ab445a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72c8a7680ad2b5bc1963f63f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 11:51:31 2014 +0200 opengl32: Make sure the function table is initialized in all threads. --- dlls/opengl32/wgl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9255e34..3a5e148 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1726,7 +1726,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); NtCurrentTeb()->glTable = &null_opengl_funcs; break; case DLL_THREAD_ATTACH:

9 years, 10 months

Grazvydas Ignotas : msvcrt: Implement bufsiz block flushing behavior.

by Alexandre Julliard

Module: wine Branch: master Commit: ad968be779fff244574eda83d101ab8393513bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad968be779fff244574eda83d… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:53 2014 +0300 msvcrt: Implement bufsiz block flushing behavior. --- dlls/msvcrt/file.c | 12 ++++++++++++ dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5a9edbe..b60e306 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3720,6 +3720,18 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si } written += wrcnt; wrcnt = 0; + } else if(file->_bufsiz && wrcnt >= file->_bufsiz) { + MSVCRT_size_t pcnt=(wrcnt / file->_bufsiz) * file->_bufsiz; + if(msvcrt_flush_buffer(file) == MSVCRT_EOF) + break; + + if(MSVCRT__write(file->_file, ptr, pcnt) <= 0) { + file->_flag |= MSVCRT__IOERR; + break; + } + written += pcnt; + wrcnt -= pcnt; + ptr = (const char*)ptr + pcnt; } else { if(MSVCRT__flsbuf(*(const char*)ptr, file) == MSVCRT_EOF) break; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index eb21697..422e41d 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2243,7 +2243,7 @@ static void test_write_flush_size(FILE *file, int bufsize) fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize) - todo_wine ok(memcmp(outbuffer, inbuffer, bufsize) == 0, "missing flush by %d byte write\n", size); + ok(memcmp(outbuffer, inbuffer, bufsize) == 0, "missing flush by %d byte write\n", size); else ok(memcmp(outbuffer, inbuffer, bufsize) != 0, "unexpected flush by %d byte write\n", size); }

9 years, 10 months

Grazvydas Ignotas : msvcrt: Clear _cnt on buffer flush.

by Alexandre Julliard

Module: wine Branch: master Commit: c6a160691afc0c7123d505c9baf0382b56a4fb45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a160691afc0c7123d505c9b… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:52 2014 +0300 msvcrt: Clear _cnt on buffer flush. --- dlls/msvcrt/file.c | 15 ++++++++------- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c1d9d6e..5a9edbe 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -595,7 +595,7 @@ static int msvcrt_flush_buffer(MSVCRT_FILE* file) return MSVCRT_EOF; } file->_ptr=file->_base; - file->_cnt=file->_bufsiz; + file->_cnt=0; } return 0; } @@ -3659,14 +3659,15 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(file->_bufsiz) { int res = 0; - if(file->_cnt <= 0) + if(file->_cnt <= 0) { res = msvcrt_flush_buffer(file); - if(!res) { - *file->_ptr++ = c; - file->_cnt--; + if(res) + return res; + file->_cnt=file->_bufsiz; } - - return res ? res : c&0xff; + *file->_ptr++ = c; + file->_cnt--; + return c&0xff; } else { unsigned char cc=c; int len; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 97e70f0..eb21697 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2239,7 +2239,7 @@ static void test_write_flush_size(FILE *file, int bufsize) */ lseek(fd, 1, SEEK_SET); fflush(file); - todo_wine ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); + ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize)

9 years, 10 months

Shuai Meng : vbscript: Implemented TypeName.

by Alexandre Julliard

Module: wine Branch: master Commit: 61d49a8a97ba5b18eff931ddfbf412ded583fb19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d49a8a97ba5b18eff931ddf… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Wed Jun 25 10:16:07 2014 +0800 vbscript: Implemented TypeName. --- dlls/vbscript/global.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5160374..5a12729 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1502,8 +1502,52 @@ static HRESULT Global_DatePart(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_TypeName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR ByteW[] = {'B', 'y', 't', 'e', 0}; + static const WCHAR IntegerW[] = {'I', 'n', 't', 'e', 'g', 'e', 'r', 0}; + static const WCHAR LongW[] = {'L', 'o', 'n', 'g', 0}; + static const WCHAR SingleW[] = {'S', 'i', 'n', 'g', 'l', 'e', 0}; + static const WCHAR DoubleW[] = {'D', 'o', 'u', 'b', 'l', 'e', 0}; + static const WCHAR CurrencyW[] = {'C', 'u', 'r', 'r', 'e', 'n', 'c', 'y', 0}; + static const WCHAR DecimalW[] = {'D', 'e', 'c', 'i', 'm', 'a', 'l', 0}; + static const WCHAR DateW[] = {'D', 'a', 't', 'e', 0}; + static const WCHAR StringW[] = {'S', 't', 'r', 'i', 'n', 'g', 0}; + static const WCHAR BooleanW[] = {'B', 'o', 'o', 'l', 'e', 'a', 'n', 0}; + static const WCHAR EmptyW[] = {'E', 'm', 'p', 't', 'y', 0}; + static const WCHAR NullW[] = {'N', 'u', 'l', 'l', 0}; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + switch(V_VT(arg)) { + case VT_UI1: + return return_string(res, ByteW); + case VT_I2: + return return_string(res, IntegerW); + case VT_I4: + return return_string(res, LongW); + case VT_R4: + return return_string(res, SingleW); + case VT_R8: + return return_string(res, DoubleW); + case VT_CY: + return return_string(res, CurrencyW); + case VT_DECIMAL: + return return_string(res, DecimalW); + case VT_DATE: + return return_string(res, DateW); + case VT_BSTR: + return return_string(res, StringW); + case VT_BOOL: + return return_string(res, BooleanW); + case VT_EMPTY: + return return_string(res, EmptyW); + case VT_NULL: + return return_string(res, NullW); + default: + FIXME("arg %s not supported\n", debugstr_variant(arg)); + return E_NOTIMPL; + } } static HRESULT Global_Array(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2cf9bb7..ded9b8b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -845,4 +845,16 @@ MyObject.myval = 0 Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) +Dim MyEmpty +Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) +Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) +Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) +Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) +Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) +Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) +Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) +Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) +Call ok(TypeName(MyEmpty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) +Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) + Call reportSuccess()

9 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2014