May 2011 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added IOmNavigator::get_cpuClass implementation.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: ebac489c49bc5962bc8d9f2cb3be05a7393ab4c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebac489c49bc5962bc8d9f2cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 14:58:35 2011 +0000 mshtml: Added IOmNavigator::get_cpuClass implementation. --- dlls/mshtml/omnavigator.c | 14 ++++++++++++-- dlls/mshtml/tests/dom.c | 13 ++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 37bd95b..f5a3573 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -443,8 +443,18 @@ static HRESULT WINAPI OmNavigator_toString(IOmNavigator *iface, BSTR *String) static HRESULT WINAPI OmNavigator_get_cpuClass(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + static const WCHAR cpu_classW[] = +#ifdef _WIN64 + {'x','6','4',0}; +#else + {'x','8','6',0}; +#endif + + TRACE("(%p)->(%p)\n", This, p); + + *p = SysAllocString(cpu_classW); + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI OmNavigator_get_systemLanguage(IOmNavigator *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8029381..dcd2e21 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3865,11 +3865,14 @@ static void test_navigator(IHTMLDocument2 *doc) bstr = NULL; hres = IOmNavigator_get_platform(navigator, &bstr); ok(hres == S_OK, "get_platform failed: %08x\n", hres); -#ifdef _WIN64 - ok(!strcmp_wa(bstr, "Win64") || broken(!strcmp_wa(bstr, "Win32") /* IE6 */), "unexpected platform %s\n", wine_dbgstr_w(bstr)); -#else - ok(!strcmp_wa(bstr, "Win32"), "unexpected platform %s\n", wine_dbgstr_w(bstr)); -#endif + ok(!strcmp_wa(bstr, sizeof(void*) == 8 ? "Win64" : "Win32") + || (sizeof(void*) == 8 && broken(!strcmp_wa(bstr, "Win32") /* IE6 */)), "unexpected platform %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + bstr = NULL; + hres = IOmNavigator_get_cpuClass(navigator, &bstr); + ok(hres == S_OK, "get_cpuClass failed: %08x\n", hres); + ok(!strcmp_wa(bstr, sizeof(void*) == 8 ? "x64" : "x86"), "unexpected cpuClass %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); bstr = NULL;

1 0

Piotr Caban : msvcrt: Don' t pass NULL as __ms_va_list in printf implementation.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 64cf208040f14f46d65b288272c8fabd93418af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64cf208040f14f46d65b28827… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 11 15:39:07 2011 +0200 msvcrt: Don't pass NULL as __ms_va_list in printf implementation. --- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/file.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 4 ++-- dlls/msvcrt/printf.h | 22 +++++++++++----------- dlls/msvcrt/wcs.c | 16 ++++++++-------- 5 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64cf208040f14f46d65b2…

1 0

Huw Davies : gdi32: Initialise the bit fields even in the BI_RGB case in order to make format comparisons easier .
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 93349f02adf41e549f219af411447dd527eb4852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93349f02adf41e549f219af41… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 11 15:13:40 2011 +0100 gdi32: Initialise the bit fields even in the BI_RGB case in order to make format comparisons easier. --- dlls/gdi32/dibdrv/dc.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 5273b29..e43ec15 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -76,6 +76,8 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) { + static const DWORD bit_fields_888[3] = {0xff0000, 0x00ff00, 0x0000ff}; + dib->bit_count = bi->biBitCount; dib->width = bi->biWidth; dib->height = bi->biHeight; @@ -99,15 +101,14 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit { case 32: if(bi->biCompression == BI_RGB) + bit_fields = bit_fields_888; + + init_bit_fields(dib, bit_fields); + + if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) dib->funcs = &funcs_8888; else - { - init_bit_fields(dib, bit_fields); - if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) - dib->funcs = &funcs_8888; - else - dib->funcs = &funcs_32; - } + dib->funcs = &funcs_32; break; default:

1 0

Huw Davies : gdi32: Add a missing const.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 90b2672e6b7e9a5140efb48e32cbb9e76252297a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b2672e6b7e9a5140efb48e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 11 15:16:45 2011 +0100 gdi32: Add a missing const. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/primitives.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index c2b3294..7327fca 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -37,7 +37,7 @@ static inline DC *get_dibdrv_dc( PHYSDEV dev ) typedef struct primitive_funcs { - void (* solid_rects)(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor); + void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); } primitive_funcs; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index c8d60cb..a35877e 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -31,7 +31,7 @@ static inline void do_rop_32(DWORD *ptr, DWORD and, DWORD xor) *ptr = (*ptr & and) ^ xor; } -static void solid_rects_32(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor) +static void solid_rects_32(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) { DWORD *ptr, *start; int x, y, i; @@ -45,7 +45,7 @@ static void solid_rects_32(const dib_info *dib, int num, RECT *rc, DWORD and, DW } } -static void solid_rects_null(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor) +static void solid_rects_null(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor) { return; }

