July 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Move the checks for empty visible rects in PatBlt/StretchBlt back to gdi32 .
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 01e12ec9f99489ecbf54b21f290dc3d633328c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e12ec9f99489ecbf54b21f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 20 12:17:09 2011 +0200 gdi32: Move the checks for empty visible rects in PatBlt/StretchBlt back to gdi32. --- dlls/gdi32/bitblt.c | 27 ++++++++++++++------------- dlls/gdi32/gdi_private.h | 7 ++++++- dlls/winex11.drv/bitblt.c | 5 ----- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 0b61729..0f266ec 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -47,7 +47,7 @@ static inline void swap_ints( int *i, int *j ) *j = tmp; } -static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, +static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, DC *dc_src, struct bitblt_coords *src ) { RECT rect, clip; @@ -79,7 +79,7 @@ static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, /* get the source visible rectangle */ - if (!src) return; + if (!src) return !is_rect_empty( &dst->visrect ); rect.left = src->log_x; rect.top = src->log_y; @@ -105,6 +105,9 @@ static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, else src->visrect = rect; /* FIXME: clip to device size */ + if (is_rect_empty( &src->visrect )) return FALSE; + if (is_rect_empty( &dst->visrect )) return FALSE; + /* intersect the rectangles */ if ((src->width == dst->width) && (src->height == dst->height)) /* no stretching */ @@ -129,10 +132,9 @@ static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, rect.top--; rect.right++; rect.bottom++; - if (!intersect_rect( &dst->visrect, &rect, &dst->visrect )) return; + if (!intersect_rect( &dst->visrect, &rect, &dst->visrect )) return FALSE; /* map destination rectangle back to source coordinates */ - rect = dst->visrect; rect.left = src->x + (dst->visrect.left - dst->x)*src->width/dst->width; rect.top = src->y + (dst->visrect.top - dst->y)*src->height/dst->height; rect.right = src->x + (dst->visrect.right - dst->x)*src->width/dst->width; @@ -145,8 +147,9 @@ static void get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, rect.top--; rect.right++; rect.bottom++; - intersect_rect( &src->visrect, &rect, &src->visrect ); + if (!intersect_rect( &src->visrect, &rect, &src->visrect )) return FALSE; } + return TRUE; } static void free_heap_bits( struct gdi_image_bits *bits ) @@ -170,8 +173,6 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, LPVOID bits; INT lines; - if (dst->visrect.left >= dst->visrect.right || dst->visrect.top >= dst->visrect.bottom) return TRUE; - /* make sure we have a real implementation for StretchDIBits */ if (GET_DC_PHYSDEV( dc_dst, pStretchDIBits ) == dst_dev) goto try_get_image; @@ -300,13 +301,13 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop dst.layout |= LAYOUT_BITMAPORIENTATIONPRESERVED; rop &= ~NOMIRRORBITMAP; } - get_vis_rectangles( dc, &dst, NULL, NULL ); + ret = !get_vis_rectangles( dc, &dst, NULL, NULL ); TRACE("dst %p log=%d,%d %dx%d phys=%d,%d %dx%d vis=%s rop=%06x\n", hdc, dst.log_x, dst.log_y, dst.log_width, dst.log_height, dst.x, dst.y, dst.width, dst.height, wine_dbgstr_rect(&dst.visrect), rop ); - ret = physdev->funcs->pPatBlt( physdev, &dst, rop ); + if (!ret) ret = physdev->funcs->pPatBlt( physdev, &dst, rop ); release_dc_ptr( dc ); } @@ -364,7 +365,7 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, INT widthDst, INT height dst.layout |= LAYOUT_BITMAPORIENTATIONPRESERVED; rop &= ~NOMIRRORBITMAP; } - get_vis_rectangles( dcDst, &dst, dcSrc, &src ); + ret = !get_vis_rectangles( dcDst, &dst, dcSrc, &src ); TRACE("src %p log=%d,%d %dx%d phys=%d,%d %dx%d vis=%s dst %p log=%d,%d %dx%d phys=%d,%d %dx%d vis=%s rop=%06x\n", hdcSrc, src.log_x, src.log_y, src.log_width, src.log_height, @@ -372,7 +373,7 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, INT widthDst, INT height hdcDst, dst.log_x, dst.log_y, dst.log_width, dst.log_height, dst.x, dst.y, dst.width, dst.height, wine_dbgstr_rect(&dst.visrect), rop ); - ret = dst_dev->funcs->pStretchBlt( dst_dev, &dst, src_dev, &src, rop ); + if (!ret) ret = dst_dev->funcs->pStretchBlt( dst_dev, &dst, src_dev, &src, rop ); release_dc_ptr( dcSrc ); } release_dc_ptr( dcDst ); @@ -695,7 +696,7 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig dst.log_width = widthDst; dst.log_height = heightDst; dst.layout = GetLayout( dst_dev->hdc ); - get_vis_rectangles( dcDst, &dst, dcSrc, &src ); + ret = !get_vis_rectangles( dcDst, &dst, dcSrc, &src ); TRACE("src %p log=%d,%d %dx%d phys=%d,%d %dx%d vis=%s dst %p log=%d,%d %dx%d phys=%d,%d %dx%d vis=%s blend=%02x/%02x/%02x/%02x\n", hdcSrc, src.log_x, src.log_y, src.log_width, src.log_height, @@ -705,7 +706,7 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig blendFunction.BlendOp, blendFunction.BlendFlags, blendFunction.SourceConstantAlpha, blendFunction.AlphaFormat ); - ret = dst_dev->funcs->pAlphaBlend( dst_dev, &dst, src_dev, &src, blendFunction ); + if (!ret) ret = dst_dev->funcs->pAlphaBlend( dst_dev, &dst, src_dev, &src, blendFunction ); release_dc_ptr( dcDst ); } release_dc_ptr( dcSrc ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 92fe8a9..4c8ed58 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -527,13 +527,18 @@ BOOL WINAPI FontIsLinked(HDC); BOOL WINAPI SetVirtualResolution(HDC hdc, DWORD horz_res, DWORD vert_res, DWORD horz_size, DWORD vert_size); +static inline BOOL is_rect_empty( const RECT *rect ) +{ + return (rect->left >= rect->right || rect->top >= rect->bottom); +} + static inline BOOL intersect_rect( RECT *dst, const RECT *src1, const RECT *src2 ) { dst->left = max( src1->left, src2->left ); dst->top = max( src1->top, src2->top ); dst->right = min( src1->right, src2->right ); dst->bottom = min( src1->bottom, src2->bottom ); - return (dst->left < dst->right && dst->top < dst->bottom); + return !is_rect_empty( dst ); } static inline void offset_rect( RECT *rect, int offset_x, int offset_y ) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index d186687..92765c5 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1401,7 +1401,6 @@ BOOL X11DRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) BOOL usePat = (((rop >> 4) & 0x0f0000) != (rop & 0x0f0000)); const BYTE *opcode = BITBLT_Opcodes[(rop >> 16) & 0xff]; - if (IsRectEmpty( &dst->visrect )) return TRUE; if (usePat && !X11DRV_SetupGCForBrush( physDev )) return TRUE; X11DRV_LockDIBSection( physDev, DIB_Status_GdiMod ); @@ -1465,9 +1464,6 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, Pixmap src_pixmap; GC tmpGC; - if (IsRectEmpty( &dst->visrect )) return TRUE; - if (IsRectEmpty( &src->visrect )) return TRUE; - fStretch = (src->width != dst->width) || (src->height != dst->height); if (physDevDst != physDevSrc) @@ -1595,7 +1591,6 @@ BOOL X11DRV_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } - if (IsRectEmpty( &dst->visrect )) return TRUE; return XRender_AlphaBlend( physDevDst, dst, physDevSrc, src, blendfn ); }

