March 2011 - wine-commits

Marcus Meissner : shdocvw: Removed useless array for NULL check (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: bde872f95e441a7c2e4949d182f2076720066303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde872f95e441a7c2e4949d18… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:17:15 2011 +0100 shdocvw: Removed useless array for NULL check (Coverity). --- dlls/shdocvw/iexplore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 9d8668e..aebe7c9 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -528,7 +528,7 @@ static LRESULT iewnd_OnNotify(InternetExplorer *This, WPARAM wparam, LPARAM lpar { NMCBEENDEDITW* info = (NMCBEENDEDITW*)lparam; - if(info->fChanged && info->iWhy == CBENF_RETURN && info->szText) + if(info->fChanged && info->iWhy == CBENF_RETURN) { VARIANT vt;

1 0

Marcus Meissner : shell32: Arrays are never NULL (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: c4571e827b351832c51d0b45d4f10bffc28e5c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4571e827b351832c51d0b45d… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:13:54 2011 +0100 shell32: Arrays are never NULL (Coverity). --- dlls/shell32/control.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 3be0494..ffe96ff 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -129,13 +129,13 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) but proper data in CPL_NEWINQUIRE. if we get an empty string or a null icon, see what we can get from CPL_NEWINQUIRE */ - if ((applet->info[i].szName == 0) || (lstrlenW(applet->info[i].szName) == 0)) + if (lstrlenW(applet->info[i].szName) == 0) info.idName = CPL_DYNAMIC_RES; /* zero-length szInfo may not be a buggy applet, but it doesn't hurt for us to check anyway */ - if ((applet->info[i].szInfo == 0) || (lstrlenW(applet->info[i].szInfo) == 0)) + if (lstrlenW(applet->info[i].szInfo) == 0) info.idInfo = CPL_DYNAMIC_RES; if (applet->info[i].hIcon == NULL)

1 0

Marcus Meissner : shell32: memset only gets character (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: edd696078fa0d60c70c8824751350b69d4174436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd696078fa0d60c70c882475… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Mar 15 02:07:45 2011 +0100 shell32: memset only gets character (Coverity). --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c17694b..3d9c959 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4063,7 +4063,7 @@ static HRESULT WINAPI fsbd_GetFindData_nul(IFileSystemBindData *fsbd, static HRESULT WINAPI fsbd_GetFindData_junk(IFileSystemBindData *fsbd, WIN32_FIND_DATAW *pfd) { - memset(pfd, 0xdeadbeef, sizeof(WIN32_FIND_DATAW)); + memset(pfd, 0xef, sizeof(WIN32_FIND_DATAW)); return S_OK; }

1 0

Marcus Meissner : d3dcompiler_43: Initialize a variable (Coverity).
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 1548c2b9853736f6d878c70fcf0142867bde4bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1548c2b9853736f6d878c70fc… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Mar 14 05:16:11 2011 +0100 d3dcompiler_43: Initialize a variable (Coverity). --- dlls/d3dcompiler_43/reflection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 3ebb6ec..4599535 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1203,7 +1203,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type DWORD temp; D3D11_SHADER_TYPE_DESC *desc; unsigned int i; - struct d3dcompiler_shader_reflection_type_member *members; + struct d3dcompiler_shader_reflection_type_member *members = NULL; HRESULT hr; DWORD member_offset;

1 0

Nikolay Sivov : msvcrt: Added _findnext32() implementation.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 82763983dcffb5b8a72f1076ea6a350fac2f0298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82763983dcffb5b8a72f1076e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 03:06:17 2011 +0300 msvcrt: Added _findnext32() implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c3dfa7d..7f6ac97 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -621,7 +621,7 @@ @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 -@ stub _findnext32 +@ cdecl _findnext32(long ptr) msvcrt._findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a615c0d..e4cf5cd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -462,7 +462,7 @@ @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 -@ stub _findnext32 +@ cdecl _findnext32(long ptr) msvcrt._findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6b3e766..515a6bd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -454,7 +454,7 @@ @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 -@ stub _findnext32 +@ cdecl _findnext32(long ptr) msvcrt._findnext32 @ stub _findnext32i64 @ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 712ffa9..fc7241f 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -542,6 +542,23 @@ int CDECL MSVCRT__findnext(MSVCRT_intptr_t hand, struct MSVCRT__finddata_t * ft) } /********************************************************************* + * _findnext32 (MSVCRT.@) + */ +int CDECL MSVCRT__findnext32(MSVCRT_intptr_t hand, struct MSVCRT__finddata32_t * ft) +{ + WIN32_FIND_DATAA find_data; + + if (!FindNextFileA((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_fttofd32(&find_data, ft); + return 0; +} + +/********************************************************************* * _wfindnext (MSVCRT.@) * * Unicode version of _findnext. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a4656a7..68eab2e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -416,6 +416,7 @@ @ cdecl _findfirst64i32(str ptr) MSVCRT__findfirst64i32 @ cdecl _findfirsti64(str ptr) MSVCRT__findfirsti64 @ cdecl _findnext(long ptr) MSVCRT__findnext +@ cdecl _findnext32(long ptr) MSVCRT__findnext32 @ cdecl _findnext64(long ptr) MSVCRT__findnext64 @ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64

1 0

Nikolay Sivov : msvcrt: Add _findfirst32() implementation.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: cd7f0962107f0630b72a2b9480394e660c983b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7f0962107f0630b72a2b948… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 03:01:43 2011 +0300 msvcrt: Add _findfirst32() implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1eca092..c3dfa7d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -617,7 +617,7 @@ @ cdecl -ret64 _filelengthi64(long) msvcrt._filelengthi64 @ cdecl _fileno(ptr) msvcrt._fileno @ cdecl _findclose(long) msvcrt._findclose -@ stub _findfirst32 +@ cdecl _findfirst32(str ptr) msvcrt._findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e7b26e7..a615c0d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -458,7 +458,7 @@ @ cdecl -ret64 _filelengthi64(long) msvcrt._filelengthi64 @ cdecl _fileno(ptr) msvcrt._fileno @ cdecl _findclose(long) msvcrt._findclose -@ stub _findfirst32 +@ cdecl _findfirst32(str ptr) msvcrt._findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9ba5bbc..6b3e766 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -450,7 +450,7 @@ @ cdecl -ret64 _filelengthi64(long) msvcrt._filelengthi64 @ cdecl _fileno(ptr) msvcrt._fileno @ cdecl _findclose(long) msvcrt._findclose -@ stub _findfirst32 +@ cdecl _findfirst32(str ptr) msvcrt._findfirst32 @ stub _findfirst32i64 @ cdecl _findfirst64(str ptr) msvcrt._findfirst64 @ cdecl _findfirst64i32(str ptr) msvcrt._findfirst64i32 diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index a5c4974..712ffa9 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -56,6 +56,26 @@ static void msvcrt_fttofd( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata_t strcpy(ft->name, fd->cFileName); } +/* INTERNAL: Translate WIN32_FIND_DATAA to finddata32_t */ +static void msvcrt_fttofd32( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata32_t* ft) +{ + DWORD dw; + + if (fd->dwFileAttributes == FILE_ATTRIBUTE_NORMAL) + ft->attrib = 0; + else + ft->attrib = fd->dwFileAttributes; + + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftCreationTime, &dw ); + ft->time_create = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastAccessTime, &dw ); + ft->time_access = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw ); + ft->time_write = dw; + ft->size = fd->nFileSizeLow; + strcpy(ft->name, fd->cFileName); +} + /* INTERNAL: Translate WIN32_FIND_DATAW to wfinddata_t */ static void msvcrt_wfttofd( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddata_t* ft) { @@ -326,6 +346,25 @@ MSVCRT_intptr_t CDECL MSVCRT__findfirst(const char * fspec, struct MSVCRT__findd } /********************************************************************* + * _findfirst32 (MSVCRT.@) + */ +MSVCRT_intptr_t CDECL MSVCRT__findfirst32(const char * fspec, struct MSVCRT__finddata32_t* ft) +{ + WIN32_FIND_DATAA find_data; + HANDLE hfind; + + hfind = FindFirstFileA(fspec, &find_data); + if (hfind == INVALID_HANDLE_VALUE) + { + msvcrt_set_errno(GetLastError()); + return -1; + } + msvcrt_fttofd32(&find_data, ft); + TRACE(":got handle %p\n", hfind); + return (MSVCRT_intptr_t)hfind; +} + +/********************************************************************* * _wfindfirst (MSVCRT.@) * * Unicode version of _findfirst. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 440eeb8..a4656a7 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -411,6 +411,7 @@ @ cdecl _fileno(ptr) MSVCRT__fileno @ cdecl _findclose(long) MSVCRT__findclose @ cdecl _findfirst(str ptr) MSVCRT__findfirst +@ cdecl _findfirst32(str ptr) MSVCRT__findfirst32 @ cdecl _findfirst64(str ptr) MSVCRT__findfirst64 @ cdecl _findfirst64i32(str ptr) MSVCRT__findfirst64i32 @ cdecl _findfirsti64(str ptr) MSVCRT__findfirsti64

1 0

Nikolay Sivov : msvcrt: Add __daylight() call export.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 78dc7af9ce625196f05179048acccfb6765e2731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78dc7af9ce625196f05179048… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 15 02:35:59 2011 +0300 msvcrt: Add __daylight() call export. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/time.c | 26 ++++++++++++++++++++++++++ 5 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1570fd4..1eca092 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -392,7 +392,7 @@ @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW -@ stub __daylight +@ cdecl __daylight() msvcrt.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ stub __dstbias diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 65f9510..e7b26e7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -205,7 +205,7 @@ @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW -@ stub __daylight +@ cdecl __daylight() msvcrt.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ stub __dstbias diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index badfe65..9ba5bbc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -202,7 +202,7 @@ @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW -@ stub __daylight +@ cdecl __daylight() msvcrt.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ stub __dstbias diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5d07736..440eeb8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -179,7 +179,7 @@ @ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long ptr long long long) @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) -# stub __daylight +@ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno # stub __dstbias diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index a56f53c..950042c 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -42,6 +42,8 @@ static errno_t (__cdecl *p_strtime_s)(char*,size_t); static errno_t (__cdecl *p_strdate_s)(char*,size_t); static errno_t (__cdecl *p_localtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_localtime64_s)(struct tm*, __time64_t*); +static int* (__cdecl *p__daylight)(void); +static int* (__cdecl *p___p__daylight)(void); static void init(void) { @@ -54,6 +56,8 @@ static void init(void) p_strdate_s = (void*)GetProcAddress(hmod, "_strdate_s"); p_localtime32_s = (void*)GetProcAddress(hmod, "_localtime32_s"); p_localtime64_s = (void*)GetProcAddress(hmod, "_localtime64_s"); + p__daylight = (void*)GetProcAddress(hmod, "__daylight"); + p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); } static int get_test_year(time_t *start) @@ -543,6 +547,27 @@ static void test_localtime64_s(void) tm.tm_isdst); } +static void test_daylight(void) +{ + int *ret1, *ret2; + + if (!p__daylight) + { + win_skip("__daylight() not available\n"); + return; + } + + if (!p___p__daylight) + { + win_skip("__p__daylight not available\n"); + return; + } + + ret1 = p__daylight(); + ret2 = p___p__daylight(); + ok(ret1 && ret1 == ret2, "got %p\n", ret1); +} + START_TEST(time) { init(); @@ -557,4 +582,5 @@ START_TEST(time) test_wstrtime(); test_localtime32_s(); test_localtime64_s(); + test_daylight(); }

1 0

Jacek Caban : wininet: Update remaining HttpOpenRequest to use the new hello.html location.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 71265980ff9e17536cb8826e2098d92d4a9c4531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71265980ff9e17536cb8826e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 00:35:14 2011 +0100 wininet: Update remaining HttpOpenRequest to use the new hello.html location. --- dlls/wininet/tests/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 980a809..477ae56 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1203,7 +1203,7 @@ static void test_http_cache(void) CloseHandle(file); /* Send the same request, requiring it to be retrieved from the cache */ - request = HttpOpenRequest(connect, "GET", "/hello.html", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + request = HttpOpenRequest(connect, "GET", "/tests/hello.html", NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n");

1 0

Jacek Caban : wininet: Release gzip_buffer when opening new connection.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: ec9660488106e89b6674d13ff3227ca1915dcec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9660488106e89b6674d13ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 00:08:34 2011 +0100 wininet: Release gzip_buffer when opening new connection. --- dlls/wininet/http.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5ae3e4d..b027af9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -258,7 +258,7 @@ static void init_gzip_stream(http_request_t *req) gzip_stream_t *gzip_stream; int index, zres; - gzip_stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(gzip_stream_t)); + gzip_stream = heap_alloc_zero(sizeof(gzip_stream_t)); gzip_stream->zstream.zalloc = wininet_zalloc; gzip_stream->zstream.zfree = wininet_zfree; @@ -276,6 +276,14 @@ static void init_gzip_stream(http_request_t *req) HTTP_DeleteCustomHeader(req, index); } +static void release_gzip_stream(http_request_t *req) +{ + if(!req->gzip_stream->end_of_data) + inflateEnd(&req->gzip_stream->zstream); + heap_free(req->gzip_stream); + req->gzip_stream = NULL; +} + #else static void init_gzip_stream(http_request_t *req) @@ -283,6 +291,10 @@ static void init_gzip_stream(http_request_t *req) ERR("gzip stream not supported, missing zlib.\n"); } +static void release_gzip_stream(http_request_t *req) +{ +} + #endif /* set the request content length based on the headers */ @@ -1605,13 +1617,8 @@ static void HTTPREQ_Destroy(object_header_t *hdr) HeapFree(GetProcessHeap(), 0, request->custHeaders[i].lpszValue); } -#ifdef HAVE_ZLIB - if(request->gzip_stream) { - if(!request->gzip_stream->end_of_data) - inflateEnd(&request->gzip_stream->zstream); - HeapFree(GetProcessHeap(), 0, request->gzip_stream); - } -#endif + if(request->gzip_stream) + release_gzip_stream(request); HeapFree(GetProcessHeap(), 0, request->custHeaders); } @@ -4997,6 +5004,8 @@ static DWORD HTTP_OpenConnection(http_request_t *request) lend: request->read_pos = request->read_size = 0; request->read_chunked = FALSE; + if(request->gzip_stream) + release_gzip_stream(request); TRACE("%d <--\n", res); return res;

1 0

Michael Stefaniuc : d3d8: COM cleanup in shader.c.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: bc6786d0e540d162ad1cc5eb6b4d1ab8b65569f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc6786d0e540d162ad1cc5eb6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 23:29:09 2011 +0100 d3d8: COM cleanup in shader.c. --- dlls/d3d8/d3d8_private.h | 6 +++--- dlls/d3d8/device.c | 4 ++-- dlls/d3d8/shader.c | 22 ++++++++++++++++------ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 59b851a..b577ea5 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -484,8 +484,8 @@ DECLARE_INTERFACE_(IDirect3DPixelShader8,IUnknown) */ struct IDirect3DVertexShader8Impl { - const IDirect3DVertexShader8Vtbl *lpVtbl; - LONG ref; + IDirect3DVertexShader8 IDirect3DVertexShader8_iface; + LONG ref; IDirect3DVertexDeclaration8 *vertex_declaration; IWineD3DVertexShader *wineD3DVertexShader; @@ -500,7 +500,7 @@ HRESULT vertexshader_init(IDirect3DVertexShader8Impl *shader, IDirect3DDevice8Im * IDirect3DPixelShader implementation structure */ typedef struct IDirect3DPixelShader8Impl { - const IDirect3DPixelShader8Vtbl *lpVtbl; + IDirect3DPixelShader8 IDirect3DPixelShader8_iface; LONG ref; DWORD handle; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9383173..bfc3f74 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2146,7 +2146,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(IDirect3DDevice8 wined3d_mutex_unlock(); - if (IUnknown_Release((IUnknown *)shader)) + if (IDirect3DVertexShader8_Release(&shader->IDirect3DVertexShader8_iface)) { ERR("Shader %p has references left, this shouldn't happen.\n", shader); } @@ -2471,7 +2471,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(IDirect3DDevice8 *i wined3d_mutex_unlock(); - if (IUnknown_Release((IUnknown *)shader)) + if (IDirect3DPixelShader8_Release(&shader->IDirect3DPixelShader8_iface)) { ERR("Shader %p has references left, this shouldn't happen.\n", shader); } diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index a59f10b..c0a9a35 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -22,6 +22,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static inline IDirect3DVertexShader8Impl *impl_from_IDirect3DVertexShader8(IDirect3DVertexShader8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DVertexShader8Impl, IDirect3DVertexShader8_iface); +} + static HRESULT WINAPI d3d8_vertexshader_QueryInterface(IDirect3DVertexShader8 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -42,7 +47,7 @@ static HRESULT WINAPI d3d8_vertexshader_QueryInterface(IDirect3DVertexShader8 *i static ULONG WINAPI d3d8_vertexshader_AddRef(IDirect3DVertexShader8 *iface) { - IDirect3DVertexShader8Impl *shader = (IDirect3DVertexShader8Impl *)iface; + IDirect3DVertexShader8Impl *shader = impl_from_IDirect3DVertexShader8(iface); ULONG refcount = InterlockedIncrement(&shader->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -66,7 +71,7 @@ static void STDMETHODCALLTYPE d3d8_vertexshader_wined3d_object_destroyed(void *p static ULONG WINAPI d3d8_vertexshader_Release(IDirect3DVertexShader8 *iface) { - IDirect3DVertexShader8Impl *shader = (IDirect3DVertexShader8Impl *)iface; + IDirect3DVertexShader8Impl *shader = impl_from_IDirect3DVertexShader8(iface); ULONG refcount = InterlockedDecrement(&shader->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -157,7 +162,7 @@ HRESULT vertexshader_init(IDirect3DVertexShader8Impl *shader, IDirect3DDevice8Im } shader->ref = 1; - shader->lpVtbl = &d3d8_vertexshader_vtbl; + shader->IDirect3DVertexShader8_iface.lpVtbl = &d3d8_vertexshader_vtbl; hr = d3d8_vertexshader_create_vertexdeclaration(device, declaration, shader_handle, &shader->vertex_declaration); if (FAILED(hr)) @@ -187,6 +192,11 @@ HRESULT vertexshader_init(IDirect3DVertexShader8Impl *shader, IDirect3DDevice8Im return D3D_OK; } +static inline IDirect3DPixelShader8Impl *impl_from_IDirect3DPixelShader8(IDirect3DPixelShader8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DPixelShader8Impl, IDirect3DPixelShader8_iface); +} + static HRESULT WINAPI d3d8_pixelshader_QueryInterface(IDirect3DPixelShader8 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -207,7 +217,7 @@ static HRESULT WINAPI d3d8_pixelshader_QueryInterface(IDirect3DPixelShader8 *ifa static ULONG WINAPI d3d8_pixelshader_AddRef(IDirect3DPixelShader8 *iface) { - IDirect3DPixelShader8Impl *shader = (IDirect3DPixelShader8Impl *)iface; + IDirect3DPixelShader8Impl *shader = impl_from_IDirect3DPixelShader8(iface); ULONG refcount = InterlockedIncrement(&shader->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -224,7 +234,7 @@ static ULONG WINAPI d3d8_pixelshader_AddRef(IDirect3DPixelShader8 *iface) static ULONG WINAPI d3d8_pixelshader_Release(IDirect3DPixelShader8 *iface) { - IDirect3DPixelShader8Impl *shader = (IDirect3DPixelShader8Impl *)iface; + IDirect3DPixelShader8Impl *shader = impl_from_IDirect3DPixelShader8(iface); ULONG refcount = InterlockedDecrement(&shader->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -263,7 +273,7 @@ HRESULT pixelshader_init(IDirect3DPixelShader8Impl *shader, IDirect3DDevice8Impl HRESULT hr; shader->ref = 1; - shader->lpVtbl = &d3d8_pixelshader_vtbl; + shader->IDirect3DPixelShader8_iface.lpVtbl = &d3d8_pixelshader_vtbl; shader->handle = shader_handle; wined3d_mutex_lock();

1 0

Łukasz Wojniłowicz : inetcpl.cpl: Update Polish translation.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 1d9354f6673c7222a0bfcc0cc2f70489a0cf62c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9354f6673c7222a0bfcc0cc… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Mar 14 19:25:05 2011 +0100 inetcpl.cpl: Update Polish translation. --- dlls/inetcpl.cpl/cpl_Pl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Pl.rc b/dlls/inetcpl.cpl/cpl_Pl.rc index cf33137..78fd221 100644 --- a/dlls/inetcpl.cpl/cpl_Pl.rc +++ b/dlls/inetcpl.cpl/cpl_Pl.rc @@ -37,11 +37,11 @@ BEGIN PUSHBUTTON "U�yj &bie��cej", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "U�yj d&omy�lnej", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "U�yj pu&stej", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " Historia przegl�dania ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Mo�esz usun�� przechowywane strony, ciasteczka i inne dane.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "&Usu� pliki...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "Usta&wienia...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END

1 0

Henri Verbeet : d3d9: Use IDirect3DVolume9_AddRef to increment the volume' s refcount.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: e51f6b644d9d6ba9424d4b3e99e62aa582508226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51f6b644d9d6ba9424d4b3e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:03:00 2011 +0100 d3d9: Use IDirect3DVolume9_AddRef to increment the volume's refcount. --- dlls/d3d9/volumetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index a423ff3..313e5cd 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -333,7 +333,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetVolumeLevel(IDirect3DVolume } *volume = wined3d_resource_get_parent(sub_resource); - IDirect3DVolumeTexture9_AddRef(*volume); + IDirect3DVolume9_AddRef(*volume); wined3d_mutex_unlock(); return D3D_OK;

1 0

Henri Verbeet : wined3d: Generalize AddDirtyRect() / AddDirtyBox() to AddDirtyRegion().
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 4a10bbc76d5e6b6654717d590dde7354eff5d396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a10bbc76d5e6b6654717d590… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:02:59 2011 +0100 wined3d: Generalize AddDirtyRect() / AddDirtyBox() to AddDirtyRegion(). --- dlls/d3d8/cubetexture.c | 22 ++++++++++++++++++---- dlls/d3d8/texture.c | 23 ++++++++++++++++++----- dlls/d3d8/volumetexture.c | 10 ++++++---- dlls/d3d9/cubetexture.c | 25 ++++++++++++++++++++----- dlls/d3d9/texture.c | 23 +++++++++++++++++++---- dlls/d3d9/volumetexture.c | 12 ++++++------ dlls/wined3d/cubetexture.c | 15 ++++++--------- dlls/wined3d/surface.c | 29 ++++++++++++++++++++++------- dlls/wined3d/texture.c | 12 ++++++------ dlls/wined3d/volumetexture.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 14 ++++---------- 12 files changed, 132 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a10bbc76d5e6b6654717…

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVolumeTexture::Unmap().
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: e409b83bcbad1c44ac20e0b9c585f9b0fae48f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e409b83bcbad1c44ac20e0b9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:02:58 2011 +0100 wined3d: Get rid of IWineD3DVolumeTexture::Unmap(). --- dlls/d3d10core/texture.c | 12 +++++++++--- dlls/d3d8/volumetexture.c | 13 +++++++++---- dlls/d3d9/volumetexture.c | 15 +++++++++------ dlls/wined3d/volumetexture.c | 17 ----------------- include/wine/wined3d.idl | 3 --- 5 files changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 8379605..2f73a75 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -375,11 +375,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN return hr; } -static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource) +static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource_idx) { - TRACE("iface %p, sub_resource %u.\n", iface, sub_resource); + struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct wined3d_resource *sub_resource; + + TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); + + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wined3d_texture, sub_resource_idx))) + return; - IWineD3DVolumeTexture_Unmap(((struct d3d10_texture3d *)iface)->wined3d_texture, sub_resource); + IWineD3DVolume_Unmap(wined3d_volume_from_resource(sub_resource)); } static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 873822b..8c693f0 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -298,14 +298,19 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(IDirect3DVolumeTexture return hr; } -static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level) { - IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; +static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(IDirect3DVolumeTexture8 *iface, UINT level) +{ + IDirect3DVolumeTexture8Impl *texture = (IDirect3DVolumeTexture8Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; - TRACE("iface %p, level %u.\n", iface, Level); + TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_Unmap(This->wineD3DVolumeTexture, Level); + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wineD3DVolumeTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DVolume8_UnlockBox((IDirect3DVolume8 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index b4b5503..0a8932c 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -360,16 +360,19 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(IDirect3DVolumeTexture return hr; } -static HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level) { - IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; +static HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(IDirect3DVolumeTexture9 *iface, UINT level) +{ + IDirect3DVolumeTexture9Impl *texture = (IDirect3DVolumeTexture9Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; - TRACE("iface %p, level %u.\n", iface, Level); + TRACE("iface %p, level %u.\n", iface, level); wined3d_mutex_lock(); - - hr = IWineD3DVolumeTexture_Unmap(This->wineD3DVolumeTexture, Level); - + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wineD3DVolumeTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DVolume9_UnlockBox((IDirect3DVolume9 *)wined3d_resource_get_parent(sub_resource)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 643141f..9d942d7 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -273,22 +273,6 @@ static struct wined3d_resource * WINAPI IWineD3DVolumeTextureImpl_GetSubResource return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_Unmap(IWineD3DVolumeTexture *iface, UINT sub_resource_idx) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DVolume_Unmap((IWineD3DVolume *)volume_from_resource(sub_resource)); -} - static HRESULT WINAPI IWineD3DVolumeTextureImpl_AddDirtyBox(IWineD3DVolumeTexture *iface, const WINED3DBOX *dirty_box) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -333,7 +317,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_IsCondNP2, IWineD3DVolumeTextureImpl_GetSubResource, /* volume texture */ - IWineD3DVolumeTextureImpl_Unmap, IWineD3DVolumeTextureImpl_AddDirtyBox }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index d7c8b97..34449d0 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2395,9 +2395,6 @@ interface IWineD3DCubeTexture : IWineD3DBaseTexture ] interface IWineD3DVolumeTexture : IWineD3DBaseTexture { - HRESULT Unmap( - [in] UINT sub_resource_idx - ); HRESULT AddDirtyBox( [in] const WINED3DBOX *dirty_box );

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVolumeTexture::Map().
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 4c3d55f10ea94b7911f58b1a9199938035021f04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3d55f10ea94b7911f58b1a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 14 21:02:57 2011 +0100 wined3d: Get rid of IWineD3DVolumeTexture::Map(). --- dlls/d3d10core/texture.c | 22 +++++++++++----------- dlls/d3d8/volumetexture.c | 16 +++++++++++----- dlls/d3d9/volumetexture.c | 18 +++++++++++------- dlls/wined3d/volume.c | 5 +++++ dlls/wined3d/volumetexture.c | 20 -------------------- dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.idl | 8 ++------ 7 files changed, 42 insertions(+), 49 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 920b64f..8379605 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -346,32 +346,32 @@ static UINT STDMETHODCALLTYPE d3d10_texture3d_GetEvictionPriority(ID3D10Texture3 return 0; } -static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource, +static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource_idx, D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *mapped_texture) { struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + struct wined3d_resource *sub_resource; WINED3DLOCKED_BOX wined3d_map_desc; HRESULT hr; - TRACE("iface %p, sub_resource %u, map_type %u, map_flags %#x, mapped_texture %p.\n", - iface, sub_resource, map_type, map_flags, mapped_texture); + TRACE("iface %p, sub_resource_idx %u, map_type %u, map_flags %#x, mapped_texture %p.\n", + iface, sub_resource_idx, map_type, map_flags, mapped_texture); if (map_type != D3D10_MAP_READ_WRITE) FIXME("Ignoring map_type %#x.\n", map_type); if (map_flags) FIXME("Ignoring map_flags %#x.\n", map_flags); - hr = IWineD3DVolumeTexture_Map(texture->wined3d_texture, sub_resource, &wined3d_map_desc, NULL, 0); - if (FAILED(hr)) + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wined3d_texture, sub_resource_idx))) + hr = E_INVALIDARG; + else if (SUCCEEDED(hr = IWineD3DVolume_Map(wined3d_volume_from_resource(sub_resource), + &wined3d_map_desc, NULL, 0))) { - WARN("Failed to map texture, hr %#x.\n", hr); - return hr; + mapped_texture->pData = wined3d_map_desc.pBits; + mapped_texture->RowPitch = wined3d_map_desc.RowPitch; + mapped_texture->DepthPitch = wined3d_map_desc.SlicePitch; } - mapped_texture->pData = wined3d_map_desc.pBits; - mapped_texture->RowPitch = wined3d_map_desc.RowPitch; - mapped_texture->DepthPitch = wined3d_map_desc.SlicePitch; - return hr; } diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 429f112..873822b 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -277,16 +277,22 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(IDirect3DVolume return D3D_OK; } -static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { - IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; +static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(IDirect3DVolumeTexture8 *iface, + UINT level, D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags) +{ + IDirect3DVolumeTexture8Impl *texture = (IDirect3DVolumeTexture8Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", - iface, Level, pLockedVolume, pBox, Flags); + iface, level, locked_box, box, flags); wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_Map(This->wineD3DVolumeTexture, Level, - (WINED3DLOCKED_BOX *)pLockedVolume, (const WINED3DBOX *)pBox, Flags); + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wineD3DVolumeTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DVolume8_LockBox((IDirect3DVolume8 *)wined3d_resource_get_parent(sub_resource), + locked_box, box, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index e97d1a4..b4b5503 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -339,18 +339,22 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetVolumeLevel(IDirect3DVolume return D3D_OK; } -static HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { - IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; +static HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(IDirect3DVolumeTexture9 *iface, + UINT level, D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags) +{ + IDirect3DVolumeTexture9Impl *texture = (IDirect3DVolumeTexture9Impl *)iface; + struct wined3d_resource *sub_resource; HRESULT hr; TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", - iface, Level, pLockedVolume, pBox, Flags); + iface, level, locked_box, box, flags); wined3d_mutex_lock(); - - hr = IWineD3DVolumeTexture_Map(This->wineD3DVolumeTexture, Level, - (WINED3DLOCKED_BOX *)pLockedVolume, (const WINED3DBOX *)pBox, Flags); - + if (!(sub_resource = IWineD3DVolumeTexture_GetSubResource(texture->wineD3DVolumeTexture, level))) + hr = D3DERR_INVALIDCALL; + else + hr = IDirect3DVolume9_LockBox((IDirect3DVolume9 *)wined3d_resource_get_parent(sub_resource), + locked_box, box, flags); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index d05a9f2..3f7090c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -277,6 +277,11 @@ static HRESULT WINAPI IWineD3DVolumeImpl_Map(IWineD3DVolume *iface, return WINED3D_OK; } +IWineD3DVolume * CDECL wined3d_volume_from_resource(struct wined3d_resource *resource) +{ + return (IWineD3DVolume *)volume_from_resource(resource); +} + static HRESULT WINAPI IWineD3DVolumeImpl_Unmap(IWineD3DVolume *iface) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index e53d4f5..643141f 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -273,25 +273,6 @@ static struct wined3d_resource * WINAPI IWineD3DVolumeTextureImpl_GetSubResource return basetexture_get_sub_resource(texture, sub_resource_idx); } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_Map(IWineD3DVolumeTexture *iface, - UINT sub_resource_idx, WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags) -{ - IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; - struct wined3d_resource *sub_resource; - - TRACE("iface %p, sub_resource_idx %u, locked_box %p, box %p, flags %#x.\n", - iface, sub_resource_idx, locked_box, box, flags); - - if (!(sub_resource = basetexture_get_sub_resource(texture, sub_resource_idx))) - { - WARN("Failed to get sub-resource.\n"); - return WINED3DERR_INVALIDCALL; - } - - return IWineD3DVolume_Map((IWineD3DVolume *)volume_from_resource(sub_resource), - locked_box, box, flags); -} - static HRESULT WINAPI IWineD3DVolumeTextureImpl_Unmap(IWineD3DVolumeTexture *iface, UINT sub_resource_idx) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -352,7 +333,6 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_IsCondNP2, IWineD3DVolumeTextureImpl_GetSubResource, /* volume texture */ - IWineD3DVolumeTextureImpl_Map, IWineD3DVolumeTextureImpl_Unmap, IWineD3DVolumeTextureImpl_AddDirtyBox }; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 558fd82..f8e2121 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -69,3 +69,5 @@ @ cdecl wined3d_vertex_declaration_decref(ptr) @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) + +@ cdecl wined3d_volume_from_resource(ptr) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7827080..d7c8b97 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2395,12 +2395,6 @@ interface IWineD3DCubeTexture : IWineD3DBaseTexture ] interface IWineD3DVolumeTexture : IWineD3DBaseTexture { - HRESULT Map( - [in] UINT sub_resource_idx, - [out] WINED3DLOCKED_BOX *locked_box, - [in] const WINED3DBOX *box, - [in] DWORD flags - ); HRESULT Unmap( [in] UINT sub_resource_idx ); @@ -3200,3 +3194,5 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaration *declaration); void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); + +IWineD3DVolume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource);

1 0

Vincent Povirk : gdiplus: Use GdipFillPath to implement GdipFillPie.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 2ce5be2ce3e36250c588523dfc27261283fcab41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce5be2ce3e36250c588523df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:36:08 2011 -0600 gdiplus: Use GdipFillPath to implement GdipFillPie. --- dlls/gdiplus/graphics.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6682f74..262828b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3472,7 +3472,8 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *p GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - INT save_state; + GpStatus stat; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, brush, x, y, width, height, startAngle, sweepAngle); @@ -3483,24 +3484,19 @@ GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, if(graphics->busy) return ObjectBusy; - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); + stat = GdipCreatePath(FillModeAlternate, &path); - BeginPath(graphics->hdc); - draw_pie(graphics, x, y, width, height, startAngle, sweepAngle); - EndPath(graphics->hdc); + if (stat == Ok) + { + stat = GdipAddPathPie(path, x, y, width, height, startAngle, sweepAngle); - brush_fill_path(graphics, brush); + if (stat == Ok) + stat = GdipFillPath(graphics, brush, path); - RestoreDC(graphics->hdc, save_state); + GdipDeletePath(path); + } - return Ok; + return stat; } GpStatus WINGDIPAPI GdipFillPieI(GpGraphics *graphics, GpBrush *brush, INT x,

1 0

Vincent Povirk : gdiplus: Use GdipFillPath to implement GdipFillEllipse.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 4aa99eaf3b1981f89632674dbb7b2adbce163aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa99eaf3b1981f89632674db… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:29:08 2011 -0600 gdiplus: Use GdipFillPath to implement GdipFillEllipse. --- dlls/gdiplus/graphics.c | 35 +++++++++++------------------------ 1 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 978e12b..6682f74 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3355,9 +3355,8 @@ GpStatus WINGDIPAPI GdipFillClosedCurveI(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[2]; - POINT pti[2]; + GpStatus stat; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, brush, x, y, width, height); @@ -3367,31 +3366,19 @@ GpStatus WINGDIPAPI GdipFillEllipse(GpGraphics *graphics, GpBrush *brush, REAL x if(graphics->busy) return ObjectBusy; - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y + height; - - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - - transform_and_round_points(graphics, pti, ptf, 2); + stat = GdipCreatePath(FillModeAlternate, &path); - BeginPath(graphics->hdc); - Ellipse(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y); - EndPath(graphics->hdc); + if (stat == Ok) + { + stat = GdipAddPathEllipse(path, x, y, width, height); - brush_fill_path(graphics, brush); + if (stat == Ok) + stat = GdipFillPath(graphics, brush, path); - RestoreDC(graphics->hdc, save_state); + GdipDeletePath(path); + } - return Ok; + return stat; } GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics *graphics, GpBrush *brush, INT x,

1 0

Vincent Povirk : gdiplus: Add software implementation of GdipFillPath.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: b5c2015999853030905ddae129a26a512825064b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c2015999853030905ddae12… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:16:26 2011 -0600 gdiplus: Add software implementation of GdipFillPath. --- dlls/gdiplus/graphics.c | 66 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 83e0f24..978e12b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3402,24 +3402,13 @@ GpStatus WINGDIPAPI GdipFillEllipseI(GpGraphics *graphics, GpBrush *brush, INT x return GdipFillEllipse(graphics,brush,(REAL)x,(REAL)y,(REAL)width,(REAL)height); } -GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) +static GpStatus GDI32_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) { INT save_state; GpStatus retval; - TRACE("(%p, %p, %p)\n", graphics, brush, path); - - if(!brush || !graphics || !path) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } + if(!graphics->hdc || !brush_can_fill_path(brush)) + return NotImplemented; save_state = SaveDC(graphics->hdc); EndPath(graphics->hdc); @@ -3444,6 +3433,55 @@ end: return retval; } +static GpStatus SOFTWARE_GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) +{ + GpStatus stat; + GpRegion *rgn; + + if (!brush_can_fill_pixels(brush)) + return NotImplemented; + + /* FIXME: This could probably be done more efficiently without regions. */ + + stat = GdipCreateRegionPath(path, &rgn); + + if (stat == Ok) + { + stat = GdipFillRegion(graphics, brush, rgn); + + GdipDeleteRegion(rgn); + } + + return stat; +} + +GpStatus WINGDIPAPI GdipFillPath(GpGraphics *graphics, GpBrush *brush, GpPath *path) +{ + GpStatus stat = NotImplemented; + + TRACE("(%p, %p, %p)\n", graphics, brush, path); + + if(!brush || !graphics || !path) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + if (!graphics->image) + stat = GDI32_GdipFillPath(graphics, brush, path); + + if (stat == NotImplemented) + stat = SOFTWARE_GdipFillPath(graphics, brush, path); + + if (stat == NotImplemented) + { + FIXME("Not implemented for brushtype %i\n", brush->bt); + stat = Ok; + } + + return stat; +} + GpStatus WINGDIPAPI GdipFillPie(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) {

1 0

Vincent Povirk : gdiplus: Call GdiAlphaBlend only once per GdipFillRegion call.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 833316f91d428955744f88ee02c71f4bad38e4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=833316f91d428955744f88ee0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 15:58:22 2011 -0600 gdiplus: Call GdiAlphaBlend only once per GdipFillRegion call. --- dlls/gdiplus/graphics.c | 93 ++++++++++++++++++++++++++++++++++++----------- 1 files changed, 72 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4d059f8..83e0f24 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3856,39 +3856,90 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, if (stat == Ok) { - UINT max_size=0; - - for (i=0; i<scans_count; i++) + if (!graphics->image) { - UINT size = scans[i].Width * scans[i].Height; + /* If we have to go through gdi32, use as few alpha blends as possible. */ + INT min_x, min_y, max_x, max_y; + UINT data_width, data_height; - if (size > max_size) - max_size = size; - } + min_x = scans[0].X; + min_y = scans[0].Y; + max_x = scans[0].X+scans[0].Width; + max_y = scans[0].Y+scans[0].Height; - pixel_data = GdipAlloc(sizeof(*pixel_data) * max_size); - if (!pixel_data) - stat = OutOfMemory; + for (i=1; i<scans_count; i++) + { + min_x = min(min_x, scans[i].X); + min_y = min(min_y, scans[i].Y); + max_x = max(max_x, scans[i].X+scans[i].Width); + max_y = max(max_y, scans[i].Y+scans[i].Height); + } - if (stat == Ok) - { - for (i=0; i<scans_count; i++) + data_width = max_x - min_x; + data_height = max_y - min_y; + + pixel_data = GdipAlloc(sizeof(*pixel_data) * data_width * data_height); + if (!pixel_data) + stat = OutOfMemory; + + if (stat == Ok) { - stat = brush_fill_pixels(graphics, brush, pixel_data, &scans[i], - scans[i].Width); + for (i=0; i<scans_count; i++) + { + stat = brush_fill_pixels(graphics, brush, + pixel_data + (scans[i].X - min_x) + (scans[i].Y - min_y) * data_width, + &scans[i], data_width); + + if (stat != Ok) + break; + } if (stat == Ok) { - stat = alpha_blend_pixels(graphics, scans[i].X, scans[i].Y, - (BYTE*)pixel_data, scans[i].Width, scans[i].Height, - scans[i].Width * 4); + stat = alpha_blend_pixels(graphics, min_x, min_y, + (BYTE*)pixel_data, data_width, data_height, + data_width * 4); } - if (stat != Ok) - break; + GdipFree(pixel_data); } + } + else + { + UINT max_size=0; - GdipFree(pixel_data); + for (i=0; i<scans_count; i++) + { + UINT size = scans[i].Width * scans[i].Height; + + if (size > max_size) + max_size = size; + } + + pixel_data = GdipAlloc(sizeof(*pixel_data) * max_size); + if (!pixel_data) + stat = OutOfMemory; + + if (stat == Ok) + { + for (i=0; i<scans_count; i++) + { + stat = brush_fill_pixels(graphics, brush, pixel_data, &scans[i], + scans[i].Width); + + if (stat == Ok) + { + stat = alpha_blend_pixels(graphics, scans[i].X, scans[i].Y, + (BYTE*)pixel_data, scans[i].Width, scans[i].Height, + scans[i].Width * 4); + } + + if (stat != Ok) + break; + } + + GdipFree(pixel_data); + } } GdipFree(scans);

1 0

Vincent Povirk : gdiplus: Remove gdi32 fallback for bitmaps from GdipFillRegion.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 77f5a07c1bd351524fe294b051aee7f37a7f77ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f5a07c1bd351524fe294b05… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:17:20 2011 -0600 gdiplus: Remove gdi32 fallback for bitmaps from GdipFillRegion. We can always do a fill directly to the image bits when gdi32 can do it. --- dlls/gdiplus/graphics.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 29dea0a..4d059f8 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3919,9 +3919,6 @@ GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, if (stat == NotImplemented) stat = SOFTWARE_GdipFillRegion(graphics, brush, region); - if (stat == NotImplemented && graphics->image) - stat = GDI32_GdipFillRegion(graphics, brush, region); - if (stat == NotImplemented) { FIXME("not implemented for brushtype %i\n", brush->bt);

1 0

Piotr Caban : shdocvw/tests: Added IShellBrowser, IBrowserService and IDocObjectService existence tests.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: a13fce16a44909249f2252c01674c71021d56c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13fce16a44909249f2252c01… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:50:18 2011 +0100 shdocvw/tests: Added IShellBrowser, IBrowserService and IDocObjectService existence tests. --- dlls/shdocvw/tests/webbrowser.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index e54e35d..e433b13 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -41,6 +41,7 @@ #include "exdispid.h" #include "mimeinfo.h" #include "hlink.h" +#include "docobjectservice.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); @@ -2963,6 +2964,18 @@ static void test_dochost_qs(IUnknown *unk) ok(iface_cmp(service, unk), "service != unk\n"); IUnknown_Release(service); + hres = IServiceProvider_QueryService(serv_prov, &IID_IShellBrowser, &IID_IShellBrowser, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + IUnknown_Release(service); + + hres = IServiceProvider_QueryService(serv_prov, &IID_IShellBrowser, &IID_IBrowserService, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + IUnknown_Release(service); + + hres = IServiceProvider_QueryService(serv_prov, &IID_IShellBrowser, &IID_IDocObjectService, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + IUnknown_Release(service); + IServiceProvider_Release(serv_prov); }

1 0

Piotr Caban : shdocvw: Use IID_IBrowserService2 defined in header.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: f1f645b345f8c47b4669ef5cb82c41847775aca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f645b345f8c47b4669ef5cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:50:08 2011 +0100 shdocvw: Use IID_IBrowserService2 defined in header. --- dlls/shdocvw/tests/webbrowser.c | 3 +-- dlls/shdocvw/webbrowser.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 1088065..e54e35d 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -36,6 +36,7 @@ #include "olectl.h" #include "mshtmdid.h" #include "shobjidl.h" +#include "shdeprecated.h" #include "shlguid.h" #include "exdispid.h" #include "mimeinfo.h" @@ -2643,8 +2644,6 @@ static void test_IServiceProvider(IUnknown *unk) IServiceProvider *servprov = (void*)0xdeadbeef; HRESULT hres; IUnknown *ret = NULL; - static const IID IID_IBrowserService2 = - {0x68BD21CC,0x438B,0x11d2,{0xA5,0x60,0x00,0xA0,0xC,0x2D,0xBF,0xE8}}; hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov); ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index a0a8020..5df1f03 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -23,6 +23,7 @@ #include "shdocvw.h" #include "exdispid.h" #include "mshtml.h" +#include "shdeprecated.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -1140,8 +1141,6 @@ static HRESULT STDMETHODCALLTYPE WBServiceProvider_QueryService(IServiceProvider REFGUID guidService, REFIID riid, void **ppv) { WebBrowser *This = impl_from_IServiceProvider(iface); - static const IID IID_IBrowserService2 = - {0x68BD21CC,0x438B,0x11d2,{0xA5,0x60,0x00,0xA0,0xC,0x2D,0xBF,0xE8}}; if(*ppv) ppv = NULL;

1 0

Piotr Caban : shdocvw: Added IDocObjectService interface stub.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: d83dca09dfadc1b71a775f9b3a0a15175b53f8b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83dca09dfadc1b71a775f9b3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:49:58 2011 +0100 shdocvw: Added IDocObjectService interface stub. --- dlls/shdocvw/shellbrowser.c | 152 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 152 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/shellbrowser.c b/dlls/shdocvw/shellbrowser.c index 6c86611..2715bcc 100644 --- a/dlls/shdocvw/shellbrowser.c +++ b/dlls/shdocvw/shellbrowser.c @@ -21,12 +21,14 @@ #include "wine/debug.h" #include "shdocvw.h" #include "shdeprecated.h" +#include "docobjectservice.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); typedef struct { IShellBrowser IShellBrowser_iface; IBrowserService IBrowserService_iface; + IDocObjectService IDocObjectService_iface; LONG ref; } ShellBrowser; @@ -49,6 +51,8 @@ static HRESULT WINAPI ShellBrowser_QueryInterface( *ppvObject = &This->IShellBrowser_iface; else if(IsEqualGUID(&IID_IBrowserService, riid)) *ppvObject = &This->IBrowserService_iface; + else if(IsEqualGUID(&IID_IDocObjectService, riid)) + *ppvObject = &This->IDocObjectService_iface; if(*ppvObject) { TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); @@ -606,6 +610,153 @@ static const IBrowserServiceVtbl BrowserServiceVtbl = { BrowserService_RegisterWindow }; +static inline ShellBrowser *impl_from_IDocObjectService(IDocObjectService *iface) +{ + return CONTAINING_RECORD(iface, ShellBrowser, IDocObjectService_iface); +} + +static HRESULT WINAPI DocObjectService_QueryInterface( + IDocObjectService* iface, + REFIID riid, + void **ppvObject) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + return IShellBrowser_QueryInterface(&This->IShellBrowser_iface, riid, ppvObject); +} + +static ULONG WINAPI DocObjectService_AddRef( + IDocObjectService* iface) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + return IShellBrowser_AddRef(&This->IShellBrowser_iface); +} + +static ULONG WINAPI DocObjectService_Release( + IDocObjectService* iface) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + return IShellBrowser_Release(&This->IShellBrowser_iface); +} + +static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( + IDocObjectService* iface, + IDispatch *pDispatch, + LPCWSTR lpszUrl, + DWORD dwFlags, + LPCWSTR lpszFrameName, + BYTE *pPostData, + DWORD cbPostData, + LPCWSTR lpszHeaders, + BOOL fPlayNavSound, + BOOL *pfCancel) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), + dwFlags, debugstr_w(lpszFrameName), pPostData, cbPostData, + debugstr_w(lpszHeaders), fPlayNavSound, pfCancel); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireNavigateComplete2( + IDocObjectService* iface, + IHTMLWindow2 *pHTMLWindow2, + DWORD dwFlags) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p %x\n", This, pHTMLWindow2, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDownloadBegin( + IDocObjectService* iface) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDownloadComplete( + IDocObjectService* iface) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_FireDocumentComplete( + IDocObjectService* iface, + IHTMLWindow2 *pHTMLWindow, + DWORD dwFlags) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p %x\n", This, pHTMLWindow, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_UpdateDesktopComponent( + IDocObjectService* iface, + IHTMLWindow2 *pHTMLWindow) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p\n", This, pHTMLWindow); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_GetPendingUrl( + IDocObjectService* iface, + BSTR *pbstrPendingUrl) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p\n", This, pbstrPendingUrl); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_ActiveElementChanged( + IDocObjectService* iface, + IHTMLElement *pHTMLElement) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p\n", This, pHTMLElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_GetUrlSearchComponent( + IDocObjectService* iface, + BSTR *pbstrSearch) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %p\n", This, pbstrSearch); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocObjectService_IsErrorUrl( + IDocObjectService* iface, + LPCWSTR lpszUrl, + BOOL *pfIsError) +{ + ShellBrowser *This = impl_from_IDocObjectService(iface); + FIXME("%p %s %p\n", This, debugstr_w(lpszUrl), pfIsError); + + *pfIsError = FALSE; + return S_OK; +} + +static const IDocObjectServiceVtbl DocObjectServiceVtbl = { + DocObjectService_QueryInterface, + DocObjectService_AddRef, + DocObjectService_Release, + DocObjectService_FireBeforeNavigate2, + DocObjectService_FireNavigateComplete2, + DocObjectService_FireDownloadBegin, + DocObjectService_FireDownloadComplete, + DocObjectService_FireDocumentComplete, + DocObjectService_UpdateDesktopComponent, + DocObjectService_GetPendingUrl, + DocObjectService_ActiveElementChanged, + DocObjectService_GetUrlSearchComponent, + DocObjectService_IsErrorUrl +}; + HRESULT ShellBrowser_Create(IShellBrowser **ppv) { ShellBrowser *sb = heap_alloc(sizeof(ShellBrowser)); @@ -614,6 +765,7 @@ HRESULT ShellBrowser_Create(IShellBrowser **ppv) sb->IShellBrowser_iface.lpVtbl = &ShellBrowserVtbl; sb->IBrowserService_iface.lpVtbl = &BrowserServiceVtbl; + sb->IDocObjectService_iface.lpVtbl = &DocObjectServiceVtbl; sb->ref = 1;

1 0

Piotr Caban : shdocvw: Added IBrowserService interface stub.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: fa43f4c85012d0dcd685dca025610da08c2d26c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa43f4c85012d0dcd685dca02… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:49:47 2011 +0100 shdocvw: Added IBrowserService interface stub. --- dlls/shdocvw/shellbrowser.c | 358 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 358 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa43f4c85012d0dcd685d…

1 0

Piotr Caban : shdocvw: Added IShellBrowser interface stub.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: df181d99f32470ce14b867fbaadb0e7b63a167cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=df181d99f32470ce14b867fba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:49:37 2011 +0100 shdocvw: Added IShellBrowser interface stub. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/client.c | 15 +++ dlls/shdocvw/shdocvw.h | 1 + dlls/shdocvw/shellbrowser.c | 264 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 281 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index c4ffa16..fe85d48 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -18,6 +18,7 @@ C_SRCS = \ oleobject.c \ persist.c \ shdocvw_main.c \ + shellbrowser.c \ shlinstobj.c \ taskbarlist.c \ urlhist.c \ diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 12fd464..3443170 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -622,6 +622,21 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE return IDispatch_QueryInterface(This->disp, riid, ppv); } + if(IsEqualGUID(&IID_IShellBrowser, guidService)) { + IShellBrowser *sb; + HRESULT hres; + + TRACE("(%p)->(IID_IShellBrowser %s %p)\n", This, debugstr_guid(riid), ppv); + + hres = ShellBrowser_Create(&sb); + if(FAILED(hres)) + return hres; + + hres = IShellBrowser_QueryInterface(sb, riid, ppv); + IShellBrowser_Release(sb); + return hres; + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return E_NOINTERFACE; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 7abd004..7a68499 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -229,6 +229,7 @@ void ConnectionPointContainer_Destroy(ConnectionPointContainer*); void HlinkFrame_Init(HlinkFrame*,IUnknown*,DocHost*); BOOL HlinkFrame_QI(HlinkFrame*,REFIID,void**); +HRESULT ShellBrowser_Create(IShellBrowser**); HRESULT WebBrowserV1_Create(IUnknown*,REFIID,void**); HRESULT WebBrowserV2_Create(IUnknown*,REFIID,void**); diff --git a/dlls/shdocvw/shellbrowser.c b/dlls/shdocvw/shellbrowser.c new file mode 100644 index 0000000..47cd095 --- /dev/null +++ b/dlls/shdocvw/shellbrowser.c @@ -0,0 +1,264 @@ +/* + * Implementation of IShellBrowser interface + * + * Copyright 2011 Piotr Caban for CodeWeavers + * + * 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 + */ + +#include "wine/debug.h" +#include "shdocvw.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); + +typedef struct { + IShellBrowser IShellBrowser_iface; + + LONG ref; +} ShellBrowser; + +static inline ShellBrowser *impl_from_IShellBrowser(IShellBrowser *iface) +{ + return CONTAINING_RECORD(iface, ShellBrowser, IShellBrowser_iface); +} + +static HRESULT WINAPI ShellBrowser_QueryInterface( + IShellBrowser* iface, + REFIID riid, + void **ppvObject) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + *ppvObject = NULL; + + if(IsEqualGUID(&IID_IShellBrowser, riid) || IsEqualGUID(&IID_IOleWindow, riid) + || IsEqualGUID(&IID_IUnknown, riid)) + *ppvObject = &This->IShellBrowser_iface; + + if(*ppvObject) { + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + IUnknown_AddRef((IUnknown*)*ppvObject); + return S_OK; + } + + FIXME("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + return E_NOINTERFACE; +} + +static ULONG WINAPI ShellBrowser_AddRef( + IShellBrowser* iface) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ShellBrowser_Release( + IShellBrowser* iface) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + return ref; +} + +static HRESULT WINAPI ShellBrowser_GetWindow( + IShellBrowser* iface, + HWND *phwnd) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p\n", This, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_ContextSensitiveHelp( + IShellBrowser* iface, + BOOL fEnterMode) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %d\n", This, fEnterMode); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_InsertMenusSB( + IShellBrowser* iface, + HMENU hmenuShared, + LPOLEMENUGROUPWIDTHS lpMenuWidths) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p %p\n", This, hmenuShared, lpMenuWidths); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_SetMenuSB( + IShellBrowser* iface, + HMENU hmenuShared, + HOLEMENU holemenuReserved, + HWND hwndActiveObject) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p %p %p\n", This, hmenuShared, holemenuReserved, hwndActiveObject); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_RemoveMenusSB( + IShellBrowser* iface, + HMENU hmenuShared) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p\n", This, hmenuShared); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_SetStatusTextSB( + IShellBrowser* iface, + LPCOLESTR pszStatusText) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %s\n", This, debugstr_w(pszStatusText)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_EnableModelessSB( + IShellBrowser* iface, + BOOL fEnable) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %d\n", This, fEnable); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_TranslateAcceleratorSB( + IShellBrowser* iface, + MSG *pmsg, + WORD wID) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p %d\n", This, pmsg, (int)wID); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_BrowseObject( + IShellBrowser* iface, + LPCITEMIDLIST pidl, + UINT wFlags) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p %u\n", This, pidl, wFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_GetViewStateStream( + IShellBrowser* iface, + DWORD grfMode, + IStream **ppStrm) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %x %p\n", This, grfMode, ppStrm); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_GetControlWindow( + IShellBrowser* iface, + UINT id, + HWND *phwnd) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %u %p\n", This, id, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_SendControlMsg( + IShellBrowser* iface, + UINT id, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + LRESULT *pret) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %u %u %p\n", This, id, uMsg, pret); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_QueryActiveShellView( + IShellBrowser* iface, + IShellView **ppshv) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p\n", This, ppshv); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_OnViewWindowActive( + IShellBrowser* iface, + IShellView *pshv) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p\n", This, pshv); + return E_NOTIMPL; +} + +static HRESULT WINAPI ShellBrowser_SetToolbarItems( + IShellBrowser* iface, + LPTBBUTTONSB lpButtons, + UINT nButtons, + UINT uFlags) +{ + ShellBrowser *This = impl_from_IShellBrowser(iface); + FIXME("%p %p %u %u\n", This, lpButtons, nButtons, uFlags); + return E_NOTIMPL; +} + +static const IShellBrowserVtbl ShellBrowserVtbl = { + ShellBrowser_QueryInterface, + ShellBrowser_AddRef, + ShellBrowser_Release, + ShellBrowser_GetWindow, + ShellBrowser_ContextSensitiveHelp, + ShellBrowser_InsertMenusSB, + ShellBrowser_SetMenuSB, + ShellBrowser_RemoveMenusSB, + ShellBrowser_SetStatusTextSB, + ShellBrowser_EnableModelessSB, + ShellBrowser_TranslateAcceleratorSB, + ShellBrowser_BrowseObject, + ShellBrowser_GetViewStateStream, + ShellBrowser_GetControlWindow, + ShellBrowser_SendControlMsg, + ShellBrowser_QueryActiveShellView, + ShellBrowser_OnViewWindowActive, + ShellBrowser_SetToolbarItems +}; + +HRESULT ShellBrowser_Create(IShellBrowser **ppv) +{ + ShellBrowser *sb = heap_alloc(sizeof(ShellBrowser)); + if(!*ppv) + return E_OUTOFMEMORY; + + sb->IShellBrowser_iface.lpVtbl = &ShellBrowserVtbl; + + sb->ref = 1; + + *ppv = &sb->IShellBrowser_iface; + return S_OK; +}

1 0

Piotr Caban : shdocvw: Added navigation error handling.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: ac53980faaef82823cb234169b687ef759b1cd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac53980faaef82823cb234169… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:49:27 2011 +0100 shdocvw: Added navigation error handling. --- dlls/shdocvw/dochost.c | 34 +++++++++++++++++++++++++++ dlls/shdocvw/navigate.c | 58 +++++++++++++++++++++++++++++++++++++++++++--- dlls/shdocvw/shdocvw.h | 1 + 3 files changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 7b11c24..3c0dbd2 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -472,6 +472,40 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, This->doc_navigate = V_UNKNOWN(pvaIn); return S_OK; + case 1: { + IHTMLWindow2 *win2; + SAFEARRAY *sa = V_ARRAY(pvaIn); + VARIANT status_code, url, htmlwindow; + LONG ind; + HRESULT hres; + + if(V_VT(pvaIn) != VT_ARRAY || !sa) + return E_INVALIDARG; + + ind = 0; + hres = SafeArrayGetElement(sa, &ind, &status_code); + if(FAILED(hres) || V_VT(&status_code)!=VT_I4) + return E_INVALIDARG; + + ind = 1; + hres = SafeArrayGetElement(sa, &ind, &url); + if(FAILED(hres) || V_VT(&url)!=VT_BSTR) + return E_INVALIDARG; + + ind = 3; + hres = SafeArrayGetElement(sa, &ind, &htmlwindow); + if(FAILED(hres) || V_VT(&htmlwindow)!=VT_UNKNOWN || !V_UNKNOWN(&htmlwindow)) + return E_INVALIDARG; + + hres = IUnknown_QueryInterface(V_UNKNOWN(&htmlwindow), &IID_IHTMLWindow2, (void**)&win2); + if(FAILED(hres)) + return E_INVALIDARG; + + handle_navigation_error(This, V_I4(&status_code), V_BSTR(&url), win2); + IHTMLWindow2_Release(win2); + return S_OK; + } + default: FIXME("unsupported command %d of CGID_DocHostCmdPriv\n", nCmdID); return E_NOTIMPL; diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 6e3ea46..a6899b0 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -241,6 +241,51 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, return S_OK; } +void handle_navigation_error(DocHost* doc_host, HRESULT hres, BSTR url, IHTMLWindow2 *win2) +{ + VARIANT var_status_code, var_frame_name, var_url; + DISPPARAMS dispparams; + VARIANTARG params[5]; + VARIANT_BOOL cancel = VARIANT_FALSE; + + dispparams.cArgs = 5; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = params; + + V_VT(params) = VT_BOOL|VT_BYREF; + V_BOOLREF(params) = &cancel; + + V_VT(params+1) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(params+1) = &var_status_code; + V_VT(&var_status_code) = VT_I4; + V_I4(&var_status_code) = hres; + + V_VT(params+2) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(params+2) = &var_frame_name; + V_VT(&var_frame_name) = VT_BSTR; + if(win2) { + hres = IHTMLWindow2_get_name(win2, &V_BSTR(&var_frame_name)); + if(FAILED(hres)) + V_BSTR(&var_frame_name) = NULL; + } else + V_BSTR(&var_frame_name) = NULL; + + V_VT(params+3) = VT_VARIANT|VT_BYREF; + V_VARIANTREF(params+3) = &var_url; + V_VT(&var_url) = VT_BSTR; + V_BSTR(&var_url) = url; + + V_VT(params+4) = VT_DISPATCH; + V_DISPATCH(params+4) = doc_host->disp; + + call_sink(doc_host->cps.wbe2, DISPID_NAVIGATEERROR, &dispparams); + SysFreeString(V_BSTR(&var_frame_name)); + + if(!cancel) + FIXME("Navigate to error page\n"); +} + static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { @@ -250,10 +295,15 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *ifac set_status_text(This, emptyW); - if(This->doc_host) { - IOleClientSite_Release(&This->doc_host->IOleClientSite_iface); - This->doc_host = NULL; - } + if(!This->doc_host) + return S_OK; + + /* FIXME: Check HTTP status code */ + if(FAILED(hresult)) + handle_navigation_error(This->doc_host, hresult, This->url, NULL); + + IOleClientSite_Release(&This->doc_host->IOleClientSite_iface); + This->doc_host = NULL; return S_OK; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 3692e15..7abd004 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -240,6 +240,7 @@ HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VAR HRESULT go_home(DocHost*); void set_doc_state(DocHost*,READYSTATE); HRESULT get_location_url(DocHost*,BSTR*); +void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*); #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,BOOL);

1 0

Piotr Caban : include: Added IBrowserService2 definition.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: fbe5abbe0676ecff191f188b715f990d2cff25f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe5abbe0676ecff191f188b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:48:53 2011 +0100 include: Added IBrowserService2 definition. --- include/shdeprecated.idl | 327 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 327 insertions(+), 0 deletions(-) diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index c78e461..9a382d7 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -21,6 +21,8 @@ import "objidl.idl"; import "ocidl.idl"; import "shobjidl.idl"; +import "hlink.idl"; +import "exdisp.idl"; cpp_quote("#define TLOG_BACK -1") cpp_quote("#define TLOG_FORE 1") @@ -108,6 +110,34 @@ interface ITravelLog : IUnknown HRESULT Revert(); }; +typedef void *CIE4ConnectionPoint; + +[ + local, + object, + uuid(0D7D1D00-6FC0-11D0-A974-00C04FD705A2) +] +interface IExpDispSupport : IUnknown +{ + HRESULT FindCIE4ConnectionPoint( + REFIID riid, + CIE4ConnectionPoint **ppccp); + + HRESULT OnTranslateAccelerator( + MSG *pMsg, + DWORD grfModifiers); + + HRESULT OnInvoke( + DISPID dispidMember, + REFIID iid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pdispparams, + VARIANT *pVarResult, + EXCEPINFO *pexcepinfo, + UINT *puArgErr); +}; + typedef enum tagBNSTATE { BNS_NORMAL = 0, @@ -274,3 +304,300 @@ interface IShellService : IUnknown { HRESULT SetOwner( [in] IUnknown *pUnk ); } + +cpp_quote("#if 0") +typedef HANDLE HMONITOR; +cpp_quote("#endif") + +enum { + SECURELOCK_NOCHANGE = -1, + SECURELOCK_SET_UNSECURE = 0, + SECURELOCK_SET_MIXED = 1, + SECURELOCK_SET_SECUREUNKNOWNBIT = 2, + SECURELOCK_SET_SECURE40BIT = 3, + SECURELOCK_SET_SECURE56BIT = 4, + SECURELOCK_SET_FORTEZZA = 5, + SECURELOCK_SET_SECURE128BIT = 6, + SECURELOCK_FIRSTSUGGEST = 7, + SECURELOCK_SUGGEST_UNSECURE = SECURELOCK_FIRSTSUGGEST, + SECURELOCK_SUGGEST_MIXED = 8, + SECURELOCK_SUGGEST_SECUREUNKNOWNBIT = 9, + SECURELOCK_SUGGEST_SECURE40BIT = 10, + SECURELOCK_SUGGEST_SECURE56BIT = 11, + SECURELOCK_SUGGEST_FORTEZZA = 12, + SECURELOCK_SUGGEST_SECURE128BIT = 13, +}; + + +typedef struct { + HWND _hwnd; + ITravelLog *_ptl; + IHlinkFrame *_phlf; + IWebBrowser2 *_pautoWB2; + IExpDispSupport *_pautoEDS; + IShellService *_pautoSS; + int _eSecureLockIcon; + DWORD _fCreatingViewWindow; + UINT _uActivateState; + + LPCITEMIDLIST _pidlNewShellView; + + IOleCommandTarget *_pctView; + + LPITEMIDLIST _pidlCur; + IShellView *_psv; + IShellFolder *_psf; + HWND _hwndView; + LPWSTR _pszTitleCur; + + LPITEMIDLIST _pidlPending; + IShellView *_psvPending; + IShellFolder *_psfPending; + HWND _hwndViewPending; + LPWSTR _pszTitlePending; + + BOOL _fIsViewMSHTML; + BOOL _fPrivacyImpacted; + +} BASEBROWSERDATA, *LPBASEBROWSERDATA; +typedef const BASEBROWSERDATA *LPCBASEBROWSERDATA; + +cpp_quote("#define VIEW_PRIORITY_RESTRICTED 0x00000070") +cpp_quote("#define VIEW_PRIORITY_CACHEHIT 0x00000050") +cpp_quote("#define VIEW_PRIORITY_STALECACHEHIT 0x00000045") +cpp_quote("#define VIEW_PRIORITY_USEASDEFAULT 0x00000043") +cpp_quote("#define VIEW_PRIORITY_SHELLEXT 0x00000040") +cpp_quote("#define VIEW_PRIORITY_CACHEMISS 0x00000030") +cpp_quote("#define VIEW_PRIORITY_INHERIT 0x00000020") +cpp_quote("#define VIEW_PRIORITY_SHELLEXT_ASBACKUP 0x0015") +cpp_quote("#define VIEW_PRIORITY_DESPERATE 0x00000010") +cpp_quote("#define VIEW_PRIORITY_NONE 0x00000000") + +typedef struct tagFolderSetData { + FOLDERSETTINGS _fs; + SHELLVIEWID _vidRestore; + DWORD _dwViewPriority; +} FOLDERSETDATA, *LPFOLDERSETDATA; + +typedef struct SToolbarItem { + IDockingWindow *ptbar; + BORDERWIDTHS rcBorderTool; + LPWSTR pwszItem; + BOOL fShow; + HMONITOR hMon; +} TOOLBARITEM, *LPTOOLBARITEM; + +cpp_quote("#define ITB_VIEW ((UINT)-1)") + +[ + local, + object, + uuid(68BD21CC-438B-11d2-A560-00A0C92DBFE8) +] +interface IBrowserService2 : IBrowserService +{ + LRESULT WndProcBS( + [in] HWND hwnd, + [in] UINT uMsg, + [in, out] WPARAM wParam, + [in, out] LPARAM lParam); + + HRESULT SetAsDefFolderSettings(); + + HRESULT GetViewRect( + [in, out] RECT *prc); + + HRESULT OnSize( + [in] WPARAM wParam); + + HRESULT OnCreate( + [in] struct tagCREATESTRUCTW *pcs); + + LRESULT OnCommand( + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT OnDestroy(); + + LRESULT OnNotify( + [in, out] struct tagNMHDR *pnm); + + HRESULT OnSetFocus(); + + HRESULT OnFrameWindowActivateBS( + [in] BOOL fActive); + + HRESULT ReleaseShellView(); + + HRESULT ActivatePendingView(); + + HRESULT CreateViewWindow( + [in] IShellView *psvNew, + [in] IShellView *psvOld, + [out] LPRECT prcView, + [out] HWND *phwnd); + + HRESULT CreateBrowserPropSheetExt( + [in] REFIID riid, + [out] void **ppv); + + HRESULT GetViewWindow( + [out] HWND *phwndView); + + HRESULT GetBaseBrowserData( + [in, out] LPCBASEBROWSERDATA *pbbd); + + LPBASEBROWSERDATA PutBaseBrowserData(); + + HRESULT InitializeTravelLog( + [in] ITravelLog *ptl, + [in] DWORD dw); + + HRESULT SetTopBrowser(); + + HRESULT Offline( + [in] int iCmd); + + HRESULT AllowViewResize( + [in] BOOL f); + + HRESULT SetActivateState( + [in] UINT u); + + HRESULT UpdateSecureLockIcon( + [in] int eSecureLock); + + HRESULT InitializeDownloadManager(); + + HRESULT InitializeTransitionSite(); + + HRESULT _Initialize( + [in] HWND hwnd, + [in] IUnknown *pauto); + + HRESULT _CancelPendingNavigationAsync(); + + HRESULT _CancelPendingView(); + + HRESULT _MaySaveChanges(); + + HRESULT _PauseOrResumeView( + [in] BOOL fPaused); + + HRESULT _DisableModeless(); + + HRESULT _NavigateToPidl( + [in] LPCITEMIDLIST pidl, + [in] DWORD grfHLNF, + [in] DWORD dwFlags); + + HRESULT _TryShell2Rename( + [in] IShellView *psv, + [in] LPCITEMIDLIST pidlNew); + + HRESULT _SwitchActivationNow(); + + HRESULT _ExecChildren( + [in] IUnknown *punkBar, + [in] BOOL fBroadcast, + [in] const GUID *pguidCmdGroup, + [in] DWORD nCmdID, + [in] DWORD nCmdexecopt, + [in] VARIANTARG *pvarargIn, + [in, out] VARIANTARG *pvarargOut); + + HRESULT _SendChildren( + [in] HWND hwndBar, + [in] BOOL fBroadcast, + [in] UINT uMsg, + [in, out] WPARAM wParam, + [in, out] LPARAM lParam); + + HRESULT GetFolderSetData( + [in, out] struct tagFolderSetData *pfsd); + + HRESULT _OnFocusChange( + [in] UINT itb); + + HRESULT v_ShowHideChildWindows( + [in] BOOL fChildOnly); + + UINT _get_itbLastFocus(); + + HRESULT _put_itbLastFocus( + [in] UINT itbLastFocus); + + HRESULT _UIActivateView( + [in] UINT uState); + + HRESULT _GetViewBorderRect( + [in, out] RECT* prc); + + HRESULT _UpdateViewRectSize(); + + HRESULT _ResizeNextBorder( + [in] UINT itb); + + HRESULT _ResizeView(); + + HRESULT _GetEffectiveClientArea( + [in, out] LPRECT lprectBorder, + [in] HMONITOR hmon); + + IStream* v_GetViewStream( + [in] LPCITEMIDLIST pidl, + [in] DWORD grfMode, + [in] LPCWSTR pwszName); + + LRESULT ForwardViewMsg( + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); + + HRESULT SetAcceleratorMenu( + [in] HACCEL hacc); + + int _GetToolbarCount(); + + LPTOOLBARITEM _GetToolbarItem( + [in] int itb); + + HRESULT _SaveToolbars( + [in] IStream *pstm); + + HRESULT _LoadToolbars( + [in] IStream *pstm); + + HRESULT _CloseAndReleaseToolbars( + [in] BOOL fClose); + + HRESULT v_MayGetNextToolbarFocus( + [in] LPMSG lpMsg, + [in] UINT itbNext, + [in] int citb, + [out] LPTOOLBARITEM *pptbi, + [out] HWND *phwnd); + + HRESULT _ResizeNextBorderHelper( + [in] UINT itb, + [in] BOOL bUseHmonitor); + + UINT _FindTBar( + [in] IUnknown *punkSrc); + + HRESULT _SetFocus( + [in] LPTOOLBARITEM ptbi, + [in] HWND hwnd, + [in] LPMSG lpMsg); + + HRESULT v_MayTranslateAccelerator( + [in] MSG* pmsg); + + HRESULT _GetBorderDWHelper( + [in] IUnknown *punkSrc, + [in] LPRECT lprectBorder, + [in] BOOL bUseHmonitor); + + HRESULT v_CheckZoneCrossing( + [in, out] LPCITEMIDLIST pidl); +};

1 0

Piotr Caban : include: Added IDockingWindow definition.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: wine Branch: master Commit: 869231b439d8defb6bfa1ba07a415f3dcc1bed80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=869231b439d8defb6bfa1ba07… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 14 17:48:39 2011 +0100 include: Added IDockingWindow definition. --- include/shlguid.h | 1 - include/shobjidl.idl | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/include/shlguid.h b/include/shlguid.h index 3af4398..e11f9ff 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -99,7 +99,6 @@ DEFINE_GUID(SID_SCommDlgBrowser, 0x80f30233, 0xb7df, 0x11d2, 0xa3, 0x3b, 0x00, #define IID_IShellExecuteHook WINELIB_NAME_AW(IID_IShellExecuteHook) #define IID_INewShortcutHook WINELIB_NAME_AW(IID_INewShortcutHook) -DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IDockingWindowSite, 0x2A342FC2L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); DEFINE_GUID(IID_IInputObject, 0x068284FAA, 0x6A48, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); DEFINE_GUID(IID_IInputObjectSite, 0x0F1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 176b63f..c4eac65 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1308,6 +1308,27 @@ interface ICommDlgBrowser3 : ICommDlgBrowser2 [in] IShellView *ppshv); } +/***************************************************************************** + * IDockingWindow interface + */ +[ + object, + uuid(012dd920-7b26-11d0-8ca9-00a0c92dbfe8) +] +interface IDockingWindow : IOleWindow +{ + HRESULT ShowDW( + [in] BOOL fShow); + + HRESULT CloseDW( + [in] DWORD dwReserved); + + HRESULT ResizeBorderDW( + [in] LPCRECT prcBorder, + [in] IUnknown *punkToolbarSite, + [in] BOOL fReserved); +}; + /***************************************************************************** * IDockingWindowFrame interface

1 0

Jacek Caban : winegecko: Added 1.2.0 release.
by Alexandre Julliard 15 Mar '11

15 Mar '11

Module: tools Branch: master Commit: b49d42ef9424e3eb4d6786da65db89077f9ab215 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b49d42ef9424e3eb4d6786da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 15 13:44:35 2011 +0100 winegecko: Added 1.2.0 release. --- winegecko.php | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/winegecko.php b/winegecko.php index 4440279..8709a72 100644 --- a/winegecko.php +++ b/winegecko.php @@ -29,8 +29,24 @@ if(isset($_GET['v'])) { $sFileSuffix = $sVersion.'-'.$_GET['arch']; } +if(!$sFileSuffix) + $sFileSuffix = $sVersion; + +switch($sVersion) { +case '0.0.1': +case '0.1.0': +case '0.9.0': +case '0.9.1': +case '1.0.0': +case '1.1.0': + $sExt = 'cab'; + break; +default: + $sExt = 'msi'; +} + // Name of the file -$sFileName = sprintf('%s/%s/wine_gecko-%s.cab', $sFolder, $sVersion, $sFileSuffix ? $sFileSuffix : $sVersion); +$sFileName = sprintf('%s/%s/wine_gecko-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); // Size array $aFileSizes = array( @@ -40,11 +56,13 @@ $aFileSizes = array( '0.9.1'=>7806837, '1.0.0-x86'=>8119486, '1.1.0-x86'=>8868851, - '1.1.0-x86_64'=>8940997 + '1.1.0-x86_64'=>8940997, + '1.2.0-x86'=>12604928, + '1.2.0-x86_64'=>12841472 ); // Exact size of the file: -$iFileSize = $aFileSizes[$sFileSuffix ? $sFileSuffix : $sVersion]; +$iFileSize = $aFileSizes[$sFileSuffix]; if(!$iFileSize) { header("HTTP/1.0 404 Not Found"); exit;

1 0

Alexandre Julliard : urlmon/tests: Update test data location to test.winehq .org/tests.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 3dc7ffb7a55d5518f8900904cc6985baea4fc2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc7ffb7a55d5518f8900904c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 16:43:22 2011 +0100 urlmon/tests: Update test data location to test.winehq.org/tests. --- dlls/urlmon/tests/protocol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 2549e02..be8494c 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -797,7 +797,7 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_REDIRECTING: CHECK_EXPECT(ReportProgress_REDIRECTING); if(test_redirect) - ok(!strcmp_wa(szStatusText, "http://test.winehq.org/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); + ok(!strcmp_wa(szStatusText, "http://test.winehq.org/tests/hello.html"), "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); else ok(szStatusText == NULL, "szStatusText = %s\n", wine_dbgstr_w(szStatusText)); break; @@ -2901,7 +2901,7 @@ static void test_http_protocol(void) 'p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR redirect_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', - 't','e','s','t','r','e','d','i','r','e','c','t',0}; + 't','e','s','t','s','/','r','e','d','i','r','e','c','t',0}; static const WCHAR winetest_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/','d','a','t','a','/',0};

1 0

Alexandre Julliard : wininet/tests: Update test data location to test. winehq.org/tests.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: ac6a5a6355cc5ad1c9efa393835300d224a85cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6a5a6355cc5ad1c9efa3938… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 16:43:19 2011 +0100 wininet/tests: Update test data location to test.winehq.org/tests. --- dlls/wininet/tests/http.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 95a5779..980a809 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -31,7 +31,7 @@ #include "wine/test.h" -#define TEST_URL "http://test.winehq.org/hello.html" +#define TEST_URL "http://test.winehq.org/tests/hello.html" static BOOL first_connection_to_test_url = TRUE; @@ -121,10 +121,10 @@ typedef struct { static const test_data_t test_data[] = { { - "http://test.winehq.org/testredirect", - "http://test.winehq.org/hello.html", + "http://test.winehq.org/tests/redirect", + "http://test.winehq.org/tests/hello.html", "test.winehq.org", - "/testredirect", + "/tests/redirect", "", TESTF_REDIRECT }, @@ -629,7 +629,7 @@ static void InternetReadFile_chunked_test(void) if (hic == 0x0) goto abort; trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", "/testchunked", NULL, NULL, types, + hor = HttpOpenRequestA(hic, "GET", "/tests/chunked", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -748,7 +748,7 @@ static void InternetReadFileExA_test(int flags) SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); trace("HttpOpenRequestA <--\n"); - hor = HttpOpenRequestA(hic, "GET", "/testredirect", NULL, NULL, types, + hor = HttpOpenRequestA(hic, "GET", "/tests/redirect", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_RESYNCHRONIZE, 0xdeadbead); if (hor == 0x0 && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { @@ -1150,7 +1150,7 @@ static void test_http_cache(void) INTERNET_SERVICE_HTTP, 0, 0); ok(connect != NULL, "Unable to connect to http://test.winehq.org with error %d\n", GetLastError()); - request = HttpOpenRequestA(connect, NULL, "/hello.html", NULL, NULL, types, INTERNET_FLAG_NEED_FILE, 0); + request = HttpOpenRequestA(connect, NULL, "/tests/hello.html", NULL, NULL, types, INTERNET_FLAG_NEED_FILE, 0); if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) { skip( "Network unreachable, skipping test\n" ); @@ -1165,7 +1165,7 @@ static void test_http_cache(void) size = sizeof(url); ret = InternetQueryOptionA(request, INTERNET_OPTION_URL, url, &size); ok(ret, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(url, "http://test.winehq.org/hello.html"), "Wrong URL %s\n", url); + ok(!strcmp(url, "http://test.winehq.org/tests/hello.html"), "Wrong URL %s\n", url); size = sizeof(file_name); ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); @@ -2913,7 +2913,7 @@ static void test_user_agent_header(void) con = InternetConnect(ses, "test.winehq.org", 80, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequest(con, "GET", "/hello.html", "HTTP/1.0", NULL, NULL, 0, 0); + req = HttpOpenRequest(con, "GET", "/tests/hello.html", "HTTP/1.0", NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); size = sizeof(buffer);

1 0

André Hentschel : advapi32/tests: Add some skips.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: e2a3b4b4e59d519d07be925c057aa3e82ff1a8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a3b4b4e59d519d07be925c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 13 15:32:59 2011 +0100 advapi32/tests: Add some skips. --- dlls/advapi32/tests/registry.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 2809559..91164bd 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2064,8 +2064,13 @@ static void test_classesroot(void) delete_key( hkey ); RegCloseKey( hkey ); } - if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, - KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return; + res = RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL ); + if (res == ERROR_ACCESS_DENIED) + { + skip("not enough privileges to add a user class\n"); + return; + } /* try to open that key in hkcr */ res = RegOpenKeyExA( HKEY_CLASSES_ROOT, "WineTestCls", 0, @@ -2075,7 +2080,7 @@ static void test_classesroot(void) "test key not found in hkcr: %d\n", res); if (res) { - trace( "HKCR key merging not supported\n" ); + skip("HKCR key merging not supported\n"); delete_key( hkey ); RegCloseKey( hkey ); return;

1 0

André Hentschel : ws2_32: Downgrade FIXME for WS_SIO_SET_COMPATIBILITY_MODE to a TRACE.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 42d3bd713d9575a393a1a7d909d72a56d1e5f10e URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d3bd713d9575a393a1a7d90… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 12 22:27:32 2011 +0100 ws2_32: Downgrade FIXME for WS_SIO_SET_COMPATIBILITY_MODE to a TRACE. --- dlls/ws2_32/socket.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1993419..9469d30 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3483,6 +3483,10 @@ INT WINAPI WSAIoctl(SOCKET s, HeapFree(GetProcessHeap(), 0, ipAddrTable); return 0; } + case WS_SIO_SET_COMPATIBILITY_MODE: + TRACE("WS_SIO_SET_COMPATIBILITY_MODE ignored\n"); + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; case WS_SIO_UDP_CONNRESET: FIXME("WS_SIO_UDP_CONNRESET stub\n"); break;

1 0

André Hentschel : kernel32/tests: Fix a test for real hardware.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 27ae573806cc541a63288884f29483905da80c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ae573806cc541a63288884f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 12 13:41:47 2011 +0100 kernel32/tests: Fix a test for real hardware. --- dlls/kernel32/tests/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index fab01dc..25b55ac 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -865,7 +865,7 @@ static VOID test_thread_processor(void) } error=pSetThreadIdealProcessor(curthread,MAXIMUM_PROCESSORS); - ok(error==0, "SetThreadIdealProcessor returned an incorrect value\n"); + ok(error!=-1, "SetThreadIdealProcessor failed\n"); } }

1 0

André Hentschel : ntoskrnl.exe: Add more mutex stubs.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: bd456a926cbfb1dbe1ff003e7f7805ab45a9a522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd456a926cbfb1dbe1ff003e7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 12 13:40:31 2011 +0100 ntoskrnl.exe: Add more mutex stubs. --- dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 27c5f7a..a697751 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1099,6 +1099,27 @@ void WINAPI KeInitializeMutex(PRKMUTEX Mutex, ULONG Level) } + /*********************************************************************** + * KeWaitForMutexObject (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeWaitForMutexObject(PRKMUTEX Mutex, KWAIT_REASON WaitReason, KPROCESSOR_MODE WaitMode, + BOOLEAN Alertable, PLARGE_INTEGER Timeout) +{ + FIXME( "stub: %p, %d, %d, %d, %p\n", Mutex, WaitReason, WaitMode, Alertable, Timeout ); + return STATUS_NOT_IMPLEMENTED; +} + + + /*********************************************************************** + * KeReleaseMutex (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeReleaseMutex(PRKMUTEX Mutex, BOOLEAN Wait) +{ + FIXME( "stub: %p, %d\n", Mutex, Wait ); + return STATUS_NOT_IMPLEMENTED; +} + + /*********************************************************************** * KeInitializeSemaphore (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6d645ad..ed0059e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -587,7 +587,7 @@ @ stub KeRegisterBugCheckReasonCallback @ stub KeReleaseInterruptSpinLock @ stub KeReleaseMutant -@ stub KeReleaseMutex +@ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) @ stub KeReleaseSpinLockFromDpcLevel @ stub KeRemoveByKeyDeviceQueue @@ -628,7 +628,7 @@ @ stub KeUpdateSystemTime @ stub KeUserModeCallback @ stub KeWaitForMultipleObjects -@ stub KeWaitForMutexObject +@ stdcall KeWaitForMutexObject(ptr long long long ptr) @ stdcall KeWaitForSingleObject(ptr long long long ptr) @ stub KiBugCheckData @ stub KiCoprocessorError

1 0

Marcus Meissner : quartz: Removed const from const REFIID (Coverity).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 82cd229cc2143b5111dc136e9e29c1e4fd84bc0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82cd229cc2143b5111dc136e9… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Mar 14 05:32:52 2011 +0100 quartz: Removed const from const REFIID (Coverity). --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/filesource.c | 2 +- dlls/quartz/nullrenderer.c | 2 +- dlls/quartz/videorenderer.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d472145..f172d87 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1534,7 +1534,7 @@ static DSoundRenderImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { return (DSoundRenderImpl*)((char*)iface - offsetof(DSoundRenderImpl, IAMFilterMiscFlags_vtbl)); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { DSoundRenderImpl *This = from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index d458144..6093713 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1357,7 +1357,7 @@ static AsyncReader *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { return (AsyncReader*)((char*)iface - offsetof(AsyncReader, IAMFilterMiscFlags_vtbl)); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { AsyncReader *This = from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); } diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index cdc7621..f4486c4 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -478,7 +478,7 @@ static NullRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { return (NullRendererImpl*)((char*)iface - offsetof(NullRendererImpl, IAMFilterMiscFlags_vtbl)); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { NullRendererImpl *This = from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 86b9f2a..cf6fc2a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -2202,7 +2202,7 @@ static VideoRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { return (VideoRendererImpl*)((char*)iface - offsetof(VideoRendererImpl, IAMFilterMiscFlags_vtbl)); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, const REFIID riid, void **ppv) { +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { VideoRendererImpl *This = from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); }

1 0

Marcus Meissner : mshtml: Removed duplicate const (Coverity).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 63b05794a7c64b1f1a3db67695ecd4ab3a287880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b05794a7c64b1f1a3db6769… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Mar 14 05:28:42 2011 +0100 mshtml: Removed duplicate const (Coverity). --- dlls/mshtml/tests/activex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 241342b..486acce 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -101,7 +101,7 @@ static const char object_ax_str[] = "</object>" "</body></html>"; -static const REFIID pluginhost_iids[] = { +static REFIID pluginhost_iids[] = { &IID_IOleClientSite, &IID_IAdviseSink, &IID_IAdviseSinkEx,

1 0

Jacek Caban : mshtml: Properly handle BLOCKED:: URLs in IHTMLImgElement:: get_src.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 0ef8f70e114fcba6845b8b3cab25fdc405efc297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef8f70e114fcba6845b8b3ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 14:07:09 2011 +0100 mshtml: Properly handle BLOCKED:: URLs in IHTMLImgElement::get_src. --- dlls/mshtml/htmlimg.c | 22 ++++++++++++++++------ dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 1008f87..1fb0e83 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -287,21 +287,31 @@ static HRESULT WINAPI HTMLImgElement_get_src(IHTMLImgElement *iface, BSTR *p) const PRUnichar *src; nsAString src_str; nsresult nsres; - HRESULT hres; + HRESULT hres = S_OK; + + static const WCHAR blockedW[] = {'B','L','O','C','K','E','D',':',':',0}; TRACE("(%p)->(%p)\n", This, p); nsAString_Init(&src_str, NULL); nsres = nsIDOMHTMLImageElement_GetSrc(This->nsimg, &src_str); - if(NS_FAILED(nsres)) { + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&src_str, &src); + + if(!strncmpiW(src, blockedW, sizeof(blockedW)/sizeof(WCHAR)-1)) { + TRACE("returning BLOCKED::\n"); + *p = SysAllocString(blockedW); + if(!*p) + hres = E_OUTOFMEMORY; + }else { + hres = nsuri_to_url(src, TRUE, p); + } + }else { ERR("GetSrc failed: %08x\n", nsres); - return E_FAIL; + hres = E_FAIL; } - nsAString_GetData(&src_str, &src); - hres = nsuri_to_url(src, TRUE, p); nsAString_Finish(&src_str); - return hres; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ec6c7e8..64e0cf2 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2161,8 +2161,8 @@ static void _elem_get_scroll_left(unsigned line, IUnknown *unk) ok(l == l2, "unexpected left %d, expected %d\n", l2, l); } -#define test_img_src(i,s) _test_img_src(__LINE__,i,s) -static void _test_img_src(unsigned line, IUnknown *unk, const char *exsrc) +#define test_img_src(a,b,c) _test_img_src(__LINE__,a,b,c) +static void _test_img_src(unsigned line, IUnknown *unk, const char *exsrc, const char *broken_src) { IHTMLImgElement *img = _get_img_iface(line, unk); BSTR src; @@ -2171,7 +2171,8 @@ static void _test_img_src(unsigned line, IUnknown *unk, const char *exsrc) hres = IHTMLImgElement_get_src(img, &src); IHTMLImgElement_Release(img); ok_(__FILE__,line) (hres == S_OK, "get_src failed: %08x\n", hres); - ok_(__FILE__,line) (!strcmp_wa(src, exsrc), "get_src returned %s expected %s\n", wine_dbgstr_w(src), exsrc); + ok_(__FILE__,line) (!strcmp_wa(src, exsrc) || (broken_src && broken(!strcmp_wa(src, broken_src))), + "get_src returned %s expected %s\n", wine_dbgstr_w(src), exsrc); SysFreeString(src); } @@ -2187,8 +2188,6 @@ static void _test_img_set_src(unsigned line, IUnknown *unk, const char *src) IHTMLImgElement_Release(img); SysFreeString(tmp); ok_(__FILE__,line) (hres == S_OK, "put_src failed: %08x\n", hres); - - _test_img_src(line, unk, src); } #define test_img_alt(u,a) _test_img_alt(__LINE__,u,a) @@ -6574,8 +6573,9 @@ static void test_elems(IHTMLDocument2 *doc) elem = get_elem_by_id(doc, "imgid", TRUE); if(elem) { - test_img_src((IUnknown*)elem, ""); + test_img_src((IUnknown*)elem, "", NULL); test_img_set_src((IUnknown*)elem, "about:blank"); + test_img_src((IUnknown*)elem, "about:blank", NULL); test_img_alt((IUnknown*)elem, NULL); test_img_set_alt((IUnknown*)elem, "alt test"); test_img_name((IUnknown*)elem, "WineImg"); @@ -6852,6 +6852,31 @@ static void test_attr(IHTMLElement *elem) IHTMLDOMAttribute_Release(attr); } +static void test_blocked(IHTMLDocument2 *doc, IHTMLElement *outer_elem) +{ + IHTMLElement *elem; + + test_elem_set_innerhtml((IUnknown*)outer_elem, + "<img id=\"imgid\" src=\"BLOCKED::http://www.winehq.org/img.png\" />"); + elem = get_elem_by_id(doc, "imgid", TRUE); + if(elem) { + test_img_src((IUnknown*)elem, "BLOCKED::", "blocked::http://www.winehq.org/img.png"); + IHTMLElement_Release(elem); + } + + test_elem_set_innerhtml((IUnknown*)outer_elem, + "<img id=\"imgid\" src=\"BLOCKE::http://www.winehq.org/img.png\" />"); + elem = get_elem_by_id(doc, "imgid", TRUE); + if(elem) { + test_img_src((IUnknown*)elem, "blocke::http://www.winehq.org/img.png", NULL); + test_img_set_src((IUnknown*)elem, "BLOCKED:http://www.winehq.org/img.png"); + test_img_src((IUnknown*)elem, "blocked:http://www.winehq.org/img.png", NULL); + test_img_set_src((IUnknown*)elem, "blocked::http://www.winehq.org/img.png"); + test_img_src((IUnknown*)elem, "BLOCKED::", "blocked::http://www.winehq.org/img.png"); + IHTMLElement_Release(elem); + } +} + static void test_elems2(IHTMLDocument2 *doc) { IHTMLElement *elem, *elem2, *div; @@ -6913,6 +6938,7 @@ static void test_elems2(IHTMLDocument2 *doc) test_attr(div); test_style_filters(div); + test_blocked(doc, div); IHTMLElement_Release(div); }

1 0

Jacek Caban : mshtml: Reimplement nsIURI::SetScheme on top of IUri.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: cdb7bc451b942be8e783c29ca9113af774e4088b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb7bc451b942be8e783c29ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 14 14:06:37 2011 +0100 mshtml: Reimplement nsIURI::SetScheme on top of IUri. --- dlls/mshtml/nsio.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 327b191..016356d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1725,16 +1725,27 @@ static nsresult NSAPI nsURI_GetScheme(nsIURL *iface, nsACString *aScheme) static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme) { nsWineURI *This = impl_from_nsIURL(iface); + const char *schemea; + WCHAR *scheme; + HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aScheme)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetScheme(This->nsuri, aScheme); - } + if(!ensure_uri_builder(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsACString_GetData(aScheme, &schemea); + scheme = heap_strdupAtoW(schemea); + if(!scheme) + return NS_ERROR_OUT_OF_MEMORY; + + hres = IUriBuilder_SetSchemeName(This->uri_builder, scheme); + heap_free(scheme); + if(FAILED(hres)) + return NS_ERROR_UNEXPECTED; + + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_GetUserPass(nsIURL *iface, nsACString *aUserPass)

1 0

Alexandre Julliard : configure: Improve check for security framework and don' t warn about gnutls in that case.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 45db3481f4d9ef7290eab9c2d29e5e3904cd16ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=45db3481f4d9ef7290eab9c2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 14 14:25:45 2011 +0100 configure: Improve check for security framework and don't warn about gnutls in that case. --- configure | 12 ++++++++---- configure.ac | 6 +++++- dlls/crypt32/rootstore.c | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 3651711..8790041 100755 --- a/configure +++ b/configure @@ -657,12 +657,12 @@ QUICKTIMELIB LIBOPENCL FRAMEWORK_OPENAL COREAUDIO +SECURITYLIB DISKARBITRATIONLIB LDEXECFLAGS APPLICATIONSERVICESLIB IOKITLIB COREFOUNDATIONLIB -SECURITYLIB DLLWRAP DLLTOOL LDD @@ -6519,9 +6519,7 @@ fi LDSHARED="\$(CC) -dynamiclib" STRIP="$STRIP -x" LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" - SECURITYLIB="-framework Security -framework CoreFoundation" - - COREFOUNDATIONLIB="-framework CoreFoundation" + COREFOUNDATIONLIB="-framework CoreFoundation" IOKITLIB="-framework IOKit -framework CoreFoundation" @@ -6534,6 +6532,12 @@ fi DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation" fi + if test "$ac_cv_header_Security_Security_h" = "yes" + then + SECURITYLIB="-framework Security -framework CoreFoundation" + + with_gnutls=${with_gnutls:-no} + fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" diff --git a/configure.ac b/configure.ac index 8314579..b16b9e9 100644 --- a/configure.ac +++ b/configure.ac @@ -703,7 +703,6 @@ case $host_os in STRIP="$STRIP -x" LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(top_builddir)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@" dnl declare needed frameworks - AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") @@ -713,6 +712,11 @@ case $host_os in dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found AC_SUBST(DISKARBITRATIONLIB,"-framework DiskArbitration -framework CoreFoundation") fi + if test "$ac_cv_header_Security_Security_h" = "yes" + then + AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation") + with_gnutls=${with_gnutls:-no} + fi if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" then if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 506497a..c6f106e 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -40,7 +40,7 @@ #include "winternl.h" #include "wine/debug.h" #include "crypt32_private.h" -#ifdef __APPLE__ +#ifdef HAVE_SECURITY_SECURITY_H #include <Security/Security.h> #endif @@ -746,7 +746,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) DWORD i; BOOL ret = FALSE; -#ifdef __APPLE__ +#ifdef HAVE_SECURITY_SECURITY_H OSStatus status; CFArrayRef rootCerts;

1 0

Ken Thomases : secur32: Add alternative schannel implementation for Mac OS X.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 5015f388d1cd1db86609e2414b9ea660383f8dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5015f388d1cd1db86609e2414… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:48 2011 -0500 secur32: Add alternative schannel implementation for Mac OS X. It uses the native Secure Transport API rather than GnuTLS. --- dlls/secur32/Makefile.in | 2 + dlls/secur32/schannel.c | 6 +- dlls/secur32/schannel_gnutls.c | 4 +- dlls/secur32/schannel_macosx.c | 791 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 798 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5015f388d1cd1db86609e…

1 0

Ken Thomases : configure: Add test for Security/Security.h header.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 25ed687fe66045a2b06578a8912486dbecc5e1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ed687fe66045a2b06578a89… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:44 2011 -0500 configure: Add test for Security/Security.h header. --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0d715db..3651711 100755 --- a/configure +++ b/configure @@ -5782,6 +5782,7 @@ for ac_header in \ OpenAL/al.h \ OpenCL/opencl.h \ QuickTime/ImageCompression.h \ + Security/Security.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ diff --git a/configure.ac b/configure.ac index edbf111..8314579 100644 --- a/configure.ac +++ b/configure.ac @@ -383,6 +383,7 @@ AC_CHECK_HEADERS(\ OpenAL/al.h \ OpenCL/opencl.h \ QuickTime/ImageCompression.h \ + Security/Security.h \ alias.h \ alsa/asoundlib.h \ arpa/inet.h \ diff --git a/include/config.h.in b/include/config.h.in index 7195429..44b6bb6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -716,6 +716,9 @@ /* Define to 1 if you have the <scsi/sg.h> header file. */ #undef HAVE_SCSI_SG_H +/* Define to 1 if you have the <Security/Security.h> header file. */ +#undef HAVE_SECURITY_SECURITY_H + /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT

1 0

Ken Thomases : secur32: Separate GnuTLS schannel implementation into separate file.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 0b396208db68c950725adae49cedd1486ee56afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b396208db68c950725adae49… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:40 2011 -0500 secur32: Separate GnuTLS schannel implementation into separate file. --- dlls/secur32/Makefile.in | 1 + dlls/secur32/schannel.c | 443 +-------------------------------------- dlls/secur32/schannel_gnutls.c | 462 ++++++++++++++++++++++++++++++++++++++++ dlls/secur32/secur32_priv.h | 37 ++++ 4 files changed, 503 insertions(+), 440 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b396208db68c950725ad…

1 0

Ken Thomases : secur32: Make no-implementation error message non-GnuTLS-specific.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c890bf4dc8dae67ff4119de78bfd49d84c6b5ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c890bf4dc8dae67ff4119de78… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:36 2011 -0500 secur32: Make no-implementation error message non-GnuTLS-specific. --- dlls/secur32/schannel.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0e49112..4cebf4b 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1757,7 +1757,7 @@ void SECUR32_deinitSchannelSP(void) void SECUR32_initSchannelSP(void) { - ERR("libgnutls not found, SSL connections will fail\n"); + ERR("TLS library not found, SSL connections will fail\n"); } void SECUR32_deinitSchannelSP(void) {}

1 0

Ken Thomases : secur32: Extract schan_imp_init/deinit functions.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 2cecf544277a99c2db62d301c0b1ca2a34989117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cecf544277a99c2db62d301c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:31 2011 -0500 secur32: Extract schan_imp_init/deinit functions. --- dlls/secur32/schannel.c | 149 ++++++++++++++++++++++++++-------------------- 1 files changed, 84 insertions(+), 65 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index da19b36..0e49112 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -391,6 +391,86 @@ static void schan_imp_free_certificate_credentials(schan_imp_certificate_credent pgnutls_certificate_free_credentials((gnutls_certificate_credentials)c); } +static void schan_gnutls_log(int level, const char *msg) +{ + TRACE("<%d> %s", level, msg); +} + +static BOOL schan_imp_init(void) +{ + int ret; + + libgnutls_handle = wine_dlopen(SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0); + if (!libgnutls_handle) + { + WARN("Failed to load libgnutls.\n"); + return FALSE; + } + +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym(libgnutls_handle, #f, NULL, 0))) \ + { \ + ERR("Failed to load %s\n", #f); \ + goto fail; \ + } + + LOAD_FUNCPTR(gnutls_alert_get) + LOAD_FUNCPTR(gnutls_alert_get_name) + LOAD_FUNCPTR(gnutls_certificate_allocate_credentials) + LOAD_FUNCPTR(gnutls_certificate_free_credentials) + LOAD_FUNCPTR(gnutls_certificate_get_peers) + LOAD_FUNCPTR(gnutls_cipher_get) + LOAD_FUNCPTR(gnutls_cipher_get_key_size) + LOAD_FUNCPTR(gnutls_credentials_set) + LOAD_FUNCPTR(gnutls_deinit) + LOAD_FUNCPTR(gnutls_global_deinit) + LOAD_FUNCPTR(gnutls_global_init) + LOAD_FUNCPTR(gnutls_global_set_log_function) + LOAD_FUNCPTR(gnutls_global_set_log_level) + LOAD_FUNCPTR(gnutls_handshake) + LOAD_FUNCPTR(gnutls_init) + LOAD_FUNCPTR(gnutls_kx_get) + LOAD_FUNCPTR(gnutls_mac_get) + LOAD_FUNCPTR(gnutls_mac_get_key_size) + LOAD_FUNCPTR(gnutls_perror) + LOAD_FUNCPTR(gnutls_protocol_get_version) + LOAD_FUNCPTR(gnutls_set_default_priority) + LOAD_FUNCPTR(gnutls_record_recv); + LOAD_FUNCPTR(gnutls_record_send); + LOAD_FUNCPTR(gnutls_transport_set_errno) + LOAD_FUNCPTR(gnutls_transport_set_ptr) + LOAD_FUNCPTR(gnutls_transport_set_pull_function) + LOAD_FUNCPTR(gnutls_transport_set_push_function) +#undef LOAD_FUNCPTR + + ret = pgnutls_global_init(); + if (ret != GNUTLS_E_SUCCESS) + { + pgnutls_perror(ret); + goto fail; + } + + if (TRACE_ON(secur32)) + { + pgnutls_global_set_log_level(4); + pgnutls_global_set_log_function(schan_gnutls_log); + } + + return TRUE; + +fail: + wine_dlclose(libgnutls_handle, NULL, 0); + libgnutls_handle = NULL; + return FALSE; +} + +static void schan_imp_deinit(void) +{ + pgnutls_global_deinit(); + wine_dlclose(libgnutls_handle, NULL, 0); + libgnutls_handle = NULL; +} + #define SCHAN_INVALID_HANDLE ~0UL @@ -1520,11 +1600,6 @@ static SECURITY_STATUS SEC_ENTRY schan_DeleteSecurityContext(PCtxtHandle context return SEC_E_OK; } -static void schan_gnutls_log(int level, const char *msg) -{ - TRACE("<%d> %s", level, msg); -} - static const SecurityFunctionTableA schanTableA = { 1, NULL, /* EnumerateSecurityPackagesA */ @@ -1616,63 +1691,9 @@ void SECUR32_initSchannelSP(void) (SEC_WCHAR *)schannelComment }, }; SecureProvider *provider; - int ret; - libgnutls_handle = wine_dlopen(SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0); - if (!libgnutls_handle) - { - WARN("Failed to load libgnutls.\n"); + if (!schan_imp_init()) return; - } - -#define LOAD_FUNCPTR(f) \ - if (!(p##f = wine_dlsym(libgnutls_handle, #f, NULL, 0))) \ - { \ - ERR("Failed to load %s\n", #f); \ - goto fail; \ - } - - LOAD_FUNCPTR(gnutls_alert_get) - LOAD_FUNCPTR(gnutls_alert_get_name) - LOAD_FUNCPTR(gnutls_certificate_allocate_credentials) - LOAD_FUNCPTR(gnutls_certificate_free_credentials) - LOAD_FUNCPTR(gnutls_certificate_get_peers) - LOAD_FUNCPTR(gnutls_cipher_get) - LOAD_FUNCPTR(gnutls_cipher_get_key_size) - LOAD_FUNCPTR(gnutls_credentials_set) - LOAD_FUNCPTR(gnutls_deinit) - LOAD_FUNCPTR(gnutls_global_deinit) - LOAD_FUNCPTR(gnutls_global_init) - LOAD_FUNCPTR(gnutls_global_set_log_function) - LOAD_FUNCPTR(gnutls_global_set_log_level) - LOAD_FUNCPTR(gnutls_handshake) - LOAD_FUNCPTR(gnutls_init) - LOAD_FUNCPTR(gnutls_kx_get) - LOAD_FUNCPTR(gnutls_mac_get) - LOAD_FUNCPTR(gnutls_mac_get_key_size) - LOAD_FUNCPTR(gnutls_perror) - LOAD_FUNCPTR(gnutls_protocol_get_version) - LOAD_FUNCPTR(gnutls_set_default_priority) - LOAD_FUNCPTR(gnutls_record_recv); - LOAD_FUNCPTR(gnutls_record_send); - LOAD_FUNCPTR(gnutls_transport_set_errno) - LOAD_FUNCPTR(gnutls_transport_set_ptr) - LOAD_FUNCPTR(gnutls_transport_set_pull_function) - LOAD_FUNCPTR(gnutls_transport_set_push_function) -#undef LOAD_FUNCPTR - - ret = pgnutls_global_init(); - if (ret != GNUTLS_E_SUCCESS) - { - pgnutls_perror(ret); - goto fail; - } - - if (TRACE_ON(secur32)) - { - pgnutls_global_set_log_level(4); - pgnutls_global_set_log_function(schan_gnutls_log); - } schan_handle_table = HeapAlloc(GetProcessHeap(), 0, 64 * sizeof(*schan_handle_table)); if (!schan_handle_table) @@ -1696,8 +1717,7 @@ void SECUR32_initSchannelSP(void) fail: HeapFree(GetProcessHeap(), 0, schan_handle_table); schan_handle_table = NULL; - wine_dlclose(libgnutls_handle, NULL, 0); - libgnutls_handle = NULL; + schan_imp_deinit(); return; } @@ -1705,7 +1725,7 @@ void SECUR32_deinitSchannelSP(void) { SIZE_T i = schan_handle_count; - if (!libgnutls_handle) return; + if (!schan_handle_table) return; /* deinitialized sessions first because a pointer to the credentials * may be stored for the session. */ @@ -1730,8 +1750,7 @@ void SECUR32_deinitSchannelSP(void) } } HeapFree(GetProcessHeap(), 0, schan_handle_table); - pgnutls_global_deinit(); - wine_dlclose(libgnutls_handle, NULL, 0); + schan_imp_deinit(); } #else /* SONAME_LIBGNUTLS */

1 0

Ken Thomases : secur32: Extract schan_imp_allocate/ free_certificate_credentials functions.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 9124cdc2346a4ff37c072c4d4a9082d50a119138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9124cdc2346a4ff37c072c4d4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:24 2011 -0500 secur32: Extract schan_imp_allocate/free_certificate_credentials functions. --- dlls/secur32/schannel.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index ff9a118..da19b36 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -73,6 +73,7 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); typedef struct schan_imp_session_opaque *schan_imp_session; +typedef struct schan_imp_certificate_credentials_opaque *schan_imp_certificate_credentials; struct schan_transport; @@ -116,7 +117,7 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, } static BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, - gnutls_certificate_credentials cred) + schan_imp_certificate_credentials cred) { gnutls_session_t *s = (gnutls_session_t*)session; @@ -137,7 +138,8 @@ static BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, return FALSE; } - err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, cred); + err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, + (gnutls_certificate_credentials)cred); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -376,6 +378,19 @@ static SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, return SEC_E_OK; } +static BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credentials *c) +{ + int ret = pgnutls_certificate_allocate_credentials((gnutls_certificate_credentials*)c); + if (ret != GNUTLS_E_SUCCESS) + pgnutls_perror(ret); + return (ret == GNUTLS_E_SUCCESS); +} + +static void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) +{ + pgnutls_certificate_free_credentials((gnutls_certificate_credentials)c); +} + #define SCHAN_INVALID_HANDLE ~0UL @@ -395,7 +410,7 @@ struct schan_handle struct schan_credentials { ULONG credential_use; - gnutls_certificate_credentials credentials; + schan_imp_certificate_credentials credentials; }; struct schan_context @@ -666,7 +681,6 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (st == SEC_E_OK) { ULONG_PTR handle; - int ret; creds = HeapAlloc(GetProcessHeap(), 0, sizeof(*creds)); if (!creds) return SEC_E_INSUFFICIENT_MEMORY; @@ -675,10 +689,8 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const SCHANNEL_CRED *schan if (handle == SCHAN_INVALID_HANDLE) goto fail; creds->credential_use = SECPKG_CRED_OUTBOUND; - ret = pgnutls_certificate_allocate_credentials(&creds->credentials); - if (ret != GNUTLS_E_SUCCESS) + if (!schan_imp_allocate_certificate_credentials(&creds->credentials)) { - pgnutls_perror(ret); schan_free_handle(handle, SCHAN_HANDLE_CRED); goto fail; } @@ -785,7 +797,7 @@ static SECURITY_STATUS SEC_ENTRY schan_FreeCredentialsHandle( if (!creds) return SEC_E_INVALID_HANDLE; if (creds->credential_use == SECPKG_CRED_OUTBOUND) - pgnutls_certificate_free_credentials(creds->credentials); + schan_imp_free_certificate_credentials(creds->credentials); HeapFree(GetProcessHeap(), 0, creds); return SEC_E_OK; @@ -1713,7 +1725,7 @@ void SECUR32_deinitSchannelSP(void) { struct schan_credentials *cred; cred = schan_free_handle(i, SCHAN_HANDLE_CRED); - pgnutls_certificate_free_credentials(cred->credentials); + schan_imp_free_certificate_credentials(cred->credentials); HeapFree(GetProcessHeap(), 0, cred); } }

