June 2007 - Wine-Commits - list.winehq.org

Rob Shearman : msi: Implement MsiGetMode for MSIRUNMODE_SCHEDULED, MSIRUNMODE_COMMIT and MSIRUNMODE_ROLLBACK.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 8a94f7aad38df0b318bcaef3fcd3a92aa754f63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a94f7aad38df0b318bcaef3f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 20:47:38 2007 +0100 msi: Implement MsiGetMode for MSIRUNMODE_SCHEDULED, MSIRUNMODE_COMMIT and MSIRUNMODE_ROLLBACK. --- dlls/msi/action.c | 22 +++++++++++----------- dlls/msi/custom.c | 20 +++++++++++++++++++- dlls/msi/events.c | 2 +- dlls/msi/install.c | 14 +++++++++++++- dlls/msi/msi.c | 6 +++--- dlls/msi/msipriv.h | 10 +++++++--- dlls/msi/package.c | 3 +++ 7 files changed, 57 insertions(+), 20 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 820d91d..01b5abb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -748,9 +748,9 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI) } if (UI) - rc = ACTION_PerformUIAction(package,action); + rc = ACTION_PerformUIAction(package,action,-1); else - rc = ACTION_PerformAction(package,action,FALSE); + rc = ACTION_PerformAction(package,action,-1,FALSE); end: msiobj_release(&row->hdr); } @@ -789,9 +789,9 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) } if (iap->UI) - rc = ACTION_PerformUIAction(iap->package,action); + rc = ACTION_PerformUIAction(iap->package,action,-1); else - rc = ACTION_PerformAction(iap->package,action,FALSE); + rc = ACTION_PerformAction(iap->package,action,-1,FALSE); msi_dialog_check_messages( NULL ); @@ -980,12 +980,12 @@ static BOOL ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action, } static BOOL ACTION_HandleCustomAction( MSIPACKAGE* package, LPCWSTR action, - UINT* rc, BOOL force ) + UINT* rc, UINT script, BOOL force ) { BOOL ret=FALSE; UINT arc; - arc = ACTION_CustomAction(package,action, force); + arc = ACTION_CustomAction(package, action, script, force); if (arc != ERROR_CALL_NOT_IMPLEMENTED) { @@ -1003,7 +1003,7 @@ static BOOL ACTION_HandleCustomAction( MSIPACKAGE* package, LPCWSTR action, * But until I get write access to the database that is hard, so I am going to * hack it to see if I can get something to run. */ -UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, BOOL force) +UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script, BOOL force) { UINT rc = ERROR_SUCCESS; BOOL handled; @@ -1013,7 +1013,7 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, BOOL force) handled = ACTION_HandleStandardAction(package, action, &rc, force); if (!handled) - handled = ACTION_HandleCustomAction(package, action, &rc, force); + handled = ACTION_HandleCustomAction(package, action, &rc, script, force); if (!handled) { @@ -1024,7 +1024,7 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, BOOL force) return rc; } -UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action) +UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT script) { UINT rc = ERROR_SUCCESS; BOOL handled = FALSE; @@ -1034,7 +1034,7 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action) handled = ACTION_HandleStandardAction(package, action, &rc,TRUE); if (!handled) - handled = ACTION_HandleCustomAction(package, action, &rc, FALSE); + handled = ACTION_HandleCustomAction(package, action, &rc, script, FALSE); if( !handled && ACTION_DialogBox(package,action) == ERROR_SUCCESS ) handled = TRUE; @@ -1598,7 +1598,7 @@ static UINT execute_script(MSIPACKAGE *package, UINT script ) action = package->script->Actions[script][i]; ui_actionstart(package, action); TRACE("Executing Action (%s)\n",debugstr_w(action)); - rc = ACTION_PerformAction(package, action, TRUE); + rc = ACTION_PerformAction(package, action, script, TRUE); if (rc != ERROR_SUCCESS) break; } diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index af9c8dc..2ea73f9 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -174,7 +174,7 @@ static void set_deferred_action_props(MSIPACKAGE *package, LPWSTR deferred_data) MSI_SetPropertyW(package, ProdCode, beg); } -UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute) +UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL execute) { UINT rc = ERROR_SUCCESS; MSIRECORD * row = 0; @@ -258,6 +258,21 @@ UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute) LPWSTR actiondata = msi_dup_property( package, action ); + switch (script) + { + case INSTALL_SCRIPT: + package->scheduled_action_running = TRUE; + break; + case COMMIT_SCRIPT: + package->commit_action_running = TRUE; + break; + case ROLLBACK_SCRIPT: + package->rollback_action_running = TRUE; + break; + default: + break; + } + if (deferred_data) set_deferred_action_props(package, deferred_data); else if (actiondata) @@ -334,6 +349,9 @@ UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute) } end: + package->scheduled_action_running = FALSE; + package->commit_action_running = FALSE; + package->rollback_action_running = FALSE; msi_free(action_copy); msiobj_release(&row->hdr); return rc; diff --git a/dlls/msi/events.c b/dlls/msi/events.c index faaaf2f..b85a5c5 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -168,7 +168,7 @@ static UINT ControlEvent_SpawnWaitDialog(MSIPACKAGE* package, LPCWSTR argument, static UINT ControlEvent_DoAction(MSIPACKAGE* package, LPCWSTR argument, msi_dialog* dialog) { - ACTION_PerformAction(package,argument,TRUE); + ACTION_PerformAction(package,argument,-1,TRUE); return ERROR_SUCCESS; } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index b6cff6d..91877e3 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -69,7 +69,7 @@ UINT WINAPI MsiDoActionW( MSIHANDLE hInstall, LPCWSTR szAction ) if (!package) return ERROR_INVALID_HANDLE; - ret = ACTION_PerformUIAction( package, szAction ); + ret = ACTION_PerformUIAction( package, szAction, -1 ); msiobj_release( &package->hdr ); return ret; @@ -452,8 +452,13 @@ UINT WINAPI MsiSetTargetPathW(MSIHANDLE hInstall, LPCWSTR szFolder, */ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) { + MSIPACKAGE *package; BOOL r = FALSE; + package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); + if (!package) + return FALSE; + switch (iRunMode) { case MSIRUNMODE_WINDOWS9X: @@ -467,8 +472,15 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) break; case MSIRUNMODE_SCHEDULED: + r = package->scheduled_action_running; + break; + case MSIRUNMODE_ROLLBACK: + r = package->rollback_action_running; + break; + case MSIRUNMODE_COMMIT: + r = package->commit_action_running; break; default: diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 59a6f67..b332f0e 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1765,7 +1765,7 @@ UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct) return ERROR_INVALID_PARAMETER; package = msihandle2msiinfo(handle, MSIHANDLETYPE_PACKAGE); - rc = ACTION_PerformUIAction(package, szFirstRun); + rc = ACTION_PerformUIAction(package, szFirstRun, -1); msiobj_release( &package->hdr ); MsiCloseHandle(handle); @@ -1787,7 +1787,7 @@ UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct) return ERROR_INVALID_PARAMETER; package = msihandle2msiinfo(handle, MSIHANDLETYPE_PACKAGE); - rc = ACTION_PerformUIAction(package, szFirstRun); + rc = ACTION_PerformUIAction(package, szFirstRun, -1); msiobj_release( &package->hdr ); MsiCloseHandle(handle); @@ -1869,7 +1869,7 @@ UINT WINAPI MsiConfigureFeatureW(LPCWSTR szProduct, LPCWSTR szFeature, INSTALLST MsiSetInternalUI( INSTALLUILEVEL_BASIC, NULL ); - r = ACTION_PerformUIAction( package, szCostInit ); + r = ACTION_PerformUIAction( package, szCostInit, -1 ); if (r != ERROR_SUCCESS) goto end; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index e577fc5..3dd0cb3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -248,6 +248,10 @@ typedef struct tagMSIPACKAGE UINT WordCount; struct list subscriptions; + + unsigned char scheduled_action_running : 1; + unsigned char commit_action_running : 1; + unsigned char rollback_action_running : 1; } MSIPACKAGE; typedef struct tagMSIPREVIEW @@ -731,10 +735,10 @@ extern WCHAR gszLogFile[MAX_PATH]; extern HINSTANCE msi_hInstance; /* action related functions */ -extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, BOOL force); -extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action); +extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script, BOOL force); +extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT script); extern void ACTION_FinishCustomActions( const MSIPACKAGE* package); -extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, BOOL execute); +extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, UINT script, BOOL execute); static inline void msi_feature_set_state( MSIFEATURE *feature, INSTALLSTATE state ) { diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1dd661d..c53def9 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -702,6 +702,9 @@ static MSIPACKAGE *msi_alloc_package( void ) package->LastAction = NULL; package->dialog = NULL; package->next_dialog = NULL; + package->scheduled_action_running = FALSE; + package->commit_action_running = FALSE; + package->rollback_action_running = FALSE; } return package;

