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

Mike McCormack : hlink: Use CoTaskMemAlloc when returning memory to a caller.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: af29c05a059c3b215430a2f757ac26f952b601b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=af29c05a059c3b215430a2f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 2 02:15:30 2006 +0900 hlink: Use CoTaskMemAlloc when returning memory to a caller. --- dlls/hlink/link.c | 59 +++++++++++++++++------------------------------------ 1 files changed, 19 insertions(+), 40 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 72245f0..814785a 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -80,6 +80,18 @@ static inline LPWSTR strdupW( LPCWSTR st return r; } +static inline LPWSTR co_strdupW( LPCWSTR str ) +{ + LPWSTR r; + + if (!str) + return NULL; + r = CoTaskMemAlloc((lstrlenW(str)+1) * sizeof (WCHAR)); + if (r) + lstrcpyW(r, str); + return r; +} + static inline void __GetMoniker(HlinkImpl* This, IMoniker** moniker) { *moniker = NULL; @@ -281,13 +293,9 @@ static HRESULT WINAPI IHlink_fnGetString if (ppwzTarget) { - if (This->Target) - { - *ppwzTarget = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(This->Target)+1) * sizeof(WCHAR)); - lstrcpyW(*ppwzTarget, This->Target); - } - else + *ppwzTarget = co_strdupW( This->Target ); + + if (!This->Target) { IMoniker* mon; __GetMoniker(This, &mon); @@ -296,34 +304,16 @@ static HRESULT WINAPI IHlink_fnGetString IBindCtx *pbc; CreateBindCtx( 0, &pbc); - IMoniker_GetDisplayName(mon, pbc, NULL, &This->Target); + IMoniker_GetDisplayName(mon, pbc, NULL, ppwzTarget); IBindCtx_Release(pbc); - *ppwzTarget = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(This->Target)+1) * sizeof(WCHAR)); - lstrcpyW(*ppwzTarget, This->Target); IMoniker_Release(mon); } else - { FIXME("Unhandled case, no set Target and no moniker\n"); - *ppwzTarget = NULL; - } } } if (ppwzLocation) - { - if (This->Location) - { - *ppwzLocation = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(This->Location)+1) * sizeof(WCHAR)); - lstrcpyW(*ppwzLocation, This->Location); - } - else - { - FIXME("Unhandled case, no explicitly set Location\n"); - *ppwzLocation = NULL; - } - } + *ppwzLocation = co_strdupW( This->Location ); TRACE("(Target: %s Location: %s)\n", (ppwzTarget)?debugstr_w(*ppwzTarget):"<NULL>", @@ -355,11 +345,7 @@ static HRESULT WINAPI IHlink_fnGetFriend /* FIXME: Only using explicitly set and cached friendly names */ if (This->FriendlyName) - { - *ppwzFriendlyName = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(This->FriendlyName)+1) * sizeof(WCHAR)); - lstrcpyW(*ppwzFriendlyName, This->FriendlyName); - } + *ppwzFriendlyName = co_strdupW( This->FriendlyName ); else { IMoniker *moniker; @@ -398,14 +384,7 @@ static HRESULT WINAPI IHlink_fnGetTarget HlinkImpl *This = (HlinkImpl*)iface; TRACE("(%p)->(%p)\n", This, ppwzTargetFrameName); - if (This->TargetFrameName) - { - *ppwzTargetFrameName = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(This->TargetFrameName)+1) * sizeof(WCHAR)); - lstrcpyW(*ppwzTargetFrameName, This->TargetFrameName); - } - else - *ppwzTargetFrameName = NULL; + *ppwzTargetFrameName = co_strdupW( This->TargetFrameName ); return S_OK; }

1 0

