April 2008 - wine-commits

Dan Hipschman : qedit: Implement IMediaDet_get_OutputStreams.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: d3061d48e1c78c331b93be7a880876ebff2730dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3061d48e1c78c331b93be7a8… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 8 16:53:52 2008 -0700 qedit: Implement IMediaDet_get_OutputStreams. --- dlls/qedit/mediadet.c | 170 ++++++++++++++++++++++++++++++++++++++- dlls/qedit/tests/mediadet.c | 90 ++++++++++++++++++-- dlls/qedit/tests/qedit.rc | 6 +- dlls/qedit/tests/rc.h | 29 +++++++ dlls/qedit/tests/test_sound.avi | Bin 0 -> 6070 bytes 5 files changed, 282 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3061d48e1c78c331b93b…

1 0

Dan Hipschman : qedit: Implement IMediaDet_get_Filename.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 7d2d5a25cbe9a3722f183991729e694d5978905c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2d5a25cbe9a3722f1839917… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 8 16:52:50 2008 -0700 qedit: Implement IMediaDet_get_Filename. --- dlls/qedit/Makefile.in | 2 +- dlls/qedit/mediadet.c | 42 ++++++++++++++++++++++++++++++++++++++++-- dlls/qedit/tests/mediadet.c | 21 ++++++++++++++++++--- 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 34707fa..d4db2a4 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qedit.dll -IMPORTS = ole32 advapi32 kernel32 +IMPORTS = oleaut32 ole32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid C_SRCS = \ diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 5ee064e..062c105 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -17,6 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + #include "qedit_private.h" #include "wine/debug.h" @@ -137,8 +146,37 @@ static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p): not implemented!\n", This, pVal); - return E_NOTIMPL; + IFileSourceFilter *file; + LPOLESTR name; + HRESULT hr; + + TRACE("(%p)\n", This); + + if (!pVal) + return E_POINTER; + + *pVal = NULL; + /* MSDN says it should return E_FAIL if no file is open, but tests + show otherwise. */ + if (!This->source) + return S_OK; + + hr = IBaseFilter_QueryInterface(This->source, &IID_IFileSourceFilter, + (void **) &file); + if (FAILED(hr)) + return hr; + + hr = IFileSourceFilter_GetCurFile(file, &name, NULL); + IFileSourceFilter_Release(file); + if (FAILED(hr)) + return hr; + + *pVal = SysAllocString(name); + CoTaskMemFree(name); + if (!*pVal) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 867d868..3e6e48f 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -93,6 +93,18 @@ static void test_mediadet(void) ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pM != NULL, "pM is NULL\n"); + filename = NULL; + hr = IMediaDet_get_Filename(pM, &filename); + /* Despite what MSDN claims, this returns S_OK. */ + ok(hr == S_OK, "IMediaDet_get_Filename\n"); + ok(filename == NULL, "IMediaDet_get_Filename\n"); + + filename = (BSTR) -1; + hr = IMediaDet_get_Filename(pM, &filename); + /* Despite what MSDN claims, this returns S_OK. */ + ok(hr == S_OK, "IMediaDet_get_Filename\n"); + ok(filename == NULL, "IMediaDet_get_Filename\n"); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); @@ -104,11 +116,14 @@ static void test_mediadet(void) filename = NULL; hr = IMediaDet_get_Filename(pM, &filename); - todo_wine ok(hr == S_OK, "IMediaDet_get_Filename\n"); - todo_wine ok(lstrcmpW(filename, test_avi_filename) == 0, - "IMediaDet_get_Filename\n"); + ok(hr == S_OK, "IMediaDet_get_Filename\n"); + ok(lstrcmpW(filename, test_avi_filename) == 0, + "IMediaDet_get_Filename\n"); SysFreeString(filename); + hr = IMediaDet_get_Filename(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_Filename\n"); + hr = IMediaDet_put_CurrentStream(pM, 0); todo_wine ok(hr == S_OK, "IMediaDet_put_CurrentStream\n");

1 0

Dan Hipschman : qedit: Implement IMediaDet_put_Filename.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: dc3d6fbe7fcaf0d6c73817d4a600e8b3cba24038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3d6fbe7fcaf0d6c73817d4a… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 8 16:52:14 2008 -0700 qedit: Implement IMediaDet_put_Filename. --- dlls/qedit/mediadet.c | 43 +++++++++++++++++++++++++++++++++++++++++-- dlls/qedit/tests/mediadet.c | 2 +- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index eb9f81d..5ee064e 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -25,8 +25,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); typedef struct MediaDetImpl { const IMediaDetVtbl *MediaDet_Vtbl; LONG refCount; + IGraphBuilder *graph; + IBaseFilter *source; } MediaDetImpl; +static void MD_cleanup(MediaDetImpl *This) +{ + if (This->source) IBaseFilter_Release(This->source); + This->source = NULL; + if (This->graph) IGraphBuilder_Release(This->graph); + This->graph = NULL; +} + static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface) { MediaDetImpl *This = (MediaDetImpl *)iface; @@ -43,6 +53,7 @@ static ULONG WINAPI MediaDet_Release(IMediaDet* iface) if (refCount == 0) { + MD_cleanup(This); CoTaskMemFree(This); return 0; } @@ -132,9 +143,35 @@ static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) { + static const WCHAR reader[] = {'R','e','a','d','e','r',0}; MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p): not implemented!\n", This, newVal); - return E_NOTIMPL; + IGraphBuilder *gb; + IBaseFilter *bf; + HRESULT hr; + + TRACE("(%p)->(%s)\n", This, debugstr_w(newVal)); + + if (This->graph) + { + WARN("MSDN says not to call this method twice\n"); + MD_cleanup(This); + } + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IGraphBuilder, (void **) &gb); + if (FAILED(hr)) + return hr; + + hr = IGraphBuilder_AddSourceFilter(gb, newVal, reader, &bf); + if (FAILED(hr)) + { + IGraphBuilder_Release(gb); + return hr; + } + + This->graph = gb; + This->source = bf; + return S_OK; } static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, @@ -228,6 +265,8 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { obj->refCount = 1; obj->MediaDet_Vtbl = &IMediaDet_VTable; + obj->graph = NULL; + obj->source = NULL; *ppv = obj; return S_OK; diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 3f8016d..867d868 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -95,7 +95,7 @@ static void test_mediadet(void) filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); - todo_wine ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); + ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); SysFreeString(filename); hr = IMediaDet_get_OutputStreams(pM, &nstrms);

1 0

Dan Hipschman : qedit/tests: Fix an incorrect count given to GetTempPathW.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 063aa3a1afb6c5441f76a13dc16e3fddf47ff99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=063aa3a1afb6c5441f76a13dc… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 8 16:51:28 2008 -0700 qedit/tests: Fix an incorrect count given to GetTempPathW. --- dlls/qedit/tests/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 0870fd0..3f8016d 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -56,7 +56,7 @@ static BOOL init_tests(void) if (size == 0) return FALSE; - if (!GetTempPathW(sizeof temp_path, temp_path)) + if (!GetTempPathW(MAX_PATH, temp_path)) return FALSE; /* We might end up relying on the extension here, so .TMP is no good. */

1 0

Aric Stewart : imm32: ImmDestroyContext cannot destroy the default context.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: bb52d30111ba5b4c7e646874945a4ec333b8fec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb52d30111ba5b4c7e6468749… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 8 13:26:05 2008 -0500 imm32: ImmDestroyContext cannot destroy the default context. --- dlls/imm32/imm.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 0995fb6..1ffe559 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -109,6 +109,8 @@ static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I',' #define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) #define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) +static BOOL IMM_DestroyContext(HIMC hIMC); + static inline WCHAR *strdupAtoW( const char *str ) { WCHAR *ret = NULL; @@ -150,7 +152,7 @@ static void IMM_InitThreadData(void) static void IMM_FreeThreadData(void) { IMMThreadData* data = TlsGetValue(tlsIndex); - ImmDestroyContext(data->defaultContext); + IMM_DestroyContext(data->defaultContext); DestroyWindow(data->hwndDefault); HeapFree(GetProcessHeap(),0,data); TRACE("Thread Data Destroyed\n"); @@ -510,7 +512,7 @@ HIMC WINAPI ImmCreateContext(void) if (!new_context->immKbd->pImeSelect(new_context, TRUE)) { TRACE("Selection of IME failed\n"); - ImmDestroyContext(new_context); + IMM_DestroyContext(new_context); return 0; } @@ -520,10 +522,7 @@ HIMC WINAPI ImmCreateContext(void) return (HIMC)new_context; } -/*********************************************************************** - * ImmDestroyContext (IMM32.@) - */ -BOOL WINAPI ImmDestroyContext(HIMC hIMC) +static BOOL IMM_DestroyContext(HIMC hIMC) { InputContextData *data = (InputContextData*)hIMC; @@ -550,6 +549,17 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) } /*********************************************************************** + * ImmDestroyContext (IMM32.@) + */ +BOOL WINAPI ImmDestroyContext(HIMC hIMC) +{ + if (hIMC != IMM_GetThreadData()->defaultContext) + return IMM_DestroyContext(hIMC); + else + return FALSE; +} + +/*********************************************************************** * ImmDisableIME (IMM32.@) */ BOOL WINAPI ImmDisableIME(DWORD idThread)

1 0

