January 2011 - Wine-commits

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_private_data().
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: a80749fd57dbe25c64787ba3bcc5811e5c4c1657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80749fd57dbe25c64787ba3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 7 10:16:38 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_set_private_data(). --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/resource.c | 45 +++++++++++++++++++-------------------- dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 43fe20e..cdcecf3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -764,7 +764,7 @@ static void * STDMETHODCALLTYPE buffer_GetParent(IWineD3DBuffer *iface) static HRESULT STDMETHODCALLTYPE buffer_SetPrivateData(IWineD3DBuffer *iface, REFGUID guid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, guid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, guid, data, data_size, flags); } static HRESULT STDMETHODCALLTYPE buffer_GetPrivateData(IWineD3DBuffer *iface, diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 89afcbf..c80e5ab 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -215,7 +215,7 @@ static ULONG WINAPI IWineD3DCubeTextureImpl_Release(IWineD3DCubeTexture *iface) static HRESULT WINAPI IWineD3DCubeTextureImpl_SetPrivateData(IWineD3DCubeTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DCubeTextureImpl_GetPrivateData(IWineD3DCubeTexture *iface, diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 173fa58..c211572 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -147,47 +147,46 @@ static struct private_data *resource_find_private_data(IWineD3DResourceImpl *Thi return NULL; } -HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID refguid, - const void *pData, DWORD SizeOfData, DWORD flags) +HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, + const void *data, DWORD data_size, DWORD flags) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - struct private_data *data; + struct private_data *d; - TRACE("iface %p, riid %s, data %p, data_size %u, flags %#x.\n", - iface, debugstr_guid(refguid), pData, SizeOfData, flags); + TRACE("resource %p, riid %s, data %p, data_size %u, flags %#x.\n", + resource, debugstr_guid(guid), data, data_size, flags); - resource_free_private_data(This, refguid); + resource_free_private_data(resource, guid); - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); - if (!data) return E_OUTOFMEMORY; + d = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d)); + if (!d) return E_OUTOFMEMORY; - data->tag = *refguid; - data->flags = flags; + d->tag = *guid; + d->flags = flags; if (flags & WINED3DSPD_IUNKNOWN) { - if (SizeOfData != sizeof(IUnknown *)) + if (data_size != sizeof(IUnknown *)) { - WARN("IUnknown data with size %d, returning WINED3DERR_INVALIDCALL\n", SizeOfData); - HeapFree(GetProcessHeap(), 0, data); + WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); + HeapFree(GetProcessHeap(), 0, d); return WINED3DERR_INVALIDCALL; } - data->ptr.object = (LPUNKNOWN)pData; - data->size = sizeof(LPUNKNOWN); - IUnknown_AddRef(data->ptr.object); + d->ptr.object = (IUnknown *)data; + d->size = sizeof(IUnknown *); + IUnknown_AddRef(d->ptr.object); } else { - data->ptr.data = HeapAlloc(GetProcessHeap(), 0, SizeOfData); - if (!data->ptr.data) + d->ptr.data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!d->ptr.data) { - HeapFree(GetProcessHeap(), 0, data); + HeapFree(GetProcessHeap(), 0, d); return E_OUTOFMEMORY; } - data->size = SizeOfData; - memcpy(data->ptr.data, pData, SizeOfData); + d->size = data_size; + memcpy(d->ptr.data, data, data_size); } - list_add_tail(&This->resource.privateData, &data->entry); + list_add_tail(&resource->resource.privateData, &d->entry); return WINED3D_OK; } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index c499d71..7ca5ba9 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -114,7 +114,7 @@ ULONG WINAPI IWineD3DBaseSurfaceImpl_AddRef(IWineD3DSurface *iface) { HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPrivateData(IWineD3DSurface *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, riid, data, data_size, flags); } HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPrivateData(IWineD3DSurface *iface, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7759435..0697680 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -240,7 +240,7 @@ static ULONG WINAPI IWineD3DTextureImpl_Release(IWineD3DTexture *iface) { static HRESULT WINAPI IWineD3DTextureImpl_SetPrivateData(IWineD3DTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DTextureImpl_GetPrivateData(IWineD3DTexture *iface, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 6334966..9b37c07 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -153,7 +153,7 @@ static void * WINAPI IWineD3DVolumeImpl_GetParent(IWineD3DVolume *iface) static HRESULT WINAPI IWineD3DVolumeImpl_SetPrivateData(IWineD3DVolume *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DVolumeImpl_GetPrivateData(IWineD3DVolume *iface, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index ed837a7..5cb67e8 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -160,7 +160,7 @@ static ULONG WINAPI IWineD3DVolumeTextureImpl_Release(IWineD3DVolumeTexture *ifa static HRESULT WINAPI IWineD3DVolumeTextureImpl_SetPrivateData(IWineD3DVolumeTexture *iface, REFGUID riid, const void *data, DWORD data_size, DWORD flags) { - return resource_set_private_data((IWineD3DResource *)iface, riid, data, data_size, flags); + return resource_set_private_data((IWineD3DResourceImpl *)iface, riid, data, data_size, flags); } static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetPrivateData(IWineD3DVolumeTexture *iface, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d6de00e..be7feb8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1838,7 +1838,7 @@ HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) DECLSPEC_HIDDEN; DWORD resource_set_priority(IWineD3DResource *iface, DWORD new_priority) DECLSPEC_HIDDEN; -HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID guid, +HRESULT resource_set_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags) DECLSPEC_HIDDEN; void resource_unload(IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_priority().
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 2d9748b1e32a773b06a9ae97874784ccb604cf3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d9748b1e32a773b06a9ae978… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 7 10:16:39 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_get_priority(). --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/resource.c | 7 +++---- dlls/wined3d/surface_base.c | 5 +++-- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/volume.c | 5 +++-- dlls/wined3d/volumetexture.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cdcecf3..b80eac6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -785,7 +785,7 @@ static DWORD STDMETHODCALLTYPE buffer_SetPriority(IWineD3DBuffer *iface, DWORD p static DWORD STDMETHODCALLTYPE buffer_GetPriority(IWineD3DBuffer *iface) { - return resource_get_priority((IWineD3DResource *)iface); + return resource_get_priority((IWineD3DResourceImpl *)iface); } /* The caller provides a context and binds the buffer */ diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index c80e5ab..ef142a2 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -233,8 +233,9 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_SetPriority(IWineD3DCubeTexture *ifa return resource_set_priority((IWineD3DResource *)iface, PriorityNew); } -static DWORD WINAPI IWineD3DCubeTextureImpl_GetPriority(IWineD3DCubeTexture *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DCubeTextureImpl_GetPriority(IWineD3DCubeTexture *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); } /* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index c211572..3d62de9 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -259,11 +259,10 @@ DWORD resource_set_priority(IWineD3DResource *iface, DWORD PriorityNew) return PriorityOld; } -DWORD resource_get_priority(IWineD3DResource *iface) +DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - TRACE("(%p) : returning %d\n", This, This->resource.priority ); - return This->resource.priority; + TRACE("resource %p, returning %u.\n", resource, resource->resource.priority); + return resource->resource.priority; } WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 7ca5ba9..8035076 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -132,8 +132,9 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD return resource_set_priority((IWineD3DResource *)iface, PriorityNew); } -DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) { - return resource_get_priority((IWineD3DResource *)iface); +DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); } WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0697680..821db95 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -258,8 +258,9 @@ static DWORD WINAPI IWineD3DTextureImpl_SetPriority(IWineD3DTexture *iface, DWOR return resource_set_priority((IWineD3DResource *)iface, PriorityNew); } -static DWORD WINAPI IWineD3DTextureImpl_GetPriority(IWineD3DTexture *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DTextureImpl_GetPriority(IWineD3DTexture *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); } /* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 9b37c07..f74a577 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -171,8 +171,9 @@ static DWORD WINAPI IWineD3DVolumeImpl_SetPriority(IWineD3DVolume *iface, DWORD return resource_set_priority((IWineD3DResource *)iface, PriorityNew); } -static DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DVolumeImpl_GetPriority(IWineD3DVolume *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); } /* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 5cb67e8..5807d3f 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -178,8 +178,9 @@ static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DVolumeTexture return resource_set_priority((IWineD3DResource *)iface, PriorityNew); } -static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DVolumeTexture *iface) { - return resource_get_priority((IWineD3DResource *)iface); +static DWORD WINAPI IWineD3DVolumeTextureImpl_GetPriority(IWineD3DVolumeTexture *iface) +{ + return resource_get_priority((IWineD3DResourceImpl *)iface); } static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *iface) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index be7feb8..2e50f7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1830,7 +1830,7 @@ typedef struct IWineD3DResourceImpl void resource_cleanup(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid) DECLSPEC_HIDDEN; -DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN; +DWORD resource_get_priority(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_get_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN; HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type,

1 0

Alexandre Julliard : wrc: Treat empty translation strings as missing.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: 45ef8e8a180652570cec16f05cf85aecaae629be URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ef8e8a180652570cec16f05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 7 10:20:23 2011 +0100 wrc: Treat empty translation strings as missing. --- tools/wrc/po.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 6cfb5b4..c075a39 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -774,8 +774,9 @@ static string_t *translate_string( po_file_t po, string_t *str, int *found ) if (msg && !po_message_is_fuzzy( msg )) { - (*found)++; transl = po_message_msgstr( msg ); + if (!transl[0]) transl = msgid; /* ignore empty strings */ + else (*found)++; } else transl = msgid;

1 0

Alexandre Julliard : shdoclc: Convert translations to po files.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: b31d2311b2e5c27ec3b9494cc8a4504b8408e22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31d2311b2e5c27ec3b9494cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 6 17:42:05 2011 +0100 shdoclc: Convert translations to po files. --- configure | 2 +- configure.ac | 2 +- dlls/shdoclc/Bg.rc | 237 ----------------------- dlls/shdoclc/Da.rc | 248 ------------------------ dlls/shdoclc/De.rc | 252 ------------------------ dlls/shdoclc/En.rc | 466 -------------------------------------------- dlls/shdoclc/Es.rc | 250 ------------------------ dlls/shdoclc/Fi.rc | 239 ----------------------- dlls/shdoclc/Fr.rc | 254 ------------------------ dlls/shdoclc/He.rc | 251 ------------------------ dlls/shdoclc/Hu.rc | 253 ------------------------ dlls/shdoclc/It.rc | 252 ------------------------ dlls/shdoclc/Ja.rc | 252 ------------------------ dlls/shdoclc/Ko.rc | 252 ------------------------ dlls/shdoclc/Lt.rc | 251 ------------------------ dlls/shdoclc/Makefile.in | 28 +--- dlls/shdoclc/Nl.rc | 250 ------------------------ dlls/shdoclc/No.rc | 248 ------------------------ dlls/shdoclc/Pl.rc | 248 ------------------------ dlls/shdoclc/Pt.rc | 482 ---------------------------------------------- dlls/shdoclc/Ro.rc | 251 ------------------------ dlls/shdoclc/Ru.rc | 251 ------------------------ dlls/shdoclc/Si.rc | 250 ------------------------ dlls/shdoclc/Sr.rc | 480 --------------------------------------------- dlls/shdoclc/Sv.rc | 248 ------------------------ dlls/shdoclc/Tr.rc | 237 ----------------------- dlls/shdoclc/Uk.rc | 470 -------------------------------------------- dlls/shdoclc/Zh.rc | 482 ---------------------------------------------- dlls/shdoclc/shdoclc.rc | 248 ++++++++++++++++++++++++ po/bg.po | 369 +++++++++++++++++++++++++++++++++++- po/cs.po | 376 +++++++++++++++++++++++++++++++++++- po/da.po | 373 +++++++++++++++++++++++++++++++++++- po/de.po | 380 ++++++++++++++++++++++++++++++++++++- po/el.po | 372 +++++++++++++++++++++++++++++++++++- po/en.po | 367 +++++++++++++++++++++++++++++++++++- po/en_US.po | 366 ++++++++++++++++++++++++++++++++++- po/eo.po | 369 +++++++++++++++++++++++++++++++++++- po/es.po | 380 ++++++++++++++++++++++++++++++++++++- po/fi.po | 381 ++++++++++++++++++++++++++++++++++++- po/fr.po | 380 ++++++++++++++++++++++++++++++++++++- po/he.po | 373 +++++++++++++++++++++++++++++++++++- po/hi.po | 369 +++++++++++++++++++++++++++++++++++- po/hu.po | 380 ++++++++++++++++++++++++++++++++++++- po/it.po | 373 +++++++++++++++++++++++++++++++++++- po/ja.po | 373 +++++++++++++++++++++++++++++++++++- po/ko.po | 373 +++++++++++++++++++++++++++++++++++- po/lt.po | 373 +++++++++++++++++++++++++++++++++++- po/ml.po | 369 +++++++++++++++++++++++++++++++++++- po/nb_NO.po | 373 +++++++++++++++++++++++++++++++++++- po/nl.po | 366 ++++++++++++++++++++++++++++++++++- po/or.po | 369 +++++++++++++++++++++++++++++++++++- po/pa.po | 369 +++++++++++++++++++++++++++++++++++- po/pl.po | 373 +++++++++++++++++++++++++++++++++++- po/pt_BR.po | 373 +++++++++++++++++++++++++++++++++++- po/pt_PT.po | 373 +++++++++++++++++++++++++++++++++++- po/ro.po | 373 +++++++++++++++++++++++++++++++++++- po/ru.po | 373 +++++++++++++++++++++++++++++++++++- po/sk.po | 369 +++++++++++++++++++++++++++++++++++- po/sl.po | 373 +++++++++++++++++++++++++++++++++++- po/sr_Latn_SP.po | 366 ++++++++++++++++++++++++++++++++++- po/sr_SP.po | 366 ++++++++++++++++++++++++++++++++++- po/sv.po | 366 ++++++++++++++++++++++++++++++++++- po/te.po | 369 +++++++++++++++++++++++++++++++++++- po/th.po | 369 +++++++++++++++++++++++++++++++++++- po/tr.po | 374 +++++++++++++++++++++++++++++++++++- po/uk.po | 374 +++++++++++++++++++++++++++++++++++- po/wa.po | 369 +++++++++++++++++++++++++++++++++++- po/wine.pot | 366 ++++++++++++++++++++++++++++++++++- po/zh_CN.po | 366 ++++++++++++++++++++++++++++++++++- po/zh_TW.po | 366 ++++++++++++++++++++++++++++++++++- 70 files changed, 15375 insertions(+), 7490 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b31d2311b2e5c27ec3b94…

1 0

Alexandre Julliard : winmm: Convert translations to po files.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 8aefc9081c40a8d2168e2b02ec113a5c47210d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aefc9081c40a8d2168e2b02e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 6 17:50:17 2011 +0100 winmm: Convert translations to po files. --- configure | 2 +- configure.ac | 2 +- dlls/winmm/Makefile.in | 24 +-- dlls/winmm/{winmm_En.rc => winmm.rc} | 0 dlls/winmm/winmm_Cs.rc | 136 -------- dlls/winmm/winmm_Da.rc | 131 ------- dlls/winmm/winmm_De.rc | 133 ------- dlls/winmm/winmm_Es.rc | 132 ------- dlls/winmm/winmm_Fr.rc | 137 -------- dlls/winmm/winmm_It.rc | 136 -------- dlls/winmm/winmm_Ja.rc | 134 ------- dlls/winmm/winmm_Ko.rc | 134 ------- dlls/winmm/winmm_Lt.rc | 134 ------- dlls/winmm/winmm_Nl.rc | 134 ------- dlls/winmm/winmm_No.rc | 131 ------- dlls/winmm/winmm_Pl.rc | 131 ------- dlls/winmm/winmm_Pt.rc | 246 ------------- dlls/winmm/winmm_Ro.rc | 133 ------- dlls/winmm/winmm_Ru.rc | 138 -------- dlls/winmm/winmm_Si.rc | 133 ------- dlls/winmm/winmm_Sk.rc | 131 ------- dlls/winmm/winmm_Sv.rc | 133 ------- dlls/winmm/winmm_Tr.rc | 133 ------- dlls/winmm/winmm_Uk.rc | 136 -------- po/bg.po | 492 ++++++++++++++++++++++++++ po/cs.po | 588 +++++++++++++++++++++++++++++++ po/da.po | 598 ++++++++++++++++++++++++++++++++ po/de.po | 633 +++++++++++++++++++++++++++++++++ po/el.po | 492 ++++++++++++++++++++++++++ po/en.po | 493 ++++++++++++++++++++++++++ po/en_US.po | 605 ++++++++++++++++++++++++++++++++ po/eo.po | 492 ++++++++++++++++++++++++++ po/es.po | 631 +++++++++++++++++++++++++++++++++ po/fi.po | 492 ++++++++++++++++++++++++++ po/fr.po | 635 ++++++++++++++++++++++++++++++++++ po/he.po | 492 ++++++++++++++++++++++++++ po/hi.po | 492 ++++++++++++++++++++++++++ po/hu.po | 492 ++++++++++++++++++++++++++ po/it.po | 624 +++++++++++++++++++++++++++++++++ po/ja.po | 601 ++++++++++++++++++++++++++++++++ po/ko.po | 588 +++++++++++++++++++++++++++++++ po/lt.po | 613 ++++++++++++++++++++++++++++++++ po/ml.po | 492 ++++++++++++++++++++++++++ po/nb_NO.po | 597 ++++++++++++++++++++++++++++++++ po/nl.po | 618 +++++++++++++++++++++++++++++++++ po/or.po | 492 ++++++++++++++++++++++++++ po/pa.po | 492 ++++++++++++++++++++++++++ po/pl.po | 615 ++++++++++++++++++++++++++++++++ po/pt_BR.po | 630 +++++++++++++++++++++++++++++++++ po/pt_PT.po | 626 +++++++++++++++++++++++++++++++++ po/ro.po | 627 +++++++++++++++++++++++++++++++++ po/ru.po | 605 ++++++++++++++++++++++++++++++++ po/sk.po | 605 ++++++++++++++++++++++++++++++++ po/sl.po | 602 ++++++++++++++++++++++++++++++++ po/sr_Latn_SP.po | 492 ++++++++++++++++++++++++++ po/sr_SP.po | 492 ++++++++++++++++++++++++++ po/sv.po | 600 ++++++++++++++++++++++++++++++++ po/te.po | 492 ++++++++++++++++++++++++++ po/th.po | 492 ++++++++++++++++++++++++++ po/tr.po | 603 ++++++++++++++++++++++++++++++++ po/uk.po | 604 ++++++++++++++++++++++++++++++++ po/wa.po | 492 ++++++++++++++++++++++++++ po/wine.pot | 492 ++++++++++++++++++++++++++ po/zh_CN.po | 492 ++++++++++++++++++++++++++ po/zh_TW.po | 492 ++++++++++++++++++++++++++ 65 files changed, 22802 insertions(+), 2809 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8aefc9081c40a8d2168e2…

1 0

Alexandre Julliard : wldap32: Convert translations to po files.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: d1d494b3db73766b9026d157dcdce069db0540a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d494b3db73766b9026d157d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 6 17:57:43 2011 +0100 wldap32: Convert translations to po files. --- configure | 2 +- configure.ac | 2 +- dlls/wldap32/Makefile.in | 22 +--- dlls/wldap32/{wldap32_En.rc => wldap32.rc} | 0 dlls/wldap32/wldap32_Da.rc | 125 -------------- dlls/wldap32/wldap32_De.rc | 127 -------------- dlls/wldap32/wldap32_Es.rc | 125 -------------- dlls/wldap32/wldap32_Fr.rc | 129 -------------- dlls/wldap32/wldap32_Hu.rc | 128 -------------- dlls/wldap32/wldap32_It.rc | 128 -------------- dlls/wldap32/wldap32_Ko.rc | 125 -------------- dlls/wldap32/wldap32_Lt.rc | 128 -------------- dlls/wldap32/wldap32_Nl.rc | 125 -------------- dlls/wldap32/wldap32_No.rc | 125 -------------- dlls/wldap32/wldap32_Pl.rc | 126 -------------- dlls/wldap32/wldap32_Pt.rc | 232 ------------------------- dlls/wldap32/wldap32_Ro.rc | 127 -------------- dlls/wldap32/wldap32_Ru.rc | 128 -------------- dlls/wldap32/wldap32_Sr.rc | 232 ------------------------- dlls/wldap32/wldap32_Sv.rc | 125 -------------- dlls/wldap32/wldap32_Tr.rc | 125 -------------- dlls/wldap32/wldap32_Uk.rc | 130 -------------- po/bg.po | 243 ++++++++++++++++++++++++++ po/cs.po | 243 ++++++++++++++++++++++++++ po/da.po | 240 ++++++++++++++++++++++++++ po/de.po | 240 ++++++++++++++++++++++++++ po/el.po | 242 ++++++++++++++++++++++++++ po/en.po | 254 ++++++++++++++++++++++++++++ po/en_US.po | 240 ++++++++++++++++++++++++++ po/eo.po | 241 ++++++++++++++++++++++++++ po/es.po | 240 ++++++++++++++++++++++++++ po/fi.po | 245 +++++++++++++++++++++++++++ po/fr.po | 240 ++++++++++++++++++++++++++ po/he.po | 246 +++++++++++++++++++++++++++ po/hi.po | 241 ++++++++++++++++++++++++++ po/hu.po | 240 ++++++++++++++++++++++++++ po/it.po | 240 ++++++++++++++++++++++++++ po/ja.po | 254 ++++++++++++++++++++++++++++ po/ko.po | 240 ++++++++++++++++++++++++++ po/lt.po | 240 ++++++++++++++++++++++++++ po/ml.po | 241 ++++++++++++++++++++++++++ po/nb_NO.po | 240 ++++++++++++++++++++++++++ po/nl.po | 240 ++++++++++++++++++++++++++ po/or.po | 241 ++++++++++++++++++++++++++ po/pa.po | 241 ++++++++++++++++++++++++++ po/pl.po | 240 ++++++++++++++++++++++++++ po/pt_BR.po | 240 ++++++++++++++++++++++++++ po/pt_PT.po | 240 ++++++++++++++++++++++++++ po/ro.po | 240 ++++++++++++++++++++++++++ po/ru.po | 240 ++++++++++++++++++++++++++ po/sk.po | 241 ++++++++++++++++++++++++++ po/sl.po | 248 +++++++++++++++++++++++++++ po/sr_Latn_SP.po | 240 ++++++++++++++++++++++++++ po/sr_SP.po | 240 ++++++++++++++++++++++++++ po/sv.po | 240 ++++++++++++++++++++++++++ po/te.po | 241 ++++++++++++++++++++++++++ po/th.po | 241 ++++++++++++++++++++++++++ po/tr.po | 240 ++++++++++++++++++++++++++ po/uk.po | 240 ++++++++++++++++++++++++++ po/wa.po | 241 ++++++++++++++++++++++++++ po/wine.pot | 240 ++++++++++++++++++++++++++ po/zh_CN.po | 246 +++++++++++++++++++++++++++ po/zh_TW.po | 246 +++++++++++++++++++++++++++ 63 files changed, 9920 insertions(+), 2512 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1d494b3db73766b9026d…

1 0

Hans Leidekker : msi/tests: Mark a test result on some old Wow64 platforms as broken.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 01286b97e3e0a610f8eae8e00c87653f9b7088c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01286b97e3e0a610f8eae8e00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 6 16:30:09 2011 +0100 msi/tests: Mark a test result on some old Wow64 platforms as broken. --- dlls/msi/tests/msi.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index bb0d65f..b5dc78c 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -5000,7 +5000,14 @@ static void test_MsiGetProductInfoEx(void) r = pMsiGetProductInfoExA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_PRODUCTSTATE, buf, &sz); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS || broken(r == ERROR_UNKNOWN_PRODUCT), "Expected ERROR_SUCCESS, got %d\n", r); + if (r == ERROR_UNKNOWN_PRODUCT) + { + win_skip("skipping remaining tests for MsiGetProductInfoEx\n"); + delete_key(prodkey, "", access); + RegCloseKey(prodkey); + return; + } ok(!lstrcmpA(buf, "1"), "Expected \"1\", got \"%s\"\n", buf); ok(sz == 1, "Expected 1, got %d\n", sz);

1 0

Greg Geldorp : dinput/tests: Skip acquire tests when not running in the foreground.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 62670dc39e00fd7855e26d46771fa6d10104c690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62670dc39e00fd7855e26d467… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 6 13:10:27 2011 +0100 dinput/tests: Skip acquire tests when not running in the foreground. If our window isn't the foreground window, we'll never be able to successfully Acquire with SetCooperativeLevel DISCL_FOREGROUND in effect. --- dlls/dinput/tests/mouse.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 09b2b27..25a9a5e 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -73,6 +73,12 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) DIMOUSESTATE m_state; HWND hwnd2; + if (! SetForegroundWindow(hwnd)) + { + skip("Not running as foreground app, skipping acquire tests\n"); + return; + } + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); if (FAILED(hr)) return;

1 0

Michael Stefaniuc : mshtml: Finish the COM standardization in protocol.c.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: f242b1fb6c083095a378de4777153517db629db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f242b1fb6c083095a378de477… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 16:16:55 2011 +0100 mshtml: Finish the COM standardization in protocol.c. --- dlls/mshtml/mshtml_private.h | 2 - dlls/mshtml/protocol.c | 94 +++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f242b1fb6c083095a378d…

1 0

Michael Stefaniuc : mshtml: Remove some leftover *_THIS undefs.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: d214a96d5812d34bf4fca674e5af61a77129e3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d214a96d5812d34bf4fca674e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 6 16:18:25 2011 +0100 mshtml: Remove some leftover *_THIS undefs. --- dlls/mshtml/mutation.c | 2 -- dlls/mshtml/olecmd.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 3c88744..fbbb398 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -659,8 +659,6 @@ static void NSAPI nsDocumentObserver_DoneAddingChildren(nsIDocumentObserver *ifa } } -#undef NSMUTATIONOBS_THIS - static const nsIDocumentObserverVtbl nsDocumentObserverVtbl = { nsDocumentObserver_QueryInterface, nsDocumentObserver_AddRef, diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index d4f1863..97d2c4f 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -888,8 +888,6 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return OLECMDERR_E_UNKNOWNGROUP; } -#undef CMDTARGET_THIS - static const IOleCommandTargetVtbl OleCommandTargetVtbl = { OleCommandTarget_QueryInterface, OleCommandTarget_AddRef,

1 0