November 2010 - Wine-Commits

Detlef Riekenberg : wer/tests: Add initial tests for WerReportCreate + WerReportCloseHandle.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: b55e5a006598b14b1e69551d305d8e4f95308d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55e5a006598b14b1e69551d3… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 1 09:22:04 2010 +0100 wer/tests: Add initial tests for WerReportCreate + WerReportCloseHandle. --- dlls/wer/tests/main.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 99 insertions(+), 0 deletions(-) diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index 183974f..a431789 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -30,6 +30,7 @@ #include "werapi.h" #include "wine/test.h" +static const WCHAR appcrash[] = {'A','P','P','C','R','A','S','H',0}; static const WCHAR empty[] = {0}; static const WCHAR winetest_wer[] = {'w','i','n','e','t','e','s','t','_','w','e','r','.','e','x','e',0}; @@ -101,10 +102,108 @@ static void test_WerRemoveExcludedApplication(void) } +/* #### */ + +static void test_WerReportCloseHandle(void) +{ + HRESULT hr; + HREPORT report; + + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + todo_wine + ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); + + if (!report) { + skip("Nothing left to test\n"); + return; + } + + /* close the handle */ + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "got 0x%x for %p (expected S_OK)\n", hr, report); + + /* close the handle again */ + hr = WerReportCloseHandle(report); + ok(hr == E_INVALIDARG, "got 0x%x for %p again (expected E_INVALIDARG)\n", hr, report); + + hr = WerReportCloseHandle(NULL); + ok(hr == E_INVALIDARG, "got 0x%x for NULL(expected E_INVALIDARG)\n", hr); +} + +/* #### */ + +static void test_WerReportCreate(void) +{ + HRESULT hr; + HREPORT report; + HREPORT table[8]; + int i; + + report = (void *) 0xdeadbeef; + /* test a simple valid case */ + hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + + todo_wine + ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); + + if (!report) { + skip("Nothing left to test\n"); + return; + } + + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "got 0x%x for %p (expected S_OK)\n", hr, report); + + /* the ptr to store the created handle is always needed */ + hr = WerReportCreate(appcrash, WerReportCritical, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + /* the event type must be a valid string */ + report = (void *) 0xdeadbeef; + hr = WerReportCreate(NULL, WerReportCritical, NULL, &report); + ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); + + report = (void *) 0xdeadbeef; + hr = WerReportCreate(empty, WerReportCritical, NULL, &report); + ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); + + /* WER_REPORT_TYPE is not checked during WerReportCreate */ + for (i = 0; i <= WerReportInvalid + 1; i++) { + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, i, NULL, &report); + ok(hr == S_OK, "%d: got 0x%x and %p (expected S_OK)\n", i, hr, report); + + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); + + } + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, 42, NULL, &report); + ok(hr == S_OK, "42: got 0x%x and %p (expected S_OK)\n", hr, report); + + /* multiple active reports are possible */ + memset(table, 0, sizeof(table)); + for (i = 0; i < (sizeof(table) / sizeof(table[0]) -1); i++) { + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, WerReportCritical, NULL, &table[i]); + ok(hr == S_OK, "%02d: got 0x%x and %p (expected S_OK)\n", i, hr, table[i]); + } + + while (i > 0) { + i--; + hr = WerReportCloseHandle(table[i]); + ok(hr == S_OK, "got 0x%x for %p (expected S_OK)\n", hr, table[i]); + } + +} + /* ########################### */ START_TEST(main) { test_WerAddExcludedApplication(); test_WerRemoveExcludedApplication(); + test_WerReportCloseHandle(); + test_WerReportCreate(); }

1 0

Yaron Shahrabani : msrle32: Added Hebrew translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

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

