June 2012 - Wine-Commits - list.winehq.org

Francois Gouget : reg: Use the CSTR_XXX macros instead of numeric literals.
by Alexandre Julliard June 21, 2012

June 21, 2012

Module: wine Branch: master Commit: f9c2e21fb1a1425652d3a2b256380be9cc55c0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c2e21fb1a1425652d3a2b25… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 20 23:41:25 2012 +0200 reg: Use the CSTR_XXX macros instead of numeric literals. --- programs/reg/reg.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 8a6ffc4..1b46661 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -80,20 +80,20 @@ static HKEY get_rootkey(LPWSTR key) static const WCHAR szHKCC[] = {'H','K','C','C',0}; static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; - if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==2 || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==2) + if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==CSTR_EQUAL) return HKEY_LOCAL_MACHINE; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2 || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==CSTR_EQUAL) return HKEY_CURRENT_USER; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2 || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==CSTR_EQUAL) return HKEY_CLASSES_ROOT; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2 || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==CSTR_EQUAL) return HKEY_USERS; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2 || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==CSTR_EQUAL || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==CSTR_EQUAL) return HKEY_CURRENT_CONFIG; else return NULL; }

1 0

Alexander Nicolaysen Sørnes : util: Fix errors preventing Xinha from loading when PHP notices are turned on
by Alexander Nicolaysen Sørnes June 21, 2012

June 21, 2012

Module: appdb Branch: master Commit: 519bbf6aa1dc27fec2ae081b4121269c26988683 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=519bbf6aa1dc27fec2ae081b… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Thu Jun 21 15:05:53 2012 +0000 util: Fix errors preventing Xinha from loading when PHP notices are turned on --- include/util.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/util.php b/include/util.php index 2549b04..3b4f517 100644 --- a/include/util.php +++ b/include/util.php @@ -653,6 +653,7 @@ function SimplifyPath($path) { { array_splice($dirs,$i,1); $i--; + continue; } if($dirs[$i]=="..") @@ -682,7 +683,7 @@ function Simplify($dirs, $idx) // won't work with relative paths like ../xinha function GetSimplifiedPath($relative) { - return "/".SimplifyPath(dirname($_SERVER[PHP_SELF])."/".BASE.$relative); + return "/".SimplifyPath(dirname($_SERVER['PHP_SELF'])."/".BASE.$relative); } function HtmlAreaLoaderScript($aTextareas)

1 0

Marcus Meissner : kernel32: Fixed read overflow in WriteFile argument.
by Alexandre Julliard June 20, 2012

June 20, 2012

Module: wine Branch: master Commit: b652dcee420be13b1b70c831981bc1c2fad10817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b652dcee420be13b1b70c8319… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jun 20 20:10:12 2012 +0200 kernel32: Fixed read overflow in WriteFile argument. --- dlls/kernel32/tests/pipe.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index bd196fe..923c0e7 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1758,7 +1758,7 @@ static void test_readfileex_pending(void) OVERLAPPED overlapped; char read_buf[1024]; char write_buf[1024]; - const char *test_string = "test"; + const char test_string[] = "test"; int i; server = CreateNamedPipe(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, @@ -1798,9 +1798,9 @@ static void test_readfileex_pending(void) ok(ret == TRUE, "ReadFileEx failed, err=%i\n", GetLastError()); ok(completion_called == 0, "completion routine called before ReadFileEx returned\n"); - ret = WriteFile(client, test_string, sizeof(test_string), &num_bytes, NULL); + ret = WriteFile(client, test_string, strlen(test_string), &num_bytes, NULL); ok(ret == TRUE, "WriteFile failed\n"); - ok(num_bytes == sizeof(test_string), "only %i bytes written\n", num_bytes); + ok(num_bytes == strlen(test_string), "only %i bytes written\n", num_bytes); ok(completion_called == 0, "completion routine called during WriteFile\n"); @@ -1809,9 +1809,9 @@ static void test_readfileex_pending(void) ok(completion_called == 1, "completion not called after writing pipe\n"); ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); - ok(completion_num_bytes == sizeof(test_string), "ReadFileEx returned only %d bytes\n", completion_num_bytes); + ok(completion_num_bytes == strlen(test_string), "ReadFileEx returned only %d bytes\n", completion_num_bytes); ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); - ok(!memcmp(test_string, read_buf, sizeof(test_string)), "ReadFileEx read wrong bytes\n"); + ok(!memcmp(test_string, read_buf, strlen(test_string)), "ReadFileEx read wrong bytes\n"); /* Make writes until the pipe is full and the write fails */ memset(write_buf, 0xaa, sizeof(write_buf));

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetFourCCCodes().
by Alexandre Julliard June 20, 2012

June 20, 2012

