August 2011 - Wine-Commits - list.winehq.org

Ričardas Barkauskas : wined3d: Avoid dereferencing null pointer in context_apply_clear_state when calling context_generate_rt_mask_from_surface .
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: e110c08cc8cfa1b2acd9c363d954a85ad61aa870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e110c08cc8cfa1b2acd9c363d… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 22 15:46:31 2011 +0300 wined3d: Avoid dereferencing null pointer in context_apply_clear_state when calling context_generate_rt_mask_from_surface. --- dlls/wined3d/context.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 42d26bc..4abe18e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2066,7 +2066,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d } else { - rt_mask = context_generate_rt_mask_no_fbo(device, rts[0]); + rt_mask = context_generate_rt_mask_no_fbo(device, rt_count ? rts[0] : NULL); } } else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO @@ -2079,7 +2079,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d } else { - rt_mask = context_generate_rt_mask_no_fbo(device, rts[0]); + rt_mask = context_generate_rt_mask_no_fbo(device, rt_count ? rts[0] : NULL); } old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask;

1 0

Henri Verbeet : wined3d: Use draw_binding in surface_unload().
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 6cdfb95c8e5f262557e24acd33ab7ae6207165a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cdfb95c8e5f262557e24acd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:44 2011 +0200 wined3d: Use draw_binding in surface_unload(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3edb48b..0572b47 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1866,7 +1866,7 @@ static void surface_unload(struct wined3d_resource *resource) { /* Load the surface into system memory */ surface_load_location(surface, SFLAG_INSYSMEM, NULL); - surface_modify_location(surface, SFLAG_INDRAWABLE, FALSE); + surface_modify_location(surface, surface->draw_binding, FALSE); } surface_modify_location(surface, SFLAG_INTEXTURE, FALSE); surface_modify_location(surface, SFLAG_INSRGBTEX, FALSE);

1 0

Michael Stefaniuc : ole32: Cleanup ItemMonikerImpl_QueryInterface().
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 82b3d35b737ae06962cf7cd73fc37bcdfd536aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b3d35b737ae06962cf7cd73… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 24 12:18:49 2011 +0200 ole32: Cleanup ItemMonikerImpl_QueryInterface(). --- dlls/ole32/itemmoniker.c | 37 +++++++++++++++---------------------- 1 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 644633c..32f7043 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -67,23 +67,17 @@ static HRESULT WINAPI ItemMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid { ItemMonikerImpl *This = impl_from_IMoniker(iface); - TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); + TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppvObject); - /* Perform a sanity check on the parameters.*/ - if ( (This==0) || (ppvObject==0) ) - return E_INVALIDARG; - - /* Initialize the return parameter */ - *ppvObject = 0; - - /* Compare the riid with the interface IDs implemented by this object.*/ - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream, riid) || - IsEqualIID(&IID_IMoniker, riid) - ) - *ppvObject = iface; + if (!ppvObject) + return E_INVALIDARG; + /* Compare the riid with the interface IDs implemented by this object.*/ + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IPersist, riid) || + IsEqualIID(&IID_IPersistStream, riid) || + IsEqualIID(&IID_IMoniker, riid)) + *ppvObject = iface; else if (IsEqualIID(&IID_IROTData, riid)) *ppvObject = &This->IROTData_iface; else if (IsEqualIID(&IID_IMarshal, riid)) @@ -95,15 +89,14 @@ static HRESULT WINAPI ItemMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid return hr; return IUnknown_QueryInterface(This->pMarshal, riid, ppvObject); } - - /* Check that we obtained an interface.*/ - if ((*ppvObject)==0) + else + { + *ppvObject = NULL; return E_NOINTERFACE; + } - /* Query Interface always increases the reference count by one when it is successful */ - IMoniker_AddRef(iface); - - return S_OK; + IMoniker_AddRef(iface); + return S_OK; } /******************************************************************************

1 0

Ričardas Barkauskas : ddraw: Do not create implicit depth buffer.
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: bf7df8516991cf4d544cbc22e66692e25be24b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7df8516991cf4d544cbc22e… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 22 15:46:41 2011 +0300 ddraw: Do not create implicit depth buffer. --- dlls/ddraw/ddraw.c | 50 +++-------------------------------------------- dlls/ddraw/tests/d3d.c | 12 +++++++++++ 2 files changed, 16 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index fc0dd93..d1754ec 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2939,8 +2939,8 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac localParameters.SwapEffect = WINED3DSWAPEFFECT_COPY; localParameters.hDeviceWindow = window; localParameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); - localParameters.EnableAutoDepthStencil = TRUE; - localParameters.AutoDepthStencilFormat = WINED3DFMT_D16_UNORM; + localParameters.EnableAutoDepthStencil = FALSE; + localParameters.AutoDepthStencilFormat = WINED3DFMT_UNKNOWN; localParameters.Flags = 0; localParameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; localParameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; @@ -5923,50 +5923,8 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) { - struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); - IDirectDrawSurface7 *ddraw7; - IDirectDrawSurfaceImpl *ddraw_surface; - DDSURFACEDESC2 ddsd; - HRESULT hr; - - TRACE("device_parent %p, width %u, height %u, format %#x, multisample_type %#x,\n" - "\tmultisample_quality %u, discard %u, surface %p.\n", - device_parent, width, height, format, multisample_type, multisample_quality, discard, surface); - - *surface = NULL; - - /* Create a DirectDraw surface */ - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.u4.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - ddsd.dwHeight = height; - ddsd.dwWidth = width; - if (format) - { - PixelFormat_WineD3DtoDD(&ddsd.u4.ddpfPixelFormat, format); - } - else - { - ddsd.dwFlags ^= DDSD_PIXELFORMAT; - } - - ddraw->depthstencil = TRUE; - hr = IDirectDraw7_CreateSurface(&ddraw->IDirectDraw7_iface, &ddsd, &ddraw7, NULL); - ddraw->depthstencil = FALSE; - if (FAILED(hr)) - { - WARN("Failed to create depth/stencil surface, hr %#x.\n", hr); - return hr; - } - - ddraw_surface = impl_from_IDirectDrawSurface7(ddraw7); - *surface = ddraw_surface->wined3d_surface; - wined3d_surface_incref(*surface); - IDirectDrawSurface7_Release(&ddraw_surface->IDirectDrawSurface7_iface); - - return D3D_OK; + ERR("DirectDraw doesn't have and shoudn't try creating implicit depth buffers.\n"); + return E_NOTIMPL; } static HRESULT CDECL device_parent_create_volume(struct wined3d_device_parent *device_parent, diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 685ed45..8946d48 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -100,11 +100,19 @@ static ULONG getRefcount(IUnknown *iface) return IUnknown_Release(iface); } +static HRESULT WINAPI SurfaceCounter(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + UINT *num = context; + (*num)++; + IDirectDrawSurface_Release(surface); + return DDENUMRET_OK; +} static BOOL CreateDirect3D(void) { HRESULT rc; DDSURFACEDESC2 ddsd; + UINT num; rc = pDirectDrawCreateEx(NULL, (void**)&lpDD, &IID_IDirectDraw7, NULL); @@ -131,6 +139,10 @@ static BOOL CreateDirect3D(void) if (FAILED(rc)) return FALSE; + num = 0; + IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, NULL, &num, SurfaceCounter); + ok(num == 1, "Has %d surfaces, expected 1\n", num); + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT;

