wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Piotr Caban : msvcp60: Fix errors related to name demangling.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 662f3ab2eee82d324ea92a3c38aae540c1fef067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=662f3ab2eee82d324ea92a3c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 10 16:24:04 2012 +0100 msvcp60: Fix errors related to name demangling. --- dlls/msvcp60/msvcp60.spec | 64 ++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=662f3ab2eee82d324ea92…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 7f59bfd6944294a89c9ee241f82cb9c04b28520e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f59bfd6944294a89c9ee241f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 10 16:23:09 2012 +0100 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 766 ++++++++++++++-------------- dlls/msvcp60/msvcp60.spec | 506 +++++++++--------- dlls/msvcp70/msvcp70.spec | 1054 +++++++++++++++++++------------------- dlls/msvcp71/msvcp71.spec | 1092 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 1200 +++++++++++++++++++++--------------------- 5 files changed, 2309 insertions(+), 2309 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f59bfd6944294a89c9ee…

1 0

Piotr Caban : msvcp90: Fix errors related to name demangling.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 727499a19a95d399c7eeb137de3c50a94fdd64b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=727499a19a95d399c7eeb137d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 10 16:22:12 2012 +0100 msvcp90: Fix errors related to name demangling. --- dlls/msvcp90/ios.c | 31 +++---- dlls/msvcp90/locale.c | 120 +++++++++++----------- dlls/msvcp90/math.c | 8 +- dlls/msvcp90/msvcp90.spec | 240 ++++++++++++++++++++++---------------------- dlls/msvcp90/string.c | 5 +- 5 files changed, 199 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=727499a19a95d399c7eeb…

1 0

Hans Leidekker : msi: Don' t try to ready media for files from a previous installation or files that will be skipped .
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 4ef765cb4e2d5976f43c9f6eb6f1850ce2f37a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef765cb4e2d5976f43c9f6eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 10 16:55:40 2012 +0100 msi: Don't try to ready media for files from a previous installation or files that will be skipped. --- dlls/msi/files.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f755d92..909f71f 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -331,6 +331,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) if (!file->Component->Enabled) continue; if (file->state != msifs_hashmatch && + file->state != msifs_skipped && + (file->state != msifs_present || !msi_get_property_int( package->db, szInstalled, 0 )) && (rc = ready_media( package, file->IsCompressed, mi ))) { ERR("Failed to ready media for %s\n", debugstr_w(file->File));

1 0

Hans Leidekker : msi: Downgrade an error.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: c7e5f0331f96d72ac67616a156a5dcab1a2fa0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e5f0331f96d72ac67616a15… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 10 16:55:23 2012 +0100 msi: Downgrade an error. --- dlls/msi/media.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index d5ace5a..69bcb91 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -61,13 +61,11 @@ static BOOL source_matches_volume(MSIMEDIAINFO *mi, LPCWSTR source_root) PathStripToRootW(root); PathAddBackslashW(root); - if (!GetVolumeInformationW(root, volume_name, MAX_PATH + 1, - NULL, NULL, NULL, NULL, 0)) + if (!GetVolumeInformationW(root, volume_name, MAX_PATH + 1, NULL, NULL, NULL, NULL, 0)) { - ERR("Failed to get volume information\n"); + WARN("failed to get volume information for %s (%u)\n", debugstr_w(root), GetLastError()); return FALSE; } - return !strcmpiW( mi->volume_label, volume_name ); }

1 0

Hans Leidekker : msi: Fix detection of installed global assemblies.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: b13195ce4ebb13342d2f01093cd33a3d81cfd779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13195ce4ebb13342d2f01093… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 10 16:55:07 2012 +0100 msi: Fix detection of installed global assemblies. --- dlls/msi/assembly.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index fd1f952..6ce020e 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -263,7 +263,7 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, QUERYASMINFO_FLAG_GETSIZE, display_name, &info ); - if (FAILED( hr )) + if (hr != HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) { TRACE("QueryAssemblyInfo returned 0x%08x\n", hr); return FALSE;

1 0

Hans Leidekker : fusion/tests: Add a test for IAssemblyCache:: QueryAssemblyInfo.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: e0425c634809d3301a5709395e47ceaff3699987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0425c634809d3301a5709395… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 10 16:53:58 2012 +0100 fusion/tests: Add a test for IAssemblyCache::QueryAssemblyInfo. --- dlls/fusion/tests/asmcache.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 900d23a..46c1db9 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1306,7 +1306,7 @@ static void test_QueryAssemblyInfo(void) ok(info.cchBuf == lstrlenW(asmpath) + 1, "Expected %d, got %d\n", lstrlenW(asmpath) + 1, info.cchBuf); - /* short buffer */ + /* short buffer, QUERYASMINFO_FLAG_VALIDATE */ memset(&info, 0, sizeof(info)); lstrcpyW(name, wine); lstrcatW(name, commasep); @@ -1316,6 +1316,16 @@ static void test_QueryAssemblyInfo(void) ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); + /* short buffer, QUERYASMINFO_FLAG_GETSIZE */ + memset(&info, 0, sizeof(info)); + lstrcpyW(name, wine); + lstrcatW(name, commasep); + lstrcatW(name, otherver); + hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, + name, &info); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); + ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); + /* display name is "wine, Version=1.0.0.00000" */ INIT_ASM_INFO(); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE,