1 0

Alex Villacís Lasso : dsound: Reset device playpos/ mixpos on buflen change.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 1a23836f91c34f627c641256688f0e6fa22c1e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a23836f91c34f627c6412566… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 25 13:15:08 2007 -0500 dsound: Reset device playpos/mixpos on buflen change. --- dlls/dsound/primary.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0068e5a..39c097a 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -100,6 +100,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) merr = DSERR_OUTOFMEMORY; /* but the old buffer might still exist and must be re-prepared */ } else { + device->playpos = 0; + device->mixpos = 0; device->buffer = newbuf; device->buflen = buflen; } @@ -139,6 +141,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) if ((err == DS_OK) && (merr != DS_OK)) err = merr; } else if (!device->hwbuf) { + device->playpos = 0; + device->mixpos = 0; err = IDsDriver_CreateSoundBuffer(device->driver,device->pwfx, DSBCAPS_PRIMARYBUFFER,0, &(device->buflen),&(device->buffer), @@ -190,6 +194,8 @@ HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) HRESULT err = DS_OK; TRACE("(%p)\n", device); + device->playpos = 0; + device->mixpos = 0; device->buflen = device->pwfx->nAvgBytesPerSec; /* FIXME: verify that hardware capabilities (DSCAPS_PRIMARY flags) match */ @@ -299,6 +305,8 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) device->pwfx, (DWORD_PTR)DSOUND_callback, (DWORD)device, flags)); if (err == DS_OK) { + device->playpos = 0; + device->mixpos = 0; err = IDsDriver_CreateSoundBuffer(device->driver,device->pwfx, DSBCAPS_PRIMARYBUFFER,0, &(device->buflen),&(device->buffer), @@ -425,6 +433,8 @@ HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) if (err == DSERR_BUFFERLOST) { /* Wine-only: the driver wants us to recreate the HW buffer */ IDsDriverBuffer_Release(device->hwbuf); + device->playpos = 0; + device->mixpos = 0; err = IDsDriver_CreateSoundBuffer(device->driver,device->pwfx, DSBCAPS_PRIMARYBUFFER,0, &(device->buflen),&(device->buffer),

1 0

Alex Villacís Lasso : dsound: Make test recover from failure to preserve primary buffer length after SetFormat ().
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: f2626bab14d5d895fbd4ca41737e9d41811f3395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2626bab14d5d895fbd4ca417… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 25 12:55:36 2007 -0500 dsound: Make test recover from failure to preserve primary buffer length after SetFormat(). --- dlls/dsound/tests/ds3d.c | 1 + dlls/dsound/tests/ds3d8.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 54b50e2..4f8ec8f 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -420,6 +420,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, " buffer size changed after SetFormat() - " "previous size was %u, current size is %u\n", dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); + dsbcaps.dwBufferBytes = new_dsbcaps.dwBufferBytes; /* Check for primary buffer flags change */ ok(new_dsbcaps.dwFlags == dsbcaps.dwFlags, diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 00c0ef7..cddcf70 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -307,6 +307,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, " buffer size changed after SetFormat() - " "previous size was %u, current size is %u\n", dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes); + dsbcaps.dwBufferBytes = new_dsbcaps.dwBufferBytes; /* Check for primary buffer flags change */ ok(new_dsbcaps.dwFlags == dsbcaps.dwFlags,

1 0

Alex Villacís Lasso : winealsa: Reduce writeahead to next multiple of psize greater than 512.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 647ad64faa5887c7b94d89496827e98ecb3bbdbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=647ad64faa5887c7b94d89496… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 25 12:49:28 2007 -0500 winealsa: Reduce writeahead to next multiple of psize greater than 512. --- dlls/winealsa.drv/dsoutput.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 9fc5020..e4c7d3f 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -381,7 +381,11 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo FIXME("Your alsa dmix period size is excessively high, unfortunately this is alsa default, try decreasing it to 512 or 256 (but double the amount of periods) if possible\n"); This->mmap_writeahead = 3 * psize; } - else This->mmap_writeahead = 3 * 512; + else + { + This->mmap_writeahead = 3 * psize; + while (This->mmap_writeahead <= 512) This->mmap_writeahead += psize; + } if (This->pcm) {

1 0

Alex Villacís Lasso : mciwave: Prevent division by zero when processing non-PCM codec.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 0b9cab02c4804cc796500254869dc5152d2dd9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9cab02c4804cc7965002548… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 25 12:42:47 2007 -0500 mciwave: Prevent division by zero when processing non-PCM codec. --- dlls/mciwave/mciwave.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index dbbd809..520d285 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -204,7 +204,7 @@ static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val, LPDWORD ret = val; break; case MCI_FORMAT_SAMPLES: /* FIXME: is this correct ? */ - ret = (val * 8) / wmw->lpWaveFormat->wBitsPerSample; + ret = (val * 8) / (wmw->lpWaveFormat->wBitsPerSample ? wmw->lpWaveFormat->wBitsPerSample : 1); break; default: WARN("Bad time format %u!\n", wmw->dwMciTimeFormat);

1 0

Jeff Latimer : crypt32: Fix possible dereference of NULL ptr.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 417ae04ed9280ceea1cf828bd82b7b6d749a4964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=417ae04ed9280ceea1cf828bd… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Jun 24 20:06:49 2007 +1000 crypt32: Fix possible dereference of NULL ptr. --- dlls/crypt32/str.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 6d879c5..c524b2b 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -899,8 +899,9 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, } } } - ret = CertRDNValueToStrW(nameAttr->dwValueType, &nameAttr->Value, - pszNameString, cchNameString); + if (nameAttr) + ret = CertRDNValueToStrW(nameAttr->dwValueType, &nameAttr->Value, + pszNameString, cchNameString); if (info) LocalFree(info); break;

