September 2012 - Wine-commits

Dmitry Timoshkov : gdiplus: Add support for generic typographic string format.
by Alexandre Julliard 04 Sep '12

04 Sep '12

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

Erich Hoover : hhctrl.ocx: Implement HH_GET_WIN_TYPE.
by Alexandre Julliard 04 Sep '12

04 Sep '12

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

Erich Hoover : hhctrl.ocx: Properly show HTML Help dialogs without Tri-Pane display.
by Alexandre Julliard 04 Sep '12

04 Sep '12

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

Jacek Caban : wininet: Set last error for invalid URL argument.
by Alexandre Julliard 04 Sep '12

04 Sep '12

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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: ed68b6d1203323c93e65778094e47516cf49416f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed68b6d1203323c93e6577809… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 4 23:26:30 2012 +0900 po: Update Japanese translation. --- po/ja.po | 65 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 44 insertions(+), 21 deletions(-) diff --git a/po/ja.po b/po/ja.po index 2e42e51..69b1dd6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-07 00:10+0900\n" +"PO-Revision-Date: 2012-09-04 23:19+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -637,7 +637,7 @@ msgstr "大文字と小文字を区別する(&C)" #: comdlg32.rc:317 joy.rc:68 msgid "Direction" -msgstr "検索する方向" +msgstr "方向" #: comdlg32.rc:318 view.rc:39 msgid "&Up" @@ -3439,6 +3439,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"このアプレットを再起動するまでは、デバイスを無効化または有効化したあとでも、" +"ここにある接続済みジョイスティックの一覧は更新されません。" #: joy.rc:47 msgid "Test Joystick" @@ -3446,23 +3448,23 @@ msgstr "ジョイスティックのテスト" #: joy.rc:51 msgid "Buttons" -msgstr "" +msgstr "ボタン" #: joy.rc:60 msgid "Test Force Feedback" msgstr "フォースフィードバックのテスト" #: joy.rc:64 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "利用できる形式" +msgstr "利用可能な効果" #: joy.rc:66 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"選択した効果を有効化するにはコントローラのボタンを押してください。効果の方向" +"はコントローラの軸で変更できます。" #: joy.rc:28 msgid "Game Controllers" @@ -9661,6 +9663,33 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"プログラムを開始したり、拡張子に基づき通常使われるプログラムで文書を開きま" +"す。\n" +"使い方:\n" +"start [オプション] プログラムファイル名 [...]\n" +"start [オプション] 文書ファイル名\n" +"\n" +"オプション:\n" +"\"タイトル\" 子ウィンドウのタイトルを指定します。\n" +"/d directory プログラムを指定したディレクトリで開始します。 \n" +"/b プログラムで新しいコンソールを作成しません。\n" +"/i 初期の環境変数でプログラムを開始します。\n" +"/min 最小化状態でプログラムを開始します。\n" +"/max 最大化状態でプログラムを開始します。\n" +"/low 優先度クラス'低'でプログラムを開始します。\n" +"/normal 優先度クラス'通常'でプログラムを開始します。\n" +"/high 優先度クラス'高'でプログラムを開始します。\n" +"/realtime 優先度クラス'リアルタイム'でプログラムを開始します。\n" +"/abovenormal 優先度クラス'通常以上'でプログラムを開始します。\n" +"/belownormal 優先度クラス'通常以下'でプログラムを開始します。\n" +"/node n 指定した NUMA ノードでプログラムを開始します。\n" +"/affinity mask 指定した関連マスクでプログラムを開始します。\n" +"/wait 開始プログラムの完了を待ち、そのプログラムの終了コードで終了しま" +"す。\n" +"/unix Unix ファイル名を使い、windows エクスプローラのようにファイルを" +"開始します。\n" +"/ProgIDOpen 文書を指定した progID を用いて開きます。\n" +"/? このヘルプを表示し、終了します。\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n" @@ -12138,27 +12167,27 @@ msgstr "プロセスを実行するプロセッサを制御します" #: taskmgr.rc:237 msgid "Sets process to the REALTIME priority class" -msgstr "プロセスの優先クラスをリアルタイムに設定します" +msgstr "プロセスの優先度クラスをリアルタイムに設定します" #: taskmgr.rc:238 msgid "Sets process to the HIGH priority class" -msgstr "プロセスの優先クラスを高に設定します" +msgstr "プロセスの優先度クラスを高に設定します" #: taskmgr.rc:240 msgid "Sets process to the ABOVE NORMAL priority class" -msgstr "プロセスの優先クラスを通常以上に設定します" +msgstr "プロセスの優先度クラスを通常以上に設定します" #: taskmgr.rc:242 msgid "Sets process to the NORMAL priority class" -msgstr "プロセスの優先クラスを通常に設定します" +msgstr "プロセスの優先度クラスを通常に設定します" #: taskmgr.rc:244 msgid "Sets process to the BELOW NORMAL priority class" -msgstr "プロセスの優先クラスを通常以下に設定します" +msgstr "プロセスの優先度クラスを通常以下に設定します" #: taskmgr.rc:245 msgid "Sets process to the LOW priority class" -msgstr "プロセスの優先クラスを低に設定します" +msgstr "プロセスの優先度クラスを低に設定します" #: taskmgr.rc:247 msgid "Controls Debug Channels" @@ -13633,22 +13662,16 @@ msgid "Help topics: " msgstr "ヘルプトピック: " #: wmic.rc:25 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "Error: Command line not supported\n" -msgstr "エラー: コマンドライン引数が無効です\n" +msgstr "エラー: コマンドラインはサポートされていません\n" #: wmic.rc:26 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Error: Alias not found\n" -msgstr "プロパティセットが見つかりません。\n" +msgstr "別名が見つかりません。\n" #: wmic.rc:27 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "Error: Invalid query\n" -msgstr "エラー: キー名が無効です\n" +msgstr "エラー: クエリが無効です\n" #: wordpad.rc:28 msgid "&New...\tCtrl+N"

