June 2014 - Wine-commits - list.winehq.org

Matteo Bruni : wpp: Free some filename strings after processing an include (Valgrind).
by Alexandre Julliard 26 Jun '14

26 Jun '14

Module: wine Branch: master Commit: 1b79df4e80c4135217ea56a20ab6c3dee5144b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b79df4e80c4135217ea56a20… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 26 19:52:31 2014 +0200 wpp: Free some filename strings after processing an include (Valgrind). --- libs/wpp/ppl.l | 16 +++++++++++----- libs/wpp/wpp.c | 8 ++++++-- libs/wpp/wpp_private.h | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 9655e34..0ce64c2 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -213,7 +213,7 @@ typedef struct bufferstackentry { pp_entry_t *define; /* Points to expanding define or NULL if handling includes */ int line_number; /* Line that we were handling */ int char_number; /* The current position on that line */ - const char *filename; /* Filename that we were handling */ + char *filename; /* Filename that we were handling */ int if_depth; /* How many #if:s deep to check matching #endif:s */ int ncontinuations; /* Remember the continuation state */ int should_pop; /* Set if we must pop the start-state on EOF */ @@ -1340,6 +1340,8 @@ static bufferstackentry_t *pop_buffer(void) bufferstack[bufferstackidx].define->expanding = 0; else { + includelogicentry_t *iep = NULL; + if(!bufferstack[bufferstackidx].should_pop) { wpp_callbacks->close(pp_status.file); @@ -1351,7 +1353,7 @@ static bufferstackentry_t *pop_buffer(void) pp_entry_t *ppp = pplookup(pp_incl_state.ppp); if(ppp) { - includelogicentry_t *iep = pp_xmalloc(sizeof(includelogicentry_t)); + iep = pp_xmalloc(sizeof(includelogicentry_t)); if(!iep) return NULL; @@ -1366,17 +1368,21 @@ static bufferstackentry_t *pop_buffer(void) if(pp_status.debug) fprintf(stderr, "pop_buffer: %s:%d: includelogic added, include_ppp='%s', file='%s'\n", bufferstack[bufferstackidx].filename, bufferstack[bufferstackidx].line_number, pp_incl_state.ppp, iep->filename); } - else - free(bufferstack[bufferstackidx].include_filename); } free(pp_incl_state.ppp); pp_incl_state = bufferstack[bufferstackidx].incl; } + if (bufferstack[bufferstackidx].include_filename) + { + free(pp_status.input); + pp_status.input = bufferstack[bufferstackidx].filename; + } pp_status.line_number = bufferstack[bufferstackidx].line_number; pp_status.char_number = bufferstack[bufferstackidx].char_number; - pp_status.input = bufferstack[bufferstackidx].filename; ncontinuations = bufferstack[bufferstackidx].ncontinuations; + if (!iep) + free(bufferstack[bufferstackidx].include_filename); } if(ppy_debug) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 66eb026..60b2d38 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -206,7 +206,7 @@ int wpp_parse( const char *input, FILE *output ) return 2; } - pp_status.input = input; + pp_status.input = input ? pp_xstrdup(input) : NULL; ppy_out = output; pp_writestring("# 1 \"%s\" 1\n", input ? input : ""); @@ -215,7 +215,11 @@ int wpp_parse( const char *input, FILE *output ) /* If there were errors during processing, return an error code */ if (!ret && pp_status.state) ret = pp_status.state; - if (input) wpp_callbacks->close(pp_status.file); + if (input) + { + wpp_callbacks->close(pp_status.file); + free(pp_status.input); + } /* Clean if_stack, it could remain dirty on errors */ while (pp_get_if_depth()) pp_pop_if(); del_special_defines(); diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index 4e2aa5b..caa52b9 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -228,7 +228,7 @@ void pp_internal_error(const char *file, int line, const char *s, ...) __attribu /* everything is in this structure to avoid polluting the global symbol space */ struct pp_status { - const char *input; /* current input file name */ + char *input; /* current input file name */ void *file; /* current input file descriptor */ int line_number; /* current line number */ int char_number; /* current char number in line */

1 0

Bruno Jesus : wininet/tests: Add more HTTP_QUERY_RAW_HEADERS tests.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: f3b0f488b8233ea6b8fd7b768d93141d641ff6a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b0f488b8233ea6b8fd7b768… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 24 22:34:17 2014 -0300 wininet/tests: Add more HTTP_QUERY_RAW_HEADERS tests. --- dlls/wininet/tests/http.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f3340df..6e30ad4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -465,7 +465,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; - DWORD length, index, exlen = 0, post_len = 0; + DWORD length, length2, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -626,9 +626,28 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed with error %d\n", GetLastError()); length = sizeof(buffer)-1; + memset(buffer, 0x77, sizeof(buffer)); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); - buffer[length]=0; + /* show that the function writes data past the length returned */ + ok(buffer[length-2], "Expected any header character, got 0x00\n"); + ok(!buffer[length-1], "Expected 0x00, got %02X\n", buffer[length-1]); + ok(!buffer[length], "Expected 0x00, got %02X\n", buffer[length]); + ok(buffer[length+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length+1]); + + length2 = length; + res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length2,0x0); + ok(!res, "Expected 0x00, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(length2 == length+1, "Expected %d, got %d\n", length+1, length2); + /* the in length of the buffer must be +1 but the length returned does not count this */ + length2 = length+1; + memset(buffer, 0x77, sizeof(buffer)); + res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length2,0x0); + ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(buffer[length2] == 0x00, "Expected 0x00, got %02X\n", buffer[length2]); + ok(buffer[length2+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length2+1]); + ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length);

