wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Dan Kegel : user32: Add assembly wrapper for calling hook procedures.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: c9d1a1906e9342a707a63d73b4afffcc0577ed11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d1a1906e9342a707a63d73b… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Apr 24 08:15:56 2013 -0700 user32: Add assembly wrapper for calling hook procedures. --- dlls/user32/hook.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index c9e9e20..633704b 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -202,6 +202,48 @@ static HHOOK set_windows_hook( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid, return handle; } +#ifdef __i386__ +/* Some apps pass a non-stdcall proc to SetWindowsHookExA, + * so we need a small assembly wrapper to call the proc. + */ +extern LRESULT HOOKPROC_wrapper( HOOKPROC proc, + INT code, WPARAM wParam, LPARAM lParam ); +__ASM_GLOBAL_FUNC( HOOKPROC_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-4\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "movl 8(%ebp),%eax\n\t" + "call *%eax\n\t" + "leal -12(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +static inline LRESULT HOOKPROC_wrapper( HOOKPROC proc, + INT code, WPARAM wParam, LPARAM lParam ) +{ + return proc( code, wParam, lParam ); +} +#endif /* __i386__ */ + /*********************************************************************** * call_hook_AtoW @@ -210,7 +252,8 @@ static LRESULT call_hook_AtoW( HOOKPROC proc, INT id, INT code, WPARAM wparam, L { LRESULT ret; UNICODE_STRING usBuffer; - if (id != WH_CBT || code != HCBT_CREATEWND) ret = proc( code, wparam, lparam ); + if (id != WH_CBT || code != HCBT_CREATEWND) + ret = HOOKPROC_wrapper( proc, code, wparam, lparam ); else { CBT_CREATEWNDA *cbtcwA = (CBT_CREATEWNDA *)lparam; @@ -233,7 +276,7 @@ static LRESULT call_hook_AtoW( HOOKPROC proc, INT id, INT code, WPARAM wparam, L RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszClass); csW.lpszClass = classW = usBuffer.Buffer; } - ret = proc( code, wparam, (LPARAM)&cbtcwW ); + ret = HOOKPROC_wrapper( proc, code, wparam, (LPARAM)&cbtcwW ); cbtcwA->hwndInsertAfter = cbtcwW.hwndInsertAfter; HeapFree( GetProcessHeap(), 0, nameW ); HeapFree( GetProcessHeap(), 0, classW ); @@ -249,7 +292,8 @@ static LRESULT call_hook_WtoA( HOOKPROC proc, INT id, INT code, WPARAM wparam, L { LRESULT ret; - if (id != WH_CBT || code != HCBT_CREATEWND) ret = proc( code, wparam, lparam ); + if (id != WH_CBT || code != HCBT_CREATEWND) + ret = HOOKPROC_wrapper( proc, code, wparam, lparam ); else { CBT_CREATEWNDW *cbtcwW = (CBT_CREATEWNDW *)lparam; @@ -277,7 +321,7 @@ static LRESULT call_hook_WtoA( HOOKPROC proc, INT id, INT code, WPARAM wparam, L csA.lpszClass = classA; } - ret = proc( code, wparam, (LPARAM)&cbtcwA ); + ret = HOOKPROC_wrapper( proc, code, wparam, (LPARAM)&cbtcwA ); cbtcwW->hwndInsertAfter = cbtcwA.hwndInsertAfter; HeapFree( GetProcessHeap(), 0, nameA ); HeapFree( GetProcessHeap(), 0, classA );

1 0

