October 2008 - Wine-Commits

Huw Davies : ole32: Call the appropriate storage function when we run the object.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 92202feff3c46585c552cc439c5584074cf58a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=92202feff3c46585c552cc439… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 23 10:25:24 2008 +0100 ole32: Call the appropriate storage function when we run the object. --- dlls/ole32/defaulthandler.c | 51 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index ce44aec..49bb733 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -64,6 +64,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +enum storage_state +{ + storage_state_uninitialised, + storage_state_initialised, + storage_state_loaded +}; + /**************************************************************************** * DefaultHandler * @@ -119,6 +126,10 @@ struct DefaultHandler /* connection cookie for the advise on the delegate OLE object */ DWORD dwAdvConn; + + /* storage passed to Load or InitNew */ + IStorage *storage; + enum storage_state storage_state; }; typedef struct DefaultHandler DefaultHandler; @@ -1302,7 +1313,12 @@ static HRESULT WINAPI DefaultHandler_Run( IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, (void **)&This->pPSDelegate); if (This->pPSDelegate) - hr = IPersistStorage_InitNew(This->pPSDelegate, NULL); + { + if(This->storage_state == storage_state_initialised) + hr = IPersistStorage_InitNew(This->pPSDelegate, This->storage); + else if(This->storage_state == storage_state_loaded) + hr = IPersistStorage_Load(This->pPSDelegate, This->storage); + } } if (SUCCEEDED(hr) && This->containerApp) @@ -1548,6 +1564,13 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_InitNew( if(SUCCEEDED(hr) && object_is_running(This)) hr = IPersistStorage_InitNew(This->pPSDelegate, pStg); + if(SUCCEEDED(hr)) + { + IStorage_AddRef(pStg); + This->storage = pStg; + This->storage_state = storage_state_initialised; + } + return hr; } @@ -1570,6 +1593,12 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_Load( if(SUCCEEDED(hr) && object_is_running(This)) hr = IPersistStorage_Load(This->pPSDelegate, pStg); + if(SUCCEEDED(hr)) + { + IStorage_AddRef(pStg); + This->storage = pStg; + This->storage_state = storage_state_loaded; + } return hr; } @@ -1614,6 +1643,14 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_SaveCompleted( if(SUCCEEDED(hr) && object_is_running(This)) hr = IPersistStorage_SaveCompleted(This->pPSDelegate, pStgNew); + if(pStgNew) + { + IStorage_AddRef(pStgNew); + if(This->storage) IStorage_Release(This->storage); + This->storage = pStgNew; + This->storage_state = storage_state_loaded; + } + return hr; } @@ -1635,6 +1672,10 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_HandsOffStorage( if(SUCCEEDED(hr) && object_is_running(This)) hr = IPersistStorage_HandsOffStorage(This->pPSDelegate); + if(This->storage) IStorage_Release(This->storage); + This->storage = NULL; + This->storage_state = storage_state_uninitialised; + return hr; } @@ -1795,6 +1836,8 @@ static DefaultHandler* DefaultHandler_Construct( This->pDataDelegate = NULL; This->dwAdvConn = 0; + This->storage = NULL; + This->storage_state = storage_state_uninitialised; return This; } @@ -1836,6 +1879,12 @@ static void DefaultHandler_Destroy( This->dataAdviseHolder = NULL; } + if (This->storage) + { + IStorage_Release(This->storage); + This->storage = NULL; + } + HeapFree(GetProcessHeap(), 0, This); }

1 0

