June 2013 - Wine-commits - list.winehq.org

Łukasz Wojniłowicz : Polish translation for release 1.6-rc3
by Jeremy Newman 26 Jun '13

26 Jun '13

Module: website Branch: master Commit: 225e6698ced483ee5f128825481c5c64a37a6bbc URL: http://source.winehq.org/git/website.git/?a=commit;h=225e6698ced483ee5f1288… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Jun 25 21:06:34 2013 +0200 Polish translation for release 1.6-rc3 --- news/pl/2013062101.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2013062101.xml b/news/pl/2013062101.xml new file mode 100644 index 0000000..ae3b14f --- /dev/null +++ b/news/pl/2013062101.xml @@ -0,0 +1,12 @@ +<news> +<date>Czerwiec 21, 2013</date> +<title>Wydano Wine 1.6-rc3</title> +<body> + Wydanie rozwojowe Wine 1.6-rc3 jest już dostępne. + <a href="{$root}/announce/1.6-rc3">Co nowego</a> w tym wydaniu: +<ul> + <li>Tylko poprawki błędów, jesteśmy w fazie zamrożenia kodu.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.6-rc3.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Put out a call for translators in Polish.
by Jeremy Newman 26 Jun '13

26 Jun '13

Module: website Branch: master Commit: d7008d5795f1b614f21f6f26b7c7be8586610142 URL: http://source.winehq.org/git/website.git/?a=commit;h=d7008d5795f1b614f21f6f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Jun 25 21:06:35 2013 +0200 Put out a call for translators in Polish. --- news/pl/2013061601.xml | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/news/pl/2013061601.xml b/news/pl/2013061601.xml new file mode 100644 index 0000000..264978a --- /dev/null +++ b/news/pl/2013061601.xml @@ -0,0 +1,11 @@ +<news> +<date>Czerwiec 16, 2013</date> +<title>Potrzebni tłumacze!</title> +<body> +Teraz, gdy Wine jest zamrożone w przygotowaniu do wydania 1.6, nie ma lepszego +czasu na odświeżenie <a href="http://fgouget.free.fr/wine-po/">20</a> tłumaczeń i dodaniu +nowych. +Od tłumaczenia jesteś oddalony tylko o jeden plik PO. Tak więc sprawdź +<a href="http://wiki.winehq.org/Translating">jak zacząć</a> i pomóż dostarczać +Wine populacjom, do których nie trafiało wcześniej! +</body></news>

1 0

