February 2012 - Wine-Commits

Aric Stewart : usp10: We do not yet shape hangul properly so allow for SSA_LINK flags to take effect .
by Alexandre Julliard Feb. 2, 2012

Feb. 2, 2012

Module: wine Branch: master Commit: 17cd9d3325994a6862706d4946c55d8f1e35adf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17cd9d3325994a6862706d494… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 1 14:52:35 2012 -0600 usp10: We do not yet shape hangul properly so allow for SSA_LINK flags to take effect. --- dlls/usp10/usp10.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1f2b863..cad234f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1856,6 +1856,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, } } + /* FIXME: When we properly shape Hangul remove this check */ + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && analysis->pItem[i].a.eScript == Script_Hangul) + analysis->pItem[i].a.fNoGlyphIndex = TRUE; + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex) analysis->pItem[i].a.fNoGlyphIndex = TRUE;

1 0

Francois Gouget : po: Mark an incorrect Czech translation as fuzzy.
by Alexandre Julliard Feb. 2, 2012

Feb. 2, 2012

Module: wine Branch: master Commit: e0d12246f82908f4ff99275f22627ff6d85f6557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d12246f82908f4ff99275f2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 2 10:07:19 2012 +0100 po: Mark an incorrect Czech translation as fuzzy. --- po/cs.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/cs.po b/po/cs.po index 432e699..4ea8434 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13649,6 +13649,7 @@ msgid "Error while selecting new font." msgstr "Chyba při volbě nového písma." #: winefile.rc:95 +#, fuzzy msgid "Wine File Manager" msgstr "Winefile"

1 0

Juan Lang : crypt32: Test and correct CryptVerifyCertificateSignature.
by Alexandre Julliard Feb. 2, 2012

Feb. 2, 2012

