← Back to branch summary

~ubuntu-branches/ubuntu/saucy/wine1.2/saucy

« back to all changes in this revision

Viewing changes to dlls/krnl386.exe16/file.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Ritchie
  • Date: 2010-12-06 00:21:37 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20101206002137-ywazcomhqf97iw3c
Tags: 1.2.2-0ubuntu1
https://launchpad.net/bugs/685474
https://launchpad.net/bugs/665270
* New upstream release (LP: #685474)
  - Support for animated cursors. 
  - Translation updates.
  - Various bug fixes. (LP: #665270)
* Add Japanese font aliases to workaround lack of fontconfig substitution
* Recommend requisite umefont as a default (same as Crossover)
* Conflict with "wine" << 1.2.1 to prevent upgrade failures from very old
  ppa packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dlls/krnl386.exe16/file.c
555
555
            ret = GetPrivateProfileSectionA( section, data, size, filename );
556
556
            if (!ret)
557
557
            {
558
 
                if (len) *buffer = 0;
559
558
                HeapFree( GetProcessHeap(), 0, data );
560
 
                return 0;
 
559
                return GetPrivateProfileStringA( section, entry, def_val, buffer, len, filename );
561
560
            }
562
561
            if (ret != size - 2) break;
563
562
            /* overflow, try again */