September 2013 - Wine-Commits

Hans Leidekker : rsaenh: Add support for setting the security descriptor on key containers.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: cabeb962cc19a87fdf1d235e14c7b3ce6f0e663c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabeb962cc19a87fdf1d235e1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 10:04:34 2013 +0200 rsaenh: Add support for setting the security descriptor on key containers. --- dlls/rsaenh/rsaenh.c | 62 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2cf6d8b..7d4cdb9 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1098,7 +1098,7 @@ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY * * dwFlags [I] Flags indicating which keyset to be opened. * phKey [O] Returned key */ -static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, HKEY *phKey) +static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM access, HKEY *phKey) { CHAR szRSABase[MAX_PATH]; HKEY hRootKey; @@ -1112,7 +1112,7 @@ static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, HKEY *phK /* @@ Wine registry key: HKLM\Software\Wine\Crypto\RSA */ /* @@ Wine registry key: HKCU\Software\Wine\Crypto\RSA */ - return RegOpenKeyExA(hRootKey, szRSABase, 0, KEY_READ, phKey) == + return RegOpenKeyExA(hRootKey, szRSABase, 0, access, phKey) == ERROR_SUCCESS; } @@ -1382,7 +1382,7 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, cons HCRYPTPROV hKeyContainer; HCRYPTKEY hCryptKey; - if (!open_container_key(pszContainerName, dwFlags, &hKey)) + if (!open_container_key(pszContainerName, dwFlags, KEY_READ, &hKey)) { SetLastError(NTE_BAD_KEYSET); return (HCRYPTPROV)INVALID_HANDLE_VALUE; @@ -3769,7 +3769,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, return TRUE; } - if (!open_container_key("", dwFlags, &hKey)) + if (!open_container_key("", dwFlags, KEY_READ, &hKey)) { SetLastError(ERROR_NO_MORE_ITEMS); return FALSE; @@ -3841,7 +3841,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, SECURITY_DESCRIPTOR *sd; DWORD err, len, flags = (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET); - if (!open_container_key(pKeyContainer->szName, flags, &hKey)) + if (!open_container_key(pKeyContainer->szName, flags, KEY_READ, &hKey)) { SetLastError(NTE_BAD_KEYSET); return FALSE; @@ -4339,8 +4339,56 @@ BOOL WINAPI RSAENH_CPSetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa */ BOOL WINAPI RSAENH_CPSetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, DWORD dwFlags) { - FIXME("(stub)\n"); - return FALSE; + KEYCONTAINER *pKeyContainer; + HKEY hKey; + + TRACE("(hProv=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, dwParam, pbData, dwFlags); + + if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR **)&pKeyContainer)) + { + SetLastError(NTE_BAD_UID); + return FALSE; + } + + switch (dwParam) + { + case PP_KEYSET_SEC_DESCR: + { + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)pbData; + DWORD err, flags = (pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET); + BOOL def, present; + REGSAM access = WRITE_DAC | WRITE_OWNER | ACCESS_SYSTEM_SECURITY; + PSID owner = NULL, group = NULL; + PACL dacl = NULL, sacl = NULL; + + if (!open_container_key(pKeyContainer->szName, flags, access, &hKey)) + { + SetLastError(NTE_BAD_KEYSET); + return FALSE; + } + + if ((dwFlags & OWNER_SECURITY_INFORMATION && !GetSecurityDescriptorOwner(sd, &owner, &def)) || + (dwFlags & GROUP_SECURITY_INFORMATION && !GetSecurityDescriptorGroup(sd, &group, &def)) || + (dwFlags & DACL_SECURITY_INFORMATION && !GetSecurityDescriptorDacl(sd, &present, &dacl, &def)) || + (dwFlags & SACL_SECURITY_INFORMATION && !GetSecurityDescriptorSacl(sd, &present, &sacl, &def))) + { + RegCloseKey(hKey); + return FALSE; + } + + err = SetSecurityInfo(hKey, SE_REGISTRY_KEY, dwFlags, owner, group, dacl, sacl); + RegCloseKey(hKey); + if (err) + { + SetLastError(err); + return FALSE; + } + return TRUE; + } + default: + FIXME("unimplemented parameter %08x\n", dwParam); + return FALSE; + } } /******************************************************************************

1 0

Hans Leidekker : winhttp: Don' t assume that end of chunk means end of stream.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 59b0374710ea735d71ceaa58fe2b311801160bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b0374710ea735d71ceaa58f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 10:03:40 2013 +0200 winhttp: Don't assume that end of chunk means end of stream. --- dlls/winhttp/request.c | 199 +++++++++++++++++----------------------- dlls/winhttp/winhttp_private.h | 4 +- 2 files changed, 87 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59b0374710ea735d71cea…

1 0

Hans Leidekker : winhttp/tests: Remove explicit zero-intialization of static data.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: bee390e1ef640eb78f5cdff182856834a3bb68cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee390e1ef640eb78f5cdff18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 23 10:03:01 2013 +0200 winhttp/tests: Remove explicit zero-intialization of static data. --- dlls/winhttp/tests/notification.c | 100 ++++++++++++++++++------------------ 1 files changed, 50 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bee390e1ef640eb78f5cd…

1 0

Michael Stefaniuc : setupapi: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 09524be58380b612d0a9d2ba023ac25791e3fe03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09524be58380b612d0a9d2ba0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 23 00:37:16 2013 +0200 setupapi: Avoid using CONST. --- dlls/setupapi/devinst.c | 53 ++++++++++------------------------------- dlls/setupapi/tests/devinst.c | 4 +- 2 files changed, 15 insertions(+), 42 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 6ddebb0..b1d6be0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1310,14 +1310,9 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( /*********************************************************************** * SetupDiCreateDeviceInfoA (SETUPAPI.@) */ -BOOL WINAPI SetupDiCreateDeviceInfoA( - HDEVINFO DeviceInfoSet, - PCSTR DeviceName, - CONST GUID *ClassGuid, - PCSTR DeviceDescription, - HWND hwndParent, - DWORD CreationFlags, - PSP_DEVINFO_DATA DeviceInfoData) +BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceName, + const GUID *ClassGuid, PCSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags, + PSP_DEVINFO_DATA DeviceInfoData) { BOOL ret = FALSE; LPWSTR DeviceNameW = NULL; @@ -1373,14 +1368,9 @@ static DWORD SETUPDI_DevNameToDevID(LPCWSTR devName) /*********************************************************************** * SetupDiCreateDeviceInfoW (SETUPAPI.@) */ -BOOL WINAPI SetupDiCreateDeviceInfoW( - HDEVINFO DeviceInfoSet, - PCWSTR DeviceName, - CONST GUID *ClassGuid, - PCWSTR DeviceDescription, - HWND hwndParent, - DWORD CreationFlags, - PSP_DEVINFO_DATA DeviceInfoData) +BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceName, + const GUID *ClassGuid, PCWSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags, + PSP_DEVINFO_DATA DeviceInfoData) { struct DeviceInfoSet *set = DeviceInfoSet; BOOL ret = FALSE, allocatedInstanceId = FALSE; @@ -1922,11 +1912,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( /*********************************************************************** * SetupDiGetClassDevsA (SETUPAPI.@) */ -HDEVINFO WINAPI SetupDiGetClassDevsA( - CONST GUID *class, - LPCSTR enumstr, - HWND parent, - DWORD flags) +HDEVINFO WINAPI SetupDiGetClassDevsA(const GUID *class, LPCSTR enumstr, HWND parent, DWORD flags) { HDEVINFO ret; LPWSTR enumstrW = NULL; @@ -2328,11 +2314,7 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, /*********************************************************************** * SetupDiGetClassDevsW (SETUPAPI.@) */ -HDEVINFO WINAPI SetupDiGetClassDevsW( - CONST GUID *class, - LPCWSTR enumstr, - HWND parent, - DWORD flags) +HDEVINFO WINAPI SetupDiGetClassDevsW(const GUID *class, LPCWSTR enumstr, HWND parent, DWORD flags) { return SetupDiGetClassDevsExW(class, enumstr, parent, flags, NULL, NULL, NULL); @@ -2341,14 +2323,8 @@ HDEVINFO WINAPI SetupDiGetClassDevsW( /*********************************************************************** * SetupDiGetClassDevsExW (SETUPAPI.@) */ -HDEVINFO WINAPI SetupDiGetClassDevsExW( - CONST GUID *class, - PCWSTR enumstr, - HWND parent, - DWORD flags, - HDEVINFO deviceset, - PCWSTR machine, - PVOID reserved) +HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND parent, DWORD flags, + HDEVINFO deviceset, PCWSTR machine, void *reserved) { static const DWORD unsupportedFlags = DIGCF_DEFAULT | DIGCF_PRESENT | DIGCF_PROFILE; @@ -2790,12 +2766,9 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey( * Success: non-zero value. * Failure: FALSE. Call GetLastError() for more info. */ -BOOL WINAPI SetupDiEnumDeviceInterfaces( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - CONST GUID * InterfaceClassGuid, - DWORD MemberIndex, - PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) +BOOL WINAPI SetupDiEnumDeviceInterfaces(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, + const GUID *InterfaceClassGuid, DWORD MemberIndex, + PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { struct DeviceInfoSet *set = DeviceInfoSet; BOOL ret = FALSE; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 77962b0..14bb934 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -52,8 +52,8 @@ static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DAT static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailA)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInterfaceDetailW)(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiRegisterDeviceInfo)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); -static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(CONST GUID *, LPCSTR, HWND, DWORD); -static HDEVINFO (WINAPI *pSetupDiGetClassDevsW)(CONST GUID *, LPCWSTR, HWND, DWORD); +static HDEVINFO (WINAPI *pSetupDiGetClassDevsA)(const GUID *, LPCSTR, HWND, DWORD); +static HDEVINFO (WINAPI *pSetupDiGetClassDevsW)(const GUID *, LPCWSTR, HWND, DWORD); static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiSetDeviceRegistryPropertyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, const BYTE *, DWORD); static BOOL (WINAPI *pSetupDiGetDeviceRegistryPropertyA)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD);

1 0

Michael Stefaniuc : quartz: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

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 : gdi32: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

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 : advapi32: Avoid using CONST.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

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

Bruno Jesus : ws2_32: Add missing else to getsockopt(SO_ACCEPTCONN).
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: cba19b90277b8faa6e83872411ad48df5dce4f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba19b90277b8faa6e8387241… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 21 15:44:57 2013 -0300 ws2_32: Add missing else to getsockopt(SO_ACCEPTCONN). --- dlls/ws2_32/socket.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 45166de..fac090d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2967,10 +2967,11 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); ret = SOCKET_ERROR; } - - /* BSD returns != 0 while Windows return exact == 1 */ - if (*(int *)optval) *(int *)optval = 1; - + else + { + /* BSD returns != 0 while Windows return exact == 1 */ + if (*(int *)optval) *(int *)optval = 1; + } release_sock_fd( s, fd ); return ret; case WS_SO_DONTLINGER:

1 0

Michael Müller : quartz: Pass correct interface to IBaseFilter:: JoinFilterGraph in function FilterGraph2_AddFilter.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 2fcfde0f627e0e466c897d47b4793e851faf2d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fcfde0f627e0e466c897d47b… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Aug 31 07:04:05 2013 +0200 quartz: Pass correct interface to IBaseFilter::JoinFilterGraph in function FilterGraph2_AddFilter. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0a0beba..0bfef6d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -450,7 +450,7 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter * This->filterCapacity = newCapacity; } - hr = IBaseFilter_JoinFilterGraph(pFilter, (IFilterGraph *)This, wszFilterName); + hr = IBaseFilter_JoinFilterGraph(pFilter, (IFilterGraph *)&This->IFilterGraph2_iface, wszFilterName); if (SUCCEEDED(hr)) {

1 0

Dmitry Timoshkov : ntdll/tests: Extend the FILE_APPEND_DATA test.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: ab8d704e2413cd0ee32e66620cf60065ec6ad31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8d704e2413cd0ee32e66620… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 20 16:00:37 2013 +0900 ntdll/tests: Extend the FILE_APPEND_DATA test. --- dlls/ntdll/tests/file.c | 88 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 65 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 66299ea..ddfa562 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -851,43 +851,85 @@ todo_wine static void append_file_test(void) { - const char text[] = "foobar"; + static const char text[6] = "foobar"; HANDLE handle; NTSTATUS status; IO_STATUS_BLOCK iosb; - DWORD written; - char path[MAX_PATH], buffer[MAX_PATH]; + LARGE_INTEGER offset; + char path[MAX_PATH], buffer[MAX_PATH], buf[16]; GetTempPathA( MAX_PATH, path ); GetTempFileNameA( path, "foo", 0, buffer ); + + handle = CreateFile(buffer, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + U(iosb).Status = -1; + iosb.Information = -1; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text, 3, NULL, NULL); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); + ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + + CloseHandle(handle); + /* It is possible to open a file with only FILE_APPEND_DATA access flags. It matches the O_WRONLY|O_APPEND open() posix behavior */ - handle = CreateFileA(buffer, FILE_APPEND_DATA, 0, NULL, CREATE_ALWAYS, - FILE_FLAG_DELETE_ON_CLOSE, 0); - ok( handle != INVALID_HANDLE_VALUE, "Failed to create a temp file in FILE_APPEND_DATA mode.\n" ); - if(handle == INVALID_HANDLE_VALUE) - { - skip("Couldn't create a temporary file, skipping FILE_APPEND_DATA test\n"); - return; - } + handle = CreateFile(buffer, FILE_APPEND_DATA, 0, NULL, OPEN_EXISTING, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 3, 3, &offset, NULL); +todo_wine + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); +todo_wine + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); +todo_wine + ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); - U(iosb).Status = STATUS_PENDING; - iosb.Information = 0; + CloseHandle(handle); - status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, - text, sizeof(text), NULL, NULL); + handle = CreateFile(buffer, FILE_READ_DATA | FILE_WRITE_DATA | FILE_APPEND_DATA, 0, NULL, OPEN_EXISTING, 0, 0); + ok(handle != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); - if (status == STATUS_PENDING) - { - WaitForSingleObject( handle, 1000 ); - status = U(iosb).Status; - } - written = iosb.Information; + memset(buf, 0, sizeof(buf)); + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); +todo_wine + ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information); + buf[6] = 0; +todo_wine + ok(memcmp(buf, text, 6) == 0, "wrong file contents: %s\n", buf); - todo_wine - ok(status == STATUS_SUCCESS && written == sizeof(text), "FILE_APPEND_DATA NtWriteFile failed\n"); + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, text + 3, 3, &offset, NULL); + ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); + ok(iosb.Information == 3, "expected 3, got %lu\n", iosb.Information); + + memset(buf, 0, sizeof(buf)); + U(iosb).Status = -1; + iosb.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(handle, 0, NULL, NULL, &iosb, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_SUCCESS, "NtReadFile error %#x\n", status); + ok(iosb.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iosb.Status); +todo_wine + ok(iosb.Information == 6, "expected 6, got %lu\n", iosb.Information); + buf[6] = 0; +todo_wine + ok(memcmp(buf, "barbar", 6) == 0, "wrong file contents: %s\n", buf); CloseHandle(handle); + DeleteFile(buffer); } static void nt_mailslot_test(void)

1 0