Module: wine Branch: master Commit: 441f7b6d9eefa8ee05fd265e14079b5290f21784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441f7b6d9eefa8ee05fd265e1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 1 20:15:27 2012 -0800 crypt32: Test and correct CryptVerifyCertificateSignature. --- dlls/crypt32/cert.c | 4 ++- dlls/crypt32/tests/cert.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 63107e1..557a17b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2239,8 +2239,10 @@ BOOL WINAPI CryptVerifyCertificateSignature(HCRYPTPROV_LEGACY hCryptProv, DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, PCERT_PUBLIC_KEY_INFO pPublicKey) { + CRYPT_DATA_BLOB blob = { cbEncoded, (BYTE *)pbEncoded }; + return CryptVerifyCertificateSignatureEx(hCryptProv, dwCertEncodingType, - CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, (void *)pbEncoded, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_BLOB, &blob, CRYPT_VERIFY_CERT_SIGN_ISSUER_PUBKEY, pPublicKey, 0, NULL); } diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 8239af8..759b0da 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1765,6 +1765,73 @@ static void testVerifyCertSig(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, DWORD size = 0; BOOL ret; + if (!pCryptEncodeObjectEx) + { + win_skip("no CryptEncodeObjectEx support\n"); + return; + } + ret = CryptVerifyCertificateSignature(0, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ret = CryptVerifyCertificateSignature(csp, 0, NULL, 0, NULL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ret = CryptVerifyCertificateSignature(csp, X509_ASN_ENCODING, NULL, 0, + NULL); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_BAD_ARG), + "Expected CRYPT_E_ASN1_EOD or OSS_BAD_ARG, got %08x\n", GetLastError()); + info.ToBeSigned.cbData = toBeSigned->cbData; + info.ToBeSigned.pbData = toBeSigned->pbData; + info.SignatureAlgorithm.pszObjId = (LPSTR)sigOID; + info.SignatureAlgorithm.Parameters.cbData = 0; + info.Signature.cbData = sigLen; + info.Signature.pbData = (BYTE *)sig; + info.Signature.cUnusedBits = 0; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &cert, &size); + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (cert) + { + PCERT_PUBLIC_KEY_INFO pubKeyInfo = NULL; + DWORD pubKeySize; + + if (0) + { + /* Crashes prior to Vista */ + ret = CryptVerifyCertificateSignature(csp, X509_ASN_ENCODING, + cert, size, NULL); + } + CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, X509_ASN_ENCODING, + (LPSTR)sigOID, 0, NULL, NULL, &pubKeySize); + pubKeyInfo = HeapAlloc(GetProcessHeap(), 0, pubKeySize); + if (pubKeyInfo) + { + ret = CryptExportPublicKeyInfoEx(csp, AT_SIGNATURE, + X509_ASN_ENCODING, (LPSTR)sigOID, 0, NULL, pubKeyInfo, + &pubKeySize); + ok(ret, "CryptExportKey failed: %08x\n", GetLastError()); + if (ret) + { + ret = CryptVerifyCertificateSignature(csp, X509_ASN_ENCODING, + cert, size, pubKeyInfo); + ok(ret, "CryptVerifyCertificateSignature failed: %08x\n", + GetLastError()); + } + HeapFree(GetProcessHeap(), 0, pubKeyInfo); + } + LocalFree(cert); + } +} + +static void testVerifyCertSigEx(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, + LPCSTR sigOID, const BYTE *sig, DWORD sigLen) +{ + CERT_SIGNED_CONTENT_INFO info; + LPBYTE cert = NULL; + DWORD size = 0; + BOOL ret; + if (!pCryptVerifyCertificateSignatureEx) { win_skip("no CryptVerifyCertificateSignatureEx support\n"); @@ -1875,6 +1942,7 @@ static void testCertSigs(void) testSignCert(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, &sigSize); testVerifyCertSig(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, sigSize); + testVerifyCertSigEx(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, sigSize); CryptReleaseContext(csp, 0); ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,

1 0

Stefan Dösinger : ddraw/tests: Add some IDirect3DViewport interface tests.
by Alexandre Julliard Feb. 2, 2012

Feb. 2, 2012

Module: wine Branch: master Commit: acf82ff1f5cfa02e3adc66e1222b9e60cf0019fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf82ff1f5cfa02e3adc66e12… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 2 12:56:00 2012 +0100 ddraw/tests: Add some IDirect3DViewport interface tests. --- dlls/ddraw/tests/ddraw1.c | 92 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 89 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 88 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/refcount.c | 3 + 4 files changed, 272 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acf82ff1f5cfa02e3adc6…

1 0

Matteo Bruni : wined3d: Use a separate flag for discarded surfaces.
by Alexandre Julliard Feb. 2, 2012

Feb. 2, 2012

Module: wine Branch: master Commit: b51a6576269e0b92532332adf849735ad78a20a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b51a6576269e0b92532332adf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 2 15:08:58 2012 +0100 wined3d: Use a separate flag for discarded surfaces. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2d014ab..d0768aa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4862,7 +4862,7 @@ HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, st if (device->swapchains[0]->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || prev->flags & SFLAG_DISCARD) { - surface_modify_ds_location(prev, SFLAG_LOST, + surface_modify_ds_location(prev, SFLAG_DISCARDED, prev->resource.width, prev->resource.height); if (prev == device->onscreen_depth_stencil) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e6b4cd8..30dc63e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -762,7 +762,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) } if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) - surface->flags |= SFLAG_LOST; + surface->flags |= SFLAG_DISCARDED; return WINED3D_OK; } @@ -5599,7 +5599,7 @@ void surface_modify_ds_location(struct wined3d_surface *surface, { TRACE("surface %p, new location %#x, w %u, h %u.\n", surface, location, w, h); - if (location & ~(SFLAG_LOCATIONS | SFLAG_LOST)) + if (location & ~(SFLAG_LOCATIONS | SFLAG_DISCARDED)) FIXME("Invalid location (%#x) specified.\n", location); if (((surface->flags & SFLAG_INTEXTURE) && !(location & SFLAG_INTEXTURE)) @@ -5614,7 +5614,7 @@ void surface_modify_ds_location(struct wined3d_surface *surface, surface->ds_current_size.cx = w; surface->ds_current_size.cy = h; - surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_LOST); + surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_DISCARDED); surface->flags |= location; } @@ -5655,7 +5655,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co return; } - if (surface->flags & SFLAG_LOST) + if (surface->flags & SFLAG_DISCARDED) { TRACE("Surface was discarded, no need copy data.\n"); switch (location) @@ -5672,7 +5672,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co default: FIXME("Unhandled location %#x\n", location); } - surface->flags &= ~SFLAG_LOST; + surface->flags &= ~SFLAG_DISCARDED; surface->flags |= location; surface->ds_current_size.cx = surface->resource.width; surface->ds_current_size.cy = surface->resource.height; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 83678f8..efe2293 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -668,7 +668,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R if (swapchain->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || fb->depth_stencil->flags & SFLAG_DISCARD) { - surface_modify_ds_location(fb->depth_stencil, SFLAG_LOST, + surface_modify_ds_location(fb->depth_stencil, SFLAG_DISCARDED, fb->depth_stencil->resource.width, fb->depth_stencil->resource.height); if (fb->depth_stencil == swapchain->device->onscreen_depth_stencil) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b218ca7..416d970 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2155,6 +2155,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_INRB_MULTISAMPLE 0x00200000 /* The multisample renderbuffer is current. */ #define SFLAG_INRB_RESOLVED 0x00400000 /* The resolved renderbuffer is current. */ #define SFLAG_PIN_SYSMEM 0x02000000 /* Keep the surface in sysmem, at the same address. */ +#define SFLAG_DISCARDED 0x04000000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long

1 0

Alexandre Julliard : winex11: Update only the key state on KeymapNotify without sending fake key events.
by Alexandre Julliard Feb. 2, 2012

Feb. 2, 2012

Module: wine Branch: master Commit: 36c76dcc24c1f66ccbfeb55495da4794c74dc868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c76dcc24c1f66ccbfeb5549… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 17:19:34 2012 +0100 winex11: Update only the key state on KeymapNotify without sending fake key events. --- dlls/winex11.drv/keyboard.c | 54 ++++++++++++++++++++++++++++------------ include/wine/server_protocol.h | 4 ++- server/protocol.def | 1 + server/queue.c | 5 +++ server/request.h | 3 +- server/trace.c | 1 + 6 files changed, 50 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 160b986..57deb59 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1176,6 +1176,31 @@ static BOOL get_async_key_state( BYTE state[256] ) } /*********************************************************************** + * set_async_key_state + */ +static void set_async_key_state( const BYTE state[256] ) +{ + SERVER_START_REQ( set_key_state ) + { + req->tid = GetCurrentThreadId(); + req->async = 1; + wine_server_add_data( req, state, 256 ); + wine_server_call( req ); + } + SERVER_END_REQ; +} + +static void update_key_state( BYTE *keystate, BYTE key, int down ) +{ + if (down) + { + if (!(keystate[key] & 0x80)) keystate[key] ^= 0x01; + keystate[key] |= 0x80; + } + else keystate[key] &= ~0x80; +} + +/*********************************************************************** * X11DRV_KeymapNotify * * Update modifiers state (Ctrl, Alt, Shift) when window is activated. @@ -1187,12 +1212,11 @@ static BOOL get_async_key_state( BYTE state[256] ) void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) { int i, j; - DWORD time = GetCurrentTime(); BYTE keystate[256]; WORD vkey; + BOOL changed = FALSE; struct { WORD vkey; - WORD scan; BOOL pressed; } modifiers[6]; /* VK_LSHIFT through VK_RMENU are contiguous */ @@ -1220,15 +1244,9 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) case VK_LSHIFT: case VK_RSHIFT: m = (vkey & 0xff) - VK_LSHIFT; - /* Take the vkey and scan from the first keycode we encounter - for this modifier. */ - if (!modifiers[m].vkey) - { - modifiers[m].vkey = vkey; - modifiers[m].scan = keyc2scan[(i * 8) + j]; - } - if (event->xkeymap.key_vector[i] & (1<<j)) - modifiers[m].pressed = TRUE; + /* Take the vkey from the first keycode we encounter for this modifier */ + if (!modifiers[m].vkey) modifiers[m].vkey = vkey; + if (event->xkeymap.key_vector[i] & (1<<j)) modifiers[m].pressed = TRUE; break; } } @@ -1239,16 +1257,20 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) int m = vkey - VK_LSHIFT; if (modifiers[m].vkey && !(keystate[vkey] & 0x80) != !modifiers[m].pressed) { - DWORD flags = modifiers[m].vkey & 0x100 ? KEYEVENTF_EXTENDEDKEY : 0; - if (!modifiers[m].pressed) flags |= KEYEVENTF_KEYUP; - TRACE( "Adjusting state for vkey %#.2x. State before %#.2x\n", modifiers[m].vkey, keystate[vkey]); - /* Fake key being pressed inside wine */ - X11DRV_send_keyboard_input( hwnd, vkey, modifiers[m].scan & 0xff, flags, time ); + update_key_state( keystate, vkey, modifiers[m].pressed ); + changed = TRUE; } } + + if (!changed) return; + + update_key_state( keystate, VK_CONTROL, (keystate[VK_LCONTROL] | keystate[VK_RCONTROL]) & 0x80 ); + update_key_state( keystate, VK_MENU, (keystate[VK_LMENU] | keystate[VK_RMENU]) & 0x80 ); + update_key_state( keystate, VK_SHIFT, (keystate[VK_LSHIFT] | keystate[VK_RSHIFT]) & 0x80 ); + set_async_key_state( keystate ); } static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fc51291..0e989da 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3838,7 +3838,9 @@ struct set_key_state_request { struct request_header __header; thread_id_t tid; + int async; /* VARARG(keystate,bytes); */ + char __pad_20[4]; }; struct set_key_state_reply { @@ -5644,6 +5646,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 430 +#define SERVER_PROTOCOL_VERSION 431 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 73f2d8e..80c0cd3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2706,6 +2706,7 @@ enum coords_relative /* Set queue keyboard state for a given thread */ @REQ(set_key_state) thread_id_t tid; /* id of thread */ + int async; /* whether to change the async state too */ VARARG(keystate,bytes); /* state array for all the keys */ @END diff --git a/server/queue.c b/server/queue.c index 2cd82b4..4fd32ed 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2724,6 +2724,11 @@ DECL_HANDLER(set_key_state) { if (!(thread = get_thread_from_id( req->tid ))) return; if (thread->queue) memcpy( thread->queue->input->keystate, get_req_data(), size ); + if (req->async && (desktop = get_thread_desktop( thread, 0 ))) + { + memcpy( desktop->keystate, get_req_data(), size ); + release_object( desktop ); + } release_object( thread ); } } diff --git a/server/request.h b/server/request.h index c1cca4c..5b45cf9 100644 --- a/server/request.h +++ b/server/request.h @@ -1756,7 +1756,8 @@ C_ASSERT( sizeof(struct get_key_state_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_key_state_reply, state) == 8 ); C_ASSERT( sizeof(struct get_key_state_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_key_state_request, tid) == 12 ); -C_ASSERT( sizeof(struct set_key_state_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_key_state_request, async) == 16 ); +C_ASSERT( sizeof(struct set_key_state_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct set_foreground_window_request, handle) == 12 ); C_ASSERT( sizeof(struct set_foreground_window_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_foreground_window_reply, previous) == 8 ); diff --git a/server/trace.c b/server/trace.c index b8dc316..cfef963 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3162,6 +3162,7 @@ static void dump_get_key_state_reply( const struct get_key_state_reply *req ) static void dump_set_key_state_request( const struct set_key_state_request *req ) { fprintf( stderr, " tid=%04x", req->tid ); + fprintf( stderr, ", async=%d", req->async ); dump_varargs_bytes( ", keystate=", cur_size ); }

1 0

Marcel Hasler : dinput: Support INFINITE as number of effect iterations.
by Alexandre Julliard Feb. 2, 2012

Feb. 2, 2012

Module: wine Branch: master Commit: c47677fee50b4f3c5a3844d9cfb8ea200b83c472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c47677fee50b4f3c5a3844d9c… Author: Marcel Hasler <mahasler(a)gmail.com> Date: Tue Jan 31 00:36:56 2012 +0100 dinput: Support INFINITE as number of effect iterations. --- dlls/dinput/effect_linuxinput.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index c224bd8..ca43b17 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -29,6 +29,7 @@ # include <linux/input.h> # undef SW_MAX #endif +#include <limits.h> #include <errno.h> #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -518,7 +519,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Start( event.type = EV_FF; event.code = This->effect.id; - event.value = dwIterations; + event.value = min( dwIterations, INT_MAX ); if (write(*(This->fd), &event, sizeof(event)) == -1) { FIXME("Unable to write event. Assuming device disconnected.\n"); return DIERR_INPUTLOST;

1 0

Francois Gouget : po: Remove English strings from the Hungarian shell folder translations.
by Alexandre Julliard Feb. 2, 2012

Feb. 2, 2012

Module: wine Branch: master Commit: fc0d21aa221582874d50a0f2f0c8bd1aa22d3f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0d21aa221582874d50a0f2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 2 10:11:37 2012 +0100 po: Remove English strings from the Hungarian shell folder translations. --- po/hu.po | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/po/hu.po b/po/hu.po index af92eef..d4b264c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8244,7 +8244,7 @@ msgstr "" #: shell32.rc:202 msgid "Favorites" -msgstr "Favorites" +msgstr "" #: shell32.rc:203 msgid "StartUp" @@ -8252,15 +8252,15 @@ msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 msgid "My Music" -msgstr "My Music" +msgstr "" #: shell32.rc:206 msgid "My Videos" -msgstr "My Videos" +msgstr "" #: shell32.rc:207 #, fuzzy @@ -8270,15 +8270,15 @@ msgstr "Asztal" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -8286,11 +8286,11 @@ msgstr "" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 msgid "My Pictures" -msgstr "My Pictures" +msgstr "" #: shell32.rc:215 #, fuzzy @@ -8299,7 +8299,7 @@ msgstr "Egyszerű név" #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents" -msgstr "Documents" +msgstr "" #: shell32.rc:217 #, fuzzy @@ -8308,20 +8308,19 @@ msgstr "Start Menu\\Programs\\Administrative Tools" #: shell32.rc:218 msgid "Music" -msgstr "Music" +msgstr "" #: shell32.rc:219 msgid "Pictures" -msgstr "Pictures" +msgstr "" #: shell32.rc:220 msgid "Videos" -msgstr "Videos" +msgstr "" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 #, fuzzy

1 0

Alexandre Julliard : winealsa: Avoid memory leak with snd_card_get_name.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 19015ae19eaf6f479bd6ef7eb07004d5292826f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19015ae19eaf6f479bd6ef7eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 1 16:55:53 2012 +0100 winealsa: Avoid memory leak with snd_card_get_name. --- dlls/winealsa.drv/mmdevdrv.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0bedcc5..7621423 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -363,7 +363,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ char cardpath[64]; - const char *cardname; + char *cardname; WCHAR *cardnameW; snd_ctl_t *ctl; DWORD len; @@ -376,24 +376,28 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, continue; } - if((err = snd_card_get_name(card, (char **)&cardname)) < 0){ + if(snd_card_get_name(card, &cardname) < 0) { + /* FIXME: Should be localized */ + static const WCHAR nameW[] = {'U','n','k','n','o','w','n',' ','s','o','u','n','d','c','a','r','d',0}; WARN("Unable to get card name for ALSA device %s: %d (%s)\n", cardpath, err, snd_strerror(err)); - /* FIXME: Should be localized */ - cardname = "Unknown soundcard"; - } + alsa_get_card_devices(stream, ids, keys, num, ctl, card, nameW); + }else{ + len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); + cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); - cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if(!cardnameW){ - snd_ctl_close(ctl); - return E_OUTOFMEMORY; - } - MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); + if(!cardnameW){ + free(cardname); + snd_ctl_close(ctl); + return E_OUTOFMEMORY; + } + MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - alsa_get_card_devices(stream, ids, keys, num, ctl, card, cardnameW); + alsa_get_card_devices(stream, ids, keys, num, ctl, card, cardnameW); - HeapFree(GetProcessHeap(), 0, cardnameW); + HeapFree(GetProcessHeap(), 0, cardnameW); + free(cardname); + } snd_ctl_close(ctl); }

