September 2006 - Wine-commits

Alexandre Julliard : kernel: Better CPU detection on MacOS.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: abae1e81e4bc6bedccb032d1a581f5ab89d57df1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=abae1e81e4bc6bedccb032d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 17:45:32 2006 +0200 kernel: Better CPU detection on MacOS. --- dlls/kernel/cpu.c | 85 ++++++++++++++++++++++++++++------------------------- 1 files changed, 45 insertions(+), 40 deletions(-) diff --git a/dlls/kernel/cpu.c b/dlls/kernel/cpu.c index 40aedcd..70febe7 100644 --- a/dlls/kernel/cpu.c +++ b/dlls/kernel/cpu.c @@ -655,7 +655,8 @@ #elif defined (__APPLE__) unsigned long long longVal; int value; int cputype; - + char buffer[256]; + valSize = sizeof(int); if (sysctlbyname ("hw.optional.floatingpoint", &value, &valSize, NULL, 0) == 0) { @@ -675,13 +676,13 @@ #elif defined (__APPLE__) valSize = sizeof(int); if (sysctlbyname ("hw.cputype", &cputype, &valSize, NULL, 0) == 0) { - valSize = sizeof(int); - if (sysctlbyname ("hw.cpusubtype", &value, &valSize, NULL, 0) == 0) - { - switch (cputype) - { - case CPU_TYPE_POWERPC: - cachedsi.u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_PPC; + switch (cputype) + { + case CPU_TYPE_POWERPC: + cachedsi.u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_PPC; + valSize = sizeof(int); + if (sysctlbyname ("hw.cpusubtype", &value, &valSize, NULL, 0) == 0) + { switch (value) { case CPU_SUBTYPE_POWERPC_601: @@ -724,38 +725,42 @@ #elif defined (__APPLE__) break; default: break; } - break; /* CPU_TYPE_POWERPC */ - case CPU_TYPE_I386: - cachedsi.u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; - switch (value) - { - case CPU_SUBTYPE_386: - cachedsi.dwProcessorType = PROCESSOR_INTEL_386; - cachedsi.wProcessorLevel = 3; - break; - case CPU_SUBTYPE_486: - case CPU_SUBTYPE_486SX: - cachedsi.dwProcessorType = PROCESSOR_INTEL_486; - cachedsi.wProcessorLevel = 4; - break; - case CPU_SUBTYPE_586: - case CPU_SUBTYPE_PENTPRO: - cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; - cachedsi.wProcessorLevel = 5; - break; - case CPU_SUBTYPE_PENTII_M3: - case CPU_SUBTYPE_PENTII_M5: - cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; - cachedsi.wProcessorLevel = 5; - /* this should imply MMX */ - PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; - break; - default: break; - } - break; /* CPU_TYPE_I386 */ - default: break; - } /* switch (cputype) */ - } + } + break; /* CPU_TYPE_POWERPC */ + case CPU_TYPE_I386: + cachedsi.u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; + valSize = sizeof(int); + if (sysctlbyname ("machdep.cpu.family", &value, &valSize, NULL, 0) == 0) + { + cachedsi.wProcessorLevel = value; + switch (value) + { + case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386; break; + case 4: cachedsi.dwProcessorType = PROCESSOR_INTEL_486; break; + default: cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; break; + } + } + valSize = sizeof(int); + if (sysctlbyname ("machdep.cpu.model", &value, &valSize, NULL, 0) == 0) + cachedsi.wProcessorRevision = (value << 8); + valSize = sizeof(int); + if (sysctlbyname ("machdep.cpu.stepping", &value, &valSize, NULL, 0) == 0) + cachedsi.wProcessorRevision |= value; + valSize = sizeof(buffer); + if (sysctlbyname ("machdep.cpu.features", buffer, &valSize, NULL, 0) == 0) + { + cachedsi.wProcessorRevision |= value; + if (strstr(buffer,"CX8")) PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; + if (strstr(buffer,"MMX")) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; + if (strstr(buffer,"TSC")) PF[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE; + if (strstr(buffer,"3DNOW")) PF[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = TRUE; + if (strstr(buffer,"SSE")) PF[PF_XMMI_INSTRUCTIONS_AVAILABLE] = TRUE; + if (strstr(buffer,"SSE2")) PF[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = TRUE; + if (strstr(buffer,"PAE")) PF[PF_PAE_ENABLED] = TRUE; + } + break; /* CPU_TYPE_I386 */ + default: break; + } /* switch (cputype) */ } valSize = sizeof(longVal); if (!sysctlbyname("hw.cpufrequency", &longVal, &valSize, NULL, 0))