1 0

Marcus Meissner : krnl386.exe16: Fixed if that always succeeds (Coverity).
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 428e0312b7254fda023432d096a0d1a87ff5aa30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428e0312b7254fda023432d09… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 11 14:36:16 2011 +0200 krnl386.exe16: Fixed if that always succeeds (Coverity). --- dlls/krnl386.exe16/ne_segment.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/ne_segment.c b/dlls/krnl386.exe16/ne_segment.c index d231fb9..1ceb714 100644 --- a/dlls/krnl386.exe16/ne_segment.c +++ b/dlls/krnl386.exe16/ne_segment.c @@ -533,7 +533,8 @@ static void NE_FixupSegmentPrologs(NE_MODULE *pModule, WORD segnum) if (!pModule->ne_autodata) return; - if (!(dgroup = SEL(pSegTable[pModule->ne_autodata-1].hSeg))) return; + if (!pSegTable[pModule->ne_autodata-1].hSeg) return; + dgroup = SEL(pSegTable[pModule->ne_autodata-1].hSeg); pSeg = MapSL( MAKESEGPTR(sel, 0) );

1 0

Dylan Smith : d3dx9: Create compact_mesh helper function for OptimizeInplace.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 4ed3930e276f59061e26cdbc6ac14cfb0030433d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed3930e276f59061e26cdbc6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed May 11 05:30:41 2011 -0400 d3dx9: Create compact_mesh helper function for OptimizeInplace. --- dlls/d3dx9_36/mesh.c | 78 +++++++++++++++++++++++++++++-------------------- 1 files changed, 46 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index eca9332..95b967b 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -652,6 +652,48 @@ static HRESULT WINAPI ID3DXMeshImpl_Optimize(ID3DXMesh *iface, DWORD flags, CONS return E_NOTIMPL; } +/* Creates a vertex_remap that removes unused vertices. + * Indices are updated according to the vertex_remap. */ +static HRESULT compact_mesh(ID3DXMeshImpl *This, DWORD *indices, DWORD *new_num_vertices, ID3DXBuffer **vertex_remap) +{ + HRESULT hr; + DWORD *vertex_remap_ptr; + DWORD num_used_vertices; + DWORD i; + + hr = D3DXCreateBuffer(This->numvertices * sizeof(DWORD), vertex_remap); + if (FAILED(hr)) return hr; + vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(*vertex_remap); + + for (i = 0; i < This->numfaces * 3; i++) + vertex_remap_ptr[indices[i]] = 1; + + /* create old->new vertex mapping */ + num_used_vertices = 0; + for (i = 0; i < This->numvertices; i++) { + if (vertex_remap_ptr[i]) + vertex_remap_ptr[i] = num_used_vertices++; + else + vertex_remap_ptr[i] = -1; + } + /* convert indices */ + for (i = 0; i < This->numfaces * 3; i++) + indices[i] = vertex_remap_ptr[indices[i]]; + + /* create new->old vertex mapping */ + num_used_vertices = 0; + for (i = 0; i < This->numvertices; i++) { + if (vertex_remap_ptr[i] != -1) + vertex_remap_ptr[num_used_vertices++] = i; + } + for (i = num_used_vertices; i < This->numvertices; i++) + vertex_remap_ptr[i] = -1; + + *new_num_vertices = num_used_vertices; + + return D3D_OK; +} + static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flags, CONST DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap_out, LPD3DXBUFFER *vertex_remap_out) { @@ -661,7 +703,7 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag ID3DXBuffer *vertex_remap = NULL; DWORD *dword_indices = NULL; DWORD new_num_vertices = 0; - DWORD new_vertex_buffer_size = 0; + DWORD new_num_alloc_vertices = 0; IDirect3DVertexBuffer9 *vertex_buffer = NULL; DWORD i; @@ -700,36 +742,9 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag if ((flags & (D3DXMESHOPT_COMPACT | D3DXMESHOPT_IGNOREVERTS)) == D3DXMESHOPT_COMPACT) { - /* Remove unused vertices. */ - DWORD *vertex_remap_ptr; - - new_vertex_buffer_size = This->numvertices; - hr = D3DXCreateBuffer(This->numvertices * sizeof(DWORD), &vertex_remap); + new_num_alloc_vertices = This->numvertices; + hr = compact_mesh(This, dword_indices, &new_num_vertices, &vertex_remap); if (FAILED(hr)) goto cleanup; - vertex_remap_ptr = ID3DXBuffer_GetBufferPointer(vertex_remap); - - for (i = 0; i < This->numfaces * 3; i++) - vertex_remap_ptr[dword_indices[i]] = 1; - - /* create old->new vertex mapping */ - for (i = 0; i < This->numvertices; i++) { - if (vertex_remap_ptr[i]) - vertex_remap_ptr[i] = new_num_vertices++; - else - vertex_remap_ptr[i] = -1; - } - /* convert indices */ - for (i = 0; i < This->numfaces * 3; i++) - dword_indices[i] = vertex_remap_ptr[dword_indices[i]]; - - /* create new->old vertex mapping */ - new_num_vertices = 0; - for (i = 0; i < This->numvertices; i++) { - if (vertex_remap_ptr[i] != -1) - vertex_remap_ptr[new_num_vertices++] = i; - } - for (i = new_num_vertices; i < This->numvertices; i++) - vertex_remap_ptr[i] = -1; } if (vertex_remap) @@ -744,8 +759,7 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag hr = IDirect3DVertexBuffer9_GetDesc(This->vertex_buffer, &vertex_desc); if (FAILED(hr)) goto cleanup; - new_vertex_buffer_size *= vertex_size; - hr = IDirect3DDevice9_CreateVertexBuffer(This->device, new_vertex_buffer_size, + hr = IDirect3DDevice9_CreateVertexBuffer(This->device, new_num_alloc_vertices * vertex_size, vertex_desc.Usage, This->fvf, vertex_desc.Pool, &vertex_buffer, NULL); if (FAILED(hr)) goto cleanup;

1 0

Henri Verbeet : wined3d: Get rid of the SHADER_LIMITS typedef.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 26dd1ed0e93e990ede0f340be42c4d0dee692163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26dd1ed0e93e990ede0f340be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 10 21:18:48 2011 +0200 wined3d: Get rid of the SHADER_LIMITS typedef. --- dlls/wined3d/wined3d_private.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4d1ce8b..599f449 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2557,7 +2557,8 @@ typedef struct local_constant { DWORD value[4]; } local_constant; -typedef struct SHADER_LIMITS { +struct wined3d_shader_limits +{ unsigned int temporary; unsigned int texcoord; unsigned int sampler; @@ -2569,7 +2570,7 @@ typedef struct SHADER_LIMITS { unsigned int packed_input; unsigned int attributes; unsigned int label; -} SHADER_LIMITS; +}; #ifdef __GNUC__ #define PRINTF_ATTR(fmt,args) __attribute__((format (printf,fmt,args))) @@ -2606,7 +2607,7 @@ struct wined3d_pixel_shader struct wined3d_shader { LONG ref; - SHADER_LIMITS limits; + struct wined3d_shader_limits limits; DWORD *function; UINT functionLength; BOOL load_local_constsF;

1 0

Eric Pouech : kernel32: Added some tests about CON special file treatment in CreateFile.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: fa8d5d166c4dd51de7c363c9928b1f95b36a114a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8d5d166c4dd51de7c363c99… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 10 22:02:26 2011 +0200 kernel32: Added some tests about CON special file treatment in CreateFile. --- dlls/kernel32/tests/console.c | 50 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 15bb838..0cd88a3 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -992,6 +992,55 @@ static void test_GetConsoleProcessList(void) HeapFree(GetProcessHeap(), 0, list); } +static void test_OpenCON(void) +{ + static const WCHAR conW[] = {'C','O','N',0}; + static const DWORD accesses[] = {CREATE_NEW, CREATE_ALWAYS, OPEN_EXISTING, + OPEN_ALWAYS, TRUNCATE_EXISTING}; + unsigned i; + HANDLE h; + + for (i = 0; i < sizeof(accesses) / sizeof(accesses[0]); i++) + { + if (accesses[i] != OPEN_EXISTING) todo_wine { + h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); + CloseHandle(h); + + h = CreateFileW(conW, GENERIC_READ, 0, NULL, accesses[i], 0, NULL); + /* Windows versions differ here: + * MSDN states in CreateFile that TRUNCATE_EXISTING requires GENERIC_WRITE + * NT, XP, Vista comply, but Win7 doesn't and allows to open CON with TRUNCATE_EXISTING + * So don't test when disposition is TRUNCATE_EXISTING + */ + if (accesses[i] != TRUNCATE_EXISTING) + { + ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); + } + CloseHandle(h); + } else { + h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); + ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); + CloseHandle(h); + + h = CreateFileW(conW, GENERIC_READ, 0, NULL, accesses[i], 0, NULL); + /* Windows versions differ here: + * MSDN states in CreateFile that TRUNCATE_EXISTING requires GENERIC_WRITE + * NT, XP, Vista comply, but Win7 doesn't and allows to open CON with TRUNCATE_EXISTING + * So don't test when disposition is TRUNCATE_EXISTING + */ + if (accesses[i] != TRUNCATE_EXISTING) + { + ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); + } + CloseHandle(h); + } + h = CreateFileW(conW, GENERIC_READ|GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); + ok(h == INVALID_HANDLE_VALUE, "Expected not to open the CON device on read-write (%x)\n", accesses[i]); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Unexpected error %x\n", GetLastError()); + } +} + static void test_OpenConsoleW(void) { static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; @@ -2515,6 +2564,7 @@ START_TEST(console) test_GetConsoleProcessList(); test_OpenConsoleW(); + test_OpenCON(); test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle(); test_GetNumberOfConsoleInputEvents(hConIn);

