wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Stefan Dösinger : d3d8: Disallow z buffers smaller than the color buffer.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 733f81ef7428e7cb9fe76671f8a56278cdaee867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=733f81ef7428e7cb9fe76671f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 11 22:21:15 2011 +0100 d3d8: Disallow z buffers smaller than the color buffer. --- dlls/d3d8/device.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0a3c9c8..9383173 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1032,6 +1032,24 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(IDirect3DDevice8 *ifa wined3d_mutex_lock(); + if (pZSurface) + { + struct wined3d_resource_desc ds_desc, rt_desc; + struct wined3d_resource *wined3d_resource; + + wined3d_resource = IWineD3DSurface_GetResource(pZSurface->wineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &ds_desc); + wined3d_resource = IWineD3DSurface_GetResource(pSurface->wineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &rt_desc); + + if (ds_desc.width < rt_desc.width || ds_desc.height < rt_desc.height) + { + WARN("Depth stencil is smaller than the render target, returning D3DERR_INVALIDCALL\n"); + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + } + hr = IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice, &original_ds); if (hr == WINED3D_OK || hr == WINED3DERR_NOTFOUND) {

1 0

Dmitry Timoshkov : advapi32: Move the 'const' modifier in front of the storage specifier.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 494ceab83ab4bca01729d4a0af7302c11c1f9806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494ceab83ab4bca01729d4a0a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 14 18:31:40 2011 +0800 advapi32: Move the 'const' modifier in front of the storage specifier. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 130352e..74afc7b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -696,7 +696,7 @@ static void test_FileSecurity(void) DWORD sdSize; DWORD retSize; BYTE *sd; - SECURITY_INFORMATION const request = OWNER_SECURITY_INFORMATION + const SECURITY_INFORMATION request = OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION;

1 0

Dmitry Timoshkov : advapi32: Properly skip the tests that depend on English locale.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 99109567ad134e5aff36473661cf23091a7a36ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=99109567ad134e5aff3647366… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 14 17:35:04 2011 +0800 advapi32: Properly skip the tests that depend on English locale. --- dlls/advapi32/tests/security.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3dae81b..130352e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1917,7 +1917,7 @@ static void test_LookupAccountName(void) domain_size = domain_save; sid_size = sid_save; - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (GetSystemDefaultLangID() != LANG_ENGLISH) { skip("Non-english locale (test with hardcoded 'Everyone')\n"); } @@ -2055,7 +2055,7 @@ static void test_LookupAccountName(void) return; } - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (GetSystemDefaultLangID() != LANG_ENGLISH) { skip("Non-english locale (skipping well known name creation tests)\n"); return; @@ -2542,7 +2542,7 @@ static void test_SetEntriesInAclW(void) ok(NewAcl != NULL, "returned acl was NULL\n"); LocalFree(NewAcl); - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (GetSystemDefaultLangID() != LANG_ENGLISH) { skip("Non-english locale (test with hardcoded 'Everyone')\n"); } @@ -2673,7 +2673,7 @@ static void test_SetEntriesInAclA(void) ok(NewAcl != NULL, "returned acl was NULL\n"); LocalFree(NewAcl); - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (GetSystemDefaultLangID() != LANG_ENGLISH) { skip("Non-english locale (test with hardcoded 'Everyone')\n"); }

1 0

Michael Stefaniuc : mscoree: COM cleanup in metahost.c.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c3afbcfd60014f139d88801fbcbabc26b04647d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3afbcfd60014f139d88801fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 10:23:01 2011 +0100 mscoree: COM cleanup in metahost.c. --- dlls/mscoree/metahost.c | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index ca4795e..fb03fb1 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -752,15 +752,19 @@ end: struct InstalledRuntimeEnum { - const struct IEnumUnknownVtbl *Vtbl; + IEnumUnknown IEnumUnknown_iface; LONG ref; ULONG pos; }; const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl; -static HRESULT WINAPI InstalledRuntimeEnum_QueryInterface(IEnumUnknown* iface, - REFIID riid, +static inline struct InstalledRuntimeEnum *impl_from_IEnumUnknown(IEnumUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct InstalledRuntimeEnum, IEnumUnknown_iface); +} + +static HRESULT WINAPI InstalledRuntimeEnum_QueryInterface(IEnumUnknown* iface, REFIID riid, void **ppvObject) { TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); @@ -783,7 +787,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_QueryInterface(IEnumUnknown* iface, static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -793,7 +797,7 @@ static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -809,7 +813,7 @@ static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); int num_fetched = 0; HRESULT hr=S_OK; IUnknown *item; @@ -841,7 +845,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, static HRESULT WINAPI InstalledRuntimeEnum_Skip(IEnumUnknown *iface, ULONG celt) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); int num_fetched = 0; HRESULT hr=S_OK; @@ -866,7 +870,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Skip(IEnumUnknown *iface, ULONG celt) static HRESULT WINAPI InstalledRuntimeEnum_Reset(IEnumUnknown *iface) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); TRACE("(%p)\n", iface); @@ -877,7 +881,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Reset(IEnumUnknown *iface) static HRESULT WINAPI InstalledRuntimeEnum_Clone(IEnumUnknown *iface, IEnumUnknown **ppenum) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); struct InstalledRuntimeEnum *new_enum; TRACE("(%p)\n", iface); @@ -886,11 +890,11 @@ static HRESULT WINAPI InstalledRuntimeEnum_Clone(IEnumUnknown *iface, IEnumUnkno if (!new_enum) return E_OUTOFMEMORY; - new_enum->Vtbl = &InstalledRuntimeEnum_Vtbl; + new_enum->IEnumUnknown_iface.lpVtbl = &InstalledRuntimeEnum_Vtbl; new_enum->ref = 1; new_enum->pos = This->pos; - *ppenum = (IEnumUnknown*)new_enum; + *ppenum = &new_enum->IEnumUnknown_iface; return S_OK; } @@ -907,10 +911,10 @@ const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl = { struct CLRMetaHost { - const struct ICLRMetaHostVtbl *CLRMetaHost_vtbl; + ICLRMetaHost ICLRMetaHost_iface; }; -static const struct CLRMetaHost GlobalCLRMetaHost; +static struct CLRMetaHost GlobalCLRMetaHost; static HRESULT WINAPI CLRMetaHost_QueryInterface(ICLRMetaHost* iface, REFIID riid, @@ -1069,11 +1073,11 @@ static HRESULT WINAPI CLRMetaHost_EnumerateInstalledRuntimes(ICLRMetaHost* iface if (!new_enum) return E_OUTOFMEMORY; - new_enum->Vtbl = &InstalledRuntimeEnum_Vtbl; + new_enum->IEnumUnknown_iface.lpVtbl = &InstalledRuntimeEnum_Vtbl; new_enum->ref = 1; new_enum->pos = 0; - *ppEnumerator = (IEnumUnknown*)new_enum; + *ppEnumerator = &new_enum->IEnumUnknown_iface; return S_OK; } @@ -1123,13 +1127,13 @@ static const struct ICLRMetaHostVtbl CLRMetaHost_vtbl = CLRMetaHost_ExitProcess }; -static const struct CLRMetaHost GlobalCLRMetaHost = { - &CLRMetaHost_vtbl +static struct CLRMetaHost GlobalCLRMetaHost = { + { &CLRMetaHost_vtbl } }; extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) { - return ICLRMetaHost_QueryInterface((ICLRMetaHost*)&GlobalCLRMetaHost, riid, ppobj); + return ICLRMetaHost_QueryInterface(&GlobalCLRMetaHost.ICLRMetaHost_iface, riid, ppobj); } static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data)