1 0

Alexandre Julliard : Makefile: Don't build all the tools before make depend , only build makedep itself.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: ade98b97f1550c0a0c30861f6aea841cf3b4d8d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ade98b97f1550c0a0c30861… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 15:43:59 2006 +0200 Makefile: Don't build all the tools before make depend, only build makedep itself. --- Makefile.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7fc3a75..df2acbb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -103,7 +103,10 @@ fonts/__install__ loader/__install__ ser programs/__install__: libs tools include dlls/__install-lib__ tools/__install-lib__ tools/__install-dev__: tools -$(SUBDIRS:%=%/__depend__): tools +depend $(SUBDIRS:%=%/__depend__): $(MAKEDEP) + +$(MAKEDEP): + @cd $(TOOLSDIR)/tools && $(MAKE) makedep # Test rules

1 0

Alexandre Julliard : winex11.drv: Avoid compile errors in the non-OpenGL case.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 5f7b77bb9174cca227d96c9b2d0588fba3919e7b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f7b77bb9174cca227d96c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 16:17:53 2006 +0200 winex11.drv: Avoid compile errors in the non-OpenGL case. --- dlls/winex11.drv/opengl.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 40aa89f..989ffcc 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1226,6 +1226,13 @@ HDC WINAPI X11DRV_wglGetCurrentDC(void) return 0; } +/* OpenGL32 wglGetCurrentReadDCARB */ +HDC WINAPI X11DRV_wglGetCurrentReadDCARB(void) +{ + ERR_(opengl)("No OpenGL support compiled in.\n"); + return 0; +} + /* OpenGL32 wglMakeCurrent */ BOOL WINAPI X11DRV_wglMakeCurrent(HDC hdc, HGLRC hglrc) { ERR_(opengl)("No OpenGL support compiled in.\n"); @@ -1246,7 +1253,7 @@ BOOL WINAPI X11DRV_wglShareLists(HGLRC h } /* WGL helper function which handles differences in glGetIntegerv from WGL and GLX */ -void X11DRV_wglGetIntegerv(GLenum pname, GLint* params) { +void X11DRV_wglGetIntegerv(int pname, int* params) { ERR_(opengl)("No OpenGL support compiled in.\n"); }

1 0

Alexandre Julliard : shell32: Don't build authors.c for make depend, it has no dependencies anyway.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 0a0f4cd835923272fd3b5529fef9bbbdf5fd70d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a0f4cd835923272fd3b552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 14:47:39 2006 +0200 shell32: Don't build authors.c for make depend, it has no dependencies anyway. --- dlls/shell32/Makefile.in | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index ccc6643..327508c 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -10,7 +10,6 @@ DELAYIMPORTS = ole32 oleaut32 EXTRALIBS = -luuid C_SRCS = \ - authors.c \ autocomplete.c \ brsfolder.c \ changenotify.c \ @@ -78,6 +77,8 @@ C_SRCS16 = shell.c RC_SRCS16 = version16.rc SPEC_SRCS16 = shell.spec +EXTRA_OBJS = authors.o + @MAKE_DLL_RULES@ # Special rules for 16-bit resource files @@ -93,8 +94,6 @@ authors.c: $(TOPSRCDIR)/AUTHORS sed -e '1,2d' -e 's/$.*$/ \"\1\",/' $(TOPSRCDIR)/AUTHORS && \ echo ' 0 };') >$@ || ($(RM) $@ && false) -depend: authors.c - clean:: $(RM) authors.c

1 0

Alexandre Julliard : Maketest.rules: Don't require testlist. c to be built before make depend.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 9953dd6ddfa1171a8771579d426aacf563c252dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9953dd6ddfa1171a8771579… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 15:43:38 2006 +0200 Maketest.rules: Don't require testlist.c to be built before make depend. --- dlls/Maketest.rules.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 36e71a1..a7095a5 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -13,16 +13,16 @@ DLLFLAGS = @DLLFLAGS@ DEFS = $(EXTRADEFS) MODULE = $(TESTDLL:%.dll=%)_test.exe -TESTLIST = testlist.c TESTRESULTS = $(CTESTS:.c=.ok) TESTPROGRAM = $(MODULE)$(DLLEXT) RUNTESTFLAGS = -q -P wine -M $(TESTDLL) -T $(TOPOBJDIR) -p $(TESTPROGRAM) -C_SRCS = $(CTESTS) $(TESTLIST) +C_SRCS = $(CTESTS) ALL_LIBS = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS) +EXTRA_OBJS = testlist.o CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe -CROSSOBJS = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) +CROSSOBJS = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) testlist.cross.o CROSSCC = @CROSSCC@ CROSSWINDRES = @CROSSWINDRES@ @@ -42,10 +42,10 @@ # Rules for .exe main module # Rules for building test list -$(TESTLIST): Makefile.in $(MAKECTESTS) +testlist.c: Makefile.in $(MAKECTESTS) $(MAKECTESTS) -o $@ $(CTESTS) -depend: $(TESTLIST) +testlist.o: testlist.c $(TOPSRCDIR)/include/wine/test.h # Rules for testing @@ -74,4 +74,4 @@ testclean:: $(RM) $(TESTRESULTS) clean:: - $(RM) $(MODULE) $(TESTLIST) $(TESTRESULTS) $(CROSSTEST) + $(RM) testlist.c $(MODULE) $(TESTRESULTS) $(CROSSTEST)

