February 2016 - Wine-commits

Hugh McMaster : reg: Explicitly use base 10 or base 16 with strtoulW.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: acb4e3f63a90ba0ae069fa41d930fddf09e32975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb4e3f63a90ba0ae069fa41d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 16 17:12:09 2016 +1100 reg: Explicitly use base 10 or base 16 with strtoulW. All Windows versions, except XP, parse the number 0123 as decimal. (XP parses 0123 as octal). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 3c98fc0..ef25fe5 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -243,7 +243,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r { LPWSTR rest; DWORD val; - val = strtoulW(data, &rest, 0); + val = strtoulW(data, &rest, (data[1] == 'x') ? 16 : 10); if (*rest || data[0] == '-') { output_message(STRING_MISSING_INTEGER); break; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0077101..1958be0 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -272,8 +272,7 @@ static void test_add(void) ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); ok(type == REG_DWORD, "got wrong type %d, expected %d\n", type, REG_DWORD); ok(size == sizeof(DWORD), "got wrong size %d, expected %d\n", size, (int)sizeof(DWORD)); - todo_wine ok(dword == 123 || broken(dword == 0123 /* WinXP */), - "got wrong data %d, expected %d\n", dword, 123); + ok(dword == 123 || broken(dword == 0123 /* WinXP */), "got wrong data %d, expected 123\n", dword); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword7 /t reg_dword /d 0xabcdefg /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Charles Davis : winemac.drv: Don't bother storing the OpenGL version.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: d8eac069402134364faf5ecafe4af51fbec9909e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8eac069402134364faf5ecaf… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Feb 15 01:49:02 2016 -0700 winemac.drv: Don't bother storing the OpenGL version. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index a6f1440..ab79a82 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -44,7 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); struct gl_info { - char *glVersion; char *glExtensions; char wglExtensions[4096]; @@ -1259,9 +1258,6 @@ static BOOL init_gl_info(void) return FALSE; } - str = (const char*)opengl_funcs.gl.p_glGetString(GL_VERSION); - gl_info.glVersion = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); - strcpy(gl_info.glVersion, str); str = (const char*)opengl_funcs.gl.p_glGetString(GL_EXTENSIONS); length = strlen(str) + sizeof(legacy_extensions); if (allow_vsync) @@ -1274,9 +1270,10 @@ static BOOL init_gl_info(void) opengl_funcs.gl.p_glGetIntegerv(GL_MAX_VIEWPORT_DIMS, gl_info.max_viewport_dims); - TRACE("GL version : %s\n", gl_info.glVersion); + str = (const char*)opengl_funcs.gl.p_glGetString(GL_VERSION); + sscanf(str, "%u.%u", &gl_info.max_major, &gl_info.max_minor); + TRACE("GL version : %s\n", str); TRACE("GL renderer : %s\n", opengl_funcs.gl.p_glGetString(GL_RENDERER)); - sscanf(gl_info.glVersion, "%u.%u", &gl_info.max_major, &gl_info.max_minor); CGLSetCurrentContext(old_context); CGLReleaseContext(context);

1 0

