February 2010 - Wine-commits

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 : 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 : 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

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

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 : d3drm: Add some definitions for IDirect3DRMMeshBuilderImpl_Load.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 29c4055f7bb6707ee6fc90eef8836ab7a434bb7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c4055f7bb6707ee6fc90eef… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 1 08:18:36 2010 +0100 d3drm: Add some definitions for IDirect3DRMMeshBuilderImpl_Load. --- include/d3drmdef.h | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/include/d3drmdef.h b/include/d3drmdef.h index 59cc9de..80086dc 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -177,6 +177,33 @@ typedef struct _D3DRMMATERIALOVERRIDE { typedef DWORD D3DRMLOADOPTIONS; +#define D3DRMLOAD_FROMFILE 0x000L +#define D3DRMLOAD_FROMRESOURCE 0x001L +#define D3DRMLOAD_FROMMEMORY 0x002L +#define D3DRMLOAD_FROMSTREAM 0x004L +#define D3DRMLOAD_FROMURL 0x008L + +#define D3DRMLOAD_BYNAME 0x010L +#define D3DRMLOAD_BYPOSITION 0x020L +#define D3DRMLOAD_BYGUID 0x040L +#define D3DRMLOAD_FIRST 0x080L + +#define D3DRMLOAD_INSTANCEBYREFERENCE 0x100L +#define D3DRMLOAD_INSTANCEBYCOPYING 0x200L + +#define D3DRMLOAD_ASYNCHRONOUS 0x400L + +typedef struct _D3DRMLOADRESOURCE { + HMODULE hModule; + LPCSTR /*LPCTSTR*/ lpName; + LPCSTR /*LPCTSTR*/ lpType; +} D3DRMLOADRESOURCE, *LPD3DRMLOADRESOURCE; + +typedef struct _D3DRMLOADMEMORY { + LPVOID lpMemory; + DWORD dSize; +} D3DRMLOADMEMORY, *LPD3DRMLOADMEMORY; + typedef struct _D3DRMPMESHLOADSTATUS { DWORD dwSize; DWORD dwPMeshSize;

1 0

Alexandre Julliard : ntdll: Avoid reporting a freed block twice to Valgrind .
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 156d66ec24f93657e3001d5ba4ea2e4cf5ffd248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156d66ec24f93657e3001d5ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 12:35:32 2010 +0100 ntdll: Avoid reporting a freed block twice to Valgrind. --- dlls/ntdll/heap.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 5e57fd0..4c73184 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -281,9 +281,8 @@ static void subheap_notify_free_all(SUBHEAP const *subheap) else { ARENA_INUSE const *pArena = (ARENA_INUSE const *)ptr; - if (pArena->magic != ARENA_INUSE_MAGIC && pArena->magic != ARENA_PENDING_MAGIC) - ERR("bad inuse_magic @%p\n", pArena); - notify_free(pArena + 1); + if (pArena->magic == ARENA_INUSE_MAGIC) notify_free(pArena + 1); + else if (pArena->magic != ARENA_PENDING_MAGIC) ERR("bad inuse_magic @%p\n", pArena); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); } }

1 0

Alexandre Julliard : kernel32/tests: Fix heap flag tests for the page alloc case.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: a86adcca616c7dd0eeeb14717cbe071d325f4dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86adcca616c7dd0eeeb14717… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 12:35:43 2010 +0100 kernel32/tests: Fix heap flag tests for the page alloc case. --- dlls/kernel32/tests/heap.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index c6d7b65..68ed459 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -527,7 +527,6 @@ static void test_heap_checks( DWORD flags ) { ok( p[14] == 0, "wrong padding %x\n", p[14] ); ok( p[15] == 0, "wrong padding %x\n", p[15] ); - ok( p[16] == 0, "wrong padding %x\n", p[16] ); } } else skip( "realloc in place failed\n "); @@ -549,7 +548,7 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_VALIDATE) { size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == ~(SIZE_T)0, "Wrong size %lu\n", size ); + ok( size == ~(SIZE_T)0 || broken(size == ~0u), "Wrong size %lu\n", size ); p2 = HeapReAlloc( GetProcessHeap(), 0, p, 14 ); ok( p2 == NULL, "HeapReAlloc succeeded\n" ); @@ -752,13 +751,13 @@ static void test_child_heap( const char *arg ) expect_heap = heap_flags_from_global_flag( expected ); - if (!(heap->flags & HEAP_GROWABLE) || heap->pattern == 0xffeeffee || heap->pattern == 0xeeeeeeee) /* vista layout */ + if (!(heap->flags & HEAP_GROWABLE) || heap->pattern == 0xffeeffee) /* vista layout */ { - if (expected & FLG_HEAP_PAGE_ALLOCS) - ok( heap->flags == 0xeeeeeeee, "%s: got heap flags %08x expected 0xeeeeeeee\n", - arg, heap->flags ); - else - ok( heap->flags == 0, "%s: got heap flags %08x expected 0\n", arg, heap->flags ); + ok( heap->flags == 0, "%s: got heap flags %08x expected 0\n", arg, heap->flags ); + } + else if (heap->pattern == 0xeeeeeeee && heap->flags == 0xeeeeeeee) + { + ok( expected & FLG_HEAP_PAGE_ALLOCS, "%s: got heap flags 0xeeeeeeee without page alloc\n", arg ); } else { @@ -811,6 +810,7 @@ START_TEST(heap) test_debug_heap( argv[0], FLG_HEAP_DISABLE_COALESCING ); test_debug_heap( argv[0], FLG_HEAP_PAGE_ALLOCS ); test_debug_heap( argv[0], 0xdeadbeef ); + Sleep(5000); } else win_skip( "RtlGetNtGlobalFlags not found, skipping heap debug tests\n" ); }

