September 2013 - Wine-commits

Frédéric Delanoy : gphoto2.ds: Use BOOL type where appropriate.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 78fe60ac765ddb7d5bef8e2ce99e864136f48a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fe60ac765ddb7d5bef8e2ce… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 21 00:47:25 2013 +0200 gphoto2.ds: Use BOOL type where appropriate. --- dlls/gphoto2.ds/ui.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index 0b21f2e..d663552 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -69,17 +69,17 @@ static void UI_EndDialog(HWND hwnd, INT_PTR rc) EndDialog(hwnd, rc); } -static int GetAllImages(void) +static BOOL GetAllImages(void) { struct gphoto2_file *file; - int has_images = 0; + BOOL has_images = FALSE; LIST_FOR_EACH_ENTRY( file, &activeDS.files, struct gphoto2_file, entry) { if (strstr(file->filename,".JPG") || strstr(file->filename,".jpg")) { file->download = TRUE; - has_images = 1; + has_images = TRUE; } } return has_images;

1 0

Stefan Dösinger : wined3d: Add support for converted volumes.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: bb172d2a38f560b2f551804c3e68d6e03728f1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb172d2a38f560b2f551804c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 23 13:29:12 2013 +0200 wined3d: Add support for converted volumes. --- dlls/wined3d/directx.c | 12 ---------- dlls/wined3d/volume.c | 56 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 653d123..4a65993 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3874,18 +3874,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - /* Filter formats that need conversion; For one part, this - * conversion is unimplemented, and volume textures are huge, so - * it would be a big performance hit. Unless we hit an application - * needing one of those formats, don't advertize them to avoid - * leading applications into temptation. The windows drivers don't - * support most of those formats on volumes anyway. */ - if (format->convert) - { - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - } - /* The GL_EXT_texture_compression_s3tc spec requires that loading * an s3tc compressed texture results in an error. While the D3D * refrast does support s3tc volumes, at least the nvidia Windows diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index ea481a1..b0dd756 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -102,11 +102,37 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; + UINT width = volume->resource.width; + UINT height = volume->resource.height; + UINT depth = volume->resource.depth, z; + BYTE *mem = data->addr; TRACE("volume %p, context %p, level %u, format %s (%#x).\n", volume, context, volume->texture_level, debug_d3dformat(format->id), format->id); + if (format->convert) + { + UINT dst_row_pitch, dst_slice_pitch; + UINT src_row_pitch, src_slice_pitch; + UINT alignment = volume->resource.device->surface_alignment; + + if (data->buffer_object) + ERR("Loading a converted volume from a PBO.\n"); + if (format->flags & WINED3DFMT_FLAG_BLOCKS) + ERR("Converting a block-based format.\n"); + + dst_row_pitch = width * format->conv_byte_count; + dst_row_pitch = (dst_row_pitch + alignment - 1) & ~(alignment - 1); + dst_slice_pitch = dst_row_pitch * height; + + wined3d_volume_get_pitch(volume, &src_row_pitch, &src_slice_pitch); + + mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); + for (z = 0; z < depth; z++) + format->convert(data->addr + z * src_slice_pitch, mem + z * dst_slice_pitch, + src_row_pitch, dst_row_pitch, width, height); + } if (data->buffer_object) { @@ -115,8 +141,8 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine } GL_EXTCALL(glTexSubImage3DEXT(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, - volume->resource.width, volume->resource.height, volume->resource.depth, - format->glFormat, format->glType, data->addr)); + width, height, depth, + format->glFormat, format->glType, mem)); checkGLcall("glTexSubImage3D"); if (data->buffer_object) @@ -124,6 +150,9 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); } + + if (mem != data->addr) + HeapFree(GetProcessHeap(), 0, mem); } static void wined3d_volume_validate_location(struct wined3d_volume *volume, DWORD location) @@ -147,6 +176,13 @@ static void wined3d_volume_download_data(struct wined3d_volume *volume, const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; + if (format->convert) + { + FIXME("Attempting to download a converted volume, format %s.\n", + debug_d3dformat(format->id)); + return; + } + if (data->buffer_object) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data->buffer_object)); @@ -218,6 +254,17 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, HeapFree(GetProcessHeap(), 0, data.addr); } +static BOOL wined3d_volume_can_evict(const struct wined3d_volume *volume) +{ + if (volume->resource.pool != WINED3D_POOL_MANAGED) + return FALSE; + if (volume->download_count >= 10) + return FALSE; + if (volume->resource.format->convert) + return FALSE; + + return TRUE; +} /* Context activation is done by the caller. */ static void wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) @@ -280,7 +327,7 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, } wined3d_volume_validate_location(volume, location); - if (volume->resource.pool == WINED3D_POOL_MANAGED && volume->download_count < 10) + if (wined3d_volume_can_evict(volume)) wined3d_volume_evict_sysmem(volume); break; @@ -808,7 +855,8 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device volume->locations = WINED3D_LOCATION_DISCARDED; if (pool == WINED3D_POOL_DEFAULT && usage & WINED3DUSAGE_DYNAMIC - && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) + && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] + && !format->convert) { wined3d_resource_free_sysmem(&volume->resource); volume->flags |= WINED3D_VFLAG_PBO;

1 0

Bruno Jesus : ws2_32: Fix some parameters checking in AcceptEx.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: d0009573eea2e5bad3ce810ddfb22fef99fe969c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0009573eea2e5bad3ce810dd… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 21 16:45:20 2013 -0300 ws2_32: Fix some parameters checking in AcceptEx. --- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fac090d..c606659 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2319,6 +2319,13 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW return FALSE; } + if ((local_addr_len < sizeof(struct sockaddr_in) + 16) + || (rem_addr_len < sizeof(struct sockaddr_in) + 16)) + { + SetLastError(WSAEINVAL); + return FALSE; + } + fd = get_sock_fd( listener, FILE_READ_DATA, NULL ); if (fd == -1) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c1d6956..343fd94 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5348,12 +5348,22 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 15, + sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, 0, &bytesReturned, &overlapped); - todo_wine ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, + sizeof(struct sockaddr_in) + 15, &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " "returned %d + errno %d\n", bret, WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, @@ -5362,6 +5372,10 @@ static void test_AcceptEx(void) ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, 0, &bytesReturned, NULL); + ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " + "returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped);

