January 2012 - Wine-Commits

Francois Gouget : po: Fix some typography issues in the Japanese translation.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 80119af8f9c9e33a92ce3a8f9ebf33309a13f08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80119af8f9c9e33a92ce3a8f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 25 02:18:19 2012 +0100 po: Fix some typography issues in the Japanese translation. --- po/ja.po | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/po/ja.po b/po/ja.po index 92ce031..413f872 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2722,8 +2722,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"この認証局によって発行された証明書は信頼されなくなります。この証明書を削除し" -"ますか?" +"この認証局によって発行された証明書は信頼されなくなります。\n" +"この証明書を削除しますか?" #: cryptui.rc:112 msgid "" @@ -2731,8 +2731,8 @@ msgid "" "trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"これらの認証局によって発行された証明書は信頼されなくなります。これらの証明書" -"を削除しますか?" +"これらの認証局によって発行された証明書は信頼されなくなります。\n" +"これらの証明書を削除しますか?" #: cryptui.rc:113 msgid "" @@ -2758,16 +2758,16 @@ msgid "" "Software signed by this publisher will no longer be trusted.\n" "Are you sure you want to remove this certificate?" msgstr "" -"この発行元により署名されたソフトウェアは信頼されなくなります。この証明書を削" -"除しますか?" +"この発行元により署名されたソフトウェアは信頼されなくなります。\n" +"この証明書を削除しますか?" #: cryptui.rc:116 msgid "" "Software signed by these publishers will no longer be trusted.\n" "Are you sure you want to remove these certificates?" msgstr "" -"これらの発行元により署名されたソフトウェアは信頼されなくなります。これらの証" -"明書を削除しますか?" +"これらの発行元により署名されたソフトウェアは信頼されなくなります。\n" +"これらの証明書を削除しますか?" #: cryptui.rc:117 msgid "Are you sure you want to remove this certificate?" @@ -9285,7 +9285,7 @@ msgstr "CHDIR <ディレクトリ> は現在のデフォルトディレクト #: cmd.rc:43 msgid "CLS clears the console screen.\n" -msgstr "CLSはコンソール画面をクリアします\n" +msgstr "CLSはコンソール画面をクリアします。\n" #: cmd.rc:45 msgid "COPY <filename> copies a file.\n" @@ -10004,7 +10004,7 @@ msgstr "使い方: hostname\n" #: hostname.rc:28 msgid "Error: Invalid option '%c'.\n" -msgstr "エラー: 無効なオプション '%c'\n" +msgstr "エラー: 無効なオプション '%c'。\n" #: hostname.rc:29 msgid "" @@ -10089,7 +10089,7 @@ msgstr "" " -または-\n" "NET コマンド /HELP\n" "\n" -"コマンドは、HELP、START、STOP、USE のいずれかです\n" +"コマンドは、HELP、START、STOP、USE のいずれかです。\n" #: net.rc:28 msgid "" @@ -10298,7 +10298,7 @@ msgstr "フッタ(&F):" #: notepad.rc:104 msgid "Margins (millimeters)" -msgstr "マージン(mm):" +msgstr "マージン(mm)" #: notepad.rc:105 msgid "&Left:" @@ -10396,10 +10396,9 @@ msgid "" "\n" "Do you want to create a new file?" msgstr "" -"ファイル '%s'\n" -"は存在しません\n" +"ファイル '%s' は存在しません\n" "\n" -" 新しいファイルを作成しますか ?" +"新しいファイルを作成しますか?" #: notepad.rc:79 msgid "" @@ -10407,14 +10406,13 @@ msgid "" "\n" "Would you like to save the changes?" msgstr "" -"ファイル '%s'\n" -"は変更されています\n" +"ファイル '%s' は変更されています\n" "\n" -" 変更を保存しますか ?" +"変更を保存しますか?" #: notepad.rc:80 msgid "'%s' could not be found." -msgstr "'%s' は見つかりませんでした" +msgstr "'%s' は見つかりませんでした。" #: notepad.rc:82 msgid "Unicode (UTF-16)" @@ -10900,11 +10898,11 @@ msgstr "コマンドライン(&C):" #: progman.rc:171 msgid "&Working directory:" -msgstr "作業ディレクトリ(&W)" +msgstr "作業ディレクトリ(&W):" #: progman.rc:173 msgid "&Key combination:" -msgstr "キーの組み合わせ(&K)" +msgstr "キーの組み合わせ(&K):" #: progman.rc:176 progman.rc:212 msgid "&Minimize at launch"

1 0

