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

Christian Costa : d3dxof: Fix string handling in binary mode + tests.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 71986eb109bb3ff45d374d15174afbe442830873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71986eb109bb3ff45d374d151… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 11 22:08:59 2013 +0200 d3dxof: Fix string handling in binary mode + tests. --- dlls/d3dxof/parsing.c | 5 ----- dlls/d3dxof/tests/d3dxof.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 69fb992..fc7250c 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -811,7 +811,6 @@ static WORD parse_TOKEN(parse_buffer * buf) case TOKEN_STRING: { DWORD count; - WORD tmp_token; char *string = (char*)buf->value; if (!read_bytes(buf, &count, 4)) @@ -819,10 +818,6 @@ static WORD parse_TOKEN(parse_buffer * buf) if (!read_bytes(buf, string, count)) return TOKEN_ERROR; string[count] = 0; - if (!read_bytes(buf, &tmp_token, 2)) - return TOKEN_ERROR; - if ((tmp_token != TOKEN_COMMA) && (tmp_token != TOKEN_SEMICOLON)) - ERR("No comma or semicolon (got %d)\n", tmp_token); TRACE("string = %s\n", string); token = TOKEN_LPSTR; diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 3a92ce9..ede23f8 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -30,6 +30,7 @@ #define I4(x) x,0,0,0 #define TOKEN_NAME I2(1) +#define TOKEN_STRING I2(2) #define TOKEN_INTEGER I2(3) #define TOKEN_INTEGER_LIST I2(6) #define TOKEN_OBRACE I2(10) @@ -328,6 +329,13 @@ static char object_syntax_string_with_separator[] = "\"foo;bar\";\n" "}\n"; +static char object_syntax_string_bin[] = { +'x','o','f',' ','0','3','0','2','b','i','n',' ','0','0','6','4', +TOKEN_NAME, /* size */ I4(8), /* name */ 'F','i','l','e','n','a','m','e', TOKEN_OBRACE, +TOKEN_STRING, /* size */ I4(6), /* string */ 'f','o','o','b','a','r', TOKEN_SEMICOLON, +TOKEN_CBRACE +}; + static char templates_complex_object[] = "xof 0302txt 0064\n" "template Vector\n" @@ -850,6 +858,21 @@ static void test_syntax(void) IDirectXFileData_Release(lpdxfd); IDirectXFileEnumObject_Release(lpdxfeo); + /* Test string in binary mode */ + dxflm.lpMemory = &object_syntax_string_bin; + dxflm.dSize = sizeof(object_syntax_string_bin); + hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); + ok(hr == DXFILE_OK, "IDirectXFile_CreateEnumObject: %x\n", hr); + hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); + ok(hr == DXFILE_OK, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr); + hr = IDirectXFileData_GetData(lpdxfd, NULL, &size, (void**)&string); + ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); + ok(size == sizeof(char*), "Got wrong data size %d\n", size); + ok(!strcmp(*string, "foobar"), "Got string %s, expected foobar\n", *string); + if (hr == DXFILE_OK) + IDirectXFileData_Release(lpdxfd); + IDirectXFileEnumObject_Release(lpdxfeo); + IDirectXFile_Release(lpDirectXFile); }

1 0

Christian Costa : d3dxof/tests: Add test for case sensitive 'indexColor' type.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 66414c46c956f6597186fc318ae3eda3e2514565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66414c46c956f6597186fc318… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 11 22:09:07 2013 +0200 d3dxof/tests: Add test for case sensitive 'indexColor' type. --- dlls/d3dx9_36/tests/xfile.c | 35 ++++++++++++++++++++++++++++++++ dlls/d3dxof/tests/d3dxof.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 4ac521b..c47cffb 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -62,6 +62,24 @@ static char object_noname[] = "1; 2; 3;\n" "}\n"; +static char template_using_index_color_lower[] = +"xof 0302txt 0064\n" +"template MeshVertexColors\n" +"{\n" +"<1630B821-7842-11cf-8F52-0040333594A3>\n" +"DWORD nVertexColors;\n" +"array indexColor vertexColors[nVertexColors];\n" +"}\n"; + +static char template_using_index_color_upper[] = +"xof 0302txt 0064\n" +"template MeshVertexColors\n" +"{\n" +"<1630B821-7842-11cf-8F52-0040333594A3>\n" +"DWORD nVertexColors;\n" +"array IndexColor vertexColors[nVertexColors];\n" +"}\n"; + static void test_templates(void) { ID3DXFile *d3dxfile; @@ -207,7 +225,23 @@ static void test_getname(void) data_object->lpVtbl->Release(data_object); enum_object->lpVtbl->Release(enum_object); d3dxfile->lpVtbl->Release(d3dxfile); +} +static void test_type_index_color(void) +{ + ID3DXFile *d3dxfile; + HRESULT ret; + + ret = D3DXFileCreate(&d3dxfile); + ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); + + /* Test that 'indexColor' can be used (same as IndexedColor in standard templates) and is case sensitive */ + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, template_using_index_color_lower, sizeof(template_using_index_color_lower) - 1); + todo_wine ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, template_using_index_color_upper, sizeof(template_using_index_color_upper) - 1); + ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x instead of %#x\n", ret, D3DXFERR_PARSEERROR); + + d3dxfile->lpVtbl->Release(d3dxfile); } static inline void debugstr_guid(char* buf, const GUID *id) @@ -361,5 +395,6 @@ START_TEST(xfile) test_templates(); test_lock_unlock(); test_getname(); + test_type_index_color(); test_dump(); } diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index ede23f8..d0f110d 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -376,6 +376,24 @@ static char object_complex[] = "3;;;, 3;;;, 1;;;, 2;;;,\n" "}\n"; +static char template_using_index_color_lower[] = +"xof 0302txt 0064\n" +"template MeshVertexColors\n" +"{\n" +"<1630B821-7842-11cf-8F52-0040333594A3>\n" +"DWORD nVertexColors;\n" +"array indexColor vertexColors[nVertexColors];\n" +"}\n"; + +static char template_using_index_color_upper[] = +"xof 0302txt 0064\n" +"template MeshVertexColors\n" +"{\n" +"<1630B821-7842-11cf-8F52-0040333594A3>\n" +"DWORD nVertexColors;\n" +"array IndexColor vertexColors[nVertexColors];\n" +"}\n"; + static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -1064,6 +1082,34 @@ static void test_standard_templates(void) IDirectXFile_Release(dxfile); } +static void test_type_index_color(void) +{ + HRESULT ret; + IDirectXFile *dxfile = NULL; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + ret = pDirectXFileCreate(&dxfile); + ok(ret == DXFILE_OK, "DirectXFileCreate failed with %#x\n", ret); + if (!dxfile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + /* Test that 'indexColor' can be used (same as IndexedColor in standard templates) and is case sensitive */ + ret = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_lower, sizeof(template_using_index_color_lower) - 1); + todo_wine ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); + ret = IDirectXFile_RegisterTemplates(dxfile, template_using_index_color_upper, sizeof(template_using_index_color_upper) - 1); + ok(ret == DXFILEERR_PARSEERROR, "IDirectXFileImpl_RegisterTemplates returned %#x instead of %#x\n", ret, DXFILEERR_PARSEERROR); + + IDirectXFile_Release(dxfile); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -1250,6 +1296,7 @@ START_TEST(d3dxof) test_syntax_semicolon_comma(); test_complex_object(); test_standard_templates(); + test_type_index_color(); test_dump(); FreeLibrary(hd3dxof);

