January 2011 - Wine-commits

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

06 Jan '11

1 0

Alexandre Julliard : po: Add missing entry for No key in en_US translation.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: f8960ac808a038cbb69ad6dfb99126b81f82e2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8960ac808a038cbb69ad6dfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 6 11:55:50 2011 +0100 po: Add missing entry for No key in en_US translation. --- po/en_US.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index 1cfdd60..7d9fad2 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -551,7 +551,7 @@ msgstr "Y" #: cmd.rc:257 xcopy.rc:41 msgctxt "No key" msgid "N" -msgstr "" +msgstr "N" #: cmd.rc:258 msgid "File association missing for extension %s\n"

1 0

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

06 Jan '11

Module: wine Branch: master Commit: c485b18201fb74f18b797ede5e4a02452df16064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c485b18201fb74f18b797ede5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 6 12:18:02 2011 +0100 crypt32: Convert translations to po files. --- configure | 2 +- configure.ac | 2 +- dlls/crypt32/Makefile.in | 19 +- dlls/crypt32/{crypt32_En.rc => crypt32.rc} | 9 + dlls/crypt32/crypt32_De.rc | 244 -------- dlls/crypt32/crypt32_Fr.rc | 244 -------- dlls/crypt32/crypt32_Hu.rc | 244 -------- dlls/crypt32/crypt32_It.rc | 244 -------- dlls/crypt32/crypt32_Ja.rc | 244 -------- dlls/crypt32/crypt32_Ko.rc | 244 -------- dlls/crypt32/crypt32_Lt.rc | 244 -------- dlls/crypt32/crypt32_Nl.rc | 243 -------- dlls/crypt32/crypt32_No.rc | 244 -------- dlls/crypt32/crypt32_Pl.rc | 241 -------- dlls/crypt32/crypt32_Pt.rc | 461 --------------- dlls/crypt32/crypt32_Ro.rc | 244 -------- dlls/crypt32/crypt32_Sv.rc | 244 -------- dlls/crypt32/crypt32_Uk.rc | 247 -------- dlls/crypt32/version.rc | 28 - po/bg.po | 832 +++++++++++++++++++++++++++- po/cs.po | 844 +++++++++++++++++++++++++++- po/da.po | 844 +++++++++++++++++++++++++++- po/de.po | 832 +++++++++++++++++++++++++++- po/en_US.po | 832 +++++++++++++++++++++++++++- po/eo.po | 833 +++++++++++++++++++++++++++- po/es.po | 844 +++++++++++++++++++++++++++- po/fi.po | 833 +++++++++++++++++++++++++++- po/fr.po | 832 +++++++++++++++++++++++++++- po/he.po | 833 +++++++++++++++++++++++++++- po/hi.po | 833 +++++++++++++++++++++++++++- po/hu.po | 832 +++++++++++++++++++++++++++- po/it.po | 832 +++++++++++++++++++++++++++- po/ja.po | 832 +++++++++++++++++++++++++++- po/ko.po | 832 +++++++++++++++++++++++++++- po/lt.po | 832 +++++++++++++++++++++++++++- po/ml.po | 833 +++++++++++++++++++++++++++- po/nb_NO.po | 832 +++++++++++++++++++++++++++- po/nl.po | 832 +++++++++++++++++++++++++++- po/or.po | 833 +++++++++++++++++++++++++++- po/pa.po | 833 +++++++++++++++++++++++++++- po/pl.po | 832 +++++++++++++++++++++++++++- po/pt_BR.po | 832 +++++++++++++++++++++++++++- po/pt_PT.po | 832 +++++++++++++++++++++++++++- po/ro.po | 832 +++++++++++++++++++++++++++- po/ru.po | 844 +++++++++++++++++++++++++++- po/sk.po | 833 +++++++++++++++++++++++++++- po/sl.po | 847 +++++++++++++++++++++++++++- po/sr_Latn_SP.po | 836 +++++++++++++++++++++++++++- po/sr_SP.po | 836 +++++++++++++++++++++++++++- po/sv.po | 832 +++++++++++++++++++++++++++- po/te.po | 833 +++++++++++++++++++++++++++- po/th.po | 833 +++++++++++++++++++++++++++- po/tr.po | 844 +++++++++++++++++++++++++++- po/uk.po | 832 +++++++++++++++++++++++++++- po/wa.po | 833 +++++++++++++++++++++++++++- po/wine.pot | 832 +++++++++++++++++++++++++++- po/zh_CN.po | 833 +++++++++++++++++++++++++++- po/zh_TW.po | 833 +++++++++++++++++++++++++++- 58 files changed, 32245 insertions(+), 3991 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c485b18201fb74f18b797…

