November 2009 - Wine-Commits

Jacek Caban : mshtml: Added [i]frame elements content document tests.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 1fccc1b4fa59ad5570ca7a2a5d4331439a628fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fccc1b4fa59ad5570ca7a2a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 24 21:13:57 2009 +0100 mshtml: Added [i]frame elements content document tests. --- dlls/mshtml/tests/dom.c | 97 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 78 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1387b13..0376ac2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -883,6 +883,25 @@ static void _test_window_length(unsigned line, IHTMLWindow2 *window, LONG exlen) ok_(__FILE__,line)(length == exlen, "length = %d, expected %d\n", length, exlen); } +#define get_frame_content_window(e) _get_frame_content_window(__LINE__,e) +static IHTMLWindow2 *_get_frame_content_window(unsigned line, IUnknown *elem) +{ + IHTMLFrameBase2 *base2; + IHTMLWindow2 *window; + HRESULT hres; + + hres = IUnknown_QueryInterface(elem, &IID_IHTMLFrameBase2, (void**)&base2); + ok(hres == S_OK, "Could not get IHTMFrameBase2 iface: %08x\n", hres); + + window = NULL; + hres = IHTMLFrameBase2_get_contentWindow(base2, &window); + IHTMLFrameBase2_Release(base2); + ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); + ok(window != NULL, "contentWindow = NULL\n"); + + return window; +} + static void test_get_set_attr(IHTMLDocument2 *doc) { IHTMLElement *elem; @@ -2202,6 +2221,40 @@ static void _test_elem_client_rect(unsigned line, IUnknown *unk) IHTMLElement2_Release(elem); } +#define get_elem_doc(e) _get_elem_doc(__LINE__,e) +static IHTMLDocument2 *_get_elem_doc(unsigned line, IUnknown *unk) +{ + IHTMLElement *elem = _get_elem_iface(line, unk); + IHTMLDocument2 *doc; + IDispatch *disp; + HRESULT hres; + + disp = NULL; + hres = IHTMLElement_get_document(elem, &disp); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLDocument2, (void**)&doc); + IDispatch_Release(disp); + ok(hres == S_OK, "Could not get IHTMLDocument2 iface: %08x\n", hres); + + return doc; +} + +#define get_window_doc(e) _get_window_doc(__LINE__,e) +static IHTMLDocument2 *_get_window_doc(unsigned line, IHTMLWindow2 *window) +{ + IHTMLDocument2 *doc; + HRESULT hres; + + doc = NULL; + hres = IHTMLWindow2_get_document(window, &doc); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(doc != NULL, "disp == NULL\n"); + + return doc; +} + #define test_create_elem(d,t) _test_create_elem(__LINE__,d,t) static IHTMLElement *_test_create_elem(unsigned line, IHTMLDocument2 *doc, const char *tag) { @@ -4806,12 +4859,27 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) SafeArrayDestroy(sa); } +static void test_frame_doc(IUnknown *frame_elem) +{ + IHTMLDocument2 *window_doc, *elem_doc; + IHTMLWindow2 *content_window; + + content_window = get_frame_content_window(frame_elem); + window_doc = get_window_doc(content_window); + IHTMLWindow2_Release(content_window); + + elem_doc = get_elem_doc(frame_elem); + ok(iface_cmp((IUnknown*)window_doc, (IUnknown*)elem_doc), "content_doc != elem_doc\n"); + + IHTMLDocument2_Release(elem_doc); + IHTMLDocument2_Release(window_doc); +} + static void test_iframe_elem(IHTMLElement *elem) { IHTMLDocument2 *content_doc, *owner_doc; IHTMLElementCollection *col; IHTMLWindow2 *content_window; - IHTMLFrameBase2 *base2; IDispatch *disp; VARIANT errv; BSTR str; @@ -4825,23 +4893,13 @@ static void test_iframe_elem(IHTMLElement *elem) ET_BR }; - hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase2, (void**)&base2); - ok(hres == S_OK, "Could not get IHTMFrameBase2 iface: %08x\n", hres); - if (!base2) return; - - content_window = NULL; - hres = IHTMLFrameBase2_get_contentWindow(base2, &content_window); - IHTMLFrameBase2_Release(base2); - ok(hres == S_OK, "get_contentWindow failed: %08x\n", hres); - ok(content_window != NULL, "contentWindow = NULL\n"); + test_frame_doc((IUnknown*)elem); + content_window = get_frame_content_window((IUnknown*)elem); test_window_length(content_window, 0); - content_doc = NULL; - hres = IHTMLWindow2_get_document(content_window, &content_doc); + content_doc = get_window_doc(content_window); IHTMLWindow2_Release(content_window); - ok(hres == S_OK, "get_document failed: %08x\n", hres); - ok(content_doc != NULL, "content_doc = NULL\n"); str = a2bstr("text/html"); V_VT(&errv) = VT_ERROR; @@ -5114,7 +5172,7 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, "s", TRUE); if(elem) { IHTMLSelectElement *select; - IHTMLDocument2 *doc_node; + IHTMLDocument2 *doc_node, *elem_doc; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLSelectElement, (void**)&select); ok(hres == S_OK, "Could not get IHTMLSelectElement interface: %08x\n", hres); @@ -5138,12 +5196,12 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLSelectElement_Release(select); - hres = IHTMLElement_get_document(elem, &disp); - ok(hres == S_OK, "get_document failed: %08x\n", hres); + elem_doc = get_elem_doc((IUnknown*)elem); doc_node = get_doc_node(doc); - ok(iface_cmp((IUnknown*)disp, (IUnknown*)doc_node), "disp != doc\n"); + ok(iface_cmp((IUnknown*)elem_doc, (IUnknown*)doc_node), "disp != doc\n"); IHTMLDocument2_Release(doc_node); + IHTMLDocument2_Release(elem_doc); IHTMLElement_Release(elem); } @@ -5619,6 +5677,7 @@ static void test_frame(IDispatch *disp, const char *exp_id) if(FAILED(hres)) return; + test_frame_doc((IUnknown*)frame_elem); test_elem_id((IUnknown*)frame_elem, exp_id); IHTMLElement_Release(frame_elem); @@ -5721,7 +5780,7 @@ static void test_frameset(IHTMLDocument2 *doc) ok(hres == S_OK, "IHTMLFramesCollection2_item failed: 0x%08x\n", hres); if(SUCCEEDED(hres)) { ok(V_VT(&result_var) == VT_DISPATCH, "result type should have been VT_DISPATCH, was: 0x%x\n", V_VT(&result_var)); - test_frame((IDispatch*)V_DISPATCH(&result_var), "fr1"); + test_frame(V_DISPATCH(&result_var), "fr1"); } VariantClear(&result_var); VariantClear(&index_var);

