May 2008 - Wine-Commits - list.winehq.org

Francois Gouget : wininet/tests: Remove a stray reference to InternetSetStatusCallback().
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: 824842cac72a5d8db7f685ff846cbf54ff293ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=824842cac72a5d8db7f685ff8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 22 10:38:03 2008 +0200 wininet/tests: Remove a stray reference to InternetSetStatusCallback(). --- dlls/wininet/tests/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1cb9793..ccaf324 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1837,7 +1837,7 @@ static void test_open_url_async(void) ses = InternetOpen("AdvancedInstaller", 0, NULL, NULL, INTERNET_FLAG_ASYNC); ok(ses != NULL, "InternetOpen failed\n"); - InternetSetStatusCallback(ses, cb); + pInternetSetStatusCallbackA(ses, cb); ResetEvent(ctx.event); req = InternetOpenUrl(ses, "http://www.winehq.org", NULL, 0, 0, (DWORD_PTR)&ctx); @@ -1920,6 +1920,7 @@ START_TEST(http) InternetReadFile_test(INTERNET_FLAG_ASYNC); InternetReadFile_test(0); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); + test_open_url_async(); } InternetOpenRequest_test(); test_http_cache(); @@ -1938,5 +1939,4 @@ START_TEST(http) test_http_connection(); test_user_agent_header(); test_bogus_accept_types_array(); - test_open_url_async(); }

1 0

Francois Gouget : advapi32/tests: Remove a stray reference to CryptReleaseContext(). This gets the test to run again on Win95.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: 705de5d391cecc4582115563d3d3855583a7067d URL: http://source.winehq.org/git/wine.git/?a=commit;h=705de5d391cecc4582115563d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 22 10:37:53 2008 +0200 advapi32/tests: Remove a stray reference to CryptReleaseContext(). This gets the test to run again on Win95. --- dlls/advapi32/tests/crypt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 8ad2b6b..1d2cfa2 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -903,7 +903,7 @@ static void test_machine_guid(void) /* Create and release a provider */ ret = pCryptAcquireContextA(&hCryptProv, szKeySet, NULL, PROV_RSA_FULL, 0); ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); - CryptReleaseContext(hCryptProv, 0); + pCryptReleaseContext(hCryptProv, 0); if (restoreGuid) RegSetValueExA(key, "MachineGuid", 0, REG_SZ, (const BYTE *)originalGuid,

1 0

Francois Gouget : ole32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: 315bf2fa452f03a471e70bc13ba6df489c4a7ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=315bf2fa452f03a471e70bc13… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 22 10:37:43 2008 +0200 ole32/tests: Add a trailing '\n' to ok() calls. --- dlls/ole32/tests/compobj.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 191424d..24d790a 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -203,19 +203,19 @@ static void test_StringFromGUID2(void) int len; /* Test corner cases for buffer size */ len = StringFromGUID2(&CLSID_CDeviceMoniker,str,50); - ok(len == 39, "len: %d (expected 39)",len); + ok(len == 39, "len: %d (expected 39)\n", len); ok(!lstrcmpiW(str, wszCLSID_CDeviceMoniker),"string wan't equal for CLSID_CDeviceMoniker\n"); memset(str,0,sizeof str); len = StringFromGUID2(&CLSID_CDeviceMoniker,str,39); - ok(len == 39, "len: %d (expected 39)",len); + ok(len == 39, "len: %d (expected 39)\n", len); ok(!lstrcmpiW(str, wszCLSID_CDeviceMoniker),"string wan't equal for CLSID_CDeviceMoniker\n"); len = StringFromGUID2(&CLSID_CDeviceMoniker,str,38); - ok(len == 0, "len: %d (expected 0)",len); + ok(len == 0, "len: %d (expected 0)\n", len); len = StringFromGUID2(&CLSID_CDeviceMoniker,str,30); - ok(len == 0, "len: %d (expected 0)",len); + ok(len == 0, "len: %d (expected 0)\n", len); } static void test_CoCreateInstance(void)

1 0

James Hawkins : user32: Fix a test that fails in almost all reports.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: 458c729251b26045b9b2228f607654d6e25bcd3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=458c729251b26045b9b2228f6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed May 21 22:24:43 2008 -0500 user32: Fix a test that fails in almost all reports. --- dlls/user32/tests/listbox.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 5e650e0..849372c 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -254,7 +254,9 @@ static LRESULT WINAPI main_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA rc_client.left, rc_client.top, rc_client.right, rc_client.bottom); GetClipBox(dis->hDC, &rc_clip); trace("clip rect (%d,%d-%d,%d)\n", rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); - ok(EqualRect(&rc_client, &rc_clip), "client rect of the listbox should be equal to the clip box\n"); + ok(EqualRect(&rc_client, &rc_clip) || IsRectEmpty(&rc_clip), + "client rect of the listbox should be equal to the clip box," + "or the clip box should be empty\n"); trace("rcItem (%d,%d-%d,%d)\n", dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom);

