September 2007 - Wine-Commits

Dmitry Timoshkov : kernel32: Print last error in failure messages of the MapViewOfFile test.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 808d38fdb61877b2aa1bc1951ae030c46c33282b URL: http://source.winehq.org/git/wine.git/?a=commit;h=808d38fdb61877b2aa1bc1951… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 20 19:09:48 2007 +0900 kernel32: Print last error in failure messages of the MapViewOfFile test. --- dlls/kernel32/tests/virtual.c | 73 +++++++++++++++++++++++++++++----------- 1 files changed, 53 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 5bfa3e9..78c5643 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -272,52 +272,63 @@ static void test_MapViewOfFile(void) HANDLE file, mapping; void *ptr; + SetLastError(0xdeadbeef); file = CreateFileA( testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); - ok( file != INVALID_HANDLE_VALUE, "Failed to create test file\n" ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); SetFilePointer( file, 4096, NULL, FILE_BEGIN ); SetEndOfFile( file ); /* read/write mapping */ + SetLastError(0xdeadbeef); mapping = CreateFileMappingA( file, NULL, PAGE_READWRITE, 0, 4096, NULL ); - ok( mapping != 0, "CreateFileMapping failed\n" ); + ok( mapping != 0, "CreateFileMapping error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4096 ); - ok( ptr != NULL, "MapViewOfFile FILE_MAPE_READ failed\n" ); + ok( ptr != NULL, "MapViewOfFile FILE_MAPE_READ error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); /* this fails on win9x but succeeds on NT */ + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_COPY, 0, 0, 4096 ); if (ptr) UnmapViewOfFile( ptr ); else ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, 0, 0, 0, 4096 ); - ok( ptr != NULL, "MapViewOfFile 0 failed\n" ); + ok( ptr != NULL, "MapViewOfFile 0 error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 4096 ); - ok( ptr != NULL, "MapViewOfFile FILE_MAP_WRITE failed\n" ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_WRITE error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); CloseHandle( mapping ); /* read-only mapping */ + SetLastError(0xdeadbeef); mapping = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 4096, NULL ); - ok( mapping != 0, "CreateFileMapping failed\n" ); + ok( mapping != 0, "CreateFileMapping error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4096 ); - ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ failed\n" ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); /* this fails on win9x but succeeds on NT */ + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_COPY, 0, 0, 4096 ); if (ptr) UnmapViewOfFile( ptr ); else ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, 0, 0, 0, 4096 ); - ok( ptr != NULL, "MapViewOfFile 0 failed\n" ); + ok( ptr != NULL, "MapViewOfFile 0 error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 4096 ); ok( !ptr, "MapViewOfFile FILE_MAP_WRITE succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER || @@ -326,21 +337,26 @@ static void test_MapViewOfFile(void) /* copy-on-write mapping */ + SetLastError(0xdeadbeef); mapping = CreateFileMappingA( file, NULL, PAGE_WRITECOPY, 0, 4096, NULL ); - ok( mapping != 0, "CreateFileMapping failed\n" ); + ok( mapping != 0, "CreateFileMapping error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4096 ); - ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ failed\n" ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_COPY, 0, 0, 4096 ); - ok( ptr != NULL, "MapViewOfFile FILE_MAP_COPY failed\n" ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_COPY error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, 0, 0, 0, 4096 ); - ok( ptr != NULL, "MapViewOfFile 0 failed\n" ); + ok( ptr != NULL, "MapViewOfFile 0 error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 4096 ); ok( !ptr, "MapViewOfFile FILE_MAP_WRITE succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER || @@ -349,23 +365,28 @@ static void test_MapViewOfFile(void) /* no access mapping */ + SetLastError(0xdeadbeef); mapping = CreateFileMappingA( file, NULL, PAGE_NOACCESS, 0, 4096, NULL ); /* fails on NT but succeeds on win9x */ if (!mapping) ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %d\n", GetLastError() ); else { + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4096 ); - ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ failed\n" ); + ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_COPY, 0, 0, 4096 ); ok( !ptr, "MapViewOfFile FILE_MAP_COPY succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, 0, 0, 0, 4096 ); - ok( ptr != NULL, "MapViewOfFile 0 failed\n" ); + ok( ptr != NULL, "MapViewOfFile 0 error %u\n", GetLastError() ); UnmapViewOfFile( ptr ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 4096 ); ok( !ptr, "MapViewOfFile FILE_MAP_WRITE succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "Wrong error %d\n", GetLastError() ); @@ -377,38 +398,46 @@ static void test_MapViewOfFile(void) /* now try read-only file */ + SetLastError(0xdeadbeef); file = CreateFileA( testfile, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 ); - ok( file != INVALID_HANDLE_VALUE, "Failed to create test file\n" ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); mapping = CreateFileMappingA( file, NULL, PAGE_READWRITE, 0, 4096, NULL ); ok( !mapping, "CreateFileMapping PAGE_READWRITE succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); mapping = CreateFileMappingA( file, NULL, PAGE_WRITECOPY, 0, 4096, NULL ); - ok( mapping != 0, "CreateFileMapping PAGE_WRITECOPY failed\n" ); + ok( mapping != 0, "CreateFileMapping PAGE_WRITECOPY error %u\n", GetLastError() ); CloseHandle( mapping ); + SetLastError(0xdeadbeef); mapping = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 4096, NULL ); - ok( mapping != 0, "CreateFileMapping PAGE_READONLY failed\n" ); + ok( mapping != 0, "CreateFileMapping PAGE_READONLY error %u\n", GetLastError() ); CloseHandle( mapping ); CloseHandle( file ); /* now try no access file */ + SetLastError(0xdeadbeef); file = CreateFileA( testfile, 0, 0, NULL, OPEN_EXISTING, 0, 0 ); - ok( file != INVALID_HANDLE_VALUE, "Failed to create test file\n" ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); mapping = CreateFileMappingA( file, NULL, PAGE_READWRITE, 0, 4096, NULL ); ok( !mapping, "CreateFileMapping PAGE_READWRITE succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); mapping = CreateFileMappingA( file, NULL, PAGE_WRITECOPY, 0, 4096, NULL ); ok( !mapping, "CreateFileMapping PAGE_WRITECOPY succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); mapping = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 4096, NULL ); ok( !mapping, "CreateFileMapping PAGE_READONLY succeeded\n" ); ok( GetLastError() == ERROR_INVALID_PARAMETER || @@ -417,13 +446,17 @@ static void test_MapViewOfFile(void) CloseHandle( file ); DeleteFileA( testfile ); + SetLastError(0xdeadbeef); file = CreateFileMapping( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "Global\\Foo"); - ok( file != 0, "CreateFileMapping PAGE_READWRITE failed\n" ); + ok( file != 0, "CreateFileMapping PAGE_READWRITE error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); mapping = OpenFileMapping( FILE_MAP_READ, FALSE, "Global\\Foo" ); - ok( mapping != 0, "OpenFileMapping FILE_MAP_READ failed\n" ); + ok( mapping != 0, "OpenFileMapping FILE_MAP_READ error %u\n", GetLastError() ); + SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); todo_wine ok( !ptr, "MapViewOfFile FILE_MAP_WRITE should fail\n" ); +todo_wine ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); CloseHandle( mapping ); CloseHandle( file );