Stefan Dösinger : wined3d: Get rid of device-> view_ident.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: c371af0d5c49e08d7554ed73fec238136d29d377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c371af0d5c49e08d7554ed73f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 24 11:29:57 2013 +0200 wined3d: Get rid of device->view_ident. --- dlls/wined3d/device.c | 15 --------------- dlls/wined3d/state.c | 33 ++++++++------------------------- dlls/wined3d/stateblock.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 6 +----- 4 files changed, 16 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4e18be8..7b6a253 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -53,17 +53,6 @@ const struct wined3d_light WINED3D_default_light = 0.0f /* Phi */ }; -/********************************************************** - * Global variable / Constants follow - **********************************************************/ -const struct wined3d_matrix identity = -{{{ - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, -}}}; /* When needed for comparisons */ - /* Note that except for WINED3DPT_POINTLIST and WINED3DPT_LINELIST these * actually have the same values in GL and D3D. */ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) @@ -1208,8 +1197,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, create_dummy_textures(device, context); - /* Initialize the current view state */ - device->view_ident = 1; device->contexts[0]->last_was_rhw = 0; switch (wined3d_settings.offscreen_rendering_mode) @@ -1684,8 +1671,6 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device, } device->stateBlock->state.transforms[d3dts] = *matrix; - if (d3dts == WINED3D_TS_VIEW) - device->view_ident = !memcmp(matrix, &identity, sizeof(identity)); if (d3dts < WINED3D_TS_WORLD_MATRIX(device->adapter->gl_info.limits.blends)) device_invalidate_state(device, STATE_TRANSFORM(d3dts)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4eb466e..38b4153 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3801,19 +3801,10 @@ static void transform_world(struct wined3d_context *context, const struct wined3 } else { - /* In the general case, the view matrix is the identity matrix */ - if (context->swapchain->device->view_ident) - { - gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(0)].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - } - else - { - gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(0)].u.m[0][0]); - checkGLcall("glMultMatrixf"); - } + gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW].u.m[0][0]); + checkGLcall("glLoadMatrixf"); + gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(0)].u.m[0][0]); + checkGLcall("glMultMatrixf"); } } @@ -3883,18 +3874,10 @@ static void transform_worldex(struct wined3d_context *context, const struct wine /* World matrix 0 is multiplied with the view matrix because d3d uses 3 * matrices while gl uses only 2. To avoid weighting the view matrix * incorrectly it has to be multiplied into every GL modelview matrix. */ - if (context->swapchain->device->view_ident) - { - gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(matrix)].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - } - else - { - gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(matrix)].u.m[0][0]); - checkGLcall("glMultMatrixf"); - } + gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW].u.m[0][0]); + checkGLcall("glLoadMatrixf"); + gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(matrix)].u.m[0][0]); + checkGLcall("glMultMatrixf"); } static void state_vertexblend_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8e17d23..aaf425c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1161,6 +1161,13 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) unsigned int i; struct wined3d_swapchain *swapchain; struct wined3d_surface *backbuffer; + static const struct wined3d_matrix identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; TRACE("stateblock %p.\n", stateblock); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 438f4d1..73862cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -863,9 +863,6 @@ do { \ #define checkGLcall(A) do {} while(0) #endif -/* Global variables */ -extern const struct wined3d_matrix identity DECLSPEC_HIDDEN; - enum wined3d_ffp_idx { WINED3D_FFP_POSITION = 0, @@ -1704,7 +1701,6 @@ struct wined3d_device DWORD vs_clipping; UINT instance_count; - WORD view_ident : 1; /* true iff view matrix is identity */ WORD vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ WORD isRecordingState : 1; WORD isInDraw : 1; @@ -1714,7 +1710,7 @@ struct wined3d_device WORD softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ WORD useDrawStridedSlow : 1; WORD filter_messages : 1; - WORD padding : 6; + WORD padding : 7; BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */

1 0

Stefan Dösinger : d3d9/tests: Don' t test for equality in d3d9's depth_blit_test.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: 098105dca4af9322c9fab7fb6790f27d480addc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098105dca4af9322c9fab7fb6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 21 19:28:20 2013 +0200 d3d9/tests: Don't test for equality in d3d9's depth_blit_test. --- dlls/d3d9/tests/visual.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 82f364b..32470f0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11549,10 +11549,10 @@ static void depth_blit_test(IDirect3DDevice9 *device) { static const struct vertex quad1[] = { - { -1.0, 1.0, 0.50f, 0xff00ff00}, - { 1.0, 1.0, 0.50f, 0xff00ff00}, - { -1.0, -1.0, 0.50f, 0xff00ff00}, - { 1.0, -1.0, 0.50f, 0xff00ff00}, + { -1.0, 1.0, 0.33f, 0xff00ff00}, + { 1.0, 1.0, 0.33f, 0xff00ff00}, + { -1.0, -1.0, 0.33f, 0xff00ff00}, + { 1.0, -1.0, 0.33f, 0xff00ff00}, }; static const struct vertex quad2[] = {

1 0

Stefan Dösinger : d3d9/tests: Nvidia cannot handle 2x1 YUY2/UYVY surfaces.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: a4babd2ed3206cb9e6ca05b98d2253aa3cf9c06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4babd2ed3206cb9e6ca05b98… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 24 11:29:55 2013 +0200 d3d9/tests: Nvidia cannot handle 2x1 YUY2/UYVY surfaces. --- dlls/d3d9/tests/visual.c | 28 ++++++++++------------------ 1 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 772c299..82f364b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10253,8 +10253,11 @@ static void yuv_color_test(IDirect3DDevice9 *device) { continue; } - /* A pixel is effectively 16 bit large, but two pixels are stored together, so the minimum size is 2x1 */ - hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 2, 1, format, D3DPOOL_DEFAULT, &surface, NULL); + /* A pixel is effectively 16 bit large, but two pixels are stored together, so the minimum size is 2x1 + * However, Nvidia Windows drivers have problems with 2x1 YUY2/UYVY surfaces, so use a 4x1 surface and + * fill the second block with dummy data. If the surface has a size of 2x1, those drivers ignore the + * second luminance value, resulting in an incorrect color in the right pixel. */ + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 1, format, D3DPOOL_DEFAULT, &surface, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface failed, hr = %08x\n", hr); for(i = 0; i < (sizeof(test_data)/sizeof(test_data[0])); i++) { @@ -10269,7 +10272,8 @@ static void yuv_color_test(IDirect3DDevice9 *device) { memset(&lr, 0, sizeof(lr)); hr = IDirect3DSurface9_LockRect(surface, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DSurface9_LockRect failed, hr = %08x\n", hr); - *((DWORD *) lr.pBits) = test_data[i].in; + ((DWORD *) lr.pBits)[0] = test_data[i].in; + ((DWORD *) lr.pBits)[1] = 0x00800080; hr = IDirect3DSurface9_UnlockRect(surface); ok(hr == D3D_OK, "IDirect3DSurface9_UnlockRect failed, hr = %08x\n", hr); @@ -10283,24 +10287,13 @@ static void yuv_color_test(IDirect3DDevice9 *device) { * want to add tests for the filtered pixels as well. * * Unfortunately different implementations(Windows-NV and Mac-ATI tested) interpret some colors vastly - * differently, so we need a max diff of 16 + * differently, so we need a max diff of 18 */ - color = getPixelColor(device, 40, 240); - - /* Newer versions of the Nvidia Windows driver mix up the U and V channels, breaking all the tests - * where U != V. Skip the entire test if this bug in this case - */ - if (broken(test_data[i].in == 0xff000000 && color == 0x00008800 && format == D3DFMT_UYVY)) - { - skip("Nvidia channel confusion bug detected, skipping YUV tests\n"); - IDirect3DSurface9_Release(surface); - goto out; - } - + color = getPixelColor(device, 1, 240); ok(color_match(color, ref_color_left, 18), "Input 0x%08x: Got color 0x%08x for pixel 1/1, expected 0x%08x, format %s\n", test_data[i].in, color, ref_color_left, fmt_string); - color = getPixelColor(device, 600, 240); + color = getPixelColor(device, 318, 240); ok(color_match(color, ref_color_right, 18), "Input 0x%08x: Got color 0x%08x for pixel 2/1, expected 0x%08x, format %s\n", test_data[i].in, color, ref_color_right, fmt_string); @@ -10310,7 +10303,6 @@ static void yuv_color_test(IDirect3DDevice9 *device) { IDirect3DSurface9_Release(surface); } -out: IDirect3DSurface9_Release(target); IDirect3D9_Release(d3d); }

1 0

Stefan Dösinger : d3d9/tests: Add r500 fp_special results.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: 6f8d25635d73f127005085754502621f271e718b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8d25635d73f127005085754… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 24 11:29:54 2013 +0200 d3d9/tests: Add r500 fp_special results. --- dlls/d3d9/tests/visual.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5069c57..772c299 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12385,6 +12385,7 @@ static void fp_special_test(IDirect3DDevice9 *device) const char *name; const DWORD *ops; DWORD size; + D3DCOLOR r500; D3DCOLOR r600; D3DCOLOR nv40; D3DCOLOR nv50; @@ -12403,17 +12404,17 @@ static void fp_special_test(IDirect3DDevice9 *device) * * There are considerable differences between graphics cards in how * these are handled, but pow and nrm never generate INF or NAN. */ - {"log", vs_log, sizeof(vs_log), 0x00000000, 0x00ff0000, 0x00ff7f00}, - {"pow", vs_pow, sizeof(vs_pow), 0x000000ff, 0x0000ff00, 0x000000ff}, - {"nrm", vs_nrm, sizeof(vs_nrm), 0x00ff0000, 0x0000ff00, 0x00ff0000}, - {"rcp1", vs_rcp1, sizeof(vs_rcp1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, - {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x00000000, 0x00ff0000, 0x00ff7f00}, - {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, - {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, - {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000}, - {"def1", vs_def1, sizeof(vs_def1), 0x00007f00, 0x0000ff00, 0x00007f00}, - {"def2", vs_def2, sizeof(vs_def2), 0x00ff7f00, 0x00ff0000, 0x00ff7f00}, - {"def3", vs_def3, sizeof(vs_def3), 0x00ff7f00, 0x00ff00ff, 0x00ff7f00}, + {"log", vs_log, sizeof(vs_log), 0x00000000, 0x00000000, 0x00ff0000, 0x00ff7f00}, + {"pow", vs_pow, sizeof(vs_pow), 0x000000ff, 0x000000ff, 0x0000ff00, 0x000000ff}, + {"nrm", vs_nrm, sizeof(vs_nrm), 0x00ff0000, 0x00ff0000, 0x0000ff00, 0x00ff0000}, + {"rcp1", vs_rcp1, sizeof(vs_rcp1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00}, + {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x000000ff, 0x00000000, 0x00ff0000, 0x00ff7f00}, + {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00}, + {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00}, + {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, + {"def1", vs_def1, sizeof(vs_def1), 0x000000ff, 0x00007f00, 0x0000ff00, 0x00007f00}, + {"def2", vs_def2, sizeof(vs_def2), 0x00ff0000, 0x00ff7f00, 0x00ff0000, 0x00ff7f00}, + {"def3", vs_def3, sizeof(vs_def3), 0x00ff00ff, 0x00ff7f00, 0x00ff00ff, 0x00ff7f00}, }; static const DWORD ps_code[] =

1 0

Stefan Dösinger : d3d9/tests: Correct nv40 results.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: 67e57c84b9992230cf2bc21fb8bb2104b8215871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e57c84b9992230cf2bc21fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 24 11:29:53 2013 +0200 d3d9/tests: Correct nv40 results. --- dlls/d3d9/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 88c776a..5069c57 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12411,9 +12411,9 @@ static void fp_special_test(IDirect3DDevice9 *device) {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x00ff00ff, 0x00ff7f00}, {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000}, - {"def1", vs_def1, sizeof(vs_def1), 0x00007f00, 0x00007f00, 0x00007f00}, - {"def2", vs_def2, sizeof(vs_def2), 0x00ff7f00, 0x00ff7f00, 0x00ff7f00}, - {"def3", vs_def3, sizeof(vs_def3), 0x00ff7f00, 0x00ff7f00, 0x00ff7f00}, + {"def1", vs_def1, sizeof(vs_def1), 0x00007f00, 0x0000ff00, 0x00007f00}, + {"def2", vs_def2, sizeof(vs_def2), 0x00ff7f00, 0x00ff0000, 0x00ff7f00}, + {"def3", vs_def3, sizeof(vs_def3), 0x00ff7f00, 0x00ff00ff, 0x00ff7f00}, }; static const DWORD ps_code[] =

1 0

Jacek Caban : jscript: Use single string instance for strings representing NULL BSTR instead of a flag .
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: 2ac35ac44161dad1fce63006452bbe35be74af91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac35ac44161dad1fce630064… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 24 11:32:33 2013 +0200 jscript: Use single string instance for strings representing NULL BSTR instead of a flag. --- dlls/jscript/jsstr.c | 27 ++++++++++++++++++++++----- dlls/jscript/jsstr.h | 7 ++++--- dlls/jscript/jsutils.c | 16 +++++++++------- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index 0d0eb0f..add0195 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -277,7 +277,7 @@ const WCHAR *jsstr_rope_flatten(jsstr_rope_t *str) return jsstr_as_heap(&str->str)->buf = buf; } -static jsstr_t *empty_str, *nan_str, *undefined_str; +static jsstr_t *empty_str, *nan_str, *undefined_str, *null_bstr_str; jsstr_t *jsstr_nan(void) { @@ -294,6 +294,16 @@ jsstr_t *jsstr_undefined(void) return jsstr_addref(undefined_str); } +jsstr_t *jsstr_null_bstr(void) +{ + return jsstr_addref(null_bstr_str); +} + +BOOL is_null_bstr(jsstr_t *str) +{ + return str == null_bstr_str; +} + BOOL init_strings(void) { static const WCHAR NaNW[] = { 'N','a','N',0 }; @@ -305,12 +315,19 @@ BOOL init_strings(void) return FALSE; if(!(undefined_str = jsstr_alloc(undefinedW))) return FALSE; - return TRUE; + if(!jsstr_alloc_buf(0, &null_bstr_str)) + return FALSE; + return TRUE; } void free_strings(void) { - jsstr_release(empty_str); - jsstr_release(nan_str); - jsstr_release(undefined_str); + if(empty_str) + jsstr_release(empty_str); + if(nan_str) + jsstr_release(nan_str); + if(undefined_str) + jsstr_release(undefined_str); + if(null_bstr_str) + jsstr_release(null_bstr_str); } diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 727b2d0..2ad03f1 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -17,7 +17,7 @@ */ /* - * This is a common header for all string representations. The exact layout of the string + * jsstr_t is a common header for all string representations. The exact layout of the string * representation may be: * * - inline string - string bytes directly follow string headers. @@ -42,8 +42,6 @@ struct _jsstr_t { #define JSSTR_MAX_LENGTH (1 << (32-JSSTR_LENGTH_SHIFT)) #define JSSTR_FLAGS_MASK ((1 << JSSTR_LENGTH_SHIFT)-1) -#define JSSTR_FLAG_NULLBSTR 4 - #define JSSTR_FLAG_LBIT 1 #define JSSTR_FLAG_FLAT 2 #define JSSTR_FLAG_TAG_MASK 3 @@ -187,6 +185,9 @@ jsstr_t *jsstr_nan(void) DECLSPEC_HIDDEN; jsstr_t *jsstr_empty(void) DECLSPEC_HIDDEN; jsstr_t *jsstr_undefined(void) DECLSPEC_HIDDEN; +jsstr_t *jsstr_null_bstr(void) DECLSPEC_HIDDEN; +BOOL is_null_bstr(jsstr_t*) DECLSPEC_HIDDEN; + BOOL init_strings(void) DECLSPEC_HIDDEN; void free_strings(void) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 60ca474..87bad26 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -294,11 +294,13 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) case VT_BSTR: { jsstr_t *str; - str = jsstr_alloc_len(V_BSTR(var), SysStringLen(V_BSTR(var))); - if(!str) - return E_OUTOFMEMORY; - if(!V_BSTR(var)) - str->length_flags |= JSSTR_FLAG_NULLBSTR; + if(V_BSTR(var)) { + str = jsstr_alloc_len(V_BSTR(var), SysStringLen(V_BSTR(var))); + if(!str) + return E_OUTOFMEMORY; + }else { + str = jsstr_null_bstr(); + } *r = jsval_string(str); return S_OK; @@ -351,7 +353,7 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) jsstr_t *str = get_string(val); V_VT(retv) = VT_BSTR; - if(str->length_flags & JSSTR_FLAG_NULLBSTR) { + if(is_null_bstr(str)) { V_BSTR(retv) = NULL; }else { V_BSTR(retv) = SysAllocStringLen(NULL, jsstr_length(str)); @@ -913,7 +915,7 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY if(FAILED(hres)) break; - if(str->length_flags & JSSTR_FLAG_NULLBSTR) { + if(is_null_bstr(str)) { V_BSTR(dst) = NULL; break; }

1 0

Dmitry Timoshkov : kernel32: Add a test to show that CreateThread is supposed to fail after the NtTerminateProcess call .
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: cd55afec8ac5c76e1c5fb3eedb139fea5431752c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd55afec8ac5c76e1c5fb3eed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 24 20:39:07 2013 +0900 kernel32: Add a test to show that CreateThread is supposed to fail after the NtTerminateProcess call. --- dlls/kernel32/tests/loader.c | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 38c059c..6291d9c 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1042,7 +1042,6 @@ nt4_is_broken: #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT], stop_event, event, mutex, semaphore; static DWORD attached_thread_count; -static LONG noop_thread_started; static int test_dll_phase; static DWORD WINAPI mutex_thread_proc(void *param) @@ -1085,14 +1084,19 @@ static DWORD WINAPI semaphore_thread_proc(void *param) static DWORD WINAPI noop_thread_proc(void *param) { - InterlockedIncrement(&noop_thread_started); + if (param) + { + LONG *noop_thread_started = param; + InterlockedIncrement(noop_thread_started); + } trace("%04u: noop_thread_proc: exiting\n", GetCurrentThreadId()); - return 196; + return 195; } static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) { + static LONG noop_thread_started; DWORD ret; switch (reason) @@ -1136,7 +1140,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(!ret || broken(ret) /* before Vista */, "RtlDllShutdownInProgress returned %d\n", ret); } - ok(attached_thread_count == 2, "attached thread count should be 2\n"); + ok(attached_thread_count >= 2, "attached thread count should be >= 2\n"); for (i = 0; i < attached_thread_count; i++) { @@ -1179,7 +1183,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) */ noop_thread_started = 0; SetLastError(0xdeadbeef); - handle = CreateThread(NULL, 0, noop_thread_proc, NULL, 0, &ret); + handle = CreateThread(NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret); /* manual call to LdrShutdownProcess doesn't prevent thread creation */ if (param && test_dll_phase != 4) { @@ -1187,7 +1191,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) if (!handle) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); else + { + ret = WaitForSingleObject(handle, 1000); + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); CloseHandle(handle); + } } else { @@ -1212,7 +1220,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) noop_thread_started = 0; SetLastError(0xdeadbeef); - handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, NULL, 0, &ret); + handle = CreateRemoteThread(process, NULL, 0, noop_thread_proc, &noop_thread_started, 0, &ret); /* manual call to LdrShutdownProcess doesn't prevent thread creation */ if (param && test_dll_phase != 4) { @@ -1220,7 +1228,11 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) if (!handle) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); else + { + ret = WaitForSingleObject(handle, 1000); + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %#x\n", ret); CloseHandle(handle); + } } else { @@ -1438,6 +1450,19 @@ static void child_process(const char *dll_name, DWORD target_offset) ret = pRtlDllShutdownInProgress(); ok(!ret, "RtlDllShutdownInProgress returned %d\n", ret); + SetLastError(0xdeadbeef); + thread = CreateThread(NULL, 0, noop_thread_proc, &dummy, 0, &ret); +todo_wine + ok(!thread || broken(thread != 0) /* before win7 */, "CreateThread should fail\n"); + if (!thread) + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + else + { + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %#x\n", ret); + CloseHandle(thread); + } + break; case 1:

1 0

Piotr Caban : mshtml: Allocate smaller cookies buffer size in HTMLDocument_get_cookie.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: b885ce8f55966f7d96a9eb297ba935cfd029f1f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b885ce8f55966f7d96a9eb297… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 11:50:23 2013 +0200 mshtml: Allocate smaller cookies buffer size in HTMLDocument_get_cookie. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 36308f0..c6a7193 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -708,7 +708,7 @@ static HRESULT WINAPI HTMLDocument_get_cookie(IHTMLDocument2 *iface, BSTR *p) return S_OK; } - *p = SysAllocStringLen(NULL, size-1); + *p = SysAllocStringLen(NULL, size/sizeof(WCHAR)-1); if(!*p) return E_OUTOFMEMORY;