Andrew Talbot : advapi32: Array parameters are passed to function as pointers so lose size information .
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 5c8473ba780cf26494bfcddce5e2364a20aabc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8473ba780cf26494bfcddce… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 8 13:44:01 2008 +0100 advapi32: Array parameters are passed to function as pointers so lose size information. --- dlls/advapi32/cred.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index ab988da..44de697 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -82,7 +82,7 @@ static DWORD read_credential_blob(HKEY hkey, const BYTE key_data[KEY_SIZE], else if (type != REG_BINARY) return ERROR_REGISTRY_CORRUPT; - key.Length = key.MaximumLength = sizeof(key_data); + key.Length = key.MaximumLength = KEY_SIZE; key.Buffer = (unsigned char *)key_data; data.Length = data.MaximumLength = *credential_blob_size; @@ -442,7 +442,7 @@ static DWORD write_credential_blob(HKEY hkey, LPCWSTR target_name, DWORD type, struct ustring key; DWORD ret; - key.Length = key.MaximumLength = sizeof(key_data); + key.Length = key.MaximumLength = KEY_SIZE; key.Buffer = (unsigned char *)key_data; encrypted_credential_blob = HeapAlloc(GetProcessHeap(), 0, credential_blob_size);

1 0

Erik de Castro Lopo : msvcrt: Clear end-of-file flag on fseek.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 60501aa93e506e8a36504d6cf325f480c619577f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60501aa93e506e8a36504d6cf… Author: Erik de Castro Lopo <mle+win(a)mega-nerd.com> Date: Tue Apr 8 21:53:53 2008 +1000 msvcrt: Clear end-of-file flag on fseek. --- dlls/msvcrt/file.c | 2 ++ dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0c1e84b..866d28d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -918,6 +918,8 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, long offset, int whence) if(file->_flag & MSVCRT__IORW) { file->_flag &= ~(MSVCRT__IOREAD|MSVCRT__IOWRT); } + /* Clear end of file flag */ + file->_flag &= ~MSVCRT__IOEOF; return (_lseek(file->_file,offset,whence) == -1)?-1:0; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index d406ae5..aa58a32 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -241,7 +241,7 @@ static void test_readmode( BOOL ascii_mode ) ok(fread(buffer,1,1,file)==0,"fread failure in %s\n", IOMODE); ok(feof(file)!=0,"feof failure in %s\n", IOMODE); ok(fseek(file,-3,SEEK_CUR)==0,"seek failure in %s\n", IOMODE); - todo_wine ok(feof(file)==0,"feof failure in %s\n", IOMODE); + ok(feof(file)==0,"feof failure in %s\n", IOMODE); ok(fread(buffer,2,1,file)==1,"fread failed in %s\n", IOMODE); ok(feof(file)==0,"feof failure in %s\n", IOMODE); ok(fread(buffer,2,1,file)==0,"fread failure in %s\n",IOMODE);

1 0

Maarten Lankhorst : quartz: Make the pullpin forward the BeginFlush before doing its own flushing.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 994af69cac31bc53842ad13570bcce6797b89207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=994af69cac31bc53842ad1357… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 22:34:21 2008 -0700 quartz: Make the pullpin forward the BeginFlush before doing its own flushing. --- dlls/quartz/pin.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 8ec39be..7d54a51 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1595,6 +1595,12 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) PullPin *This = (PullPin *)iface; TRACE("(%p)->()\n", iface); + EnterCriticalSection(This->pin.pCritSec); + { + SendFurther( iface, deliver_beginflush, NULL, NULL ); + } + LeaveCriticalSection(This->pin.pCritSec); + EnterCriticalSection(&This->thread_lock); { if (This->state == State_Running) @@ -1607,8 +1613,6 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) EnterCriticalSection(This->pin.pCritSec); { This->fnCleanProc(This->pin.pUserData); - - SendFurther( iface, deliver_beginflush, NULL, NULL ); } LeaveCriticalSection(This->pin.pCritSec);

1 0

Maarten Lankhorst : quartz: Don't free a null media type in the file source .
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 4763e83b60528a8564332d3ba18c51d3e4509f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4763e83b60528a8564332d3ba… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 22:31:15 2008 -0700 quartz: Don't free a null media type in the file source. --- dlls/quartz/filesource.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index fd977f9..b2d6838 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -96,6 +96,7 @@ static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GU size = sizeof(keying); if (!l) l = RegQueryValueExW(hsub, subtype_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) CLSIDFromString(keying, minorType); @@ -433,7 +434,8 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) DeleteCriticalSection(&This->csFilter); This->lpVtbl = NULL; CoTaskMemFree(This->pszFileName); - FreeMediaType(This->pmt); + if (This->pmt) + FreeMediaType(This->pmt); CoTaskMemFree(This); return 0; } @@ -681,7 +683,8 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi } CoTaskMemFree(This->pszFileName); - FreeMediaType(This->pmt); + if (This->pmt) + FreeMediaType(This->pmt); This->pszFileName = NULL; This->pmt = NULL;

1 0

Maarten Lankhorst : quartz: Make the DirectSound renderer return S_FALSE packet if in the paused state .
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: de117c1eb54488f839a790d5901ae34c3063dfd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de117c1eb54488f839a790d59… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 22:30:30 2008 -0700 quartz: Make the DirectSound renderer return S_FALSE packet if in the paused state. --- dlls/quartz/dsoundrender.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index e65ae12..290e02e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -231,6 +231,9 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); + if (This->state == State_Paused) + return S_FALSE; + if (This->state == State_Stopped) return VFW_E_WRONG_STATE; @@ -804,9 +807,9 @@ static HRESULT WINAPI DSoundRender_InputPin_BeginFlush(IPin * iface) DSoundRenderImpl *pFilter = (DSoundRenderImpl *)This->pin.pinInfo.pFilter; HRESULT hr; + TRACE("\n"); hr = InputPin_BeginFlush(iface); - FIXME("Requested flush\n"); EnterCriticalSection(This->pin.pCritSec); if (pFilter->dsbuffer) IDirectSoundBuffer_Stop(pFilter->dsbuffer);

1 0

Maarten Lankhorst : quartz: Drop packets in the transform filter if in the wrong state.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 8939a41563608585dbbfa0e76ce95237e93c3419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8939a41563608585dbbfa0e76… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 22:28:47 2008 -0700 quartz: Drop packets in the transform filter if in the wrong state. --- dlls/quartz/transform.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 85962d1..dbb84a7 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -54,6 +54,12 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); + if (This->state == State_Paused) + return S_FALSE; + + if (This->state == State_Stopped) + return VFW_E_WRONG_STATE; + return This->pFuncsTable->pfnProcessSampleData(This, pSample); }

1 0

Maarten Lankhorst : quartz: Try creating the file reader from the filter source first before falling back to the generic async file reader .
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 0117468754bdf53266b6ea752a44528abb744c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0117468754bdf53266b6ea752… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 22:28:15 2008 -0700 quartz: Try creating the file reader from the filter source first before falling back to the generic async file reader. --- dlls/quartz/filtergraph.c | 69 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1c0acc7..91b872d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -29,6 +29,8 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winreg.h" +#include "shlwapi.h" #include "dshow.h" #include "wine/debug.h" #include "quartz_private.h" @@ -1199,6 +1201,63 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, return hr; } +/* Some filters implement their own asynchronous reader (Theoretically they all should, try to load it first */ +static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) +{ + static const WCHAR wszReg[] = {'M','e','d','i','a',' ','T','y','p','e','\\','E','x','t','e','n','s','i','o','n','s',0}; + HRESULT hr = S_OK; + HKEY extkey; + LONG lRet; + + lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszReg, 0, KEY_READ, &extkey); + hr = HRESULT_FROM_WIN32(lRet); + + if (SUCCEEDED(hr)) + { + static const WCHAR filtersource[] = {'S','o','u','r','c','e',' ','F','i','l','t','e','r',0}; + WCHAR *ext = PathFindExtensionW(pszFileName); + WCHAR clsid_key[39]; + GUID clsid; + DWORD size = sizeof(clsid_key); + HKEY pathkey; + + if (!ext) + { + CloseHandle(extkey); + return E_FAIL; + } + + lRet = RegOpenKeyExW(extkey, ext, 0, KEY_READ, &pathkey); + hr = HRESULT_FROM_WIN32(lRet); + CloseHandle(extkey); + if (FAILED(hr)) + return hr; + + lRet = RegQueryValueExW(pathkey, filtersource, NULL, NULL, (LPBYTE)clsid_key, &size); + hr = HRESULT_FROM_WIN32(lRet); + CloseHandle(pathkey); + if (FAILED(hr)) + return hr; + + CLSIDFromString(clsid_key, &clsid); + + TRACE("CLSID: %s\n", debugstr_guid(&clsid)); + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)filter); + if (SUCCEEDED(hr)) + { + IFileSourceFilter *source = NULL; + hr = IBaseFilter_QueryInterface(*filter, &IID_IFileSourceFilter, (LPVOID*)&source); + if (SUCCEEDED(hr)) + IFileSourceFilter_Release(source); + else + IBaseFilter_Release(*filter); + } + } + if (FAILED(hr)) + *filter = NULL; + return hr; +} + static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR lpcwstrFileName, LPCWSTR lpcwstrFilterName, @@ -1212,8 +1271,11 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, TRACE("(%p/%p)->(%s, %s, %p)\n", This, iface, debugstr_w(lpcwstrFileName), debugstr_w(lpcwstrFilterName), ppFilter); - /* Instantiate a file source filter */ - hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader); + /* Try from file name first, then fall back to default asynchronous reader */ + hr = GetFileSourceFilter(lpcwstrFileName, &preader); + + if (FAILED(hr)) + hr = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&preader); if (FAILED(hr)) { ERR("Unable to create file source filter (%x)\n", hr); return hr; @@ -1238,12 +1300,13 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, ERR("Load (%x)\n", hr); goto error; } - + IFileSourceFilter_GetCurFile(pfile, &filename, &mt); if (FAILED(hr)) { ERR("GetCurFile (%x)\n", hr); goto error; } + TRACE("File %s\n", debugstr_w(filename)); TRACE("MajorType %s\n", debugstr_guid(&mt.majortype)); TRACE("SubType %s\n", debugstr_guid(&mt.subtype));

1 0