Module: wine Branch: master Commit: 0833a639a9056b2302bc5fbfd1fc84162488aab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0833a639a9056b2302bc5fbfd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 20 17:45:17 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetFourCCCodes(). --- dlls/ddraw/ddraw.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6424492..ce3eade 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1513,7 +1513,11 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes TRACE("iface %p, codes_count %p, codes %p.\n", iface, NumCodes, Codes); - wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode); + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return hr; + } outsize = NumCodes && Codes ? *NumCodes : 0;

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetDisplayMode().
by Alexandre Julliard June 20, 2012

June 20, 2012

Module: wine Branch: master Commit: e109754b1eef0d9f2218ddf6dafe08e94aae2aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e109754b1eef0d9f2218ddf6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 20 17:45:16 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in ddraw7_GetDisplayMode(). --- dlls/ddraw/ddraw.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f38734b..6424492 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1421,10 +1421,7 @@ static HRESULT WINAPI ddraw7_GetDisplayMode(IDirectDraw7 *iface, DDSURFACEDESC2 return DDERR_INVALIDPARAMS; } - /* The necessary members of LPDDSURFACEDESC and LPDDSURFACEDESC2 are equal, - * so one method can be used for all versions (Hopefully) */ - hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode); - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) { ERR("Failed to get display mode, hr %#x.\n", hr); wined3d_mutex_unlock();

1 0

Henri Verbeet : ddraw: Use wined3d_get_adapter_display_mode() in ddraw_create_swapchain().
by Alexandre Julliard June 20, 2012

June 20, 2012

Module: wine Branch: master Commit: bf9b2a89ba075d4df7dbf6066e8b936c089e2f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9b2a89ba075d4df7dbf6066… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 20 17:45:15 2012 +0200 ddraw: Use wined3d_get_adapter_display_mode() in ddraw_create_swapchain(). --- dlls/ddraw/ddraw.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e5bd7d6..f38734b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -670,12 +670,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win struct wined3d_display_mode mode; HRESULT hr = WINED3D_OK; - /* FIXME: wined3d_get_adapter_display_mode() would be more appropriate - * here, since we don't actually have a swapchain yet, but - * wined3d_device_get_display_mode() has some special handling for color - * depth changes. */ - hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode); - if (FAILED(hr)) + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode))) { ERR("Failed to get display mode.\n"); return hr;

1 0

Henri Verbeet : wined3d: Lie about the display format in wined3d_get_adapter_display_mode().
by Alexandre Julliard June 20, 2012

June 20, 2012

Module: wine Branch: master Commit: fdb85423b4ae3ee8454456966b8cc1b0c46da49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb85423b4ae3ee8454456966… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 20 17:45:14 2012 +0200 wined3d: Lie about the display format in wined3d_get_adapter_display_mode(). --- dlls/wined3d/directx.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5183904..df22efd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3029,15 +3029,18 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode) { + const struct wined3d_adapter *adapter; + TRACE("wined3d %p, adapter_idx %u, display_mode %p.\n", wined3d, adapter_idx, mode); if (!mode || adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; + adapter = &wined3d->adapters[adapter_idx]; + if (!adapter_idx) { DEVMODEW DevModeW; - unsigned int bpp; ZeroMemory(&DevModeW, sizeof(DevModeW)); DevModeW.dmSize = sizeof(DevModeW); @@ -3045,11 +3048,22 @@ HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UI EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &DevModeW, 0); mode->width = DevModeW.dmPelsWidth; mode->height = DevModeW.dmPelsHeight; - bpp = DevModeW.dmBitsPerPel; mode->refresh_rate = DEFAULT_REFRESH_RATE; if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) mode->refresh_rate = DevModeW.dmDisplayFrequency; - mode->format_id = pixelformat_for_depth(bpp); + mode->format_id = pixelformat_for_depth(DevModeW.dmBitsPerPel); + + /* Lie about the format. X11 can't change the color depth, and some + * apps are pretty angry if they SetDisplayMode from 24 to 16 bpp and + * find out that GetDisplayMode still returns 24 bpp. This should + * probably be handled in winex11 instead. */ + if (adapter->screen_format && adapter->screen_format != mode->format_id) + { + WARN("Overriding format %s with stored format %s.\n", + debug_d3dformat(mode->format_id), + debug_d3dformat(adapter->screen_format)); + mode->format_id = adapter->screen_format; + } } else {

1 0

Henri Verbeet : wined3d: Only filter redundant mode changes in wined3d.
by Alexandre Julliard June 20, 2012

June 20, 2012

Module: wine Branch: master Commit: 2a0463ac21bab45a477f1f4a500b315546a85042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0463ac21bab45a477f1f4a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 20 17:45:13 2012 +0200 wined3d: Only filter redundant mode changes in wined3d. --- dlls/ddraw/ddraw.c | 14 -------------- dlls/wined3d/device.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 057e6e1..e5bd7d6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1061,20 +1061,6 @@ static HRESULT ddraw_set_display_mode(struct ddraw *ddraw, DWORD Width, DWORD He default: format = WINED3DFMT_UNKNOWN; break; } - if (FAILED(hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode))) - { - ERR("Failed to get current display mode, hr %#x.\n", hr); - } - else if (mode.width == Width - && mode.height == Height - && mode.format_id == format - && mode.refresh_rate == RefreshRate) - { - TRACE("Skipping redundant mode setting call.\n"); - wined3d_mutex_unlock(); - return DD_OK; - } - /* Check the exclusive mode if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) return DDERR_NOEXCLUSIVEMODE; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3bc623a..8aadbbb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1567,9 +1567,11 @@ HRESULT CDECL wined3d_device_set_display_mode(struct wined3d_device *device, { struct wined3d_adapter *adapter = device->adapter; const struct wined3d_format *format = wined3d_get_format(&adapter->gl_info, mode->format_id); + struct wined3d_display_mode current_mode; DEVMODEW devmode; LONG ret; RECT clip_rc; + HRESULT hr; TRACE("device %p, swapchain_idx %u, mode %p (%ux%u@%u %s).\n", device, swapchain_idx, mode, mode->width, mode->height, mode->refresh_rate, debug_d3dformat(mode->format_id)); @@ -1592,9 +1594,19 @@ HRESULT CDECL wined3d_device_set_display_mode(struct wined3d_device *device, devmode.dmFields |= DM_DISPLAYFREQUENCY; /* Only change the mode if necessary */ - if (adapter->screen_size.cx == mode->width && adapter->screen_size.cy == mode->height - && adapter->screen_format == mode->format_id && !mode->refresh_rate) + if (FAILED(hr = wined3d_device_get_display_mode(device, swapchain_idx, &current_mode))) + { + ERR("Failed to get current display mode, hr %#x.\n", hr); + } + else if (current_mode.width == mode->width + && current_mode.height == mode->height + && current_mode.format_id == mode->format_id + && (current_mode.refresh_rate == mode->refresh_rate + || !mode->refresh_rate)) + { + TRACE("Skipping redundant mode setting call.\n"); return WINED3D_OK; + } ret = ChangeDisplaySettingsExW(NULL, &devmode, NULL, CDS_FULLSCREEN, NULL); if (ret != DISP_CHANGE_SUCCESSFUL)

