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

Gerald Pfeifer : inetmib1: Remove unused parameter pPduType from mapStructEntryToValue.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: eb087ae86039cb9aa6d0726003c86f53640d2bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb087ae86039cb9aa6d072600… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 22 20:54:16 2011 +0200 inetmib1: Remove unused parameter pPduType from mapStructEntryToValue. --- dlls/inetmib1/main.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 9aef4d5..76741f3 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -59,7 +59,7 @@ struct structToAsnValue }; static AsnInteger32 mapStructEntryToValue(struct structToAsnValue *map, - UINT mapLen, void *record, UINT id, BYTE bPduType, SnmpVarBind *pVarBind) + UINT mapLen, void *record, UINT id, SnmpVarBind *pVarBind) { /* OIDs are 1-based */ if (!id) @@ -640,7 +640,7 @@ static BOOL mib2IfEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, { *pErrorStatus = mapStructEntryToValue(mib2IfEntryMap, DEFINE_SIZEOF(mib2IfEntryMap), - &ifTable->table[tableIndex - 1], item, bPduType, + &ifTable->table[tableIndex - 1], item, pVarBind); if (bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndInteger(&pVarBind->name, @@ -713,7 +713,7 @@ static BOOL mib2IpStatsQuery(BYTE bPduType, SnmpVarBind *pVarBind, if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2IpMap, - DEFINE_SIZEOF(mib2IpMap), &ipStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2IpMap), &ipStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -798,7 +798,7 @@ static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind, assert(item); *pErrorStatus = mapStructEntryToValue(mib2IpAddrMap, DEFINE_SIZEOF(mib2IpAddrMap), - &ipAddrTable->table[tableIndex - 1], item, bPduType, pVarBind); + &ipAddrTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ipAddrTable->table[tableIndex - 1].dwAddr); @@ -891,7 +891,7 @@ static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind, assert(item); *pErrorStatus = mapStructEntryToValue(mib2IpRouteMap, DEFINE_SIZEOF(mib2IpRouteMap), - &ipRouteTable->table[tableIndex - 1], item, bPduType, pVarBind); + &ipRouteTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ipRouteTable->table[tableIndex - 1].dwForwardDest); @@ -978,7 +978,7 @@ static BOOL mib2IpNetQuery(BYTE bPduType, SnmpVarBind *pVarBind, { *pErrorStatus = mapStructEntryToValue(mib2IpNetMap, DEFINE_SIZEOF(mib2IpNetMap), - &ipNetTable[tableIndex - 1], item, bPduType, pVarBind); + &ipNetTable[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItemAndInteger(&pVarBind->name, &myOid, item, tableIndex); @@ -1053,7 +1053,7 @@ static BOOL mib2IcmpQuery(BYTE bPduType, SnmpVarBind *pVarBind, if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2IcmpMap, - DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, bPduType, + DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); @@ -1115,7 +1115,7 @@ static BOOL mib2TcpQuery(BYTE bPduType, SnmpVarBind *pVarBind, if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2TcpMap, - DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -1165,7 +1165,7 @@ static BOOL mib2UdpQuery(BYTE bPduType, SnmpVarBind *pVarBind, if (!*pErrorStatus) { *pErrorStatus = mapStructEntryToValue(mib2UdpMap, - DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, bPduType, pVarBind); + DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) ret = setOidWithItem(&pVarBind->name, &myOid, item); } @@ -1258,7 +1258,7 @@ static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, assert(item); *pErrorStatus = mapStructEntryToValue(mib2UdpEntryMap, DEFINE_SIZEOF(mib2UdpEntryMap), - &udpTable->table[tableIndex - 1], item, bPduType, pVarBind); + &udpTable->table[tableIndex - 1], item, pVarBind); if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) { AsnObjectIdentifier oid;

1 0

Rico Schüller : d3dx9: Pass the device directly to d3dx9_parse_data().
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 088ed09e94c0824d49d708bf24ef20af5db3137c URL: http://source.winehq.org/git/wine.git/?a=commit;h=088ed09e94c0824d49d708bf2… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 25 10:54:51 2011 +0200 d3dx9: Pass the device directly to d3dx9_parse_data(). --- dlls/d3dx9_36/effect.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7608717..712839b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3519,7 +3519,7 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } -static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr) +static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, LPDIRECT3DDEVICE9 device) { DWORD size; HRESULT hr; @@ -3549,7 +3549,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr) break; case D3DXPT_VERTEXSHADER: - hr = IDirect3DDevice9_CreateVertexShader(param->base->effect->device, (DWORD *)*ptr, (LPDIRECT3DVERTEXSHADER9 *)param->data); + hr = IDirect3DDevice9_CreateVertexShader(device, (DWORD *)*ptr, (LPDIRECT3DVERTEXSHADER9 *)param->data); if (hr != D3D_OK) { WARN("Failed to create vertex shader\n"); @@ -3558,7 +3558,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr) break; case D3DXPT_PIXELSHADER: - hr = IDirect3DDevice9_CreatePixelShader(param->base->effect->device, (DWORD *)*ptr, (LPDIRECT3DPIXELSHADER9 *)param->data); + hr = IDirect3DDevice9_CreatePixelShader(device, (DWORD *)*ptr, (LPDIRECT3DPIXELSHADER9 *)param->data); if (hr != D3D_OK) { WARN("Failed to create pixel shader\n"); @@ -4252,7 +4252,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * param = get_parameter_struct(base->objects[id]); - hr = d3dx9_parse_data(param, &ptr); + hr = d3dx9_parse_data(param, &ptr, base->effect->device); if (hr != D3D_OK) { WARN("Failed to parse data\n");

1 0

Marcus Meissner : version: Merge all 3 C source files into one.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: d8ed83e3c13b5196b2005290690be31abc5e4333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ed83e3c13b5196b20052906… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 18:23:59 2011 +0200 version: Merge all 3 C source files into one. --- dlls/version/Makefile.in | 4 +- dlls/version/info.c | 675 -------------------- dlls/version/install.c | 602 ------------------ dlls/version/resource.c | 365 ----------- dlls/version/version.c | 1567 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 1568 insertions(+), 1645 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8ed83e3c13b5196b2005…

1 0

Michael Stefaniuc : shell32/tests: COM cleanup in ebrowser.c.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 4d003283c1677ecea4f6a1f29399c495eec23a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d003283c1677ecea4f6a1f29… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 25 10:40:07 2011 +0200 shell32/tests: COM cleanup in ebrowser.c. --- dlls/shell32/tests/ebrowser.c | 125 ++++++++++++++++++++++++----------------- 1 files changed, 73 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d003283c1677ecea4f6a…

1 0

Francois Gouget : usp10/tests: Make enumFontProc() static.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 792a9eb6892b92a56548dd8a92a4627ce2583c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=792a9eb6892b92a56548dd8a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 25 11:09:12 2011 +0200 usp10/tests: Make enumFontProc() static. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b9e4ed5..bfb2b5c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -421,7 +421,7 @@ typedef struct tagRangeP { LOGFONTA lf; } fontEnumParam; -int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntme, +static int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntme, DWORD FontType, LPARAM lParam) { NEWTEXTMETRICEX *ntme = (NEWTEXTMETRICEX*)lpntme;

1 0

Hans Leidekker : msi: Support rollback of failed uninstalls.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: ee804123304af9c6b64be76489e7964c2bc5277e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee804123304af9c6b64be7648… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 25 10:40:36 2011 +0200 msi: Support rollback of failed uninstalls. --- dlls/msi/action.c | 50 +++++++++++++++++++++++++------------------------- 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f38607f..86a8c99 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7159,7 +7159,7 @@ StandardActions[] = { szCostInitialize, ACTION_CostInitialize, NULL }, { szCreateFolders, ACTION_CreateFolders, szRemoveFolders }, { szCreateShortcuts, ACTION_CreateShortcuts, szRemoveShortcuts }, - { szDeleteServices, ACTION_DeleteServices, NULL }, + { szDeleteServices, ACTION_DeleteServices, szInstallServices }, { szDisableRollback, ACTION_DisableRollback, NULL }, { szDuplicateFiles, ACTION_DuplicateFiles, szRemoveDuplicateFiles }, { szExecuteAction, ACTION_ExecuteAction, NULL }, @@ -7169,9 +7169,11 @@ StandardActions[] = { szInstallAdminPackage, ACTION_InstallAdminPackage, NULL }, { szInstallExecute, ACTION_InstallExecute, NULL }, { szInstallExecuteAgain, ACTION_InstallExecute, NULL }, - { szInstallFiles, ACTION_InstallFiles, NULL }, + { szInstallFiles, ACTION_InstallFiles, szRemoveFiles }, { szInstallFinalize, ACTION_InstallFinalize, NULL }, { szInstallInitialize, ACTION_InstallInitialize, NULL }, + { szInstallODBC, ACTION_InstallODBC, szRemoveODBC }, + { szInstallServices, ACTION_InstallServices, szDeleteServices }, { szInstallSFPCatalogFile, ACTION_InstallSFPCatalogFile, NULL }, { szInstallValidate, ACTION_InstallValidate, NULL }, { szIsolateComponents, ACTION_IsolateComponents, NULL }, @@ -7179,11 +7181,9 @@ StandardActions[] = { szMigrateFeatureStates, ACTION_MigrateFeatureStates, NULL }, { szMoveFiles, ACTION_MoveFiles, NULL }, { szMsiPublishAssemblies, ACTION_MsiPublishAssemblies, szMsiUnpublishAssemblies }, - { szMsiUnpublishAssemblies, ACTION_MsiUnpublishAssemblies, NULL }, - { szInstallODBC, ACTION_InstallODBC, szRemoveODBC }, - { szInstallServices, ACTION_InstallServices, szDeleteServices }, + { szMsiUnpublishAssemblies, ACTION_MsiUnpublishAssemblies, szMsiPublishAssemblies }, { szPatchFiles, ACTION_PatchFiles, NULL }, - { szProcessComponents, ACTION_ProcessComponents, NULL }, + { szProcessComponents, ACTION_ProcessComponents, szProcessComponents }, { szPublishComponents, ACTION_PublishComponents, szUnpublishComponents }, { szPublishFeatures, ACTION_PublishFeatures, szUnpublishFeatures }, { szPublishProduct, ACTION_PublishProduct, NULL }, @@ -7196,32 +7196,32 @@ StandardActions[] = { szRegisterProgIdInfo, ACTION_RegisterProgIdInfo, szUnregisterProgIdInfo }, { szRegisterTypeLibraries, ACTION_RegisterTypeLibraries, szUnregisterTypeLibraries }, { szRegisterUser, ACTION_RegisterUser, NULL }, - { szRemoveDuplicateFiles, ACTION_RemoveDuplicateFiles, NULL }, - { szRemoveEnvironmentStrings, ACTION_RemoveEnvironmentStrings, NULL }, + { szRemoveDuplicateFiles, ACTION_RemoveDuplicateFiles, szDuplicateFiles }, + { szRemoveEnvironmentStrings, ACTION_RemoveEnvironmentStrings, szWriteEnvironmentStrings }, { szRemoveExistingProducts, ACTION_RemoveExistingProducts, NULL }, - { szRemoveFiles, ACTION_RemoveFiles, NULL }, - { szRemoveFolders, ACTION_RemoveFolders, NULL }, - { szRemoveIniValues, ACTION_RemoveIniValues, NULL }, - { szRemoveODBC, ACTION_RemoveODBC, NULL }, - { szRemoveRegistryValues, ACTION_RemoveRegistryValues, NULL }, - { szRemoveShortcuts, ACTION_RemoveShortcuts, NULL }, + { szRemoveFiles, ACTION_RemoveFiles, szInstallFiles }, + { szRemoveFolders, ACTION_RemoveFolders, szCreateFolders }, + { szRemoveIniValues, ACTION_RemoveIniValues, szWriteIniValues }, + { szRemoveODBC, ACTION_RemoveODBC, szInstallODBC }, + { szRemoveRegistryValues, ACTION_RemoveRegistryValues, szWriteRegistryValues }, + { szRemoveShortcuts, ACTION_RemoveShortcuts, szCreateShortcuts }, { szResolveSource, ACTION_ResolveSource, NULL }, { szRMCCPSearch, ACTION_RMCCPSearch, NULL }, { szScheduleReboot, ACTION_ScheduleReboot, NULL }, { szSelfRegModules, ACTION_SelfRegModules, szSelfUnregModules }, - { szSelfUnregModules, ACTION_SelfUnregModules, NULL }, + { szSelfUnregModules, ACTION_SelfUnregModules, szSelfUnregModules }, { szSetODBCFolders, ACTION_SetODBCFolders, NULL }, { szStartServices, ACTION_StartServices, szStopServices }, - { szStopServices, ACTION_StopServices, NULL }, - { szUnpublishComponents, ACTION_UnpublishComponents, NULL }, - { szUnpublishFeatures, ACTION_UnpublishFeatures, NULL }, - { szUnregisterClassInfo, ACTION_UnregisterClassInfo, NULL }, - { szUnregisterComPlus, ACTION_UnregisterComPlus, NULL }, - { szUnregisterExtensionInfo, ACTION_UnregisterExtensionInfo, NULL }, - { szUnregisterFonts, ACTION_UnregisterFonts, NULL }, - { szUnregisterMIMEInfo, ACTION_UnregisterMIMEInfo, NULL }, - { szUnregisterProgIdInfo, ACTION_UnregisterProgIdInfo, NULL }, - { szUnregisterTypeLibraries, ACTION_UnregisterTypeLibraries, NULL }, + { szStopServices, ACTION_StopServices, szStartServices }, + { szUnpublishComponents, ACTION_UnpublishComponents, szPublishComponents }, + { szUnpublishFeatures, ACTION_UnpublishFeatures, szPublishFeatures }, + { szUnregisterClassInfo, ACTION_UnregisterClassInfo, szRegisterClassInfo }, + { szUnregisterComPlus, ACTION_UnregisterComPlus, szRegisterComPlus }, + { szUnregisterExtensionInfo, ACTION_UnregisterExtensionInfo, szRegisterExtensionInfo }, + { szUnregisterFonts, ACTION_UnregisterFonts, szRegisterFonts }, + { szUnregisterMIMEInfo, ACTION_UnregisterMIMEInfo, szRegisterMIMEInfo }, + { szUnregisterProgIdInfo, ACTION_UnregisterProgIdInfo, szRegisterProgIdInfo }, + { szUnregisterTypeLibraries, ACTION_UnregisterTypeLibraries, szRegisterTypeLibraries }, { szValidateProductID, ACTION_ValidateProductID, NULL }, { szWriteEnvironmentStrings, ACTION_WriteEnvironmentStrings, szRemoveEnvironmentStrings }, { szWriteIniValues, ACTION_WriteIniValues, szRemoveIniValues },

1 0

Hans Leidekker : msi: Don't schedule rollback actions during rollback.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 6c39fdf19a9bb8c8468d9b3f3dabfaa8cc967819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c39fdf19a9bb8c8468d9b3f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 25 10:40:19 2011 +0200 msi: Don't schedule rollback actions during rollback. --- dlls/msi/action.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 50e1e31..f38607f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7246,8 +7246,7 @@ static BOOL ACTION_HandleStandardAction( MSIPACKAGE *package, LPCWSTR action, UI *rc = StandardActions[i].handler( package ); ui_actioninfo( package, action, FALSE, *rc ); - if (StandardActions[i].action_rollback && - !msi_get_property_int( package->db, szRollbackDisabled, 0 )) + if (StandardActions[i].action_rollback && !package->need_rollback) { TRACE("scheduling rollback action\n"); msi_schedule_action( package, ROLLBACK_SCRIPT, StandardActions[i].action_rollback ); @@ -7484,7 +7483,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, if (package->need_rollback) { WARN("installation failed, running rollback script\n"); - msi_set_property( package->db, szRollbackDisabled, NULL ); execute_script( package, ROLLBACK_SCRIPT ); }

1 0

Michael Stefaniuc : shell32: COM cleanup for shfldr_printers.c.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 381f72fd7e5c2696dd0bf2349f2d163dd90a4b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=381f72fd7e5c2696dd0bf2349… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 25 10:39:35 2011 +0200 shell32: COM cleanup for shfldr_printers.c. --- dlls/shell32/shfldr_printers.c | 67 +++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=381f72fd7e5c2696dd0bf…

1 0

Francois Gouget : gdi32: Move MFDRV_{ExtEscape, GetDeviceCaps}() up and make them static.
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: f62ca752e9c6cdf38da4d1eec333cbf522a9ef5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62ca752e9c6cdf38da4d1eec… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 25 11:09:07 2011 +0200 gdi32: Move MFDRV_{ExtEscape,GetDeviceCaps}() up and make them static. --- dlls/gdi32/mfdrv/init.c | 91 ++++++++++++++++++++-------------------- dlls/gdi32/mfdrv/metafiledrv.h | 3 - 2 files changed, 46 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index cba26eb..a8ecf3f 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -32,6 +32,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(metafile); static BOOL CDECL MFDRV_DeleteDC( PHYSDEV dev ); + +/********************************************************************** + * MFDRV_ExtEscape + */ +static INT CDECL MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, + INT cbOutput, LPVOID out_data ) +{ + METARECORD *mr; + DWORD len; + INT ret; + + if (cbOutput) return 0; /* escapes that require output cannot work in metafiles */ + + len = sizeof(*mr) + sizeof(WORD) + ((cbInput + 1) & ~1); + mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + mr->rdSize = len / 2; + mr->rdFunction = META_ESCAPE; + mr->rdParm[0] = nEscape; + mr->rdParm[1] = cbInput; + memcpy(&(mr->rdParm[2]), in_data, cbInput); + ret = MFDRV_WriteRecord( dev, mr, len); + HeapFree(GetProcessHeap(), 0, mr); + return ret; +} + + +/****************************************************************** + * MFDRV_GetDeviceCaps + * + *A very simple implementation that returns DT_METAFILE + */ +static INT CDECL MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) +{ + switch(cap) + { + case TECHNOLOGY: + return DT_METAFILE; + case TEXTCAPS: + return 0; + default: + TRACE(" unsupported capability %d, will return 0\n", cap ); + } + return 0; +} + + static const DC_FUNCTIONS MFDRV_Funcs = { NULL, /* pAbortDoc */ @@ -533,48 +579,3 @@ BOOL MFDRV_MetaParam8(PHYSDEV dev, short func, short param1, short param2, *(mr->rdParm + 7) = param1; return MFDRV_WriteRecord( dev, mr, mr->rdSize * 2); } - - -/********************************************************************** - * MFDRV_ExtEscape - */ -INT CDECL MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, - INT cbOutput, LPVOID out_data ) -{ - METARECORD *mr; - DWORD len; - INT ret; - - if (cbOutput) return 0; /* escapes that require output cannot work in metafiles */ - - len = sizeof(*mr) + sizeof(WORD) + ((cbInput + 1) & ~1); - mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); - mr->rdSize = len / 2; - mr->rdFunction = META_ESCAPE; - mr->rdParm[0] = nEscape; - mr->rdParm[1] = cbInput; - memcpy(&(mr->rdParm[2]), in_data, cbInput); - ret = MFDRV_WriteRecord( dev, mr, len); - HeapFree(GetProcessHeap(), 0, mr); - return ret; -} - - -/****************************************************************** - * MFDRV_GetDeviceCaps - * - *A very simple implementation that returns DT_METAFILE - */ -INT CDECL MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) -{ - switch(cap) - { - case TECHNOLOGY: - return DT_METAFILE; - case TEXTCAPS: - return 0; - default: - TRACE(" unsupported capability %d, will return 0\n", cap ); - } - return 0; -} diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 296cb47..a5e0605 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -74,8 +74,6 @@ extern BOOL CDECL MFDRV_Ellipse( PHYSDEV dev, INT left, INT top, extern BOOL CDECL MFDRV_EndPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, - INT cbOutput, LPVOID out_data ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT fillType ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, @@ -85,7 +83,6 @@ extern BOOL CDECL MFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT x, INT y ) DECLSPEC_HIDDEN; -extern INT CDECL MFDRV_GetDeviceCaps( PHYSDEV dev , INT cap ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Fix the remaining actions to revert features and components to the installed state during rollback .
by Alexandre Julliard May 25, 2011

May 25, 2011

Module: wine Branch: master Commit: 0ecb33e21ed5e848515438e2632b567e8550d8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecb33e21ed5e848515438e26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 25 10:39:41 2011 +0200 msi: Fix the remaining actions to revert features and components to the installed state during rollback. --- dlls/msi/action.c | 170 +++++++++++++++++----------------------------------- 1 files changed, 56 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ecb33e21ed5e84851543…

1 0