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

Stefan Leichter : crypt32: Replace CRYPT_RecurseDeleteKey with RegDeleteTreeW.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 374267e127889ffd4cd4c5c440cb7703bd4ca6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=374267e127889ffd4cd4c5c44… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Jun 1 22:49:49 2007 +0200 crypt32: Replace CRYPT_RecurseDeleteKey with RegDeleteTreeW. --- dlls/crypt32/store.c | 59 ++----------------------------------------------- 1 files changed, 3 insertions(+), 56 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 30143fe..b2be152 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1367,59 +1367,6 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, return ret; } -/* Copied from shlwapi's SHDeleteKeyW, and reformatted to match this file. */ -static DWORD CRYPT_RecurseDeleteKey(HKEY hKey, LPCWSTR lpszSubKey) -{ - DWORD dwRet, dwKeyCount = 0, dwMaxSubkeyLen = 0, dwSize, i; - WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; - HKEY hSubKey = 0; - - TRACE("(hkey=%p,%s)\n", hKey, debugstr_w(lpszSubKey)); - - dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); - if (!dwRet) - { - /* Find how many subkeys there are */ - dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwKeyCount, - &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL); - if (!dwRet) - { - dwMaxSubkeyLen++; - if (dwMaxSubkeyLen > sizeof(szNameBuf)/sizeof(WCHAR)) - { - /* Name too big: alloc a buffer for it */ - lpszName = CryptMemAlloc(dwMaxSubkeyLen*sizeof(WCHAR)); - } - - if (!lpszName) - dwRet = ERROR_NOT_ENOUGH_MEMORY; - else - { - /* Recursively delete all the subkeys */ - for (i = 0; i < dwKeyCount && !dwRet; i++) - { - dwSize = dwMaxSubkeyLen; - dwRet = RegEnumKeyExW(hSubKey, i, lpszName, &dwSize, NULL, - NULL, NULL, NULL); - if (!dwRet) - dwRet = CRYPT_RecurseDeleteKey(hSubKey, lpszName); - } - - if (lpszName != szNameBuf) - { - /* Free buffer if allocated */ - CryptMemFree(lpszName); - } - } - } - - RegCloseKey(hSubKey); - if (!dwRet) - dwRet = RegDeleteKeyW(hKey, lpszSubKey); - } - return dwRet; -} - static void *regProvFuncs[] = { CRYPT_RegCloseStore, NULL, /* CERT_STORE_PROV_READ_CERT_FUNC */ @@ -1446,12 +1393,12 @@ static WINECRYPT_CERTSTORE *CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, if (dwFlags & CERT_STORE_DELETE_FLAG) { - DWORD rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CertsW); + DWORD rc = RegDeleteTreeW((HKEY)pvPara, CertsW); if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS) - rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CRLsW); + rc = RegDeleteTreeW((HKEY)pvPara, CRLsW); if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS) - rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CTLsW); + rc = RegDeleteTreeW((HKEY)pvPara, CTLsW); if (rc == ERROR_NO_MORE_ITEMS) rc = ERROR_SUCCESS; SetLastError(rc);

1 0