1 0

Ken Thomases : secur32: Use opaque type schan_imp_session in schan_imp interface.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: e02ac5f023ada68ae62414b0a89e67df4999b493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02ac5f023ada68ae62414b0a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:18 2011 -0500 secur32: Use opaque type schan_imp_session in schan_imp interface. --- dlls/secur32/schannel.c | 40 ++++++++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f7e05be..ff9a118 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -72,20 +72,22 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #undef MAKE_FUNCPTR +typedef struct schan_imp_session_opaque *schan_imp_session; + struct schan_transport; static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len); static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len); -static gnutls_session_t schan_session_for_transport(struct schan_transport* t); +static schan_imp_session schan_session_for_transport(struct schan_transport* t); static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; - gnutls_session_t s = schan_session_for_transport(t); + gnutls_session_t s = (gnutls_session_t)schan_session_for_transport(t); int ret = schan_pull(transport, buff, &buff_len); if (ret) @@ -101,7 +103,7 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; - gnutls_session_t s = schan_session_for_transport(t); + gnutls_session_t s = (gnutls_session_t)schan_session_for_transport(t); int ret = schan_push(transport, buff, &buff_len); if (ret) @@ -113,9 +115,11 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } -static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server, +static BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, gnutls_certificate_credentials cred) { + gnutls_session_t *s = (gnutls_session_t*)session; + int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); if (err != GNUTLS_E_SUCCESS) { @@ -147,19 +151,22 @@ static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server, return TRUE; } -static void schan_imp_dispose_session(gnutls_session_t s) +static void schan_imp_dispose_session(schan_imp_session session) { + gnutls_session_t s = (gnutls_session_t)session; pgnutls_deinit(s); } -static void schan_imp_set_session_transport(gnutls_session_t s, +static void schan_imp_set_session_transport(schan_imp_session session, struct schan_transport *t) { + gnutls_session_t s = (gnutls_session_t)session; pgnutls_transport_set_ptr(s, (gnutls_transport_ptr_t)t); } -static SECURITY_STATUS schan_imp_handshake(gnutls_session_t s) +static SECURITY_STATUS schan_imp_handshake(schan_imp_session session) { + gnutls_session_t s = (gnutls_session_t)session; int err = pgnutls_handshake(s); switch(err) { @@ -285,15 +292,17 @@ static ALG_ID schannel_get_kx_algid(gnutls_kx_algorithm_t kx) } } -static unsigned int schan_imp_get_session_cipher_block_size(gnutls_session_t s) +static unsigned int schan_imp_get_session_cipher_block_size(schan_imp_session session) { + gnutls_session_t s = (gnutls_session_t)session; gnutls_cipher_algorithm_t cipher = pgnutls_cipher_get(s); return schannel_get_cipher_block_size(cipher); } -static SECURITY_STATUS schan_imp_get_connection_info(gnutls_session_t s, +static SECURITY_STATUS schan_imp_get_connection_info(schan_imp_session session, SecPkgContext_ConnectionInfo *info) { + gnutls_session_t s = (gnutls_session_t)session; gnutls_protocol_t proto = pgnutls_protocol_get_version(s); gnutls_cipher_algorithm_t alg = pgnutls_cipher_get(s); gnutls_mac_algorithm_t mac = pgnutls_mac_get(s); @@ -310,9 +319,10 @@ static SECURITY_STATUS schan_imp_get_connection_info(gnutls_session_t s, return SEC_E_OK; } -static SECURITY_STATUS schan_imp_get_session_peer_certificate(gnutls_session_t s, +static SECURITY_STATUS schan_imp_get_session_peer_certificate(schan_imp_session session, PCCERT_CONTEXT *cert) { + gnutls_session_t s = (gnutls_session_t)session; unsigned int list_size; const gnutls_datum_t *datum; @@ -330,9 +340,10 @@ static SECURITY_STATUS schan_imp_get_session_peer_certificate(gnutls_session_t s return SEC_E_INTERNAL_ERROR; } -static SECURITY_STATUS schan_imp_send(gnutls_session_t s, const void *buffer, +static SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, size_t *length) { + gnutls_session_t s = (gnutls_session_t)session; ssize_t ret = pgnutls_record_send(s, buffer, *length); if (ret >= 0) *length = ret; @@ -347,9 +358,10 @@ static SECURITY_STATUS schan_imp_send(gnutls_session_t s, const void *buffer, return SEC_E_OK; } -static SECURITY_STATUS schan_imp_recv(gnutls_session_t s, void *buffer, +static SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, size_t *length) { + gnutls_session_t s = (gnutls_session_t)session; ssize_t ret = pgnutls_record_recv(s, buffer, *length); if (ret >= 0) *length = ret; @@ -388,7 +400,7 @@ struct schan_credentials struct schan_context { - gnutls_session_t session; + schan_imp_session session; ULONG req_ctx_attr; }; @@ -964,7 +976,7 @@ static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_ return 0; } -static gnutls_session_t schan_session_for_transport(struct schan_transport* t) +static schan_imp_session schan_session_for_transport(struct schan_transport* t) { return t->ctx->session; }