1 0

Aric Stewart : ole32: Not all uses of StorageImpl_ReadBigBlock fail if no bytes are read.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: b69d67f146ee46604669348d17d52877b6052772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69d67f146ee46604669348d1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 10 14:24:13 2013 -0500 ole32: Not all uses of StorageImpl_ReadBigBlock fail if no bytes are read. --- dlls/ole32/storage32.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 425fd12..5009127 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -105,7 +105,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct(StorageBaseImpl* paren static void StorageImpl_Destroy(StorageBaseImpl* iface); static void StorageImpl_Invalidate(StorageBaseImpl* iface); static HRESULT StorageImpl_Flush(StorageBaseImpl* iface); -static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer); +static HRESULT StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer, ULONG *read ); static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, const void* buffer); static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, ULONG nextBlock); static HRESULT StorageImpl_LoadFileHeader(StorageImpl* This); @@ -3080,12 +3080,12 @@ static ULONG StorageImpl_GetNextFreeBigBlock( { ULONG depotBlockIndexPos; BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; - BOOL success; ULONG depotBlockOffset; ULONG blocksPerDepot = This->bigBlockSize / sizeof(ULONG); ULONG nextBlockIndex = BLOCK_SPECIAL; int depotIndex = 0; ULONG freeBlock = BLOCK_UNUSED; + ULONG read; ULARGE_INTEGER neededSize; STATSTG statstg; @@ -3175,9 +3175,9 @@ static ULONG StorageImpl_GetNextFreeBigBlock( } } - success = StorageImpl_ReadBigBlock(This, depotBlockIndexPos, depotBuffer); + StorageImpl_ReadBigBlock(This, depotBlockIndexPos, depotBuffer, &read); - if (success) + if (read) { while ( ( (depotBlockOffset/sizeof(ULONG) ) < blocksPerDepot) && ( nextBlockIndex != BLOCK_UNUSED)) @@ -3257,7 +3257,7 @@ static ULONG Storage32Impl_GetExtDepotBlock(StorageImpl* This, ULONG depotIndex) { extBlockIndex = This->extBigBlockDepotLocations[extBlockCount]; - StorageImpl_ReadBigBlock(This, extBlockIndex, depotBuffer); + StorageImpl_ReadBigBlock(This, extBlockIndex, depotBuffer, NULL); num_blocks = This->bigBlockSize / 4; @@ -3419,7 +3419,7 @@ static HRESULT StorageImpl_GetNextBlockInChain( ULONG depotBlockCount = offsetInDepot / This->bigBlockSize; ULONG depotBlockOffset = offsetInDepot % This->bigBlockSize; BYTE depotBuffer[MAX_BIG_BLOCK_SIZE]; - BOOL success; + ULONG read; ULONG depotBlockIndexPos; int index, num_blocks; @@ -3451,9 +3451,9 @@ static HRESULT StorageImpl_GetNextBlockInChain( depotBlockIndexPos = Storage32Impl_GetExtDepotBlock(This, depotBlockCount); } - success = StorageImpl_ReadBigBlock(This, depotBlockIndexPos, depotBuffer); + StorageImpl_ReadBigBlock(This, depotBlockIndexPos, depotBuffer, &read); - if (!success) + if (!read) return STG_E_READFAULT; num_blocks = This->bigBlockSize / 4; @@ -4035,26 +4035,30 @@ HRESULT StorageImpl_WriteDirEntry( return StorageImpl_WriteRawDirEntry(This, index, currentEntry); } -static BOOL StorageImpl_ReadBigBlock( +static HRESULT StorageImpl_ReadBigBlock( StorageImpl* This, ULONG blockIndex, - void* buffer) + void* buffer, + ULONG* out_read) { ULARGE_INTEGER ulOffset; DWORD read=0; + HRESULT hr; ulOffset.u.HighPart = 0; ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); - StorageImpl_ReadAt(This, ulOffset, buffer, This->bigBlockSize, &read); + hr = StorageImpl_ReadAt(This, ulOffset, buffer, This->bigBlockSize, &read); - if (read && read < This->bigBlockSize) + if (SUCCEEDED(hr) && read < This->bigBlockSize) { /* File ends during this block; fill the rest with 0's. */ memset((LPBYTE)buffer+read, 0, This->bigBlockSize-read); } - return (read != 0); + if (out_read) *out_read = read; + + return hr; } static BOOL StorageImpl_ReadDWordFromBigBlock( @@ -6222,7 +6226,7 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, { if (!cachedBlock->read) { - if (!StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data)) + if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, NULL))) return STG_E_READFAULT; cachedBlock->read = 1; @@ -6306,7 +6310,7 @@ HRESULT BlockChainStream_WriteAt(BlockChainStream* This, { if (!cachedBlock->read && bytesToWrite != This->parentStorage->bigBlockSize) { - if (!StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data)) + if (FAILED(StorageImpl_ReadBigBlock(This->parentStorage, cachedBlock->sector, cachedBlock->data, NULL))) return STG_E_READFAULT; }

1 0

Marcus Meissner : winhttp: Initialize schemes (Coverity).
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 85f3fe735dd31cf032cf82b851132ca82f3e38ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=85f3fe735dd31cf032cf82b85… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jun 12 08:02:51 2013 +0200 winhttp: Initialize schemes (Coverity). --- dlls/winhttp/request.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 436a02f..3b91c75 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1270,8 +1270,10 @@ static BOOL query_auth_schemes( request_t *request, DWORD level, LPDWORD support return FALSE; } scheme = auth_scheme_from_header( buffer ); - if (first && index == 1) *first = scheme; - *supported |= scheme; + if (first && index == 1) + *first = *supported = scheme; + else + *supported |= scheme; heap_free( buffer ); ret = TRUE;

1 0

Hans Leidekker : winhttp/tests: Test query schemes.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: 50febc48880895a839e12a4440aee1d5b048fd71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50febc48880895a839e12a444… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 12 08:02:52 2013 +0200 winhttp/tests: Test query schemes. --- dlls/winhttp/tests/winhttp.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1aff505..2f1df0f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1881,7 +1881,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) { HINTERNET ses, con, req; char buffer[0x100]; - DWORD count, status, size; + DWORD count, status, size, supported, first, target; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -1904,6 +1904,13 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); + supported = first = target = 0xffff; + ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); + ok(!ret, "unexpected success\n"); + ok(supported == 0xffff, "got %x\n", supported); + ok(first == 0xffff, "got %x\n", first); + ok(target == 0xffff, "got %x\n", target); + count = 0; memset(buffer, 0, sizeof(buffer)); ret = WinHttpReadData(req, buffer, sizeof buffer, &count); @@ -1922,7 +1929,7 @@ static void test_basic_authentication(int port) static const WCHAR userW[] = {'u','s','e','r',0}; static const WCHAR passW[] = {'p','w','d',0}; HINTERNET ses, con, req; - DWORD status, size, error; + DWORD status, size, error, supported, first, target; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -1934,6 +1941,13 @@ static void test_basic_authentication(int port) req = WinHttpOpenRequest(con, NULL, authW, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + supported = first = target = 0xffff; + ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); + ok(!ret, "unexpected success\n"); + ok(supported == 0xffff, "got %x\n", supported); + ok(first == 0xffff, "got %x\n", first); + ok(target == 0xffff, "got %x\n", target); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError());

