March 2007 - Wine-commits - list.winehq.org

Dmitry Timoshkov : user32: Make the excessive scroll test pass under Windows.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 7f7d85859611dfaab5a13e43ef13d5ed3be4f143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f7d85859611dfaab5a13e43e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 6 13:12:19 2007 +0800 user32: Make the excessive scroll test pass under Windows. --- dlls/user32/tests/win.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c15e62f..c9d0b3b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2991,13 +2991,14 @@ static void test_scrollvalidate( HWND parent) CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); + /* clear an update region */ + UpdateWindow( hwnd1 ); + SetRect( &rc, 0,40, 100,60); SetRect( &cliprc, 0,0, 100,100); ScrollWindowEx( hwnd1, 0, -25, &rc, &cliprc, hrgn, &rcu, SW_INVALIDATE); - SetRectRgn( tmprgn, 0,15,98,35); - CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); - SetRectRgn( tmprgn, 0, 40, 98, 60); - CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); + if (winetest_debug > 0) dump_region( hrgn ); + SetRectRgn( exprgn, 0, 40, 98, 60 ); ok( EqualRgn( exprgn, hrgn), "wrong update region in excessive scroll\n"); /* now test ScrollWindowEx with a combination of

1 0

Eric Pouech : winedbg: We no longer need to force for ELF modules in minidumps as we do it automatically now .
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: e374bcffee7dcebec21728839bfffca7c95bc9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e374bcffee7dcebec21728839… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Mar 5 21:45:21 2007 +0100 winedbg: We no longer need to force for ELF modules in minidumps as we do it automatically now. --- programs/winedbg/tgt_minidump.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 5df7c99..9e61130 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -44,7 +44,6 @@ void minidump_write(const char* file, const EXCEPTION_RECORD* rec) HANDLE hFile; MINIDUMP_EXCEPTION_INFORMATION mei; EXCEPTION_POINTERS ep; - DWORD wine_opt; hFile = CreateFile(file, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); @@ -59,14 +58,9 @@ void minidump_write(const char* file, const EXCEPTION_RECORD* rec) ep.ContextRecord = &dbg_context; mei.ClientPointers = FALSE; } - /* this is a wine specific options to return also ELF modules in the - * dumping - */ - SymSetOptions((wine_opt = SymGetOptions()) | 0x40000000); MiniDumpWriteDump(dbg_curr_process->handle, dbg_curr_process->pid, hFile, MiniDumpNormal/*|MiniDumpWithDataSegs*/, rec ? &mei : NULL, NULL, NULL); - SymSetOptions(wine_opt); CloseHandle(hFile); }

1 0