Detlef Riekenberg : wer: Add stubs for WerReportCreate + WerReportCloseHandle.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: de5e0cbbf8cd42695eddca4f4ba22743c27c27b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5e0cbbf8cd42695eddca4f4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 1 09:22:03 2010 +0100 wer: Add stubs for WerReportCreate + WerReportCloseHandle. --- dlls/wer/main.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wer/wer.spec | 4 +- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index a283bae..b577b6b 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "werapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wer); @@ -69,3 +70,60 @@ HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR exeName, BOOL allUsers) FIXME("(%s, %d) :stub\n",debugstr_w(exeName), allUsers); return E_NOTIMPL; } + +/*********************************************************************** + * WerReportCloseHandle (wer.@) + * + * Close an error reporting handle and free associated resources + * + * PARAMS + * hreport [i] error reporting handle to close + * + * RETURNS + * Success: S_OK + * Failure: A HRESULT error code + * + */ +HRESULT WINAPI WerReportCloseHandle(HREPORT hreport) +{ + FIXME("(%p) :stub\n", hreport); + + return E_NOTIMPL; +} + +/*********************************************************************** + * WerReportCreate (wer.@) + * + * Create an error report in memory and return a related HANDLE + * + * PARAMS + * eventtype [i] a name for the event type + * reporttype [i] what type of report should be created + * reportinfo [i] NULL or a ptr to a struct with some detailed information + * phandle [o] ptr, where the resulting handle should be saved + * + * RETURNS + * Success: S_OK + * Failure: A HRESULT error code + * + * NOTES + * The event type must be registered at microsoft. Predefined types are + * "APPCRASH" as the default on Windows, "Crash32" and "Crash64" + * + */ +HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWER_REPORT_INFORMATION reportinfo, HREPORT *phandle) +{ + + FIXME("(%s, %d, %p, %p) :stub\n", debugstr_w(eventtype), reporttype, reportinfo, phandle); + if (reportinfo) { + TRACE(".wzFriendlyEventName: %s\n", debugstr_w(reportinfo->wzFriendlyEventName)); + TRACE(".wzApplicationName: %s\n", debugstr_w(reportinfo->wzApplicationName)); + } + + if (phandle) *phandle = NULL; + if (!eventtype || !eventtype[0] || !phandle) { + return E_INVALIDARG; + } + + return E_NOTIMPL; +} diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index b50eb47..6369f85 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -65,8 +65,8 @@ @ stdcall WerRemoveExcludedApplication(wstr long) @ stub WerReportAddDump @ stub WerReportAddFile -@ stub WerReportCloseHandle -@ stub WerReportCreate +@ stdcall WerReportCloseHandle(ptr) +@ stdcall WerReportCreate(wstr long ptr ptr) @ stub WerReportSetParameter @ stub WerReportSetUIOption @ stub WerReportSubmit

1 0

Yaron Shahrabani : winemine: Added Hebrew translation.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

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 Nov. 1, 2010

Nov. 1, 2010

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

