October 2012 - Wine-commits

Hans Leidekker : wbemprox: Implement Win32_Processor.UniqueId.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 4d0a1588084d4dbf7a8032dd122d1ef15e1ceef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d0a1588084d4dbf7a8032dd1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 4 15:37:57 2012 +0200 wbemprox: Implement Win32_Processor.UniqueId. --- dlls/wbemprox/builtin.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7c7cf24..13c96b8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -182,6 +182,8 @@ static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_typeW[] = {'T','y','p','e',0}; +static const WCHAR prop_uniqueidW[] = + {'U','n','i','q','u','e','I','d',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; @@ -290,7 +292,8 @@ static const struct column col_processor[] = { prop_maxclockspeedW, CIM_UINT32, VT_I4 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, - { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_uniqueidW, CIM_STRING } }; static const struct column col_service[] = { @@ -462,6 +465,7 @@ struct record_processor const WCHAR *name; UINT32 num_logical_processors; const WCHAR *processor_id; + const WCHAR *unique_id; }; struct record_service { @@ -898,6 +902,7 @@ static void fill_processor( struct table *table ) rec->name = heap_strdupW( name ); rec->num_logical_processors = num_logical_processors; rec->processor_id = heap_strdupW( processor_id ); + rec->unique_id = NULL; offset += sizeof(*rec); }

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.Manufacturer.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: fe695f3ef9e60fe493269e3a6d9f8791bb9df703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe695f3ef9e60fe493269e3a6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 4 15:38:18 2012 +0200 wbemprox: Implement Win32_NetworkAdapter.Manufacturer. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 13c96b8..9beb3e2 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -252,6 +252,7 @@ static const struct column col_networkadapter[] = { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_manufacturerW, CIM_STRING }, { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } @@ -424,6 +425,7 @@ struct record_networkadapter const WCHAR *device_id; INT32 interface_index; const WCHAR *mac_address; + const WCHAR *manufacturer; UINT16 netconnection_status; const WCHAR *pnpdevice_id; UINT64 speed; @@ -741,6 +743,7 @@ static void fill_networkadapter( struct table *table ) rec->device_id = heap_strdupW( device_id ); rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + rec->manufacturer = compsys_manufacturerW; rec->netconnection_status = get_connection_status( aa->OperStatus ); rec->pnpdevice_id = networkadapter_pnpdeviceidW; rec->speed = 1000000;

1 0

Christian Costa : advapi32: Add stub for StopTraceA and StopTraceW.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: ed976838cba20f9e2b2a5f7f80f6a6e90cf81fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed976838cba20f9e2b2a5f7f8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 3 23:43:54 2012 +0200 advapi32: Add stub for StopTraceA and StopTraceW. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 732bf04..0cb3e15 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -727,8 +727,8 @@ @ stdcall StartServiceW(long long ptr) @ stdcall StartTraceA(ptr str ptr) @ stdcall StartTraceW(ptr wstr ptr) -# @ stub StopTraceA -# @ stub StopTraceW +@ stdcall StopTraceA(int64 str ptr) +@ stdcall StopTraceW(int64 wstr ptr) @ stdcall SynchronizeWindows31FilesAndWindowsNTRegistry(long long long long) @ stdcall SystemFunction001(ptr ptr ptr) @ stdcall SystemFunction002(ptr ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 09ffa8b..38c533a 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -795,6 +795,30 @@ ULONG WINAPI StartTraceA( PTRACEHANDLE pSessionHandle, LPCSTR SessionName, PEVEN } /****************************************************************************** + * StopTraceW [ADVAPI32.@] + * + * Stop an event trace session + * + */ +ULONG WINAPI StopTraceW( TRACEHANDLE session, LPCWSTR session_name, PEVENT_TRACE_PROPERTIES properties ) +{ + FIXME("(%s, %s, %p) stub\n", wine_dbgstr_longlong(session), debugstr_w(session_name), properties); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * StopTraceA [ADVAPI32.@] + * + * See StopTraceW. + * + */ +ULONG WINAPI StopTraceA( TRACEHANDLE session, LPCSTR session_name, PEVENT_TRACE_PROPERTIES properties ) +{ + FIXME("(%s, %s, %p) stub\n", wine_dbgstr_longlong(session), debugstr_a(session_name), properties); + return ERROR_SUCCESS; +} + +/****************************************************************************** * TraceEvent [ADVAPI32.@] */ ULONG WINAPI TraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTrace )

1 0

André Hentschel : winedbg: Reorder disassembler functions to match instruction table order.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 523ca37f1183d09310ab82e969a2b1969b15e343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523ca37f1183d09310ab82e96… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 21:26:30 2012 +0200 winedbg: Reorder disassembler functions to match instruction table order. --- programs/winedbg/be_arm.c | 148 ++++++++++++++++++++++----------------------- 1 files changed, 72 insertions(+), 76 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 2cb126d..bad74d0 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -183,6 +183,39 @@ static UINT arm_disasm_swp(UINT inst, ADDRESS64 *addr) return 0; } +static UINT arm_disasm_halfwordtrans(UINT inst, ADDRESS64 *addr) +{ + short halfword = (inst >> 5) & 0x01; + short sign = (inst >> 6) & 0x01; + short load = (inst >> 20) & 0x01; + short writeback = (inst >> 21) & 0x01; + short immediate = (inst >> 22) & 0x01; + short direction = (inst >> 23) & 0x01; + short indexing = (inst >> 24) & 0x01; + short offset = ((inst >> 4) & 0xf0) + (inst & 0x0f); + + if (!direction) offset *= -1; + + dbg_printf("\n\t%s%s%s%s%s", load ? "ldr" : "str", sign ? "s" : "", + halfword ? "h" : (sign ? "b" : ""), writeback ? "t" : "", get_cond(inst)); + dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); + if (indexing) + { + if (immediate) + dbg_printf("[%s, #%d]", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("[%s, %s]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + } + else + { + if (immediate) + dbg_printf("[%s], #%d", tbl_regs[get_nibble(inst, 4)], offset); + else + dbg_printf("[%s], %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); + } + return 0; +} + static UINT arm_disasm_branchreg(UINT inst, ADDRESS64 *addr) { dbg_printf("\n\tb%s\t%s", get_cond(inst), tbl_regs[get_nibble(inst, 0)]); @@ -317,39 +350,6 @@ static UINT arm_disasm_singletrans(UINT inst, ADDRESS64 *addr) return 0; } -static UINT arm_disasm_halfwordtrans(UINT inst, ADDRESS64 *addr) -{ - short halfword = (inst >> 5) & 0x01; - short sign = (inst >> 6) & 0x01; - short load = (inst >> 20) & 0x01; - short writeback = (inst >> 21) & 0x01; - short immediate = (inst >> 22) & 0x01; - short direction = (inst >> 23) & 0x01; - short indexing = (inst >> 24) & 0x01; - short offset = ((inst >> 4) & 0xf0) + (inst & 0x0f); - - if (!direction) offset *= -1; - - dbg_printf("\n\t%s%s%s%s%s", load ? "ldr" : "str", sign ? "s" : "", - halfword ? "h" : (sign ? "b" : ""), writeback ? "t" : "", get_cond(inst)); - dbg_printf("\t%s, ", tbl_regs[get_nibble(inst, 3)]); - if (indexing) - { - if (immediate) - dbg_printf("[%s, #%d]", tbl_regs[get_nibble(inst, 4)], offset); - else - dbg_printf("[%s, %s]", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); - } - else - { - if (immediate) - dbg_printf("[%s], #%d", tbl_regs[get_nibble(inst, 4)], offset); - else - dbg_printf("[%s], %s", tbl_regs[get_nibble(inst, 4)], tbl_regs[get_nibble(inst, 0)]); - } - return 0; -} - static UINT arm_disasm_blocktrans(UINT inst, ADDRESS64 *addr) { short load = (inst >> 20) & 0x01; @@ -379,8 +379,7 @@ static UINT arm_disasm_blocktrans(UINT inst, ADDRESS64 *addr) static UINT arm_disasm_swi(UINT inst, ADDRESS64 *addr) { - UINT comment = inst & 0x00ffffff; - dbg_printf("\n\tswi%s\t#%d", get_cond(inst), comment); + dbg_printf("\n\tswi%s\t#%d", get_cond(inst), inst & 0x00ffffff); return 0; } @@ -518,6 +517,12 @@ static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_swi(WORD inst, ADDRESS64 *addr) +{ + dbg_printf("\n\tswi\t#%d", inst & 0x00ff); + return 0; +} + static WORD thumb_disasm_condbranch(WORD inst, ADDRESS64 *addr) { WORD offset = inst & 0x00ff; @@ -547,19 +552,6 @@ static WORD thumb_disasm_loadadr(WORD inst, ADDRESS64 *addr) return 0; } -static WORD thumb_disasm_swi(WORD inst, ADDRESS64 *addr) -{ - WORD comment = inst & 0x00ff; - dbg_printf("\n\tswi\t#%d", comment); - return 0; -} - -static WORD thumb_disasm_nop(WORD inst, ADDRESS64 *addr) -{ - dbg_printf("\n\tnop"); - return 0; -} - static WORD thumb_disasm_ldrpcrel(WORD inst, ADDRESS64 *addr) { WORD offset = (inst & 0xff) << 2; @@ -621,6 +613,12 @@ static WORD thumb_disasm_immop(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_nop(WORD inst, ADDRESS64 *addr) +{ + dbg_printf("\n\tnop"); + return 0; +} + static WORD thumb_disasm_addsub(WORD inst, ADDRESS64 *addr) { WORD op = (inst >> 9) & 0x01; @@ -643,33 +641,6 @@ static WORD thumb_disasm_movshift(WORD inst, ADDRESS64 *addr) return 0; } -static UINT thumb2_disasm_branch(UINT inst, ADDRESS64 *addr) -{ - UINT S = (inst >> 26) & 0x01; - UINT L = (inst >> 14) & 0x01; - UINT I1 = !(((inst >> 13) & 0x01) ^ S); - UINT C = !((inst >> 12) & 0x01); - UINT I2 = !(((inst >> 11) & 0x01) ^ S); - UINT offset = (inst & 0x000007ff) << 1; - - if (C) - { - offset |= I1 << 19 | I2 << 18 | (inst & 0x003f0000) >> 4; - offset += 4; - if (S) offset |= 0x0fff << 20; - } - else - { - offset |= I1 << 23 | I2 << 22 | (inst & 0x03ff0000) >> 4; - offset += 4; - if (S) offset |= 0xff << 24; - } - - dbg_printf("\n\tb%s%s\t", L ? "l" : "", C ? tbl_cond[(inst >> 22) & 0x0f] : ""); - db_printsym(addr->Offset + offset); - return 0; -} - static UINT thumb2_disasm_srtrans(UINT inst, ADDRESS64 *addr) { UINT fromsr = (inst >> 21) & 0x03; @@ -737,6 +708,31 @@ static UINT thumb2_disasm_miscctrl(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_branch(UINT inst, ADDRESS64 *addr) +{ + UINT S = (inst >> 26) & 0x01; + UINT L = (inst >> 14) & 0x01; + UINT I1 = !(((inst >> 13) & 0x01) ^ S); + UINT C = !((inst >> 12) & 0x01); + UINT I2 = !(((inst >> 11) & 0x01) ^ S); + UINT offset = (inst & 0x000007ff) << 1; + + if (C) + { + offset |= I1 << 19 | I2 << 18 | (inst & 0x003f0000) >> 4; + if (S) offset |= 0x0fff << 20; + } + else + { + offset |= I1 << 23 | I2 << 22 | (inst & 0x03ff0000) >> 4; + if (S) offset |= 0xff << 24; + } + + dbg_printf("\n\tb%s%s\t", L ? "l" : "", C ? tbl_cond[(inst >> 22) & 0x0f] : ""); + db_printsym(addr->Offset + offset + 4); + return 0; +} + static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) { WORD op1 = (inst >> 20) & 0x03; @@ -1078,6 +1074,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { { 0xfc00, 0x4000, thumb_disasm_aluop }, { 0xf600, 0xb400, thumb_disasm_pushpop }, { 0xf000, 0xc000, thumb_disasm_blocktrans }, + { 0xff00, 0xdf00, thumb_disasm_swi }, { 0xf000, 0xd000, thumb_disasm_condbranch }, { 0xf800, 0xe000, thumb_disasm_uncondbranch }, { 0xf000, 0xa000, thumb_disasm_loadadr }, @@ -1089,7 +1086,6 @@ static const struct inst_thumb16 tbl_thumb16[] = { { 0xf200, 0x5000, thumb_disasm_ldrreg }, { 0xf200, 0x5200, thumb_disasm_ldrsreg }, { 0xe000, 0x2000, thumb_disasm_immop }, - { 0xff00, 0xdf00, thumb_disasm_swi }, { 0xff00, 0xbf00, thumb_disasm_nop }, { 0xf800, 0x1800, thumb_disasm_addsub }, { 0xe000, 0x0000, thumb_disasm_movshift },

1 0

Francois Gouget : oledb32/tests: Make test_database() static.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 6be0dd10de874fea9958606716677db69cae71b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be0dd10de874fea995860671… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 4 09:44:43 2012 +0200 oledb32/tests: Make test_database() static. --- dlls/oledb32/tests/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index c0d5237..fe92bb8 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -31,7 +31,7 @@ #include "wine/test.h" -void test_database(void) +static void test_database(void) { HRESULT hr; IDBInitialize *dbinit = NULL;

1 0

Francois Gouget : shell32/tests: Some more type consistency fixes for the ShellExecute() return value checks.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 0e6605ac52798b8baebe2a199a95f65b887c11b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6605ac52798b8baebe2a199… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 09:53:31 2012 +0200 shell32/tests: Some more type consistency fixes for the ShellExecute() return value checks. --- dlls/shell32/tests/shlexec.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 6cfb2b0..ba0e2b8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -854,7 +854,7 @@ typedef struct const char* verb; const char* basename; int todo; - int rc; + INT_PTR rc; } filename_tests_t; static filename_tests_t filename_tests[]= @@ -1136,7 +1136,7 @@ static void test_filename(void) char filename[MAX_PATH]; const filename_tests_t* test; char* c; - int rc; + INT_PTR rc; test=filename_tests; while (test->basename) @@ -1179,12 +1179,12 @@ static void test_filename(void) { ok(rc==test->rc || broken(quotedfile && rc == 2), /* NT4 */ - "%s failed: rc=%d err=%u\n", shell_call, + "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } else todo_wine { - ok(rc==test->rc, "%s failed: rc=%d err=%u\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } if (rc == 33) @@ -1228,12 +1228,12 @@ static void test_filename(void) rc=33; if ((test->todo & 0x1)==0) { - ok(rc==test->rc, "%s failed: rc=%d err=%u\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } else todo_wine { - ok(rc==test->rc, "%s failed: rc=%d err=%u\n", shell_call, + ok(rc==test->rc, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } if (rc==0) @@ -1297,7 +1297,7 @@ static void test_filename(void) */ sprintf(filename, "\"%s\\test file.shlexec\"", tmpdir); rc=shell_execute(NULL, filename, NULL, NULL); - ok(rc > 32, "%s failed: rc=%d err=%u\n", shell_call, rc, + ok(rc > 32, "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open");

1 0

Francois Gouget : shell32/tests: Simplify shlexec's test_argify() and test_lpFile_parsed() and avoid numeric literals.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: da6b02ceb1eeef52fec2394aa92bc3ce70fcf0e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6b02ceb1eeef52fec2394aa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 09:54:07 2012 +0200 shell32/tests: Simplify shlexec's test_argify() and test_lpFile_parsed() and avoid numeric literals. --- dlls/shell32/tests/shlexec.c | 148 +++++++++++------------------------------- 1 files changed, 37 insertions(+), 111 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ba0e2b8..131a9e6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -903,107 +903,54 @@ static filename_tests_t noquotes_tests[]= static void test_lpFile_parsed(void) { - /* basename tmpdir */ - const char* shorttmpdir; - const char *testfile; char fileA[MAX_PATH]; INT_PTR rc; - GetTempPathA(sizeof(fileA), fileA); - shorttmpdir = tmpdir + strlen(fileA); - - /* ensure tmpdir is in %TEMP%: GetTempPath() can succeed even if TEMP is undefined */ - SetEnvironmentVariableA("TEMP", fileA); - /* existing "drawback_file.noassoc" prevents finding "drawback_file.noassoc foo.shlexec" on wine */ - testfile = "%s\\drawback_file.noassoc foo.shlexec"; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "%s\\drawback_file.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + todo_wine ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* if quoted, existing "drawback_file.noassoc" not prevents finding "drawback_file.noassoc foo.shlexec" on wine */ - testfile = "\"%s\\drawback_file.noassoc foo.shlexec\""; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "\"%s\\drawback_file.noassoc foo.shlexec\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - - /* error should be 2, not 31 */ - testfile = "\"%s\\drawback_file.noassoc\" foo.shlexec"; - sprintf(fileA, testfile, tmpdir); + ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, + "%s failed: rc=%lu\n", shell_call, rc); + + /* error should be SE_ERR_FNF, not SE_ERR_NOASSOC */ + sprintf(fileA, "\"%s\\drawback_file.noassoc\" foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc==2, - "expected failure (2), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); /* ""command"" not works on wine (and real win9x and w2k) */ - testfile = "\"\"%s\\simple.shlexec\"\""; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "\"\"%s\\simple.shlexec\"\"", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc>32 || broken(rc == 2) /* Win9x/2000 */, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + todo_wine ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win9x/2000 */, + "%s failed: rc=%lu\n", shell_call, rc); /* nonexisting "drawback_nonexist.noassoc" not prevents finding "drawback_nonexist.noassoc foo.shlexec" on wine */ - testfile = "%s\\drawback_nonexist.noassoc foo.shlexec"; - sprintf(fileA, testfile, tmpdir); + sprintf(fileA, "%s\\drawback_nonexist.noassoc foo.shlexec", tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* is SEE_MASK_DOENVSUBST default flag? Should only be when XP emulates 9x (XP bug or real 95 or ME behavior ?) */ - testfile = "%%TEMP%%\\%s\\simple.shlexec"; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc==2, - "expected failure (2), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + rc=shell_execute(NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); /* quoted */ - testfile = "\"%%TEMP%%\\%s\\simple.shlexec\""; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute(NULL, fileA, NULL, NULL); - todo_wine { - ok(rc==2, - "expected failure (2), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - } + rc=shell_execute(NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL); + todo_wine ok(rc == SE_ERR_FNF, "%s succeeded: rc=%lu\n", shell_call, rc); /* test SEE_MASK_DOENVSUBST works */ - testfile = "%%TEMP%%\\%s\\simple.shlexec"; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, + NULL, "%TMPDIR%\\simple.shlexec", NULL, NULL); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); /* quoted lpFile does not work on real win95 and nt4 */ - testfile = "\"%%TEMP%%\\%s\\simple.shlexec\""; - sprintf(fileA, testfile, shorttmpdir); - rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); - ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); - + rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, + NULL, "\"%TMPDIR%\\simple.shlexec\"", NULL, NULL); + ok(rc > 32 || broken(rc == SE_ERR_FNF) /* Win95/NT4 */, + "%s failed: rc=%lu\n", shell_call, rc); } static void test_argify(void) @@ -1015,10 +962,7 @@ static void test_argify(void) /* %2 */ rc=shell_execute("NoQuotesParam2", fileA, "a b", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { okChildInt("argcA", 5); @@ -1028,10 +972,7 @@ static void test_argify(void) /* %2 */ /* '"a"""' -> 'a"' */ rc=shell_execute("NoQuotesParam2", fileA, "\"a:\"\"some string\"\"\"", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { okChildInt("argcA", 5); @@ -1044,10 +985,7 @@ static void test_argify(void) /* backslash isn't escape char * '"a\""' -> '"a\""' */ rc=shell_execute("NoQuotesParam2", fileA, "\"a:\\\"some string\\\"\"", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { okChildInt("argcA", 5); @@ -1059,10 +997,7 @@ static void test_argify(void) /* "%2" */ /* \t isn't whitespace */ rc=shell_execute("QuotedParam2", fileA, "a\tb c", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { okChildInt("argcA", 5); @@ -1073,10 +1008,7 @@ static void test_argify(void) /* %* */ rc=shell_execute("NoQuotesAllParams", fileA, "a b c d e f g h", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { todo_wine { @@ -1088,10 +1020,7 @@ static void test_argify(void) /* %* can sometimes contain only whitespaces and no args */ rc=shell_execute("QuotedAllParams", fileA, " ", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { todo_wine { @@ -1102,10 +1031,7 @@ static void test_argify(void) /* %~3 */ rc=shell_execute("NoQuotesParams345etc", fileA, "a b c d e f g h", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { todo_wine { @@ -1117,10 +1043,7 @@ static void test_argify(void) /* %~3 is rest of command line starting with whitespaces after 2nd arg */ rc=shell_execute("QuotedParams345etc", fileA, "a ", NULL); - ok(rc>32, - "expected success (33), got %s (%lu), lpFile: %s\n", - rc > 32 ? "success" : "failure", rc, fileA - ); + ok(rc > 32, "%s failed: rc=%lu\n", shell_call, rc); if (rc>32) { okChildInt("argcA", 5); @@ -1178,7 +1101,7 @@ static void test_filename(void) if ((test->todo & 0x1)==0) { ok(rc==test->rc || - broken(quotedfile && rc == 2), /* NT4 */ + broken(quotedfile && rc == SE_ERR_FNF), /* NT4 */ "%s failed: rc=%ld err=%u\n", shell_call, rc, GetLastError()); } @@ -2184,6 +2107,9 @@ static void init_test(void) DeleteFileA( tmpdir ); rc = CreateDirectoryA( tmpdir, NULL ); ok( rc, "failed to create %s err %u\n", tmpdir, GetLastError() ); + /* Set %TMPDIR% for the tests */ + SetEnvironmentVariableA("TMPDIR", tmpdir); + rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); assert(rc != 0); init_event(child_file);

1 0

Francois Gouget : shell32/tests: Write proper tests for CommandLineToArgvW( ).
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 9ec7ab3fa03ca5ba467cfb7a856d50014bae5211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec7ab3fa03ca5ba467cfb7a8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 09:54:16 2012 +0200 shell32/tests: Write proper tests for CommandLineToArgvW(). --- dlls/kernel32/tests/process.c | 12 -- dlls/shell32/tests/shlexec.c | 326 +++++++++++++++++++++++++++++------------ 2 files changed, 232 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ec7ab3fa03ca5ba467cf…

1 0

Piotr Caban : msvcp90: Removed no longer needed exports.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 5998072af684fbbfc26b80685be780818a4dc877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5998072af684fbbfc26b80685… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:13:22 2012 +0200 msvcp90: Removed no longer needed exports. --- dlls/msvcp90/msvcp90.spec | 2 -- dlls/msvcp90/string.c | 14 -------------- 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 576541c..d99add4 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5819,5 +5819,3 @@ @ cdecl -arch=win64 ?facet_Register(a)facet@locale(a)std@@CAXPEAV123@@Z(ptr) locale_facet_register @ thiscall -arch=win32 ?_Register(a)facet@locale(a)std@@QAEXXZ(ptr) locale_facet__Register @ cdecl -arch=win64 ?_Register(a)facet@locale(a)std@@QEAAXXZ(ptr) locale_facet__Register -@ stdcall basic_string_char_replace_helper(ptr long long ptr long) -@ stdcall basic_string_wchar_replace_helper(ptr long long ptr long) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 73f0d4e..0ebf757 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1991,13 +1991,6 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch return this; } -/* Not exported from msvcp90 */ -basic_string_char* __stdcall basic_string_char_replace_helper(basic_string_char *this, - MSVCP_size_t off, MSVCP_size_t len, const char *str, MSVCP_size_t str_len) -{ - return basic_string_char_replace_cstr_len(this, off, len, str, str_len); -} - /* ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)IIPBD@Z */ /* ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0PEBD@Z */ DEFINE_THISCALL_WRAPPER(basic_string_char_replace_cstr, 16) @@ -3950,13 +3943,6 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_cstr_len(basic_string_ return this; } -/* Not exported from msvcp90 */ -basic_string_wchar* __stdcall basic_string_wchar_replace_helper(basic_string_wchar *this, - MSVCP_size_t off, MSVCP_size_t len, const wchar_t *str, MSVCP_size_t str_len) -{ - return basic_string_wchar_replace_cstr_len(this, off, len ,str, str_len); -} - /* ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)IIPB_W@Z */ /* ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K0PEB_W@Z */ /* ?replace@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)IIPBG@Z */

1 0

Piotr Caban : msvcp90: Fixed io classes cleaning.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: wine Branch: master Commit: 0cb615cf80f6d8a09fc6bd19ca0b5211f55764b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb615cf80f6d8a09fc6bd19c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 4 13:13:38 2012 +0200 msvcp90: Fixed io classes cleaning. --- dlls/msvcp100/ios.c | 24 ++++++++++++------------ dlls/msvcp71/ios.c | 24 ++++++++++++------------ dlls/msvcp90/ios.c | 24 ++++++++++++------------ 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index fa2f76e..96e6835 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -8193,39 +8193,39 @@ void init_io(void *base) void free_io(void) { - basic_istream_char_dtor(basic_istream_char_to_basic_ios(&cin.obj)); + basic_istream_char_vbase_dtor(&cin.obj); basic_filebuf_char_dtor(&filebuf_char_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&ucin.obj)); + basic_istream_wchar_vbase_dtor(&ucin.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&wcin.obj)); + basic_istream_wchar_vbase_dtor(&wcin.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdin); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cout.obj)); + basic_ostream_char_vbase_dtor(&cout.obj); basic_filebuf_char_dtor(&filebuf_char_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucout.obj)); + basic_ostream_wchar_vbase_dtor(&ucout.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcout.obj)); + basic_ostream_wchar_vbase_dtor(&wcout.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdout); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cerr.obj)); + basic_ostream_char_vbase_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_char_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucerr.obj)); + basic_ostream_wchar_vbase_dtor(&ucerr.obj); basic_filebuf_wchar_dtor(&filebuf_short_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcerr.obj)); + basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&clog.obj)); + basic_ostream_char_vbase_dtor(&clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&uclog.obj)); + basic_ostream_wchar_vbase_dtor(&uclog.obj); basic_filebuf_wchar_dtor(&filebuf_short_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wclog.obj)); + basic_ostream_wchar_vbase_dtor(&wclog.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_log); } diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index 069011c..6696149 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -12637,39 +12637,39 @@ void init_io(void *base) void free_io(void) { - basic_istream_char_dtor(basic_istream_char_to_basic_ios(&cin.obj)); + basic_istream_char_vbase_dtor(&cin.obj); basic_filebuf_char_dtor(&filebuf_char_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&ucin.obj)); + basic_istream_wchar_vbase_dtor(&ucin.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&wcin.obj)); + basic_istream_wchar_vbase_dtor(&wcin.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdin); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cout.obj)); + basic_ostream_char_vbase_dtor(&cout.obj); basic_filebuf_char_dtor(&filebuf_char_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucout.obj)); + basic_ostream_wchar_vbase_dtor(&ucout.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcout.obj)); + basic_ostream_wchar_vbase_dtor(&wcout.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdout); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cerr.obj)); + basic_ostream_char_vbase_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_char_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucerr.obj)); + basic_ostream_wchar_vbase_dtor(&ucerr.obj); basic_filebuf_wchar_dtor(&filebuf_short_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcerr.obj)); + basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&clog.obj)); + basic_ostream_char_vbase_dtor(&clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&uclog.obj)); + basic_ostream_wchar_vbase_dtor(&uclog.obj); basic_filebuf_wchar_dtor(&filebuf_short_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wclog.obj)); + basic_ostream_wchar_vbase_dtor(&wclog.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_log); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 1816884..19b799c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -13142,39 +13142,39 @@ void init_io(void *base) void free_io(void) { - basic_istream_char_dtor(basic_istream_char_to_basic_ios(&cin.obj)); + basic_istream_char_vbase_dtor(&cin.obj); basic_filebuf_char_dtor(&filebuf_char_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&ucin.obj)); + basic_istream_wchar_vbase_dtor(&ucin.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdin); - basic_istream_wchar_dtor(basic_istream_wchar_to_basic_ios(&wcin.obj)); + basic_istream_wchar_vbase_dtor(&wcin.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdin); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cout.obj)); + basic_ostream_char_vbase_dtor(&cout.obj); basic_filebuf_char_dtor(&filebuf_char_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucout.obj)); + basic_ostream_wchar_vbase_dtor(&ucout.obj); basic_filebuf_wchar_dtor(&filebuf_short_stdout); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcout.obj)); + basic_ostream_wchar_vbase_dtor(&wcout.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stdout); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&cerr.obj)); + basic_ostream_char_vbase_dtor(&cerr.obj); basic_filebuf_char_dtor(&filebuf_char_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&ucerr.obj)); + basic_ostream_wchar_vbase_dtor(&ucerr.obj); basic_filebuf_wchar_dtor(&filebuf_short_stderr); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wcerr.obj)); + basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_dtor(basic_ostream_char_to_basic_ios(&clog.obj)); + basic_ostream_char_vbase_dtor(&clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&uclog.obj)); + basic_ostream_wchar_vbase_dtor(&uclog.obj); basic_filebuf_wchar_dtor(&filebuf_short_log); - basic_ostream_wchar_dtor(basic_ostream_wchar_to_basic_ios(&wclog.obj)); + basic_ostream_wchar_vbase_dtor(&wclog.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_log); }

1 0