Henri Verbeet : wined3d: Only take the wined3d mutex during the WM_DISPLAYCHANGE handler in device_process_message ().
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: d0347f51ed1304e61b856fd768ec404bd8dde709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0347f51ed1304e61b856fd76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 21:47:45 2012 +0100 wined3d: Only take the wined3d mutex during the WM_DISPLAYCHANGE handler in device_process_message(). We can deadlock if we send messages while holding the wined3d mutex and the message loop is on another thread. Ideally we probably shouldn't send messages while holding the wined3d mutex at all, but that may be hard to enforce with the way wined3d locking is currently set up. --- dlls/wined3d/device.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 348ee08..e5f3506 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1198,7 +1198,7 @@ HRESULT CDECL wined3d_device_acquire_focus_window(struct wined3d_device *device, return E_FAIL; } - device->focus_window = window; + InterlockedExchangePointer((void **)&device->focus_window, window); SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); return WINED3D_OK; @@ -1209,7 +1209,7 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) TRACE("device %p.\n", device); if (device->focus_window) wined3d_unregister_window(device->focus_window); - device->focus_window = NULL; + InterlockedExchangePointer((void **)&device->focus_window, NULL); } HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, @@ -5890,12 +5890,8 @@ void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *w LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { - wined3d_mutex_lock(); - if (device->filter_messages) { - wined3d_mutex_unlock(); - TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", window, message, wparam, lparam); if (unicode) @@ -5909,16 +5905,16 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL TRACE("unregister window %p.\n", window); wined3d_unregister_window(window); - if (device->focus_window == window) device->focus_window = NULL; - else ERR("Window %p is not the focus window for device %p.\n", window, device); + if (InterlockedCompareExchangePointer((void **)&device->focus_window, NULL, window) != window) + ERR("Window %p is not the focus window for device %p.\n", window, device); } else if (message == WM_DISPLAYCHANGE) { + wined3d_mutex_lock(); device->device_parent->ops->mode_changed(device->device_parent); + wined3d_mutex_unlock(); } - wined3d_mutex_unlock(); - if (unicode) return CallWindowProcW(proc, window, message, wparam, lparam); else

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 25, 2012

Jan. 25, 2012

Module: wine Branch: master Commit: 69581c370a3cbabb7c30a849e51c1a346be6ac18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69581c370a3cbabb7c30a849e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jan 24 09:32:13 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 181 ++++++++++++++++++++++--------------------------------------- 1 files changed, 65 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69581c370a3cbabb7c30a…

1 0

