April 2009 - Wine-commits - list.winehq.org

Nicolas Le Cam : shell32/tests: Completly fix GetAttributesOf test when launched from drive root dir.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 1f52f12f3c125f7c07f531c6064760516cc24e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f52f12f3c125f7c07f531c60… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 7 19:14:07 2009 +0200 shell32/tests: Completly fix GetAttributesOf test when launched from drive root dir. --- dlls/shell32/tests/shlfolder.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 5492b84..08ea9cc 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -848,6 +848,8 @@ static void test_GetAttributesOf(void) IMalloc_Free(ppM, newPIDL); /* append testdirectory name to path */ + if (cCurrDirA[len-1] == '\\') + cCurrDirA[len-1] = 0; lstrcatA(cCurrDirA, "\\testdir"); MultiByteToWideChar(CP_ACP, 0, cCurrDirA, -1, cCurrDirW, MAX_PATH);

1 0

Nicolas Le Cam : shell32/tests: Skip interactive part of SetNameOf test on Win2k.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: eb57396fc62b1c4fc56c187273c534ca82abc1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb57396fc62b1c4fc56c18727… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 7 19:15:35 2009 +0200 shell32/tests: Skip interactive part of SetNameOf test on Win2k. Passing an absolute path to SetNameOf on Win2k display an error message box about invalid characters in filename, forcing interaction during test. --- dlls/shell32/tests/shlfolder.c | 63 +++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 08ea9cc..cbbad01 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -473,7 +473,7 @@ static void test_GetDisplayName(void) IShellFolder_Release(psfFile); } - if(!pSHBindToParent) + if (!pSHBindToParent) { win_skip("SHBindToParent is missing\n"); DeleteFileA(szTestFile); @@ -482,37 +482,42 @@ static void test_GetDisplayName(void) } /* Some tests for IShellFolder::SetNameOf */ - hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); - ok(SUCCEEDED(hr), "SHBindToParent failed! hr = %08x\n", hr); - if (SUCCEEDED(hr)) { - /* It's ok to use this fixed path. Call will fail anyway. */ - WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; - LPITEMIDLIST pidlNew; - - /* The pidl returned through the last parameter of SetNameOf is a simple one. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); - ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr); - if(hr == S_OK) - { - ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, - "pidl returned from SetNameOf should be simple!\n"); - - /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf - * is implemented on top of SHFileOperation in WinXP. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, - SHGDN_FORPARSING, NULL); - ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); - - /* Rename the file back to its original name. SetNameOf ignores the fact, that the - * SHGDN flags specify an absolute path. */ - hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); + if (pSHGetFolderPathAndSubDirA) + { + hr = pSHBindToParent(pidlTestFile, &IID_IShellFolder, (VOID**)&psfPersonal, &pidlLast); + ok(SUCCEEDED(hr), "SHBindToParent failed! hr = %08x\n", hr); + if (SUCCEEDED(hr)) { + /* It's ok to use this fixed path. Call will fail anyway. */ + WCHAR wszAbsoluteFilename[] = { 'C',':','\\','w','i','n','e','t','e','s','t', 0 }; + LPITEMIDLIST pidlNew; + + /* The pidl returned through the last parameter of SetNameOf is a simple one. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlLast, wszDirName, SHGDN_NORMAL, &pidlNew); ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr); + if (hr == S_OK) + { + ok (((LPITEMIDLIST)((LPBYTE)pidlNew+pidlNew->mkid.cb))->mkid.cb == 0, + "pidl returned from SetNameOf should be simple!\n"); + + /* Passing an absolute path to SetNameOf fails. The HRESULT code indicates that SetNameOf + * is implemented on top of SHFileOperation in WinXP. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszAbsoluteFilename, + SHGDN_FORPARSING, NULL); + ok (hr == HRESULT_FROM_WIN32(ERROR_CANCELLED), "SetNameOf succeeded! hr = %08x\n", hr); + + /* Rename the file back to its original name. SetNameOf ignores the fact, that the + * SHGDN flags specify an absolute path. */ + hr = IShellFolder_SetNameOf(psfPersonal, NULL, pidlNew, wszFileName, SHGDN_FORPARSING, NULL); + ok (SUCCEEDED(hr), "SetNameOf failed! hr = %08x\n", hr); + + pILFree(pidlNew); + } - pILFree(pidlNew); + IShellFolder_Release(psfPersonal); } - - IShellFolder_Release(psfPersonal); } + else + win_skip("Avoid needs of interaction on Win2k\n"); /* Deleting the file and the directory */ DeleteFileA(szTestFile);

