December 2009 - Wine-Commits

Juan Lang : winhttp/tests: Only free a certificate context if retrieving it succeeded.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: b0f5b96efe86a0728b4c69198b2b9404b4684e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f5b96efe86a0728b4c69198… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 8 13:43:49 2009 -0800 winhttp/tests: Only free a certificate context if retrieving it succeeded. --- dlls/winhttp/tests/winhttp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2810fbb..342dde2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -787,7 +787,8 @@ static void test_secure_connection(void) size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size ); ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); - CertFreeCertificateContext(cert); + if (ret) + CertFreeCertificateContext(cert); size = sizeof(bitness); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size );

1 0

Juan Lang : rsaenh: Use helper function to release and install a key into a crypt provider.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: ac4ac88a517f125d4ac0366d71fdcb9d5a8c7914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac4ac88a517f125d4ac0366d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 8 13:17:59 2009 -0800 rsaenh: Use helper function to release and install a key into a crypt provider. --- dlls/rsaenh/rsaenh.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0228696..2ccbf5c 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3065,9 +3065,9 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP if (pCryptKey) { new_key_impl(pCryptKey->aiAlgid, &pCryptKey->context, pCryptKey->dwKeyLen); setup_key(pCryptKey); - RSAENH_CPDestroyKey(hProv, pKeyContainer->hSignatureKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hSignatureKeyPair); + release_and_install_key(hProv, *phKey, + &pKeyContainer->hSignatureKeyPair, + FALSE); } break; @@ -3077,9 +3077,9 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP if (pCryptKey) { new_key_impl(pCryptKey->aiAlgid, &pCryptKey->context, pCryptKey->dwKeyLen); setup_key(pCryptKey); - RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hKeyExchangeKeyPair); + release_and_install_key(hProv, *phKey, + &pKeyContainer->hKeyExchangeKeyPair, + FALSE); } break;

1 0

Jacek Caban : wininet: Correctly handle dwContentRead for gzip encoded requests.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: 2d1c4e69282e23feb96c75d0defbfd001bea4988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1c4e69282e23feb96c75d0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 8 23:51:46 2009 +0100 wininet: Correctly handle dwContentRead for gzip encoded requests. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b75986f..19f854d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1967,6 +1967,7 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, zstream->avail_out = size-read; zres = inflate(zstream, Z_FULL_FLUSH); read = size - zstream->avail_out; + req->dwContentRead += req->read_size-zstream->avail_in; remove_data(req, req->read_size-zstream->avail_in); if(zres == Z_STREAM_END) { TRACE("end of data\n"); @@ -2086,9 +2087,9 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * } finished_reading = !bytes_read && req->dwContentRead == req->dwContentLength; + req->dwContentRead += bytes_read; } done: - req->dwContentRead += bytes_read; *read = bytes_read; TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, req->dwContentRead, req->dwContentLength );

1 0

