November 2010 - Wine-commits

Detlef Riekenberg : wer: Add a stub for WerReportSetParameter.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: f0a4bc9ead5c3a9225c8146fd989c2c3df3cb505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a4bc9ead5c3a9225c8146fd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 1 09:22:05 2010 +0100 wer: Add a stub for WerReportSetParameter. --- dlls/wer/main.c | 23 +++++++++++++++++++++++ dlls/wer/wer.spec | 2 +- 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index b577b6b..289d01e 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -127,3 +127,26 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE return E_NOTIMPL; } + +/*********************************************************************** + * WerReportSetParameter (wer.@) + * + * Set one of 10 parameter / value pairs for a report handle + * + * PARAMS + * hreport [i] error reporting handle to add the parameter + * id [i] parameter to set (WER_P0 upto WER_P9) + * name [i] optional name of the parameter + * value [i] value of the parameter + * + * RETURNS + * Success: S_OK + * Failure: A HRESULT error code + * + */ +HRESULT WINAPI WerReportSetParameter(HREPORT hreport, DWORD id, PCWSTR name, PCWSTR value) +{ + FIXME("(%p, %d, %s, %s) :stub\n", hreport, id, debugstr_w(name), debugstr_w(value)); + + return E_NOTIMPL; +} diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index 6369f85..5e6fb52 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -67,7 +67,7 @@ @ stub WerReportAddFile @ stdcall WerReportCloseHandle(ptr) @ stdcall WerReportCreate(wstr long ptr ptr) -@ stub WerReportSetParameter +@ stdcall WerReportSetParameter(ptr long wstr wstr) @ stub WerReportSetUIOption @ stub WerReportSubmit @ stub WerpGetReportConsent

1 0

