October 2007 - Wine-Commits

Hans Leidekker : wininet: Always send a content length header, even if there is no content.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 64359c2432fda82d5565417417c92578825dc089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64359c2432fda82d556541741… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Oct 28 16:32:46 2007 +0100 wininet: Always send a content length header, even if there is no content. --- dlls/wininet/http.c | 15 +++++---------- dlls/wininet/tests/http.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f496733..53d6fba 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2589,6 +2589,9 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, BOOL loop_next; INTERNET_ASYNC_RESULT iar; static const WCHAR szClose[] = { 'C','l','o','s','e',0 }; + static const WCHAR szContentLength[] = + { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; + WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \r\n */ + 20 /* int */ ]; TRACE("--> %p\n", lpwhr); @@ -2599,16 +2602,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, HTTP_FixVerb(lpwhr); - /* if we are using optional stuff, we must add the fixed header of that option length */ - if (dwContentLength > 0) - { - static const WCHAR szContentLength[] = { - 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0}; - WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \n\r */ + 20 /* int */ ]; - sprintfW(contentLengthStr, szContentLength, dwContentLength); - HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, - HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); - } + sprintfW(contentLengthStr, szContentLength, dwContentLength); + HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); do { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 589fe8a..a8f989b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1302,6 +1302,17 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "/test5")) + { + if (strstr(buffer, "Content-Length: 0")) + { + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + } + else + send(c, notokmsg, sizeof notokmsg-1, 0); + } + if (strstr(buffer, "/quit")) { send(c, okmsg, sizeof okmsg-1, 0); @@ -1526,6 +1537,7 @@ static void test_http_connection(void) test_proxy_indirect(si.port); test_proxy_direct(si.port); test_header_handling_order(si.port); + test_basic_request(si.port, "/test5"); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "/quit");

1 0