1 0

Alexandre Julliard : wine.inf: Explicitly register the 32-bit stdole2. tlb under SysWOW64.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: dbecee55ce8bdebab20611a49a163882c5f0b82b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbecee55ce8bdebab20611a49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 16:01:38 2013 +0200 wine.inf: Explicitly register the 32-bit stdole2.tlb under SysWOW64. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 45fca8f..22c9df0 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2478,6 +2478,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,mui, 11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe +10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- 12,,mountmgr.sys,-

1 0

Hans Leidekker : tapi32: Properly implement lineGetCountryW.
by Alexandre Julliard 12 Jun '13

12 Jun '13

Module: wine Branch: master Commit: f8c7cd945f4080c70db773c26de22ea284e16d92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c7cd945f4080c70db773c26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 12 16:07:37 2013 +0200 tapi32: Properly implement lineGetCountryW. --- dlls/tapi32/line.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 135 insertions(+), 16 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 264e07b..2a13fad 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -31,6 +31,7 @@ #include "objbase.h" #include "tapi.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(tapi); @@ -313,18 +314,8 @@ DWORD WINAPI lineGetConfRelatedCalls(HCALL hCall, LPLINECALLLIST lpCallList) return 0; } -typedef struct tagTAPI_CountryInfo -{ - DWORD dwCountryID; - DWORD dwCountryCode; - LPSTR lpCountryName; - LPSTR lpSameAreaRule; - LPSTR lpLongDistanceRule; - LPSTR lpInternationalRule; -} TAPI_CountryInfo; - /*********************************************************************** - * lineGetCountry (TAPI32.@) + * lineGetCountryA (TAPI32.@) */ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTRYLIST lpLineCountryList) { @@ -484,11 +475,139 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR } /*********************************************************************** - * lineGetCountry (TAPI32.@) - */ -DWORD WINAPI lineGetCountryW(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTRYLIST lpLineCountryList) -{ - return lineGetCountryA(dwCountryID, dwAPIVersion, lpLineCountryList); + * lineGetCountryW (TAPI32.@) + */ +DWORD WINAPI lineGetCountryW(DWORD id, DWORD version, LPLINECOUNTRYLIST list) +{ + static const WCHAR country_listW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'T','e','l','e','p','h','o','n','y','\\','C','o','u','n','t','r','y',' ','L','i','s','t',0}; + static const WCHAR international_ruleW[] = + {'I','n','t','e','r','n','a','t','i','o','n','a','l','R','u','l','e',0}; + static const WCHAR longdistance_ruleW[] = + {'L','o','n','g','D','i','s','t','a','n','c','e','R','u','l','e',0}; + static const WCHAR samearea_ruleW[] = + {'S','a','m','e','A','r','e','a','R','u','l','e',0}; + static const WCHAR nameW[] = + {'N','a','m','e',0}; + static const WCHAR country_codeW[] = + {'C','o','u','n','t','r','y','C','o','d','e',0}; + DWORD total_size, offset, i, num_countries, max_subkey_len; + LINECOUNTRYENTRY *entry; + WCHAR *subkey_name; + HKEY hkey; + + if (!list) return LINEERR_INVALPOINTER; + TRACE("(%08x, %08x, %p(%d))\n", id, version, list, list->dwTotalSize); + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, country_listW, &hkey) != ERROR_SUCCESS) + return LINEERR_INIFILECORRUPT; + + total_size = list->dwTotalSize; + offset = sizeof(LINECOUNTRYLIST); + if (total_size < offset) return LINEERR_STRUCTURETOOSMALL; + + memset(list, 0, total_size); + list->dwTotalSize = total_size; + list->dwUsedSize = offset; + list->dwNumCountries = 0; + list->dwCountryListSize = 0; + list->dwCountryListOffset = offset; + + entry = (LINECOUNTRYENTRY *)(list + 1); + + if (RegQueryInfoKeyW(hkey, NULL, NULL, NULL, &num_countries, &max_subkey_len, + NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + { + RegCloseKey(hkey); + return LINEERR_OPERATIONFAILED; + } + if (id) offset = sizeof(LINECOUNTRYENTRY); + else offset += num_countries * sizeof(LINECOUNTRYENTRY); + + max_subkey_len++; + if (!(subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)))) + { + RegCloseKey(hkey); + return LINEERR_NOMEM; + } + for (i = 0; i < num_countries; i++) + { + DWORD len, size, size_int, size_long, size_name, size_same; + HKEY hsubkey; + + if (RegEnumKeyW(hkey, i, subkey_name, max_subkey_len) != ERROR_SUCCESS) continue; + if (id && (atoiW(subkey_name) != id)) continue; + if (RegOpenKeyW(hkey, subkey_name, &hsubkey) != ERROR_SUCCESS) continue; + + RegQueryValueExW(hsubkey, international_ruleW, NULL, NULL, NULL, &size_int); + len = size_int; + + RegQueryValueExW(hsubkey, longdistance_ruleW, NULL, NULL, NULL, &size_long); + len += size_long; + + RegQueryValueExW(hsubkey, nameW, NULL, NULL, NULL, &size_name); + len += size_name; + + RegQueryValueExW(hsubkey, samearea_ruleW, NULL, NULL, NULL, &size_same); + len += size_same; + + if (total_size < offset + len) + { + offset += len; + RegCloseKey(hsubkey); + if (id) break; + continue; + } + list->dwNumCountries++; + list->dwCountryListSize += sizeof(LINECOUNTRYENTRY); + list->dwUsedSize += len + sizeof(LINECOUNTRYENTRY); + + if (id) i = 0; + entry[i].dwCountryID = atoiW(subkey_name); + size = sizeof(DWORD); + RegQueryValueExW(hsubkey, country_codeW, NULL, NULL, (BYTE *)&entry[i].dwCountryCode, &size); + entry[i].dwNextCountryID = 0; + + if (i > 0) entry[i - 1].dwNextCountryID = entry[i].dwCountryID; + + /* add country name */ + entry[i].dwCountryNameSize = size_name; + entry[i].dwCountryNameOffset = offset; + RegQueryValueExW(hsubkey, nameW, NULL, NULL, (BYTE *)list + offset, &size_name); + offset += size_name; + + /* add Same Area Rule */ + entry[i].dwSameAreaRuleSize = size_same; + entry[i].dwSameAreaRuleOffset = offset; + RegQueryValueExW(hsubkey, samearea_ruleW, NULL, NULL, (BYTE *)list + offset, &size_same); + offset += size_same; + + /* add Long Distance Rule */ + entry[i].dwLongDistanceRuleSize = size_long; + entry[i].dwLongDistanceRuleOffset = offset; + RegQueryValueExW(hsubkey, longdistance_ruleW, NULL, NULL, (BYTE *)list + offset, &size_long); + offset += size_long; + + /* add Long Distance Rule */ + entry[i].dwInternationalRuleSize = size_int; + entry[i].dwInternationalRuleOffset = offset; + RegQueryValueExW(hsubkey, international_ruleW, NULL, NULL, (BYTE *)list + offset, &size_int); + offset += size_int; + RegCloseKey(hsubkey); + + TRACE("added country %s at %p\n", + debugstr_w((const WCHAR *)((const char *)list + entry[i].dwCountryNameOffset)), &entry[i]); + if (id) break; + } + list->dwNeededSize = offset; + + TRACE("%d available %d required\n", total_size, offset); + + HeapFree(GetProcessHeap(), 0, subkey_name); + RegCloseKey(hkey); + return 0; } /***********************************************************************

