January 2006 - Wine-commits

Robert Shearman : rpcrt4: Improve ReadVariance.
by Alexandre Julliard 09 Jan '06

09 Jan '06

Module: wine Branch: refs/heads/master Commit: 1926b6da63e939fb0e21fa2183e1dc5f4e755245 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1926b6da63e939fb0e21fa2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 9 17:21:01 2006 +0100 rpcrt4: Improve ReadVariance. Extend ReadVariance to read the offset as well as the actual count, since these always come in pairs. Handle the variance not being present in ReadVariance and always call it from the unmarshalling functions to simplify the code there and also to fix a bug where the format pointer wasn't advanced properly for complex arrays (introduced in the previous patch when implementing variance). --- dlls/rpcrt4/ndr_marshall.c | 35 ++++++++++++++++------------------- 1 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index def590d..026f517 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -315,9 +315,21 @@ PFORMAT_STRING ReadConformance(MIDL_STUB static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) { + if (!IsConformanceOrVariancePresent(pFormat)) + { + pStubMsg->Offset = 0; + pStubMsg->ActualCount = pStubMsg->MaxCount; + goto done; + } + + pStubMsg->Offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); + pStubMsg->Buffer += 4; + TRACE("offset is %ld\n", pStubMsg->Offset); pStubMsg->ActualCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); pStubMsg->Buffer += 4; - TRACE("unmarshalled variance is %ld\n", pStubMsg->ActualCount); + TRACE("variance is %ld\n", pStubMsg->ActualCount); + +done: return pFormat+4; } @@ -2008,7 +2020,6 @@ unsigned char* WINAPI NdrConformantVaryi PFORMAT_STRING pFormat, unsigned char fMustAlloc ) { - DWORD offset; DWORD esize = *(const WORD*)(pFormat+2); TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2020,13 +2031,11 @@ unsigned char* WINAPI NdrConformantVaryi return NULL; } pFormat = ReadConformance(pStubMsg, pFormat); - offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); - pStubMsg->Buffer += 4; pFormat = ReadVariance(pStubMsg, pFormat); if (!*ppMemory || fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, pStubMsg->MaxCount * esize); - memcpy(*ppMemory + offset, pStubMsg->Buffer, pStubMsg->ActualCount * esize); + memcpy(*ppMemory + pStubMsg->Offset, pStubMsg->Buffer, pStubMsg->ActualCount * esize); pStubMsg->Buffer += pStubMsg->ActualCount * esize; EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2141,7 +2150,7 @@ unsigned char * WINAPI NdrComplexArrayUn PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - ULONG offset, count, esize; + ULONG count, esize; unsigned char *pMemory; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2156,19 +2165,7 @@ unsigned char * WINAPI NdrComplexArrayUn pFormat += 4; pFormat = ReadConformance(pStubMsg, pFormat); - TRACE("conformance = %ld\n", pStubMsg->MaxCount); - if (IsConformanceOrVariancePresent(pFormat)) - { - offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); - pStubMsg->Buffer += 4; - pFormat = ReadVariance(pStubMsg, pFormat); - TRACE("variance = %ld\n", pStubMsg->ActualCount); - } - else - { - offset = 0; - pStubMsg->ActualCount = pStubMsg->MaxCount; - } + pFormat = ReadVariance(pStubMsg, pFormat); esize = ComplexStructSize(pStubMsg, pFormat);

1 0

Jacek Caban : urlmon: Pass FORMATETC to OnDataAvailable.
by Alexandre Julliard 09 Jan '06

09 Jan '06

Module: wine Branch: refs/heads/master Commit: 99306db99e312ad3ad3ef8291fc0de818408c3d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99306db99e312ad3ad3ef82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:19:49 2006 +0100 urlmon: Pass FORMATETC to OnDataAvailable. --- dlls/urlmon/binding.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 453d6a7..1533c1e 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -547,6 +547,7 @@ static HRESULT WINAPI InternetProtocolSi { Binding *This = PROTSINK_THIS(iface); STGMEDIUM stgmed; + FORMATETC formatetc; TRACE("(%p)->(%ld %lu %lu)\n", This, grfBSCF, ulProgress, ulProgressMax); @@ -570,8 +571,14 @@ static HRESULT WINAPI InternetProtocolSi stgmed.tymed = TYMED_ISTREAM; stgmed.u.pstm = STREAM(This->stream); + formatetc.cfFormat = 0; /* FIXME */ + formatetc.ptd = NULL; + formatetc.dwAspect = 1; + formatetc.lindex = -1; + formatetc.tymed = TYMED_ISTREAM; + IBindStatusCallback_OnDataAvailable(This->callback, grfBSCF, This->stream->buf_size, - NULL /* FIXME */, &stgmed); + &formatetc, &stgmed); if(grfBSCF & BSCF_LASTDATANOTIFICATION) IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL);

