May 2010 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Add a test for properties updated by a patch.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: c2ce56146991ad2786458101d4e11bd6522b703e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ce56146991ad2786458101d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:18:47 2010 +0200 msi: Add a test for properties updated by a patch. --- dlls/msi/tests/patch.c | 65 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 56af5f8..4de2fd0 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -54,7 +54,8 @@ static const char property_dat[] = "UpgradeCode\t{A2E3D643-4E2C-477F-A309-F76F552D5F43}\n" "ProductLanguage\t1033\n" "ProductName\tmsitest\n" - "ProductVersion\t1.1.1\n"; + "ProductVersion\t1.1.1\n" + "PATCHNEWSUMMARYSUBJECT\tInstaller Database\n"; static const char media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" @@ -708,6 +709,48 @@ static void test_simple_patch( void ) "InstallSource", install_source, &size ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + strcpy( path, CURR_DIR ); + strcat( path, "\\" ); + strcat( path, msifile ); + + r = MsiOpenPackageA( path, &hpackage ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + hdb = MsiGetActiveDatabase( hpackage ); + ok( hdb, "failed to get database handle\n" ); + + query = "SELECT * FROM `Property` where `Property` = 'PATCHNEWPACKAGECODE'"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + + query = "SELECT * FROM `Property` WHERE `Property` = 'PATCHNEWSUMMARYSUBJECT' " + "AND `Value` = 'Installer Database'"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + + MsiCloseHandle( hdb ); + MsiCloseHandle( hpackage ); + r = MsiApplyPatchA( mspfile, NULL, INSTALLTYPE_DEFAULT, NULL ); ok( r == ERROR_SUCCESS || broken( r == ERROR_PATCH_PACKAGE_INVALID ), /* version 2.0 */ "expected ERROR_SUCCESS, got %u\n", r ); @@ -721,10 +764,6 @@ static void test_simple_patch( void ) size = get_pf_file_size( "msitest\\patch.txt" ); ok( size == 1002, "expected 1002, got %u\n", size ); - strcpy( path, CURR_DIR ); - strcat( path, "\\" ); - strcat( path, msifile ); - /* show that MsiOpenPackage applies registered patches */ r = MsiOpenPackageA( path, &hpackage ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); @@ -745,6 +784,22 @@ static void test_simple_patch( void ) MsiCloseHandle( hrec ); MsiViewClose( hview ); MsiCloseHandle( hview ); + + query = "SELECT * FROM `Property` WHERE `Property` = 'PATCHNEWSUMMARYSUBJECT' " + "AND `Value` = 'Installation Database'"; + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + todo_wine ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hdb ); MsiCloseHandle( hpackage );

1 0

Hans Leidekker : msi: End the search for a directory signature if the parent cannot be found.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: c35856dd09b78abf8142d1cbc02baa20af4292b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35856dd09b78abf8142d1cbc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:19:02 2010 +0200 msi: End the search for a directory signature if the parent cannot be found. --- dlls/msi/appsearch.c | 8 +++++--- dlls/msi/tests/package.c | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 18b95ac..336bfca 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -929,7 +929,8 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU 'D','r','L','o','c','a','t','o','r',' ', 'w','h','e','r','e',' ', 'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; - LPWSTR parentName = NULL, parent = NULL; + LPWSTR parent = NULL; + LPCWSTR parentName; WCHAR path[MAX_PATH]; WCHAR expanded[MAX_PATH]; MSIRECORD *row; @@ -949,14 +950,15 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU } /* check whether parent is set */ - parentName = msi_dup_record_field(row,2); + parentName = MSI_RecordGetString(row, 2); if (parentName) { MSISIGNATURE parentSig; rc = ACTION_AppSearchSigName(package, parentName, &parentSig, &parent); ACTION_FreeSignature(&parentSig); - msi_free(parentName); + if (!parent) + return ERROR_SUCCESS; } sz = MAX_PATH; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ce15c66..d2514ce 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8742,6 +8742,9 @@ static void test_appsearch_drlocator(void) r = add_appsearch_entry(hdb, "'SIGPROP11', 'NewSignature11'"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = add_appsearch_entry(hdb, "'SIGPROP13', 'NewSignature13'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_drlocator_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8800,6 +8803,18 @@ static void test_appsearch_drlocator(void) r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_reglocator_table(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* parent */ + r = add_reglocator_entry(hdb, "'NewSignature12', 2, 'htmlfile\\shell\\open\\nonexistent', '', 1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* parent is in RegLocator, no path, depth 0, no signature */ + sprintf(path, "'NewSignature13', 'NewSignature12', '', 0"); + r = add_drlocator_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_signature_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -8906,6 +8921,12 @@ static void test_appsearch_drlocator(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpiA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + size = MAX_PATH; + strcpy(path, "c:\\"); + r = MsiGetPropertyA(hpkg, "SIGPROP13", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!prop[0], "Expected \"\", got \"%s\"\n", prop); + DeleteFileA("FileName1"); DeleteFileA("FileName3.dll"); DeleteFileA("FileName4.dll");

