wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Piotr Caban : msvcp90: Added locale::_Locimp class stub.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: ac978ea85e29c0c15d0514a9fe67281513eaf831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac978ea85e29c0c15d0514a9f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:03:24 2011 +0200 msvcp90: Added locale::_Locimp class stub. --- dlls/msvcp90/locale.c | 131 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 58 ++++++++++---------- 2 files changed, 160 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac978ea85e29c0c15d051…

1 0

Piotr Caban : msvcp90: Added std::locale::id class stub.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 198162fbe5bc572c34b789a7d40d5b3ef4e9ea7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=198162fbe5bc572c34b789a7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:03:09 2011 +0200 msvcp90: Added std::locale::id class stub. --- dlls/msvcp90/locale.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 18 +++++++++--------- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 74db8d0..068c8c5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -26,13 +26,55 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +typedef struct _locale_id { + MSVCP_size_t id; +} locale_id; + typedef struct _locale_facet { const vtable_ptr *vtable; MSVCP_size_t refs; } locale_facet; +/* ?_Id_cnt@id@locale@std@@0HA */ +int locale_id__Id_cnt = 0; + static const vtable_ptr MSVCP_locale_facet_vtable[]; +/* ??0id@locale@std@@QAE@I@Z */ +/* ??0id@locale@std@@QEAA@_K@Z */ +DEFINE_THISCALL_WRAPPER(locale_id_ctor_id, 8) +locale_id* __thiscall locale_id_ctor_id(locale_id *this, MSVCP_size_t id) +{ + FIXME("(%p %lu) stub\n", this, id); + return NULL; +} + +/* ??_Fid@locale@std@@QAEXXZ */ +/* ??_Fid@locale@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(locale_id_ctor, 4) +locale_id* __thiscall locale_id_ctor(locale_id *this) +{ + FIXME("(%p) stub\n", this); + return NULL; +} + +/* ??Bid@locale@std@@QAEIXZ */ +/* ??Bid@locale@std@@QEAA_KXZ */ +DEFINE_THISCALL_WRAPPER(locale_id_operator_size_t, 4) +MSVCP_size_t __thiscall locale_id_operator_size_t(locale_id *this) +{ + FIXME("(%p) stub\n", this); + return 0; +} + +/* ?_Id_cnt_func@id@locale@std@@CAAAHXZ */ +/* ?_Id_cnt_func@id@locale@std@@CAAEAHXZ */ +int* __cdecl locale_id__Id_cnt_func(void) +{ + FIXME("stub\n"); + return NULL; +} + /* ??_Ffacet@locale@std@@QAEXXZ */ /* ??_Ffacet@locale@std@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(locale_facet_ctor, 4) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 21ba935..c10e70f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1098,8 +1098,8 @@ @ stub -arch=win64 ??0ctype_base@std@@QEAA@_K@Z @ thiscall -arch=win32 ??0facet@locale@std@@IAE@I@Z(ptr long) locale_facet_ctor_refs @ cdecl -arch=win64 ??0facet@locale@std@@IEAA@_K@Z(ptr long) locale_facet_ctor_refs -@ stub -arch=win32 ??0id@locale@std@@QAE@I@Z -@ stub -arch=win64 ??0id@locale@std@@QEAA@_K@Z +@ thiscall -arch=win32 ??0id@locale@std@@QAE@I@Z(ptr long) locale_id_ctor_id +@ cdecl -arch=win64 ??0id@locale@std@@QEAA@_K@Z(ptr long) locale_id_ctor_id @ thiscall -arch=win32 ??0ios_base@std@@IAE@XZ(ptr) ios_base_ctor @ cdecl -arch=win64 ??0ios_base@std@@IEAA@XZ(ptr) ios_base_ctor @ thiscall -arch=win32 ??0ios_base@std@@QAE@ABV01@@Z(ptr ptr) ios_base_copy_ctor @@ -1706,8 +1706,8 @@ @ stub -arch=win64 ??A?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAAEB_WU_Size_type_nosscl@01@@Z @ stub -arch=win32 ??A?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QBEAB_WU_Size_type_nosscl@01@@Z @ cdecl -arch=win64 ??A?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEBAAEB_W_K@Z(ptr long) MSVCP_basic_string_wchar_const_at -@ stub -arch=win32 ??Bid@locale@std@@QAEIXZ -@ stub -arch=win64 ??Bid@locale@std@@QEAA_KXZ +@ thiscall -arch=win32 ??Bid@locale@std@@QAEIXZ(ptr) locale_id_operator_size_t +@ cdecl -arch=win64 ??Bid@locale@std@@QEAA_KXZ(ptr) locale_id_operator_size_t @ thiscall -arch=win32 ??Bios_base@std@@QBEPAXXZ(ptr) ios_base_op_fail @ cdecl -arch=win64 ??Bios_base@std@@QEBAPEAXXZ(ptr) ios_base_op_fail @ stub -arch=win32 ??X?$complex@M@std@@QAEAAV01@ABM@Z @@ -2087,8 +2087,8 @@ @ stub -arch=win64 ??_Fctype_base@std@@QEAAXXZ @ thiscall -arch=win32 ??_Ffacet@locale@std@@QAEXXZ(ptr) locale_facet_ctor @ cdecl -arch=win64 ??_Ffacet@locale@std@@QEAAXXZ(ptr) locale_facet_ctor -@ stub -arch=win32 ??_Fid@locale@std@@QAEXXZ -@ stub -arch=win64 ??_Fid@locale@std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fid@locale@std@@QAEXXZ(ptr) locale_id_ctor +@ cdecl -arch=win64 ??_Fid@locale@std@@QEAAXXZ(ptr) locale_id_ctor @ stub -arch=win32 ??_Fmessages_base@std@@QAEXXZ @ stub -arch=win64 ??_Fmessages_base@std@@QEAAXXZ @ stub -arch=win32 ??_Fmoney_base@std@@QAEXXZ @@ -2401,9 +2401,9 @@ @ stub -arch=win64 ?_Hexdig@?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@AEBAHGGGG@Z @ stub -arch=win32 ?_Hexdig@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABEH_W000@Z @ stub -arch=win64 ?_Hexdig@?$num_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBAH_W000@Z -# extern ?_Id_cnt@id@locale@std@@0HA -@ stub -arch=win32 ?_Id_cnt_func@id@locale@std@@CAAAHXZ -@ stub -arch=win64 ?_Id_cnt_func@id@locale@std@@CAAEAHXZ +@ extern ?_Id_cnt@id@locale@std@@0HA locale_id__Id_cnt +@ cdecl -arch=win32 ?_Id_cnt_func@id@locale@std@@CAAAHXZ(long) locale_id__Id_cnt_func +@ cdecl -arch=win64 ?_Id_cnt_func@id@locale@std@@CAAEAHXZ(long) locale_id__Id_cnt_func @ stub -arch=win32 ?_Id_func@?$codecvt@GDH@std@@SAAAVid@locale@2@XZ @ stub -arch=win64 ?_Id_func@?$codecvt@GDH@std@@SAAEAVid@locale@2@XZ @ stub -arch=win32 ?_Id_func@?$codecvt@_WDH@std@@SAAAVid@locale@2@XZ

1 0

Piotr Caban : msvcp90: Added std::locale::facet class stub.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 95891e4f56f5dac130090ece941c564538c51095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95891e4f56f5dac130090ece9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:02:58 2011 +0200 msvcp90: Added std::locale::facet class stub. --- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/locale.c | 110 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 30 ++++++------ 3 files changed, 126 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95891e4f56f5dac130090…

1 0

Matteo Bruni : wined3d: Fix draw buffers tracking.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 32787ec0dd45a0ec794368ce8e513f421152f9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32787ec0dd45a0ec794368ce8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 17 19:28:38 2011 +0200 wined3d: Fix draw buffers tracking. --- dlls/wined3d/context.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a3c7c78..42141f2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1986,7 +1986,7 @@ static inline GLenum draw_buffer_from_rt_mask(DWORD rt_mask) } /* Context activation and GL locking are done by the caller. */ -static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask, struct wined3d_surface **rts) +static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask) { if (!rt_mask) { @@ -2007,7 +2007,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt while (rt_mask) { - if ((rt_mask & 1) && rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + if (rt_mask & 1) context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else context->draw_buffers[i] = GL_NONE; @@ -2120,7 +2120,10 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, context->current_rt, NULL, SFLAG_INTEXTURE); LEAVE_GL(); - rt_mask = 1; + if (context->current_rt && context->current_rt->resource.format->id != WINED3DFMT_NULL) + rt_mask = 1; + else + rt_mask = 0; } else { @@ -2138,7 +2141,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); if (rt_mask != context->draw_buffers_mask) { - context_apply_draw_buffers(context, rt_mask, &context->current_rt); + context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; } @@ -2191,7 +2194,8 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d for (i = 0; i < rt_count; ++i) { context->blit_targets[i] = rts[i]; - rt_mask |= (1 << i); + if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + rt_mask |= (1 << i); } while (i < context->gl_info->limits.buffers) { @@ -2218,7 +2222,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d ENTER_GL(); if (rt_mask != context->draw_buffers_mask) { - context_apply_draw_buffers(context, rt_mask, rts); + context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; } @@ -2282,6 +2286,8 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de else { const struct wined3d_shader *ps = device->stateBlock->state.pixel_shader; + DWORD rt_mask_bits; + struct wined3d_surface **rts = fb->render_targets; ENTER_GL(); context_apply_fbo_state(context, GL_FRAMEBUFFER, fb->render_targets, fb->depth_stencil, SFLAG_INTEXTURE); @@ -2290,6 +2296,16 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de LEAVE_GL(); rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= device->valid_rt_mask; + rt_mask_bits = rt_mask; + i = 0; + while (rt_mask_bits) + { + rt_mask_bits &= ~(1 << i); + if (!rts[i] || rts[i]->resource.format->id == WINED3DFMT_NULL) + rt_mask &= ~(1 << i); + + i++; + } } } else @@ -2300,7 +2316,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); if (context->draw_buffers_mask != rt_mask) { - context_apply_draw_buffers(context, rt_mask, fb->render_targets); + context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; }

1 0

Matteo Bruni : wined3d: Fix context_apply_draw_buffers() with backbuffer ORM.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 0919ac3b518904c40cfa0949f910bb2e6befd1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0919ac3b518904c40cfa0949f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 21 18:28:36 2011 +0200 wined3d: Fix context_apply_draw_buffers() with backbuffer ORM. --- dlls/wined3d/context.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 872ba03..a3c7c78 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2029,8 +2029,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt } else { - glDrawBuffer(draw_buffer_from_rt_mask(rt_mask)); - checkGLcall("glDrawBuffer()"); + ERR("Unexpected draw buffers mask with backbuffer ORM.\n"); } } } @@ -2095,6 +2094,16 @@ static void context_validate_onscreen_formats(struct wined3d_device *device, context_set_render_offscreen(context, device->StateTable, TRUE); } +static DWORD generate_rt_mask_no_fbo(struct wined3d_device *device, struct wined3d_surface *rt) +{ + if (!rt || rt->resource.format->id == WINED3DFMT_NULL) + return 0; + else if (rt->container.type == WINED3D_CONTAINER_SWAPCHAIN) + return generate_rt_mask_from_surface(rt); + else + return generate_rt_mask(device->offscreenBuffer); +} + /* Context activation is done by the caller. */ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) { @@ -2123,7 +2132,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de } else { - rt_mask = generate_rt_mask_from_surface(context->current_rt); + rt_mask = generate_rt_mask_no_fbo(device, context->current_rt); } ENTER_GL(); @@ -2203,7 +2212,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d } else { - rt_mask = generate_rt_mask_from_surface(rts[0]); + rt_mask = generate_rt_mask_no_fbo(device, rts[0]); } ENTER_GL(); @@ -2285,7 +2294,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de } else { - rt_mask = generate_rt_mask_from_surface(fb->render_targets[0]); + rt_mask = generate_rt_mask_no_fbo(device, fb->render_targets[0]); } ENTER_GL();