1 0

Dan Hipschman : widl: Handle top-level conformance for complex arrays.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 767a1f26f6249b485a6aa09467ac1d45174214c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=767a1f26f6249b485a6aa0946… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 19 17:05:38 2007 -0700 widl: Handle top-level conformance for complex arrays. --- dlls/rpcrt4/tests/server.c | 15 +++++++++++++++ dlls/rpcrt4/tests/server.idl | 1 + tools/widl/typegen.c | 34 +++++++++++++++++++--------------- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 031714f..cdec58b 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -357,6 +357,16 @@ s_sum_padded2(padded_t ps[2]) } int +s_sum_padded_conf(padded_t *ps, int n) +{ + int sum = 0; + int i; + for (i = 0; i < n; ++i) + sum += s_sum_padded(&ps[i]); + return sum; +} + +int s_sum_bogus(bogus_t *b) { return *b->h.p1 + *b->p2 + *b->p3 + b->c; @@ -501,6 +511,11 @@ basic_tests(void) padded2[1].i = 3; padded2[1].c = 7; ok(sum_padded2(padded2) == 6, "RPC sum_padded2\n"); + padded2[0].i = -5; + padded2[0].c = 1; + padded2[1].i = 3; + padded2[1].c = 7; + ok(sum_padded_conf(padded2, 2) == 6, "RPC sum_padded_conf\n"); i1 = 14; i2 = -7; diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 9f66fe7..cadd1df 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -208,6 +208,7 @@ interface IServer int sum_padded(padded_t *p); int sum_padded2(padded_t ps[2]); + int sum_padded_conf([size_is(n)] padded_t *ps, int n); typedef struct { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 84efe96..288de10 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2580,11 +2580,9 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func, else if (is_array(type)) { unsigned char tc = type->type; - const char *array_type; + const char *array_type = "FixedArray"; - if (tc == RPC_FC_SMFARRAY || tc == RPC_FC_LGFARRAY) - array_type = "FixedArray"; - else if (tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY) + if (tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY) { if (is_size_needed_for_phase(phase)) { @@ -2605,22 +2603,28 @@ void write_remoting_arguments(FILE *file, int indent, const func_t *func, } array_type = "ConformantArray"; } - else if (tc == RPC_FC_CVARRAY) + else if (tc == RPC_FC_CVARRAY || tc == RPC_FC_BOGUS_ARRAY) { if (is_size_needed_for_phase(phase)) { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1); - fprintf(file, ";\n"); - print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ - print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); - write_expr(file, type->length_is, 1); - fprintf(file, ";\n\n"); + if (type->size_is) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, type->size_is, 1); + fprintf(file, ";\n"); + } + if (type->length_is) + { + print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ + print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); + write_expr(file, type->length_is, 1); + fprintf(file, ";\n\n"); + } } - array_type = "ConformantVaryingArray"; + array_type = (tc == RPC_FC_BOGUS_ARRAY + ? "ComplexArray" + : "ConformantVaryingArray"); } - else - array_type = "ComplexArray"; if (!in_attr && phase == PHASE_FREE) {

1 0

Dan Hipschman : widl: Respect pointer attributes better.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: dbfabf68a2c36a554c44589b55ef0dbab24ef4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbfabf68a2c36a554c44589b5… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 19 17:04:49 2007 -0700 widl: Respect pointer attributes better. --- dlls/rpcrt4/tests/server.c | 8 ++++++++ dlls/rpcrt4/tests/server.idl | 1 + tools/widl/parser.y | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 40f9a81..031714f 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -363,6 +363,12 @@ s_sum_bogus(bogus_t *b) } void +s_check_null(int *null) +{ + ok(!null, "RPC check_null\n"); +} + +void s_stop(void) { ok(RPC_S_OK == RpcMgmtStopServerListening(NULL), "RpcMgmtStopServerListening\n"); @@ -504,6 +510,8 @@ basic_tests(void) bogus.p3 = &i3; bogus.c = 9; ok(sum_bogus(&bogus) == 12, "RPC sum_bogus\n"); + + check_null(NULL); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 23ca779..9f66fe7 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -223,6 +223,7 @@ interface IServer } bogus_t; int sum_bogus(bogus_t *b); + void check_null([unique] int *null); void stop(void); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 46fb439..17dd700 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1266,6 +1266,7 @@ static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr) { expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS); expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS); + int ptr_type = get_attrv(v->attrs, ATTR_POINTERTYPE); int sizeless, has_varconf; expr_t *dim; type_t *atype, **ptype; @@ -1273,7 +1274,25 @@ static void set_type(var_t *v, type_t *type, int ptr_level, array_dims_t *arr) v->type = type; for ( ; 0 < ptr_level; --ptr_level) + { v->type = make_type(RPC_FC_RP, v->type); + if (ptr_level == 1 && ptr_type && !arr) + { + v->type->type = ptr_type; + ptr_type = 0; + } + } + + if (ptr_type) + { + if (is_ptr(v->type)) + { + v->type = duptype(v->type, 1); + v->type->type = ptr_type; + } + else if (!arr) + error("%s: pointer attribute applied to non-pointer type", v->name); + } sizeless = FALSE; if (arr) LIST_FOR_EACH_ENTRY_REV(dim, arr, expr_t, entry)

