November 2006 - Wine-Commits

Alexander Nicolaysen Sørnes : Updated Norwegian Bokmål translations .
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 0427c0ded37ba02f319d27dfece345253e792dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0427c0ded37ba02f319d27dfe… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Nov 19 21:12:48 2006 +0100 Updated Norwegian Bokmål translations. --- dlls/kernel32/nls/nor.nls | 37 +++++++++++++++++++------------------ dlls/localspl/localspl.rc | 1 + dlls/localspl/spl_No.rc | 28 ++++++++++++++++++++++++++++ dlls/oledlg/oledlg_No.rc | 42 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 89 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/nls/nor.nls b/dlls/kernel32/nls/nor.nls index 689b06a..f8f52b0 100644 --- a/dlls/kernel32/nls/nor.nls +++ b/dlls/kernel32/nls/nor.nls @@ -1,7 +1,8 @@ /* - * Locale definitions for Norwegian (Bokmal) + * Locale definitions for Norwegian (Bokm�l) * * Copyright 2002 Alexandre Julliard for CodeWeavers + * Copyright 2006 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -135,21 +136,21 @@ STRINGTABLE LANGUAGE LANG_NORWEGIAN, SUB LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "MMMM yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Vest-Europa og USA" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Sentral-Europa" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltisk" + LGRPID_GREEK+LGRPID_RES_BASE "Gresk" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Kyrillisk" + LGRPID_TURKISH+LGRPID_RES_BASE "Tyrkisk" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japansk" + LGRPID_KOREAN+LGRPID_RES_BASE "Koreansk" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Kinesisk (tradisjonell)" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Kinesisk (forenklet)" + LGRPID_THAI+LGRPID_RES_BASE "Thailandsk" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebraisk" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabisk" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamesisk" + LGRPID_INDIC+LGRPID_RES_BASE "Indisk" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgisk" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armensk" } diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 4b60164..a9ca999 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -39,3 +39,4 @@ #include "spl_En.rc" #include "spl_De.rc" #include "spl_Ko.rc" +#include "spl_No.rc" diff --git a/dlls/localspl/spl_No.rc b/dlls/localspl/spl_No.rc new file mode 100644 index 0000000..f4600f4 --- /dev/null +++ b/dlls/localspl/spl_No.rc @@ -0,0 +1,28 @@ +/* + * Norwegian Bokm�l resources for localspl + * + * Copyright 2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokal port" + IDS_LOCALMONITOR "Lokal overv�ker" + IDS_NOTHINGTOCONFIG "Denne porten har ingen innstillinger" +} diff --git a/dlls/oledlg/oledlg_No.rc b/dlls/oledlg/oledlg_No.rc index fe7bf57..e56c721 100644 --- a/dlls/oledlg/oledlg_No.rc +++ b/dlls/oledlg/oledlg_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -53,3 +53,43 @@ STRINGTABLE DISCARDABLE IDS_NOTOLEMOD "Filen ser ikke ut til � v�re en gyldig OLE-modul. Kunne ikke registrere OLE-kontroller." IDS_NOTOLEMODCAPTION "Legg til kontroller" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Lim inn spesiell" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kilde:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "Lim in&n", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Lim inn kob&ling", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Som:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Avbryt", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Hjelp", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Vis som ikon", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Endre &ikon . . .", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< resultatet kommer her >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Resultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Rediger", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Setter innholdet fra utklippstavlen inn i dokumentet som %s." + IDS_PS_PASTE_OBJECT "Setter innholdet fra utklippstavlen inn i dokumentet s� du kan aktivere det med %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Setter innholdet fra utklippstavlen inn i dokumentet s� du kan aktivere det med %s. Det vises som et ikon." + IDS_PS_PASTE_LINK_DATA "Setter innholdet fra utklippstavlen inn i dokumentet som %s. Det kobles til kildefilen s� endrer i denne ogs� skjer i dokumentet." + IDS_PS_PASTE_LINK_OBJECT "Setter inn et bilde av utklippstavleinnholdet i dokumentet. Bildet kobles til kildefilen s� endringer i denne ogs� skjer i dokumentet ." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Setter inn en snarvei som peker til plasseringen av innholdet p� utklippstavlen. Snarveien kobles til kildefilen s� endringer i denne ogs� skjer i dokumentet." + IDS_PS_NON_OLE "Setter innholdet fra utklippstavlen inn i dokumentet." + IDS_PS_UNKNOWN_TYPE "Ukjent type" + IDS_PS_UNKNOWN_SRC "Ukjent kilde" + IDS_PS_UNKNOWN_APP "programmet som laget det" +}

1 0

Ken Thomases : winex11.drv: Correct the count of characters matching with layout.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 9124858b08227a416c7076e94b916f4dcac7705f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9124858b08227a416c7076e94… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 17 14:47:31 2006 -0600 winex11.drv: Correct the count of characters matching with layout. --- dlls/winex11.drv/keyboard.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index bca2c21..fd85b56 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1651,6 +1651,7 @@ void X11DRV_InitKeyboard(void) for (keyn=0; keyn<MAIN_LEN; keyn++) { for (ok=(*lkey)[keyn][i=0]; ok&&(i<4); i++) if ((*lkey)[keyn][i] && (*lkey)[keyn][i]!=ckey[i]) ok=0; + if (!ok) i--; /* we overshot */ if (ok||(i>maxlen)) { maxlen=i; maxval=keyn; }

