September 2010 - Wine-Commits

Austin English : widl: Fix compiler warnings on clang.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: b94bc5604a4132145c337911404743ec1ffda1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94bc5604a4132145c3379114… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Sep 16 05:12:40 2010 -0500 widl: Fix compiler warnings on clang. --- tools/widl/typegen.c | 52 +++++++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b94bc5604a4132145c337…

1 0

Piotr Caban : secur32: Prevent schannel tests from crashing on Windows NT.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: ab5218608688be91db6f96a1cab7382a2b14a4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5218608688be91db6f96a1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 17 23:58:19 2010 +0200 secur32: Prevent schannel tests from crashing on Windows NT. --- dlls/secur32/tests/schannel.c | 119 +++++++++++++++++++++------------------- 1 files changed, 62 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab5218608688be91db6f9…

1 0

Jacek Caban : mshtml: Added nsIHttpChannel:: VisitResponseHeaders implementation.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: d4071b56a1dbdee9afea990903e22915979f1436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4071b56a1dbdee9afea99090… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 17 18:33:10 2010 +0200 mshtml: Added nsIHttpChannel::VisitResponseHeaders implementation. --- dlls/mshtml/nsiface.idl | 11 ++++++++++- dlls/mshtml/nsio.c | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index d4ab0b7..c7aaf88 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -107,7 +107,6 @@ interface nsISupports /* Currently we don't need a full declaration of these interfaces */ typedef nsISupports nsISHistory; typedef nsISupports nsIWidget; -typedef nsISupports nsIHttpHeaderVisitor; typedef nsISupports nsIDOMBarProp; typedef nsISupports nsIPrompt; typedef nsISupports nsIAuthPrompt; @@ -430,6 +429,16 @@ interface nsIChannel : nsIRequest [ object, + uuid(0cf40717-d7c1-4a94-8c1e-d6c9734101bb), + local +] +interface nsIHttpHeaderVisitor : nsISupports +{ + nsresult VisitHeader(const nsACString *aHeader, const nsACString *aValue); +} + +[ + object, uuid(9277fe09-f0cc-4cd9-bbce-581dd94b0260), local ] diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 08d3c06..a157a4c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -419,6 +419,38 @@ static nsresult set_channel_http_header(struct list *headers, const nsACString * return SUCCEEDED(hres) ? NS_OK : NS_ERROR_UNEXPECTED; } +static nsresult visit_http_headers(struct list *headers, nsIHttpHeaderVisitor *visitor) +{ + nsACString header_str, value_str; + char *header, *value; + http_header_t *iter; + nsresult nsres; + + LIST_FOR_EACH_ENTRY(iter, headers, http_header_t, entry) { + header = heap_strdupWtoA(iter->header); + if(!header) + return NS_ERROR_OUT_OF_MEMORY; + + value = heap_strdupWtoA(iter->data); + if(!value) { + heap_free(header); + return NS_ERROR_OUT_OF_MEMORY; + } + + nsACString_InitDepend(&header_str, header); + nsACString_InitDepend(&value_str, value); + nsres = nsIHttpHeaderVisitor_VisitHeader(visitor, &header_str, &value_str); + nsACString_Finish(&header_str); + nsACString_Finish(&value_str); + heap_free(header); + heap_free(value); + if(NS_FAILED(nsres)) + break; + } + + return NS_OK; +} + static void free_http_headers(struct list *list) { http_header_t *iter, *iter_next; @@ -1211,9 +1243,9 @@ static nsresult NSAPI nsChannel_VisitResponseHeaders(nsIHttpChannel *iface, { nsChannel *This = NSCHANNEL_THIS(iface); - FIXME("(%p)->(%p)\n", This, aVisitor); + TRACE("(%p)->(%p)\n", This, aVisitor); - return NS_ERROR_NOT_IMPLEMENTED; + return visit_http_headers(&This->response_headers, aVisitor); } static nsresult NSAPI nsChannel_IsNoStoreResponse(nsIHttpChannel *iface, PRBool *_retval)

1 0

Brad Smith : ntll: Fix the detection of the number of CPUs for OpenBSD.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: 466b64032f733777b517828f3fc141a77feb3cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=466b64032f733777b517828f3… Author: Brad Smith <brad(a)comstyle.com> Date: Fri Sep 17 20:38:51 2010 -0400 ntll: Fix the detection of the number of CPUs for OpenBSD. --- dlls/ntdll/nt.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ee50921..0f37def 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1191,15 +1191,16 @@ void fill_cpu_info(void) } #elif defined (__OpenBSD__) { - int mib[2], num; + int mib[2], num, ret; size_t len; mib[0] = CTL_HW; mib[1] = HW_NCPU; len = sizeof(num); - num = sysctl(mib, 2, &num, &len, NULL, 0); - NtCurrentTeb()->Peb->NumberOfProcessors = num; + ret = sysctl(mib, 2, &num, &len, NULL, 0); + if (!ret) + NtCurrentTeb()->Peb->NumberOfProcessors = num; } #elif defined (__APPLE__) {

1 0

Łukasz Wojniłowicz : mshtml: Update the Polish translation.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: 8b3d314a687c27c000cc6acb3eaa4b4d933ecc51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3d314a687c27c000cc6acb3… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Sep 17 10:02:20 2010 +0200 mshtml: Update the Polish translation. --- dlls/mshtml/Pl.rc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Pl.rc b/dlls/mshtml/Pl.rc index 9e0a635..f071bd8 100644 --- a/dlls/mshtml/Pl.rc +++ b/dlls/mshtml/Pl.rc @@ -24,6 +24,12 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE { + IDS_STATUS_DONE "Sko�czone" + IDS_STATUS_DOWNLOADINGFROM "Pobieranie od %s..." +} + +STRINGTABLE +{ IDS_HTMLDISABLED "Wy�wietlanie HTML jest aktualnie wy��czone." IDS_HTMLDOCUMENT "Dokument HTML" IDS_DOWNLOADING "Pobieranie plik�w..."

1 0

Luca Bennati : winecfg: Fix Italian translation.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: d9e4bcc88cc41f3b622f8cdbe9055c4a9bbf78aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e4bcc88cc41f3b622f8cdbe… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Sep 17 10:24:30 2010 +0200 winecfg: Fix Italian translation. --- programs/winecfg/It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 78f60d4..34f71e9 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -60,7 +60,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Impostazioni delle applicazioni",IDC_STATIC, 8,4,244,210 LTEXT "Wine può simulare diverse versioni e stili di Windows per ogni applicazione. Questo tab è collegato ai tab Librerie e Grafica per permetterti di cambiare le impostazioni a livello di sistema o per applicazione pure in quelle tab.", - IDC_STATIC,15,20,227,30 + IDC_STATIC,15,15,235,33 CONTROL "Applicazioni",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,120 PUSHBUTTON "&Aggiungi applicazione...",IDC_APP_ADDAPP, 80,174,85,14

1 0

Alexandre Goujon : quartz: avisplitter Fix query interface test.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: 19a0350bde8543b9d977e7105d37fa549a379897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19a0350bde8543b9d977e7105… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Fri Sep 17 16:33:14 2010 +0200 quartz: avisplitter Fix query interface test. --- dlls/quartz/parser.c | 13 +++-------- dlls/quartz/tests/avisplitter.c | 40 ++++++++++++++++---------------------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index da5e9d3..f95d3e7 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -114,16 +114,11 @@ HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaFilter)) + if ( IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IPersist) + || IsEqualIID(riid, &IID_IMediaFilter) + || IsEqualIID(riid, &IID_IBaseFilter) ) *ppv = This; - else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->mediaSeeking; if (*ppv) { diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 33a0d6d..3a0a9e2 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -89,29 +89,23 @@ static void test_query_interface(void) ULONG ref; IUnknown *iface= NULL; - hr = IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, - (void**)&iface); - - ok(hr == S_OK, - "IID_IBaseFilter should exist, got %08x!\n", GetLastError()); - if (hr == S_OK) - { - ref = IUnknown_Release(iface); - iface = NULL; - ok(ref == 1, "Reference is %u, expected 1\n", ref); - } - - hr = IUnknown_QueryInterface(pAviSplitter, &IID_IMediaSeeking, - (void**)&iface); - if (hr == S_OK) - ref = IUnknown_Release(iface); - iface = NULL; - todo_wine ok(hr == E_NOINTERFACE, - "Query for IMediaSeeking returned: %08x\n", hr); - -/* These interfaces should not be present: - IID_IKsPropertySet, IID_IMediaPosition, IID_IQualityControl, IID_IQualProp -*/ +#define TEST_INTERFACE(riid,expected) do { \ + hr = IUnknown_QueryInterface(pAviSplitter, &riid, (void**)&iface); \ + ok( hr == expected, #riid" should %s got %08X\n", expected==S_OK ? "exist" : "not be present", GetLastError() ); \ + if (hr == S_OK) { \ + ref = IUnknown_Release(iface); \ + ok(ref == 1, "Reference is %u, expected 1\n", ref); \ + } \ + iface = NULL; \ + } while(0) + + TEST_INTERFACE(IID_IBaseFilter,S_OK); + TEST_INTERFACE(IID_IMediaSeeking,E_NOINTERFACE); + TEST_INTERFACE(IID_IKsPropertySet,E_NOINTERFACE); + TEST_INTERFACE(IID_IMediaPosition,E_NOINTERFACE); + TEST_INTERFACE(IID_IQualityControl,E_NOINTERFACE); + TEST_INTERFACE(IID_IQualProp,E_NOINTERFACE); +#undef TEST_INTERFACE } static void test_pin(IPin *pin)

