wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Paul Vriens : d3d8/tests: Fix some tests (logical || with non-zero constant ).
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 91e306579bbc51b6f86b97ab99704d3f398dadcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e306579bbc51b6f86b97ab9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 19 08:14:17 2009 +0200 d3d8/tests: Fix some tests (logical || with non-zero constant). --- dlls/d3d8/tests/visual.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 19bf497..1850b83 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -645,11 +645,11 @@ static void offscreen_test(IDirect3DDevice8 *device) ok(hr == D3D_OK, "Clear failed, hr = %#08x\n", hr); hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture); - ok(hr == D3D_OK || D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr); if(!offscreenTexture) { trace("Failed to create an X8R8G8B8 offscreen texture, trying R5G6B5\n"); hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &offscreenTexture); - ok(hr == D3D_OK || D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr); if(!offscreenTexture) { skip("Cannot create an offscreen render target\n"); goto out; @@ -776,7 +776,7 @@ static void alpha_test(IDirect3DDevice8 *device) ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture); - ok(hr == D3D_OK || D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr); hr = IDirect3DDevice8_GetDepthStencilSurface(device, &depthstencil); ok(hr == D3D_OK, "IDirect3DDevice8_GetDepthStencilSurface failed, hr = %#08x\n", hr);

1 0

Paul Vriens : msi/tests: Fix test (logical || with non-zero constant).
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 44b53ef35e1482766b3a6761f4eebf3e47ed491d URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b53ef35e1482766b3a6761f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 19 07:52:50 2009 +0200 msi/tests: Fix test (logical || with non-zero constant). --- dlls/msi/tests/source.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 4e94eda..5a51c66 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -283,7 +283,7 @@ static void test_MsiSourceListGetInfo(void) size = MAX_PATH; r = pMsiSourceListGetInfoA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAME, NULL, &size); - ok(r == ERROR_UNKNOWN_PRODUCT || ERROR_INVALID_PARAMETER, + ok(r == ERROR_UNKNOWN_PRODUCT || r == ERROR_INVALID_PARAMETER, "Expected ERROR_UNKNOWN_PRODUCT or ERROR_INVALID_PARAMETER, got %d\n", r); lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\");

1 0

Gerald Pfeifer : crypt32: Fix incorrect logic condition in test_decodePKCSAttribute().
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: afbeea25c1dacb2c2ab483f6ccad1e7081881beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=afbeea25c1dacb2c2ab483f6c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jun 18 19:26:39 2009 +0200 crypt32: Fix incorrect logic condition in test_decodePKCSAttribute(). --- dlls/crypt32/tests/encode.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index e406194..3e99800 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5843,7 +5843,8 @@ static void test_decodePKCSAttribute(DWORD dwEncoding) * I doubt an app depends on that. */ ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || - GetLastError() == CRYPT_E_ASN1_CORRUPT || OSS_MORE_INPUT /* Win9x */), + GetLastError() == CRYPT_E_ASN1_CORRUPT || + GetLastError() == OSS_MORE_INPUT /* Win9x */), "Expected CRYPT_E_ASN1_EOD, CRYPT_E_ASN1_CORRUPT, or OSS_MORE_INPUT, got %x\n", GetLastError()); ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTE,

1 0