1 0

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

06 Jan '11

Module: wine Branch: master Commit: 8484e9633a9b762c8ac5cd880296914a43ca41c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8484e9633a9b762c8ac5cd880… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 6 12:28:26 2011 +0100 cryptdlg: Convert translations to po files. --- configure | 2 +- configure.ac | 2 +- dlls/cryptdlg/Makefile.in | 19 +------- dlls/cryptdlg/{cryptdlg_En.rc => cryptdlg.rc} | 0 dlls/cryptdlg/cryptdlg_Da.rc | 39 ----------------- dlls/cryptdlg/cryptdlg_De.rc | 40 ----------------- dlls/cryptdlg/cryptdlg_Fr.rc | 42 ------------------ dlls/cryptdlg/cryptdlg_Hu.rc | 41 ----------------- dlls/cryptdlg/cryptdlg_It.rc | 42 ------------------ dlls/cryptdlg/cryptdlg_Ko.rc | 41 ----------------- dlls/cryptdlg/cryptdlg_Lt.rc | 41 ----------------- dlls/cryptdlg/cryptdlg_Nl.rc | 38 ---------------- dlls/cryptdlg/cryptdlg_No.rc | 41 ----------------- dlls/cryptdlg/cryptdlg_Pl.rc | 38 ---------------- dlls/cryptdlg/cryptdlg_Pt.rc | 58 ------------------------- dlls/cryptdlg/cryptdlg_Ro.rc | 41 ----------------- dlls/cryptdlg/cryptdlg_Sr.rc | 58 ------------------------- dlls/cryptdlg/cryptdlg_Sv.rc | 40 ----------------- dlls/cryptdlg/cryptdlg_Uk.rc | 42 ------------------ po/bg.po | 40 ++++++++++++++++- po/cs.po | 40 ++++++++++++++++- po/da.po | 40 ++++++++++++++++- po/de.po | 44 ++++++++++++++++++- po/en_US.po | 40 ++++++++++++++++- po/eo.po | 40 ++++++++++++++++- po/es.po | 40 ++++++++++++++++- po/fi.po | 40 ++++++++++++++++- po/fr.po | 44 ++++++++++++++++++- po/he.po | 40 ++++++++++++++++- po/hi.po | 40 ++++++++++++++++- po/hu.po | 44 ++++++++++++++++++- po/it.po | 44 ++++++++++++++++++- po/ja.po | 44 ++++++++++++++++++- po/ko.po | 44 ++++++++++++++++++- po/lt.po | 44 ++++++++++++++++++- po/ml.po | 40 ++++++++++++++++- po/nb_NO.po | 44 ++++++++++++++++++- po/nl.po | 44 ++++++++++++++++++- po/or.po | 40 ++++++++++++++++- po/pa.po | 40 ++++++++++++++++- po/pl.po | 44 ++++++++++++++++++- po/pt_BR.po | 44 ++++++++++++++++++- po/pt_PT.po | 44 ++++++++++++++++++- po/ro.po | 44 ++++++++++++++++++- po/ru.po | 40 ++++++++++++++++- po/sk.po | 40 ++++++++++++++++- po/sl.po | 40 ++++++++++++++++- po/sr_Latn_SP.po | 40 ++++++++++++++++- po/sr_SP.po | 40 ++++++++++++++++- po/sv.po | 44 ++++++++++++++++++- po/te.po | 40 ++++++++++++++++- po/th.po | 40 ++++++++++++++++- po/tr.po | 40 ++++++++++++++++- po/uk.po | 44 ++++++++++++++++++- po/wa.po | 40 ++++++++++++++++- po/wine.pot | 40 ++++++++++++++++- po/zh_CN.po | 40 ++++++++++++++++- po/zh_TW.po | 40 ++++++++++++++++- 58 files changed, 1546 insertions(+), 739 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8484e9633a9b762c8ac5c…

1 0