Aric Stewart : winegstreamer: Set bmiHeader. biSizeImage in the transform filter.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 9526499b88b9fbc051b1f9415997460f06f1ad79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9526499b88b9fbc051b1f9415… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 24 08:15:52 2012 -0600 winegstreamer: Set bmiHeader.biSizeImage in the transform filter. --- dlls/winegstreamer/gsttffilter.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 1286cd8..8230943 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -627,7 +627,7 @@ static HRESULT WINAPI Gstreamer_YUV_SetMediaType(TransformFilter *tf, PIN_DIRECT AM_MEDIA_TYPE *outpmt = &This->tf.pmt; HRESULT hr; int avgtime; - DWORD width, height; + LONG width, height; if (dir != PINDIR_INPUT) return S_OK; @@ -643,19 +643,21 @@ static HRESULT WINAPI Gstreamer_YUV_SetMediaType(TransformFilter *tf, PIN_DIRECT avgtime = vih->AvgTimePerFrame; width = vih->bmiHeader.biWidth; height = vih->bmiHeader.biHeight; - if ((LONG)vih->bmiHeader.biHeight > 0) + if (vih->bmiHeader.biHeight > 0) vih->bmiHeader.biHeight = -vih->bmiHeader.biHeight; vih->bmiHeader.biBitCount = 24; vih->bmiHeader.biCompression = BI_RGB; + vih->bmiHeader.biSizeImage = width * abs(height) * 3; } else { VIDEOINFOHEADER2 *vih = (VIDEOINFOHEADER2*)outpmt->pbFormat; avgtime = vih->AvgTimePerFrame; width = vih->bmiHeader.biWidth; height = vih->bmiHeader.biHeight; - if ((LONG)vih->bmiHeader.biHeight > 0) + if (vih->bmiHeader.biHeight > 0) vih->bmiHeader.biHeight = -vih->bmiHeader.biHeight; vih->bmiHeader.biBitCount = 24; vih->bmiHeader.biCompression = BI_RGB; + vih->bmiHeader.biSizeImage = width * abs(height) * 3; } if (!avgtime) avgtime = 10000000 / 30;

1 0

Jacek Caban : wininet: Correctly detect https connections and custom port numbers in HTTP_HandleRedirect .
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: ac26517ac96f9e6fc725bc52724ed814c0bd9de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac26517ac96f9e6fc725bc527… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 24 17:31:17 2012 +0100 wininet: Correctly detect https connections and custom port numbers in HTTP_HandleRedirect. --- dlls/wininet/http.c | 67 +++++++++++++++++++------------------------------- 1 files changed, 26 insertions(+), 41 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3439924..24e55b3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3788,8 +3788,10 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH]; WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH]; WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH]; - static WCHAR szHttp[] = {'h','t','t','p',0}; - static WCHAR szHttps[] = {'h','t','t','p','s',0}; + BOOL custom_port = FALSE; + + static WCHAR httpW[] = {'h','t','t','p',0}; + static WCHAR httpsW[] = {'h','t','t','p','s',0}; userName[0] = 0; hostName[0] = 0; @@ -3811,50 +3813,33 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) return INTERNET_GetLastError(); - if (!strncmpW(szHttp, urlComponents.lpszScheme, strlenW(szHttp)) && - (request->hdr.dwFlags & INTERNET_FLAG_SECURE)) - { - TRACE("redirect from secure page to non-secure page\n"); - /* FIXME: warn about from secure redirect to non-secure page */ - request->hdr.dwFlags &= ~INTERNET_FLAG_SECURE; - } - if (!strncmpW(szHttps, urlComponents.lpszScheme, strlenW(szHttps)) && - !(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) - { - TRACE("redirect from non-secure page to secure page\n"); - /* FIXME: notify about redirect to secure page */ - request->hdr.dwFlags |= INTERNET_FLAG_SECURE; - } + if(!strcmpiW(protocol, httpW)) { + if(request->hdr.dwFlags & INTERNET_FLAG_SECURE) { + TRACE("redirect from secure page to non-secure page\n"); + /* FIXME: warn about from secure redirect to non-secure page */ + request->hdr.dwFlags &= ~INTERNET_FLAG_SECURE; + } - if (urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) - { - if (lstrlenW(protocol)>4) /*https*/ - urlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; - else /*http*/ + if(urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) urlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT; - } + else if(urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT) + custom_port = TRUE; + }else if(!strcmpiW(protocol, httpsW)) { + if(!(request->hdr.dwFlags & INTERNET_FLAG_SECURE)) { + TRACE("redirect from non-secure page to secure page\n"); + /* FIXME: notify about redirect to secure page */ + request->hdr.dwFlags |= INTERNET_FLAG_SECURE; + } -#if 0 - /* - * This upsets redirects to binary files on sourceforge.net - * and gives an html page instead of the target file - * Examination of the HTTP request sent by native wininet.dll - * reveals that it doesn't send a referrer in that case. - * Maybe there's a flag that enables this, or maybe a referrer - * shouldn't be added in case of a redirect. - */ + if(urlComponents.nPort == INTERNET_INVALID_PORT_NUMBER) + urlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT; + else if(urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) + custom_port = TRUE; + } - /* consider the current host as the referrer */ - if (session->lpszServerName && *session->lpszServerName) - HTTP_ProcessHeader(request, HTTP_REFERER, session->lpszServerName, - HTTP_ADDHDR_FLAG_REQ|HTTP_ADDREQ_FLAG_REPLACE| - HTTP_ADDHDR_FLAG_ADD_IF_NEW); -#endif - heap_free(session->hostName); - if (urlComponents.nPort != INTERNET_DEFAULT_HTTP_PORT && - urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) - { + + if(custom_port) { int len; static const WCHAR fmt[] = {'%','s',':','%','u',0}; len = lstrlenW(hostName);

1 0

Jacek Caban : wininet: Insert custom headers only once in HTTP_HttpSendRequestW.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: dfa9f4bc26d78bb27f411cda3a176783726de907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa9f4bc26d78bb27f411cda3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 24 17:31:38 2012 +0100 wininet: Insert custom headers only once in HTTP_HttpSendRequestW. --- dlls/wininet/http.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 24e55b3..3c5ed9c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4707,6 +4707,10 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, HTTP_HttpAddRequestHeadersW(request, cache_control, strlenW(cache_control), HTTP_ADDREQ_FLAG_ADD_IF_NEW); } + /* add the headers the caller supplied */ + if( lpszHeaders && dwHeaderLength ) + HTTP_HttpAddRequestHeadersW(request, lpszHeaders, dwHeaderLength, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); + do { DWORD len; @@ -4740,13 +4744,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_COOKIES)) HTTP_InsertCookies(request); - /* add the headers the caller supplied */ - if( lpszHeaders && dwHeaderLength ) - { - HTTP_HttpAddRequestHeadersW(request, lpszHeaders, dwHeaderLength, - HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); - } - if (request->session->appInfo->proxy && request->session->appInfo->proxy[0]) { WCHAR *url = HTTP_BuildProxyRequestUrl(request);

1 0

Alexandre Julliard : wordpad: Add message contexts for accelerators that can be translated.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

Module: wine Branch: master Commit: 9ef59aad98ea1b6b0c9278fc174dca8ece37f05c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef59aad98ea1b6b0c9278fc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 20:40:39 2012 +0100 wordpad: Add message contexts for accelerators that can be translated. --- po/ar.po | 55 ++++++++++++++++++++++++++++++++++------- po/bg.po | 55 ++++++++++++++++++++++++++++++++++------- po/ca.po | 56 +++++++++++++++++++++++++++++++++++------- po/cs.po | 55 ++++++++++++++++++++++++++++++++++------- po/da.po | 56 +++++++++++++++++++++++++++++++++++------- po/de.po | 56 +++++++++++++++++++++++++++++++++++------- po/el.po | 55 ++++++++++++++++++++++++++++++++++------- po/en.po | 55 ++++++++++++++++++++++++++++++++++------- po/en_US.po | 55 ++++++++++++++++++++++++++++++++++------- po/eo.po | 55 ++++++++++++++++++++++++++++++++++------- po/es.po | 56 +++++++++++++++++++++++++++++++++++------- po/fa.po | 55 ++++++++++++++++++++++++++++++++++------- po/fi.po | 55 ++++++++++++++++++++++++++++++++++------- po/fr.po | 56 +++++++++++++++++++++++++++++++++++------- po/he.po | 56 +++++++++++++++++++++++++++++++++++------- po/hi.po | 55 ++++++++++++++++++++++++++++++++++------- po/hu.po | 55 ++++++++++++++++++++++++++++++++++------- po/it.po | 56 +++++++++++++++++++++++++++++++++++------- po/ja.po | 56 +++++++++++++++++++++++++++++++++++------- po/ko.po | 56 +++++++++++++++++++++++++++++++++++------- po/lt.po | 56 +++++++++++++++++++++++++++++++++++------- po/ml.po | 55 ++++++++++++++++++++++++++++++++++------- po/nb_NO.po | 56 +++++++++++++++++++++++++++++++++++------- po/nl.po | 56 +++++++++++++++++++++++++++++++++++------- po/or.po | 55 ++++++++++++++++++++++++++++++++++------- po/pa.po | 55 ++++++++++++++++++++++++++++++++++------- po/pl.po | 56 +++++++++++++++++++++++++++++++++++------- po/pt_BR.po | 56 +++++++++++++++++++++++++++++++++++------- po/pt_PT.po | 55 ++++++++++++++++++++++++++++++++++------- po/rm.po | 55 ++++++++++++++++++++++++++++++++++------- po/ro.po | 56 +++++++++++++++++++++++++++++++++++------- po/ru.po | 56 +++++++++++++++++++++++++++++++++++------- po/sk.po | 55 ++++++++++++++++++++++++++++++++++------- po/sl.po | 56 +++++++++++++++++++++++++++++++++++------- po/sr_RS(a)cyrillic.po | 55 ++++++++++++++++++++++++++++++++++------- po/sr_RS(a)latin.po | 55 ++++++++++++++++++++++++++++++++++------- po/sv.po | 56 +++++++++++++++++++++++++++++++++++------- po/te.po | 55 ++++++++++++++++++++++++++++++++++------- po/th.po | 55 ++++++++++++++++++++++++++++++++++------- po/tr.po | 55 ++++++++++++++++++++++++++++++++++------- po/uk.po | 55 ++++++++++++++++++++++++++++++++++------- po/wa.po | 55 ++++++++++++++++++++++++++++++++++------- po/wine.pot | 55 ++++++++++++++++++++++++++++++++++------- po/zh_CN.po | 55 ++++++++++++++++++++++++++++++++++------- po/zh_TW.po | 55 ++++++++++++++++++++++++++++++++++------- programs/wordpad/wordpad.rc | 34 +++++++++++++------------- 46 files changed, 2060 insertions(+), 467 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ef59aad98ea1b6b0c927…

1 0

Alexandre Julliard : winefile: Add message contexts for accelerators that can be translated.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

1 0

Alexandre Julliard : winemine: Add message contexts for accelerators that can be translated.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

1 0

Alexandre Julliard : view: Add message contexts for accelerators that can be translated.
by Alexandre Julliard Jan. 24, 2012

Jan. 24, 2012

1 0