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

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 0c69e7f2148f7d37dd2b5e8c6ab00e8ddba9a4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c69e7f2148f7d37dd2b5e8c6… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu May 5 15:09:21 2011 +0200 po: Update Polish translation. --- po/pl.po | 21 ++++++--------------- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/po/pl.po b/po/pl.po index 1320f6b..538c449 100644 --- a/po/pl.po +++ b/po/pl.po @@ -356,9 +356,8 @@ msgstr "" "Wprowadź inną wielkość marginesu." #: comdlg32.rc:74 -#, fuzzy msgid "The 'Number of copies' field cannot be empty." -msgstr "Wartość „liczba kopii” nie może być pusta." +msgstr "Pole „liczba kopii” nie może być puste." #: comdlg32.rc:76 msgid "" @@ -686,9 +685,8 @@ msgid "Unstructured Address" msgstr "Adres bez struktury" #: crypt32.rc:51 -#, fuzzy msgid "S/MIME Capabilities" -msgstr "Możliwości edytora SMIME" +msgstr "Możliwości edytora S/MIME" #: crypt32.rc:52 msgid "Prefer Signed Data" @@ -9228,9 +9226,8 @@ msgid "&Export Registry File..." msgstr "&Eksportuj plik rejestru..." #: regedit.rc:42 regedit.rc:87 -#, fuzzy msgid "&Modify..." -msgstr "&Modyfikuj" +msgstr "&Modyfikuj..." #: regedit.rc:46 regedit.rc:97 msgid "&Key" @@ -9289,9 +9286,8 @@ msgid "&About Registry Editor" msgstr "Edytor rejestru - i&nformacje" #: regedit.rc:88 -#, fuzzy msgid "Modify Binary Data..." -msgstr "Modyfikuj dane binarne" +msgstr "Modyfikuj dane binarne..." #: regedit.rc:109 msgid "&Export..." @@ -10223,9 +10219,8 @@ msgid "Regular Metafile Viewer" msgstr "Podgląd plików WMF (Regular Metafile)" #: winecfg.rc:32 -#, fuzzy msgid "Configure..." -msgstr "Konfiguruj" +msgstr "Konfiguruj..." #: winecfg.rc:39 msgid "Libraries" @@ -10365,9 +10360,8 @@ msgid "None" msgstr "Brak" #: winecfg.rc:81 -#, fuzzy msgid "Autodetect..." -msgstr "Automatyczne wykrywanie" +msgstr "Automatyczne wykrywanie..." #: winecfg.rc:82 msgid "Local hard disk" @@ -10773,7 +10767,6 @@ msgid "Re&name..." msgstr "Zmień &nazwę..." #: winefile.rc:31 -#, fuzzy msgid "Propert&ies\tAlt+Enter" msgstr "&Właściwości...\tAlt+Enter" @@ -10794,7 +10787,6 @@ msgid "&Disk" msgstr "&Dysk" #: winefile.rc:45 -#, fuzzy msgid "Connect &Network Drive..." msgstr "Podłącz &dysk sieciowy..." @@ -10827,7 +10819,6 @@ msgid "Sort by &Date" msgstr "Sortuj według &dat" #: winefile.rc:60 -#, fuzzy msgid "Filter by&..." msgstr "Filtruj widok &..."

1 0