Maarten Lankhorst : quartz: Make mpeg splitter keep track of play position and keep last sample if sending was not successful .
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 4bc4457109075bd25ab8a5bd4dc8101636074f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc4457109075bd25ab8a5bd4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 16:11:36 2008 -0700 quartz: Make mpeg splitter keep track of play position and keep last sample if sending was not successful. This fixes data discontinuities that earlier occured after a stop/pause command or the downright rejection of a sample (S_FALSE). --- dlls/quartz/mpegsplit.c | 121 ++++++++++++++++++++++++----------------------- 1 files changed, 62 insertions(+), 59 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index fcd0a5c..a9632c3 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -136,7 +136,7 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) bitrate = tabsel_123[lsf][layer-1][bitrate_index] * 1000; if (!bitrate || layer != 3) { - ERR("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); + FIXME("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); return E_INVALIDARG; } @@ -189,6 +189,7 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen, IMed HRESULT hr = S_OK; DWORD dlen; LONGLONG time = This->position, sampleduration = 0; + DWORD extrasamples = 2; TRACE("Source length: %u, skip length: %u, remaining: %u\n", *flen, This->skipbytes, This->remaining_bytes); @@ -307,8 +308,11 @@ static HRESULT FillBuffer(MPEGSplitterImpl *This, BYTE** fbuf, DWORD *flen, IMed out_append: /* Optimize: Send multiple samples! */ - while (*flen >= 4) + while (extrasamples--) { + if (*flen < 4) + break; + if (FAILED(parse_header(*fbuf, &length, &sampleduration))) break; @@ -324,24 +328,19 @@ out_append: } TRACE("Media time: %u.%03u\n", (DWORD)(This->position/10000000), (DWORD)((This->position/10000)%1000)); - IMediaSample_AddRef(pCurrentSample); - LeaveCriticalSection(&This->Parser.csFilter); - hr = OutputPin_SendSample(&pOutputPin->pin, pCurrentSample); - EnterCriticalSection(&This->Parser.csFilter); - IMediaSample_Release(pCurrentSample); - - if (FAILED(hr)) + if (hr != S_OK) { - WARN("Error sending sample (%x)\n", hr); + if (hr != S_FALSE) + TRACE("Error sending sample (%x)\n", hr); + else + TRACE("S_FALSE (%d), holding\n", IMediaSample_GetActualDataLength(This->pCurrentSample)); return hr; } - if (This->pCurrentSample) - { - IMediaSample_Release(pCurrentSample); - This->pCurrentSample = NULL; - } + + IMediaSample_Release(pCurrentSample); + This->pCurrentSample = NULL; return hr; } @@ -367,7 +366,27 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) /* trace removed for performance reasons */ /* TRACE("(%p), %llu -> %llu\n", pSample, tStart, tStop); */ - EnterCriticalSection(&This->Parser.csFilter); + /* Try to get rid of current sample, if any */ + if (This->pCurrentSample && !This->skipbytes && !This->remaining_bytes && IMediaSample_GetActualDataLength(This->pCurrentSample) > 4) + { + Parser_OutputPin * pOutputPin = (Parser_OutputPin*)This->Parser.ppPins[1]; + IMediaSample *pCurrentSample = This->pCurrentSample; + HRESULT hr; + + /* Unset advancement */ + This->Parser.pInputPin->rtCurrent -= MEDIATIME_FROM_BYTES(cbSrcStream); + + hr = OutputPin_SendSample(&pOutputPin->pin, pCurrentSample); + + if (hr != S_OK) + return hr; + + IMediaSample_Release(This->pCurrentSample); + This->pCurrentSample = NULL; + + This->Parser.pInputPin->rtCurrent += MEDIATIME_FROM_BYTES(cbSrcStream); + } + /* Now, try to find a new header */ while (cbSrcStream > 0) { @@ -375,7 +394,7 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) { if (FAILED(hr = OutputPin_GetDeliveryBuffer(&pOutputPin->pin, &This->pCurrentSample, NULL, NULL, 0))) { - FIXME("Failed with hres: %08x!\n", hr); + TRACE("Failed with hres: %08x!\n", hr); break; } @@ -387,14 +406,17 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample) This->seek = FALSE; } hr = FillBuffer(This, &pbSrcStream, &cbSrcStream, This->pCurrentSample); - if (SUCCEEDED(hr) && hr != S_FALSE) + if (hr == S_OK) continue; + /* We still have our sample! Do damage control and send it next round */ fail: if (hr != S_FALSE) - FIXME("Failed with hres: %08x!\n", hr); + WARN("Failed with hres: %08x!\n", hr); This->skipbytes += This->remaining_bytes; This->remaining_bytes = 0; + + This->Parser.pInputPin->rtCurrent = MEDIATIME_FROM_BYTES(BYTES_FROM_MEDIATIME(tStop) - cbSrcStream); if (This->pCurrentSample) { IMediaSample_SetActualDataLength(This->pCurrentSample, 0); @@ -410,20 +432,9 @@ fail: TRACE("End of file reached\n"); - if (This->pCurrentSample) - { - /* Drop last data, it's likely to be garbage anyway */ - IMediaSample_SetActualDataLength(This->pCurrentSample, 0); - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; - } - for (i = 0; i < This->Parser.cStreams; i++) { IPin* ppin; - HRESULT hr; - - TRACE("Send End Of Stream to output pin %d\n", i); hr = IPin_ConnectedTo(This->Parser.ppPins[i+1], &ppin); if (SUCCEEDED(hr)) @@ -439,7 +450,6 @@ fail: hr = S_FALSE; } - LeaveCriticalSection(&This->Parser.csFilter); return hr; } @@ -636,7 +646,8 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) if (FAILED(hr)) return hr; pos -= 4; - This->header_bytes = This->skipbytes = pos; + This->header_bytes = pos; + This->skipbytes = 0; switch(streamtype) { @@ -673,6 +684,8 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) break; if (!strncmp((char*)header+4, "TAG", 3)) This->EndOfFile -= 128; + This->Parser.pInputPin->rtStop = MEDIATIME_FROM_BYTES(This->EndOfFile); + This->Parser.pInputPin->rtStart = This->Parser.pInputPin->rtCurrent = MEDIATIME_FROM_BYTES(This->header_bytes); /* http://mpgedit.org/mpgedit/mpeg_format/mpeghdr.htm has a whole readup on audio headers */ while (pos + 3 < This->EndOfFile) @@ -720,20 +733,13 @@ static HRESULT MPEGSplitter_cleanup(LPVOID iface) { MPEGSplitterImpl *This = (MPEGSplitterImpl*)iface; - TRACE("(%p)->()\n", This); + TRACE("(%p) Deleting sample\n", This); if (This->pCurrentSample) IMediaSample_Release(This->pCurrentSample); This->pCurrentSample = NULL; - if (This->Parser.pInputPin && !This->seek) - { - This->skipbytes += This->remaining_bytes; - This->Parser.pInputPin->rtCurrent += MEDIATIME_FROM_BYTES(This->skipbytes); - } - if (!This->seek) - This->skipbytes = This->remaining_bytes = 0; - + This->remaining_bytes = This->skipbytes = 0; return S_OK; } @@ -754,18 +760,17 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface) if (newpos > This->duration) { - FIXME("Requesting position %x%08x beyond end of stream %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->duration>>32), (DWORD)This->duration); + WARN("Requesting position %x%08x beyond end of stream %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->duration>>32), (DWORD)This->duration); return E_INVALIDARG; } if (This->position/1000000 == newpos/1000000) { - FIXME("Requesting position %x%08x same as current position %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->position>>32), (DWORD)This->position); + TRACE("Requesting position %x%08x same as current position %x%08x\n", (DWORD)(newpos>>32), (DWORD)newpos, (DWORD)(This->position>>32), (DWORD)This->position); return S_OK; } hr = IAsyncReader_SyncRead(pPin->pReader, bytepos, 4, header); - while (bytepos < This->EndOfFile && SUCCEEDED(hr)) { LONGLONG length = 0; @@ -783,35 +788,33 @@ static HRESULT MPEGSplitter_seek(IBaseFilter *iface) if (timepos >= newpos) break; } + if (SUCCEEDED(hr)) { - FILTER_STATE state; PullPin *pin = This->Parser.pInputPin; + IPin *victim = NULL; - TRACE("Moving sound to %x%08x bytes!\n", (DWORD)(bytepos>>32), (DWORD)bytepos); + TRACE("Moving sound to %08u bytes!\n", (DWORD)bytepos); IPin_BeginFlush((IPin *)pin); - IPin_NewSegment((IPin*)pin, newpos, This->duration, pin->dRate); - IPin_EndFlush((IPin *)pin); - /* Make sure this is done while stopped */ + /* Make sure this is done while stopped, BeginFlush takes care of this */ EnterCriticalSection(&This->Parser.csFilter); + IPin_ConnectedTo(This->Parser.ppPins[1], &victim); + if (victim) + { + IPin_NewSegment(victim, newpos, This->duration, pin->dRate); + IPin_Release(victim); + } + pin->rtStart = pin->rtCurrent = MEDIATIME_FROM_BYTES(bytepos); pin->rtStop = MEDIATIME_FROM_BYTES((REFERENCE_TIME)This->EndOfFile); This->seek = TRUE; - This->skipbytes = This->remaining_bytes = 0; This->position = newpos; - if (This->pCurrentSample) - { - IMediaSample_Release(This->pCurrentSample); - This->pCurrentSample = NULL; - } - state = This->Parser.state; LeaveCriticalSection(&This->Parser.csFilter); - if (state == State_Running && pin->state == State_Paused) - PullPin_StartProcessing(pin); - + TRACE("Done flushing\n"); + IPin_EndFlush((IPin *)pin); } return hr; }

1 0

Alexandre Julliard : explorer: Implement a global system tray window.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 698805d8c5a65311900c5f387618fd66572f69d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=698805d8c5a65311900c5f387… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 15:56:24 2008 +0200 explorer: Implement a global system tray window. --- programs/explorer/systray.c | 433 +++++++++++++++++++++++-------------------- 1 files changed, 229 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=698805d8c5a65311900c5…

1 0

Alexandre Julliard : winex11: Add a timer to detect when a systray owner has been destroyed.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 49f467c339497cdf1d81d30b99263f9adcebe15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f467c339497cdf1d81d30b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 15:56:09 2008 +0200 winex11: Add a timer to detect when a systray owner has been destroyed. --- dlls/winex11.drv/systray.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 6b967ff..347e5a7 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -185,6 +185,10 @@ static LRESULT WINAPI tray_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp } break; + case WM_TIMER: + if (!IsWindow( icon->owner )) delete_icon( icon ); + return 0; + default: return DefWindowProcW(hwnd, msg, wparam, lparam); } @@ -323,6 +327,7 @@ static BOOL show_icon( struct tray_icon *icon ) NULL, NULL, NULL, icon ); create_tooltip( icon ); dock_systray_window( icon->window, systray_window ); + SetTimer( icon->window, 1, 1000, NULL ); ShowWindow( icon->window, SW_SHOWNA ); icon->hidden = FALSE; return TRUE;

1 0

Alexandre Julliard : winex11: Make the system tray window transparent.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 498a7628c95a80896c46c57562f6fb2b6dbeb80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=498a7628c95a80896c46c5756… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 15:51:22 2008 +0200 winex11: Make the system tray window transparent. --- dlls/winex11.drv/systray.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 9deb003..6b967ff 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -223,6 +223,7 @@ static void dock_systray_window( HWND hwnd, Window systray_window ) Display *display = thread_display(); struct x11drv_win_data *data; XEvent ev; + XSetWindowAttributes attr; unsigned long info[2]; if (!(data = X11DRV_get_win_data( hwnd )) && @@ -252,6 +253,10 @@ static void dock_systray_window( HWND hwnd, Window systray_window ) ev.xclient.data.l[3] = 0; ev.xclient.data.l[4] = 0; XSendEvent( display, systray_window, False, NoEventMask, &ev ); + attr.background_pixmap = ParentRelative; + attr.bit_gravity = ForgetGravity; + XChangeWindowAttributes( display, data->whole_window, CWBackPixmap | CWBitGravity, &attr ); + XChangeWindowAttributes( display, data->client_window, CWBackPixmap | CWBitGravity, &attr ); wine_tsx11_unlock(); data->mapped = TRUE; @@ -295,7 +300,6 @@ static BOOL show_icon( struct tray_icon *icon ) class.lpfnWndProc = tray_wndproc; class.hCursor = LoadCursorW( 0, (LPCWSTR)IDC_ARROW ); class.lpszClassName = tray_classname; - class.hbrBackground = (HBRUSH)COLOR_WINDOW; class.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; if (!RegisterClassExW(&class) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) @@ -344,7 +348,10 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) icon->image = CopyIcon(nid->hIcon); if (!icon->hidden) - RedrawWindow(icon->window, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_UPDATENOW); + { + struct x11drv_win_data *data = X11DRV_get_win_data( icon->window ); + if (data) XClearArea( gdi_display, data->client_window, 0, 0, 0, 0, True ); + } } if (nid->uFlags & NIF_MESSAGE)