Gerald Pfeifer : shlwapi/tests: Remove overly aggressive const declaration for TEST_URL_UNESCAPE.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: e3b8e2f2dd571dee80b1d0a0ddd928821661e354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b8e2f2dd571dee80b1d0a0d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Oct 28 14:05:03 2007 +0100 shlwapi/tests: Remove overly aggressive const declaration for TEST_URL_UNESCAPE. --- dlls/shlwapi/tests/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index ebce1e5..6d219c9 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -242,7 +242,7 @@ static const struct { /* ################ */ -static const struct { +static struct { char url[30]; const char *expect; } TEST_URL_UNESCAPE[] = {

1 0

Roderick Colenbrander : wined3d: Default to GLSL. This is safe because we now have proper ps2.0/vs2.0 detection.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 59eba5cb41d165734468dcab0b38b56ff6c40ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59eba5cb41d165734468dcab0… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Oct 28 00:28:53 2007 +0200 wined3d: Default to GLSL. This is safe because we now have proper ps2.0/vs2.0 detection. --- dlls/wined3d/directx.c | 8 +++++++- dlls/wined3d/wined3d_main.c | 10 +++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 47bf9e1..ce14eef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -335,7 +335,13 @@ static void select_shader_mode( if (wined3d_settings.vs_mode == VS_NONE) { *vs_selected = SHADER_NONE; } else if (gl_info->supported[ARB_VERTEX_SHADER] && wined3d_settings.glslRequested) { - *vs_selected = SHADER_GLSL; + /* Geforce4 cards support GLSL but for vertex shaders only. Further its reported GLSL caps are + * wrong. This combined with the fact that glsl won't offer more features or performance, use ARB + * shaders only on this card. */ + if(gl_info->vs_nv_version < VS_VERSION_20) + *vs_selected = SHADER_ARB; + else + *vs_selected = SHADER_GLSL; } else if (gl_info->supported[ARB_VERTEX_PROGRAM]) { *vs_selected = SHADER_ARB; } else { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ebe09bd..26e7f70 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -39,7 +39,7 @@ wined3d_settings_t wined3d_settings = VS_HW, /* Hardware by default */ PS_HW, /* Hardware by default */ VBO_HW, /* Hardware by default */ - FALSE, /* Use of GLSL disabled by default */ + TRUE, /* Use of GLSL enabled by default */ ORM_BACKBUFFER, /* Use the backbuffer to do offscreen rendering */ RTL_AUTO, /* Automatically determine best locking method */ 0, /* The default of memory is set in FillGLCaps */ @@ -184,14 +184,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) } if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) { - if (!strcmp(buffer,"enabled")) - { - TRACE("Use of GL Shading Language enabled for systems that support it\n"); - wined3d_settings.glslRequested = TRUE; - } - else + if (!strcmp(buffer,"disabled")) { TRACE("Use of GL Shading Language disabled\n"); + wined3d_settings.glslRequested = FALSE; } } if ( !get_config_key( hkey, appkey, "OffscreenRenderingMode", buffer, size) )

1 0

Roderick Colenbrander : wined3d: Detect vertex shader 2. 0 support using a pixel shader 2.0 limit.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: efc18d79afdc3b639c6b820a48ca178113c63310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc18d79afdc3b639c6b820a4… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 27 23:54:10 2007 +0200 wined3d: Detect vertex shader 2.0 support using a pixel shader 2.0 limit. Without this vertex shader 3.0 is reported on non-Nvidia cards that only support vertex shader 2.0. Reporting 3.0 would result in slow software rendering as it is much more advanced than 2.0. --- dlls/wined3d/directx.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ad71295..47bf9e1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2367,10 +2367,13 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, if (vs_selected_mode == SHADER_GLSL) { /* Nvidia Geforce6/7 or Ati R4xx/R5xx cards with GLSL support, support VS 3.0 but older Nvidia/Ati - models with GLSL support only support 2.0. In case of nvidia we can detect VS 2.0 support using - vs_nv_version which is based on NV_vertex_program. For Ati cards there's no easy way, so for - now only support 2.0/3.0 detection on Nvidia GeforceFX cards and default to 3.0 for everything else */ - if(GLINFO_LOCATION.vs_nv_version == VS_VERSION_20) + * models with GLSL support only support 2.0. In case of nvidia we can detect VS 2.0 support using + * vs_nv_version which is based on NV_vertex_program. + * For Ati cards there's no way using glsl (it abstracts the lowlevel info away) and also not + * using ARB_vertex_program. It is safe to assume that when a card supports pixel shader 2.0 it + * supports vertex shader 2.0 too and the way around. We can detect ps2.0 using the maximum number + * of native instructions, so use that here. For more info see the pixel shader versioning code below. */ + if((GLINFO_LOCATION.vs_nv_version == VS_VERSION_20) || (GLINFO_LOCATION.ps_arb_max_instructions <= 512)) *pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); else *pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0);

1 0

Roderick Colenbrander : wined3d: Fix the amount of texture memory in the debug traces.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 6760ce83a416c658fda486ec4783d1969ce1a87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6760ce83a416c658fda486ec4… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 27 23:08:11 2007 +0200 wined3d: Fix the amount of texture memory in the debug traces. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ecfb095..ad71295 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2765,7 +2765,7 @@ BOOL InitAdapters(void) { else Adapters[0].TextureRam = Adapters[0].gl_info.vidmem; Adapters[0].UsedTextureRam = 0; - TRACE("Emulating %dMB of texture ram\n", Adapters[0].TextureRam); + TRACE("Emulating %dMB of texture ram\n", Adapters[0].TextureRam/(1024*1024)); /* Initialize the Adapter's DeviceName which is required for ChangeDisplaySettings and friends */ DisplayDevice.cb = sizeof(DisplayDevice);

1 0

Roderick Colenbrander : wined3d: Print the correct pixel/ vertex shader version in a debug trace.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: ac53711902bcb300384898c06d1f13496ec756ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac53711902bcb300384898c06… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 27 23:00:11 2007 +0200 wined3d: Print the correct pixel/vertex shader version in a debug trace. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index df12b7e..ecfb095 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2374,7 +2374,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->VertexShaderVersion = WINED3DVS_VERSION(2,0); else *pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); - TRACE_(d3d_caps)("Hardware vertex shader version 3.0 enabled (GLSL)\n"); + TRACE_(d3d_caps)("Hardware vertex shader version %d.%d enabled (GLSL)\n", (*pCaps->VertexShaderVersion >> 8) & 0xff, *pCaps->VertexShaderVersion & 0xff); } else if (vs_selected_mode == SHADER_ARB) { *pCaps->VertexShaderVersion = WINED3DVS_VERSION(1,1); TRACE_(d3d_caps)("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); @@ -2414,7 +2414,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, * offer a way to query this. */ *pCaps->PixelShader1xMaxValue = 8.0; - TRACE_(d3d_caps)("Hardware pixel shader version 3.0 enabled (GLSL)\n"); + TRACE_(d3d_caps)("Hardware pixel shader version %d.%d enabled (GLSL)\n", (*pCaps->PixelShaderVersion >> 8) & 0xff, *pCaps->PixelShaderVersion & 0xff); } else if (ps_selected_mode == SHADER_ARB) { *pCaps->PixelShaderVersion = WINED3DPS_VERSION(1,4); *pCaps->PixelShader1xMaxValue = 8.0;

1 0

Roderick Colenbrander : wined3d: Add proper PS2. 0 detection for older cards with GLSL support.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 50ed6f36d2cdb29e39648546a688cec92917076d URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ed6f36d2cdb29e39648546a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 27 22:59:47 2007 +0200 wined3d: Add proper PS2.0 detection for older cards with GLSL support. --- dlls/wined3d/directx.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f597af9..df12b7e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2386,9 +2386,18 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF); if (ps_selected_mode == SHADER_GLSL) { - /* See the comment about VS2.0/VS3.0 detection as we do the same here but then based on NV_fragment_program - in case of GeforceFX cards. */ - if(GLINFO_LOCATION.ps_nv_version == PS_VERSION_20) + /* Older DX9-class videocards (GeforceFX / Radeon >9500/X*00) only support pixel shader 2.0/2.0a/2.0b. + * In OpenGL the extensions related to GLSL abstract lowlevel GL info away which is needed + * to distinguish between 2.0 and 3.0 (and 2.0a/2.0b). In case of Nvidia we use their fragment + * program extensions. On other hardware including ATI GL_ARB_fragment_program offers the info + * in max native instructions. Intel and others also offer the info in this extension but they + * don't support GLSL (at least on Windows). + * + * PS2.0 requires at least 96 instructions, 2.0a/2.0b go upto 512. Assume that if the number + * of instructions is 512 or less we have to do with ps2.0 hardware. + * NOTE: ps3.0 hardware requires 512 or more instructions but ati and nvidia offer 'enough' (1024 vs 4096) on their most basic ps3.0 hardware. + */ + if((GLINFO_LOCATION.ps_nv_version == PS_VERSION_20) || (GLINFO_LOCATION.ps_arb_max_instructions <= 512)) *pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0); else *pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0);

1 0

Roderick Colenbrander : wined3d: Use native shader limits instead of the maximum the driver can handle in software .
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 465962dae66e20e8c026976833b1a38c60638e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=465962dae66e20e8c02697683… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 27 21:54:32 2007 +0200 wined3d: Use native shader limits instead of the maximum the driver can handle in software. This should prevent software fallbacks and and second it will allow for ps2.0/ps3.0 detection. --- dlls/wined3d/directx.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ca1f44e..f597af9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -723,24 +723,24 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); gl_info->ps_arb_constantsF = gl_max; TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM float constants: %d\n", gl_info->ps_arb_constantsF); - GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_TEMPORARIES_ARB, &gl_max)); + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max)); gl_info->ps_arb_max_temps = gl_max; - TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM temporaries: %d\n", gl_info->ps_arb_max_temps); - GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_INSTRUCTIONS_ARB, &gl_max)); + TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM native temporaries: %d\n", gl_info->ps_arb_max_temps); + GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, &gl_max)); gl_info->ps_arb_max_instructions = gl_max; - TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM instructions: %d\n", gl_info->ps_arb_max_instructions); + TRACE_(d3d_caps)("Max ARB_FRAGMENT_PROGRAM native instructions: %d\n", gl_info->ps_arb_max_instructions); } if (gl_info->supported[ARB_VERTEX_PROGRAM]) { gl_info->vs_arb_version = VS_VERSION_11; GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); gl_info->vs_arb_constantsF = gl_max; TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM float constants: %d\n", gl_info->vs_arb_constantsF); - GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_TEMPORARIES_ARB, &gl_max)); + GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max)); gl_info->vs_arb_max_temps = gl_max; - TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM temporaries: %d\n", gl_info->vs_arb_max_temps); - GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_INSTRUCTIONS_ARB, &gl_max)); + TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM native temporaries: %d\n", gl_info->vs_arb_max_temps); + GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, &gl_max)); gl_info->vs_arb_max_instructions = gl_max; - TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM instructions: %d\n", gl_info->vs_arb_max_instructions); + TRACE_(d3d_caps)("Max ARB_VERTEX_PROGRAM native instructions: %d\n", gl_info->vs_arb_max_instructions); } if (gl_info->supported[ARB_VERTEX_SHADER]) { glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &gl_max);

