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

Henri Verbeet : wined3d: Remove GetGlDesc() from the public IWineD3DSurface interface.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 038d939941d164f77b4a68aad926048bfca7e29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=038d939941d164f77b4a68aad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 10:20:12 2009 +0200 wined3d: Remove GetGlDesc() from the public IWineD3DSurface interface. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/surface_gdi.c | 7 ------- include/wine/wined3d.idl | 3 --- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2962d6d..27de1b3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5746,7 +5746,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, WINED3DPOOL srcPool, destPool; int offset = 0; int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */ - glDescriptor *glDescription = NULL; + glDescriptor *glDescription; const struct GlPixelFormatDesc *src_format_desc, *dst_format_desc; GLenum dummy; int sampler; @@ -5807,7 +5807,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, surface_internal_preload(pDestinationSurface, SRGB_RGB); IWineD3DSurface_BindTexture(pDestinationSurface, FALSE); - IWineD3DSurface_GetGlDesc(pDestinationSurface, &glDescription); + glDescription = &((IWineD3DSurfaceImpl *)pDestinationSurface)->glDescription; src_format_desc = ((IWineD3DSurfaceImpl *)pSrcSurface)->resource.format_desc; dst_format_desc = ((IWineD3DSurfaceImpl *)pDestinationSurface)->resource.format_desc; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6909627..9328e82 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -914,13 +914,6 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { IWineD3DSurface IWineD3DSurface parts follow ****************************************************** */ -static void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - TRACE("(%p) : returning %p\n", This, &This->glDescription); - *glDescription = &This->glDescription; -} - /* Read the framebuffer back into the surface */ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, void *dest, UINT pitch) { IWineD3DSwapChainImpl *swapchain; @@ -5082,7 +5075,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_BindTexture, IWineD3DSurfaceImpl_SaveSnapshot, IWineD3DSurfaceImpl_SetContainer, - IWineD3DSurfaceImpl_GetGlDesc, IWineD3DBaseSurfaceImpl_GetData, IWineD3DSurfaceImpl_SetFormat, IWineD3DSurfaceImpl_PrivateSetup, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 9e1a5de..39f00cc 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -547,12 +547,6 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface) return WINED3D_OK; } -static void WINAPI IWineGDISurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - FIXME("(%p) : Should not be called on a GDI surface\n", This); - *glDescription = NULL; -} - static HRESULT WINAPI IWineGDISurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; @@ -682,7 +676,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_BindTexture, IWineGDISurfaceImpl_SaveSnapshot, IWineD3DBaseSurfaceImpl_SetContainer, - IWineGDISurfaceImpl_GetGlDesc, IWineD3DBaseSurfaceImpl_GetData, IWineD3DBaseSurfaceImpl_SetFormat, IWineGDISurfaceImpl_PrivateSetup, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 0f51b8e..3cc9d2c 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2532,9 +2532,6 @@ interface IWineD3DSurface : IWineD3DResource HRESULT SetContainer( [in] IWineD3DBase *container ); - void GetGlDesc( - [out] glDescriptor **desc - ); const void *GetData( ); HRESULT SetFormat(

1 0

Henri Verbeet : wined3d: Get rid of struct glDescriptor.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 69b76122655d58a99f726a1558621cc4dede2032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b76122655d58a99f726a155… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 10:20:13 2009 +0200 wined3d: Get rid of struct glDescriptor. In general it might not be a bad idea to group GL specific data into a separate struct, but IWineD3DSurfaceImpl is currently the only thing that bothers. It doesn't get it quite right either, since e.g. the PBO isn't in glDescriptor either. --- dlls/wined3d/context.c | 19 ++-- dlls/wined3d/device.c | 24 ++--- dlls/wined3d/surface.c | 228 +++++++++++++++++++--------------------- dlls/wined3d/surface_gdi.c | 3 +- dlls/wined3d/swapchain.c | 6 +- dlls/wined3d/utils.c | 3 +- dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.idl | 7 -- 8 files changed, 142 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69b76122655d58a99f726…

1 0

Henri Verbeet : wined3d: Take geometry shaders into account in shader_glsl_load_constantsB().
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 38cb9d02b10a8e69e0696b399f13aa2dd91d11a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38cb9d02b10a8e69e0696b399… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 10:20:14 2009 +0200 wined3d: Take geometry shaders into account in shader_glsl_load_constantsB(). --- dlls/wined3d/glsl_shader.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7402a79..83511aa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -502,10 +502,30 @@ static void shader_glsl_load_constantsB(IWineD3DBaseShaderImpl *This, const Wine GLint tmp_loc; unsigned int i; char tmp_name[8]; - char is_pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); - const char* prefix = is_pshader? "PB":"VB"; + const char *prefix; struct list* ptr; + switch (This->baseShader.reg_maps.shader_version.type) + { + case WINED3D_SHADER_TYPE_VERTEX: + prefix = "VB"; + break; + + case WINED3D_SHADER_TYPE_GEOMETRY: + prefix = "GB"; + break; + + case WINED3D_SHADER_TYPE_PIXEL: + prefix = "PB"; + break; + + default: + FIXME("Unknown shader type %#x.\n", + This->baseShader.reg_maps.shader_version.type); + prefix = "UB"; + break; + } + /* TODO: Benchmark and see if it would be beneficial to store the * locations of the constants to avoid looking up each time */ for (i = 0; constants_set; constants_set >>= 1, ++i)

1 0

Henri Verbeet : d3d9/tests: Use color_match() in a few more places.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 3115f3357fd9533b1ccc0dd02ac3b2e996636c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3115f3357fd9533b1ccc0dd02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 10:20:15 2009 +0200 d3d9/tests: Use color_match() in a few more places. --- dlls/d3d9/tests/visual.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cd362f0..2a86be8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3004,7 +3004,7 @@ static void g16r16_texture_test(IDirect3DDevice9 *device) IDirect3DTexture9 *texture = NULL; D3DLOCKED_RECT lr; DWORD *data; - DWORD color, red, green, blue; + DWORD color; float quad[] = { -1.0, -1.0, 0.1, 0.0, 0.0, -1.0, 1.0, 0.1, 0.0, 1.0, @@ -3058,11 +3058,8 @@ static void g16r16_texture_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 240, 320); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(blue == 0xff && red >= 0xef && red <= 0xf1 && green >= 0x0e && green <= 0x10, - "D3DFMT_G16R16 with value 0x00ffff00 has color %08x, expected 0x00F00FFF\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xf0, 0x0f, 0xff), 1), + "D3DFMT_G16R16 with value 0x00ffff00 has color %08x, expected 0x00f00fff\n", color); out: if(texture) IDirect3DTexture9_Release(texture); @@ -4163,7 +4160,7 @@ static void x8l8v8u8_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 578, 430); - ok(color == 0x008262ca || color == 0x008363ca || color == 0x008362ca, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x82, 0x62, 0xca), 1), "D3DFMT_X8L8V8U8 = 0x112131ca returns color %08x, expected 0x008262ca\n", color); hr = IDirect3DDevice9_SetPixelShader(device, shader2); @@ -4435,19 +4432,19 @@ static void test_constant_clamp_vs(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); color = getPixelColor(device, 160, 360); - ok(color == 0x00bfbf80 || color == 0x00bfbf7f || color == 0x00bfbf81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 1 has color %08x, expected 0x00bfbf80\n", color); color = getPixelColor(device, 480, 360); - ok(color == 0x00bfbf80 || color == 0x00bfbf7f || color == 0x00bfbf81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 2 has color %08x, expected 0x00bfbf80\n", color); if(shader_20) { color = getPixelColor(device, 160, 120); - ok(color == 0x00bfbf80 || color == 0x00bfbf7f || color == 0x00bfbf81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 3 has color %08x, expected 0x00bfbf80\n", color); } if(shader_20_2) { color = getPixelColor(device, 480, 120); - ok(color == 0x00bfbf80 || color == 0x00bfbf7f || color == 0x00bfbf81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 4 has color %08x, expected 0x00bfbf80\n", color); } @@ -4578,17 +4575,17 @@ static void constant_clamp_ps_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); color = getPixelColor(device, 160, 360); - ok(color == 0x00808000 || color == 0x007f7f00 || color == 0x00818100, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x00), 1), "quad 1 has color %08x, expected 0x00808000\n", color); color = getPixelColor(device, 480, 360); - ok(color == 0x00808000 || color == 0x007f7f00 || color == 0x00818100, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x00), 1), "quad 2 has color %08x, expected 0x00808000\n", color); color = getPixelColor(device, 480, 120); - ok(color == 0x00808000 || color == 0x007f7f00 || color == 0x00818100, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x00), 1), "quad 3 has color %08x, expected 0x00808000\n", color); if(shader_20) { color = getPixelColor(device, 160, 120); - ok(color == 0x00bfbf80 || color == 0x00bfbf7f || color == 0x00bfbf81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 4 has color %08x, expected 0x00bfbf80\n", color); } @@ -4680,7 +4677,8 @@ static void dp2add_ps_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 360, 240); - ok(color == 0x007f7f7f || color == 0x00808080, "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), + "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); IDirect3DPixelShader9_Release(shader_dp2add); } else { @@ -4706,7 +4704,8 @@ static void dp2add_ps_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 360, 240); - ok(color == 0x007f7f7f || color == 0x00808080, "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), + "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); IDirect3DPixelShader9_Release(shader_dp2add_sat); } else {

1 0

Michael Stefaniuc : wrc: Reset the language before processing multiple rc files.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: d67a9d92eabb116a23a1c1b4dae72eee84bffbd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67a9d92eabb116a23a1c1b4d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 10 11:48:34 2009 +0200 wrc: Reset the language before processing multiple rc files. --- tools/wrc/wrc.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 61a3734..6a856eb 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -132,6 +132,7 @@ int extensions = 1; /* * Language setting for resources (-l option) */ +static language_t *defaultlanguage; language_t *currentlanguage = NULL; /* @@ -289,6 +290,9 @@ static int load_file( const char *input_name, const char *output_name ) input_name = temp_name; } + /* Reset the language */ + currentlanguage = dup_language( defaultlanguage ); + /* Go from .rc to .res */ chat("Starting parse\n"); @@ -302,6 +306,7 @@ static int load_file( const char *input_name, const char *output_name ) unlink( temp_name ); temp_name = NULL; } + free( currentlanguage ); return ret; } @@ -429,7 +434,7 @@ int main(int argc,char *argv[]) lan = strtol(optarg, NULL, 0); if (get_language_codepage(PRIMARYLANGID(lan), SUBLANGID(lan)) == -1) error("Language %04x is not supported\n", lan); - currentlanguage = new_language(PRIMARYLANGID(lan), SUBLANGID(lan)); + defaultlanguage = new_language(PRIMARYLANGID(lan), SUBLANGID(lan)); } break; case 'f': @@ -492,8 +497,8 @@ int main(int argc,char *argv[]) (debuglevel & DEBUGLEVEL_PPMSG) != 0 ); /* Check if the user set a language, else set default */ - if(!currentlanguage) - currentlanguage = new_language(0, 0); + if(!defaultlanguage) + defaultlanguage = new_language(0, 0); atexit(cleanup_files);

