April 2011 - Wine-commits - list.winehq.org

Wolfram Sang : comdlg32: Filedlg should not add extension if it contains a glob.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 3b53dce920f16816ec6408a8c048ca629fedfa1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b53dce920f16816ec6408a8c… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Sat Jan 29 09:15:34 2011 +0100 comdlg32: Filedlg should not add extension if it contains a glob. (cherry picked from commit 5cb4c55335c5e1192a6ac3b6f97db87f6344c7cd) --- dlls/comdlg32/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 6778f17..30dba64 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2273,8 +2273,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) else if ( fodInfos->defext ) /* attach the default file extension*/ filterExt = fodInfos->defext; - /* If extension is .*, ignore it */ - if (filterExt[0] != '*') + /* If extension contains a glob, ignore it */ + if ( filterExt && !strchrW(filterExt, '*') && !strchrW(filterExt, '?') ) { /* Attach the dot*/ lstrcatW(lpstrPathAndFile, szwDot);

1 0

Alexandre Julliard : Update copyright info for 2011.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 05a7e541ff177d57fbb4a9eccc0e793d678f3be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a7e541ff177d57fbb4a9ecc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 1 11:57:08 2011 +0100 Update copyright info for 2011. (cherry picked from commit 8e2becf394f2fff9a67138419a27cbec8874c81c) --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index c9549e3..bcd8991 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2010 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2011 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 29dcd98..340f38b 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -104,7 +104,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2010 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2011 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Joshua Beck : winex11: Improved error handling in pglXMakeCurrent() call.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 12a6603136230223e2386aae033fe1e54c9f33e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a6603136230223e2386aae0… Author: Joshua Beck <jxb091000(a)utdallas.edu> Date: Thu Mar 24 01:50:33 2011 -0500 winex11: Improved error handling in pglXMakeCurrent() call. (cherry picked from commit ddada6753836faac170b9613b1d237d937b41ed6) --- dlls/winex11.drv/opengl.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fec5cd9..73d3b69 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -343,8 +343,11 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) else win = root; - pglXMakeCurrent(gdi_display, win, ctx); - + if(pglXMakeCurrent(gdi_display, win, ctx) == 0) + { + ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" ); + goto done; + } WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); str = (const char *) pglGetString(GL_EXTENSIONS); WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1);

1 0

Hwang YunSong : wineps.drv: Update Korean resource.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: c316a1810dd399b57bd246202b5413094fa48655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c316a1810dd399b57bd246202… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Jan 7 10:59:58 2011 +0900 wineps.drv: Update Korean resource. (cherry picked from commit d512ccdfa14e5411c8f56801e35b25d7bb8cc420) --- dlls/wineps.drv/wps_Ko.rc | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/wps_Ko.rc b/dlls/wineps.drv/wps_Ko.rc index 8e0c9a3..5e8e9c6 100644 --- a/dlls/wineps.drv/wps_Ko.rc +++ b/dlls/wineps.drv/wps_Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2002 Won-kyu Park <wkpark(a)kldp.org> - * Copyright 2005 YunSong Hwang + * Copyright 2005,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,22 +19,24 @@ #include "psdlg.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE -CAPTION "��" +CAPTION "종이" FONT 9, "MS Shell Dlg" { - LTEXT "�� ũ��(&Z):", -1, 10, 6, 100, 8 + LTEXT "종이 크기(&Z):", -1, 10, 6, 100, 8 LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP - GROUPBOX "��", -1, 10, 80, 200, 50 - CONTROL "��(&P)", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + GROUPBOX "방향", -1, 10, 80, 200, 50 + CONTROL "세로(&P)", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 - CONTROL "��(&L)", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + CONTROL "가로(&L)", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 - LTEXT "�� :", IDD_DUPLEX_NAME, 10, 140, 100, 8 + LTEXT "양방향 통신:", IDD_DUPLEX_NAME, 10, 140, 100, 8 COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP }

1 0

Rex Tsai : wineboot: Update Traditional Chinese translation.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: ddf78e3c1e369838e68926ec4eb5afe45d2365c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf78e3c1e369838e68926ec4… Author: Rex Tsai <chihchun(a)kalug.linux.org.tw> Date: Fri Jan 7 20:11:02 2011 +0800 wineboot: Update Traditional Chinese translation. (cherry picked from commit 1a75769263c3bca65437f86cf22b6a303a552626) --- programs/wineboot/wineboot_Zh.rc | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot_Zh.rc b/programs/wineboot/wineboot_Zh.rc index 8f27fd8..f0cc32f 100644 --- a/programs/wineboot/wineboot_Zh.rc +++ b/programs/wineboot/wineboot_Zh.rc @@ -3,6 +3,7 @@ * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> + * Copyright 2010 Rex Tsai <chihchun.at.kalug.linux.org.tw> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,13 +55,23 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "正在等待程式" +CAPTION "等候程式" FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "取消",IDCANCEL,129,49,50,15 - PUSHBUTTON "中斷進程",IDOK,51,49,71,15 - LTEXT "正在模擬關機, 但是這個程式沒有反應.", + PUSHBUTTON "中斷",IDOK,51,49,71,15 + LTEXT "正在模擬關機，但此程序沒有反應。", IDC_STATIC,7,7,172,19 - LTEXT "如果你中斷進程，有可能丟失沒有儲存的數據.", + LTEXT "如果您中斷程式，可能會遺失尚未儲存的資料。", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "正在更新 %s 的 Wine 設定，請稍候……", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Hwang YunSong : wordpad: Update Korean resource.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 10d62a66aa7c63d1c7888b6693d1a58731c34220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d62a66aa7c63d1c7888b669… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 8 10:43:18 2011 +0900 wordpad: Update Korean resource. (cherry picked from commit 302415c3db8f03db0abcd6c44dc4bd2146e6da78) --- programs/wordpad/Ko.rc | 284 ++++++++++++++++++++++++------------------------ 1 files changed, 143 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10d62a66aa7c63d1c7888…

1 0

Hwang YunSong : winspool.drv: Update Korean resource.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 3b1799c5eb32a6f0eca6eed3c309d7a5673e3665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b1799c5eb32a6f0eca6eed3c… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Jan 8 10:41:46 2011 +0900 winspool.drv: Update Korean resource. (cherry picked from commit ac2b56162a742b36f2d30fe5a8af55fccb8e17a3) --- dlls/winspool.drv/Ko.rc | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winspool.drv/Ko.rc b/dlls/winspool.drv/Ko.rc index 8c5a9c4..23142e0 100644 --- a/dlls/winspool.drv/Ko.rc +++ b/dlls/winspool.drv/Ko.rc @@ -1,7 +1,7 @@ /* * Korean resources for winspool * - * Copyright 2005 YunSong Hwang + * Copyright 2005,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,22 +20,24 @@ #include "wspool.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "��Ϸ� �μ�" +CAPTION "파일로 인쇄" FONT 9, "MS Shell Dlg" BEGIN - LTEXT "�� ̸�(&O):", -1, 7, 13, 194, 13, WS_VISIBLE + LTEXT "출력 파일 이름(&O):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL - DEFPUSHBUTTON "Ȯ��", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + DEFPUSHBUTTON "확인", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "취소", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE END STRINGTABLE DISCARDABLE { - IDS_CAPTION "�� Ʈ" - IDS_FILE_EXISTS "�� մϴ�. 'Ȯ��'�� ��̴ϴ�." - IDS_CANNOT_OPEN "�� ϴ�." + IDS_CAPTION "지역 포트" + IDS_FILE_EXISTS "출력 파일은 존재합니다. '확인'을 누르면 덮어쓰여질겁니다." + IDS_CANNOT_OPEN "출력 파일을 만들수 없습니다." }

1 0

Martin Storsjo : wineconsole: Fallback to window based console if the curses library isn't found.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: a55cafb6778d7047440b65980eab8c8149c0eb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55cafb6778d7047440b65980… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Dec 21 14:26:03 2010 +0200 wineconsole: Fallback to window based console if the curses library isn't found. (cherry picked from commit 59398d7ca7e43cc9fe4bfecd5277ce648a181a97) --- programs/wineconsole/curses.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 773f985..a49bcea 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -951,7 +951,7 @@ static int WCCURSES_MainLoop(struct inner_data* data) enum init_return WCCURSES_InitBackend(struct inner_data* data) { if( !WCCURSES_bind_libcurses() ) - return init_failed; + return init_not_supported; data->private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct inner_data_curse)); if (!data->private) return init_failed;

1 0

Martin Storsjo : wineconsole: Don' t overwrite the backend selection when parsing --use-event.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: d23c622471ee9a450d7cfb876f3270c1d06cdd85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d23c622471ee9a450d7cfb876… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Dec 22 00:07:51 2010 +0200 wineconsole: Don't overwrite the backend selection when parsing --use-event. (cherry picked from commit 0f3ff8b4b162202e687ebeaa33062b46d56574b1) --- programs/wineconsole/wineconsole.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 5acb9ad..6500950 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -743,7 +743,6 @@ static UINT WINECON_ParseOptions(const char* lpCmdLine, struct wc_init* wci) if (end == wci->ptr + 12) return IDS_CMD_INVALID_EVENT_ID; wci->mode = from_event; wci->ptr = end; - wci->backend = WCUSER_InitBackend; } else if (strncmp(wci->ptr, "--backend=", 10) == 0) {

1 0

Austin English : msiexec: Add /unreg as an alias for /z.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 3ee07aa3dc0e7dd6b87f18a49e816261b557424d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee07aa3dc0e7dd6b87f18a49… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 12 21:05:20 2011 -0800 msiexec: Add /unreg as an alias for /z. (cherry picked from commit b827ab329be24e8bb590ae6b1905e49b44f7d3ba) --- programs/msiexec/msiexec.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 70e3255..d7c83cb 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -563,7 +563,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine { FunctionRegServer = TRUE; } - else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister")) + else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister") + || msi_option_equal(argvW[i], "unreg")) { FunctionUnregServer = TRUE; }

1 0