Erich Hoover : ws2_32: Fix interface-bound filter to accept locally generated targeted packets.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 74010aa0e774b8b4e32455e6a42306f714ee66dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=74010aa0e774b8b4e32455e6a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Jun 23 20:19:16 2013 -0600 ws2_32: Fix interface-bound filter to accept locally generated targeted packets. --- dlls/ws2_32/socket.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 98bb426..7ad118f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -178,6 +178,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); struct interface_filter { struct sock_filter iface_memaddr; struct sock_filter iface_rule; + struct sock_filter ip_memaddr; + struct sock_filter ip_rule; struct sock_filter return_keep; struct sock_filter return_dump; }; @@ -187,9 +189,17 @@ struct interface_filter { # define FILTER_JUMP_KEEP(here) (u_char)(offsetof(struct interface_filter, return_keep) \ -offsetof(struct interface_filter, here)-sizeof(struct sock_filter)) \ /sizeof(struct sock_filter) +# define FILTER_JUMP_NEXT() (u_char)(0) +# define SKF_NET_DESTIP 16 /* offset in the network header to the destination IP */ static struct interface_filter generic_interface_filter = { + /* This filter rule allows incoming packets on the specified interface, which works for all + * remotely generated packets and for locally generated broadcast packets. */ BPF_STMT(BPF_LD+BPF_W+BPF_ABS, SKF_AD_OFF+SKF_AD_IFINDEX), - BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0xdeadbeef, FILTER_JUMP_KEEP(iface_rule), FILTER_JUMP_DUMP(iface_rule)), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0xdeadbeef, FILTER_JUMP_KEEP(iface_rule), FILTER_JUMP_NEXT()), + /* This rule allows locally generated packets targeted at the specific IP address of the chosen + * adapter (local packets not destined for the broadcast address do not have IFINDEX set) */ + BPF_STMT(BPF_LD+BPF_W+BPF_ABS, SKF_NET_OFF+SKF_NET_DESTIP), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0xdeadbeef, FILTER_JUMP_KEEP(ip_rule), FILTER_JUMP_DUMP(ip_rule)), BPF_STMT(BPF_RET+BPF_K, (u_int)-1), /* keep packet */ BPF_STMT(BPF_RET+BPF_K, 0) /* dump packet */ }; @@ -2191,6 +2201,7 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) goto cleanup; /* Failed to suggest egress interface */ specific_interface_filter = generic_interface_filter; specific_interface_filter.iface_rule.k = adapter->Index; + specific_interface_filter.ip_rule.k = htonl(adapter_addr); filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); filter_prog.filter = (struct sock_filter *) &specific_interface_filter; if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog)) != 0)

1 0

Frédéric Delanoy : tools: Update winemaker manpage French translation.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 9c4936717aba2a7e36970f11d8e064447724aef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c4936717aba2a7e36970f11d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jun 23 10:09:24 2013 +0200 tools: Update winemaker manpage French translation. --- tools/winemaker.fr.man.in | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/winemaker.fr.man.in b/tools/winemaker.fr.man.in index 61616ba..6a1ce72 100644 --- a/tools/winemaker.fr.man.in +++ b/tools/winemaker.fr.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINEMAKER 1 "mai 2010" "@PACKAGE_STRING@" "Manuel des développeurs de Wine" +.TH WINEMAKER 1 "jan 2012" "@PACKAGE_STRING@" "Manuel des développeurs de Wine" .SH NOM winemaker \- générer une infrastructure de construction pour la compilation de programmes Windows sur UNIX .SH SYNOPSIS @@ -17,7 +17,7 @@ winemaker \- générer une infrastructure de construction pour la compilation de ] .br [ -.BR "--guiexe " "| " "--windows " "| " "--cuiexe " "| " "--console " "| " "--dll " +.BR "--guiexe " "| " "--windows " "| " "--cuiexe " "| " "--console " "| " "--dll " "| " "--lib " ] .br [ @@ -48,7 +48,7 @@ processus de conversion de vos sources Windows en programmes Winelib. -\ renommer vos fichiers sources et répertoires en minuscules s'ils ont été convertis en majuscules durant le transfert. .PP --\ convertir les fins de ligne DOS en fins de lignes UNIX (CRLF vers LF). +-\ convertir les fins de ligne DOS en fins de ligne UNIX (CRLF vers LF). .PP -\ balayer les directives d'inclusion et les références aux fichiers de ressources pour y remplacer les backslashs par des slashs. @@ -61,7 +61,7 @@ avec la casse correcte si nécessaire. .PP .RB "-\ " winemaker recherchera également d'autres problèmes plus exotiques comme l'emploi -de «\ #pragma pack\ », l'utilisation de «\ afxres.h\ » dans des projets +de « #pragma pack », l'utilisation de « afxres.h » dans des projets non MFC, etc. Quand il trouve de tels points nébuleux, il émettra des avertissements. .PP @@ -104,12 +104,12 @@ Renommer tous les fichiers et répertoires en minuscules. .B --lower-uppercase Ne renommer que les fichiers et répertoires qui ont un nom composé uniquement de majuscules. -Ainsi, «\ HELLO.C\ » serait renommé, mais pas «\ World.c\ ». +Ainsi, « HELLO.C » serait renommé, mais pas « World.c ». .TP .B --lower-none Ne pas renommer de fichiers et répertoires en minuscules. Notez que cela n'empêche pas le renommage d'un fichier si son extension ne peut être traitée -telle quelle, comme par exemple «\ .Cxx\ ». Comportement par défaut. +telle quelle, comme par exemple « .Cxx ». Comportement par défaut. .TP .B "--lower-include " Convertir en minuscules les noms de fichiers associés à des directives @@ -132,10 +132,14 @@ Présumer une application en mode console quand une cible exécutable ou une cib type inconnu est rencontrée. .TP .B --dll -Présumer une bibliothèque quand une cible d'un type inconnu est rencontrée (c.-à-d. -si +Présumer une DLL quand une cible d'un type inconnu est rencontrée (c.-à-d. si .B winemaker -ne peut déterminer s'il s'agit d'un exécutable ou d'une bibliothèque). +ne peut déterminer s'il s'agit d'un exécutable, d'une DLL ou d'une bibliothèque statique). +.TP +.B --lib +Présumer une bibliothèque statique quand une cible d'un type inconnu est rencontrée (c.-à-d. si +.B winemaker +ne peut déterminer s'il s'agit d'un exécutable, d'une DLL ou d'une bibliothèque statique). .TP .B --mfc Spécifier que les cibles utilisent les MFC. Dans ce cas, @@ -147,7 +151,7 @@ et lie la cible avec la bibliothèque MFC. Spécifier que les cibles n'utilisent pas les MFC. Cette option empêche l'utilisation des bibliothèques MFC même si .B winemaker -rencontre des fichiers «\ stdafx.cpp\ » ou «\ stdafx.h\ » qui activeraient +rencontre des fichiers « stdafx.cpp » ou « stdafx.h » qui activeraient les MFC automatiquement en temps normal si ni --nomfc ni --mfc n'était spécifiée. .TP @@ -189,7 +193,7 @@ demandera de confirmer la liste de cibles pour chaque répertoire, et ensuite de fournir des options spécifiques de répertoire et/ou de cible. .TP .BR --single-target " nom" -Spécifier qu'il n'y a qu'une seule cible, appelée «\ nom\ ». +Spécifier qu'il n'y a qu'une seule cible, appelée « nom ». .TP .B --generated-files Générer le Makefile. Comportement par défaut. @@ -213,7 +217,7 @@ Recherche des fichiers sources dans le répertoire courant et ses sous-répertoires. Quand un fichier ou répertoire a un nom composé uniquement de majuscules, le renomme en minuscules. Ensuite, adapte tous ces fichiers sources pour une compilation avec Winelib, et génère des -Makefiles. «\ -DSTRICT\ » spécifie que la macro STRICT doit +Makefiles. « -DSTRICT » spécifie que la macro STRICT doit être définie lors de la compilation des sources. Finalement, un Makefile est créé. .PP

1 0

Stefan Leichter : msvcp100/tests: Fix dynamically loaded functions for platform arm.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 34c5acdd4e53e8d458b6b026f4771808769255bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c5acdd4e53e8d458b6b026f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jun 24 21:44:28 2013 +0200 msvcp100/tests: Fix dynamically loaded functions for platform arm. --- dlls/msvcp100/tests/misc.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 89933d0..47f6410 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -111,12 +111,21 @@ static BOOL init(void) SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ"); SET(p__Container_base12__Swap_all, "?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z"); }else { +#ifdef __arm__ + SET(p__Container_base12_copy_ctor, "??0_Container_base12(a)std@@QAA(a)ABU01@@Z"); + SET(p__Container_base12_ctor, "??0_Container_base12(a)std@@QAE(a)XZ"); + SET(p__Container_base12__Orphan_all, "?_Orphan_all(a)_Container_base12@std@@QAAXXZ"); + SET(p__Container_base12_dtor, "??1_Container_base12(a)std@@QAA(a)XZ"); + SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QBAPAPAU_Iterator_base12(a)2@XZ"); + SET(p__Container_base12__Swap_all, "?_Swap_all(a)_Container_base12@std@@QAAXAAU12@@Z"); +#else SET(p__Container_base12_copy_ctor, "??0_Container_base12(a)std@@QAE(a)ABU01@@Z"); SET(p__Container_base12_ctor, "??0_Container_base12(a)std@@QAE(a)XZ"); SET(p__Container_base12__Orphan_all, "?_Orphan_all(a)_Container_base12@std@@QAEXXZ"); SET(p__Container_base12_dtor, "??1_Container_base12(a)std@@QAE(a)XZ"); SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ"); SET(p__Container_base12__Swap_all, "?_Swap_all(a)_Container_base12@std@@QAEXAAU12@@Z"); +#endif /* __arm__ */ } init_thiscall_thunk();