Yaron Shahrabani : msrle32: Added Hebrew translation.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 094cce5ca5d73d540ed85bce494ea2502ab5e0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094cce5ca5d73d540ed85bce4… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sun Oct 17 12:26:36 2010 +0200 msrle32: Added Hebrew translation. --- dlls/msrle32/Makefile.in | 1 + dlls/msrle32/msrle_He.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index 35cd54d..e4ed7db 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -12,6 +12,7 @@ RC_SRCS = \ msrle_En.rc \ msrle_Es.rc \ msrle_Fr.rc \ + msrle_He.rc \ msrle_Hu.rc \ msrle_It.rc \ msrle_Ja.rc \ diff --git a/dlls/msrle32/msrle_He.rc b/dlls/msrle32/msrle_He.rc new file mode 100644 index 0000000..03e2b2b --- /dev/null +++ b/dlls/msrle32/msrle_He.rc @@ -0,0 +1,33 @@ +/* + * Hebrew resource file for MS-RLE + * + * Copyright 2002 Michael Günnewig + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "msrle_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "מקודד הווידאו Wine MS-RLE" + IDS_ABOUT "מקודד הווידאו Wine MS-RLE\nהזכויות שמורות 2002 ל־Michael Günnewig" +}

1 0

Yaron Shahrabani : winemine: Added Hebrew translation.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: b9e7c3490f8b48af99d71ba36540f1f63ce80c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e7c3490f8b48af99d71ba36… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Mon Nov 1 08:57:04 2010 +0200 winemine: Added Hebrew translation. --- programs/winemine/He.rc | 100 +++++++++++++++++++++++++++++++++++++++++ programs/winemine/Makefile.in | 1 + 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/programs/winemine/He.rc b/programs/winemine/He.rc new file mode 100644 index 0000000..24c56bd --- /dev/null +++ b/programs/winemine/He.rc @@ -0,0 +1,100 @@ +/* + * WineMine + * Hebrew Language Support + * + * Copyright 2000 Joshua Thielen + * Copyright 2003 Marcelo Duarte + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE { + IDS_APPNAME, "WineMine" + IDS_NOBODY, "אף אחד" + IDS_ABOUT, "כל הזכויות שמורות 2000 Joshua Thielen" +} + +MENU_WINEMINE MENU +{ + POPUP "&אפשרויות" { + MENUITEM "&חדש\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&סימון בשאלה", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "מ&תחילים", IDM_BEGINNER + MENUITEM "מת&קדמים", IDM_ADVANCED + MENUITEM "מומ&חים", IDM_EXPERT + MENUITEM "ה&תאמה אישית...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "י&ציאה\tAlt+X", IDM_EXIT + } + POPUP "&מידע" { + MENUITEM "&שיאים...", IDM_TIMES + MENUITEM "על &אודות", IDM_ABOUT + } +} + +DLG_TIMES DIALOG 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "שיאים" +{ + GROUPBOX "שיאים", -1, 10, 10, 140, 45 + LTEXT "מתחילים", -1, 20, 20, 40, 8 + LTEXT "מתקדמים", -1, 20, 30, 40, 8 + LTEXT "מומחים", -1, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "אישור", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "כל הכבוד!" +{ + LTEXT "נא להזין את שמך", -1, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "אישור", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "משחק בהתאמה אישית" +{ + LTEXT "שורות", -1, 5, 5, 30, 10 + LTEXT "עמודות", -1, 5, 35, 30, 10 + LTEXT "מוקשים", -1, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "אישור", IDOK, 40, 30, 50, 15 + PUSHBUTTON "ביטול", IDCANCEL, 40, 50, 50, 15 +} diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 9519620..4d5c5d1 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -15,6 +15,7 @@ RC_SRCS = \ Es.rc \ Fi.rc \ Fr.rc \ + He.rc \ It.rc \ Ja.rc \ Ko.rc \

1 0

Henri Verbeet : wined3d: Change surface_translate_frontbuffer_coords() to handle all drawable coordinates.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: e35b6aa1a7ea9b95910ced5fc6e39e1c130ba400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35b6aa1a7ea9b95910ced5fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 1 11:57:57 2010 +0100 wined3d: Change surface_translate_frontbuffer_coords() to handle all drawable coordinates. --- dlls/wined3d/arb_program_shader.c | 17 ++---------- dlls/wined3d/surface.c | 50 +++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 28 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2886180..ca9d0e6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7153,21 +7153,8 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ context = context_acquire(device, dst_surface); context_apply_blit_state(context, device); - /* The coordinates of the ddraw front buffer are always fullscreen ('screen coordinates', - * while OpenGL coordinates are window relative. - * Also beware of the origin difference(top left vs bottom left). - * Also beware that the front buffer's surface size is screen width x screen height, - * whereas the real gl drawable size is the size of the window. */ - dst_swapchain = dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN - ? dst_surface->container.u.swapchain : NULL; if (!surface_is_offscreen(dst_surface)) - { - if (dst_swapchain && dst_surface == dst_swapchain->front_buffer) - surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); - - dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; - dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; - } + surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); arbfp_blit_set((IWineD3DDevice *)device, src_surface); @@ -7181,6 +7168,8 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ /* Leave the opengl state valid for blitting */ arbfp_blit_unset((IWineD3DDevice *)device); + dst_swapchain = dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + ? dst_surface->container.u.swapchain : NULL; if (wined3d_settings.strict_draw_ordering || (dst_swapchain && (dst_surface == dst_swapchain->front_buffer || dst_swapchain->num_contexts > 1))) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3a18f9e..20a656c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3176,15 +3176,29 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ * drawable is limited to the window's client area. The sysmem and texture * copies do have the full screen size. Note that GL has a bottom-left * origin, while D3D has a top-left origin. */ -void surface_translate_frontbuffer_coords(IWineD3DSurfaceImpl *surface, HWND window, RECT *rect) +void surface_translate_drawable_coords(IWineD3DSurfaceImpl *surface, HWND window, RECT *rect) { - POINT offset = {0, surface->currentDesc.Height}; - RECT windowsize; + UINT drawable_height; - GetClientRect(window, &windowsize); - offset.y -= windowsize.bottom - windowsize.top; - ScreenToClient(window, &offset); - OffsetRect(rect, offset.x, offset.y); + if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + && surface == surface->container.u.swapchain->front_buffer) + { + POINT offset = {0, 0}; + RECT windowsize; + + ScreenToClient(window, &offset); + OffsetRect(rect, offset.x, offset.y); + + GetClientRect(window, &windowsize); + drawable_height = windowsize.bottom - windowsize.top; + } + else + { + drawable_height = surface->currentDesc.Height; + } + + rect->top = drawable_height - rect->top; + rect->bottom = drawable_height - rect->bottom; } static BOOL surface_is_full_rect(IWineD3DSurfaceImpl *surface, const RECT *r) @@ -3262,11 +3276,7 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT TRACE("Source surface %p is onscreen.\n", src_surface); - if (buffer == GL_FRONT) - surface_translate_frontbuffer_coords(src_surface, context->win_handle, &src_rect); - - src_rect.top = src_surface->currentDesc.Height - src_rect.top; - src_rect.bottom = src_surface->currentDesc.Height - src_rect.bottom; + surface_translate_drawable_coords(src_surface, context->win_handle, &src_rect); ENTER_GL(); context_bind_fbo(context, GL_READ_FRAMEBUFFER, NULL); @@ -3289,11 +3299,7 @@ static void surface_blt_fbo(IWineD3DDeviceImpl *device, const WINED3DTEXTUREFILT TRACE("Destination surface %p is onscreen.\n", dst_surface); - if (buffer == GL_FRONT) - surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); - - dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; - dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; + surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); ENTER_GL(); context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); @@ -3353,15 +3359,7 @@ static void surface_blt_to_drawable(IWineD3DDeviceImpl *device, context_apply_blit_state(context, device); if (!surface_is_offscreen(dst_surface)) - { - if (swapchain && dst_surface == swapchain->front_buffer) - { - surface_translate_frontbuffer_coords(dst_surface, context->win_handle, &dst_rect); - } - - dst_rect.top = dst_surface->currentDesc.Height - dst_rect.top; - dst_rect.bottom = dst_surface->currentDesc.Height - dst_rect.bottom; - } + surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); device->blitter->set_shader((IWineD3DDevice *)device, src_surface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3313963..18da56a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2178,7 +2178,7 @@ void surface_set_container(IWineD3DSurfaceImpl *surface, enum wined3d_container_type type, IWineD3DBase *container) DECLSPEC_HIDDEN; void surface_set_texture_name(IWineD3DSurfaceImpl *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(IWineD3DSurfaceImpl *surface, GLenum target) DECLSPEC_HIDDEN; -void surface_translate_frontbuffer_coords(IWineD3DSurfaceImpl *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; +void surface_translate_drawable_coords(IWineD3DSurfaceImpl *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; /* Predeclare the shared Surface functions */ HRESULT WINAPI IWineD3DBaseSurfaceImpl_QueryInterface(IWineD3DSurface *iface,