1 0

Bruno Jesus : bcrypt: Add a stub for BCryptCloseAlgorithmProvider.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: c8c609b59dec2482abfe401414f06a80378834c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c609b59dec2482abfe40141… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 24 23:53:42 2014 -0300 bcrypt: Add a stub for BCryptCloseAlgorithmProvider. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 185f950..3b154f5 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -1,6 +1,6 @@ @ stub BCryptAddContextFunction @ stub BCryptAddContextFunctionProvider -@ stub BCryptCloseAlgorithmProvider +@ stdcall BCryptCloseAlgorithmProvider(ptr long) @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @ stub BCryptCreateContext diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ee203a6..5ccb9f1 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -90,3 +90,10 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *algorithm, LPCWST return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE algorithm, DWORD flags) +{ + FIXME("%p, %08x - stub\n", algorithm, flags); + + return STATUS_NOT_IMPLEMENTED; +}

1 0

Matteo Bruni : wpp: Properly free defines (Valgrind).
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: f91fa3722167f4ebefaa5fa9f856bd9a15ce7eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91fa3722167f4ebefaa5fa9f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 24 22:25:26 2014 +0200 wpp: Properly free defines (Valgrind). --- libs/wpp/preproc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 33f69c8..21830d6 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -292,7 +292,7 @@ void pp_pop_define_state(void) for (i = 0; i < HASHKEY; i++) { - while ((ppp = pp_def_state->defines[i]) != NULL) free_pp_entry( ppp, i ); + while ((ppp = pp_def_state->defines[i]) != NULL) pp_del_define( ppp->ident ); } state = pp_def_state; pp_def_state = state->next; @@ -302,6 +302,7 @@ void pp_pop_define_state(void) void pp_del_define(const char *name) { pp_entry_t *ppp; + int idx = pphash(name); if((ppp = pplookup(name)) == NULL) { @@ -310,13 +311,13 @@ void pp_del_define(const char *name) return; } + if(pp_status.debug) + printf("Deleting (%s, %d) <%s>\n", pp_status.input, pp_status.line_number, name); + free( ppp->ident ); free( ppp->subst.text ); free( ppp->filename ); - free_pp_entry( ppp, pphash(name) ); - - if(pp_status.debug) - printf("Deleted (%s, %d) <%s>\n", pp_status.input, pp_status.line_number, name); + free_pp_entry( ppp, idx ); } pp_entry_t *pp_add_define(const char *def, const char *text)

1 0

