June 2012 - Wine-commits - list.winehq.org

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 468eec2a2c20566b738c1ef531bc1822307c6c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=468eec2a2c20566b738c1ef53… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 7 00:37:59 2012 +0900 po: Update Japanese translation. --- po/ja.po | 49 +++++++++++++++---------------------------------- 1 files changed, 15 insertions(+), 34 deletions(-) diff --git a/po/ja.po b/po/ja.po index 719203c..05d3b19 100644 --- a/po/ja.po +++ b/po/ja.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: 2012-05-09 23:00+0900\n" +"PO-Revision-Date: 2012-06-07 00:10+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -157,21 +157,10 @@ msgid "Cancel" msgstr "キャンセル" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko インストーラ" +msgstr "Wine Mono インストーラ" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -180,13 +169,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Gecko パッケージを見つけられません。このパッケージは HTML を組み込んだアプリ" -"ケーションが正しく動作するために必要です。 Wine で Gecko パッケージを自動的に" -"ダウンロードし、インストールできます。\n" +"Mono パッケージを見つけられません。このパッケージは .NET アプリケーションが正" +"しく動作するために必要です。 Wine で Mono パッケージを自動的にダウンロード" +"し、インストールできます。\n" "\n" "注意: 代わりにディストリビューションのパッケージを利用することをおすすめしま" -"す。詳しくは、<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq." -"org/Gecko</a> を参照ください。" +"す。詳しくは、<a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/" +"Mono</a> を参照ください。" #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -3427,43 +3416,35 @@ msgstr "高" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "ジョイスティック" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" -msgstr "無効(&D)" +msgstr "無効化(&D)" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "有効(&E)" +msgstr "有効化(&E)" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "切断" +msgstr "接続済み" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "無効(&D)" +msgstr "無効" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "ジョイスティックのテスト" #: joy.rc:53 msgid "Test Force Feedback" -msgstr "" +msgstr "フォースフィードバックのテスト" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "コントロールを作成" +msgstr "ゲームコントローラ" #: jscript.rc:25 msgid "Error converting object to primitive type"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 18187742fe390175f88f1e26b39ffe3d9a58b9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=18187742fe390175f88f1e26b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jun 6 21:20:19 2012 +0300 po: Update Finnish translation. --- po/fi.po | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/po/fi.po b/po/fi.po index f2a30cc..a1427eb 100644 --- a/po/fi.po +++ b/po/fi.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: 2012-03-04 21:45+0200\n" +"PO-Revision-Date: 2012-06-06 21:18+0300\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: none\n" "Language: Finnish\n" @@ -3419,43 +3419,35 @@ msgstr "Korkea" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "Joystickit" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" msgstr "&Poista käytöstä" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "&käytä" +msgstr "&Ota käyttöön" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "Yhteys katkaistu" +msgstr "Yhdistetty" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "&Poista käytöstä" +msgstr "Ei käytössä" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "Testaa joystickia" #: joy.rc:53 msgid "Test Force Feedback" -msgstr "" +msgstr "Testaa voimapalautetta" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Luo kontrolli" +msgstr "Peliohjaimet" #: jscript.rc:25 msgid "Error converting object to primitive type"

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 876f0f27bccba9514c9c78c7ce7779f52d8f02ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=876f0f27bccba9514c9c78c7c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jun 6 21:23:20 2012 +0300 po: Update Swedish translation. --- po/sv.po | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/po/sv.po b/po/sv.po index 8cc0265..6928ade 100644 --- a/po/sv.po +++ b/po/sv.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: 2012-03-06 21:30+0200\n" +"PO-Revision-Date: 2012-06-06 21:20+0300\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: none\n" "Language: Swedish\n" @@ -3414,43 +3414,35 @@ msgstr "Hög" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "Joysticks" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" msgstr "&Inaktivera" #: joy.rc:37 -#, fuzzy -#| msgid "&Table" msgid "&Enable" -msgstr "&Tabell" +msgstr "&Aktivera" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "Kopplat ifrån" +msgstr "Ansluten" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "&Inaktivera" +msgstr "Inaktiverad" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "Testa joysticken" #: joy.rc:53 msgid "Test Force Feedback" -msgstr "" +msgstr "Testa kraftåterkoppling" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Create Control" +msgstr "Spelkontroller" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -7118,7 +7110,7 @@ msgstr "Skapa ny" #: oledlg.rc:60 msgid "Create Control" -msgstr "Create Control" +msgstr "Skapa en kontroll" #: oledlg.rc:62 msgid "Create From File" @@ -13125,6 +13117,10 @@ msgid "" "button, then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" +"Om denna problem inte presenterar sig i Windows och ännu inte har " +"rapporterats, kan du spara detaljerna till ett fil med knappen \"Spara som\" " +"och <a href=\"http://wiki.winehq.org/Bugs\">skicka en bugrapport</a> med " +"filet som en bilaga." #: winedbg.rc:35 msgid "Wine program crash"