Stefan Dösinger : ddraw: Hold the lock in IDirectDrawClipper methods.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 0086d490a92594be0faf3f680346a16caa26f710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0086d490a92594be0faf3f680… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun May 20 23:51:26 2007 +0200 ddraw: Hold the lock in IDirectDrawClipper methods. --- dlls/ddraw/clipper.c | 42 ++++++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index eb8a8db..517bc7c 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -106,8 +106,10 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) { if (ref == 0) { + EnterCriticalSection(&ddraw_cs); IWineD3DClipper_Release(This->wineD3DClipper); HeapFree(GetProcessHeap(), 0, This); + LeaveCriticalSection(&ddraw_cs); return 0; } else return ref; @@ -135,9 +137,11 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd( HRESULT hr; TRACE("(%p)->(%08x,%p)\n", This, dwFlags, hWnd); + EnterCriticalSection(&ddraw_cs); hr = IWineD3DClipper_SetHWnd(This->wineD3DClipper, dwFlags, hWnd); + LeaveCriticalSection(&ddraw_cs); switch(hr) { case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; @@ -168,12 +172,16 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetClipList( LPDWORD lpdwSize) { IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; + HRESULT hr; TRACE("(%p,%p,%p,%p)\n", This, lpRect, lpClipList, lpdwSize); - return IWineD3DClipper_GetClipList(This->wineD3DClipper, - lpRect, - lpClipList, - lpdwSize); + EnterCriticalSection(&ddraw_cs); + hr = IWineD3DClipper_GetClipList(This->wineD3DClipper, + lpRect, + lpClipList, + lpdwSize); + LeaveCriticalSection(&ddraw_cs); + return hr; } /***************************************************************************** @@ -194,10 +202,14 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList( LPDIRECTDRAWCLIPPER iface,LPRGNDATA lprgn,DWORD dwFlag ) { IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; + HRESULT hr; - return IWineD3DClipper_SetClipList(This->wineD3DClipper, - lprgn, - dwFlag); + EnterCriticalSection(&ddraw_cs); + hr = IWineD3DClipper_SetClipList(This->wineD3DClipper, + lprgn, + dwFlag); + LeaveCriticalSection(&ddraw_cs); + return hr; } /***************************************************************************** @@ -215,10 +227,14 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd( LPDIRECTDRAWCLIPPER iface, HWND* hWndPtr ) { IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; + HRESULT hr; TRACE("(%p)->(%p)\n", This, hWndPtr); - return IWineD3DClipper_GetHWnd(This->wineD3DClipper, - hWndPtr); + EnterCriticalSection(&ddraw_cs); + hr = IWineD3DClipper_GetHWnd(This->wineD3DClipper, + hWndPtr); + LeaveCriticalSection(&ddraw_cs); + return hr; } /***************************************************************************** @@ -242,11 +258,17 @@ static HRESULT WINAPI IDirectDrawClipperImpl_Initialize( IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; TRACE("(%p)->(%p,0x%08x)\n", This, lpDD, dwFlags); - if (This->ddraw_owner != NULL) return DDERR_ALREADYINITIALIZED; + EnterCriticalSection(&ddraw_cs); + if (This->ddraw_owner != NULL) + { + LeaveCriticalSection(&ddraw_cs); + return DDERR_ALREADYINITIALIZED; + } pOwner = ICOM_OBJECT(IDirectDrawImpl, IDirectDraw, lpDD); This->ddraw_owner = pOwner; + LeaveCriticalSection(&ddraw_cs); return DD_OK; }

1 0

Stefan Dösinger : ddraw: Hold the lock in IDirectDrawGammaControl methods.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: e38439bdfe5d793f14da3c2dda2ab29faf2f7ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38439bdfe5d793f14da3c2dd… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat May 26 18:46:51 2007 +0200 ddraw: Hold the lock in IDirectDrawGammaControl methods. --- dlls/ddraw/gamma.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/gamma.c b/dlls/ddraw/gamma.c index 8a8e2dd..949d673 100644 --- a/dlls/ddraw/gamma.c +++ b/dlls/ddraw/gamma.c @@ -141,6 +141,7 @@ IDirectDrawGammaControlImpl_GetGammaRamp(IDirectDrawGammaControl *iface, return DDERR_INVALIDPARAMS; } + EnterCriticalSection(&ddraw_cs); if(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { /* Note: DDGAMMARAMP is compatible with WINED3DGAMMARAMP */ @@ -152,6 +153,7 @@ IDirectDrawGammaControlImpl_GetGammaRamp(IDirectDrawGammaControl *iface, { ERR("(%p) Unimplemented for non-primary surfaces\n", This); } + LeaveCriticalSection(&ddraw_cs); return DD_OK; } @@ -185,6 +187,7 @@ IDirectDrawGammaControlImpl_SetGammaRamp(IDirectDrawGammaControl *iface, return DDERR_INVALIDPARAMS; } + EnterCriticalSection(&ddraw_cs); if(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { @@ -198,6 +201,7 @@ IDirectDrawGammaControlImpl_SetGammaRamp(IDirectDrawGammaControl *iface, { ERR("(%p) Unimplemented for non-primary surfaces\n", This); } + LeaveCriticalSection(&ddraw_cs); return DD_OK; }

1 0

Stefan Dösinger : ddraw: Hold the lock in IDirect3DMaterial methods.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: d0de7e72ec9afac274835bf4dba637ff7219c5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0de7e72ec9afac274835bf4d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon May 21 00:05:06 2007 +0200 ddraw: Hold the lock in IDirect3DMaterial methods. --- dlls/ddraw/material.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 5b7332e..24cb14f 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -149,8 +149,10 @@ IDirect3DMaterialImpl_Release(IDirect3DMaterial3 *iface) { if(This->Handle) { + EnterCriticalSection(&ddraw_cs); This->ddraw->d3ddevice->Handles[This->Handle - 1].ptr = NULL; This->ddraw->d3ddevice->Handles[This->Handle - 1].type = DDrawHandle_Unknown; + LeaveCriticalSection(&ddraw_cs); } HeapFree(GetProcessHeap(), 0, This); @@ -246,9 +248,11 @@ IDirect3DMaterialImpl_SetMaterial(IDirect3DMaterial3 *iface, dump_material(lpMat); /* Stores the material */ + EnterCriticalSection(&ddraw_cs); memset(&This->mat, 0, sizeof(This->mat)); memcpy(&This->mat, lpMat, lpMat->dwSize); - + LeaveCriticalSection(&ddraw_cs); + return DD_OK; } @@ -278,9 +282,11 @@ IDirect3DMaterialImpl_GetMaterial(IDirect3DMaterial3 *iface, } /* Copies the material structure */ + EnterCriticalSection(&ddraw_cs); dwSize = lpMat->dwSize; memset(lpMat, 0, dwSize); memcpy(lpMat, &This->mat, dwSize); + LeaveCriticalSection(&ddraw_cs); return DD_OK; } @@ -309,6 +315,7 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, IDirect3DDeviceImpl *device = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice3, lpDirect3DDevice3); TRACE("(%p/%p)->(%p,%p)\n", This, iface, device, lpHandle); + EnterCriticalSection(&ddraw_cs); This->active_device = device; if(!This->Handle) { @@ -316,6 +323,7 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, if(!This->Handle) { ERR("Error creating a handle\n"); + LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; /* Unchecked */ } device->Handles[This->Handle - 1].ptr = This; @@ -323,6 +331,7 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, } *lpHandle = This->Handle; TRACE(" returning handle %08x.\n", *lpHandle); + LeaveCriticalSection(&ddraw_cs); return D3D_OK; }

1 0

Maarten Lankhorst : dsound: Fix buffer caps.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 909ed9937a5365f70df81bad96ab2d7add753d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=909ed9937a5365f70df81bad9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 30 18:32:35 2007 +0200 dsound: Fix buffer caps. --- dlls/dsound/buffer.c | 7 ++----- dlls/dsound/primary.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index b1cecd7..59964ec 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -898,11 +898,8 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCaps( caps->dwBufferBytes = This->buflen; - /* This value represents the speed of the "unlock" command. - As unlock is quite fast (it does not do anything), I put - 4096 ko/s = 4 Mo / s */ - /* FIXME: hwbuf speed */ - caps->dwUnlockTransferRate = 4096; + /* According to windows, this is zero*/ + caps->dwUnlockTransferRate = 0; caps->dwPlayCpuOverhead = 0; return DS_OK; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ad7a5b0..f229757 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -914,11 +914,8 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps( caps->dwBufferBytes = device->buflen; - /* This value represents the speed of the "unlock" command. - As unlock is quite fast (it does not do anything), I put - 4096 ko/s = 4 Mo / s */ - /* FIXME: hwbuf speed */ - caps->dwUnlockTransferRate = 4096; + /* Windows reports these as zero */ + caps->dwUnlockTransferRate = 0; caps->dwPlayCpuOverhead = 0; return DS_OK;

1 0

Maarten Lankhorst : dsound: Recalculate 3d buffer on SetVolume.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 13af0566282b6d2ee91f192432884c218591470a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13af0566282b6d2ee91f19243… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 30 18:31:21 2007 +0200 dsound: Recalculate 3d buffer on SetVolume. --- dlls/dsound/buffer.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 59964ec..2437758 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -221,6 +221,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume( if (This->dsbd.dwFlags & DSBCAPS_CTRL3D) { oldVol = This->ds3db_lVolume; This->ds3db_lVolume = vol; + if (vol != oldVol) + /* recalc 3d volume, which in turn recalcs the pans */ + DSOUND_Calc3DBuffer(This); } else { oldVol = This->volpan.lVolume; This->volpan.lVolume = vol;

1 0

Maarten Lankhorst : dsound: Disable property sets if hardware doesn' t support it.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 3e1fcc0eb722ba5f19ad410b3a0096744743cd61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1fcc0eb722ba5f19ad410b3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed May 30 19:21:29 2007 +0200 dsound: Disable property sets if hardware doesn't support it. --- dlls/dsound/propset.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 7773293..7bb7f4f 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -197,9 +197,19 @@ HRESULT IKsBufferPropertySetImpl_Create( IDirectSoundBufferImpl *dsb, IKsBufferPropertySetImpl **piks) { + PIDSDRIVERPROPERTYSET ps = NULL; IKsBufferPropertySetImpl *iks; TRACE("(%p,%p)\n",dsb,piks); + if (!dsb->hwbuf) + return DSERR_INVALIDPARAM; + + IDsDriver_QueryInterface(dsb->hwbuf, &IID_IDsDriverPropertySet, (void **)&ps); + if (!ps) + return DSERR_INVALIDPARAM; + + IUnknown_Release(ps); + iks = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*iks)); if (iks == 0) { WARN("out of memory\n");

1 0

Stefan Dösinger : wined3d: Do not enable GL_APPLE_client_storage for the dummy textures.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: cd7ed61cfa62fb028e7a94f04cd05fb8fdcdb12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7ed61cfa62fb028e7a94f04… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri May 25 14:15:45 2007 +0200 wined3d: Do not enable GL_APPLE_client_storage for the dummy textures. --- dlls/wined3d/stateblock.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index fe92d1f..4213084 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1062,6 +1062,11 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat then the default texture will kick in until replaced by a SetTexture call */ ENTER_GL(); + if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { + /* The dummy texture does not have client storage backing */ + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); + } for (i = 0; i < GL_LIMITS(textures); i++) { GLubyte white = 255; @@ -1092,6 +1097,11 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, 1, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white); checkGLcall("glTexImage2D"); } + if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { + /* Reenable because if supported it is enabled by default */ + glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); + } LEAVE_GL();

1 0

Stefan Dösinger : ddraw: Hold the lock in IDirect3DDevice methods.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: d5d7d4dae4315e5b8173b638e75bc66c01dd8da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d7d4dae4315e5b8173b638e… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jun 3 18:51:50 2007 +0200 ddraw: Hold the lock in IDirect3DDevice methods. --- dlls/ddraw/device.c | 499 ++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 357 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5d7d4dae4315e5b8173b…

1 0

Alexander Nicolaysen Sørnes : wordpad: Store file name globally.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: d072e8b1a9f70aaec4c2790718725da3c692acee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d072e8b1a9f70aaec4c279071… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed May 30 14:56:20 2007 +0200 wordpad: Store file name globally. --- programs/wordpad/wordpad.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index e131527..524d2d2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -114,6 +114,8 @@ static DWORD CALLBACK stream_in(DWORD_PTR cookie, LPBYTE buffer, LONG cb, LONG * return 0; } +static WCHAR wszFileName[MAX_PATH]; + static void set_caption(LPCWSTR wszNewFileName) { static const WCHAR wszSeparator[] = {' ','-',' ','\0'}; @@ -180,6 +182,8 @@ static void DoOpenFile(LPCWSTR szOpenFileName) SetFocus(hEditorWnd); set_caption(szOpenFileName); + + lstrcpyW(wszFileName, szOpenFileName); } static void DialogOpenFile(void) @@ -442,6 +446,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_FILE_NEW: SetWindowTextA(hwndEditor, ""); set_caption(NULL); + wszFileName[0] = '\0'; /* FIXME: set default format too */ break;

1 0