wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Christian Costa : d3dxof: Do not expect a separator when there is no element.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 4d79c2630676a461b447bb4993ed03212555f9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d79c2630676a461b447bb499… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 1 08:18:30 2010 +0100 d3dxof: Do not expect a separator when there is no element. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index ac3d4bd..c2ffdff 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1161,7 +1161,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - if (buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE)) + if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE)) { token = get_TOKEN(buf); if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA))

1 0

Christian Costa : d3dxof: Add other debug channel for parsing.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 65b7bdcef9c054000e101c27b1de87dfb02619fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b7bdcef9c054000e101c27b… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 1 08:18:24 2010 +0100 d3dxof: Add other debug channel for parsing. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index f4fb3d2..ac3d4bd 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -34,7 +34,7 @@ #include <stdio.h> -WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); +WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing); #define TOKEN_NAME 1 #define TOKEN_STRING 2

1 0

Luca Bennati : mshtml: Add Italian translation.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 1d91e3ba4f4df279dc11c8c0f3f268d8b942febd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d91e3ba4f4df279dc11c8c0f… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Jan 31 13:46:45 2010 +0100 mshtml: Add Italian translation. --- dlls/mshtml/It.rc | 71 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/Makefile.in | 1 + 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/It.rc b/dlls/mshtml/It.rc new file mode 100644 index 0000000..36660cc --- /dev/null +++ b/dlls/mshtml/It.rc @@ -0,0 +1,71 @@ +/* + * Copyright 2010 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 + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "Il rendering HTML è correntemente disattivato." + IDS_HTMLDOCUMENT "Documento HTML" + IDS_DOWNLOADING "Scaricando..." + IDS_INSTALLING "Installando..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installer di Wine Gecko" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine non ha trovato un pacchetto Gecko che è necessario per applicazioni che incorporano HTML " \ + "per funzionare correttamente. Wine può automaticamente scaricarlo ed installarlo per te.\n\n" \ + "Nota: è raccomandato usare i pacchetti delle distribuzioni. Leggi http://wiki.winehq.org/Gecko per i dettagli.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Avanzamento", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Installa", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Annulla", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hyperlink" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Informazioni sull'hyperlink", -1, 5, 5, 190, 55 + LTEXT "&Tipo:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index c0b7b2a..290f8ae 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -80,6 +80,7 @@ RC_SRCS = \ Fi.rc \ Fr.rc \ Hu.rc \ + It.rc \ Ja.rc \ Ko.rc \ Lt.rc \

1 0

Luca Bennati : msvfw32: Add Italian translation.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 48b411ce3c522bc2722ef86d1001d16c34372b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b411ce3c522bc2722ef86d1… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Jan 31 13:52:35 2010 +0100 msvfw32: Add Italian translation. --- dlls/msvfw32/Makefile.in | 1 + dlls/msvfw32/msvfw32_It.rc | 56 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index a773c8d..252ab78 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -18,6 +18,7 @@ RC_SRCS = \ msvfw32_Es.rc \ msvfw32_Fr.rc \ msvfw32_Hu.rc \ + msvfw32_It.rc \ msvfw32_Ko.rc \ msvfw32_Lt.rc \ msvfw32_Nl.rc \ diff --git a/dlls/msvfw32/msvfw32_It.rc b/dlls/msvfw32/msvfw32_It.rc new file mode 100644 index 0000000..6f8ee4e --- /dev/null +++ b/dlls/msvfw32/msvfw32_It.rc @@ -0,0 +1,56 @@ +/* + * Copyright 2010 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 "msvideo_private.h" + +/*UTF-8*/ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Compressione video" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Annulla",IDCANCEL,129,18,49,14 + + LTEXT "&Compressore:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Con&figura...",882,129,36,49,14 + PUSHBUTTON "&Informazioni...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "&Qualità della compressione:",886,9,34,80,8 + + CONTROL "&Key Frame Every",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "frames",889,103,62,26,10 + + CONTROL "&Data Rate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Frames completi (non compresso)" +}

1 0