1 0

Nicolas Le Cam : shell32/tests: Fix PropertyBag test on Win2k.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 1d3edf6377cf346eed758bdfe1c6a81f5dadde5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3edf6377cf346eed758bdfe… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Apr 7 19:16:46 2009 +0200 shell32/tests: Fix PropertyBag test on Win2k. --- dlls/shell32/tests/shlfolder.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index cbbad01..a45a386 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1106,7 +1106,9 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC 'R','e','s','o','l','v','e','L','i','n','k','F','l','a','g','s',0 }; if (!lstrcmpW(pszPropName, wszTargetSpecialFolder)) { - ok(V_VT(pVar) == VT_I4, "Wrong variant type for 'TargetSpecialFolder' property!\n"); + ok(V_VT(pVar) == VT_I4 || + broken(V_VT(pVar) == VT_BSTR), /* Win2k */ + "Wrong variant type for 'TargetSpecialFolder' property!\n"); return E_INVALIDARG; } @@ -1120,7 +1122,9 @@ static HRESULT WINAPI InitPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPC WCHAR wszPath[MAX_PATH]; BOOL result; - ok(V_VT(pVar) == VT_BSTR, "Wrong variant type for 'Target' property!\n"); + ok(V_VT(pVar) == VT_BSTR || + broken(V_VT(pVar) == VT_EMPTY), /* Win2k */ + "Wrong variant type for 'Target' property!\n"); if (V_VT(pVar) != VT_BSTR) return E_INVALIDARG; result = pSHGetSpecialFolderPathW(NULL, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE);

1 0

Nicolas Le Cam : shell32/tests: Skip FolderShortcut test on Win2k.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: fbcec1ca56e7acff180b23e81b6f1d38060ad4b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcec1ca56e7acff180b23e81… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Apr 9 00:01:12 2009 +0200 shell32/tests: Skip FolderShortcut test on Win2k. Skip this test as it doesn't work on Win2k. CoCreateInstance is successful but IPersistPropertyBag_Load call fails. --- dlls/shell32/tests/shlfolder.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index a45a386..5c30a7b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1196,7 +1196,13 @@ static void test_FolderShortcut(void) { win_skip("SHGetSpecialFolderPathW and/or StrRetToBufW are not available\n"); return; } - + + if (!pSHGetFolderPathAndSubDirA) + { + win_skip("FolderShortcut test doesn't work on Win2k\n"); + return; + } + /* These tests basically show, that CLSID_FolderShortcuts are initialized * via their IPersistPropertyBag interface. And that the target folder * is taken from the IPropertyBag's 'Target' property. @@ -1216,7 +1222,7 @@ static void test_FolderShortcut(void) { IPersistPropertyBag_Release(pPersistPropertyBag); return; } - + hr = IPersistPropertyBag_QueryInterface(pPersistPropertyBag, &IID_IShellFolder, (LPVOID*)&pShellFolder); IPersistPropertyBag_Release(pPersistPropertyBag);

1 0

Alexandre Julliard : server: Make all dump function take a prefix string to simplify the tracing code.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 53929f19066af05c92373dcd662c1d007b2f7692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53929f19066af05c92373dcd6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 3 18:02:21 2009 +0200 server: Make all dump function take a prefix string to simplify the tracing code. --- server/trace.c | 2778 ++++++++++++++++++++++----------------------------- tools/make_requests | 23 +- 2 files changed, 1202 insertions(+), 1599 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53929f19066af05c92373…

1 0