Piotr Caban : shell32: Improved equal ITEMIDLISTs handling in ILIsParent.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: 92ba2168fa2b46a077f3d7746ce70ad6e815a7b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ba2168fa2b46a077f3d7746… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 6 00:01:28 2011 +0100 shell32: Improved equal ITEMIDLISTs handling in ILIsParent. --- dlls/shell32/pidl.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 266c444..71b8f93 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -544,6 +544,8 @@ BOOL WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) * parent = a/b, child = a/b/c -> true, c is in folder a/b * child = a/b/c/d -> false if bImmediate is true, d is not in folder a/b * child = a/b/c/d -> true if bImmediate is false, d is in a subfolder of a/b + * child = a/b -> false if bImmediate is true + * child = a/b -> true if bImmediate is false */ BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL bImmediate) { @@ -569,12 +571,12 @@ BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL b pChild = ILGetNext(pChild); } - /* child shorter or has equal length to parent */ - if (pParent->mkid.cb || !pChild->mkid.cb) + /* child has shorter name than parent */ + if (pParent->mkid.cb) return FALSE; /* not immediate descent */ - if ( ILGetNext(pChild)->mkid.cb && bImmediate) + if ((!pChild->mkid.cb || ILGetNext(pChild)->mkid.cb) && bImmediate) return FALSE; return TRUE;

1 0

Hwang YunSong : winedbg: Update Korean resource.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: f6b8689b0453f9edc03e21b53451e98e2be32651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b8689b0453f9edc03e21b53… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jan 6 10:49:59 2011 +0900 winedbg: Update Korean resource. --- programs/winedbg/rsrc_Ko.rc | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/rsrc_Ko.rc b/programs/winedbg/rsrc_Ko.rc index a68deac..3e5352c 100644 --- a/programs/winedbg/rsrc_Ko.rc +++ b/programs/winedbg/rsrc_Ko.rc @@ -2,7 +2,7 @@ * Korean Language Support * * Copyright 2008 Mikolaj Zalewski - * Copyright 2009 YunSong Hwang + * Copyright 2009,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,36 +21,38 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDM_DEBUG_POPUP MENU BEGIN POPUP "" BEGIN - MENUITEM "��(&D)", ID_DEBUG + MENUITEM "디버그(&D)", ID_DEBUG END END IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��α׷� ��" -FONT 8, "Tahoma" +CAPTION "프로그램 에러" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 - LTEXT "�� α׷� %s �� ɰ�� ؼ� ��Ḧ �ʿ�� մϴ�. \ - �츮�� ĵ帰 �ſ� ��Ͽ� �� ǥ�Դϴ�.", + LTEXT "이 프로그램 %s 은 심각한 문제에 직면해서 종료를 필요로 합니다. \ + 우리는 불편을 끼쳐드린 거에 대하여 유감을 표함니다.", IDC_STATIC_TXT1,27,10,224,30 - LTEXT "��α׷�� Wind�� ߻�� ֽ��ϴ�. \ - �� α׷�� Ͽ� http://appdb.winehq.org �� Ȯ�� ֽ��ϴ�. \ + LTEXT "프로그램의 문제나 Wind의 결함으로 위해 발생할 수 있습니다. \ + 당신은 실행한 프로그램에 대하여 http://appdb.winehq.org 의 팁을 확인 할 수 있습니다. \ .\n\n\ - �� 쿡�� ʰ�, �� ׷� �� ʾ�� \ - , �� http://bugs.winehq.org�� ׷� �� ֽ��ϴ�.",IDC_STATIC_TXT2,27,60,224,100 - DEFPUSHBUTTON "�ݱ�", IDOK, 205, 151, 60, 16, WS_TABSTOP + 만약 이 문제가 윈도우에서는 존재하지 않고, 아직 버그로 보고되지 않았으면 \ + , 당신은 http://bugs.winehq.org에 버그로 보고할 수 있습니다.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "닫기", IDOK, 205, 151, 60, 16, WS_TABSTOP END STRINGTABLE BEGIN - IDS_AUTO_CAPTION "Wine ��α׷� �浹" - IDS_INVALID_PARAMS "�� -�ùٸ�� Ű�� " - IDS_UNIDENTIFIED "(�˼� ��)" + IDS_AUTO_CAPTION "Wine 프로그램 충돌" + IDS_INVALID_PARAMS "내부 에러 -올바르지 않은 매개변수가 들어옴" + IDS_UNIDENTIFIED "(알수 없음)" END