1 0

Jay Yang : shell32: Make ISFHelper_fnCopyItems actually copy the items.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 872c07a967f374e5216911f28863e5166e245bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872c07a967f374e5216911f28… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Tue Jul 19 12:25:15 2011 -0400 shell32: Make ISFHelper_fnCopyItems actually copy the items. --- dlls/shell32/shfldr_fs.c | 48 +++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index c0e9ae5..969f18d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1383,13 +1383,15 @@ static HRESULT WINAPI ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) { - UINT i; + HRESULT ret=E_FAIL; IPersistFolder2 *ppf2 = NULL; - char szSrcPath[MAX_PATH], - szDstPath[MAX_PATH]; - + WCHAR wszSrcPathRoot[MAX_PATH], + wszDstPath[MAX_PATH+1]; + WCHAR *wszSrcPathsList; IGenericSFImpl *This = impl_from_ISFHelper(iface); + SHFILEOPSTRUCTW fop; + TRACE ("(%p)->(%p,%u,%p)\n", This, pSFFrom, cidl, apidl); IShellFolder_QueryInterface (pSFFrom, &IID_IPersistFolder2, @@ -1398,24 +1400,32 @@ ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, LPITEMIDLIST pidl; if (SUCCEEDED (IPersistFolder2_GetCurFolder (ppf2, &pidl))) { - for (i = 0; i < cidl; i++) { - SHGetPathFromIDListA (pidl, szSrcPath); - PathAddBackslashA (szSrcPath); - _ILSimpleGetText (apidl[i], szSrcPath + strlen (szSrcPath), - MAX_PATH); - - if (!WideCharToMultiByte(CP_ACP, 0, This->sPathTarget, -1, szDstPath, MAX_PATH, NULL, NULL)) - szDstPath[0] = '\0'; - PathAddBackslashA (szDstPath); - _ILSimpleGetText (apidl[i], szDstPath + strlen (szDstPath), - MAX_PATH); - MESSAGE ("would copy %s to %s\n", szSrcPath, szDstPath); + SHGetPathFromIDListW (pidl, wszSrcPathRoot); + ZeroMemory(wszDstPath, MAX_PATH+1); + if (This->sPathTarget) + lstrcpynW(wszDstPath, This->sPathTarget, MAX_PATH); + PathAddBackslashW(wszSrcPathRoot); + PathAddBackslashW(wszDstPath); + wszSrcPathsList = build_paths_list(wszSrcPathRoot, cidl, apidl); + ZeroMemory(&fop, sizeof(fop)); + fop.hwnd = GetActiveWindow(); + fop.wFunc = FO_COPY; + fop.pFrom = wszSrcPathsList; + fop.pTo = wszDstPath; + fop.fFlags = FOF_ALLOWUNDO; + ret = S_OK; + if(SHFileOperationW(&fop)) + { + WARN("Copy failed\n"); + ret = E_FAIL; } - SHFree (pidl); + HeapFree(GetProcessHeap(), 0, wszSrcPathsList); + } - IPersistFolder2_Release (ppf2); + SHFree(pidl); + IPersistFolder2_Release(ppf2); } - return S_OK; + return ret; } static const ISFHelperVtbl shvt =

1 0

Bernhard Loos : server: Check for STATUS_OBJECT_TYPE_MISMATCH before STATUS_ACCESS_DENIED in get_handle_obj .
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: bf3c2a06f58a32cd58a019eff95774eea8305ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3c2a06f58a32cd58a019eff… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Tue Jul 19 13:20:39 2011 +0200 server: Check for STATUS_OBJECT_TYPE_MISMATCH before STATUS_ACCESS_DENIED in get_handle_obj. --- server/handle.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/server/handle.c b/server/handle.c index 9d91f16..c7cd417 100644 --- a/server/handle.c +++ b/server/handle.c @@ -403,14 +403,19 @@ struct object *get_handle_obj( struct process *process, obj_handle_t handle, set_error( STATUS_INVALID_HANDLE ); return NULL; } + obj = entry->ptr; + if (ops && (obj->ops != ops)) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); /* not the right type */ + return NULL; + } if ((entry->access & access) != access) { set_error( STATUS_ACCESS_DENIED ); return NULL; } - obj = entry->ptr; } - if (ops && (obj->ops != ops)) + else if (ops && (obj->ops != ops)) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); /* not the right type */ return NULL;