1 0

Alexandre Julliard : winetest: Store the test name as the resource name instead of in a separate string table .
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 5e0a81571f4a2bf1236d806d3cbdf0808832d7e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e0a81571f4a2bf1236d806… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 14:23:07 2006 +0200 winetest: Store the test name as the resource name instead of in a separate string table. --- programs/winetest/main.c | 57 ++++++++++++++++++++++++------------------ programs/winetest/maketest | 11 +------- programs/winetest/util.c | 7 +++++ programs/winetest/winetest.h | 1 + 4 files changed, 42 insertions(+), 34 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 20c25f4..796d542 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -57,6 +57,7 @@ struct rev_info char *tag = NULL; static struct wine_test *wine_tests; +static int nr_of_files, nr_of_tests; static struct rev_info *rev_infos = NULL; static const char whitespace[] = " \t\r\n"; @@ -220,13 +221,13 @@ static void extract_rev_infos (void) } } -static void* extract_rcdata (int id, int type, DWORD* size) +static void* extract_rcdata (LPTSTR name, int type, DWORD* size) { HRSRC rsrc; HGLOBAL hdl; LPVOID addr; - if (!(rsrc = FindResource (NULL, (LPTSTR)id, MAKEINTRESOURCE(type))) || + if (!(rsrc = FindResource (NULL, name, MAKEINTRESOURCE(type))) || !(*size = SizeofResource (0, rsrc)) || !(hdl = LoadResource (0, rsrc)) || !(addr = LockResource (hdl))) @@ -236,24 +237,18 @@ static void* extract_rcdata (int id, int /* Fills in the name and exename fields */ static void -extract_test (struct wine_test *test, const char *dir, int id) +extract_test (struct wine_test *test, const char *dir, LPTSTR res_name) { BYTE* code; DWORD size; FILE* fout; - int strlen, bufflen = 128; char *exepos; - code = extract_rcdata (id, TESTRES, &size); - if (!code) report (R_FATAL, "Can't find test resource %d: %d", - id, GetLastError ()); - test->name = xmalloc (bufflen); - while ((strlen = LoadStringA (NULL, id, test->name, bufflen)) - == bufflen - 1) { - bufflen *= 2; - test->name = xrealloc (test->name, bufflen); - } - if (!strlen) report (R_FATAL, "Can't read name of test %d.", id); + code = extract_rcdata (res_name, TESTRES, &size); + if (!code) report (R_FATAL, "Can't find test resource %s: %d", + res_name, GetLastError ()); + test->name = xstrdup( res_name ); + CharLowerA( test->name ); test->exename = strmake (NULL, "%s/%s", dir, test->name); exepos = strstr (test->name, "_test.exe"); if (!exepos) report (R_FATAL, "Not an .exe file: %s", test->name); @@ -351,7 +346,7 @@ run_ex (char *cmd, const char *out, DWOR } static void -get_subtests (const char *tempdir, struct wine_test *test, int id) +get_subtests (const char *tempdir, struct wine_test *test, LPTSTR res_name) { char *subname, *cmd; FILE *subfile; @@ -365,7 +360,7 @@ get_subtests (const char *tempdir, struc subname = tempnam (0, "sub"); if (!subname) report (R_FATAL, "Can't name subtests file."); - extract_test (test, tempdir, id); + extract_test (test, tempdir, res_name); cmd = strmake (NULL, "%s --list", test->exename); run_ex (cmd, subname, 5000); free (cmd); @@ -437,10 +432,21 @@ EnumTestFileProc (HMODULE hModule, LPCTS return TRUE; } +static BOOL CALLBACK +extract_test_proc (HMODULE hModule, LPCTSTR lpszType, + LPTSTR lpszName, LONG_PTR lParam) +{ + const char *tempdir = (const char *)lParam; + get_subtests( tempdir, &wine_tests[nr_of_files], lpszName ); + nr_of_tests += wine_tests[nr_of_files].subtest_count; + nr_of_files++; + return TRUE; +} + static char * run_tests (char *logname) { - int nr_of_files = 0, nr_of_tests = 0, i; + int i; char *tempdir, *shorttempdir; int logfile; char *strres, *eol, *nextline; @@ -481,17 +487,17 @@ run_tests (char *logname) report (R_DIR, tempdir); xprintf ("Version 3\n"); - strres = extract_rcdata (WINE_BUILD, STRINGRES, &strsize); + strres = extract_rcdata (MAKEINTRESOURCE(WINE_BUILD), STRINGRES, &strsize); xprintf ("Tests from build "); if (strres) xprintf ("%.*s", strsize, strres); else xprintf ("-\n"); - strres = extract_rcdata (TESTS_URL, STRINGRES, &strsize); + strres = extract_rcdata (MAKEINTRESOURCE(TESTS_URL), STRINGRES, &strsize); xprintf ("Archive: "); if (strres) xprintf ("%.*s", strsize, strres); else xprintf ("-\n"); xprintf ("Tag: %s\n", tag); xprintf ("Build info:\n"); - strres = extract_rcdata (BUILD_INFO, STRINGRES, &strsize); + strres = extract_rcdata (MAKEINTRESOURCE(BUILD_INFO), STRINGRES, &strsize); while (strres) { eol = memchr (strres, '\n', strsize); if (!eol) { @@ -518,10 +524,13 @@ run_tests (char *logname) report (R_STATUS, "Extracting tests"); report (R_PROGRESS, 0, nr_of_files); - for (i = 0; i < nr_of_files; i++) { - get_subtests (tempdir, wine_tests+i, i); - nr_of_tests += wine_tests[i].subtest_count; - } + nr_of_files = 0; + nr_of_tests = 0; + if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), + extract_test_proc, (LPARAM)tempdir)) + report (R_FATAL, "Can't enumerate test files: %d", + GetLastError ()); + report (R_DELTA, 0, "Extracting: Done"); report (R_STATUS, "Running tests"); diff --git a/programs/winetest/maketest b/programs/winetest/maketest index 527a3b4..0f907d9 100755 --- a/programs/winetest/maketest +++ b/programs/winetest/maketest @@ -8,13 +8,6 @@ echo "#include \"resource.h\"" echo "STRINGTABLE {" i=0 -for test -do - echo "$i \"$test\"" - i=`expr $i + 1` -done - -i=0 cd $TOPSRCDIR if [ -d .git ] then @@ -32,9 +25,7 @@ done echo "}" -i=0 for test do - echo "$i TESTRES \"$test\"" - i=`expr $i + 1` + echo "$test TESTRES \"$test\"" done diff --git a/programs/winetest/util.c b/programs/winetest/util.c index 741245d..12c6073 100644 --- a/programs/winetest/util.c +++ b/programs/winetest/util.c @@ -40,6 +40,13 @@ void *xrealloc (void *op, size_t len) return p; } +char *xstrdup( const char *str ) +{ + char *res = strdup( str ); + if (!res) report (R_FATAL, "Out of memory."); + return res; +} + static char *vstrfmtmake (size_t *lenp, const char *fmt, va_list ap) { size_t size = 1000; diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index 168fc71..043e5ed 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -30,6 +30,7 @@ void fatal (const char* msg); void warning (const char* msg); void *xmalloc (size_t len); void *xrealloc (void *op, size_t len); +char *xstrdup( const char *str ); void xprintf (const char *fmt, ...); char *vstrmake (size_t *lenp, va_list ap); char *strmake (size_t *lenp, ...);

1 0

Alexandre Julliard : winetest: Generate the list of test resources in make_makefiles.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 534fac983d56f477a98e6f76903277061b71b94c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=534fac983d56f477a98e6f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 11 14:32:00 2006 +0200 winetest: Generate the list of test resources in make_makefiles. Only include test revision information in the distributed binary. --- programs/winetest/.gitignore | 2 programs/winetest/Makefile.in | 224 ++++++++++++++++++++--------------------- programs/winetest/dist.rc | 1 programs/winetest/maketest | 6 - programs/winetest/winetest.rc | 59 ++++++++++- tools/make_makefiles | 13 ++ 6 files changed, 180 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=534fac983d56f477a98…

1 0

Robert Shearman : ole32: Add a check for a condition where a stream has an invalid size
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: aa336618ecb0a2d76a6e49877c515691c694e4e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa336618ecb0a2d76a6e498… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Sep 11 11:15:01 2006 +0100 ole32: Add a check for a condition where a stream has an invalid size and so there aren't enough blocks in the chain to write data into. --- dlls/ole32/storage32.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 19f09fc..187ba0b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4656,6 +4656,14 @@ HRESULT BlockChainStream_WriteAt(BlockCh This->lastBlockNoInSequenceIndex = blockIndex; + /* BlockChainStream_SetSize should have already been called to ensure we have + * enough blocks in the chain to write into */ + if (blockIndex == BLOCK_END_OF_CHAIN) + { + ERR("not enough blocks in chain to write data\n"); + return STG_E_DOCFILECORRUPT; + } + /* * Here, I'm casting away the constness on the buffer variable * This is OK since we don't intend to modify that buffer.

1 0

Robert Shearman : ole32: Remove some assertions in the stuctured storage code by
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 106156cb7597cf6f077b6f4e9d7562d8932fd766 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=106156cb7597cf6f077b6f4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Sep 11 11:14:25 2006 +0100 ole32: Remove some assertions in the stuctured storage code by returning error codes to the caller and by handling the error condition. --- dlls/ole32/storage32.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3860431..19f09fc 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3557,7 +3557,7 @@ BlockChainStream* Storage32Impl_SmallBlo ULARGE_INTEGER size, offset; ULONG cbRead, cbWritten, cbTotalRead, cbTotalWritten; ULONG propertyIndex; - HRESULT resWrite; + HRESULT resWrite = S_OK; HRESULT resRead; StgProperty chainProperty; BYTE *buffer; @@ -3593,7 +3593,7 @@ BlockChainStream* Storage32Impl_SmallBlo { resRead = SmallBlockChainStream_ReadAt(*ppsbChain, offset, - DEF_SMALL_BLOCK_SIZE, + This->smallBlockSize, buffer, &cbRead); if (FAILED(resRead)) @@ -3618,7 +3618,12 @@ BlockChainStream* Storage32Impl_SmallBlo } while (cbRead > 0); HeapFree(GetProcessHeap(),0,buffer); - assert(cbTotalRead == cbTotalWritten); + if (FAILED(resRead) || FAILED(resWrite)) + { + ERR("conversion failed: resRead = 0x%08lx, resWrite = 0x%08lx\n", resRead, resWrite); + BlockChainStream_Destroy(bbTempChain); + return NULL; + } /* * Destroy the small block chain. @@ -5319,8 +5324,6 @@ HRESULT SmallBlockChainStream_ReadAt( if (FAILED(rc)) return rc; - assert(bytesReadFromBigBlockFile == bytesToReadInBuffer); - /* * Step to the next big block. */ @@ -5328,10 +5331,10 @@ HRESULT SmallBlockChainStream_ReadAt( if(FAILED(rc)) return STG_E_DOCFILECORRUPT; - bufferWalker += bytesToReadInBuffer; - size -= bytesToReadInBuffer; - *bytesRead += bytesToReadInBuffer; - offsetInBlock = 0; /* There is no offset on the next block */ + bufferWalker += bytesReadFromBigBlockFile; + size -= bytesReadFromBigBlockFile; + *bytesRead += bytesReadFromBigBlockFile; + offsetInBlock = (offsetInBlock + bytesReadFromBigBlockFile) % This->parentStorage->smallBlockSize; } return (size == 0) ? S_OK : STG_E_READFAULT; @@ -5358,7 +5361,7 @@ HRESULT SmallBlockChainStream_WriteAt( ULONG offsetInBlock = offset.u.LowPart % This->parentStorage->smallBlockSize; ULONG bytesToWriteInBuffer; ULONG blockIndex; - ULONG bytesWrittenFromBigBlockFile; + ULONG bytesWrittenToBigBlockFile; const BYTE* bufferWalker; HRESULT res; @@ -5412,22 +5415,20 @@ HRESULT SmallBlockChainStream_WriteAt( offsetInBigBlockFile, bytesToWriteInBuffer, bufferWalker, - &bytesWrittenFromBigBlockFile); + &bytesWrittenToBigBlockFile); if (FAILED(res)) return res; - assert(bytesWrittenFromBigBlockFile == bytesToWriteInBuffer); - /* * Step to the next big block. */ if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex))) return FALSE; - bufferWalker += bytesToWriteInBuffer; - size -= bytesToWriteInBuffer; - *bytesWritten += bytesToWriteInBuffer; - offsetInBlock = 0; /* There is no offset on the next block */ + bufferWalker += bytesWrittenToBigBlockFile; + size -= bytesWrittenToBigBlockFile; + *bytesWritten += bytesWrittenToBigBlockFile; + offsetInBlock = (offsetInBlock + bytesWrittenToBigBlockFile) % This->parentStorage->smallBlockSize; } return (size == 0) ? S_OK : STG_E_WRITEFAULT;

1 0

Robert Shearman : ole32: Convert the *_{Read, Write}At structured storage functions to
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 79f7318a119c4f0f45ecf45a1d5aa0035c0305c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=79f7318a119c4f0f45ecf45… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Sep 11 11:13:47 2006 +0100 ole32: Convert the *_{Read,Write}At structured storage functions to return HRESULTs instead of BOOLs so that errors can be properly propagated from lower levels. --- dlls/ole32/stg_stream.c | 23 +++++------ dlls/ole32/storage32.c | 100 +++++++++++++++++++++++++---------------------- dlls/ole32/storage32.h | 6 +-- 3 files changed, 67 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=79f7318a119c4f0f45e…

1 0