1 0

Henri Verbeet : wined3d: Use draw_binding in context_apply_blit_state().
by Alexandre Julliard Aug. 25, 2011

Aug. 25, 2011

Module: wine Branch: master Commit: 47c5711fe235281121c854556570c7ad1cd418a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c5711fe235281121c854556… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:46 2011 +0200 wined3d: Use draw_binding in context_apply_blit_state(). --- dlls/wined3d/context.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4abe18e..e13af5f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1947,6 +1947,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_device *device /* Context activation is done by the caller. */ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) { + struct wined3d_surface *rt = context->current_rt; DWORD rt_mask, old_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -1955,12 +1956,12 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de if (context->render_offscreen) { - surface_internal_preload(context->current_rt, SRGB_RGB); + surface_internal_preload(rt, SRGB_RGB); ENTER_GL(); - context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, context->current_rt, NULL, SFLAG_INTEXTURE); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, rt, NULL, rt->draw_binding); LEAVE_GL(); - if (context->current_rt && context->current_rt->resource.format->id != WINED3DFMT_NULL) + if (rt && rt->resource.format->id != WINED3DFMT_NULL) rt_mask = 1; else rt_mask = 0; @@ -1970,12 +1971,12 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); LEAVE_GL(); - rt_mask = context_generate_rt_mask_from_surface(context->current_rt); + rt_mask = context_generate_rt_mask_from_surface(rt); } } else { - rt_mask = context_generate_rt_mask_no_fbo(device, context->current_rt); + rt_mask = context_generate_rt_mask_no_fbo(device, rt); } old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask;