Jianqiu Zhang : wpcap: Fix crash on pcap_loop.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: eacc448f6c7525cdfa725cea497d5d4e1864213b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eacc448f6c7525cdfa725cea4… Author: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Date: Tue Jan 5 09:12:42 2016 +0800 wpcap: Fix crash on pcap_loop. Signed-off-by: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index ae9e482..b770067 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -95,7 +95,6 @@ static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h TRACE("(%p %p %p)\n", user_data, h, p); pcb = (PCAP_HANDLER_CALLBACK *)user_data; pcb->pfn_cb(pcb->user_data, h, p); - HeapFree(GetProcessHeap(), 0, pcb); TRACE("Callback COMPLETED\n"); } @@ -107,11 +106,10 @@ int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, if (callback) { - PCAP_HANDLER_CALLBACK *pcb; - pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); - pcb->pfn_cb = callback; - pcb->user_data = user; - return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + PCAP_HANDLER_CALLBACK pcb; + pcb.pfn_cb = callback; + pcb.user_data = user; + return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char *)&pcb); } return pcap_dispatch(p, cnt, NULL, user); @@ -200,11 +198,10 @@ int CDECL wine_pcap_loop(pcap_t *p, int cnt, if (callback) { - PCAP_HANDLER_CALLBACK *pcb; - pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); - pcb->pfn_cb = callback; - pcb->user_data = user; - return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + PCAP_HANDLER_CALLBACK pcb; + pcb.pfn_cb = callback; + pcb.user_data = user; + return pcap_loop(p, cnt, pcap_handler_callback, (unsigned char *)&pcb); } return pcap_loop(p, cnt, NULL, user);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: c38ddf4bbb760258b75416f17b3a274c19dd5e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38ddf4bbb760258b75416f17… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Feb 15 22:14:11 2016 +0100 po: Update French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 60 ++++++++++++++---------------------------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6f3b5b0..8f1efb6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11707,94 +11707,64 @@ msgid "The operation completed successfully\n" msgstr "L'opération s'est terminée avec succès\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Erreur : nom de clé invalide\n" +msgstr "reg : nom de clé invalide\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Erreur : paramètre de ligne de commande invalide\n" +msgstr "reg : paramètres de ligne de commande invalide\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Erreur : impossible d'accéder à une machine distante\n" +msgstr "reg : impossible d'accéder à une machine distante\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" msgstr "" -"Erreur : le système n'a pas pu trouver la clé ou la valeur de registre " -"spécifiée\n" +"reg : le système n'a pas pu trouver la clé ou valeur de registre spécifiée\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Erreur : type non pris en charge\n" +msgstr "reg : type non pris en charge [%1]\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"uninstaller : l'option « --remove » doit être suivie d'un GUID " -"d'application\n" +msgstr "reg : l'option [/d] doit être suivie d'un entier valide\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -"uninstaller : l'option « --remove » doit être suivie d'un GUID " -"d'application\n" +"reg : l'option [/d] doit être suivie d'une valeur hexadécimale valide\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg : type de donnée non géré [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "Le fichier spécifié existe déjà. Voulez-vous le remplacer ?" +msgstr "La valeur de registre « %1 » existe déjà. Voulez-vous la remplacer ?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "L'operation sur le registre a été annulée\n" #: reg.rc:48 regedit.rc:204 msgid "(Default)" msgstr "(par défaut)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Voulez-vous réellement supprimer ces valeurs ?" +msgstr "Voulez-vous réellement supprimer la valeur de registre « %1 » ?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Voulez-vous réellement supprimer la valeur « %s » ?" +msgstr "" +"Voulez-vous réellement supprimer toutes les valeurs de registre dans « %1 » ?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Voulez-vous réellement supprimer « %1 » ?" +msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" #: regedit.rc:34 msgid "&Registry" @@ -13950,8 +13920,6 @@ msgid "Configuration error" msgstr "Erreur de configuration" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window."

1 0

Henri Verbeet : wined3d: Get rid of the unused _WINEDDOVERLAYFX structure.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 05b84945d5b1b2d37b20ae390db557b70d3395ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b84945d5b1b2d37b20ae390… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:00 2016 +0100 wined3d: Get rid of the unused _WINEDDOVERLAYFX structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 7 +++++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 26 +------------------------- 4 files changed, 10 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index aa6a0d1..dc6ad25 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3707,14 +3707,17 @@ static HRESULT WINAPI ddraw_surface7_UpdateOverlay(IDirectDrawSurface7 *iface, R TRACE("iface %p, src_rect %s, dst_surface %p, dst_rect %s, flags %#x, fx %p.\n", iface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_rect(dst_rect), flags, fx); + if (fx) + FIXME("Ignoring fx %p.\n", fx); + wined3d_mutex_lock(); if (dst_impl) { dst_wined3d_texture = dst_impl->wined3d_texture; dst_sub_resource_idx = dst_impl->sub_resource_idx; } - hr = wined3d_texture_update_overlay(src_impl->wined3d_texture, src_impl->sub_resource_idx, src_rect, - dst_wined3d_texture, dst_sub_resource_idx, dst_rect, flags, (WINEDDOVERLAYFX *)fx); + hr = wined3d_texture_update_overlay(src_impl->wined3d_texture, src_impl->sub_resource_idx, + src_rect, dst_wined3d_texture, dst_sub_resource_idx, dst_rect, flags); wined3d_mutex_unlock(); switch (hr) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b4c8bb2..1b144e3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1432,15 +1432,15 @@ HRESULT CDECL wined3d_texture_set_overlay_position(struct wined3d_texture *textu HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, - const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx) + const RECT *dst_rect, DWORD flags) { struct wined3d_resource *sub_resource, *dst_sub_resource; struct wined3d_surface *surface, *dst_surface; TRACE("texture %p, sub_resource_idx %u, src_rect %s, dst_texture %p, " - "dst_sub_resource_idx %u, dst_rect %s, flags %#x, fx %p.\n", + "dst_sub_resource_idx %u, dst_rect %s, flags %#x.\n", texture, sub_resource_idx, wine_dbgstr_rect(src_rect), dst_texture, - dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), flags, fx); + dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), flags); if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D || !(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bbd2fb5..47eea42 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,7 +259,7 @@ @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_overlay_position(ptr long long long) @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) -@ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long ptr) +@ cdecl wined3d_texture_update_overlay(ptr long ptr ptr long ptr long) @ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr) @ cdecl wined3d_vertex_declaration_create_from_fvf(ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d5cae29..3b5e0d6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1901,30 +1901,6 @@ typedef struct _WINEDDBLTFX struct wined3d_color_key ddckSrcColorkey; /* SrcColorkey override */ } WINEDDBLTFX,*LPWINEDDBLTFX; -typedef struct _WINEDDOVERLAYFX -{ - DWORD dwSize; /* size of structure */ - DWORD dwAlphaEdgeBlendBitDepth; /* Bit depth used to specify constant for alpha edge blend */ - DWORD dwAlphaEdgeBlend; /* Constant to use as alpha for edge blend */ - DWORD dwReserved; - DWORD dwAlphaDestConstBitDepth; /* Bit depth used to specify alpha constant for destination */ - union - { - DWORD dwAlphaDestConst; /* Constant to use as alpha channel for dest */ - struct wined3d_surface *lpDDSAlphaDest; /* Surface to use as alpha channel for dest */ - } DUMMYUNIONNAME1; - DWORD dwAlphaSrcConstBitDepth; /* Bit depth used to specify alpha constant for source */ - union - { - DWORD dwAlphaSrcConst; /* Constant to use as alpha channel for src */ - struct wined3d_surface *lpDDSAlphaSrc; /* Surface to use as alpha channel for src */ - } DUMMYUNIONNAME2; - struct wined3d_color_key dckDestColorkey; /* DestColorkey override */ - struct wined3d_color_key dckSrcColorkey; /* SrcColorkey override */ - DWORD dwDDFX; /* Overlay FX */ - DWORD dwFlags; /* flags */ -} WINEDDOVERLAYFX; - struct wined3d_buffer_desc { UINT byte_width; @@ -2545,7 +2521,7 @@ HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, void *mem, UINT pitch); HRESULT __cdecl wined3d_texture_update_overlay(struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, - const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx); + const RECT *dst_rect, DWORD flags); HRESULT __cdecl wined3d_vertex_declaration_create(struct wined3d_device *device, const struct wined3d_vertex_element *elements, UINT element_count, void *parent,

1 0

Henri Verbeet : ddraw: Handle DDBLT_DDROPS in ddraw_surface7_Blt().
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 47635a60a0f372b8c5258afb0346f829fad5b6f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47635a60a0f372b8c5258afb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:01 2016 +0100 ddraw: Handle DDBLT_DDROPS in ddraw_surface7_Blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 8 ++++++++ dlls/wined3d/surface.c | 4 ---- include/wine/wined3d.h | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index dc6ad25..6d9bed1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1553,6 +1553,14 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * return DDERR_INVALIDPARAMS; } + if (Flags & DDBLT_DDROPS) + { + FIXME("DDBLT_DDROPS not implemented.\n"); + if (DDBltFx) + FIXME(" rop %#x, pattern %p.\n", DDBltFx->dwDDROP, DDBltFx->u5.lpDDSPattern); + return DDERR_NORASTEROPHW; + } + wined3d_mutex_lock(); if (Flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0e6bf28..33942d8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4375,10 +4375,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { FIXME("DDBLT_DEPTHFILL needs to be implemented!\n"); } - if (flags & WINEDDBLT_DDROPS) - { - FIXME("\tDdraw Raster Ops: %08x Pattern: %p\n", fx->dwDDROP, fx->u5.lpDDSPattern); - } /* Now the 'with source' blits. */ if (src_surface) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3b5e0d6..18d7a75 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1279,7 +1279,6 @@ enum wined3d_display_rotation #define WINEDDBLT_ASYNC 0x00000200 #define WINEDDBLT_COLORFILL 0x00000400 #define WINEDDBLT_DDFX 0x00000800 -#define WINEDDBLT_DDROPS 0x00001000 #define WINEDDBLT_KEYDEST 0x00002000 #define WINEDDBLT_KEYDESTOVERRIDE 0x00004000 #define WINEDDBLT_KEYSRC 0x00008000

1 0

Henri Verbeet : wined3d: Get rid of unused/ unimplemented WINEDDBLT_* flags.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 0b6b5176cc38ac4b57b37cb729fd9e6af5604d90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6b5176cc38ac4b57b37cb72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:02 2016 +0100 wined3d: Get rid of unused/unimplemented WINEDDBLT_* flags. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 15 +++++--- dlls/wined3d/surface.c | 93 ++++++++++++++++++++++++------------------------ dlls/wined3d/swapchain.c | 8 ++--- include/wine/wined3d.h | 40 +++++++-------------- 4 files changed, 74 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b6b5176cc38ac4b57b37…

1 0

Henri Verbeet : wined3d: Replace WINEDDBLTFX with a new structure that only includes the used fields.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 9d7221b51d8e365020915fa8eb3501220e24a61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7221b51d8e365020915fa8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:03 2016 +0100 wined3d: Replace WINEDDBLTFX with a new structure that only includes the used fields. It's a happy coincidence that none of the surface pointers are actually used. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 91 ++++++++++++++++++++++------------------ dlls/wined3d/surface.c | 95 ++++++++++++++++-------------------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 57 ++++--------------------- 5 files changed, 97 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d7221b51d8e365020915…

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in resolve_depth_buffer ().
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: c62fe153c64fc2db08be080cb1af7d8de7487ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c62fe153c64fc2db08be080cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:04 2016 +0100 wined3d: Use wined3d_texture_blt() in resolve_depth_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2d45135..4cebcb8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2013,20 +2013,26 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru static void resolve_depth_buffer(struct wined3d_state *state) { - struct wined3d_texture *texture = state->textures[0]; - struct wined3d_surface *depth_stencil, *surface; + struct wined3d_texture *dst_texture = state->textures[0]; + struct wined3d_rendertarget_view *src_view; RECT src_rect, dst_rect; - if (!texture || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || !(texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!dst_texture || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D + || !(dst_texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) return; - surface = surface_from_resource(texture->sub_resources[0]); - if (!(depth_stencil = wined3d_rendertarget_view_get_surface(state->fb->depth_stencil))) + + if (!(src_view = state->fb->depth_stencil)) + return; + if (src_view->resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Not supported on buffer resources.\n"); return; + } - SetRect(&dst_rect, 0, 0, surface->resource.width, surface->resource.height); - SetRect(&src_rect, 0, 0, depth_stencil->resource.width, depth_stencil->resource.height); - wined3d_surface_blt(surface, &dst_rect, depth_stencil, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + SetRect(&dst_rect, 0, 0, dst_texture->resource.width, dst_texture->resource.height); + SetRect(&src_rect, 0, 0, src_view->width, src_view->height); + wined3d_texture_blt(dst_texture, 0, &dst_rect, wined3d_texture_from_resource(src_view->resource), + src_view->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); } void CDECL wined3d_device_set_render_state(struct wined3d_device *device,

1 0

Henri Verbeet : ntdll: Add special handling for int $0x2d exceptions.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: e65c89f1c52c8aa4bbc375751138d0aec6bd237a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65c89f1c52c8aa4bbc375751… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 15 18:18:05 2016 +0100 ntdll: Add special handling for int $0x2d exceptions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 29 ++++++++++++++++++++++++++++- dlls/ntdll/tests/exception.c | 38 +++++++++++++++++++++++--------------- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a3abbff..10235fe 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1553,6 +1553,31 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) } } + +/*********************************************************************** + * handle_interrupt + * + * Handle an interrupt. + */ +static inline BOOL handle_interrupt( unsigned int interrupt, EXCEPTION_RECORD *rec, CONTEXT *context ) +{ + switch(interrupt) + { + case 0x2d: + context->Eip += 3; + rec->ExceptionCode = EXCEPTION_BREAKPOINT; + rec->ExceptionAddress = (void *)context->Eip; + rec->NumberParameters = is_wow64 ? 1 : 3; + rec->ExceptionInformation[0] = context->Eax; + rec->ExceptionInformation[1] = context->Ecx; + rec->ExceptionInformation[2] = context->Edx; + return TRUE; + default: + return FALSE; + } +} + + /*********************************************************************** * check_invalid_gs * @@ -2072,8 +2097,10 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case TRAP_x86_PROTFLT: /* General protection fault */ case TRAP_x86_UNKNOWN: /* Unknown fault code */ { + CONTEXT *win_context = get_exception_context( rec ); WORD err = get_error_code(context); - if (!err && (rec->ExceptionCode = is_privileged_instr( get_exception_context(rec) ))) break; + if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break; + if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break; rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; rec->ExceptionInformation[0] = 0; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c9e06ea..8ec7408 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -219,6 +219,11 @@ static const struct exception { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ 1, 1, FALSE, STATUS_SINGLE_STEP, 0 }, + { { 0xb8, 0xb8, 0xb8, 0xb8, 0xb8, /* mov $0xb8b8b8b8, %eax */ + 0xb9, 0xb9, 0xb9, 0xb9, 0xb9, /* mov $0xb9b9b9b9, %ecx */ + 0xba, 0xba, 0xba, 0xba, 0xba, /* mov $0xbabababa, %edx */ + 0xcd, 0x2d, 0xc3 }, /* int $0x2d; ret */ + 17, 0, FALSE, STATUS_BREAKPOINT, 3, { 0xb8b8b8b8, 0xb9b9b9b9, 0xbabababa } }, }; static int got_exception; @@ -473,7 +478,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { const struct exception *except = *(const struct exception **)(frame + 1); - unsigned int i, entry = except - exceptions; + unsigned int i, parameter_count, entry = except - exceptions; got_exception++; trace( "exception %u: %x flags:%x addr:%p\n", @@ -482,20 +487,23 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram ok( rec->ExceptionCode == except->status || (except->alt_status != 0 && rec->ExceptionCode == except->alt_status), "%u: Wrong exception code %x/%x\n", entry, rec->ExceptionCode, except->status ); - ok( rec->ExceptionAddress == (char*)code_mem + except->offset, - "%u: Wrong exception address %p/%p\n", entry, - rec->ExceptionAddress, (char*)code_mem + except->offset ); - - if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) - { - ok( rec->NumberParameters == except->nb_params, - "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); - } + ok( context->Eip == (DWORD_PTR)code_mem + except->offset, + "%u: Unexpected eip %#x/%#lx\n", entry, + context->Eip, (DWORD_PTR)code_mem + except->offset ); + ok( rec->ExceptionAddress == (char*)context->Eip || + (rec->ExceptionCode == STATUS_BREAKPOINT && rec->ExceptionAddress == (char*)context->Eip + 1), + "%u: Unexpected exception address %p/%p\n", entry, + rec->ExceptionAddress, (char*)context->Eip ); + + if (except->status == STATUS_BREAKPOINT && is_wow64) + parameter_count = 1; + else if (except->alt_status == 0 || rec->ExceptionCode != except->alt_status) + parameter_count = except->nb_params; else - { - ok( rec->NumberParameters == except->alt_nb_params, - "%u: Wrong number of parameters %u/%u\n", entry, rec->NumberParameters, except->nb_params ); - } + parameter_count = except->alt_nb_params; + + ok( rec->NumberParameters == parameter_count, + "%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count ); /* Most CPUs (except Intel Core apparently) report a segment limit violation */ /* instead of page faults for accesses beyond 0xffffffff */ @@ -530,7 +538,7 @@ static DWORD handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *fram skip_params: /* don't handle exception if it's not the address we expected */ - if (rec->ExceptionAddress != (char*)code_mem + except->offset) return ExceptionContinueSearch; + if (context->Eip != (DWORD_PTR)code_mem + except->offset) return ExceptionContinueSearch; context->Eip += except->length; return ExceptionContinueExecution;

1 0