1 0

Hans Leidekker : wininet: Implement InternetQueryOption( INTERNET_OPTION_CONTEXT_VALUE).
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: 67b1eecaf26d854791b3098d6bfa14fb200afc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b1eecaf26d854791b3098d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:19:45 2010 +0200 wininet: Implement InternetQueryOption(INTERNET_OPTION_CONTEXT_VALUE). --- dlls/wininet/internet.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5159687..5b1913a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2357,6 +2357,25 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; case INTERNET_OPTION_POLICY: return ERROR_INVALID_PARAMETER; + case INTERNET_OPTION_CONTEXT_VALUE: + { + if (!hdr) + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + if (!size) + return ERROR_INVALID_PARAMETER; + + if (*size < sizeof(DWORD_PTR)) + { + *size = sizeof(DWORD_PTR); + return ERROR_INSUFFICIENT_BUFFER; + } + if (!buffer) + return ERROR_INVALID_PARAMETER; + + *(DWORD_PTR *)buffer = hdr->dwContext; + *size = sizeof(DWORD_PTR); + return ERROR_SUCCESS; + } } FIXME("Stub for %d\n", option);

1 0

Hans Leidekker : wininet: Pass the object header pointer to INET_QueryOption.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: 80dd367846ffcbe58268b3088caf0059a482c339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80dd367846ffcbe58268b3088… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 25 12:19:32 2010 +0200 wininet: Pass the object header pointer to INET_QueryOption. --- dlls/wininet/ftp.c | 6 +++--- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 8 ++++---- dlls/wininet/internet.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 1f03199..80cc6f0 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1176,7 +1176,7 @@ static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffe } } } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) @@ -2395,7 +2395,7 @@ static DWORD FTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *bu return ERROR_SUCCESS; } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static const object_vtbl_t FTPSESSIONVtbl = { @@ -3476,7 +3476,7 @@ static DWORD FTPFINDNEXT_QueryOption(object_header_t *hdr, DWORD option, void *b return ERROR_SUCCESS; } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static DWORD FTPFINDNEXT_FindNextFileW(object_header_t *hdr, void *data) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ac0edea..200d03f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1754,7 +1754,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe } } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size) @@ -4166,7 +4166,7 @@ static DWORD HTTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *b return ERROR_SUCCESS; } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static DWORD HTTPSESSION_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 73e9e66..5159687 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -812,7 +812,7 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe } } - return INET_QueryOption(option, buffer, size, unicode); + return INET_QueryOption(hdr, option, buffer, size, unicode); } static const object_vtbl_t APPINFOVtbl = { @@ -2194,7 +2194,7 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, return res == ERROR_SUCCESS; } -DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) +DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { static BOOL warn = TRUE; @@ -2388,7 +2388,7 @@ BOOL WINAPI InternetQueryOptionW(HINTERNET hInternet, DWORD dwOption, WININET_Release(hdr); } }else { - res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, TRUE); + res = INET_QueryOption(NULL, dwOption, lpBuffer, lpdwBufferLength, TRUE); } if(res != ERROR_SUCCESS) @@ -2421,7 +2421,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption, WININET_Release(hdr); } }else { - res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, FALSE); + res = INET_QueryOption(NULL, dwOption, lpBuffer, lpdwBufferLength, FALSE); } if(res != ERROR_SUCCESS) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 64bfdaa..07b92d8 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -389,7 +389,7 @@ object_header_t *WININET_AddRef( object_header_t *info ); BOOL WININET_Release( object_header_t *info ); BOOL WININET_FreeHandle( HINTERNET hinternet ); -DWORD INET_QueryOption(DWORD,void*,DWORD*,BOOL); +DWORD INET_QueryOption( object_header_t *, DWORD, void *, DWORD *, BOOL ); time_t ConvertTimeString(LPCWSTR asctime);