1 0

Nikolay Sivov : shell32: Merge ShellView menu implementations into a single file.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: e9fa0599768fcf6f2522bb94a4ad94e14cefa799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fa0599768fcf6f2522bb94a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 18:47:52 2012 +0300 shell32: Merge ShellView menu implementations into a single file. --- dlls/shell32/Makefile.in | 3 +- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/shell32_main.h | 4 +- dlls/shell32/shfldr_desktop.c | 4 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_netplaces.c | 2 +- dlls/shell32/shfldr_unixfs.c | 2 +- dlls/shell32/shlmenu.c | 4 +- dlls/shell32/shlview.c | 4 +- dlls/shell32/shlview_cmenu.c | 973 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shv_bg_cmenu.c | 458 ------------------ dlls/shell32/shv_item_cmenu.c | 623 ------------------------- 13 files changed, 987 insertions(+), 1096 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9fa0599768fcf6f2522b…

1 0

Nikolay Sivov : shell32: Get rid of rename helper.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: de0813c7a384b4e4eb2831999d356b74a59c7268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de0813c7a384b4e4eb2831999… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 16:02:44 2012 +0300 shell32: Get rid of rename helper. --- dlls/shell32/shv_item_cmenu.c | 43 +++++++++++++++++----------------------- 1 files changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index ac91f37..06169c5 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -260,29 +260,6 @@ static void DoOpenExplore(ItemCmImpl *This, HWND hwnd, LPCSTR verb) } /************************************************************************** -* DoRename -*/ -static void DoRename(ItemCmImpl *This, HWND hwnd) -{ - LPSHELLBROWSER lpSB; - LPSHELLVIEW lpSV; - - TRACE("(%p)->(wnd=%p)\n",This, hwnd); - - /* get the active IShellView */ - if ((lpSB = (LPSHELLBROWSER)SendMessageA(hwnd, CWM_GETISHELLBROWSER,0,0))) - { - if(SUCCEEDED(IShellBrowser_QueryActiveShellView(lpSB, &lpSV))) - { - TRACE("(sv=%p)\n",lpSV); - IShellView_SelectItem(lpSV, This->apidl[0], - SVSI_DESELECTOTHERS|SVSI_EDIT|SVSI_ENSUREVISIBLE|SVSI_FOCUSED|SVSI_SELECT); - IShellView_Release(lpSV); - } - } -} - -/************************************************************************** * DoDelete * * deletes the currently selected items @@ -479,9 +456,25 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( DoOpenExplore(This, lpcmi->hwnd, "open"); break; case FCIDM_SHVIEW_RENAME: - TRACE("Verb FCIDM_SHVIEW_RENAME\n"); - DoRename(This, lpcmi->hwnd); + { + IShellBrowser *browser; + + /* get the active IShellView */ + browser = (IShellBrowser*)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER, 0, 0); + if (browser) + { + IShellView *view; + + if(SUCCEEDED(IShellBrowser_QueryActiveShellView(browser, &view))) + { + TRACE("(shellview=%p)\n", view); + IShellView_SelectItem(view, This->apidl[0], + SVSI_DESELECTOTHERS|SVSI_EDIT|SVSI_ENSUREVISIBLE|SVSI_FOCUSED|SVSI_SELECT); + IShellView_Release(view); + } + } break; + } case FCIDM_SHVIEW_DELETE: TRACE("Verb FCIDM_SHVIEW_DELETE\n"); DoDelete(This);

1 0

Nikolay Sivov : shell32: Remove menu insertion helper.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 48eba8033dbb6b7394b2be7aba1a34246b3030db URL: http://source.winehq.org/git/wine.git/?a=commit;h=48eba8033dbb6b7394b2be7ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 15:53:55 2012 +0300 shell32: Remove menu insertion helper. --- dlls/shell32/shv_item_cmenu.c | 36 ++++++++---------------------------- 1 files changed, 8 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 4c05460..ac91f37 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -158,33 +158,6 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) return refCount; } -static void _InsertMenuItemW ( - HMENU hmenu, - UINT indexMenu, - BOOL fByPosition, - UINT wID, - UINT fType, - LPWSTR dwTypeData, - UINT fState) -{ - MENUITEMINFOW mii; - - mii.cbSize = sizeof(mii); - if (fType == MFT_SEPARATOR) - { - mii.fMask = MIIM_ID | MIIM_TYPE; - } - else - { - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; - mii.dwTypeData = dwTypeData; - mii.fState = fState; - } - mii.wID = wID; - mii.fType = fType; - InsertMenuItemW( hmenu, indexMenu, fByPosition, &mii); -} - /************************************************************************** * ISvItemCm_fnQueryContextMenu() */ @@ -224,7 +197,14 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( mi.cch = 255; GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND, &mi); RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND); - _InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, FCIDM_SHVIEW_EXPLORE, MFT_STRING, str, MFS_ENABLED); + + mi.cbSize = sizeof(mi); + mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE; + mi.dwTypeData = str; + mi.fState = MFS_ENABLED; + mi.wID = FCIDM_SHVIEW_EXPLORE; + mi.fType = MFT_STRING; + InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, &mi); } SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION);

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012