January 2011 - Wine-commits

Thomas Mullaly : urlmon/tests: Added CoInternetGetSecurityUrlEx tests.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 312bfb1042b73947d78daf093a9edf36046ee2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=312bfb1042b73947d78daf093… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jan 16 14:36:24 2011 -0500 urlmon/tests: Added CoInternetGetSecurityUrlEx tests. --- dlls/urlmon/sec_mgr.c | 5 ++ dlls/urlmon/tests/sec_mgr.c | 149 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 7e8d02b..547f735 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1332,6 +1332,11 @@ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUA */ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION psuAction, DWORD_PTR dwReserved) { + TRACE("(%p,%p,%u,%u)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); + + if(!pUri || !ppSecUri) + return E_INVALIDARG; + FIXME("(%p,%p,%u,%u)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); return E_NOTIMPL; } diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index f6e4abd..5d6dca3 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -39,6 +39,8 @@ static HRESULT (WINAPI *pCoInternetCreateSecurityManager)(IServiceProvider *, IInternetSecurityManager**, DWORD); static HRESULT (WINAPI *pCoInternetCreateZoneManager)(IServiceProvider *, IInternetZoneManager**, DWORD); static HRESULT (WINAPI *pCoInternetGetSecurityUrl)(LPCWSTR, LPWSTR*, PSUACTION, DWORD); +static HRESULT (WINAPI *pCoInternetGetSecurityUrlEx)(IUri*, IUri**, PSUACTION, DWORD_PTR); +static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); static const WCHAR url1[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l', '/','b','l','a','n','k','.','h','t','m',0}; @@ -104,6 +106,31 @@ static int strcmp_w(const WCHAR *str1, const WCHAR *str2) return memcmp(str1, str2, len1*sizeof(WCHAR)); } +static inline void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +static inline LPWSTR a2w(LPCSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + +static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { + LPWSTR strAW = a2w(strA); + DWORD ret = lstrcmpW(strAW, strB); + heap_free(strAW); + return ret; +} + static void test_SecurityManager(void) { int i; @@ -683,6 +710,120 @@ static void test_InternetGetSecurityUrl(void) } } +static const struct { + const char *uri; + DWORD create_flags; + const char *security_uri; + HRESULT security_hres; + const char *default_uri; + HRESULT default_hres; + BOOL todo; +} sec_url_ex_tests[] = { + {"index.htm",Uri_CREATE_ALLOW_RELATIVE,"*:index.html",S_OK,"*:index.htm",S_OK,TRUE}, + {"file://c:\\Index.htm",Uri_CREATE_FILE_USE_DOS_PATH,"file:///c:/Index.htm",S_OK,"file:///c:/Index.htm",S_OK,TRUE}, + {"file:some%20file%2ejpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG,TRUE}, + {"http://www.zone3.winetest/",0,"http://www.zone3.winetest/",S_OK,"http://www.zone3.winetest/",S_OK,TRUE}, + {"about:blank",0,"about:blank",S_OK,"about:blank",S_OK,TRUE}, + {"ftp://zone3.winetest/file.test",0,"ftp://zone3.winetest/file.test",S_OK,"ftp://zone3.winetest/file.test",S_OK,TRUE}, + {"test:123abc",0,"test:123abc",S_OK,"test:123abc",S_OK,TRUE}, + {"http:google.com/test.file",0,"http:google.com/test.file",S_OK,"http:google.com/test.file",S_OK,TRUE}, + {"ftp://test(a)ftp.winehq.org/",0,"ftp://ftp.winehq.org/",S_OK,"ftp://ftp.winehq.org/",S_OK,TRUE}, + {"test://google(a)ftp.winehq.org/",0,"test://google(a)ftp.winehq.org/",S_OK,"test://google(a)ftp.winehq.org/",S_OK,TRUE} +}; + +static void test_InternetGetSecurityUrlEx(void) +{ + HRESULT hr; + DWORD i; + IUri *uri = NULL, *result = NULL; + + hr = pCoInternetGetSecurityUrlEx(NULL, NULL, PSU_DEFAULT, 0); + ok(hr == E_INVALIDARG, "CoInternetGetSecurityUrlEx returned 0x%08x, expected E_INVALIDARG\n", hr); + + result = (void*) 0xdeadbeef; + hr = pCoInternetGetSecurityUrlEx(NULL, &result, PSU_DEFAULT, 0); + ok(hr == E_INVALIDARG, "CoInternetGetSecurityUrlEx returned 0x%08x, expected E_INVALIDARG\n", hr); + ok(result == (void*) 0xdeadbeef, "'result' was %p\n", result); + + for(i = 0; i < sizeof(sec_url_ex_tests)/sizeof(sec_url_ex_tests[0]); ++i) { + LPWSTR uriW = a2w(sec_url_ex_tests[i].uri); + uri = NULL; + + hr = pCreateUri(uriW, sec_url_ex_tests[i].create_flags, 0, &uri); + ok(hr == S_OK, "CreateUri returned 0x%08x on test %d\n", hr, i); + if(hr == S_OK) { + result = NULL; + + hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_DEFAULT, 0); + if(sec_url_ex_tests[i].todo) { + todo_wine + ok(hr == sec_url_ex_tests[i].default_hres, + "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", + hr, sec_url_ex_tests[i].default_hres, i); + } else { + ok(hr == sec_url_ex_tests[i].default_hres, + "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", + hr, sec_url_ex_tests[i].default_hres, i); + } + if(SUCCEEDED(hr)) { + BSTR received; + + hr = IUri_GetDisplayUri(result, &received); + ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); + if(hr == S_OK) { + if(sec_url_ex_tests[i].todo) { + todo_wine + ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, + wine_dbgstr_w(received), i); + } else { + ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, + wine_dbgstr_w(received), i); + } + } + SysFreeString(received); + } + if(result) IUri_Release(result); + + result = NULL; + hr = pCoInternetGetSecurityUrlEx(uri, &result, PSU_SECURITY_URL_ONLY, 0); + if(sec_url_ex_tests[i].todo) { + todo_wine + ok(hr == sec_url_ex_tests[i].default_hres, + "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", + hr, sec_url_ex_tests[i].default_hres, i); + } else { + ok(hr == sec_url_ex_tests[i].default_hres, + "CoInternetGetSecurityUrlEx returned 0x%08x, expected 0x%08x on test %d\n", + hr, sec_url_ex_tests[i].default_hres, i); + } + if(SUCCEEDED(hr)) { + BSTR received; + + hr = IUri_GetDisplayUri(result, &received); + ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); + if(hr == S_OK) { + if(sec_url_ex_tests[i].todo) { + todo_wine + ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, + wine_dbgstr_w(received), i); + } else { + ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, + wine_dbgstr_w(received), i); + } + } + SysFreeString(received); + } + if(result) IUri_Release(result); + } + + if(uri) IUri_Release(uri); + heap_free(uriW); + } +} START_TEST(sec_mgr) { @@ -692,6 +833,8 @@ START_TEST(sec_mgr) pCoInternetCreateSecurityManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateSecurityManager"); pCoInternetCreateZoneManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateZoneManager"); pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl"); + pCoInternetGetSecurityUrlEx = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrlEx"); + pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); if (!pCoInternetCreateSecurityManager || !pCoInternetCreateZoneManager || !pCoInternetGetSecurityUrl) { @@ -702,6 +845,12 @@ START_TEST(sec_mgr) OleInitialize(NULL); test_InternetGetSecurityUrl(); + + if(!pCoInternetGetSecurityUrlEx || !pCreateUri) + win_skip("Skipping CoInternetGetSecurityUrlEx tests, IE too old\n"); + else + test_InternetGetSecurityUrlEx(); + test_SecurityManager(); test_polices(); test_CoInternetCreateZoneManager();

1 0

Erich Hoover : hhctrl.ocx: Add better bitmaps for some toolbar buttons.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: d127f0087a93384aef10daf45b33e3a46fadd90a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d127f0087a93384aef10daf45… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jan 20 10:56:24 2011 -0700 hhctrl.ocx: Add better bitmaps for some toolbar buttons. --- dlls/hhctrl.ocx/help.c | 56 +++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 4a0f78b..c75be78 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -761,10 +761,9 @@ static void TB_OnClick(HWND hWnd, DWORD dwID) } } -static void TB_AddButton(TBBUTTON *pButtons, DWORD dwIndex, DWORD dwID) +static void TB_AddButton(TBBUTTON *pButtons, DWORD dwIndex, DWORD dwID, DWORD dwBitmap) { - /* FIXME: Load the correct button bitmaps */ - pButtons[dwIndex].iBitmap = STD_PRINT; + pButtons[dwIndex].iBitmap = dwBitmap; pButtons[dwIndex].idCommand = dwID; pButtons[dwIndex].fsState = TBSTATE_ENABLED; pButtons[dwIndex].fsStyle = BTNS_BUTTON; @@ -774,12 +773,22 @@ static void TB_AddButton(TBBUTTON *pButtons, DWORD dwIndex, DWORD dwID) static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dwButtonFlags, LPDWORD pdwNumButtons) { + HWND hToolbar = pHHInfo->WinType.hwndToolBar; + int nHistBitmaps = 0, nStdBitmaps = 0; + TBADDBITMAP tbAB; + + tbAB.hInst = HINST_COMMCTRL; + tbAB.nID = IDB_HIST_LARGE_COLOR; + nHistBitmaps = SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbAB); + tbAB.nID = IDB_STD_LARGE_COLOR; + nStdBitmaps = SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbAB); + *pdwNumButtons = 0; if (dwButtonFlags & HHWIN_BUTTON_EXPAND) { - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_EXPAND); - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_CONTRACT); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_EXPAND, nHistBitmaps + HIST_VIEWTREE); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_CONTRACT, nHistBitmaps + HIST_VIEWTREE); if (pHHInfo->WinType.fNotExpanded) pButtons[1].fsState |= TBSTATE_HIDDEN; @@ -788,43 +797,44 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw } if (dwButtonFlags & HHWIN_BUTTON_BACK) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_BACK); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_BACK, nHistBitmaps + HIST_BACK); if (dwButtonFlags & HHWIN_BUTTON_FORWARD) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_FORWARD); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_FORWARD, nHistBitmaps + HIST_FORWARD); + /* FIXME: Load the correct button bitmaps */ if (dwButtonFlags & HHWIN_BUTTON_STOP) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_STOP); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_STOP, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_REFRESH) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_REFRESH); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_REFRESH, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_HOME) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_HOME); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_HOME, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_SYNC) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_SYNC); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_SYNC, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_OPTIONS) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_OPTIONS); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_OPTIONS, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_PRINT) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_PRINT); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_PRINT, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_JUMP1) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_JUMP1); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_JUMP1, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_JUMP2) - TB_AddButton(pButtons,(*pdwNumButtons)++, IDTB_JUMP2); + TB_AddButton(pButtons,(*pdwNumButtons)++, IDTB_JUMP2, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_ZOOM) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_ZOOM); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_ZOOM, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_TOC_NEXT) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_TOC_NEXT); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_TOC_NEXT, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_TOC_PREV) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_TOC_PREV); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_TOC_PREV, nStdBitmaps + STD_PRINT); } static BOOL HH_AddToolbar(HHInfo *pHHInfo) @@ -833,7 +843,6 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) HWND hwndParent = pHHInfo->WinType.hwndHelp; DWORD toolbarFlags; TBBUTTON buttons[IDTB_TOC_PREV - IDTB_EXPAND]; - TBADDBITMAP tbAB; DWORD dwStyles, dwExStyles; DWORD dwNumButtons, dwIndex; @@ -842,8 +851,6 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) else toolbarFlags = HHWIN_DEF_BUTTONS; - TB_AddButtonsFromFlags(pHHInfo, buttons, toolbarFlags, &dwNumButtons); - dwStyles = WS_CHILDWINDOW | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_WRAPABLE | TBSTYLE_TOOLTIPS | CCS_NODIVIDER; dwExStyles = WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; @@ -853,15 +860,13 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) hhctrl_hinstance, NULL); if (!hToolbar) return FALSE; + pHHInfo->WinType.hwndToolBar = hToolbar; SendMessageW(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(ICON_SIZE, ICON_SIZE)); SendMessageW(hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); SendMessageW(hToolbar, WM_SETFONT, (WPARAM)pHHInfo->hFont, TRUE); - /* FIXME: Load correct icons for all buttons */ - tbAB.hInst = HINST_COMMCTRL; - tbAB.nID = IDB_STD_LARGE_COLOR; - SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbAB); + TB_AddButtonsFromFlags(pHHInfo, buttons, toolbarFlags, &dwNumButtons); for (dwIndex = 0; dwIndex < dwNumButtons; dwIndex++) { @@ -877,7 +882,6 @@ static BOOL HH_AddToolbar(HHInfo *pHHInfo) SendMessageW(hToolbar, TB_AUTOSIZE, 0, 0); ShowWindow(hToolbar, SW_SHOW); - pHHInfo->WinType.hwndToolBar = hToolbar; return TRUE; }