Aurimas Fišeras : oleacc: Add Lithuanian translation.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: c22a97b1427c3f84cfa6eb9d6548168c0626b742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22a97b1427c3f84cfa6eb9d6… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 14 13:55:58 2009 +0300 oleacc: Add Lithuanian translation. --- dlls/oleacc/oleacc.rc | 1 + dlls/oleacc/oleacc_Lt.rc | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/oleacc.rc b/dlls/oleacc/oleacc.rc index 3be579a..abcd7fb 100644 --- a/dlls/oleacc/oleacc.rc +++ b/dlls/oleacc/oleacc.rc @@ -25,5 +25,6 @@ #include "oleacc_En.rc" #include "oleacc_Fr.rc" #include "oleacc_Ko.rc" +#include "oleacc_Lt.rc" #include "oleacc_Nl.rc" #include "oleacc_Pl.rc" diff --git a/dlls/oleacc/oleacc_Lt.rc b/dlls/oleacc/oleacc_Lt.rc new file mode 100644 index 0000000..5498e84 --- /dev/null +++ b/dlls/oleacc/oleacc_Lt.rc @@ -0,0 +1,95 @@ +/* + * Lithuanian resources for oleacc + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "nežinomas objektas" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "lango antraštės juosta" + ROLE_SYSTEM_MENUBAR "meniu juosta" + ROLE_SYSTEM_SCROLLBAR "slankjuostė" + ROLE_SYSTEM_GRIP "rankenėlė" + ROLE_SYSTEM_SOUND "garsas" + ROLE_SYSTEM_CURSOR "pelės žymeklis" + ROLE_SYSTEM_CARET "žymeklis" + ROLE_SYSTEM_ALERT "įspėjimas" + ROLE_SYSTEM_WINDOW "langas" + ROLE_SYSTEM_CLIENT "klientas" + ROLE_SYSTEM_MENUPOPUP "iškylantis meniu" + ROLE_SYSTEM_MENUITEM "meniu elementas" + ROLE_SYSTEM_TOOLTIP "paaiškinimas" + ROLE_SYSTEM_APPLICATION "programa" + ROLE_SYSTEM_DOCUMENT "dokumentas" + ROLE_SYSTEM_PANE "polangis" + ROLE_SYSTEM_CHART "diagrama" + ROLE_SYSTEM_DIALOG "dialogo langas" + ROLE_SYSTEM_BORDER "rėmelis" + ROLE_SYSTEM_GROUPING "grupavimas" + ROLE_SYSTEM_SEPARATOR "skirtukas" + ROLE_SYSTEM_TOOLBAR "įrankių juosta" + ROLE_SYSTEM_STATUSBAR "būsenos juosta" + ROLE_SYSTEM_TABLE "lentelė" + ROLE_SYSTEM_COLUMNHEADER "stulpelio antraštė" + ROLE_SYSTEM_ROWHEADER "eilutės antraštė" + ROLE_SYSTEM_COLUMN "stulpelis" + ROLE_SYSTEM_ROW "eilutė" + ROLE_SYSTEM_CELL "langelis" + ROLE_SYSTEM_LINK "nuoroda" + ROLE_SYSTEM_HELPBALLOON "pagalbos balionas" + ROLE_SYSTEM_CHARACTER "personažas" + ROLE_SYSTEM_LIST "sąrašas" + ROLE_SYSTEM_LISTITEM "sąrašo elementas" + ROLE_SYSTEM_OUTLINE "planas" + ROLE_SYSTEM_OUTLINEITEM "plano elementas" + ROLE_SYSTEM_PAGETAB "kortelė" + ROLE_SYSTEM_PROPERTYPAGE "savybių lapas" + ROLE_SYSTEM_INDICATOR "indikatorius" + ROLE_SYSTEM_GRAPHIC "grafika" + ROLE_SYSTEM_STATICTEXT "statinis tekstas" + ROLE_SYSTEM_TEXT "tekstas" + ROLE_SYSTEM_PUSHBUTTON "mygtukas" + ROLE_SYSTEM_CHECKBUTTON "žymimasis langelis" + ROLE_SYSTEM_RADIOBUTTON "akutė" + ROLE_SYSTEM_COMBOBOX "jungtinis langelis" + ROLE_SYSTEM_DROPLIST "išskleidžiamasis sąrašas" + ROLE_SYSTEM_PROGRESSBAR "eigos juosta" + ROLE_SYSTEM_DIAL "sukiojama rankenėlė" + ROLE_SYSTEM_HOTKEYFIELD "sparčiojo klavišo laukas" + ROLE_SYSTEM_SLIDER "šliaužiklis" + ROLE_SYSTEM_SPINBUTTON "suktukas" + ROLE_SYSTEM_DIAGRAM "schema" + ROLE_SYSTEM_ANIMATION "animacija" + ROLE_SYSTEM_EQUATION "lygtis" + ROLE_SYSTEM_BUTTONDROPDOWN "išskleidžiamasis mygtukas" + ROLE_SYSTEM_BUTTONMENU "meniu mygtukas" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "tinklelio išskleidžiamasis mygtukas" + ROLE_SYSTEM_WHITESPACE "matomas tarpas" + ROLE_SYSTEM_PAGETABLIST "kortelių sąrašas" + ROLE_SYSTEM_CLOCK "laikrodis" + ROLE_SYSTEM_SPLITBUTTON "išskleidimo mygtukas" + ROLE_SYSTEM_IPADDRESS "IP adresas" + ROLE_SYSTEM_OUTLINEBUTTON "plano mygtukas" +} + +#pragma code_page(default)