1 0

Alexandre Julliard : winex11: Move all the embedded systray window support to winex11.drv.
by Alexandre Julliard 09 Apr '08

09 Apr '08

Module: wine Branch: master Commit: 52246fb92124620a7c57d897f44a78dfa92b6246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52246fb92124620a7c57d897f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 15:47:36 2008 +0200 winex11: Move all the embedded systray window support to winex11.drv. --- dlls/winex11.drv/Makefile.in | 2 + dlls/winex11.drv/systray.c | 439 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/window.c | 90 -------- dlls/winex11.drv/winex11.drv.spec | 2 +- dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/x11drv_main.c | 2 - programs/explorer/systray.c | 18 +- 7 files changed, 454 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52246fb92124620a7c57d…

1 0

Huw Davies : gdi32: Don' t overrun the current scanline while copying a glyph's bitmap.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: a643337c266c64bd55ec32bed74703409a629a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a643337c266c64bd55ec32bed… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 8 12:19:31 2008 +0100 gdi32: Don't overrun the current scanline while copying a glyph's bitmap. --- dlls/gdi32/freetype.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b00bc71..aeb9c7d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4384,7 +4384,12 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, INT x; while(h--) { for(x = 0; x < pitch; x++) - dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0; + { + if(x < ft_face->glyph->bitmap.width) + dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0; + else + dst[x] = 0; + } src += ft_face->glyph->bitmap.pitch; dst += pitch; }

1 0

Michael Stefaniuc : msacm32: Add the Romanian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: e7311f0aa455d0e1dfbde225dbfa0916443b56c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7311f0aa455d0e1dfbde225d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 8 00:09:26 2008 +0200 msacm32: Add the Romanian translation. --- dlls/msacm32/msacm.rc | 1 + dlls/msacm32/msacm_Ro.rc | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/msacm.rc b/dlls/msacm32/msacm.rc index 0fa0157..6e55fb1 100644 --- a/dlls/msacm32/msacm.rc +++ b/dlls/msacm32/msacm.rc @@ -36,6 +36,7 @@ #include "msacm_No.rc" #include "msacm_Pl.rc" #include "msacm_Pt.rc" +#include "msacm_Ro.rc" #include "msacm_Ru.rc" #include "msacm_Si.rc" #include "msacm_Sv.rc" diff --git a/dlls/msacm32/msacm_Ro.rc b/dlls/msacm32/msacm_Ro.rc new file mode 100644 index 0000000..d1cc0bb --- /dev/null +++ b/dlls/msacm32/msacm_Ro.rc @@ -0,0 +1,54 @@ +/* + * Copyright 2000 Eric Pouech + * Copyright 2008 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Sound Selection" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Nume:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Salvează ca", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Elimină", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Atribute:", -1, 5, 59, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Renunță", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Ajutor", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END + +#pragma code_page(default)

1 0