1 0

Erich Hoover : hhctrl.ocx: Add some private toolbar bitmaps ( copied from shdocvw).
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 1115e320700cca5a2b523ad033da36d931d98e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1115e320700cca5a2b523ad03… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jan 20 11:01:03 2011 -0700 hhctrl.ocx: Add some private toolbar bitmaps (copied from shdocvw). --- dlls/hhctrl.ocx/Makefile.in | 2 + dlls/hhctrl.ocx/help.c | 15 ++- dlls/hhctrl.ocx/hhctrl.rc | 3 + dlls/hhctrl.ocx/hhtoolbar.bmp | Bin 0 -> 7034 bytes dlls/hhctrl.ocx/hhtoolbar.svg | 185 +++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/resource.h | 6 ++ 6 files changed, 206 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1115e320700cca5a2b523…

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 94aa08d2ecec362e9d98a0f3bbb6d75f686c4db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94aa08d2ecec362e9d98a0f3b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jan 20 17:04:18 2011 +0900 po: Update Korean translation. --- po/ko.po | 433 ++++++++++++++------------------------------------------------ 1 files changed, 98 insertions(+), 335 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=94aa08d2ecec362e9d98a…

1 0

Anders Jonsson : po: Update Swedish translation.
by Alexandre Julliard 21 Jan '11