1 0

Robert Shearman : Call DisableThreadLibraryCalls for DLLs that don't need thread
by Alexandre Julliard 09 Jan '06

09 Jan '06

Module: wine Branch: refs/heads/master Commit: 811fb7614c22ffee8173a8939e06869cbfd40dbe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=811fb7614c22ffee8173a89… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 9 17:17:37 2006 +0100 Call DisableThreadLibraryCalls for DLLs that don't need thread creation/destruction notifications. --- dlls/crypt32/main.c | 1 + dlls/rsaenh/rsaenh.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index df30206..53c6000 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -39,6 +39,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, switch (fdwReason) { case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstance); CRYPT_InitFunctionSets(); break; case DLL_PROCESS_DETACH: diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2e9b701..1721a94 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -335,6 +335,7 @@ int WINAPI DllMain(HINSTANCE hInstance, switch (fdwReason) { case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstance); init_handle_table(&handle_table); break;

1 0

Jacek Caban : urlmon: Added implementation of protocol stream.
by Alexandre Julliard 09 Jan '06

09 Jan '06

Module: wine Branch: refs/heads/master Commit: 762e2696df28d39c724f7a34e559e08276d78116 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=762e2696df28d39c724f7a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 9 17:18:06 2006 +0100 urlmon: Added implementation of protocol stream. --- dlls/urlmon/binding.c | 247 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 233 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 4cb41a5..453d6a7 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); +typedef struct ProtocolStream ProtocolStream; + typedef struct { const IBindingVtbl *lpBindingVtbl; const IInternetProtocolSinkVtbl *lpInternetProtocolSinkVtbl; @@ -45,7 +47,7 @@ typedef struct { IBindStatusCallback *callback; IInternetProtocol *protocol; IServiceProvider *service_provider; - IStream *stream; + ProtocolStream *stream; BINDINFO bindinfo; DWORD bindf; @@ -53,11 +55,24 @@ typedef struct { LPWSTR url; } Binding; +struct ProtocolStream { + const IStreamVtbl *lpStreamVtbl; + + LONG ref; + + IInternetProtocol *protocol; + + BYTE buf[1024*8]; + DWORD buf_size; +}; + #define BINDING(x) ((IBinding*) &(x)->lpBindingVtbl) #define PROTSINK(x) ((IInternetProtocolSink*) &(x)->lpInternetProtocolSinkVtbl) #define BINDINF(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) +#define STREAM(x) ((IStream*) &(x)->lpStreamVtbl) + static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate2 *iface, REFIID riid, void **ppv) { @@ -130,8 +145,218 @@ static const IHttpNegotiate2Vtbl HttpNeg static IHttpNegotiate2 HttpNegotiate = { &HttpNegotiate2Vtbl }; +#define STREAM_THIS(iface) DEFINE_THIS(ProtocolStream, Stream, iface) + +static HRESULT WINAPI ProtocolStream_QueryInterface(IStream *iface, + REFIID riid, void **ppv) +{ + ProtocolStream *This = STREAM_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = STREAM(This); + }else if(IsEqualGUID(&IID_ISequentialStream, riid)) { + TRACE("(%p)->(IID_ISequentialStream %p)\n", This, ppv); + *ppv = STREAM(This); + }else if(IsEqualGUID(&IID_IStream, riid)) { + TRACE("(%p)->(IID_IStream %p)\n", This, ppv); + *ppv = STREAM(This); + } + + if(*ppv) { + IStream_AddRef(STREAM(This)); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ProtocolStream_AddRef(IStream *iface) +{ + ProtocolStream *This = STREAM_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + return ref; +} + +static ULONG WINAPI ProtocolStream_Release(IStream *iface) +{ + ProtocolStream *This = STREAM_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%ld\n", This, ref); + + if(!ref) { + IInternetProtocol_Release(This->protocol); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv, + ULONG cb, ULONG *pcbRead) +{ + ProtocolStream *This = STREAM_THIS(iface); + DWORD read = 0, pread = 0; + + TRACE("(%p)->(%p %ld %p)\n", This, pv, cb, pcbRead); + + if(This->buf_size) { + read = cb; + + if(read > This->buf_size) + read = This->buf_size; + + memcpy(pv, This->buf, read); + + if(read < This->buf_size) + memmove(This->buf, This->buf+read, This->buf_size-read); + This->buf_size -= read; + } + + if(read == cb) { + *pcbRead = read; + return S_OK; + } + + IInternetProtocol_Read(This->protocol, (PBYTE)pv+read, cb-read, &pread); + *pcbRead = read + pread; + + return read || pread ? S_OK : S_FALSE; +} + +static HRESULT WINAPI ProtocolStream_Write(IStream *iface, const void *pv, + ULONG cb, ULONG *pcbWritten) +{ + ProtocolStream *This = STREAM_THIS(iface); + + TRACE("(%p)->(%p %ld %p)\n", This, pv, cb, pcbWritten); + + return STG_E_ACCESSDENIED; +} + +static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove, + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + ProtocolStream *This = STREAM_THIS(iface); + FIXME("(%p)->(%ld %08lx %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) +{ + ProtocolStream *This = STREAM_THIS(iface); + FIXME("(%p)->(%ld)\n", This, libNewSize.u.LowPart); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolStream_CopyTo(IStream *iface, IStream *pstm, + ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) +{ + ProtocolStream *This = STREAM_THIS(iface); + FIXME("(%p)->(%p %ld %p %p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolStream_Commit(IStream *iface, DWORD grfCommitFlags) +{ + ProtocolStream *This = STREAM_THIS(iface); + + TRACE("(%p)->(%08lx)\n", This, grfCommitFlags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolStream_Revert(IStream *iface) +{ + ProtocolStream *This = STREAM_THIS(iface); + + TRACE("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolStream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ProtocolStream *This = STREAM_THIS(iface); + FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolStream_UnlockRegion(IStream *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + ProtocolStream *This = STREAM_THIS(iface); + FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolStream_Stat(IStream *iface, STATSTG *pstatstg, + DWORD dwStatFlag) +{ + ProtocolStream *This = STREAM_THIS(iface); + FIXME("(%p)->(%p %08lx)\n", This, pstatstg, dwStatFlag); + return E_NOTIMPL; +} + +static HRESULT WINAPI ProtocolStream_Clone(IStream *iface, IStream **ppstm) +{ + ProtocolStream *This = STREAM_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppstm); + return E_NOTIMPL; +} + +#undef STREAM_THIS + +static const IStreamVtbl ProtocolStreamVtbl = { + ProtocolStream_QueryInterface, + ProtocolStream_AddRef, + ProtocolStream_Release, + ProtocolStream_Read, + ProtocolStream_Write, + ProtocolStream_Seek, + ProtocolStream_SetSize, + ProtocolStream_CopyTo, + ProtocolStream_Commit, + ProtocolStream_Revert, + ProtocolStream_LockRegion, + ProtocolStream_UnlockRegion, + ProtocolStream_Stat, + ProtocolStream_Clone +}; + #define BINDING_THIS(iface) DEFINE_THIS(Binding, Binding, iface) +static ProtocolStream *create_stream(IInternetProtocol *protocol) +{ + ProtocolStream *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ProtocolStream)); + + ret->lpStreamVtbl = &ProtocolStreamVtbl; + ret->ref = 1; + ret->buf_size = 0; + + IInternetProtocol_AddRef(protocol); + ret->protocol = protocol; + + return ret; +} + +static void fill_stream_buffer(ProtocolStream *This) +{ + DWORD read = 0; + + IInternetProtocol_Read(This->protocol, This->buf+This->buf_size, + sizeof(This->buf)-This->buf_size, &read); + This->buf_size += read; +} + static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) { Binding *This = BINDING_THIS(iface); @@ -187,7 +412,7 @@ static ULONG WINAPI Binding_Release(IBin if(This->service_provider) IServiceProvider_Release(This->service_provider); if(This->stream) - IStream_Release(This->stream); + IStream_Release(STREAM(This->stream)); ReleaseBindInfo(&This->bindinfo); HeapFree(GetProcessHeap(), 0, This->mime); @@ -321,9 +546,7 @@ static HRESULT WINAPI InternetProtocolSi DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { Binding *This = PROTSINK_THIS(iface); - DWORD read = 0, cread; STGMEDIUM stgmed; - BYTE buf[1024]; TRACE("(%p)->(%ld %lu %lu)\n", This, grfBSCF, ulProgress, ulProgressMax); @@ -341,17 +564,13 @@ static HRESULT WINAPI InternetProtocolSi if(grfBSCF & BSCF_FIRSTDATANOTIFICATION) IInternetProtocol_LockRequest(This->protocol, 0); - do { - cread = 0; - IInternetProtocol_Read(This->protocol, buf, sizeof(buf), &cread); - IStream_Write(This->stream, buf, read, NULL); - read += cread; - }while(cread); + + fill_stream_buffer(This->stream); stgmed.tymed = TYMED_ISTREAM; - stgmed.u.pstm = This->stream; + stgmed.u.pstm = STREAM(This->stream); - IBindStatusCallback_OnDataAvailable(This->callback, grfBSCF, read, + IBindStatusCallback_OnDataAvailable(This->callback, grfBSCF, This->stream->buf_size, NULL /* FIXME */, &stgmed); if(grfBSCF & BSCF_LASTDATANOTIFICATION) @@ -637,7 +856,7 @@ static HRESULT Binding_Create(LPCWSTR ur ret->url = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); memcpy(ret->url, url, len*sizeof(WCHAR)); - CreateStreamOnHGlobal(NULL, TRUE, &ret->stream); + ret->stream = create_stream(ret->protocol); *binding = ret; return S_OK; @@ -673,7 +892,7 @@ HRESULT start_binding(LPCWSTR url, IBind IBindStatusCallback_OnStopBinding(binding->callback, S_OK, NULL); } - IStream_AddRef(binding->stream); + IStream_AddRef(STREAM(binding->stream)); *ppv = binding->stream; IBinding_Release(BINDING(binding));

1 0

Hans Leidekker : usp10: Improve stubs.
by Alexandre Julliard 09 Jan '06

09 Jan '06

Module: wine Branch: refs/heads/master Commit: c0a223be60e3d4f64b29f5ba0257737bc4e2663d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0a223be60e3d4f64b29f5b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 9 17:16:57 2006 +0100 usp10: Improve stubs. Improve stubs for ScriptGetProperties and ScriptItemize. Add stub for ScriptFreeCache. --- dlls/usp10/usp10.c | 23 +++++++++++++++++++++-- dlls/usp10/usp10.spec | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 57c0f1d..38e1fc6 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -52,13 +52,27 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, } /*********************************************************************** + * ScriptFreeCache (USP10.@) + * + */ +HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) +{ + FIXME("%p\n", psc); + + if (psc) *psc = NULL; + return 0; +} + +/*********************************************************************** * ScriptGetProperties (USP10.@) * */ HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts) { FIXME("%p,%p\n",ppSp,piNumScripts); - return E_NOTIMPL; + + if (piNumScripts) *piNumScripts = 0; + return 0; } /*********************************************************************** @@ -111,7 +125,12 @@ HRESULT WINAPI ScriptItemize(const WCHAR { FIXME("%s,%d,%d,%p,%p,%p,%p\n", debugstr_w(pwcInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); - return E_INVALIDARG; + + if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2) + return E_INVALIDARG; + + *pcItems = 0; + return 0; } /*********************************************************************** diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index d8f77f0..c975cc0 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -4,7 +4,7 @@ @ stub ScriptBreak @ stub ScriptCPtoX @ stub ScriptCacheGetHeight -@ stub ScriptFreeCache +@ stdcall ScriptFreeCache(ptr) @ stub ScriptGetCMap @ stdcall ScriptGetFontProperties(long ptr ptr) @ stub ScriptGetGlyphABCWidth

1 0

Alexander N. Sørnes : shell32: Updated Norwegian Bokmål resources.
by Alexandre Julliard 09 Jan '06

09 Jan '06

Module: wine Branch: refs/heads/master Commit: 22ce9a665329f1ee1bbb9c1594007b27d5b500ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22ce9a665329f1ee1bbb9c1… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Mon Jan 9 17:17:09 2006 +0100 shell32: Updated Norwegian Bokmål resources. --- dlls/shell32/shell32_No.rc | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index c565dfe..69b3a7e 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -159,12 +159,12 @@ STRINGTABLE DISCARDABLE IDS_OPEN "�pne" IDS_CREATEFOLDER_DENIED "Kunne ikke opprette ny mappe: tilgang nektet." - IDS_CREATEFOLDER_CAPTION "Feil ved oppretting av ny mappe" + IDS_CREATEFOLDER_CAPTION "Klarte ikke opprette ny mappe" IDS_DELETEITEM_CAPTION "Bekreft filsletting" IDS_DELETEFOLDER_CAPTION "Bekreft sletting av mappe" - IDS_DELETEITEM_TEXT "Virkelig slette '%1'?" + IDS_DELETEITEM_TEXT "Virkelig slette �%1�?" IDS_DELETEMULTIPLE_TEXT "Virkelig slette disse %1 elementene?" - IDS_OVERWRITEFILE_TEXT "Overskrive filen '%1'?" + IDS_OVERWRITEFILE_TEXT "Overskrive filen �%1�?" IDS_OVERWRITEFILE_CAPTION "Bekreft overskriving av fil" /* message box strings */ @@ -178,21 +178,21 @@ STRINGTABLE DISCARDABLE IDS_PERSONAL "Mine dokumenter" IDS_FAVORITES "Favoritter" IDS_STARTUP "Start-meny\\Programmer\\Oppstart" - IDS_RECENT "Recent" + IDS_RECENT "Siste" IDS_SENDTO "SendTo" IDS_STARTMENU "Start-meny" IDS_MYMUSIC "Mine dokumenter\\Min musikk" IDS_MYVIDEO "Mine dokumenter\\Mine videoklipp" IDS_DESKTOPDIRECTORY "Skrivebord" IDS_NETHOOD "NetHood" - IDS_TEMPLATES "Templates" - IDS_APPDATA "Application Data" - IDS_PRINTHOOD "PrintHood" - IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" + IDS_TEMPLATES "Maler" + IDS_APPDATA "Programdata" + IDS_PRINTHOOD "Skrivere" + IDS_LOCAL_APPDATA "Lokale innstillinger\\Programdata" + IDS_INTERNET_CACHE "Lokale innstillinger\\Temporary Internet Files" IDS_COOKIES "Cookies" - IDS_HISTORY "Local Settings\\History" - IDS_PROGRAM_FILES "Program Files" + IDS_HISTORY "Lokale innstillinger\\Logg" + IDS_PROGRAM_FILES "Programfiler" IDS_MYPICTURES "Mine dokumenter\\Mine bilder" IDS_PROGRAM_FILES_COMMON "Programfiler\\Fellesfiler" IDS_COMMON_DOCUMENTS "Dokumenter" @@ -200,5 +200,5 @@ STRINGTABLE DISCARDABLE IDS_COMMON_MUSIC "Dokumenter\\Min musikk" IDS_COMMON_PICTURES "Dokumenter\\Mine bilder" IDS_COMMON_VIDEO "Dokumenter\\Mine videoklipp" - IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_CDBURN_AREA "Lokale innstillinger\\Programdata\\Microsoft\\CD Burning" }

