January 2010 - Wine-Commits

Andrew Nguyen : mapi32/tests: Fix the PropCopyMore tests and add an additional test.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: b69045bfc71f083b9ea0dd6c5161e986aa760c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69045bfc71f083b9ea0dd6c5… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Jan 18 07:00:01 2010 -0600 mapi32/tests: Fix the PropCopyMore tests and add an additional test. The PropCopyMore test function was incorrectly allocating memory and testing property types without initializing the correct property union member, causing a crash with the native Outlook extended MAPI provider. --- dlls/mapi32/tests/prop.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index bf6c275..ce6fbd5 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -69,10 +69,10 @@ static BOOL InitFuncPtrs(void) return FALSE; } +/* FIXME: Test PT_I2, PT_I4, PT_R4, PT_R8, PT_CURRENCY, PT_APPTIME, PT_SYSTIME, + * PT_ERROR, PT_BOOLEAN, PT_I8, and PT_CLSID. */ static ULONG ptTypes[] = { - PT_I2, PT_I4, PT_R4, PT_R8, PT_CURRENCY, PT_APPTIME, PT_SYSTIME, - PT_ERROR, PT_BOOLEAN, PT_I8, PT_CLSID, PT_STRING8, PT_BINARY, - PT_UNICODE + PT_STRING8, PT_BINARY, PT_UNICODE }; static inline int strcmpW(const WCHAR *str1, const WCHAR *str2) @@ -97,7 +97,7 @@ static void test_PropCopyMore(void) return; } - scode = pMAPIAllocateBuffer(sizeof(LPSPropValue), lpDest); + scode = pMAPIAllocateBuffer(sizeof(SPropValue), &lpDest); ok(scode == S_OK, "Expected MAPIAllocateBuffer to return S_OK, got 0x%x\n", scode); if (FAILED(scode)) { @@ -105,7 +105,7 @@ static void test_PropCopyMore(void) return; } - scode = pMAPIAllocateMore(sizeof(LPSPropValue), lpDest, lpSrc); + scode = pMAPIAllocateMore(sizeof(SPropValue), lpDest, &lpSrc); ok(scode == S_OK, "Expected MAPIAllocateMore to return S_OK, got 0x%x\n", scode); if (FAILED(scode)) { @@ -159,7 +159,8 @@ static void test_PropCopyMore(void) } /* Since all allocations are linked, freeing lpDest frees everything */ - pMAPIFreeBuffer(lpDest); + scode = pMAPIFreeBuffer(lpDest); + ok(scode == S_OK, "Expected MAPIFreeBuffer to return S_OK, got 0x%x\n", scode); } static void test_UlPropSize(void)

1 0

Maarten Lankhorst : mmdevapi: Dump device id in test.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 6299544cdd731925eea0c960fcd1a57fab846a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6299544cdd731925eea0c960f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jan 17 13:38:32 2010 +0100 mmdevapi: Dump device id in test. --- dlls/mmdevapi/tests/mmdevenum.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 35e0152..fa26b75 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -90,6 +90,18 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) hr = IMMDeviceCollection_Item(col, 0, &dev); ok(hr == S_OK, "Valid Item returned 0x%08x\n", hr); ok(dev != NULL, "Device is null!\n"); + if (dev != NULL) + { + char temp[128]; + WCHAR *id = NULL; + if (IMMDevice_GetId(dev, &id) == S_OK) + { + temp[sizeof(temp)-1] = 0; + WideCharToMultiByte(CP_ACP, 0, id, -1, temp, sizeof(temp)-1, NULL, NULL); + trace("Device found: %s\n", temp); + CoTaskMemFree(id); + } + } if (dev) IUnknown_Release(dev); }

1 0