Mike McCormack : hlink: Create a strdupW function and use it.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: dc3d475147056a306a0affdd54e3c973bc466147 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc3d475147056a306a0affd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Aug 2 02:14:53 2006 +0900 hlink: Create a strdupW function and use it. --- dlls/hlink/link.c | 45 +++++++++++++++++---------------------------- 1 files changed, 17 insertions(+), 28 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index baf3b75..72245f0 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -68,6 +68,18 @@ static inline HlinkImpl* HlinkImpl_from_ return (HlinkImpl*) ((CHAR*)iface - FIELD_OFFSET(HlinkImpl, lpDOVtbl)); } +static inline LPWSTR strdupW( LPCWSTR str ) +{ + LPWSTR r; + + if (!str) + return NULL; + r = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(str)+1) * sizeof (WCHAR)); + if (r) + lstrcpyW(r, str); + return r; +} + static inline void __GetMoniker(HlinkImpl* This, IMoniker** moniker) { *moniker = NULL; @@ -216,13 +228,7 @@ static HRESULT WINAPI IHlink_fnSetMonike IMoniker_AddRef(This->Moniker); HeapFree(GetProcessHeap(), 0, This->Location); - This->Location = NULL; - if (pwzLocation) - { - This->Location = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(pwzLocation)+1)*sizeof(WCHAR)); - lstrcpyW(This->Location, pwzLocation); - } + This->Location = strdupW( pwzLocation ); return S_OK; } @@ -238,25 +244,12 @@ static HRESULT WINAPI IHlink_fnSetString if (grfHLSETF & HLINKSETF_TARGET) { HeapFree(GetProcessHeap(), 0, This->Target); - This->Target = NULL; - if (pwzTarget) - { - This->Target = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(pwzTarget)+1)*sizeof(WCHAR)); - lstrcpyW(This->Target, pwzTarget); - } + This->Target = strdupW( pwzTarget ); } if (grfHLSETF & HLINKSETF_LOCATION) { HeapFree(GetProcessHeap(), 0, This->Location); - This->Location = NULL; - if (pwzLocation) - { - This->Location = - HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pwzLocation)+1) - *sizeof(WCHAR)); - lstrcpyW(This->Location, pwzLocation); - } + This->Location = strdupW( pwzLocation ); } return S_OK; @@ -347,9 +340,7 @@ static HRESULT WINAPI IHlink_fnSetFriend TRACE("(%p) -> (%s)\n", This, debugstr_w(pwzFriendlyName)); HeapFree(GetProcessHeap(), 0, This->FriendlyName); - This->FriendlyName = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(pwzFriendlyName)+1) * sizeof(WCHAR)); - lstrcpyW(This->FriendlyName, pwzFriendlyName); + This->FriendlyName = strdupW( pwzFriendlyName ); return S_OK; } @@ -396,9 +387,7 @@ static HRESULT WINAPI IHlink_fnSetTarget TRACE("(%p)->(%s)\n", This, debugstr_w(pwzTargetFramename)); HeapFree(GetProcessHeap(), 0, This->TargetFrameName); - This->TargetFrameName = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(pwzTargetFramename)+1) * sizeof(WCHAR)); - lstrcpyW(This->TargetFrameName, pwzTargetFramename); + This->TargetFrameName = strdupW( pwzTargetFramename ); return S_OK; }

1 0

Thomas Kho : msi: Wake dialog on messages from external threads.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: 88cc410fd62f51c52e052c1ca50a1380686ed513 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88cc410fd62f51c52e052c1… Author: Thomas Kho <tkho(a)ucla.edu> Date: Mon Jul 31 20:17:03 2006 -0500 msi: Wake dialog on messages from external threads. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 9b1c32e..ae4f044 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2598,7 +2598,7 @@ UINT msi_dialog_run_message_loop( msi_di { while( !dialog->finished ) { - MsgWaitForMultipleObjects( 0, NULL, 0, INFINITE, QS_ALLEVENTS ); + MsgWaitForMultipleObjects( 0, NULL, 0, INFINITE, QS_ALLINPUT ); msi_process_pending_messages( dialog->hwnd ); } }

1 0

James Hawkins : msi: Fix the add_feature_entry helper function.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: 6330f14da9d3a7519cb59e14a37f128d77f6dee4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6330f14da9d3a7519cb59e1… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 31 13:55:24 2006 -0700 msi: Fix the add_feature_entry helper function. --- dlls/msi/tests/package.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ecc333d..24f4332 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -117,7 +117,7 @@ static UINT add_component_entry( MSIHAND static UINT add_feature_entry( MSIHANDLE hdb, char *values ) { char insert[] = "INSERT INTO `Feature` (`Feature`, `Feature_Parent`, " - "`Display`, `Level`, `Attributes`) VALUES( %s )"; + "`Title`, `Description`, `Display`, `Level`, `Directory_`, `Attributes`) VALUES( %s )"; char *query; UINT sz, r; @@ -1294,7 +1294,7 @@ static void test_states(void) ok( r == ERROR_SUCCESS, "cannot create Component table: %d\n", r ); /* msidbFeatureAttributesFavorLocal */ - r = add_feature_entry( hdb, "'one', '', 2, 1, 0" ); + r = add_feature_entry( hdb, "'one', '', '', '', 2, 1, '', 0" ); ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); /* msidbFeatureAttributesFavorLocal:msidbComponentAttributesLocalOnly */ @@ -1310,7 +1310,7 @@ static void test_states(void) ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); /* msidbFeatureAttributesFavorSource */ - r = add_feature_entry( hdb, "'two', '', 2, 1, 1" ); + r = add_feature_entry( hdb, "'two', '', '', '', 2, 1, '', 1" ); ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); /* msidbFeatureAttributesFavorSource:msidbComponentAttributesLocalOnly */ @@ -1326,7 +1326,7 @@ static void test_states(void) ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); /* msidbFeatureAttributesFavorSource */ - r = add_feature_entry( hdb, "'three', '', 2, 1, 1" ); + r = add_feature_entry( hdb, "'three', '', '', '', 2, 1, '', 1" ); ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); /* msidbFeatureAttributesFavorSource:msidbComponentAttributesSourceOnly */ @@ -1669,20 +1669,14 @@ static void test_states(void) r = MsiGetFeatureState(hpkg, "one", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); - } + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "two", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -1706,7 +1700,10 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "beta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); + todo_wine + { + ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); + } state = 0xdeadbee; action = 0xdeadbee;

