August 2006 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Correctly handle nsILoadGroup.
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: 9ee2f5e0adf0ce87db5e40f93f703e46cb4d7c47 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9ee2f5e0adf0ce87db5e40f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 15 21:55:33 2006 +0200 mshtml: Correctly handle nsILoadGroup. --- dlls/mshtml/navigate.c | 12 +++++++++++- dlls/mshtml/nsio.c | 19 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index c37c475..c588f05 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -309,10 +309,20 @@ static HRESULT WINAPI BindStatusCallback TRACE("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError)); - if(This->nslistener) + if(This->nslistener) { nsIStreamListener_OnStopRequest(This->nslistener, (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, NS_OK); + if(This->nschannel->load_group) { + nsresult nsres; + + nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, + (nsIRequest*)NSCHANNEL(This->nschannel), NULL, NS_OK); + if(NS_FAILED(nsres)) + ERR("RemoveRequest failed: %08lx\n", nsres); + } + } + return S_OK; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0c26fd4..d643e35 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -602,8 +602,17 @@ static nsresult NSAPI nsChannel_AsyncOpe nsIWebBrowserChrome_Release(NSWBCHROME(container)); - if(!This->channel) + if(!This->channel) { + if(This->load_group) { + nsres = nsILoadGroup_AddRequest(This->load_group, + (nsIRequest*)NSCHANNEL(This), NULL); + + if(NS_FAILED(nsres)) + ERR("AddRequest failed:%08lx\n", nsres); + } + return WINE_NS_LOAD_FROM_MONIKER; + } }else { BOOL cont = before_async_open(This, container); nsIWebBrowserChrome_Release(NSWBCHROME(container)); @@ -673,6 +682,14 @@ static nsresult NSAPI nsChannel_AsyncOpe bscallback->nscontext = aContext; } + if(This->load_group) { + nsres = nsILoadGroup_AddRequest(This->load_group, + (nsIRequest*)NSCHANNEL(This), NULL); + + if(NS_FAILED(nsres)) + ERR("AddRequest failed:%08lx\n", nsres); + } + start_binding(bscallback); IBindStatusCallback_Release(STATUSCLB(bscallback));

1 0

Alexandre Julliard : server: Store the actual process count in snapshots.
by Alexandre Julliard Aug. 15, 2006

Aug. 15, 2006

Module: wine Branch: master Commit: 498b781e2300681105fcf4a768c7a7d69a632ed1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=498b781e2300681105fcf4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 20:31:54 2006 +0200 server: Store the actual process count in snapshots. We can't rely on running_processes for that, since it now also counts processes waiting for SIGKILL and those aren't included in snapshots. --- server/process.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/server/process.c b/server/process.c index 733b1c5..b36ca37 100644 --- a/server/process.c +++ b/server/process.c @@ -733,6 +733,7 @@ struct process_snapshot *process_snap( i { struct process_snapshot *snapshot, *ptr; struct process *process; + if (!running_processes) return NULL; if (!(snapshot = mem_alloc( sizeof(*snapshot) * running_processes ))) return NULL; @@ -748,7 +749,12 @@ struct process_snapshot *process_snap( i grab_object( process ); ptr++; } - *count = running_processes; + + if (!(*count = ptr - snapshot)) + { + free( snapshot ); + snapshot = NULL; + } return snapshot; }

1 0

Alexandre Julliard : user/tests: Fix a compiler warning, and remove some useless casts.
by Alexandre Julliard Aug. 15, 2006

Aug. 15, 2006

Module: wine Branch: master Commit: 68eddac14bde40388559b82188108492df72c04b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68eddac14bde40388559b82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 19:50:34 2006 +0200 user/tests: Fix a compiler warning, and remove some useless casts. --- dlls/user/tests/cursoricon.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user/tests/cursoricon.c b/dlls/user/tests/cursoricon.c index 4a217f9..be0da20 100644 --- a/dlls/user/tests/cursoricon.c +++ b/dlls/user/tests/cursoricon.c @@ -29,8 +29,8 @@ #include "winreg.h" #include "wingdi.h" #include "winuser.h" -static void test_CopyImage_Check(HBITMAP bitmap, UINT flags, LONG copyWidth, LONG copyHeight, - LONG expectedWidth, LONG expectedHeight, WORD expectedDepth, BOOL dibExpected) +static void test_CopyImage_Check(HBITMAP bitmap, UINT flags, INT copyWidth, INT copyHeight, + INT expectedWidth, INT expectedHeight, WORD expectedDepth, BOOL dibExpected) { HBITMAP copy; BITMAP origBitmap; @@ -42,7 +42,7 @@ static void test_CopyImage_Check(HBITMAP ok(copy != NULL, "CopyImage() failed\n"); if (copy != NULL) { - GetObject(bitmap, sizeof(origBitmap), &origBitmap) != 0, + GetObject(bitmap, sizeof(origBitmap), &origBitmap); GetObject(copy, sizeof(copyBitmap), &copyBitmap); orig_is_dib = (origBitmap.bmBits != NULL); copy_is_dib = (copyBitmap.bmBits != NULL); @@ -72,11 +72,11 @@ static void test_CopyImage_Check(HBITMAP && (copyBitmap.bmWidth == expectedWidth) && (copyBitmap.bmHeight == expectedHeight) && (copyBitmap.bmBitsPixel == expectedDepth)), - "CopyImage ((%s, %ldx%ld, %u bpp), %ld, %ld, %#x): Expected (%s, %ldx%ld, %u bpp), got (%s, %ldx%ld, %u bpp)\n", - orig_is_dib ? "DIB" : "DDB", (long)origBitmap.bmWidth, (long)origBitmap.bmHeight, (unsigned int)origBitmap.bmBitsPixel, - (long)copyWidth, (long)copyHeight, (unsigned int)flags, - dibExpected ? "DIB" : "DDB", (long)expectedWidth, (long)expectedHeight, (unsigned int)expectedDepth, - copy_is_dib ? "DIB" : "DDB", (long)copyBitmap.bmWidth, (long)copyBitmap.bmHeight, (unsigned int)copyBitmap.bmBitsPixel); + "CopyImage ((%s, %dx%d, %u bpp), %d, %d, %#x): Expected (%s, %dx%d, %u bpp), got (%s, %dx%d, %u bpp)\n", + orig_is_dib ? "DIB" : "DDB", origBitmap.bmWidth, origBitmap.bmHeight, origBitmap.bmBitsPixel, + copyWidth, copyHeight, flags, + dibExpected ? "DIB" : "DDB", expectedWidth, expectedHeight, expectedDepth, + copy_is_dib ? "DIB" : "DDB", copyBitmap.bmWidth, copyBitmap.bmHeight, copyBitmap.bmBitsPixel); DeleteObject(copy); }

1 0

Paul Vriens : kernel/tests: Wrong error code checked.
by Alexandre Julliard Aug. 15, 2006

Aug. 15, 2006

Module: wine Branch: master Commit: f2f44de6dc90c16db476254a33031b54a6295a7a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2f44de6dc90c16db476254… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Aug 15 19:15:56 2006 +0200 kernel/tests: Wrong error code checked. --- dlls/kernel/tests/file.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index a0ac890..29602b2 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -1214,7 +1214,9 @@ static void test_FindFirstFileA(void) handle = FindFirstFileA(buffer2, &search_results); err = GetLastError(); ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should Fail\n", buffer2 ); - ok ( err == ERROR_FILE_NOT_FOUND, "Bad Error number %d\n", err ); + todo_wine { + ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); + } /* try FindFirstFileA on "C:\foo\bar.txt" */ SetLastError( 0xdeadbeaf );

1 0

Paul Vriens : setupapi: Make tests loadable again on NT4.
by Alexandre Julliard Aug. 15, 2006

Aug. 15, 2006

Module: wine Branch: master Commit: 2bd9c59c4938b6474afbf037ba4a279031016012 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2bd9c59c4938b6474afbf03… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Aug 15 17:40:31 2006 +0200 setupapi: Make tests loadable again on NT4. --- dlls/setupapi/tests/devinst.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index bef1315..60915d1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -30,6 +30,21 @@ #include "setupapi.h" #include "wine/test.h" +/* function pointers */ +static HMODULE hSetupAPI; +static HDEVINFO (WINAPI *pSetupDiCreateDeviceInfoListExW)(GUID*,HWND,PCWSTR,PVOID); +static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); + +static void init_function_pointers(void) +{ + hSetupAPI = LoadLibraryA("setupapi.dll"); + + if (hSetupAPI) + { + pSetupDiCreateDeviceInfoListExW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoListExW"); + pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); + } +} static void test_SetupDiCreateDeviceInfoListEx(void) { @@ -41,7 +56,7 @@ static void test_SetupDiCreateDeviceInfo SetLastError(0xdeadbeef); /* create empty DeviceInfoList, but set Reserved to a value, which is not NULL */ - devlist = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, notnull); + devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, notnull); error = GetLastError(); ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %ld (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); @@ -49,22 +64,29 @@ static void test_SetupDiCreateDeviceInfo SetLastError(0xdeadbeef); /* create empty DeviceInfoList, but set MachineName to something */ - devlist = SetupDiCreateDeviceInfoListExW(NULL, NULL, machine, NULL); + devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, machine, NULL); error = GetLastError(); ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %ld (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); ok(error == ERROR_INVALID_MACHINENAME, "GetLastError returned wrong value : %ld, (expected %d)\n", error, ERROR_INVALID_MACHINENAME); /* create empty DeviceInfoList */ - devlist = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); + devlist = pSetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); ok(devlist && devlist != INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %ld (expected != %p)\n", devlist, error, INVALID_HANDLE_VALUE); /* destroy DeviceInfoList */ - ret = SetupDiDestroyDeviceInfoList(devlist); + ret = pSetupDiDestroyDeviceInfoList(devlist); ok(ret, "SetupDiDestroyDeviceInfoList failed : %ld\n", error); } START_TEST(devinst) { - test_SetupDiCreateDeviceInfoListEx(); + init_function_pointers(); + if (!hSetupAPI) + return; + + if (pSetupDiCreateDeviceInfoListExW && pSetupDiDestroyDeviceInfoList) + test_SetupDiCreateDeviceInfoListEx(); + else + trace("Needed calls not all available, skipping tests.\n"); }

1 0

Alexandre Julliard : ntdll: Default to native loadorder for the main exe if not in system directory.
by Alexandre Julliard Aug. 15, 2006

Aug. 15, 2006

Module: wine Branch: master Commit: c6d9577017946c33f78db51f82af9e657d13d15d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c6d9577017946c33f78db51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 19:48:08 2006 +0200 ntdll: Default to native loadorder for the main exe if not in system directory. Unlike dlls, executables can have the same name without necessarily being the same application, so defaulting to native is more likely to do the right thing. --- dlls/ntdll/loadorder.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index ecc0cab..c31b633 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -474,9 +474,17 @@ enum loadorder get_load_order( const WCH if (basename != module+1 && ((ret = get_load_order_value( std_key, app_key, basename )) != LO_INVALID)) goto done; + /* if loading the main exe with an explicit path, try native first */ + if (!app_name && basename != module+1) + { + ret = LO_NATIVE_BUILTIN; + TRACE( "got main exe default %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) ); + goto done; + } + /* and last the hard-coded default */ ret = LO_DEFAULT; - TRACE( "got hardcoded default %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) ); + TRACE( "got hardcoded %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) ); done: RtlFreeHeap( GetProcessHeap(), 0, module );

1 0

Paul Vriens : winerror.h: Added an error code.
by Alexandre Julliard Aug. 15, 2006

Aug. 15, 2006

Module: wine Branch: master Commit: c73e577c9af794a567d031b068fa593bd1823cb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c73e577c9af794a567d031b… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Aug 15 16:53:07 2006 +0200 winerror.h: Added an error code. --- include/winerror.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index eaad982..20f443c 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2268,6 +2268,7 @@ #define TRUST_E_PROVIDER_UNKNOWN #define TRUST_E_ACTION_UNKNOWN _HRESULT_TYPEDEF_(0x800B0002L) #define TRUST_E_SUBJECT_FORM_UNKNOWN _HRESULT_TYPEDEF_(0x800B0003L) #define TRUST_E_SUBJECT_NOT_TRUSTED _HRESULT_TYPEDEF_(0x800B0004L) +#define TRUST_E_NOSIGNATURE _HRESULT_TYPEDEF_(0x800B0100L) #define SPAPI_E_EXPECTED_SECTION_NAME _HRESULT_TYPEDEF_(0x800F0000L) #define SPAPI_E_BAD_SECTION_NAME_LINE _HRESULT_TYPEDEF_(0x800F0001L)

1 0

Paul Vriens : wintrust: Added stubbed WintrustLoadFunctionPointers.
by Alexandre Julliard Aug. 15, 2006

Aug. 15, 2006

Module: wine Branch: master Commit: 80df5324bab57094686e5e3dd83695cecfb403c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80df5324bab57094686e5e3… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Aug 15 16:47:04 2006 +0200 wintrust: Added stubbed WintrustLoadFunctionPointers. --- dlls/wintrust/wintrust.spec | 2 +- dlls/wintrust/wintrust_main.c | 11 +++++++++++ include/wintrust.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 10aaf67..a41c77d 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -115,7 +115,7 @@ @ stub WintrustCertificateTrust @ stub WintrustGetDefaultForUsage @ stdcall WintrustGetRegPolicyFlags(ptr) -@ stub WintrustLoadFunctionPointers +@ stdcall WintrustLoadFunctionPointers(ptr ptr) @ stdcall WintrustRemoveActionID(ptr) @ stdcall WintrustSetRegPolicyFlags(long) @ stub mscat32DllRegisterServer diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 5e435ea..e7d0f42 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -164,6 +164,17 @@ BOOL WINAPI WintrustRemoveActionID( GUID } /*********************************************************************** + * WintrustLoadFunctionPointers (WINTRUST.@) + */ +BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, + CRYPT_PROVIDER_FUNCTIONS* pPfns ) +{ + FIXME("%s %p\n", debugstr_guid(pgActionID), pPfns); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * WintrustGetRegPolicyFlags (WINTRUST.@) */ void WINAPI WintrustGetRegPolicyFlags( DWORD* pdwPolicyFlags ) diff --git a/include/wintrust.h b/include/wintrust.h index baadf25..26be598 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -290,6 +290,7 @@ #endif BOOL WINAPI WintrustAddActionID(GUID*,DWORD,CRYPT_REGISTER_ACTIONID*); BOOL WINAPI WintrustRemoveActionID(GUID*); +BOOL WINAPI WintrustLoadFunctionPointers(GUID*,CRYPT_PROVIDER_FUNCTIONS*); void WINAPI WintrustGetRegPolicyFlags(DWORD*); LONG WINAPI WinVerifyTrust(HWND,GUID*,WINTRUST_DATA*); HRESULT WINAPI WinVerifyTrustEx(HWND,GUID*,WINTRUST_DATA*);

1 0

Mike McCormack : infosoft: Add a test for the language neutral word breaker .
by Alexandre Julliard Aug. 15, 2006

Aug. 15, 2006

Module: wine Branch: master Commit: b5871fa5121b7b2d1d071152a761bc305b0ace8b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b5871fa5121b7b2d1d07115… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Aug 15 22:58:12 2006 +0900 infosoft: Add a test for the language neutral word breaker. --- configure | 3 - configure.ac | 1 dlls/infosoft/Makefile.in | 2 dlls/infosoft/tests/Makefile.in | 13 ++ dlls/infosoft/tests/infosoft.c | 204 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + 6 files changed, 225 insertions(+), 1 deletions(-) create mode 100644 dlls/infosoft/tests/Makefile.in create mode 100644 dlls/infosoft/tests/infosoft.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b5871fa5121b7b2d1d0…

1 0

Alexander Nicolaysen Sørnes : winecfg: Improve wording of virtual desktop explanation.
by Alexandre Julliard Aug. 15, 2006

Aug. 15, 2006

Module: wine Branch: master Commit: 5d264f2212c1844ae053c83c03f09108625baf33 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d264f2212c1844ae053c83… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 15 15:36:09 2006 +0200 winecfg: Improve wording of virtual desktop explanation. --- programs/winecfg/En.rc | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 4184501..3884d7b 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -70,8 +70,7 @@ BEGIN IDC_STATIC,15,37,228,80 CONTROL "Allow the window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 - /* FIXME: the wording of this explanation could be a lot better */ - LTEXT "You can choose to emulate a windows desktop, where all the windows are confined to one 'virtual screen', or you can have the windows placed on your standard desktop.", + LTEXT "You can either choose to have all Windows applications confined to a single window acting as a virtual desktop, or to have them behave like your other applications.", IDC_STATIC,15,125,228,28 LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED

1 0