1 0

Paul Vriens : shell32/tests: Fix some test failures on Vista and higher.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: a4477bac28b0265cab4cbc6fe94e69d345b2ef7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4477bac28b0265cab4cbc6fe… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 18 18:20:18 2009 +0200 shell32/tests: Fix some test failures on Vista and higher. --- dlls/shell32/tests/shlfolder.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index afb2840..7487376 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -274,13 +274,15 @@ static void test_EnumObjects(IShellFolder *iFolder) for (i = 0; i < 5; i++) { SFGAOF flags; +#define SFGAO_VISTA SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY /* Native returns all flags no matter what we ask for */ flags = SFGAO_CANCOPY; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); ok(flags == (attrs[i]) || - flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */ + flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR) || /* Win9x, NT4 */ + flags == ((attrs[i] & ~SFGAO_CAPABILITYMASK) | SFGAO_VISTA), /* Vista and higher */ "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); flags = SFGAO_testfor;

1 0

Paul Vriens : shell32/tests: Fix a test failure on Vista and higher.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: b1e007e3c6784943509081349337ff70cef9c8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e007e3c6784943509081349… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 18 18:02:20 2009 +0200 shell32/tests: Fix a test failure on Vista and higher. --- dlls/shell32/tests/shlfolder.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f09afbc..afb2840 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1558,7 +1558,7 @@ static void testSHGetFolderPathAndSubDirA(void) static char toolongpath[MAX_PATH+1]; if(!pSHGetFolderPathA) { - skip("SHGetFolderPathA not present!\n"); + win_skip("SHGetFolderPathA not present!\n"); return; } if(FAILED(pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, appdata))) @@ -1580,16 +1580,13 @@ static void testSHGetFolderPathAndSubDirA(void) skip("RemoveDirectoryA(%s) failed with error %u\n", testpath, GetLastError()); return; } - for(i=0; i< MAX_PATH; i++) - toolongpath[i] = '0' + i % 10; - toolongpath[MAX_PATH] = '\0'; /* test invalid second parameter */ ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | 0xff, NULL, SHGFP_TYPE_CURRENT, wine, testpath); ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); - /* test invalid forth parameter */ - ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, wine, testpath); + /* test fourth parameter */ + ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, winetemp, testpath); switch(ret) { case S_OK: /* winvista */ ok(!strncmp(appdata, testpath, strlen(appdata)), @@ -1619,6 +1616,9 @@ static void testSHGetFolderPathAndSubDirA(void) ok(S_OK == ret, "expected S_OK, got %x\n", ret); ok(!lstrcmpA(appdata, testpath), "expected %s, got %s\n", appdata, testpath); + for(i=0; i< MAX_PATH; i++) + toolongpath[i] = '0' + i % 10; + toolongpath[MAX_PATH] = '\0'; ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, toolongpath, testpath); ok(HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) == ret, "expected %x, got %x\n", HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE), ret);

1 0

