wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

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

← Newer
1
...
38
39
40
41
42
43
44
...
85
Older →

Jump to page:

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