Maarten Lankhorst : mmdevapi: Add code to enumerate NOTPRESENT devices.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: abd9627d9228070db1f6671b90ac33d940d4f773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd9627d9228070db1f6671b9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Jan 17 13:38:31 2010 +0100 mmdevapi: Add code to enumerate NOTPRESENT devices. --- dlls/mmdevapi/devenum.c | 83 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 40e296e..a708573 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -24,6 +24,8 @@ #define COBJMACROS #include "windef.h" #include "winbase.h" +#include "winnls.h" +#include "winreg.h" #include "wine/debug.h" #include "ole2.h" @@ -33,6 +35,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); +static const WCHAR software_mmdevapi[] = + { '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','\\', + 'M','M','D','e','v','i','c','e','s','\\', + 'A','u','d','i','o',0}; +static const WCHAR reg_render[] = + { 'R','e','n','d','e','r',0 }; +static const WCHAR reg_capture[] = + { 'C','a','p','t','u','r','e',0 }; +static const WCHAR reg_devicestate[] = + { 'D','e','v','i','c','e','S','t','a','t','e',0 }; +static const WCHAR reg_alname[] = + { 'A','L','N','a','m','e',0 }; +static const WCHAR reg_properties[] = + { 'P','r','o','p','e','r','t','i','e','s',0 }; + typedef struct MMDevEnumImpl { const IMMDeviceEnumeratorVtbl *lpVtbl; @@ -41,27 +61,35 @@ typedef struct MMDevEnumImpl static MMDevEnumImpl *MMDevEnumerator; static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl; +static const IMMDeviceCollectionVtbl MMDevColVtbl; typedef struct MMDevColImpl { const IMMDeviceCollectionVtbl *lpVtbl; LONG ref; - MMDevEnumImpl *parent; EDataFlow flow; DWORD state; } MMDevColImpl; -static const IMMDeviceCollectionVtbl MMDevColVtbl; -static HRESULT MMDevCol_Create(IMMDeviceCollection **ppv, MMDevEnumImpl *parent, EDataFlow flow, DWORD state) +/* Creates or updates the state of a device + * If GUID is null, a random guid will be assigned + * and the device will be created + */ +static void MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD state) +{ + FIXME("stub\n"); +} + +static HRESULT MMDevCol_Create(IMMDeviceCollection **ppv, EDataFlow flow, DWORD state) { MMDevColImpl *This; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); *ppv = NULL; if (!This) return E_OUTOFMEMORY; This->lpVtbl = &MMDevColVtbl; This->ref = 1; - This->parent = parent; This->flow = flow; This->state = state; *ppv = (IMMDeviceCollection*)This; @@ -143,6 +171,10 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) if (!This) { + DWORD i = 0; + HKEY root, cur, key_capture = NULL, key_render = NULL; + LONG ret; + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); *ppv = NULL; if (!This) @@ -150,6 +182,47 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) This->ref = 1; This->lpVtbl = &MMDevEnumVtbl; MMDevEnumerator = This; + + ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, software_mmdevapi, 0, KEY_READ, &root); + if (ret == ERROR_SUCCESS) + ret = RegOpenKeyExW(root, reg_capture, 0, KEY_READ, &key_capture); + if (ret == ERROR_SUCCESS) + ret = RegOpenKeyExW(root, reg_render, 0, KEY_READ, &key_render); + cur = key_capture; + if (ret != ERROR_SUCCESS) + { + RegCloseKey(key_capture); + RegCloseKey(key_render); + TRACE("Couldn't open key: %u\n", ret); + } + else do { + WCHAR guidvalue[39]; + WCHAR alname[128]; + GUID guid; + DWORD len; + + len = sizeof(guidvalue); + ret = RegEnumKeyExW(cur, i++, guidvalue, &len, NULL, NULL, NULL, NULL); + if (ret == ERROR_NO_MORE_ITEMS) + { + if (cur == key_capture) + { + cur = key_render; + i = 0; + continue; + } + break; + } + if (ret != ERROR_SUCCESS) + continue; + len = sizeof(alname); + RegGetValueW(cur, guidvalue, reg_alname, RRF_RT_REG_SZ, NULL, alname, &len); + if (SUCCEEDED(CLSIDFromString(guidvalue, &guid))) + MMDevice_Create(alname, &guid, + cur == key_capture ? eCapture : eRender, + DEVICE_STATE_NOTPRESENT); + } while (1); + RegCloseKey(root); } return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); } @@ -206,7 +279,7 @@ static HRESULT WINAPI MMDevEnum_EnumAudioEndpoints(IMMDeviceEnumerator *iface, E return E_INVALIDARG; if (mask & ~DEVICE_STATEMASK_ALL) return E_INVALIDARG; - return MMDevCol_Create(devices, This, flow, mask); + return MMDevCol_Create(devices, flow, mask); } static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *iface, EDataFlow flow, ERole role, IMMDevice **device)