1 0

Matteo Bruni : wined3d: Fix context_apply_blit_state().
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 5b67bd4fb266856a54a152036b87f6c674f665f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b67bd4fb266856a54a152036… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 21 18:08:27 2011 +0200 wined3d: Fix context_apply_blit_state(). --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 40b9cee..872ba03 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2129,7 +2129,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); if (rt_mask != context->draw_buffers_mask) { - context_apply_draw_buffers(context, 1, &context->current_rt); + context_apply_draw_buffers(context, rt_mask, &context->current_rt); context->draw_buffers_mask = rt_mask; }

1 0

Alexandre Julliard : libwine: Avoid a potential loop in reserve_area.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 6d780048990b75effba8224f52688ca7b49a8e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d780048990b75effba8224f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 13:43:26 2011 +0200 libwine: Avoid a potential loop in reserve_area. --- libs/wine/mmap.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 0e02d16..63a597d 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -277,11 +277,11 @@ static inline void reserve_area( void *addr, void *end ) wine_mmap_add_reserved_area( addr, size ); return; } - if (size > granularity_mask + 1) + size = (size / 2) & ~granularity_mask; + if (size) { - size_t new_size = (size / 2) & ~granularity_mask; - reserve_area( addr, (char *)addr + new_size ); - reserve_area( (char *)addr + new_size, end ); + reserve_area( addr, (char *)addr + size ); + reserve_area( (char *)addr + size, end ); } #endif }