1 0

Rob Shearman : rpcrt4: Dereference the pointer passed to the marshaling/ unmarshaling/sizing routines in complex types for interface pointers.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: 545c2a95f665df8ed481fefc553bd51abd9bf80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=545c2a95f665df8ed481fefc5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:29:52 2007 +0100 rpcrt4: Dereference the pointer passed to the marshaling/unmarshaling/sizing routines in complex types for interface pointers. --- dlls/rpcrt4/ndr_marshall.c | 48 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b2c08b2..2b89e50 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1853,7 +1853,17 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, size = EmbeddedComplexSize(pStubMsg, desc); TRACE("embedded complex (size=%ld) <= %p\n", size, pMemory); m = NdrMarshaller[*desc & NDR_TABLE_MASK]; - if (m) m(pStubMsg, pMemory, desc); + if (m) + { + /* for some reason interface pointers aren't generated as + * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet + * they still need the derefencing treatment that pointers are + * given */ + if (*desc == RPC_FC_IP) + m(pStubMsg, *(unsigned char **)pMemory, desc); + else + m(pStubMsg, pMemory, desc); + } else FIXME("no marshaller for embedded type %02x\n", *desc); pMemory += size; pFormat += 2; @@ -1961,7 +1971,17 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, TRACE("embedded complex (size=%ld) => %p\n", size, pMemory); m = NdrUnmarshaller[*desc & NDR_TABLE_MASK]; memset(pMemory, 0, size); /* just in case */ - if (m) m(pStubMsg, &pMemory, desc, FALSE); + if (m) + { + /* for some reason interface pointers aren't generated as + * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet + * they still need the derefencing treatment that pointers are + * given */ + if (*desc == RPC_FC_IP) + m(pStubMsg, (unsigned char **)pMemory, desc, FALSE); + else + m(pStubMsg, &pMemory, desc, FALSE); + } else FIXME("no unmarshaller for embedded type %02x\n", *desc); pMemory += size; pFormat += 2; @@ -2048,7 +2068,17 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, desc = pFormat + *(const SHORT*)pFormat; size = EmbeddedComplexSize(pStubMsg, desc); m = NdrBufferSizer[*desc & NDR_TABLE_MASK]; - if (m) m(pStubMsg, pMemory, desc); + if (m) + { + /* for some reason interface pointers aren't generated as + * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet + * they still need the derefencing treatment that pointers are + * given */ + if (*desc == RPC_FC_IP) + m(pStubMsg, *(unsigned char **)pMemory, desc); + else + m(pStubMsg, pMemory, desc); + } else FIXME("no buffersizer for embedded type %02x\n", *desc); pMemory += size; pFormat += 2; @@ -2120,7 +2150,17 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, desc = pFormat + *(const SHORT*)pFormat; size = EmbeddedComplexSize(pStubMsg, desc); m = NdrFreer[*desc & NDR_TABLE_MASK]; - if (m) m(pStubMsg, pMemory, desc); + if (m) + { + /* for some reason interface pointers aren't generated as + * RPC_FC_POINTER, but instead as RPC_FC_EMBEDDED_COMPLEX, yet + * they still need the derefencing treatment that pointers are + * given */ + if (*desc == RPC_FC_IP) + m(pStubMsg, *(unsigned char **)pMemory, desc); + else + m(pStubMsg, pMemory, desc); + } else FIXME("no freer for embedded type %02x\n", *desc); pMemory += size; pFormat += 2;