1 0

Alexandre Julliard : ole32: Implement the IAdviseSink call_as proxies and stubs.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: 78d1686b90ea8cb0a3223ffb628c210349239bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d1686b90ea8cb0a3223ffb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 25 12:49:08 2010 +0200 ole32: Implement the IAdviseSink call_as proxies and stubs. Based on a patch by Rob Shearman. --- dlls/ole32/usrmarshal.c | 48 +++++++++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index ed31620..2d238e6 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2761,7 +2761,8 @@ void CALLBACK IAdviseSink_OnDataChange_Proxy( FORMATETC *pFormatetc, STGMEDIUM *pStgmed) { - FIXME(":stub\n"); + TRACE("(%p)->(%p, %p)\n", This, pFormatetc, pStgmed); + IAdviseSink_RemoteOnDataChange_Proxy(This, pFormatetc, pStgmed); } HRESULT __RPC_STUB IAdviseSink_OnDataChange_Stub( @@ -2769,8 +2770,9 @@ HRESULT __RPC_STUB IAdviseSink_OnDataChange_Stub( FORMATETC *pFormatetc, ASYNC_STGMEDIUM *pStgmed) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", This, pFormatetc, pStgmed); + IAdviseSink_OnDataChange(This, pFormatetc, pStgmed); + return S_OK; } void CALLBACK IAdviseSink_OnViewChange_Proxy( @@ -2778,7 +2780,8 @@ void CALLBACK IAdviseSink_OnViewChange_Proxy( DWORD dwAspect, LONG lindex) { - FIXME(":stub\n"); + TRACE("(%p)->(%d, %d)\n", This, dwAspect, lindex); + IAdviseSink_RemoteOnViewChange_Proxy(This, dwAspect, lindex); } HRESULT __RPC_STUB IAdviseSink_OnViewChange_Stub( @@ -2786,64 +2789,73 @@ HRESULT __RPC_STUB IAdviseSink_OnViewChange_Stub( DWORD dwAspect, LONG lindex) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%d, %d)\n", This, dwAspect, lindex); + IAdviseSink_OnViewChange(This, dwAspect, lindex); + return S_OK; } void CALLBACK IAdviseSink_OnRename_Proxy( IAdviseSink* This, IMoniker *pmk) { - FIXME(":stub\n"); + TRACE("(%p)->(%p)\n", This, pmk); + IAdviseSink_RemoteOnRename_Proxy(This, pmk); } HRESULT __RPC_STUB IAdviseSink_OnRename_Stub( IAdviseSink* This, IMoniker *pmk) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pmk); + IAdviseSink_OnRename(This, pmk); + return S_OK; } void CALLBACK IAdviseSink_OnSave_Proxy( IAdviseSink* This) { - FIXME(":stub\n"); + TRACE("(%p)\n", This); + IAdviseSink_RemoteOnSave_Proxy(This); } HRESULT __RPC_STUB IAdviseSink_OnSave_Stub( IAdviseSink* This) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)\n", This); + IAdviseSink_OnSave(This); + return S_OK; } void CALLBACK IAdviseSink_OnClose_Proxy( IAdviseSink* This) { - FIXME(":stub\n"); + TRACE("(%p)\n", This); + IAdviseSink_RemoteOnClose_Proxy(This); } HRESULT __RPC_STUB IAdviseSink_OnClose_Stub( IAdviseSink* This) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)\n", This); + IAdviseSink_OnClose(This); + return S_OK; } void CALLBACK IAdviseSink2_OnLinkSrcChange_Proxy( IAdviseSink2* This, IMoniker *pmk) { - FIXME(":stub\n"); + TRACE("(%p)->(%p)\n", This, pmk); + IAdviseSink2_RemoteOnLinkSrcChange_Proxy(This, pmk); } HRESULT __RPC_STUB IAdviseSink2_OnLinkSrcChange_Stub( IAdviseSink2* This, IMoniker *pmk) { - FIXME(":stub\n"); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pmk); + IAdviseSink2_OnLinkSrcChange(This, pmk); + return S_OK; } HRESULT CALLBACK IDataObject_GetData_Proxy(

1 0

Damjan Jovanovic : winemenubuilder: Use the full path to start.exe.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: dfdb349cdc3bd74f9e8ba99be4ae63d6a609ad18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfdb349cdc3bd74f9e8ba99be… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon May 24 21:18:08 2010 +0200 winemenubuilder: Use the full path to start.exe. --- programs/winemenubuilder/winemenubuilder.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index eba21ef..413e5de 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2366,6 +2366,16 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package return hasChanged; } +static char *get_start_exe_path(void) + { + static const WCHAR startW[] = {'\\','c','o','m','m','a','n','d', + '\\','s','t','a','r','t','.','e','x','e',0}; + WCHAR start_path[MAX_PATH]; + GetWindowsDirectoryW(start_path, MAX_PATH); + lstrcatW(start_path, startW); + return escape(start_path); +} + static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) { static const WCHAR startW[] = {'\\','c','o','m','m','a','n','d', @@ -2379,6 +2389,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) DWORD csidl = -1; HANDLE hsem = NULL; char *unix_link = NULL; + char *start_path = NULL; if ( !link ) { @@ -2503,6 +2514,13 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) goto cleanup; } + start_path = get_start_exe_path(); + if (start_path == NULL) + { + WINE_ERR("out of memory\n"); + goto cleanup; + } + /* building multiple menus concurrently has race conditions */ hsem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); if( WAIT_OBJECT_0 != MsgWaitForMultipleObjects( 1, &hsem, FALSE, INFINITE, QS_ALLINPUT ) ) @@ -2540,7 +2558,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) char *menuarg = heap_printf("/Unix %s", escaped_lnk); if (menuarg) { - r = !write_menu_entry(unix_link, link_name, "start", menuarg, description, work_dir, icon_name); + r = !write_menu_entry(unix_link, link_name, start_path, menuarg, description, work_dir, icon_name); HeapFree(GetProcessHeap(), 0, menuarg); } HeapFree(GetProcessHeap(), 0, escaped_lnk); @@ -2559,7 +2577,8 @@ cleanup: HeapFree( GetProcessHeap(), 0, escaped_args ); HeapFree( GetProcessHeap(), 0, escaped_path ); HeapFree( GetProcessHeap(), 0, description ); - HeapFree( GetProcessHeap(), 0, unix_link); + HeapFree( GetProcessHeap(), 0, unix_link ); + HeapFree( GetProcessHeap(), 0, start_path ); if (r && !bWait) WINE_ERR("failed to build the menu\n" );