1 0

Francois Gouget : po: Add a number of missing '\n' characters in the Slovenian translation.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: e6fbfa76aa65ec21516cbaa73a721f0e9868f533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fbfa76aa65ec21516cbaa73… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 22 12:57:41 2011 +0200 po: Add a number of missing '\n' characters in the Slovenian translation. --- po/sl.po | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/po/sl.po b/po/sl.po index 799e24f..630978e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2615,7 +2615,7 @@ msgstr "Preveč semaforjev\n" #: winerror.mc:381 msgid "Exclusive semaphore already owned\n" -msgstr "Izključen semafor je ža " +msgstr "Izključen semafor je ža\n" #: winerror.mc:386 msgid "Semaphore is set\n" @@ -2936,7 +2936,7 @@ msgstr "Samodejni odseki podatkov presegajo 64k\n" #: winerror.mc:791 msgid "Ring 2 segment must be movable\n" -msgstr "Odsek obroč 2 mora biti premakljiv" +msgstr "Odsek obroč 2 mora biti premakljiv\n" #: winerror.mc:796 msgid "Relocation chain exceeds segment limit in %1\n" @@ -2986,7 +2986,6 @@ msgstr "Preveč modulov\n" msgid "Nesting LoadModule calls not allowed\n" msgstr "" "Klici gnezdenega modula nalaganja niso dovoljeni\n" -" " #: winerror.mc:856 msgid "Machine type mismatch\n" @@ -3064,7 +3063,6 @@ msgstr "Klicatelj ne sme biti lastnik mutexa\n" msgid "Too many posts to semaphore\n" msgstr "" "Preveč objav na semaforju\n" -" " #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed\n" @@ -3148,7 +3146,7 @@ msgstr "Neveljavna datoteka\n" #: winerror.mc:1051 msgid "Cannot run full-screen\n" -msgstr "Ni mogoče poganjati v celozaslonskem načinu" +msgstr "Ni mogoče poganjati v celozaslonskem načinu\n" #: winerror.mc:1056 msgid "Nonexistent token\n" @@ -3428,7 +3426,7 @@ msgstr "Zaporedni V/I je končan\n" #: winerror.mc:1401 msgid "Serial I/O counter timeout\n" -msgstr "Zakasnitev zaporednega števca V/I" +msgstr "Zakasnitev zaporednega števca V/I\n" #: winerror.mc:1406 msgid "Floppy ID address mark not found\n" @@ -3520,7 +3518,7 @@ msgstr "DLL-ja ni mogoče najti\n" #: winerror.mc:1516 msgid "Out of user handles\n" -msgstr "Ročnikov uporabnikov je zmanjkalo" +msgstr "Ročnikov uporabnikov je zmanjkalo\n" #: winerror.mc:1521 msgid "Message can only be used in synchronous calls\n" @@ -4276,7 +4274,7 @@ msgstr "Neveljaven ročnik ikone\n" #: winerror.mc:2471 msgid "Private dialog index\n" -msgstr "Kazalo zasebnega pogovornega okna" +msgstr "Kazalo zasebnega pogovornega okna\n" #: winerror.mc:2476 #, fuzzy @@ -4466,7 +4464,7 @@ msgstr "Zakasnitev\n" #: winerror.mc:2701 msgid "Invalid monitor handle\n" -msgstr "Neveljaven ročnik zaslona" +msgstr "Neveljaven ročnik zaslona\n" #: winerror.mc:2706 msgid "Event log file corrupt\n" @@ -4883,7 +4881,7 @@ msgstr "Vnosa ni mogoče najti\n" #: winerror.mc:3226 msgid "Name service unavailable\n" -msgstr "Ime storitve ni na voljo" +msgstr "Ime storitve ni na voljo\n" #: winerror.mc:3231 msgid "Invalid network address family\n" @@ -5062,19 +5060,16 @@ msgstr "Ni več vezav\n" msgid "Can't logon with interdomain trust account\n" msgstr "" "Ni se mogoče prijaviti z računom meddomenskega zaupanja\n" -" " #: winerror.mc:3451 msgid "Can't logon with workstation trust account\n" msgstr "" "Ni se mogoče prijaviti z računom zaupanja delovne postaja\n" -" " #: winerror.mc:3456 msgid "Can't logon with server trust account\n" msgstr "" "Ni se mogoče prijaviti z računom zaupanja strežnika\n" -" " #: winerror.mc:3461 msgid "Domain trust information inconsistent\n" @@ -6808,7 +6803,7 @@ msgstr "" "Kopijo Splošnega Javnega Dovoljenja GNU (angleško: GNU General Public " "License) bi morali prejeti skupaj s programom, v kolikor pa je niste, pišite " "na naslov Free Software Foundation, Inc.,59 Temple Place - Suite 330, " -"Boston, MA 02111-1307, USA in zahtevajte kopijo.\n" +"Boston, MA 02111-1307, USA in zahtevajte kopijo." #: shell32.rc:246 msgid "Wine License" @@ -8174,7 +8169,7 @@ msgstr "VER prikaže različico cmd\n" #: cmd.rc:206 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL pokaže oznako nosilca diskovne napreve" +msgstr "VOL pokaže oznako nosilca diskovne napreve.\n" #: cmd.rc:209 msgid ""