1 0

Piotr Caban : mshtml: Added IOmHistory::get_length test.
by Alexandre Julliard 24 Apr '13

24 Apr '13

Module: wine Branch: master Commit: 8bc118cf17309988ba7bf68954cbe33efd8241ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc118cf17309988ba7bf6895… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 24 11:50:01 2013 +0200 mshtml: Added IOmHistory::get_length test. --- dlls/mshtml/tests/htmldoc.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7531a40..c8ed4d4 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3309,10 +3309,13 @@ static HRESULT WINAPI TravelLog_Clone(ITravelLog *iface, ITravelLog **pptl) return E_NOTIMPL; } +static IBrowserService BrowserService; static DWORD WINAPI TravelLog_CountEntries(ITravelLog *iface, IUnknown *punk) { CHECK_EXPECT(CountEntries); - return E_NOTIMPL; + + ok(punk == (IUnknown*)&BrowserService, "punk != &BrowserService (%p)\n", punk); + return 0; } static HRESULT WINAPI TravelLog_Revert(ITravelLog *iface) @@ -5761,6 +5764,29 @@ static void test_load_history(IHTMLDocument2 *doc) history_stream = NULL; } +static void test_OmHistory(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *win; + IOmHistory *hist; + short len; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &win); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_get_history(win, &hist); + ok(hres == S_OK, "get_history failed: %08x\n", hres); + IHTMLWindow2_Release(win); + + SET_EXPECT(CountEntries); + hres = IOmHistory_get_length(hist, &len); + CHECK_CALLED(CountEntries); + ok(hres == S_OK, "get_length failed: %08x\n", hres); + ok(len == 0, "len = %d\n", len); + + IOmHistory_Release(hist); +} + static void test_refresh(IHTMLDocument2 *doc) { IOleCommandTarget *cmdtrg; @@ -7292,6 +7318,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE, 0); if(support_wbapp) { test_load_history(doc); + test_OmHistory(doc); test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0); }

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
58
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 April 2013