1 0

Andrew Nguyen : pdh: Implement and test PdhGetDllVersion.
by Alexandre Julliard 01 Feb '10

01 Feb '10

Module: wine Branch: master Commit: 2da6570ca4cb9cf277c0504b2cbe2cfd84d48956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da6570ca4cb9cf277c0504b2… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Jan 30 18:24:52 2010 -0600 pdh: Implement and test PdhGetDllVersion. --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 13 +++++++++++++ dlls/pdh/tests/pdh.c | 23 +++++++++++++++++++++++ include/pdh.h | 5 +++++ 4 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 3d75bb1..b475d53 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -57,7 +57,7 @@ @ stub PdhGetDefaultPerfObjectHA @ stub PdhGetDefaultPerfObjectHW @ stub PdhGetDefaultPerfObjectW -@ stub PdhGetDllVersion +@ stdcall PdhGetDllVersion(ptr) @ stub PdhGetFormattedCounterArrayA @ stub PdhGetFormattedCounterArrayW @ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index fd6deba..bdf83a9 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -726,6 +726,19 @@ PDH_STATUS WINAPI PdhGetCounterTimeBase( PDH_HCOUNTER handle, LONGLONG *base ) } /*********************************************************************** + * PdhGetDllVersion (PDH.@) + */ +PDH_STATUS WINAPI PdhGetDllVersion( LPDWORD version ) +{ + if (!version) + return PDH_INVALID_ARGUMENT; + + *version = PDH_VERSION; + + return ERROR_SUCCESS; +} + +/*********************************************************************** * PdhGetFormattedCounterValue (PDH.@) */ PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format, diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index cd03bcb..094ad74 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -934,6 +934,28 @@ static void test_PdhMakeCounterPathA(void) ok(ret == PDH_INVALID_ARGUMENT, "PdhMakeCounterPathA failed 0x%08x\n", ret); } +static void test_PdhGetDllVersion(void) +{ + PDH_STATUS ret; + DWORD version; + + ret = PdhGetDllVersion(NULL); + ok(ret == PDH_INVALID_ARGUMENT || + broken(ret == ERROR_SUCCESS), /* Vista+ */ + "Expected PdhGetDllVersion to return PDH_INVALID_ARGUMENT, got %d\n", ret); + + ret = PdhGetDllVersion(&version); + ok(ret == ERROR_SUCCESS, + "Expected PdhGetDllVersion to return ERROR_SUCCESS, got %d\n", ret); + + if (ret == ERROR_SUCCESS) + { + ok(version == PDH_CVERSION_WIN50 || + version == PDH_VERSION, + "Expected version number to be PDH_CVERSION_WIN50 or PDH_VERSION, got %u\n", version); + } +} + START_TEST(pdh) { if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) @@ -975,4 +997,5 @@ START_TEST(pdh) test_PdhCollectQueryDataEx(); test_PdhMakeCounterPathA(); + test_PdhGetDllVersion(); } diff --git a/include/pdh.h b/include/pdh.h index f4764af..7f3d334 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -37,6 +37,10 @@ typedef HANDLE PDH_HQUERY; typedef HANDLE PDH_HCOUNTER; typedef HANDLE PDH_HLOG; +#define PDH_CVERSION_WIN40 0x0400 +#define PDH_CVERSION_WIN50 0x0500 +#define PDH_VERSION 0x0503 + #define PDH_MAX_SCALE 7 #define PDH_MIN_SCALE (-7) @@ -186,6 +190,7 @@ PDH_STATUS WINAPI PdhGetCounterInfoA(PDH_HCOUNTER, BOOLEAN, LPDWORD, PPDH_COUNTE PDH_STATUS WINAPI PdhGetCounterInfoW(PDH_HCOUNTER, BOOLEAN, LPDWORD, PPDH_COUNTER_INFO_W); #define PdhGetCounterInfo WINELIB_NAME_AW(PdhGetCounterInfo) PDH_STATUS WINAPI PdhGetCounterTimeBase(PDH_HCOUNTER, LONGLONG *); +PDH_STATUS WINAPI PdhGetDllVersion(LPDWORD); PDH_STATUS WINAPI PdhGetFormattedCounterValue(PDH_HCOUNTER, DWORD, LPDWORD, PPDH_FMT_COUNTERVALUE); PDH_STATUS WINAPI PdhGetRawCounterValue(PDH_HCOUNTER, LPDWORD, PPDH_RAW_COUNTER); PDH_STATUS WINAPI PdhLookupPerfIndexByNameA(LPCSTR, LPCSTR, LPDWORD);