1 0

Christian Costa : d3dxof: Add test for standard templates.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: f054431c637078e20fbdacb87ac574d6314df519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f054431c637078e20fbdacb87… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 10 09:19:19 2013 +0200 d3dxof: Add test for standard templates. --- dlls/d3dxof/tests/d3dxof.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 8d322ad..3a92ce9 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -24,6 +24,7 @@ #include "wine/test.h" #include "initguid.h" #include "dxfile.h" +#include "rmxftmpl.h" #define I2(x) x,0 #define I4(x) x,0,0,0 @@ -1014,6 +1015,32 @@ static void test_complex_object(void) IDirectXFileEnumObject_Release(enum_object); IDirectXFile_Release(dxfile); } + +static void test_standard_templates(void) +{ + HRESULT ret; + IDirectXFile *dxfile = NULL; + + if (!pDirectXFileCreate) + { + win_skip("DirectXFileCreate is not available\n"); + return; + } + + ret = pDirectXFileCreate(&dxfile); + ok(ret == DXFILE_OK, "DirectXFileCreate failed with %#x\n", ret); + if (!dxfile) + { + skip("Couldn't create DirectXFile interface\n"); + return; + } + + ret = IDirectXFile_RegisterTemplates(dxfile, D3DRM_XTEMPLATES, D3DRM_XTEMPLATE_BYTES); + ok(ret == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates failed with %#x\n", ret); + + IDirectXFile_Release(dxfile); +} + /* Set it to 1 to expand the string when dumping the object. This is useful when there is * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 @@ -1199,6 +1226,7 @@ START_TEST(d3dxof) test_syntax(); test_syntax_semicolon_comma(); test_complex_object(); + test_standard_templates(); test_dump(); FreeLibrary(hd3dxof);

