February 2006 - Wine-commits

Jonathan Ernst : wordpad: French localization.
by Alexandre Julliard 16 Feb '06

16 Feb '06

Module: wine Branch: refs/heads/master Commit: 582eeaa573b418792013bbe4db0c67b58eaae537 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=582eeaa573b418792013bbe… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Feb 16 12:18:17 2006 +0100 wordpad: French localization. --- programs/wordpad/Fr.rc | 66 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 1 + 2 files changed, 67 insertions(+), 0 deletions(-) create mode 100644 programs/wordpad/Fr.rc diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc new file mode 100644 index 0000000..e0ced98 --- /dev/null +++ b/programs/wordpad/Fr.rc @@ -0,0 +1,66 @@ +/* + * Copyright 2006 by Jonathan Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Nouveau", ID_FILE_NEW + MENUITEM "&Ouvrir", ID_FILE_OPEN + MENUITEM "&Sauver", ID_FILE_SAVE + MENUITEM SEPARATOR + MENUITEM "&Quitter", ID_FILE_EXIT + END + POPUP "&Edition" + BEGIN + MENUITEM "&Annuler\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&RÃ©pÃ©ter\tCtrl+Y", ID_EDIT_REDO + MENUITEM "&SÃ©lectionner tout\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&Couper\tCtrl+X", ID_EDIT_CUT + MENUITEM "Co&pier\tCtrl+C", ID_EDIT_COPY + MENUITEM SEPARATOR + MENUITEM "Lecture-&seule", ID_EDIT_READONLY + MENUITEM "&ModifiÃ©", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&AvancÃ©s" + BEGIN + MENUITEM "&Information sÃ©lection", ID_EDIT_SELECTIONINFO + MENUITEM "&Format caractÃšres", ID_EDIT_CHARFORMAT + MENUITEM "&DÃ©f. format car.", ID_EDIT_DEFCHARFORMAT + MENUITEM "Format paragrap&he", ID_EDIT_PARAFORMAT + MENUITEM "&Recevoir texte", ID_EDIT_GETTEXT + END + END + POPUP "F&ormat" + BEGIN + POPUP "&Fond" + BEGIN + MENUITEM "&SystÃšme\tCtrl+1", ID_BACK_1 + MENUITEM "&PostThat yellowish\tCtrl+2", ID_BACK_2 + END + POPUP "&Alignement" + BEGIN + MENUITEM "AlignÃ© Ã &gauche\tCtrl+L", ID_ALIGN_LEFT + MENUITEM "&CentrÃ©\tCtrl+E", ID_ALIGN_CENTER + MENUITEM "AlignÃ© Ã &droite\tCtrl+R", ID_ALIGN_RIGHT + END + END +END diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index d355242..669954c 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -78,3 +78,4 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" #include "De.rc" #include "En.rc" +#include "Fr.rc"

1 0

Alexandre Julliard : Merge the contents of info/exclude into the top-level .gitignore.
by Alexandre Julliard 16 Feb '06

16 Feb '06

Module: wine Branch: refs/heads/master Commit: 5f3cc79424b74031b30636a26957ff40a7d5163b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f3cc79424b74031b30636a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 12:14:06 2006 +0100 Merge the contents of info/exclude into the top-level .gitignore. --- .gitignore | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 38068e2..2006f5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,14 @@ +*.[oa] +*.orig +*.rej +*.so +*~ Make.rules Makefile +TAGS autom4te.cache config.cache config.log config.status +tags wine

1 0

Alexandre Julliard : server: Store the process exe module in the standard dll list.
by Alexandre Julliard 16 Feb '06

16 Feb '06

Module: wine Branch: refs/heads/master Commit: e6374cbea784e7e3ad6b5dbe5b6e04159cb74f2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6374cbea784e7e3ad6b5db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 12:13:01 2006 +0100 server: Store the process exe module in the standard dll list. --- server/debugger.c | 13 +++++++------ server/process.c | 49 +++++++++++++++---------------------------------- server/process.h | 7 ++++++- server/snapshot.c | 7 ++++--- 4 files changed, 32 insertions(+), 44 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index e326516..c32b9b1 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -130,6 +130,7 @@ static int fill_create_process_event( st struct process *debugger = event->debugger->process; struct thread *thread = event->sender; struct process *process = thread->process; + struct process_dll *exe_module = get_process_exe_module( process ); obj_handle_t handle; /* documented: PROCESS_VM_READ | PROCESS_VM_WRITE */ @@ -145,9 +146,9 @@ static int fill_create_process_event( st event->data.info.create_process.thread = handle; handle = 0; - if (process->exe.file && + if (exe_module->file && /* the doc says write access too, but this doesn't seem a good idea */ - !(handle = alloc_handle( debugger, process->exe.file, GENERIC_READ, 0 ))) + !(handle = alloc_handle( debugger, exe_module->file, GENERIC_READ, 0 ))) { close_handle( debugger, event->data.info.create_process.process, NULL ); close_handle( debugger, event->data.info.create_process.thread, NULL ); @@ -155,11 +156,11 @@ static int fill_create_process_event( st } event->data.info.create_process.file = handle; event->data.info.create_process.teb = thread->teb; - event->data.info.create_process.base = process->exe.base; + event->data.info.create_process.base = exe_module->base; event->data.info.create_process.start = arg; - event->data.info.create_process.dbg_offset = process->exe.dbg_offset; - event->data.info.create_process.dbg_size = process->exe.dbg_size; - event->data.info.create_process.name = process->exe.name; + event->data.info.create_process.dbg_offset = exe_module->dbg_offset; + event->data.info.create_process.dbg_size = exe_module->dbg_size; + event->data.info.create_process.name = exe_module->name; event->data.info.create_process.unicode = 1; return 1; } diff --git a/server/process.c b/server/process.c index e738bb2..a593ad2 100644 --- a/server/process.c +++ b/server/process.c @@ -252,11 +252,6 @@ struct thread *create_process( int fd ) process->ldt_copy = NULL; process->winstation = 0; process->desktop = 0; - process->exe.file = NULL; - process->exe.dbg_offset = 0; - process->exe.dbg_size = 0; - process->exe.namelen = 0; - process->exe.filename = NULL; process->token = token_create_admin(); list_init( &process->thread_list ); list_init( &process->locks ); @@ -392,8 +387,6 @@ static void process_destroy( struct obje list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); if (process->queue) release_object( process->queue ); - if (process->exe.file) release_object( process->exe.file ); - if (process->exe.filename) free( process->exe.filename ); if (process->id) free_ptid( process->id ); if (process->token) release_object( process->token ); } @@ -480,8 +473,6 @@ static inline struct process_dll *find_p { struct process_dll *dll; - if (process->exe.base == base) return &process->exe; - LIST_FOR_EACH_ENTRY( dll, &process->dlls, struct process_dll, entry ) { if (dll->base == base) return dll; @@ -514,7 +505,7 @@ static struct process_dll *process_load_ return NULL; } if (file) dll->file = (struct file *)grab_object( file ); - list_add_head( &process->dlls, &dll->entry ); + list_add_tail( &process->dlls, &dll->entry ); } return dll; } @@ -524,7 +515,7 @@ static void process_unload_dll( struct p { struct process_dll *dll = find_process_dll( process, base ); - if (dll && dll != &process->exe) + if (dll && (&dll->entry != list_head( &process->dlls ))) /* main exe can't be unloaded */ { if (dll->file) release_object( dll->file ); if (dll->filename) free( dll->filename ); @@ -597,8 +588,6 @@ static void process_killed( struct proce destroy_process_classes( process ); remove_process_locks( process ); set_process_startup_state( process, STARTUP_ABORTED ); - if (process->exe.file) release_object( process->exe.file ); - process->exe.file = NULL; wake_up( &process->obj, 0 ); if (!--running_processes) close_master_socket(); } @@ -850,18 +839,12 @@ struct module_snapshot *module_snap( str { struct module_snapshot *snapshot, *ptr; struct process_dll *dll; - int total = 1; + int total = 0; LIST_FOR_EACH_ENTRY( dll, &process->dlls, struct process_dll, entry ) total++; if (!(snapshot = mem_alloc( sizeof(*snapshot) * total ))) return NULL; - /* first entry is main exe */ - snapshot->base = process->exe.base; - snapshot->size = process->exe.size; - snapshot->namelen = process->exe.namelen; - snapshot->filename = memdup( process->exe.filename, process->exe.namelen ); - ptr = snapshot + 1; - + ptr = snapshot; LIST_FOR_EACH_ENTRY( dll, &process->dlls, struct process_dll, entry ) { ptr->base = dll->base; @@ -992,22 +975,20 @@ DECL_HANDLER(init_process_done) } /* check if main exe has been registered as a dll already */ - if ((dll = find_process_dll( process, req->module ))) - { - list_remove( &dll->entry ); - memcpy( &process->exe, dll, sizeof(*dll) ); - list_init( &process->exe.entry ); - free( dll ); - } - else + if (!(dll = find_process_dll( process, req->module ))) { - process->exe.base = req->module; - process->exe.size = req->module_size; - process->exe.name = req->name; - if ((process->exe.namelen = get_req_data_size())) - process->exe.filename = memdup( get_req_data(), process->exe.namelen ); + if (!(dll = process_load_dll( process, NULL, req->module, + get_req_data(), get_req_data_size() ))) return; + dll->size = req->module_size; + dll->dbg_offset = 0; + dll->dbg_size = 0; + dll->name = req->name; } + /* main exe is the first in the dll list */ + list_remove( &dll->entry ); + list_add_head( &process->dlls, &dll->entry ); + generate_startup_debug_events( process, req->entry ); set_process_startup_state( process, STARTUP_DONE ); diff --git a/server/process.h b/server/process.h index 02c3602..57dc7fb 100644 --- a/server/process.h +++ b/server/process.h @@ -75,7 +75,6 @@ struct process obj_handle_t winstation; /* main handle to process window station */ obj_handle_t desktop; /* handle to desktop to use for new threads */ struct token *token; /* security token associated with this process */ - struct process_dll exe; /* main exe file */ struct list dlls; /* list of loaded dlls */ void *peb; /* PEB address in client address space */ void *ldt_copy; /* pointer to LDT copy in client addr space */ @@ -134,4 +133,10 @@ inline static int is_process_init_done( return process->startup_state == STARTUP_DONE; } +inline static struct process_dll *get_process_exe_module( struct process *process ) +{ + struct list *ptr = list_head( &process->dlls ); + return ptr ? LIST_ENTRY( ptr, struct process_dll, entry ) : NULL; +} + #endif /* __WINE_SERVER_PROCESS_H */ diff --git a/server/snapshot.c b/server/snapshot.c index ccbbe72..55dcc79 100644 --- a/server/snapshot.c +++ b/server/snapshot.c @@ -117,6 +117,7 @@ static struct snapshot *create_snapshot( static int snapshot_next_process( struct snapshot *snapshot, struct next_process_reply *reply ) { struct process_snapshot *ptr; + struct process_dll *exe_module; if (!snapshot->process_count) { @@ -137,10 +138,10 @@ static int snapshot_next_process( struct reply->threads = ptr->threads; reply->priority = ptr->priority; reply->handles = ptr->handles; - if (ptr->process->exe.filename) + if ((exe_module = get_process_exe_module( ptr->process )) && exe_module->filename) { - size_t len = min( ptr->process->exe.namelen, get_reply_max_size() ); - set_reply_data( ptr->process->exe.filename, len ); + size_t len = min( exe_module->namelen, get_reply_max_size() ); + set_reply_data( exe_module->filename, len ); } return 1; }

1 0

Alexandre Julliard : d3d8: Fixed compile with older GL versions.
by Alexandre Julliard 16 Feb '06

16 Feb '06

Module: wine Branch: refs/heads/master Commit: 45bf26cbdb2aeb1650b5ef9e5276bf849c030e6f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=45bf26cbdb2aeb1650b5ef9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 12:10:41 2006 +0100 d3d8: Fixed compile with older GL versions. --- dlls/d3d8/cubetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 0cc273b..0d6346a 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -165,7 +165,7 @@ void WINAPI IDirect3DCubeText #if defined(GL_VERSION_1_3) glBindTexture(GL_TEXTURE_CUBE_MAP, D3D8_SURFACE(This->surfaces[0][0])->textureName); #else - glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, This->surfaces[0][0]->textureName); + glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, D3D8_SURFACE(This->surfaces[0][0])->textureName); #endif checkGLcall("glBindTexture");

1 0

Roderick Colenbrander : wined3d: Set the texture size for d3d8.
by Alexandre Julliard 16 Feb '06

16 Feb '06

Module: wine Branch: refs/heads/master Commit: e64a2fdf9e4c3b8d3cc5f94df08d39a801f1234a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e64a2fdf9e4c3b8d3cc5f94… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Feb 16 12:10:21 2006 +0100 wined3d: Set the texture size for d3d8. --- dlls/wined3d/device.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 04a2fe8..3d53132 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -696,6 +696,13 @@ HRESULT WINAPI IWineD3DDeviceImpl_Creat } } + /* D3D8 doesn't use the opengl capability code from WineD3D and because of this the maximum texture size isn't set. */ + if (((IWineD3DImpl *)This->wineD3D)->dxVersion == 8 && GL_LIMITS(texture_size) == 0) { + int gl_max; + glGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max); + GL_LIMITS(texture_size) = gl_max; + } + /** Check against the maximum texture sizes supported by the video card **/ if (pow2Width > GL_LIMITS(texture_size) || pow2Height > GL_LIMITS(texture_size)) { /* one of three options

1 0

YunSong Hwang : winecfg: Updated Korean translation.
by Alexandre Julliard 16 Feb '06

16 Feb '06

Module: wine Branch: refs/heads/master Commit: 3ab7a987bd4cd11b76029ec537cf39b89fdd8b71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3ab7a987bd4cd11b76029ec… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Thu Feb 16 12:09:46 2006 +0100 winecfg: Updated Korean translation. --- programs/winecfg/Ko.rc | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index e132825..8318ecc 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -68,7 +68,7 @@ BEGIN CONTROL "DirectX Ǯ�׸�� ׵�� â�� 콺�� �� ϵ�� ",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "��ũž �� ۸� ��",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - LTEXT "�� â��ڰ� â�� Ѵٸ�, �� ǥ�� ׵θ�� ̴�, �װ͵�� ũž�� ġ�� â ��Ͽ� ��̴�. \n\n�� â�� ʴ´ٸ�, �װ͵�� â ��ϰ� �� ̴�. �װ�� â�� ũž�� ϰ� ��Ǿ� �� ʴٴ� �� ǹ��Ѵ�, �׷�� ķ��̼��  Ǯ�׸�� ۵�� ֵ�� ټ� �ֵ�� Ȯ�� ̴�.", + LTEXT "�� â��ڰ� â�� Ѵٸ�, �� ǥ�� ׵θ�� ̴�, �װ͵�� ũž�� ġ�� â ��Ͽ� \n ��̴�. �� â�� ʴ´ٸ�, �װ͵�� â ��ϰ� �� ̴�. �װ�� â�� ũž�� ϰ� ��Ǿ� �� ʴٴ� �� ǹ��Ѵ�, �׷�� ķ��̼��  Ǯ�׸�� ۵�� ֵ�� ټ� �ֵ�� Ȯ�� ̴�.", IDC_STATIC,15,58,228,80 CONTROL "â ��ڰ� â ��ϵ�� ",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 /* FIXME: the wording of this explanation could be a lot better */ @@ -82,7 +82,7 @@ BEGIN EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 + GROUPBOX "��̷�Ʈ 3D ",IDC_STATIC,8,210,244,50 LTEXT "��ؽ� ��̴� ��: ",IDC_STATIC,15,220,80,30 COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -108,14 +108,14 @@ END IDD_LOADORDER DIALOG DISCARDABLE 80, 90, 110, 92 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "��̺� ��" +CAPTION "�� " FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "�ε� �� ",IDC_STATIC,8,4,94,66 CONTROL "��(&B)(Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,75,10 - CONTROL "��Ƽ��(&N) (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,75,10 - CONTROL "�� Ƽ�꺸�� 켱(&l)",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 - CONTROL "��Ƽ�갡 ��庸�� 켱(&v)",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 + CONTROL "��Ƽ��(&N)(Win)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,75,10 + CONTROL "��>��Ƽ��(&l)",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 + CONTROL "��Ƽ��>��(&v)",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 CONTROL "�� (&D)",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,16,54,75,10 DEFPUSHBUTTON "Ȯ��",IDOK,8,74,45,14,WS_GROUP PUSHBUTTON "��",IDCANCEL,57,74,45,14,WS_GROUP @@ -167,7 +167,7 @@ BEGIN LTEXT "�� ̹�: ",IDC_STATIC,10,20,227,30 CONTROL "��ġ",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "��",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 - GROUPBOX "DirectSound ",IDC_STATIC,8,205,244,60 + GROUPBOX "��̷�Ʈ �� ",IDC_STATIC,8,205,244,60 LTEXT "�ϵ�� : ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "��̹� �ֹ�",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 @@ -177,7 +177,7 @@ IDD_DESKTOP_INTEGRATION DIALOG DISCARDAB STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + GROUPBOX "�ܾ�",IDC_STATIC,8,4,244,106 LTEXT "�׸�:",IDC_STATIC,15,16,230,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "�׸� ��ġ...",IDC_THEME_INSTALL,152,38,93,14 @@ -185,12 +185,12 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "ũ��:",IDC_THEME_SIZETEXT,15,80,230,8 COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + GROUPBOX "�� ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "�� ũ:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "ã��",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -199,12 +199,12 @@ BEGIN IDS_TAB_APPLICATIONS "Ǯ�׸�" IDS_TAB_DLLS "��̺귯��" IDS_TAB_DRIVES "��̺�" - IDS_CHOOSE_PATH "Select the unix target folder, please." + IDS_CHOOSE_PATH "��н� �� Ͻʽÿ�." IDS_HIDE_ADVANCED "�߰� �ɼ� ��" IDS_SHOW_ADVANCED "�߰� �ɼ� ��ֱ�" IDS_NOTHEME "(�׸� ��)" IDS_TAB_GRAPHICS "�׷��" - IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" + IDS_TAB_DESKTOP_INTEGRATION "��ũž ��" IDS_TAB_AUDIO "��" IDS_TAB_ABOUT "��" IDS_WINECFG_TITLE "Wine ��" @@ -222,6 +222,6 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "��Ƽ��, ��" IDS_DLL_BUILTIN_NATIVE "��, ��Ƽ��" IDS_DLL_DISABLED "�Ұ��" - IDS_SHELL_FOLDER "Shell Folder" - IDS_LINKS_TO "Links to" + IDS_SHELL_FOLDER "�� " + IDS_LINKS_TO "�� ũ" END

1 0

Jonathan Ernst : winecfg: French resource update.
by Alexandre Julliard 16 Feb '06

16 Feb '06

Module: wine Branch: refs/heads/master Commit: 6ed40c10d684f05380ce824debda1b2111ecb2cb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ed40c10d684f05380ce824… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Feb 16 12:09:34 2006 +0100 winecfg: French resource update. --- programs/winecfg/Fr.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index e73bd92..326c0b8 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -2,7 +2,7 @@ * WineCfg resources * French Language Support * - * Copyright 2005 Jonathan Ernst + * Copyright 2005-2006 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -171,7 +171,7 @@ IDD_DESKTOP_INTEGRATION DIALOG DISCARDAB STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + GROUPBOX " Apparence ",IDC_STATIC,8,4,244,106 LTEXT "Th�me:",IDC_STATIC,15,16,230,8 COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Installer un th�me...",IDC_THEME_INSTALL,152,38,93,14 @@ -179,12 +179,12 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Taille:",IDC_THEME_SIZETEXT,15,80,230,8 COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + GROUPBOX " Dossiers syst�me ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "Li� �:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + PUSHBUTTON "Parcourir",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -193,17 +193,17 @@ BEGIN IDS_TAB_APPLICATIONS "Applications" IDS_TAB_DLLS "Biblioth�ques" IDS_TAB_DRIVES "Lecteurs" - IDS_CHOOSE_PATH "Select the unix target directory, please." + IDS_CHOOSE_PATH "Veuillez s�lectionner le r�pertoire de destination." IDS_HIDE_ADVANCED "Cacher avanc�s" IDS_SHOW_ADVANCED "Montrer avanc�s" IDS_NOTHEME "(Pas de th�me)" IDS_TAB_GRAPHICS "Affichage" - IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" + IDS_TAB_DESKTOP_INTEGRATION "Int�gration avec le bureau" IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "A propos" IDS_WINECFG_TITLE "Configuration de Wine" IDS_THEMEFILE "Fichiers de th�mes" IDS_THEMEFILE_SELECT "S�lectionnez un fichier de th�me" - IDS_SHELL_FOLDER "Shell Folder" - IDS_LINKS_TO "Links to" + IDS_SHELL_FOLDER "Dossier syst�me" + IDS_LINKS_TO "Li� �" END

1 0

Henning Gerhardt : wordpad: Added German resource.
by Alexandre Julliard 16 Feb '06

16 Feb '06

Module: wine Branch: refs/heads/master Commit: 2907693ba979e4a83963e2011175abfc80082632 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2907693ba979e4a83963e20… Author: Henning Gerhardt <henning.gerhardt(a)web.de> Date: Thu Feb 16 12:09:21 2006 +0100 wordpad: Added German resource. --- programs/wordpad/De.rc | 66 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/En.rc | 2 + programs/wordpad/rsrc.rc | 2 + 3 files changed, 69 insertions(+), 1 deletions(-) create mode 100644 programs/wordpad/De.rc diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc new file mode 100644 index 0000000..493bf5b --- /dev/null +++ b/programs/wordpad/De.rc @@ -0,0 +1,66 @@ +/* + * Copyright 2006 by Henning Gerhardt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Neu", ID_FILE_NEW + MENUITEM "&�ffnen", ID_FILE_OPEN + MENUITEM "&Speichern", ID_FILE_SAVE + MENUITEM SEPARATOR + MENUITEM "&Beenden", ID_FILE_EXIT + END + POPUP "&Bearbeiten" + BEGIN + MENUITEM "&R�ckg�ngig\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Wiederholen\tCtrl+Y", ID_EDIT_REDO + MENUITEM "&Alles markieren\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "Aus&schneiden\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Kopieren\tCtrl+C", ID_EDIT_COPY + MENUITEM SEPARATOR + MENUITEM "Schreibgesch�&tzt", ID_EDIT_READONLY + MENUITEM "&Ge�ndert", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&Extras" + BEGIN + MENUITEM "Markierungs&information", ID_EDIT_SELECTIONINFO + MENUITEM "Zeichen&format", ID_EDIT_CHARFORMAT + MENUITEM "&Standardzeichenformat", ID_EDIT_DEFCHARFORMAT + MENUITEM "&Absatzformat", ID_EDIT_PARAFORMAT + MENUITEM "&Get text", ID_EDIT_GETTEXT + END + END + POPUP "F&ormat" + BEGIN + POPUP "&Hintergrund" + BEGIN + MENUITEM "&System\tCtrl+1", ID_BACK_1 + MENUITEM "&PostIt-Notiz\tCtrl+2", ID_BACK_2 + END + POPUP "&Ausrichtung" + BEGIN + MENUITEM "&Links\tCtrl+L", ID_ALIGN_LEFT + MENUITEM "&Zentriert\tCtrl+E", ID_ALIGN_CENTER + MENUITEM "&Rechts\tCtrl+R", ID_ALIGN_RIGHT + END + END +END diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index cb89f80..a554960 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "resource.h" +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT MAINMENU MENU DISCARDABLE BEGIN diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 2ba5627..d355242 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <windows.h> #include "resource.h" MAINACCELTABLE ACCELERATORS @@ -75,4 +76,5 @@ IDB_TOOLBAR BITMAP "toolbar.bmp" '88 88 88 88 88 88' } */ +#include "De.rc" #include "En.rc"

1 0

Hans Leidekker : shlwapi: Fix parameter check for UrlUnescapeA.
by Alexandre Julliard 16 Feb '06

16 Feb '06

Module: wine Branch: refs/heads/master Commit: 7c9918338a21a70b1eac3fdd14fb7a55470a211a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c9918338a21a70b1eac3fd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Feb 16 12:08:48 2006 +0100 shlwapi: Fix parameter check for UrlUnescapeA. NULL pszUnescaped is okay if URL_UNESCAPE_INPLACE is set. Add a corresponding test for UrlUnescape{A,W}. --- dlls/shlwapi/tests/path.c | 8 ++++++++ dlls/shlwapi/url.c | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 6800da2..aa0a519 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -585,6 +585,9 @@ static void test_UrlUnescape(void) WCHAR *urlW, *expected_urlW; DWORD dwEscaped; size_t i; + static char inplace[] = "file:///C:/Program%20Files"; + static WCHAR inplaceW[] = {'f','i','l','e',':','/','/','/','C',':','/', + 'P','r','o','g','r','a','m','%','2','0','F','i','l','e','s',0}; for(i=0; i<sizeof(TEST_URL_UNESCAPE)/sizeof(TEST_URL_UNESCAPE[0]); i++) { dwEscaped=INTERNET_MAX_URL_LENGTH; @@ -601,6 +604,11 @@ static void test_UrlUnescape(void) FreeWideString(expected_urlW); } + dwEscaped = sizeof(inplace); + ok(UrlUnescapeA(inplace, NULL, &dwEscaped, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeA failed unexpectedly\n"); + + dwEscaped = sizeof(inplaceW); + ok(UrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE) == S_OK, "UrlUnescapeW failed unexpectedly\n"); } static void test_PathSearchAndQualify(void) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 7211420..9747eef 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1117,7 +1117,7 @@ HRESULT WINAPI UrlUnescapeA( TRACE("(%s, %p, %p, 0x%08lx)\n", debugstr_a(pszUrl), pszUnescaped, pcchUnescaped, dwFlags); - if(!pszUrl || !pszUnescaped || !pcchUnescaped) + if(!pszUrl || (!pszUnescaped && !(dwFlags & URL_UNESCAPE_INPLACE)) || !pcchUnescaped) return E_INVALIDARG; if(dwFlags & URL_UNESCAPE_INPLACE)

1 0

Juan Lang : crypt32: Partially implement CertGetNameString.
by Alexandre Julliard 16 Feb '06

16 Feb '06

Module: wine Branch: refs/heads/master Commit: 8e7f30ef1115c5940268be3bda49d827e8701455 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8e7f30ef1115c5940268be3… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Feb 16 12:08:19 2006 +0100 crypt32: Partially implement CertGetNameString. --- dlls/crypt32/crypt32.spec | 2 + dlls/crypt32/str.c | 133 +++++++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 18 ++++++ 3 files changed, 153 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 6a0b2d6..e13c9e6 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -52,6 +52,8 @@ @ stub CertGetEnhancedKeyUsage @ stub CertGetIntendedKeyUsage @ stub CertGetIssuerCertificateFromStore +@ stdcall CertGetNameStringA(ptr long long ptr ptr long) +@ stdcall CertGetNameStringW(ptr long long ptr ptr long) @ stub CertGetPublicKeyLength @ stub CertGetSubjectCertificateFromStore @ stub CertIsRDNAttrsInCertificateName diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index d34c9da..cf56c47 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -18,6 +18,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wincrypt.h" #include "wine/debug.h" @@ -306,3 +307,135 @@ DWORD WINAPI CertNameToStrW(DWORD dwCert ret++; return ret; } + +DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType, + DWORD dwFlags, void *pvTypePara, LPSTR pszNameString, DWORD cchNameString) +{ + DWORD ret; + + TRACE("(%p, %ld, %08lx, %p, %p, %ld)\n", pCertContext, dwType, dwFlags, + pvTypePara, pszNameString, cchNameString); + + if (pszNameString) + { + LPWSTR wideName; + DWORD nameLen; + + nameLen = CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara, + NULL, 0); + wideName = CryptMemAlloc(nameLen * sizeof(WCHAR)); + if (wideName) + { + CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara, + wideName, nameLen); + nameLen = WideCharToMultiByte(CP_ACP, 0, wideName, nameLen, + pszNameString, cchNameString, NULL, NULL); + if (nameLen <= cchNameString) + ret = nameLen; + else + { + pszNameString[cchNameString - 1] = '\0'; + ret = cchNameString; + } + CryptMemFree(wideName); + } + else + { + *pszNameString = '\0'; + ret = 1; + } + } + else + ret = CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara, + NULL, 0); + return ret; +} + +DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, + DWORD dwFlags, void *pvTypePara, LPWSTR pszNameString, DWORD cchNameString) +{ + DWORD ret; + PCERT_NAME_BLOB name; + LPCSTR altNameOID; + + TRACE("(%p, %ld, %08lx, %p, %p, %ld)\n", pCertContext, dwType, + dwFlags, pvTypePara, pszNameString, cchNameString); + + if (dwFlags & CERT_NAME_ISSUER_FLAG) + { + name = &pCertContext->pCertInfo->Issuer; + altNameOID = szOID_ISSUER_ALT_NAME; + } + else + { + name = &pCertContext->pCertInfo->Subject; + altNameOID = szOID_SUBJECT_ALT_NAME; + } + + switch (dwType) + { + case CERT_NAME_SIMPLE_DISPLAY_TYPE: + { + static const LPCSTR simpleAttributeOIDs[] = { szOID_COMMON_NAME, + szOID_ORGANIZATIONAL_UNIT_NAME, szOID_ORGANIZATION_NAME, + szOID_RSA_emailAddr }; + CERT_NAME_INFO *info = NULL; + PCERT_RDN_ATTR nameAttr = NULL; + DWORD bytes = 0, i; + + if (CryptDecodeObjectEx(pCertContext->dwCertEncodingType, X509_NAME, + name->pbData, name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, + &bytes)) + { + for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) / + sizeof(simpleAttributeOIDs[0]); i++) + nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], info); + } + else + ret = 0; + if (!nameAttr) + { + PCERT_EXTENSION ext = CertFindExtension(altNameOID, + pCertContext->pCertInfo->cExtension, + pCertContext->pCertInfo->rgExtension); + + if (ext) + { + for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) / + sizeof(simpleAttributeOIDs[0]); i++) + nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], info); + if (!nameAttr) + { + /* FIXME: gotta then look for a rfc822Name choice in ext. + * Failing that, look for the first attribute. + */ + FIXME("CERT_NAME_SIMPLE_DISPLAY_TYPE: stub\n"); + ret = 0; + } + } + } + ret = CertRDNValueToStrW(nameAttr->dwValueType, &nameAttr->Value, + pszNameString, cchNameString); + if (info) + LocalFree(info); + break; + } + case CERT_NAME_FRIENDLY_DISPLAY_TYPE: + { + DWORD cch = cchNameString; + + if (CertGetCertificateContextProperty(pCertContext, + CERT_FRIENDLY_NAME_PROP_ID, pszNameString, &cch)) + ret = cch; + else + ret = CertGetNameStringW(pCertContext, + CERT_NAME_SIMPLE_DISPLAY_TYPE, dwFlags, pvTypePara, pszNameString, + cchNameString); + break; + } + default: + FIXME("unimplemented for type %ld\n", dwType); + ret = 0; + } + return ret; +} diff --git a/include/wincrypt.h b/include/wincrypt.h index dc3a44d..aa3240b 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2283,6 +2283,18 @@ static const WCHAR CERT_PHYSICAL_STORE_A #define CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG 0x00020000 #define CERT_NAME_STR_DISABLE_IE4_UTF8_FLAG 0x00010000 +#define CERT_NAME_EMAIL_TYPE 1 +#define CERT_NAME_RDN_TYPE 2 +#define CERT_NAME_ATTR_TYPE 3 +#define CERT_NAME_SIMPLE_DISPLAY_TYPE 4 +#define CERT_NAME_FRIENDLY_DISPLAY_TYPE 5 +#define CERT_NAME_DNS_TYPE 6 +#define CERT_NAME_URL_TYPE 7 +#define CERT_NAME_UPN_TYPE 8 + +#define CERT_NAME_ISSUER_FLAG 0x00000001 +#define CERT_NAME_DISABLE_IE4_UTF8_FLAG 0x00010000 + /* function declarations */ /* advapi32.dll */ BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer, @@ -2642,6 +2654,12 @@ BOOL WINAPI CryptUnprotectData( DATA_BLO DATA_BLOB* pOptionalEntropy, PVOID pvReserved, CRYPTPROTECT_PROMPTSTRUCT* pPromptStruct, DWORD dwFlags, DATA_BLOB* pDataOut ); +DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType, + DWORD dwFlags, void *pvTypePara, LPSTR pszNameString, DWORD cchNameString); +DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, + DWORD dwFlags, void *pvTypePara, LPWSTR pszNameString, DWORD cchNameString); +#define CertGetNameString WINELIB_NAME_AW(CertGetNameString) + DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, LPSTR psz, DWORD csz); DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,

1 0