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

Alexandre Julliard : Release 1.5.7.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: d35cb8164a7635201c2ccdf73de2a78cebf6cb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35cb8164a7635201c2ccdf73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 22 20:16:32 2012 +0200 Release 1.5.7. --- ANNOUNCE | 913 ++++++++++++++++++++++++++++++++++-------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 527 insertions(+), 406 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d35cb8164a7635201c2cc…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: 4b97c4b1ef8c83f3cc51c7b8396b99839a10a87f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b97c4b1ef8c83f3cc51c7b83… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:42:09 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 292 +++++++++++++++++++++--------------------- dlls/msvcp70/msvcp70.spec | 228 +++++++++++++++++----------------- dlls/msvcp71/msvcp71.spec | 260 +++++++++++++++++++------------------- dlls/msvcp80/msvcp80.spec | 284 +++++++++++++++++++++--------------------- 4 files changed, 532 insertions(+), 532 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b97c4b1ef8c83f3cc51c…

1 0

Henri Verbeet : wined3d: Only store a different screen format if it' s explicitly changed through wined3d.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: b6c7b825a10f6661763cf0e196004d21f600a12e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c7b825a10f6661763cf0e19… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:30 2012 +0200 wined3d: Only store a different screen format if it's explicitly changed through wined3d. --- dlls/wined3d/device.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 49b1efb..4c3282c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5678,7 +5678,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, { struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; const struct fragment_pipeline *fragment_pipeline; - struct wined3d_display_mode mode; struct shader_caps shader_caps; struct fragment_caps ffp_caps; unsigned int i; @@ -5693,16 +5692,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, list_init(&device->shaders); device->surface_alignment = surface_alignment; - /* Get the initial screen setup for ddraw. */ - hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode); - if (FAILED(hr)) - { - ERR("Failed to get the adapter's display mode, hr %#x.\n", hr); - wined3d_decref(device->wined3d); - return hr; - } - adapter->screen_format = mode.format_id; - /* Save the creation parameters. */ device->create_parms.adapter_idx = adapter_idx; device->create_parms.device_type = device_type;

1 0

Henri Verbeet : wined3d: Implement mode setting in the adapter instead of the device.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: 0f0fe49240522cc3cf67d2211c875fb38c140396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0fe49240522cc3cf67d2211… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:27 2012 +0200 wined3d: Implement mode setting in the adapter instead of the device. --- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 80 +++----------------------------------------- dlls/wined3d/directx.c | 72 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 8 +++-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 +- 6 files changed, 87 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f0fe49240522cc3cf67d…

1 0

Henri Verbeet : wined3d: Properly retrieve the display mode in wined3d_device_set_cursor_properties ().
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: c2c0743ccfd4a945df3b88231d62731e14da3324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c0743ccfd4a945df3b88231… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:29 2012 +0200 wined3d: Properly retrieve the display mode in wined3d_device_set_cursor_properties(). --- dlls/wined3d/device.c | 15 ++++++++++----- dlls/wined3d/directx.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 08b9b63..49b1efb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4800,7 +4800,9 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device if (cursor_image) { + struct wined3d_display_mode mode; struct wined3d_map_desc map_desc; + HRESULT hr; /* MSDN: Cursor must be A8R8G8B8 */ if (cursor_image->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) @@ -4809,13 +4811,18 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } + if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } + /* MSDN: Cursor must be smaller than the display mode */ - if (cursor_image->resource.width > device->adapter->screen_size.cx - || cursor_image->resource.height > device->adapter->screen_size.cy) + if (cursor_image->resource.width > mode.width || cursor_image->resource.height > mode.height) { WARN("Surface %p dimensions are %ux%u, but screen dimensions are %ux%u.\n", cursor_image, cursor_image->resource.width, cursor_image->resource.height, - device->adapter->screen_size.cx, device->adapter->screen_size.cy); + mode.width, mode.height); return WINED3DERR_INVALIDCALL; } @@ -5694,8 +5701,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wined3d_decref(device->wined3d); return hr; } - adapter->screen_size.cx = mode.width; - adapter->screen_size.cy = mode.height; adapter->screen_format = mode.format_id; /* Save the creation parameters. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8fe3109..2685504 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3136,8 +3136,6 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, } /* Store the new values. */ - adapter->screen_size.cx = mode->width; - adapter->screen_size.cy = mode->height; adapter->screen_format = mode->format_id; /* And finally clip mouse to our screen. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9aa4be3..5d07091 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1543,7 +1543,6 @@ struct wined3d_adapter BOOL opengl; POINT monitorPoint; - SIZE screen_size; enum wined3d_format_id screen_format; struct wined3d_gl_info gl_info;

1 0

Henri Verbeet : wined3d: Get rid of the d3d_caps debug channel.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: c11c2e2dbbce3f9b59d2a976281a0fcb60549fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11c2e2dbbce3f9b59d2a9762… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:31 2012 +0200 wined3d: Get rid of the d3d_caps debug channel. --- dlls/wined3d/arb_program_shader.c | 13 +- dlls/wined3d/directx.c | 425 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 7 +- 3 files changed, 215 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c11c2e2dbbce3f9b59d2a…

1 0

Henri Verbeet : wined3d: Just forward wined3d_device_get_display_mode() to the appropriate swapchain.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: 70008999486651b62bef641196a31f6c7002d0e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70008999486651b62bef64119… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 22 15:57:28 2012 +0200 wined3d: Just forward wined3d_device_get_display_mode() to the appropriate swapchain. --- dlls/wined3d/device.c | 27 +++------------------------ 1 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 54eea3f..08b9b63 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3723,31 +3723,10 @@ HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *devic TRACE("device %p, swapchain_idx %u, mode %p.\n", device, swapchain_idx, mode); - if (swapchain_idx) + if (SUCCEEDED(hr = wined3d_device_get_swapchain(device, swapchain_idx, &swapchain))) { - hr = wined3d_device_get_swapchain(device, swapchain_idx, &swapchain); - if (SUCCEEDED(hr)) - { - hr = wined3d_swapchain_get_display_mode(swapchain, mode); - wined3d_swapchain_decref(swapchain); - } - } - else - { - const struct wined3d_adapter *adapter = device->adapter; - - /* Don't read the real display mode, but return the stored mode - * instead. 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. - * - * Also don't relay to the swapchain because with ddraw it's possible - * that there isn't a swapchain at all. */ - mode->width = adapter->screen_size.cx; - mode->height = adapter->screen_size.cy; - mode->format_id = adapter->screen_format; - mode->refresh_rate = 0; - hr = WINED3D_OK; + hr = wined3d_swapchain_get_display_mode(swapchain, mode); + wined3d_swapchain_decref(swapchain); } return hr;