1 0

Ken Thomases : winex11.drv: Enable code for picking layout-independent vkey as second pass.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 89bdf03989ba10db0c9cfb6218fe3a2859359fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89bdf03989ba10db0c9cfb621… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 17 14:47:16 2006 -0600 winex11.drv: Enable code for picking layout-independent vkey as second pass. --- dlls/winex11.drv/keyboard.c | 63 ++++++++++++++++++++++++++++--------------- 1 files changed, 41 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index dc355a5..bca2c21 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1673,9 +1673,18 @@ void X11DRV_InitKeyboard(void) vkey_used[(vkey & 0xff)] = 1; } /* for */ -#if 0 /* this breaks VK_OEM_x VKeys in some layout tables by inserting - * a VK code into a not appropriate place. - */ +#define VKEY_IF_NOT_USED(vkey) (vkey_used[(vkey)] ? 0 : (vkey_used[(vkey)] = 1, (vkey))) + for (keyc = min_keycode; keyc <= max_keycode; keyc++) + { + vkey = keyc2vkey[keyc] & 0xff; + if (vkey) + continue; + + e2.keycode = (KeyCode)keyc; + keysym = XLookupKeysym(&e2, 0); + if (!keysym) + continue; + /* find a suitable layout-dependent VK code */ /* (most Winelib apps ought to be able to work without layout tables!) */ for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) @@ -1683,7 +1692,7 @@ void X11DRV_InitKeyboard(void) keysym = XLookupKeysym(&e2, i); if ((keysym >= XK_0 && keysym <= XK_9) || (keysym >= XK_A && keysym <= XK_Z)) { - vkey = keysym; + vkey = VKEY_IF_NOT_USED(keysym); } } @@ -1692,17 +1701,17 @@ void X11DRV_InitKeyboard(void) keysym = XLookupKeysym(&e2, i); switch (keysym) { - case ';': vkey = VK_OEM_1; break; - case '/': vkey = VK_OEM_2; break; - case '`': vkey = VK_OEM_3; break; - case '[': vkey = VK_OEM_4; break; - case '\\': vkey = VK_OEM_5; break; - case ']': vkey = VK_OEM_6; break; - case '\'': vkey = VK_OEM_7; break; - case ',': vkey = VK_OEM_COMMA; break; - case '.': vkey = VK_OEM_PERIOD; break; - case '-': vkey = VK_OEM_MINUS; break; - case '+': vkey = VK_OEM_PLUS; break; + case ';': vkey = VKEY_IF_NOT_USED(VK_OEM_1); break; + case '/': vkey = VKEY_IF_NOT_USED(VK_OEM_2); break; + case '`': vkey = VKEY_IF_NOT_USED(VK_OEM_3); break; + case '[': vkey = VKEY_IF_NOT_USED(VK_OEM_4); break; + case '\\': vkey = VKEY_IF_NOT_USED(VK_OEM_5); break; + case ']': vkey = VKEY_IF_NOT_USED(VK_OEM_6); break; + case '\'': vkey = VKEY_IF_NOT_USED(VK_OEM_7); break; + case ',': vkey = VKEY_IF_NOT_USED(VK_OEM_COMMA); break; + case '.': vkey = VKEY_IF_NOT_USED(VK_OEM_PERIOD); break; + case '-': vkey = VKEY_IF_NOT_USED(VK_OEM_MINUS); break; + case '+': vkey = VKEY_IF_NOT_USED(VK_OEM_PLUS); break; } } @@ -1710,14 +1719,17 @@ void X11DRV_InitKeyboard(void) { /* Others keys: let's assign OEM virtual key codes in the allowed range, * that is ([0xba,0xc0], [0xdb,0xe4], 0xe6 (given up) et [0xe9,0xf5]) */ - switch (++OEMvkey) + do { - case 0xc1 : OEMvkey=0xdb; break; - case 0xe5 : OEMvkey=0xe9; break; - case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n"); - } + switch (++OEMvkey) + { + case 0xc1 : OEMvkey=0xdb; break; + case 0xe5 : OEMvkey=0xe9; break; + case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n"); + } + } while (OEMvkey < 0xf5 && vkey_used[OEMvkey]); - vkey = OEMvkey; + vkey = VKEY_IF_NOT_USED(OEMvkey); if (TRACE_ON(keyboard)) { @@ -1737,7 +1749,14 @@ void X11DRV_InitKeyboard(void) TRACE(")\n"); } } -#endif + + if (vkey) + { + TRACE("keycode %04x => vkey %04x\n", e2.keycode, vkey); + keyc2vkey[e2.keycode] = vkey; + } + } /* for */ +#undef VKEY_IF_NOT_USED /* If some keys still lack scancodes, assign some arbitrary ones to them now */ for (scan = 0x60, keyc = min_keycode; keyc <= max_keycode; keyc++)