1 0

Alexandre Julliard : winex11: Poll the mouse button to detect the end of a window manager move/resize.
by Alexandre Julliard Feb. 1, 2012

Feb. 1, 2012

Module: wine Branch: master Commit: 852687f1d112c3a945698cc551b2b7d122a1dff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852687f1d112c3a945698cc55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 1 15:49:19 2012 +0100 winex11: Poll the mouse button to detect the end of a window manager move/resize. --- dlls/winex11.drv/mouse.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 060b4c8..332b71d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1332,8 +1332,10 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) void move_resize_window( Display *display, struct x11drv_win_data *data, int dir ) { DWORD pt; - int x, y, button = 0; + int x, y, rootX, rootY, ret, button = 0; XEvent xev; + Window root, child; + unsigned int xstate; pt = GetMessagePos(); x = (short)LOWORD( pt ); @@ -1365,6 +1367,48 @@ void move_resize_window( Display *display, struct x11drv_win_data *data, int dir XUngrabPointer( display, CurrentTime ); XSendEvent(display, root_window, False, SubstructureNotifyMask | SubstructureRedirectMask, &xev); wine_tsx11_unlock(); + + /* try to detect the end of the size/move by polling for the mouse button to be released */ + /* (some apps don't like it if we return before the size/move is done) */ + + if (!button) return; + for (;;) + { + MSG msg; + INPUT input; + + wine_tsx11_lock(); + ret = XQueryPointer( display, root_window, &root, &child, &rootX, &rootY, &x, &y, &xstate ); + wine_tsx11_unlock(); + if (!ret) break; + + if (!(xstate & (Button1Mask << (button - 1)))) + { + /* fake a button release event */ + input.type = INPUT_MOUSE; + input.u.mi.dx = x + virtual_screen_rect.left; + input.u.mi.dy = y + virtual_screen_rect.top; + input.u.mi.mouseData = button_up_data[button - 1]; + input.u.mi.dwFlags = button_up_flags[button - 1] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; + input.u.mi.time = GetTickCount(); + input.u.mi.dwExtraInfo = 0; + __wine_send_input( data->hwnd, &input ); + } + + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + if (!CallMsgFilterW( &msg, MSGF_SIZE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + } + + if (!(xstate & (Button1Mask << (button - 1)))) break; + MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); + } + + TRACE( "hwnd %p/%lx done\n", data->hwnd, data->whole_window ); }

1 0