1 0

Rob Shearman : rpcrt4: Implement marshalling, unmarshalling and buffer sizing for the context handle type.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: fc124eca6eff950b97d2abebc2759b102ffb2fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc124eca6eff950b97d2abebc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:29:15 2007 +0100 rpcrt4: Implement marshalling, unmarshalling and buffer sizing for the context handle type. --- dlls/rpcrt4/ndr_marshall.c | 74 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1bd2764..b2c08b2 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -118,6 +118,10 @@ static void WINAPI NdrBaseTypeBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PF static void WINAPI NdrBaseTypeFree(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); static ULONG WINAPI NdrBaseTypeMemorySize(PMIDL_STUB_MESSAGE, PFORMAT_STRING); +static unsigned char *WINAPI NdrContextHandleMarshall(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); +static void WINAPI NdrContextHandleBufferSize(PMIDL_STUB_MESSAGE, unsigned char *, PFORMAT_STRING); +static unsigned char *WINAPI NdrContextHandleUnmarshall(PMIDL_STUB_MESSAGE, unsigned char **, PFORMAT_STRING, unsigned char); + const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { 0, NdrBaseTypeMarshall, NdrBaseTypeMarshall, NdrBaseTypeMarshall, @@ -152,7 +156,7 @@ const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { /* 0x2f */ NdrInterfacePointerMarshall, /* 0x30 */ - 0, + NdrContextHandleMarshall, /* 0xb1 */ 0, 0, 0, NdrUserMarshalMarshall, @@ -194,7 +198,7 @@ const NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = { /* 0x2f */ NdrInterfacePointerUnmarshall, /* 0x30 */ - 0, + NdrContextHandleUnmarshall, /* 0xb1 */ 0, 0, 0, NdrUserMarshalUnmarshall, @@ -236,7 +240,7 @@ const NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = { /* 0x2f */ NdrInterfacePointerBufferSize, /* 0x30 */ - 0, + NdrContextHandleBufferSize, /* 0xb1 */ 0, 0, 0, NdrUserMarshalBufferSize, @@ -5517,6 +5521,70 @@ static void WINAPI NdrBaseTypeFree(PMIDL_STUB_MESSAGE pStubMsg, } /*********************************************************************** + * NdrContextHandleBufferSize [internal] + */ +static void WINAPI NdrContextHandleBufferSize( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); + + if (*pFormat != RPC_FC_BIND_CONTEXT) + { + ERR("invalid format type %x\n", *pFormat); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + } + ALIGN_LENGTH(pStubMsg->BufferLength, 4); + pStubMsg->BufferLength += cbNDRContext; +} + +/*********************************************************************** + * NdrContextHandleMarshall [internal] + */ +static unsigned char *WINAPI NdrContextHandleMarshall( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); + + if (*pFormat != RPC_FC_BIND_CONTEXT) + { + ERR("invalid format type %x\n", *pFormat); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + } + + if (pFormat[1] & 0x80) + NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); + else + NdrClientContextMarshall(pStubMsg, (NDR_CCONTEXT *)pMemory, FALSE); + + return NULL; +} + +/*********************************************************************** + * NdrContextHandleUnmarshall [internal] + */ +static unsigned char *WINAPI NdrContextHandleUnmarshall( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + if (*pFormat != RPC_FC_BIND_CONTEXT) + { + ERR("invalid format type %x\n", *pFormat); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + } + + **(NDR_CCONTEXT **)ppMemory = NULL; + NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + + return NULL; +} + +/*********************************************************************** * NdrClientContextMarshall [RPCRT4.@] */ void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg,

1 0

Rob Shearman : rpcrt4: Try a lot harder to resuse existing connections by comparing inside the RpcQualityOfService and RpcAuthInfo objects .
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: cbafe663b0a44bcc0fc7b0c8deb1d46dd2f4324d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbafe663b0a44bcc0fc7b0c8d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:27:17 2007 +0100 rpcrt4: Try a lot harder to resuse existing connections by comparing inside the RpcQualityOfService and RpcAuthInfo objects. Store a copy of the SEC_WINNT_AUTH_IDENTITY structure passed in to RpcBindingSetAuthInfo(Ex) to enable us to do this for RpcAuthInfo objects. --- dlls/rpcrt4/rpc_binding.c | 184 ++++++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/rpc_binding.h | 7 ++ dlls/rpcrt4/rpc_transport.c | 8 +- 3 files changed, 192 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbafe663b0a44bcc0fc7b…

1 0

Rob Shearman : rpcrt4: Implement marshalling/ unmarshalling for the range NDR type.
by Alexandre Julliard June 26, 2007

June 26, 2007

Module: wine Branch: master Commit: d36f02eaa91fbd564108fa87b54542ec361e9aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36f02eaa91fbd564108fa87b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jun 25 14:28:40 2007 +0100 rpcrt4: Implement marshalling/unmarshalling for the range NDR type. --- dlls/rpcrt4/ndr_marshall.c | 236 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 221 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0eb2e10..1bd2764 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -151,9 +151,14 @@ const NDR_MARSHALL NdrMarshaller[NDR_TABLE_SIZE] = { NdrXmitOrRepAsMarshall, NdrXmitOrRepAsMarshall, /* 0x2f */ NdrInterfacePointerMarshall, - /* 0xb0 */ - 0, 0, 0, 0, - NdrUserMarshalMarshall + /* 0x30 */ + 0, + /* 0xb1 */ + 0, 0, 0, + NdrUserMarshalMarshall, + 0, 0, + /* 0xb7 */ + NdrRangeMarshall }; const NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = { 0, @@ -188,9 +193,14 @@ const NDR_UNMARSHALL NdrUnmarshaller[NDR_TABLE_SIZE] = { NdrXmitOrRepAsUnmarshall, NdrXmitOrRepAsUnmarshall, /* 0x2f */ NdrInterfacePointerUnmarshall, - /* 0xb0 */ - 0, 0, 0, 0, - NdrUserMarshalUnmarshall + /* 0x30 */ + 0, + /* 0xb1 */ + 0, 0, 0, + NdrUserMarshalUnmarshall, + 0, 0, + /* 0xb7 */ + NdrRangeUnmarshall }; const NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = { 0, @@ -225,9 +235,14 @@ const NDR_BUFFERSIZE NdrBufferSizer[NDR_TABLE_SIZE] = { NdrXmitOrRepAsBufferSize, NdrXmitOrRepAsBufferSize, /* 0x2f */ NdrInterfacePointerBufferSize, - /* 0xb0 */ - 0, 0, 0, 0, - NdrUserMarshalBufferSize + /* 0x30 */ + 0, + /* 0xb1 */ + 0, 0, 0, + NdrUserMarshalBufferSize, + 0, 0, + /* 0xb7 */ + NdrRangeBufferSize }; const NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_SIZE] = { 0, @@ -262,9 +277,14 @@ const NDR_MEMORYSIZE NdrMemorySizer[NDR_TABLE_SIZE] = { NdrXmitOrRepAsMemorySize, NdrXmitOrRepAsMemorySize, /* 0x2f */ NdrInterfacePointerMemorySize, - /* 0xb0 */ - 0, 0, 0, 0, - NdrUserMarshalMemorySize + /* 0x30 */ + 0, + /* 0xb1 */ + 0, 0, 0, + NdrUserMarshalMemorySize, + 0, 0, + /* 0xb7 */ + NdrRangeMemorySize }; const NDR_FREE NdrFreer[NDR_TABLE_SIZE] = { 0, @@ -298,9 +318,14 @@ const NDR_FREE NdrFreer[NDR_TABLE_SIZE] = { NdrXmitOrRepAsFree, NdrXmitOrRepAsFree, /* 0x2f */ NdrInterfacePointerFree, - /* 0xb0 */ - 0, 0, 0, 0, - NdrUserMarshalFree + /* 0x30 */ + 0, + /* 0xb1 */ + 0, 0, 0, + NdrUserMarshalFree, + 0, 0, + /* 0xb7 */ + NdrRangeFree }; void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) @@ -5047,6 +5072,187 @@ void WINAPI NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE pStubMsg, FIXME("stub\n"); } +#include "pshpack1.h" +typedef struct +{ + unsigned char type; + unsigned char flags_type; /* flags in upper nibble, type in lower nibble */ + ULONG low_value; + ULONG high_value; +} NDR_RANGE; +#include "poppack.h" + +/*********************************************************************** + * NdrRangeMarshall [internal] + */ +unsigned char *WINAPI NdrRangeMarshall( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + unsigned char base_type; + + TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); + + if (pRange->type != RPC_FC_RANGE) + { + ERR("invalid format type %x\n", pRange->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + + base_type = pRange->flags_type & 0xf; + + return NdrBaseTypeMarshall(pStubMsg, pMemory, &base_type); +} + +/*********************************************************************** + * NdrRangeUnmarshall + */ +unsigned char *WINAPI NdrRangeUnmarshall( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char **ppMemory, + PFORMAT_STRING pFormat, + unsigned char fMustAlloc) +{ + NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + unsigned char base_type; + + TRACE("pStubMsg: %p, ppMemory: %p, type: 0x%02x, fMustAlloc: %s\n", pStubMsg, ppMemory, *pFormat, fMustAlloc ? "true" : "false"); + + if (pRange->type != RPC_FC_RANGE) + { + ERR("invalid format type %x\n", pRange->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return NULL; + } + base_type = pRange->flags_type & 0xf; + + TRACE("base_type = 0x%02x, low_value = %d, high_value = %d\n", + base_type, pRange->low_value, pRange->high_value); + +#define RANGE_UNMARSHALL(type, format_spec) \ + do \ + { \ + ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \ + if (fMustAlloc || !*ppMemory) \ + *ppMemory = NdrAllocate(pStubMsg, sizeof(type)); \ + if ((*(type *)pStubMsg->Buffer < (type)pRange->low_value) || \ + (*(type *)pStubMsg->Buffer > (type)pRange->high_value)) \ + { \ + ERR("value exceeded bounds: " format_spec ", low: " format_spec ", high: " format_spec "\n", \ + *(type *)pStubMsg->Buffer, (type)pRange->low_value, \ + (type)pRange->high_value); \ + RpcRaiseException(RPC_S_INVALID_BOUND); \ + return NULL; \ + } \ + TRACE("*ppMemory: %p\n", *ppMemory); \ + **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ + pStubMsg->Buffer += sizeof(type); \ + } while (0) + + switch(base_type) + { + case RPC_FC_CHAR: + case RPC_FC_SMALL: + RANGE_UNMARSHALL(UCHAR, "%d"); + TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + break; + case RPC_FC_BYTE: + case RPC_FC_USMALL: + RANGE_UNMARSHALL(CHAR, "%u"); + TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + break; + case RPC_FC_WCHAR: /* FIXME: valid? */ + case RPC_FC_USHORT: + RANGE_UNMARSHALL(USHORT, "%u"); + TRACE("value: 0x%04x\n", **(USHORT **)ppMemory); + break; + case RPC_FC_SHORT: + RANGE_UNMARSHALL(SHORT, "%d"); + TRACE("value: 0x%04x\n", **(USHORT **)ppMemory); + break; + case RPC_FC_LONG: + RANGE_UNMARSHALL(LONG, "%d"); + TRACE("value: 0x%08x\n", **(ULONG **)ppMemory); + break; + case RPC_FC_ULONG: + RANGE_UNMARSHALL(ULONG, "%u"); + TRACE("value: 0x%08x\n", **(ULONG **)ppMemory); + break; + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + FIXME("Unhandled enum type\n"); + break; + case RPC_FC_ERROR_STATUS_T: /* FIXME: valid? */ + case RPC_FC_FLOAT: + case RPC_FC_DOUBLE: + case RPC_FC_HYPER: + default: + ERR("invalid range base type: 0x%02x\n", base_type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + } + + return NULL; +} + +/*********************************************************************** + * NdrRangeBufferSize [internal] + */ +void WINAPI NdrRangeBufferSize( + PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + unsigned char base_type; + + TRACE("pStubMsg %p, pMemory %p, type 0x%02x\n", pStubMsg, pMemory, *pFormat); + + if (pRange->type != RPC_FC_RANGE) + { + ERR("invalid format type %x\n", pRange->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + } + base_type = pRange->flags_type & 0xf; + + NdrBaseTypeBufferSize(pStubMsg, pMemory, &base_type); +} + +/*********************************************************************** + * NdrRangeMemorySize [internal] + */ +ULONG WINAPI NdrRangeMemorySize( + PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + NDR_RANGE *pRange = (NDR_RANGE *)pFormat; + unsigned char base_type; + + if (pRange->type != RPC_FC_RANGE) + { + ERR("invalid format type %x\n", pRange->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return 0; + } + base_type = pRange->flags_type & 0xf; + + return NdrBaseTypeMemorySize(pStubMsg, &base_type); +} + +/*********************************************************************** + * NdrRangeFree [internal] + */ +void WINAPI NdrRangeFree(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + TRACE("pStubMsg %p pMemory %p type 0x%02x\n", pStubMsg, pMemory, *pFormat); + + /* nothing to do */ +} + /*********************************************************************** * NdrBaseTypeMarshall [internal] */

1 0