January 2012 - Wine-commits

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: 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

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

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 : 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: 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

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

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 : 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

Alexandre Julliard : gdi32: Add a separate set of GDI object functions for DIBs.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: a51b2c8bd594199bf1a3de36a20845f5b604d366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51b2c8bd594199bf1a3de36a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 14:37:48 2012 +0100 gdi32: Add a separate set of GDI object functions for DIBs. --- dlls/gdi32/bitmap.c | 45 ++-------------- dlls/gdi32/dib.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 0d637ec..dcccd3d 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -566,7 +566,7 @@ static BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return FALSE; - if (!bitmap->dib && bitmap->funcs != physdev->funcs) + if (bitmap->funcs != physdev->funcs) { /* we can only change from the null driver to some other driver */ if (bitmap->funcs == &null_driver) @@ -634,7 +634,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) old_physdev = pop_dc_driver( &dc->physDev ); physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); - if (bitmap->dib || physdev->funcs == &null_driver) + if (physdev->funcs == &null_driver) { physdev = dc->dibdrv; if (physdev) push_dc_driver( &dc->physDev, physdev, physdev->funcs ); @@ -701,26 +701,6 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) if (!(bmp = free_gdi_handle( handle ))) return FALSE; HeapFree( GetProcessHeap(), 0, bmp->bitmap.bmBits ); - - if (bmp->dib) - { - DIBSECTION *dib = bmp->dib; - - if (dib->dsBm.bmBits) - { - if (dib->dshSection) - { - SYSTEM_INFO SystemInfo; - GetSystemInfo( &SystemInfo ); - UnmapViewOfFile( (char *)dib->dsBm.bmBits - - (dib->dsOffset % SystemInfo.dwAllocationGranularity) ); - } - else if (!dib->dsOffset) - VirtualFree(dib->dsBm.bmBits, 0L, MEM_RELEASE ); - } - HeapFree(GetProcessHeap(), 0, dib); - HeapFree(GetProcessHeap(), 0, bmp->color_table); - } return HeapFree( GetProcessHeap(), 0, bmp ); } @@ -730,30 +710,13 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) */ static INT BITMAP_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) { - INT ret; + INT ret = 0; BITMAPOBJ *bmp = GDI_GetObjPtr( handle, OBJ_BITMAP ); if (!bmp) return 0; if (!buffer) ret = sizeof(BITMAP); - else if (count < sizeof(BITMAP)) ret = 0; - else if (bmp->dib) - { - if (count >= sizeof(DIBSECTION)) - { - DIBSECTION *dib = buffer; - *dib = *bmp->dib; - dib->dsBmih.biHeight = abs( dib->dsBmih.biHeight ); - ret = sizeof(DIBSECTION); - } - else /* if (count >= sizeof(BITMAP)) */ - { - DIBSECTION *dib = bmp->dib; - memcpy( buffer, &dib->dsBm, sizeof(BITMAP) ); - ret = sizeof(BITMAP); - } - } - else + else if (count >= sizeof(BITMAP)) { memcpy( buffer, &bmp->bitmap, sizeof(BITMAP) ); ((BITMAP *) buffer)->bmBits = NULL; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 5aab956..0f17972 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -72,6 +72,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(bitmap); +static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ); +static INT DIB_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ); +static BOOL DIB_DeleteObject( HGDIOBJ handle ); + +static const struct gdi_obj_funcs dib_funcs = +{ + DIB_SelectObject, /* pSelectObject */ + DIB_GetObject, /* pGetObjectA */ + DIB_GetObject, /* pGetObjectW */ + NULL, /* pUnrealizeObject */ + DIB_DeleteObject /* pDeleteObject */ +}; + /*********************************************************************** * bitmap_info_size * @@ -1576,6 +1589,7 @@ HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pCreateDIBSection ); bmp->dib = dib; + bmp->header.funcs = &dib_funcs; bmp->funcs = physdev->funcs; bmp->color_table = color_table; GDI_ReleaseObj( ret ); @@ -1600,3 +1614,135 @@ error: HeapFree( GetProcessHeap(), 0, dib ); return 0; } + + +/*********************************************************************** + * DIB_SelectObject + */ +static HGDIOBJ DIB_SelectObject( HGDIOBJ handle, HDC hdc ) +{ + HGDIOBJ ret; + BITMAPOBJ *bitmap; + DC *dc; + PHYSDEV physdev = NULL, old_physdev = NULL, pathdev = NULL; + + if (!(dc = get_dc_ptr( hdc ))) return 0; + + if (GetObjectType( hdc ) != OBJ_MEMDC) + { + ret = 0; + goto done; + } + ret = dc->hBitmap; + if (handle == dc->hBitmap) goto done; /* nothing to do */ + + if (!(bitmap = GDI_GetObjPtr( handle, OBJ_BITMAP ))) + { + ret = 0; + goto done; + } + + if (bitmap->header.selcount) + { + WARN( "Bitmap already selected in another DC\n" ); + GDI_ReleaseObj( handle ); + ret = 0; + goto done; + } + + if (dc->physDev->funcs == &path_driver) pathdev = pop_dc_driver( &dc->physDev ); + + old_physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); + physdev = dc->dibdrv; + if (old_physdev != dc->dibdrv) + { + if (physdev) push_dc_driver( &dc->physDev, physdev, physdev->funcs ); + else + { + if (!dib_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) goto done; + dc->dibdrv = physdev = dc->physDev; + } + } + + if (!physdev->funcs->pSelectBitmap( physdev, handle )) + { + GDI_ReleaseObj( handle ); + ret = 0; + } + else + { + dc->hBitmap = handle; + GDI_inc_ref_count( handle ); + dc->dirty = 0; + dc->vis_rect.left = 0; + dc->vis_rect.top = 0; + dc->vis_rect.right = bitmap->bitmap.bmWidth; + dc->vis_rect.bottom = bitmap->bitmap.bmHeight; + GDI_ReleaseObj( handle ); + DC_InitDC( dc ); + GDI_dec_ref_count( ret ); + } + + done: + if(!ret) + { + if (old_physdev && old_physdev != dc->dibdrv) pop_dc_driver( &dc->physDev ); + } + if (pathdev) push_dc_driver( &dc->physDev, pathdev, pathdev->funcs ); + release_dc_ptr( dc ); + return ret; +} + + +/*********************************************************************** + * DIB_GetObject + */ +static INT DIB_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) +{ + INT ret = 0; + BITMAPOBJ *bmp = GDI_GetObjPtr( handle, OBJ_BITMAP ); + + if (!bmp) return 0; + + if (!buffer) ret = sizeof(BITMAP); + else if (count >= sizeof(DIBSECTION)) + { + DIBSECTION *dib = buffer; + *dib = *bmp->dib; + dib->dsBmih.biHeight = abs( dib->dsBmih.biHeight ); + ret = sizeof(DIBSECTION); + } + else if (count >= sizeof(BITMAP)) + { + BITMAP *bitmap = buffer; + *bitmap = bmp->dib->dsBm; + ret = sizeof(BITMAP); + } + + GDI_ReleaseObj( handle ); + return ret; +} + + +/*********************************************************************** + * DIB_DeleteObject + */ +static BOOL DIB_DeleteObject( HGDIOBJ handle ) +{ + BITMAPOBJ *bmp; + + if (!(bmp = free_gdi_handle( handle ))) return FALSE; + + if (bmp->dib->dshSection) + { + SYSTEM_INFO SystemInfo; + GetSystemInfo( &SystemInfo ); + UnmapViewOfFile( (char *)bmp->dib->dsBm.bmBits - + (bmp->dib->dsOffset % SystemInfo.dwAllocationGranularity) ); + } + else VirtualFree( bmp->dib->dsBm.bmBits, 0, MEM_RELEASE ); + + HeapFree(GetProcessHeap(), 0, bmp->dib); + HeapFree(GetProcessHeap(), 0, bmp->color_table); + return HeapFree( GetProcessHeap(), 0, bmp ); +}

1 0