1 0

Nathan Gallaher : msi: Support _Streams, _Storages tablename prefixes in SELECT.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: abb23d8bd5004dd031e0ab978208845ac2fe363d URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb23d8bd5004dd031e0ab978… Author: Nathan Gallaher <ngallaher(a)deepthought.org> Date: Thu Nov 12 22:59:03 2009 -0500 msi: Support _Streams, _Storages tablename prefixes in SELECT. --- dlls/msi/storages.c | 11 +++++++++++ dlls/msi/streams.c | 11 +++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 005bcdb..844db8d 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -296,6 +296,7 @@ static UINT STORAGES_get_column_info(struct tagMSIVIEW *view, UINT n, static const WCHAR Name[] = {'N','a','m','e',0}; static const WCHAR Data[] = {'D','a','t','a',0}; + static const WCHAR _Storages[] = {'_','S','t','o','r','a','g','e','s',0}; TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary, table_name); @@ -322,6 +323,16 @@ static UINT STORAGES_get_column_info(struct tagMSIVIEW *view, UINT n, if (!*name) return ERROR_FUNCTION_FAILED; } + if (table_name) + { + *table_name = strdupW(_Storages); + if (!*table_name) + { + msi_free(name); + return ERROR_FUNCTION_FAILED; + } + } + if (temporary) *temporary = FALSE; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 23ae971..faa27c8 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -262,6 +262,7 @@ static UINT STREAMS_get_column_info(struct tagMSIVIEW *view, UINT n, static const WCHAR Name[] = {'N','a','m','e',0}; static const WCHAR Data[] = {'D','a','t','a',0}; + static const WCHAR _Streams[] = {'_','S','t','r','e','a','m','s',0}; TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary, table_name); @@ -288,6 +289,16 @@ static UINT STREAMS_get_column_info(struct tagMSIVIEW *view, UINT n, if (!*name) return ERROR_FUNCTION_FAILED; } + if (table_name) + { + *table_name = strdupW(_Streams); + if (!*table_name) + { + msi_free(name); + return ERROR_FUNCTION_FAILED; + } + } + if (temporary) *temporary = FALSE;