1 0

Stefan Dösinger : wined3d: Keep the selected stencil setup face set to GL_FRONT.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 05cef43308e72c6a507c9a6cc5b491c58e1760d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05cef43308e72c6a507c9a6cc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 14 12:07:48 2007 +0200 wined3d: Keep the selected stencil setup face set to GL_FRONT. --- dlls/wined3d/state.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 77b728e..fbd95ed 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -692,8 +692,14 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *c glEnable(GL_STENCIL_TEST); checkGLcall("glEnable GL_STENCIL_TEST"); - renderstate_stencil_twosided(stateblock, GL_FRONT, func, ref, mask, stencilFail, depthFail, stencilPass); + /* Apply back first, then front. This function calls glActiveStencilFaceEXT, + * which has an effect on the code below too. If we apply the front face + * afterwards, we are sure that the active stencil face is set to front, + * and other stencil functions which do not use two sided stencil do not have + * to set it back + */ renderstate_stencil_twosided(stateblock, GL_BACK, func_ccw, ref, mask, stencilFail_ccw, depthFail_ccw, stencilPass_ccw); + renderstate_stencil_twosided(stateblock, GL_FRONT, func, ref, mask, stencilFail, depthFail, stencilPass); } else if(onesided_enable) { if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT);

1 0

Dan Hipschman : widl: Set the pointer description offset to zero if there are no pointers.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 33da66d6c8c829ded8059dd3aeb1549081d76c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33da66d6c8c829ded8059dd3a… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Sep 19 17:04:09 2007 -0700 widl: Set the pointer description offset to zero if there are no pointers. --- tools/widl/typegen.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6625bda..84efe96 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1677,9 +1677,10 @@ static size_t write_struct_tfs(FILE *file, type_t *type, /* On the sizing pass, type->ptrdesc may be zero, but it's ok as nothing is written to file yet. On the actual writing pass, this will have been updated. */ - short reloff = type->ptrdesc - *tfsoff; + unsigned int absoff = type->ptrdesc ? type->ptrdesc : *tfsoff; + short reloff = absoff - *tfsoff; print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", - reloff, reloff, type->ptrdesc); + reloff, reloff, absoff); *tfsoff += 2; } else if ((type->type == RPC_FC_PSTRUCT) || @@ -1708,6 +1709,8 @@ static size_t write_struct_tfs(FILE *file, type_t *type, if (is_ptr(ft)) write_pointer_tfs(file, ft, tfsoff); } + if (type->ptrdesc == *tfsoff) + type->ptrdesc = 0; } current_structure = save_current_structure;

1 0

Juan Lang : setupapi: Add error checking to SetupDiCreateDeviceInfoW stub.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 1bbfd72afbda1e1b953ac6fef7a396ba5b518209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bbfd72afbda1e1b953ac6fef… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 19 17:49:17 2007 -0700 setupapi: Add error checking to SetupDiCreateDeviceInfoW stub. --- dlls/setupapi/devinst.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/setupapi/tests/devinst.c | 3 --- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e567670..a1c27dd 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -752,13 +752,50 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( DWORD CreationFlags, PSP_DEVINFO_DATA DeviceInfoData) { + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + BOOL ret = FALSE; + TRACE("%p %s %s %s %p %x %p\n", DeviceInfoSet, debugstr_w(DeviceName), debugstr_guid(ClassGuid), debugstr_w(DeviceDescription), hwndParent, CreationFlags, DeviceInfoData); - FIXME("stub\n"); + if (!DeviceName) + { + SetLastError(ERROR_INVALID_DEVINST_NAME); + return FALSE; + } + if (!DeviceInfoSet || DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (!ClassGuid) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (set->magic == SETUP_DEVICE_INFO_SET_MAGIC) + { + if (IsEqualGUID(&set->ClassGuid, &GUID_NULL) || + IsEqualGUID(ClassGuid, &set->ClassGuid)) + ret = TRUE; + else + SetLastError(ERROR_CLASS_MISMATCH); + if ((CreationFlags & DICD_GENERATE_ID) && strchrW(DeviceName, '\\')) + { + SetLastError(ERROR_INVALID_DEVINST_NAME); + ret = FALSE; + } + if (ret) + { + FIXME("stub\n"); + ret = FALSE; + } + } + else + SetLastError(ERROR_INVALID_HANDLE); - return FALSE; + return ret; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index e8fdc33..05d42d8 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -146,13 +146,11 @@ static void testCreateDeviceInfo(void) } SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInfoA(NULL, NULL, NULL, NULL, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_DEVINST_NAME, "Expected ERROR_INVALID_DEVINST_NAME, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInfoA(NULL, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLEHANDLE, got %08x\n", GetLastError()); set = pSetupDiCreateDeviceInfoList(&guid, NULL); @@ -166,7 +164,6 @@ static void testCreateDeviceInfo(void) SetLastError(0xdeadbeef); ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); /* Finally, with all three required parameters, this succeeds: */

1 0

Juan Lang : setupapi: Implement SetupDiGetDeviceInstanceIdA on top of SetupDiGetDeviceInstanceIdW .
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: c1ccd65792cc003bcac08d5ceeaac17b80447919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ccd65792cc003bcac08d5ce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 19 17:47:52 2007 -0700 setupapi: Implement SetupDiGetDeviceInstanceIdA on top of SetupDiGetDeviceInstanceIdW. --- dlls/setupapi/devinst.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index d1e9642..e567670 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -813,9 +813,42 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdA( DWORD DeviceInstanceIdSize, PDWORD RequiredSize) { - FIXME("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, + BOOL ret = FALSE; + DWORD size; + PWSTR instanceId; + + TRACE("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); - return FALSE; + + SetupDiGetDeviceInstanceIdW(DeviceInfoSet, + DeviceInfoData, + NULL, + 0, + &size); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return FALSE; + instanceId = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (instanceId) + { + ret = SetupDiGetDeviceInstanceIdW(DeviceInfoSet, + DeviceInfoData, + instanceId, + size, + &size); + if (ret) + { + int len = WideCharToMultiByte(CP_ACP, 0, instanceId, -1, + DeviceInstanceId, + DeviceInstanceIdSize, NULL, NULL); + + if (!len) + ret = FALSE; + else if (RequiredSize) + *RequiredSize = len; + } + HeapFree(GetProcessHeap(), 0, instanceId); + } + return ret; } /*********************************************************************** @@ -830,6 +863,7 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW( { FIXME("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }

1 0

Juan Lang : setupapi: Implement SetupDiEnumDeviceInfo.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: 634cba84d2fc548594276a26d672e4117a527956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=634cba84d2fc548594276a26d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 19 17:46:58 2007 -0700 setupapi: Implement SetupDiEnumDeviceInfo. --- dlls/setupapi/devinst.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 414aa18..d1e9642 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -769,15 +769,38 @@ BOOL WINAPI SetupDiEnumDeviceInfo( DWORD index, PSP_DEVINFO_DATA info) { - FIXME("%p %d %p\n", devinfo, index, info); + BOOL ret = FALSE; + + TRACE("%p %d %p\n", devinfo, index, info); if(info==NULL) return FALSE; if(info->cbSize < sizeof(*info)) return FALSE; - - SetLastError(ERROR_NO_MORE_ITEMS); - return FALSE; + if (devinfo && devinfo != (HDEVINFO)INVALID_HANDLE_VALUE) + { + struct DeviceInfoSet *list = (struct DeviceInfoSet *)devinfo; + if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC) + { + if (index < list->cDevices) + { + if (info->cbSize == sizeof(SP_DEVINFO_DATA)) + { + memcpy(info, &list->devices[index], info->cbSize); + ret = TRUE; + } + else + SetLastError(ERROR_INVALID_USER_BUFFER); + } + else + SetLastError(ERROR_NO_MORE_ITEMS); + } + else + SetLastError(ERROR_INVALID_HANDLE); + } + else + SetLastError(ERROR_INVALID_HANDLE); + return ret; } /***********************************************************************

1 0

Juan Lang : setupapi: Add tests for SetupDiGetDeviceInstanceId.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: e481b1eaee50b86071bcafffbebb746418e86fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e481b1eaee50b86071bcafffb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 19 17:46:11 2007 -0700 setupapi: Add tests for SetupDiGetDeviceInstanceId. --- dlls/setupapi/tests/devinst.c | 87 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index b922f4a..e8fdc33 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -39,6 +39,7 @@ static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DATA); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); static BOOL (WINAPI *pSetupDiCreateDeviceInfoA)(HDEVINFO, PCSTR, GUID *, PCSTR, HWND, DWORD, PSP_DEVINFO_DATA); +static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DATA, PSTR, DWORD, PDWORD); static void init_function_pointers(void) { @@ -49,6 +50,7 @@ static void init_function_pointers(void) pSetupDiCreateDeviceInfoListExW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDeviceInfoListExW"); pSetupDiDestroyDeviceInfoList = (void *)GetProcAddress(hSetupAPI, "SetupDiDestroyDeviceInfoList"); pSetupDiEnumDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInfo"); + pSetupDiGetDeviceInstanceIdA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInstanceIdA"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); } @@ -207,6 +209,90 @@ static void testCreateDeviceInfo(void) } } +static void testGetDeviceInstanceId(void) +{ + BOOL ret; + HDEVINFO set; + GUID guid = {0x6a55b5a4, 0x3f65, 0x11db, {0xb7,0x04, + 0x00,0x11,0x95,0x5c,0x2b,0xdb}}; + SP_DEVINFO_DATA devInfo = { 0 }; + + if (!pSetupDiCreateDeviceInfoList || !pSetupDiDestroyDeviceInfoList || + !pSetupDiCreateDeviceInfoA || !pSetupDiGetDeviceInstanceIdA) + { + skip("No SetupDiGetDeviceInstanceIdA\n"); + return; + } + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInstanceIdA(NULL, NULL, NULL, 0, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLEHANDLE, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInstanceIdA(NULL, &devInfo, NULL, 0, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLEHANDLE, got %08x\n", GetLastError()); + set = pSetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %08x\n", + GetLastError()); + if (set) + { + char instanceID[MAX_PATH]; + DWORD size; + + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInstanceIdA(set, NULL, NULL, 0, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + devInfo.cbSize = sizeof(devInfo); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + ret = pSetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, + NULL, NULL, 0, &devInfo); + todo_wine + ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, NULL, 0, &size); + todo_wine + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %08x\n", GetLastError()); + ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, instanceID, + sizeof(instanceID), NULL); + todo_wine + ok(ret, "SetupDiGetDeviceInstanceIdA failed: %08x\n", GetLastError()); + todo_wine + ok(!lstrcmpA(instanceID, "ROOT\\LEGACY_BOGUS\\0000"), + "Unexpected instance ID %s\n", instanceID); + ret = pSetupDiCreateDeviceInfoA(set, "LEGACY_BOGUS", &guid, + NULL, NULL, DICD_GENERATE_ID, &devInfo); + todo_wine + ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + ret = pSetupDiGetDeviceInstanceIdA(set, &devInfo, instanceID, + sizeof(instanceID), NULL); + todo_wine + ok(ret, "SetupDiGetDeviceInstanceIdA failed: %08x\n", GetLastError()); + todo_wine + ok(!lstrcmpA(instanceID, "ROOT\\LEGACY_BOGUS\\0001"), + "Unexpected instance ID %s\n", instanceID); + pSetupDiDestroyDeviceInfoList(set); + } +} + START_TEST(devinst) { init_function_pointers(); @@ -221,4 +307,5 @@ START_TEST(devinst) else skip("SetupDiOpenClassRegKeyExA is not available\n"); testCreateDeviceInfo(); + testGetDeviceInstanceId(); }

1 0

Juan Lang : setupapi: Add a placeholder for devices.
by Alexandre Julliard Sept. 20, 2007

Sept. 20, 2007

Module: wine Branch: master Commit: a7ad54ef9243a618a55dbaf8815363aa62da3e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ad54ef9243a618a55dbaf88… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 19 17:46:29 2007 -0700 setupapi: Add a placeholder for devices. --- dlls/setupapi/devinst.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 32fc3fa..414aa18 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -77,6 +77,8 @@ struct DeviceInfoSet DWORD magic; /* if is equal to SETUP_DEVICE_INFO_SET_MAGIC struct is okay */ GUID ClassGuid; HWND hwndParent; + DWORD cDevices; + SP_DEVINFO_DATA *devices; }; /*********************************************************************** @@ -692,6 +694,8 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, memcpy(&list->ClassGuid, ClassGuid ? ClassGuid : &GUID_NULL, sizeof(list->ClassGuid)); + list->cDevices = 0; + list->devices = NULL; return (HDEVINFO)list; } @@ -1113,6 +1117,7 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) if (list->magic == SETUP_DEVICE_INFO_SET_MAGIC) { + HeapFree(GetProcessHeap(), 0, list->devices); HeapFree(GetProcessHeap(), 0, list); ret = TRUE; }

1 0