May 2011 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLElement::get_offsetLeft implementation.
by Alexandre Julliard May 31, 2011

May 31, 2011

Module: wine Branch: master Commit: 0a77eb68e3007581a0c4d6e25490f3ec65128e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a77eb68e3007581a0c4d6e25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 31 12:19:13 2011 +0200 mshtml: Added IHTMLElement::get_offsetLeft implementation. --- dlls/mshtml/htmlelem.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 3 +++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 74a4394..0cf0227 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -819,8 +819,27 @@ static HRESULT WINAPI HTMLElement_get_lang(IHTMLElement *iface, BSTR *p) static HRESULT WINAPI HTMLElement_get_offsetLeft(IHTMLElement *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 off_left = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSHTMLElement: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNSHTMLElement_GetOffsetLeft(nselem, &off_left); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) { + ERR("GetOffsetLeft failed: %08x\n", nsres); + return E_FAIL; + } + + *p = off_left; + return S_OK; } static HRESULT WINAPI HTMLElement_get_offsetTop(IHTMLElement *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d7e8dda..03eb48a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -947,6 +947,9 @@ static void _test_elem_offset(unsigned line, IUnknown *unk) hres = IHTMLElement_get_offsetWidth(elem, &l); ok_(__FILE__,line) (hres == S_OK, "get_offsetWidth failed: %08x\n", hres); + hres = IHTMLElement_get_offsetLeft(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_offsetLeft failed: %08x\n", hres); + IHTMLElement_Release(elem); }

1 0

Peter Urbanec : ws2_32/tests: Use WSAGetLastError() when reporting errors.
by Alexandre Julliard May 31, 2011

May 31, 2011

Module: wine Branch: master Commit: d0067a5dc109858a7e41233cb218be6842e7af8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0067a5dc109858a7e41233cb… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Tue May 31 13:14:21 2011 +1000 ws2_32/tests: Use WSAGetLastError() when reporting errors. --- dlls/ws2_32/tests/sock.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3116a0d..07803ff 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2328,18 +2328,18 @@ static void test_select(void) SetLastError(0); ret = select(maxfd+1, 0, 0, 0, &select_timeout); ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); - ok ( GetLastError() == WSAEINVAL, "expected WSAEINVAL, got %i\n", ret); + ok ( WSAGetLastError() == WSAEINVAL, "expected WSAEINVAL, got %i\n", WSAGetLastError()); SetLastError(0); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); - ok ( GetLastError() == WSAEINVAL, "expected WSAEINVAL, got %i\n", ret); + ok ( WSAGetLastError() == WSAEINVAL, "expected WSAEINVAL, got %i\n", WSAGetLastError()); FD_SET(INVALID_SOCKET, &readfds); SetLastError(0); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); - ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", WSAGetLastError()); ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); FD_ZERO(&readfds); @@ -2347,7 +2347,7 @@ static void test_select(void) SetLastError(0); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); - ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", WSAGetLastError()); ok ( !FD_ISSET(fdRead, &writefds), "FD should not be set\n"); FD_ZERO(&writefds); @@ -2355,7 +2355,7 @@ static void test_select(void) SetLastError(0); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ok ( (ret == SOCKET_ERROR), "expected SOCKET_ERROR, got %i\n", ret); - ok ( GetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", ret); + ok ( WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %i\n", WSAGetLastError()); ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); }

1 0

André Hentschel : include: Define FIBER_FLAG_FLOAT_SWITCH.
by Alexandre Julliard May 31, 2011

May 31, 2011

Module: wine Branch: master Commit: 02c88bcef7be8c28a26b0b1deb3e904e7a44ed1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c88bcef7be8c28a26b0b1de… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 31 00:30:30 2011 +0200 include: Define FIBER_FLAG_FLOAT_SWITCH. --- include/winbase.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 4cae6ea..adf7341 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -46,6 +46,8 @@ typedef DWORD (CALLBACK *LPTHREAD_START_ROUTINE)(LPVOID); typedef VOID (WINAPI *PFIBER_START_ROUTINE)( LPVOID lpFiberParameter ); typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE; +#define FIBER_FLAG_FLOAT_SWITCH 1 + typedef RTL_CRITICAL_SECTION CRITICAL_SECTION; typedef PRTL_CRITICAL_SECTION PCRITICAL_SECTION; typedef PRTL_CRITICAL_SECTION LPCRITICAL_SECTION;

1 0

André Hentschel : ws2_32/tests: Initialize atmark ( valgrind).
by Alexandre Julliard May 31, 2011

May 31, 2011