1 0

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

01 Feb '10

Module: wine Branch: master Commit: 4ed80f3bcb0b090d29af0dbbb730a11fe59136fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed80f3bcb0b090d29af0dbbb… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Jan 30 18:58:11 2010 -0600 mapi32/tests: Invoke MAPIInitialize before performing the FPropContainsProp tests. This avoids crashes with the native Outlook extended MAPI provider. --- dlls/mapi32/tests/prop.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 8c64245..15d6d98 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -32,6 +32,7 @@ static HMODULE hMapi32 = 0; static SCODE (WINAPI *pScInitMapiUtil)(ULONG); +static void (WINAPI *pDeinitMapiUtil)(void); static SCODE (WINAPI *pPropCopyMore)(LPSPropValue,LPSPropValue,ALLOCATEMORE*,LPVOID); static ULONG (WINAPI *pUlPropSize)(LPSPropValue); static BOOL (WINAPI *pFPropContainsProp)(LPSPropValue,LPSPropValue,ULONG); @@ -53,7 +54,9 @@ static SCODE (WINAPI *pCreateIProp)(LPCIID,ALLOCATEBUFFER*,ALLOCATEMORE*, FREEBUFFER*,LPVOID,LPPROPDATA*); static SCODE (WINAPI *pMAPIAllocateBuffer)(ULONG, LPVOID); static SCODE (WINAPI *pMAPIAllocateMore)(ULONG, LPVOID, LPVOID); +static SCODE (WINAPI *pMAPIInitialize)(LPVOID); static SCODE (WINAPI *pMAPIFreeBuffer)(LPVOID); +static void (WINAPI *pMAPIUninitialize)(void); static BOOL InitFuncPtrs(void) { @@ -79,13 +82,15 @@ static BOOL InitFuncPtrs(void) pCreateIProp = (void*)GetProcAddress(hMapi32, "CreateIProp(a)24"); pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil(a)4"); + pDeinitMapiUtil = (void*)GetProcAddress(hMapi32, "DeinitMapiUtil(a)0"); pMAPIAllocateBuffer = (void*)GetProcAddress(hMapi32, "MAPIAllocateBuffer"); pMAPIAllocateMore = (void*)GetProcAddress(hMapi32, "MAPIAllocateMore"); pMAPIFreeBuffer = (void*)GetProcAddress(hMapi32, "MAPIFreeBuffer"); - if(pScInitMapiUtil && pMAPIAllocateBuffer && pMAPIAllocateMore && pMAPIFreeBuffer) - return TRUE; - else - return FALSE; + pMAPIInitialize = (void*)GetProcAddress(hMapi32, "MAPIInitialize"); + pMAPIUninitialize = (void*)GetProcAddress(hMapi32, "MAPIUninitialize"); + + return pMAPIAllocateBuffer && pMAPIAllocateMore && pMAPIFreeBuffer && + pScInitMapiUtil && pDeinitMapiUtil; } /* FIXME: Test PT_I2, PT_I4, PT_R4, PT_R8, PT_CURRENCY, PT_APPTIME, PT_SYSTIME, @@ -1441,7 +1446,17 @@ START_TEST(prop) test_PropCopyMore(); test_UlPropSize(); + + /* We call MAPIInitialize here for the benefit of native extended MAPI + * providers which crash in the FPropContainsProp tests when MAPIInitialize + * has not been called. Since MAPIInitialize is irrelevant for FPropContainsProp + * on Wine, we do not care whether MAPIInitialize succeeds. */ + if (pMAPIInitialize) + ret = pMAPIInitialize(NULL); test_FPropContainsProp(); + if (pMAPIUninitialize && ret == S_OK) + pMAPIUninitialize(); + test_FPropCompareProp(); test_LPropCompareProp(); test_PpropFindProp(); @@ -1457,5 +1472,7 @@ START_TEST(prop) test_FBadColumnSet(); test_IProp(); + + pDeinitMapiUtil(); FreeLibrary(hMapi32); }

1 0