1 0

Thomas Faber : wininet: Use the correct type for sock_namelen in FTP_Connect.
by Alexandre Julliard June 20, 2012

June 20, 2012

Module: wine Branch: master Commit: 62d6b24e4cb5b4180b110599b5682105869406db URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d6b24e4cb5b4180b110599b… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Jun 20 16:31:36 2012 +0200 wininet: Use the correct type for sock_namelen in FTP_Connect. --- dlls/wininet/ftp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 0c7ca12..54dd655 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2433,7 +2433,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, static const WCHAR szEmpty[] = {'\0'}; struct sockaddr_in socketAddr; INT nsocket = -1; - UINT sock_namelen; + socklen_t sock_namelen; BOOL bSuccess = FALSE; ftp_session_t *lpwfs = NULL; char szaddr[INET_ADDRSTRLEN];

1 0

Vincent Povirk : windowscodecs: Report missing component info strings as zero-length.
by Alexandre Julliard June 20, 2012

June 20, 2012

Module: wine Branch: master Commit: 9f157e5bfaccb895c969ab656c8b06575169f066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f157e5bfaccb895c969ab656… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 15:25:37 2012 -0500 windowscodecs: Report missing component info strings as zero-length. --- dlls/windowscodecs/info.c | 6 ++++++ dlls/windowscodecs/tests/info.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index a2cc1a7..5b81702 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -59,6 +59,12 @@ static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, ret = RegGetValueW(classkey, NULL, value, RRF_RT_REG_SZ|RRF_NOEXPAND, NULL, buffer, &cbdata); + if (ret == ERROR_FILE_NOT_FOUND) + { + *actual_size = 0; + return S_OK; + } + if (ret == 0 || ret == ERROR_MORE_DATA) *actual_size = cbdata/sizeof(WCHAR); diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index eda21a6..e923999 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -214,8 +214,8 @@ static void test_pixelformat_info(void) len = 0xdeadbeef; hr = IWICComponentInfo_GetVersion(info, 0, NULL, &len); - todo_wine ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); - todo_wine ok(len == 0, "invalid length 0x%x\n", len); /* version does not apply to pixel formats */ + ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + ok(len == 0, "invalid length 0x%x\n", len); /* version does not apply to pixel formats */ IWICComponentInfo_Release(info); }

1 0