1 0

Matteo Bruni : d3dx9: Stricter checks for relative addressing in the shader assembler.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: 084d5f1f6c248a68feb1ee956dbc9ce836368570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=084d5f1f6c248a68feb1ee956… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon May 24 17:18:55 2010 +0200 d3dx9: Stricter checks for relative addressing in the shader assembler. --- dlls/d3dx9_36/asmparser.c | 121 +++++++++++++++++++++++--------------------- dlls/d3dx9_36/tests/asm.c | 15 ++++++ 2 files changed, 78 insertions(+), 58 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 539cacd..0242909 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -382,6 +382,7 @@ static void check_ps_dstmod(struct asm_parser *This, DWORD dstmod) { struct allowed_reg_type { DWORD type; DWORD count; + BOOL reladdr; }; static BOOL check_reg_type(const struct shader_reg *reg, @@ -390,9 +391,13 @@ static BOOL check_reg_type(const struct shader_reg *reg, while(allowed[i].type != ~0U) { if(reg->type == allowed[i].type) { - if(reg->rel_reg) return TRUE; /* The relative addressing register - can have a negative value, we - can't check the register index */ + if(reg->rel_reg) { + if(allowed[i].reladdr) + return TRUE; /* The relative addressing register + can have a negative value, we + can't check the register index */ + return FALSE; + } if(reg->regnum < allowed[i].count) return TRUE; return FALSE; } @@ -403,18 +408,18 @@ static BOOL check_reg_type(const struct shader_reg *reg, /* Native assembler doesn't do separate checks for src and dst registers */ static const struct allowed_reg_type vs_2_reg_allowed[] = { - { BWRITERSPR_TEMP, 12 }, - { BWRITERSPR_INPUT, 16 }, - { BWRITERSPR_CONST, ~0U }, - { BWRITERSPR_ADDR, 1 }, - { BWRITERSPR_CONSTBOOL, 16 }, - { BWRITERSPR_CONSTINT, 16 }, - { BWRITERSPR_LOOP, 1 }, - { BWRITERSPR_LABEL, 2048 }, - { BWRITERSPR_PREDICATE, 1 }, - { BWRITERSPR_RASTOUT, 3 }, /* oPos, oFog and oPts */ - { BWRITERSPR_ATTROUT, 2 }, - { BWRITERSPR_TEXCRDOUT, 8 }, + { BWRITERSPR_TEMP, 12, FALSE }, + { BWRITERSPR_INPUT, 16, FALSE }, + { BWRITERSPR_CONST, ~0U, TRUE }, + { BWRITERSPR_ADDR, 1, FALSE }, + { BWRITERSPR_CONSTBOOL, 16, FALSE }, + { BWRITERSPR_CONSTINT, 16, FALSE }, + { BWRITERSPR_LOOP, 1, FALSE }, + { BWRITERSPR_LABEL, 2048, FALSE }, + { BWRITERSPR_PREDICATE, 1, FALSE }, + { BWRITERSPR_RASTOUT, 3, FALSE }, /* oPos, oFog and oPts */ + { BWRITERSPR_ATTROUT, 2, FALSE }, + { BWRITERSPR_TEXCRDOUT, 8, FALSE }, { ~0U, 0 } /* End tag */ }; @@ -437,17 +442,17 @@ static void asmparser_srcreg_vs_2(struct asm_parser *This, } static const struct allowed_reg_type vs_3_reg_allowed[] = { - { BWRITERSPR_TEMP, 32 }, - { BWRITERSPR_INPUT, 16 }, - { BWRITERSPR_CONST, ~0U }, - { BWRITERSPR_ADDR, 1 }, - { BWRITERSPR_CONSTBOOL, 16 }, - { BWRITERSPR_CONSTINT, 16 }, - { BWRITERSPR_LOOP, 1 }, - { BWRITERSPR_LABEL, 2048 }, - { BWRITERSPR_PREDICATE, 1 }, - { BWRITERSPR_SAMPLER, 4 }, - { BWRITERSPR_OUTPUT, 12 }, + { BWRITERSPR_TEMP, 32, FALSE }, + { BWRITERSPR_INPUT, 16, TRUE }, + { BWRITERSPR_CONST, ~0U, TRUE }, + { BWRITERSPR_ADDR, 1, FALSE }, + { BWRITERSPR_CONSTBOOL, 16, FALSE }, + { BWRITERSPR_CONSTINT, 16, FALSE }, + { BWRITERSPR_LOOP, 1, FALSE }, + { BWRITERSPR_LABEL, 2048, FALSE }, + { BWRITERSPR_PREDICATE, 1, FALSE }, + { BWRITERSPR_SAMPLER, 4, FALSE }, + { BWRITERSPR_OUTPUT, 12, TRUE }, { ~0U, 0 } /* End tag */ }; @@ -466,15 +471,15 @@ static void asmparser_srcreg_vs_3(struct asm_parser *This, } static const struct allowed_reg_type ps_2_0_reg_allowed[] = { - { BWRITERSPR_INPUT, 2 }, - { BWRITERSPR_TEMP, 32 }, - { BWRITERSPR_CONST, 32 }, - { BWRITERSPR_CONSTINT, 16 }, - { BWRITERSPR_CONSTBOOL, 16 }, - { BWRITERSPR_SAMPLER, 16 }, - { BWRITERSPR_TEXTURE, 8 }, - { BWRITERSPR_COLOROUT, 4 }, - { BWRITERSPR_DEPTHOUT, 1 }, + { BWRITERSPR_INPUT, 2, FALSE }, + { BWRITERSPR_TEMP, 32, FALSE }, + { BWRITERSPR_CONST, 32, FALSE }, + { BWRITERSPR_CONSTINT, 16, FALSE }, + { BWRITERSPR_CONSTBOOL, 16, FALSE }, + { BWRITERSPR_SAMPLER, 16, FALSE }, + { BWRITERSPR_TEXTURE, 8, FALSE }, + { BWRITERSPR_COLOROUT, 4, FALSE }, + { BWRITERSPR_DEPTHOUT, 1, FALSE }, { ~0U, 0 } /* End tag */ }; @@ -496,17 +501,17 @@ static void asmparser_srcreg_ps_2(struct asm_parser *This, } static const struct allowed_reg_type ps_2_x_reg_allowed[] = { - { BWRITERSPR_INPUT, 2 }, - { BWRITERSPR_TEMP, 32 }, - { BWRITERSPR_CONST, 32 }, - { BWRITERSPR_CONSTINT, 16 }, - { BWRITERSPR_CONSTBOOL, 16 }, - { BWRITERSPR_PREDICATE, 1 }, - { BWRITERSPR_SAMPLER, 16 }, - { BWRITERSPR_TEXTURE, 8 }, - { BWRITERSPR_LABEL, 2048 }, - { BWRITERSPR_COLOROUT, 4 }, - { BWRITERSPR_DEPTHOUT, 1 }, + { BWRITERSPR_INPUT, 2, FALSE }, + { BWRITERSPR_TEMP, 32, FALSE }, + { BWRITERSPR_CONST, 32, FALSE }, + { BWRITERSPR_CONSTINT, 16, FALSE }, + { BWRITERSPR_CONSTBOOL, 16, FALSE }, + { BWRITERSPR_PREDICATE, 1, FALSE }, + { BWRITERSPR_SAMPLER, 16, FALSE }, + { BWRITERSPR_TEXTURE, 8, FALSE }, + { BWRITERSPR_LABEL, 2048, FALSE }, + { BWRITERSPR_COLOROUT, 4, FALSE }, + { BWRITERSPR_DEPTHOUT, 1, FALSE }, { ~0U, 0 } /* End tag */ }; @@ -528,18 +533,18 @@ static void asmparser_srcreg_ps_2_x(struct asm_parser *This, } static const struct allowed_reg_type ps_3_reg_allowed[] = { - { BWRITERSPR_INPUT, 10 }, - { BWRITERSPR_TEMP, 32 }, - { BWRITERSPR_CONST, 224 }, - { BWRITERSPR_CONSTINT, 16 }, - { BWRITERSPR_CONSTBOOL, 16 }, - { BWRITERSPR_PREDICATE, 1 }, - { BWRITERSPR_SAMPLER, 16 }, - { BWRITERSPR_MISCTYPE, 2 }, /* vPos and vFace */ - { BWRITERSPR_LOOP, 1 }, - { BWRITERSPR_LABEL, 2048 }, - { BWRITERSPR_COLOROUT, 4 }, - { BWRITERSPR_DEPTHOUT, 1 }, + { BWRITERSPR_INPUT, 10, TRUE }, + { BWRITERSPR_TEMP, 32, FALSE }, + { BWRITERSPR_CONST, 224, FALSE }, + { BWRITERSPR_CONSTINT, 16, FALSE }, + { BWRITERSPR_CONSTBOOL, 16, FALSE }, + { BWRITERSPR_PREDICATE, 1, FALSE }, + { BWRITERSPR_SAMPLER, 16, FALSE }, + { BWRITERSPR_MISCTYPE, 2, FALSE }, /* vPos and vFace */ + { BWRITERSPR_LOOP, 1, FALSE }, + { BWRITERSPR_LABEL, 2048, FALSE }, + { BWRITERSPR_COLOROUT, 4, FALSE }, + { BWRITERSPR_DEPTHOUT, 1, FALSE }, { ~0U, 0 } /* End tag */ }; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 7202d62..7daa91f 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1291,6 +1291,21 @@ static void failure_test(void) { /* shader 32: t5 not allowed in ps_1_3 */ "ps_1_3\n" "tex t5\n", + /* shader 33: no temporary registers relative addressing */ + "vs_3_0\n" + "add r0, r0[ a0.x ], r1\n", + /* shader 34: no input registers relative addressing in vs_2_0 */ + "vs_2_0\n" + "add r0, v[ a0.x ], r1\n", + /* shader 35: no aL register in ps_2_0 */ + "ps_2_0\n" + "add r0, v[ aL ], r1\n", + /* shader 36: no relative addressing in ps_2_0 */ + "ps_2_0\n" + "add r0, v[ r0 ], r1\n", + /* shader 37: no a0 register in ps_3_0 */ + "ps_3_0\n" + "add r0, v[ a0.x ], r1\n", }; HRESULT hr; unsigned int i;

1 0

Andrew Eikum : winedbg: Allow user to specify length of stack info output.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: d3f80c1e9f144ac73bfcb9f60d64158a2803bbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3f80c1e9f144ac73bfcb9f60… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 24 17:48:36 2010 -0500 winedbg: Allow user to specify length of stack info output. --- programs/winedbg/dbg.y | 3 ++- programs/winedbg/debugger.h | 2 +- programs/winedbg/info.c | 2 +- programs/winedbg/stack.c | 13 ++++++++----- programs/winedbg/tgt_active.c | 2 +- programs/winedbg/tgt_minidump.c | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 855407f..336f993 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -274,7 +274,8 @@ info_command: | tINFO tALLREGS { be_cpu->print_context(dbg_curr_thread->handle, &dbg_context, 1); } | tINFO tSEGMENTS expr_rvalue { info_win32_segments($3 >> 3, 1); } | tINFO tSEGMENTS { info_win32_segments(0, -1); } - | tINFO tSTACK { stack_info(); } + | tINFO tSTACK tNUM { stack_info($3); } + | tINFO tSTACK { stack_info(-1); } | tINFO tSYMBOL tSTRING { symbol_info($3); } | tINFO tLOCAL { symbol_info_locals(); } | tINFO tDISPLAY { display_info(); } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 8ebac1e..ae949f2 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -384,7 +384,7 @@ extern void source_nuke_path(struct dbg_process* p); extern void source_free_files(struct dbg_process* p); /* stack.c */ -extern void stack_info(void); +extern void stack_info(int len); extern void stack_backtrace(DWORD threadID); extern BOOL stack_set_frame(int newframe); extern BOOL stack_get_current_frame(IMAGEHLP_STACK_FRAME* ihsf); diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e501f43..a09af5d 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -106,7 +106,7 @@ void info_help(void) " info segments <pid> Displays information about all known segments", " info share Displays all loaded modules", " info share <addr> Displays internal module state", - " info stack Dumps information about top of stack", + " info stack [<len>] Dumps information about top of stack, up to len words", " info symbol <sym> Displays information about a given symbol", " info thread Shows all running threads", " info wnd <handle> Displays internal window state", diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index bccb56a..be535f9 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -33,12 +33,15 @@ /*********************************************************************** * stack_info * - * Dump the top of the stack + * Dump the top of the stack. If len <= 0, a default length is used. */ -void stack_info(void) +void stack_info(int len) { struct dbg_lvalue lvalue; + if(len <= 0) + len = 24; + lvalue.cookie = 0; lvalue.type.id = dbg_itype_segptr; lvalue.type.module = 0; @@ -51,14 +54,14 @@ void stack_info(void) switch (lvalue.addr.Mode) { case AddrModeFlat: /* 32-bit or 64-bit mode */ - memory_examine(&lvalue, 24, 'a'); + memory_examine(&lvalue, len, 'a'); break; case AddrMode1632: /* 32-bit mode */ - memory_examine(&lvalue, 24, 'x'); + memory_examine(&lvalue, len, 'x'); break; case AddrModeReal: /* 16-bit mode */ case AddrMode1616: - memory_examine(&lvalue, 24, 'w'); + memory_examine(&lvalue, len, 'w'); break; } } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 0572d95..c0c12dd 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -182,7 +182,7 @@ static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXC { /* This is a real crash, dump some info */ be_cpu->print_context(dbg_curr_thread->handle, &dbg_context, 0); - stack_info(); + stack_info(-1); be_cpu->print_segment_info(dbg_curr_thread->handle, &dbg_context); stack_backtrace(dbg_curr_tid); } diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index f099b4e..c24fd8c 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -389,7 +389,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) memory_get_current_pc(&addr); stack_fetch_frames(&dbg_context); be_cpu->print_context(dbg_curr_thread->handle, &dbg_context, 0); - stack_info(); + stack_info(-1); be_cpu->print_segment_info(dbg_curr_thread->handle, &dbg_context); stack_backtrace(mes->ThreadId); source_list_from_addr(&addr, 0);

1 0

Jacek Caban : mshtml: Simplify translate_url call.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: 66e4ba9f9fd41af86f507a150c9d2dd608776549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e4ba9f9fd41af86f507a150… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 25 11:48:23 2010 +0200 mshtml: Simplify translate_url call. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d55f169..63c9a6a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -228,7 +228,7 @@ nsresult on_start_uri_open(NSContainer *nscontainer, nsIURI *uri, PRBool *_retva } wine_uri->is_doc_uri = TRUE; - *_retval = translate_url(nscontainer->doc->basedoc.doc_obj, wine_uri); + *_retval = translate_url(nscontainer->doc, wine_uri); } nsIURI_Release(NSURI(wine_uri));

1 0

Henri Verbeet : wined3d: Set the ati_fragment_shader. c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard May 25, 2010

May 25, 2010

Module: wine Branch: master Commit: 11bda6e0ab4b58e1588fc41141096c189727624d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bda6e0ab4b58e1588fc4114… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 25 12:02:01 2010 +0200 wined3d: Set the ati_fragment_shader.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/ati_fragment_shader.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 62be40d..344daf6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d); +#define GLINFO_LOCATION (*gl_info) + /* GL locking for state handlers is done by the caller. */ /* Some private defines, Constant associations, etc. @@ -190,7 +192,6 @@ static const char *debug_mask(GLuint mask) { default: return "Unexpected writemask"; } } -#define GLINFO_LOCATION (*gl_info) static void wrap_op1(const struct wined3d_gl_info *gl_info, GLuint op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod) @@ -796,11 +797,10 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con checkGLcall("GL_EXTCALL(glEndFragmentShaderATI())"); return ret; } -#undef GLINFO_LOCATION -#define GLINFO_LOCATION stateblock->device->adapter->gl_info static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *This = stateblock->device; const struct atifs_ffp_desc *desc; struct ffp_frag_settings settings; @@ -818,14 +818,14 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, st return; } new_desc->num_textures_used = 0; - for (i = 0; i < context->gl_info->limits.texture_stages; ++i) + for (i = 0; i < gl_info->limits.texture_stages; ++i) { if(settings.op[i].cop == WINED3DTOP_DISABLE) break; new_desc->num_textures_used = i; } memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); - new_desc->shader = gen_ati_shader(settings.op, context->gl_info); + new_desc->shader = gen_ati_shader(settings.op, gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); desc = new_desc; @@ -849,6 +849,7 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, st static void state_texfactor_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; float col[4]; D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); @@ -859,6 +860,7 @@ static void state_texfactor_atifs(DWORD state, IWineD3DStateBlockImpl *statebloc static void set_bumpmat(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + const struct wined3d_gl_info *gl_info = context->gl_info; float mat[2][2]; mat[0][0] = *((float *) &stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT00]); @@ -912,8 +914,6 @@ static void atifs_apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *statebl } } -#undef GLINFO_LOCATION - static const struct StateEntryTemplate atifs_fragmentstate_template[] = { {STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), state_texfactor_atifs }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, WINED3D_GL_EXT_NONE }, @@ -1126,11 +1126,11 @@ static HRESULT atifs_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } -#define GLINFO_LOCATION This->adapter->gl_info /* Context activation is done by the caller. */ static void atifs_free_ffpshader(struct wine_rb_entry *entry, void *context) { IWineD3DDeviceImpl *This = context; + const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; struct atifs_ffp_desc *entry_ati = WINE_RB_ENTRY_VALUE(entry, struct atifs_ffp_desc, parent.entry); ENTER_GL(); @@ -1150,7 +1150,6 @@ static void atifs_free(IWineD3DDevice *iface) { HeapFree(GetProcessHeap(), 0, priv); This->fragment_priv = NULL; } -#undef GLINFO_LOCATION static BOOL atifs_color_fixup_supported(struct color_fixup_desc fixup) {

1 0