1 0

Per Johansson : ws2_32: In WSAIoctl(SIO_GET_INTERFACE_LIST), skip interfaces with no IPv4 address.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: a239e8ed27b1c3cde6bc568c3d7b9996a9e846b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a239e8ed27b1c3cde6bc568c3… Author: Per Johansson <per(a)morth.org> Date: Thu Jun 21 14:13:09 2012 +0200 ws2_32: In WSAIoctl(SIO_GET_INTERFACE_LIST), skip interfaces with no IPv4 address. --- dlls/ws2_32/socket.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b2bed09..51016b7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3195,27 +3195,27 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID { PIP_ADAPTER_INFO ptr; - if (size*sizeof(INTERFACE_INFO)/sizeof(IP_ADAPTER_INFO) > out_size) - { - WARN("Buffer too small = %u, out_size = %u\n", size, out_size); - HeapFree(GetProcessHeap(),0,table); - release_sock_fd( s, fd ); - status = WSAEFAULT; - break; - } - for (ptr = table, numInt = 0; ptr; - ptr = ptr->Next, intArray++, numInt++) + for (ptr = table, numInt = 0; ptr; ptr = ptr->Next) { unsigned int addr, mask, bcast; struct ifreq ifInfo; + /* Skip interfaces without an IPv4 address. */ + if (ptr->IpAddressList.IpAddress.String[0] == '\0') + continue; + + if ((numInt + 1)*sizeof(INTERFACE_INFO)/sizeof(IP_ADAPTER_INFO) > out_size) + { + WARN("Buffer too small = %u, out_size = %u\n", numInt + 1, out_size); + status = WSAEFAULT; + break; + } + /* Socket Status Flags */ lstrcpynA(ifInfo.ifr_name, ptr->AdapterName, IFNAMSIZ); if (ioctl(fd, SIOCGIFFLAGS, &ifInfo) < 0) { ERR("Error obtaining status flags for socket!\n"); - HeapFree(GetProcessHeap(),0,table); - release_sock_fd( s, fd ); status = WSAEINVAL; break; } @@ -3255,6 +3255,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID intArray->iiBroadcastAddress.AddressIn.sin_port = 0; intArray->iiBroadcastAddress.AddressIn.sin_addr. WS_s_addr = bcast; + intArray++; + numInt++; } } else

1 0