21 Jan '11

Module: wine Branch: master Commit: 9c66f68f55beca6fc92315d40a73b41f12865353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c66f68f55beca6fc92315d40… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Thu Jan 20 21:02:23 2011 +0100 po: Update Swedish translation. --- po/sv.po | 349 +++++++++++++------------------------------------------------- 1 files changed, 72 insertions(+), 277 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c66f68f55beca6fc9231…

1 0

Alexandre Julliard : transl: Take into account the new naming of . mc output files.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: tools Branch: master Commit: 85faaac69fcc79951699c865d183e5bb5f17ec79 URL: http://source.winehq.org/git/tools.git/?a=commit;h=85faaac69fcc79951699c865… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 20 12:07:37 2011 +0100 transl: Take into account the new naming of .mc output files. --- transl/parse_resfiles.php | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/transl/parse_resfiles.php b/transl/parse_resfiles.php index ac62342..23eb191 100644 --- a/transl/parse_resfiles.php +++ b/transl/parse_resfiles.php @@ -25,12 +25,8 @@ function create_resfiles($dir, $files) continue; } - if (preg_match("/.mc$/", $file)) - { - $file .= ".rc"; - } - $targets .= preg_replace("/\.rc$/", ".res", $file). " "; - $objs .= "$objdir/$dir/" . preg_replace("/\.rc$/", ".res", $file) . " "; + $targets .= preg_replace("/\.[mr]c$/", ".res", $file). " "; + $objs .= "$objdir/$dir/" . preg_replace("/\.[mr]c$/", ".res", $file) . " "; } if ($targets == "") return;

