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

Kolbjoern Fredheim : wined3d: Implemented converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying .
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: cb8a8182d1b6900526eae763c5096cc7335db946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8a8182d1b6900526eae763c… Author: Kolbjoern Fredheim <hightower(a)tregt.net> Date: Tue May 22 03:29:44 2007 +0200 wined3d: Implemented converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. --- dlls/wined3d/surface.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 12681c4..fe2fc08 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1532,6 +1532,15 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO } break; + case WINED3DFMT_X1R5G5B5: + if (colorkey_active) { + *convert = CONVERT_CK_5551; + *format = GL_BGRA; + *internal = GL_RGBA; + *type = GL_UNSIGNED_SHORT_1_5_5_5_REV; + } + break; + case WINED3DFMT_R8G8B8: if (colorkey_active) { *convert = CONVERT_CK_RGB24; @@ -1720,6 +1729,32 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN } break; + case CONVERT_CK_5551: + { + /* Converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. */ + unsigned int x, y; + WORD *Source; + WORD *Dest; + TRACE("Color keyed 5551\n"); + for (y = 0; y < height; y++) { + Source = (WORD *) (src + y * pitch); + Dest = (WORD *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + WORD color = *Source++; + *Dest = color; + if ((color < surf->SrcBltCKey.dwColorSpaceLowValue) || + (color > surf->SrcBltCKey.dwColorSpaceHighValue)) { + *Dest |= (1 << 15); + } + else { + *Dest &= ~(1 << 15); + } + Dest++; + } + } + } + break; + case CONVERT_V8U8: { unsigned int x, y;

1 0

Rob Shearman : ole32: Remove a useless trace.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 071ea06af8b8b5c92a8842844b98a92e7183c60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=071ea06af8b8b5c92a8842844… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 21 16:45:53 2007 +0100 ole32: Remove a useless trace. Remove an incorrect comment. --- dlls/ole32/tests/marshal.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e64b9f5..1fd2fbb 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -241,7 +241,6 @@ static DWORD CALLBACK host_object_proc(LPVOID p) { if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA) { - trace("releasing marshal data\n"); CoReleaseMarshalData(data->stream); SetEvent((HANDLE)msg.lParam); } @@ -523,14 +522,6 @@ static void test_proxy_marshal_and_unmarshal(void) ok_more_than_one_lock(); - /* now the proxies should be as follows: - * pProxy2 -> &Test_ClassFactory - * they should NOT be as follows: - * pProxy -> &Test_ClassFactory - * pProxy2 -> pProxy - * the above can only really be tested by looking in +ole traces - */ - IUnknown_Release(pProxy2); /* unmarshal all of the proxies to check that the object stub still exists */

1 0

Rob Shearman : ole32: The identity functions can be used from apartments other than the one the proxy was unmarshaled into .
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: dd8a736c3fc8ebcbbce1d4c548ac0e57d5c3feff URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd8a736c3fc8ebcbbce1d4c54… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 21 16:45:17 2007 +0100 ole32: The identity functions can be used from apartments other than the one the proxy was unmarshaled into. In this case, don't use the cached This->remunk and don't cache the unmarshaled object in This->remunk. --- dlls/ole32/marshal.c | 19 +++++++++++++++---- dlls/ole32/tests/marshal.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 9c7d53c..d918347 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -298,7 +298,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL ULONG index = mapping[i]; HRESULT hrobj = qiresults[i].hResult; if (hrobj == S_OK) - hrobj = unmarshal_object(&qiresults[i].std, This->parent, + hrobj = unmarshal_object(&qiresults[i].std, COM_CurrentApt(), This->dest_context, This->dest_context_data, pMQIs[index].pIID, &This->oxid_info, @@ -964,14 +964,25 @@ static void proxy_manager_disconnect(struct proxy_manager * This) static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnknown **remunk) { HRESULT hr = S_OK; + struct apartment *apt; + BOOL called_in_original_apt; /* we don't want to try and unmarshal or use IRemUnknown if we don't want * lifetime management */ if (This->sorflags & SORFP_NOLIFETIMEMGMT) return S_FALSE; + apt = COM_CurrentApt(); + if (!apt) + return CO_E_NOTINITIALIZED; + + called_in_original_apt = This->parent && (This->parent->oxid == apt->oxid); + EnterCriticalSection(&This->cs); - if (This->remunk) + /* only return the cached object if called from the original apartment. + * in future, we might want to make the IRemUnknown proxy callable from any + * apartment to avoid these checks */ + if (This->remunk && called_in_original_apt) { /* already created - return existing object */ *remunk = This->remunk; @@ -994,10 +1005,10 @@ static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnk stdobjref.ipid = This->oxid_info.ipidRemUnknown; /* do the unmarshal */ - hr = unmarshal_object(&stdobjref, This->parent, This->dest_context, + hr = unmarshal_object(&stdobjref, COM_CurrentApt(), This->dest_context, This->dest_context_data, &IID_IRemUnknown, &This->oxid_info, (void**)remunk); - if (hr == S_OK) + if (hr == S_OK && called_in_original_apt) { This->remunk = *remunk; IRemUnknown_AddRef(This->remunk); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 843b220..e64b9f5 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1283,6 +1283,24 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) HRESULT hr; IUnknown * proxy = NULL; + hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy); + todo_wine + ok(hr == CO_E_NOTINITIALIZED, + "COM should have failed with CO_E_NOTINITIALIZED on using proxy without apartment, but instead returned 0x%08x\n", + hr); + + hr = IClassFactory_QueryInterface(cf, &IID_IMultiQI, (LPVOID *)&proxy); + /* Win9x returns S_OK, whilst NT returns RPC_E_WRONG_THREAD */ + trace("call to proxy's QueryInterface for local interface without apartment returned 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(proxy); + + hr = IClassFactory_QueryInterface(cf, &IID_IStream, (LPVOID *)&proxy); + /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ + trace("call to proxy's QueryInterface without apartment returned 0x%08x\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(proxy); + pCoInitializeEx(NULL, COINIT_MULTITHREADED); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (LPVOID*)&proxy); @@ -1291,6 +1309,19 @@ static DWORD CALLBACK bad_thread_proc(LPVOID p) "COM should have failed with RPC_E_WRONG_THREAD on using proxy from wrong apartment, but instead returned 0x%08x\n", hr); + hr = IClassFactory_QueryInterface(cf, &IID_IStream, (LPVOID *)&proxy); + /* Win9x returns E_NOINTERFACE, whilst NT returns RPC_E_WRONG_THREAD */ + trace("call to proxy's QueryInterface from wrong apartment returned 0x%08x\n", hr); + + /* this statement causes Win9x DCOM to crash during CoUninitialize of + * other apartment, so don't test this on Win9x (signified by NT-only + * export of CoRegisterSurrogateEx) */ + if (GetProcAddress(GetModuleHandle("ole32"), "CoRegisterSurrogateEx")) + /* now be really bad and release the proxy from the wrong apartment */ + IUnknown_Release(cf); + else + skip("skipping test for releasing proxy from wrong apartment that will succeed, but cause a crash during CoUninitialize\n"); + CoUninitialize(); return 0; @@ -1321,13 +1352,18 @@ static void test_proxy_used_in_wrong_thread(void) ok_more_than_one_lock(); + /* do a call that will fail, but result in IRemUnknown being used by the proxy */ + IClassFactory_QueryInterface(pProxy, &IID_IStream, (LPVOID *)&pStream); + /* create a thread that we can misbehave in */ thread = CreateThread(NULL, 0, bad_thread_proc, (LPVOID)pProxy, 0, &tid2); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); - IUnknown_Release(pProxy); + /* do release statement on Win9x that we should have done above */ + if (!GetProcAddress(GetModuleHandle("ole32"), "CoRegisterSurrogateEx")) + IUnknown_Release(pProxy); ok_no_locks();

1 0

Rob Shearman : ole32: Make proxy_manager_get_remunknown AddRef the return IRemUnknown object.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: bf2b49b4e0ab46bff6a2f85f66be60d2ee320d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2b49b4e0ab46bff6a2f85f6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 21 16:43:44 2007 +0100 ole32: Make proxy_manager_get_remunknown AddRef the return IRemUnknown object. Fix up the callers to release the returned IRemUnknown object. --- dlls/ole32/marshal.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 759a683..9c7d53c 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -283,6 +283,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL { hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS, nonlocal_mqis, iids, &qiresults); + IRemUnknown_Release(remunk); if (FAILED(hr)) ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); } @@ -409,6 +410,7 @@ static HRESULT WINAPI Proxy_MarshalInterface( rif.cPublicRefs = (mshlflags == MSHLFLAGS_TABLESTRONG) ? 1 : NORMALEXTREFS; rif.cPrivateRefs = 0; hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref); + IRemUnknown_Release(remunk); if (hr == S_OK && hrref == S_OK) { /* table-strong marshaling doesn't give the refs to the @@ -467,6 +469,7 @@ static HRESULT WINAPI Proxy_MarshalInterface( } else ERR("IRemUnknown_RemQueryInterface failed with error 0x%08x\n", hr); + IRemUnknown_Release(remunk); } } @@ -577,6 +580,7 @@ static HRESULT ifproxy_get_public_ref(struct ifproxy * This) rif.cPublicRefs = NORMALEXTREFS; rif.cPrivateRefs = 0; hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref); + IRemUnknown_Release(remunk); if (hr == S_OK && hrref == S_OK) InterlockedExchangeAdd((LONG *)&This->refs, NORMALEXTREFS); else @@ -614,6 +618,7 @@ static HRESULT ifproxy_release_public_refs(struct ifproxy * This) rif.cPublicRefs = public_refs; rif.cPrivateRefs = 0; hr = IRemUnknown_RemRelease(remunk, 1, &rif); + IRemUnknown_Release(remunk); if (hr == S_OK) InterlockedExchangeAdd((LONG *)&This->refs, -public_refs); else if (hr == RPC_E_DISCONNECTED) @@ -967,8 +972,11 @@ static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnk EnterCriticalSection(&This->cs); if (This->remunk) + { /* already created - return existing object */ *remunk = This->remunk; + IRemUnknown_AddRef(*remunk); + } else if (!This->parent) /* disconnected - we can't create IRemUnknown */ hr = S_FALSE; @@ -988,9 +996,12 @@ static HRESULT proxy_manager_get_remunknown(struct proxy_manager * This, IRemUnk /* do the unmarshal */ hr = unmarshal_object(&stdobjref, This->parent, This->dest_context, This->dest_context_data, &IID_IRemUnknown, - &This->oxid_info, (void**)&This->remunk); + &This->oxid_info, (void**)remunk); if (hr == S_OK) - *remunk = This->remunk; + { + This->remunk = *remunk; + IRemUnknown_AddRef(This->remunk); + } } LeaveCriticalSection(&This->cs);

1 0

Rob Shearman : ole32: Handle MSHLFLAGS_TABLEWEAK and MSHLFLAGS_TABLESTRONG when marshaling a proxy .
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 5369d4dffd97a78d3dc1b312b123cd7855c325c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5369d4dffd97a78d3dc1b312b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 21 16:43:09 2007 +0100 ole32: Handle MSHLFLAGS_TABLEWEAK and MSHLFLAGS_TABLESTRONG when marshaling a proxy. Add tests for this behaviour. --- dlls/ole32/marshal.c | 44 +++++++++++------- dlls/ole32/tests/marshal.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 120361a..759a683 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -375,22 +375,29 @@ static HRESULT WINAPI Proxy_MarshalInterface( if (SUCCEEDED(hr)) { STDOBJREF stdobjref = ifproxy->stdobjref; - ULONG cPublicRefs = ifproxy->refs; - ULONG cPublicRefsOld; - /* optimization - share out proxy's public references if possible - * instead of making new proxy do a roundtrip through the server */ - do + stdobjref.cPublicRefs = 0; + + if ((mshlflags != MSHLFLAGS_TABLEWEAK) && + (mshlflags != MSHLFLAGS_TABLESTRONG)) { - ULONG cPublicRefsNew; - cPublicRefsOld = cPublicRefs; - stdobjref.cPublicRefs = cPublicRefs / 2; - cPublicRefsNew = cPublicRefs - stdobjref.cPublicRefs; - cPublicRefs = InterlockedCompareExchange( - (LONG *)&ifproxy->refs, cPublicRefsNew, cPublicRefsOld); - } while (cPublicRefs != cPublicRefsOld); - - if (!stdobjref.cPublicRefs) + ULONG cPublicRefs = ifproxy->refs; + ULONG cPublicRefsOld; + /* optimization - share out proxy's public references if possible + * instead of making new proxy do a roundtrip through the server */ + do + { + ULONG cPublicRefsNew; + cPublicRefsOld = cPublicRefs; + stdobjref.cPublicRefs = cPublicRefs / 2; + cPublicRefsNew = cPublicRefs - stdobjref.cPublicRefs; + cPublicRefs = InterlockedCompareExchange( + (LONG *)&ifproxy->refs, cPublicRefsNew, cPublicRefsOld); + } while (cPublicRefs != cPublicRefsOld); + } + + /* normal and table-strong marshaling need at least one reference */ + if (!stdobjref.cPublicRefs && (mshlflags != MSHLFLAGS_TABLEWEAK)) { IRemUnknown *remunk; hr = proxy_manager_get_remunknown(This, &remunk); @@ -399,11 +406,16 @@ static HRESULT WINAPI Proxy_MarshalInterface( HRESULT hrref = S_OK; REMINTERFACEREF rif; rif.ipid = ifproxy->stdobjref.ipid; - rif.cPublicRefs = NORMALEXTREFS; + rif.cPublicRefs = (mshlflags == MSHLFLAGS_TABLESTRONG) ? 1 : NORMALEXTREFS; rif.cPrivateRefs = 0; hr = IRemUnknown_RemAddRef(remunk, 1, &rif, &hrref); if (hr == S_OK && hrref == S_OK) - stdobjref.cPublicRefs = rif.cPublicRefs; + { + /* table-strong marshaling doesn't give the refs to the + * client that unmarshals the STDOBJREF */ + if (mshlflags != MSHLFLAGS_TABLESTRONG) + stdobjref.cPublicRefs = rif.cPublicRefs; + } else ERR("IRemUnknown_RemAddRef returned with 0x%08x, hrref = 0x%08x\n", hr, hrref); } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 2ad02ee..843b220 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -609,6 +609,112 @@ static void test_proxy_marshal_and_unmarshal2(void) end_host_object(tid, thread); } +/* tests success case of an interthread marshal and then table-weak-marshaling the proxy */ +static void test_proxy_marshal_and_unmarshal_weak(void) +{ + HRESULT hr; + IStream *pStream = NULL; + IUnknown *pProxy = NULL; + IUnknown *pProxy2 = NULL; + DWORD tid; + HANDLE thread; + + cLocks = 0; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok_ole_success(hr, CreateStreamOnHGlobal); + tid = start_host_object(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &thread); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy); + ok_ole_success(hr, CoUnmarshalInterface); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + /* marshal the proxy */ + hr = CoMarshalInterface(pStream, &IID_IClassFactory, pProxy, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLEWEAK); + ok_ole_success(hr, CoMarshalInterface); + + ok_more_than_one_lock(); + + /* release the original proxy to test that we successfully keep the + * original object alive */ + IUnknown_Release(pProxy); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy2); + todo_wine + ok(hr == CO_E_OBJNOTREG, "CoUnmarshalInterface should return CO_E_OBJNOTREG instead of 0x%08x\n", hr); + + ok_no_locks(); + + IStream_Release(pStream); + + end_host_object(tid, thread); +} + +/* tests success case of an interthread marshal and then table-strong-marshaling the proxy */ +static void test_proxy_marshal_and_unmarshal_strong(void) +{ + HRESULT hr; + IStream *pStream = NULL; + IUnknown *pProxy = NULL; + IUnknown *pProxy2 = NULL; + DWORD tid; + HANDLE thread; + + cLocks = 0; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok_ole_success(hr, CreateStreamOnHGlobal); + tid = start_host_object(pStream, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &thread); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy); + ok_ole_success(hr, CoUnmarshalInterface); + + ok_more_than_one_lock(); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + /* marshal the proxy */ + hr = CoMarshalInterface(pStream, &IID_IClassFactory, pProxy, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLESTRONG); + ok(hr == S_OK /* WinNT */ || hr == E_INVALIDARG /* Win9x */, + "CoMarshalInterface should have return S_OK or E_INVALIDARG instead of 0x%08x\n", hr); + if (FAILED(hr)) + { + IUnknown_Release(pProxy); + goto end; + } + + ok_more_than_one_lock(); + + /* release the original proxy to test that we successfully keep the + * original object alive */ + IUnknown_Release(pProxy); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy2); + ok_ole_success(hr, CoUnmarshalInterface); + + ok_more_than_one_lock(); + + IUnknown_Release(pProxy2); + + ok_more_than_one_lock(); + +end: + IStream_Release(pStream); + + end_host_object(tid, thread); + + ok_no_locks(); +} + /* tests that stubs are released when the containing apartment is destroyed */ static void test_marshal_stub_apartment_shutdown(void) { @@ -2750,6 +2856,8 @@ START_TEST(marshal) test_interthread_marshal_and_unmarshal(); test_proxy_marshal_and_unmarshal(); test_proxy_marshal_and_unmarshal2(); + test_proxy_marshal_and_unmarshal_weak(); + test_proxy_marshal_and_unmarshal_strong(); test_marshal_stub_apartment_shutdown(); test_marshal_proxy_apartment_shutdown(); test_marshal_proxy_mta_apartment_shutdown();

1 0

Mikołaj Zalewski : xcopy: Add Polish translation.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 4266bf0869f596b180fedbffa8b13baad494da62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4266bf0869f596b180fedbffa… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon May 21 22:54:04 2007 +0200 xcopy: Add Polish translation. --- programs/xcopy/Pl.rc | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ programs/xcopy/rsrc.rc | 1 + 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/programs/xcopy/Pl.rc b/programs/xcopy/Pl.rc new file mode 100644 index 0000000..10176aa --- /dev/null +++ b/programs/xcopy/Pl.rc @@ -0,0 +1,79 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Polish language support + * + * Copyright (C) 2007 J. Edmeades + * Copyright (C) 2007 Mikolaj Zalewski + * + * 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_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Niew�a�ciwa liczba parametr�w - uruchom xcopy /? aby wy�wietli� pomoc\n" + STRING_INVPARM, "Nieznany parameter '%s' - uruchom xcopy /? aby wy�wietli� pomoc\n" + STRING_PAUSE, "Naci�nij <enter> aby rozpocz�� kopiowanie\n" + STRING_SIMCOPY, "%d plik(�w) zosta�oby skopiowanych\n" + STRING_COPY, "%d plik(�w) skopiowanych\n" + STRING_QISDIR, "Czy '%s' jest nazw� pliku czy katalogu\n" \ + "docelowego?\n" \ + "(P - plik, K - katalog)\n" + STRING_SRCPROMPT,"%s? (Tak|Nie)\n" + STRING_OVERWRITE,"Zast�pi� %s? (Tak|Nie|Wszystkie)\n" + STRING_COPYFAIL, "Kopiowanie '%s' do '%s' nie powiod�o si� - kod b��du %d\n" + STRING_OPENFAIL, "Nie uda�o si� otworzy� '%s'\n" + STRING_READFAIL, "B��d podczas czytania '%s'\n" + STRING_YES_CHAR, "T" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "W" + STRING_FILE_CHAR,"P" + STRING_DIR_CHAR, "K" + + STRING_HELP, +"XCOPY - kopiuje pliki lub drzewa katalog�w\n\ +\n\ +Sk�adnia:\n\ +XCOPY �r�d�o [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Gdzie:\n\ +\n\ +[/I] Je�eli \"cel\" nie istnieje i kopiowane s� co najmniej dwa pliki,\n\ +\tzak�ada, �e \"cel\" powien by� katalogiem\n\ +[/S] Kopiuje katalogi i podkatalogi\n\ +[/E] Kopiuje katalogi i podkatalogi, ��cznie z pustymi\n\ +[/Q] Nie wypisuje nazw plik�w podczas kopiowania (tryb cichy)\n\ +[/F] Wypisuje pe�ne �cie�ki �r�d�owe i docelowe podczas kopiowania\n\ +[/L] Jedynie symuluje operacj�, pokazuj�c pliki, kt�re by�yby kopiowane\n\ +[/W] Prosi o potwierdzenie przed rozpocz�ciem kopiowania\n\ +[/T] Tworzy puste katalogi, ale nie kopiuje plik�w\n\ +[/Y] Zast�puje pliki bez pro�by o potwierdzenie\n\ +[/-Y] Zawsze prosi o potwierdzenie przed zast�pieniem pliku\n\ +[/P] Prosi o potwierdzenie przed skopiowaniem ka�dego pliku\n\ +[/N] Kopiuje u�ywaj�c kr�tkich nazw plik�w\n\ +[/U] Kopiuje tylko pliki, kt�re ju� istniej� w miejscu docelowym\n\ +[/R] Zast�puje pliki tylko do odczytu\n\ +[/H] Kopiuje r�wnie� pliki ukryte i systemowe\n\ +[/C] Kontynuuje nawet je�eli podczas kopiowania wyst�pi�y b��dy\n\ +[/A] Kopiuje tylko pliki z atrybutem archiwalny\n\ +[/M] Kopiuje tylko pliki z atrybutem archiwalny i usuwa ten atrybut\n\ +[/D | /D:m-d-y] Kopiuje tylko nowe pliki lub te zmodifikowane po podanej dacie.\n\ +\t\tJe�eli nie podano �adnej daty, to kopiowane s� pliki, kt�re s�\n\ +\t\tnowsze ni� w katalogu docelowym\n\n" + +} diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc index 2742d8f..1f7882c 100644 --- a/programs/xcopy/rsrc.rc +++ b/programs/xcopy/rsrc.rc @@ -22,4 +22,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" +#include "Pl.rc" #include "Ru.rc"

1 0

Andrew Talbot : winealsa.drv: Exclude unused headers.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: bf76e754e5e059da1ef54e27c0295078b03955a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf76e754e5e059da1ef54e27c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 21 20:37:38 2007 +0100 winealsa.drv: Exclude unused headers. --- dlls/winealsa.drv/dsoutput.c | 1 - dlls/winealsa.drv/mixer.c | 1 - dlls/winealsa.drv/wavein.c | 1 - dlls/winealsa.drv/waveout.c | 1 - 4 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 1b0c550..671ca38 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -50,7 +50,6 @@ #include "wingdi.h" #include "winerror.h" #include "winuser.h" -#include "winnls.h" #include "mmddk.h" #include "alsa.h" diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index c1dab51..83c82b7 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -42,7 +42,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winerror.h" #include "winuser.h" #include "winnls.h" #include "mmddk.h" diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 97b8e5a..5d731eb 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -48,7 +48,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winerror.h" #include "winuser.h" #include "winnls.h" #include "mmddk.h" diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 786d3c1..18919b5 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -48,7 +48,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winerror.h" #include "winuser.h" #include "winnls.h" #include "mmddk.h"

1 0

Detlef Riekenberg : serialui/tests: Remove unused string.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: b89e36eb59a8edc291c44dcb119556fa0e5ad441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89e36eb59a8edc291c44dcb1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 21 18:01:49 2007 +0200 serialui/tests: Remove unused string. --- dlls/serialui/tests/confdlg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/serialui/tests/confdlg.c b/dlls/serialui/tests/confdlg.c index 18cf90d..87a83ec 100644 --- a/dlls/serialui/tests/confdlg.c +++ b/dlls/serialui/tests/confdlg.c @@ -44,7 +44,6 @@ static const CHAR str_colonA[] = ":"; static const WCHAR com1W[] = {'c','o','m','1',0}; static const WCHAR emptyW[] = {0}; -static const WCHAR fmt_comW[] = {'c','o','m','%','d',0}; static const WCHAR str_colonW[] = {':',0}; /* ################# */

1 0

Detlef Riekenberg : localui/tests: Add tests for ConfigurePortUI.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 3124e1c3b7deed2a5636ba53f197166cb11b892c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3124e1c3b7deed2a5636ba53f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 21 17:57:23 2007 +0200 localui/tests: Add tests for ConfigurePortUI. --- dlls/localui/tests/Makefile.in | 2 +- dlls/localui/tests/localui.c | 175 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 175 insertions(+), 2 deletions(-) diff --git a/dlls/localui/tests/Makefile.in b/dlls/localui/tests/Makefile.in index 191a312..8532af8 100644 --- a/dlls/localui/tests/Makefile.in +++ b/dlls/localui/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = localui.dll -IMPORTS = kernel32 +IMPORTS = kernel32 winspool CTESTS = \ localui.c diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index e3a1813..414d8d3 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -20,11 +20,13 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" #include "winerror.h" #include "wingdi.h" +#include "winnls.h" #include "winreg.h" #include "winspool.h" @@ -42,6 +44,51 @@ static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); +static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; +static WCHAR emptyW[] = {0}; +static CHAR fmt_comA[] = {'C','O','M','%','u',':',0}; +static CHAR fmt_lptA[] = {'L','P','T','%','u',':',0}; +static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; + +static LPBYTE pi_buffer; +static DWORD pi_numports; +static DWORD pi_needed; + +static PORT_INFO_2W * lpt_present; +static PORT_INFO_2W * com_present; +static PORT_INFO_2W * file_present; + +static LPWSTR lpt_absent; +static LPWSTR com_absent; + +/* ########################### */ + +static PORT_INFO_2W * find_portinfo2(LPWSTR pPort) +{ + PORT_INFO_2W * pi; + DWORD res; + + if (!pi_buffer) { + res = EnumPortsW(NULL, 2, NULL, 0, &pi_needed, &pi_numports); + pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); + SetLastError(0xdeadbeef); + res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports); + } + if (pi_buffer) { + pi = (PORT_INFO_2W *) pi_buffer; + res = 0; + while (pi_numports > res) { + if (lstrcmpiW(pi->pPortName, pPort) == 0) { + return pi; + } + pi++; + res++; + } + } + return NULL; +} + + /* ########################### */ static LPCSTR load_functions(void) @@ -59,6 +106,96 @@ static LPCSTR load_functions(void) return NULL; } +/* ########################### + * strdupW [internal] + */ + +static LPWSTR strdupW(LPCWSTR strW) +{ + LPWSTR ptr; + + ptr = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(strW) + 1) * sizeof(WCHAR)); + if (ptr) { + lstrcpyW(ptr, strW); + } + return ptr; +} + +/* ########################### */ + +static void test_ConfigurePortUI(void) +{ + DWORD res; + + /* not present before w2k */ + if (!pConfigurePortUI) { + skip("ConfigurePortUI not found\n"); + return; + } + + SetLastError(0xdeadbeef); + res = pConfigurePortUI(NULL, NULL, NULL); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + + + SetLastError(0xdeadbeef); + res = pConfigurePortUI(NULL, NULL, emptyW); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + + + SetLastError(0xdeadbeef); + res = pConfigurePortUI(NULL, NULL, does_not_existW); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + + + if (winetest_interactive && lpt_present) { + SetLastError(0xdeadbeef); + res = pConfigurePortUI(NULL, NULL, lpt_present->pPortName); + ok( res || + (GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED), + "got %d with %u (expected '!= 0' or '0' with: ERROR_CANCELLED or " + "ERROR_ACCESS_DENIED)\n", res, GetLastError()); + } + + if (lpt_absent) { + SetLastError(0xdeadbeef); + res = pConfigurePortUI(NULL, NULL, lpt_absent); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + } + + if (winetest_interactive && com_present) { + SetLastError(0xdeadbeef); + res = pConfigurePortUI(NULL, NULL, com_present->pPortName); + ok( res || + (GetLastError() == ERROR_CANCELLED) || (GetLastError() == ERROR_ACCESS_DENIED), + "got %d with %u (expected '!= 0' or '0' with: ERROR_CANCELLED or " + "ERROR_ACCESS_DENIED)\n", res, GetLastError()); + } + + if (com_absent) { + SetLastError(0xdeadbeef); + res = pConfigurePortUI(NULL, NULL, com_absent); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + } + + if (winetest_interactive && file_present) { + SetLastError(0xdeadbeef); + res = pConfigurePortUI(NULL, NULL, portname_fileW); + ok( !res && (GetLastError() == ERROR_CANCELLED), + "got %d with %u (expected '0' with ERROR_CANCELLED)\n", + res, GetLastError()); + } +} /* ########################### */ @@ -66,7 +203,10 @@ START_TEST(localui) { LPCSTR ptr; DWORD numentries; - + PORT_INFO_2W * pi2; + WCHAR bufferW[16]; + CHAR bufferA[16]; + DWORD id; /* localui.dll does not exist before w2k */ ptr = load_functions(); @@ -88,4 +228,37 @@ START_TEST(localui) } } + /* find installed Ports */ + + id = 0; + /* "LPT1:" - "LPT9:" */ + while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { + id++; + sprintf(bufferA, fmt_lptA, id); + MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + pi2 = find_portinfo2(bufferW); + if (pi2 && (lpt_present == NULL)) lpt_present = pi2; + if (!pi2 && (lpt_absent == NULL)) lpt_absent = strdupW(bufferW); + } + + id = 0; + /* "COM1:" - "COM9:" */ + while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { + id++; + sprintf(bufferA, fmt_comA, id); + MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) ); + pi2 = find_portinfo2(bufferW); + if (pi2 && (com_present == NULL)) com_present = pi2; + if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); + } + + /* "FILE:" */ + file_present = find_portinfo2(portname_fileW); + + test_ConfigurePortUI(); + + /* cleanup */ + HeapFree(GetProcessHeap(), 0, lpt_absent); + HeapFree(GetProcessHeap(), 0, com_absent); + HeapFree(GetProcessHeap(), 0, pi_buffer); }

1 0

Francois Gouget : msvcrt: Remove the S_ISXXX() macros as they are not present in the Visual C++ headers.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 784693bb5a71478de81c6960f51e989a9d35125c URL: http://source.winehq.org/git/wine.git/?a=commit;h=784693bb5a71478de81c6960f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 21 16:04:12 2007 +0200 msvcrt: Remove the S_ISXXX() macros as they are not present in the Visual C++ headers. --- dlls/msvcrt/tests/file.c | 2 +- include/msvcrt/sys/stat.h | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index d7d7676..9b5538f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -809,7 +809,7 @@ static void test_stat(void) { if (fstat(fd, &buf) == 0) { - if (S_ISREG(buf.st_mode)) + if ((buf.st_mode & _S_IFMT) == _S_IFREG) { ok(buf.st_dev == 0, "st_dev is %d, expected 0\n", buf.st_dev); ok(buf.st_dev == buf.st_rdev, "st_dev (%d) and st_rdev (%d) differ\n", diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index a81a9ec..9ab0edc 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -164,11 +164,6 @@ int _wstat64(const wchar_t*,struct _stat64*); #define S_IWRITE _S_IWRITE #define S_IEXEC _S_IEXEC -#define S_ISCHR(m) (((m)&_S_IFMT) == _S_IFCHR) -#define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR) -#define S_ISFIFO(m) (((m)&_S_IFMT) == _S_IFIFO) -#define S_ISREG(m) (((m)&_S_IFMT) == _S_IFREG) - static inline int fstat(int fd, struct stat* ptr) { return _fstat(fd, (struct _stat*)ptr); } static inline int stat(const char* path, struct stat* ptr) { return _stat(path, (struct _stat*)ptr); } #ifndef _UMASK_DEFINED

1 0