August 2014 - Wine-Commits - list.winehq.org

Matteo Bruni : d3dx9: Account for include paths mixing '/' and '\'.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: ec364eaa4f70e35466d0f4eb85a28eca08b04c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec364eaa4f70e35466d0f4eb8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 25 20:36:51 2014 +0200 d3dx9: Account for include paths mixing '/' and '\'. Include pathnames are passed unchanged to ID3DInclude objects so e.g. if a file is included as "path/file.h" the full pathname will have mixed slashes. --- dlls/d3dx9_36/shader.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index b36e7bb..5ea3d13 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -242,7 +242,7 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T const char *filename, const void *parent_data, const void **data, UINT *bytes) { const char *p, *parent_name = ""; - char *pathname = NULL; + char *pathname = NULL, *ptr; char **buffer = NULL; HANDLE file; UINT size; @@ -259,14 +259,23 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T TRACE("Looking up for include file %s, parent %s\n", debugstr_a(filename), debugstr_a(parent_name)); - if ((p = strrchr(parent_name, '\\')) || (p = strrchr(parent_name, '/'))) p++; - else p = parent_name; + if ((p = strrchr(parent_name, '\\'))) + ++p; + else + p = parent_name; pathname = HeapAlloc(GetProcessHeap(), 0, (p - parent_name) + strlen(filename) + 1); if(!pathname) return HRESULT_FROM_WIN32(GetLastError()); memcpy(pathname, parent_name, p - parent_name); strcpy(pathname + (p - parent_name), filename); + ptr = pathname + (p - parent_name); + while (*ptr) + { + if (*ptr == '/') + *ptr = '\\'; + ++ptr; + } file = CreateFileA(pathname, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); if(file == INVALID_HANDLE_VALUE)

1 0

Gerald Pfeifer : winedbg: Avoid a compiler warning about " use of uninitialized" in in types_extract_as_longlong.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: ab8e9d23a08b5bf69d88fa48d9e62d96dffe38ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8e9d23a08b5bf69d88fa48d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 24 00:40:56 2014 +0200 winedbg: Avoid a compiler warning about "use of uninitialized" in in types_extract_as_longlong. --- programs/winedbg/types.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 03c69ab..de790c7 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -123,7 +123,7 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, default: WINE_FIXME("Unsupported tag %u\n", tag); RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); - break; + rtn = 0; } return rtn;

1 0