1 0

Jacek Caban : mshtml: Get rid of no longer useful get_nsdoc_window helper.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: 05d3b9cd1a3476c4c054ce5828cccdcd5197d40f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d3b9cd1a3476c4c054ce582… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 24 15:38:08 2011 +0200 mshtml: Get rid of no longer useful get_nsdoc_window helper. --- dlls/mshtml/htmlframebase.c | 5 +++-- dlls/mshtml/htmlwindow.c | 14 -------------- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/npplugin.c | 4 ++-- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 850d1a9..6c52e53 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -39,13 +39,14 @@ HRESULT set_frame_doc(HTMLFrameBase *frame, nsIDOMDocument *nsdoc) { nsIDOMWindow *nswindow; HTMLWindow *window; + nsresult nsres; HRESULT hres = S_OK; if(frame->content_window) return S_OK; - nswindow = get_nsdoc_window(nsdoc); - if(!nswindow) + nsres = nsIDOMDocument_GetDefaultView(nsdoc, &nswindow); + if(NS_FAILED(nsres) || !nswindow) return E_FAIL; window = nswindow_to_window(nswindow); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 17fe016..960a445 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -83,20 +83,6 @@ static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) } } -nsIDOMWindow *get_nsdoc_window(nsIDOMDocument *nsdoc) -{ - nsIDOMWindow *nswindow; - nsresult nsres; - - nsres = nsIDOMDocument_GetDefaultView(nsdoc, &nswindow); - if(NS_FAILED(nsres)) { - ERR("GetDefaultView failed: %08x\n", nsres); - return NULL; - } - - return nswindow; -} - static void release_children(HTMLWindow *This) { HTMLWindow *child; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index eac02d9..9bb37e4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -609,7 +609,6 @@ HRESULT create_document_fragment(nsIDOMNode*,HTMLDocumentNode*,HTMLDocumentNode* HRESULT HTMLWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLWindow*,HTMLWindow**) DECLSPEC_HIDDEN; void update_window_doc(HTMLWindow*) DECLSPEC_HIDDEN; HTMLWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; -nsIDOMWindow *get_nsdoc_window(nsIDOMDocument*) DECLSPEC_HIDDEN; HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLWindow*) DECLSPEC_HIDDEN; HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLWindow*) DECLSPEC_HIDDEN; HRESULT HTMLLocation_Create(HTMLWindow*,HTMLLocation**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 62f0d52..e22499b 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -126,9 +126,9 @@ static HTMLWindow *get_elem_window(nsIDOMElement *elem) if(NS_FAILED(nsres)) return NULL; - nswindow = get_nsdoc_window(nsdoc); + nsres = nsIDOMDocument_GetDefaultView(nsdoc, &nswindow); nsIDOMDocument_Release(nsdoc); - if(!nswindow) + if(NS_FAILED(nsres) || !nswindow) return NULL; window = nswindow_to_window(nswindow);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: 351bfadd3165cbb0e15cc8a34964209f6ac13217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351bfadd3165cbb0e15cc8a34… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Aug 24 15:42:38 2011 +0200 po: Update French translation. --- po/fr.po | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/po/fr.po b/po/fr.po index 937fb68..08e9ee2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-07-26 20:25+0100\n" +"PO-Revision-Date: 2011-08-24 14:25+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -8843,13 +8843,12 @@ msgstr "" "Veuillez utiliser un autre éditeur." #: notepad.rc:81 -#, fuzzy msgid "" "You did not enter any text.\n" "Please type something and try again." msgstr "" "Vous n'avez pas entré de texte.\n" -"Veuillez taper quelque chose et recommencer" +"Veuillez taper quelque chose et recommencer." #: notepad.rc:83 msgid "" @@ -8937,21 +8936,19 @@ msgstr "Indicateur &CoCreateInstance" #: oleview.rc:41 msgid "&In-process server" -msgstr "" +msgstr "&Serveur intégré au processus" #: oleview.rc:42 msgid "In-process &handler" -msgstr "" +msgstr "&Gestionnaire intégré au processus" #: oleview.rc:43 -#, fuzzy msgid "&Local server" -msgstr "Erreur locale" +msgstr "Serveur &local" #: oleview.rc:44 -#, fuzzy msgid "&Remote server" -msgstr "&Supprimer" +msgstr "Serveur &distant" #: oleview.rc:47 msgid "View &Type information" @@ -9105,20 +9102,21 @@ msgstr "" #: oleview.rc:113 msgid "Ask for an in-process server when calling CoGetClassObject" msgstr "" +"Requérir un serveur intégré au processus lors de l'appel à CoGetClassObject" #: oleview.rc:114 msgid "Ask for an in-process handler when calling CoGetClassObject" msgstr "" +"Requérir un gestionnaire intégré au processus lors de l'appel à " +"CoGetClassObject" #: oleview.rc:115 -#, fuzzy msgid "Ask for a local server when calling CoGetClassObject" -msgstr "Utiliser CLSCTX_LOCAL_SERVER lors de l'appel à CoGetClassObject" +msgstr "Requérir un serveur local lors de l'appel à CoGetClassObject" #: oleview.rc:116 -#, fuzzy msgid "Ask for a remote server when calling CoGetClassObject" -msgstr "Utiliser CLSCTX_LOCAL_SERVER lors de l'appel à CoGetClassObject" +msgstr "Requérir un serveur distant lors de l'appel à CoGetClassObject" #: oleview.rc:128 msgid "ObjectClasses"

1 0

Alexandre Julliard : msvcp90: Add separate entry points for functions with different calling conventions .
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: 43d9122e3c043601e21adb2c814ec8afb98a92ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d9122e3c043601e21adb2c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 24 19:33:30 2011 +0200 msvcp90: Add separate entry points for functions with different calling conventions. --- dlls/msvcp90/locale.c | 19 +++++++++++++++---- dlls/msvcp90/msvcp90.spec | 8 ++++---- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 768cc51..c838744 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -250,8 +250,6 @@ locale__Locimp* __thiscall locale__Locimp_ctor_transparent(locale__Locimp *this, /* ??0_Locimp(a)locale@std@@AAE(a)ABV012@@Z */ /* ??0_Locimp(a)locale@std@@AEAA(a)AEBV012@@Z */ -/* ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z */ -/* ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPEAV123(a)AEBV123@@Z */ DEFINE_THISCALL_WRAPPER(locale__Locimp_copy_ctor, 8) locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const locale__Locimp *copy) { @@ -259,16 +257,29 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const return NULL; } +/* ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z */ +/* ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPEAV123(a)AEBV123@@Z */ +locale__Locimp* __cdecl locale__Locimp__Locimp_ctor(locale__Locimp *this, const locale__Locimp *copy) +{ + FIXME("(%p %p) stub\n", this, copy); + return NULL; +} + /* ??1_Locimp(a)locale@std@@MAE(a)XZ */ /* ??1_Locimp(a)locale@std@@MEAA(a)XZ */ -/* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z */ -/* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPEAV123@@Z */ DEFINE_THISCALL_WRAPPER(locale__Locimp_dtor, 4) void __thiscall locale__Locimp_dtor(locale__Locimp *this) { FIXME("(%p) stub\n", this); } +/* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z */ +/* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPEAV123@@Z */ +void __cdecl locale__Locimp__Locimp_dtor(locale__Locimp *this) +{ + FIXME("(%p) stub\n", this); +} + DEFINE_THISCALL_WRAPPER(MSVCP_locale__Locimp_vector_dtor, 8) locale__Locimp* __thiscall MSVCP_locale__Locimp_vector_dtor(locale__Locimp *this, unsigned int flags) { diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2f9079c..f3062cd 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2577,10 +2577,10 @@ @ stub ?_Isnan@?$_Ctraits(a)O@std@@SA_NO(a)Z @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac -@ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp_copy_ctor -@ cdecl -arch=win64 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPEAV123(a)AEBV123@@Z(ptr ptr) locale__Locimp_copy_ctor -@ cdecl -arch=win32 ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z(ptr) locale__Locimp_dtor -@ cdecl -arch=win64 ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPEAV123@@Z(ptr) locale__Locimp_dtor +@ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor +@ cdecl -arch=win64 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPEAV123(a)AEBV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor +@ cdecl -arch=win32 ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z(ptr) locale__Locimp__Locimp_dtor +@ cdecl -arch=win64 ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPEAV123@@Z(ptr) locale__Locimp__Locimp_dtor @ cdecl -arch=win32 ?_Locinfo_Addcats(a)_Locinfo@std@@SAAAV12(a)PAV12@HPBD(a)Z(ptr long str) _Locinfo__Locinfo_Addcats @ cdecl -arch=win64 ?_Locinfo_Addcats(a)_Locinfo@std@@SAAEAV12(a)PEAV12@HPEBD(a)Z(ptr long str) _Locinfo__Locinfo_Addcats @ cdecl -arch=win32 ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z(ptr ptr) _Locinfo__Locinfo_ctor_bstr

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

1 0

Francois Gouget : wrc: Fix the spelling of the --endianness option.
by Alexandre Julliard Aug. 24, 2011

Aug. 24, 2011

Module: wine Branch: master Commit: 9c11faf619eb5d8b12ef8dfe2878343ff3de6a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c11faf619eb5d8b12ef8dfe2… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 24 15:22:52 2011 +0200 wrc: Fix the spelling of the --endianness option. --- tools/wrc/wrc.c | 8 ++++---- tools/wrc/wrc.man.in | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index b1418c1..2eb5380 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -56,7 +56,7 @@ static const char usage[] = " -D, --define id[=val] Define preprocessor identifier id=val\n" " --debug=nn Set debug level to 'nn'\n" " -E Preprocess only\n" - " --endianess=e Set output byte-order e={n[ative], l[ittle], b[ig]}\n" + " --endianness=e Set output byte-order e={n[ative], l[ittle], b[ig]}\n" " (win32 only; default is " ENDIAN "-endian)\n" " -F TARGET Synonym for -b for compatibility with windres\n" " -fo FILE Synonym for -o for compatibility with windres\n" @@ -176,7 +176,7 @@ enum long_options_values LONG_OPT_PREPROCESSOR, LONG_OPT_VERSION, LONG_OPT_DEBUG, - LONG_OPT_ENDIANESS, + LONG_OPT_ENDIANNESS, LONG_OPT_PEDANTIC, LONG_OPT_VERIFY_TRANSL }; @@ -186,7 +186,7 @@ static const char short_options[] = static const struct option long_options[] = { { "debug", 1, NULL, LONG_OPT_DEBUG }, { "define", 1, NULL, 'D' }, - { "endianess", 1, NULL, LONG_OPT_ENDIANESS }, + { "endianness", 1, NULL, LONG_OPT_ENDIANNESS }, { "help", 0, NULL, 'h' }, { "include-dir", 1, NULL, 'I' }, { "input", 1, NULL, 'i' }, @@ -396,7 +396,7 @@ int main(int argc,char *argv[]) case LONG_OPT_DEBUG: debuglevel = strtol(optarg, NULL, 0); break; - case LONG_OPT_ENDIANESS: + case LONG_OPT_ENDIANNESS: switch(optarg[0]) { case 'n': diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 16ed347..cfdf800 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -37,7 +37,7 @@ Set debug level to \fInn\fR. The value is a bitmask consisting of 1=verbose, 2=dump internals, 4=resource parser trace, 8=preprocessor messages, 16=preprocessor scanner and 32=preprocessor parser trace. .TP -.I \fB\-\-endianess\fR=\fIe\fR +.I \fB\-\-endianness\fR=\fIe\fR Win32 only; set output byte\-ordering, where \fIe\fR is one of n[ative], l[ittle] or b[ig]. Only resources in source-form can be reordered. Native ordering depends on the system on which \fBwrc\fR was built. You can see

1 0