May 2013 - Wine-Commits - list.winehq.org

Andrew Eikum : oleaut32: Implement ICreateTypeLib::CreateTypeInfo.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: d72a797f0067c5be93101171f973ea6892d87070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72a797f0067c5be93101171f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 24 11:28:42 2013 -0500 oleaut32: Implement ICreateTypeLib::CreateTypeInfo. --- dlls/oleaut32/typelib.c | 104 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 85 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 83b503c..c9ee1cd 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1652,6 +1652,18 @@ static inline TLBCustData *TLB_get_custdata_by_guid(struct list *custdata_list, return NULL; } +static inline ITypeInfoImpl *TLB_get_typeinfo_by_name(ITypeInfoImpl **typeinfos, + UINT n, const OLECHAR *name) +{ + while(n){ + if(!lstrcmpiW((*typeinfos)->Name, name)) + return *typeinfos; + ++typeinfos; + --n; + } + return NULL; +} + static TLBVarDesc *TLBVarDesc_Constructor(UINT n) { TLBVarDesc *ret; @@ -5051,31 +5063,25 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( ITypeComp ** ppTComp) { ITypeLibImpl *This = impl_from_ITypeComp(iface); - int i; + ITypeInfoImpl *info; TRACE("(%s, %x, %p, %p)\n", debugstr_w(szName), lHash, ppTInfo, ppTComp); if(!szName || !ppTInfo || !ppTComp) return E_INVALIDARG; - for(i = 0; i < This->TypeInfoCount; ++i) - { - ITypeInfoImpl *pTypeInfo = This->typeinfos[i]; - /* FIXME: should use lHash to do the search */ - if (pTypeInfo->Name && !strcmpiW(pTypeInfo->Name, szName)) - { - TRACE("returning %p\n", pTypeInfo); - *ppTInfo = (ITypeInfo *)&pTypeInfo->ITypeInfo2_iface; - ITypeInfo_AddRef(*ppTInfo); - *ppTComp = &pTypeInfo->ITypeComp_iface; - ITypeComp_AddRef(*ppTComp); - return S_OK; - } + info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, szName); + if(!info){ + *ppTInfo = NULL; + *ppTComp = NULL; + return S_OK; } - TRACE("not found\n"); - *ppTInfo = NULL; - *ppTComp = NULL; + *ppTInfo = (ITypeInfo *)&info->ITypeInfo2_iface; + ITypeInfo_AddRef(*ppTInfo); + *ppTComp = &info->ITypeComp_iface; + ITypeComp_AddRef(*ppTComp); + return S_OK; } @@ -8102,8 +8108,68 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo(ICreateTypeLib2 *iface, LPOLESTR name, TYPEKIND kind, ICreateTypeInfo **ctinfo) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s %d %p - stub\n", This, wine_dbgstr_w(name), kind, ctinfo); - return E_NOTIMPL; + ITypeInfoImpl *info; + HRESULT hres; + + TRACE("%p %s %d %p\n", This, wine_dbgstr_w(name), kind, ctinfo); + + if (!ctinfo || !name) + return E_INVALIDARG; + + info = TLB_get_typeinfo_by_name(This->typeinfos, This->TypeInfoCount, name); + if (info) + return TYPE_E_NAMECONFLICT; + + if (This->typeinfos) + This->typeinfos = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->typeinfos, + sizeof(ITypeInfoImpl*) * (This->TypeInfoCount + 1)); + else + This->typeinfos = heap_alloc_zero(sizeof(ITypeInfoImpl*)); + + info = This->typeinfos[This->TypeInfoCount] = ITypeInfoImpl_Constructor(); + + info->pTypeLib = This; + info->Name = SysAllocString(name); + info->index = This->TypeInfoCount; + info->TypeAttr.typekind = kind; + info->TypeAttr.cbAlignment = 4; + + switch(info->TypeAttr.typekind) { + case TKIND_ENUM: + case TKIND_INTERFACE: + case TKIND_DISPATCH: + case TKIND_COCLASS: + info->TypeAttr.cbSizeInstance = 4; + break; + case TKIND_RECORD: + case TKIND_UNION: + info->TypeAttr.cbSizeInstance = 0; + break; + case TKIND_MODULE: + info->TypeAttr.cbSizeInstance = 2; + break; + case TKIND_ALIAS: + info->TypeAttr.cbSizeInstance = -0x75; + break; + default: + FIXME("unrecognized typekind %d\n", info->TypeAttr.typekind); + info->TypeAttr.cbSizeInstance = 0xdeadbeef; + break; + } + + hres = ITypeInfo2_QueryInterface(&info->ITypeInfo2_iface, + &IID_ICreateTypeInfo, (void **)ctinfo); + if (FAILED(hres)) { + SysFreeString(info->Name); + ITypeInfo2_Release(&info->ITypeInfo2_iface); + return hres; + } + + info->hreftype = info->index * sizeof(MSFT_TypeInfoBase); + + ++This->TypeInfoCount; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetName(ICreateTypeLib2 *iface,

1 0

Andrew Eikum : oleaut32: Implement basic ICreateTypeLib functions.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: ba5c9c7d38f6184f74bd82bed57c6bf1ebba3d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5c9c7d38f6184f74bd82bed… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 24 11:28:35 2013 -0500 oleaut32: Implement basic ICreateTypeLib functions. --- dlls/oleaut32/typelib.c | 88 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 70 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index edc9f21..9bbd86f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8110,64 +8110,109 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetName(ICreateTypeLib2 *iface, LPOLESTR name) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(name)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(name)); + + if (!name) + return E_INVALIDARG; + + SysFreeString(This->Name); + This->Name = SysAllocString(name); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetVersion(ICreateTypeLib2 *iface, WORD majorVerNum, WORD minorVerNum) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %d %d - stub\n", This, majorVerNum, minorVerNum); - return E_NOTIMPL; + + TRACE("%p %d %d\n", This, majorVerNum, minorVerNum); + + This->LibAttr.wMajorVerNum = majorVerNum; + This->LibAttr.wMinorVerNum = minorVerNum; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetGuid(ICreateTypeLib2 *iface, REFGUID guid) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, debugstr_guid(guid)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, debugstr_guid(guid)); + + memcpy(&This->LibAttr.guid, guid, sizeof(GUID)); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetDocString(ICreateTypeLib2 *iface, LPOLESTR doc) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(doc)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(doc)); + + if (!doc) + return E_INVALIDARG; + + SysFreeString(This->DocString); + This->DocString = SysAllocString(doc); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetHelpFileName(ICreateTypeLib2 *iface, LPOLESTR helpFileName) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(helpFileName)); - return E_NOTIMPL; + + TRACE("%p %s\n", This, wine_dbgstr_w(helpFileName)); + + if (!helpFileName) + return E_INVALIDARG; + + SysFreeString(This->HelpFile); + This->HelpFile = SysAllocString(helpFileName); + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 *iface, DWORD helpContext) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %d - stub\n", This, helpContext); - return E_NOTIMPL; + + TRACE("%p %d\n", This, helpContext); + + This->dwHelpContext = helpContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 *iface, LCID lcid) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %x - stub\n", This, lcid); - return E_NOTIMPL; + + TRACE("%p %x\n", This, lcid); + + This->LibAttr.lcid = lcid; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSetLibFlags(ICreateTypeLib2 *iface, UINT libFlags) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %x - stub\n", This, libFlags); - return E_NOTIMPL; + + TRACE("%p %x\n", This, libFlags); + + This->LibAttr.wLibFlags = libFlags; + + return S_OK; } static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) @@ -8205,8 +8250,15 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpStringDll(ICreateTypeLib2 *iface, LPOLESTR filename) { ITypeLibImpl *This = impl_from_ICreateTypeLib2(iface); - FIXME("%p %s - stub\n", This, wine_dbgstr_w(filename)); - return E_NOTIMPL; + TRACE("%p %s\n", This, wine_dbgstr_w(filename)); + + if (!filename) + return E_INVALIDARG; + + SysFreeString(This->HelpStringDll); + This->HelpStringDll = SysAllocString(filename); + + return S_OK; } static const ICreateTypeLib2Vtbl CreateTypeLib2Vtbl = {

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.31
by Jeremy Newman May 28, 2013

May 28, 2013

Module: website Branch: master Commit: e5e9cb844784e4fc7db69ce84ef1975133ed5639 URL: http://source.winehq.org/git/website.git/?a=commit;h=e5e9cb844784e4fc7db69c… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 25 18:43:13 2013 +0200 Polish translation for release 1.5.31 --- news/pl/2013052401.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pl/2013052401.xml b/news/pl/2013052401.xml new file mode 100644 index 0000000..0584738 --- /dev/null +++ b/news/pl/2013052401.xml @@ -0,0 +1,15 @@ +<news> +<date>Maj 24, 2013</date> +<title>Wydano Wine 1.5.31</title> +<body> + Wydanie rozwojowe Wine 1.5.31 jest już dostępne. + <a href="{$root}/announce/1.5.31">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa wersja silnika Gecko oparta o Firefox 21.</li> + <li>Wsparcie dla odczucia wstecznego dla Joysticków na Mac OS X.</li> + <li>Poprawki w zarządzaniu oknami w sterowniku Mac.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.31.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Wine 1.5.31 freigegeben
by Jeremy Newman May 28, 2013

May 28, 2013

Module: website Branch: master Commit: 9e72addafe7952b6c2dc3af2f0b39307db5d7823 URL: http://source.winehq.org/git/website.git/?a=commit;h=9e72addafe7952b6c2dc3a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat May 25 14:45:53 2013 +0200 Wine 1.5.31 freigegeben --- news/de/2013052401.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2013052401.xml b/news/de/2013052401.xml new file mode 100644 index 0000000..0dfd6b6 --- /dev/null +++ b/news/de/2013052401.xml @@ -0,0 +1,15 @@ +<news> +<date>24. Mai 2013</date> +<title>Wine 1.5.31 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.31 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.31">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko Engine, basierend auf Firefox 21.</li> + <li>Joystick Force Feedback Unterstützung unter Mac OS X.</li> + <li>Fenster Management Fehlerbehebungen im Mac Treiber.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.31.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.31
by Jeremy Newman May 28, 2013

May 28, 2013

Module: website Branch: master Commit: fb1103f42cc28045018981fb2e2d7f432e546551 URL: http://source.winehq.org/git/website.git/?a=commit;h=fb1103f42cc28045018981… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri May 24 20:55:54 2013 +0200 French translation for release 1.5.31 --- news/fr/2013052401.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/fr/2013052401.xml b/news/fr/2013052401.xml new file mode 100644 index 0000000..f03d30d --- /dev/null +++ b/news/fr/2013052401.xml @@ -0,0 +1,14 @@ +<news> +<date>24 mai 2013</date> +<title>Sortie de Wine 1.5.31</title> +<body> + La version de développement 1.5.31 de Wine est disponible. + <a href="{$root}/announce/1.5.31">Nouveautés</a> de cette version : +<ul> + <li>Nouvelle version du moteur Gecko basée sur Firefox 21.</li> + <li>Prise en charge du retour de force des joysticks sous Mac OS X.</li> + <li>Correctifs dans la gestion des fenêtres dans le pilote Mac.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.31.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.30
by Jeremy Newman May 28, 2013

May 28, 2013

Module: website Branch: master Commit: e0d563fdd891db70756a22030fa7b4591558fe7d URL: http://source.winehq.org/git/website.git/?a=commit;h=e0d563fdd891db70756a22… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat May 25 18:43:12 2013 +0200 Polish translation for release 1.5.30 --- news/pl/2013051001.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/pl/2013051001.xml b/news/pl/2013051001.xml new file mode 100644 index 0000000..a853023 --- /dev/null +++ b/news/pl/2013051001.xml @@ -0,0 +1,15 @@ +<news> +<date>Maj 10, 2013</date> +<title>Wydano Wine 1.5.30</title> +<body> + Wydanie rozwojowe Wine 1.5.30 jest już dostępne. + <a href="{$root}/announce/1.5.30">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla przechwytywania myszy w sterowniku Mac.</li> + <li>NTLM i uwierzytelnienie negocjacji w WinHTTP.</li> + <li>Wsparcie dla obejść przez pośrednika w WinInet.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.30.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.31
by Jeremy Newman May 28, 2013

May 28, 2013

Module: website Branch: master Commit: 7c0f3c6a85bd5b216ca33182b8decb0eaa7e40be URL: http://source.winehq.org/git/website.git/?a=commit;h=7c0f3c6a85bd5b216ca331… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat May 25 09:22:02 2013 +0800 Simplified Chinese translation for release 1.5.31 --- news/zh-cn/2013052401.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013052401.xml b/news/zh-cn/2013052401.xml new file mode 100644 index 0000000..ed13be1 --- /dev/null +++ b/news/zh-cn/2013052401.xml @@ -0,0 +1,15 @@ +<news> +<date>五月 24, 2013</date> +<title>Wine 1.5.31 发布</title> +<body> + Wine 开发版 1.5.31 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.31">更新</a>： +<ul> + <li>基于 Firefox 21 的新版本 Gecko 引擎。</li> + <li>Mac OS X 上操纵杆的力量反馈支持。</li> + <li>Mac 后端驱动窗口管理的修正。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.31.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Henri Verbeet : wined3d: Don't create FBOs in context_bind_fbo().
by Alexandre Julliard May 27, 2013

May 27, 2013

Module: wine Branch: master Commit: b35045ba2535c1e8046b532e1a8cd1c77895b77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b35045ba2535c1e8046b532e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 09:22:49 2013 +0200 wined3d: Don't create FBOs in context_bind_fbo(). We can just do this in context_create_fbo_entry() now. --- dlls/wined3d/context.c | 66 +++++++++++++++++++----------------------------- 1 files changed, 26 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e6f2c1a..584683d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -38,43 +38,27 @@ static DWORD wined3d_context_tls_idx; /* FBO helper functions */ /* Context activation is done by the caller. */ -static void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint *fbo) +static void context_bind_fbo(struct wined3d_context *context, GLenum target, GLuint fbo) { const struct wined3d_gl_info *gl_info = context->gl_info; - GLuint f; - - if (!fbo) - { - f = 0; - } - else - { - if (!*fbo) - { - gl_info->fbo_ops.glGenFramebuffers(1, fbo); - checkGLcall("glGenFramebuffers()"); - TRACE("Created FBO %u.\n", *fbo); - } - f = *fbo; - } switch (target) { case GL_READ_FRAMEBUFFER: - if (context->fbo_read_binding == f) return; - context->fbo_read_binding = f; + if (context->fbo_read_binding == fbo) return; + context->fbo_read_binding = fbo; break; case GL_DRAW_FRAMEBUFFER: - if (context->fbo_draw_binding == f) return; - context->fbo_draw_binding = f; + if (context->fbo_draw_binding == fbo) return; + context->fbo_draw_binding = fbo; break; case GL_FRAMEBUFFER: - if (context->fbo_read_binding == f - && context->fbo_draw_binding == f) return; - context->fbo_read_binding = f; - context->fbo_draw_binding = f; + if (context->fbo_read_binding == fbo + && context->fbo_draw_binding == fbo) return; + context->fbo_read_binding = fbo; + context->fbo_draw_binding = fbo; break; default: @@ -82,7 +66,7 @@ static void context_bind_fbo(struct wined3d_context *context, GLenum target, GLu break; } - gl_info->fbo_ops.glBindFramebuffer(target, f); + gl_info->fbo_ops.glBindFramebuffer(target, fbo); checkGLcall("glBindFramebuffer()"); } @@ -104,15 +88,15 @@ static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info, } /* Context activation is done by the caller. */ -static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) +static void context_destroy_fbo(struct wined3d_context *context, GLuint fbo) { const struct wined3d_gl_info *gl_info = context->gl_info; context_bind_fbo(context, GL_FRAMEBUFFER, fbo); context_clean_fbo_attachments(gl_info, GL_FRAMEBUFFER); - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_bind_fbo(context, GL_FRAMEBUFFER, 0); - gl_info->fbo_ops.glDeleteFramebuffers(1, fbo); + gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); checkGLcall("glDeleteFramebuffers()"); } @@ -338,7 +322,9 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * entry->location = location; entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); entry->attached = FALSE; - entry->id = 0; + gl_info->fbo_ops.glGenFramebuffers(1, &entry->id); + checkGLcall("glGenFramebuffers()"); + TRACE("Created FBO %u.\n", entry->id); return entry; } @@ -350,7 +336,7 @@ static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum targ { const struct wined3d_gl_info *gl_info = context->gl_info; - context_bind_fbo(context, target, &entry->id); + context_bind_fbo(context, target, entry->id); context_clean_fbo_attachments(gl_info, target); memcpy(entry->render_targets, render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)); @@ -364,8 +350,8 @@ static void context_destroy_fbo_entry(struct wined3d_context *context, struct fb { if (entry->id) { - TRACE("Destroy FBO %d\n", entry->id); - context_destroy_fbo(context, &entry->id); + TRACE("Destroy FBO %u.\n", entry->id); + context_destroy_fbo(context, entry->id); } --context->fbo_entry_count; list_remove(&entry->entry); @@ -428,13 +414,13 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ if (entry->attached) { - context_bind_fbo(context, target, &entry->id); + context_bind_fbo(context, target, entry->id); return; } read_binding = context->fbo_read_binding; draw_binding = context->fbo_draw_binding; - context_bind_fbo(context, GL_FRAMEBUFFER, &entry->id); + context_bind_fbo(context, GL_FRAMEBUFFER, entry->id); /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) @@ -454,9 +440,9 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ if (target != GL_FRAMEBUFFER) { if (target == GL_READ_FRAMEBUFFER) - context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, draw_binding ? &draw_binding : NULL); + context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, draw_binding); else - context_bind_fbo(context, GL_READ_FRAMEBUFFER, read_binding ? &read_binding : NULL); + context_bind_fbo(context, GL_READ_FRAMEBUFFER, read_binding); } entry->attached = TRUE; @@ -475,14 +461,14 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ if (context->rebind_fbo) { - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_bind_fbo(context, GL_FRAMEBUFFER, 0); context->rebind_fbo = FALSE; } if (location == SFLAG_INDRAWABLE) { context->current_fbo = NULL; - context_bind_fbo(context, target, NULL); + context_bind_fbo(context, target, 0); } else { @@ -2150,7 +2136,7 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine else { context->current_fbo = NULL; - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_bind_fbo(context, GL_FRAMEBUFFER, 0); rt_mask = context_generate_rt_mask_from_surface(rt); } }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMTEXTURE.
by Alexandre Julliard May 27, 2013

May 27, 2013

Module: wine Branch: master Commit: 769efb1f63e28a41b63f4431c93a741036fb31c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=769efb1f63e28a41b63f4431c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 27 09:22:51 2013 +0200 d3drm: Avoid LPDIRECT3DRMTEXTURE. --- dlls/d3drm/d3drm.c | 20 ++++++++------------ dlls/d3drm/frame.c | 22 +++++++--------------- dlls/d3drm/meshbuilder.c | 14 +++++++------- dlls/d3drm/tests/d3drm.c | 16 ++++++++-------- include/d3drm.h | 4 ++-- include/d3drmobj.h | 26 +++++++++++++------------- 6 files changed, 45 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=769efb1f63e28a41b63f4…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard May 27, 2013

May 27, 2013

Module: wine Branch: master Commit: be968797d33d0fc40b2f2a14491566fff47e6fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be968797d33d0fc40b2f2a144… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon May 27 22:47:47 2013 +0900 po: Update Korean translation. --- po/ko.po | 90 ++++++++++++++++++------------------------------------------- 1 files changed, 27 insertions(+), 63 deletions(-) diff --git a/po/ko.po b/po/ko.po index c7bd9ef..2485a4e 100644 --- a/po/ko.po +++ b/po/ko.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-12-18 18:50+0900\n" +"PO-Revision-Date: 2013-04-15 10:56+0900\n" "Last-Translator: YunSong Hwang <hys545(a)dreamwiz.com>\n" "Language-Team: none\n" "Language: Korean\n" @@ -8257,16 +8257,12 @@ msgid "Don't install" msgstr "설치 안 함" #: urlmon.rc:40 -#, fuzzy -#| msgid "" -#| "When installed, ActiveX has full access to your computer.Do not click " -#| "install unless you have absolute trust in the above source." msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"설치할 때,ActiveX는 당신의 컴퓨터에 완전한 접근권한을 가질 것입니다. 당신이" -"이 원본을 완전히 신뢰하지 않는다면 설치를 클릭하지 마십시오." +"설치할 때,ActiveX 구성요소는 당신의 컴퓨터에 완전한 접근권한을 가질 것입니" +"다. 당신이이 원본을 완전히 신뢰하지 않는다면 설치를 클릭하지 마십시오." #: urlmon.rc:48 msgid "Installation of component failed: %08x" @@ -10156,10 +10152,8 @@ msgid "Connection-specific DNS suffix" msgstr "연결에 지정된 DNS 접미사" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "IP 주소" +msgstr "IPv4 주소" #: ipconfig.rc:34 msgid "Hostname" @@ -10202,10 +10196,8 @@ msgid "Default gateway" msgstr "기본 게이트웨이" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "IP 주소" +msgstr "IPv6 주소" #: net.rc:27 msgid "" @@ -10343,7 +10335,7 @@ msgstr "활성화된 연결" #: netstat.rc:28 msgid "Proto" -msgstr "프로토콜" +msgstr "프로토" #: netstat.rc:29 msgid "Local Address" @@ -10358,124 +10350,96 @@ msgid "State" msgstr "상태" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "인터페이스" +msgstr "인터페이스 통계" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "보냄" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "응답받음" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" msgstr "바이트" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "유니캐스트 패킷" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "유니캐스트가 아닌 패킷" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "거부" +msgstr "폐기" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" msgstr "오류" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "알 수 없는 포트.\n" +msgstr "알 수 없는 프로토콜" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "IPv4의 TCP 상태" #: netstat.rc:42 -#, fuzzy -#| msgid "Active Connections" msgid "Active Opens" -msgstr "활성화된 연결" +msgstr "활성화된 열림" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "수동적인 열림" #: netstat.rc:44 -#, fuzzy -#| msgid "Active Connections" msgid "Failed Connection Attempts" -msgstr "활성화된 연결" +msgstr "연결 시도 실패" #: netstat.rc:45 -#, fuzzy -#| msgid "Active Connections" msgid "Reset Connections" -msgstr "활성화된 연결" +msgstr "연결 재설정" #: netstat.rc:46 -#, fuzzy -#| msgid "Active Connections" msgid "Current Connections" -msgstr "활성화된 연결" +msgstr "현재 연결" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "세그멘트가 잠김.\n" +msgstr "세그멘트가 응답함" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "세그멘트가 잠김.\n" +msgstr "세그멘트가 보내짐" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "세그멘트가 다시 보내짐" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "IPv4의 UDP 상태" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "세그멘트가 잠김.\n" +msgstr "데이터그램을 받음" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "지역 포트" +msgstr "포트가 없음" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "디코딩 오류" +msgstr "받는 중에 오류 발생" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "데이터그램을 보냄" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0