1 0

Piotr Caban : ntdll: Added partial support for SystemLogicalProcessorInformation information class in NtQuerySystemInformation (linux).
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: faccf6ad10262beb195b1ecc60be8b97ed5fbf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faccf6ad10262beb195b1ecc6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 4 13:37:59 2012 +0200 ntdll: Added partial support for SystemLogicalProcessorInformation information class in NtQuerySystemInformation (linux). --- dlls/ntdll/nt.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 146 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 7b161e5..3f0f6d1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1320,6 +1320,122 @@ void fill_cpu_info(void) cached_sci.Architecture, cached_sci.Level, cached_sci.Revision, cached_sci.FeatureSet); } +#ifdef linux +static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, + DWORD *len, DWORD max_len, LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, DWORD proc) +{ + int i; + + for(i=0; i<*len; i++) + { + if(data[i].Relationship!=rel || data[i].u.Reserved[1]!=id) + continue; + + data[i].ProcessorMask |= (ULONG_PTR)1<<proc; + return TRUE; + } + + if(*len == max_len) + return FALSE; + + data[i].Relationship = rel; + data[i].ProcessorMask = (ULONG_PTR)1<<proc; + /* TODO: set processor core flags */ + data[i].u.Reserved[0] = 0; + data[i].u.Reserved[1] = id; + *len = i+1; + 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"; + + FILE *fcpu_list, *f; + DWORD len = 0, beg, end, i, r; + char op, name[MAX_PATH]; + + fcpu_list = fopen("/sys/devices/system/cpu/online", "r"); + if(!fcpu_list) + return STATUS_NOT_IMPLEMENTED; + + while(!feof(fcpu_list)) + { + if(!fscanf(fcpu_list, "%u%c ", &beg, &op)) + break; + if(op == '-') fscanf(fcpu_list, "%u%c ", &end, &op); + else end = beg; + + for(i=beg; i<=end; i++) + { + if(i > 8*sizeof(ULONG_PTR)) + { + FIXME("skipping logical processor %d\n", i); + continue; + } + + sprintf(name, core_info, i, "core_id"); + f = fopen(name, "r"); + if(f) + { + fscanf(f, "%u", &r); + fclose(f); + } + else r = i; + if(!logical_proc_info_add_by_id(*data, &len, *max_len, RelationProcessorCore, r, i)) + { + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; + + *max_len *= 2; + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, *data, *max_len*sizeof(*new_data)); + if(!new_data) + { + fclose(fcpu_list); + return STATUS_NO_MEMORY; + } + + *data = new_data; + logical_proc_info_add_by_id(*data, &len, *max_len, RelationProcessorCore, r, i); + } + + sprintf(name, core_info, i, "physical_package_id"); + f = fopen(name, "r"); + if(f) + { + fscanf(f, "%u", &r); + fclose(f); + } + else r = 0; + if(!logical_proc_info_add_by_id(*data, &len, *max_len, RelationProcessorPackage, r, i)) + { + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; + + *max_len *= 2; + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, *data, *max_len*sizeof(*new_data)); + if(!new_data) + { + fclose(fcpu_list); + return STATUS_NO_MEMORY; + } + + *data = new_data; + logical_proc_info_add_by_id(*data, &len, *max_len, RelationProcessorPackage, r, i); + } + } + } + fclose(fcpu_list); + + *max_len = len * sizeof(**data); + return STATUS_SUCCESS; +} +#else +static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, DWORD *max_len) +{ + FIXME("stub\n"); + return STATUS_NOT_IMPLEMENTED; +} +#endif + /****************************************************************************** * NtQuerySystemInformation [NTDLL.@] * ZwQuerySystemInformation [NTDLL.@] @@ -1754,6 +1870,36 @@ NTSTATUS WINAPI NtQuerySystemInformation( else ret = STATUS_INFO_LENGTH_MISMATCH; } break; + case SystemLogicalProcessorInformation: + { + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *buf; + + /* Each logical processor may use up to 7 entries in returned table: + * core, numa node, package, L1i, L1d, L2, L3 */ + len = 7 * NtCurrentTeb()->Peb->NumberOfProcessors; + buf = RtlAllocateHeap(GetProcessHeap(), 0, len * sizeof(*buf)); + if(!buf) + { + ret = STATUS_NO_MEMORY; + break; + } + + ret = create_logical_proc_info(&buf, &len); + if( ret != STATUS_SUCCESS ) + { + RtlFreeHeap(GetProcessHeap(), 0, buf); + break; + } + + if( Length >= len) + { + if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; + else memcpy( SystemInformation, buf, len); + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + RtlFreeHeap(GetProcessHeap(), 0, buf); + } + break; default: FIXME("(0x%08x,%p,0x%08x,%p) stub\n", SystemInformationClass,SystemInformation,Length,ResultLength);