Module: wine Branch: master Commit: e47ef8ae54cbdcf5b5a6b116d56a9ff9252f4bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47ef8ae54cbdcf5b5a6b116d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 31 00:30:26 2011 +0200 ws2_32/tests: Initialize atmark (valgrind). --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d1ac3c4..3116a0d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -470,7 +470,7 @@ static VOID WINAPI oob_server ( server_params *par ) { test_params *gen = par->general; server_memory *mem; - u_long atmark; + u_long atmark = 0; int pos, n_recvd, n_expected = gen->n_chunks * gen->chunk_size, tmp, id = GetCurrentThreadId();

1 0

Vitaliy Margolen : dinput: Keyboard does not support DIPROP_RANGE property.
by Alexandre Julliard May 31, 2011

May 31, 2011

Module: wine Branch: master Commit: eb6cec16566787816513ed90953d830bf297b7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb6cec16566787816513ed909… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon May 30 16:31:17 2011 -0600 dinput: Keyboard does not support DIPROP_RANGE property. --- dlls/dinput/keyboard.c | 2 ++ dlls/dinput/tests/keyboard.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 6215f62..c697cfd 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -509,6 +509,8 @@ static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, memcpy(ps->wsz, didoi.tszName, sizeof(ps->wsz)); return hr; } + case (DWORD_PTR) DIPROP_RANGE: + return DIERR_UNSUPPORTED; default: return IDirectInputDevice2AImpl_GetProperty( IDirectInputDevice8A_from_impl(This), rguid, pdiph ); } diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 2d4a12f..ecfd6c2 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -130,6 +130,28 @@ static void test_set_coop(LPDIRECTINPUT pDI, HWND hwnd) if (pKeyboard) IUnknown_Release(pKeyboard); } +static void test_get_prop(LPDIRECTINPUT pDI, HWND hwnd) +{ + HRESULT hr; + LPDIRECTINPUTDEVICE pKeyboard = NULL; + DIPROPRANGE diprg; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + memset(&diprg, 0, sizeof(diprg)); + diprg.diph.dwSize = sizeof(DIPROPRANGE); + diprg.diph.dwHeaderSize = sizeof(DIPROPHEADER); + diprg.diph.dwHow = DIPH_DEVICE; + diprg.diph.dwObj = 0; + + hr = IDirectInputDevice_GetProperty(pKeyboard, DIPROP_RANGE, &diprg.diph); + ok(hr == DIERR_UNSUPPORTED, "IDirectInputDevice_GetProperty() did not return DIPROP_RANGE but: %08x\n", hr); + + if (pKeyboard) IUnknown_Release(pKeyboard); +} + static void keyboard_tests(DWORD version) { HRESULT hr; @@ -155,6 +177,7 @@ static void keyboard_tests(DWORD version) { acquire_tests(pDI, hwnd); test_set_coop(pDI, hwnd); + test_get_prop(pDI, hwnd); } DestroyWindow(hwnd);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.21
by Jeremy Newman May 31, 2011

May 31, 2011

Module: website Branch: master Commit: 533afb1d8e72fa46c2293013130b788037c67b5f URL: http://source.winehq.org/git/website.git/?a=commit;h=533afb1d8e72fa46c22930… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon May 30 09:37:46 2011 +0200 Polish translation for release 1.3.21 --- news/pl/2011052701.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2011052701.xml b/news/pl/2011052701.xml new file mode 100644 index 0000000..88e73c6 --- /dev/null +++ b/news/pl/2011052701.xml @@ -0,0 +1,18 @@ +<news> +<date>Maj 27, 2011</date> +<title>Wydano Wine 1.3.21</title> +<body> + Wydanie rozwojowe Wine 1.3.21 jest już dostępne. + <a href="{$root}/announce/1.3.21">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla wycofania instalacji w MSI.</li> + <li>8- i 16-bitowe formaty bitmap w silniku DIB.</li> + <li>Poprawki we wsparciu myszki przez XInput2.</li> + <li>Lepsze wsparcie dla kształtowania tekstu w Uniscribe.</li> + <li>Ulepszenia w oknie dialogowym wspólnych elementów.</li> + <li>Więcej funkcji w bibliotece uruchomieniowej MSVC.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.21.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

André Hentschel : Wine 1.3.21 freigegeben
by Jeremy Newman May 31, 2011

May 31, 2011

Module: website Branch: master Commit: c7b175246c83af17484e0169891b7f67c2692354 URL: http://source.winehq.org/git/website.git/?a=commit;h=c7b175246c83af17484e01… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat May 28 01:38:53 2011 +0200 Wine 1.3.21 freigegeben --- news/de/2011052701.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2011052701.xml b/news/de/2011052701.xml new file mode 100644 index 0000000..6a9c8c5 --- /dev/null +++ b/news/de/2011052701.xml @@ -0,0 +1,18 @@ +<news> +<date>27. Mai 2011</date> +<title>Wine 1.3.21 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.21 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.21">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Installations Rollbacks in MSI.</li> + <li>8- und 16-Bit Bitmap Formate in der DIB Engine.</li> + <li>Fehlerbehebungen an der XInput2 Mausunterstützung.</li> + <li>Bessere Unterstützung für Textgestaltung in Uniscribe.</li> + <li>Verbesserungen am Item Common Dialog.</li> + <li>Mehr MSVC Runtime Funktionen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.21.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

André Hentschel : fix so the html is valid
by Jeremy Newman May 31, 2011

May 31, 2011

Module: website Branch: master Commit: 53accb249c28a0bce5535a766ec894cb3e6d1de2 URL: http://source.winehq.org/git/website.git/?a=commit;h=53accb249c28a0bce5535a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat May 28 01:38:43 2011 +0200 fix so the html is valid --- news/en/2011052701.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/news/en/2011052701.xml b/news/en/2011052701.xml index 639a606..0c65d67 100644 --- a/news/en/2011052701.xml +++ b/news/en/2011052701.xml @@ -3,7 +3,7 @@ <title>Wine 1.3.21 Released</title> <body> The Wine development release 1.3.21 is now available. - <a href="{$root}/announce/1.3.21">What's new</a> in this release: + <a href="{$root}/announce/1.3.21">What's new</a> in this release: <ul> <li>Support for installation rollbacks in MSI.</li> <li>8- and 16-bit bitmap formats in the DIB engine.</li> @@ -12,7 +12,7 @@ <li>Improvements to the Item common dialog.</li> <li>More MSVC runtime functions.</li> <li>Various bug fixes.</li> -</ul> -The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.21.tar.bz2">available now</a>. +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.21.tar.bz2">available now</a>. Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. </body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.21
by Jeremy Newman May 31, 2011

May 31, 2011

Module: website Branch: master Commit: 15bfa31b4ef0a907a442fee731f104b515131409 URL: http://source.winehq.org/git/website.git/?a=commit;h=15bfa31b4ef0a907a442fe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat May 28 10:14:39 2011 +0200 French translation for release 1.3.21 --- news/fr/2011052701.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/news/fr/2011052701.xml b/news/fr/2011052701.xml new file mode 100644 index 0000000..4316191 --- /dev/null +++ b/news/fr/2011052701.xml @@ -0,0 +1,21 @@ +<news> +<date>27 mai 2011</date> +<title>Sortie de Wine 1.3.21</title> +<body> + La version de développement 1.3.21 de Wine est disponible. + <a href="{$root}/announce/1.3.21">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des annulations d'installation dans MSI.</li> + <li>Formats bitmap 8 et 16 bits dans le moteur DIB.</li> + <li>Correctifs dans le support souris XInput2.</li> + <li>Meilleure prise en charge du façonnage de texte dans Uniscribe.</li> + <li>Amélioration à la boîte de dialogue Éléments communs.</li> + <li>Plus de fonctions du moteur d'exécution MSVC.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.21.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

David Hedberg : crypt32: Add BCryptEnumAlgorithms stub.
by Alexandre Julliard May 30, 2011

May 30, 2011

Module: wine Branch: master Commit: 66db40e89190e970e599aafcc2c682d030924f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=66db40e89190e970e599aafcc… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon May 30 12:45:30 2011 +0200 crypt32: Add BCryptEnumAlgorithms stub. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 12 ++++++++++++ include/bcrypt.h | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 7d85e12..e1ffb8a 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -14,7 +14,7 @@ @ stub BCryptDuplicateHash @ stub BCryptDuplicateKey @ stub BCryptEncrypt -@ stub BCryptEnumAlgorithms +@ stdcall BCryptEnumAlgorithms(long ptr ptr long) @ stub BCryptEnumContextFunctionProviders @ stub BCryptEnumContextFunctions @ stub BCryptEnumContexts diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index abe9750..441b3ef 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -22,6 +22,7 @@ #include "wine/debug.h" #include "winbase.h" +#include "bcrypt.h" WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); @@ -38,3 +39,14 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } + +NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, + BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) +{ + FIXME("%08x, %p, %p, %08x - stub\n", dwAlgOperations, pAlgCount, ppAlgList, dwFlags); + + *ppAlgList=NULL; + *pAlgCount=0; + + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/bcrypt.h b/include/bcrypt.h index a3d7fe0..43d1f94 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -40,4 +40,11 @@ typedef LONG NTSTATUS; #endif +typedef struct _BCRYPT_ALGORITHM_IDENTIFIER +{ + LPWSTR pszName; + ULONG dwClass; + ULONG dwFlags; +} BCRYPT_ALGORITHM_IDENTIFIER; + #endif /* __WINE_BCRYPT_H */

1 0