1 0

Andrew Nguyen : mapi32/tests: Centralize property function pointer initialization.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: aef39f3d9fc63a8d9ec08438a76a6bd2d361505a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef39f3d9fc63a8d9ec08438a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Jan 18 07:00:09 2010 -0600 mapi32/tests: Centralize property function pointer initialization. --- dlls/mapi32/tests/prop.c | 47 ++++++++++++++++++--------------------------- 1 files changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index ce6fbd5..8c64245 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -59,6 +59,25 @@ static BOOL InitFuncPtrs(void) { hMapi32 = LoadLibraryA("mapi32.dll"); + pPropCopyMore = (void*)GetProcAddress(hMapi32, "PropCopyMore(a)16"); + pUlPropSize = (void*)GetProcAddress(hMapi32, "UlPropSize(a)4"); + pFPropContainsProp = (void*)GetProcAddress(hMapi32, "FPropContainsProp(a)12"); + pFPropCompareProp = (void*)GetProcAddress(hMapi32, "FPropCompareProp(a)12"); + pLPropCompareProp = (void*)GetProcAddress(hMapi32, "LPropCompareProp(a)8"); + pPpropFindProp = (void*)GetProcAddress(hMapi32, "PpropFindProp(a)12"); + pScCountProps = (void*)GetProcAddress(hMapi32, "ScCountProps(a)12"); + pScCopyProps = (void*)GetProcAddress(hMapi32, "ScCopyProps(a)16"); + pScRelocProps = (void*)GetProcAddress(hMapi32, "ScRelocProps(a)20"); + pLpValFindProp = (void*)GetProcAddress(hMapi32, "LpValFindProp(a)12"); + pFBadRglpszA = (void*)GetProcAddress(hMapi32, "FBadRglpszA(a)8"); + pFBadRglpszW = (void*)GetProcAddress(hMapi32, "FBadRglpszW(a)8"); + pFBadRowSet = (void*)GetProcAddress(hMapi32, "FBadRowSet(a)4"); + pFBadPropTag = (void*)GetProcAddress(hMapi32, "FBadPropTag(a)4"); + pFBadRow = (void*)GetProcAddress(hMapi32, "FBadRow(a)4"); + pFBadProp = (void*)GetProcAddress(hMapi32, "FBadProp(a)4"); + pFBadColumnSet = (void*)GetProcAddress(hMapi32, "FBadColumnSet(a)4"); + pCreateIProp = (void*)GetProcAddress(hMapi32, "CreateIProp(a)24"); + pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil(a)4"); pMAPIAllocateBuffer = (void*)GetProcAddress(hMapi32, "MAPIAllocateBuffer"); pMAPIAllocateMore = (void*)GetProcAddress(hMapi32, "MAPIAllocateMore"); @@ -89,8 +108,6 @@ static void test_PropCopyMore(void) ULONG i; SCODE scode; - pPropCopyMore = (void*)GetProcAddress(hMapi32, "PropCopyMore(a)16"); - if (!pPropCopyMore) { win_skip("PropCopyMore is not available\n"); @@ -172,8 +189,6 @@ static void test_UlPropSize(void) SBinary buffbin[2]; ULONG pt, exp, res; - pUlPropSize = (void*)GetProcAddress(hMapi32, "UlPropSize(a)4"); - if (!pUlPropSize) { win_skip("UlPropSize is not available\n"); @@ -272,8 +287,6 @@ static void test_FPropContainsProp(void) ULONG pt; BOOL bRet; - pFPropContainsProp = (void*)GetProcAddress(hMapi32, "FPropContainsProp(a)12"); - if (!pFPropContainsProp) { win_skip("FPropContainsProp is not available\n"); @@ -424,8 +437,6 @@ static void test_FPropCompareProp(void) ULONG i, j; BOOL bRet, bExp; - pFPropCompareProp = (void*)GetProcAddress(hMapi32, "FPropCompareProp(a)12"); - if (!pFPropCompareProp) { win_skip("FPropCompareProp is not available\n"); @@ -556,8 +567,6 @@ static void test_LPropCompareProp(void) ULONG i, j; INT iRet, iExp; - pLPropCompareProp = (void*)GetProcAddress(hMapi32, "LPropCompareProp(a)8"); - if (!pLPropCompareProp) { win_skip("LPropCompareProp is not available\n"); @@ -664,8 +673,6 @@ static void test_PpropFindProp(void) SPropValue pvProp, *pRet; ULONG i; - pPpropFindProp = (void*)GetProcAddress(hMapi32, "PpropFindProp(a)12"); - if (!pPpropFindProp) { win_skip("PpropFindProp is not available\n"); @@ -706,8 +713,6 @@ static void test_ScCountProps(void) ULONG pt, exp, ulRet; int success = 1; - pScCountProps = (void*)GetProcAddress(hMapi32, "ScCountProps(a)12"); - if (!pScCountProps) { win_skip("ScCountProps is not available\n"); @@ -844,9 +849,6 @@ static void test_ScCopyRelocProps(void) ULONG ulCount; SCODE sc; - pScCopyProps = (void*)GetProcAddress(hMapi32, "ScCopyProps(a)16"); - pScRelocProps = (void*)GetProcAddress(hMapi32, "ScRelocProps(a)20"); - if (!pScCopyProps || !pScRelocProps) { win_skip("SPropValue copy functions are not available\n"); @@ -910,8 +912,6 @@ static void test_LpValFindProp(void) SPropValue pvProp, *pRet; ULONG i; - pLpValFindProp = (void*)GetProcAddress(hMapi32, "LpValFindProp(a)12"); - if (!pLpValFindProp) { win_skip("LpValFindProp is not available\n"); @@ -948,7 +948,6 @@ static void test_FBadRglpszA(void) static CHAR szString[] = "A String"; BOOL bRet; - pFBadRglpszA = (void*)GetProcAddress(hMapi32, "FBadRglpszA(a)8"); if (!pFBadRglpszA) { win_skip("FBadRglpszA is not available\n"); @@ -976,7 +975,6 @@ static void test_FBadRglpszW(void) static WCHAR szString[] = { 'A',' ','S','t','r','i','n','g','\0' }; BOOL bRet; - pFBadRglpszW = (void*)GetProcAddress(hMapi32, "FBadRglpszW(a)8"); if (!pFBadRglpszW) { win_skip("FBadRglpszW is not available\n"); @@ -1002,7 +1000,6 @@ static void test_FBadRowSet(void) { ULONG ulRet; - pFBadRowSet = (void*)GetProcAddress(hMapi32, "FBadRowSet(a)4"); if (!pFBadRowSet) { win_skip("FBadRowSet is not available\n"); @@ -1019,7 +1016,6 @@ static void test_FBadPropTag(void) { ULONG pt, res; - pFBadPropTag = (void*)GetProcAddress(hMapi32, "FBadPropTag(a)4"); if (!pFBadPropTag) { win_skip("FBadPropTag is not available\n"); @@ -1054,7 +1050,6 @@ static void test_FBadRow(void) { ULONG ulRet; - pFBadRow = (void*)GetProcAddress(hMapi32, "FBadRow(a)4"); if (!pFBadRow) { win_skip("FBadRow is not available\n"); @@ -1074,7 +1069,6 @@ static void test_FBadProp(void) ULONG pt, res; SPropValue pv; - pFBadProp = (void*)GetProcAddress(hMapi32, "FBadProp(a)4"); if (!pFBadProp) { win_skip("FBadProp is not available\n"); @@ -1151,7 +1145,6 @@ static void test_FBadColumnSet(void) SPropTagArray pta; ULONG pt, res; - pFBadColumnSet = (void*)GetProcAddress(hMapi32, "FBadColumnSet(a)4"); if (!pFBadColumnSet) { win_skip("FBadColumnSet is not available\n"); @@ -1214,8 +1207,6 @@ static void test_IProp(void) ULONG access[2], count; SCODE sc; - pCreateIProp = (void*)GetProcAddress(hMapi32, "CreateIProp(a)24"); - if (!pCreateIProp) { win_skip("CreateIProp is not available\n");

1 0

Hans Leidekker : msi: Support retrieving rows from join tables.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 1423ef9923de2e4882395acff7d0b52fcfc5d444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1423ef9923de2e4882395acff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 18 13:09:46 2010 +0100 msi: Support retrieving rows from join tables. --- dlls/msi/join.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/join.c b/dlls/msi/join.c index a577aea..b4685b5 100644 --- a/dlls/msi/join.c +++ b/dlls/msi/join.c @@ -117,8 +117,11 @@ static UINT JOIN_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, IStr static UINT JOIN_get_row( struct tagMSIVIEW *view, UINT row, MSIRECORD **rec ) { - FIXME("(%p, %d, %p): stub!\n", view, row, rec); - return ERROR_FUNCTION_FAILED; + MSIJOINVIEW *jv = (MSIJOINVIEW*)view; + + TRACE("%p %d %p\n", jv, row, rec); + + return msi_view_get_row( jv->db, view, row, rec ); } static UINT JOIN_execute( struct tagMSIVIEW *view, MSIRECORD *record )

1 0

Andrew Nguyen : kernel32/tests: Add tests for IsBadCodePtr.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 11dce800c12e4a65508460c57f8b8ab535cf30d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11dce800c12e4a65508460c57… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Jan 18 04:44:02 2010 -0600 kernel32/tests: Add tests for IsBadCodePtr. --- dlls/kernel32/tests/virtual.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index b6960f4..f95fdd9 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -922,11 +922,20 @@ static void test_IsBadWritePtr(void) ok(ret == FALSE, "Expected IsBadWritePtr to return FALSE, got %d\n", ret); } -static void test_BadPtr(void) +static void test_IsBadCodePtr(void) { - void *ptr = (void*)1; - /* We assume address 1 is not mapped. */ - ok(IsBadCodePtr(ptr),"IsBadCodePtr(1) failed.\n"); + BOOL ret; + void *ptr = (void *)0xdeadbeef; + char stackval; + + ret = IsBadCodePtr(NULL); + ok(ret == TRUE, "Expected IsBadCodePtr to return TRUE, got %d\n", ret); + + ret = IsBadCodePtr(ptr); + ok(ret == TRUE, "Expected IsBadCodePtr to return TRUE, got %d\n", ret); + + ret = IsBadCodePtr((void *)&stackval); + ok(ret == FALSE, "Expected IsBadCodePtr to return FALSE, got %d\n", ret); } static void test_write_watch(void) @@ -1270,6 +1279,6 @@ START_TEST(virtual) test_CreateFileMapping(); test_IsBadReadPtr(); test_IsBadWritePtr(); - test_BadPtr(); + test_IsBadCodePtr(); test_write_watch(); }