1 0

André Hentschel : wininet/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 7e65578b7cb00c74433fc6801c83d6753f2ec878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e65578b7cb00c74433fc6801… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 22 21:35:34 2013 +0200 wininet/tests: Don't test function directly when reporting GetLastError(). --- dlls/wininet/tests/http.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2526681..12eab57 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1468,6 +1468,7 @@ static void HttpHeaders_test(void) DWORD len = 256; DWORD oldlen; DWORD index = 0; + BOOL ret; hSession = InternetOpen("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG,NULL,NULL,0); @@ -1759,19 +1760,19 @@ static void HttpHeaders_test(void) ok(index == 1, "Index was not incremented\n"); ok(strcmp(buffer,"value3")==0, "incorrect string was returned(%s)\n",buffer); - ok(HttpAddRequestHeaders(hRequest, "Authorization: Basic\r\n", -1, HTTP_ADDREQ_FLAG_ADD), - "unable to add header %u\n", GetLastError()); + ret = HttpAddRequestHeaders(hRequest, "Authorization: Basic\r\n", -1, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "unable to add header %u\n", GetLastError()); index = 0; buffer[0] = 0; len = sizeof(buffer); - ok(HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index), - "unable to query header %u\n", GetLastError()); + ret = HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index); + ok(ret, "unable to query header %u\n", GetLastError()); ok(index == 1, "index was not incremented\n"); ok(!strcmp(buffer, "Basic"), "incorrect string was returned (%s)\n", buffer); - ok(HttpAddRequestHeaders(hRequest, "Authorization:\r\n", -1, HTTP_ADDREQ_FLAG_REPLACE), - "unable to remove header %u\n", GetLastError()); + ret = HttpAddRequestHeaders(hRequest, "Authorization:\r\n", -1, HTTP_ADDREQ_FLAG_REPLACE); + ok(ret, "unable to remove header %u\n", GetLastError()); index = 0; len = sizeof(buffer);