1 0

Jacek Caban : wininet: Properly set flags in InternetSetOption( INTERNET_OPTION_SECURITY_FLAGS).
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 8dbc39b4be70cf9c8f92a9ad511ff367bf916f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dbc39b4be70cf9c8f92a9ad5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 6 17:38:30 2012 +0200 wininet: Properly set flags in InternetSetOption(INTERNET_OPTION_SECURITY_FLAGS). --- dlls/wininet/http.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b123283..e263d8a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2197,10 +2197,11 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, if (!buffer || size != sizeof(DWORD)) return ERROR_INVALID_PARAMETER; flags = *(DWORD *)buffer; - TRACE("%08x\n", flags); - req->security_flags = flags; + TRACE("INTERNET_OPTION_SECURITY_FLAGS %08x\n", flags); + flags &= SECURITY_SET_MASK; + req->security_flags |= flags; if(req->netconn) - req->netconn->security_flags = flags; + req->netconn->security_flags |= flags; return ERROR_SUCCESS; } case INTERNET_OPTION_CONNECT_TIMEOUT:

1 0

André Hentschel : kernel32/tests: Add tests for LCMapStringEx.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 1f3eca666bfd2aedb2769c7f24fafb61a5b7f549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3eca666bfd2aedb2769c7f2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 4 22:53:55 2012 +0200 kernel32/tests: Add tests for LCMapStringEx. --- dlls/kernel32/tests/locale.c | 210 ++++++++++++++++++++++++++---------------- include/winnls.h | 14 +++ 2 files changed, 144 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f3eca666bfd2aedb2769…

1 0

Detlef Riekenberg : localui/tests: Do not fail when the spooler service was stopped.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 0b85a740bd72045de53d11da2b734220fb10e3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b85a740bd72045de53d11da2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 5 22:59:53 2012 +0200 localui/tests: Do not fail when the spooler service was stopped. --- dlls/localui/tests/localui.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index 59ac3b5..b3422aa 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -71,7 +71,11 @@ static PORT_INFO_2W * find_portinfo2(LPWSTR pPort) if (!pi_buffer) { res = EnumPortsW(NULL, 2, NULL, 0, &pi_needed, &pi_numports); - ok(!res, "EnumPorts failed: got %d\n", res); + if (!res && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { + win_skip("The Service 'Spooler' is required for many test\n"); + return NULL; + } + ok(!res, "EnumPorts succeeded: got %d\n", res); pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports); ok(res == 1, "EnumPorts failed: got %d\n", res); @@ -295,6 +299,12 @@ START_TEST(localui) /* find installed Ports */ + /* "FILE:" */ + file_present = find_portinfo2(portname_fileW); + + if (!pi_numports) /* Nothing to test without a port */ + return; + id = 0; /* "LPT1:" - "LPT9:" */ while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { @@ -317,9 +327,6 @@ START_TEST(localui) if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); } - /* "FILE:" */ - file_present = find_portinfo2(portname_fileW); - test_AddPortUI(); test_ConfigurePortUI();

1 0

Piotr Caban : msvcp90: Added partial basic_istream<char> implementation.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 6f8149e5e334fdbe9b331bfd908a7069b5d8fac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8149e5e334fdbe9b331bfd9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 6 14:50:59 2012 +0200 msvcp90: Added partial basic_istream<char> implementation. --- dlls/msvcp90/ios.c | 786 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 174 +++++----- 2 files changed, 871 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f8149e5e334fdbe9b331…

1 0