Alexander Dorofeyev : wined3d: Set isInDraw later in drawPrimitive.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 7c8b8e0a9319c53eb0602c0e5ab12da0b83b9ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8b8e0a9319c53eb0602c0e5… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Apr 8 00:42:39 2008 +0300 wined3d: Set isInDraw later in drawPrimitive. This should fix the problem that in LoadLocation SFLAG_INTEXTURE path gl calls can be made without activating context, due to isInDraw checks. --- dlls/wined3d/drawprim.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 37482fb..77b396a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -986,9 +986,6 @@ void drawPrimitive(IWineD3DDevice *iface, if (NumPrimitives == 0) return; - /* Signals other modules that a drawing is in progress and the stateblock finalized */ - This->isInDraw = TRUE; - /* Invalidate the back buffer memory so LockRect will read it the next time */ for(i = 0; i < GL_LIMITS(buffers); i++) { target = (IWineD3DSurfaceImpl *) This->render_targets[i]; @@ -1032,6 +1029,9 @@ void drawPrimitive(IWineD3DDevice *iface, } } + /* Signals other modules that a drawing is in progress and the stateblock finalized */ + This->isInDraw = TRUE; + /* Ok, we will be updating the screen from here onwards so grab the lock */ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) {

1 0

Michael Stefaniuc : notepad: Add the Romanian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 1ae1d452327fd9cff5cd69229727340c977db53e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae1d452327fd9cff5cd69229… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 8 00:11:20 2008 +0200 notepad: Add the Romanian translation. --- programs/notepad/Ro.rc | 117 ++++++++++++++++++++++++++++++++++++++++++++++ programs/notepad/rsrc.rc | 1 + 2 files changed, 118 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Ro.rc b/programs/notepad/Ro.rc new file mode 100644 index 0000000..2bb7651 --- /dev/null +++ b/programs/notepad/Ro.rc @@ -0,0 +1,117 @@ +/* + * Copyright 1997,98 Marcel Baur + * Copyright 2002 Sylvain Petreolle + * Copyright 2008 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +MAIN_MENU MENU +{ + POPUP "&Fișier" { + MENUITEM "&Nou\tCtrl+N", CMD_NEW + MENUITEM "&Deschide...\tCtrl+O", CMD_OPEN + MENUITEM "&Salvează\tCtrl+S", CMD_SAVE + MENUITEM "Salvează &ca...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Tipărește...\tCtrl+P", CMD_PRINT + MENUITEM "S&etare pagină...", CMD_PAGE_SETUP + MENUITEM "Setare im&primantă...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Ieșire", CMD_EXIT + } +POPUP "&Editează" { + MENUITEM "&Refă\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Taie\tCtrl+X", CMD_CUT + MENUITEM "&Copiază\tCtrl+C", CMD_COPY + MENUITEM "&Lipește\tCtrl+V", CMD_PASTE + MENUITEM "&Șterge\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "S&electeză tot\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Ora/data\tF5", CMD_TIME_DATE + MENUITEM SEPARATOR + MENUITEM "&Desparte liniile lungi", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + } +POPUP "&Caută" { + MENUITEM "&Caută...\tCtrl+F", CMD_SEARCH + MENUITEM "Caută &următorul\tF3", CMD_SEARCH_NEXT + } +POPUP "&Ajutor" { + MENUITEM "C&onținut", CMD_HELP_CONTENTS + MENUITEM "&Caută...", CMD_HELP_SEARCH + MENUITEM "&Ajutor la ajutor", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Despre notepad...", CMD_HELP_ABOUT_NOTEPAD + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Setare pagină" +{ +LTEXT "Colon&titlu:", 0x140, 10, 07, 40, 15 +EDITTEXT IDC_PAGESETUP_HEADERVALUE, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "&Coloncifru:", 0x142, 10, 24, 40, 15 +EDITTEXT IDC_PAGESETUP_FOOTERVALUE, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "&Margini (milimetri):", 0x144, 10, 43,160, 45 +LTEXT "&Stânga:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_LEFTVALUE, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "S&us:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_TOPVALUE, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Dreapta:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_RIGHTVALUE, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&Jos:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "Renunță", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&Ajutor", IDHELP, 180, 39, 40, 15, WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&f" +STRING_PAGESETUP_FOOTERVALUE, "Pagina &p" + +STRING_NOTEPAD, "Notepad" +STRING_ERROR, "EROARE" +STRING_WARNING, "ATENȚIE" +STRING_INFO, "Informație" + +STRING_UNTITLED, "(fără titlu)" + +STRING_ALL_FILES, "Toate fișierele (*.*)" +STRING_TEXT_FILES_TXT, "Toate fișierele text (*.txt)" + +STRING_TOOLARGE, "Fișierul '%s' este prea mare pentru notepad.\n Folosoți un alt editor." +STRING_NOTEXT, "Nu ați introdus nici un text.\nIntroduceți ceva și încercați din nou." +STRING_DOESNOTEXIST, "Fișierul '%s'\nnu există\n\n Vreți să creați un fișier nou?" +STRING_NOTSAVED, "Fișierul '%s'\na fost modificat\n\nVreți să salvați modificările?" +STRING_NOTFOUND, "'%s' nu a fost găsit." +STRING_OUT_OF_MEMORY, "Nu este destulă memorie pentru a completa această sarcină.\nÎnchideți una sau mai multe aplicații pentru a mări memoria liberă." + +} + +#pragma code_page(default) diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc index f737178..0275c03 100644 --- a/programs/notepad/rsrc.rc +++ b/programs/notepad/rsrc.rc @@ -64,6 +64,7 @@ IDI_NOTEPAD ICON "notepad.ico" #include "No.rc" #include "Pl.rc" #include "Pt.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Sk.rc"

1 0

Michael Stefaniuc : view: Add the Romanian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: c3529fab62fe394c54fbd08797eb5956e396990a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3529fab62fe394c54fbd0879… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 8 00:11:03 2008 +0200 view: Add the Romanian translation. --- programs/view/Ro.rc | 73 +++++++++++++++++++++++++++++++++++++++++++++++ programs/view/viewrc.rc | 1 + 2 files changed, 74 insertions(+), 0 deletions(-) diff --git a/programs/view/Ro.rc b/programs/view/Ro.rc new file mode 100644 index 0000000..b03fe31 --- /dev/null +++ b/programs/view/Ro.rc @@ -0,0 +1,73 @@ +/* + * Copyright 1998 Douglas Ridgway + * Copyright 2003 Marcelo Duarte + * Copyright 2008 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +/* + * + * Menu + * + */ + +VIEW MENU +BEGIN + POPUP "&Fișier" + BEGIN + MENUITEM "&Deschide", IDM_OPEN + MENUITEM "&Ieșire", IDM_EXIT + END + POPUP "&Plasare" + BEGIN + MENUITEM "&Scalează la fereastră", IDM_SET_EXT_TO_WIN + MENUITEM SEPARATOR + MENUITEM "&Stânga", IDM_LEFT + MENUITEM "D&reapta", IDM_RIGHT + MENUITEM "&Sus", IDM_UP + MENUITEM "&Jos", IDM_DOWN + END +END + + +/* + * + * Accelerator + * + */ + +VIEW ACCELERATORS +BEGIN + "Q", IDM_EXIT, VIRTKEY, CONTROL +END + + +/* + * + * String Table + * + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Vizualizator de fișiere metafile normale" +END + +#pragma code_page(default) diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc index 0473067..868b57f 100644 --- a/programs/view/viewrc.rc +++ b/programs/view/viewrc.rc @@ -32,6 +32,7 @@ #include "No.rc" #include "Pl.rc" #include "Pt.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Tr.rc"

1 0

Michael Stefaniuc : mpr: Add the Romanian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 08f5157ff38d8cbf741c8d4e1d3bc3d5ca0c5477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f5157ff38d8cbf741c8d4e1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 8 00:10:14 2008 +0200 mpr: Add the Romanian translation. --- dlls/mpr/mpr.rc | 1 + dlls/mpr/mpr_Ro.rc | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/mpr.rc b/dlls/mpr/mpr.rc index 2d209c7..306a1f6 100644 --- a/dlls/mpr/mpr.rc +++ b/dlls/mpr/mpr.rc @@ -39,6 +39,7 @@ #include "mpr_No.rc" #include "mpr_Pl.rc" #include "mpr_Pt.rc" +#include "mpr_Ro.rc" #include "mpr_Ru.rc" #include "mpr_Si.rc" #include "mpr_Sv.rc" diff --git a/dlls/mpr/mpr_Ro.rc b/dlls/mpr/mpr_Ro.rc new file mode 100644 index 0000000..ce06328 --- /dev/null +++ b/dlls/mpr/mpr_Ro.rc @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2008 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Toată rețeaua" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Introducere parolă de rețea" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Introduceți numele de utilizator și parola:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 + LTEXT "Utilizator", -1, 40, 66, 50, 10 + LTEXT "Parolă", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Salvează această parolă (nesigur)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Renunță", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +#pragma code_page(default)

1 0

Michael Stefaniuc : sane.ds: Add the Romanian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: f41fd59ddbdc878c1de287ede14067fdc5c6a143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41fd59ddbdc878c1de287ede… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 8 00:09:57 2008 +0200 sane.ds: Add the Romanian translation. --- dlls/sane.ds/rsrc.rc | 1 + dlls/sane.ds/sane_Ro.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc index 28a3d5c..d44c98b 100644 --- a/dlls/sane.ds/rsrc.rc +++ b/dlls/sane.ds/rsrc.rc @@ -34,6 +34,7 @@ #include "sane_Nl.rc" #include "sane_No.rc" #include "sane_Pl.rc" +#include "sane_Ro.rc" #include "sane_Ru.rc" #include "sane_Si.rc" #include "sane_Sv.rc" diff --git a/dlls/sane.ds/sane_Ro.rc b/dlls/sane.ds/sane_Ro.rc new file mode 100644 index 0000000..06fc8c5 --- /dev/null +++ b/dlls/sane.ds/sane_Ro.rc @@ -0,0 +1,43 @@ +/* + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2008 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Scanare" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "SCANEZ.... Așteptați",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "dpi" + 5 "%" + 6 "ns" +} + +#pragma code_page(default)

1 0

Michael Stefaniuc : localui: Add the Romanian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: fe662c7be6adb1487934d1a6bdc8238e35f1e6d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe662c7be6adb1487934d1a6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 8 00:09:41 2008 +0200 localui: Add the Romanian translation. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Ro.rc | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index d51101d..9b6c142 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -45,6 +45,7 @@ #include "ui_Nl.rc" #include "ui_No.rc" #include "ui_Pl.rc" +#include "ui_Ro.rc" #include "ui_Ru.rc" #include "ui_Si.rc" #include "ui_Sv.rc" diff --git a/dlls/localui/ui_Ro.rc b/dlls/localui/ui_Ro.rc new file mode 100644 index 0000000..43edfe6 --- /dev/null +++ b/dlls/localui/ui_Ro.rc @@ -0,0 +1,57 @@ +/* + * Copyright 2007 Detlef Riekenberg + * Copyright 2008 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Adaugă un port local" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nume port de adăugat:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Renunță", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Configurare port LPT" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Temporizare (secunde)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "Reîncearcă &transmisia:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Renunță", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Port local" + IDS_INVALIDNAME "'%s' nu este un nume valid de port" + IDS_PORTEXISTS "Portul %s existsă deja" + IDS_NOTHINGTOCONFIG "Acest port nu are opțiuni de configurat" +} + +#pragma code_page(default)

1 0

Austin English : msi: Spelling fixes.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 5644f05edf598ca4a51b5edbcf99ba8f4dff41c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5644f05edf598ca4a51b5edbc… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 7 14:44:23 2008 -0500 msi: Spelling fixes. --- dlls/msi/action.c | 6 +++--- dlls/msi/helpers.c | 4 ++-- dlls/msi/msi.c | 2 +- dlls/msi/tests/db.c | 2 +- dlls/msi/tests/format.c | 4 ++-- dlls/msi/tests/install.c | 2 +- dlls/msi/tests/package.c | 2 +- dlls/msi/tests/source.c | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 43ada4c..d7acc12 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2767,7 +2767,7 @@ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) } } - /* add a count for permenent */ + /* add a count for permanent */ if (comp->Attributes & msidbComponentAttributesPermanent) count ++; @@ -2826,7 +2826,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) comp->RefCount); /* * Write the keypath out if the component is to be registered - * and delete the key if the component is to be deregistered + * and delete the key if the component is to be unregistered */ if (ACTION_VerifyComponentForAction( comp, INSTALLSTATE_LOCAL)) { @@ -3101,7 +3101,7 @@ static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) buffer = MSI_RecordGetString(row,2); target_folder = resolve_folder(package, buffer,FALSE,FALSE,TRUE,NULL); - /* may be needed because of a bug somehwere else */ + /* may be needed because of a bug somewhere else */ create_full_pathW(target_folder); filename = msi_dup_record_field( row, 3 ); diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 90055a1..25c1c71 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -19,7 +19,7 @@ */ /* - * Here are helper functions formally in action.c that are used by a variaty of + * Here are helper functions formally in action.c that are used by a variety of * actions and functions. */ @@ -885,7 +885,7 @@ LPWSTR create_component_advertise_string(MSIPACKAGE* package, return output; } -/* update compoennt state based on a feature change */ +/* update component state based on a feature change */ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) { INSTALLSTATE newstate; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index adc4b68..97af66f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1066,7 +1066,7 @@ UINT WINAPI MsiGetProductInfoExW(LPCWSTR szProductCode, LPCWSTR szUserSid, if (!prod && !classes) goto done; - /* FIME */ + /* FIXME */ val = strdupW(empty); r = msi_copy_outval(val, szValue, pcchValue); } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index cd9abad..3a627c0 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2274,7 +2274,7 @@ static UINT set_summary_info(MSIHANDLE hdb) UINT res; MSIHANDLE suminfo; - /* build summmary info */ + /* build summary info */ res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo); ok( res == ERROR_SUCCESS , "Failed to open summaryinfo\n" ); diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index f4c1670..00d3856 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -205,7 +205,7 @@ static UINT set_summary_info(MSIHANDLE hdb) UINT res; MSIHANDLE suminfo; - /* build summmary info */ + /* build summary info */ res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo); ok( res == ERROR_SUCCESS , "Failed to open summaryinfo\n" ); @@ -318,7 +318,7 @@ static MSIHANDLE helper_createpackage( const char *szName ) res = MsiDatabaseCommit( hdb ); ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); - /* build summmary info */ + /* build summary info */ res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo); ok( res == ERROR_SUCCESS , "Failed to open summaryinfo\n" ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 7b1d92e..a85cdd4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3512,7 +3512,7 @@ static void set_transform_summary_info(void) UINT r; MSIHANDLE suminfo = 0; - /* build summmary info */ + /* build summary info */ r = MsiGetSummaryInformation(0, mstfile, 3, &suminfo); todo_wine { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 232b75e..5178384 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -532,7 +532,7 @@ static UINT set_summary_info(MSIHANDLE hdb) UINT res; MSIHANDLE suminfo; - /* build summmary info */ + /* build summary info */ res = MsiGetSummaryInformation(hdb, NULL, 7, &suminfo); ok( res == ERROR_SUCCESS , "Failed to open summaryinfo\n" ); diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index aef15ba..4d2cbbd 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -2161,7 +2161,7 @@ static void test_MsiSourceListAddMediaDisk(void) ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - /* update dwDiskId 1, szVolumeLable is NULL */ + /* update dwDiskId 1, szVolumeLabel is NULL */ r = pMsiSourceListAddMediaDiskA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, NULL, "provocar"); @@ -2172,7 +2172,7 @@ static void test_MsiSourceListAddMediaDisk(void) CHECK_REG_STR(media, "1", ";provocar"); CHECK_REG_STR(media, "42", "label42;prompt42"); - /* update dwDiskId 1, szVolumeLable is empty */ + /* update dwDiskId 1, szVolumeLabel is empty */ r = pMsiSourceListAddMediaDiskA(prodcode, usersid, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, 1, "", "provoquer");

1 0

Alexandre Julliard : winex11: Improved handling of broken 8-bit TARGETS selection.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 828ac88f24e96537a28bf30f055cfef264268a87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828ac88f24e96537a28bf30f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 12:24:54 2008 +0200 winex11: Improved handling of broken 8-bit TARGETS selection. --- dlls/winex11.drv/clipboard.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 2404a71..cdf54c1 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1902,8 +1902,22 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(LPCLIPBOARDINFO lpcbinfo) * The TARGETS property should have returned us a list of atoms * corresponding to each selection target format supported. */ - if (aformat == 32 && (atype == XA_ATOM || atype == x11drv_atom(TARGETS))) - X11DRV_CLIPBOARD_InsertSelectionProperties(display, targetList, cSelectionTargets); + if (atype == XA_ATOM || atype == x11drv_atom(TARGETS)) + { + if (aformat == 32) + { + X11DRV_CLIPBOARD_InsertSelectionProperties(display, targetList, cSelectionTargets); + } + else if (aformat == 8) /* work around quartz-wm brain damage */ + { + unsigned long i, count = cSelectionTargets / sizeof(CARD32); + Atom *atoms = HeapAlloc( GetProcessHeap(), 0, count * sizeof(Atom) ); + for (i = 0; i < count; i++) + atoms[i] = ((CARD32 *)targetList)[i]; /* FIXME: byte swapping */ + X11DRV_CLIPBOARD_InsertSelectionProperties( display, atoms, count ); + HeapFree( GetProcessHeap(), 0, atoms ); + } + } /* Free the list of targets */ wine_tsx11_lock();

1 0

Detlef Riekenberg : ntoskrnl.exe: Implement KeQueryInterruptTime.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 28553fa8a79fe1dbc0c2cc15a1672d88bb7d1e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28553fa8a79fe1dbc0c2cc15a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 7 21:15:46 2008 +0200 ntoskrnl.exe: Implement KeQueryInterruptTime. --- dlls/ntoskrnl.exe/ntoskrnl.c | 15 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cd155f7..cf1603a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -529,6 +529,21 @@ KAFFINITY WINAPI KeQueryActiveProcessors( void ) } +/********************************************************************** + * KeQueryInterruptTime (NTOSKRNL.EXE.@) + * + * Return the interrupt time count + * + */ +ULONGLONG WINAPI KeQueryInterruptTime( void ) +{ + LARGE_INTEGER totaltime; + + KeQueryTickCount(&totaltime); + return totaltime.QuadPart; +} + + /*********************************************************************** * KeQuerySystemTime (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dbab0fa..3aef928 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -570,7 +570,7 @@ @ stub KeProfileInterruptWithSource @ stub KePulseEvent @ stdcall KeQueryActiveProcessors() -@ stub KeQueryInterruptTime +@ stdcall KeQueryInterruptTime() @ stub KeQueryPriorityThread @ stub KeQueryRuntimeThread @ stdcall KeQuerySystemTime(ptr)

1 0

Detlef Riekenberg : ntoskrnl.exe: Implement KeQueryActiveProcessors.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: ee4a99696317320727f3cad4b42b804930d18159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee4a99696317320727f3cad4b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 7 21:10:12 2008 +0200 ntoskrnl.exe: Implement KeQueryActiveProcessors. --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6a3c9f3..cd155f7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -511,6 +511,24 @@ void WINAPI KeInitializeTimer( PKTIMER Timer ) } +/********************************************************************** + * KeQueryActiveProcessors (NTOSKRNL.EXE.@) + * + * Return the active Processors as bitmask + * + * RETURNS + * active Processors as bitmask + * + */ +KAFFINITY WINAPI KeQueryActiveProcessors( void ) +{ + DWORD_PTR AffinityMask; + + GetProcessAffinityMask( GetCurrentProcess(), &AffinityMask, NULL); + return AffinityMask; +} + + /*********************************************************************** * KeQuerySystemTime (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 461bf28..dbab0fa 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -569,7 +569,7 @@ @ stub KeProfileInterrupt @ stub KeProfileInterruptWithSource @ stub KePulseEvent -@ stub KeQueryActiveProcessors +@ stdcall KeQueryActiveProcessors() @ stub KeQueryInterruptTime @ stub KeQueryPriorityThread @ stub KeQueryRuntimeThread

1 0

Maarten Lankhorst : quartz: Fix deadlocks in pullpin.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: f4d9c09dd44d9ba32434787cee5f3a44fa54a899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d9c09dd44d9ba32434787ce… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 15:45:51 2008 -0700 quartz: Fix deadlocks in pullpin. --- dlls/quartz/parser.c | 73 +++++++++++++++++++++---------------------------- dlls/quartz/pin.c | 57 ++++++++++++++++++++++++++++++-------- dlls/quartz/pin.h | 15 +++++++--- 3 files changed, 87 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4d9c09dd44d9ba324347…

1 0

Maarten Lankhorst : quartz: Make wait timeout in directsound slightly larger.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: d1aa222e85938424bf85b95f395df5a13877b644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1aa222e85938424bf85b95f3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 15:44:51 2008 -0700 quartz: Make wait timeout in directsound slightly larger. --- dlls/quartz/dsoundrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 0cfd163..e65ae12 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -188,7 +188,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, const BYTE *d /* Wait for enough of the buffer to empty before filling it */ if(buf_free < This->buf_size/4) { - Sleep(10); + Sleep(50); continue; }