1 0

André Hentschel : ws2_32/tests: Don' t test function directly when reporting WSAGetLastError().
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: b605553e28fd51cd39cc3d2a503477c44ab9bd43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b605553e28fd51cd39cc3d2a5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 22 21:35:38 2013 +0200 ws2_32/tests: Don't test function directly when reporting WSAGetLastError(). --- dlls/ws2_32/tests/sock.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 343fd94..b085f0b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2094,7 +2094,7 @@ static void test_WSADuplicateSocket(void) WSAPROTOCOL_INFOA info; DWORD err; struct sockaddr_in addr; - int socktype, size, addrsize; + int socktype, size, addrsize, ret; char teststr[] = "TEST", buffer[16]; source = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0); @@ -2181,8 +2181,8 @@ static void test_WSADuplicateSocket(void) ok(dupsock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); size = sizeof(int); - ok(!getsockopt(dupsock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size), - "getsockopt failed with %d\n", WSAGetLastError()); + ret = getsockopt(dupsock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", SOCK_DGRAM, socktype);

1 0

Michael Stefaniuc : advapi32: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 6f8b2f5938defef061c270df9c317c8da708a14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8b2f5938defef061c270df9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 23 00:22:48 2013 +0200 advapi32: Avoid using CONST. --- dlls/advapi32/crypt.c | 12 ++++++------ dlls/advapi32/crypt.h | 12 ++++++------ dlls/advapi32/registry.c | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 3eb4213..d6454ea 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1827,7 +1827,7 @@ BOOL WINAPI CryptHashSessionKey (HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, +BOOL WINAPI CryptImportKey (HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey) { PCRYPTPROV prov = (PCRYPTPROV)hProv; @@ -1947,7 +1947,7 @@ BOOL WINAPI CryptSignHashA (HCRYPTHASH hHash, DWORD dwKeySpec, LPCSTR sDescripti * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov; PCRYPTHASH hash = (PCRYPTHASH)hHash; @@ -1981,7 +1981,7 @@ BOOL WINAPI CryptSetHashParam (HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbDa * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov; PCRYPTKEY key = (PCRYPTKEY)hKey; @@ -2156,7 +2156,7 @@ BOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pd * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags) +BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbData, DWORD dwFlags) { PCRYPTPROV prov = (PCRYPTPROV)hProv; @@ -2215,7 +2215,7 @@ BOOL WINAPI CryptSetProvParam (HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbDa * NULL. It is supported only for compatibility with Microsoft's Cryptographic * Providers. */ -BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, +BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags) { PCRYPTHASH hash = (PCRYPTHASH)hHash; @@ -2243,7 +2243,7 @@ BOOL WINAPI CryptVerifySignatureW (HCRYPTHASH hHash, CONST BYTE *pbSignature, DW * * See CryptVerifySignatureW. */ -BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, +BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCSTR sDescription, DWORD dwFlags) { LPWSTR wsDescription; diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index 9a199b5..afee3e2 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -45,15 +45,15 @@ typedef struct tagPROVFUNCS BOOL (WINAPI *pCPGetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags); BOOL (WINAPI *pCPGetProvParam)(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD *pdwDataLen, DWORD dwFlags); BOOL (WINAPI *pCPGetUserKey)(HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *phUserKey); - BOOL (WINAPI *pCPHashData)(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pbData, DWORD dwDataLen, DWORD dwFlags); + BOOL (WINAPI *pCPHashData)(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pbData, DWORD dwDataLen, DWORD dwFlags); BOOL (WINAPI *pCPHashSessionKey)(HCRYPTPROV hProv, HCRYPTHASH hHash, HCRYPTKEY hKey, DWORD dwFlags); - BOOL (WINAPI *pCPImportKey)(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); + BOOL (WINAPI *pCPImportKey)(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey); BOOL (WINAPI *pCPReleaseContext)(HCRYPTPROV hProv, DWORD dwFlags); - BOOL (WINAPI *pCPSetHashParam)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); - BOOL (WINAPI *pCPSetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); - BOOL (WINAPI *pCPSetProvParam)(HCRYPTPROV hProv, DWORD dwParam, CONST BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetHashParam)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwParam, const BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetKeyParam)(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData, DWORD dwFlags); + BOOL (WINAPI *pCPSetProvParam)(HCRYPTPROV hProv, DWORD dwParam, const BYTE *pbData, DWORD dwFlags); BOOL (WINAPI *pCPSignHash)(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpec, LPCWSTR sDescription, DWORD dwFlags, BYTE *pbSignature, DWORD *pdwSigLen); - BOOL (WINAPI *pCPVerifySignature)(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags); + BOOL (WINAPI *pCPVerifySignature)(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pbSignature, DWORD dwSigLen, HCRYPTKEY hPubKey, LPCWSTR sDescription, DWORD dwFlags); } PROVFUNCS, *PPROVFUNCS; #define MAGIC_CRYPTPROV 0xA39E741F diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index c01e125..e4f7586 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1176,7 +1176,7 @@ LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) * Failure: Error code */ LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, - DWORD type, CONST BYTE *data, DWORD count ) + DWORD type, const BYTE *data, DWORD count ) { UNICODE_STRING nameW; @@ -1208,7 +1208,7 @@ LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, * NT does definitely care (aj) */ LSTATUS WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, - CONST BYTE *data, DWORD count ) + const BYTE *data, DWORD count ) { ANSI_STRING nameA; UNICODE_STRING nameW;

1 0

Michael Stefaniuc : gdi32: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 7589bbeee41c3e1d6d4306a680014785e7d49a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7589bbeee41c3e1d6d4306a68… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 23 00:23:49 2013 +0200 gdi32: Avoid using CONST. --- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/enhmetafile.c | 7 ++----- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/objects.c | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index adf29ea..dd7a7f1 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -906,7 +906,7 @@ INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx, /*********************************************************************** * SetDIBColorTable (GDI32.@) */ -UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, CONST RGBQUAD *colors ) +UINT WINAPI SetDIBColorTable( HDC hdc, UINT startpos, UINT entries, const RGBQUAD *colors ) { DC * dc; UINT result = 0; @@ -1466,7 +1466,7 @@ HBITMAP WINAPI CreateDIBitmap( HDC hdc, const BITMAPINFOHEADER *header, /*********************************************************************** * CreateDIBSection (GDI32.@) */ -HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, +HBITMAP WINAPI CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage, VOID **bits, HANDLE section, DWORD offset) { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 796796e..b2ae6aa 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2692,11 +2692,8 @@ typedef struct gdi_mf_comment * Translate from old style to new style. * */ -HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, - CONST BYTE *lpbBuffer, - HDC hdcRef, - CONST METAFILEPICT *lpmfp - ) +HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer, const BYTE *lpbBuffer, HDC hdcRef, + const METAFILEPICT *lpmfp) { static const WCHAR szDisplayW[] = { 'D','I','S','P','L','A','Y','\0' }; HMETAFILE hmf = NULL; diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 3dd2923..cbd7368 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -73,7 +73,7 @@ extern BOOL EMFDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_FillRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; -extern BOOL EMFDRV_GdiComment( PHYSDEV dev, UINT bytes, CONST BYTE *buffer ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_GdiComment( PHYSDEV dev, UINT bytes, const BYTE *buffer ) DECLSPEC_HIDDEN; extern INT EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) DECLSPEC_HIDDEN; extern INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 4c85fe7..4e1f3b1 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -503,7 +503,7 @@ COLORREF EMFDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) /****************************************************************** * EMFDRV_GdiComment */ -BOOL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, CONST BYTE *buffer) +BOOL EMFDRV_GdiComment(PHYSDEV dev, UINT bytes, const BYTE *buffer) { EMRGDICOMMENT *emr; UINT total, rounded_size;

1 0

Michael Stefaniuc : quartz: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: e476a201157a0a7a5282412e8a54d9f5151df1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e476a201157a0a7a5282412e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 23 00:26:14 2013 +0200 quartz: Avoid using CONST. --- dlls/quartz/regsvr.c | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 340dec4..d5adf8a 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -197,8 +197,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) if (res != ERROR_SUCCESS) goto error_close_interface_key; if (list->name) { - res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, (const BYTE*)list->name, strlen(list->name) + 1); if (res != ERROR_SUCCESS) goto error_close_iid_key; } @@ -217,8 +216,7 @@ static HRESULT register_interfaces(struct regsvr_interface const *list) if (res != ERROR_SUCCESS) goto error_close_iid_key; sprintfW(buf, fmt, list->num_methods); - res = RegSetValueExW(key, NULL, 0, REG_SZ, - (CONST BYTE*)buf, + res = RegSetValueExW(key, NULL, 0, REG_SZ, (const BYTE*)buf, (lstrlenW(buf) + 1) * sizeof(WCHAR)); RegCloseKey(key); @@ -293,8 +291,7 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list) if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->name) { - res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, - (CONST BYTE*)(list->name), + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, (const BYTE*)list->name, strlen(list->name) + 1); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } @@ -312,12 +309,11 @@ static HRESULT register_coclasses(struct regsvr_coclass const *list) &ips32_key, NULL); if (res != ERROR_SUCCESS) goto error_close_clsid_key; - res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, - (CONST BYTE*)list->ips32, + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, (const BYTE*)list->ips32, lstrlenA(list->ips32) + 1); if (res == ERROR_SUCCESS && list->ips32_tmodel) res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, - (CONST BYTE*)list->ips32_tmodel, + (const BYTE*)list->ips32_tmodel, strlen(list->ips32_tmodel) + 1); RegCloseKey(ips32_key); if (res != ERROR_SUCCESS) goto error_close_clsid_key; @@ -422,14 +418,14 @@ static HRESULT register_mediatypes_parsing(struct regsvr_mediatype_parsing const if (res != ERROR_SUCCESS) goto error_close_keys; StringFromGUID2(&CLSID_AsyncReader, buf, 39); - res = RegSetValueExW(subtype_key, sourcefilter_valuename, 0, REG_SZ, (CONST BYTE*)buf, + res = RegSetValueExW(subtype_key, sourcefilter_valuename, 0, REG_SZ, (const BYTE*)buf, (lstrlenW(buf) + 1) * sizeof(WCHAR)); if (res != ERROR_SUCCESS) goto error_close_keys; for(i = 0; list->line[i]; i++) { char buffer[3]; wsprintfA(buffer, "%d", i); - res = RegSetValueExA(subtype_key, buffer, 0, REG_SZ, (CONST BYTE*)list->line[i], + res = RegSetValueExA(subtype_key, buffer, 0, REG_SZ, (const BYTE*)list->line[i], lstrlenA(list->line[i])); if (res != ERROR_SUCCESS) goto error_close_keys; } @@ -472,17 +468,17 @@ static HRESULT register_mediatypes_extension(struct regsvr_mediatype_extension c if (res != ERROR_SUCCESS) break; StringFromGUID2(list->majortype, buf, 39); - res = RegSetValueExW(extension_key, mediatype_name, 0, REG_SZ, (CONST BYTE*)buf, + res = RegSetValueExW(extension_key, mediatype_name, 0, REG_SZ, (const BYTE*)buf, (lstrlenW(buf) + 1) * sizeof(WCHAR)); if (res != ERROR_SUCCESS) goto error_close_key; StringFromGUID2(list->subtype, buf, 39); - res = RegSetValueExW(extension_key, subtype_valuename, 0, REG_SZ, (CONST BYTE*)buf, + res = RegSetValueExW(extension_key, subtype_valuename, 0, REG_SZ, (const BYTE*)buf, (lstrlenW(buf) + 1) * sizeof(WCHAR)); if (res != ERROR_SUCCESS) goto error_close_key; StringFromGUID2(&CLSID_AsyncReader, buf, 39); - res = RegSetValueExW(extension_key, sourcefilter_valuename, 0, REG_SZ, (CONST BYTE*)buf, + res = RegSetValueExW(extension_key, sourcefilter_valuename, 0, REG_SZ, (const BYTE*)buf, (lstrlenW(buf) + 1) * sizeof(WCHAR)); if (res != ERROR_SUCCESS) goto error_close_key; @@ -702,7 +698,7 @@ static LONG register_key_defvalueW( res = RegCreateKeyExW(base, name, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, NULL); if (res != ERROR_SUCCESS) return res; - res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + res = RegSetValueExW(key, NULL, 0, REG_SZ, (const BYTE*)value, (lstrlenW(value) + 1) * sizeof(WCHAR)); RegCloseKey(key); return res; @@ -722,8 +718,7 @@ static LONG register_key_defvalueA( res = RegCreateKeyExW(base, name, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, NULL); if (res != ERROR_SUCCESS) return res; - res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, - lstrlenA(value) + 1); + res = RegSetValueExA(key, NULL, 0, REG_SZ, (const BYTE*)value, lstrlenA(value) + 1); RegCloseKey(key); return res; } @@ -747,8 +742,7 @@ static LONG register_progid( if (res != ERROR_SUCCESS) return res; if (name) { - res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, - (CONST BYTE*)name, strlen(name) + 1); + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, (const BYTE*)name, strlen(name) + 1); if (res != ERROR_SUCCESS) goto error_close_progid_key; }

1 0

Michael Stefaniuc : rsaenh: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 1a3137fa1ba4cf126604357a5ec1f547050e13c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3137fa1ba4cf126604357a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 23 00:29:19 2013 +0200 rsaenh: Avoid using CONST. --- dlls/rsaenh/implglue.c | 14 ++-- dlls/rsaenh/implglue.h | 14 ++-- dlls/rsaenh/rsaenh.c | 146 ++++++++++++++++++++++++------------------------ 3 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a3137fa1ba4cf1266043…

1 0

Michael Stefaniuc : gdiplus: Avoid using CONST.
by Alexandre Julliard 24 Sep '13

24 Sep '13

Module: wine Branch: master Commit: 9fefae61dafcfb6b7a583050b6fd741170a3894c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fefae61dafcfb6b7a583050b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 23 00:36:04 2013 +0200 gdiplus: Avoid using CONST. --- dlls/gdiplus/gdiplus.c | 6 +++--- dlls/gdiplus/gdiplus_private.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index bfa3279..a76143e 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -374,7 +374,7 @@ REAL units_scale(GpUnit from, GpUnit to, REAL dpi) } /* Calculates Bezier points from cardinal spline points. */ -void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, +void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) { REAL xdiff, ydiff; @@ -473,13 +473,13 @@ void delete_element(region_element* element) } } -const char *debugstr_rectf(CONST RectF* rc) +const char *debugstr_rectf(const RectF* rc) { if (!rc) return "(null)"; return wine_dbg_sprintf("(%0.2f,%0.2f,%0.2f,%0.2f)", rc->X, rc->Y, rc->Width, rc->Height); } -const char *debugstr_pointf(CONST PointF* pt) +const char *debugstr_pointf(const PointF* pt) { if (!pt) return "(null)"; return wine_dbg_sprintf("(%0.2f,%0.2f)", pt->X, pt->Y); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 00be810..19b2130 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -60,7 +60,7 @@ extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDE extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; extern MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) DECLSPEC_HIDDEN; -extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, +extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, REAL tension, REAL *x, REAL *y) DECLSPEC_HIDDEN; @@ -114,9 +114,9 @@ static inline ARGB color_over(ARGB bg, ARGB fg) return (a<<24)|(r<<16)|(g<<8)|b; } -extern const char *debugstr_rectf(CONST RectF* rc) DECLSPEC_HIDDEN; +extern const char *debugstr_rectf(const RectF* rc) DECLSPEC_HIDDEN; -extern const char *debugstr_pointf(CONST PointF* pt) DECLSPEC_HIDDEN; +extern const char *debugstr_pointf(const PointF* pt) DECLSPEC_HIDDEN; extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride) DECLSPEC_HIDDEN;

1 0