1 0

Owen Rudge : dsound/tests: Add IEEE float buffer tests for dsound8.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 15d5311804bd65b1b6f94357a229ab0496797738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d5311804bd65b1b6f94357a… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Jan 20 15:41:59 2011 +0000 dsound/tests: Add IEEE float buffer tests for dsound8. --- dlls/dsound/tests/ds3d8.c | 7 ++++++- dlls/dsound/tests/dsound8.c | 33 +++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 7855fb3..aa72648 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -30,6 +30,8 @@ #include "wine/test.h" #include "dsound.h" #include "mmreg.h" +#include "ks.h" +#include "ksmedia.h" #include "dsound_test.h" static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; @@ -181,6 +183,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, DSBCAPS dsbcaps; WAVEFORMATEX wfx,wfx2; DWORD size,status,freq; + BOOL ieee = FALSE; int ref; /* DSOUND: Error: Invalid caps pointer */ @@ -214,10 +217,12 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, if (size == sizeof(WAVEFORMATEX)) { rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,size,NULL); + ieee = (wfx.wFormatTag == WAVE_FORMAT_IEEE_FLOAT); } else if (size == sizeof(WAVEFORMATEXTENSIBLE)) { WAVEFORMATEXTENSIBLE wfxe; rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,size,NULL); wfx = wfxe.Format; + ieee = IsEqualGUID(&wfxe.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); } ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); if (rc==DS_OK && winetest_debug > 1) { @@ -447,7 +452,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, ok(rc==DSERR_INVALIDPARAM, "IDirectSoundBuffer_Lock() should have " "returned DSERR_INVALIDPARAM, returned %08x\n", rc); - state.wave=wave_generate_la(&wfx,duration,&state.wave_len,FALSE); + state.wave=wave_generate_la(&wfx,duration,&state.wave_len,ieee); state.dsbo=*dsbo; state.wfx=&wfx; diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 5eb7c05..5561051 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -534,7 +534,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) DSCAPS dscaps; WAVEFORMATEX wfx, wfx2; int ref; - unsigned int f; + unsigned int f, tag; /* Create the DirectSound object */ rc=pDirectSoundCreate8(lpGuid,&dso,NULL); @@ -568,6 +568,11 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) if (rc==DS_OK && primary!=NULL) { for (f=0;f<NB_FORMATS;f++) { + for (tag=0;tag<NB_TAGS;tag++) { + /* if float, we only want to test 32-bit */ + if ((format_tags[tag] == WAVE_FORMAT_IEEE_FLOAT) && (formats[f][1] != 32)) + continue; + /* We must call SetCooperativeLevel to be allowed to call * SetFormat */ /* DSOUND: Setting DirectSound cooperative level to @@ -577,7 +582,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) if (rc!=DS_OK) goto EXIT; - init_format(&wfx,WAVE_FORMAT_PCM,formats[f][0],formats[f][1], + init_format(&wfx,format_tags[tag],formats[f][0],formats[f][1], formats[f][2]); wfx2=wfx; rc=IDirectSoundBuffer_SetFormat(primary,&wfx); @@ -621,9 +626,9 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx2; if (winetest_interactive) { - trace(" Testing a primary buffer at %dx%dx%d with a " + trace(" Testing a primary buffer at %dx%dx%d (fmt=%d) with a " "secondary buffer at %dx%dx%d\n", - wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels, + wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); } rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); @@ -639,6 +644,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " "should have 0\n",ref); } + } } ref=IDirectSoundBuffer_Release(primary); @@ -668,7 +674,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) DSBUFFERDESC bufdesc; DSCAPS dscaps; WAVEFORMATEX wfx, wfx1; - DWORD f; + DWORD f, tag; int ref; /* Create the DirectSound object */ @@ -708,8 +714,14 @@ static HRESULT test_secondary8(LPGUID lpGuid) goto EXIT1; for (f=0;f<NB_FORMATS;f++) { + for (tag=0;tag<NB_TAGS;tag++) { WAVEFORMATEXTENSIBLE wfxe; - init_format(&wfx,WAVE_FORMAT_PCM,formats[f][0],formats[f][1], + + /* if float, we only want to test 32-bit */ + if ((format_tags[tag] == WAVE_FORMAT_IEEE_FLOAT) && (formats[f][1] != 32)) + continue; + + init_format(&wfx,format_tags[tag],formats[f][0],formats[f][1], formats[f][2]); secondary=NULL; ZeroMemory(&bufdesc, sizeof(bufdesc)); @@ -748,7 +760,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) bufdesc.lpwfxFormat=(WAVEFORMATEX*)&wfxe; wfxe.Format = wfx; wfxe.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - wfxe.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); wfxe.Format.cbSize = 1; wfxe.Samples.wValidBitsPerSample = wfx.wBitsPerSample; wfxe.dwChannelMask = (wfx.nChannels == 1 ? KSAUDIO_SPEAKER_MONO : KSAUDIO_SPEAKER_STEREO); @@ -799,7 +811,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) secondary=NULL; } - wfxe.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + wfxe.SubFormat = (format_tags[tag] == WAVE_FORMAT_PCM ? KSDATAFORMAT_SUBTYPE_PCM : KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DS_OK && secondary, "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", @@ -854,9 +866,9 @@ static HRESULT test_secondary8(LPGUID lpGuid) if (rc==DS_OK && secondary!=NULL) { if (winetest_interactive) { - trace(" Testing a secondary buffer at %dx%dx%d " + trace(" Testing a secondary buffer at %dx%dx%d (fmt=%d) " "with a primary buffer at %dx%dx%d\n", - wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels, + wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,format_tags[tag], wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); } test_buffer8(dso,&secondary,0,FALSE,0,FALSE,0, @@ -866,6 +878,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " "should have 0\n",ref); } + } } EXIT1: ref=IDirectSoundBuffer_Release(primary);