1 0

Henri Verbeet : d3dcompiler_43/tests: Make probe info const.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: d3dd18646dc8d8e226e8e18ae9552c1033b760bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3dd18646dc8d8e226e8e18ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 1 11:57:58 2010 +0100 d3dcompiler_43/tests: Make probe info const. --- dlls/d3dcompiler_43/tests/hlsl.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index ce214c0..c5ccf23 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -248,7 +248,7 @@ static int colors_match(D3DXCOLOR a, D3DXCOLOR b, float epsilon) to see if they are as expected. */ static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShader9 *vshader, IDirect3DPixelShader9 *pshader, IDirect3DVertexBuffer9 *quad_geometry, - struct hlsl_probe_info *probes, int count, int width, int height, int line_number) + const struct hlsl_probe_info *probes, int count, int width, int height, int line_number) { IDirect3DSurface9 *render_target; IDirect3DSurface9 *readback; @@ -296,7 +296,7 @@ static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShade static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, IDirect3DVertexShader9 *vshader_passthru) { - static struct hlsl_probe_info swizzle_test_probes[] = + static const struct hlsl_probe_info swizzle_test_probes[] = { {0, 0, {0.0101f, 0.0303f, 0.0202f, 0.0404f}, 0.0001f, "swizzle_test failed"} }; @@ -333,7 +333,7 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo /* Tests order of operations */ static const float u = 2.5f, v = 0.3f, w = 0.2f, x = 0.7f, y = 0.1f, z = 1.5f; - static struct hlsl_probe_info order_of_operations_probes[] = + static const struct hlsl_probe_info order_of_operations_probes[] = { {0, 0, {-12.4300f, 9.8333f, 1.6000f, 34.9999f}, 0.0001f, "order of operations test failed"} @@ -373,7 +373,7 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, IDirect3DVertexShader9 *vshader_passthru) { - static struct hlsl_probe_info if_greater_probes[] = + static const struct hlsl_probe_info if_greater_probes[] = { { 0, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, { 5, 0, {0.9f, 0.8f, 0.7f, 0.6f}, 0.0001f, "if greater test failed"}, @@ -392,7 +392,7 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * return float4(0.9, 0.8, 0.7, 0.6); \ }"; - static struct hlsl_probe_info ternary_operator_probes[] = + static const struct hlsl_probe_info ternary_operator_probes[] = { {0, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, {1, 0, {0.50f, 0.25f, 0.50f, 0.75f}, 0.00001f, "ternary operator test failed"}, @@ -437,7 +437,7 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, IDirect3DVertexShader9 *vshader_passthru) { - static struct hlsl_probe_info vec4_indexing_test1_probes[] = + static const struct hlsl_probe_info vec4_indexing_test1_probes[] = { {0, 0, {0.020f, 0.245f, 0.351f, 1.000f}, 0.0001f, "vec4 indexing test 1 failed"} }; @@ -453,7 +453,7 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 return color; \ }"; - static struct hlsl_probe_info vec4_indexing_test2_probes[] = + static const struct hlsl_probe_info vec4_indexing_test2_probes[] = { {0, 0, {0.5f, 0.3f, 0.8f, 0.2f}, 0.0001f, "vec4 indexing test 2 failed"} };

1 0

Eric Pouech : msvcrt: Use parameter checking macros in vsn(w)printf_s_l.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 5d4de2ac45574c94a40ae1d09098bf347cff2dfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4de2ac45574c94a40ae1d09… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Oct 29 15:39:42 2010 +0200 msvcrt: Use parameter checking macros in vsn(w)printf_s_l. --- dlls/msvcrt/wcs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a100f31..1042008 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1050,7 +1050,7 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, if(ret<0 || ret==len) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { - MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small"); *MSVCRT__errno() = MSVCRT_ERANGE; memset(str, 0, sizeOfBuffer); } else @@ -1188,7 +1188,7 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer if(ret<0 || ret==len) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { - MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + MSVCRT_INVALID_PMT("str[sizeOfBuffer] is too small"); *MSVCRT__errno() = MSVCRT_ERANGE; memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); } else

1 0

David Adam : ddraw: Add tests for the foreground window set by SetCooperativeLevel.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 94f74a7caf84458d4400db46e0158b3e951f1d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f74a7caf84458d4400db46e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Thu Oct 28 14:18:15 2010 +0200 ddraw: Add tests for the foreground window set by SetCooperativeLevel. --- dlls/ddraw/tests/ddrawmodes.c | 106 +++++++++++++++++++++++++++++++++------- 1 files changed, 87 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index b6491f3..e83541a 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -33,7 +33,7 @@ static LPDIRECTDRAW lpDD = NULL; static LPDIRECTDRAWSURFACE lpDDSPrimary = NULL; static LPDIRECTDRAWSURFACE lpDDSBack = NULL; static WNDCLASS wc; -static HWND hwnd; +static HWND hwnd, hwnd2; static int modes_cnt; static int modes_size; static LPDDSURFACEDESC modes; @@ -54,31 +54,21 @@ static void init_function_pointers(void) pDirectDrawEnumerateExW = (void*)GetProcAddress(hmod, "DirectDrawEnumerateExW"); } -static void createwindow(void) +static HWND createwindow(void) { - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = DefWindowProcA; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = GetModuleHandleA(0); - wc.hIcon = LoadIconA(wc.hInstance, IDI_APPLICATION); - wc.hCursor = LoadCursorA(NULL, IDC_ARROW); - wc.hbrBackground = GetStockObject(BLACK_BRUSH); - wc.lpszMenuName = NULL; - wc.lpszClassName = "TestWindowClass"; - if(!RegisterClassA(&wc)) - assert(0); + HWND hwnd; hwnd = CreateWindowExA(0, "TestWindowClass", "TestWindowClass", WS_POPUP, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), NULL, NULL, GetModuleHandleA(0), NULL); - assert(hwnd != NULL); ShowWindow(hwnd, SW_HIDE); UpdateWindow(hwnd); SetFocus(hwnd); + + return hwnd; } static BOOL createdirectdraw(void) @@ -546,6 +536,7 @@ static void testdisplaymodes(void) static void testcooperativelevels_normal(void) { + BOOL sfw; HRESULT rc; DDSURFACEDESC surfacedesc; IDirectDrawSurface *surface = (IDirectDrawSurface *) 0xdeadbeef; @@ -561,11 +552,23 @@ static void testcooperativelevels_normal(void) ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW) returned: %x\n",rc); /* Do some tests with DDSCL_NORMAL mode */ + /* Fullscreen mode + normal mode + exclusive mode */ + sfw=FALSE; + if(hwnd2) + sfw=SetForegroundWindow(hwnd2); + else + skip("Failed to create the second window\n"); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL); todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_NORMAL) returned: %x\n",rc); + + if(sfw) + todo_wine ok(GetForegroundWindow()==hwnd,"Expected the main windows (%p) for foreground, received the second one (%p)\n",hwnd, hwnd2); + /* Try creating a double buffered primary in fullscreen + exclusive + normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); + if (rc == DDERR_UNSUPPORTEDMODE) skip("Unsupported mode\n"); else @@ -574,12 +577,21 @@ static void testcooperativelevels_normal(void) todo_wine ok(surface!=NULL, "Returned NULL surface pointer \n"); } if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); + /* Exclusive mode + normal mode */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_EXCLUSIVE | DDSCL_NORMAL); ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_EXCLUSIVE | DDSCL_NORMAL) returned: %x\n",rc); + /* Fullscreen mode + normal mode */ + sfw=FALSE; + if(hwnd2) sfw=SetForegroundWindow(hwnd2); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_NORMAL); todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_FULLSCREEN | DDSCL_NORMAL) returned: %x\n",rc); + + if(sfw) + ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + /* Try creating a double buffered primary in fullscreen + normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); if (rc == DDERR_UNSUPPORTEDMODE) @@ -589,12 +601,20 @@ static void testcooperativelevels_normal(void) ok(rc == DDERR_NOEXCLUSIVEMODE, "IDirectDraw_CreateSurface returned %08x\n", rc); ok(surface == NULL, "Returned surface pointer is %p\n", surface); } + if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); - /* Normal mode */ + + /* switching from Fullscreen mode to Normal mode */ + sfw=FALSE; + if(hwnd2) sfw=SetForegroundWindow(hwnd2); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_NORMAL); ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_NORMAL) returned: %x\n",rc); + if(sfw) + ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + /* Try creating a double buffered primary in normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); if (rc == DDERR_UNSUPPORTEDMODE) @@ -606,6 +626,17 @@ static void testcooperativelevels_normal(void) } if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); + /* switching from Normal mode to Fullscreen + Normal mode */ + sfw=FALSE; + if(hwnd2) sfw=SetForegroundWindow(hwnd2); + + rc = IDirectDraw_SetCooperativeLevel(lpDD, + hwnd, DDSCL_NORMAL | DDSCL_FULLSCREEN); + todo_wine ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_NORMAL | FULLSCREEN) returned: %x\n",rc); + + if(sfw) + ok(GetForegroundWindow()==hwnd2,"Expected the second windows (%p) for foreground, received the main one (%p)\n",hwnd2, hwnd); + /* Set the focus window */ rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_SETFOCUSWINDOW | DDSCL_CREATEDEVICEWINDOW); @@ -681,7 +712,7 @@ static void testcooperativelevels_normal(void) static void testcooperativelevels_exclusive(void) { - BOOL success; + BOOL sfw, success; HRESULT rc; RECT window_rect; @@ -702,11 +733,21 @@ static void testcooperativelevels_exclusive(void) ok(rc==DDERR_INVALIDPARAMS,"SetCooperativeLevel(DDSCL_FULLSCREEN) returned: %x\n",rc); /* Full screen mode + exclusive mode */ + sfw=FALSE; + if(hwnd2) + sfw=SetForegroundWindow(hwnd2); + else + skip("Failed to create the second window\n"); + rc = IDirectDraw_SetCooperativeLevel(lpDD, hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE); ok(rc==DD_OK,"SetCooperativeLevel(DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN) returned: %x\n",rc); - GetClientRect(hwnd, &window_rect); + + if(sfw) + ok(GetForegroundWindow()==hwnd,"Expected the main windows (%p) for foreground, received the second one (%p)\n",hwnd, hwnd2); + /* rect_before_create is assumed to hold the screen rect */ + GetClientRect(hwnd, &window_rect); rc = EqualRect(&rect_before_create, &window_rect); todo_wine ok(rc!=0, "Fullscreen window has wrong size\n"); @@ -783,9 +824,36 @@ START_TEST(ddrawmodes) { init_function_pointers(); - createwindow(); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = DefWindowProcA; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(0); + wc.hIcon = LoadIconA(wc.hInstance, IDI_APPLICATION); + wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hbrBackground = GetStockObject(BLACK_BRUSH); + wc.lpszMenuName = NULL; + wc.lpszClassName = "TestWindowClass"; + if (!RegisterClassA(&wc)) + { + skip("RegisterClassA failed\n"); + return; + } + + hwnd2=createwindow(); + hwnd=createwindow(); + + if (!hwnd) + { + skip("Failed to create the main window\n"); + return; + } + if (!createdirectdraw()) + { + skip("Failed to create the direct draw object\n"); return; + } test_DirectDrawEnumerateA(); test_DirectDrawEnumerateW();

1 0

Nikolay Sivov : msxml3: Implement a trivial case of ::put_nodeTypedValue() for elements.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: eef194a7992eaa9a90350ba4504c6d340b6c6f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef194a7992eaa9a90350ba45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 30 19:42:24 2010 +0400 msxml3: Implement a trivial case of ::put_nodeTypedValue() for elements. --- dlls/msxml3/element.c | 31 +++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 615499d..d6558f0 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -434,10 +434,37 @@ static HRESULT WINAPI domelem_get_nodeTypedValue( static HRESULT WINAPI domelem_put_nodeTypedValue( IXMLDOMElement *iface, - VARIANT var1) + VARIANT value) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_put_nodeTypedValue( IXMLDOMNode_from_impl(&This->node), var1 ); + VARIANT type; + HRESULT hr; + + TRACE("(%p)\n", This); + + /* for untyped node coerce to BSTR and set */ + if (IXMLDOMElement_get_dataType(iface, &type) == S_FALSE) + { + if (V_VT(&value) != VT_BSTR) + { + hr = VariantChangeType(&value, &value, 0, VT_BSTR); + if (hr == S_OK) + { + hr = node_set_content(&This->node, V_BSTR(&value)); + VariantClear(&value); + } + } + else + hr = node_set_content(&This->node, V_BSTR(&value)); + } + else + { + FIXME("not implemented for typed nodes. type %s\n", debugstr_w(V_BSTR(&value))); + VariantClear(&type); + return E_NOTIMPL; + } + + return hr; } static HRESULT WINAPI domelem_get_dataType( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a22975a..f560694 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7409,6 +7409,48 @@ static void test_createProcessingInstruction(void) IXMLDOMDocument_Release(doc); } +static void test_put_nodeTypedValue(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + VARIANT type; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + if (!doc) return; + + hr = IXMLDOMDocument_createElement(doc, _bstr_("Element"), &elem); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&type) = VT_EMPTY; + hr = IXMLDOMElement_get_dataType(elem, &type); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(V_VT(&type) == VT_NULL, "got %d, expected VT_NULL\n", V_VT(&type)); + + /* set typed value for untyped node */ + V_VT(&type) = VT_I1; + V_I1(&type) = 1; + hr = IXMLDOMElement_put_nodeTypedValue(elem, type); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&type) = VT_EMPTY; + hr = IXMLDOMElement_get_dataType(elem, &type); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(V_VT(&type) == VT_NULL, "got %d, expected VT_NULL\n", V_VT(&type)); + + /* no type info stored */ + V_VT(&type) = VT_EMPTY; + hr = IXMLDOMElement_get_nodeTypedValue(elem, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&type) == VT_BSTR, "got %d, expected VT_BSTR\n", V_VT(&type)); + ok(memcmp(V_BSTR(&type), _bstr_("1"), 2*sizeof(WCHAR)) == 0, + "got %s, expected \"1\"\n", wine_dbgstr_w(V_BSTR(&type))); + VariantClear(&type); + + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -7471,6 +7513,7 @@ START_TEST(domdoc) test_selectSingleNode(); test_events(); test_createProcessingInstruction(); + test_put_nodeTypedValue(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Get rid of ::cloneNode() forward.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 936d4cf91101ffd66468de714e986d89c4d8e8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=936d4cf91101ffd66468de714… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 31 11:50:58 2010 +0300 msxml3: Get rid of ::cloneNode() forward. --- dlls/msxml3/attribute.c | 5 +++-- dlls/msxml3/cdata.c | 5 +++-- dlls/msxml3/comment.c | 5 +++-- dlls/msxml3/docfrag.c | 5 +++-- dlls/msxml3/domdoc.c | 5 +++-- dlls/msxml3/element.c | 5 +++-- dlls/msxml3/entityref.c | 5 +++-- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 31 ++++++++++++------------------- dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/text.c | 5 +++-- 11 files changed, 40 insertions(+), 37 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index c63cf6e..c545a76 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -358,10 +358,11 @@ static HRESULT WINAPI domattr_get_ownerDocument( static HRESULT WINAPI domattr_cloneNode( IXMLDOMAttribute *iface, - VARIANT_BOOL pbool, IXMLDOMNode** outNode) + VARIANT_BOOL deep, IXMLDOMNode** outNode) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); + TRACE("(%p)->(%d %p)\n", This, deep, outNode); + return node_clone( &This->node, deep, outNode ); } static HRESULT WINAPI domattr_get_nodeTypeString( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index c346f1b..59898d4 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -369,10 +369,11 @@ static HRESULT WINAPI domcdata_get_ownerDocument( static HRESULT WINAPI domcdata_cloneNode( IXMLDOMCDATASection *iface, - VARIANT_BOOL pbool, IXMLDOMNode** outNode) + VARIANT_BOOL deep, IXMLDOMNode** outNode) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); + TRACE("(%p)->(%d %p)\n", This, deep, outNode); + return node_clone( &This->node, deep, outNode ); } static HRESULT WINAPI domcdata_get_nodeTypeString( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 9f8c0e3..7358bd5 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -362,10 +362,11 @@ static HRESULT WINAPI domcomment_get_ownerDocument( static HRESULT WINAPI domcomment_cloneNode( IXMLDOMComment *iface, - VARIANT_BOOL pbool, IXMLDOMNode** outNode) + VARIANT_BOOL deep, IXMLDOMNode** outNode) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); + TRACE("(%p)->(%d %p)\n", This, deep, outNode); + return node_clone( &This->node, deep, outNode ); } static HRESULT WINAPI domcomment_get_nodeTypeString( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index ccc6744..36d3cac 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -366,10 +366,11 @@ static HRESULT WINAPI domfrag_get_ownerDocument( static HRESULT WINAPI domfrag_cloneNode( IXMLDOMDocumentFragment *iface, - VARIANT_BOOL pbool, IXMLDOMNode** outNode) + VARIANT_BOOL deep, IXMLDOMNode** outNode) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); + TRACE("(%p)->(%d %p)\n", This, deep, outNode); + return node_clone( &This->node, deep, outNode ); } static HRESULT WINAPI domfrag_get_nodeTypeString( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d62d02b..f301470 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1174,10 +1174,11 @@ static HRESULT WINAPI domdoc_get_ownerDocument( static HRESULT WINAPI domdoc_cloneNode( IXMLDOMDocument3 *iface, VARIANT_BOOL deep, - IXMLDOMNode** cloneRoot) + IXMLDOMNode** outNode) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), deep, cloneRoot ); + TRACE("(%p)->(%d %p)\n", This, deep, outNode); + return node_clone( &This->node, deep, outNode ); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index d6558f0..cf8be13 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -374,10 +374,11 @@ static HRESULT WINAPI domelem_get_ownerDocument( static HRESULT WINAPI domelem_cloneNode( IXMLDOMElement *iface, - VARIANT_BOOL pbool, IXMLDOMNode** outNode) + VARIANT_BOOL deep, IXMLDOMNode** outNode) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); + TRACE("(%p)->(%d %p)\n", This, deep, outNode); + return node_clone( &This->node, deep, outNode ); } static HRESULT WINAPI domelem_get_nodeTypeString( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 501ff62..1fcbdd9 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -360,10 +360,11 @@ static HRESULT WINAPI entityref_get_ownerDocument( static HRESULT WINAPI entityref_cloneNode( IXMLDOMEntityReference *iface, - VARIANT_BOOL pbool, IXMLDOMNode** outNode) + VARIANT_BOOL deep, IXMLDOMNode** outNode) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); + TRACE("(%p)->(%d %p)\n", This, deep, outNode); + return node_clone( &This->node, deep, outNode ); } static HRESULT WINAPI entityref_get_nodeTypeString( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 310b9ad..0d41eac 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -192,6 +192,7 @@ extern HRESULT node_insert_before(xmlnode*,IXMLDOMNode*,const VARIANT*,IXMLDOMNo extern HRESULT node_replace_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT node_put_text(xmlnode*,BSTR); extern HRESULT node_get_xml(xmlnode*,BOOL,BOOL,BSTR*); +extern HRESULT node_clone(xmlnode*,VARIANT_BOOL,IXMLDOMNode**); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 72e6be9..e13fc4c 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -449,34 +449,27 @@ static HRESULT WINAPI xmlnode_get_ownerDocument( return DOMDocument_create_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)DOMDocument); } -static HRESULT WINAPI xmlnode_cloneNode( - IXMLDOMNode *iface, - VARIANT_BOOL deep, - IXMLDOMNode** cloneRoot) +HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - xmlNodePtr pClone = NULL; - IXMLDOMNode *pNode = NULL; + IXMLDOMNode *node; + xmlNodePtr clone; - TRACE("(%p)->(%d %p)\n", This, deep, cloneRoot); + if(!cloneNode) return E_INVALIDARG; - if(!cloneRoot) - return E_INVALIDARG; - - pClone = xmlCopyNode(This->node, deep ? 1 : 2); - if(pClone) + clone = xmlCopyNode(This->node, deep ? 1 : 2); + if (clone) { - pClone->doc = This->node->doc; - xmldoc_add_orphan(pClone->doc, pClone); + clone->doc = This->node->doc; + xmldoc_add_orphan(clone->doc, clone); - pNode = create_node(pClone); - if(!pNode) + node = create_node(clone); + if (!node) { ERR("Copy failed\n"); return E_FAIL; } - *cloneRoot = pNode; + *cloneNode = node; } else { @@ -1255,7 +1248,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = xmlnode_appendChild, xmlnode_hasChildNodes, xmlnode_get_ownerDocument, - xmlnode_cloneNode, + NULL, xmlnode_get_nodeTypeString, xmlnode_get_text, NULL, diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 4ba7607..5e3fd3a 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -376,10 +376,11 @@ static HRESULT WINAPI dom_pi_get_ownerDocument( static HRESULT WINAPI dom_pi_cloneNode( IXMLDOMProcessingInstruction *iface, - VARIANT_BOOL pbool, IXMLDOMNode** outNode) + VARIANT_BOOL deep, IXMLDOMNode** outNode) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); + TRACE("(%p)->(%d %p)\n", This, deep, outNode); + return node_clone( &This->node, deep, outNode ); } static HRESULT WINAPI dom_pi_get_nodeTypeString( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 38a44c3..a55a515 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -375,10 +375,11 @@ static HRESULT WINAPI domtext_get_ownerDocument( static HRESULT WINAPI domtext_cloneNode( IXMLDOMText *iface, - VARIANT_BOOL pbool, IXMLDOMNode** outNode) + VARIANT_BOOL deep, IXMLDOMNode** outNode) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_cloneNode( IXMLDOMNode_from_impl(&This->node), pbool, outNode ); + TRACE("(%p)->(%d %p)\n", This, deep, outNode); + return node_clone( &This->node, deep, outNode ); } static HRESULT WINAPI domtext_get_nodeTypeString(

1 0

Nikolay Sivov : msxml3: Get rid of ::get_prefix() forward.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 6556ad57f337ad8fbb2653999f230013bac29e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6556ad57f337ad8fbb2653999… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 31 12:22:53 2010 +0300 msxml3: Get rid of ::get_prefix() forward. --- dlls/msxml3/attribute.c | 5 ++- dlls/msxml3/cdata.c | 5 ++- dlls/msxml3/comment.c | 5 ++- dlls/msxml3/docfrag.c | 5 ++- dlls/msxml3/domdoc.c | 5 ++- dlls/msxml3/element.c | 5 ++- dlls/msxml3/entityref.c | 5 ++- dlls/msxml3/msxml_private.h | 10 ++++++++ dlls/msxml3/node.c | 20 +++++---------- dlls/msxml3/pi.c | 5 ++- dlls/msxml3/tests/domdoc.c | 54 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/text.c | 5 ++- 12 files changed, 97 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6556ad57f337ad8fbb265…

1 0