Francois Gouget : comctl32/tests: Make DummyCompareEx() static.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: fb37e89a06532c0ac879dc4ca05ca4d77913f707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb37e89a06532c0ac879dc4ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 18 17:55:50 2009 +0200 comctl32/tests: Make DummyCompareEx() static. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 57d39ce..f75f858 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3353,7 +3353,7 @@ static void test_indentation(void) DestroyWindow(hwnd); } -INT CALLBACK DummyCompareEx(LPARAM first, LPARAM second, LPARAM param) +static INT CALLBACK DummyCompareEx(LPARAM first, LPARAM second, LPARAM param) { return 0; }

1 0

Alexandre Julliard : rpcrt4: Fix memory sizes of marshalled pointers on 64-bit.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: b579c4813345becb9eb016f57ba57e220618ab97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b579c4813345becb9eb016f57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 12:49:35 2009 +0200 rpcrt4: Fix memory sizes of marshalled pointers on 64-bit. --- dlls/rpcrt4/ndr_marshall.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0d12843..1777c49 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1562,7 +1562,7 @@ ULONG WINAPI NdrPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, ALIGN_POINTER(pStubMsg->Buffer, 4); safe_buffer_increment(pStubMsg, 4); } - ALIGN_LENGTH(pStubMsg->MemorySize, 4); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(void *)); return PointerMemorySize(pStubMsg, Buffer, pFormat); } @@ -2724,7 +2724,7 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, } TRACE("pStubMsg->Buffer after %p\n", pStubMsg->Buffer); pPointer += 4; - pMemory += 4; + pMemory += sizeof(void *); break; } case RPC_FC_ALIGNM4: @@ -2849,7 +2849,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ } pPointer += 4; - pMemory += 4; + pMemory += sizeof(void *); break; } case RPC_FC_ALIGNM4: @@ -2964,7 +2964,7 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, safe_buffer_length_increment(pStubMsg, 4); } pPointer += 4; - pMemory += 4; + pMemory += sizeof(void*); break; case RPC_FC_ALIGNM4: ALIGN_POINTER(pMemory, 4); @@ -3047,7 +3047,7 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, case RPC_FC_POINTER: NdrPointerFree(pStubMsg, *(unsigned char**)pMemory, pPointer); pPointer += 4; - pMemory += 4; + pMemory += sizeof(void *); break; case RPC_FC_ALIGNM4: ALIGN_POINTER(pMemory, 4); @@ -3158,7 +3158,7 @@ static ULONG ComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, safe_buffer_increment(pStubMsg, 4); /* for pointer ID */ } pPointer += 4; - size += 4; + size += sizeof(void *); break; } case RPC_FC_ALIGNM4: @@ -5684,8 +5684,8 @@ static ULONG union_arm_memory_size(PMIDL_STUB_MESSAGE pStubMsg, ALIGN_POINTER(pStubMsg->Buffer, 4); saved_buffer = pStubMsg->Buffer; safe_buffer_increment(pStubMsg, 4); - ALIGN_LENGTH(pStubMsg->MemorySize, 4); - pStubMsg->MemorySize += 4; + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(void *)); + pStubMsg->MemorySize += sizeof(void *); if (!pStubMsg->IgnoreEmbeddedPointers) PointerMemorySize(pStubMsg, saved_buffer, pFormat); break;

1 0

Alexandre Julliard : rpcrt4/tests: Fix the marshalling test for Win9x.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 39d75dfba422d1a1a1e4f3dd0290b22b360af7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d75dfba422d1a1a1e4f3dd0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 12:49:20 2009 +0200 rpcrt4/tests: Fix the marshalling test for Win9x. --- dlls/rpcrt4/tests/ndr_marshall.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d8ba912..2aa8146 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -211,8 +211,16 @@ static void test_pointer_marshal(const unsigned char *formattypes, ptr = NdrPointerMarshall( &StubMsg, memsrc, formattypes ); ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled\n", msgpfx); + if (srcsize == 8 && wiredatalen == 16 && StubMsg.Buffer - StubMsg.BufferStart == 12) + { + /* win9x doesn't align 8-byte types properly */ + wiredatalen = 12; + } + else + { + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled\n", msgpfx); + } StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0;