1 0

James Hawkins : secur32: Fix a few tests that fail in win2k3.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: 6848da72d947443733b7d306940c51cf6dc1cec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6848da72d947443733b7d3069… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed May 21 17:39:17 2008 -0500 secur32: Fix a few tests that fail in win2k3. --- dlls/secur32/tests/schannel.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 2fc793b..c6d6052 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -221,8 +221,8 @@ static void testAcquireSecurityContext(void) st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, &cred, &exp); ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); - ok(exp.HighPart == 0 && exp.LowPart == 0, - "Expected 0 expiry, got %08lx%08lx\n", exp.HighPart, exp.LowPart); + /* expriy is indeterminate in win2k3 */ + trace("expiry: %08lx%08lx\n", exp.HighPart, exp.LowPart); pFreeCredentialsHandle(&cred); /* Bad version in SCHANNEL_CRED */ @@ -351,7 +351,9 @@ static void testAcquireSecurityContext(void) pFreeCredentialsHandle(&cred); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); + ok(st == SEC_E_OK || + st == SEC_E_UNKNOWN_CREDENTIALS, /* win2k3 */ + "AcquireCredentialsHandleA failed: %08x\n", st); pFreeCredentialsHandle(&cred); schanCred.dwVersion = SCHANNEL_CRED_VERSION; st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, @@ -360,8 +362,10 @@ static void testAcquireSecurityContext(void) pFreeCredentialsHandle(&cred); st = pAcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); - test_strength(&cred); + ok(st == SEC_E_OK || + st == SEC_E_UNKNOWN_CREDENTIALS, /* win2k3 */ + "AcquireCredentialsHandleA failed: %08x\n", st); + if (st == SEC_E_OK) test_strength(&cred); pFreeCredentialsHandle(&cred); /* How about more than one cert? */

1 0