Eric Pouech : winedbg: Forward the wShowWindow option from winedbg to the debuggee.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: deaa366e4c8ecc2f0c9813226911766b3367d080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deaa366e4c8ecc2f0c9813226… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Mar 5 21:54:35 2007 +0100 winedbg: Forward the wShowWindow option from winedbg to the debuggee. --- programs/winedbg/tgt_active.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 8730f41..21e8966 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -703,13 +703,17 @@ void dbg_active_wait_for_first_exception(void) static unsigned dbg_start_debuggee(LPSTR cmdLine) { PROCESS_INFORMATION info; - STARTUPINFOA startup; + STARTUPINFOA startup, current; DWORD flags; + GetStartupInfoA(&current); + memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; - startup.wShowWindow = SW_SHOWNORMAL; + + startup.wShowWindow = (current.dwFlags & STARTF_USESHOWWINDOW) ? + current.wShowWindow : SW_SHOWNORMAL; /* FIXME: shouldn't need the CREATE_NEW_CONSOLE, but as usual CUI:s need it * while GUI:s don't

1 0

Detlef Riekenberg : winspool/tests: Vista returns a different status.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 753e61fe1157b1d67a55711c0c22511a3318d848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=753e61fe1157b1d67a55711c0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Mar 5 21:44:18 2007 +0100 winspool/tests: Vista returns a different status. --- dlls/winspool.drv/tests/info.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 5a8994e..e8b50bf 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -86,7 +86,7 @@ static DWORD report_deactivated_spooler = 1; { \ if(report_deactivated_spooler > 0) { \ report_deactivated_spooler--; \ - trace("The Service 'Spooler' is required for many test\n"); \ + skip("The Service 'Spooler' is required for many test\n"); \ } \ return; \ } @@ -308,7 +308,7 @@ static void test_AddMonitor(void) RETURN_ON_DEACTIVATED_SPOOLER(res) if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { - trace("skip tests (ACCESS_DENIED)\n"); + skip("(ACCESS_DENIED)\n"); return; } @@ -319,7 +319,7 @@ static void test_AddMonitor(void) "ERROR_INVALID_ENVIRONMENT)\n", res, GetLastError()); if (!entry) { - trace("No usable Monitor found: Skip tests\n"); + skip("No usable Monitor found\n"); return; } @@ -434,7 +434,7 @@ static void test_AddPort(void) res = AddPortA(NULL, 0, empty); /* Allowed only for (Printer-)Administrators */ if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { - trace("skip tests (ACCESS_DENIED)\n"); + skip("(ACCESS_DENIED)\n"); return; } /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ @@ -474,7 +474,7 @@ static void test_ConfigurePort(void) res = ConfigurePortA(NULL, 0, empty); /* Allowed only for (Printer-)Administrators */ if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { - trace(" skip tests (ACCESS_DENIED)\n"); + skip("(ACCESS_DENIED)\n"); return; } /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ @@ -530,7 +530,7 @@ static void test_DeleteMonitor(void) entry = find_installed_monitor(); if (!entry) { - trace("No usable Monitor found: Skip tests\n"); + skip("No usable Monitor found\n"); return; } @@ -615,7 +615,7 @@ static void test_DeletePort(void) res = DeletePortA(NULL, 0, empty); /* Allowed only for (Printer-)Administrators */ if (!res && (GetLastError() == ERROR_ACCESS_DENIED)) { - trace("skip tests (ACCESS_DENIED)\n"); + skip("(ACCESS_DENIED)\n"); return; } /* XP: ERROR_NOT_SUPPORTED, NT351 and 9x: ERROR_INVALID_PARAMETER */ @@ -653,7 +653,7 @@ static void test_EnumForms(LPSTR pName) if (!res || !hprinter) { /* Open the local Prinserver is not supported on win9x */ - if (pName) trace("Failed to open '%s', skiping the test\n", pName); + if (pName) skip("Failed to open '%s' (not supported on win9x)\n", pName); return; } @@ -776,7 +776,7 @@ static void test_EnumMonitors(void) /* Level 2 is not supported on win9x */ if (!res && (GetLastError() == ERROR_INVALID_LEVEL)) { - trace("Level %d not supported, skipping tests\n", level); + skip("Level %d not supported\n", level); continue; } @@ -785,7 +785,7 @@ static void test_EnumMonitors(void) "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); if (!cbBuf) { - trace("no valid buffer size returned, skipping tests\n"); + skip("no valid buffer size returned\n"); continue; } @@ -884,7 +884,7 @@ static void test_EnumPorts(void) /* Level 2 is not supported on NT 3.x */ if (!res && (GetLastError() == ERROR_INVALID_LEVEL)) { - trace("Level %d not supported, skipping tests\n", level); + skip("Level %d not supported\n", level); continue; } @@ -1045,7 +1045,7 @@ static void test_GetPrinterDriverDirectory(void) "ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); if (!cbBuf) { - trace("no valid buffer size returned, skipping tests\n"); + skip("no valid buffer size returned\n"); return; } @@ -1716,8 +1716,9 @@ static void test_XcvDataW_PortIsValid(void) status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) emptyW, sizeof(emptyW), NULL, 0, &needed, &status); - ok( res && (status == ERROR_PATH_NOT_FOUND), - "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_PATH_NOT_FOUND)\n", + ok( res && ((status == ERROR_FILE_NOT_FOUND) || (status == ERROR_PATH_NOT_FOUND)), + "returned %d with %u and %u for status %u (expected '!= 0' for status: " + "ERROR_FILE_NOT_FOUND or ERROR_PATH_NOT_FOUND)\n", res, GetLastError(), needed, status); /* a directory is not allowed */ @@ -1797,7 +1798,7 @@ static void test_GetPrinterDriver(void) if (!default_printer) { - trace("There is no default printer installed, skiping the test\n"); + skip("There is no default printer installed\n"); return; } @@ -1805,7 +1806,7 @@ static void test_GetPrinterDriver(void) ret = OpenPrinter(default_printer, &hprn, NULL); if (!ret) { - trace("There is no printers installed, skiping the test\n"); + skip("Unable to open the default printer (%s)\n", default_printer); return; } ok(hprn != 0, "wrong hprn %p\n", hprn); @@ -1906,7 +1907,7 @@ static void test_DocumentProperties(void) if (!default_printer) { - trace("There is no default printer installed, skiping the test\n"); + skip("There is no default printer installed\n"); return; } @@ -1914,7 +1915,7 @@ static void test_DocumentProperties(void) ret = OpenPrinter(default_printer, &hprn, NULL); if (!ret) { - trace("There is no printers installed, skiping the test\n"); + skip("Unable to open the default printer (%s)\n", default_printer); return; } ok(hprn != 0, "wrong hprn %p\n", hprn); @@ -1966,7 +1967,7 @@ static void test_EnumPrinters(void) /* EnumPrintersW is not supported on all platforms */ if (!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { - trace("EnumPrintersW is not implemented, skipping some tests\n"); + skip("EnumPrintersW is not implemented\n"); return; }

1 0

Detlef Riekenberg : localspl: Do not crash when Xcv was opened without a space in the name.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 2253edb7a3981bf8f8367bfca0fac2b254ad2b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2253edb7a3981bf8f8367bfca… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Mar 6 05:40:50 2007 +0100 localspl: Do not crash when Xcv was opened without a space in the name. --- dlls/localspl/localmon.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 3aa3485..c195c17 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -520,7 +520,13 @@ DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInput if (!lstrcmpW(pszDataName, cmd_SetDefaultCommConfigW)) { /* get the portname from the Handle */ ptr = strchrW(((xcv_t *)hXcv)->nameW, ' '); - ptr++; /* skip the space */ + if (ptr) { + ptr++; /* skip the space */ + } + else + { + ptr = ((xcv_t *)hXcv)->nameW; + } lstrcpynW(buffer, ptr, sizeof(buffer)/sizeof(WCHAR)); if (buffer[0]) buffer[lstrlenW(buffer)-1] = '\0'; /* remove the ':' */ res = SetDefaultCommConfigW(buffer, (LPCOMMCONFIG) pInputData, cbInputData);

1 0

Rob Shearman : ole32: Compare the class contexts in COM_GetRegisteredClassObject.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 87155d654f5b74e22d2f947b2a5cda069c2f2458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87155d654f5b74e22d2f947b2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 5 20:45:49 2007 +0000 ole32: Compare the class contexts in COM_GetRegisteredClassObject. Only objects that have been registered for a class context that matches the requested class context should be returned. --- dlls/ole32/compobj.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 110223a..a20cb94 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1461,16 +1461,12 @@ static HRESULT COM_GetRegisteredClassObject( while (curClass != 0) { /* - * Check if we have a match on the class ID. + * Check if we have a match on the class ID and context. */ - if (IsEqualGUID(&(curClass->classIdentifier), rclsid)) + if ((dwClsContext & curClass->runContext) && + IsEqualGUID(&(curClass->classIdentifier), rclsid)) { /* - * Since we don't do out-of process or DCOM just right away, let's ignore the - * class context. - */ - - /* * We have a match, return the pointer to the class object. */ *ppUnk = curClass->classObject;

1 0

Rob Shearman : credui: Fix a missing ":" in the credential dialog domain name text box.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 25e983d3890933e0b12a6f05794a65bc04fde6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e983d3890933e0b12a6f057… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 5 20:44:12 2007 +0000 credui: Fix a missing ":" in the credential dialog domain name text box. --- dlls/credui/credui.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index 0417aa5..6306bc7 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -35,7 +35,7 @@ BEGIN EDITTEXT IDC_USERNAME,80,10,130,12,ES_AUTOHSCROLL LTEXT "&Password:",IDC_STATIC,7,27,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,27,130,12,ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&Domain Name",IDC_STATIC,7,44,72,12,SS_CENTERIMAGE + LTEXT "&Domain Name:",IDC_STATIC,7,44,72,12,SS_CENTERIMAGE EDITTEXT IDC_DOMAIN,80,44,130,12,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,7,61,50,14 PUSHBUTTON "Cancel",IDCANCEL,67,61,50,14

1 0

Rob Shearman : ole32: OleLoad should call CoCreateInstance with CLSCTX_INPROC_SERVER as well as CLSCTX_INPROC_HANDLER .
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 356fdcbb1545d076cf921301c90ab4ae9f99d59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=356fdcbb1545d076cf921301c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 5 20:44:52 2007 +0000 ole32: OleLoad should call CoCreateInstance with CLSCTX_INPROC_SERVER as well as CLSCTX_INPROC_HANDLER. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index fa02c42..8b3103f 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -966,7 +966,7 @@ HRESULT WINAPI OleLoad( */ hres = CoCreateInstance(&storageInfo.clsid, NULL, - CLSCTX_INPROC_HANDLER, + CLSCTX_INPROC_HANDLER|CLSCTX_INPROC_SERVER, riid, (void**)&pUnk);

1 0

Mike Schaadt : snmpapi: Changed %llu to %x%08lx.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 26390a47c78e63677325496e05d0da42f4a5fb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26390a47c78e63677325496e0… Author: Mike Schaadt <mschaadt(a)gmail.com> Date: Mon Mar 5 11:50:23 2007 -0600 snmpapi: Changed %llu to %x%08lx. --- dlls/snmpapi/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index b512d41..11a7b31 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -564,7 +564,7 @@ VOID WINAPI SnmpUtilPrintAsnAny(AsnAny *any) case ASN_TIMETICKS: TRACE("Timeticks %u\n", any->asnValue.ticks); return; case ASN_COUNTER64: { - TRACE("Counter64 %llu\n", any->asnValue.counter64.QuadPart); + TRACE("Counter64 %lx%08lx\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); return; } case ASN_OCTETSTRING:

1 0

Andrew Talbot : msi: Replace const pointer parameters with correct pointers to const.
by Alexandre Julliard 06 Mar '07

06 Mar '07

Module: wine Branch: master Commit: 7a9b2183d4f17a825421d510773d583f60f4f648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9b2183d4f17a825421d5107… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 5 18:58:55 2007 +0000 msi: Replace const pointer parameters with correct pointers to const. --- dlls/msi/custom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index fc86691..1e3a866 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -457,7 +457,7 @@ static UINT wait_thread_handle( msi_custom_action_info *info ) return rc; } -static msi_custom_action_info *find_action_by_guid( const LPGUID guid ) +static msi_custom_action_info *find_action_by_guid( const GUID *guid ) { msi_custom_action_info *info; BOOL found = FALSE; @@ -481,7 +481,7 @@ static msi_custom_action_info *find_action_by_guid( const LPGUID guid ) return info; } -static DWORD WINAPI ACTION_CallDllFunction( const LPGUID guid ) +static DWORD WINAPI ACTION_CallDllFunction( const GUID *guid ) { msi_custom_action_info *info; MsiCustomActionEntryPoint fn;

1 0