Alexandre Julliard : ntdll/tests: Avoid size_t in traces.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: 70c20027a98722cde3e38dee90b3570e23244941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c20027a98722cde3e38dee9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:19:48 2009 +0100 ntdll/tests: Avoid size_t in traces. --- dlls/ntdll/tests/file.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7e8f101..d98488b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1191,22 +1191,20 @@ static void test_file_name_information(void) hr, STATUS_BUFFER_OVERFLOW); ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_BUFFER_OVERFLOW); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u, expected %u.\n", - info->FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); ok(info->FileName[2] == 0xcccc, "info->FileName[2] is %#x, expected 0xcccc.\n", info->FileName[2]); ok(CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), "info->FileName[1] is %p, expected %p.\n", CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); - ok(io.Information == sizeof(*info), "io.Information is %lu, expected %u.\n", io.Information, sizeof(*info)); + ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information); memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); - ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u, expected %u.\n", - info->FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); - ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[%u] is %#x, expected 0xcccc.\n", - info->FileNameLength / sizeof(WCHAR), info->FileName[info->FileNameLength / sizeof(WCHAR)]); + ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u\n", info->FileNameLength); + ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[len] is %#x, expected 0xcccc.\n", + info->FileName[info->FileNameLength / sizeof(WCHAR)]); info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); @@ -1324,35 +1322,30 @@ static void test_file_all_name_information(void) ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_BUFFER_OVERFLOW); ok(info->NameInformation.FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), - "info->NameInformation.FileNameLength is %u, expected %u.\n", - info->NameInformation.FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + "info->NameInformation.FileNameLength is %u\n", info->NameInformation.FileNameLength ); ok(info->NameInformation.FileName[2] == 0xcccc, "info->NameInformation.FileName[2] is %#x, expected 0xcccc.\n", info->NameInformation.FileName[2]); ok(CharLowerW((LPWSTR)(UINT_PTR)info->NameInformation.FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), "info->NameInformation.FileName[1] is %p, expected %p.\n", CharLowerW((LPWSTR)(UINT_PTR)info->NameInformation.FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); - ok(io.Information == sizeof(*info), "io.Information is %lu, expected %u.\n", io.Information, sizeof(*info)); + ok(io.Information == sizeof(*info), "io.Information is %lu\n", io.Information); memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, info_size, FileAllInformation ); ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); ok(info->NameInformation.FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), - "info->NameInformation.FileNameLength is %u, expected %u.\n", - info->NameInformation.FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + "info->NameInformation.FileNameLength is %u\n", info->NameInformation.FileNameLength ); ok(info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] == 0xcccc, - "info->NameInformation.FileName[%u] is %#x, expected 0xcccc.\n", - info->NameInformation.FileNameLength / sizeof(WCHAR), - info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)]); + "info->NameInformation.FileName[len] is %#x, expected 0xcccc.\n", + info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)]); info->NameInformation.FileName[info->NameInformation.FileNameLength / sizeof(WCHAR)] = '\0'; ok(!lstrcmpiW( info->NameInformation.FileName, expected ), "info->NameInformation.FileName is %s, expected %s.\n", wine_dbgstr_w( info->NameInformation.FileName ), wine_dbgstr_w( expected )); ok(io.Information == FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + info->NameInformation.FileNameLength, - "io.Information is %lu, expected %u.\n", - io.Information, - FIELD_OFFSET(FILE_ALL_INFORMATION, NameInformation.FileName) + info->NameInformation.FileNameLength); + "io.Information is %lu\n", io.Information ); CloseHandle( h ); HeapFree( GetProcessHeap(), 0, info );

1 0