1 0

Huw Davies : include: Add some more internet options.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 55f6f9ada43acef87b4ee10096997ac73e4e8e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f6f9ada43acef87b4ee1009… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 20 13:23:52 2011 +0000 include: Add some more internet options. --- include/wininet.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 0c98aa4..0cf453e 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -591,9 +591,13 @@ BOOLAPI InternetUnlockRequestFile(HANDLE); #define INTERNET_OPTION_CODEPAGE_PATH 100 #define INTERNET_OPTION_CODEPAGE_EXTRA 101 #define INTERNET_OPTION_IDN 102 +#define INTERNET_OPTION_MAX_CONNS_PER_PROXY 103 +#define INTERNET_OPTION_SUPPRESS_SERVER_AUTH 104 +#define INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT 105 + #define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK -#define INTERNET_LAST_OPTION INTERNET_OPTION_DATAFILE_EXT +#define INTERNET_LAST_OPTION INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT #define INTERNET_PRIORITY_FOREGROUND 1000 #define INTERNET_HANDLE_TYPE_INTERNET 1

1 0

Jacek Caban : mshtml: Forward nsIURL::[Get|Set]FilePath to nsIURI::[Get|Set ]Path.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: ba229eed59d12df9dc5a1c9bdd843ad9e77e5a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba229eed59d12df9dc5a1c9bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 20 12:21:20 2011 +0100 mshtml: Forward nsIURL::[Get|Set]FilePath to nsIURI::[Get|Set]Path. --- dlls/mshtml/nsio.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b6887fa..492f845 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2130,11 +2130,7 @@ static nsresult NSAPI nsURL_GetFilePath(nsIURL *iface, nsACString *aFilePath) TRACE("(%p)->(%p)\n", This, aFilePath); - if(This->nsurl) - return nsIURL_GetFilePath(This->nsurl, aFilePath); - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return nsIURL_GetPath(&This->nsIURL_iface, aFilePath); } static nsresult NSAPI nsURL_SetFilePath(nsIURL *iface, const nsACString *aFilePath) @@ -2143,13 +2139,7 @@ static nsresult NSAPI nsURL_SetFilePath(nsIURL *iface, const nsACString *aFilePa TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFilePath)); - if(This->nsurl) { - invalidate_uri(This); - return nsIURL_SetFilePath(This->nsurl, aFilePath); - } - - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return nsIURL_SetPath(&This->nsIURL_iface, aFilePath); } static nsresult NSAPI nsURL_GetParam(nsIURL *iface, nsACString *aParam)