1 0

Rob Shearman : ole32: Fix circular reference count in default handler objects.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 6592c25bc749373cad0e7584ef13e010b4a2431d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6592c25bc749373cad0e7584e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Nov 24 14:06:57 2009 +0000 ole32: Fix circular reference count in default handler objects. This is caused by caching a pointer and reference to the data cache's IPersistStorage interface without managing reference counts appropriately. --- dlls/ole32/defaulthandler.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index a3da0dd..5130513 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1960,9 +1960,21 @@ static DefaultHandler* DefaultHandler_Construct( &IID_IUnknown, (void**)&This->dataCache); if(SUCCEEDED(hr)) + { hr = IUnknown_QueryInterface(This->dataCache, &IID_IPersistStorage, (void**)&This->dataCache_PersistStg); + /* keeping a reference to This->dataCache_PersistStg causes us to keep a + * reference on the outer object */ + if (SUCCEEDED(hr)) + IUnknown_Release(This->outerUnknown); + else + IUnknown_Release(This->dataCache); + } if(FAILED(hr)) + { ERR("Unexpected error creating data cache\n"); + HeapFree(GetProcessHeap(), 0, This); + return NULL; + } This->clsid = *clsid; This->clientSite = NULL; @@ -2009,6 +2021,13 @@ static DefaultHandler* DefaultHandler_Construct( static void DefaultHandler_Destroy( DefaultHandler* This) { + TRACE("(%p)\n", This); + + /* AddRef/Release may be called on this object during destruction. + * Prevent the object being destroyed recursively by artificially raising + * the reference count. */ + This->ref = 10000; + /* release delegates */ DefaultHandler_Stop(This); release_delegates(This); @@ -2020,6 +2039,9 @@ static void DefaultHandler_Destroy( if (This->dataCache) { + /* to balance out the release of dataCache_PersistStg which will result + * in a reference being released from the outer unknown */ + IUnknown_AddRef(This->outerUnknown); IPersistStorage_Release(This->dataCache_PersistStg); IUnknown_Release(This->dataCache); This->dataCache_PersistStg = NULL;

1 0

Jeremy White : winspool: Add a test showing Windows behavior wrt size and GetPrinterDriverA.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 2feb43f57301ebbee7929a82ebf69a3c7df5e49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2feb43f57301ebbee7929a82e… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Nov 24 07:31:21 2009 -0600 winspool: Add a test showing Windows behavior wrt size and GetPrinterDriverA. This behavior was discovered by Huw Davies. --- dlls/winspool.drv/tests/info.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index c6c0066..2fb09f3 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -70,6 +70,7 @@ static BOOL (WINAPI * pGetDefaultPrinterA)(LPSTR, LPDWORD); static BOOL (WINAPI * pSetDefaultPrinterA)(LPCSTR); static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); static BOOL (WINAPI * pAddPortExA)(LPSTR, DWORD, LPBYTE, LPSTR); +static BOOL (WINAPI * pGetPrinterDriverW)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD); /* ################################ */ @@ -2260,6 +2261,15 @@ static void test_GetPrinterDriver(void) continue; } + /* GetPrinterDriverA returns the same number of bytes as GetPrinterDriverW */ + if (! ret && pGetPrinterDriverW) + { + DWORD double_needed; + ret = pGetPrinterDriverW(hprn, NULL, level, NULL, 0, &double_needed); + todo_wine + ok(double_needed == needed, "GetPrinterDriverA returned different size %d than GetPrinterDriverW (%d)\n", needed, double_needed); + } + buf = HeapAlloc(GetProcessHeap(), 0, needed); SetLastError(0xdeadbeef); @@ -2536,6 +2546,7 @@ START_TEST(info) hwinspool = GetModuleHandleA("winspool.drv"); pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); + pGetPrinterDriverW = (void *) GetProcAddress(hwinspool, "GetPrinterDriverW"); pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA");