1 0

Ken Thomases : winex11.drv: Changed indenting of some dead code.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: c7ffd04be7e3207843534f00f3803ea484f01174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ffd04be7e3207843534f00f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 17 14:46:58 2006 -0600 winex11.drv: Changed indenting of some dead code. --- dlls/winex11.drv/keyboard.c | 100 +++++++++++++++++++++--------------------- 1 files changed, 50 insertions(+), 50 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7256edd..dc355a5 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1676,67 +1676,67 @@ void X11DRV_InitKeyboard(void) #if 0 /* this breaks VK_OEM_x VKeys in some layout tables by inserting * a VK code into a not appropriate place. */ - /* find a suitable layout-dependent VK code */ - /* (most Winelib apps ought to be able to work without layout tables!) */ - for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) - { - keysym = XLookupKeysym(&e2, i); - if ((keysym >= XK_0 && keysym <= XK_9) - || (keysym >= XK_A && keysym <= XK_Z)) { - vkey = keysym; - } + /* find a suitable layout-dependent VK code */ + /* (most Winelib apps ought to be able to work without layout tables!) */ + for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) + { + keysym = XLookupKeysym(&e2, i); + if ((keysym >= XK_0 && keysym <= XK_9) + || (keysym >= XK_A && keysym <= XK_Z)) { + vkey = keysym; } + } - for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) + for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) + { + keysym = XLookupKeysym(&e2, i); + switch (keysym) { - keysym = XLookupKeysym(&e2, i); - switch (keysym) - { - case ';': vkey = VK_OEM_1; break; - case '/': vkey = VK_OEM_2; break; - case '`': vkey = VK_OEM_3; break; - case '[': vkey = VK_OEM_4; break; - case '\\': vkey = VK_OEM_5; break; - case ']': vkey = VK_OEM_6; break; - case '\'': vkey = VK_OEM_7; break; - case ',': vkey = VK_OEM_COMMA; break; - case '.': vkey = VK_OEM_PERIOD; break; - case '-': vkey = VK_OEM_MINUS; break; - case '+': vkey = VK_OEM_PLUS; break; - } - } + case ';': vkey = VK_OEM_1; break; + case '/': vkey = VK_OEM_2; break; + case '`': vkey = VK_OEM_3; break; + case '[': vkey = VK_OEM_4; break; + case '\\': vkey = VK_OEM_5; break; + case ']': vkey = VK_OEM_6; break; + case '\'': vkey = VK_OEM_7; break; + case ',': vkey = VK_OEM_COMMA; break; + case '.': vkey = VK_OEM_PERIOD; break; + case '-': vkey = VK_OEM_MINUS; break; + case '+': vkey = VK_OEM_PLUS; break; + } + } - if (!vkey) + if (!vkey) + { + /* Others keys: let's assign OEM virtual key codes in the allowed range, + * that is ([0xba,0xc0], [0xdb,0xe4], 0xe6 (given up) et [0xe9,0xf5]) */ + switch (++OEMvkey) { - /* Others keys: let's assign OEM virtual key codes in the allowed range, - * that is ([0xba,0xc0], [0xdb,0xe4], 0xe6 (given up) et [0xe9,0xf5]) */ - switch (++OEMvkey) - { - case 0xc1 : OEMvkey=0xdb; break; - case 0xe5 : OEMvkey=0xe9; break; - case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n"); - } + case 0xc1 : OEMvkey=0xdb; break; + case 0xe5 : OEMvkey=0xe9; break; + case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n"); + } - vkey = OEMvkey; + vkey = OEMvkey; - if (TRACE_ON(keyboard)) + if (TRACE_ON(keyboard)) + { + TRACE("OEM specific virtual key %X assigned to keycode %X:\n", + OEMvkey, e2.keycode); + TRACE("("); + for (i = 0; i < keysyms_per_keycode; i += 1) { - TRACE("OEM specific virtual key %X assigned to keycode %X:\n", - OEMvkey, e2.keycode); - TRACE("("); - for (i = 0; i < keysyms_per_keycode; i += 1) - { - const char *ksname; + const char *ksname; - keysym = XLookupKeysym(&e2, i); - ksname = XKeysymToString(keysym); - if (!ksname) - ksname = "NoSymbol"; - TRACE( "%lX (%s) ", keysym, ksname); - } - TRACE(")\n"); + keysym = XLookupKeysym(&e2, i); + ksname = XKeysymToString(keysym); + if (!ksname) + ksname = "NoSymbol"; + TRACE( "%lX (%s) ", keysym, ksname); } + TRACE(")\n"); } + } #endif /* If some keys still lack scancodes, assign some arbitrary ones to them now */