1 0

André Hentschel : oleaut32/tests: Get rid of IS_ANCIENT in vartest.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: ca77d6c1daaa33ae455f6d509b035edb2f6a65f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca77d6c1daaa33ae455f6d509… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 24 22:01:45 2013 +0200 oleaut32/tests: Get rid of IS_ANCIENT in vartest. --- dlls/oleaut32/tests/vartest.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 0d38b9d..247e08e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -61,8 +61,6 @@ static WCHAR sz12_true[32]; static int HAVE_OLEAUT32_RECORD = 0; /* Have I8/UI8 data type? */ static int HAVE_OLEAUT32_I8 = 0; -/* Is this an ancient version with support for only I2/I4/R4/R8/DATE? */ -static int IS_ANCIENT = 0; /* When comparing floating point values we cannot expect an exact match * because the rounding errors depend on the exact algorithm. @@ -130,7 +128,6 @@ static void init(void) skip("No support for I8 and UI8 data types\n"); HAVE_OLEAUT32_RECORD = HAVE_FUNC(SafeArraySetRecordInfo); - IS_ANCIENT = (!HAVE_FUNC(VarI1FromI2)); #undef HAVE_FUNC } @@ -470,8 +467,7 @@ static void test_VariantClear(void) V_VT(&v) = VT_UI4; V_UI4(&v) = ~0u; hres = VariantClear(&v); - ok((hres == S_OK && V_VT(&v) == VT_EMPTY) || - (IS_ANCIENT && hres == DISP_E_BADVARTYPE && V_VT(&v) == VT_UI4), + ok((hres == S_OK && V_VT(&v) == VT_EMPTY), "VariantClear: Type set to %d, res %08x\n", V_VT(&v), hres); ok(V_UI4(&v) == ~0u, "VariantClear: Overwrote value\n"); @@ -479,7 +475,7 @@ static void test_VariantClear(void) * Also demonstrates that null pointers in 'v' are not dereferenced. * Individual variant tests should test VariantClear() with non-NULL values. */ - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { VARTYPE vt; @@ -589,7 +585,7 @@ static void test_VariantCopy(void) */ /* vSrc == vDst */ - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { @@ -617,7 +613,7 @@ static void test_VariantCopy(void) memset(&vSrc, 0, sizeof(vSrc)); V_VT(&vSrc) = VT_UI1; - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { @@ -643,7 +639,7 @@ static void test_VariantCopy(void) } /* Test that VariantClear() checks vSrc for validity before copying */ - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { @@ -720,7 +716,7 @@ static void test_VariantCopyInd(void) memset(buffer, 0, sizeof(buffer)); /* vSrc == vDst */ - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { if (ExtraFlags[i] & VT_ARRAY) continue; /* Native crashes on NULL safearray */ @@ -771,7 +767,7 @@ static void test_VariantCopyInd(void) V_VT(&vSrc) = VT_UI1|VT_BYREF; V_BYREF(&vSrc) = &buffer; - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { for (vt = 0; vt <= VT_BSTR_BLOB; vt++) { @@ -797,7 +793,7 @@ static void test_VariantCopyInd(void) } /* bad src */ - for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]) && !IS_ANCIENT; i++) + for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { if (ExtraFlags[i] & VT_ARRAY) continue; /* Native crashes on NULL safearray */

1 0

André Hentschel : oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in vartest.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 18690c833ac477dc210e334071d8c576eb5b538f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18690c833ac477dc210e33407… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 24 22:01:51 2013 +0200 oleaut32/tests: Get rid of HAVE_OLEAUT32_RECORD in vartest. --- dlls/oleaut32/tests/vartest.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 247e08e..9b2d4e8 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -57,8 +57,6 @@ static WCHAR sz12_true[32]; #define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } -/* Have IRecordInfo data type? */ -static int HAVE_OLEAUT32_RECORD = 0; /* Have I8/UI8 data type? */ static int HAVE_OLEAUT32_I8 = 0; @@ -127,8 +125,6 @@ static void init(void) if (!HAVE_OLEAUT32_I8) skip("No support for I8 and UI8 data types\n"); - HAVE_OLEAUT32_RECORD = HAVE_FUNC(SafeArraySetRecordInfo); - #undef HAVE_FUNC } @@ -404,8 +400,7 @@ static int IsValidVariantClearVT(VARTYPE vt, VARTYPE extraFlags) extraFlags == (VT_ARRAY|VT_BYREF))) ret = 1; /* ok */ - if ((vt == VT_RECORD && !HAVE_OLEAUT32_RECORD) || - ((vt == VT_I8 || vt == VT_UI8) && !HAVE_OLEAUT32_I8)) + if (!HAVE_OLEAUT32_I8 && (vt == VT_I8 || vt == VT_UI8)) ret = 0; /* Old versions of oleaut32 */ return ret; } @@ -2042,8 +2037,7 @@ static void test_VarNot(void) hExpected = S_OK; break; case VT_RECORD: - if (HAVE_OLEAUT32_RECORD) - hExpected = DISP_E_TYPEMISMATCH; + hExpected = DISP_E_TYPEMISMATCH; break; case VT_UNKNOWN: case VT_BSTR: case VT_DISPATCH: case VT_ERROR: hExpected = DISP_E_TYPEMISMATCH;

1 0

André Hentschel : oleaut32/tests: Don' t use autoheader styled define in vartest.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: a58e9f0312f200a657dcd16235f75898acd1306b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58e9f0312f200a657dcd1623… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 24 22:02:25 2013 +0200 oleaut32/tests: Don't use autoheader styled define in vartest. --- dlls/oleaut32/tests/vartest.c | 282 ++++++++++++++++++++--------------------- 1 files changed, 138 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a58e9f0312f200a657dcd…

1 0

Dmitry Timoshkov : kernel32/tests: Add more VirtualAlloc and VirtualProtect tests.
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: c69cc5506bd0507c1247311ab58425d97fa21168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69cc5506bd0507c1247311ab… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 25 14:43:49 2013 +0900 kernel32/tests: Add more VirtualAlloc and VirtualProtect tests. --- dlls/kernel32/tests/virtual.c | 69 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index c0c1a89..521ce6e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1581,7 +1581,7 @@ static void test_VirtualProtect(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, 0 }, /* 0xe0 */ { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, 0 } /* 0xf0 */ }; - char *base; + char *base, *ptr; DWORD ret, old_prot, rw_prot, exec_prot, i, j; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; @@ -1652,6 +1652,27 @@ static void test_VirtualProtect(void) DWORD prot = exec_prot | rw_prot; SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, prot); + if ((rw_prot && exec_prot) || (!rw_prot && !exec_prot)) + { + ok(!ptr, "VirtualAlloc(%02x) should fail\n", prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + else + { + if (prot & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY)) + { + ok(!ptr, "VirtualAlloc(%02x) should fail\n", prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + else + { + ok(ptr != NULL, "VirtualAlloc(%02x) error %d\n", prot, GetLastError()); + ok(ptr == base, "expected %p, got %p\n", base, ptr); + } + } + + SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, prot, &old_prot); if ((rw_prot && exec_prot) || (!rw_prot && !exec_prot)) { @@ -1734,7 +1755,7 @@ static void test_VirtualAlloc_protection(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE }, /* 0xe0 */ { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE } /* 0xf0 */ }; - char *base; + char *base, *ptr; DWORD ret, i; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; @@ -1772,6 +1793,10 @@ static void test_VirtualAlloc_protection(void) ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); } + SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); + ok(ptr == base, "%d: VirtualAlloc failed %d\n", i, GetLastError()); + VirtualFree(base, 0, MEM_FREE); } else @@ -1824,7 +1849,7 @@ static void test_CreateFileMapping_protection(void) { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ, FALSE, PAGE_NOACCESS }, /* 0xe0 */ { PAGE_EXECUTE_WRITECOPY | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_READ | PAGE_EXECUTE, FALSE, PAGE_NOACCESS } /* 0xf0 */ }; - char *base; + char *base, *ptr; DWORD ret, i, alloc_prot, prot, old_prot; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; @@ -1896,6 +1921,27 @@ static void test_CreateFileMapping_protection(void) ok(info.Protect == td[i].prot, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot); } + SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); + /* FIXME: remove once Wine is fixed */ + if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) + ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); + else +todo_wine + ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); + ret = VirtualProtect(base, si.dwPageSize, td[i].prot, &old_prot); + if (td[i].prot == PAGE_READONLY || td[i].prot == PAGE_WRITECOPY) + ok(ret, "%d: VirtualProtect(%02x) error %d\n", i, td[i].prot, GetLastError()); + else + { + ok(!ret, "%d: VirtualProtect(%02x) should fail\n", i, td[i].prot); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%d: expected ERROR_INVALID_PARAMETER, got %d\n", i, GetLastError()); + } + UnmapViewOfFile(base); CloseHandle(hmap); } @@ -2196,7 +2242,7 @@ static void test_mapping(void) { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE, PAGE_EXECUTE_READWRITE }, /* 0x2e */ { FILE_MAP_EXECUTE | SECTION_MAP_EXECUTE | FILE_MAP_READ | FILE_MAP_WRITE | FILE_MAP_COPY, PAGE_EXECUTE_READWRITE } /* 0x2f */ }; - void *base, *nt_base; + void *base, *nt_base, *ptr; DWORD i, j, k, ret, old_prot, prev_prot; SYSTEM_INFO si; char temp_path[MAX_PATH]; @@ -2376,6 +2422,21 @@ static void test_mapping(void) } } + for (k = 0; k < sizeof(page_prot)/sizeof(page_prot[0]); k++) + { + /*trace("map %#x, view %#x, requested prot %#x\n", page_prot[i], view[j].prot, page_prot[k]);*/ + SetLastError(0xdeadbeef); + ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, page_prot[k]); + /* FIXME: remove once Wine is fixed */ + if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) + ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); + else +todo_wine + ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + } + UnmapViewOfFile(base); }

1 0

Marcus Meissner : ole32: LeaveCriticalSection in one exit case (Coverity).
by Alexandre Julliard 25 Jun '13

25 Jun '13

Module: wine Branch: master Commit: 5ef6f99108874362857525eb5447d5e1cf77a609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef6f99108874362857525eb5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 25 09:59:34 2013 +0200 ole32: LeaveCriticalSection in one exit case (Coverity). --- dlls/ole32/ifs.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 8ec6bd8..35ed04b 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -217,13 +217,16 @@ static LPVOID WINAPI IMalloc_fnRealloc(LPMALLOC iface,LPVOID pv,DWORD cb) { IMallocSpy_Release(Malloc32.pSpy); Malloc32.SpyReleasePending = FALSE; Malloc32.pSpy = NULL; + LeaveCriticalSection(&IMalloc32_SpyCS); } if (0==cb) { - /* PreRealloc can force Realloc to fail */ - LeaveCriticalSection(&IMalloc32_SpyCS); + /* PreRealloc can force Realloc to fail */ + if (Malloc32.pSpy) + LeaveCriticalSection(&IMalloc32_SpyCS); return NULL; } + pv = pRealMemory; }

1 0