Alexandre Julliard : server: Define a generic context structure instead of using the platform-specific version .
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 5316dd011f15ca488ccfa69b5873b075407fe238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5316dd011f15ca488ccfa69b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 8 19:38:02 2009 +0200 server: Define a generic context structure instead of using the platform-specific version. --- dlls/ntdll/exception.c | 20 ++- dlls/ntdll/ntdll_misc.h | 2 + dlls/ntdll/signal_i386.c | 144 +++++++++++++++++ dlls/ntdll/signal_powerpc.c | 214 ++++++++++++++++++++++++- dlls/ntdll/signal_sparc.c | 132 +++++++++++++++ dlls/ntdll/signal_x86_64.c | 137 ++++++++++++++++ dlls/ntdll/thread.c | 51 +++++-- include/wine/server_protocol.h | 60 +++++++- server/Makefile.in | 5 - server/context_alpha.c | 348 ---------------------------------------- server/context_i386.c | 104 ------------ server/context_powerpc.c | 286 --------------------------------- server/context_sparc.c | 184 --------------------- server/context_x86_64.c | 104 ------------ server/debugger.c | 8 +- server/mach.c | 67 ++++----- server/procfs.c | 10 +- server/protocol.def | 58 +++++++- server/ptrace.c | 119 +++++++------- server/request.h | 3 +- server/thread.c | 83 ++++++++-- server/thread.h | 14 +-- server/trace.c | 210 +++++++++++++++++++++---- 23 files changed, 1135 insertions(+), 1228 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5316dd011f15ca488ccfa…

1 0

Alexandre Julliard : ntdll: Set the proper context flags in the signal handlers for x86_64.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 0865c278f27da7d0a45128caeeed99d090a80ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0865c278f27da7d0a45128cae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 8 20:40:29 2009 +0200 ntdll: Set the proper context flags in the signal handlers for x86_64. --- dlls/ntdll/signal_x86_64.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7a0defa..dfb1b51 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -189,6 +189,7 @@ static inline int dispatch_signal(unsigned int sig) */ static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) { + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS; context->Rax = RAX_sig(sigcontext); context->Rcx = RCX_sig(sigcontext); context->Rdx = RDX_sig(sigcontext); @@ -214,7 +215,11 @@ static void save_context( CONTEXT *context, const SIGCONTEXT *sigcontext ) context->SegEs = 0; /* FIXME */ context->SegSs = 0; /* FIXME */ context->MxCsr = 0; /* FIXME */ - if (FPU_sig(sigcontext)) context->u.FltSave = *FPU_sig(sigcontext); + if (FPU_sig(sigcontext)) + { + context->ContextFlags |= CONTEXT_FLOATING_POINT; + context->u.FltSave = *FPU_sig(sigcontext); + } }

1 0