1 0

Alex Villacís Lasso : riched20: Fix test crash on WinXP-SP2.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: e7296eaeaab3fbeb5a643287162c42f8069026e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7296eaeaab3fbeb5a6432871… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun Oct 28 10:53:45 2007 -0500 riched20: Fix test crash on WinXP-SP2. --- dlls/riched20/tests/editor.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 0c259b9..3dfa28e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1087,6 +1087,8 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem1); @@ -1101,6 +1103,8 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem2); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1117,6 +1121,8 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem3); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1128,6 +1134,8 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem3alt); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1139,6 +1147,8 @@ static void test_EM_SETTEXTEX(void) getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem4); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -1747,6 +1757,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "RichEdit1") == 0, "EM_GETTEXTEX results not what was set by EM_REPLACESEL\n"); @@ -1760,6 +1772,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "RichEdit1\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1779,6 +1793,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "RichEdit1\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1805,6 +1821,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1821,6 +1839,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, " ") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1837,6 +1857,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r\r \r\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1853,6 +1875,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, " \r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1869,6 +1893,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, " \r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1885,6 +1911,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\rX\r\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1901,6 +1929,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r") == 0, "EM_GETTEXTEX returned incorrect string\n"); @@ -1917,6 +1947,8 @@ static void test_EM_REPLACESEL(void) getText.cb = 1024; getText.codepage = CP_ACP; getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefaultChar = NULL; SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buffer); ok(strcmp(buffer, "\r\r\r\r\r\r ") == 0, "EM_GETTEXTEX returned incorrect string\n");