Alexandre Julliard : winex11: Fix a compiler warning.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: e099b80a6f26e133fb9996ab9baf257d8dd3e893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e099b80a6f26e133fb9996ab9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 13:13:29 2009 +0100 winex11: Fix a compiler warning. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index aadb7f1..38f1dad 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -368,7 +368,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) /* In general indirect rendering on a local X11 server indicates a driver problem. * Detect a local X11 server by checking whether the X11 socket is a Unix socket. */ - if(!getsockname(fd, &uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) + if(!getsockname(fd, (struct sockaddr *)&uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers haven't been installed correctly\n"); }

1 0

Piotr Caban : urlmon: Added ProxyStub implementation.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: dc78e8d31532da68d9e4dc13a8dc0f92f378c6b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc78e8d31532da68d9e4dc13a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 8 16:02:19 2009 +0100 urlmon: Added ProxyStub implementation. --- .gitignore | 2 + dlls/urlmon/Makefile.in | 11 ++- dlls/urlmon/regsvr.c | 30 +++++--- dlls/urlmon/urlmon_main.c | 5 + dlls/urlmon/urlmon_main.h | 6 ++ dlls/urlmon/urlmon_urlmon.idl | 19 +++++ dlls/urlmon/usrmarshal.c | 162 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 223 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc78e8d31532da68d9e4d…

1 0

Alexandre Julliard : uxtheme: Fix some pointer cast warnings on 64-bit.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: de3e06a745e38df5d04ade13fb95e62dc4082f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3e06a745e38df5d04ade13f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:04:08 2009 +0100 uxtheme: Fix some pointer cast warnings on 64-bit. --- dlls/uxtheme/draw.c | 5 ++--- dlls/uxtheme/system.c | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 9e22025..17900f8 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -56,7 +56,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) TRACE("(%p,0x%08x\n", hwnd, dwFlags); res = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), - (HANDLE)(dwFlags|0x80000000)); + UlongToHandle(dwFlags|0x80000000)); /* 0x80000000 serves as a "flags set" flag */ if (!res) return HRESULT_FROM_WIN32(GetLastError()); @@ -74,8 +74,7 @@ BOOL WINAPI IsThemeDialogTextureEnabled(HWND hwnd) DWORD dwDialogTextureFlags; TRACE("(%p)\n", hwnd); - dwDialogTextureFlags = (DWORD)GetPropW (hwnd, - (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled)); + dwDialogTextureFlags = HandleToUlong( GetPropW( hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled) )); if (dwDialogTextureFlags == 0) /* Means EnableThemeDialogTexture wasn't called for this dialog */ return TRUE; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 2839539..b84e978 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -393,8 +393,7 @@ static void UXTHEME_RestoreSystemMetrics(void) if (RegQueryValueExW (hKey, bsp->keyName, 0, &type, (LPBYTE)&value, &count) == ERROR_SUCCESS) { - SystemParametersInfoW (bsp->spiSet, 0, (LPVOID)value, - SPIF_UPDATEINIFILE); + SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); } bsp++; @@ -445,9 +444,7 @@ static void UXTHEME_SaveSystemMetrics(void) DWORD value; SystemParametersInfoW (bsp->spiGet, 0, &value, 0); - SystemParametersInfoW (bsp->spiSet, 0, (LPVOID)value, - SPIF_UPDATEINIFILE); - + SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); bsp++; }

1 0

Marcin Baczyński : gdiplus: Add missing declarations for pen.c.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: 82072be1e29ee2170a0117ab85b2d428dd23efe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82072be1e29ee2170a0117ab8… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Wed Dec 9 01:08:45 2009 +0100 gdiplus: Add missing declarations for pen.c. --- include/gdiplusflat.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 7c4fa70..5fc4ed5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -594,6 +594,8 @@ GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen*,INT*); GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen*,REAL*); GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen*,GpDashStyle*); GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); +GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*); +GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB); GpStatus WINGDIPAPI GdipSetPenCompoundArray(GpPen*,GDIPCONST REAL*,INT);

1 0

Marcin Baczyński : gdiplus: Add missing declaration for customlinecap.c.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: cf09ae7be87b96dc7636df38877ad23dd73f2aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf09ae7be87b96dc7636df388… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Wed Dec 9 01:08:46 2009 +0100 gdiplus: Add missing declaration for customlinecap.c. --- include/gdiplusflat.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5fc4ed5..cd97a70 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -90,6 +90,7 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap, GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin*); GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin); GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap*,REAL*); +GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap*,REAL); GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap*,REAL); /* Font */

1 0

Alexandre Julliard : d3d8/tests: Fix some pointer cast warnings on 64-bit.
by Alexandre Julliard Dec. 9, 2009

Dec. 9, 2009

Module: wine Branch: master Commit: 6062679b086a172f1726dd6702f535aa735d3980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6062679b086a172f1726dd670… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:04:22 2009 +0100 d3d8/tests: Fix some pointer cast warnings on 64-bit. --- dlls/d3d8/tests/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 630c4de..33cc56d 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -1745,7 +1745,7 @@ static void resource_test_data_init(IDirect3DDevice8 *device, static void resource_poison_data_init(struct resource_test_data *data, const struct resource_test_arg *arg) { - DWORD poison = 0xdeadbeef; + DWORD_PTR poison = 0xdeadbeef; unsigned int i; data->vs = poison++;

1 0