1 0

Paul Vriens : kernel32/tests: Skip a test on Win9x/WinMe.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 6fd641aa05ed33e42ff318ea753ca1499439fe65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd641aa05ed33e42ff318ea7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 18 12:51:35 2010 +0100 kernel32/tests: Skip a test on Win9x/WinMe. --- dlls/kernel32/tests/debugger.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index ca26302..9acea22 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -409,7 +409,10 @@ static void test_ExitCode(void) crash_and_debug(hkey, test_exe, "dbg,none"); else skip("\"none\" debugger test needs user interaction\n"); - crash_and_debug(hkey, test_exe, "dbg,event,order"); + if (disposition == REG_CREATED_NEW_KEY) + win_skip("'dbg,event,order' test doesn't finish on Win9x/WinMe\n"); + else + crash_and_debug(hkey, test_exe, "dbg,event,order"); crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); if (pDebugSetProcessKillOnExit) crash_and_debug(hkey, test_exe, "dbg,attach,event,nokill");

1 0

Uwe Bonnes : msvcrt: Handle CR at buffer boundary and test case.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: e6f1ae029e39d24ca3c56175df966ffb39ba532e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f1ae029e39d24ca3c56175d… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Sat Jan 16 17:24:19 2010 +0100 msvcrt: Handle CR at buffer boundary and test case. --- dlls/msvcrt/file.c | 22 ++++++++++++++++++++++ dlls/msvcrt/tests/file.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a9678ed..655f17e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -60,6 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define WX_OPEN 0x01 #define WX_ATEOF 0x02 #define WX_READEOF 0x04 /* like ATEOF, but for underlying file rather than buffer */ +#define WX_READCR 0x08 /* underlying file is at \r */ #define WX_DONTINHERIT 0x10 #define WX_APPEND 0x20 #define WX_TEXT 0x80 @@ -941,6 +942,9 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, MSVCRT_long offset, int whence) if (file->_ptr[i] == '\n') offset--; } + /* Black magic when reading CR at buffer boundary*/ + if(MSVCRT_fdesc[file->_file].wxflag & WX_READCR) + offset--; } } /* Discard buffered input */ @@ -1742,6 +1746,10 @@ int CDECL _rmtmp(void) /********************************************************************* * (internal) read_i + * + * When reading \r as last character in text mode, read() positions + * the file pointer on the \r character while getc() goes on to + * the following \n */ static int read_i(int fd, void *buf, unsigned int count) { @@ -1768,6 +1776,13 @@ static int read_i(int fd, void *buf, unsigned int count) if (MSVCRT_fdesc[fd].wxflag & WX_TEXT) { DWORD i, j; + if (bufstart[num_read-1] == '\r') + { + MSVCRT_fdesc[fd].wxflag |= WX_READCR; + num_read--; + } + else + MSVCRT_fdesc[fd].wxflag &= ~WX_READCR; for (i=0, j=0; i<num_read; i++) { /* in text mode, a ctrl-z signals EOF */ @@ -2890,6 +2905,10 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) if (file->_ptr[i] == '\n') off--; } + /* Black magic when reading CR at buffer boundary*/ + if(MSVCRT_fdesc[file->_file].wxflag & WX_READCR) + off--; + } } } @@ -2916,6 +2935,9 @@ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) if (file->_ptr[i] == '\n') off--; } + /* Black magic when reading CR at buffer boundary*/ + if(MSVCRT_fdesc[file->_file].wxflag & WX_READCR) + off--; } } } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 042a82e..18247ad 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -422,6 +422,35 @@ static WCHAR* AtoW( const char* p ) return buffer; } +/* Test reading in text mode when the 512'th character read is \r*/ +static void test_readboundary(void) +{ + FILE *fp; + char buf[513], rbuf[513]; + int i, j; + for (i = 0; i < 511; i++) + { + j = (i%('~' - ' ')+ ' '); + buf[i] = j; + } + buf[511] = '\n'; + buf[512] =0; + fp = fopen("boundary.tst", "wt"); + fwrite(buf, 512,1,fp); + fclose(fp); + fp = fopen("boundary.tst", "rt"); + for(i=0; i<512; i++) + { + fseek(fp,0 , SEEK_CUR); + rbuf[i] = fgetc(fp); + } + rbuf[512] =0; + fclose(fp); + unlink("boundary.tst"); + + ok(strcmp(buf, rbuf) == 0,"CRLF on buffer boundary failure\n"); + } + static void test_fgetc( void ) { char* tempf; @@ -808,15 +837,23 @@ static void test_file_write_read( void ) tempfd = _open(tempf,_O_RDONLY|_O_TEXT); /* open in TEXT mode */ _lseek(tempfd, -1, FILE_END); ret = _read(tempfd,btext,LLEN); - ok(ret == 1, "_read expected 1 got bad length: %d\n", ret); + ok(ret == 1 && *btext == '\n', "_read expected 1 got bad length: %d\n", ret); _lseek(tempfd, -2, FILE_END); ret = _read(tempfd,btext,LLEN); ok(ret == 1 && *btext == '\n', "_read expected '\\n' got bad length: %d\n", ret); _lseek(tempfd, -3, FILE_END); + ret = _read(tempfd,btext,1); + ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); + ok(tell(tempfd) == 41, "bad position %u expecting 41\n", tell(tempfd)); + _lseek(tempfd, -3, FILE_END); ret = _read(tempfd,btext,2); ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); ok(tell(tempfd) == 42, "bad position %u expecting 42\n", tell(tempfd)); - _close(tempfd); + _lseek(tempfd, -3, FILE_END); + ret = _read(tempfd,btext,3); + ok(ret == 2 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); + ok(tell(tempfd) == 43, "bad position %u expecting 43\n", tell(tempfd)); + _close(tempfd); ret = unlink(tempf); ok( ret == 0 ,"Can't unlink '%s': %d\n", tempf, errno); @@ -1402,6 +1439,7 @@ START_TEST(file) test_asciimode2(); test_readmode(FALSE); /* binary mode */ test_readmode(TRUE); /* ascii mode */ + test_readboundary(); test_fgetc(); test_fputc(); test_flsbuf();