1 0

YunSong Hwang : shell32: Update the Korean translation.
by Alexandre Julliard 09 Jan '06

09 Jan '06

Module: wine Branch: refs/heads/master Commit: dc8c6bb90b7b7b3bc33b5691803afb5ffee5b7e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc8c6bb90b7b7b3bc33b569… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Mon Jan 9 17:17:20 2006 +0100 shell32: Update the Korean translation. --- dlls/shell32/shell32_Ko.rc | 187 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 173 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 7001c34..f4e1993 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -1,5 +1,6 @@ /* * Copyright 1998 Juergen Schmied + * Copyright 2006 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,17 +19,103 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +MENU_001 MENU DISCARDABLE +BEGIN +MENUITEM "ū ��(&g)", FCIDM_SHVIEW_BIGICON +MENUITEM "�� (&m)", FCIDM_SHVIEW_SMALLICON +MENUITEM "��(&L)", FCIDM_SHVIEW_LISTVIEW +MENUITEM "�ڼ��(&D)", FCIDM_SHVIEW_REPORTVIEW +END + +/* +shellview background menu +*/ +MENU_002 MENU DISCARDABLE +BEGIN +POPUP "" +BEGIN +POPUP "��(&V)" +BEGIN +MENUITEM "ū ��(&g)", FCIDM_SHVIEW_BIGICON +MENUITEM "�� (&m)", FCIDM_SHVIEW_SMALLICON +MENUITEM "��(&L)", FCIDM_SHVIEW_LISTVIEW +MENUITEM "�ڼ��(&D)", FCIDM_SHVIEW_REPORTVIEW +END +MENUITEM SEPARATOR +POPUP "�� (&I)" +BEGIN +MENUITEM "�̸��(&N)", 0x30 /* column 0 */ +MENUITEM "��(&T)", 0x32 /* column 2 */ +MENUITEM "ũ��(&S)", 0x31 /* ... */ +MENUITEM "��¥��(&D)", 0x33 +MENUITEM SEPARATOR +MENUITEM "�ڵ� ��(&A)", FCIDM_SHVIEW_AUTOARRANGE +END +MENUITEM "�� ", FCIDM_SHVIEW_SNAPTOGRID +MENUITEM SEPARATOR +MENUITEM "�� ħ", FCIDM_SHVIEW_REFRESH +MENUITEM SEPARATOR +MENUITEM "�ٿ��ֱ�", FCIDM_SHVIEW_INSERT +MENUITEM "��ũ�� ٿ��ֱ�", FCIDM_SHVIEW_INSERTLINK +MENUITEM SEPARATOR +POPUP "�� ۾�" +BEGIN +MENUITEM "�� (&F)", FCIDM_SHVIEW_NEWFOLDER +MENUITEM "�� ũ(&L)", FCIDM_SHVIEW_NEWLINK +MENUITEM SEPARATOR +END +MENUITEM SEPARATOR +MENUITEM "�Ӽ�", FCIDM_SHVIEW_PROPERTIES +END +END + +/* +shellview item menu +*/ +MENU_SHV_FILE MENU DISCARDABLE +BEGIN +POPUP "" +BEGIN +MENUITEM "Ž��(&x)", FCIDM_SHVIEW_EXPLORE +MENUITEM "��(&O)", FCIDM_SHVIEW_OPEN +MENUITEM SEPARATOR +MENUITEM "�߶󳻱�(&u)", FCIDM_SHVIEW_CUT +MENUITEM "��(&C)", FCIDM_SHVIEW_COPY +MENUITEM SEPARATOR +MENUITEM "��ũ ��(&L)", FCIDM_SHVIEW_CREATELINK +MENUITEM "��(&D)", FCIDM_SHVIEW_DELETE +MENUITEM "�̸� �ٲٱ�(&R)", FCIDM_SHVIEW_RENAME +MENUITEM SEPARATOR +MENUITEM "�Ӽ�(&P)", FCIDM_SHVIEW_PROPERTIES +END +END + +SHBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 188, 192 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "�� Ž��" +FONT 8, "MS Shell Dlg" +{ +DEFPUSHBUTTON "Ȯ��", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP +PUSHBUTTON "��", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP +LTEXT "", IDD_TITLE, 4, 4, 180, 12 +LTEXT "", IDD_STATUS, 4, 25, 180, 12 +CONTROL "", IDD_TREEVIEW, "SysTreeView32", +TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | +WS_BORDER | WS_TABSTOP, +4, 40, 180, 120 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "%s�� Ͽ�" +CAPTION "%s ��" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "Ȯ��", IDOK, 153, 133, 50, 12, WS_TABSTOP - LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER - ICON "", 1088, 10, 10, 14, 16 - LTEXT "", 100, 30, 10, 137, 10 - LTEXT "", 101, 30, 22, 137, 10 - LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10 +DEFPUSHBUTTON "Ȯ��", IDOK, 153, 133, 50, 12, WS_TABSTOP +LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER +ICON "", 1088, 10, 10, 14, 16 +LTEXT "", 100, 30, 10, 137, 10 +LTEXT "", 101, 30, 22, 137, 10 +LTEXT "Wine�� Ǿ��ϴ�.:", 98, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -36,11 +123,83 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISI CAPTION "" FONT 8, "MS Shell Dlg" { - ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 - LTEXT "&Open:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 - DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP +ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE +LTEXT "Ǯ�׸�,��,�� ͳ� �ڿ�, �׸�� Wine�� ̸�� ּ��.", 12289, 36, 11, 182, 18 +LTEXT "��(&O):", 12305, 7, 39, 24, 10 +CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 +DEFPUSHBUTTON "Ȯ��", IDOK, 62, 63, 50, 14, WS_TABSTOP +PUSHBUTTON "��", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP +PUSHBUTTON "ã��(&B)...", 12288, 170, 63, 50, 14, WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ +/* columns in the shellview */ +IDS_SHV_COLUMN1 "��" +IDS_SHV_COLUMN2 "ũ��" +IDS_SHV_COLUMN3 "��" +IDS_SHV_COLUMN4 "��¥" +IDS_SHV_COLUMN5 "�Ӽ�" +IDS_SHV_COLUMN6 "ũ��" +IDS_SHV_COLUMN7 "�� ũ��" +IDS_SHV_COLUMN8 "�̸�" +IDS_SHV_COLUMN9 "�ּ�" +IDS_SHV_COLUMN10 "��" +IDS_SHV_COLUMN11 "�׷�" + +/* special folders */ +IDS_DESKTOP "��ũž" +IDS_MYCOMPUTER "�� ǻ��" + +/* context menus */ +IDS_VIEW_LARGE "ū ��(&g)" +IDS_VIEW_SMALL "�� (&m)" +IDS_VIEW_LIST "��(&L)" +IDS_VIEW_DETAILS "�ڼ��(&D)" +IDS_SELECT "��" +IDS_OPEN "��" + +IDS_CREATEFOLDER_DENIED "�� ϴ�: �� ϴ�." +IDS_CREATEFOLDER_CAPTION "�� ߻�" +IDS_DELETEITEM_CAPTION "�� Ȯ��" +IDS_DELETEFOLDER_CAPTION "�� Ȯ��" +IDS_DELETEITEM_TEXT "�� '%1'�� ⸦ �ٶ��ϱ�?" +IDS_DELETEMULTIPLE_TEXT "�� ̰� %1 �� ⸦ �ٶ��ϱ�?" +IDS_OVERWRITEFILE_TEXT "�� %1�� �ڽ��ϱ�?" +IDS_OVERWRITEFILE_CAPTION "�� �� Ȯ��" + +/* message box strings */ +IDS_RESTART_TITLE "�ٽ� ��" +IDS_RESTART_PROMPT "�� ϰڽ��ϱ�?" +IDS_SHUTDOWN_TITLE "��" +IDS_SHUTDOWN_PROMPT "�� Wine �� ڽ��ϱ�?" + +/* shell folder path default values */ +IDS_PROGRAMS "Start Menu\\Programs" +IDS_PERSONAL "My Documents" +IDS_FAVORITES "Favorites" +IDS_STARTUP "Start Menu\\Programs\\StartUp" +IDS_RECENT "Recent" +IDS_SENDTO "SendTo" +IDS_STARTMENU "Start Menu" +IDS_MYMUSIC "My Documents\\My Music" +IDS_MYVIDEO "My Documents\\My Video" +IDS_DESKTOPDIRECTORY "Desktop" +IDS_NETHOOD "NetHood" +IDS_TEMPLATES "Templates" +IDS_APPDATA "Application Data" +IDS_PRINTHOOD "PrintHood" +IDS_LOCAL_APPDATA "Local Settings\\Application Data" +IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" +IDS_COOKIES "Cookies" +IDS_HISTORY "Local Settings\\History" +IDS_PROGRAM_FILES "Program Files" +IDS_MYPICTURES "My Documents\\My Pictures" +IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" +IDS_COMMON_DOCUMENTS "Documents" +IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" +IDS_COMMON_MUSIC "Documents\\My Music" +IDS_COMMON_PICTURES "Documents\\My Pictures" +IDS_COMMON_VIDEO "Documents\\My Video" +IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" }

1 0

Mike McCormack : user32: Update the list of things to fix in the Combo control.
by Alexandre Julliard 09 Jan '06

09 Jan '06

Module: wine Branch: refs/heads/master Commit: c83a5930b1635c1d76ce5158c3ec6e169ab723f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c83a5930b1635c1d76ce515… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 9 17:16:14 2006 +0100 user32: Update the list of things to fix in the Combo control. --- dlls/user/combo.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user/combo.c b/dlls/user/combo.c index 89d356b..4fab7f3 100644 --- a/dlls/user/combo.c +++ b/dlls/user/combo.c @@ -29,7 +29,6 @@ * TODO: * - ComboBox_[GS]etMinVisible() * - CB_GETMINVISIBLE, CB_SETMINVISIBLE - * - CB_LIMITTEXT * - CB_SETTOPINDEX */

1 0

Mike McCormack : kernel: Trying to lock an empty global memory block gives an ERROR_DISCARDED.
by Alexandre Julliard 09 Jan '06

09 Jan '06

Module: wine Branch: refs/heads/master Commit: 3066397babcaaba3727cb40f375776394d54e932 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3066397babcaaba3727cb40… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 9 17:16:32 2006 +0100 kernel: Trying to lock an empty global memory block gives an ERROR_DISCARDED. --- dlls/kernel/heap.c | 6 ++++-- dlls/kernel/tests/heap.c | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index ec3c24d..ac3b6b2 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -413,9 +413,11 @@ LPVOID WINAPI GlobalLock( pintern = HANDLE_TO_INTERN(hmem); if (pintern->Magic == MAGIC_GLOBAL_USED) { - if (pintern->LockCount < GLOBAL_LOCK_MAX) - pintern->LockCount++; palloc = pintern->Pointer; + if (!pintern->Pointer) + SetLastError(ERROR_DISCARDED); + else if (pintern->LockCount < GLOBAL_LOCK_MAX) + pintern->LockCount++; } else { diff --git a/dlls/kernel/tests/heap.c b/dlls/kernel/tests/heap.c index e5b1e17..27a51cf 100644 --- a/dlls/kernel/tests/heap.c +++ b/dlls/kernel/tests/heap.c @@ -102,4 +102,12 @@ START_TEST(heap) gbl = LocalReAlloc(0, 10, LMEM_MOVEABLE); ok(gbl == NULL, "local realloc allocated memory\n"); + /* trying to lock empty memory should give an error */ + gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0); + ok(gbl != NULL, "returned NULL\n"); + SetLastError(0xdeadbeef); + mem = GlobalLock(gbl); + ok( GetLastError() == ERROR_DISCARDED, "should return an error\n"); + ok( mem == NULL, "should return NULL\n"); + GlobalFree(gbl); }

1 0

Phil Krylov : riched20: Simplified logic in ME_StrRelPos().
by Alexandre Julliard 09 Jan '06

09 Jan '06

Module: wine Branch: refs/heads/master Commit: 74aa295f55b335b4b89cc8739a1dcf229bcce05c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=74aa295f55b335b4b89cc87… Author: Phil Krylov <phil(a)newstar.rinet.ru> Date: Mon Jan 9 17:12:34 2006 +0100 riched20: Simplified logic in ME_StrRelPos(). --- dlls/riched20/string.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 6abd22a..c9057bf 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -155,29 +155,22 @@ int ME_StrVLen(ME_String *s) { return s->nLen; } -/* FIXME we use widechars, not multibytes, inside, no need for complex logic anymore */ int ME_StrRelPos(ME_String *s, int nVChar, int *pRelChars) { + int nRelChars = *pRelChars; + TRACE("%s,%d,&%d\n", debugstr_w(s->szData), nVChar, *pRelChars); assert(*pRelChars); - if (!*pRelChars) return nVChar; - - if (*pRelChars>0) - { - while(nVChar<s->nLen && *pRelChars>0) - { - nVChar++; - (*pRelChars)--; - } + if (!nRelChars) return nVChar; - } - - while(nVChar>0 && *pRelChars<0) - { - nVChar--; - (*pRelChars)++; - } + + if (nRelChars>0) + nRelChars = min(*pRelChars, s->nLen - nVChar); + else + nRelChars = max(*pRelChars, -nVChar); + nVChar += nRelChars; + *pRelChars -= nRelChars; return nVChar; }

1 0