Luca Bennati : reg: Add Italian translation.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 0692a960a87601740d333f8fb2f9efc7fe425860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0692a960a87601740d333f8fb… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Jan 31 13:47:50 2010 +0100 reg: Add Italian translation. --- programs/reg/It.rc | 40 ++++++++++++++++++++++++++++++++++++++++ programs/reg/Makefile.in | 1 + 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/programs/reg/It.rc b/programs/reg/It.rc new file mode 100644 index 0000000..09d38fd --- /dev/null +++ b/programs/reg/It.rc @@ -0,0 +1,40 @@ +/* + * REG.EXE - Wine-compatible reg program. + * Italian language support + * + * Copyright 2010 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 "reg.h" + +/*UTF-8*/ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "La sintassi di questo comando è:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n" + STRING_ADD_USAGE, "REG ADD nome_della_chiave [/v nome_del_valore | /ve] [/t tipo] [/s separatore] [/d dati] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nome_della_chiave [/v nome_del_valore | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nome_della_chiave [/v nome_del_valore | /ve] [/s]\n" + STRING_SUCCESS, "Operazione completata con successo\n" + STRING_INVALID_KEY, "Errore: nome della chiave non valido\n" + STRING_INVALID_CMDLINE, "Errore: parametri della linea di comando non validi\n" + STRING_NO_REMOTE, "Errore: Impossibile aggiungere chiavi alla macchina remota\n" + STRING_CANNOT_FIND, "Errore: Il sistema non è riuscito a trovare la chiave di registro o il valore specificati\n" +} diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 82066db..485f2e3 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ De.rc \ En.rc \ Fr.rc \ + It.rc \ Ja.rc \ Ko.rc \ Lt.rc \

1 0

Luca Bennati : msi: Fix Italian translation.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 2197da77708405500750dd6a42570677bbdf9d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2197da77708405500750dd6a4… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Jan 31 13:45:26 2010 +0100 msi: Fix Italian translation. --- dlls/msi/msi_It.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi_It.rc b/dlls/msi/msi_It.rc index 9864806..a40a730 100644 --- a/dlls/msi/msi_It.rc +++ b/dlls/msi/msi_It.rc @@ -20,17 +20,20 @@ #include "windef.h" +/*UTF-8*/ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "Impossibile aprire il pacchetto di installazione specificato. Per favore controlla l'indirizzo del file e riprova." 5 "percorso %s non trovato" 9 "inserire disco %s" 10 "parametri incorretti" 11 "immettere il nome della cartella che contiene %s" - 12 "sorgente di installazione per la funzionalit� mancante" - 13 "periferica di rete per la funzionalit� mancante" - 14 "funzionalit� da:" + 12 "sorgente di installazione per la funzionalità mancante" + 13 "periferica di rete per la funzionalità mancante" + 14 "funzionalità da:" 15 "selezionare la cartella che contiene %s" }

1 0

