October 2011 - Wine-commits

André Hentschel : dbghelp: Rewrite stabs parsing to not need PATH_MAX.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 85051917fe99e5c257638bf04caf7dfa94440410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85051917fe99e5c257638bf04… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 14 20:41:58 2011 +0200 dbghelp: Rewrite stabs parsing to not need PATH_MAX. --- dlls/dbghelp/stabs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 1bdd706..b4188d1 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -47,9 +47,6 @@ # include <unistd.h> #endif #include <stdio.h> -#ifndef PATH_MAX -#define PATH_MAX MAX_PATH -#endif #include <assert.h> #include <stdarg.h> @@ -1272,7 +1269,7 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, struct symt_function* curr_func = NULL; struct symt_block* block = NULL; struct symt_compiland* compiland = NULL; - char srcpath[PATH_MAX]; /* path to directory source file is in */ + char* srcpath = NULL; int i; int nstab; const char* ptr; @@ -1294,7 +1291,6 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, nstab = stablen / sizeof(struct stab_nlist); strs_end = strs + strtablen; - memset(srcpath, 0, sizeof(srcpath)); memset(stabs_basic, 0, sizeof(stabs_basic)); memset(&pending_block, 0, sizeof(pending_block)); memset(&pending_func, 0, sizeof(pending_func)); @@ -1565,7 +1561,8 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, if (*ptr == '\0') /* end of N_SO file */ { /* Nuke old path. */ - srcpath[0] = '\0'; + HeapFree(GetProcessHeap(), 0, srcpath); + srcpath = NULL; stabs_finalize_function(module, curr_func, 0); curr_func = NULL; source_idx = -1; @@ -1583,7 +1580,10 @@ BOOL stabs_parse(struct module* module, unsigned long load_offset, compiland = symt_new_compiland(module, 0 /* FIXME */, source_idx); } else + { + srcpath = HeapAlloc(GetProcessHeap(), 0, len + 1); strcpy(srcpath, ptr); + } } break; case N_SOL:

1 0

