wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Glenn Wurster : sfc_os: Add stub implementation for SfcIsKeyProtected.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 7dbe9a6728064172a9d9edac484f90c421156785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dbe9a6728064172a9d9edac4… Author: Glenn Wurster <gwurster(a)scs.carleton.ca> Date: Fri Jun 1 16:10:02 2007 -0400 sfc_os: Add stub implementation for SfcIsKeyProtected. --- dlls/sfc/sfc.spec | 1 + dlls/sfc_os/sfc_os.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/sfc_os/sfc_os.spec | 1 + 3 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/sfc/sfc.spec b/dlls/sfc/sfc.spec index 20d0da5..8afb515 100644 --- a/dlls/sfc/sfc.spec +++ b/dlls/sfc/sfc.spec @@ -1,2 +1,3 @@ @ stub SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected +@ stdcall SfcIsKeyProtected(long wstr long) sfc_os.SfcIsKeyProtected diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index 070eea7..5805342 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -84,3 +84,42 @@ BOOL WINAPI SfcIsFileProtected(HANDLE RpcHandle, LPCWSTR ProtFileName) SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } + +/****************************************************************** + * SfcIsKeyProtected [sfc_os.@] + * + * Check, if the given Registry Key is protected by the System + * + * PARAMS + * hKey [I] Handle to the root registry key + * lpSubKey [I] Name of the subkey to check + * samDesired [I] The Registry View to Examine (32 or 64 bit) + * + * RETURNS + * Failure: FALSE with GetLastError() != ERROR_FILE_NOT_FOUND + * Success: TRUE, when the Key is Protected + * FALSE with GetLastError() == ERROR_FILE_NOT_FOUND, + * when the Key is not Protected + * + */ +BOOL WINAPI SfcIsKeyProtected(HKEY hKey, LPCWSTR lpSubKey, REGSAM samDesired) +{ + static BOOL reported = FALSE; + + if (reported) { + TRACE("(%p, %s) stub\n", hKey, debugstr_w(lpSubKey)); + } + else + { + FIXME("(%p, %s) stub\n", hKey, debugstr_w(lpSubKey)); + reported = TRUE; + } + + if( !hKey ) { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} diff --git a/dlls/sfc_os/sfc_os.spec b/dlls/sfc_os/sfc_os.spec index bd71d4d..1edcb83 100644 --- a/dlls/sfc_os/sfc_os.spec +++ b/dlls/sfc_os/sfc_os.spec @@ -1,2 +1,3 @@ @ stub SfcGetNextProtectedFile @ stdcall SfcIsFileProtected(ptr wstr) +@ stdcall SfcIsKeyProtected(long wstr long)

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

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: 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

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

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 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 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

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

Alexander Nicolaysen Sørnes : wordpad: Add file saving dialog.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 68ce6023817c9ab5f5c11da213a9e4b7378e7614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ce6023817c9ab5f5c11da21… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 31 15:38:51 2007 +0200 wordpad: Add file saving dialog. --- programs/wordpad/De.rc | 1 + programs/wordpad/En.rc | 1 + programs/wordpad/Fr.rc | 3 ++- programs/wordpad/Hu.rc | 1 + programs/wordpad/Ko.rc | 1 + programs/wordpad/Nl.rc | 1 + programs/wordpad/No.rc | 1 + programs/wordpad/Pl.rc | 1 + programs/wordpad/Ru.rc | 1 + programs/wordpad/Tr.rc | 1 + programs/wordpad/resource.h | 7 ++++--- programs/wordpad/wordpad.c | 32 ++++++++++++++++++++++++++++++-- 12 files changed, 45 insertions(+), 6 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 6d973ab..054e234 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -25,6 +25,7 @@ BEGIN MENUITEM "&Neu\tCtrl+N", ID_FILE_NEW MENUITEM "&�ffnen\tCtrl+O", ID_FILE_OPEN MENUITEM "&Speichern\tCtrl+S", ID_FILE_SAVE + MENUITEM "Speichern &unter...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Beenden", ID_FILE_EXIT END diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index bab4178..4fa734d 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -25,6 +25,7 @@ BEGIN MENUITEM "&New\tCtrl+N", ID_FILE_NEW MENUITEM "&Open\tCtrl+O", ID_FILE_OPEN MENUITEM "&Save\tCtrl+S", ID_FILE_SAVE + MENUITEM "Save &as . . .", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "E&xit", ID_FILE_EXIT END diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 901749e..e0d8370 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -24,7 +24,8 @@ BEGIN BEGIN MENUITEM "&Nouveau\tCtrl+N", ID_FILE_NEW MENUITEM "&Ouvrir\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Sauver\tCtrl+S", ID_FILE_SAVE + MENUITEM "&Enregistrer\tCtrl+S", ID_FILE_SAVE + MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Quitter", ID_FILE_EXIT END diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 8c1e058..2cab4f5 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -25,6 +25,7 @@ BEGIN MENUITEM "&�j\tCtrl+N", ID_FILE_NEW MENUITEM "&Megnyit�s\tCtrl+O", ID_FILE_OPEN MENUITEM "M&ent�s\tCtrl+S", ID_FILE_SAVE + MENUITEM "Ment�s m�&sk�nt...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Kil�p�s", ID_FILE_EXIT END diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 33c7678..6694006 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -26,6 +26,7 @@ BEGIN MENUITEM "�� (&N)\tCtrl+N", ID_FILE_NEW MENUITEM "��(&O)\tCtrl+O", ID_FILE_OPEN MENUITEM "��(&S)\tCtrl+S", ID_FILE_SAVE + MENUITEM "�ٸ� �̸�� (&A)...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "��(&X)", ID_FILE_EXIT END diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 3a18519..e009d5f 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -25,6 +25,7 @@ BEGIN MENUITEM "&Nieuw\tCtrl+N" ID_FILE_NEW MENUITEM "&Openen\tCtrl+O", ID_FILE_OPEN MENUITEM "O&pslaan\tCtrl+S", ID_FILE_SAVE + MENUITEM "Ops&laan als...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Afsluiten", ID_FILE_EXIT END diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index b13fb67..3efb408 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -25,6 +25,7 @@ BEGIN MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW MENUITEM "&�pne\tCtrl+O", ID_FILE_OPEN MENUITEM "&Lagre\tCtrl+S", ID_FILE_SAVE + MENUITEM "Lagre &som . . .", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&Avslutt", ID_FILE_EXIT END diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 2c277e4..9498484 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -26,6 +26,7 @@ BEGIN MENUITEM "&Nowy\tCtrl+N", ID_FILE_NEW MENUITEM "&Otw�rz\tCtrl+O", ID_FILE_OPEN MENUITEM "&Zapisz\tCtrl+S", ID_FILE_SAVE + MENUITEM "Z&apisz jako...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "Za&ko�cz", ID_FILE_EXIT END diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index fd24593..ff471e2 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -25,6 +25,7 @@ BEGIN MENUITEM "��&��\tCtrl+N", ID_FILE_NEW MENUITEM "&��\tCtrl+O", ID_FILE_OPEN MENUITEM "&��\tCtrl+S", ID_FILE_SAVE + MENUITEM "�� &��...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "�&��", ID_FILE_EXIT END diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index f43f8fd..0d6598e 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -27,6 +27,7 @@ BEGIN MENUITEM "&Yeni\tCtrl+N", ID_FILE_NEW MENUITEM "&A�\tCtrl+O", ID_FILE_OPEN MENUITEM "&Kaydet\tCtrl+S", ID_FILE_SAVE + MENUITEM "&Farkl� Kaydet...", ID_FILE_SAVEAS MENUITEM SEPARATOR MENUITEM "&��k", ID_FILE_EXIT END diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index e818e40..bc7647d 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -20,11 +20,12 @@ #define ID_FILE_OPEN 1001 #define ID_FILE_SAVE 1002 #define ID_FILE_NEW 1003 +#define ID_FILE_SAVEAS 1004 -#define ID_PRINT 1004 -#define ID_PREVIEW 1005 +#define ID_PRINT 1005 +#define ID_PREVIEW 1006 -#define ID_FIND 1006 +#define ID_FIND 1007 #define ID_ALIGN_LEFT 1100 #define ID_ALIGN_CENTER 1101 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 360f2a3..5a9f7fd 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -223,6 +223,29 @@ static void DoSaveFile(LPCWSTR wszSaveFileName) set_caption(wszFileName); } +static void DialogSaveFile(void) +{ + OPENFILENAMEW sfn; + + WCHAR wszFile[MAX_PATH] = {'\0'}; + static const WCHAR wszDefExt[] = {'r','t','f','\0'}; + + ZeroMemory(&sfn, sizeof(sfn)); + + sfn.lStructSize = sizeof(sfn); + sfn.Flags = OFN_HIDEREADONLY | OFN_PATHMUSTEXIST; + sfn.hwndOwner = hMainWnd; + sfn.lpstrFilter = wszFilter; + sfn.lpstrFile = wszFile; + sfn.nMaxFile = MAX_PATH; + sfn.lpstrDefExt = wszDefExt; + + if(!GetSaveFileNameW(&sfn)) + return; + + DoSaveFile(sfn.lpstrFile); +} + static void HandleCommandLine(LPWSTR cmdline) { WCHAR delimiter; @@ -466,9 +489,14 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_FILE_SAVE: if(wszFileName[0]) + { DoSaveFile(wszFileName); - else - MessageBox(hWnd, "Can only save existing for now", "WordPad", MB_OK); + break; + } + /* Fall through */ + + case ID_FILE_SAVEAS: + DialogSaveFile(); break; case ID_PRINT:

1 0

← Newer
1
...
78
79
80
81
82
83
84
85
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007