Jacek Caban : wininet: Added InternetGetSecurityInfoByURL* stubs.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 4c7e9aa92083504009b365fb39554c7bdcbe918f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7e9aa92083504009b365fb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 6 17:38:16 2012 +0200 wininet: Added InternetGetSecurityInfoByURL* stubs. --- dlls/wininet/internet.c | 19 +++++++++++++++++++ dlls/wininet/wininet.spec | 3 +++ include/winineti.h | 3 +++ 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7ca4b0b..118dcdd 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2702,6 +2702,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, SetLastError(ERROR_INTERNET_BAD_OPTION_LENGTH); ret = FALSE; } else + TRACE("INTERNET_OPTION_ERROR_MASK: %x\n", *(ULONG*)lpBuffer); lpwhh->ErrorMask = *(ULONG*)lpBuffer; } break; @@ -4413,6 +4414,24 @@ DWORD WINAPI PrivacyGetZonePreferenceW( DWORD zone, DWORD type, LPDWORD template return 0; } +/*********************************************************************** + * InternetGetSecurityInfoByURLA (WININET.@) + */ +BOOL WINAPI InternetGetSecurityInfoByURLA(LPSTR lpszURL, PCCERT_CHAIN_CONTEXT *ppCertChain, DWORD *pdwSecureFlags) +{ + FIXME("(%s %p %p)\n", debugstr_a(lpszURL), ppCertChain, pdwSecureFlags); + return FALSE; +} + +/*********************************************************************** + * InternetGetSecurityInfoByURLW (WININET.@) + */ +BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT *ppCertChain, DWORD *pdwSecureFlags) +{ + FIXME("(%s %p %p)\n", debugstr_w(lpszURL), ppCertChain, pdwSecureFlags); + return FALSE; +} + DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags, DWORD_PTR* lpdwConnection, DWORD dwReserved ) { diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 1e651b5..6fcb3fd 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -157,6 +157,9 @@ @ stdcall InternetGetLastResponseInfoW(ptr ptr ptr) @ stdcall InternetGetPerSiteCookieDecisionA(str ptr) @ stdcall InternetGetPerSiteCookieDecisionW(wstr ptr) +@ stdcall InternetGetSecurityInfoByURL(str ptr ptr) InternetGetSecurityInfoByURLA +@ stdcall InternetGetSecurityInfoByURLA(str ptr ptr) +@ stdcall InternetGetSecurityInfoByURLW(wstr ptr ptr) @ stdcall InternetGoOnline(str long long) InternetGoOnlineA @ stdcall InternetGoOnlineA(str long long) @ stdcall InternetGoOnlineW(wstr long long) diff --git a/include/winineti.h b/include/winineti.h index 8029155..5b6f15f 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -123,6 +123,9 @@ BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*); BOOL WINAPI SetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,DWORD); BOOL WINAPI SetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,DWORD); #define SetUrlCacheConfigInfo WINELIB_NAME_AW(SetUrlCacheConfigInfo) +BOOL WINAPI InternetGetSecurityInfoByURLA(LPSTR,PCCERT_CHAIN_CONTEXT*,DWORD*); +BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR,PCCERT_CHAIN_CONTEXT*,DWORD*); +#define InternetGetSecurityInfoByURL WINELIB_NAME_AW(InternetGetSecurityInfoByURL) #ifdef __cplusplus }

1 0