1 0

Bernhard Loos : ntdll/tests: Add a test for STATUS_OBJECT_TYPE_MISMATCH.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 070cbfc412d3e61a8cdd8e5da350d4e6b96f539a URL: http://source.winehq.org/git/wine.git/?a=commit;h=070cbfc412d3e61a8cdd8e5da… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Tue Jul 19 13:20:45 2011 +0200 ntdll/tests: Add a test for STATUS_OBJECT_TYPE_MISMATCH. --- dlls/ntdll/tests/om.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index b13d9d1..ac37761 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -46,6 +46,7 @@ static NTSTATUS (WINAPI *pNtOpenSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJEC static NTSTATUS (WINAPI *pNtCreateSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PUNICODE_STRING); static NTSTATUS (WINAPI *pNtQuerySymbolicLinkObject)(HANDLE,PUNICODE_STRING,PULONG); static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); +static NTSTATUS (WINAPI *pNtReleaseSemaphore)(HANDLE handle, ULONG count, PULONG previous); static void test_case_sensitive (void) @@ -774,6 +775,28 @@ static void test_query_object(void) pNtClose( handle ); } +static void test_type_mismatch(void) +{ + HANDLE h; + NTSTATUS res; + OBJECT_ATTRIBUTES attr; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = NULL; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + res = pNtCreateEvent( &h, 0, &attr, 0, 0 ); + ok(!res, "can't create event: %x\n", res); + + res = pNtReleaseSemaphore( h, 30, NULL ); + ok(res == STATUS_OBJECT_TYPE_MISMATCH, "expected 0xc0000024, got %x\n", res); + + pNtClose( h ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -805,6 +828,7 @@ START_TEST(om) pNtCreateTimer = (void *)GetProcAddress(hntdll, "NtCreateTimer"); pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection"); pNtQueryObject = (void *)GetProcAddress(hntdll, "NtQueryObject"); + pNtReleaseSemaphore = (void *)GetProcAddress(hntdll, "NtReleaseSemaphore"); test_case_sensitive(); test_namespace_pipe(); @@ -812,4 +836,5 @@ START_TEST(om) test_directory(); test_symboliclink(); test_query_object(); + test_type_mismatch(); }