1 0

Nathan Gallaher : msi: Add support for table names in select statements.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 5c56e1f440049e0676b81f74c182d4ce25661dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c56e1f440049e0676b81f74c… Author: Nathan Gallaher <ngallaher(a)deepthought.org> Date: Mon Nov 9 20:41:43 2009 -0500 msi: Add support for table names in select statements. Propagate tablename from 'SELECT tablename.column from tablename' queries into VIEW_find_column(). Previously, the tablename had been dropped. --- dlls/msi/select.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/select.c b/dlls/msi/select.c index c4b9e80..f6b5dae 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -368,12 +368,14 @@ static const MSIVIEWOPS select_ops = NULL, }; -static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name ) +static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name, + LPCWSTR table_name ) { UINT r, n=0; MSIVIEW *table; - TRACE("%p adding %s\n", sv, debugstr_w( name ) ); + TRACE("%p adding %s.%s\n", sv, debugstr_w( table_name ), + debugstr_w( name )); if( sv->view.ops != &select_ops ) return ERROR_FUNCTION_FAILED; @@ -389,7 +391,7 @@ static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name ) if( sv->num_cols >= sv->max_cols ) return ERROR_FUNCTION_FAILED; - r = VIEW_find_column( table, name, NULL, &n ); + r = VIEW_find_column( table, name, table_name, &n ); if( r != ERROR_SUCCESS ) return r; @@ -433,7 +435,7 @@ UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, while( columns ) { - r = SELECT_AddColumn( sv, columns->column ); + r = SELECT_AddColumn( sv, columns->column, columns->table ); if( r ) break; columns = columns->next;

1 0

Paul Chitescu : wineserver: Do not uselessly set the KEY_DIRTY flag on registry keys when loading from file .
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 51000c171b256b1367550cfab6f77d34d8c63f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51000c171b256b1367550cfab… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Nov 24 15:12:56 2009 +0200 wineserver: Do not uselessly set the KEY_DIRTY flag on registry keys when loading from file. --- server/registry.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/server/registry.c b/server/registry.c index 1fa2c67..afdffed 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1257,7 +1257,6 @@ static int load_value( struct key *key, const char *buffer, struct file_load_inf value->data = newptr; value->len = len; value->type = type; - make_dirty( key ); return 1; error: @@ -1266,7 +1265,6 @@ static int load_value( struct key *key, const char *buffer, struct file_load_inf value->data = NULL; value->len = 0; value->type = REG_NONE; - make_dirty( key ); return 0; } @@ -1304,7 +1302,6 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi struct key *subkey = NULL; struct file_load_info info; char *p; - int flags = (key->flags & KEY_VOLATILE) ? KEY_VOLATILE : KEY_DIRTY; info.filename = filename; info.file = f; @@ -1334,7 +1331,7 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi case '[': /* new key */ if (subkey) release_object( subkey ); if (prefix_len == -1) prefix_len = get_prefix_len( key, p + 1, &info ); - if (!(subkey = load_key( key, p + 1, flags, prefix_len, &info ))) + if (!(subkey = load_key( key, p + 1, key->flags, prefix_len, &info ))) file_read_error( "Error creating key", &info ); break; case '@': /* default value */

1 0

Rob Shearman : ole32: Fix a typo in PropertyStorage_WritePropertyToStream that caused the wrong data to be written to the stream .
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 4b1d527b15dc2781feade1378bdce59377b54d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1d527b15dc2781feade1378… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Nov 24 14:05:06 2009 +0000 ole32: Fix a typo in PropertyStorage_WritePropertyToStream that caused the wrong data to be written to the stream. The field pClipData is a pointer to the data to be written, not the start of it. --- dlls/ole32/stg_prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 1c77c9e..bc45cea 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1735,7 +1735,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, hr = IStream_Write(This->stm, cf_hdr, sizeof(cf_hdr), &count); if (FAILED(hr)) goto end; - hr = IStream_Write(This->stm, &var->u.pclipdata->pClipData, len, &count); + hr = IStream_Write(This->stm, var->u.pclipdata->pClipData, len, &count); if (FAILED(hr)) goto end; bytesWritten = count + sizeof cf_hdr;

1 0

Paul Vriens : shell32/tests: Fix test failures on several platforms.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: ac85305c95e6e26954f3b3aea4909371ba36d674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac85305c95e6e26954f3b3aea… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 24 17:06:45 2009 +0100 shell32/tests: Fix test failures on several platforms. --- dlls/shell32/tests/progman_dde.c | 68 ++++++++++++++++++++++++++++++-------- 1 files changed, 54 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index c2ff934..09eb791 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -76,6 +76,45 @@ static void init_function_pointers(void) pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA"); } +static char Group1Title[MAX_PATH] = "Group1"; +static char Group2Title[MAX_PATH] = "Group2"; +static char Group3Title[MAX_PATH] = "Group3"; +static char Startup[MAX_PATH] = "Startup"; +static char StartupTitle[MAX_PATH] = "Startup"; + +static void init_strings(void) +{ + HKEY key; + DWORD fullpath = 0; + DWORD size = sizeof(DWORD); + + if (!pSHGetSpecialFolderPathA) + return; + + RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key); + RegQueryValueExA(key, "FullPath", NULL, NULL, (LPBYTE)&fullpath, &size); + RegCloseKey(key); + if (fullpath == 1) + { + BOOL ret; + char commonprog[MAX_PATH], startup[MAX_PATH]; + + ret = SHGetSpecialFolderPathA(NULL, commonprog, CSIDL_COMMON_PROGRAMS, FALSE); + if (!ret) /* Win9x */ + SHGetSpecialFolderPathA(NULL, commonprog, CSIDL_PROGRAMS, FALSE); + lstrcpyA(Group1Title, commonprog); + lstrcatA(Group1Title, "\\Group1"); + lstrcpyA(Group2Title, commonprog); + lstrcatA(Group2Title, "\\Group2"); + lstrcpyA(Group3Title, commonprog); + lstrcatA(Group3Title, "\\Group3"); + + SHGetSpecialFolderPathA(NULL, startup, CSIDL_STARTUP, FALSE); + lstrcpyA(StartupTitle, startup); + lstrcpyA(Startup, (strrchr(StartupTitle, '\\') + 1)); + } +} + static HDDEDATA CALLBACK DdeCallback(UINT type, UINT format, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hDDEData, ULONG_PTR data1, ULONG_PTR data2) { @@ -316,7 +355,7 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx * 2. window is open */ static void CreateGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, int testParams) + const char *groupName, const char *windowTitle, int testParams) { HDDEDATA hData; UINT error; @@ -337,7 +376,7 @@ static void CreateGroupTest(DWORD instance, HCONV hConv, const char *command, UI /* Check if Group Now Exists */ CheckFileExistsInProgramGroups(groupName, TRUE, TRUE, NULL, testParams); /* Check if Window is Open (polling) */ - CheckWindowCreated(groupName, TRUE, testParams); + CheckWindowCreated(windowTitle, TRUE, testParams); } } @@ -347,7 +386,7 @@ static void CreateGroupTest(DWORD instance, HCONV hConv, const char *command, UI * 1. window is open */ static void ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, int closeAfterShowing, int testParams) + const char *groupName, const char *windowTitle, int closeAfterShowing, int testParams) { HDDEDATA hData; UINT error; @@ -372,7 +411,7 @@ static void ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT if (error == DMLERR_NO_ERROR) { /* Check if Window is Open (polling) */ - CheckWindowCreated(groupName, closeAfterShowing, testParams); + CheckWindowCreated(windowTitle, closeAfterShowing, testParams); } } @@ -461,7 +500,7 @@ static void DeleteItemTest(DWORD instance, HCONV hConv, const char *command, UIN * AddItems) so this covers minimum expected functionality. */ static void CompoundCommandTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, const char *fileName1, + const char *groupName, const char *windowTitle, const char *fileName1, const char *fileName2, int testParams) { HDDEDATA hData; @@ -479,7 +518,7 @@ static void CompoundCommandTest(DWORD instance, HCONV hConv, const char *command { /* Check that File exists */ CheckFileExistsInProgramGroups(groupName, TRUE, TRUE, NULL, testParams); - CheckWindowCreated(groupName, FALSE, testParams); + CheckWindowCreated(windowTitle, FALSE, testParams); CheckFileExistsInProgramGroups(fileName1, TRUE, FALSE, groupName, testParams); CheckFileExistsInProgramGroups(fileName2, TRUE, FALSE, groupName, testParams); } @@ -499,26 +538,26 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) GetStringFromError(DMLERR_NOTPROCESSED), GetStringFromError(error)); /* CreateGroup Tests (including AddItem, DeleteItem) */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); + CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); AddItemTest(instance, hConv, "[AddItem(c:\\f1g1,f1g1Name)]", DMLERR_NO_ERROR, "f1g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); AddItemTest(instance, hConv, "[AddItem(c:\\f2g1,f2g1Name)]", DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); DeleteItemTest(instance, hConv, "[DeleteItem(f2g1Name)]", DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_DELETEITEM|testnum++); AddItemTest(instance, hConv, "[AddItem(c:\\f3g1,f3g1Name)]", DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_ADDITEM|testnum++); - CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); + CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); /* Create Group that already exists - same instance */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); + CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); /* ShowGroup Tests */ - ShowGroupTest(instance, hConv, "[ShowGroup(Group1)]", DMLERR_NOTPROCESSED, "Startup", TRUE, DDE_TEST_SHOWGROUP|testnum++); + ShowGroupTest(instance, hConv, "[ShowGroup(Group1)]", DMLERR_NOTPROCESSED, Startup, StartupTitle, TRUE, DDE_TEST_SHOWGROUP|testnum++); DeleteItemTest(instance, hConv, "[DeleteItem(f3g1Name)]", DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_COMMON|DDE_TEST_DELETEITEM|testnum++); - ShowGroupTest(instance, hConv, "[ShowGroup(Startup,0)]", DMLERR_NO_ERROR, "Startup", TRUE, DDE_TEST_SHOWGROUP|testnum++); - ShowGroupTest(instance, hConv, "[ShowGroup(Group1,0)]", DMLERR_NO_ERROR, "Group1", FALSE, DDE_TEST_SHOWGROUP|testnum++); + ShowGroupTest(instance, hConv, "[ShowGroup(Startup,0)]", DMLERR_NO_ERROR, Startup, StartupTitle, TRUE, DDE_TEST_SHOWGROUP|testnum++); + ShowGroupTest(instance, hConv, "[ShowGroup(Group1,0)]", DMLERR_NO_ERROR, "Group1", Group1Title, FALSE, DDE_TEST_SHOWGROUP|testnum++); /* DeleteGroup Test - Note that Window is Open for this test */ DeleteGroupTest(instance, hConv, "[DeleteGroup(Group1)]", DMLERR_NO_ERROR, "Group1", DDE_TEST_DELETEGROUP|testnum++); /* Compound Execute String Command */ - CompoundCommandTest(instance, hConv, "[CreateGroup(Group3)][AddItem(c:\\f1g3,f1g3Name)][AddItem(c:\\f2g3,f2g3Name)]", DMLERR_NO_ERROR, "Group3", "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMMON|DDE_TEST_COMPOUND|testnum++); + CompoundCommandTest(instance, hConv, "[CreateGroup(Group3)][AddItem(c:\\f1g3,f1g3Name)][AddItem(c:\\f2g3,f2g3Name)]", DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMMON|DDE_TEST_COMPOUND|testnum++); DeleteGroupTest(instance, hConv, "[DeleteGroup(Group3)]", DMLERR_NO_ERROR, "Group3", DDE_TEST_DELETEGROUP|testnum++); /* Full Parameters of Add Item */ @@ -531,7 +570,7 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) static void DdeTestProgman2(DWORD instance, HCONV hConv, int testnum) { /* Create Group that already exists on a separate connection */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); + CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_COMMON|DDE_TEST_CREATEGROUP|testnum++); DeleteGroupTest(instance, hConv, "[DeleteGroup(Group2)]", DMLERR_NO_ERROR, "Group2", DDE_TEST_COMMON|DDE_TEST_DELETEGROUP|testnum++); } @@ -544,6 +583,7 @@ START_TEST(progman_dde) int testnum; init_function_pointers(); + init_strings(); /* Only report this once */ if (!pSHGetSpecialFolderPathA)

1 0

Nathan Gallaher : msi/tests: Test for SELECT table.column FROM table.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: f7ba4b2ec00c19d3c97b46d6395ba606100f7f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ba4b2ec00c19d3c97b46d63… Author: Nathan Gallaher <ngallaher(a)deepthought.org> Date: Sun Nov 15 22:33:29 2009 -0500 msi/tests: Test for SELECT table.column FROM table. Make sure that mixing table columns returns the expected data. eg: SELECT t1.action, t2.action FROM t1, t2 should return distinct data. --- dlls/msi/tests/db.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 19cd74c..041e860 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -7901,6 +7901,80 @@ static void test_dbmerge(void) DeleteFileA("binary.dat"); } +static void test_select_with_tablenames(void) +{ + MSIHANDLE hdb, view, rec; + LPCSTR query; + UINT r; + int i; + + int vals[4][2] = { + {1,12}, + {4,12}, + {1,15}, + {4,15}}; + + hdb = create_db(); + ok(hdb, "failed to create db\n"); + + /* Build a pair of tables with the same column names, but unique data */ + query = "CREATE TABLE `T1` ( `A` SHORT, `B` SHORT PRIMARY KEY `A`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `T1` ( `A`, `B` ) VALUES ( 1, 2 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `T1` ( `A`, `B` ) VALUES ( 4, 5 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `T2` ( `A` SHORT, `B` SHORT PRIMARY KEY `A`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `T2` ( `A`, `B` ) VALUES ( 11, 12 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `T2` ( `A`, `B` ) VALUES ( 14, 15 )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + + /* Test that selection based on prefixing the column with the table + * actually selects the right data */ + + query = "SELECT T1.A, T2.B FROM T1,T2"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + for (i = 0; i < 4; i++) + { + r = MsiViewFetch(view, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(rec, 1); + ok(r == vals[i][0], "Expected %d, got %d\n", vals[i][0], r); + + r = MsiRecordGetInteger(rec, 2); + ok(r == vals[i][1], "Expected %d, got %d\n", vals[i][1], r); + + MsiCloseHandle(rec); + } + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(view); + MsiCloseHandle(view); + MsiCloseHandle(hdb); + DeleteFileA(msifile); +} + UINT ordervals[6][3] = { { MSI_NULL_INTEGER, 12, 13 }, @@ -8579,6 +8653,7 @@ START_TEST(db) test_dbtopackage(); test_droptable(); test_dbmerge(); + test_select_with_tablenames(); test_insertorder(); test_columnorder(); test_suminfo_import();

1 0

Andrew Nguyen : msvcr71: Forward more exports to msvcrt.
by Alexandre Julliard Nov. 24, 2009

Nov. 24, 2009

Module: wine Branch: master Commit: 663cef29f8add5e50f42a267ade62f740a9e6d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663cef29f8add5e50f42a267a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Nov 24 04:52:07 2009 -0600 msvcr71: Forward more exports to msvcrt. --- dlls/msvcr71/msvcr71.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 0beec0c..2a35217 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -363,7 +363,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind @ cdecl _loaddll(str) msvcrt._loaddll @ cdecl _local_unwind2(ptr long) msvcrt._local_unwind2 -@ stub _localtime64 +@ cdecl _localtime64(ptr) msvcrt._localtime64 @ cdecl _lock(long) msvcrt._lock @ cdecl _locking(long long long) msvcrt._locking @ cdecl _logb(double) msvcrt._logb @@ -435,7 +435,7 @@ @ cdecl _memicmp(str str long) msvcrt._memicmp @ cdecl _mkdir(str) msvcrt._mkdir @ cdecl _mktemp(str) msvcrt._mktemp -@ stub _mktime64 +@ cdecl _mktime64(ptr) msvcrt._mktime64 @ cdecl _msize(ptr) msvcrt._msize @ cdecl _nextafter(double double) msvcrt._nextafter @ cdecl _onexit(ptr) msvcrt._onexit @@ -527,7 +527,7 @@ @ cdecl _tell(long) msvcrt._tell @ cdecl -ret64 _telli64(long) msvcrt._telli64 @ cdecl _tempnam(str str) msvcrt._tempnam -@ stub _time64 +@ cdecl _time64(ptr) msvcrt._time64 @ extern _timezone msvcrt._timezone @ cdecl _tolower(long) msvcrt._tolower @ cdecl _toupper(long) msvcrt._toupper

1 0