1 0

Alexandre Julliard : user32: Get rid of the debug mark option in the system menu.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 806d08c206c36f1e35dd68b114bf8caf256cd2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806d08c206c36f1e35dd68b11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 12:20:04 2008 +0200 user32: Get rid of the debug mark option in the system menu. --- dlls/user32/nonclient.c | 4 ---- dlls/user32/resources/user32_Bg.rc | 2 -- dlls/user32/resources/user32_Ca.rc | 2 -- dlls/user32/resources/user32_Da.rc | 2 -- dlls/user32/resources/user32_De.rc | 2 -- dlls/user32/resources/user32_En.rc | 2 -- dlls/user32/resources/user32_Eo.rc | 1 - dlls/user32/resources/user32_Es.rc | 2 -- dlls/user32/resources/user32_Fi.rc | 2 -- dlls/user32/resources/user32_Fr.rc | 2 -- dlls/user32/resources/user32_Hu.rc | 2 -- dlls/user32/resources/user32_It.rc | 2 -- dlls/user32/resources/user32_Ja.rc | 1 - dlls/user32/resources/user32_Ko.rc | 2 -- dlls/user32/resources/user32_Nl.rc | 2 -- dlls/user32/resources/user32_No.rc | 2 -- dlls/user32/resources/user32_Pl.rc | 2 -- dlls/user32/resources/user32_Pt.rc | 4 ---- dlls/user32/resources/user32_Ro.rc | 2 -- dlls/user32/resources/user32_Ru.rc | 2 -- dlls/user32/resources/user32_Si.rc | 2 -- dlls/user32/resources/user32_Sk.rc | 2 -- dlls/user32/resources/user32_Tr.rc | 2 -- dlls/user32/resources/user32_Uk.rc | 2 -- dlls/user32/resources/user32_Wa.rc | 2 -- 25 files changed, 0 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=806d08c206c36f1e35dd6…

1 0

Alexandre Julliard : libwine: Added mappings for codepage 1361 ( Korean Johab).
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 5fe73e6903c9ef4db2f6a90813396b174f6d5b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe73e6903c9ef4db2f6a9081… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 8 12:19:27 2008 +0200 libwine: Added mappings for codepage 1361 (Korean Johab). --- libs/wine/Makefile.in | 1 + libs/wine/c_1361.c | 8872 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cpmap.pl | 12 +- libs/wine/cptable.c | 4 +- 4 files changed, 8885 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fe73e6903c9ef4db2f6a…

1 0

Lei Zhang : user32: Handle VK_ESCAPE correctly in EDIT_WM_KeyDown.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 6736ed82ed5cb416771390c5c1bee7781e95b61c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6736ed82ed5cb416771390c5c… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:18:34 2008 -0700 user32: Handle VK_ESCAPE correctly in EDIT_WM_KeyDown. --- dlls/user32/edit.c | 4 ++++ dlls/user32/tests/edit.c | 17 ++++------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f359555..2159ab7 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4610,6 +4610,10 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); } break; + case VK_ESCAPE: + if (!(es->style & ES_MULTILINE)) + SendMessageW(GetParent(es->hwndSelf), WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( GetParent(es->hwndSelf), IDCANCEL ) ); + break; } return 0; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9542714..058d9fe 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -300,8 +300,6 @@ static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM break; case 1: PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); - /* needed so the test does not wait for user input */ - PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); break; case 2: PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); @@ -330,8 +328,6 @@ static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM case 7: PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); - /* needed so the test does not wait for user input */ - PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); break; case 8: PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); @@ -371,11 +367,6 @@ static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM HWND hfocus = GetFocus(); int len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); - if (wparam == 0xfeedbeef) - { - EndDialog(hdlg, 66); - break; - } if (wparam != 0xdeadbeef) break; @@ -1872,7 +1863,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); @@ -1888,7 +1879,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); @@ -1896,7 +1887,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); @@ -1912,7 +1903,7 @@ static void test_singleline_wantreturn_edit_dialog(void) /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); - todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8);

1 0

Lei Zhang : user32: Handle ES_MULTILINE correctly for WM_KEYDOWN/VK_RETURN.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 7f10fe07443a7eadb2b491981e69b1cbca9b5808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f10fe07443a7eadb2b491981… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:13:04 2008 -0700 user32: Handle ES_MULTILINE correctly for WM_KEYDOWN/VK_RETURN. --- dlls/user32/edit.c | 2 +- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 8afc87a..f359555 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4596,7 +4596,7 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) break; case VK_RETURN: /* If the edit doesn't want the return send a message to the default object */ - if(!(es->style & ES_WANTRETURN)) + if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) { HWND hwndParent = GetParent(es->hwndSelf); DWORD dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 396f74d..9542714 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1898,7 +1898,7 @@ static void test_singleline_wantreturn_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); - todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); ok(444 == r, "Expected %d, got %d\n", 444, r); @@ -1914,7 +1914,7 @@ static void test_singleline_wantreturn_edit_dialog(void) r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); - todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); }

1 0