1 0

Greg Geldorp : winhttp/tests: No reconnect on redirect when using proxy.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: f213cdbc4e0215be595c70f943142e0f63df6d4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f213cdbc4e0215be595c70f94… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 20 13:39:05 2011 +0100 winhttp/tests: No reconnect on redirect when using proxy. --- dlls/winhttp/tests/notification.c | 42 +++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index bd6db58..6c9142b 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -46,6 +46,7 @@ struct notification unsigned int status; /* status received */ int todo; int ignore; + int skipped_for_proxy; }; struct info @@ -58,6 +59,25 @@ struct info unsigned int line; }; +static BOOL proxy_active(void) +{ + WINHTTP_PROXY_INFO proxy_info; + BOOL active = FALSE; + + if (WinHttpGetDefaultProxyConfiguration(&proxy_info)) + { + active = (proxy_info.lpszProxy != NULL); + if (active) + GlobalFree((HGLOBAL) proxy_info.lpszProxy); + if (proxy_info.lpszProxyBypass != NULL) + GlobalFree((HGLOBAL) proxy_info.lpszProxyBypass); + } + else + active = FALSE; + + return active; +} + static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID buffer, DWORD buflen ) { BOOL status_ok, function_ok; @@ -88,6 +108,12 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW } } if (status_ok) info->index++; + if (proxy_active()) + { + while (info->test[info->index].skipped_for_proxy) + info->index++; + } + if (status & (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING)) { SetEvent( info->wait ); @@ -222,10 +248,10 @@ static const struct notification redirect_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, @@ -299,10 +325,10 @@ static const struct notification async_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0 },

1 0