1 0

Alexander Morozov : crypt32: Add a stub for CryptEncryptMessage.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: dfd3e2dcd55e31c9f3be1cdc324e8d48dfe7a8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd3e2dcd55e31c9f3be1cdc3… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Jul 5 14:23:35 2010 +0400 crypt32: Add a stub for CryptEncryptMessage. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/message.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index f531bf6..d9cd9a8 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -113,7 +113,7 @@ @ stub CryptDecryptMessage @ stdcall CryptEncodeObject(long str ptr ptr ptr) @ stdcall CryptEncodeObjectEx(long str ptr long ptr ptr ptr) -@ stub CryptEncryptMessage +@ stdcall CryptEncryptMessage(ptr long ptr ptr long ptr ptr) @ stub CryptEnumOIDFunction @ stdcall CryptEnumOIDInfo(long long ptr ptr) @ stub CryptEnumProvidersU diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 2d67e4c..b57c407 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -531,3 +531,14 @@ BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, CryptReleaseContext(hCryptProv, 0); return ret; } + +BOOL WINAPI CryptEncryptMessage(PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptPara, + DWORD cRecipientCert, PCCERT_CONTEXT rgpRecipientCert[], + const BYTE *pbToBeEncrypted, DWORD cbToBeEncrypted, BYTE *pbEncryptedBlob, + DWORD *pcbEncryptedBlob) +{ + FIXME("(%p, %d, %p, %p, %d, %p, %p): stub\n", pEncryptPara, cRecipientCert, + rgpRecipientCert, pbToBeEncrypted, cbToBeEncrypted, pbEncryptedBlob, + pcbEncryptedBlob); + return FALSE; +}

