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

Henri Verbeet : wined3d: Remove COM from the device implementation.
by Alexandre Julliard 17 May '11

17 May '11

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DDevice typedefs.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 0e0e5c3e381faa7090835dfa81b19cb85220b218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0e5c3e381faa7090835dfa8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 16 23:01:23 2011 +0200 wined3d: Get rid of the IWineD3DDevice typedefs. --- dlls/wined3d/arb_program_shader.c | 67 +- dlls/wined3d/ati_fragment_shader.c | 21 +- dlls/wined3d/buffer.c | 21 +- dlls/wined3d/context.c | 53 +- dlls/wined3d/device.c | 1467 ++++++++++++++++------------------ dlls/wined3d/directx.c | 8 +- dlls/wined3d/drawprim.c | 8 +- dlls/wined3d/glsl_shader.c | 26 +- dlls/wined3d/nvidia_texture_shader.c | 4 +- dlls/wined3d/palette.c | 5 +- dlls/wined3d/query.c | 17 +- dlls/wined3d/resource.c | 2 +- dlls/wined3d/shader.c | 31 +- dlls/wined3d/state.c | 19 +- dlls/wined3d/stateblock.c | 15 +- dlls/wined3d/surface.c | 81 +- dlls/wined3d/swapchain.c | 11 +- dlls/wined3d/texture.c | 23 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/vertexdeclaration.c | 12 +- dlls/wined3d/volume.c | 5 +- dlls/wined3d/wined3d_main.c | 6 +- dlls/wined3d/wined3d_private.h | 85 +- 23 files changed, 945 insertions(+), 1044 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e0e5c3e381faa7090835…

1 0