1 0

Paul Millar : widl: Add support for overriding recorded time, allowing binary-identical compilation.
by Alexandre Julliard Oct. 29, 2007

Oct. 29, 2007

Module: wine Branch: master Commit: 17e934669e2910a5d0a52533a22c156863b24aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=17e934669e2910a5d0a52533a… Author: Paul Millar <paul(a)astro.gla.ac.uk> Date: Sun Oct 28 16:31:03 2007 +0000 widl: Add support for overriding recorded time, allowing binary-identical compilation. --- tools/widl/write_msft.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index dd29c73..f5ea2f7 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2473,6 +2473,7 @@ int create_msft_typelib(typelib_t *typelib) int failed = 0; typelib_entry_t *entry; time_t cur_time; + char *time_override; unsigned int version = 5 << 24 | 1 << 16 | 164; /* 5.01.0164 */ GUID midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; GUID midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; @@ -2518,7 +2519,8 @@ int create_msft_typelib(typelib_t *typelib) /* midl adds two sets of custom data to the library: the current unix time and midl's version number */ - cur_time = time(NULL); + time_override = getenv( "WIDL_TIME_OVERRIDE"); + cur_time = time_override ? atol( time_override) : time(NULL); set_custdata(msft, &midl_time_guid, VT_UI4, &cur_time, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_version_guid, VT_UI4, &version, &msft->typelib_header.CustomDataOffset);

1 0