1 0

Piotr Caban : ntdll: Added processor cache information to SystemLogicalProcessorInformation ( linux).
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: a3d0a19624c2a843b910a87b72123df0e65fdeb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d0a19624c2a843b910a87b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 4 13:38:17 2012 +0200 ntdll: Added processor cache information to SystemLogicalProcessorInformation (linux). --- dlls/ntdll/nt.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3f0f6d1..0b18d24 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1347,12 +1347,35 @@ static inline BOOL logical_proc_info_add_by_id(SYSTEM_LOGICAL_PROCESSOR_INFORMAT return TRUE; } +static inline BOOL logical_proc_info_add_cache(SYSTEM_LOGICAL_PROCESSOR_INFORMATION *data, + DWORD *len, DWORD max_len, ULONG_PTR mask, CACHE_DESCRIPTOR *cache) +{ + int i; + + for(i=0; i<*len; i++) + { + if(data[i].Relationship==RelationCache && data[i].ProcessorMask==mask + && data[i].u.Cache.Level==cache->Level && data[i].u.Cache.Type==cache->Type) + return TRUE; + } + + if(*len == max_len) + return FALSE; + + data[i].Relationship = RelationCache; + data[i].ProcessorMask = mask; + data[i].u.Cache = *cache; + *len = i+1; + 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"; FILE *fcpu_list, *f; - DWORD len = 0, beg, end, i, r; + DWORD len = 0, beg, end, i, j, r; char op, name[MAX_PATH]; fcpu_list = fopen("/sys/devices/system/cpu/online", "r"); @@ -1421,6 +1444,81 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** *data = new_data; logical_proc_info_add_by_id(*data, &len, *max_len, RelationProcessorPackage, r, i); } + + for(j=0; j<4; j++) + { + CACHE_DESCRIPTOR cache; + ULONG_PTR mask = 0; + + sprintf(name, cache_info, i, j, "shared_cpu_map"); + 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); + + sprintf(name, cache_info, i, j, "level"); + f = fopen(name, "r"); + if(!f) continue; + fscanf(f, "%u", &r); + fclose(f); + cache.Level = r; + + sprintf(name, cache_info, i, j, "ways_of_associativity"); + f = fopen(name, "r"); + if(!f) continue; + fscanf(f, "%u", &r); + fclose(f); + cache.Associativity = r; + + sprintf(name, cache_info, i, j, "coherency_line_size"); + f = fopen(name, "r"); + if(!f) continue; + fscanf(f, "%u", &r); + fclose(f); + cache.LineSize = r; + + sprintf(name, cache_info, i, j, "size"); + f = fopen(name, "r"); + if(!f) continue; + fscanf(f, "%u%c", &r, &op); + fclose(f); + if(op != 'K') + WARN("unknown cache size %u%c\n", r, op); + cache.Size = (op=='K' ? r*1024 : r); + + sprintf(name, cache_info, i, j, "type"); + f = fopen(name, "r"); + if(!f) continue; + fscanf(f, "%s", name); + fclose(f); + if(!memcmp(name, "Data", 5)) + cache.Type = CacheData; + else if(!memcmp(name, "Instruction", 11)) + cache.Type = CacheInstruction; + else + cache.Type = CacheUnified; + + if(!logical_proc_info_add_cache(*data, &len, *max_len, mask, &cache)) + { + SYSTEM_LOGICAL_PROCESSOR_INFORMATION *new_data; + + *max_len *= 2; + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, *data, *max_len*sizeof(*new_data)); + if(!new_data) + { + fclose(fcpu_list); + return STATUS_NO_MEMORY; + } + + *data = new_data; + logical_proc_info_add_cache(*data, &len, *max_len, mask, &cache); + } + } } } fclose(fcpu_list);

1 0

Piotr Caban : ntdll: Added numa nodes information to SystemLogicalProcessorInformation (linux).
by Alexandre Julliard 04 Sep '12

04 Sep '12

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

Henri Verbeet : wined3d: Get rid of wined3d_device_get_wined3d().
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 66ec8a5cfb392e28d0feb5a9a42337eac1676117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ec8a5cfb392e28d0feb5a9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 13:52:30 2012 +0200 wined3d: Get rid of wined3d_device_get_wined3d(). --- dlls/wined3d/device.c | 12 ------------ dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 3 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0826957..ba8c4be 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1567,18 +1567,6 @@ void CDECL wined3d_device_set_multithreaded(struct wined3d_device *device) device->create_parms.flags |= WINED3DCREATE_MULTITHREADED; } -HRESULT CDECL wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d) -{ - TRACE("device %p, wined3d %p.\n", device, wined3d); - - *wined3d = device->wined3d; - wined3d_incref(*wined3d); - - TRACE("Returning %p.\n", *wined3d); - - return WINED3D_OK; -} - UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device *device) { TRACE("device %p.\n", device); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index eed1174..6555ae8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -94,7 +94,6 @@ @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) -@ cdecl wined3d_device_get_wined3d(ptr ptr) @ cdecl wined3d_device_incref(ptr) @ cdecl wined3d_device_init_3d(ptr ptr) @ cdecl wined3d_device_init_gdi(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4a11ff2..941bd8e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2176,7 +2176,6 @@ HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *devi UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); -HRESULT __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc);

1 0

Henri Verbeet : d3d10: Handle D3D10_SVT_UINT in read_int32_value() and read_int8_value().
by Alexandre Julliard 04 Sep '12

04 Sep '12

Module: wine Branch: master Commit: 0f372135bb9de3e96c92343f52257bb204765f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f372135bb9de3e96c92343f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 4 13:52:31 2012 +0200 d3d10: Handle D3D10_SVT_UINT in read_int32_value() and read_int8_value(). --- dlls/d3d10/effect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7d07cc3..5b82777 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1084,6 +1084,7 @@ static BOOL read_int32_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT return TRUE; case D3D10_SVT_INT: + case D3D10_SVT_UINT: case D3D10_SVT_BOOL: out_data[idx] = value; return TRUE; @@ -1099,6 +1100,7 @@ static BOOL read_int8_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT8 switch (in_type) { case D3D10_SVT_INT: + case D3D10_SVT_UINT: out_data[idx] = value; return TRUE;

1 0