1 0

Eric Pouech : kernel32: In CreateFile, when trying to open the CON special DOS file, force OPEN_EXISTING as creation flag.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 8a529d60e285308023bc56e7300a2a864289ae60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a529d60e285308023bc56e73… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 10 22:02:35 2011 +0200 kernel32: In CreateFile, when trying to open the CON special DOS file, force OPEN_EXISTING as creation flag. --- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/console.c | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 6ee243e..537ea0a 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1322,10 +1322,10 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, switch (access & (GENERIC_READ|GENERIC_WRITE)) { case GENERIC_READ: - ret = OpenConsoleW(coninW, access, (sa && sa->bInheritHandle), creation); + ret = OpenConsoleW(coninW, access, (sa && sa->bInheritHandle), OPEN_EXISTING); goto done; case GENERIC_WRITE: - ret = OpenConsoleW(conoutW, access, (sa && sa->bInheritHandle), creation); + ret = OpenConsoleW(conoutW, access, (sa && sa->bInheritHandle), OPEN_EXISTING); goto done; default: SetLastError( ERROR_FILE_NOT_FOUND ); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 0cd88a3..07a090b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1002,7 +1002,6 @@ static void test_OpenCON(void) for (i = 0; i < sizeof(accesses) / sizeof(accesses[0]); i++) { - if (accesses[i] != OPEN_EXISTING) todo_wine { h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); CloseHandle(h); @@ -1018,23 +1017,6 @@ static void test_OpenCON(void) ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); } CloseHandle(h); - } else { - h = CreateFileW(conW, GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); - ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on write (%x)\n", accesses[i]); - CloseHandle(h); - - h = CreateFileW(conW, GENERIC_READ, 0, NULL, accesses[i], 0, NULL); - /* Windows versions differ here: - * MSDN states in CreateFile that TRUNCATE_EXISTING requires GENERIC_WRITE - * NT, XP, Vista comply, but Win7 doesn't and allows to open CON with TRUNCATE_EXISTING - * So don't test when disposition is TRUNCATE_EXISTING - */ - if (accesses[i] != TRUNCATE_EXISTING) - { - ok(h != INVALID_HANDLE_VALUE, "Expected to open the CON device on read (%x)\n", accesses[i]); - } - CloseHandle(h); - } h = CreateFileW(conW, GENERIC_READ|GENERIC_WRITE, 0, NULL, accesses[i], 0, NULL); ok(h == INVALID_HANDLE_VALUE, "Expected not to open the CON device on read-write (%x)\n", accesses[i]); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Unexpected error %x\n", GetLastError());

1 0

Paul Chitescu : qcap: Initialize to NULL the content of ppPin, not the pointer itself.
by Alexandre Julliard 11 May '11

11 May '11

Module: wine Branch: master Commit: 84a39b4f636fe84d0470ac60b4182b384842c971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a39b4f636fe84d0470ac60b… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed May 11 04:45:59 2011 +0300 qcap: Initialize to NULL the content of ppPin, not the pointer itself. --- dlls/qcap/vfwcapture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 8997480..1138a64 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -726,7 +726,7 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, PIN_INFO piOutput; HRESULT hr; - ppPin = NULL; + *ppPin = NULL; piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = pBaseFilter;

1 0