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

Andrew Talbot : dinput/tests: Write-strings warning fix.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 70cfb05fc43ab5b0f05a0e03ee89587c44e4ab1c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70cfb05fc43ab5b0f05a0e0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jul 31 19:51:00 2006 +0100 dinput/tests: Write-strings warning fix. --- dlls/dinput/tests/keyboard.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 7a64bbc..302e178 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -36,6 +36,7 @@ #include "dinput_test.h" const char * get_file_version(const char * file_name) { static char version[32]; + static char backslash[] = "\\"; DWORD size; DWORD handle; @@ -46,7 +47,7 @@ const char * get_file_version(const char if (GetFileVersionInfoA(file_name, handle, size, data)) { VS_FIXEDFILEINFO *pFixedVersionInfo; UINT len; - if (VerQueryValueA(data, "\\", (LPVOID *)&pFixedVersionInfo, &len)) { + if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { sprintf(version, "%ld.%ld.%ld.%ld", pFixedVersionInfo->dwFileVersionMS >> 16, pFixedVersionInfo->dwFileVersionMS & 0xffff,

1 0

Andrew Talbot : dsound/tests: Write-strings warning fix.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 70642e2511240d28c794c1d94dbc9f94a35495f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70642e2511240d28c794c1d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jul 31 19:53:07 2006 +0100 dsound/tests: Write-strings warning fix. --- dlls/dsound/tests/dsound8.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 179b733..e207a9e 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -806,6 +806,7 @@ static void dsound8_tests(void) const char * get_file_version(const char * file_name) { static char version[32]; + static char backslash[] = "\\"; DWORD size; DWORD handle; @@ -816,7 +817,7 @@ const char * get_file_version(const char if (GetFileVersionInfoA("dsound.dll", handle, size, data)) { VS_FIXEDFILEINFO *pFixedVersionInfo; UINT len; - if (VerQueryValueA(data, "\\", (LPVOID *)&pFixedVersionInfo, &len)) { + if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) { sprintf(version, "%ld.%ld.%ld.%ld", pFixedVersionInfo->dwFileVersionMS >> 16, pFixedVersionInfo->dwFileVersionMS & 0xffff,

1 0

Duane Clark : msvcrt: Fix fgetwc/s in binary mode.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: bc194793a701b219516329bc4b3232dbc79e9d4a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc194793a701b219516329b… Author: Duane Clark <fpga(a)pacbell.net> Date: Mon Jul 31 12:15:37 2006 -0700 msvcrt: Fix fgetwc/s in binary mode. --- dlls/msvcrt/file.c | 26 ++++++++++++++++++++++---- dlls/msvcrt/tests/file.c | 20 ++++++++++---------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 266adb2..3b3a6de 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2179,14 +2179,32 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT)) { MSVCRT_wchar_t wc; - int r; - if ((r = _read(file->_file, &wc, sizeof(wc))) != sizeof(wc)) + int i,j; + char *chp, *wcp; + wcp = (char *)&wc; + for(i=0; i<sizeof(wc); i++) { - file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; - return MSVCRT_WEOF; + if (file->_cnt>0) + { + file->_cnt--; + chp = file->_ptr++; + wcp[i] = *chp; + } + else + { + j = MSVCRT__filbuf(file); + if(file->_cnt<=0) + { + file->_flag |= (file->_cnt == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; + file->_cnt = 0; + return MSVCRT_WEOF; + } + wcp[i] = j; + } } return wc; } + c = MSVCRT_fgetc(file); if ((*__p___mb_cur_max() > 1) && MSVCRT_isleadbyte(c)) { diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 284e3ba..0205de4 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -329,28 +329,28 @@ #define LLEN 512 j++; ok(l==j, "ftell expected %d got %ld\n", j, l); fgetws(wtextW,3,tempfh); - todo_wine ok(wtextW[0]=='\r',"expected carriage return got %04hx\n", wtextW[0]); - todo_wine ok(wtextW[1]=='\n',"expected newline got %04hx\n", wtextW[1]); + ok(wtextW[0]=='\r',"expected carriage return got %04hx\n", wtextW[0]); + ok(wtextW[1]=='\n',"expected newline got %04hx\n", wtextW[1]); l=ftell(tempfh); j += 4; - todo_wine ok(l==j, "ftell expected %d got %ld\n", j, l); + ok(l==j, "ftell expected %d got %ld\n", j, l); for(i=0; i<strlen(mytext); i++) wtextW[i] = 0; /* the first time we get the string, it should be entirely within the local buffer */ fgetws(wtextW,LLEN,tempfh); l=ftell(tempfh); j += (strlen(mytext)-1)*sizeof(WCHAR); - todo_wine ok(l==j, "ftell expected %d got %ld\n", j, l); + ok(l==j, "ftell expected %d got %ld\n", j, l); diff_found = FALSE; aptr = mytextW; wptr = wtextW; for (i=0; i<strlen(mytext)-2; i++, aptr++, wptr++) { - todo_wine ok(*aptr == *wptr, "Char %d expected %04hx got %04hx\n", i, *aptr, *wptr); + ok(*aptr == *wptr, "Char %d expected %04hx got %04hx\n", i, *aptr, *wptr); diff_found |= (*aptr != *wptr); } - todo_wine ok(!(diff_found), "fgetwc difference found in BINARY mode\n"); - todo_wine ok(*wptr == '\n', "Should get newline\n"); + ok(!(diff_found), "fgetwc difference found in BINARY mode\n"); + ok(*wptr == '\n', "Should get newline\n"); for(i=0; i<strlen(mytext); i++) wtextW[i] = 0; /* the second time we get the string, it should cross the local buffer boundary. @@ -361,11 +361,11 @@ #define LLEN 512 wptr = wtextW; for (i=0; i<strlen(mytext)-2; i++, aptr++, wptr++) { - todo_wine ok(*aptr == *wptr, "Char %d expected %04hx got %04hx\n", i, *aptr, *wptr); + ok(*aptr == *wptr, "Char %d expected %04hx got %04hx\n", i, *aptr, *wptr); diff_found |= (*aptr != *wptr); } - todo_wine ok(!(diff_found), "fgetwc difference found in BINARY mode\n"); - todo_wine ok(*wptr == '\n', "Should get newline\n"); + ok(!(diff_found), "fgetwc difference found in BINARY mode\n"); + ok(*wptr == '\n', "Should get newline\n"); if(mytextW) free (mytextW); fclose(tempfh);

1 0

Robert Shearman : user: Ignore setting NULL window procs inside SetWindowLong.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 447721e8cb449794b8646430a692a607533f1d81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=447721e8cb449794b864643… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 31 16:43:35 2006 +0100 user: Ignore setting NULL window procs inside SetWindowLong. Add tests for SetWindowLong error cases. --- dlls/user/tests/win.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user/win.c | 8 +++++--- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 05a9287..35cd7fc 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -3818,6 +3818,54 @@ #undef expect_style #undef expect_ex_style } +/* function that remembers whether the system the test is running on sets the + * last error for user32 functions to make the tests stricter */ +static int check_error(DWORD actual, DWORD expected) +{ + static int sets_last_error = -1; + if (sets_last_error == -1) + sets_last_error = (actual != 0xdeadbeef); + return (!sets_last_error && (actual == 0xdeadbeef)) || (actual == expected); +} + +static void test_SetWindowLong(void) +{ + LONG_PTR retval; + + SetLastError(0xdeadbeef); + retval = SetWindowLongPtr(NULL, GWLP_WNDPROC, 0); + ok(!retval, "SetWindowLongPtr on invalid window handle should have returned 0 instead of 0x%x\n", retval); + ok(check_error(GetLastError(), ERROR_INVALID_WINDOW_HANDLE), + "SetWindowLongPtr should have set error to ERROR_INVALID_WINDOW_HANDLE instad of %ld\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetWindowLongPtr(hwndMain, 0xdeadbeef, 0); + ok(!retval, "SetWindowLongPtr on invalid index should have returned 0 instead of 0x%x\n", retval); + ok(check_error(GetLastError(), ERROR_INVALID_INDEX), + "SetWindowLongPtr should have set error to ERROR_INVALID_INDEX instad of %ld\n", GetLastError()); + + SetLastError(0xdeadbeef); + retval = SetWindowLongPtr(hwndMain, GWLP_WNDPROC, 0); + ok((WNDPROC)retval == main_window_procA, + "SetWindowLongPtr on invalid window proc should have returned address of main_window_procA instead of 0x%x\n", retval); + ok(GetLastError() == 0xdeadbeef, "SetWindowLongPtr shouldn't have set the last error, instead of setting it to %ld\n", GetLastError()); + retval = GetWindowLongPtr(hwndMain, GWLP_WNDPROC); + ok((WNDPROC)retval == main_window_procA, + "SetWindowLongPtr on invalid window proc shouldn't have changed the value returned by GetWindowLongPtr, instead of changing it to 0x%x\n", retval); + ok(!IsWindowUnicode(hwndMain), "hwndMain shouldn't be Unicode\n"); + + SetLastError(0xdeadbeef); + retval = SetWindowLongPtrW(hwndMain, GWLP_WNDPROC, 0); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { + ok(GetLastError() == 0xdeadbeef, "SetWindowLongPtr shouldn't have set the last error, instead of setting it to %ld\n", GetLastError()); + ok(IsWindowUnicode(hwndMain), "hwndMain should now be Unicode\n"); + + /* set it back to ANSI */ + SetWindowLongPtr(hwndMain, GWLP_WNDPROC, 0); + } +} + START_TEST(win) { pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); @@ -3893,6 +3941,7 @@ START_TEST(win) test_window_styles(); test_redrawnow(); test_csparentdc(); + test_SetWindowLong(); /* add the tests above this line */ UnhookWindowsHookEx(hhook); diff --git a/dlls/user/win.c b/dlls/user/win.c index fa2af00..16690b0 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -1981,11 +1981,13 @@ static LONG_PTR WIN_SetWindowLong( HWND } case GWLP_WNDPROC: { + WNDPROC proc; UINT old_flags = wndPtr->flags; retval = (ULONG_PTR)WINPROC_GetProc( wndPtr->winproc, unicode ); - if (unicode) wndPtr->winproc = WINPROC_AllocProc( NULL, (WNDPROC)newval ); - else wndPtr->winproc = WINPROC_AllocProc( (WNDPROC)newval, NULL ); - if (WINPROC_IsUnicode( wndPtr->winproc, unicode )) wndPtr->flags |= WIN_ISUNICODE; + if (unicode) proc = WINPROC_AllocProc( NULL, (WNDPROC)newval ); + else proc = WINPROC_AllocProc( (WNDPROC)newval, NULL ); + if (proc) wndPtr->winproc = proc; + if (WINPROC_IsUnicode( proc, unicode )) wndPtr->flags |= WIN_ISUNICODE; else wndPtr->flags &= ~WIN_ISUNICODE; if (!((old_flags ^ wndPtr->flags) & WIN_ISUNICODE)) {

1 0

Dan Hipschman : widl: Set type_t kind field correctly for all types.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 3e1ace5aa32c2995cedb0f75e3635a4ef57da0ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e1ace5aa32c2995cedb0f7… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jul 31 11:57:05 2006 -0700 widl: Set type_t kind field correctly for all types. --- tools/widl/parser.y | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 123a23a..db78003 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -487,6 +487,7 @@ enum: ident '=' expr_const { $$ = re ; enumdef: tENUM t_ident '{' enums '}' { $$ = get_typev(RPC_FC_ENUM16, $2, tsENUM); + $$->kind = TKIND_ENUM; $$->fields = $4; $$->defined = TRUE; if(in_typelib) @@ -663,8 +664,8 @@ coclass_int: m_attributes interfacedec { $$ = make_ifref($2); $$->attrs = $1; } ; -dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(0, $2, 0); } - | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(0, $2, 0); } +dispinterface: tDISPINTERFACE aIDENTIFIER { $$ = get_type(0, $2, 0); $$->kind = TKIND_DISPATCH; } + | tDISPINTERFACE aKNOWNTYPE { $$ = get_type(0, $2, 0); $$->kind = TKIND_DISPATCH; } ; dispinterfacehdr: attributes dispinterface { attr_t *attrs; @@ -707,8 +708,8 @@ inherit: { $$ = NULL; } | ':' aKNOWNTYPE { $$ = find_type2($2, 0); } ; -interface: tINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); } - | tINTERFACE aKNOWNTYPE { $$ = get_type(RPC_FC_IP, $2, 0); } +interface: tINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_INTERFACE; } + | tINTERFACE aKNOWNTYPE { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_INTERFACE; } ; interfacehdr: attributes interface { $$ = $2; @@ -742,8 +743,8 @@ interfacedec: | dispinterface ';' { $$ = $1; if (!parse_only && do_header) write_forward($$); } ; -module: tMODULE aIDENTIFIER { $$ = make_type(0, NULL); $$->name = $2; } - | tMODULE aKNOWNTYPE { $$ = make_type(0, NULL); $$->name = $2; } +module: tMODULE aIDENTIFIER { $$ = make_type(0, NULL); $$->name = $2; $$->kind = TKIND_MODULE; } + | tMODULE aKNOWNTYPE { $$ = make_type(0, NULL); $$->name = $2; $$->kind = TKIND_MODULE; } ; modulehdr: attributes module { $$ = $2; @@ -780,6 +781,7 @@ pointer_type: structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, tsSTRUCT); /* overwrite RPC_FC_STRUCT with a more exact type */ $$->type = get_struct_type( $4 ); + $$->kind = TKIND_RECORD; $$->fields = $4; $$->defined = TRUE; if(in_typelib) @@ -814,6 +816,7 @@ typedef: tTYPEDEF m_attributes type pide ; uniondef: tUNION t_ident '{' fields '}' { $$ = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, $2, tsUNION); + $$->kind = TKIND_UNION; $$->fields = $4; $$->defined = TRUE; } @@ -821,8 +824,10 @@ uniondef: tUNION t_ident '{' fields '}' tSWITCH '(' s_field ')' m_ident '{' cases '}' { var_t *u = $7; $$ = get_typev(RPC_FC_ENCAPSULATED_UNION, $2, tsUNION); + $$->kind = TKIND_UNION; if (!u) u = make_var("tagged_union"); u->type = make_type(RPC_FC_NON_ENCAPSULATED_UNION, NULL); + u->type->kind = TKIND_UNION; u->type->fields = $9; u->type->defined = TRUE; LINK(u, $5); $$->fields = u;

1 0

Duane Clark : msvcrt: Remove read_i loop and fix fread.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 5c4b18a931cc1779ec7cc49a4c871ec7397eebcc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c4b18a931cc1779ec7cc49… Author: Duane Clark <fpga(a)pacbell.net> Date: Mon Jul 31 12:12:02 2006 -0700 msvcrt: Remove read_i loop and fix fread. --- dlls/msvcrt/file.c | 50 +++++++++++++++++++------------------------------- 1 files changed, 19 insertions(+), 31 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d5d9647..266adb2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1619,7 +1619,7 @@ static unsigned int remove_cr(char *buf, */ static int read_i(int fd, void *buf, unsigned int count) { - DWORD num_read, all_read = 0; + DWORD num_read; char *bufstart = buf; HANDLE hand = msvcrt_fdtoh(fd); @@ -1630,34 +1630,25 @@ static int read_i(int fd, void *buf, uns return -1; /* Reading single bytes in O_TEXT mode makes things slow - * So read big chunks, then remove the \r in memory and try reading - * the rest until the request is satisfied or EOF is met + * So read big chunks */ - while (all_read < count) - { - if (ReadFile(hand, bufstart+all_read, count - all_read, &num_read, NULL)) - { - if (num_read != (count - all_read)) - { - TRACE(":EOF\n"); - MSVCRT_fdesc[fd].wxflag |= WX_ATEOF; - all_read += num_read; - if (count > 4) - TRACE("%s\n",debugstr_an(buf,all_read)); - return all_read; - } - all_read += num_read; - } - else - { - TRACE(":failed-last error (%ld)\n",GetLastError()); - return -1; - } - } + if (ReadFile(hand, bufstart, count, &num_read, NULL)) + { + if (num_read != count) + { + MSVCRT_fdesc[fd].wxflag |= WX_ATEOF; + TRACE(":EOF %s\n",debugstr_an(buf,num_read)); + } + } + else + { + TRACE(":failed-last error (%ld)\n",GetLastError()); + return -1; + } if (count > 4) - TRACE("(%lu), %s\n",all_read,debugstr_an(buf, all_read)); - return all_read; + TRACE("(%lu), %s\n",num_read,debugstr_an(buf, num_read)); + return num_read; } /********************************************************************* @@ -2132,11 +2123,8 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file file->_cnt--; i = file->_ptr++; j = *i; - } else { + } else j = MSVCRT__filbuf(file); - if (j == MSVCRT_EOF) - return j; - } if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) || (j != '\r')) return j; } while(1); @@ -2508,7 +2496,6 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *p while(rcnt>0) { int i = _read(file->_file,ptr, rcnt); - if (i==0) break; pread += i; rcnt -= i; /* expose feof condition in the flags @@ -2522,6 +2509,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *p pread = 0; rcnt = 0; } + if (i < 1) break; } read+=pread; return read / size;

1 0

Duane Clark : msvcrt: Test fgetwc/s in binary mode.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: d74b6055fe882504742be0f96d01b03607fdfd3b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d74b6055fe882504742be0f… Author: Duane Clark <fpga(a)pacbell.net> Date: Mon Jul 31 12:14:04 2006 -0700 msvcrt: Test fgetwc/s in binary mode. --- dlls/msvcrt/tests/file.c | 99 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 92 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index b9387ce..284e3ba 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -261,27 +261,112 @@ #define LLEN 512 char* tempf; FILE *tempfh; - static const char mytext[]= "This is test_fgetwc\n"; - WCHAR wtextW[LLEN+1]; + static const char mytext[]= "This is test_fgetwc\r\n"; + WCHAR wtextW[MSVCRT_BUFSIZ+LLEN+1]; WCHAR *mytextW = NULL, *aptr, *wptr; BOOL diff_found = FALSE; - unsigned int i; + int i, j; + long l; tempf=_tempnam(".","wne"); - tempfh = fopen(tempf,"wt"); /* open in TEXT mode */ + tempfh = fopen(tempf,"wb"); + j = 'a'; + /* pad to almost the length of the internal buffer */ + for (i=0; i<MSVCRT_BUFSIZ-4; i++) + fputc(j,tempfh); + j = '\r'; + fputc(j,tempfh); + j = '\n'; + fputc(j,tempfh); fputs(mytext,tempfh); fclose(tempfh); - tempfh = fopen(tempf,"rt"); + /* in text mode, getws/c expects multibyte characters */ + /*currently Wine only supports plain ascii, and that is all that is tested here */ + tempfh = fopen(tempf,"rt"); /* open in TEXT mode */ + fgetws(wtextW,LLEN,tempfh); + l=ftell(tempfh); + ok(l==MSVCRT_BUFSIZ-2, "ftell expected %d got %ld\n", MSVCRT_BUFSIZ-2, l); fgetws(wtextW,LLEN,tempfh); + l=ftell(tempfh); + ok(l==MSVCRT_BUFSIZ-2+strlen(mytext), "ftell expected %d got %ld\n", + MSVCRT_BUFSIZ-2+strlen(mytext), l); mytextW = AtoW ((char*)mytext); aptr = mytextW; wptr = wtextW; - - for (i=0; i<strlen(mytext); i++, aptr++, wptr++) + for (i=0; i<strlen(mytext)-2; i++, aptr++, wptr++) { diff_found |= (*aptr != *wptr); } ok(!(diff_found), "fgetwc difference found in TEXT mode\n"); + ok(*wptr == '\n', "Carriage return was not skipped\n"); + fclose(tempfh); + unlink(tempf); + + tempfh = fopen(tempf,"wb"); + j = 'a'; + /* pad to almost the length of the internal buffer. Use an odd number of bytes + to test that we can read wchars that are split across the internal buffer + boundary */ + for (i=0; i<MSVCRT_BUFSIZ-3-strlen(mytext)*sizeof(WCHAR); i++) + fputc(j,tempfh); + j = '\r'; + fputwc(j,tempfh); + j = '\n'; + fputwc(j,tempfh); + fputws(wtextW,tempfh); + fputws(wtextW,tempfh); + fclose(tempfh); + /* in binary mode, getws/c expects wide characters */ + tempfh = fopen(tempf,"rb"); /* open in BINARY mode */ + j=(MSVCRT_BUFSIZ-2)/sizeof(WCHAR)-strlen(mytext); + fgetws(wtextW,j,tempfh); + l=ftell(tempfh); + j=(j-1)*sizeof(WCHAR); + ok(l==j, "ftell expected %d got %ld\n", j, l); + i=fgetc(tempfh); + ok(i=='a', "fgetc expected %d got %d\n", 0x61, i); + l=ftell(tempfh); + j++; + ok(l==j, "ftell expected %d got %ld\n", j, l); + fgetws(wtextW,3,tempfh); + todo_wine ok(wtextW[0]=='\r',"expected carriage return got %04hx\n", wtextW[0]); + todo_wine ok(wtextW[1]=='\n',"expected newline got %04hx\n", wtextW[1]); + l=ftell(tempfh); + j += 4; + todo_wine ok(l==j, "ftell expected %d got %ld\n", j, l); + for(i=0; i<strlen(mytext); i++) + wtextW[i] = 0; + /* the first time we get the string, it should be entirely within the local buffer */ + fgetws(wtextW,LLEN,tempfh); + l=ftell(tempfh); + j += (strlen(mytext)-1)*sizeof(WCHAR); + todo_wine ok(l==j, "ftell expected %d got %ld\n", j, l); + diff_found = FALSE; + aptr = mytextW; + wptr = wtextW; + for (i=0; i<strlen(mytext)-2; i++, aptr++, wptr++) + { + todo_wine ok(*aptr == *wptr, "Char %d expected %04hx got %04hx\n", i, *aptr, *wptr); + diff_found |= (*aptr != *wptr); + } + todo_wine ok(!(diff_found), "fgetwc difference found in BINARY mode\n"); + todo_wine ok(*wptr == '\n', "Should get newline\n"); + for(i=0; i<strlen(mytext); i++) + wtextW[i] = 0; + /* the second time we get the string, it should cross the local buffer boundary. + One of the wchars should be split across the boundary */ + fgetws(wtextW,LLEN,tempfh); + diff_found = FALSE; + aptr = mytextW; + wptr = wtextW; + for (i=0; i<strlen(mytext)-2; i++, aptr++, wptr++) + { + todo_wine ok(*aptr == *wptr, "Char %d expected %04hx got %04hx\n", i, *aptr, *wptr); + diff_found |= (*aptr != *wptr); + } + todo_wine ok(!(diff_found), "fgetwc difference found in BINARY mode\n"); + todo_wine ok(*wptr == '\n', "Should get newline\n"); + if(mytextW) free (mytextW); fclose(tempfh); unlink(tempf);

1 0

James Hawkins : setupapi: Add a stub implementation of SetupGetSourceInfo.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: b74f4d92d74953eabb594a17c91fb6a6aff60ee7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b74f4d92d74953eabb594a1… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 31 11:48:27 2006 -0700 setupapi: Add a stub implementation of SetupGetSourceInfo. --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 36240b8..76f4fc1 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -416,8 +416,8 @@ @ stub SetupGetSourceFileLocationW @ stub SetupGetSourceFileSizeA @ stub SetupGetSourceFileSizeW -@ stub SetupGetSourceInfoA -@ stub SetupGetSourceInfoW +@ stdcall SetupGetSourceInfoA(ptr long long str long ptr) +@ stdcall SetupGetSourceInfoW(ptr long long wstr long ptr) @ stdcall SetupGetStringFieldA(ptr long ptr long ptr) @ stdcall SetupGetStringFieldW(ptr long ptr long ptr) @ stub SetupGetTargetPathA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index eb3d06e..33da153 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -140,6 +140,28 @@ BOOL WINAPI SetupCopyOEMInfW(PCWSTR sour } /*********************************************************************** + * SetupGetSourceInfoA (SETUPAPI.@) + */ +BOOL WINAPI SetupGetSourceInfoA(HINF InfHandle, UINT SourceId, UINT InfoDesired, + PSTR ReturnBuffer, DWORD ReturnBufferSize, LPDWORD RequiredSize) +{ + FIXME("(%p, %d, %d, %p, %ld, %p): stub\n", InfHandle, SourceId, InfoDesired, + ReturnBuffer, ReturnBufferSize, RequiredSize); + return FALSE; +} + +/*********************************************************************** + * SetupGetSourceInfoW (SETUPAPI.@) + */ +BOOL WINAPI SetupGetSourceInfoW(HINF InfHandle, UINT SourceId, UINT InfoDesired, + PWSTR ReturnBuffer, DWORD ReturnBufferSize, LPDWORD RequiredSize) +{ + FIXME("(%p, %d, %d, %p, %ld, %p): stub\n", InfHandle, SourceId, InfoDesired, + ReturnBuffer, ReturnBufferSize, RequiredSize); + return FALSE; +} + +/*********************************************************************** * SetupInitializeFileLogW(SETUPAPI.@) */ HANDLE WINAPI SetupInitializeFileLogW(LPWSTR LogFileName, DWORD Flags)

1 0

Dan Hipschman : widl: Set defined flag for coclasses.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 23707beb461c7c44a17088de4c78d4f654ca2091 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=23707beb461c7c44a17088d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jul 31 11:56:24 2006 -0700 widl: Set defined flag for coclasses. --- tools/widl/parser.y | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index b8e1c39..123a23a 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -651,6 +651,7 @@ coclasshdr: attributes coclass { $$ = coclassdef: coclasshdr '{' coclass_ints '}' { $$ = $1; $$->ifaces = $3; + $$->defined = TRUE; } ;

1 0

Robert Shearman : oleaut32: Improve dump_DispParms.
by Alexandre Julliard 31 Jul '06

31 Jul '06

Module: wine Branch: refs/heads/master Commit: 40556ae08f5808eef8ad5a109e5109939231c6e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40556ae08f5808eef8ad5a1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jul 31 16:44:06 2006 +0100 oleaut32: Improve dump_DispParms. --- dlls/oleaut32/typelib.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0e58ae8..e648735 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1242,15 +1242,19 @@ void dump_Variant(const VARIANT * pvar) static void dump_DispParms(const DISPPARAMS * pdp) { - int index = 0; + int index; TRACE("args=%u named args=%u\n", pdp->cArgs, pdp->cNamedArgs); - while (index < pdp->cArgs) - { + if (pdp->cNamedArgs) + TRACE("named args:\n"); + for (index = 0; index < pdp->cNamedArgs; index++) + TRACE( "\t0x%lx\n", pdp->rgdispidNamedArgs[index] ); + + if (pdp->cArgs) + TRACE("args:\n"); + for (index = 0; index < pdp->cArgs; index++) dump_Variant( &pdp->rgvarg[index] ); - ++index; - } } static void dump_TypeInfo(const ITypeInfoImpl * pty)

1 0