Stefan Leichter : rpcrt4: Add stub for MesEncodeDynBufferHandleCreate.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 79bbddd431bf61e8377b909cfa80e573d1877ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79bbddd431bf61e8377b909cf… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Oct 22 20:41:09 2008 +0200 rpcrt4: Add stub for MesEncodeDynBufferHandleCreate. --- dlls/rpcrt4/ndr_es.c | 13 ++++++++++++- dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index 3423d39..b0bb7cc 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -156,7 +156,18 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( *pHandle = (handle_t)pEsMsg; - return RPC_S_OK;} + return RPC_S_OK; +} + +/*********************************************************************** + * MesEncodeDynBufferHandleCreate [RPCRT4.@] + */ +RPC_STATUS RPC_ENTRY MesEncodeDynBufferHandleCreate(char **ppBuffer, + ULONG *pEncodedSize, handle_t *pHandle) +{ + FIXME("%p %p %p stub\n", ppBuffer, pEncodedSize, pHandle); + return RPC_S_OK; +} /*********************************************************************** * MesDecodeBufferHandleCreate [RPCRT4.@] diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 1a56c08..2c86e68 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -99,7 +99,7 @@ @ stub MesBufferHandleReset @ stdcall MesDecodeBufferHandleCreate(ptr long ptr) @ stdcall MesDecodeIncrementalHandleCreate(ptr ptr ptr) -@ stub MesEncodeDynBufferHandleCreate +@ stdcall MesEncodeDynBufferHandleCreate(ptr ptr ptr) @ stdcall MesEncodeFixedBufferHandleCreate(ptr long ptr ptr) @ stdcall MesEncodeIncrementalHandleCreate(ptr ptr ptr ptr) @ stdcall MesHandleFree(ptr)

1 0

Alexandre Julliard : winecfg: Update the drives only when they have changed , instead of trying to compare with the current setup.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: f410cf7c98aa60b7d6beb418b2a342466f4c8ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f410cf7c98aa60b7d6beb418b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 23 12:15:43 2008 +0200 winecfg: Update the drives only when they have changed, instead of trying to compare with the current setup. --- programs/winecfg/drive.c | 95 +++++++++---------------------------------- programs/winecfg/driveui.c | 7 +++ programs/winecfg/winecfg.h | 1 + 3 files changed, 28 insertions(+), 75 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 1516426..bc3766c 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -103,6 +103,7 @@ BOOL add_drive(char letter, const char *targetpath, const WCHAR *label, DWORD se drives[driveIndex].serial = serial; drives[driveIndex].type = type; drives[driveIndex].in_use = TRUE; + drives[driveIndex].modified = TRUE; return TRUE; } @@ -116,6 +117,7 @@ void delete_drive(struct drive *d) d->label = NULL; d->serial = 0; d->in_use = FALSE; + d->modified = TRUE; } static void set_drive_type( char letter, DWORD type ) @@ -370,6 +372,9 @@ void load_drives(void) drivecount++; } + /* reset modified flags */ + for (i = 0; i < 26; i++) drives[i].modified = FALSE; + WINE_TRACE("found %d drives\n", drivecount); HeapFree(GetProcessHeap(), 0, path); @@ -383,66 +388,37 @@ void apply_drive_changes(void) int i; CHAR devicename[4]; CHAR targetpath[256]; - BOOL foundDrive; - WCHAR volumeNameBuffer[512]; - DWORD serialNumber; - int retval; - BOOL defineDevice; WINE_TRACE("\n"); /* add each drive and remove as we go */ for(i = 0; i < 26; i++) { - defineDevice = FALSE; - foundDrive = FALSE; - volumeNameBuffer[0] = 0; - serialNumber = 0; - snprintf(devicename, sizeof(devicename), "%c:", 'A' + i); + if (!drives[i].modified) continue; + drives[i].modified = FALSE; - /* get a drive */ - if(QueryDosDevice(devicename, targetpath, sizeof(targetpath))) - { - char *cursor; - - /* correct the slashes in the path to be UNIX style */ - while ((cursor = strchr(targetpath, '\\'))) *cursor = '/'; - - foundDrive = TRUE; - } + snprintf(devicename, sizeof(devicename), "%c:", 'A' + i); - /* if we found a drive and have a drive then compare things */ - if(foundDrive && drives[i].in_use) + if (drives[i].in_use) { - WCHAR deviceW[4] = {'a',':','\\',0}; - WINE_TRACE("drives[i].letter: '%c'\n", drives[i].letter); - - deviceW[0] = 'A' + i; - retval = GetVolumeInformationW(deviceW, volumeNameBuffer, sizeof(volumeNameBuffer)/sizeof(WCHAR), - &serialNumber, NULL, NULL, NULL, 0 ); - if(!retval) + /* define this drive */ + /* DefineDosDevice() requires that NO trailing slash be present */ + if(!DefineDosDevice(DDD_RAW_TARGET_PATH, devicename, drives[i].unixpath)) { - WINE_TRACE(" GetVolumeInformation() for '%s' failed\n", devicename); + WINE_ERR(" unable to define devicename of '%s', targetpath of '%s'\n", + devicename, drives[i].unixpath); PRINTERROR(); - volumeNameBuffer[0] = '\0'; - } - - WINE_TRACE(" current path: '%s', new path: '%s'\n", - targetpath, drives[i].unixpath); - - /* compare to what we have */ - /* do we have the same targetpath? */ - if(strcmp(drives[i].unixpath, targetpath)) - { - defineDevice = TRUE; - WINE_TRACE(" making changes to drive '%s'\n", devicename); } else { - WINE_TRACE(" no changes to drive '%s'\n", devicename); + WINE_TRACE(" added devicename of '%s', targetpath of '%s'\n", + devicename, drives[i].unixpath); } + set_drive_label( drives[i].letter, drives[i].label ); + set_drive_serial( drives[i].letter, drives[i].serial ); + set_drive_type( drives[i].letter, drives[i].type ); } - else if(foundDrive && !drives[i].in_use) + else if (QueryDosDevice(devicename, targetpath, sizeof(targetpath))) { /* remove this drive */ if(!DefineDosDevice(DDD_REMOVE_DEFINITION, devicename, drives[i].unixpath)) @@ -460,36 +436,5 @@ void apply_drive_changes(void) set_drive_type( drives[i].letter, DRIVE_UNKNOWN ); continue; } - else if(drives[i].in_use) /* foundDrive must be false from the above check */ - { - defineDevice = TRUE; - } - - /* adding and modifying are the same steps */ - if(defineDevice) - { - /* define this drive */ - /* DefineDosDevice() requires that NO trailing slash be present */ - snprintf(devicename, sizeof(devicename), "%c:", 'A' + i); - if(!DefineDosDevice(DDD_RAW_TARGET_PATH, devicename, drives[i].unixpath)) - { - WINE_ERR(" unable to define devicename of '%s', targetpath of '%s'\n", - devicename, drives[i].unixpath); - PRINTERROR(); - } - else - { - WINE_TRACE(" added devicename of '%s', targetpath of '%s'\n", - devicename, drives[i].unixpath); - } - } - - if (!drives[i].label || lstrcmpW(drives[i].label, volumeNameBuffer)) - set_drive_label( drives[i].letter, drives[i].label ); - - if (drives[i].serial != serialNumber) - set_drive_serial( drives[i].letter, drives[i].serial ); - - set_drive_type( drives[i].letter, drives[i].type ); } } diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 61fba5f..8443537 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -334,6 +334,7 @@ static void on_add_click(HWND dialog) SetFocus(GetDlgItem(dialog, IDC_LIST_DRIVES)); update_controls(dialog); + SendMessage(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); } static void on_remove_click(HWND dialog) @@ -372,6 +373,7 @@ static void on_remove_click(HWND dialog) SetFocus(GetDlgItem(dialog, IDC_LIST_DRIVES)); update_controls(dialog); + SendMessage(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); } static void update_controls(HWND dialog) @@ -485,6 +487,7 @@ static void on_edit_changed(HWND dialog, WORD id) WCHAR *label = get_textW(dialog, id); HeapFree(GetProcessHeap(), 0, current_drive->label); current_drive->label = label; + current_drive->modified = TRUE; WINE_TRACE("set label to %s\n", wine_dbgstr_w(current_drive->label)); @@ -500,6 +503,7 @@ static void on_edit_changed(HWND dialog, WORD id) path = get_text(dialog, id); HeapFree(GetProcessHeap(), 0, current_drive->unixpath); current_drive->unixpath = path ? path : strdupA("drive_c"); + current_drive->modified = TRUE; WINE_TRACE("set path to %s\n", current_drive->unixpath); @@ -517,6 +521,7 @@ static void on_edit_changed(HWND dialog, WORD id) serial = get_text(dialog, id); current_drive->serial = strtoul( serial, NULL, 16 ); + current_drive->modified = TRUE; WINE_TRACE("set serial to %08x\n", current_drive->serial); @@ -756,6 +761,7 @@ DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) str = get_textW(dialog, IDC_EDIT_SERIAL); current_drive->serial = strtoulW( str, NULL, 16 ); + current_drive->modified = TRUE; /* TODO: we don't have a device at this point */ @@ -787,6 +793,7 @@ DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) enable_labelserial_box(dialog, mode); current_drive->type = type_pairs[selection].sCode; + current_drive->modified = TRUE; break; } diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 91cb7b3..807caf7 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -102,6 +102,7 @@ struct drive DWORD type; /* one of the DRIVE_ constants from winbase.h */ BOOL in_use; + BOOL modified; }; #define DRIVE_MASK_BIT(B) (1 << (toupper(B) - 'A'))