1 0

Andrew Nguyen : mapi32/tests: Report skips for unavailable property functions.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 3bd474d7f3672196b9061d0ac0880cdc600929ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd474d7f3672196b9061d0ac… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Jan 18 06:59:43 2010 -0600 mapi32/tests: Report skips for unavailable property functions. --- dlls/mapi32/tests/prop.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 237134b..bf6c275 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -92,15 +92,26 @@ static void test_PropCopyMore(void) pPropCopyMore = (void*)GetProcAddress(hMapi32, "PropCopyMore(a)16"); if (!pPropCopyMore) + { + win_skip("PropCopyMore is not available\n"); return; + } scode = pMAPIAllocateBuffer(sizeof(LPSPropValue), lpDest); + ok(scode == S_OK, "Expected MAPIAllocateBuffer to return S_OK, got 0x%x\n", scode); if (FAILED(scode)) + { + skip("MAPIAllocateBuffer failed\n"); return; + } scode = pMAPIAllocateMore(sizeof(LPSPropValue), lpDest, lpSrc); + ok(scode == S_OK, "Expected MAPIAllocateMore to return S_OK, got 0x%x\n", scode); if (FAILED(scode)) + { + skip("MAPIAllocateMore failed\n"); return; + } for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) { @@ -163,7 +174,10 @@ static void test_UlPropSize(void) pUlPropSize = (void*)GetProcAddress(hMapi32, "UlPropSize(a)4"); if (!pUlPropSize) + { + win_skip("UlPropSize is not available\n"); return; + } for (pt = 0; pt < PROP_ID_INVALID; pt++) { @@ -260,7 +274,10 @@ static void test_FPropContainsProp(void) pFPropContainsProp = (void*)GetProcAddress(hMapi32, "FPropContainsProp(a)12"); if (!pFPropContainsProp) + { + win_skip("FPropContainsProp is not available\n"); return; + } /* Ensure that only PT_STRING8 and PT_BINARY are handled */ for (pt = 0; pt < PROP_ID_INVALID; pt++) @@ -409,7 +426,10 @@ static void test_FPropCompareProp(void) pFPropCompareProp = (void*)GetProcAddress(hMapi32, "FPropCompareProp(a)12"); if (!pFPropCompareProp) + { + win_skip("FPropCompareProp is not available\n"); return; + } lbuffa[1] = '\0'; rbuffa[1] = '\0'; @@ -538,7 +558,10 @@ static void test_LPropCompareProp(void) pLPropCompareProp = (void*)GetProcAddress(hMapi32, "LPropCompareProp(a)8"); if (!pLPropCompareProp) + { + win_skip("LPropCompareProp is not available\n"); return; + } lbuffa[1] = '\0'; rbuffa[1] = '\0'; @@ -643,7 +666,10 @@ static void test_PpropFindProp(void) pPpropFindProp = (void*)GetProcAddress(hMapi32, "PpropFindProp(a)12"); if (!pPpropFindProp) + { + win_skip("PpropFindProp is not available\n"); return; + } for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) { @@ -682,7 +708,10 @@ static void test_ScCountProps(void) pScCountProps = (void*)GetProcAddress(hMapi32, "ScCountProps(a)12"); if (!pScCountProps) + { + win_skip("ScCountProps is not available\n"); return; + } for (pt = 0; pt < PROP_ID_INVALID && success; pt++) { @@ -818,7 +847,10 @@ static void test_ScCopyRelocProps(void) pScRelocProps = (void*)GetProcAddress(hMapi32, "ScRelocProps(a)20"); if (!pScCopyProps || !pScRelocProps) + { + win_skip("SPropValue copy functions are not available\n"); return; + } pvProp.ulPropTag = PROP_TAG(PT_MV_STRING8, 1u); @@ -880,7 +912,10 @@ static void test_LpValFindProp(void) pLpValFindProp = (void*)GetProcAddress(hMapi32, "LpValFindProp(a)12"); if (!pLpValFindProp) + { + win_skip("LpValFindProp is not available\n"); return; + } for (i = 0; i < sizeof(ptTypes)/sizeof(ptTypes[0]); i++) { @@ -914,7 +949,10 @@ static void test_FBadRglpszA(void) pFBadRglpszA = (void*)GetProcAddress(hMapi32, "FBadRglpszA(a)8"); if (!pFBadRglpszA) + { + win_skip("FBadRglpszA is not available\n"); return; + } bRet = pFBadRglpszA(NULL, 10); ok(bRet == TRUE, "FBadRglpszA(Null): expected TRUE, got FALSE\n"); @@ -939,7 +977,10 @@ static void test_FBadRglpszW(void) pFBadRglpszW = (void*)GetProcAddress(hMapi32, "FBadRglpszW(a)8"); if (!pFBadRglpszW) + { + win_skip("FBadRglpszW is not available\n"); return; + } bRet = pFBadRglpszW(NULL, 10); ok(bRet == TRUE, "FBadRglpszW(Null): expected TRUE, got FALSE\n"); @@ -962,7 +1003,10 @@ static void test_FBadRowSet(void) pFBadRowSet = (void*)GetProcAddress(hMapi32, "FBadRowSet(a)4"); if (!pFBadRowSet) + { + win_skip("FBadRowSet is not available\n"); return; + } ulRet = pFBadRowSet(NULL); ok(ulRet != 0, "FBadRow(null): Expected non-zero, got 0\n"); @@ -976,7 +1020,10 @@ static void test_FBadPropTag(void) pFBadPropTag = (void*)GetProcAddress(hMapi32, "FBadPropTag(a)4"); if (!pFBadPropTag) + { + win_skip("FBadPropTag is not available\n"); return; + } for (pt = 0; pt < PROP_ID_INVALID; pt++) { @@ -1008,7 +1055,10 @@ static void test_FBadRow(void) pFBadRow = (void*)GetProcAddress(hMapi32, "FBadRow(a)4"); if (!pFBadRow) + { + win_skip("FBadRow is not available\n"); return; + } ulRet = pFBadRow(NULL); ok(ulRet != 0, "FBadRow(null): Expected non-zero, got 0\n"); @@ -1025,7 +1075,10 @@ static void test_FBadProp(void) pFBadProp = (void*)GetProcAddress(hMapi32, "FBadProp(a)4"); if (!pFBadProp) + { + win_skip("FBadProp is not available\n"); return; + } for (pt = 0; pt < PROP_ID_INVALID; pt++) { @@ -1099,7 +1152,10 @@ static void test_FBadColumnSet(void) pFBadColumnSet = (void*)GetProcAddress(hMapi32, "FBadColumnSet(a)4"); if (!pFBadColumnSet) + { + win_skip("FBadColumnSet is not available\n"); return; + } res = pFBadColumnSet(NULL); ok(res != 0, "(null): Expected non-zero, got 0\n"); @@ -1160,7 +1216,10 @@ static void test_IProp(void) pCreateIProp = (void*)GetProcAddress(hMapi32, "CreateIProp(a)24"); if (!pCreateIProp) + { + win_skip("CreateIProp is not available\n"); return; + } memset(&tags, 0 , sizeof(tags));

1 0

Hans Leidekker : msi: Fix parsing of feature overrides.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 2bfce6cfdcfbf15ebb85f2680feea0ed62667a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bfce6cfdcfbf15ebb85f2680… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 18 13:10:15 2010 +0100 msi: Fix parsing of feature overrides. --- dlls/msi/action.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 10338ad..50f2007 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1562,8 +1562,10 @@ static BOOL process_state_property(MSIPACKAGE* package, int level, while (ptr) { - if ((ptr2 && strncmpW(ptr,feature->Feature, ptr2-ptr)==0) - || (!ptr2 && strcmpW(ptr,feature->Feature)==0)) + int len = ptr2 - ptr; + + if ((ptr2 && strlenW(feature->Feature) == len && !strncmpW(ptr, feature->Feature, len)) + || (!ptr2 && !strcmpW(ptr, feature->Feature))) { msi_feature_set_state(package, feature, state); break;

1 0