1 0

Michael Stefaniuc : mscoree: COM cleanup in corruntimehost.c.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: e79e6e30f46c1a719fb47b443abfc844a6ee911b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79e6e30f46c1a719fb47b443… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:54:50 2011 +0200 mscoree: COM cleanup in corruntimehost.c. --- dlls/mscoree/corruntimehost.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 607537c..146dd23 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -45,8 +45,8 @@ DEFINE_GUID(IID__AppDomain, 0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0x struct RuntimeHost { - const struct ICorRuntimeHostVtbl *lpVtbl; - const struct ICLRRuntimeHostVtbl *lpCLRHostVtbl; + ICorRuntimeHost ICorRuntimeHost_iface; + ICLRRuntimeHost ICLRRuntimeHost_iface; const CLRRuntimeInfo *version; loaded_mono *mono; struct list domains; @@ -207,12 +207,12 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d static inline RuntimeHost *impl_from_ICLRRuntimeHost( ICLRRuntimeHost *iface ) { - return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpCLRHostVtbl)); + return CONTAINING_RECORD(iface, RuntimeHost, ICLRRuntimeHost_iface); } static inline RuntimeHost *impl_from_ICorRuntimeHost( ICorRuntimeHost *iface ) { - return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpVtbl)); + return CONTAINING_RECORD(iface, RuntimeHost, ICorRuntimeHost_iface); } /*** IUnknown methods ***/ @@ -476,13 +476,13 @@ static HRESULT WINAPI CLRRuntimeHost_QueryInterface(ICLRRuntimeHost* iface, static ULONG WINAPI CLRRuntimeHost_AddRef(ICLRRuntimeHost* iface) { RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); - return IUnknown_AddRef((IUnknown*)&This->lpVtbl); + return ICorRuntimeHost_AddRef(&This->ICorRuntimeHost_iface); } static ULONG WINAPI CLRRuntimeHost_Release(ICLRRuntimeHost* iface) { RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); - return IUnknown_Release((IUnknown*)&This->lpVtbl); + return ICorRuntimeHost_Release(&This->ICorRuntimeHost_iface); } static HRESULT WINAPI CLRRuntimeHost_Start(ICLRRuntimeHost* iface) @@ -794,8 +794,8 @@ HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, if ( !This ) return E_OUTOFMEMORY; - This->lpVtbl = &corruntimehost_vtbl; - This->lpCLRHostVtbl = &CLRHostVtbl; + This->ICorRuntimeHost_iface.lpVtbl = &corruntimehost_vtbl; + This->ICLRRuntimeHost_iface.lpVtbl = &CLRHostVtbl; This->ref = 1; This->version = runtime_version; This->mono = loaded_mono; @@ -816,12 +816,12 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, if (IsEqualGUID(clsid, &CLSID_CorRuntimeHost)) { - unk = (IUnknown*)&This->lpVtbl; + unk = (IUnknown*)&This->ICorRuntimeHost_iface; IUnknown_AddRef(unk); } else if (IsEqualGUID(clsid, &CLSID_CLRRuntimeHost)) { - unk = (IUnknown*)&This->lpCLRHostVtbl; + unk = (IUnknown*)&This->ICLRRuntimeHost_iface; IUnknown_AddRef(unk); } else if (IsEqualGUID(clsid, &CLSID_CorMetaDataDispenser) ||

1 0

Michael Mc Donnell : d3dx9: Implement UpdateSemantics mesh method.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 39d4656b2a755c9aa0a81f3c76977c586862bbf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d4656b2a755c9aa0a81f3c7… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Tue May 24 19:44:48 2011 +0200 d3dx9: Implement UpdateSemantics mesh method. --- dlls/d3dx9_36/mesh.c | 95 +++++++++++++++++++++++++++++++++++++------ dlls/d3dx9_36/tests/mesh.c | 46 +++++++++++----------- 2 files changed, 104 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39d4656b2a755c9aa0a81…

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011