1 0

Ken Thomases : secur32: Set session credentials in schan_imp_create_session .
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 6b5f7df5cb8997c5ac5e59854812a907795bc8ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b5f7df5cb8997c5ac5e59854… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:14 2011 -0500 secur32: Set session credentials in schan_imp_create_session. --- dlls/secur32/schannel.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 3db2772..f7e05be 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -113,7 +113,8 @@ static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, return buff_len; } -static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) +static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server, + gnutls_certificate_credentials cred) { int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); if (err != GNUTLS_E_SUCCESS) @@ -132,6 +133,14 @@ static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) return FALSE; } + err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, cred); + if (err != GNUTLS_E_SUCCESS) + { + pgnutls_perror(err); + pgnutls_deinit(*s); + return FALSE; + } + pgnutls_transport_set_pull_function(*s, schan_pull_adapter); pgnutls_transport_set_push_function(*s, schan_push_adapter); @@ -1010,7 +1019,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( struct schan_buffers *out_buffers; struct schan_credentials *cred; struct schan_transport transport; - int err; SECURITY_STATUS ret; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, @@ -1045,22 +1053,13 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INTERNAL_ERROR; } - if (!schan_imp_create_session(&ctx->session, FALSE)) + if (!schan_imp_create_session(&ctx->session, FALSE, cred->credentials)) { schan_free_handle(handle, SCHAN_HANDLE_CTX); HeapFree(GetProcessHeap(), 0, ctx); return SEC_E_INTERNAL_ERROR; } - err = pgnutls_credentials_set(ctx->session, GNUTLS_CRD_CERTIFICATE, cred->credentials); - if (err != GNUTLS_E_SUCCESS) - { - pgnutls_perror(err); - schan_imp_dispose_session(ctx->session); - schan_free_handle(handle, SCHAN_HANDLE_CTX); - HeapFree(GetProcessHeap(), 0, ctx); - } - phNewContext->dwLower = handle; phNewContext->dwUpper = 0; } @@ -1685,7 +1684,7 @@ void SECUR32_deinitSchannelSP(void) if (!libgnutls_handle) return; /* deinitialized sessions first because a pointer to the credentials - * are stored for the session by calling gnutls_credentials_set. */ + * may be stored for the session. */ while (i--) { if (schan_handle_table[i].type == SCHAN_HANDLE_CTX)

1 0

Ken Thomases : secur32: Set push & pull functions in schan_imp_create_session.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 3d47fce382ddf2a71ecf1e09b698cbc134634c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d47fce382ddf2a71ecf1e09b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:11 2011 -0500 secur32: Set push & pull functions in schan_imp_create_session. --- dlls/secur32/schannel.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5404d90..3db2772 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -132,6 +132,9 @@ static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) return FALSE; } + pgnutls_transport_set_pull_function(*s, schan_pull_adapter); + pgnutls_transport_set_push_function(*s, schan_push_adapter); + return TRUE; } @@ -1058,9 +1061,6 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( HeapFree(GetProcessHeap(), 0, ctx); } - pgnutls_transport_set_pull_function(ctx->session, schan_pull_adapter); - pgnutls_transport_set_push_function(ctx->session, schan_push_adapter); - phNewContext->dwLower = handle; phNewContext->dwUpper = 0; }