Luca Bennati : credui: Add Italian translation.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 293589ebb3dbcec06ebe83ab40f9c29612d11f84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293589ebb3dbcec06ebe83ab4… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun Jan 31 11:55:43 2010 +0100 credui: Add Italian translation. --- dlls/credui/Makefile.in | 1 + dlls/credui/credui_It.rc | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index 34ba773..7b6068c 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = \ credui_En.rc \ credui_Es.rc \ credui_Fr.rc \ + credui_It.rc \ credui_Ko.rc \ credui_Lt.rc \ credui_Nl.rc \ diff --git a/dlls/credui/credui_It.rc b/dlls/credui/credui_It.rc new file mode 100644 index 0000000..f7708f4 --- /dev/null +++ b/dlls/credui/credui_It.rc @@ -0,0 +1,55 @@ +/* + * Italian language resource file for Credentials UI + * + * Copyright 2010 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 "credui_resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Nome Utente:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Password:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Ricorda la mia password",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Annulla",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Connetti a %s" + IDS_MESSAGEFORMAT "Connettendo a %s" + IDS_INCORRECTPASSWORDTITLE "Accesso fallito" + IDS_INCORRECTPASSWORD "Assicurati che il tuo nome utente\ne password siano corrette." + IDS_CAPSLOCKONTITLE "Il Caps Lock è acceso" + IDS_CAPSLOCKON "Avere Caps Lock acceso può portarti a immettere la password incorrettamente.\n\nPremere il tasto Caps Lock sulla tua tastiera per spegnere Caps Lock prima\n di immettere la tua password." +}

1 0

Luca Bennati : wined3d: Add newer ATI/AMD cards vendor recognition.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 9f3c90973f19b30a0b9890490b70e36de0948255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3c90973f19b30a0b9890490… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Jan 30 18:10:59 2010 +0100 wined3d: Add newer ATI/AMD cards vendor recognition. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c2694eb..b708b33 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1129,6 +1129,7 @@ static enum wined3d_pci_vendor wined3d_guess_vendor(const char *gl_vendor, const return VENDOR_INTEL; if (strstr(gl_vendor, "Mesa") + || strstr(gl_vendor, "Advanced Micro Devices, Inc.") || strstr(gl_vendor, "DRI R300 Project") || strstr(gl_vendor, "Tungsten Graphics, Inc") || strstr(gl_vendor, "VMware, Inc."))

1 0

Andrew Nguyen : mapi32/tests: Invoke MAPIInitialize before performing the HexFromBin tests.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: ad2fdafee9fe1f0649b55a56f1c47d1f169bfddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2fdafee9fe1f0649b55a56f… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Jan 30 18:58:43 2010 -0600 mapi32/tests: Invoke MAPIInitialize before performing the HexFromBin tests. This avoids crashes with the native Outlook extended MAPI provider. --- dlls/mapi32/tests/util.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index c116b1f..0d1022a 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -31,6 +31,7 @@ static HMODULE hMapi32 = 0; static SCODE (WINAPI *pScInitMapiUtil)(ULONG); +static void (WINAPI *pDeinitMapiUtil)(void); static void (WINAPI *pSwapPword)(PUSHORT,ULONG); static void (WINAPI *pSwapPlong)(PULONG,ULONG); static void (WINAPI *pHexFromBin)(LPBYTE,int,LPWSTR); @@ -39,12 +40,15 @@ static UINT (WINAPI *pUFromSz)(LPCSTR); static ULONG (WINAPI *pUlFromSzHex)(LPCSTR); static ULONG (WINAPI *pCbOfEncoded)(LPCSTR); static BOOL (WINAPI *pIsBadBoundedStringPtr)(LPCSTR,ULONG); +static SCODE (WINAPI *pMAPIInitialize)(LPVOID); +static void (WINAPI *pMAPIUninitialize)(void); static void init_function_pointers(void) { hMapi32 = LoadLibraryA("mapi32.dll"); pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil@4"); + pDeinitMapiUtil = (void*)GetProcAddress(hMapi32, "DeinitMapiUtil@0"); pSwapPword = (void*)GetProcAddress(hMapi32, "SwapPword@8"); pSwapPlong = (void*)GetProcAddress(hMapi32, "SwapPlong@8"); pHexFromBin = (void*)GetProcAddress(hMapi32, "HexFromBin@12"); @@ -53,6 +57,8 @@ static void init_function_pointers(void) pUlFromSzHex = (void*)GetProcAddress(hMapi32, "UlFromSzHex@4"); pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded@4"); pIsBadBoundedStringPtr = (void*)GetProcAddress(hMapi32, "IsBadBoundedStringPtr@8"); + pMAPIInitialize = (void*)GetProcAddress(hMapi32, "MAPIInitialize"); + pMAPIUninitialize = (void*)GetProcAddress(hMapi32, "MAPIUninitialize"); } static void test_SwapPword(void) @@ -209,9 +215,9 @@ START_TEST(util) init_function_pointers(); - if (!pScInitMapiUtil) + if (!pScInitMapiUtil || !pDeinitMapiUtil) { - win_skip("ScInitMapiUtil is not available\n"); + win_skip("MAPI utility initialization functions are not available\n"); FreeLibrary(hMapi32); return; } @@ -233,11 +239,22 @@ START_TEST(util) test_SwapPword(); test_SwapPlong(); + + /* We call MAPIInitialize here for the benefit of native extended MAPI + * providers which crash in the HexFromBin tests when MAPIInitialize has + * not been called. Since MAPIInitialize is irrelevant for HexFfromBin on + * Wine, we do not care whether MAPIInitialize succeeds. */ + if (pMAPIInitialize) + ret = pMAPIInitialize(NULL); test_HexFromBin(); + if (pMAPIUninitialize && ret == S_OK) + pMAPIUninitialize(); + test_UFromSz(); test_UlFromSzHex(); test_CbOfEncoded(); test_IsBadBoundedStringPtr(); + pDeinitMapiUtil(); FreeLibrary(hMapi32); }

1 0

Andrew Nguyen : mapi32/tests: Fix prototype of FBinFromHex function pointer .
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 491201a8714fc1d03a945642aa9752d520885343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491201a8714fc1d03a945642a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Jan 30 18:58:33 2010 -0600 mapi32/tests: Fix prototype of FBinFromHex function pointer. --- dlls/mapi32/tests/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index 7450efe..c116b1f 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -34,7 +34,7 @@ static SCODE (WINAPI *pScInitMapiUtil)(ULONG); static void (WINAPI *pSwapPword)(PUSHORT,ULONG); static void (WINAPI *pSwapPlong)(PULONG,ULONG); static void (WINAPI *pHexFromBin)(LPBYTE,int,LPWSTR); -static void (WINAPI *pFBinFromHex)(LPWSTR,LPBYTE); +static BOOL (WINAPI *pFBinFromHex)(LPWSTR,LPBYTE); static UINT (WINAPI *pUFromSz)(LPCSTR); static ULONG (WINAPI *pUlFromSzHex)(LPCSTR); static ULONG (WINAPI *pCbOfEncoded)(LPCSTR);

1 0

← Newer
1
...
71
72
73
74
75
76
77
78
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010