wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

André Hentschel : Wine 1.4-rc2 freigegeben
by Jeremy Newman 06 Feb '12

06 Feb '12

Module: website Branch: master Commit: 14a72a534a9cdd1482101e80c2b7476b74f9a55d URL: http://source.winehq.org/git/website.git/?a=commit;h=14a72a534a9cdd1482101e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 5 12:59:37 2012 +0100 Wine 1.4-rc2 freigegeben --- news/de/2012020201.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/de/2012020201.xml b/news/de/2012020201.xml new file mode 100644 index 0000000..497d550 --- /dev/null +++ b/news/de/2012020201.xml @@ -0,0 +1,12 @@ +<news> +<date>2. Februar 2012</date> +<title>Wine 1.4-rc2 freigegeben</title> +<body> + Die Entwicklungsversion 1.4-rc2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.4-rc2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Nur Fehlerbehebungen da wir uns im Code-Freeze befinden.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.4-rc2
by Jeremy Newman 06 Feb '12

06 Feb '12

Module: website Branch: master Commit: 5c2f8282554f5bae10ce6b171f4db3a6e9523870 URL: http://source.winehq.org/git/website.git/?a=commit;h=5c2f8282554f5bae10ce6b… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Feb 3 16:02:19 2012 +0100 Polish translation for release 1.4-rc2 --- news/pl/2012020201.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pl/2012020201.xml b/news/pl/2012020201.xml new file mode 100644 index 0000000..ccce559 --- /dev/null +++ b/news/pl/2012020201.xml @@ -0,0 +1,12 @@ +<news> +<date>Luty 2, 2012</date> +<title>Wydano Wine 1.4-rc2</title> +<body> + Wydanie rozwojowe Wine 1.4-rc2 jest już dostępne. + <a href="{$root}/announce/1.4-rc2">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.4-rc2.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

Joerg Schiermeier : Add lost image file for 'Paypal donate'
by Jeremy Newman 06 Feb '12

06 Feb '12

Module: website Branch: master Commit: 6d993167868a03e63c067548f193d384118f40c7 URL: http://source.winehq.org/git/website.git/?a=commit;h=6d993167868a03e63c0675… Author: Joerg Schiermeier <mywine(a)Schiermeier-Software.de> Date: Fri Feb 3 14:32:19 2012 +0100 Add lost image file for 'Paypal donate' The clickable button for 'Donate Paypal' is missing. This is restored from wine-devel mailinglist archive at 2005-01-19: <http://www.winehq.org/pipermail/wine-devel/2005-January/032957.html> exactly: the attached file <http://www.winehq.org/pipermail/wine-devel/attachments/20050119/ecdf48fe/pp…> Joerg Schiermeier --- images/ppdonate.png | Bin 0 -> 2498 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/ppdonate.png b/images/ppdonate.png new file mode 100644 index 0000000..7ddcdfd Binary files /dev/null and b/images/ppdonate.png differ

1 0

Frédéric Delanoy : French translation for release 1.4-rc2
by Jeremy Newman 06 Feb '12

06 Feb '12

Module: website Branch: master Commit: e76eab26dab85e0b8488b11cd9d881b3e7363ef4 URL: http://source.winehq.org/git/website.git/?a=commit;h=e76eab26dab85e0b8488b1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 3 00:03:29 2012 +0100 French translation for release 1.4-rc2 --- news/fr/2012020201.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/fr/2012020201.xml b/news/fr/2012020201.xml new file mode 100644 index 0000000..d685ac9 --- /dev/null +++ b/news/fr/2012020201.xml @@ -0,0 +1,15 @@ +<news> +<date>2 février 2012</date> +<title>Sortie de Wine 1.4-rc2</title> +<body> + La version de développement 1.4-rc2 de Wine est disponible. + <a href="{$root}/announce/1.4-rc2">Nouveautés</a> de cette version : +<ul> + <li>Corrections de bogues uniquement : la période de gel du code est en cours.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc2.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

Alexandre Julliard : announce.php: Fix the version number regexp.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: website Branch: master Commit: 2c6ca4f10864fdf8a2164ade6d70a322769fe6c9 URL: http://source.winehq.org/git/website.git/?a=commit;h=2c6ca4f10864fdf8a2164a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 23:05:46 2012 +0100 announce.php: Fix the version number regexp. --- include/plugins/announce.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/plugins/announce.php b/include/plugins/announce.php index a243475..3f0f0fd 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -28,7 +28,7 @@ if ($arr = file($announce)) { // Link to previous versions in changes $in_bugs = 0; - $arr[$c] = ereg_replace( '[[:digit:].]+', '<a title="Changes since \\0" href="./\\0">\\0</a>', $arr[$c] ); + $arr[$c] = ereg_replace( '[[:digit:].]+(-rc[[:digit:]]+)?', '<a title="Changes since \\0" href="./\\0">\\0</a>', $arr[$c] ); } if ($in_header)

1 0

Alexandre Julliard : Wine release 1.4-rc2
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: website Branch: master Commit: 68f62d130ee61147185a46079f0c0bb9e1c5cc32 URL: http://source.winehq.org/git/website.git/?a=commit;h=68f62d130ee61147185a46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 20:37:13 2012 +0100 Wine release 1.4-rc2 --- news/en/2012020201.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/en/2012020201.xml b/news/en/2012020201.xml new file mode 100644 index 0000000..fbec59a --- /dev/null +++ b/news/en/2012020201.xml @@ -0,0 +1,12 @@ +<news> +<date>February 2, 2012</date> +<title>Wine 1.4-rc2 Released</title> +<body> + The Wine development release 1.4-rc2 is now available. + <a href="{$root}/announce/1.4-rc2">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc2.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

Tag wine-1.4-rc2 : Alexandre Julliard : Release 1.4-rc2
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: refs/tags/wine-1.4-rc2 Tag: 52d9b5ea6b736e669a6a14651064b413e428b389 URL: http://source.winehq.org/git/wine.git/?a=tag;h=52d9b5ea6b736e669a6a14651064… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 20:27:32 2012 +0100 Release 1.4-rc2

1 0

Alexandre Julliard : Release 1.4-rc2.
by Alexandre Julliard 02 Feb '12

02 Feb '12

Module: wine Branch: master Commit: 4d515c07f591a3ccb83f309ac42a92762e00bd7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d515c07f591a3ccb83f309ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 20:27:31 2012 +0100 Release 1.4-rc2. --- ANNOUNCE | 847 ++++++++++++------------------------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 178 insertions(+), 689 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d515c07f591a3ccb83f3…

1 0

Alexandre Julliard : winex11: Update only the key state on KeymapNotify without sending fake key events.
by Alexandre Julliard 02 Feb '12

02 Feb '12

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

Matteo Bruni : wined3d: Use a separate flag for discarded surfaces.
by Alexandre Julliard 02 Feb '12

02 Feb '12

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

← Newer
1
...
38
39
40
41
42
43
44
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2012