Nikolay Sivov : msxml3: Hint parser to use UTF-8 if it's specfied as BOM.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 678fbc172c5f54e6417f0fc1336a0a3b444b444c URL: http://source.winehq.org/git/wine.git/?a=commit;h=678fbc172c5f54e6417f0fc13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 30 18:49:43 2010 +0400 msxml3: Hint parser to use UTF-8 if it's specfied as BOM. --- dlls/msxml3/saxreader.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a1df5c7..7d8caf4 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1770,6 +1770,8 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B /*** SAXXMLReader internal functions ***/ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int size, BOOL vbInterface) { + xmlCharEncoding encoding = XML_CHAR_ENCODING_NONE; + xmlChar *enc_name = NULL; saxlocator *locator; HRESULT hr; @@ -1777,6 +1779,22 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz if(FAILED(hr)) return hr; + if (size >= 4) + { + const unsigned char *buff = (unsigned char*)buffer; + + encoding = xmlDetectCharEncoding((xmlChar*)buffer, 4); + enc_name = (xmlChar*)xmlGetCharEncodingName(encoding); + TRACE("detected encoding: %s\n", enc_name); + /* skip BOM, parser won't switch encodings and so won't skip it on its own */ + if ((encoding == XML_CHAR_ENCODING_UTF8) && + buff[0] == 0xEF && buff[1] == 0xBB && buff[2] == 0xBF) + { + buffer += 3; + size -= 3; + } + } + locator->pParserCtxt = xmlCreateMemoryParserCtxt(buffer, size); if(!locator->pParserCtxt) { @@ -1784,6 +1802,9 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz return E_FAIL; } + if (encoding == XML_CHAR_ENCODING_UTF8) + locator->pParserCtxt->encoding = xmlStrdup(enc_name); + xmlFree(locator->pParserCtxt->sax); locator->pParserCtxt->sax = &locator->saxreader->sax; locator->pParserCtxt->userData = locator;

1 0

Nikolay Sivov : msxml3: Get rid of ::get_prefix() forward.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

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

Nikolay Sivov : msxml3: Implement a trivial case of ::put_nodeTypedValue() for elements.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

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 ::get_baseName() forward.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

Module: wine Branch: master Commit: 1e998bfc3f14ccfc9ee1b250d1a6a9c18bca3541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e998bfc3f14ccfc9ee1b250d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 31 12:39:53 2010 +0300 msxml3: Get rid of ::get_baseName() 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 | 38 +++++++------------------------------- dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/text.c | 5 +++-- 11 files changed, 35 insertions(+), 49 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index c9a2cc7..34cc007 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -506,10 +506,11 @@ static HRESULT WINAPI domattr_get_prefix( static HRESULT WINAPI domattr_get_baseName( IXMLDOMAttribute *iface, - BSTR* p) + BSTR* name) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, name); + return node_get_base_name( &This->node, name ); } static HRESULT WINAPI domattr_transformNodeToObject( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e62a7d6..d602bfa 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -517,10 +517,11 @@ static HRESULT WINAPI domcdata_get_prefix( static HRESULT WINAPI domcdata_get_baseName( IXMLDOMCDATASection *iface, - BSTR* p) + BSTR* name) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + FIXME("(%p)->(%p): needs test\n", This, name); + return return_null_bstr( name ); } static HRESULT WINAPI domcdata_transformNodeToObject( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index b749638..5402a54 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -510,10 +510,11 @@ static HRESULT WINAPI domcomment_get_prefix( static HRESULT WINAPI domcomment_get_baseName( IXMLDOMComment *iface, - BSTR* p) + BSTR* name) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, name); + return return_null_bstr( name ); } static HRESULT WINAPI domcomment_transformNodeToObject( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 2c0ad81..792298c 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -514,10 +514,11 @@ static HRESULT WINAPI domfrag_get_prefix( static HRESULT WINAPI domfrag_get_baseName( IXMLDOMDocumentFragment *iface, - BSTR* p) + BSTR* name) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + FIXME("(%p)->(%p): needs test\n", This, name); + return return_null_bstr( name ); } static HRESULT WINAPI domfrag_transformNodeToObject( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index b70acd4..500bde8 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1341,10 +1341,11 @@ static HRESULT WINAPI domdoc_get_prefix( static HRESULT WINAPI domdoc_get_baseName( IXMLDOMDocument3 *iface, - BSTR* nameString ) + BSTR* name ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), nameString ); + TRACE("(%p)->(%p)\n", This, name); + return return_null_bstr( name ); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index fd49874..418307e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -562,10 +562,11 @@ static HRESULT WINAPI domelem_get_prefix( static HRESULT WINAPI domelem_get_baseName( IXMLDOMElement *iface, - BSTR* p) + BSTR* name) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, name); + return node_get_base_name( &This->node, name ); } static HRESULT WINAPI domelem_transformNodeToObject( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index fae2a2c..308b9ce 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -508,10 +508,11 @@ static HRESULT WINAPI entityref_get_prefix( static HRESULT WINAPI entityref_get_baseName( IXMLDOMEntityReference *iface, - BSTR* p) + BSTR* name) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + FIXME("(%p)->(%p): needs test\n", This, name); + return return_null_bstr( name ); } static HRESULT WINAPI entityref_transformNodeToObject( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8ae84cf..3d7903c 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -194,6 +194,7 @@ 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 node_get_prefix(xmlnode*,BSTR*); +extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3b2ce35..3bb0970 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1170,40 +1170,16 @@ HRESULT node_get_prefix(xmlnode *This, BSTR *prefix) return *prefix ? S_OK : S_FALSE; } -static HRESULT WINAPI xmlnode_get_baseName( - IXMLDOMNode *iface, - BSTR* nameString) +HRESULT node_get_base_name(xmlnode *This, BSTR *name) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - BSTR str = NULL; - HRESULT r = S_FALSE; - - TRACE("(%p)->(%p)\n", This, nameString ); - - if ( !nameString ) - return E_INVALIDARG; + if (!name) return E_INVALIDARG; - switch ( This->node->type ) - { - case XML_ELEMENT_NODE: - case XML_ATTRIBUTE_NODE: - case XML_PI_NODE: - str = bstr_from_xmlChar( This->node->name ); - r = S_OK; - break; - case XML_TEXT_NODE: - case XML_COMMENT_NODE: - case XML_DOCUMENT_NODE: - break; - default: - ERR("Unhandled type %d\n", This->node->type ); - break; - } + *name = bstr_from_xmlChar(This->node->name); + if (!*name) return E_OUTOFMEMORY; - TRACE("returning %08x str = %s\n", r, debugstr_w( str ) ); + TRACE("returning %s\n", debugstr_w(*name)); - *nameString = str; - return r; + return S_OK; } static HRESULT WINAPI xmlnode_transformNodeToObject( @@ -1259,7 +1235,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, xmlnode_get_namespaceURI, NULL, - xmlnode_get_baseName, + NULL, xmlnode_transformNodeToObject, }; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 2158c13..44ccb96 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -524,10 +524,11 @@ static HRESULT WINAPI dom_pi_get_prefix( static HRESULT WINAPI dom_pi_get_baseName( IXMLDOMProcessingInstruction *iface, - BSTR* p) + BSTR* name) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, name); + return node_get_base_name( &This->node, name ); } static HRESULT WINAPI dom_pi_transformNodeToObject( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 0fd8b42..47bb1f0 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -523,10 +523,11 @@ static HRESULT WINAPI domtext_get_prefix( static HRESULT WINAPI domtext_get_baseName( IXMLDOMText *iface, - BSTR* p) + BSTR* name) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_baseName( IXMLDOMNode_from_impl(&This->node), p ); + TRACE("(%p)->(%p)\n", This, name); + return return_null_bstr( name ); } static HRESULT WINAPI domtext_transformNodeToObject(

1 0

Nikolay Sivov : msxml3: Get rid of ::cloneNode() forward.
by Alexandre Julliard Nov. 1, 2010

Nov. 1, 2010

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