1 0

Igor Paliychuk : shell32: Ukrainian translation update.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: 4908e82fe3387dd0c005bd657c35f3adb35700aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4908e82fe3387dd0c005bd657… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Sep 17 13:05:58 2010 +0300 shell32: Ukrainian translation update. --- dlls/shell32/shell32_Uk.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Uk.rc b/dlls/shell32/shell32_Uk.rc index 6a1fce3..b79e746 100644 --- a/dlls/shell32/shell32_Uk.rc +++ b/dlls/shell32/shell32_Uk.rc @@ -275,14 +275,34 @@ STRINGTABLE IDS_COOKIES "Cookies" IDS_HISTORY "Local Settings\\History" IDS_PROGRAM_FILES "Program Files" + IDS_PROGRAM_FILESX86 "Program Files (x86)" IDS_MYPICTURES "�� " IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" + IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Common Files" IDS_COMMON_DOCUMENTS "��" IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" IDS_COMMON_MUSIC "��" IDS_COMMON_PICTURES "��" IDS_COMMON_VIDEO "Գ��" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_CONTACTS "��" + IDS_LINKS "��" + IDS_PHOTO_ALBUMS "��\\�� " + IDS_PLAYLISTS "��\\��" + IDS_PUBLIC_DOWNLOADS "��" + IDS_PUBLIC_GAME_TASKS "Microsoft\\Windows\\GameExplorer" + IDS_PUBLIC_LIBRARIES "Microsoft\\Windows\\Libraries" + IDS_PUBLIC_RINGTONES "Microsoft\\Windows\\Ringtones" + IDS_SAMPLE_MUSIC "��\\�� " + IDS_SAMPLE_PICTURES "��\\�� " + IDS_SAMPLE_PLAYLISTS "��\\�� " + IDS_SAMPLE_VIDEOS "Գ��\\�� ³��" + IDS_SAVED_GAMES "�� " + IDS_SAVED_SEARCHES "��" + IDS_USER_PROFILES "��" + IDS_COMMON_OEM_LINKS "OEM ��" + IDS_DOCUMENTS "��" + IDS_DOWNLOADS "��" IDS_NEWFOLDER "�� "

1 0

Łukasz Wojniłowicz : shdocvw: Update the Polish translation.
by Alexandre Julliard Sept. 18, 2010

Sept. 18, 2010

Module: wine Branch: master Commit: 477e65402aab99c3e36dcf253c0c486649acbc39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=477e65402aab99c3e36dcf253… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Sep 17 10:02:21 2010 +0200 shdocvw: Update the Polish translation. --- dlls/shdocvw/Pl.rc | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Pl.rc b/dlls/shdocvw/Pl.rc index 7a6ce31..55c0742 100644 --- a/dlls/shdocvw/Pl.rc +++ b/dlls/shdocvw/Pl.rc @@ -49,9 +49,38 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "Podgl�&d wydruku...", ID_BROWSE_PRINT_PREVIEW MENUITEM SEPARATOR MENUITEM "&W�a�ciwo�ci...", ID_BROWSE_PROPERTIES + MENUITEM "&Zamknij...", ID_BROWSE_QUIT + } + POPUP "&Widok" + { + POPUP "&Paski narz�dzi" + { + MENUITEM "Pasek &standardowy" ID_BROWSE_BAR_STD + MENUITEM "&Pasek adresu" ID_BROWSE_BAR_ADDR + } + } + POPUP "&Ulubione" + { + MENUITEM "&Dodaj do ulubionych..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR } POPUP "&Pomoc" { MENUITEM "&O Internet Explorer...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Wstecz" + IDS_TB_FORWARD "Dalej" + IDS_TB_STOP "Zatrzymaj" + IDS_TB_REFRESH "Od�wierz" + IDS_TB_HOME "Strona g��wna" + IDS_TB_PRINT "Drukuj" +} + +STRINGTABLE +{ + IDS_ADDRESS "Adres" +}

1 0