1 0

Ken Thomases : secur32: Extract GnuTLS-isms from schan_push to schan_push_adapter.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c86dafe51e7032462b1be9ee9160972d9fff78f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86dafe51e7032462b1be9ee9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 13 18:58:03 2011 -0500 secur32: Extract GnuTLS-isms from schan_push to schan_push_adapter. --- dlls/secur32/schannel.c | 60 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 9a6864f..5404d90 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -76,6 +76,7 @@ struct schan_transport; static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len); +static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len); static gnutls_session_t schan_session_for_transport(struct schan_transport* t); @@ -96,6 +97,22 @@ static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, return buff_len; } +static ssize_t schan_push_adapter(gnutls_transport_ptr_t transport, + const void *buff, size_t buff_len) +{ + struct schan_transport *t = (struct schan_transport*)transport; + gnutls_session_t s = schan_session_for_transport(t); + + int ret = schan_push(transport, buff, &buff_len); + if (ret) + { + pgnutls_transport_set_errno(s, ret); + return -1; + } + + return buff_len; +} + static BOOL schan_imp_create_session(gnutls_session_t *s, BOOL is_server) { int err = pgnutls_init(s, is_server ? GNUTLS_SERVER : GNUTLS_CLIENT); @@ -896,26 +913,43 @@ static int schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) return 0; } -static ssize_t schan_push(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) +/* schan_push + * Write data to the transport output buffer. + * + * t - The session transport object. + * buff - The buffer of data to write. Must be at least *buff_len bytes in length. + * buff_len - On input, *buff_len is the desired length to write. On successful + * return, *buff_len is the number of bytes actually written. + * + * Returns: + * 0 on success + * *buff_len will be > 0 indicating how much data was written. May be less + * than what was requested, in which case the caller should call again + if/when they want to write more. + * EAGAIN when no data could be written without blocking + * another errno-style error value on failure + * + */ +static int schan_push(struct schan_transport *t, const void *buff, size_t *buff_len) { - struct schan_transport *t = transport; char *b; + size_t local_len = *buff_len; - TRACE("Push %zu bytes\n", buff_len); + TRACE("Push %zu bytes\n", local_len); + + *buff_len = 0; - b = schan_get_buffer(t, &t->out, &buff_len); + b = schan_get_buffer(t, &t->out, &local_len); if (!b) - { - pgnutls_transport_set_errno(t->ctx->session, EAGAIN); - return -1; - } + return EAGAIN; - memcpy(b, buff, buff_len); - t->out.offset += buff_len; + memcpy(b, buff, local_len); + t->out.offset += local_len; - TRACE("Wrote %zu bytes\n", buff_len); + TRACE("Wrote %zu bytes\n", local_len); - return buff_len; + *buff_len = local_len; + return 0; } static gnutls_session_t schan_session_for_transport(struct schan_transport* t) @@ -1025,7 +1059,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } pgnutls_transport_set_pull_function(ctx->session, schan_pull_adapter); - pgnutls_transport_set_push_function(ctx->session, schan_push); + pgnutls_transport_set_push_function(ctx->session, schan_push_adapter); phNewContext->dwLower = handle; phNewContext->dwUpper = 0;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2011