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

Henri Verbeet : wined3d: Use draw_binding in surface_unmap().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 683b52ed92fde8f47dce36640225cd16aaf4009a URL: http://source.winehq.org/git/wine.git/?a=commit;h=683b52ed92fde8f47dce36640… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:42 2011 +0200 wined3d: Use draw_binding in surface_unmap(). --- 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 95f5052..604073d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -984,7 +984,7 @@ static void surface_unmap(struct wined3d_surface *surface) surface->flags |= SFLAG_INSYSMEM; } - surface_load_location(surface, SFLAG_INDRAWABLE, fullsurface ? NULL : &surface->dirtyRect); + surface_load_location(surface, surface->draw_binding, fullsurface ? NULL : &surface->dirtyRect); /* Partial rectangle tracking is not commonly implemented, it is only * done for render targets. INSYSMEM was set before to tell

1 0

Henri Verbeet : wined3d: Use draw_binding in surface_realize_palette().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 1d43f07239c7a0b9c014443091d9f627bed844f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d43f07239c7a0b9c01444309… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:43 2011 +0200 wined3d: Use draw_binding in surface_realize_palette(). --- 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 604073d..3edb48b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -811,7 +811,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) /* Propagate the changes to the drawable when we have a palette. */ if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET) - surface_load_location(surface, SFLAG_INDRAWABLE, NULL); + surface_load_location(surface, surface->draw_binding, NULL); } static HRESULT surface_draw_overlay(struct wined3d_surface *surface)

1 0

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

25 Aug '11

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

Henri Verbeet : wined3d: Use draw_binding in swapchain_gl_present().
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: f0d8f2aa8914a41b17de3976f07db68fcfc670dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d8f2aa8914a41b17de3976f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 24 22:08:45 2011 +0200 wined3d: Use draw_binding in swapchain_gl_present(). --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 20c2323..fe1a510 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -614,7 +614,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R * the texture / sysmem copy needs to be reloaded from the drawable */ if (swapchain->presentParms.SwapEffect == WINED3DSWAPEFFECT_FLIP) - surface_modify_location(swapchain->back_buffers[0], SFLAG_INDRAWABLE, TRUE); + surface_modify_location(swapchain->back_buffers[0], swapchain->back_buffers[0]->draw_binding, TRUE); } if (fb->depth_stencil)

1 0

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

25 Aug '11

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 24 Aug '11

24 Aug '11

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 24 Aug '11

24 Aug '11

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 24 Aug '11

24 Aug '11

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 24 Aug '11

24 Aug '11

1 0

Francois Gouget : wrc: If the message context is 'do not translate', then don't add the string to the PO file.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 32b310c737e80c9080c7031a46164aa105dd652d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32b310c737e80c9080c7031a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 24 14:40:53 2011 +0200 wrc: If the message context is 'do not translate', then don't add the string to the PO file. --- tools/wrc/po.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 3efd208..e882a7c 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -503,6 +503,7 @@ static po_file_t read_po_file( const char *name ) static void add_po_string( po_file_t po, const string_t *msgid, const string_t *msgstr, const language_t *lang ) { + static const char dnt[] = "do not translate"; po_message_t msg; po_message_iterator_t iterator; int codepage; @@ -512,6 +513,12 @@ static void add_po_string( po_file_t po, const string_t *msgid, const string_t * id_buffer = id = convert_msgid_ascii( msgid, 1 ); context = get_message_context( &id ); + if (context && strcmp(context, dnt) == 0) + { + /* This string should not be translated */ + free( id_buffer ); + return; + } if (msgstr) {

1 0