1 0

James Hawkins : msi: Fix a couple install state test cases.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: 38f2ba23f1a9f877f220e9776ad19f9d99492bd2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38f2ba23f1a9f877f220e97… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 31 14:50:44 2006 -0700 msi: Fix a couple install state test cases. - Correctly handle the msidbComponentAttributesOptional component attribute. - Don't set a component's state to INSTALLSTATE_LOCAL if the msidbComponentAttributesSourceOnly attribute is provided. --- dlls/msi/action.c | 19 +++++++++++++------ dlls/msi/tests/package.c | 10 ++-------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 37513e0..65cfa77 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1122,7 +1122,6 @@ static UINT load_component( MSIRECORD *r switch (comp->Attributes) { case msidbComponentAttributesLocalOnly: - case msidbComponentAttributesOptional: comp->Action = INSTALLSTATE_LOCAL; comp->ActionRequest = INSTALLSTATE_LOCAL; break; @@ -1130,6 +1129,10 @@ static UINT load_component( MSIRECORD *r comp->Action = INSTALLSTATE_SOURCE; comp->ActionRequest = INSTALLSTATE_SOURCE; break; + case msidbComponentAttributesOptional: + comp->Action = INSTALLSTATE_DEFAULT; + comp->ActionRequest = INSTALLSTATE_DEFAULT; + break; default: comp->Action = INSTALLSTATE_UNKNOWN; comp->ActionRequest = INSTALLSTATE_UNKNOWN; @@ -1713,16 +1716,20 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa } else { - if (feature->Action == INSTALLSTATE_LOCAL) + if (feature->Attributes == msidbFeatureAttributesFavorLocal) { - component->Action = INSTALLSTATE_LOCAL; - component->ActionRequest = INSTALLSTATE_LOCAL; + if (!(component->Attributes & msidbComponentAttributesSourceOnly)) + { + component->Action = INSTALLSTATE_LOCAL; + component->ActionRequest = INSTALLSTATE_LOCAL; + } } - else if (feature->ActionRequest == INSTALLSTATE_SOURCE) + else if (feature->Attributes == msidbFeatureAttributesFavorSource) { if ((component->Action == INSTALLSTATE_UNKNOWN) || (component->Action == INSTALLSTATE_ABSENT) || - (component->Action == INSTALLSTATE_ADVERTISED)) + (component->Action == INSTALLSTATE_ADVERTISED) || + (component->Action == INSTALLSTATE_DEFAULT)) { component->Action = INSTALLSTATE_SOURCE; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 24f4332..62920fa 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1700,10 +1700,7 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "beta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -1731,10 +1728,7 @@ static void test_states(void) r = MsiGetComponentState(hpkg, "zeta", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

Detlef Riekenberg : winsplp.h: Remove FAR, use W structs, fix typo.
by Alexandre Julliard Aug. 1, 2006

Aug. 1, 2006

Module: wine Branch: refs/heads/master Commit: adb27013e3d77808c333f7f9a40d6f59725595ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=adb27013e3d77808c333f7f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jul 31 22:49:39 2006 +0200 winsplp.h: Remove FAR, use W structs, fix typo. --- include/ddk/winsplp.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/ddk/winsplp.h b/include/ddk/winsplp.h index 3c3bc29..f4cc663 100644 --- a/include/ddk/winsplp.h +++ b/include/ddk/winsplp.h @@ -52,7 +52,7 @@ typedef struct _MONITOR { DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); BOOL (WINAPI *pfnOpenPort)(LPWSTR pName, PHANDLE pHandle); BOOL (WINAPI *pfnOpenPortEx)(LPWSTR pPortName, LPWSTR pPrinterName, - PHANDLE pHandle, struct _MONITOR FAR *pMonitor); + PHANDLE pHandle, struct _MONITOR *pMonitor); BOOL (WINAPI *pfnStartDocPort)(HANDLE hPort, LPWSTR pPrinterName, DWORD JobId, DWORD Level, LPBYTE pDocInfo); BOOL (WINAPI *pfnWritePort)(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuf, @@ -85,7 +85,7 @@ typedef struct _MONITOR2 { DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned); BOOL (WINAPI *pfnOpenPort)(LPWSTR pName, PHANDLE pHandle); BOOL (WINAPI *pfnOpenPortEx)(LPWSTR pPortName, LPWSTR pPrinterName, - PHANDLE pHandle, struct _MONITOR2 FAR *pMonitor2); + PHANDLE pHandle, struct _MONITOR2 *pMonitor2); BOOL (WINAPI *pfnStartDocPort)(HANDLE hPort, LPWSTR pPrinterName, DWORD JobId, DWORD Level, LPBYTE pDocInfo); BOOL (WINAPI *pfnWritePort)(HANDLE hPort, LPBYTE pBuffer, DWORD cbBuf, @@ -170,13 +170,13 @@ typedef struct _PRINTER_NOTIFY_INIT { } PRINTER_NOTIFY_INIT, *LPPRINTER_NOTIFY_INIT, *PPRINTER_NOTIFY_INIT; typedef struct _PRINTPROCESSOROPENDATA { - PDEVMODE pDevMode; - LPWSTR pDatatype; - LPWSTR pParameters; - LPWSTR pDocumentName; - DWORD JobId; - LPWSTR pOutputFile; - LPWSTR pPrinterName; + PDEVMODEW pDevMode; + LPWSTR pDatatype; + LPWSTR pParameters; + LPWSTR pDocumentName; + DWORD JobId; + LPWSTR pOutputFile; + LPWSTR pPrinterName; } PRINTPROCESSOROPENDATA, *LPPRINTPROCESSOROPENDATA, *PPRINTPROCESSOROPENDATA; @@ -287,7 +287,7 @@ typedef struct _PRINTPROVIDOR { BOOL (WINAPI *fpRefreshPrinterChangeNotification)(HANDLE hPrinter, DWORD Reserved, PVOID pvReserved, PVOID pPrinterNotifyInfo); BOOL (WINAPI *fpOpenPrinterEx)(LPWSTR pPrinterName, LPHANDLE phPrinter, - LPPRINTER_DEFAULTS pDefault, LPBYTE pClientInfo, DWORD Level); + LPPRINTER_DEFAULTSW pDefault, LPBYTE pClientInfo, DWORD Level); HANDLE (WINAPI *fpAddPrinterEx)(LPWSTR pName, DWORD Level, LPBYTE pPrinter, LPBYTE pClientInfo, DWORD ClientInfoLevel); BOOL (WINAPI *fpSetPort)(LPWSTR pName, LPWSTR pPortName, DWORD dwLevel, @@ -360,7 +360,7 @@ HANDLE WINAPI CreatePrinterIC(HANDLE hPr BOOL WINAPI PlayGdiScriptOnPrinterIC(HANDLE hPrinterIC, LPBYTE pIn, DWORD cIn, LPBYTE pOut, DWORD cOut, DWORD ul); BOOL WINAPI DeletePrinterIC(HANDLE hPrinterIC); -BOOL WINAPI DevQueryPrint(HANDLE hPrinter, LPDEVMODE pDevMode, DWORD *pResID); +BOOL WINAPI DevQueryPrint(HANDLE hPrinter, LPDEVMODEW pDevMode, DWORD *pResID); /* Security and Access */ HANDLE WINAPI RevertToPrinterSelf(VOID); @@ -386,7 +386,7 @@ LPMONITOR2 WINAPI InitializePrintMonito PHANDLE phMonitor); PMONITORUI WINAPI InitializePrintMonitorUI(VOID); LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR pRegistryRoot); -BOOL WINAPI InitializeMonitorEx(LPWSTR pRegisterRoot, LPMONITOR pMonitor); +BOOL WINAPI InitializeMonitorEx(LPWSTR pRegistryRoot, LPMONITOR pMonitor); BOOL WINAPI InitializeMonitor(LPWSTR pRegistryRoot); BOOL WINAPI OpenPort(LPWSTR pName, PHANDLE pHandle);

1 0