1 0

Alexandre Julliard : rpcrt4/tests: Fix the marshalling test for Win64.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: c3c8aa3b2387427e06f0b2bff6db578b6b62faf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c8aa3b2387427e06f0b2bff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 12:38:46 2009 +0200 rpcrt4/tests: Fix the marshalling test for Win64. --- dlls/rpcrt4/tests/ndr_marshall.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index c48f7de..d8ba912 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -221,7 +221,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) - ok(size == srcsize + 4, "%s: mem size %u\n", msgpfx, size); + ok(size == srcsize + sizeof(void *), "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize, "%s: mem size %u\n", msgpfx, size); @@ -231,7 +231,7 @@ static void test_pointer_marshal(const unsigned char *formattypes, ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) - ok(size == srcsize + 4 + 16, "%s: mem size %u\n", msgpfx, size); + ok(size == srcsize + sizeof(void *) + 16, "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize + 16, "%s: mem size %u\n", msgpfx, size); @@ -241,9 +241,9 @@ static void test_pointer_marshal(const unsigned char *formattypes, ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); if(formattypes[1] & 0x10 /* FC_POINTER_DEREF */) - ok(size == srcsize + 4 + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); + ok(size == srcsize + sizeof(void *) + (srcsize == 8 ? 8 : sizeof(void *)), "%s: mem size %u\n", msgpfx, size); else - ok(size == srcsize + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); + ok(size == srcsize + (srcsize == 8 ? 8 : sizeof(void *)), "%s: mem size %u\n", msgpfx, size); size = srcsize; if(formattypes[1] & 0x10) size += 4; @@ -901,6 +901,25 @@ static void test_simple_struct(void) { 0x12, 0x0, /* FC_UP */ NdrFcShort( 0x2 ), /* Offset=2 */ +#ifdef _WIN64 + 0x1a, /* FC_BOGUS_STRUCT */ + 0x3, /* 3 */ + NdrFcShort(0x18), /* [size 24] */ + NdrFcShort(0x0), + NdrFcShort(0x8), /* Offset= 8 (266) */ + 0x08, /* FC_LONG */ + 0x39, /* FC_ALIGNM8 */ + 0x36, /* FC_POINTER */ + 0x36, /* FC_POINTER */ + 0x5c, /* FC_PAD */ + 0x5b, /* FC_END */ + 0x12, 0x8, /* FC_UP [simple_pointer] */ + 0x08, /* FC_LONG */ + 0x5c, /* FC_PAD */ + 0x12, 0x8, /* FC_UP [simple_pointer] */ + 0x02, /* FC_CHAR */ + 0x5c, /* FC_PAD */ +#else 0x16, 0x3, /* FC_PSTRUCT [align 4] */ NdrFcShort( 0xc ), /* [size 12] */ 0x4b, /* FC_PP */ @@ -925,7 +944,7 @@ static void test_simple_struct(void) 0x8, /* FC_LONG */ 0x5c, /* FC_PAD */ 0x5b, /* FC_END */ - +#endif }; /* zero the entire structure, including the holes */ @@ -949,6 +968,8 @@ static void test_simple_struct(void) memcpy(wiredata + 4, &s1, wiredatalen); test_pointer_marshal(fmtstr_simple_struct, &s1, 24, wiredata, 28, NULL, 0, "struct"); + if (sizeof(void *) == 8) return; /* it cannot be represented as a simple struct on Win64 */ + /* zero the entire structure, including the hole */ memset(&ps1, 0, sizeof(ps1)); @@ -1570,7 +1591,7 @@ todo_wine { } my_alloc_called = 0; - mem = mem_orig; + mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc)); StubMsg.Buffer = StubMsg.BufferStart; NdrPointerUnmarshall( &StubMsg, &mem, fmtstr_conf_str, 0); ok(mem == StubMsg.BufferStart + 12 || broken(!mem), /* win9x, nt4 */

1 0

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 June 2009