1 0

Ken Thomases : winex11.drv: Move some dead code from inside a loop to just after the loop.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: fac3dc60756b3586e7df20099c21eebea321e4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac3dc60756b3586e7df20099… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 17 14:46:46 2006 -0600 winex11.drv: Move some dead code from inside a loop to just after the loop. --- dlls/winex11.drv/keyboard.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index a542fd5..7256edd 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1664,6 +1664,15 @@ void X11DRV_InitKeyboard(void) vkey = (*lvkey)[maxval]; } } + } + TRACE("keycode %04x => vkey %04x\n", e2.keycode, vkey); + keyc2vkey[e2.keycode] = vkey; + keyc2scan[e2.keycode] = scan; + if ((vkey & 0xff) && vkey_used[(vkey & 0xff)]) + WARN("vkey %04x is being used by more than one keycode\n", vkey); + vkey_used[(vkey & 0xff)] = 1; + } /* for */ + #if 0 /* this breaks VK_OEM_x VKeys in some layout tables by inserting * a VK code into a not appropriate place. */ @@ -1729,14 +1738,6 @@ void X11DRV_InitKeyboard(void) } } #endif - } - TRACE("keycode %04x => vkey %04x\n", e2.keycode, vkey); - keyc2vkey[e2.keycode] = vkey; - keyc2scan[e2.keycode] = scan; - if ((vkey & 0xff) && vkey_used[(vkey & 0xff)]) - WARN("vkey %04x is being used by more than one keycode\n", vkey); - vkey_used[(vkey & 0xff)] = 1; - } /* for */ /* If some keys still lack scancodes, assign some arbitrary ones to them now */ for (scan = 0x60, keyc = min_keycode; keyc <= max_keycode; keyc++)

1 0

Ken Thomases : winex11.drv: Replace no-longer-existent VK_A, VK_Z, VK_0, and VK_9 constants.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 0dee5eb1608ab8491cad2848b673f74d634aa576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dee5eb1608ab8491cad2848b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 17 14:46:31 2006 -0600 winex11.drv: Replace no-longer-existent VK_A, VK_Z, VK_0, and VK_9 constants. --- dlls/winex11.drv/keyboard.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 1fdb9e9..a542fd5 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1672,8 +1672,8 @@ void X11DRV_InitKeyboard(void) for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) { keysym = XLookupKeysym(&e2, i); - if ((keysym >= VK_0 && keysym <= VK_9) - || (keysym >= VK_A && keysym <= VK_Z)) { + if ((keysym >= XK_0 && keysym <= XK_9) + || (keysym >= XK_A && keysym <= XK_Z)) { vkey = keysym; } }

1 0

Ken Thomases : winex11.drv: Track which vkeys have already been assigned to keycodes.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 8c768fb4375b0cb0cba92ddf0e11392cbad824e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c768fb4375b0cb0cba92ddf0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 17 14:46:13 2006 -0600 winex11.drv: Track which vkeys have already been assigned to keycodes. --- dlls/winex11.drv/keyboard.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index eb8a3c4..1fdb9e9 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1561,6 +1561,7 @@ void X11DRV_InitKeyboard(void) int keyc, i, keyn, syms; char ckey[4]={0,0,0,0}; const char (*lkey)[MAIN_LEN][4]; + char vkey_used[256] = { 0 }; wine_tsx11_lock(); XDisplayKeycodes(display, &min_keycode, &max_keycode); @@ -1732,6 +1733,9 @@ void X11DRV_InitKeyboard(void) TRACE("keycode %04x => vkey %04x\n", e2.keycode, vkey); keyc2vkey[e2.keycode] = vkey; keyc2scan[e2.keycode] = scan; + if ((vkey & 0xff) && vkey_used[(vkey & 0xff)]) + WARN("vkey %04x is being used by more than one keycode\n", vkey); + vkey_used[(vkey & 0xff)] = 1; } /* for */ /* If some keys still lack scancodes, assign some arbitrary ones to them now */

