July 2010 - Wine-commits - list.winehq.org

Vincent Povirk : wineboot: Don' t abort shutdown if we have to terminate a process.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: da8904d150694ba82b201ec72e2e94cba9dd4475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8904d150694ba82b201ec72… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 22 16:49:35 2010 -0500 wineboot: Don't abort shutdown if we have to terminate a process. We can sometimes get a FALSE result from WM_QUERYENDSESSION as a side-effect of terminating a process. We should continue the shutdown process in this case. --- programs/wineboot/shutdown.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index cebe16b..ac3019c 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -113,6 +113,7 @@ struct endtask_dlg_data { struct window_info *win; BOOL cancelled; + BOOL terminated; }; static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) @@ -138,6 +139,7 @@ static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LP WINE_TRACE( "terminating process %04x\n", data->win[0].pid ); TerminateProcess( handle, 0 ); CloseHandle( handle ); + data->terminated = TRUE; } return TRUE; case MAKEWPARAM(IDCANCEL, BN_CLICKED): @@ -175,6 +177,7 @@ static LRESULT send_messages_with_timeout_dialog( cb_data->window_count = count; dlg_data.win = win; + dlg_data.terminated = FALSE; dlg_data.cancelled = FALSE; for (i = 0; i < count; i++) @@ -211,7 +214,7 @@ static LRESULT send_messages_with_timeout_dialog( } if (!cb_data->window_count) { - result = cb_data->result; + result = dlg_data.terminated || cb_data->result; HeapFree( GetProcessHeap(), 0, cb_data ); if (!result) goto cleanup;

1 0

Thomas Mullaly : urlmon: Implemented a parser for IPv4 addresses.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 89026cf980a55e1baef39b5630da28cbe51f2d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=89026cf980a55e1baef39b563… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jun 21 17:03:02 2010 -0400 urlmon: Implemented a parser for IPv4 addresses. --- dlls/urlmon/uri.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 201 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 526624f..cbd8c15 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -23,6 +23,8 @@ #define NO_SHLWAPI_REG #include "shlwapi.h" +#define UINT_MAX 0xffffffff + WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { @@ -55,6 +57,8 @@ typedef struct { BOOL is_relative; BOOL is_opaque; BOOL has_implicit_scheme; + BOOL has_implicit_ip; + UINT implicit_ipv4; const WCHAR *scheme; DWORD scheme_len; @@ -63,6 +67,10 @@ typedef struct { const WCHAR *userinfo; DWORD userinfo_len; INT userinfo_split; + + const WCHAR *host; + DWORD host_len; + Uri_HOST_TYPE host_type; } parse_data; static const CHAR hexDigits[] = "0123456789ABCDEF"; @@ -252,6 +260,135 @@ static BOOL check_pct_encoded(const WCHAR **ptr) { return TRUE; } +/* dec-octet = DIGIT ; 0-9 + * / %x31-39 DIGIT ; 10-99 + * / "1" 2DIGIT ; 100-199 + * / "2" %x30-34 DIGIT ; 200-249 + * / "25" %x30-35 ; 250-255 + */ +static BOOL check_dec_octet(const WCHAR **ptr) { + const WCHAR *c1, *c2, *c3; + + c1 = *ptr; + /* A dec-octet must be at least 1 digit long. */ + if(*c1 < '0' || *c1 > '9') + return FALSE; + + ++(*ptr); + + c2 = *ptr; + /* Since the 1 digit requirment was meet, it doesn't + * matter if this is a DIGIT value, it's considered a + * dec-octet. + */ + if(*c2 < '0' || *c2 > '9') + return TRUE; + + ++(*ptr); + + c3 = *ptr; + /* Same explanation as above. */ + if(*c3 < '0' || *c3 > '9') + return TRUE; + + /* Anything > 255 isn't a valid IP dec-octet. */ + if(*c1 >= '2' && *c2 >= '5' && *c3 >= '5') { + *ptr = c1; + return FALSE; + } + + ++(*ptr); + return TRUE; +} + +/* Checks if there is an implicit IPv4 address in the host component of the URI. + * The max value of an implicit IPv4 address is UINT_MAX. + * + * Ex: + * "234567" would be considered an implicit IPv4 address. + */ +static BOOL check_implicit_ipv4(const WCHAR **ptr, UINT *val) { + const WCHAR *start = *ptr; + ULONGLONG ret = 0; + *val = 0; + + while(is_num(**ptr)) { + ret = ret*10 + (**ptr - '0'); + + if(ret > UINT_MAX) { + *ptr = start; + return FALSE; + } + ++(*ptr); + } + + if(*ptr == start) + return FALSE; + + *val = ret; + return TRUE; +} + +/* Checks if the string contains an IPv4 address. + * + * This function has a strict mode or a non-strict mode of operation + * When 'strict' is set to FALSE this function will return TRUE if + * the string contains at least 'dec-octet "." dec-octet' since partial + * IPv4 addresses will be normalized out into full IPv4 addresses. When + * 'strict' is set this function expects there to be a full IPv4 address. + * + * IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet + */ +static BOOL check_ipv4address(const WCHAR **ptr, BOOL strict) { + const WCHAR *start = *ptr; + + if(!check_dec_octet(ptr)) { + *ptr = start; + return FALSE; + } + + if(**ptr != '.') { + *ptr = start; + return FALSE; + } + + ++(*ptr); + if(!check_dec_octet(ptr)) { + *ptr = start; + return FALSE; + } + + if(**ptr != '.') { + if(strict) { + *ptr = start; + return FALSE; + } else + return TRUE; + } + + ++(*ptr); + if(!check_dec_octet(ptr)) { + *ptr = start; + return FALSE; + } + + if(**ptr != '.') { + if(strict) { + *ptr = start; + return FALSE; + } else + return TRUE; + } + + ++(*ptr); + if(!check_dec_octet(ptr)) { + *ptr = start; + return FALSE; + } + + /* Found a four digit ip address. */ + return TRUE; +} /* Tries to parse the scheme name of the URI. * * scheme = ALPHA *(ALPHA | NUM | '+' | '-' | '.') as defined by RFC 3896. @@ -448,6 +585,68 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { ++(*ptr); } +/* Attempts to parse a IPv4 address from the URI. + * + * NOTES: + * Window's normalizes IPv4 addresses, This means there's three + * possibilities for the URI to contain an IPv4 address. + * 1) A well formed address (ex. 192.2.2.2). + * 2) A partially formed address. For example "192.0" would + * normalize to "192.0.0.0" during canonicalization. + * 3) An implicit IPv4 address. For example "256" would + * normalize to "0.0.1.0" during canonicalization. Also + * note that the maximum value for an implicit IP address + * is UINT_MAX, if the value in the URI exceeds this then + * it is not considered an IPv4 address. + */ +static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) { + const BOOL is_unknown = data->scheme_type == URL_SCHEME_UNKNOWN; + data->host = *ptr; + + if(!check_ipv4address(ptr, FALSE)) { + if(!check_implicit_ipv4(ptr, &data->implicit_ipv4)) { + TRACE("(%p %p %x): URI didn't contain anything looking like an IPv4 address.\n", + ptr, data, flags); + *ptr = data->host; + data->host = NULL; + return FALSE; + } else + data->has_implicit_ip = TRUE; + } + + /* Check if what we found is the only part of the host name (if it isn't + * we don't have an IPv4 address). + */ + if(!is_auth_delim(**ptr, !is_unknown) && **ptr != ':') { + *ptr = data->host; + data->host = NULL; + data->has_implicit_ip = FALSE; + return FALSE; + } + + data->host_len = *ptr - data->host; + data->host_type = Uri_HOST_IPV4; + TRACE("(%p %p %x): IPv4 address found. host=%s host_len=%d host_type=%d\n", + ptr, data, flags, debugstr_wn(data->host, data->host_len), + data->host_len, data->host_type); + return TRUE; +} + +/* Parses the host information from the URI. + * + * host = IP-literal / IPv4address / reg-name + */ +static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD flags) { + if(!parse_ipv4address(ptr, data, flags)) { + WARN("(%p %p %x): Only IPv4 parsing is implemented so far.\n", ptr, data, flags); + data->host_type = Uri_HOST_UNKNOWN; + } + + /* TODO parse IP-Literal / reg-name. */ + + return TRUE; +} + /* Parses the authority information from the URI. * * authority = [ userinfo "@" ] host [ ":" port ] @@ -455,7 +654,8 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { static BOOL parse_authority(const WCHAR **ptr, parse_data *data, DWORD flags) { parse_userinfo(ptr, data, flags); - /* TODO: Parse host and port information. */ + if(!parse_host(ptr, data, flags)) + return FALSE; return TRUE; }

1 0

Thomas Mullaly : urlmon: Implemented canonicalization functions for IPv4 addresses.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: a3dd8f4598b838d647dc2d7e2b94621acbb990ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3dd8f4598b838d647dc2d7e2… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Jun 23 23:21:14 2010 -0400 urlmon: Implemented canonicalization functions for IPv4 addresses. --- dlls/urlmon/uri.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 192 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index cbd8c15..060b92e 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -30,20 +30,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IUriVtbl *lpIUriVtbl; LONG ref; - BSTR raw_uri; + + BSTR raw_uri; /* Information about the canonicalized URI's buffer. */ - WCHAR *canon_uri; - DWORD canon_size; - DWORD canon_len; + WCHAR *canon_uri; + DWORD canon_size; + DWORD canon_len; + + INT scheme_start; + DWORD scheme_len; + URL_SCHEME scheme_type; - INT scheme_start; - DWORD scheme_len; - URL_SCHEME scheme_type; + INT userinfo_start; + DWORD userinfo_len; + INT userinfo_split; - INT userinfo_start; - DWORD userinfo_len; - INT userinfo_split; + INT host_start; + DWORD host_len; + Uri_HOST_TYPE host_type; } Uri; typedef struct { @@ -233,6 +238,34 @@ static inline void pct_encode_val(WCHAR val, WCHAR *dest) { dest[2] = hexDigits[val & 0xf]; } +/* Converts an IPv4 address in numerical form into it's fully qualified + * string form. This function returns the number of characters written + * to 'dest'. If 'dest' is NULL this function will return the number of + * characters that would have been written. + * + * It's up to the caller to ensure there's enough space in 'dest' for the + * address. + */ +static DWORD ui2ipv4(WCHAR *dest, UINT address) { + static const WCHAR formatW[] = + {'%','u','.','%','u','.','%','u','.','%','u',0}; + DWORD ret = 0; + UCHAR digits[4]; + + digits[0] = (address >> 24) & 0xff; + digits[1] = (address >> 16) & 0xff; + digits[2] = (address >> 8) & 0xff; + digits[3] = address & 0xff; + + if(!dest) { + WCHAR tmp[16]; + ret = sprintfW(tmp, formatW, digits[0], digits[1], digits[2], digits[3]); + } else + ret = sprintfW(dest, formatW, digits[0], digits[1], digits[2], digits[3]); + + return ret; +} + /* Checks if the characters pointed to by 'ptr' are * a percent encoded data octet. * @@ -823,12 +856,160 @@ static BOOL canonicalize_userinfo(const parse_data *data, Uri *uri, DWORD flags, return TRUE; } +/* Attempts to canonicalize an implicit IPv4 address. */ +static BOOL canonicalize_implicit_ipv4address(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + uri->host_start = uri->canon_len; + + TRACE("%u\n", data->implicit_ipv4); + /* For unknown scheme types Window's doesn't convert + * the value into an IP address, but, it still considers + * it an IPv4 address. + */ + if(data->scheme_type == URL_SCHEME_UNKNOWN) { + if(!computeOnly) + memcpy(uri->canon_uri+uri->canon_len, data->host, data->host_len*sizeof(WCHAR)); + uri->canon_len += data->host_len; + } else { + if(!computeOnly) + uri->canon_len += ui2ipv4(uri->canon_uri+uri->canon_len, data->implicit_ipv4); + else + uri->canon_len += ui2ipv4(NULL, data->implicit_ipv4); + } + + uri->host_len = uri->canon_len - uri->host_start; + uri->host_type = Uri_HOST_IPV4; + + if(!computeOnly) + TRACE("%p %p %x %d): Canonicalized implicit IP address=%s len=%d\n", + data, uri, flags, computeOnly, + debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len), + uri->host_len); + + return TRUE; +} + +/* Attempts to canonicalize an IPv4 address. + * + * If the parse_data represents a URI that has an implicit IPv4 address + * (ex. http://256/, this function will convert 256 into 0.0.1.0). If + * the implicit IP address exceeds the value of UINT_MAX (maximum value + * for an IPv4 address) it's canonicalized as if were a reg-name. + * + * If the parse_data contains a partial or full IPv4 address it normalizes it. + * A partial IPv4 address is something like "192.0" and would be normalized to + * "192.0.0.0". With a full (or partial) IPv4 address like "192.002.01.003" would + * be normalized to "192.2.1.3". + * + * NOTES: + * Window's ONLY normalizes IPv4 address for known scheme types (one that isn't + * URL_SCHEME_UNKNOWN). For unknown scheme types, it simply copies the data from + * the original URI into the canonicalized URI, but, it still recognizes URI's + * host type as HOST_IPV4. + */ +static BOOL canonicalize_ipv4address(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + if(data->has_implicit_ip) + return canonicalize_implicit_ipv4address(data, uri, flags, computeOnly); + else { + uri->host_start = uri->canon_len; + + /* Windows only normalizes for known scheme types. */ + if(data->scheme_type != URL_SCHEME_UNKNOWN) { + /* parse_data contains a partial or full IPv4 address, so normalize it. */ + DWORD i, octetDigitCount = 0, octetCount = 0; + BOOL octetHasDigit = FALSE; + + for(i = 0; i < data->host_len; ++i) { + if(data->host[i] == '0' && !octetHasDigit) { + /* Can ignore leading zeros if: + * 1) It isn't the last digit of the octet. + * 2) i+1 != data->host_len + * 3) i+1 != '.' + */ + if(octetDigitCount == 2 || + i+1 == data->host_len || + data->host[i+1] == '.') { + if(!computeOnly) + uri->canon_uri[uri->canon_len] = data->host[i]; + ++uri->canon_len; + TRACE("Adding zero\n"); + } + } else if(data->host[i] == '.') { + if(!computeOnly) + uri->canon_uri[uri->canon_len] = data->host[i]; + ++uri->canon_len; + + octetDigitCount = 0; + octetHasDigit = FALSE; + ++octetCount; + } else { + if(!computeOnly) + uri->canon_uri[uri->canon_len] = data->host[i]; + ++uri->canon_len; + + ++octetDigitCount; + octetHasDigit = TRUE; + } + } + + /* Make sure the canonicalized IP address has 4 dec-octets. + * If doesn't add "0" ones until there is 4; + */ + for( ; octetCount < 3; ++octetCount) { + if(!computeOnly) { + uri->canon_uri[uri->canon_len] = '.'; + uri->canon_uri[uri->canon_len+1] = '0'; + } + + uri->canon_len += 2; + } + } else { + /* Windows doesn't normalize addresses in unknown schemes. */ + if(!computeOnly) + memcpy(uri->canon_uri+uri->canon_len, data->host, data->host_len*sizeof(WCHAR)); + uri->canon_len += data->host_len; + } + + uri->host_len = uri->canon_len - uri->host_start; + if(!computeOnly) + TRACE("(%p %p %x %d): Canonicalized IPv4 address, ip=%s len=%d\n", + data, uri, flags, computeOnly, + debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len), + uri->host_len); + } + + return TRUE; +} + +static BOOL canonicalize_host(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { + uri->host_start = -1; + uri->host_len = 0; + + if(data->host) { + switch(data->host_type) { + case Uri_HOST_IPV4: + uri->host_type = Uri_HOST_IPV4; + if(!canonicalize_ipv4address(data, uri, flags, computeOnly)) + return FALSE; + + break; + default: + WARN("(%p %p %x %d): Canonicalization not supported yet\n", data, + uri, flags, computeOnly); + } + } + + return TRUE; +} + /* Canonicalizes the authority of the URI represented by the parse_data. */ static BOOL canonicalize_authority(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { if(!canonicalize_userinfo(data, uri, flags, computeOnly)) return FALSE; - /* TODO: canonicalize the host and port information. */ + if(!canonicalize_host(data, uri, flags, computeOnly)) + return FALSE; + + /* TODO Canonicalize port information. */ return TRUE; }

1 0

Frédéric Delanoy : Update French homepage translation
by Jeremy Newman 23 Jul '10

23 Jul '10

Module: website Branch: master Commit: 9a7318f299f6c600a8e88274d9e4fb9503854df6 URL: http://source.winehq.org/git/website.git/?a=commit;h=9a7318f299f6c600a8e882… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 23 11:19:05 2010 +0200 Update French homepage translation >From 1185affa1222e87e551db3421a69e2762449487d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delanoy?= <frederic.delanoy(a)gmail.com> Date: Fri, 23 Jul 2010 11:17:13 +0200 Subject: Update French homepage translation --- templates/fr/home.template | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/fr/home.template b/templates/fr/home.template index 1688032..2765775 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -12,8 +12,8 @@ <div class="info" onClick="document.location='{$root}/about/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/about/">Informations</a></div> - <div class="subtitle">Aperçu des fonctionnalités de Wine.</div> + <div class="title"><a href="{$root}/about/">À propos</a></div> + <div class="subtitle">Apprenez-en plus sur le projet Wine.</div> </div> </div> @@ -21,15 +21,15 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/download/">Téléchargement</a></div> - <div class="subtitle">Recevez Wine maintenant !</div> + <div class="subtitle">Installez la dernière version de Wine.</div> </div> </div> <div class="help" onClick="document.location='{$root}/help/';"> <div class="icon"></div> <div class="text"> - <div class="title"><a href="{$root}/help/">Aide</a></div> - <div class="subtitle">Documentation, support et Wiki.</div> + <div class="title"><a href="{$root}/help/">Support</a></div> + <div class="subtitle">Obtenez de l'aide sur Wine.</div> </div> </div> @@ -37,7 +37,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/devel/">Développement</a></div> - <div class="subtitle">Sources de Wine, suivi des anomalies, etc.</div> + <div class="subtitle">Devenez un développeur Wine.</div> </div> </div> @@ -50,7 +50,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="javascript:document.donateForm.submit();">Dons</a></div> - <div class="subtitle">Faire un don à Wine.</div> + <div class="subtitle">Faites un don au projet Wine.</div> </div> </div>

1 0

Owen Rudge : d3dx9/tests: Add beginning of general tests for texture functions.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 79690ab1ea6fa73d86bf44753ecacced042f4af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79690ab1ea6fa73d86bf44753… Author: Owen Rudge <owen(a)owenrudge.net> Date: Wed Jul 21 15:06:09 2010 +0100 d3dx9/tests: Add beginning of general tests for texture functions. --- dlls/d3dx9_36/tests/Makefile.in | 3 +- dlls/d3dx9_36/tests/texture.c | 81 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/Makefile.in b/dlls/d3dx9_36/tests/Makefile.in index 02f48c1..4a7aa28 100644 --- a/dlls/d3dx9_36/tests/Makefile.in +++ b/dlls/d3dx9_36/tests/Makefile.in @@ -13,7 +13,8 @@ C_SRCS = \ math.c \ mesh.c \ shader.c \ - surface.c + surface.c \ + texture.c RC_SRCS = rsrc.rc diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c new file mode 100644 index 0000000..de7ccf4 --- /dev/null +++ b/dlls/d3dx9_36/tests/texture.c @@ -0,0 +1,81 @@ +/* + * Tests for the D3DX9 texture functions + * + * Copyright 2009 Tony Wasserka + * Copyright 2010 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "wine/test.h" +#include "d3dx9tex.h" + +static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) +{ + HRESULT hr; + + todo_wine { + + /* general tests */ + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXCheckTextureRequirements(device, NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXCheckTextureRequirements(NULL, NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + } /* todo_wine */ +} + +START_TEST(texture) +{ + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + D3DPRESENT_PARAMETERS d3dpp; + HRESULT hr; + + wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + if (!wnd) { + skip("Couldn't create application window\n"); + return; + } + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d) { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + test_D3DXCheckTextureRequirements(device); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +}

1 0

Alexandre Julliard : msvcrt: Use the appropriate mangled names for operator new/delete on 64-bit.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: c27aa289b7e51ee98f6a3cfca485e784c5ef9071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27aa289b7e51ee98f6a3cfca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 16:55:35 2010 +0200 msvcrt: Use the appropriate mangled names for operator new/delete on 64-bit. --- dlls/crtdll/crtdll.spec | 6 ++++-- dlls/msvcr100/msvcr100.spec | 18 ++++++++++++------ dlls/msvcr70/msvcr70.spec | 12 ++++++++---- dlls/msvcr71/msvcr71.spec | 12 ++++++++---- dlls/msvcr80/msvcr80.spec | 18 ++++++++++++------ dlls/msvcr90/msvcr90.spec | 18 ++++++++++++------ dlls/msvcrt/msvcrt.spec | 18 ++++++++++++------ dlls/msvcrt/tests/cpp.c | 14 +++++++++++--- dlls/msvcrt20/msvcrt20.spec | 6 ++++-- dlls/msvcrt40/msvcrt40.spec | 6 ++++-- dlls/msvcrtd/msvcrtd.spec | 9 ++++++--- dlls/msvcrtd/tests/debug.c | 8 ++++++-- 12 files changed, 99 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c27aa289b7e51ee98f6a3…

1 0

Alexandre Julliard : include: Make sure wine/port. h and msvcrt headers are not used together.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 8f1ea6eeb1bbe95733d57e05f1b3da8c1a715408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1ea6eeb1bbe95733d57e05f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 17:40:55 2010 +0200 include: Make sure wine/port.h and msvcrt headers are not used together. --- include/msvcrt/crtdefs.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index 1f51937..0e43dd5 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -22,6 +22,10 @@ #define __WINE_USE_MSVCRT #endif +#ifdef __WINE_WINE_PORT_H +# error You cannot use both wine/port.h and msvcrt headers +#endif + #if defined(__x86_64__) && !defined(_WIN64) #define _WIN64 #endif

1 0

Piotr Caban : msvcp90: Added allocator<char> implementation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: e79af2f0d9c9e8db1551e1155ab74a9b774e10e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79af2f0d9c9e8db1551e1155… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 22 09:40:19 2010 +0200 msvcp90: Added allocator<char> implementation. --- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/memory.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 21 ++++++++ dlls/msvcp90/msvcp90.spec | 22 ++++---- dlls/msvcp90/msvcp90_main.c | 19 ++++++++ 5 files changed, 159 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e79af2f0d9c9e8db1551e…

1 0

Huw Davies : ole32/tests: Relax the reference counting tests a bit. We only care whether references are held or not.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: a2e1dd29dcbc98ee1d6417af10b84a9768f4c653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e1dd29dcbc98ee1d6417af1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 12:16:17 2010 +0100 ole32/tests: Relax the reference counting tests a bit. We only care whether references are held or not. --- dlls/ole32/tests/dragdrop.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 55a5167..18674dd 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -31,8 +31,7 @@ #include "wine/test.h" -static int droptarget_addref_called; -static int droptarget_release_called; +static int droptarget_refs; /* helper macros to make tests a bit leaner */ #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -54,14 +53,14 @@ static HRESULT WINAPI DropTarget_QueryInterface(IDropTarget* iface, REFIID riid, static ULONG WINAPI DropTarget_AddRef(IDropTarget* iface) { - droptarget_addref_called++; - return 2; + droptarget_refs++; + return droptarget_refs; } static ULONG WINAPI DropTarget_Release(IDropTarget* iface) { - droptarget_release_called++; - return 1; + droptarget_refs--; + return droptarget_refs; } static HRESULT WINAPI DropTarget_DragEnter(IDropTarget* iface, @@ -314,10 +313,10 @@ static void test_Register_Revoke(void) hr = RegisterDragDrop((HWND)0xdeadbeef, &DropTarget); ok(hr == DRAGDROP_E_INVALIDHWND, "RegisterDragDrop with garbage hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr); - ok(droptarget_addref_called == 0, "DropTarget_AddRef shouldn't have been called\n"); + ok(droptarget_refs == 0, "DropTarget refs should be zero not %d\n", droptarget_refs); hr = RegisterDragDrop(hwnd, &DropTarget); ok_ole_success(hr, "RegisterDragDrop"); - ok(droptarget_addref_called == 1, "DropTarget_AddRef should have been called once, not %d times\n", droptarget_addref_called); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); prop = GetPropA(hwnd, "OleDropTargetInterface"); ok(prop == &DropTarget, "expected IDropTarget pointer %p, got %p\n", &DropTarget, prop); @@ -325,15 +324,15 @@ static void test_Register_Revoke(void) hr = RegisterDragDrop(hwnd, &DropTarget); ok(hr == DRAGDROP_E_ALREADYREGISTERED, "RegisterDragDrop with already registered hwnd should return DRAGDROP_E_ALREADYREGISTERED instead of 0x%08x\n", hr); - ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); OleUninitialize(); - ok(droptarget_release_called == 0, "DropTarget_Release shouldn't have been called\n"); + ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); hr = RevokeDragDrop(hwnd); ok_ole_success(hr, "RevokeDragDrop"); - ok(droptarget_release_called == 1 || - broken(droptarget_release_called == 0), /* NT4 */ - "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); + ok(droptarget_refs == 0 || + broken(droptarget_refs == 1), /* NT4 */ + "DropTarget refs should be zero not %d\n", droptarget_refs); hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr);

1 0

Huw Davies : ole32: Implement cross-process drag and drop.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 6d1ef3a6a64f0fabf05ce1bba5f0ec4373684786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1ef3a6a64f0fabf05ce1bba… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 22 13:37:19 2010 +0100 ole32: Implement cross-process drag and drop. --- dlls/ole32/ole2.c | 219 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 188 insertions(+), 31 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 41989f3..f570167 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -116,6 +116,10 @@ static const WCHAR prop_olemenuW[] = static const WCHAR prop_oledroptarget[] = {'O','l','e','D','r','o','p','T','a','r','g','e','t','I','n','t','e','r','f','a','c','e',0}; +/* property to store Marshalled IDropTarget pointer */ +static const WCHAR prop_marshalleddroptarget[] = + {'W','i','n','e','M','a','r','s','h','a','l','l','e','d','D','r','o','p','T','a','r','g','e','t',0}; + static const WCHAR clsidfmtW[] = {'C','L','S','I','D','\\','{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x', @@ -266,14 +270,134 @@ HRESULT WINAPI OleInitializeWOW(DWORD x, DWORD y) { return 0; } -/*** - * OLEDD_FindDropTarget() +/************************************************************* + * get_droptarget_handle + * + * Retrieve a handle to the map containing the marshalled IDropTarget. + * This handle belongs to the process that called RegisterDragDrop. + * See get_droptarget_local_handle(). + */ +static inline HANDLE get_droptarget_handle(HWND hwnd) +{ + return GetPropW(hwnd, prop_marshalleddroptarget); +} + +/************************************************************* + * is_droptarget + * + * Is the window a droptarget. + */ +static inline BOOL is_droptarget(HWND hwnd) +{ + return get_droptarget_handle(hwnd) ? TRUE : FALSE; +} + +/************************************************************* + * get_droptarget_local_handle + * + * Retrieve a handle to the map containing the marshalled IDropTarget. + * The handle should be closed when finished with. + */ +static HANDLE get_droptarget_local_handle(HWND hwnd) +{ + HANDLE handle, local_handle = 0; + + handle = get_droptarget_handle(hwnd); + + if(handle) + { + DWORD pid; + HANDLE process; + + GetWindowThreadProcessId(hwnd, &pid); + process = OpenProcess(PROCESS_DUP_HANDLE, FALSE, pid); + if(process) + { + DuplicateHandle(process, handle, GetCurrentProcess(), &local_handle, 0, FALSE, DUPLICATE_SAME_ACCESS); + CloseHandle(process); + } + } + return local_handle; +} + +/*********************************************************************** + * create_map_from_stream + * + * Helper for RegisterDragDrop. Creates a file mapping object + * with the contents of the provided stream. The stream must + * be a global memory backed stream. + */ +static HRESULT create_map_from_stream(IStream *stream, HANDLE *map) +{ + HGLOBAL hmem; + DWORD size; + HRESULT hr; + void *data; + + hr = GetHGlobalFromStream(stream, &hmem); + if(FAILED(hr)) return hr; + + size = GlobalSize(hmem); + *map = CreateFileMappingW(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, size, NULL); + if(!*map) return E_OUTOFMEMORY; + + data = MapViewOfFile(*map, FILE_MAP_WRITE, 0, 0, size); + memcpy(data, GlobalLock(hmem), size); + GlobalUnlock(hmem); + UnmapViewOfFile(data); + return S_OK; +} + +/*********************************************************************** + * create_stream_from_map + * + * Creates a stream from the provided map. + */ +static HRESULT create_stream_from_map(HANDLE map, IStream **stream) +{ + HRESULT hr = E_OUTOFMEMORY; + HGLOBAL hmem; + void *data; + MEMORY_BASIC_INFORMATION info; + + data = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); + if(!data) return hr; + + VirtualQuery(data, &info, sizeof(info)); + TRACE("size %d\n", (int)info.RegionSize); + + hmem = GlobalAlloc(GMEM_MOVEABLE, info.RegionSize); + if(hmem) + { + memcpy(GlobalLock(hmem), data, info.RegionSize); + GlobalUnlock(hmem); + hr = CreateStreamOnHGlobal(hmem, TRUE, stream); + } + UnmapViewOfFile(data); + return hr; +} + +/*********************************************************************** + * get_droptarget_pointer * - * Returns IDropTarget pointer registered for this window. + * Retrieves the marshalled IDropTarget from the window. */ -static inline IDropTarget* OLEDD_FindDropTarget(HWND hwnd) +static IDropTarget* get_droptarget_pointer(HWND hwnd) { - return GetPropW(hwnd, prop_oledroptarget); + IDropTarget *droptarget = NULL; + HANDLE map; + IStream *stream; + + map = get_droptarget_local_handle(hwnd); + if(!map) return NULL; + + if(SUCCEEDED(create_stream_from_map(map, &stream))) + { + CoUnmarshalInterface(stream, &IID_IDropTarget, (void**)&droptarget); + IStream_Release(stream); + } + CloseHandle(map); + return droptarget; } /*********************************************************************** @@ -282,6 +406,9 @@ static inline IDropTarget* OLEDD_FindDropTarget(HWND hwnd) HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) { DWORD pid = 0; + HRESULT hr; + IStream *stream; + HANDLE map; TRACE("(%p,%p)\n", hwnd, pDropTarget); @@ -309,13 +436,40 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) } /* check if the window is already registered */ - if (OLEDD_FindDropTarget(hwnd)) + if (is_droptarget(hwnd)) return DRAGDROP_E_ALREADYREGISTERED; - IDropTarget_AddRef(pDropTarget); - SetPropW(hwnd, prop_oledroptarget, pDropTarget); + /* + * Marshal the drop target pointer into a shared memory map and + * store the map's handle in a Wine specific window prop. We also + * store the drop target pointer itself in the + * "OleDropTargetInterface" prop for compatibility with Windows. + */ + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + if(FAILED(hr)) return hr; - return S_OK; + hr = CoMarshalInterface(stream, &IID_IDropTarget, (IUnknown*)pDropTarget, MSHCTX_LOCAL, NULL, MSHLFLAGS_TABLESTRONG); + if(SUCCEEDED(hr)) + { + hr = create_map_from_stream(stream, &map); + if(SUCCEEDED(hr)) + { + IDropTarget_AddRef(pDropTarget); + SetPropW(hwnd, prop_oledroptarget, pDropTarget); + SetPropW(hwnd, prop_marshalleddroptarget, map); + } + else + { + LARGE_INTEGER zero; + zero.QuadPart = 0; + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + CoReleaseMarshalData(stream); + } + } + IStream_Release(stream); + + return hr; } /*********************************************************************** @@ -323,7 +477,10 @@ HRESULT WINAPI RegisterDragDrop(HWND hwnd, LPDROPTARGET pDropTarget) */ HRESULT WINAPI RevokeDragDrop(HWND hwnd) { - IDropTarget* droptarget; + HANDLE map; + IStream *stream; + IDropTarget *drop_target; + HRESULT hr; TRACE("(%p)\n", hwnd); @@ -334,13 +491,24 @@ HRESULT WINAPI RevokeDragDrop(HWND hwnd) } /* no registration data */ - if (!(droptarget = OLEDD_FindDropTarget(hwnd))) + if (!(map = get_droptarget_handle(hwnd))) return DRAGDROP_E_NOTREGISTERED; - IDropTarget_Release(droptarget); + drop_target = GetPropW(hwnd, prop_oledroptarget); + if(drop_target) IDropTarget_Release(drop_target); + RemovePropW(hwnd, prop_oledroptarget); + RemovePropW(hwnd, prop_marshalleddroptarget); - return S_OK; + hr = create_stream_from_map(map, &stream); + if(SUCCEEDED(hr)) + { + CoReleaseMarshalData(stream); + IStream_Release(stream); + } + CloseHandle(map); + + return hr; } /*********************************************************************** @@ -1975,30 +2143,17 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) * Find-out if there is a drag target under the mouse */ HWND next_target_wnd = hwndNewTarget; - IDropTarget *new_target; - DWORD pid; trackerInfo->curTargetHWND = hwndNewTarget; - do { - new_target = OLEDD_FindDropTarget(next_target_wnd); - } while (!new_target && (next_target_wnd = GetParent(next_target_wnd))); + while (next_target_wnd && !is_droptarget(next_target_wnd)) + next_target_wnd = GetParent(next_target_wnd); if (next_target_wnd) hwndNewTarget = next_target_wnd; - GetWindowThreadProcessId(hwndNewTarget, &pid); - if (pid != GetCurrentProcessId()) - { - FIXME("drop to another process window is unsupported\n"); - trackerInfo->curDragTargetHWND = 0; - trackerInfo->curTargetHWND = 0; - trackerInfo->curDragTarget = 0; - } - else - { - trackerInfo->curDragTargetHWND = hwndNewTarget; - trackerInfo->curDragTarget = new_target; - } + trackerInfo->curDragTargetHWND = hwndNewTarget; + if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); + trackerInfo->curDragTarget = get_droptarget_pointer(hwndNewTarget); /* * If there is, notify it that we just dragged-in @@ -2016,6 +2171,7 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) { trackerInfo->curDragTargetHWND = 0; trackerInfo->curTargetHWND = 0; + IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = 0; } } @@ -2027,6 +2183,7 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) */ trackerInfo->curDragTargetHWND = 0; trackerInfo->curTargetHWND = 0; + if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = 0; } }

1 0