Marcus Meissner : winedump: flags is a DWORD not a WORD (Coverity).
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: a09829bd4deceaabb58cb147c8e2bc0c2f7d1930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a09829bd4deceaabb58cb147c… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 5 15:17:51 2011 +0200 winedump: flags is a DWORD not a WORD (Coverity). --- tools/winedump/pe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 1f8ee38..9690c33 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -937,7 +937,7 @@ static void dump_dir_debug(void) printf("\n"); } -static inline void print_clrflags(const char *title, WORD value) +static inline void print_clrflags(const char *title, DWORD value) { printf(" %-34s 0x%X\n", title, value); #define X(f,s) if (value & f) printf(" %s\n", s)

1 0

Marcus Meissner : wined3d: Fixed a operator precedence issue (Coverity).
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 49828372c1ada5de816d051ef37b6257dbf83348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49828372c1ada5de816d051ef… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 5 15:47:54 2011 +0200 wined3d: Fixed a operator precedence issue (Coverity). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5638e99..e7f3e89 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2049,7 +2049,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, /* Clear the screen */ IWineD3DDevice_Clear((IWineD3DDevice *) This, 0, NULL, - WINED3DCLEAR_TARGET | pPresentationParameters->EnableAutoDepthStencil ? WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL : 0, + WINED3DCLEAR_TARGET | (pPresentationParameters->EnableAutoDepthStencil ? WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL : 0), 0x00, 1.0f, 0); This->d3d_initialized = TRUE;

1 0

Marcus Meissner : user32: Use left shift instead of right shift (Coverity).
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: cfe4c7fde96f169c299838fef5192e89a036781f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe4c7fde96f169c299838fef… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 5 15:54:33 2011 +0200 user32: Use left shift instead of right shift (Coverity). --- dlls/user32/tests/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 736c99d..1dd5884 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -209,7 +209,7 @@ static BOOL CreateWindows (HINSTANCE hinst) /* Form the lParam of a WM_KEYDOWN message */ static DWORD KeyDownData (int repeat, int scancode, int extended, int wasdown) { - return ((repeat & 0x0000FFFF) | ((scancode & 0x00FF) >> 16) | + return ((repeat & 0x0000FFFF) | ((scancode & 0x00FF) << 16) | (extended ? 0x01000000 : 0) | (wasdown ? 0x40000000 : 0)); }

1 0

Detlef Riekenberg : urlmon/tests: Add tests for IInternetZoneManager_SetZoneAttributes.
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 7aaf9f0324fd5d117ca4638c995c9293c874f905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aaf9f0324fd5d117ca4638c9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed May 4 19:42:21 2011 +0200 urlmon/tests: Add tests for IInternetZoneManager_SetZoneAttributes. --- dlls/urlmon/tests/sec_mgr.c | 149 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 148 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 1b5ed62..c64dfe4 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1,6 +1,6 @@ /* * Copyright 2005-2006 Jacek Caban for CodeWeavers - * Copyright 2009-2010 Detlef Riekenberg + * Copyright 2009-2011 Detlef Riekenberg * Copyright 2011 Thomas Mullaly for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -105,6 +105,7 @@ static const WCHAR security_expectedW[] = {'w','i','n','e','t','e','s','t',':',' static const WCHAR winetest_to_httpW[] = {'w','i','n','e','t','e','s','t',':','h',0}; static const char *szZoneMapDomainsKey = "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap\\Domains"; +static const char *szInternetSettingsKey = "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; static const BYTE secid1[] = {'f','i','l','e',':',0,0,0,0}; static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','z','o','n','e','3', @@ -176,6 +177,74 @@ static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { return ret; } + +/* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ +static LONG myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + CHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = hKey; + + if(lpszSubKey) + { + ret = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + if (ret) return ret; + } + + /* Get highest length for keys, values */ + ret = RegQueryInfoKeyA(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)/sizeof(CHAR)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(CHAR)))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExA(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = myRegDeleteTreeA(hSubKey, lpszName); + if (ret) goto cleanup; + } + + if (lpszSubKey) + ret = RegDeleteKeyA(hKey, lpszSubKey); + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueA(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueA(hKey, lpszName); + if (ret) goto cleanup; + } + +cleanup: + /* Free buffer if allocated */ + if (lpszName != szNameBuf) + heap_free(lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + return ret; +} + + static void test_SecurityManager(void) { int i; @@ -1011,6 +1080,83 @@ static void test_GetZoneAttributes(void) ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); } +static void test_SetZoneAttributes(void) +{ + IInternetZoneManager *zonemgr = NULL; + CHAR buffer [sizeof(ZONEATTRIBUTES) + 16]; + ZONEATTRIBUTES* pZA = (ZONEATTRIBUTES*) buffer; + CHAR regpath[MAX_PATH]; + HKEY hkey; + HRESULT hr; + DWORD res; + + trace("testing SetZoneAttributes...\n"); + hr = pCoInternetCreateZoneManager(NULL, &zonemgr, 0); + ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr); + if (FAILED(hr)) + return; + + memset(buffer, -1, sizeof(buffer)); + hr = IInternetZoneManager_GetZoneAttributes(zonemgr, URLZONE_LOCAL_MACHINE, pZA); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + sprintf(regpath, "%s\\Zones\\%d", szInternetSettingsKey, URLZONE_CUSTOM); + res = RegCreateKeyA(HKEY_CURRENT_USER, regpath, &hkey); + RegCloseKey(hkey); + + ok(res == ERROR_SUCCESS, "got %d (expected ERROR_SUCCESS)\n", res); + if (res != ERROR_SUCCESS) + goto cleanup; + + pZA->cbSize = sizeof(ZONEATTRIBUTES); + hr = IInternetZoneManager_SetZoneAttributes(zonemgr, URLZONE_CUSTOM, NULL); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + /* normal use */ + hr = IInternetZoneManager_SetZoneAttributes(zonemgr, URLZONE_CUSTOM, pZA); + if (hr == E_FAIL) { + win_skip("SetZoneAttributes not supported: IE too old\n"); + goto cleanup; + } + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* native urlmon ignores cbSize */ + pZA->cbSize = sizeof(ZONEATTRIBUTES) + sizeof(DWORD); + hr = IInternetZoneManager_SetZoneAttributes(zonemgr, URLZONE_CUSTOM, pZA); + ok(hr == S_OK, "got 0x%x for sizeof(ZONEATTRIBUTES) + sizeof(DWORD) (expected S_OK)\n", hr); + + pZA->cbSize = sizeof(ZONEATTRIBUTES) - sizeof(DWORD); + hr = IInternetZoneManager_SetZoneAttributes(zonemgr, URLZONE_CUSTOM, pZA); + ok(hr == S_OK, "got 0x%x for sizeof(ZONEATTRIBUTES) - sizeof(DWORD) (expected S_OK)\n", hr); + + pZA->cbSize = 0; + hr = IInternetZoneManager_SetZoneAttributes(zonemgr, URLZONE_CUSTOM, pZA); + ok(hr == S_OK, "got 0x%x for size 0 (expected S_OK)\n", hr); + + /* The key for the zone must be present, when calling SetZoneAttributes */ + myRegDeleteTreeA(HKEY_CURRENT_USER, regpath); + /* E_FAIL is returned from IE6 here, which is resonable. + All newer IE return S_OK without saving the zone attributes to the registry. + This is a Windows bug, but we have to accept that as standard */ + hr = IInternetZoneManager_SetZoneAttributes(zonemgr, URLZONE_CUSTOM, pZA); + ok((hr == S_OK) || broken(hr == E_FAIL), "got 0x%x (expected S_OK)\n", hr); + + /* SetZoneAttributes did not create the directory */ + res = RegOpenKeyA(HKEY_CURRENT_USER, regpath, &hkey); + ok((res == ERROR_FILE_NOT_FOUND) && (hkey == NULL), + "got %u with %p (expected ERROR_FILE_NOT_FOUND with NULL)\n", res, hkey); + + if (hkey) RegCloseKey(hkey); + +cleanup: + /* delete zone settings in the registry */ + myRegDeleteTreeA(HKEY_CURRENT_USER, regpath); + + hr = IInternetZoneManager_Release(zonemgr); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); +} + + static void test_InternetSecurityMarshalling(void) { IInternetSecurityManager *secmgr = NULL; @@ -1509,6 +1655,7 @@ START_TEST(sec_mgr) test_GetZoneActionPolicy(); test_GetZoneAt(); test_GetZoneAttributes(); + test_SetZoneAttributes(); test_InternetSecurityMarshalling(); unregister_protocols();

1 0

Detlef Riekenberg : urlmon: Implement IInternetZoneManager_SetZoneAttributes.
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 16e27e4d6ca037dc0795ee2cef86da1c88d25bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e27e4d6ca037dc0795ee2ce… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed May 4 19:42:20 2011 +0200 urlmon: Implement IInternetZoneManager_SetZoneAttributes. --- dlls/urlmon/sec_mgr.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 8246727..7b4bb35 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1220,8 +1220,42 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneAttributes(IInternetZoneManagerEx2* ifa DWORD dwZone, ZONEATTRIBUTES* pZoneAttributes) { - FIXME("(%p)->(%08x %p) stub\n", iface, dwZone, pZoneAttributes); - return E_NOTIMPL; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); + HRESULT hr; + HKEY hcu; + + TRACE("(%p)->(%d %p)\n", This, dwZone, pZoneAttributes); + + if (!pZoneAttributes) + return E_INVALIDARG; + + hr = open_zone_key(HKEY_CURRENT_USER, dwZone, &hcu); + if (FAILED(hr)) + return S_OK; /* IE6 returned E_FAIL here */ + + /* cbSize is ignored */ + RegSetValueExW(hcu, displaynameW, 0, REG_SZ, (LPBYTE) pZoneAttributes->szDisplayName, + (lstrlenW(pZoneAttributes->szDisplayName)+1)* sizeof(WCHAR)); + + RegSetValueExW(hcu, descriptionW, 0, REG_SZ, (LPBYTE) pZoneAttributes->szDescription, + (lstrlenW(pZoneAttributes->szDescription)+1)* sizeof(WCHAR)); + + RegSetValueExW(hcu, iconW, 0, REG_SZ, (LPBYTE) pZoneAttributes->szIconPath, + (lstrlenW(pZoneAttributes->szIconPath)+1)* sizeof(WCHAR)); + + RegSetValueExW(hcu, minlevelW, 0, REG_DWORD, + (const BYTE*) &pZoneAttributes->dwTemplateMinLevel, sizeof(DWORD)); + + RegSetValueExW(hcu, currentlevelW, 0, REG_DWORD, + (const BYTE*) &pZoneAttributes->dwTemplateCurrentLevel, sizeof(DWORD)); + + RegSetValueExW(hcu, recommendedlevelW, 0, REG_DWORD, + (const BYTE*) &pZoneAttributes->dwTemplateRecommended, sizeof(DWORD)); + + RegSetValueExW(hcu, flagsW, 0, REG_DWORD, (const BYTE*) &pZoneAttributes->dwFlags, sizeof(DWORD)); + RegCloseKey(hcu); + return S_OK; + } /********************************************************************

1 0

Marcus Meissner : user32: DrawText gets a 32bit flag, not a 16bit flag.
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 0ba1bfb0624d5e95f15499d6cfc9af1910c7c5be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ba1bfb0624d5e95f15499d6c… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu May 5 16:12:49 2011 +0200 user32: DrawText gets a 32bit flag, not a 16bit flag. --- dlls/user32/static.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 99ce319..f4b5880 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -575,7 +575,7 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) RECT rc; HBRUSH hBrush; HFONT hFont, hOldFont = NULL; - WORD wFormat; + UINT format; INT len, buf_size; WCHAR *text; @@ -584,23 +584,23 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) switch (style & SS_TYPEMASK) { case SS_LEFT: - wFormat = DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK; + format = DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK; break; case SS_CENTER: - wFormat = DT_CENTER | DT_EXPANDTABS | DT_WORDBREAK; + format = DT_CENTER | DT_EXPANDTABS | DT_WORDBREAK; break; case SS_RIGHT: - wFormat = DT_RIGHT | DT_EXPANDTABS | DT_WORDBREAK; + format = DT_RIGHT | DT_EXPANDTABS | DT_WORDBREAK; break; case SS_SIMPLE: - wFormat = DT_LEFT | DT_SINGLELINE; + format = DT_LEFT | DT_SINGLELINE; break; case SS_LEFTNOWORDWRAP: - wFormat = DT_LEFT | DT_EXPANDTABS; + format = DT_LEFT | DT_EXPANDTABS; break; default: @@ -608,23 +608,23 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) } if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_RIGHT) - wFormat = DT_RIGHT | (wFormat & ~(DT_LEFT | DT_CENTER)); + format = DT_RIGHT | (format & ~(DT_LEFT | DT_CENTER)); if (style & SS_NOPREFIX) - wFormat |= DT_NOPREFIX; + format |= DT_NOPREFIX; if ((style & SS_TYPEMASK) != SS_SIMPLE) { if (style & SS_CENTERIMAGE) - wFormat |= DT_SINGLELINE | DT_VCENTER; + format |= DT_SINGLELINE | DT_VCENTER; if (style & SS_EDITCONTROL) - wFormat |= DT_EDITCONTROL; + format |= DT_EDITCONTROL; if (style & SS_ENDELLIPSIS) - wFormat |= DT_SINGLELINE | DT_END_ELLIPSIS; + format |= DT_SINGLELINE | DT_END_ELLIPSIS; if (style & SS_PATHELLIPSIS) - wFormat |= DT_SINGLELINE | DT_PATH_ELLIPSIS; + format |= DT_SINGLELINE | DT_PATH_ELLIPSIS; if (style & SS_WORDELLIPSIS) - wFormat |= DT_SINGLELINE | DT_WORD_ELLIPSIS; + format |= DT_SINGLELINE | DT_WORD_ELLIPSIS; } if ((hFont = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ))) @@ -663,7 +663,7 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) } else { - DrawTextW( hdc, text, -1, &rc, wFormat ); + DrawTextW( hdc, text, -1, &rc, format ); } no_TextOut:

1 0

Matteo Bruni : d3dcompiler: Fix error messages generation.
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: bfda69d0e980435186cf7602ec33c046506f28c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfda69d0e980435186cf7602e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 20 18:21:27 2011 +0200 d3dcompiler: Fix error messages generation. --- dlls/d3dcompiler_43/compiler.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index d925f95..0969ae8 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -390,7 +390,7 @@ cleanup: return hr; } -static HRESULT assemble_shader(const char *preproc_shader, const char *preproc_messages, +static HRESULT assemble_shader(const char *preproc_shader, ID3DBlob **shader_blob, ID3DBlob **error_messages) { struct bwriter_shader *shader; @@ -403,26 +403,19 @@ static HRESULT assemble_shader(const char *preproc_shader, const char *preproc_m shader = SlAssembleShader(preproc_shader, &messages); - if (messages || preproc_messages) + if (messages) { - if (preproc_messages) - { - TRACE("Preprocessor messages:\n"); - TRACE("%s", preproc_messages); - } - if (messages) - { - TRACE("Assembler messages:\n"); - TRACE("%s", messages); - } + TRACE("Assembler messages:\n"); + TRACE("%s", messages); TRACE("Shader source:\n"); TRACE("%s\n", debugstr_a(preproc_shader)); if (error_messages) { - size = (messages ? strlen(messages) : 0) + - (preproc_messages ? strlen(preproc_messages) : 0) + 1; + const char *preproc_messages = *error_messages ? ID3D10Blob_GetBufferPointer(*error_messages) : NULL; + + size = strlen(messages) + (preproc_messages ? strlen(preproc_messages) : 0) + 1; hr = D3DCreateBlob(size, &buffer); if (FAILED(hr)) { @@ -436,9 +429,9 @@ static HRESULT assemble_shader(const char *preproc_shader, const char *preproc_m CopyMemory(pos, preproc_messages, strlen(preproc_messages) + 1); pos += strlen(preproc_messages); } - if (messages) - CopyMemory(pos, messages, strlen(messages) + 1); + CopyMemory(pos, messages, strlen(messages) + 1); + if (*error_messages) ID3D10Blob_Release(*error_messages); *error_messages = buffer; } HeapFree(GetProcessHeap(), 0, messages); @@ -492,7 +485,7 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena hr = preprocess_shader(data, datasize, defines, include, error_messages); if (SUCCEEDED(hr)) - hr = assemble_shader(wpp_output, wpp_messages, shader, error_messages); + hr = assemble_shader(wpp_output, shader, error_messages); HeapFree(GetProcessHeap(), 0, wpp_output); LeaveCriticalSection(&wpp_mutex);

1 0

Matteo Bruni : wined3d: Fix pow handling with special values in ARB backend .
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 4f96f4f46724c85b7e3b7c6092d03916df720a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f96f4f46724c85b7e3b7c609… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed May 4 19:08:39 2011 +0200 wined3d: Fix pow handling with special values in ARB backend. --- dlls/wined3d/arb_program_shader.c | 24 +++++++++++++++++++++--- dlls/wined3d/shader.c | 1 + dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 53c187a..7f86ba5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -340,6 +340,7 @@ static BOOL need_helper_const(const struct arb_vshader_private *shader_data, if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ if (!use_nv_clip(gl_info)) return TRUE; /* Init the clip texcoord */ if (reg_maps->usesnrm) return TRUE; /* 0.0 */ + if (reg_maps->usespow) return TRUE; /* EPS, 0.0 and 1.0 */ return FALSE; } @@ -2773,6 +2774,8 @@ static void shader_hw_pow(const struct wined3d_shader_instruction *ins) char src0[50], src1[50], dst[50]; struct wined3d_shader_src_param src0_copy = ins->src[0]; BOOL need_abs = FALSE; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; + const char *one = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ONE); /* POW operates on the absolute value of the input */ src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); @@ -2782,13 +2785,28 @@ static void shader_hw_pow(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[1], 1, src1); if (need_abs) - { shader_addline(buffer, "ABS TA.x, %s;\n", src0); - shader_addline(buffer, "POW%s %s, TA.x, %s;\n", shader_arb_get_modifier(ins), dst, src1); + else + shader_addline(buffer, "MOV TA.x, %s;\n", src0); + + if (priv->target_version >= NV2) + { + shader_addline(buffer, "MOVC TA.y, %s;\n", src1); + shader_addline(buffer, "POW%s %s, TA.x, TA.y;\n", shader_arb_get_modifier(ins), dst); + shader_addline(buffer, "MOV %s (EQ.y), %s;\n", dst, one); } else { - shader_addline(buffer, "POW%s %s, %s, %s;\n", shader_arb_get_modifier(ins), dst, src0, src1); + const char *zero = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ZERO); + const char *flt_eps = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_EPS); + + shader_addline(buffer, "ABS TA.y, %s;\n", src1); + shader_addline(buffer, "SGE TA.y, -TA.y, %s;\n", zero); + /* Possibly add flt_eps to avoid getting float special values */ + shader_addline(buffer, "MAD TA.z, TA.y, %s, %s;\n", flt_eps, src1); + shader_addline(buffer, "POW%s TA.x, TA.x, TA.z;\n", shader_arb_get_modifier(ins)); + shader_addline(buffer, "MAD TA.x, -TA.x, TA.y, TA.x;\n"); + shader_addline(buffer, "MAD %s, TA.y, %s, TA.x;\n", dst, one); } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6c8a224..1fd6529 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -788,6 +788,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else if (ins.handler_idx == WINED3DSIH_MOVA) reg_maps->usesmova = 1; else if (ins.handler_idx == WINED3DSIH_IFC) reg_maps->usesifc = 1; else if (ins.handler_idx == WINED3DSIH_CALL) reg_maps->usescall = 1; + else if (ins.handler_idx == WINED3DSIH_POW) reg_maps->usespow = 1; limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8606004..199d7ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -558,7 +558,8 @@ struct wined3d_shader_reg_maps WORD usestexldl : 1; WORD usesifc : 1; WORD usescall : 1; - WORD padding : 4; + WORD usespow : 1; + WORD padding : 3; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth;