1 0

Ken Thomases : winex11.drv: Reset the keyc2vkey table to empty before rebuilding it.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: 30f691f56b4caf014e880697fd16385f2194bd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f691f56b4caf014e880697f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Nov 17 14:46:00 2006 -0600 winex11.drv: Reset the keyc2vkey table to empty before rebuilding it. --- dlls/winex11.drv/keyboard.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index fbc64d7..eb8a3c4 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1604,6 +1604,7 @@ void X11DRV_InitKeyboard(void) e2.state = 0; OEMvkey = VK_OEM_8; /* next is available. */ + memset(keyc2vkey, 0, sizeof(keyc2vkey)); for (keyc = min_keycode; keyc <= max_keycode; keyc++) { char buf[30];

1 0

Mike McCormack : msi: Split msi_set_sourcedir_props into a separate function.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: b921118f145227e194b8b312c6ee9f7a1b39b837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b921118f145227e194b8b312c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 20 16:27:36 2006 +0900 msi: Split msi_set_sourcedir_props into a separate function. --- dlls/msi/action.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 41d0a19..c49d26d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3851,10 +3851,30 @@ static UINT ACTION_ForceReboot(MSIPACKAG return ERROR_INSTALL_SUSPEND; } +UINT msi_set_sourcedir_props(MSIPACKAGE *package) +{ + LPWSTR p, source; + DWORD len; + + p = strrchrW( package->PackagePath, '\\' ); + if (!p) + return ERROR_SUCCESS; + + len = p - package->PackagePath + 2; + source = msi_alloc( len * sizeof(WCHAR) ); + lstrcpynW( source, package->PackagePath, len ); + + MSI_SetPropertyW( package, cszSourceDir, source ); + MSI_SetPropertyW( package, cszSOURCEDIR, source ); + + msi_free( source ); + + return ERROR_SUCCESS; +} + static UINT ACTION_ResolveSource(MSIPACKAGE* package) { - DWORD attrib, len; - LPWSTR ptr, source; + DWORD attrib; UINT rc; /* @@ -3864,18 +3884,7 @@ static UINT ACTION_ResolveSource(MSIPACK if (!package->PackagePath) return ERROR_SUCCESS; - ptr = strrchrW(package->PackagePath, '\\'); - if (!ptr) - return ERROR_SUCCESS; - - len = ptr - package->PackagePath + 2; - source = msi_alloc(len * sizeof(WCHAR)); - lstrcpynW(source, package->PackagePath, len); - - MSI_SetPropertyW(package, cszSourceDir, source); - MSI_SetPropertyW(package, cszSOURCEDIR, source); - - msi_free(source); + msi_set_sourcedir_props(package); attrib = GetFileAttributesW(package->PackagePath); if (attrib == INVALID_FILE_ATTRIBUTES)

1 0

Mike McCormack : msi: Spelling fixes.
by Alexandre Julliard Nov. 20, 2006

Nov. 20, 2006

Module: wine Branch: master Commit: fc564239044b928a22f6d8ce81568c49212a58b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc564239044b928a22f6d8ce8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Nov 20 16:17:03 2006 +0900 msi: Spelling fixes. --- dlls/msi/action.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1a13fb7..41d0a19 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3856,10 +3856,10 @@ static UINT ACTION_ResolveSource(MSIPACK DWORD attrib, len; LPWSTR ptr, source; UINT rc; - + /* - * we are currently doing what should be done here in the top level Install - * however for Adminastrative and uninstalls this step will be needed + * We are currently doing what should be done here in the top level Install + * however for Administrative and uninstalls this step will be needed */ if (!package->PackagePath) return ERROR_SUCCESS;

1 0