1 0

Jörg Höhle : winmm: MCI does not support the 0xhexadecimal notation.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: d1a034627c3fac9db5e51ffadd1a9005a5c0e1e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a034627c3fac9db5e51ffad… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 23 10:07:42 2011 +0100 winmm: MCI does not support the 0xhexadecimal notation. --- dlls/winmm/mci.c | 2 +- dlls/winmm/tests/mci.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 0fcccec..822b1c0 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -978,7 +978,7 @@ static BOOL MCI_GetDWord(DWORD* data, LPWSTR* ptr) DWORD val; LPWSTR ret; - val = strtoulW(*ptr, &ret, 0); + val = strtoulW(*ptr, &ret, 10); switch (*ret) { case '\0': break; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index cb6df72..91a3e47 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -249,6 +249,9 @@ static void test_mciParser(HWND hwnd) err = mciSendString("status x 2 track 3", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_OUTOFRANGE,"status 2(position) track 3: %s\n", dbg_mcierr(err)); + err = mciSendString("status x 0x4", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_BAD_CONSTANT, "status 0x4: %s\n", dbg_mcierr(err)); + err = mciSendString("status x 4", buf, sizeof(buf), hwnd); ok(!err,"status 4(mode): %s\n", dbg_mcierr(err)); if(!err)ok(!strcmp(buf,"stopped"), "status 4(mode), got: %s\n", buf); @@ -874,6 +877,9 @@ static void test_playWAVE(HWND hwnd) ok(!err,"mci seek to 250 wait notify returned %s\n", dbg_mcierr(err)); test_notification(hwnd,"seek wait notify",MCI_NOTIFY_SUCCESSFUL); + err = mciSendString("seek mysound to 0xfa", NULL, 0, NULL); + ok(err==MCIERR_BAD_INTEGER,"mci seek to 0xfa returned %s\n", dbg_mcierr(err)); + err = mciSendString("status mysound position notify", buf, sizeof(buf), hwnd); ok(!err,"mci status position notify returned %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"250"), "mci status position: %s\n", buf);

1 0

Dmitry Timoshkov : gdi32: Remove a redundant check for Roman font presence.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: d9d52672374ff11d4866e07955ba1e2a32ae4cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d52672374ff11d4866e0795… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 14 13:05:09 2011 +0800 gdi32: Remove a redundant check for Roman font presence. Wine ships Tahoma and many other built-in fonts these days. --- dlls/gdi32/freetype.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 512e08b..4582216 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -471,8 +471,6 @@ struct font_mapping static struct list mappings_list = LIST_INIT( mappings_list ); -static BOOL have_installed_roman_font = FALSE; /* CreateFontInstance will fail if this is still FALSE */ - static CRITICAL_SECTION freetype_cs; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -1523,9 +1521,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ } } - if (!(face->fs.fsCsb[0] & FS_SYMBOL)) - have_installed_roman_font = TRUE; - AddFaceToFamily(face, family); } while(!FT_IS_SCALABLE(ft_face) && ++bitmap_num < ft_face->num_fixed_sizes); @@ -3530,12 +3525,6 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) LeaveCriticalSection( &freetype_cs ); return NULL; } - if(!have_installed_roman_font) - { - TRACE("No roman font installed\n"); - LeaveCriticalSection( &freetype_cs ); - return NULL; - } ret = alloc_font();