1 0

Matteo Bruni : d3dcompiler: Improve some parameter names and fix code style .
by Alexandre Julliard May 5, 2011

May 5, 2011

Module: wine Branch: master Commit: 1d160beda04946df465e9e51b6838f8d684f01e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d160beda04946df465e9e51b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 12 23:06:44 2011 +0100 d3dcompiler: Improve some parameter names and fix code style. --- dlls/d3dcompiler_43/compiler.c | 45 +++++++++++++++++++-------------------- 1 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 8527870..d925f95 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -390,8 +390,8 @@ cleanup: return hr; } -static HRESULT assemble_shader(const char *preprocShader, const char *preprocMessages, - LPD3DBLOB* ppShader, LPD3DBLOB* ppErrorMsgs) +static HRESULT assemble_shader(const char *preproc_shader, const char *preproc_messages, + ID3DBlob **shader_blob, ID3DBlob **error_messages) { struct bwriter_shader *shader; char *messages = NULL; @@ -401,51 +401,50 @@ static HRESULT assemble_shader(const char *preprocShader, const char *preprocMes int size; char *pos; - shader = SlAssembleShader(preprocShader, &messages); + shader = SlAssembleShader(preproc_shader, &messages); - if(messages || preprocMessages) + if (messages || preproc_messages) { - if(preprocMessages) + if (preproc_messages) { TRACE("Preprocessor messages:\n"); - TRACE("%s", preprocMessages); + TRACE("%s", preproc_messages); } - if(messages) + if (messages) { TRACE("Assembler messages:\n"); TRACE("%s", messages); } TRACE("Shader source:\n"); - TRACE("%s\n", debugstr_a(preprocShader)); + TRACE("%s\n", debugstr_a(preproc_shader)); - if(ppErrorMsgs) + if (error_messages) { size = (messages ? strlen(messages) : 0) + - (preprocMessages ? strlen(preprocMessages) : 0) + 1; + (preproc_messages ? strlen(preproc_messages) : 0) + 1; hr = D3DCreateBlob(size, &buffer); - if(FAILED(hr)) + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, messages); - if(shader) SlDeleteShader(shader); + if (shader) SlDeleteShader(shader); return hr; } pos = ID3D10Blob_GetBufferPointer(buffer); - if(preprocMessages) + if (preproc_messages) { - CopyMemory(pos, preprocMessages, strlen(preprocMessages) + 1); - pos += strlen(preprocMessages); + CopyMemory(pos, preproc_messages, strlen(preproc_messages) + 1); + pos += strlen(preproc_messages); } - if(messages) + if (messages) CopyMemory(pos, messages, strlen(messages) + 1); - *ppErrorMsgs = buffer; + *error_messages = buffer; } - HeapFree(GetProcessHeap(), 0, messages); } - if(shader == NULL) + if (shader == NULL) { ERR("Asm reading failed\n"); return D3DXERR_INVALIDDATA; @@ -453,23 +452,23 @@ static HRESULT assemble_shader(const char *preprocShader, const char *preprocMes hr = SlWriteBytecode(shader, 9, &res); SlDeleteShader(shader); - if(FAILED(hr)) + if (FAILED(hr)) { ERR("SlWriteBytecode failed with 0x%08x\n", hr); return D3DXERR_INVALIDDATA; } - if(ppShader) + if (shader_blob) { size = HeapSize(GetProcessHeap(), 0, res); hr = D3DCreateBlob(size, &buffer); - if(FAILED(hr)) + if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, res); return hr; } CopyMemory(ID3D10Blob_GetBufferPointer(buffer), res, size); - *ppShader = buffer; + *shader_blob = buffer; } HeapFree(GetProcessHeap(), 0, res);

1 0