1 0

Juan Lang : wininet: Fix tests when running behind a proxy server.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 9fd8462add1e40abfc727cea9f6efb7a2a8ec768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd8462add1e40abfc727cea9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 10:19:00 2009 -0700 wininet: Fix tests when running behind a proxy server. --- dlls/wininet/tests/http.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf6ca02..b11cb2c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1788,7 +1788,12 @@ static void test_proxy_indirect(int port) sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_PROXY_AUTHENTICATE, buffer, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); + ok(r || GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "HttpQueryInfo failed: %d\n", GetLastError()); + if (!r) + { + skip("missing proxy header, not testing remaining proxy headers\n"); + goto out; + } ok(!strcmp(buffer, "Basic realm=\"placebo\""), "proxy auth info wrong\n"); sz = sizeof buffer; @@ -1821,6 +1826,7 @@ static void test_proxy_indirect(int port) ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "HttpQueryInfo should fail\n"); ok(r == FALSE, "HttpQueryInfo failed\n"); +out: InternetCloseHandle(hr); InternetCloseHandle(hc); InternetCloseHandle(hi);

1 0

Juan Lang : wininet: Change type of GetAddress from struct sockaddr_in * to struct sockaddr *.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 44bf025767f94e4335cd642747dabf293172977a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44bf025767f94e4335cd64274… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 10:53:08 2009 -0700 wininet: Change type of GetAddress from struct sockaddr_in * to struct sockaddr *. --- dlls/wininet/ftp.c | 4 +++- dlls/wininet/http.c | 4 +++- dlls/wininet/internet.c | 5 +++-- dlls/wininet/internet.h | 2 +- dlls/wininet/utility.c | 31 +++++++++++++++++++++++-------- 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ebb6d39..791459e 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2439,7 +2439,9 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_RESOLVING_NAME, (LPWSTR) lpszServerName, strlenW(lpszServerName)); - if (!GetAddress(lpszServerName, nServerPort, &socketAddr)) + sock_namelen = sizeof(socketAddr); + if (!GetAddress(lpszServerName, nServerPort, + (struct sockaddr *)&socketAddr, &sock_namelen)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); goto lerror; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1b8d585..4ff4be7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1452,14 +1452,16 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) { char szaddr[32]; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + socklen_t sa_len; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESOLVING_NAME, lpwhs->lpszServerName, strlenW(lpwhs->lpszServerName)+1); + sa_len = sizeof(lpwhs->socketAddress); if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort, - &lpwhs->socketAddress)) + (struct sockaddr *)&lpwhs->socketAddress, &sa_len)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); return FALSE; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3d87a73..b1def60 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2750,14 +2750,15 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe if (dwFlags & FLAG_ICC_FORCE_CONNECTION) { struct sockaddr_in sin; + socklen_t sa_len = sizeof(sin); int fd; - if (!GetAddress(hostW, port, &sin)) + if (!GetAddress(hostW, port, (struct sockaddr *)&sin, &sa_len)) goto End; fd = socket(sin.sin_family, SOCK_STREAM, 0); if (fd != -1) { - if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == 0) + if (connect(fd, (struct sockaddr *)&sin, sa_len) == 0) rc = TRUE; close(fd); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e01e8de..53e9715 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -381,7 +381,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, DWORD dwInternalFlags); BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct sockaddr_in *psa); + struct sockaddr *psa, socklen_t *sa_len); void INTERNET_SetLastError(DWORD dwError); DWORD INTERNET_GetLastError(void); diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 5afdeb2..2c443bf 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -145,7 +145,7 @@ time_t ConvertTimeString(LPCWSTR asctime) BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct sockaddr_in *psa) + struct sockaddr *psa, socklen_t *sa_len) { WCHAR *found; char *name; @@ -155,6 +155,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, int ret; #else struct hostent *phe; + struct sockaddr_in *sin = (struct sockaddr_in *)psa; #endif TRACE("%s\n", debugstr_w(lpszServerName)); @@ -186,10 +187,17 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); return FALSE; } + if (*sa_len < sizeof(struct sockaddr_in)) + { + WARN("address too small\n"); + freeaddrinfo( res ); + return FALSE; + } + *sa_len = sizeof(struct sockaddr_in); memset( psa, 0, sizeof(struct sockaddr_in) ); - memcpy( &psa->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); - psa->sin_family = res->ai_family; - psa->sin_port = htons(nServerPort); + memcpy( &((struct sockaddr_in *)psa)->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); + ((struct sockaddr_in *)psa)->sin_family = res->ai_family; + ((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); freeaddrinfo( res ); #else @@ -203,10 +211,17 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, LeaveCriticalSection( &cs_gethostbyname ); return FALSE; } - memset(psa,0,sizeof(struct sockaddr_in)); - memcpy((char *)&psa->sin_addr, phe->h_addr, phe->h_length); - psa->sin_family = phe->h_addrtype; - psa->sin_port = htons(nServerPort); + if (*sa_len < sizeof(struct sockaddr_in)) + { + WARN("address too small\n"); + LeaveCriticalSection( &cs_gethostbyname ); + return FALSE; + } + *sa_len = sizeof(struct sockaddr_in); + memset(sin,0,sizeof(struct sockaddr_in)); + memcpy((char *)&sin->sin_addr, phe->h_addr, phe->h_length); + sin->sin_family = phe->h_addrtype; + sin->sin_port = htons(nServerPort); LeaveCriticalSection( &cs_gethostbyname ); #endif

1 0

Juan Lang : wininet: Simplify GetAddress when using getaddrinfo.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: f0dde6b673905f2229ca09c9e153ac879b614c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dde6b673905f2229ca09c9e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 10:55:18 2009 -0700 wininet: Simplify GetAddress when using getaddrinfo. --- dlls/wininet/utility.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 2c443bf..e2eee46 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -187,17 +187,21 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); return FALSE; } - if (*sa_len < sizeof(struct sockaddr_in)) + if (*sa_len < res->ai_addrlen) { WARN("address too small\n"); freeaddrinfo( res ); return FALSE; } - *sa_len = sizeof(struct sockaddr_in); - memset( psa, 0, sizeof(struct sockaddr_in) ); - memcpy( &((struct sockaddr_in *)psa)->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); - ((struct sockaddr_in *)psa)->sin_family = res->ai_family; - ((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); + *sa_len = res->ai_addrlen; + memcpy( psa, res->ai_addr, res->ai_addrlen ); + /* Copy port */ + switch (res->ai_family) + { + case AF_INET: + ((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); + break; + } freeaddrinfo( res ); #else

1 0

Frédéric Delanoy : clock: Convert French resources to UTF-8.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 3e41d66449816a18eb21b2a9d264cd222412002c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e41d66449816a18eb21b2a9d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 01:03:36 2009 +0200 clock: Convert French resources to UTF-8. --- programs/clock/Fr.rc | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/programs/clock/Fr.rc b/programs/clock/Fr.rc index ce6aa8d..c6c24ba 100644 --- a/programs/clock/Fr.rc +++ b/programs/clock/Fr.rc @@ -22,13 +22,16 @@ #include "clock_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MAIN_MENU MENU { - POPUP "&Propri�t�s" { + POPUP "&Propriétés" { MENUITEM "Ana&logique", IDM_ANALOG - MENUITEM "&Num�rique", IDM_DIGITAL + MENUITEM "&Numérique", IDM_DIGITAL MENUITEM SEPARATOR MENUITEM "&Police...", IDM_FONT MENUITEM SEPARATOR @@ -42,7 +45,7 @@ MAIN_MENU MENU POPUP "Inf&o" { MENUITEM "&Licence...", IDM_LICENSE MENUITEM "AUCUNE &GARANTIE...", IDM_NOWARRANTY - MENUITEM "� &propos de l'horloge", IDM_ABOUT + MENUITEM "À &propos de l'horloge", IDM_ABOUT } } @@ -55,23 +58,23 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { IDS_LICENSE_CAPTION, "LICENCE" IDS_LICENSE, -"Ce programme est un logiciel libre�; vous pouvez le redistribuer et/ou \ -le modifier suivant les termes de la Licence G�n�rale Publique Limit�e GNU \ -telle que publi�e par la Free Software Foundation�; soit la version 2.1 \ -de la License, soit (� votre gr�) toute version ult�rieure.\n\ -Ce programme est distribu� dans l'espoir qu'il sera utile, mais \ -SANS AUCUNE GARANTIE�: sans m�me la garantie implicite de \ -COMMERCIALISABILIT� ou d'AD�QUATION � UN OBJECTIF PARTICULIER. Consultez \ -la Licence G�n�rale Publique Limit�e pour plus de d�tails.\n\ -Vous devriez avoir re�u une copie de la Licence G�n�rale Publique Limit�e \ -GNU avec ce programme�; si ce n'est pas le cas, �crivez � la�: \ +"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou \ +le modifier suivant les termes de la Licence Générale Publique Limitée GNU \ +telle que publiée par la Free Software Foundation ; soit la version 2.1 \ +de la Licence, soit (à votre gré) toute version ultérieure.\n\ +Ce programme est distribué dans l'espoir qu'il sera utile, mais \ +SANS AUCUNE GARANTIE : sans même la garantie implicite de \ +COMMERCIALISABILITÉ ou d'ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \ +la Licence Générale Publique Limitée pour plus de détails.\n\ +Vous devriez avoir reçu une copie de la Licence Générale Publique Limitée \ +GNU avec ce programme ; si ce n'est pas le cas, écrivez à la : \ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, \ MA 02110-1301, USA." IDS_WARRANTY_CAPTION, "AUCUNE GARANTIE" IDS_WARRANTY, -"Ce programme est distribu� dans l'espoir qu'il sera utile, mais \ -SANS AUCUNE GARANTIE�: sans m�me la garantie implicite de \ -COMMERCIALISABILIT� ou d'AD�QUATION � UN OBJECTIF PARTICULIER. Consultez \ -la Licence G�n�rale Publique Limit�e pour plus de d�tails." +"Ce programme est distribué dans l'espoir qu'il sera utile, mais \ +SANS AUCUNE GARANTIE : sans même la garantie implicite de \ +COMMERCIALISABILITÉ ou d'ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \ +la Licence Générale Publique Limitée pour plus de détails." }

1 0

Frédéric Delanoy : shell32: Fix French translation & UI display.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 4a4c2fa12ff01366f81d4e4c5101ee843073b246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4c2fa12ff01366f81d4e4c5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 01:36:12 2009 +0200 shell32: Fix French translation & UI display. --- dlls/shell32/shell32_Fr.rc | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index 511a373..e63a589 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -87,7 +87,7 @@ BEGIN MENUITEM "E&xplorer", FCIDM_SHVIEW_EXPLORE MENUITEM "&Ouvrir", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR - MENUITEM "C&ouper", FCIDM_SHVIEW_CUT + MENUITEM "Cou&per", FCIDM_SHVIEW_CUT MENUITEM "&Copier", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR MENUITEM "Créer un &lien", FCIDM_SHVIEW_CREATELINK @@ -148,7 +148,7 @@ FONT 8, "MS Shell Dlg" WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Créer un nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP } @@ -216,7 +216,7 @@ STRINGTABLE IDS_DESKTOP "Bureau" IDS_MYCOMPUTER "Poste de travail" IDS_RECYCLEBIN_FOLDER_NAME "Corbeille" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Panneau de configuration" /* context menus */ IDS_VIEW_LARGE "&Grandes icônes" @@ -226,19 +226,19 @@ STRINGTABLE IDS_SELECT "Sélectionner" IDS_OPEN "Ouvrir" - IDS_CREATEFOLDER_DENIED "Impossible de créer le nouveau dossier : permission refusée." - IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier" - IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" - IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier" - IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1'?" + IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier : permission refusée." + IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du dossier" + IDS_DELETEITEM_CAPTION "Confirmez la suppression du fichier" + IDS_DELETEFOLDER_CAPTION "Confirmez la suppression du dossier" + IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer « %1 » ?" IDS_DELETEMULTIPLE_TEXT "Êtes-vous sûr de vouloir supprimer ces %1 éléments ?" - IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer le(les) élément(s) séléectionné(s) ?" + IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer le(s) élément(s) sélectionné(s) ?" IDS_TRASHITEM_TEXT "Êtes-vous sûr de vouloir mettre « %1 » dans la corbeille ?" IDS_TRASHFOLDER_TEXT "Êtes-vous sûr de vouloir mettre « %1 » et tout ce qu'il contient dans la corbeille ?" IDS_TRASHMULTIPLE_TEXT "Êtes-vous sûr de vouloir mettre ces %1 éléments dans la corbeille ?" - IDS_CANTTRASH_TEXT "L'élément « %1 » ne peut pas être mis dans la corbeille. Souhaitez-vous le supprimer à la place ?" + IDS_CANTTRASH_TEXT "L'élément « %1 » ne peut être mis dans la corbeille. Souhaitez-vous plutôt le supprimer ?" IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé « %1 ».\n\nVoulez-vous le remplacer ?" - IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" + IDS_OVERWRITEFILE_CAPTION "Confirmez l'écrasement du fichier" IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé « %1 ».\n\n"\ "Si des fichiers dans le dossier de destination ont le même nom que ceux dans le dossier\n"\ "sélectionné, ils seront écrasés. Voulez-vous quand même déplacer ou copier\n"\ @@ -248,7 +248,7 @@ STRINGTABLE IDS_RESTART_TITLE "Redémarrer" IDS_RESTART_PROMPT "Voulez-vous simuler le redémarrage de Windows ?" IDS_SHUTDOWN_TITLE "Arrêter" - IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session Wine ?" + IDS_SHUTDOWN_PROMPT "Voulez-vous clôturer la session Wine ?" /* Run File dialog */ IDS_RUNDLG_ERROR "Impossible d'afficher la boîte de dialogue « Exécuter » (erreur interne)" @@ -267,7 +267,7 @@ STRINGTABLE IDS_MYMUSIC "Ma musique" IDS_MYVIDEO "Mes vidéos" IDS_DESKTOPDIRECTORY "Bureau" - IDS_NETHOOD "Voisinage Réseau" + IDS_NETHOOD "Voisinage réseau" IDS_TEMPLATES "Modèles" IDS_APPDATA "Application Data" IDS_PRINTHOOD "Voisinage d'impression" @@ -301,7 +301,7 @@ IDS_LICENSE, "Wine est un logiciel libre ; vous pouvez le redistribuer et/ou \ le modifier suivant les termes de la Licence Générale Publique Limitée GNU \ telle que publiée par la Free Software Foundation ; soit la version 2.1 \ -de la License, soit (à votre gré) toute version ultérieure.\n\n\ +de la Licence, soit (à votre gré) toute version ultérieure.\n\n\ Wine est distribué dans l’espoir qu'il sera utile, mais \ SANS AUCUNE GARANTIE : sans même la garantie implicite de \ COMMERCIALISABILITÉ ou d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \

1 0