Lei Zhang : user32: Fix WM_CHAR return value for edit controls.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: c8a4bb8fff225aa74d9a2c115cde7f2c4d31c5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a4bb8fff225aa74d9a2c115… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:11:58 2008 -0700 user32: Fix WM_CHAR return value for edit controls. --- dlls/user32/edit.c | 9 +++++---- dlls/user32/tests/edit.c | 25 ++++++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e6d2530..8afc87a 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -257,7 +257,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es); /* * WM_XXX message handlers */ -static void EDIT_WM_Char(EDITSTATE *es, WCHAR c); +static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c); static void EDIT_WM_Command(EDITSTATE *es, INT code, INT id, HWND conrtol); static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y); static void EDIT_WM_Copy(EDITSTATE *es); @@ -834,7 +834,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, strng[1] = wParam & 0xff; if (strng[0]) MultiByteToWideChar(CP_ACP, 0, strng, 2, &charW, 1); else MultiByteToWideChar(CP_ACP, 0, &strng[1], 1, &charW, 1); - EDIT_WM_Char(es, charW); + result = EDIT_WM_Char(es, charW); break; } /* fall through */ @@ -866,7 +866,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, if (charW == VK_TAB || charW == VK_RETURN) break; } - EDIT_WM_Char(es, charW); + result = EDIT_WM_Char(es, charW); break; } @@ -3994,7 +3994,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) * WM_CHAR * */ -static void EDIT_WM_Char(EDITSTATE *es, WCHAR c) +static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) { BOOL control; @@ -4065,6 +4065,7 @@ static void EDIT_WM_Char(EDITSTATE *es, WCHAR c) } break; } + return 1; } diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0eafc80..396f74d 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -731,6 +731,7 @@ static void test_edit_control_2(void) { HWND hwndMain; char szLocalString[MAXLEN]; + LONG r; /* Create main and edit windows. */ hwndMain = CreateWindow(szEditTest2Class, "ET2", WS_OVERLAPPEDWINDOW, @@ -749,9 +750,12 @@ static void test_edit_control_2(void) trace("EDIT: SETTEXT atomicity\n"); /* Send messages to "type" in the word 'foo'. */ - SendMessage(hwndET2, WM_CHAR, 'f', 1); - SendMessage(hwndET2, WM_CHAR, 'o', 1); - SendMessage(hwndET2, WM_CHAR, 'o', 1); + r = SendMessage(hwndET2, WM_CHAR, 'f', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwndET2, WM_CHAR, 'o', 1); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* 'foo' should have been changed to 'bar' by the UPDATE handler. */ GetWindowText(hwndET2, szLocalString, MAXLEN); ok(lstrcmp(szLocalString, "bar")==0, @@ -1553,7 +1557,8 @@ static void test_espassword(void) /* select all, cut (ctrl-x) */ SendMessage(hwEdit, EM_SETSEL, 0, -1); - SendMessage(hwEdit, WM_CHAR, 24, 0); + r = SendMessage(hwEdit, WM_CHAR, 24, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ r = SendMessage(hwEdit, WM_GETTEXT, 1024, (LPARAM) buffer); @@ -1569,8 +1574,10 @@ static void test_espassword(void) /* select all, copy (ctrl-c) and paste (ctrl-v) */ SendMessage(hwEdit, EM_SETSEL, 0, -1); - SendMessage(hwEdit, WM_CHAR, 3, 0); - SendMessage(hwEdit, WM_CHAR, 22, 0); + r = SendMessage(hwEdit, WM_CHAR, 3, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); + r = SendMessage(hwEdit, WM_CHAR, 22, 0); + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; @@ -1607,7 +1614,7 @@ static void test_undo(void) /* cut (ctrl-x) */ r = SendMessage(hwEdit, WM_CHAR, 24, 0); - todo_wine { ok(1 == r, "Expected: %d, got: %d\n", 1, r); } + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; @@ -1617,7 +1624,7 @@ static void test_undo(void) /* undo (ctrl-z) */ r = SendMessage(hwEdit, WM_CHAR, 26, 0); - todo_wine { ok(1 == r, "Expected: %d, got: %d\n", 1, r); } + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0; @@ -1627,7 +1634,7 @@ static void test_undo(void) /* undo again (ctrl-z) */ r = SendMessage(hwEdit, WM_CHAR, 26, 0); - todo_wine { ok(1 == r, "Expected: %d, got: %d\n", 1, r); } + ok(1 == r, "Expected: %d, got: %d\n", 1, r); /* get text */ buffer[0] = 0;

1 0

Lei Zhang : user32: Add tests for edit controls and VK_TAB.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 42d32aba0223dcf4a08b577a2b32f7f65cc3faaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d32aba0223dcf4a08b577a2… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:07:04 2008 -0700 user32: Add tests for edit controls and VK_TAB. --- dlls/user32/tests/edit.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 4ff294c..0eafc80 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1707,6 +1707,55 @@ static void test_enter(void) DestroyWindow (hwEdit); } +static void test_tab(void) +{ + HWND hwEdit; + LONG r; + char buffer[16]; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected 0x%x got: 0x%x\n", ES_MULTILINE, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_TAB, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + todo_wine { + ok(1 == r, "Expected: %d, got len %d\n", 1, r); + ok(0 == strcmp(buffer, "\t"), "expected \"\\t\", got \"%s\"\n", buffer); + } + + DestroyWindow (hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_TAB, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); +} + static void test_edit_dialog(void) { int r; @@ -1932,6 +1981,7 @@ START_TEST(edit) test_espassword(); test_undo(); test_enter(); + test_tab(); test_edit_dialog(); test_multi_edit_dialog(); test_wantreturn_edit_dialog();

1 0

Lei Zhang : user32: Add tests for edit controls and VK_RETURN.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: d1abf27f8d3057131cf0bbc01bbfff121fdcb9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1abf27f8d3057131cf0bbc01… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 14:01:00 2008 -0700 user32: Add tests for edit controls and VK_RETURN. --- dlls/user32/tests/edit.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9ca687b..4ff294c 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1638,6 +1638,75 @@ static void test_undo(void) DestroyWindow (hwEdit); } +static void test_enter(void) +{ + HWND hwEdit; + LONG r; + char buffer[16]; + + /* multiline */ + hwEdit = create_editcontrol(ES_MULTILINE, 0); + r = get_edit_style(hwEdit); + ok(ES_MULTILINE == r, "Wrong style expected 0x%x got: 0x%x\n", ES_MULTILINE, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + todo_wine { + ok(2 == r, "Expected: %d, got len %d\n", 2, r); + ok(0 == strcmp(buffer, "\r\n"), "expected \"\\r\\n\", got \"%s\"\n", buffer); + } + + DestroyWindow (hwEdit); + + /* single line */ + hwEdit = create_editcontrol(0, 0); + r = get_edit_style(hwEdit); + ok(0 == r, "Wrong style expected 0x%x got: 0x%x\n", 0, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); + + /* single line with ES_WANTRETURN */ + hwEdit = create_editcontrol(ES_WANTRETURN, 0); + r = get_edit_style(hwEdit); + ok(ES_WANTRETURN == r, "Wrong style expected 0x%x got: 0x%x\n", ES_WANTRETURN, r); + + /* set text */ + r = SendMessage(hwEdit , WM_SETTEXT, 0, (LPARAM) ""); + ok(TRUE == r, "Expected: %d, got: %d\n", TRUE, r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0); + todo_wine ok(1 == r, "Expected: %d, got: %d\n", 1, r); + + /* get text */ + buffer[0] = 0; + r = SendMessage(hwEdit, WM_GETTEXT, 16, (LPARAM) buffer); + ok(0 == r, "Expected: %d, got len %d\n", 0, r); + ok(0 == strcmp(buffer, ""), "expected \"\", got \"%s\"\n", buffer); + + DestroyWindow (hwEdit); +} + static void test_edit_dialog(void) { int r; @@ -1862,6 +1931,7 @@ START_TEST(edit) test_text_position(); test_espassword(); test_undo(); + test_enter(); test_edit_dialog(); test_multi_edit_dialog(); test_wantreturn_edit_dialog();

1 0

Lei Zhang : user32: Add more tests for single line edit control inside a dialog.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: e91de3952191b1a5775b00adb62d5ef320b3d01f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e91de3952191b1a5775b00adb… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 13:32:36 2008 -0700 user32: Add more tests for single line edit control inside a dialog. --- dlls/user32/tests/edit.c | 182 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 20 +++++ 2 files changed, 202 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index c226131..9ca687b 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -284,6 +284,134 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA return FALSE; } +static INT_PTR CALLBACK edit_singleline_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + /* needed so the test does not wait for user input */ + PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); + break; + case 2: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 5: + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + break; + case 7: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + /* needed so the test does not wait for user input */ + PostMessage(hdlg, WM_USER, 0xfeedbeef, 0); + break; + case 8: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam == 0xfeedbeef) + { + EndDialog(hdlg, 66); + break; + } + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + static INT_PTR CALLBACK edit_wantreturn_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -1613,6 +1741,59 @@ static void test_wantreturn_edit_dialog(void) ok(444 == r, "Expected %d, got %d\n", 444, r); } +static void test_singleline_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 0); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 1); + todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 6); + todo_wine ok(222 == r, "Expected %d, got %d\n", 222, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 7); + todo_wine ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_SINGLELINE_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_singleline_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1684,6 +1865,7 @@ START_TEST(edit) test_edit_dialog(); test_multi_edit_dialog(); test_wantreturn_edit_dialog(); + test_singleline_wantreturn_edit_dialog(); UnregisterWindowClasses(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 833797d..7da8a6c 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -118,6 +118,26 @@ FONT 8, "MS Shell Dlg" EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL } +EDIT_SINGLELINE_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL +} + +EDIT_SINGLELINE_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN +} + EDIT_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Test"

1 0

Lei Zhang : user32: Add more tests for ES_WANTRETURN.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 8cf7eef073955e825a675485234b7ef1d6f00cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf7eef073955e825a6754852… Author: Lei Zhang <thestig(a)google.com> Date: Mon Apr 7 13:32:20 2008 -0700 user32: Add more tests for ES_WANTRETURN. --- dlls/user32/tests/edit.c | 159 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 10 +++ 2 files changed, 169 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0e9487d..c226131 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -284,6 +284,135 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA return FALSE; } +static INT_PTR CALLBACK edit_wantreturn_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); + switch (lparam) + { + /* test cases for WM_KEYDOWN */ + case 0: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + break; + case 1: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 2: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + /* test cases for WM_CHAR */ + case 3: + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 5: + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 7: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 2); + break; + case 8: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + + default: + break; + } + break; + } + + case WM_COMMAND: + if (HIWORD(wparam) != BN_CLICKED) + break; + + switch (LOWORD(wparam)) + { + case IDOK: + EndDialog(hdlg, 111); + break; + + case IDCANCEL: + EndDialog(hdlg, 222); + break; + + default: + break; + } + break; + + case WM_USER: + { + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + HWND hfocus = GetFocus(); + int len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); + + if (wparam != 0xdeadbeef) + break; + + switch (lparam) + { + case 0: + if ((hfocus == hedit) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + if ((hfocus == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 2: + if ((hfocus == hedit) && len == 2) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 55); + } + break; + } + + case WM_CLOSE: + EndDialog(hdlg, 333); + break; + + default: + break; + } + + return FALSE; +} + static HINSTANCE hinst; static HWND hwndET2; static const char szEditTest2Class[] = "EditTest2Class"; @@ -1455,6 +1584,35 @@ static void test_multi_edit_dialog(void) ok(11 == r, "Expected %d, got %d\n", 11, r); } +static void test_wantreturn_edit_dialog(void) +{ + int r; + + /* tests for WM_KEYDOWN */ + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 1); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 4); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 6); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 7); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); +} + static BOOL RegisterWindowClasses (void) { WNDCLASSA test2; @@ -1525,6 +1683,7 @@ START_TEST(edit) test_undo(); test_edit_dialog(); test_multi_edit_dialog(); + test_wantreturn_edit_dialog(); UnregisterWindowClasses(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 80abf08..833797d 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -118,6 +118,16 @@ FONT 8, "MS Shell Dlg" EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL } +EDIT_WANTRETURN_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN +} + EDIT_READONLY_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Readonly Test"

1 0