1 0

Hwang YunSong : winefile: Update Korean resource.
by Alexandre Julliard 06 Jan '11

06 Jan '11

Module: wine Branch: master Commit: d54d410d287c558b43739a825f507a2677ff2adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54d410d287c558b43739a825… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jan 6 10:51:40 2011 +0900 winefile: Update Korean resource. --- programs/winefile/Ko.rc | 260 ++++++++++++++++++++++++----------------------- 1 files changed, 131 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d54d410d287c558b43739…

1 0

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

06 Jan '11

Module: wine Branch: master Commit: 7080922e0e6938741d6c84b13728f51c1ea3e234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7080922e0e6938741d6c84b13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 6 09:38:59 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_init(). --- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/resource.c | 38 +++++++++++++++++++------------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 26beb29..d6678b7 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -34,7 +34,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, const struct wined3d_ { HRESULT hr; - hr = resource_init((IWineD3DResource *)texture, resource_type, device, + hr = resource_init((IWineD3DResourceImpl *)texture, resource_type, device, 0, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3048834..bfed37c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1473,7 +1473,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, buffer->vtbl = &wined3d_buffer_vtbl; - hr = resource_init((IWineD3DResource *)buffer, WINED3DRTYPE_BUFFER, + hr = resource_init((IWineD3DResourceImpl *)buffer, WINED3DRTYPE_BUFFER, device, size, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index b8b8594..0c8aa98 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -43,28 +43,28 @@ struct private_data DWORD size; }; -HRESULT resource_init(IWineD3DResource *iface, WINED3DRESOURCETYPE resource_type, +HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) { - struct IWineD3DResourceClass *resource = &((IWineD3DResourceImpl *)iface)->resource; - - resource->device = device; - resource->resourceType = resource_type; - resource->ref = 1; - resource->pool = pool; - resource->format = format; - resource->usage = usage; - resource->size = size; - resource->priority = 0; - resource->parent = parent; - resource->parent_ops = parent_ops; - list_init(&resource->privateData); + struct IWineD3DResourceClass *r = &resource->resource; + + r->device = device; + r->resourceType = resource_type; + r->ref = 1; + r->pool = pool; + r->format = format; + r->usage = usage; + r->size = size; + r->priority = 0; + r->parent = parent; + r->parent_ops = parent_ops; + list_init(&r->privateData); if (size) { - resource->heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + RESOURCE_ALIGNMENT); - if (!resource->heapMemory) + r->heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + RESOURCE_ALIGNMENT); + if (!r->heapMemory) { ERR("Out of memory!\n"); return WINED3DERR_OUTOFVIDEOMEMORY; @@ -72,9 +72,9 @@ HRESULT resource_init(IWineD3DResource *iface, WINED3DRESOURCETYPE resource_type } else { - resource->heapMemory = NULL; + r->heapMemory = NULL; } - resource->allocatedMemory = (BYTE *)(((ULONG_PTR)resource->heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + r->allocatedMemory = (BYTE *)(((ULONG_PTR)r->heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); /* Check that we have enough video ram left */ if (pool == WINED3DPOOL_DEFAULT) @@ -82,13 +82,13 @@ HRESULT resource_init(IWineD3DResource *iface, WINED3DRESOURCETYPE resource_type if (size > IWineD3DDevice_GetAvailableTextureMem((IWineD3DDevice *)device)) { ERR("Out of adapter memory\n"); - HeapFree(GetProcessHeap(), 0, resource->heapMemory); + HeapFree(GetProcessHeap(), 0, r->heapMemory); return WINED3DERR_OUTOFVIDEOMEMORY; } WineD3DAdapterChangeGLRam(device, size); } - device_resource_add(device, iface); + device_resource_add(device, (IWineD3DResource *)resource); return WINED3D_OK; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 29d98ee..a4f37cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -373,7 +373,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, return WINED3DERR_INVALIDCALL; } - hr = resource_init((IWineD3DResource *)surface, WINED3DRTYPE_SURFACE, + hr = resource_init((IWineD3DResourceImpl *)surface, WINED3DRTYPE_SURFACE, device, resource_size, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 48e2c7b..8ccc482 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -346,7 +346,7 @@ HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT volume->lpVtbl = &IWineD3DVolume_Vtbl; - hr = resource_init((IWineD3DResource *)volume, WINED3DRTYPE_VOLUME, device, + hr = resource_init((IWineD3DResourceImpl *)volume, WINED3DRTYPE_VOLUME, device, width * height * depth * format->byte_count, usage, format, pool, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7562101..9d4009c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1833,7 +1833,7 @@ HRESULT resource_free_private_data(IWineD3DResource *iface, REFGUID guid) DECLSP DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN; HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN; -HRESULT resource_init(IWineD3DResource *iface, WINED3DRESOURCETYPE resource_type, +HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE resource_type, IWineD3DDeviceImpl *device, UINT size, DWORD usage, const struct wined3d_format *format, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE resource_get_type(IWineD3DResource *iface) DECLSPEC_HIDDEN;

1 0

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

06 Jan '11

Module: wine Branch: master Commit: 134137cdb4ee210209da8a8ad38deef62e0bb70e URL: http://source.winehq.org/git/wine.git/?a=commit;h=134137cdb4ee210209da8a8ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 6 09:39:00 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_cleanup(). --- dlls/wined3d/basetexture.c | 4 ++-- dlls/wined3d/buffer.c | 6 +++--- dlls/wined3d/resource.c | 31 ++++++++++++++++--------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index d6678b7..6d0f951 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -48,7 +48,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, const struct wined3d_ if (!texture->baseTexture.sub_resources) { ERR("Failed to allocate sub-resource array.\n"); - resource_cleanup((IWineD3DResource *)texture); + resource_cleanup((IWineD3DResourceImpl *)texture); return E_OUTOFMEMORY; } @@ -79,7 +79,7 @@ void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) { basetexture_unload(texture); HeapFree(GetProcessHeap(), 0, texture->baseTexture.sub_resources); - resource_cleanup((IWineD3DResource *)texture); + resource_cleanup((IWineD3DResourceImpl *)texture); } IWineD3DResourceImpl *basetexture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bfed37c..b5aeee4 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -742,7 +742,7 @@ static ULONG STDMETHODCALLTYPE buffer_Release(IWineD3DBuffer *iface) if (!refcount) { buffer_UnLoad(iface); - resource_cleanup((IWineD3DResource *)iface); + resource_cleanup((IWineD3DResourceImpl *)iface); This->resource.parent_ops->wined3d_object_destroyed(This->resource.parent); HeapFree(GetProcessHeap(), 0, This->maps); HeapFree(GetProcessHeap(), 0, This); @@ -1521,7 +1521,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, { ERR("Failed to map buffer, hr %#x\n", hr); buffer_UnLoad((IWineD3DBuffer *)buffer); - resource_cleanup((IWineD3DResource *)buffer); + resource_cleanup((IWineD3DResourceImpl *)buffer); return hr; } @@ -1535,7 +1535,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, { ERR("Out of memory\n"); buffer_UnLoad((IWineD3DBuffer *)buffer); - resource_cleanup((IWineD3DResource *)buffer); + resource_cleanup((IWineD3DResourceImpl *)buffer); return E_OUTOFMEMORY; } buffer->maps_size = 1; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 0c8aa98..7b8066e 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -93,33 +93,34 @@ HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE return WINED3D_OK; } -void resource_cleanup(IWineD3DResource *iface) +void resource_cleanup(struct IWineD3DResourceImpl *resource) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; struct private_data *data; struct list *e1, *e2; HRESULT hr; - TRACE("(%p) Cleaning up resource\n", This); - if (This->resource.pool == WINED3DPOOL_DEFAULT) { - TRACE("Decrementing device memory pool by %u\n", This->resource.size); - WineD3DAdapterChangeGLRam(This->resource.device, -This->resource.size); + TRACE("Cleaning up resource %p.\n", resource); + + if (resource->resource.pool == WINED3DPOOL_DEFAULT) + { + TRACE("Decrementing device memory pool by %u.\n", resource->resource.size); + WineD3DAdapterChangeGLRam(resource->resource.device, -resource->resource.size); } - LIST_FOR_EACH_SAFE(e1, e2, &This->resource.privateData) + LIST_FOR_EACH_SAFE(e1, e2, &resource->resource.privateData) { data = LIST_ENTRY(e1, struct private_data, entry); - hr = resource_free_private_data(iface, &data->tag); - if(hr != WINED3D_OK) { - ERR("Failed to free private data when destroying resource %p, hr = %08x\n", This, hr); - } + hr = resource_free_private_data((IWineD3DResource *)resource, &data->tag); + if (FAILED(hr)) + ERR("Failed to free private data when destroying resource %p, hr = %#x.\n", resource, hr); } - HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); - This->resource.allocatedMemory = 0; - This->resource.heapMemory = 0; + HeapFree(GetProcessHeap(), 0, resource->resource.heapMemory); + resource->resource.allocatedMemory = 0; + resource->resource.heapMemory = 0; - if (This->resource.device) device_resource_released(This->resource.device, iface); + if (resource->resource.device) + device_resource_released(resource->resource.device, (IWineD3DResource *)resource); } void resource_unload(IWineD3DResourceImpl *resource) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a4f37cc..8eedb90 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -89,7 +89,7 @@ static void surface_cleanup(IWineD3DSurfaceImpl *This) HeapFree(GetProcessHeap(), 0, This->palette9); - resource_cleanup((IWineD3DResource *)This); + resource_cleanup((IWineD3DResourceImpl *)This); } void surface_set_container(IWineD3DSurfaceImpl *surface, enum wined3d_container_type type, IWineD3DBase *container) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index b1c0b32..013ff2c 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -54,7 +54,7 @@ void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) HeapFree(GetProcessHeap(), 0, This->palette9); - resource_cleanup((IWineD3DResource *)This); + resource_cleanup((IWineD3DResourceImpl *)This); } /***************************************************************************** diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 8ccc482..dbc2116 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -133,7 +133,7 @@ static ULONG WINAPI IWineD3DVolumeImpl_Release(IWineD3DVolume *iface) { if (!ref) { - resource_cleanup((IWineD3DResource *)iface); + resource_cleanup((IWineD3DResourceImpl *)iface); This->resource.parent_ops->wined3d_object_destroyed(This->resource.parent); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9d4009c..41456f9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1828,7 +1828,7 @@ typedef struct IWineD3DResourceImpl IWineD3DResourceClass resource; } IWineD3DResourceImpl; -void resource_cleanup(IWineD3DResource *iface) DECLSPEC_HIDDEN; +void resource_cleanup(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; HRESULT resource_free_private_data(IWineD3DResource *iface, REFGUID guid) DECLSPEC_HIDDEN; DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN; HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID guid,

1 0

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

06 Jan '11

Module: wine Branch: master Commit: a97ae0db6a696f39dc480b316556a18bc83caa6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97ae0db6a696f39dc480b316… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 6 09:39:01 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to resource_free_private_data(). --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/cubetexture.c | 5 +++-- dlls/wined3d/resource.c | 12 ++++++------ 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, 23 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b5aeee4..e3f71a0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -775,7 +775,7 @@ static HRESULT STDMETHODCALLTYPE buffer_GetPrivateData(IWineD3DBuffer *iface, static HRESULT STDMETHODCALLTYPE buffer_FreePrivateData(IWineD3DBuffer *iface, REFGUID guid) { - return resource_free_private_data((IWineD3DResource *)iface, guid); + return resource_free_private_data((IWineD3DResourceImpl *)iface, guid); } static DWORD STDMETHODCALLTYPE buffer_SetPriority(IWineD3DBuffer *iface, DWORD priority) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 94b414c..2449b79 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -222,8 +222,9 @@ static HRESULT WINAPI IWineD3DCubeTextureImpl_GetPrivateData(IWineD3DCubeTexture return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); } -static HRESULT WINAPI IWineD3DCubeTextureImpl_FreePrivateData(IWineD3DCubeTexture *iface, REFGUID refguid) { - return resource_free_private_data((IWineD3DResource *)iface, refguid); +static HRESULT WINAPI IWineD3DCubeTextureImpl_FreePrivateData(IWineD3DCubeTexture *iface, REFGUID refguid) +{ + return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } static DWORD WINAPI IWineD3DCubeTextureImpl_SetPriority(IWineD3DCubeTexture *iface, DWORD PriorityNew) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 7b8066e..76267d5 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -110,7 +110,7 @@ void resource_cleanup(struct IWineD3DResourceImpl *resource) LIST_FOR_EACH_SAFE(e1, e2, &resource->resource.privateData) { data = LIST_ENTRY(e1, struct private_data, entry); - hr = resource_free_private_data((IWineD3DResource *)resource, &data->tag); + hr = resource_free_private_data(resource, &data->tag); if (FAILED(hr)) ERR("Failed to free private data when destroying resource %p, hr = %#x.\n", resource, hr); } @@ -156,7 +156,7 @@ HRESULT resource_set_private_data(IWineD3DResource *iface, REFGUID refguid, TRACE("iface %p, riid %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(refguid), pData, SizeOfData, flags); - resource_free_private_data(iface, refguid); + resource_free_private_data(This, refguid); data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); if (!data) return E_OUTOFMEMORY; @@ -223,13 +223,13 @@ HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID refguid, void return WINED3D_OK; } -HRESULT resource_free_private_data(IWineD3DResource *iface, REFGUID refguid) +HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid) { - IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; struct private_data *data; - TRACE("(%p) : %s\n", This, debugstr_guid(refguid)); - data = resource_find_private_data(This, refguid); + TRACE("resource %p, guid %s.\n", resource, debugstr_guid(guid)); + + data = resource_find_private_data(resource, guid); if (!data) return WINED3DERR_NOTFOUND; if (data->flags & WINED3DSPD_IUNKNOWN) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index f328366..14268b8 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -121,8 +121,9 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPrivateData(IWineD3DSurface *iface, RE return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); } -HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, REFGUID refguid) { - return resource_free_private_data((IWineD3DResource *)iface, refguid); +HRESULT WINAPI IWineD3DBaseSurfaceImpl_FreePrivateData(IWineD3DSurface *iface, REFGUID refguid) +{ + return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD PriorityNew) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1722b3b..bb00fc4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -247,8 +247,9 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetPrivateData(IWineD3DTexture *iface, return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); } -static HRESULT WINAPI IWineD3DTextureImpl_FreePrivateData(IWineD3DTexture *iface, REFGUID refguid) { - return resource_free_private_data((IWineD3DResource *)iface, refguid); +static HRESULT WINAPI IWineD3DTextureImpl_FreePrivateData(IWineD3DTexture *iface, REFGUID refguid) +{ + return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } static DWORD WINAPI IWineD3DTextureImpl_SetPriority(IWineD3DTexture *iface, DWORD PriorityNew) { diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index dbc2116..4c55170 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -160,8 +160,9 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetPrivateData(IWineD3DVolume *iface, R return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); } -static HRESULT WINAPI IWineD3DVolumeImpl_FreePrivateData(IWineD3DVolume *iface, REFGUID refguid) { - return resource_free_private_data((IWineD3DResource *)iface, refguid); +static HRESULT WINAPI IWineD3DVolumeImpl_FreePrivateData(IWineD3DVolume *iface, REFGUID refguid) +{ + return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } static DWORD WINAPI IWineD3DVolumeImpl_SetPriority(IWineD3DVolume *iface, DWORD PriorityNew) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index a47801e..e3e16d3 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -167,8 +167,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetPrivateData(IWineD3DVolumeTex return resource_get_private_data((IWineD3DResource *)iface, refguid, pData, pSizeOfData); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_FreePrivateData(IWineD3DVolumeTexture *iface, REFGUID refguid) { - return resource_free_private_data((IWineD3DResource *)iface, refguid); +static HRESULT WINAPI IWineD3DVolumeTextureImpl_FreePrivateData(IWineD3DVolumeTexture *iface, REFGUID refguid) +{ + return resource_free_private_data((IWineD3DResourceImpl *)iface, refguid); } static DWORD WINAPI IWineD3DVolumeTextureImpl_SetPriority(IWineD3DVolumeTexture *iface, DWORD PriorityNew) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 41456f9..5a0d068 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1829,7 +1829,7 @@ typedef struct IWineD3DResourceImpl } IWineD3DResourceImpl; void resource_cleanup(struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; -HRESULT resource_free_private_data(IWineD3DResource *iface, REFGUID guid) DECLSPEC_HIDDEN; +HRESULT resource_free_private_data(struct IWineD3DResourceImpl *resource, REFGUID guid) DECLSPEC_HIDDEN; DWORD resource_get_priority(IWineD3DResource *iface) DECLSPEC_HIDDEN; HRESULT resource_get_private_data(IWineD3DResource *iface, REFGUID guid, void *data, DWORD *data_size) DECLSPEC_HIDDEN;

1 0