Matteo Bruni : wpp: Free the include filename on error (Valgrind).
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: efcaad3911858be0a52a3b0606ef20ff75b8b0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efcaad3911858be0a52a3b060… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 24 22:25:27 2014 +0200 wpp: Free the include filename on error (Valgrind). --- libs/wpp/ppl.l | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 70bd213..9655e34 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1586,6 +1586,7 @@ void pp_do_include(char *fname, int type) * If the define was deleted, then this entry would have * been deleted too. */ + free(fname); return; } } @@ -1595,6 +1596,7 @@ void pp_do_include(char *fname, int type) if(n <= 2) { ppy_error("Empty include filename"); + free(fname); return; } @@ -1604,6 +1606,7 @@ void pp_do_include(char *fname, int type) if((fp = pp_open_include(fname+1, type, pp_status.input, &newpath)) == NULL) { ppy_error("Unable to open include file %s", fname+1); + free(fname); return; }

1 0

Matteo Bruni : d3dcompiler/tests: Add a couple more checks for parent data values.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: 342eec7f7de223ebb1d350bab4c6900d7bea3bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=342eec7f7de223ebb1d350bab… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 24 22:25:30 2014 +0200 d3dcompiler/tests: Add a couple more checks for parent data values. --- dlls/d3dcompiler_43/compiler.c | 5 +++-- dlls/d3dcompiler_43/tests/asm.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index d09b5f6..114b4c1 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -145,11 +145,12 @@ static void wpp_warning(const char *file, int line, int col, const char *near, static char *wpp_lookup_mem(const char *filename, int type, const char *parent_name, char **include_path, int include_path_count) { - /* Here we return always ok. We will maybe fail on the next wpp_open_mem */ + /* We don't check for file existence here. We will potentially fail on + * the following wpp_open_mem(). */ char *path; int i; - TRACE("Looking for include %s.\n", debugstr_a(filename)); + TRACE("Looking for include %s, parent %s.\n", debugstr_a(filename), debugstr_a(parent_name)); parent_include = NULL; if (strcmp(parent_name, initial_filename)) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 331b864..618a541 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1446,12 +1446,14 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); CopyMemory(buffer, include, sizeof(include)); *bytes = sizeof(include); + ok(!parent_data, "Wrong parent_data value.\n"); } else if (!strcmp(filename, "incl2.vsh")) { buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2)); CopyMemory(buffer, include2, sizeof(include2)); *bytes = sizeof(include2); + ok(!parent_data, "Wrong parent_data value.\n"); ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type); } else if (!strcmp(filename, "incl3.vsh"))

1 0

Shuai Meng : vbscript: Implemented TypeName.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: 61d49a8a97ba5b18eff931ddfbf412ded583fb19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d49a8a97ba5b18eff931ddf… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Wed Jun 25 10:16:07 2014 +0800 vbscript: Implemented TypeName. --- dlls/vbscript/global.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5160374..5a12729 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1502,8 +1502,52 @@ static HRESULT Global_DatePart(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_TypeName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR ByteW[] = {'B', 'y', 't', 'e', 0}; + static const WCHAR IntegerW[] = {'I', 'n', 't', 'e', 'g', 'e', 'r', 0}; + static const WCHAR LongW[] = {'L', 'o', 'n', 'g', 0}; + static const WCHAR SingleW[] = {'S', 'i', 'n', 'g', 'l', 'e', 0}; + static const WCHAR DoubleW[] = {'D', 'o', 'u', 'b', 'l', 'e', 0}; + static const WCHAR CurrencyW[] = {'C', 'u', 'r', 'r', 'e', 'n', 'c', 'y', 0}; + static const WCHAR DecimalW[] = {'D', 'e', 'c', 'i', 'm', 'a', 'l', 0}; + static const WCHAR DateW[] = {'D', 'a', 't', 'e', 0}; + static const WCHAR StringW[] = {'S', 't', 'r', 'i', 'n', 'g', 0}; + static const WCHAR BooleanW[] = {'B', 'o', 'o', 'l', 'e', 'a', 'n', 0}; + static const WCHAR EmptyW[] = {'E', 'm', 'p', 't', 'y', 0}; + static const WCHAR NullW[] = {'N', 'u', 'l', 'l', 0}; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + switch(V_VT(arg)) { + case VT_UI1: + return return_string(res, ByteW); + case VT_I2: + return return_string(res, IntegerW); + case VT_I4: + return return_string(res, LongW); + case VT_R4: + return return_string(res, SingleW); + case VT_R8: + return return_string(res, DoubleW); + case VT_CY: + return return_string(res, CurrencyW); + case VT_DECIMAL: + return return_string(res, DecimalW); + case VT_DATE: + return return_string(res, DateW); + case VT_BSTR: + return return_string(res, StringW); + case VT_BOOL: + return return_string(res, BooleanW); + case VT_EMPTY: + return return_string(res, EmptyW); + case VT_NULL: + return return_string(res, NullW); + default: + FIXME("arg %s not supported\n", debugstr_variant(arg)); + return E_NOTIMPL; + } } static HRESULT Global_Array(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2cf9bb7..ded9b8b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -845,4 +845,16 @@ MyObject.myval = 0 Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) +Dim MyEmpty +Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) +Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) +Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) +Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) +Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) +Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) +Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) +Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) +Call ok(TypeName(MyEmpty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) +Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) + Call reportSuccess()