Christian Costa : d3drm: Pass texture of mesh builder to newly created mesh .
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 8080528fc4c545e2ab1d56b21cec6c90cae755f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8080528fc4c545e2ab1d56b21… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 5 22:45:18 2012 +0200 d3drm: Pass texture of mesh builder to newly created mesh. --- dlls/d3drm/meshbuilder.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 836412e..0f39b4a 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -77,6 +77,7 @@ typedef struct { Coords2d* pCoords2d; D3DCOLOR color; IDirect3DRMMaterial2* material; + IDirect3DRMTexture3* texture; } IDirect3DRMMeshBuilderImpl; char templates[] = { @@ -633,13 +634,20 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetColor(IDirect3DRMMeshBuilde } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTexture(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMTEXTURE pTexture) + LPDIRECT3DRMTEXTURE texture) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); + LPDIRECT3DRMTEXTURE3 texture3 = NULL; + HRESULT hr = D3DRM_OK; - FIXME("(%p)->(%p): stub\n", This, pTexture); + if (texture) + hr = IDirect3DRMTexture_QueryInterface(texture, &IID_IDirect3DRMTexture3, (LPVOID*)&texture3); + if (SUCCEEDED(hr)) + hr = IDirect3DRMMeshBuilder3_SetTexture(&This->IDirect3DRMMeshBuilder3_iface, texture3); + if (texture3) + IDirect3DRMTexture3_Release(texture3); - return E_NOTIMPL; + return hr; } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetMaterial(IDirect3DRMMeshBuilder2* iface, @@ -1732,9 +1740,15 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetTexture(IDirect3DRMMeshBuil { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%p): stub\n", This, texture); + TRACE("(%p)->(%p)\n", This, texture); - return E_NOTIMPL; + if (texture) + IDirect3DRMTexture3_AddRef(texture); + if (This->texture) + IDirect3DRMTexture3_Release(This->texture); + This->texture = texture; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetMaterial(IDirect3DRMMeshBuilder3* iface, @@ -2025,6 +2039,14 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil hr = IDirect3DRMMesh_SetGroupColor(*mesh, 0, This->color); if (SUCCEEDED(hr)) hr = IDirect3DRMMesh_SetGroupMaterial(*mesh, 0, (LPDIRECT3DRMMATERIAL)This->material); + if (SUCCEEDED(hr) && This->texture) + { + LPDIRECT3DRMTEXTURE texture; + + IDirect3DRMTexture3_QueryInterface(This->texture, &IID_IDirect3DRMTexture, (LPVOID*)&texture); + hr = IDirect3DRMMesh_SetGroupTexture(*mesh, 0, texture); + IDirect3DRMTexture_Release(texture); + } if (FAILED(hr)) IDirect3DRMMesh_Release(*mesh); }

1 0

Christian Costa : d3drm: Fix SetMaterial macros.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 1425c78c4cd894c23f6552bbd070745a6c0a9eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1425c78c4cd894c23f6552bbd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 5 22:45:36 2012 +0200 d3drm: Fix SetMaterial macros. --- include/d3drmobj.h | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index c5f69b3..33721f9 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2571,7 +2571,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder_SetColorRGB(p,a,b,c) (p)->lpVtbl->SetColorRGB(p,a,b,c) #define IDirect3DRMMeshBuilder_SetColor(p,a) (p)->lpVtbl->SetColor(p,a) #define IDirect3DRMMeshBuilder_SetTexture(p,a) (p)->lpVtbl->SetTexture(p,a) -#define IDirect3DRMMeshBuilder_SetMateria(p,a) (p)->lpVtbl->SetMateria(p,a) +#define IDirect3DRMMeshBuilder_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a) #define IDirect3DRMMeshBuilder_SetTextureTopology(p,a,b) (p)->lpVtbl->SetTextureTopology(p,a,b) #define IDirect3DRMMeshBuilder_SetQuality(p,a) (p)->lpVtbl->SetQuality(p,a) #define IDirect3DRMMeshBuilder_SetPerspective(p,a) (p)->lpVtbl->SetPerspective(p,a) @@ -2624,7 +2624,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder_SetColorRGB(p,a,b,c) (p)->SetColorRGB(a,b,c) #define IDirect3DRMMeshBuilder_SetColor(p,a) (p)->SetColor(a) #define IDirect3DRMMeshBuilder_SetTexture(p,a) (p)->SetTexture(a) -#define IDirect3DRMMeshBuilder_SetMateria(p,a) (p)->SetMateria(a) +#define IDirect3DRMMeshBuilder_SetMaterial(p,a) (p)->SetMaterial(a) #define IDirect3DRMMeshBuilder_SetTextureTopology(p,a,b) (p)->SetTextureTopology(a,b) #define IDirect3DRMMeshBuilder_SetQuality(p,a) (p)->SetQuality(a) #define IDirect3DRMMeshBuilder_SetPerspective(p,a) (p)->SetPerspective(a) @@ -2745,7 +2745,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) #define IDirect3DRMMeshBuilder2_SetColorRGB(p,a,b,c) (p)->lpVtbl->SetColorRGB(p,a,b,c) #define IDirect3DRMMeshBuilder2_SetColor(p,a) (p)->lpVtbl->SetColor(p,a) #define IDirect3DRMMeshBuilder2_SetTexture(p,a) (p)->lpVtbl->SetTexture(p,a) -#define IDirect3DRMMeshBuilder2_SetMateria(p,a) (p)->lpVtbl->SetMateria(p,a) +#define IDirect3DRMMeshBuilder2_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a) #define IDirect3DRMMeshBuilder2_SetTextureTopology(p,a,b) (p)->lpVtbl->SetTextureTopology(p,a,b) #define IDirect3DRMMeshBuilder2_SetQuality(p,a) (p)->lpVtbl->SetQuality(p,a) #define IDirect3DRMMeshBuilder2_SetPerspective(p,a) (p)->lpVtbl->SetPerspective(p,a) @@ -2801,7 +2801,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) #define IDirect3DRMMeshBuilder2_SetColorRGB(p,a,b,c) (p)->SetColorRGB(a,b,c) #define IDirect3DRMMeshBuilder2_SetColor(p,a) (p)->SetColor(a) #define IDirect3DRMMeshBuilder2_SetTexture(p,a) (p)->SetTexture(a) -#define IDirect3DRMMeshBuilder2_SetMateria(p,a) (p)->SetMateria(a) +#define IDirect3DRMMeshBuilder2_SetMaterial(p,a) (p)->SetMaterial(a) #define IDirect3DRMMeshBuilder2_SetTextureTopology(p,a,b) (p)->SetTextureTopology(a,b) #define IDirect3DRMMeshBuilder2_SetQuality(p,a) (p)->SetQuality(a) #define IDirect3DRMMeshBuilder2_SetPerspective(p,a) (p)->SetPerspective(a) @@ -2925,6 +2925,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_SetName(p,a) (p)->lpVtbl->SetName(p,a) #define IDirect3DRMMeshBuilder3_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) #define IDirect3DRMMeshBuilder3_GetClassName(p,a,b) (p)->lpVtbl->GetClassName(p,a,b) + /*** IDirect3DRMMeshBuilder3 methods ***/ #define IDirect3DRMMeshBuilder3_Load(p,a,b,c,d,e) (p)->lpVtbl->Load(p,a,b,c,d,e) #define IDirect3DRMMeshBuilder3_Save(p,a,b,c) (p)->lpVtbl->Save(p,a,b,c) @@ -2943,7 +2944,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_SetColorRGB(p,a,b,c) (p)->lpVtbl->SetColorRGB(p,a,b,c) #define IDirect3DRMMeshBuilder3_SetColor(p,a) (p)->lpVtbl->SetColor(p,a) #define IDirect3DRMMeshBuilder3_SetTexture(p,a) (p)->lpVtbl->SetTexture(p,a) -#define IDirect3DRMMeshBuilder3_SetMateria(p,a) (p)->lpVtbl->SetMateria(p,a) +#define IDirect3DRMMeshBuilder3_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a) #define IDirect3DRMMeshBuilder3_SetTextureTopology(p,a,b) (p)->lpVtbl->SetTextureTopology(p,a,b) #define IDirect3DRMMeshBuilder3_SetQuality(p,a) (p)->lpVtbl->SetQuality(p,a) #define IDirect3DRMMeshBuilder3_SetPerspective(p,a) (p)->lpVtbl->SetPerspective(p,a) @@ -2957,9 +2958,11 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_GetTextureCoordinates(p,a,b,c) (p)->lpVtbl->GetTextureCoordinates(p,a,b,c) #define IDirect3DRMMeshBuilder3_AddVertex(p,a,b,c) (p)->lpVtbl->AddVertex(p,a,b,c) #define IDirect3DRMMeshBuilder3_AddNormal(p,a,b,c) (p)->lpVtbl->AddNormal(p,a,b,c) + #define IDirect3DRMMeshBuilder3_CreateFace(p,a) (p)->lpVtbl->CreateFace(p,a) #define IDirect3DRMMeshBuilder3_GetQuality(p) (p)->lpVtbl->GetQuality(p) #define IDirect3DRMMeshBuilder3_GetPerspective(p) (p)->lpVtbl->GetPerspective(p) + #define IDirect3DRMMeshBuilder3_GetFaceCount(p) (p)->lpVtbl->GetFaceCount(p) #define IDirect3DRMMeshBuilder3_GetVertexCount(p) (p)->lpVtbl->GetVertexCount(p) #define IDirect3DRMMeshBuilder3_GetVertexColor(p,a) (p)->lpVtbl->GetVertexColor(p,a) @@ -3016,7 +3019,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_SetColorRGB(p,a,b,c) (p)->SetColorRGB(a,b,c) #define IDirect3DRMMeshBuilder3_SetColor(p,a) (p)->SetColor(a) #define IDirect3DRMMeshBuilder3_SetTexture(p,a) (p)->SetTexture(a) -#define IDirect3DRMMeshBuilder3_SetMateria(p,a) (p)->SetMateria(a) +#define IDirect3DRMMeshBuilder3_SetMaterial(p,a) (p)->SetMaterial(a) #define IDirect3DRMMeshBuilder3_SetTextureTopology(p,a,b) (p)->SetTextureTopology(a,b) #define IDirect3DRMMeshBuilder3_SetQuality(p,a) (p)->SetQuality(a) #define IDirect3DRMMeshBuilder3_SetPerspective(p,a) (p)->SetPerspective(a) @@ -3031,6 +3034,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_AddVertex(p,a,b,c) (p)->AddVertex(a,b,c) #define IDirect3DRMMeshBuilder3_AddNormal(p,a,b,c) (p)->AddNormal(a,b,c) #define IDirect3DRMMeshBuilder3_CreateFace(p,a) (p)->CreateFace(a) + #define IDirect3DRMMeshBuilder3_GetQuality(p) (p)->GetQuality() #define IDirect3DRMMeshBuilder3_GetPerspective(p) (p)->GetPerspective() #define IDirect3DRMMeshBuilder3_GetFaceCount(p) (p)->GetFaceCount()

1 0