1 0

Dmitry Timoshkov : kernel32: Add a test how PE section characteristics get mapped into memory page access , make it pass under Wine.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 3d81e97c753a73646081b1084ad64c88b71f4cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d81e97c753a73646081b1084… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 20 01:41:12 2011 +0900 kernel32: Add a test how PE section characteristics get mapped into memory page access, make it pass under Wine. --- dlls/kernel32/tests/loader.c | 119 +++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/virtual.c | 2 +- 2 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 44dae18..d024074 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1,7 +1,7 @@ /* * Unit test suite for the PE loader. * - * Copyright 2006 Dmitry Timoshkov + * Copyright 2006,2011 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -560,8 +560,125 @@ static void test_ImportDescriptors(void) } } +static void test_section_access(void) +{ + static const struct test_data + { + DWORD scn_file_access, scn_page_access; + } td[] = + { + { 0, PAGE_NOACCESS }, + { IMAGE_SCN_MEM_READ, PAGE_READONLY }, + { IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE, PAGE_WRITECOPY }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_READ }, + { IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY }, + { IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_MEM_EXECUTE, PAGE_EXECUTE_WRITECOPY } + }; + static const char filler[0x1000]; + static const char section_data[0x10] = "section data"; + int i; + DWORD dummy, file_align; + HANDLE hfile; + HMODULE hlib; + SYSTEM_INFO si; + char temp_path[MAX_PATH]; + char dll_name[MAX_PATH]; + SIZE_T size; + MEMORY_BASIC_INFORMATION info; + BOOL ret; + + GetSystemInfo(&si); + trace("system page size %#x\n", si.dwPageSize); + + /* prevent displaying of the "Unable to load this DLL" message box */ + SetErrorMode(SEM_FAILCRITICALERRORS); + + GetTempPath(MAX_PATH, temp_path); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + GetTempFileName(temp_path, "ldr", 0, dll_name); + + /*trace("creating %s\n", dll_name);*/ + hfile = CreateFileA(dll_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + { + ok(0, "could not create %s\n", dll_name); + return; + } + + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &dos_header, sizeof(dos_header), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + + nt_header.FileHeader.NumberOfSections = 1; + nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + + nt_header.OptionalHeader.SectionAlignment = si.dwPageSize; + nt_header.OptionalHeader.FileAlignment = 0x200; + nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + si.dwPageSize; + nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &nt_header.OptionalHeader, sizeof(IMAGE_OPTIONAL_HEADER), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + + section.SizeOfRawData = sizeof(section_data); + section.PointerToRawData = nt_header.OptionalHeader.FileAlignment; + section.VirtualAddress = nt_header.OptionalHeader.SectionAlignment; + section.Misc.VirtualSize = section.SizeOfRawData; + section.Characteristics = td[i].scn_file_access; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &section, sizeof(section), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + + file_align = nt_header.OptionalHeader.FileAlignment - nt_header.OptionalHeader.SizeOfHeaders; + assert(file_align < sizeof(filler)); + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, filler, file_align, &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + + /* section data */ + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, section_data, sizeof(section_data), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + + CloseHandle(hfile); + + SetLastError(0xdeadbeef); + hlib = LoadLibrary(dll_name); + ok(ret, "LoadLibrary error %d\n", GetLastError()); + + size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), + "%d: VirtualQuery error %d\n", i, GetLastError()); + ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + if (info.Protect != PAGE_NOACCESS) + ok(!memcmp((const char *)info.BaseAddress, section_data, section.SizeOfRawData), "wrong section data\n"); + + SetLastError(0xdeadbeef); + ret = FreeLibrary(hlib); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DeleteFile(dll_name); + ok(ret, "DeleteFile error %d\n", GetLastError()); + } +} + START_TEST(loader) { test_Loader(); test_ImportDescriptors(); + test_section_access(); } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index aba9a71..a7679da 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1341,7 +1341,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz size = ROUND_SIZE( sec->VirtualAddress, sec->SizeOfRawData ); if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; - if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ|VPROT_WRITE; + if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_WRITECOPY; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC; /* Dumb game crack lets the AOEP point into a data section. Adjust. */