James Hawkins : msi: Search the last used source if the cabinet to extract cannot be found.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: 77d259f46c1cd75c89cd14e5c96fb54025b26736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d259f46c1cd75c89cd14e5c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed May 21 18:39:45 2008 -0500 msi: Search the last used source if the cabinet to extract cannot be found. --- dlls/msi/files.c | 3 ++- dlls/msi/helpers.c | 10 ++++++++++ dlls/msi/msipriv.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d2bef7c..ae7f3f0 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -577,7 +577,7 @@ UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) } /* FIXME: search NETWORK and URL sources as well */ -static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) +UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) { WCHAR source[MAX_PATH]; WCHAR volume[MAX_PATH]; @@ -586,6 +586,7 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) DWORD index, size, id; UINT r; + size = MAX_PATH; r = MsiSourceListGetInfoW(package->ProductCode, NULL, package->Context, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, source, &size); diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 3ff47ed..cffc09a 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -1163,6 +1163,16 @@ UINT msi_extract_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR destdir) if (r != ERROR_SUCCESS) goto done; + if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) + { + r = find_published_source(package, mi); + if (r != ERROR_SUCCESS) + { + ERR("Cabinet not found: %s\n", debugstr_w(mi->source)); + return ERROR_INSTALL_FAILURE; + } + } + data.package = package; data.mi = mi; data.file = file; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 90eaa19..19d0b0d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -908,6 +908,7 @@ extern UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, PFNFDINOTIFY notify, LPVOID data); extern UINT msi_extract_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR destdir); +extern UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi); /* control event stuff */ extern VOID ControlEvent_FireSubscribedEvent(MSIPACKAGE *package, LPCWSTR event,

1 0

Alexander Nicolaysen Sørnes : regedit: Set selected key name as default favourite name.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: c1940e397e56c6d8fc2f1fbf7987487360ec935d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1940e397e56c6d8fc2f1fbf7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 22 00:00:12 2008 +0200 regedit: Set selected key name as default favourite name. --- programs/regedit/framewnd.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d1fb973..fd20a62 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -506,9 +506,17 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w switch(uMsg) { case WM_INITDIALOG: + { + HKEY hKeyRoot = NULL; + LPSTR ItemPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hKeyRoot); + + if(!ItemPath || !*ItemPath) + ItemPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); + SetWindowText(hwndValue, ItemPath); SendMessage(hwndValue, EM_SETLIMITTEXT, 127, 0); return TRUE; + } case WM_COMMAND: switch(LOWORD(wParam)) { case IDC_VALUE_NAME:

1 0

Alexander Nicolaysen Sørnes : regedit: Allow modifying values of root keys.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: bb0eefb9393fb0ae89e153a5f1401985c011a917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb0eefb9393fb0ae89e153a5f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed May 21 23:33:45 2008 +0200 regedit: Allow modifying values of root keys. --- programs/regedit/framewnd.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index b1f8a56..d1fb973 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -100,18 +100,18 @@ static void OnExitMenuLoop(HWND hWnd) static void UpdateMenuItems(HMENU hMenu) { HWND hwndTV = g_pChildWnd->hTreeWnd; - BOOL bIsKeySelected = FALSE; + BOOL bAllowEdit = FALSE; HKEY hRootKey = NULL; LPCTSTR keyName; keyName = GetItemPath(hwndTV, TreeView_GetSelection(hwndTV), &hRootKey); - if (keyName && *keyName) { /* can't modify root keys */ - bIsKeySelected = TRUE; + if (GetFocus() != hwndTV || (keyName && *keyName)) { /* can't modify root keys, but allow for their values */ + bAllowEdit = TRUE; } EnableMenuItem(hMenu, ID_EDIT_FIND, MF_ENABLED | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_EDIT_FINDNEXT, MF_ENABLED | MF_BYCOMMAND); - EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bIsKeySelected ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); - EnableMenuItem(hMenu, ID_EDIT_DELETE, (bIsKeySelected ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); - EnableMenuItem(hMenu, ID_EDIT_RENAME, (bIsKeySelected ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); + EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); + EnableMenuItem(hMenu, ID_EDIT_DELETE, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); + EnableMenuItem(hMenu, ID_EDIT_RENAME, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE, (GetMenuItemCount(hMenu)>2 ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND);

1 0

Andrew Talbot : dplayx: Remove unneeded "extern" from function definitions.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: fed3a4aebec0ce6377aed8216a6dd9807c088e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed3a4aebec0ce6377aed8216… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed May 21 21:50:32 2008 +0100 dplayx: Remove unneeded "extern" from function definitions. --- dlls/dplayx/dplay.c | 3 --- dlls/dplayx/dplaysp.c | 3 +-- dlls/dplayx/dplobby.c | 5 ++--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 7b18010..3623453 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -471,7 +471,6 @@ static BOOL DP_DestroyDirectPlay4( LPVOID lpDP ) /* Create a new interface */ -extern HRESULT DP_CreateInterface ( REFIID riid, LPVOID* ppvObj ) { @@ -5139,7 +5138,6 @@ static const IDirectPlay4Vtbl directPlay4AVT = }; #undef XCAST -extern HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID* lplpData ) @@ -5156,7 +5154,6 @@ HRESULT DP_GetSPPlayerData( IDirectPlay2Impl* lpDP, return DP_OK; } -extern HRESULT DP_SetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID lpData ) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index b3b1b60..33cfedd 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -86,7 +86,6 @@ typedef struct tagDP_SPPLAYERDATA } DP_SPPLAYERDATA, *LPDP_SPPLAYERDATA; /* Create the SP interface */ -extern HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp ) { TRACE( " for %s\n", debugstr_guid( riid ) ); @@ -949,7 +948,7 @@ static const IDirectPlaySPVtbl directPlaySPVT = /* DP external interfaces to call into DPSP interface */ /* Allocate the structure */ -extern LPVOID DPSP_CreateSPPlayerData(void) +LPVOID DPSP_CreateSPPlayerData(void) { TRACE( "Creating SPPlayer data struct\n" ); return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 30b0a9f..f78d657 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -270,7 +270,6 @@ static BOOL DPL_DestroyLobby3( LPVOID lpDPL ) * successfully for a third interface, a query for the first interface * through the pointer for the third interface must succeed. */ -extern HRESULT DPL_CreateInterface ( REFIID riid, LPVOID* ppvObj ) { @@ -679,8 +678,8 @@ static HRESULT WINAPI IDirectPlayLobbyWImpl_EnumAddress return DPL_EnumAddress( lpEnumAddressCallback, lpAddress, dwAddressSize, lpContext ); } -extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, - DWORD dwAddressSize, LPVOID lpContext ) +HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, + DWORD dwAddressSize, LPVOID lpContext ) { DWORD dwTotalSizeEnumerated = 0;

1 0

Andrew Talbot : wined3d: Remove unneeded "extern" from function definition.
by Alexandre Julliard May 22, 2008

May 22, 2008

Module: wine Branch: master Commit: c58e59f40fc0fc82be615aadb043890ab7589549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58e59f40fc0fc82be615aadb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed May 21 21:50:36 2008 +0100 wined3d: Remove unneeded "extern" from function definition. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7a1a355..684690b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2489,7 +2489,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch /** * Slightly inefficient way to handle multiple dirty rects but it works :) */ -extern HRESULT WINAPI IWineD3DSurfaceImpl_AddDirtyRect(IWineD3DSurface *iface, CONST RECT* pDirtyRect) { +HRESULT WINAPI IWineD3DSurfaceImpl_AddDirtyRect(IWineD3DSurface *iface, CONST RECT* pDirtyRect) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DBaseTexture *baseTexture = NULL;

1 0