1 0

Grazvydas Ignotas : msvcrt: Clear _cnt on buffer flush.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: c6a160691afc0c7123d505c9baf0382b56a4fb45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a160691afc0c7123d505c9b… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:52 2014 +0300 msvcrt: Clear _cnt on buffer flush. --- dlls/msvcrt/file.c | 15 ++++++++------- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c1d9d6e..5a9edbe 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -595,7 +595,7 @@ static int msvcrt_flush_buffer(MSVCRT_FILE* file) return MSVCRT_EOF; } file->_ptr=file->_base; - file->_cnt=file->_bufsiz; + file->_cnt=0; } return 0; } @@ -3659,14 +3659,15 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(file->_bufsiz) { int res = 0; - if(file->_cnt <= 0) + if(file->_cnt <= 0) { res = msvcrt_flush_buffer(file); - if(!res) { - *file->_ptr++ = c; - file->_cnt--; + if(res) + return res; + file->_cnt=file->_bufsiz; } - - return res ? res : c&0xff; + *file->_ptr++ = c; + file->_cnt--; + return c&0xff; } else { unsigned char cc=c; int len; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 97e70f0..eb21697 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2239,7 +2239,7 @@ static void test_write_flush_size(FILE *file, int bufsize) */ lseek(fd, 1, SEEK_SET); fflush(file); - todo_wine ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); + ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize)

1 0

Grazvydas Ignotas : msvcrt: Implement bufsiz block flushing behavior.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: ad968be779fff244574eda83d101ab8393513bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad968be779fff244574eda83d… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:53 2014 +0300 msvcrt: Implement bufsiz block flushing behavior. --- dlls/msvcrt/file.c | 12 ++++++++++++ dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5a9edbe..b60e306 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3720,6 +3720,18 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si } written += wrcnt; wrcnt = 0; + } else if(file->_bufsiz && wrcnt >= file->_bufsiz) { + MSVCRT_size_t pcnt=(wrcnt / file->_bufsiz) * file->_bufsiz; + if(msvcrt_flush_buffer(file) == MSVCRT_EOF) + break; + + if(MSVCRT__write(file->_file, ptr, pcnt) <= 0) { + file->_flag |= MSVCRT__IOERR; + break; + } + written += pcnt; + wrcnt -= pcnt; + ptr = (const char*)ptr + pcnt; } else { if(MSVCRT__flsbuf(*(const char*)ptr, file) == MSVCRT_EOF) break; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index eb21697..422e41d 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2243,7 +2243,7 @@ static void test_write_flush_size(FILE *file, int bufsize) fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize) - todo_wine ok(memcmp(outbuffer, inbuffer, bufsize) == 0, "missing flush by %d byte write\n", size); + ok(memcmp(outbuffer, inbuffer, bufsize) == 0, "missing flush by %d byte write\n", size); else ok(memcmp(outbuffer, inbuffer, bufsize) != 0, "unexpected flush by %d byte write\n", size); }

1 0

Alexandre Julliard : opengl32: Make sure the function table is initialized in all threads.
by Alexandre Julliard 25 Jun '14

25 Jun '14

Module: wine Branch: master Commit: b72c8a7680ad2b5bc1963f63fd342f60ab445a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72c8a7680ad2b5bc1963f63f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 11:51:31 2014 +0200 opengl32: Make sure the function table is initialized in all threads. --- dlls/opengl32/wgl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9255e34..3a5e148 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1726,7 +1726,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); NtCurrentTeb()->glTable = &null_opengl_funcs; break; case DLL_THREAD_ATTACH:

1 0