Stefan Dösinger : wined3d: Mark the SYSMEM copy outdated after releasing memory.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: df2b1bea63223533fcae81eccf9abe86b2fc8dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=df2b1bea63223533fcae81ecc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 23:24:12 2008 +0200 wined3d: Mark the SYSMEM copy outdated after releasing memory. Strictly speaking this is redundant because the UnLoad before did the job, but if we mess with the allocated memory we have to tell the surface about that. Updating INDRAWABLE will automatically mark SYSMEM outdated. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cd39e20..c594460 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7002,6 +7002,8 @@ static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAM surface->resource.allocatedMemory = NULL; surface->resource.heapMemory = NULL; surface->resource.size = IWineD3DSurface_GetPitch((IWineD3DSurface *) surface) * surface->pow2Width; + /* INDRAWABLE is a sane place for implicit targets / depth stencil after the reset */ + IWineD3DSurface_ModifyLocation((IWineD3DSurface *) surface, SFLAG_INDRAWABLE, TRUE); } static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *data) {

1 0

Stefan Dösinger : wined3d: Put implicit surfaces into drawable on unload.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 0de167db9e2ef6c62ba48b050bc3d0ba2638467f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de167db9e2ef6c62ba48b050… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 7 23:21:33 2008 +0200 wined3d: Put implicit surfaces into drawable on unload. If we mark the sysmem copy up to date we would have to take care about allocating it. As explained in the comment, INDRAWABLE is a saner choice --- dlls/wined3d/surface.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 733d095..3eeaaa3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -563,14 +563,21 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { * Implicit resources stay however. So this means we have an implicit render target * or depth stencil. The content may be destroyed, but we still have to tear down * opengl resources, so we cannot leave early. + * + * Put the most up to date surface location into the drawable. D3D-wise this content + * is undefined, so it would be nowhere, but that would make the location management + * more complicated. The drawable is a sane location, because if we mark sysmem or + * texture up to date, drawPrim will copy the uninitialized texture or sysmem to the + * uninitialized drawable. That's pointless and we'd have to allocate the texture / + * sysmem copy here. */ - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, TRUE); } else { /* Load the surface into system memory */ IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); } IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); - IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); This->Flags &= ~SFLAG_ALLOCATED; /* Destroy PBOs, but load them into real sysmem before */

1 0

Rok Mandeljc : oleaut32: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 0f4f6fac3ce8254fe7f92032b1ce278e7186eac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4f6fac3ce8254fe7f92032b… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:07 2008 +0200 oleaut32: Added Slovenian translation. --- dlls/oleaut32/oleaut32.rc | 3 ++- dlls/oleaut32/oleaut32_Si.rc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rc b/dlls/oleaut32/oleaut32.rc index 44a3641..d57b886 100644 --- a/dlls/oleaut32/oleaut32.rc +++ b/dlls/oleaut32/oleaut32.rc @@ -42,6 +42,7 @@ #include "oleaut32_Pt.rc" #include "oleaut32_Ro.rc" #include "oleaut32_Ru.rc" +#include "oleaut32_Si.rc" #include "oleaut32_Sv.rc" #include "oleaut32_Th.rc" #include "oleaut32_Tr.rc" @@ -49,6 +50,6 @@ /* * FIXME: * Finnish, Greek, Hebrew, Japanese, Korean, - * Turkish, Slovenian (at least) are localised in XP Home. + * Turkish (at least) are localised in XP Home. * I expect Chinese etc are localised in Asian Editions also. */ diff --git a/dlls/oleaut32/oleaut32_Si.rc b/dlls/oleaut32/oleaut32_Si.rc new file mode 100644 index 0000000..365d877 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Si.rc @@ -0,0 +1,35 @@ +/* + * Slovenian resources for oleaut32 + * + * Copyright 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TRUE "Da" + IDS_FALSE "Ne" + IDS_YES "Da" + IDS_NO "Ne" + IDS_ON "Vključeno" + IDS_OFF "Izključeno" +} + +#pragma code_page(default)

1 0

Andrew Talbot : msdmo: Array parameter is passed to function as pointer so loses size information .
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: a9200b24014607c4c82fb052b97de88daa804a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9200b24014607c4c82fb052b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Apr 7 22:39:33 2008 +0100 msdmo: Array parameter is passed to function as pointer so loses size information. --- dlls/msdmo/dmoreg.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 9560234..f6d71bd 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -291,8 +291,9 @@ lend: * * Get DMP Name from the registry */ -HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[80]) +HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) { +#define NAME_SIZE 80 /* Size of szName[] */ WCHAR szguid[64]; HRESULT hres; HKEY hrkey = 0; @@ -311,7 +312,7 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[80]) if (ERROR_SUCCESS != hres) goto lend; - count = sizeof(szName); + count = NAME_SIZE; hres = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE) szName, &count); @@ -323,6 +324,7 @@ lend: RegCloseKey(hkey); return hres; +#undef NAME_SIZE }

1 0

Rok Mandeljc : regedit: Updated Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: a7c4c6a9f1fa58131bc7467dceeec6bd352b180d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7c4c6a9f1fa58131bc7467dc… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:42:46 2008 +0200 regedit: Updated Slovenian translation. --- programs/regedit/Si.rc | 263 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 217 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7c4c6a9f1fa58131bc74…

1 0

Rok Mandeljc : msvfw32: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 44aa996e3defd5693a5cf764dc5038030254dd89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44aa996e3defd5693a5cf764d… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:04 2008 +0200 msvfw32: Added Slovenian translation. --- dlls/msvfw32/msvfw32_Si.rc | 55 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/rsrc.rc | 1 + 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Si.rc b/dlls/msvfw32/msvfw32_Si.rc new file mode 100644 index 0000000..05d1ba5 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Si.rc @@ -0,0 +1,55 @@ +/* + * Copyright 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Stiskanje videa" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "V redu",IDOK,129,2,49,14 + PUSHBUTTON "Prekliči",IDCANCEL,129,18,49,14 + + LTEXT "&Kodek za stiskanje:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "&Nastavitve ...",882,129,36,49,14 + PUSHBUTTON "&O ...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Kakovost &stiskanja:",886,9,34,80,8 + + CONTROL "&Ključna slika na vsakih",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "slik",889,103,62,26,10 + + CONTROL "&Pretok podatkov",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "kb/s",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Polne slike (nestisnjeno)" +} + +#pragma code_page(default) diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc index ba00f7d..15c7b53 100644 --- a/dlls/msvfw32/rsrc.rc +++ b/dlls/msvfw32/rsrc.rc @@ -30,5 +30,6 @@ #include "msvfw32_No.rc" #include "msvfw32_Pl.rc" #include "msvfw32_Ru.rc" +#include "msvfw32_Si.rc" #include "msvfw32_Sv.rc" #include "msvfw32_Tr.rc"

1 0

Rok Mandeljc : msvidc32: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 704949d76a80155969652af9827fc23ab1cc6920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704949d76a80155969652af98… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:05 2008 +0200 msvidc32: Added Slovenian translation. --- dlls/msvidc32/msvidc32_Si.rc | 29 +++++++++++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvidc32_Si.rc b/dlls/msvidc32/msvidc32_Si.rc new file mode 100644 index 0000000..060ad08 --- /dev/null +++ b/dlls/msvidc32/msvidc32_Si.rc @@ -0,0 +1,29 @@ +/* + * Copyright 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "Wine Video 1 video kodek" +} + +#pragma code_page(default) diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc index bb8fdfe..ff97399 100644 --- a/dlls/msvidc32/rsrc.rc +++ b/dlls/msvidc32/rsrc.rc @@ -29,5 +29,6 @@ #include "msvidc32_Pl.rc" #include "msvidc32_Ro.rc" #include "msvidc32_Ru.rc" +#include "msvidc32_Si.rc" #include "msvidc32_Sv.rc" #include "msvidc32_Tr.rc"

1 0

Rok Mandeljc : localui: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 151ae30aaf6c8d50246ba16a8f71a44ecabff39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=151ae30aaf6c8d50246ba16a8… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:00 2008 +0200 localui: Added Slovenian translation. --- dlls/localui/localui.rc | 1 + dlls/localui/ui_Si.rc | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/localui/localui.rc b/dlls/localui/localui.rc index 7c67807..d51101d 100644 --- a/dlls/localui/localui.rc +++ b/dlls/localui/localui.rc @@ -46,4 +46,5 @@ #include "ui_No.rc" #include "ui_Pl.rc" #include "ui_Ru.rc" +#include "ui_Si.rc" #include "ui_Sv.rc" diff --git a/dlls/localui/ui_Si.rc b/dlls/localui/ui_Si.rc new file mode 100644 index 0000000..961a2e0 --- /dev/null +++ b/dlls/localui/ui_Si.rc @@ -0,0 +1,58 @@ +/* + * Slovenian resources for localui + * + * Copyright 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Dodaj lokalna vrata" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ime vrat:", -1, 7, 13, 194, 13, WS_VISIBLE + EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL + DEFPUSHBUTTON "V redu", IDOK, 199, 10, 40, 14, WS_VISIBLE + PUSHBUTTON "Prekliči", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE +END + + +LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Nastavitev LPT vrat" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Časovna omejitev (seconds)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX + LTEXT "&Ponoven poskus prenosa:", -1, 14, 22, 90, 13, WS_VISIBLE + EDITTEXT LPTCONFIG_EDIT, 112, 20, 32, 13, WS_VISIBLE | ES_NUMBER + DEFPUSHBUTTON "V redu", IDOK, 164, 10, 50, 14, WS_VISIBLE + PUSHBUTTON "Prekliči", IDCANCEL, 164, 27, 50, 14, WS_VISIBLE +END + + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokalna vrata" + IDS_INVALIDNAME "'%s' ni veljavno ime vrat" + IDS_PORTEXISTS "Vrata z imenom %s že obstajajo" + IDS_NOTHINGTOCONFIG "Ta vrata nimajo možnosti nastavitve" +} + +#pragma code_page(default)

1 0

Rok Mandeljc : taskmgr: Added Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 2d4c036e747f87966960d19f0752b2d60779f6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4c036e747f87966960d19f0… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:43:21 2008 +0200 taskmgr: Added Slovenian translation. --- programs/taskmgr/Si.rc | 504 +++++++++++++++++++++++++++++++++++++++++++ programs/taskmgr/taskmgr.rc | 1 + 2 files changed, 505 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d4c036e747f87966960d…

1 0

Rok Mandeljc : cmd: Updated Slovenian translation.
by Alexandre Julliard 08 Apr '08

08 Apr '08

Module: wine Branch: master Commit: 2f807a2fa8ab6f331df831945d767c9cd22e9a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f807a2fa8ab6f331df831945… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Mon Apr 7 20:42:50 2008 +0200 cmd: Updated Slovenian translation. --- programs/cmd/Si.rc | 352 +++++++++++++++++++++++++++------------------------- 1 files changed, 180 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f807a2fa8ab6f331df83…

1 0

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