September 2008 - Wine-commits

Andrey Turkin : ntdll: Add stubbed implementations for NtQueryEaFile and NtSetEaFile.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: c425c8a406669fc203a8f77ca3be5216fa4e4160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c425c8a406669fc203a8f77ca… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Tue Sep 23 21:12:19 2008 +0400 ntdll: Add stubbed implementations for NtQueryEaFile and NtSetEaFile. --- dlls/ntdll/file.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 8 +++--- include/winternl.h | 2 +- 3 files changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ffc2399..3dee4ee 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2309,6 +2309,59 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io /****************************************************************** + * NtQueryEaFile (NTDLL.@) + * + * Read extended attributes from NTFS files. + * + * PARAMS + * hFile [I] File handle, must be opened with FILE_READ_EA access + * iosb [O] Receives information about the operation on return + * buffer [O] Output buffer + * length [I] Length of output buffer + * single_entry [I] Only read and return one entry + * ea_list [I] Optional list with names of EAs to return + * ea_list_len [I] Length of ea_list in bytes + * ea_index [I] Optional pointer to 1-based index of attribute to return + * restart [I] restart EA scan + * + * RETURNS + * Success: 0. Atrributes read into buffer + * Failure: An NTSTATUS error code describing the error. + */ +NTSTATUS WINAPI NtQueryEaFile( HANDLE hFile, PIO_STATUS_BLOCK iosb, PVOID buffer, ULONG length, + BOOLEAN single_entry, PVOID ea_list, ULONG ea_list_len, + PULONG ea_index, BOOLEAN restart ) +{ + FIXME("(%p,%p,%p,%d,%d,%p,%d,%p,%d) stub\n", + hFile, iosb, buffer, length, single_entry, ea_list, + ea_list_len, ea_index, restart); + return STATUS_ACCESS_DENIED; +} + + +/****************************************************************** + * NtSetEaFile (NTDLL.@) + * + * Update extended attributes for NTFS files. + * + * PARAMS + * hFile [I] File handle, must be opened with FILE_READ_EA access + * iosb [O] Receives information about the operation on return + * buffer [I] Buffer with EA information + * length [I] Length of buffer + * + * RETURNS + * Success: 0. Attributes are updated + * Failure: An NTSTATUS error code describing the error. + */ +NTSTATUS WINAPI NtSetEaFile( HANDLE hFile, PIO_STATUS_BLOCK iosb, PVOID buffer, ULONG length ) +{ + FIXME("(%p,%p,%p,%d) stub\n", hFile, iosb, buffer, length); + return STATUS_ACCESS_DENIED; +} + + +/****************************************************************** * NtFlushBuffersFile (NTDLL.@) * * Flush any buffered data on an open file handle. diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 617d25d..32a2a73 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -238,7 +238,7 @@ @ stdcall NtQueryDefaultUILanguage(ptr) @ stdcall NtQueryDirectoryFile(long long ptr ptr ptr ptr long long long ptr long) @ stdcall NtQueryDirectoryObject(long ptr long long long ptr ptr) -@ stub NtQueryEaFile +@ stdcall NtQueryEaFile(long ptr ptr long long ptr long ptr long) @ stdcall NtQueryEvent(long long ptr long ptr) @ stdcall NtQueryFullAttributesFile(ptr ptr) @ stdcall NtQueryInformationAtom(long long ptr long ptr) @@ -313,7 +313,7 @@ @ stub NtSetDefaultHardErrorPort @ stdcall NtSetDefaultLocale(long long) @ stdcall NtSetDefaultUILanguage(long) -@ stub NtSetEaFile +@ stdcall NtSetEaFile(long ptr ptr long) @ stdcall NtSetEvent(long long) # @ stub NtSetEventBoostPriority @ stub NtSetHighEventPair @@ -1082,7 +1082,7 @@ @ stdcall ZwQueryDefaultUILanguage(ptr) NtQueryDefaultUILanguage @ stdcall ZwQueryDirectoryFile(long long ptr ptr ptr ptr long long long ptr long) NtQueryDirectoryFile @ stdcall ZwQueryDirectoryObject(long ptr long long long ptr ptr) NtQueryDirectoryObject -@ stub ZwQueryEaFile +@ stdcall ZwQueryEaFile(long ptr ptr long long ptr long ptr long) NtQueryEaFile @ stdcall ZwQueryEvent(long long ptr long ptr) NtQueryEvent @ stdcall ZwQueryFullAttributesFile(ptr ptr) NtQueryFullAttributesFile @ stdcall ZwQueryInformationAtom(long long ptr long ptr) NtQueryInformationAtom @@ -1157,7 +1157,7 @@ @ stub ZwSetDefaultHardErrorPort @ stdcall ZwSetDefaultLocale(long long) NtSetDefaultLocale @ stdcall ZwSetDefaultUILanguage(long) NtSetDefaultUILanguage -@ stub ZwSetEaFile +@ stdcall ZwSetEaFile(long ptr ptr long) NtSetEaFile @ stdcall ZwSetEvent(long long) NtSetEvent # @ stub ZwSetEventBoostPriority @ stub ZwSetHighEventPair diff --git a/include/winternl.h b/include/winternl.h index 04bc3e4..1b1c8d1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1966,7 +1966,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryDefaultLocale(BOOLEAN,LCID*); NTSYSAPI NTSTATUS WINAPI NtQueryDefaultUILanguage(LANGID*); NTSYSAPI NTSTATUS WINAPI NtQueryDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtQueryDirectoryObject(HANDLE,PDIRECTORY_BASIC_INFORMATION,ULONG,BOOLEAN,BOOLEAN,PULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID,ULONG,PVOID,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI NtQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID,ULONG,PULONG,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtQueryEvent(HANDLE,EVENT_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*); NTSYSAPI NTSTATUS WINAPI NtQueryInformationAtom(RTL_ATOM,ATOM_INFORMATION_CLASS,PVOID,ULONG,ULONG*);

1 0

Muneyuki Noguchi : setupapi: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 8448a9f1f4dd468ec5bfae8447fc9ec2f1637a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8448a9f1f4dd468ec5bfae844… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 11:24:06 2008 +0900 setupapi: Use "MS Shell Dlg" 9 in Japanese resources. --- dlls/setupapi/Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/Ja.rc b/dlls/setupapi/Ja.rc index dc75dfb..e2c5e3d 100644 --- a/dlls/setupapi/Ja.rc +++ b/dlls/setupapi/Ja.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "�t�@�C��R�s�[��Ă��܂�..." -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN PUSHBUTTON "�L��Z��", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "�R�s�[��:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP

1 0

Muneyuki Noguchi : shell32: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: e786bdebcdd499cdf1d8baae5908e68146f50a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e786bdebcdd499cdf1d8baae5… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 11:27:09 2008 +0900 shell32: Use "MS Shell Dlg" 9 in Japanese resources. --- dlls/shell32/shell32_Ja.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_Ja.rc b/dlls/shell32/shell32_Ja.rc index 11e6e84..e010ffc 100644 --- a/dlls/shell32/shell32_Ja.rc +++ b/dlls/shell32/shell32_Ja.rc @@ -115,7 +115,7 @@ END SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK CAPTION "�t�H��_�̎Q��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "�L��Z��", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP @@ -130,7 +130,7 @@ FONT 8, "MS Shell Dlg" SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK CAPTION "�t�H��_�̎Q��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { LTEXT "", IDD_TITLE, 10, 8, 198, 24 LTEXT "", IDD_STATUS, 10, 25, 198, 12 @@ -148,7 +148,7 @@ FONT 8, "MS Shell Dlg" SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "��b�Z�[�W" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { DEFPUSHBUTTON "�͂�(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "��ׂĂ͂�(&A)", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP @@ -176,7 +176,7 @@ FONT 10, "MS Shell Dlg" SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18

1 0

Muneyuki Noguchi : user32: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: bcff2eb2880f7c9d3a3a56af96b269f5554ae8f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcff2eb2880f7c9d3a3a56af9… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 11:28:28 2008 +0900 user32: Use "MS Shell Dlg" 9 in Japanese resources. --- dlls/user32/resources/user32_Ja.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/resources/user32_Ja.rc b/dlls/user32/resources/user32_Ja.rc index 5136391..d32cff1 100644 --- a/dlls/user32/resources/user32_Ja.rc +++ b/dlls/user32/resources/user32_Ja.rc @@ -50,7 +50,7 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE MSGBOX DIALOG 100, 80, 216, 168 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX @@ -69,7 +69,7 @@ END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select Window" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14

1 0

Muneyuki Noguchi : wordpad: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 595dc286200d383fc80c2d7750a69017924dfd9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=595dc286200d383fc80c2d775… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 10:29:52 2008 +0900 wordpad: Use "MS Shell Dlg" 9 in Japanese resources. --- programs/wordpad/Ja.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/Ja.rc b/programs/wordpad/Ja.rc index acb3ddf..45c0ca8 100644 --- a/programs/wordpad/Ja.rc +++ b/programs/wordpad/Ja.rc @@ -107,7 +107,7 @@ END IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "��t�Ǝ��" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "��p�ł��`��",0,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT|LBS_NOTIFY @@ -118,7 +118,7 @@ END IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�V�K�쐬" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�V��`��",0,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT @@ -129,7 +129,7 @@ END IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�i��̐ݒ�" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "�C��f��g", 0, 10, 10, 120, 68 LTEXT "��(&L)", 0, 15, 22, 40, 13 @@ -147,7 +147,7 @@ END IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�^�u�̐ݒ�" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "�^�u�̒�~�ʒu(&T)", 0, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT @@ -161,7 +161,7 @@ END IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 STYLE DS_SYSMODAL CAPTION "" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "�s�̐܂�Ԃ�", 0, 10, 10, 130, 85 RADIOBUTTON "�E�B��h�E�̋��E�Ő܂�Ԃ�(&W)", IDC_PAGEFMT_WW, 18, 25, 117, 15

1 0

Muneyuki Noguchi : winhlp32: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 323e6a2de5b56558384769e7864b5fb05b3b6e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=323e6a2de5b56558384769e78… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 10:32:17 2008 +0900 winhlp32: Use "MS Shell Dlg" 9 in Japanese resources. --- programs/winhlp32/Ja.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/Ja.rc b/programs/winhlp32/Ja.rc index a6acc2c..9e62afd 100644 --- a/programs/winhlp32/Ja.rc +++ b/programs/winhlp32/Ja.rc @@ -68,7 +68,7 @@ MAIN_MENU MENU LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" CAPTION "��" { LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER @@ -76,7 +76,7 @@ CAPTION " IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" CAPTION "��" { LTEXT "��", -1, 10, 10, 180, 150

1 0

Muneyuki Noguchi : notepad: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: f94ab4f482c87021fc0070a1b5d51f3731140b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94ab4f482c87021fc0070a1b… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 10:34:05 2008 +0900 notepad: Use "MS Shell Dlg" 9 in Japanese resources. --- programs/notepad/Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Ja.rc b/programs/notepad/Ja.rc index 3af3007..0a52186 100644 --- a/programs/notepad/Ja.rc +++ b/programs/notepad/Ja.rc @@ -67,7 +67,7 @@ POPUP " DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" CAPTION "�y�[�W�ݒ�" { LTEXT "�w�b�_(&H):", 0x140, 10, 07, 40, 15

1 0

Muneyuki Noguchi : avifil32: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 5fb9ed227d77c96ead8857ebb561541293d3e950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb9ed227d77c96ead8857ebb… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 11:22:49 2008 +0900 avifil32: Use "MS Shell Dlg" 9 in Japanese resources. --- dlls/avifil32/avifile_Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile_Ja.rc b/dlls/avifil32/avifile_Ja.rc index 37a3824..e99be4e 100644 --- a/dlls/avifil32/avifile_Ja.rc +++ b/dlls/avifil32/avifile_Ja.rc @@ -21,7 +21,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "��k�I�v�V��" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "�X�g��[��I��(&C):",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL |

1 0

Muneyuki Noguchi : taskmgr: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: 0f6a195647622b868dd038825f863ae0c562b19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f6a195647622b868dd038825… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 10:23:47 2008 +0900 taskmgr: Use "MS Shell Dlg" 9 in Japanese resources. --- programs/taskmgr/Ja.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc index d904f3b..2405339 100644 --- a/programs/taskmgr/Ja.rc +++ b/programs/taskmgr/Ja.rc @@ -178,14 +178,14 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_THICKFRAME CAPTION "�^�X�N �}�l�[�W��" MENU IDR_TASKMANAGER -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 END IDD_APPLICATION_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 @@ -196,7 +196,7 @@ END IDD_PROCESS_PAGE DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | @@ -209,7 +209,7 @@ END /*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "CPU �g�p��",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "��",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT @@ -268,7 +268,7 @@ END IDD_DEBUG_CHANNELS_DIALOG DIALOG DISCARDABLE 0, 0, 247, 210 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�_��v�̃v��Z�X" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | @@ -279,7 +279,7 @@ END IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�v��Z�b�T�̊֌W" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 PUSHBUTTON "�L��Z��",IDCANCEL,174,133,50,14 @@ -354,7 +354,7 @@ END IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "�v��Z�X�y�[�W�̗�̑I��" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "�L��Z��",IDCANCEL,138,178,50,14

1 0

Muneyuki Noguchi : winecfg: Use "MS Shell Dlg" 9 in Japanese resources.
by Alexandre Julliard 25 Sep '08

25 Sep '08

Module: wine Branch: master Commit: cb7fba896d7d8cd95d2c408d193ae41d7dc14a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7fba896d7d8cd95d2c408d1… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 25 10:27:07 2008 +0900 winecfg: Use "MS Shell Dlg" 9 in Japanese resources. --- programs/winecfg/Ja.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index fcf2433..a8b97c6 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -34,7 +34,7 @@ END IDD_ABOUTCFG DIALOGEX 0, 0, 260, 270 STYLE WS_CHILD -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 @@ -50,7 +50,7 @@ END IDD_APPCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " �A�v��P�[�V��ݒ� ",IDC_STATIC, 8,4,244,240 LTEXT "Wine�̓A�v��P�[�V��ɂ��ĈقȂ�Windows�̃o�[�W��G�~��[�g�ł��܂��B ��̃^�u�̓��C�u��y�уO��t�B�b�N�e�^�u�ƘA��܂��̂ŁA�V�X�e��S�̂̐ݒ��\n�ʃA�v��P�[�V��̐ݒ�̕ύX��s��܂��B", @@ -65,7 +65,7 @@ END IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " �E�B��h�E�ݒ� ",IDC_STATIC,8,4,244,84 CONTROL "DirectX �A�v��P�[�V��}�E�X��m�ۂ��̂��(&M)",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 @@ -92,7 +92,7 @@ END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " DLL �I�[�o�[��C�h ",IDC_STATIC,8,4,244,240 LTEXT "�_�C�i�~�b�N ��N ��C�u��(DLL)�͌ʂ� builtin (Wine��) �܂�� native (Windows ��̓A�v��P�[�V��񋟂̕�)��I�Ԃ��Ƃ��ł��܂��B" @@ -109,7 +109,7 @@ END IDD_LOADORDER DIALOG DISCARDABLE 80, 90, 110, 92 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "�I�[�o�[��C�h�̕ҏW" -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " �Ǎ�� ",IDC_STATIC,8,4,94,66 CONTROL "&Builtin (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,75,10 @@ -123,7 +123,7 @@ END IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " �h��C�u�̃}�b�s��O ",IDC_STATIC,8,4,244,240 CONTROL "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | @@ -160,7 +160,7 @@ END IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " �h��C�o�̑I�� ",IDC_STATIC,8,4,244,195 LTEXT "�I�[�f�B�I�h��C�o: ",IDC_STATIC,15,20,227,30 @@ -179,7 +179,7 @@ END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED -FONT 9, "MS UI Gothic" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " �O�� ",IDC_STATIC,8,4,244,106 LTEXT "�e�[�}(&T):",IDC_STATIC,15,16,130,8

1 0