September 2012 - Wine-Commits

Jacek Caban : wininet: Set last error for invalid URL argument.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: c4c3ff47e7ad1ae66cde22b0e479cabbaa019e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c3ff47e7ad1ae66cde22b0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 4 17:08:06 2012 +0200 wininet: Set last error for invalid URL argument. --- dlls/wininet/cookie.c | 5 +++- dlls/wininet/tests/internet.c | 45 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 6f9caad..8552548 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -360,7 +360,10 @@ BOOL WINAPI InternetGetCookieW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, host[0] = 0; ret = COOKIE_crackUrlSimple(lpszUrl, host, sizeof(host)/sizeof(host[0]), path, sizeof(path)/sizeof(path[0])); - if (!ret || !host[0]) return FALSE; + if (!ret || !host[0]) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } return get_cookie(host, path, lpCookieData, lpdwSize); } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index f2ea04f..a0b6466 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -40,6 +40,8 @@ static BOOL (WINAPI *pInternetTimeToSystemTimeW)(LPCWSTR ,SYSTEMTIME *,DWORD); static BOOL (WINAPI *pIsDomainLegalCookieDomainW)(LPCWSTR, LPCWSTR); static DWORD (WINAPI *pPrivacyGetZonePreferenceW)(DWORD, DWORD, LPDWORD, LPWSTR, LPDWORD); static DWORD (WINAPI *pPrivacySetZonePreferenceW)(DWORD, DWORD, DWORD, LPCWSTR); +static BOOL (WINAPI *pInternetGetCookieExA)(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD,LPVOID); +static BOOL (WINAPI *pInternetGetCookieExW)(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD,LPVOID); /* ############################### */ @@ -471,6 +473,36 @@ static void test_complicated_cookie(void) ok(strstr(buffer,"O=P")==NULL,"O=P present\n"); } +static void test_cookie_url(void) +{ + WCHAR bufw[512]; + char buf[512]; + DWORD len; + BOOL res; + + static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + + len = sizeof(buf); + res = InternetGetCookieA("about:blank", NULL, buf, &len); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, + "InternetGetCookeA failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + len = sizeof(bufw)/sizeof(*bufw); + res = InternetGetCookieW(about_blankW, NULL, bufw, &len); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, + "InternetGetCookeW failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + len = sizeof(buf); + res = pInternetGetCookieExA("about:blank", NULL, buf, &len, 0, NULL); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, + "InternetGetCookeExA failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + + len = sizeof(bufw)/sizeof(*bufw); + res = pInternetGetCookieExW(about_blankW, NULL, bufw, &len, 0, NULL); + ok(!res && GetLastError() == ERROR_INVALID_PARAMETER, + "InternetGetCookeExW failed: %u, expected ERROR_INVALID_PARAMETER\n", GetLastError()); +} + static void test_null(void) { HINTERNET hi, hc; @@ -1381,11 +1413,6 @@ START_TEST(internet) HMODULE hdll; hdll = GetModuleHandleA("wininet.dll"); - if(!GetProcAddress(hdll, "InternetGetCookieExW")) { - win_skip("Too old IE (older than 6.0)\n"); - return; - } - pCreateUrlCacheContainerA = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerA"); pCreateUrlCacheContainerW = (void*)GetProcAddress(hdll, "CreateUrlCacheContainerW"); pInternetTimeFromSystemTimeA = (void*)GetProcAddress(hdll, "InternetTimeFromSystemTimeA"); @@ -1395,11 +1422,19 @@ START_TEST(internet) pIsDomainLegalCookieDomainW = (void*)GetProcAddress(hdll, (LPCSTR)117); pPrivacyGetZonePreferenceW = (void*)GetProcAddress(hdll, "PrivacyGetZonePreferenceW"); pPrivacySetZonePreferenceW = (void*)GetProcAddress(hdll, "PrivacySetZonePreferenceW"); + pInternetGetCookieExA = (void*)GetProcAddress(hdll, "InternetGetCookieExA"); + pInternetGetCookieExW = (void*)GetProcAddress(hdll, "InternetGetCookieExW"); + + if(!pInternetGetCookieExW) { + win_skip("Too old IE (older than 6.0)\n"); + return; + } test_InternetCanonicalizeUrlA(); test_InternetQueryOptionA(); test_get_cookie(); test_complicated_cookie(); + test_cookie_url(); test_version(); test_null(); test_Option_PerConnectionOption();

