January 2012 - Wine-Commits

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

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 : msvcp60: Fix errors related to name demangling.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

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

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

Jan. 10, 2012

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

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

Jan. 10, 2012

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 : msi: Downgrade an error.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

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

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

Jan. 10, 2012

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 Jan. 10, 2012

Jan. 10, 2012

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

Nikolay Sivov : shell32: Get rid of rename helper.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

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: Merge ShellView menu implementations into a single file.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

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

Dmitry Timoshkov : msvcrt: Add some tests for strftime/wcsftime.
by Alexandre Julliard Jan. 10, 2012

Jan. 10, 2012

Module: wine Branch: master Commit: 42157151d0b4e9fcc2ffd72cc16ded5c157ff10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42157151d0b4e9fcc2ffd72cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 10 16:02:04 2012 +0800 msvcrt: Add some tests for strftime/wcsftime. --- dlls/msvcrt/tests/time.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 950042c..a7790d5 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -25,6 +25,7 @@ #include <stdlib.h> /*setenv*/ #include <stdio.h> /*printf*/ +#include <locale.h> #include <errno.h> #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) @@ -37,6 +38,7 @@ static __time32_t (__cdecl *p_mkgmtime32)(struct tm*); static struct tm* (__cdecl *p_gmtime32)(__time32_t*); +static struct tm* (__cdecl *p_gmtime)(time_t*); static errno_t (__cdecl *p_gmtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_strtime_s)(char*,size_t); static errno_t (__cdecl *p_strdate_s)(char*,size_t); @@ -44,12 +46,15 @@ static errno_t (__cdecl *p_localtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_localtime64_s)(struct tm*, __time64_t*); static int* (__cdecl *p__daylight)(void); static int* (__cdecl *p___p__daylight)(void); +static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); +static size_t (__cdecl *p_wcsftime)(wchar_t *, size_t, const wchar_t *, const struct tm *); static void init(void) { - HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + HMODULE hmod = LoadLibrary("msvcrt.dll"); p_gmtime32 = (void*)GetProcAddress(hmod, "_gmtime32"); + p_gmtime = (void*)GetProcAddress(hmod, "gmtime"); p_gmtime32_s = (void*)GetProcAddress(hmod, "_gmtime32_s"); p_mkgmtime32 = (void*)GetProcAddress(hmod, "_mkgmtime32"); p_strtime_s = (void*)GetProcAddress(hmod, "_strtime_s"); @@ -58,6 +63,8 @@ static void init(void) p_localtime64_s = (void*)GetProcAddress(hmod, "_localtime64_s"); p__daylight = (void*)GetProcAddress(hmod, "__daylight"); p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); + p_strftime = (void*)GetProcAddress(hmod, "strftime"); + p_wcsftime = (void*)GetProcAddress(hmod, "wcsftime"); } static int get_test_year(time_t *start) @@ -568,10 +575,48 @@ static void test_daylight(void) ok(ret1 && ret1 == ret2, "got %p\n", ret1); } +static void test_strftime(void) +{ + static const wchar_t cW[] = { '%','c',0 }; + static const char expected[] = "01/01/70 00:00:00"; + time_t gmt; + struct tm* gmt_tm; + char buf[256], bufA[256]; + WCHAR bufW[256]; + long retA, retW; + + if (!p_strftime || !p_wcsftime || !p_gmtime) + { + win_skip("strftime, wcsftime or gmtime is not available\n"); + return; + } + + setlocale(LC_TIME, "C"); + + gmt = 0; + gmt_tm = p_gmtime(&gmt); + ok(gmt_tm != NULL, "gmtime failed\n"); + + retA = strftime(bufA, 256, "%c", gmt_tm); +todo_wine { + ok(retA == 17, "expected 17, got %ld\n", retA); + ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA); +} + retW = wcsftime(bufW, 256, cW, gmt_tm); +todo_wine + ok(retW == 17, "expected 17, got %ld\n", retW); + ok(retA == retW, "expected %ld, got %ld\n", retA, retW); + buf[0] = 0; + retA = WideCharToMultiByte(CP_ACP, 0, bufW, retW, buf, 256, NULL, NULL); + buf[retA] = 0; + ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); +} + START_TEST(time) { init(); + test_strftime(); test_ctime(); test_gmtime(); test_mktime();

1 0