1 0

Vincent Povirk : shell32: Include NULL terminators in the lengths used by SHELL_ArgifyW.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: eeeca57072f87d3796a030fba1d690915da6ebc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeeca57072f87d3796a030fba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 19 13:22:07 2011 -0500 shell32: Include NULL terminators in the lengths used by SHELL_ArgifyW. --- dlls/shell32/shlexec.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ff07550..7bbbb2b 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -269,7 +269,12 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp } } - *res = '\0'; + used ++; + if (res - out < len) + *res = '\0'; + else + out[len-1] = '\0'; + TRACE("used %i of %i space\n",used,len); if (out_len) *out_len = used;

1 0

Vincent Povirk : shell32: Dynamically allocate argify buffer if the static one is too small.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: 9b2968dc77e33996a0de9cffb7fc8d6581caa3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2968dc77e33996a0de9cffb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 19 12:47:29 2011 -0500 shell32: Dynamically allocate argify buffer if the static one is too small. --- dlls/shell32/shlexec.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 7bbbb2b..3f7a170 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -781,7 +781,9 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec static const WCHAR wTopic[] = {'\\','t','o','p','i','c',0}; WCHAR regkey[256]; WCHAR * endkey = regkey + strlenW(key); - WCHAR app[256], topic[256], ifexec[256], res[256]; + WCHAR app[256], topic[256], ifexec[256], static_res[256]; + WCHAR * dynamic_res=NULL; + WCHAR * res; LONG applen, topiclen, ifexeclen; WCHAR * exec; DWORD ddeInst = 0; @@ -896,9 +898,14 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec } } - SHELL_ArgifyW(res, sizeof(res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen); - if (resultLen > sizeof(res)/sizeof(WCHAR)) - ERR("Argify buffer not large enough, truncated\n"); + SHELL_ArgifyW(static_res, sizeof(static_res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline, &resultLen); + if (resultLen > sizeof(static_res)/sizeof(WCHAR)) + { + res = dynamic_res = HeapAlloc(GetProcessHeap(), 0, resultLen * sizeof(WCHAR)); + SHELL_ArgifyW(dynamic_res, resultLen, exec, lpFile, pidl, szCommandline, NULL); + } + else + res = static_res; TRACE("%s %s => %s\n", debugstr_w(exec), debugstr_w(lpFile), debugstr_w(res)); /* It's documented in the KB 330337 that IE has a bug and returns @@ -922,6 +929,8 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec WARN("DdeClientTransaction failed with error %04x\n", DdeGetLastError(ddeInst)); ret = 33; + HeapFree(GetProcessHeap(), 0, dynamic_res); + DdeDisconnect(hConv); error:

1 0

Alistair Leslie-Hughes : oleaut32: Dont filter out VT_RECORD|VT_REF type in VariantCopyInd.
by Alexandre Julliard 20 Jul '11

20 Jul '11

Module: wine Branch: master Commit: d457956c583a4f083f112e0b5ff79485d775af12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d457956c583a4f083f112e0b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jul 9 14:38:11 2011 +1000 oleaut32: Dont filter out VT_RECORD|VT_REF type in VariantCopyInd. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 5c17eb8..02dd31c 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -872,7 +872,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc) /* Argument checking is more lax than VariantCopy()... */ vt = V_TYPE(pvargSrc); - if (V_ISARRAY(pvargSrc) || + if (V_ISARRAY(pvargSrc) || (V_VT(pvargSrc) == (VT_RECORD|VT_BYREF)) || (vt > VT_NULL && vt != (VARTYPE)15 && vt < VT_VOID && !(V_VT(pvargSrc) & (VT_VECTOR|VT_RESERVED)))) {

1 0

Mariusz Pluciński : shell32/tests: Add checking known folders' names.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: fa4ba100837ad2db4ba89886e268c5cb18012857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4ba100837ad2db4ba89886e… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jul 19 16:17:54 2011 +0200 shell32/tests: Add checking known folders' names. --- dlls/shell32/tests/shellpath.c | 233 ++++++++++++++++++++++------------------ 1 files changed, 129 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa4ba100837ad2db4ba89…

1 0

Mariusz Pluciński : shell32: Add IKnownFolder:: GetFolderDefinition() implementation.
by Alexandre Julliard 19 Jul '11

19 Jul '11

Module: wine Branch: master Commit: dfa35a529f1233d2e3e52f7bcff227be5416ff97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa35a529f1233d2e3e52f7bc… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jul 19 16:19:28 2011 +0200 shell32: Add IKnownFolder::GetFolderDefinition() implementation. --- dlls/shell32/shellpath.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 4407056..13d50e0 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3175,6 +3175,15 @@ static HRESULT get_known_folder_redirection_place( static HRESULT get_known_folder_path_by_id(REFKNOWNFOLDERID folderId, LPWSTR lpRegistryPath, DWORD dwFlags, LPWSTR *ppszPath); +static HRESULT get_known_folder_category( + LPWSTR registryPath, + KF_CATEGORY* pCategory) +{ + DWORD dwSize = sizeof(DWORD); + DWORD dwType; + return HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, registryPath, szCategory, RRF_RT_DWORD, &dwType, pCategory, &dwSize)); +} + static HRESULT redirect_known_folder( REFKNOWNFOLDERID rfid, HWND hwnd, @@ -3372,8 +3381,6 @@ static HRESULT WINAPI knownfolder_GetCategory( { struct knownfolder *knownfolder = impl_from_IKnownFolder(iface); HRESULT hr = S_OK; - DWORD dwSize = sizeof(DWORD); - DWORD dwType; TRACE("%p, %p\n", knownfolder, pCategory); @@ -3382,7 +3389,7 @@ static HRESULT WINAPI knownfolder_GetCategory( hr = E_FAIL; if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szCategory, RRF_RT_DWORD, &dwType, pCategory, &dwSize)); + hr = get_known_folder_category(knownfolder->registryPath, pCategory); return hr; } @@ -3585,8 +3592,30 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( IKnownFolder *iface, KNOWNFOLDER_DEFINITION *pKFD) { - FIXME("%p\n", pKFD); - return E_NOTIMPL; + struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); + HRESULT hr; + DWORD dwSize; + TRACE("(%p, %p)\n", knownfolder, pKFD); + + if(!pKFD) return E_INVALIDARG; + + ZeroMemory(pKFD, sizeof(*pKFD)); + + hr = get_known_folder_category(knownfolder->registryPath, &pKFD->category); + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szName, RRF_RT_REG_SZ, NULL, NULL, &dwSize)); + + if(SUCCEEDED(hr)) + { + pKFD->pszName = CoTaskMemAlloc(dwSize); + if(!pKFD->pszName) hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szName, RRF_RT_REG_SZ, NULL, pKFD->pszName, &dwSize)); + + return hr; } static const struct IKnownFolderVtbl knownfolder_vtbl =

1 0