1 0

Erich Hoover : hhctrl.ocx: Properly show HTML Help dialogs without Tri-Pane display.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: b6ed7acce1d0692c0510366210762cda9076a6ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ed7acce1d0692c051036621… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Aug 31 15:26:26 2012 -0600 hhctrl.ocx: Properly show HTML Help dialogs without Tri-Pane display. --- dlls/hhctrl.ocx/help.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 93a93a5..514b2a8 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -165,6 +165,11 @@ struct html_encoded_symbol html_encoded_symbols[] = {"yuml", 0xFF} }; +static inline BOOL navigation_visible(HHInfo *info) +{ + return ((info->WinType.fsWinProperties & HHWIN_PROP_TRI_PANE) && !info->WinType.fNotExpanded); +} + /* Loads a string from the resource file */ static LPWSTR HH_LoadString(DWORD dwID) { @@ -427,7 +432,7 @@ static BOOL HH_AddSizeBar(HHInfo *pHHInfo) DWORD dwExStyles = WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; RECT rc; - if (!pHHInfo->WinType.fNotExpanded) + if (navigation_visible(pHHInfo)) dwStyles |= WS_VISIBLE; SB_GetSizeBarRect(pHHInfo, &rc); @@ -1010,8 +1015,7 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) else toolbarFlags = HHWIN_DEF_BUTTONS; - dwStyles = WS_CHILDWINDOW | WS_VISIBLE | TBSTYLE_FLAT | - TBSTYLE_WRAPABLE | TBSTYLE_TOOLTIPS | CCS_NODIVIDER; + dwStyles = WS_CHILDWINDOW | TBSTYLE_FLAT | TBSTYLE_WRAPABLE | TBSTYLE_TOOLTIPS | CCS_NODIVIDER; dwExStyles = WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; hToolbar = CreateWindowExW(dwExStyles, TOOLBARCLASSNAMEW, NULL, dwStyles, @@ -1039,7 +1043,8 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) SendMessageW(hToolbar, TB_ADDBUTTONSW, dwNumButtons, (LPARAM)buttons); SendMessageW(hToolbar, TB_AUTOSIZE, 0, 0); - ShowWindow(hToolbar, SW_SHOW); + if (pHHInfo->WinType.fsWinProperties & HHWIN_PROP_TRI_PANE) + ShowWindow(hToolbar, SW_SHOW); return TRUE; } @@ -1091,7 +1096,7 @@ static BOOL HH_AddNavigationPane(HHInfo *info) DWORD dwExStyles = WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; RECT rc; - if (!info->WinType.fNotExpanded) + if (navigation_visible(info)) dwStyles |= WS_VISIBLE; NP_GetNavigationRect(info, &rc); @@ -1138,20 +1143,22 @@ static void HP_GetHTMLRect(HHInfo *info, RECT *rc) RECT rectTB, rectWND, rectNP, rectSB; GetClientRect(info->WinType.hwndHelp, &rectWND); - GetClientRect(info->WinType.hwndToolBar, &rectTB); GetClientRect(info->hwndSizeBar, &rectSB); - if (info->WinType.fNotExpanded) - rc->left = 0; - else + rc->left = 0; + rc->top = 0; + if (navigation_visible(info)) { GetClientRect(info->WinType.hwndNavigation, &rectNP); - rc->left = rectNP.right + rectSB.right; + rc->left += rectNP.right + rectSB.right; + } + if (info->WinType.fsWinProperties & HHWIN_PROP_TRI_PANE) + { + GetClientRect(info->WinType.hwndToolBar, &rectTB); + rc->top += rectTB.bottom; } - - rc->top = rectTB.bottom; rc->right = rectWND.right - rc->left; - rc->bottom = rectWND.bottom - rectTB.bottom; + rc->bottom = rectWND.bottom - rc->top; } static BOOL HH_AddHTMLPane(HHInfo *pHHInfo) @@ -1535,7 +1542,7 @@ static LRESULT Help_OnSize(HWND hWnd) if (!pHHInfo) return 0; - if (!pHHInfo->WinType.fNotExpanded) + if (navigation_visible(pHHInfo)) { NP_GetNavigationRect(pHHInfo, &rc); SetWindowPos(pHHInfo->WinType.hwndNavigation, HWND_TOP, 0, 0, @@ -1643,7 +1650,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) height = WINTYPE_DEFAULT_HEIGHT; } - if (info->WinType.fNotExpanded) + if (!(info->WinType.fsWinProperties & HHWIN_PROP_TRI_PANE) && info->WinType.fNotExpanded) { if (!(info->WinType.fsValidMembers & HHWIN_PARAM_NAV_WIDTH) && info->WinType.iNavWidth == 0)

1 0

Erich Hoover : hhctrl.ocx: Implement HH_GET_WIN_TYPE.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: af0fa40effda14c124a4cb619f66830cfe2f7773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0fa40effda14c124a4cb619… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Aug 31 15:26:12 2012 -0600 hhctrl.ocx: Implement HH_GET_WIN_TYPE. --- dlls/hhctrl.ocx/help.c | 16 +++++++++++ dlls/hhctrl.ocx/hhctrl.c | 66 +++++++++++++++++++++++++++++++++++++++------ dlls/hhctrl.ocx/hhctrl.h | 29 ++++++++++++++++++++ 3 files changed, 102 insertions(+), 9 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 6671f70..93a93a5 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1757,6 +1757,21 @@ void wintype_stringsW_free(struct wintype_stringsW *stringsW) heap_free(stringsW->pszUrlJump2); } +void wintype_stringsA_free(struct wintype_stringsA *stringsA) +{ + heap_free(stringsA->pszType); + heap_free(stringsA->pszCaption); + heap_free(stringsA->pszToc); + heap_free(stringsA->pszIndex); + heap_free(stringsA->pszFile); + heap_free(stringsA->pszHome); + heap_free(stringsA->pszJump1); + heap_free(stringsA->pszJump2); + heap_free(stringsA->pszUrlJump1); + heap_free(stringsA->pszUrlJump2); + heap_free(stringsA->pszCustomTabs); +} + void ReleaseHelpViewer(HHInfo *info) { TRACE("(%p)\n", info); @@ -1766,6 +1781,7 @@ void ReleaseHelpViewer(HHInfo *info) list_remove(&info->entry); + wintype_stringsA_free(&info->stringsA); wintype_stringsW_free(&info->stringsW); if (info->pCHMInfo) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 4ed9afc..7f11276 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -330,6 +330,29 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat MergeChmProperties(wintype, info); return 0; } + case HH_GET_WIN_TYPE: { + HH_WINTYPEW *wintype = (HH_WINTYPEW *)data; + WCHAR *window = NULL; + HHInfo *info = NULL; + + if (!filename || !resolve_filename(filename, fullname, MAX_PATH, NULL, &window) || !window) + { + WARN("can't find window name: %s\n", debugstr_w(filename)); + return 0; + } + info = find_window(window); + if (!info) + { + WARN("Could not find window named %s.\n", debugstr_w(window)); + heap_free(window); + return (HWND)~0; + } + + TRACE("Retrieving WINTYPE for %s.\n", debugstr_w(window)); + *wintype = info->WinType; + heap_free(window); + return 0; + } default: FIXME("HH case %s not handled.\n", command_to_string( command )); } @@ -337,11 +360,8 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat return 0; } -static HH_WINTYPEW *wintypeAtoW(HH_WINTYPEA *data, struct wintype_stringsW *stringsW) +static void wintypeAtoW(const HH_WINTYPEA *data, HH_WINTYPEW *wdata, struct wintype_stringsW *stringsW) { - HH_WINTYPEW *wdata; - - wdata = heap_alloc(sizeof(*wdata)); memcpy(wdata, data, sizeof(*data)); /* convert all of the ANSI strings to Unicode */ wdata->pszType = stringsW->pszType = strdupAtoW(data->pszType); @@ -355,8 +375,23 @@ static HH_WINTYPEW *wintypeAtoW(HH_WINTYPEA *data, struct wintype_stringsW *stri wdata->pszUrlJump1 = stringsW->pszUrlJump1 = strdupAtoW(data->pszUrlJump1); wdata->pszUrlJump2 = stringsW->pszUrlJump2 = strdupAtoW(data->pszUrlJump2); wdata->pszCustomTabs = stringsW->pszCustomTabs = strdupAtoW(data->pszCustomTabs); +} - return wdata; +static void wintypeWtoA(const HH_WINTYPEW *wdata, HH_WINTYPEA *data, struct wintype_stringsA *stringsA) +{ + memcpy(data, wdata, sizeof(*wdata)); + /* convert all of the Unicode strings to ANSI */ + data->pszType = stringsA->pszType = strdupWtoA(wdata->pszType); + data->pszCaption = stringsA->pszCaption = strdupWtoA(wdata->pszCaption); + data->pszToc = stringsA->pszToc = strdupWtoA(wdata->pszToc); + data->pszIndex = stringsA->pszFile = strdupWtoA(wdata->pszIndex); + data->pszFile = stringsA->pszFile = strdupWtoA(wdata->pszFile); + data->pszHome = stringsA->pszHome = strdupWtoA(wdata->pszHome); + data->pszJump1 = stringsA->pszJump1 = strdupWtoA(wdata->pszJump1); + data->pszJump2 = stringsA->pszJump2 = strdupWtoA(wdata->pszJump2); + data->pszUrlJump1 = stringsA->pszUrlJump1 = strdupWtoA(wdata->pszUrlJump1); + data->pszUrlJump2 = stringsA->pszUrlJump2 = strdupWtoA(wdata->pszUrlJump2); + data->pszCustomTabs = stringsA->pszCustomTabs = strdupWtoA(wdata->pszCustomTabs); } /****************************************************************** @@ -375,7 +410,6 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data case HH_DISPLAY_SEARCH: case HH_DISPLAY_TEXT_POPUP: case HH_GET_LAST_ERROR: - case HH_GET_WIN_TYPE: case HH_KEYWORD_LOOKUP: case HH_SYNC: FIXME("structures not handled yet\n"); @@ -384,10 +418,24 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data case HH_SET_WIN_TYPE: { struct wintype_stringsW stringsW; - HH_WINTYPEW *wdata = wintypeAtoW((HH_WINTYPEA *)data, &stringsW); - result = HtmlHelpW( caller, wfile, command, (DWORD_PTR)wdata ); + HH_WINTYPEW wdata; + + wintypeAtoW((HH_WINTYPEA *)data, &wdata, &stringsW); + result = HtmlHelpW( caller, wfile, command, (DWORD_PTR)&wdata ); wintype_stringsW_free(&stringsW); - heap_free( wdata ); + goto done; + } + case HH_GET_WIN_TYPE: + { + HH_WINTYPEW wdata; + HHInfo *info; + + result = HtmlHelpW( caller, wfile, command, (DWORD_PTR)&wdata ); + if (!wdata.pszType) break; + info = find_window(wdata.pszType); + if (!info) break; + wintype_stringsA_free(&info->stringsA); + wintypeWtoA(&wdata, (HH_WINTYPEA *)data, &info->stringsA); goto done; } diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 900bbb4..7bdf26e 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -154,6 +154,20 @@ struct wintype_stringsW { WCHAR *pszCustomTabs; }; +struct wintype_stringsA { + char *pszType; + char *pszCaption; + char *pszToc; + char *pszIndex; + char *pszFile; + char *pszHome; + char *pszJump1; + char *pszJump2; + char *pszUrlJump1; + char *pszUrlJump2; + char *pszCustomTabs; +}; + typedef struct { IOleClientSite *client_site; IWebBrowser2 *web_browser; @@ -161,6 +175,7 @@ typedef struct { HH_WINTYPEW WinType; + struct wintype_stringsA stringsA; struct wintype_stringsW stringsW; struct list entry; @@ -209,6 +224,7 @@ void InitSearch(HHInfo *info, const char *needle) DECLSPEC_HIDDEN; void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN; LPCWSTR skip_schema(LPCWSTR url) DECLSPEC_HIDDEN; +void wintype_stringsA_free(struct wintype_stringsA *stringsA) DECLSPEC_HIDDEN; void wintype_stringsW_free(struct wintype_stringsW *stringsW) DECLSPEC_HIDDEN; WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page); @@ -282,6 +298,19 @@ static inline LPWSTR strdupAtoW(LPCSTR str) return strdupnAtoW(str, -1); } +static inline LPSTR strdupWtoA(LPCWSTR str) +{ + LPSTR ret; + DWORD len; + + if(!str) + return NULL; + + len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + ret = heap_alloc(len); + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, len, NULL, NULL); + return ret; +} extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN;

1 0

Dmitry Timoshkov : gdiplus: Add support for generic typographic string format.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: b8f42522905272b11328f79457447d6b3185a3b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f42522905272b11328f7945… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 3 17:57:17 2012 +0900 gdiplus: Add support for generic typographic string format. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 89 +++++++++++++++++++++++----------------- dlls/gdiplus/stringformat.c | 4 ++ 3 files changed, 56 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8f42522905272b11328f…

1 0

Piotr Caban : kernel32: Added GetLogicalProcessorInformation implementation .
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: c6ac0d0fcc57b4b955289826e2effb759f74e673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ac0d0fcc57b4b955289826e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 4 13:39:52 2012 +0200 kernel32: Added GetLogicalProcessorInformation implementation. --- dlls/kernel32/process.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1edf9ea..1b10f9e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3717,9 +3717,29 @@ HANDLE WINAPI GetCurrentProcess(void) */ BOOL WINAPI GetLogicalProcessorInformation(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION buffer, PDWORD pBufLen) { - FIXME("(%p,%p): stub\n", buffer, pBufLen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status; + + TRACE("(%p,%p)\n", buffer, pBufLen); + + if(!pBufLen) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + status = NtQuerySystemInformation( SystemLogicalProcessorInformation, buffer, *pBufLen, pBufLen); + + if (status == STATUS_INFO_LENGTH_MISMATCH) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; } /***********************************************************************

1 0

Piotr Caban : ntdll/tests: Added basic NtQuerySystemInformation( SystemLogicalProcessorInformation) tests.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 67920ea6dde99e3dafde7f27147dcd80550608c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67920ea6dde99e3dafde7f271… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 4 13:39:35 2012 +0200 ntdll/tests: Added basic NtQuerySystemInformation(SystemLogicalProcessorInformation) tests. --- dlls/ntdll/tests/info.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 4c23552..3dce90b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -576,6 +576,51 @@ static void test_query_regquota(void) ok( sizeof(srqi) == ReturnLength, "Inconsistent length %d\n", ReturnLength); } +static void test_query_logicalproc(void) +{ + NTSTATUS status; + ULONG len, i, proc_no; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *slpi; + SYSTEM_INFO si; + + GetSystemInfo(&si); + + status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, NULL, 0, &len); + if(status == STATUS_INVALID_INFO_CLASS) + { + win_skip("SystemLogicalProcessorInformation is not supported\n"); + return; + } + if(status == STATUS_NOT_IMPLEMENTED) + { + todo_wine ok(0, "SystemLogicalProcessorInformation is not implemented\n"); + return; + } + ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok(len%sizeof(*slpi) == 0, "Incorrect length %d\n", len); + + slpi = HeapAlloc(GetProcessHeap(), 0, len); + status = pNtQuerySystemInformation(SystemLogicalProcessorInformation, slpi, len, &len); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + + proc_no = 0; + for(i=0; i<len/sizeof(*slpi); i++) { + switch(slpi[i].Relationship) { + case RelationProcessorCore: + /* Get number of logical processors */ + for(; slpi[i].ProcessorMask; slpi[i].ProcessorMask /= 2) + proc_no += slpi[i].ProcessorMask%2; + break; + default: + break; + } + } + ok(proc_no > 0, "No processors were found\n"); + if(si.dwNumberOfProcessors <= 32) + ok(proc_no == si.dwNumberOfProcessors, "Incorrect number of logical processors: %d, expected %d\n", + proc_no, si.dwNumberOfProcessors); +} + static void test_query_process_basic(void) { NTSTATUS status; @@ -1513,6 +1558,10 @@ START_TEST(info) trace("Starting test_query_regquota()\n"); test_query_regquota(); + /* 0x49 SystemLogicalProcessorInformation */ + trace("Starting test_query_logicalproc()\n"); + test_query_logicalproc(); + /* NtQueryInformationProcess */ /* 0x0 ProcessBasicInformation */

1 0

Henri Verbeet : d3d10: Improve a couple of debug messages.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 99d1c9ba82dc612535beb8a18c97b8c6aec7864f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d1c9ba82dc612535beb8a18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 13:52:32 2012 +0200 d3d10: Improve a couple of debug messages. --- dlls/d3d10/effect.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5b82777..6d1337b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1191,20 +1191,20 @@ static BOOL parse_fx10_state_group(const char **ptr, const char *data, if (property_info->container_type != container_type) { - ERR("FAIL1\n"); + ERR("Invalid container type %#x for property %#x.\n", container_type, id); return FALSE; } if (idx >= property_info->count) { - ERR("FAIL2\n"); + ERR("Invalid index %#x for property %#x.\n", idx, id); return FALSE; } if (!read_value_list(data + value_offset, property_info->type, idx, property_info->size, (char *)container + property_info->offset)) { - ERR("FAIL3\n"); + ERR("Failed to read values for property %#x.\n", id); return FALSE; } }

1 0

Nikolay Sivov : oleaut32: Added some VT_DECIMAL rounding tests.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 2bb07936efdabba3e7309d1e25e1a3e06200c272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb07936efdabba3e7309d1e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 3 00:06:49 2012 +0400 oleaut32: Added some VT_DECIMAL rounding tests. --- dlls/oleaut32/tests/vartest.c | 77 +++++++++++++++++++++++++++++----------- 1 files changed, 56 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 1ac09cd..94bbf7e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3240,6 +3240,32 @@ static void test_Round( int line, VARIANT *arg, int deci, VARIANT *expected ) V_VT(&exp) = VT_##rvt; V_##rvt(&exp) = rval; \ test_Round( __LINE__, &v, deci, &exp ) +struct decimal_t { + BYTE scale; + BYTE sign; + ULONG Hi32; + ULONG Mid32; + ULONG Lo32; +}; + +struct decimal_round_t { + struct decimal_t source; + struct decimal_t ret; + int dec; +}; + +static const struct decimal_round_t decimal_round_data[] = { + {{ 0, DECIMAL_NEG, 0, 0, 1 }, { 0, DECIMAL_NEG, 0, 0, 1 }, 0}, + {{ 0, 0, 0, 0, 1 }, { 0, 0, 0, 0, 1 }, 0}, + {{ 2, 0, 0, 0, 155 }, { 0, 0, 0, 0, 16 }, 1}, + {{ 2, 0, 0, 0, 155 }, { 1, 0, 0, 0, 2 }, 0}, + {{ 2, 0, 0, 0, 199 }, { 1, 0, 0, 0, 20 }, 1}, + {{ 2, 0, 0, 0, 199 }, { 2, 0, 0, 0, 199 }, 2}, + {{ 2, DECIMAL_NEG, 0, 0, 199 }, { 2, DECIMAL_NEG, 0, 0, 199 }, 2}, + {{ 2, DECIMAL_NEG, 0, 0, 55 }, { 2, DECIMAL_NEG, 0, 0, 6 }, 1}, + {{ 2, 0, 0, 0, 55 }, { 2, 0, 0, 0, 6 }, 1} +}; + static void test_VarRound(void) { static WCHAR szNumMin[] = {'-','1','.','4','4','9','\0' }; @@ -3248,6 +3274,7 @@ static void test_VarRound(void) VARIANT v, exp, vDst; CY *pcy = &V_CY(&v); char buff[8]; + int i; CHECKPTR(VarRound); @@ -3324,30 +3351,38 @@ static void test_VarRound(void) ok(hres == S_OK && V_VT(&vDst) == VT_NULL, "VarRound: expected 0x0,%d got 0x%X,%d\n", VT_NULL, hres, V_VT(&vDst)); - /* not yet implemented so no use testing yet - todo_wine { - DECIMAL *pdec = &V_DECIMAL(&v); + /* VT_DECIMAL */ + for (i = 0; i < sizeof(decimal_round_data)/sizeof(struct decimal_round_t); i++) + { + const struct decimal_round_t *ptr = &decimal_round_data[i]; + DECIMAL *pdec; + + pdec = &V_DECIMAL(&v); V_VT(&v) = VT_DECIMAL; - S(U(*pdec)).sign = DECIMAL_NEG; - S(U(*pdec)).scale = 0; - pdec->Hi32 = 0; - S1(U1(*pdec)).Mid32 = 0; - S1(U1(*pdec)).Lo32 = 1; - hres = pVarRound(&v,0,&vDst); - ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && - S(U(V_DECIMAL(&vDst))).sign == 0, - "VarRound: expected 0x0,%d,0x00, got 0x%X,%d,%02x\n", VT_DECIMAL, - hres, V_VT(&vDst), S(U(V_DECIMAL(&vDst))).sign); - - S(U(*pdec)).sign = 0; - hres = pVarRound(&v,0,&vDst); - ok(hres == S_OK && V_VT(&vDst) == VT_DECIMAL && - S(U(V_DECIMAL(&vDst))).sign == DECIMAL_NEG, - "VarRound: expected 0x0,%d,0x7f, got 0x%X,%d,%02x\n", VT_DECIMAL, - hres, V_VT(&vDst), S(U(V_DECIMAL(&vDst))).sign); - } - */ + S(U(*pdec)).sign = ptr->source.sign; + S(U(*pdec)).scale = ptr->source.scale; + pdec->Hi32 = ptr->source.Hi32; + S1(U1(*pdec)).Mid32 = ptr->source.Mid32; + S1(U1(*pdec)).Lo32 = ptr->source.Lo32; + VariantInit(&vDst); + hres = pVarRound(&v, ptr->dec, &vDst); + todo_wine + ok(hres == S_OK, "%d: got 0x%08x\n", i, hres); + if (hres == S_OK) + { + ok(V_VT(&vDst) == VT_DECIMAL, "%d: got VT %d, expected VT_DECIMAL\n", i, V_VT(&vDst)); + ok(S(U(V_DECIMAL(&vDst))).sign == ptr->ret.sign, "%d: got sign 0x%02x, expected 0x%02x\n", + i, S(U(V_DECIMAL(&vDst))).sign, ptr->ret.sign); + ok(V_DECIMAL(&vDst).Hi32 == ptr->ret.Hi32, "%d: got Hi32 %d, expected %d\n", + i, V_DECIMAL(&vDst).Hi32, ptr->ret.Hi32); + ok(S(U(V_DECIMAL(&vDst))).Mid32 == ptr->ret.Mid32, "%d: got Mid32 %d, expected %d\n", + i, S(U(V_DECIMAL(&vDst))).Mid32, ptr->ret.Mid32); + ok(S(U(V_DECIMAL(&vDst))).Lo32 == ptr->ret.Lo32, "%d: got Lo32 %d, expected %d\n", + i, S(U(V_DECIMAL(&vDst))).Lo32, ptr->ret.Lo32); + } + } + /* VT_CY */ V_VT(&v) = VT_CY; pcy->int64 = 10000; hres = pVarRound(&v,0,&vDst);

1 0

Chae Jong Bin : fltlib: Add stub for FilterUnload.
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 4c6c8ed04102762a80e13a3fa1540b872ad19987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6c8ed04102762a80e13a3fa… Author: Chae Jong Bin <chae(a)trunk.so> Date: Sun Sep 2 08:40:12 2012 -0400 fltlib: Add stub for FilterUnload. --- dlls/fltlib/fltlib.c | 17 +++++++++++++++-- dlls/fltlib/fltlib.spec | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c index 9975a29..50f46ac 100644 --- a/dlls/fltlib/fltlib.c +++ b/dlls/fltlib/fltlib.c @@ -65,7 +65,7 @@ HRESULT WINAPI FilterConnectCommunicationPort(LPCWSTR lpPortName, DWORD dwOption HRESULT WINAPI FilterFindFirst(DWORD class, LPVOID buffer, DWORD size, LPDWORD bytes_returned, LPHANDLE handle) { - FIXME("%u, %p, %u, %p, %p\n", class, buffer, size, bytes_returned, handle); + FIXME("(%u, %p, %u, %p, %p) stub\n", class, buffer, size, bytes_returned, handle); return HRESULT_FROM_WIN32(ERROR_NO_MORE_ITEMS); } @@ -74,6 +74,19 @@ HRESULT WINAPI FilterFindFirst(DWORD class, LPVOID buffer, DWORD size, LPDWORD b */ HRESULT WINAPI FilterFindClose(HANDLE handle) { - FIXME("%p\n", handle); + FIXME("(%p) stub\n", handle); + return S_OK; +} + +/********************************************************************** + * FilterUnload (FLTLIB.@) + */ +HRESULT WINAPI FilterUnload(LPCWSTR lpFilterName) +{ + FIXME("(%s) stub\n", debugstr_w(lpFilterName)); + + if (!lpFilterName) + return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); + return S_OK; } diff --git a/dlls/fltlib/fltlib.spec b/dlls/fltlib/fltlib.spec index ecf5893..91e803b 100644 --- a/dlls/fltlib/fltlib.spec +++ b/dlls/fltlib/fltlib.spec @@ -19,7 +19,7 @@ @ stub FilterLoad @ stub FilterReplyMessage @ stub FilterSendMessage -@ stub FilterUnload +@ stdcall FilterUnload(wstr) @ stub FilterVolumeClose @ stub FilterVolumeFindClose @ stub FilterVolumeFindFirst

1 0

Piotr Caban : ntdll: Added numa nodes information to SystemLogicalProcessorInformation (linux).
by Alexandre Julliard Sept. 4, 2012

Sept. 4, 2012

Module: wine Branch: master Commit: 59a54b0f8a223f6b1c31706d96894ac698b65831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a54b0f8a223f6b1c31706d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 4 13:38:36 2012 +0200 ntdll: Added numa nodes information to SystemLogicalProcessorInformation (linux). --- dlls/ntdll/nt.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0b18d24..863844a 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1369,12 +1369,26 @@ static inline BOOL logical_proc_info_add_cache(SYSTEM_LOGICAL_PROCESSOR_INFORMAT return TRUE; } +static inline BOOL logical_proc_info_add_numa_node(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, + DWORD *len, DWORD max_len, ULONG_PTR mask, DWORD node_id) +{ + if(*len == max_len) + return FALSE; + + data[*len].Relationship = RelationNumaNode; + data[*len].ProcessorMask = mask; + data[*len].u.NumaNode.NodeNumber = node_id; + (*len)++; + return TRUE; +} + static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, DWORD *max_len) { static const char core_info[] = "/sys/devices/system/cpu/cpu%d/%s"; static const char cache_info[] = "/sys/devices/system/cpu/cpu%d/cache/index%d/%s"; + static const char numa_info[] = "/sys/devices/system/node/node%d/cpumap"; - FILE *fcpu_list, *f; + FILE *fcpu_list, *fnuma_list, *f; DWORD len = 0, beg, end, i, j, r; char op, name[MAX_PATH]; @@ -1523,6 +1537,72 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** } fclose(fcpu_list); + fnuma_list = fopen("/sys/devices/system/node/online", "r"); + if(!fnuma_list) + { + ULONG_PTR mask = 0; + + for(i=0; i<len; i++) + if((*data)[i].Relationship == RelationProcessorCore) + mask |= (*data)[i].ProcessorMask; + + if(len == *max_len) + { + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; + + *max_len *= 2; + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, *data, *max_len*sizeof(*new_data)); + if(!new_data) + return STATUS_NO_MEMORY; + + *data = new_data; + } + logical_proc_info_add_numa_node(*data, &len, *max_len, mask, 0); + } + else + { + while(!feof(fnuma_list)) + { + if(!fscanf(fnuma_list, "%u%c ", &beg, &op)) + break; + if(op == '-') fscanf(fnuma_list, "%u%c ", &end, &op); + else end = beg; + + for(i=beg; i<=end; i++) + { + ULONG_PTR mask = 0; + + sprintf(name, numa_info, i); + f = fopen(name, "r"); + if(!f) continue; + while(!feof(f)) + { + if(!fscanf(f, "%x%c ", &r, &op)) + break; + mask = (sizeof(ULONG_PTR)>sizeof(int) ? mask<<(8*sizeof(DWORD)) : 0) + r; + } + fclose(f); + + if(len == *max_len) + { + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; + + *max_len *= 2; + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, *data, *max_len*sizeof(*new_data)); + if(!new_data) + { + fclose(fnuma_list); + return STATUS_NO_MEMORY; + } + + *data = new_data; + } + logical_proc_info_add_numa_node(*data, &len, *max_len, mask, i); + } + } + fclose(fnuma_list); + } + *max_len = len * sizeof(**data); return STATUS_SUCCESS; }

1 0