Henri Verbeet : wined3d: Get rid of the renderbuffer_entry_t typedef.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: ef6c6f9ac9d040b36d3da6b2a1cc0a3d78b2822b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6c6f9ac9d040b36d3da6b2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 16 23:01:24 2011 +0200 wined3d: Get rid of the renderbuffer_entry_t typedef. --- dlls/wined3d/surface.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 7 ++++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 520a4ad..862ba07 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -48,8 +48,8 @@ static void surface_cleanup(struct wined3d_surface *surface) if (surface->texture_name || (surface->flags & SFLAG_PBO) || !list_empty(&surface->renderbuffers)) { + struct wined3d_renderbuffer_entry *entry, *entry2; const struct wined3d_gl_info *gl_info; - renderbuffer_entry_t *entry, *entry2; struct wined3d_context *context; context = context_acquire(surface->resource.device, NULL); @@ -69,7 +69,7 @@ static void surface_cleanup(struct wined3d_surface *surface) GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); } - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, renderbuffer_entry_t, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) { TRACE("Deleting renderbuffer %u.\n", entry->id); gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); @@ -1529,9 +1529,9 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win static void surface_unload(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); + struct wined3d_renderbuffer_entry *entry, *entry2; struct wined3d_device *device = resource->device; const struct wined3d_gl_info *gl_info; - renderbuffer_entry_t *entry, *entry2; struct wined3d_context *context; TRACE("surface %p.\n", surface); @@ -1571,7 +1571,7 @@ static void surface_unload(struct wined3d_resource *resource) * all application-created targets the application has to release the surface * before calling _Reset */ - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, renderbuffer_entry_t, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) { ENTER_GL(); gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); @@ -2325,7 +2325,7 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct wined3d_surface *rt) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; - renderbuffer_entry_t *entry; + struct wined3d_renderbuffer_entry *entry; GLuint renderbuffer = 0; unsigned int src_width, src_height; unsigned int width, height; @@ -2356,7 +2356,7 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct } /* Look if we've already got a renderbuffer of the correct dimensions */ - LIST_FOR_EACH_ENTRY(entry, &surface->renderbuffers, renderbuffer_entry_t, entry) + LIST_FOR_EACH_ENTRY(entry, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) { if (entry->width == width && entry->height == height) { @@ -2373,7 +2373,7 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, surface->resource.format->glInternal, width, height); - entry = HeapAlloc(GetProcessHeap(), 0, sizeof(renderbuffer_entry_t)); + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); entry->width = width; entry->height = height; entry->id = renderbuffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2bb91d1..5973f0a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1964,12 +1964,13 @@ typedef struct wineD3DSurface_DIB { BOOL client_memory; } wineD3DSurface_DIB; -typedef struct { +struct wined3d_renderbuffer_entry +{ struct list entry; GLuint id; UINT width; UINT height; -} renderbuffer_entry_t; +}; struct fbo_entry { @@ -2068,7 +2069,7 @@ struct wined3d_surface WINEDDCOLORKEY glCKey; struct list renderbuffers; - renderbuffer_entry_t *current_renderbuffer; + struct wined3d_renderbuffer_entry *current_renderbuffer; SIZE ds_current_size; /* DirectDraw clippers */

1 0

Henri Verbeet : wined3d: Get rid of the glsl_program_key_t typedef.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: d52ae4b63f6148d42d79ab0e593b665084bca947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52ae4b63f6148d42d79ab0e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 16 23:01:25 2011 +0200 wined3d: Get rid of the glsl_program_key_t typedef. --- dlls/wined3d/glsl_shader.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d6e30dd..e9b378e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -117,12 +117,13 @@ struct glsl_shader_prog_link { const struct ps_np2fixup_info *np2Fixup_info; }; -typedef struct { +struct glsl_program_key +{ const struct wined3d_shader *vshader; const struct wined3d_shader *pshader; struct ps_compile_args ps_args; struct vs_compile_args vs_args; -} glsl_program_key_t; +}; struct shader_glsl_ctx_priv { const struct vs_compile_args *cur_vs_args; @@ -3701,8 +3702,9 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w * Vertex Shader Specific Code begins here ********************************************/ -static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_shader_prog_link *entry) { - glsl_program_key_t key; +static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_shader_prog_link *entry) +{ + struct glsl_program_key key; key.vshader = entry->vshader; key.pshader = entry->pshader; @@ -3720,7 +3722,7 @@ static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_p struct vs_compile_args *vs_args, struct ps_compile_args *ps_args) { struct wine_rb_entry *entry; - glsl_program_key_t key; + struct glsl_program_key key; key.vshader = vshader; key.pshader = pshader; @@ -3735,7 +3737,7 @@ static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_p static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info, struct glsl_shader_prog_link *entry) { - glsl_program_key_t key; + struct glsl_program_key key; key.vshader = entry->vshader; key.pshader = entry->pshader; @@ -4784,7 +4786,7 @@ static void shader_glsl_destroy(struct wined3d_shader *shader) static int glsl_program_key_compare(const void *key, const struct wine_rb_entry *entry) { - const glsl_program_key_t *k = key; + const struct glsl_program_key *k = key; const struct glsl_shader_prog_link *prog = WINE_RB_ENTRY_VALUE(entry, const struct glsl_shader_prog_link, program_lookup_entry); int cmp;

1 0

Alexandre Julliard : wined3d: Get rid of the haveHardwareCursor flag.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 30e187e019a33c6a9ba84205e0c9bdb1eff68bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e187e019a33c6a9ba84205e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 20:13:13 2011 +0200 wined3d: Get rid of the haveHardwareCursor flag. --- dlls/wined3d/device.c | 11 +++-------- dlls/wined3d/wined3d_private.h | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 74c6e04..a4e85be 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -870,7 +870,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) ERR("Context array not freed!\n"); if (device->hardwareCursor) DestroyCursor(device->hardwareCursor); - device->haveHardwareCursor = FALSE; + device->hardwareCursor = 0; wined3d_decref(device->wined3d); device->wined3d = NULL; @@ -5203,11 +5203,6 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device device->cursorTexture = 0; } - if (cursor_image->resource.width == 32 && cursor_image->resource.height == 32) - device->haveHardwareCursor = TRUE; - else - device->haveHardwareCursor = FALSE; - if (cursor_image) { WINED3DLOCKED_RECT rect; @@ -5229,7 +5224,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (!device->haveHardwareCursor) + if (cursor_image->resource.width != 32 || cursor_image->resource.height != 32) { /* TODO: MSDN: Cursor sizes must be a power of 2 */ @@ -5369,7 +5364,7 @@ BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show) device->xScreenSpace = pt.x; device->yScreenSpace = pt.y; - if (device->haveHardwareCursor) + if (device->hardwareCursor) { device->bCursorVisible = show; if (show) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5973f0a..08a8469 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1680,14 +1680,13 @@ struct wined3d_device WORD isRecordingState : 1; WORD isInDraw : 1; WORD bCursorVisible : 1; - WORD haveHardwareCursor : 1; WORD d3d_initialized : 1; WORD inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ WORD softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ WORD useDrawStridedSlow : 1; WORD instancedDraw : 1; WORD filter_messages : 1; - WORD padding : 3; + WORD padding : 4; BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */

1 0

Alexandre Julliard : wined3d: Only update the cursor position the first time we display it.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 38d0d9fe809ad368475876834af316d8692f7fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d0d9fe809ad368475876834… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 16 20:16:15 2011 +0200 wined3d: Only update the cursor position the first time we display it. --- dlls/wined3d/device.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a4e85be..fb13e02 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5352,17 +5352,20 @@ void CDECL wined3d_device_set_cursor_position(struct wined3d_device *device, BOOL CDECL wined3d_device_show_cursor(struct wined3d_device *device, BOOL show) { BOOL oldVisible = device->bCursorVisible; - POINT pt; TRACE("device %p, show %#x.\n", device, show); - /* When ShowCursor is first called it should make the cursor appear at the - * OS's last known cursor position. Because of this, some applications - * just repetitively call ShowCursor in order to update the cursor's - * position. This behavior is undocumented. */ - GetCursorPos(&pt); - device->xScreenSpace = pt.x; - device->yScreenSpace = pt.y; + /* + * When ShowCursor is first called it should make the cursor appear at the OS's last + * known cursor position. + */ + if (show && !oldVisible) + { + POINT pt; + GetCursorPos(&pt); + device->xScreenSpace = pt.x; + device->yScreenSpace = pt.y; + } if (device->hardwareCursor) {

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.20
by Jeremy Newman 17 May '11

17 May '11

Module: website Branch: master Commit: 2f6c9dbb1dbf927690f4231aa98141b4b892d4d0 URL: http://source.winehq.org/git/website.git/?a=commit;h=2f6c9dbb1dbf927690f423… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun May 15 19:30:19 2011 +0200 Polish translation for release 1.3.20 --- news/pl/2011051301.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/pl/2011051301.xml b/news/pl/2011051301.xml new file mode 100644 index 0000000..b9944da --- /dev/null +++ b/news/pl/2011051301.xml @@ -0,0 +1,18 @@ +<news> +<date>Maj 13, 2011</date> +<title>Wydano Wine 1.3.20</title> +<body> + Wydanie rozwojowe Wine 1.3.20 jest już dostępne. + <a href="{$root}/announce/1.3.20">Co nowego</a> w tym wydaniu: +<ul> + <li>Opcja obcięcia kursora myszki wewnątrz pełnoekranowych okien.</li> + <li>Wsparcie dla trwałych połączeń HTTP.</li> + <li>Wstępna implementacja XML writer.</li> + <li>Wsparcie dla rysowania prostokątów w silniku DIB.</li> + <li>Kontrola głośności w MMDevAPI.</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.20.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.20 freigegeben
by Jeremy Newman 17 May '11

17 May '11

Module: website Branch: master Commit: c3337c02c1e9d446dd7674f9bd909f6c6506d158 URL: http://source.winehq.org/git/website.git/?a=commit;h=c3337c02c1e9d446dd7674… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 15 20:22:19 2011 +0200 Wine 1.3.20 freigegeben --- news/de/2011051301.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2011051301.xml b/news/de/2011051301.xml new file mode 100644 index 0000000..2e48833 --- /dev/null +++ b/news/de/2011051301.xml @@ -0,0 +1,18 @@ +<news> +<date>13. Mai 2011</date> +<title>Wine 1.3.20 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.20 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.20">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Option die Maus in eine Vollbildfenster einzufangen.</li> + <li>Unterstützung für anhaltende HTTP Verbindungen.</li> + <li>Anfängliche Implementierung des XML Writer.</li> + <li>Unterstützung zum zeichnen von Rechtecken in der DIB Engine.</li> + <li>Lautstärkeregelung in MMDevAPI.</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.20.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

Jeremy Newman : fix so the html is valid, translators, please update your base templates
by Jeremy Newman 17 May '11

17 May '11

Module: website Branch: master Commit: bab050cfbafe96b4f347db9511a49fb0cc244a30 URL: http://source.winehq.org/git/website.git/?a=commit;h=bab050cfbafe96b4f347db… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue May 17 10:10:12 2011 -0500 fix so the html is valid, translators, please update your base templates --- news/en/2011051301.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/news/en/2011051301.xml b/news/en/2011051301.xml index fd52487..a0992b1 100644 --- a/news/en/2011051301.xml +++ b/news/en/2011051301.xml @@ -3,7 +3,7 @@ <title>Wine 1.3.20 Released</title> <body> The Wine development release 1.3.20 is now available. - <a href="{$root}/announce/1.3.20">What's new</a> in this release: + <a href="{$root}/announce/1.3.20">What's new</a> in this release: <ul> <li>Option to clip the mouse inside fullscreen windows.</li> <li>Support for persistent HTTP connections.</li> @@ -12,7 +12,7 @@ <li>Volume control in MMDevAPI.</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.20.tar.bz2">available now</a>. +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.20.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.20
by Jeremy Newman 17 May '11

17 May '11

Module: website Branch: master Commit: 8fa615b1f22632a8ea9d30821e6cb6d53e16f589 URL: http://source.winehq.org/git/website.git/?a=commit;h=8fa615b1f22632a8ea9d30… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 13 20:55:59 2011 +0200 French translation for release 1.3.20 --- news/fr/2011051301.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/news/fr/2011051301.xml b/news/fr/2011051301.xml new file mode 100644 index 0000000..3e00a5b --- /dev/null +++ b/news/fr/2011051301.xml @@ -0,0 +1,21 @@ +<news> +<date>13 mai 2011</date> +<title>Sortie de Wine 1.3.20</title> +<body> + La version de développement 1.3.20 de Wine est disponible. + <a href="{$root}/announce/1.3.20">Nouveautés</a> de cette version : +<ul> + <li>Possibilité de la capture de la souris dans les fenêtres plein écran.</li> + <li>Prise en charge des connexions HTTP persistantes.</li> + <li>Implémentation initiale du rédacteur XML.</li> + <li>Prise en charge du dessin de rectangles dans le moteur DIB.</li> + <li>Contrôle de volume dans MMDevAPI.</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.20.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