Erich Hoover : hhctrl.ocx: Add support for the CHM code page.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: a02ad10f99fd0ce6b3d756944a30dcb2852b79ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02ad10f99fd0ce6b3d756944… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jun 20 14:31:19 2012 -0600 hhctrl.ocx: Add support for the CHM code page. --- dlls/hhctrl.ocx/chm.c | 8 ++++++++ dlls/hhctrl.ocx/content.c | 8 ++++---- dlls/hhctrl.ocx/help.c | 6 +++--- dlls/hhctrl.ocx/hhctrl.h | 4 +++- dlls/hhctrl.ocx/index.c | 6 +++--- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index f040e5d..f051feb 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -133,6 +133,13 @@ static BOOL ReadChmSystem(CHMInfo *chm) heap_free(chm->defTitle); chm->defTitle = strdupnAtoW(buf, entry.len); break; + case 0x4: + /* TODO: Currently only the Locale ID is loaded from this field */ + TRACE("Locale is: %d\n", *(LCID*)&buf[0]); + if(!GetLocaleInfoW(*(LCID*)&buf[0], LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, + (WCHAR *)&chm->codePage, sizeof(chm->codePage)/sizeof(WCHAR))) + chm->codePage = CP_ACP; + break; case 0x5: TRACE("Default window is %s\n", debugstr_an(buf, entry.len)); break; @@ -416,6 +423,7 @@ CHMInfo *OpenCHM(LPCWSTR szFile) if (!(ret = heap_alloc_zero(sizeof(CHMInfo)))) return NULL; + ret->codePage = CP_ACP; if (!(ret->szFile = strdupW(szFile))) { heap_free(ret); diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index e0ec794..d246c49 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -50,7 +50,7 @@ static void free_content_item(ContentItem *item) } } -static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const char *text) +static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const char *text, UINT code_page) { const char *ptr; LPWSTR *param, merge; @@ -89,11 +89,11 @@ static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const const char *local = strstr(ptr, "::")+2; int local_len = len-(local-ptr); - item->local = decode_html(local, local_len); + item->local = decode_html(local, local_len, code_page); param = &merge; } - *param = decode_html(ptr, len); + *param = decode_html(ptr, len, code_page); if(param == &merge) { SetChmPath(&item->merge, hhc_root->merge.chm_file, merge); @@ -151,7 +151,7 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, Content if(!strcasecmp(node_name.buf, "/object")) break; if(!strcasecmp(node_name.buf, "param")) - parse_obj_node_param(item, hhc_root, node.buf); + parse_obj_node_param(item, hhc_root, node.buf, info->pCHMInfo->codePage); strbuf_zero(&node); } diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 1726f05..ef41ec2 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1793,7 +1793,7 @@ static char find_html_symbol(const char *entity, int entity_len) /* * Decode a string containing HTML encoded characters into a unicode string. */ -WCHAR *decode_html(const char *html_fragment, int html_fragment_len) +WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page) { const char *h = html_fragment; char *amp, *sem, symbol, *tmp; @@ -1850,9 +1850,9 @@ WCHAR *decode_html(const char *html_fragment, int html_fragment_len) tmp_len += len; tmp[tmp_len++] = 0; /* NULL-terminate the string */ - len = MultiByteToWideChar(CP_ACP, 0, tmp, tmp_len, NULL, 0); + len = MultiByteToWideChar(code_page, 0, tmp, tmp_len, NULL, 0); unicode_text = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, tmp, tmp_len, unicode_text, len); + MultiByteToWideChar(code_page, 0, tmp, tmp_len, unicode_text, len); heap_free(tmp); return unicode_text; } diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 599b6a5..73b2a6b 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -106,6 +106,8 @@ typedef struct CHMInfo WCHAR *defTopic; WCHAR *defTitle; WCHAR *defToc; + + UINT codePage; } CHMInfo; #define TAB_CONTENTS 0 @@ -193,7 +195,7 @@ void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN; LPCWSTR skip_schema(LPCWSTR url) DECLSPEC_HIDDEN; -WCHAR *decode_html(const char *html_fragment, int html_fragment_len); +WCHAR *decode_html(const char *html_fragment, int html_fragment_len, UINT code_page); /* memory allocation functions */ diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index 3b5053a..3cf69de 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -62,7 +62,7 @@ static void fill_index_tree(HWND hwnd, IndexItem *item) * sub-topic then there isn't really a sub-topic, the index will jump * directly to the requested item. */ -static void parse_index_obj_node_param(IndexItem *item, const char *text) +static void parse_index_obj_node_param(IndexItem *item, const char *text, UINT code_page) { const char *ptr; LPWSTR *param; @@ -109,7 +109,7 @@ static void parse_index_obj_node_param(IndexItem *item, const char *text) return; } - *param = decode_html(ptr, len); + *param = decode_html(ptr, len, code_page); } /* Parse the object tag corresponding to a list item. @@ -137,7 +137,7 @@ static IndexItem *parse_index_sitemap_object(HHInfo *info, stream_t *stream) TRACE("%s\n", node.buf); if(!strcasecmp(node_name.buf, "param")) { - parse_index_obj_node_param(item, node.buf); + parse_index_obj_node_param(item, node.buf, info->pCHMInfo->codePage); }else if(!strcasecmp(node_name.buf, "/object")) { break; }else {

1 0

Stefan Leichter : kernel32: Let K32EnumProcessModules fail if the last parameter is NULL.
by Alexandre Julliard June 22, 2012

June 22, 2012

Module: wine Branch: master Commit: c0e72bb3626a7ba8090ee07cc0aa88cd5c8b7f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e72bb3626a7ba8090ee07cc… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Jun 21 23:11:19 2012 +0200 kernel32: Let K32EnumProcessModules fail if the last parameter is NULL. --- dlls/kernel32/module.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index adf8a99..9913f1b 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1175,6 +1175,12 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, if (!init_module_iterator(&iter, process)) return FALSE; + if (!needed) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } + *needed = 0; while ((ret = module_iterator_next(&iter)) > 0)

1 0