1 0

Juan Lang : wininet: Don' t adjust the use counts in RetrieveUrlCacheEntryFile until the function will succeed .
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 31abbd708286571f85371ecb2a63fa636df7e537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31abbd708286571f85371ecb2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 21:04:20 2011 -0800 wininet: Don't adjust the use counts in RetrieveUrlCacheEntryFile until the function will succeed. --- dlls/wininet/urlcache.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 0c88372..8ab2ee6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1996,11 +1996,6 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); - pUrlEntry->dwHitRate++; - pUrlEntry->dwUseCount++; - GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); - URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); - error = URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, pUrlEntry, FALSE); @@ -2012,6 +2007,11 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( } TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + pUrlEntry->dwHitRate++; + pUrlEntry->dwUseCount++; + URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); + URLCacheContainer_UnlockIndex(pContainer, pHeader); return TRUE; @@ -2093,11 +2093,6 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); - pUrlEntry->dwHitRate++; - pUrlEntry->dwUseCount++; - GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); - URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); - error = URLCache_CopyEntry( pContainer, pHeader, @@ -2113,6 +2108,11 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( } TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + pUrlEntry->dwHitRate++; + pUrlEntry->dwUseCount++; + URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); + URLCacheContainer_UnlockIndex(pContainer, pHeader); return TRUE;