Frédéric Delanoy : cryptui: Avoid idempotent operation (Clang).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 61c6212672c230c6b4eb66274dfa4bcc751fe579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c6212672c230c6b4eb66274… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 14 23:11:32 2011 +0200 cryptui: Avoid idempotent operation (Clang). --- dlls/cryptui/main.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 9df9800..5f742d6 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1966,23 +1966,19 @@ static struct OIDToString oidMap[] = { static struct OIDToString *findSupportedOID(LPCSTR oid) { - int indexHigh = sizeof(oidMap) / sizeof(oidMap[0]) - 1, indexLow = 0, i; - struct OIDToString *ret = NULL; + int indexHigh = sizeof(oidMap) / sizeof(oidMap[0]) - 1, indexLow = 0; - for (i = (indexLow + indexHigh) / 2; !ret && indexLow <= indexHigh; - i = (indexLow + indexHigh) / 2) + while (indexLow <= indexHigh) { - int cmp; - - cmp = strcmp(oid, oidMap[i].oid); - if (!cmp) - ret = &oidMap[i]; - else if (cmp > 0) + int cmp, i = (indexLow + indexHigh) / 2; + if (!(cmp = strcmp(oid, oidMap[i].oid))) + return &oidMap[i]; + if (cmp > 0) indexLow = i + 1; else indexHigh = i - 1; } - return ret; + return NULL; } static void add_local_oid_text_to_control(HWND text, LPCSTR oid)

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: e8331e6d2e04ccf6f6fc7339c88e6d156b87f78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8331e6d2e04ccf6f6fc7339c… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sat Oct 15 21:01:17 2011 +0900 po: Updated Korean translation. --- po/ko.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 63c76b5..8eb2f34 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10346,9 +10346,8 @@ msgid "(None)" msgstr "(없음)" #: winecfg.rc:89 -#, fuzzy msgid "Audio test failed!" -msgstr "오디오 테스트 실패\n" +msgstr "오디오 테스트 실패!" #: winecfg.rc:91 msgid "(System default)" @@ -11311,7 +11310,7 @@ msgstr "%s를 덮어쓰겠습니까? (예|아니오|모두)\n" #: xcopy.rc:37 msgid "Copying of '%s' to '%s' failed with r/c %d\n" -msgstr " r/c %d로 '%s'를 '%s'로 복사 실패 \n" +msgstr "r/c %d로 '%s'를 '%s'로 복사 실패 \n" #: xcopy.rc:39 msgid "Failed during reading of '%s'\n"

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: e3f022b2bd0ea252303164872996fd91124538ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f022b2bd0ea252303164872… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Oct 15 12:52:56 2011 +0200 po: Update Italian translation. --- po/it.po | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/po/it.po b/po/it.po index 7e5e78f..eabf4e9 100644 --- a/po/it.po +++ b/po/it.po @@ -1,11 +1,11 @@ # Italian translations for Wine -# +# Luca Bennati <lucak3(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-10-07 13:37+0200\n" +"PO-Revision-Date: 2011-10-14 14:56+0200\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -8002,18 +8002,17 @@ msgstr "" "PATH %PATH%;c:\\temp\n" #: cmd.rc:128 -#, fuzzy msgid "" "PAUSE displays a message on the screen asking the user to press a key.\n" "\n" "It is mainly useful in batch files to allow the user to read the output\n" "of a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE mostra un messaggio sullo schermo 'Premere Invio per continuare'\n" -"e aspetta che l'utente prema Invio. È utile principalmente nei files\n" -"batch per permettere all'utente di leggere l'output di un comando " -"precedente\n" -"prima che scorra fuori dallo schermo.\n" +"PAUSE mostra un messaggio sullo schermo che chiede all'utente di premere un " +"tasto.\n" +"\n" +"È utile soprattutto in file batch per permettere all'utente di leggere\n" +"l'output di un comando precedente prima che scorra via dallo schermo.\n" #: cmd.rc:149 msgid "" @@ -8489,9 +8488,8 @@ msgid "PATH not found\n" msgstr "PATH non trovato\n" #: cmd.rc:321 -#, fuzzy msgid "Press any key to continue... " -msgstr "Premere Invio per continuare: " +msgstr "Premere un tasto qualsiasi per continuare... " #: cmd.rc:322 msgid "Wine Command Prompt"

1 0

Luca Bennati : dinput: Add Italian translation.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 9d487fd2c3b0ead42e39d5e0e482546e48d9f4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d487fd2c3b0ead42e39d5e0e… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Oct 15 15:18:39 2011 +0200 dinput: Add Italian translation. --- dlls/dinput/Makefile.in | 1 + dlls/dinput/dinput_It.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index 0054363..0007506 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -25,6 +25,7 @@ PO_SRCS = dinput.rc RC_SRCS = \ dinput.rc \ dinput_En.rc \ + dinput_It.rc \ dinput_Ko.rc @MAKE_DLL_RULES@ diff --git a/dlls/dinput/dinput_It.rc b/dlls/dinput/dinput_It.rc new file mode 100644 index 0000000..d853c7f --- /dev/null +++ b/dlls/dinput/dinput_It.rc @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011 Luca Bennati + * + * 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 + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_CONFIGUREDEVICES DIALOG 0, 0, 270, 260 +STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE +CAPTION "Configura unità" +FONT 8, "Ms Shell Dlg" +{ + DEFPUSHBUTTON "Ok", IDOK, 10, 236, 50, 14 + DEFPUSHBUTTON "Annulla", IDCANCEL, 65, 236, 50, 14 + DEFPUSHBUTTON "Resetta", IDC_RESET, 210, 236, 50, 14 + COMBOBOX IDC_PLAYERCOMBO, 10, 50, 90, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + COMBOBOX IDC_CONTROLLERCOMBO, 10, 20, 90, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "Riproduttore", IDC_PLAYERTEXT, 10, 40, 21, 8, SS_LEFT + LTEXT "Unità", IDC_DEVICETEXT, 10, 10, 22, 8, SS_LEFT + LTEXT "Azioni", IDC_ACTIONTEXT, 10, 70, 24, 8, SS_LEFT + LTEXT "Corrispondenza", IDC_MAPPINGTEXT, 120, 8, 28, 8, SS_LEFT + LISTBOX IDC_ACTIONLIST, 10, 80, 90, 130, WS_TABSTOP | WS_VSCROLL | LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + AUTOCHECKBOX "Ordina assegnati", IDC_CHECKBOXSORT, 120, 215, 60, 8 + CONTROL "Listview", IDC_DEVICEOBJECTSLIST, "SysListView32", LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 120, 20, 140, 190 +}

1 0

Luca Bennati : inetcpl: Update Italian translation.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 32706d952e11e91d2eda488d34f3ed4a5048815b URL: http://source.winehq.org/git/wine.git/?a=commit;h=32706d952e11e91d2eda488d3… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Oct 15 15:37:10 2011 +0200 inetcpl: Update Italian translation. --- dlls/inetcpl.cpl/cpl_It.rc | 50 +++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_It.rc b/dlls/inetcpl.cpl/cpl_It.rc index 566450c..331a0bf 100644 --- a/dlls/inetcpl.cpl/cpl_It.rc +++ b/dlls/inetcpl.cpl/cpl_It.rc @@ -1,7 +1,7 @@ /* * Italian resources for the Internet control panel applet * - * Copyright 2010 Luca Bennati <lucak3(a)gmail.com + * Copyright 2010,2011 Luca Bennati <lucak3(a)gmail.com * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,14 +40,54 @@ BEGIN PUSHBUTTON "Pagina &attuale", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "Pagina &predefinita", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "Pagina &vuota", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " Nella cronologia ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Puoi eliminare pagine in cache, cookies e altri dati.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "Elimina &file...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "&Impostazioni...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Elimina la cronologia" +BEGIN + + AUTOCHECKBOX "File temporanei di internet\nCopie in cache di pagine web, immagini e certificati.", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Cookie\nFile salvati sul tuo computer da siti web, che memorizzano le impostazioni dell'utente e le informazioni di accesso.", + IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Cronologia\nLista dei siti web che hai visitato.", + IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Dati dei moduli\nNome utente e altre informazioni che hai inserito nei moduli.", + IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Password\nPassword salvate che hai inserito nei moduli.", + IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "Annulla", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "Elimina", IDOK, 120, 230, 60, 15, WS_GROUP + +END + +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Sicurezza" +BEGIN + + CONTROL "Listview", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "trackbar", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Luca Bennati : comdlg32: Update Italian translation.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 6da39c228da689a8866d7e8ecae6dc36ef381280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da39c228da689a8866d7e8ec… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Oct 15 15:06:41 2011 +0200 comdlg32: Update Italian translation. --- dlls/comdlg32/cdlg_It.rc | 249 +++++++++++++++++++++++++--------------------- 1 files changed, 134 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6da39c228da689a8866d7…

1 0

Luca Bennati : winecfg: Update Italian translation.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: aabe6e6f181e4ca27a10b7a6adbde08ebfe98c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aabe6e6f181e4ca27a10b7a6a… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Oct 15 15:49:52 2011 +0200 winecfg: Update Italian translation. --- programs/winecfg/It.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index c6515cd..0193989 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -3,7 +3,7 @@ * Italian Language Support * * Copyright 2004 Ivan Leo Pioti - * Copyright 2009 Luca Bennati + * Copyright 2009,2011 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -66,7 +66,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Impostazioni delle finestre ",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "Cattura automaticamente il &mouse nelle finestre a schermo pieno",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Permetti al gestore delle finestre di &decorare le finestre",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "Permetti al &gestore delle finestre di controllare le finestre",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emula un desktop virtuale",IDC_ENABLE_DESKTOP,"Button", @@ -115,7 +115,7 @@ BEGIN CONTROL "In&tegrata poi nativa",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 CONTROL "N&ativa poi integrata",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 CONTROL "&Disabilita",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,16,54,75,10 - DEFPUSHBUTTON "OK",IDOK,8,74,45,14,WS_GROUP + DEFPUSHBUTTON "Ok",IDOK,8,74,45,14,WS_GROUP PUSHBUTTON "Annulla",IDCANCEL,57,74,45,14,WS_GROUP END @@ -125,7 +125,7 @@ CAPTION "Seleziona la lettera dell'unità" FONT 8, "MS Shell Dlg" BEGIN COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,105,10,45,14,WS_GROUP + DEFPUSHBUTTON "Ok",IDOK,105,10,45,14,WS_GROUP PUSHBUTTON "Annulla",IDCANCEL,105,30,45,14,WS_GROUP END @@ -166,13 +166,13 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Diagnostics ",IDC_STATIC,8,4,244,27 + GROUPBOX " Diagnostica del driver ",IDC_STATIC,8,4,244,27 LTEXT "",IDC_AUDIO_DRIVER,18,16,230,8 - GROUPBOX " Defaults ",IDC_STATIC,8,33,244,76 - LTEXT "Output device:",IDC_STATIC,18,45,230,8 - LTEXT "Voice output device:",IDC_STATIC,18,61,230,8 - LTEXT "Input device:",IDC_STATIC,18,77,230,8 - LTEXT "Voice input device:",IDC_STATIC,18,93,230,8 + GROUPBOX " Valori predefiniti ",IDC_STATIC,8,33,244,76 + LTEXT "Unità output:",IDC_STATIC,18,45,230,8 + LTEXT "Unità output voce:",IDC_STATIC,18,61,230,8 + LTEXT "Unità input:",IDC_STATIC,18,77,230,8 + LTEXT "Unità input voce:",IDC_STATIC,18,93,230,8 COMBOBOX IDC_AUDIOOUT_DEVICE,110,43,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_VOICEOUT_DEVICE,110,59,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_AUDIOIN_DEVICE,110,75,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

1 0

Marcus Meissner : user32: Load PaddedBorderWidth from registry too ( Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 118dc1998f04fc5e5b7729f1ce15973c19a02c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=118dc1998f04fc5e5b7729f1c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 11:32:03 2011 +0200 user32: Load PaddedBorderWidth from registry too (Coverity). --- dlls/user32/sysparams.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3c7da43..6a80687 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -254,6 +254,7 @@ static const WCHAR METRICS_MENUWIDTH_VALNAME[]= {'M','e','n','u','W','i',' static const WCHAR METRICS_MENUHEIGHT_VALNAME[]= {'M','e','n','u','H','e','i','g','h','t',0}; static const WCHAR METRICS_ICONSIZE_VALNAME[]= {'S','h','e','l','l',' ','I','c','o','n',' ','S','i','z','e',0}; static const WCHAR METRICS_BORDERWIDTH_VALNAME[]= {'B','o','r','d','e','r','W','i','d','t','h',0}; +static const WCHAR METRICS_PADDEDBORDERWIDTH_VALNAME[]={'P','a','d','d','e','d','B','o','r','d','e','r','W','i','d','t','h',0}; static const WCHAR METRICS_CAPTIONLOGFONT_VALNAME[]= {'C','a','p','t','i','o','n','F','o','n','t',0}; static const WCHAR METRICS_SMCAPTIONLOGFONT_VALNAME[]={'S','m','C','a','p','t','i','o','n','F','o','n','t',0}; static const WCHAR METRICS_MENULOGFONT_VALNAME[]= {'M','e','n','u','F','o','n','t',0}; @@ -1079,6 +1080,7 @@ static void load_nonclient_metrics(void) ncm.iBorderWidth = get_reg_metric(hkey, METRICS_BORDERWIDTH_VALNAME, 1); ncm.iScrollWidth = get_reg_metric(hkey, METRICS_SCROLLWIDTH_VALNAME, 16); ncm.iScrollHeight = get_reg_metric(hkey, METRICS_SCROLLHEIGHT_VALNAME, 16); + ncm.iPaddedBorderWidth = get_reg_metric(hkey, METRICS_PADDEDBORDERWIDTH_VALNAME, 0); /* size of the normal caption buttons */ ncm.iCaptionHeight = get_reg_metric(hkey, METRICS_CAPTIONHEIGHT_VALNAME, 18);

1 0

Marcus Meissner : usp10: Fixed some oom handling (Coverity).
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 76702f33916f69af67352c9c3e8720c5e3b8d267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76702f33916f69af67352c9c3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Oct 16 12:38:24 2011 +0200 usp10: Fixed some oom handling (Coverity). --- dlls/usp10/usp10.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 107f8cc..65d42e4 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1029,6 +1029,8 @@ static BOOL requires_fallback(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, return TRUE; glyphs = heap_alloc(sizeof(WORD) * cChars); + if (!glyphs) + return FALSE; if (ScriptGetCMap(hdc, psc, pwcInChars, cChars, 0, glyphs) != S_OK) { heap_free(glyphs); @@ -1111,6 +1113,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_PASSWORD) { iString = heap_alloc(sizeof(WCHAR)*cString); + if (!iString) + { + hr = E_OUTOFMEMORY; + goto error; + } for (i = 0; i < cString; i++) iString[i] = *((const WCHAR *)pString); pString = iString; @@ -1133,6 +1140,9 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, } if (hr != S_OK) goto error; + /* set back to out of memory for default goto error behaviour */ + hr = E_OUTOFMEMORY; + if (dwFlags & SSA_BREAK) { if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) @@ -1173,6 +1183,18 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, const WCHAR* pStr = (const WCHAR*)pString; analysis->glyphs[i].fallbackFont = NULL; + if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset || !abc) + { + heap_free (glyphs); + heap_free (pwLogClust); + heap_free (piAdvance); + heap_free (psva); + heap_free (pGoffset); + heap_free (abc); + hr = E_OUTOFMEMORY; + goto error; + } + if ((dwFlags & SSA_FALLBACK) && requires_fallback(hdc, sc, &analysis->pItem[i].a, &pStr[analysis->pItem[i].iCharPos], cChar)) { LOGFONTW lf;

1 0