1 0

Paul Vriens : oleacc/tests: Fix some failures on Win98 up to W2K.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: c9b8a28576d046d2c98054c3bf53d402e563d9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b8a28576d046d2c98054c3b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 23 09:36:40 2008 +0200 oleacc/tests: Fix some failures on Win98 up to W2K. --- dlls/oleacc/tests/main.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 66b25af..b977a7b 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -24,8 +24,8 @@ static void test_getroletext(void) { INT ret, role; - CHAR buf[2], *buff, buff2[100]; - WCHAR bufW[2], *buffW, buff2W[100]; + CHAR buf[2], *buff; + WCHAR bufW[2], *buffW; /* wrong role number */ ret = GetRoleTextA(-1, NULL, 0); @@ -103,11 +103,26 @@ static void test_getroletext(void) /* check returned length for all roles */ for(role = 0; role <= ROLE_SYSTEM_OUTLINEBUTTON; role++){ + CHAR buff2[100]; + WCHAR buff2W[100]; + + /* NT4 and W2K don't clear the buffer on a non existing role in the A-call */ + memset(buff2, 0, sizeof(buff2)); + ret = GetRoleTextA(role, NULL, 0); + /* Win98 up to W2K miss some of the roles */ + if (role >= ROLE_SYSTEM_SPLITBUTTON) + ok(ret > 0 || broken(ret == 0), "Expected the role %d to be present\n", role); + else + ok(ret > 0, "Expected the role to be present\n"); + GetRoleTextA(role, buff2, sizeof(buff2)); ok(ret == lstrlenA(buff2), "GetRoleTextA: returned length doesn't match returned buffer for role %d\n", role); + /* Win98 and WinMe don't clear the buffer on a non existing role in the W-call */ + memset(buff2W, 0, sizeof(buff2W)); + ret = GetRoleTextW(role, NULL, 0); GetRoleTextW(role, buff2W, sizeof(buff2W)/sizeof(WCHAR)); ok(ret == lstrlenW(buff2W),

1 0

Andrew Talbot : msxml3: Sign-compare warning fix.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 68f0e06434a28030c70b2324936b62b23113219b URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f0e06434a28030c70b23249… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Oct 22 21:43:50 2008 +0100 msxml3: Sign-compare warning fix. --- dlls/msxml3/queryresult.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index d38cc19..e0367bc 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -308,7 +308,7 @@ static HRESULT queryresult_get_dispid(IUnknown *iface, BSTR name, DWORD flags, D { queryresult *This = impl_from_IXMLDOMNodeList( (IXMLDOMNodeList*)iface ); WCHAR *ptr; - DWORD idx=0; + int idx = 0; for(ptr = name; *ptr && isdigitW(*ptr); ptr++) idx = idx*10 + (*ptr-'0');

1 0

Jeff Zaroyko : dsound/tests: Fix failing propset and capture tests on win98 .
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: b9084bc99f794155154676400bbfc48209177058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9084bc99f794155154676400… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Thu Oct 23 16:18:09 2008 +1100 dsound/tests: Fix failing propset and capture tests on win98. --- dlls/dsound/tests/capture.c | 6 +++++- dlls/dsound/tests/propset.c | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 2da7fcc..787d670 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -596,9 +596,13 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc1.lpwfxFormat=&wfx; rc=IDirectSoundCapture_CreateCaptureBuffer(dsco, (DSCBUFFERDESC*)&bufdesc1,&dscbo,NULL); - ok(rc==DS_OK || broken(rc==E_INVALIDARG), + ok(rc==DS_OK || broken(rc==DSERR_INVALIDPARAM), "IDirectSoundCapture_CreateCaptureBuffer() failed to create a " "%s capture buffer: %08x\n",format_string(&wfx), rc); + if (rc==DSERR_INVALIDPARAM) { + skip("broken driver\n"); + goto EXIT; + } if (rc==DS_OK) { test_capture_buffer(dsco, dscbo, winetest_interactive); ref=IDirectSoundCaptureBuffer_Release(dscbo); diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 5d87e89..88ea3dc 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -591,8 +591,14 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, bufdesc.dwSize=sizeof(bufdesc); bufdesc.dwFlags=DSBCAPS_PRIMARYBUFFER|DSBCAPS_LOCHARDWARE|DSBCAPS_CTRL3D; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&primary,NULL); - ok(rc==DS_OK&&primary!=NULL,"IDirectSound_CreateSoundBuffer() failed to " + ok((rc==DS_OK&&primary!=NULL) + || broken(rc==DSERR_INVALIDPARAM), + "IDirectSound_CreateSoundBuffer() failed to " "create a hardware 3D primary buffer: %08x\n",rc); + if(rc==DSERR_INVALIDPARAM) { + skip("broken driver\n"); + goto EXIT; + } if (rc==DS_OK&&primary!=NULL) { ZeroMemory(&wfx, sizeof(wfx)); wfx.wFormatTag=WAVE_FORMAT_PCM;

1 0

Jeff Zaroyko : dsound/tests: Fix a failing capture test on win2k.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 29e49bbe8eaf401b3a80f6949047faaccf78bd1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29e49bbe8eaf401b3a80f6949… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Thu Oct 23 16:51:09 2008 +1100 dsound/tests: Fix a failing capture test on win2k. --- dlls/dsound/tests/capture.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 787d670..b2a377a 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -567,8 +567,9 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, if (winetest_interactive) trace(" Testing the capture buffer at %s\n", format_string(&wfx)); rc=IDirectSoundCapture_CreateCaptureBuffer(dsco,&bufdesc,&dscbo,NULL); - ok(((rc==DS_OK)&&(dscbo!=NULL))||(rc==DSERR_BADFORMAT)|| - ((rc==DSERR_NODRIVER))||(rc==DSERR_ALLOCATED)||(rc==E_INVALIDARG)||(rc==E_FAIL), + ok(((rc==DS_OK)&&(dscbo!=NULL)) + || rc==DSERR_BADFORMAT || rc==DSERR_INVALIDCALL || rc==DSERR_NODRIVER + || rc==DSERR_ALLOCATED || rc==E_INVALIDARG || rc==E_FAIL, "IDirectSoundCapture_CreateCaptureBuffer() failed to create a " "%s capture buffer: %08x\n",format_string(&wfx),rc); if (rc==DS_OK) {

1 0

Juan Lang : crypt32: Correct trust error status for cyclic chains.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 0556e9d966362fb607956614a35092ec1898549e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0556e9d966362fb607956614a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 22 15:02:15 2008 -0700 crypt32: Correct trust error status for cyclic chains. --- dlls/crypt32/chain.c | 6 ++---- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 1c113c1..cd70d49 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -754,13 +754,11 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, if (CRYPT_IsSimpleChainCyclic(chain)) { /* If the chain is cyclic, then the path length constraints - * are violated, because the chain is infinitely long. MS - * misleadingly also sets the not supported name constraint bit, - * whether or not name constraints were present. + * are violated, because the chain is infinitely long. */ pathLengthConstraintViolated = TRUE; chain->TrustStatus.dwErrorStatus |= - CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT | + CERT_TRUST_IS_PARTIAL_CHAIN | CERT_TRUST_INVALID_BASIC_CONSTRAINTS; } /* FIXME: check valid usages */ diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 530a03d..fc9768b 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1527,7 +1527,7 @@ static ChainCheck chainCheck[] = { TODO_ERROR }, { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, { { CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT | + { CERT_TRUST_IS_PARTIAL_CHAIN | CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_CYCLIC, 0 }, 1, simpleStatus9 }, TODO_INFO },

1 0

Nikolay Sivov : gdiplus: Added GdipSetClipGraphics.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: c543f3d947987f89fb69527f8e3e17909a399641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c543f3d947987f89fb69527f8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Oct 22 20:03:10 2008 +0400 gdiplus: Added GdipSetClipGraphics. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ef53b9b..fea80a4 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -506,7 +506,7 @@ @ stdcall GdipSetAdjustableArrowCapHeight(ptr long) @ stdcall GdipSetAdjustableArrowCapMiddleInset(ptr long) @ stdcall GdipSetAdjustableArrowCapWidth(ptr long) -@ stub GdipSetClipGraphics +@ stdcall GdipSetClipGraphics(ptr ptr long) @ stub GdipSetClipHrgn @ stdcall GdipSetClipPath(ptr ptr long) @ stdcall GdipSetClipRect(ptr long long long long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 03b0994..3273494 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2818,6 +2818,17 @@ GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, return GdipScaleMatrix(graphics->worldtrans, sx, sy, order); } +GpStatus WINGDIPAPI GdipSetClipGraphics(GpGraphics *graphics, GpGraphics *srcgraphics, + CombineMode mode) +{ + TRACE("(%p, %p, %d)\n", graphics, srcgraphics, mode); + + if(!graphics || !srcgraphics) + return InvalidParameter; + + return GdipCombineRegionRegion(graphics->clip, srcgraphics->clip, mode); +} + GpStatus WINGDIPAPI GdipSetCompositingMode(GpGraphics *graphics, CompositingMode mode) {

1 0

Juan Lang : crypt32: Pass flags to enumeration callback.
by Alexandre Julliard Oct. 23, 2008

Oct. 23, 2008

Module: wine Branch: master Commit: 5a5129b42e46e1a90c11fbb2149e4ac6f3c1850e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5129b42e46e1a90c11fbb21… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 22 13:21:20 2008 -0700 crypt32: Pass flags to enumeration callback. --- dlls/crypt32/store.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 6d9177e..391a95e 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1321,7 +1321,7 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, rc = RegEnumKeyExW(key, index++, name, &size, NULL, NULL, NULL, NULL); if (!rc) - ret = pfnEnum(name, 0, &info, NULL, pvArg); + ret = pfnEnum(name, dwFlags, &info, NULL, pvArg); } while (ret && !rc); if (ret && rc != ERROR_NO_MORE_ITEMS) SetLastError(rc);

1 0