Alexandre Julliard : winedbg: Add context dumping for x86_64.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 09d7fa707f9cdef672c88a9d583629b02c28032a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d7fa707f9cdef672c88a9d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 8 20:40:35 2009 +0200 winedbg: Add context dumping for x86_64. --- programs/winedbg/be_x86_64.c | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index f2dcc1a..b1315bb 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -66,7 +66,41 @@ static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable) static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { - dbg_printf("Context printing for x86_64 not done yet\n"); + char *pt, buf[33]; + + dbg_printf("Register dump:\n"); + strcpy(buf, " - 00 - - - "); + pt = buf + strlen(buf) - 1; + if (ctx->EFlags & 0x00000001) *pt-- = 'C'; /* Carry Flag */ + if (ctx->EFlags & 0x00000002) *pt-- = '1'; + if (ctx->EFlags & 0x00000004) *pt-- = 'P'; /* Parity Flag */ + if (ctx->EFlags & 0x00000008) *pt-- = '-'; + if (ctx->EFlags & 0x00000010) *pt-- = 'A'; /* Auxiliary Carry Flag */ + if (ctx->EFlags & 0x00000020) *pt-- = '-'; + if (ctx->EFlags & 0x00000040) *pt-- = 'Z'; /* Zero Flag */ + if (ctx->EFlags & 0x00000080) *pt-- = 'S'; /* Sign Flag */ + if (ctx->EFlags & 0x00000100) *pt-- = 'T'; /* Trap/Trace Flag */ + if (ctx->EFlags & 0x00000200) *pt-- = 'I'; /* Interrupt Enable Flag */ + if (ctx->EFlags & 0x00000400) *pt-- = 'D'; /* Direction Indicator */ + if (ctx->EFlags & 0x00000800) *pt-- = 'O'; /* Overflow flags */ + if (ctx->EFlags & 0x00001000) *pt-- = '1'; /* I/O Privilege Level */ + if (ctx->EFlags & 0x00002000) *pt-- = '1'; /* I/O Privilege Level */ + if (ctx->EFlags & 0x00004000) *pt-- = 'N'; /* Nested Task Flag */ + if (ctx->EFlags & 0x00008000) *pt-- = '-'; + if (ctx->EFlags & 0x00010000) *pt-- = 'R'; /* Resume Flag */ + if (ctx->EFlags & 0x00020000) *pt-- = 'V'; /* Vritual Mode Flag */ + if (ctx->EFlags & 0x00040000) *pt-- = 'a'; /* Alignment Check Flag */ + + dbg_printf(" rip:%016lx rsp:%016lx rbp:%016lx eflags:%08x (%s)\n", + ctx->Rip, ctx->Rsp, ctx->Rbp, ctx->EFlags, buf); + dbg_printf(" rax:%016lx rbx:%016lx rcx:%016lx rdx:%016lx\n", + ctx->Rax, ctx->Rbx, ctx->Rcx, ctx->Rdx); + dbg_printf(" rsi:%016lx rdi:%016lx r8:%016lx r9:%016lx r10:%016lx\n", + ctx->Rsi, ctx->Rdi, ctx->R8, ctx->R9, ctx->R10 ); + dbg_printf(" r11:%016lx r12:%016lx r13:%016lx r14:%016lx r15:%016lx\n", + ctx->R11, ctx->R12, ctx->R13, ctx->R14, ctx->R15 ); + + if (all_regs) dbg_printf( "Floating point x86_64 dump not implemented\n" ); } static void be_x86_64_print_segment_info(HANDLE hThread, const CONTEXT* ctx)

1 0

Nikolay Sivov : comctl32/tab: Simplify hottracked button painting.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: bc22a893068dd380cae5d35d001fd5f60a6f5b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc22a893068dd380cae5d35d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 8 11:39:08 2009 -0400 comctl32/tab: Simplify hottracked button painting. --- dlls/comctl32/tab.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 4eebd15..c2ab01e 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1483,10 +1483,7 @@ TAB_EraseTabInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect InflateRect(&rTemp, 2, 2); FillRect(hdc, &rTemp, hbr); if (iItem == infoPtr->iHotTracked) - { - DrawEdge(hdc, &rTemp, EDGE_RAISED, BF_SOFT|BF_TOPLEFT); - DrawEdge(hdc, &rTemp, EDGE_RAISED, BF_FLAT|BF_BOTTOMRIGHT); - } + DrawEdge(hdc, &rTemp, BDR_RAISEDINNER, BF_RECT); } else FillRect(hdc, &rTemp, hbr);

1 0

Detlef Riekenberg : wintrust/tests: Fix some tests on win9x.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 49ff2be04e9811573907c1bd754c3029d15189c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ff2be04e9811573907c1bd7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 8 19:53:59 2009 +0200 wintrust/tests: Fix some tests on win9x. --- dlls/wintrust/tests/crypt.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 9129fa9..cfb9564 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -854,7 +854,9 @@ static void test_cdf_parsing(void) catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); /* Header and member only */ @@ -868,7 +870,9 @@ static void test_cdf_parsing(void) catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n"); @@ -882,7 +886,9 @@ static void test_cdf_parsing(void) catcdf = pCryptCATCDFOpen(cdffileW, cdf_callback); ok(catcdf == NULL, "CryptCATCDFOpen succeeded\n"); todo_wine - ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_SHARING_VIOLATION || + broken(GetLastError() == ERROR_SUCCESS), /* win9x */ + "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); DeleteFileA(cdffileA); ok(!DeleteFileA(catfileA), "Didn't expect a catalog file to be created\n");

1 0