1 0

Alexandre Julliard : wineboot: Don' t print an error when failing to delete a file.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: 849ea3d6515dd2a64991a0d8dc580b7a074427f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849ea3d6515dd2a64991a0d8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 13:50:05 2013 +0200 wineboot: Don't print an error when failing to delete a file. --- programs/wineboot/wineboot.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 7b68747..b8512e3 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -545,21 +545,7 @@ static BOOL pendingRename(void) } else { /* Delete the file or directory */ - if( (res=GetFileAttributesW(src))!=INVALID_FILE_ATTRIBUTES ) - { - if( (res&FILE_ATTRIBUTE_DIRECTORY)==0 ) - { - /* It's a file */ - DeleteFileW(src); - } else - { - /* It's a directory */ - RemoveDirectoryW(src); - } - } else - { - WINE_ERR("couldn't get file attributes (%d)\n", GetLastError() ); - } + if (!RemoveDirectoryW( src ) && GetLastError() == ERROR_DIRECTORY) DeleteFileW( src ); } }

1 0

Alexandre Julliard : winex11: Don' t use a surface if there is a client window.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: ba54de6ed5f6797d7f9627016ba2ec21bff13f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba54de6ed5f6797d7f9627016… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 18:07:07 2013 +0200 winex11: Don't use a surface if there is a client window. We can't get clipping right for child windows if using a surface. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5d83e8f..429602b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2168,6 +2168,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (data->embedded) goto done; if (data->whole_window == root_window) goto done; + if (data->client_window) goto done; if (!client_side_graphics && !layered) goto done; surface_rect = get_surface_rect( visible_rect );

1 0