1 0

Anders Jonsson : inetcpl.cpl: Update Swedish translation.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 51057e6033b443fb0a2edd2df8e0fb79ff900d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=51057e6033b443fb0a2edd2df… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Mar 12 14:46:25 2011 +0100 inetcpl.cpl: Update Swedish translation. --- dlls/inetcpl.cpl/cpl_Sv.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Sv.rc b/dlls/inetcpl.cpl/cpl_Sv.rc index cc75ce6..997fd31 100644 --- a/dlls/inetcpl.cpl/cpl_Sv.rc +++ b/dlls/inetcpl.cpl/cpl_Sv.rc @@ -37,13 +37,13 @@ BEGIN IDC_STATIC, 58, 10, 252, 10 EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Aktuell sida", IDC_HOME_CURRENT, 58, 36, 80, 14 - PUSHBUTTON "&Förvald sida", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "För&vald sida", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "&Blank sida", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " Bläddringshistorik ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Du kan ta bort cachade sidor, kakor och annan data.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "Ta bort &filer...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "&Inställningar...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END

1 0

Rico Schüller : include: Fix ID3DXBaseEffect interface .
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: b1c26a0e9573b819e83a7646e78361109a4406d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c26a0e9573b819e83a7646e… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Mar 13 22:46:05 2011 +0100 include: Fix ID3DXBaseEffect interface. --- include/d3dx9effect.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 79b635c..67d28b2 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -140,9 +140,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) STDMETHOD(GetString)(THIS_ D3DXHANDLE parameter, LPCSTR* string) PURE; STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; - STDMETHOD(SetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 pshader) PURE; STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9* pshader) PURE; - STDMETHOD(SetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 vshader) PURE; STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; };

1 0

Detlef Riekenberg : inetcpl: Update German translation.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 9328d28115c9e564f03410d055d7fbbb1feb9c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9328d28115c9e564f03410d05… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 13 22:01:45 2011 +0100 inetcpl: Update German translation. --- dlls/inetcpl.cpl/cpl_De.rc | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_De.rc b/dlls/inetcpl.cpl/cpl_De.rc index 3e1e5b6..0f75bee 100644 --- a/dlls/inetcpl.cpl/cpl_De.rc +++ b/dlls/inetcpl.cpl/cpl_De.rc @@ -39,14 +39,35 @@ BEGIN PUSHBUTTON "A&ktuelle Seite", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "&Standardseite", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "&Leere Seite", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " Browserverlauf ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Sie können temporäre Dateien, Cookies und andere Daten löschen.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "&Daten löschen...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "&Einstellungen...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Gespeicherte Browserdaten löchen" +BEGIN + + AUTOCHECKBOX "&Temporäre Inernetdateien\nZwischengespeicherte Kopien von Webseiten, Bildern und Zertifikaten.", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Cookies\nVon Webseiten auf ihrem Computer gespeicherte Dateien, die Benutzereinstellungen oder Anmeldeinformationen enthalten.", + IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Verlauf\nListe von Webseiten, die Sie aufgerufen haben.", + IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Formulardaten\nBenutzernamen und andere Informationen, die Sie in Formulare eingegeben haben.", + IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Kennwörter\nGespeicherte Kennwörter, die Sie in Formulare eingegeben haben.", + IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "&Abbrechen", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "&Löschen", IDOK, 120, 230, 60, 15, WS_GROUP + +END /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011