Gerald Pfeifer : gdiplus: Remove three unused constants.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 42afdebc430a1ffe28888ff5dd75179955086a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42afdebc430a1ffe28888ff5d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 23 23:05:47 2014 +0200 gdiplus: Remove three unused constants. --- dlls/gdiplus/tests/font.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b826ba6..932b5ed 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -32,11 +32,8 @@ static const WCHAR nonexistent[] = {'T','h','i','s','F','o','n','t','s','h','o','u','l','d','N','o','t','E','x','i','s','t','\0'}; static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; -static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; -static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; -static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; static void set_rect_empty(RectF *rc) {

1 0

David Hedberg : comdlg32: Implement IFileDialogCustomize::StartVisualGroup () and ::EndVisualGroup().
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: aac6255d46ce99922779a2ba3467f3a3188d3ac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac6255d46ce99922779a2ba3… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Aug 24 02:39:04 2014 +0200 comdlg32: Implement IFileDialogCustomize::StartVisualGroup() and ::EndVisualGroup(). --- dlls/comdlg32/itemdlg.c | 191 +++++++++++++++++++++++++++++++++--------- dlls/comdlg32/tests/itemdlg.c | 140 +++++++++++++++++++++++++++++-- 2 files changed, 282 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aac6255d46ce99922779a…

1 0

Felix Janda : server: Include <sys/types.h> for mode_t.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: f5320ad4a8b89d70ee4756ac7d05cf23026c7f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5320ad4a8b89d70ee4756ac7… Author: Felix Janda <felix.janda(a)posteo.de> Date: Sat Aug 23 17:01:29 2014 +0200 server: Include <sys/types.h> for mode_t. --- server/file.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/file.h b/server/file.h index 493d30b..ed6096f 100644 --- a/server/file.h +++ b/server/file.h @@ -21,6 +21,8 @@ #ifndef __WINE_SERVER_FILE_H #define __WINE_SERVER_FILE_H +#include <sys/types.h> + #include "object.h" struct fd;

1 0

Jacek Caban : restartmanager.h: Added some missing declarations.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 4f3b0c126deb3b89554885e6e68d386ff6459427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3b0c126deb3b89554885e6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 25 13:59:24 2014 +0200 restartmanager.h: Added some missing declarations. --- include/restartmanager.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/restartmanager.h b/include/restartmanager.h index c2250bb..27c1a92 100644 --- a/include/restartmanager.h +++ b/include/restartmanager.h @@ -23,8 +23,12 @@ extern "C" { #endif +#define RM_SESSION_KEY_LEN sizeof(GUID) +#define CCH_RM_SESSION_KEY RM_SESSION_KEY_LEN*2 #define CCH_RM_MAX_APP_NAME 255 #define CH_RM_MAX_SVC_NAME 63 +#define RM_INVALID_TS_SESSION -1 +#define RM_INVALID_PROCESS -1 typedef enum { RmUnknownApp = 0, @@ -36,6 +40,15 @@ typedef enum { RmCritical = 1000 } RM_APP_TYPE; +typedef enum _RM_REBOOT_REASON { + RmRebootReasonNone = 0x0000, + RmRebootReasonPermissionDenied = 0x0001, + RmRebootReasonSessionMismatch = 0x0002, + RmRebootReasonCriticalProcess = 0x0004, + RmRebootReasonCriticalService = 0x0008, + RmRebootReasonDetectedSelf = 0x0010 +} RM_REBOOT_REASON; + typedef struct { DWORD dwProcessId; FILETIME ProcessStartTime;

1 0

Francois Gouget : dwrite: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 4c7826066ed629b10c329a635ca5db5f4998ba58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7826066ed629b10c329a635… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Aug 23 12:47:42 2014 +0200 dwrite: Remove WINAPI on static functions where not needed. --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0683dd5..277046e 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -215,7 +215,7 @@ static inline struct dwrite_fontcollection *impl_from_IDWriteFontCollection(IDWr return CONTAINING_RECORD(iface, struct dwrite_fontcollection, IDWriteFontCollection_iface); } -static HRESULT WINAPI _dwritefontfile_GetFontFileStream(IDWriteFontFile *iface, IDWriteFontFileStream **stream) +static HRESULT _dwritefontfile_GetFontFileStream(IDWriteFontFile *iface, IDWriteFontFileStream **stream) { HRESULT hr; struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface);

1 0

Matteo Bruni : d3dx9/tests: Add a test for an include path containing '/'.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: bc8d913199e870c6de2bdbc43f74b2806a508b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8d913199e870c6de2bdbc43… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 25 20:36:52 2014 +0200 d3dx9/tests: Add a test for an include path containing '/'. --- dlls/d3dx9_36/tests/asm.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 5bda4d0..3ee501e 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -86,6 +86,13 @@ static HRESULT WINAPI testD3DXInclude_open(ID3DXInclude *iface, D3DXINCLUDE_TYPE /* Also check for the correct parent_data content */ ok(parent_data != NULL && !strncmp(include2, parent_data, strlen(include2)), "wrong parent_data value\n"); } + else if (!strcmp(filename, "include/incl3.vsh")) + { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); + memcpy(buffer, include, sizeof(include)); + *bytes = sizeof(include); + ok(!parent_data, "wrong parent_data value\n"); + } else { ok(0, "Unexpected #include for file %s.\n", filename); @@ -221,6 +228,20 @@ static void assembleshader_test(void) } if(shader) ID3DXBuffer_Release(shader); + /* #include with a path. */ + shader = NULL; + messages = NULL; + hr = D3DXAssembleShader(testshader3, strlen(testshader3), NULL, &include.ID3DXInclude_iface, + D3DXSHADER_SKIPVALIDATION, &shader, &messages); + ok(hr == D3D_OK, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); + if (messages) + { + trace("Path search D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + if (shader) + ID3DXBuffer_Release(shader); + shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader) - 1); if(SUCCEEDED(shader_vsh_res)) { create_file("incl.vsh", testincl, sizeof(testincl) - 1);

1 0

Matteo Bruni : d3dx9: Properly evaluate fallbacks for luminance texture formats in D3DXCheckTextureRequirements.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: 770eaec561c8920b64c07b5152611c55a7038eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770eaec561c8920b64c07b515… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Aug 25 20:36:50 2014 +0200 d3dx9: Properly evaluate fallbacks for luminance texture formats in D3DXCheckTextureRequirements. --- dlls/d3dx9_36/tests/texture.c | 22 ++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 29 +++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 6322c70..61132bb 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -340,6 +340,28 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(format == expected, "Returned format %u, expected %u\n", format, expected); + if(SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, D3DFMT_L8))) + expected = D3DFMT_L8; + else + expected = D3DFMT_X8R8G8B8; + + format = D3DFMT_L8; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_RENDERTARGET, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == expected, "Returned format %u, expected %u\n", format, expected); + + if(SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, + mode.Format, D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, D3DFMT_L16))) + expected = D3DFMT_L16; + else + expected = D3DFMT_A16B16G16R16; + + format = D3DFMT_L16; + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DUSAGE_RENDERTARGET, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == expected, "Returned format %u, expected %u\n", format, expected); + /* Block-based texture formats and size < block size. */ if (has_2d_dxt5) { diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 32415a2..47c3c1d 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -184,6 +184,27 @@ HRESULT WINAPI D3DXFilterTexture(IDirect3DBaseTexture9 *texture, } } +static D3DFORMAT get_luminance_replacement_format(D3DFORMAT format) +{ + static const struct + { + D3DFORMAT luminance_format; + D3DFORMAT replacement_format; + } luminance_replacements[] = + { + {D3DFMT_L8, D3DFMT_X8R8G8B8}, + {D3DFMT_A8L8, D3DFMT_A8R8G8B8}, + {D3DFMT_A4L4, D3DFMT_A4R4G4B4}, + {D3DFMT_L16, D3DFMT_A16B16G16R16} + }; + unsigned int i; + + for (i = 0; i < sizeof(luminance_replacements) / sizeof(luminance_replacements[0]); ++i) + if (format == luminance_replacements[i].luminance_format) + return luminance_replacements[i].replacement_format; + return format; +} + HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool) { @@ -255,16 +276,16 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN FIXME("Pixel format %x not handled\n", usedformat); goto cleanup; } + fmt = get_format_info(get_luminance_replacement_format(usedformat)); allow_24bits = fmt->bytes_per_pixel == 3; - channels = (fmt->bits[0] ? 1 : 0) + (fmt->bits[1] ? 1 : 0) - + (fmt->bits[2] ? 1 : 0) + (fmt->bits[3] ? 1 : 0); + channels = !!fmt->bits[0] + !!fmt->bits[1] + !!fmt->bits[2] + !!fmt->bits[3]; usedformat = D3DFMT_UNKNOWN; while ((curfmt = get_format_info_idx(i))) { - unsigned int curchannels = (curfmt->bits[0] ? 1 : 0) + (curfmt->bits[1] ? 1 : 0) - + (curfmt->bits[2] ? 1 : 0) + (curfmt->bits[3] ? 1 : 0); + unsigned int curchannels = !!curfmt->bits[0] + !!curfmt->bits[1] + + !!curfmt->bits[2] + !!curfmt->bits[3]; int score; i++;

1 0

Gerald Pfeifer : crypt32: Remove elementStatus29, simpleStatus29, andnoMatchingNameBrokenStatus.
by Alexandre Julliard Aug. 25, 2014

Aug. 25, 2014

Module: wine Branch: master Commit: fdfd6b6342fb0f3d2cc29fe9f30e8e73d4c73ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdfd6b6342fb0f3d2cc29fe9f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Aug 23 19:14:55 2014 +0200 crypt32: Remove elementStatus29, simpleStatus29, andnoMatchingNameBrokenStatus. --- dlls/crypt32/tests/chain.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index bf02ca0..36fc16a 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3347,14 +3347,6 @@ static CONST_DATA_BLOB chain29[] = { { sizeof(chain0_0), chain0_0 }, { sizeof(chain29_1), chain29_1 }, }; -static const CERT_TRUST_STATUS elementStatus29[] = { - { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, -}; -static const SimpleChainStatusCheck simpleStatus29[] = { - { sizeof(elementStatus29) / sizeof(elementStatus29[0]), elementStatus29 }, -}; static CONST_DATA_BLOB chain30[] = { { sizeof(chain0_0), chain0_0 }, { sizeof(chain30_1), chain30_1 }, @@ -4228,10 +4220,6 @@ static const ChainPolicyCheck googlePolicyCheckWithMatchingName = { { 0, 0, -1, -1, NULL}, &expiredStatus, 0 }; -/* Windows NT 4 has a different error code when the name doesn't match. */ -static const CERT_CHAIN_POLICY_STATUS noMatchingNameBrokenStatus = - { 0, CERT_E_ROLE, 0, 0, NULL }; - /* Win98 does not trust the root of the OpenSSL chain or the Stanford chain */ static const CERT_CHAIN_POLICY_STATUS untrustedRootStatus = { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL };

1 0