March 2018 - Wine-devel - list.winehq.org

[PATCH 1/2] appwiz.cpl: Introduce ARRAY_SIZE macro.
by Gijs Vermeulen 21 Mar '18

21 Mar '18

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/appwiz.cpl/appwiz.c | 24 ++++++++++++------------ dlls/appwiz.cpl/appwiz.h | 2 ++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 38075559b2..dae9df9035 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -161,7 +161,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) APPINFO *info = NULL; LPWSTR iconPtr; - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); for (i = 0; RegEnumKeyExW(root, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS; ++i) @@ -172,7 +172,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) && dwType == REG_DWORD && value == 1) { RegCloseKey(hkeyApp); - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); continue; } displen = 0; @@ -197,7 +197,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) else { RegCloseKey(hkeyApp); - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); continue; } @@ -308,7 +308,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) } RegCloseKey(hkeyApp); - sizeOfSubKeyName = sizeof(subKeyName) / sizeof(subKeyName[0]); + sizeOfSubKeyName = ARRAY_SIZE(subKeyName); } return TRUE; @@ -501,7 +501,7 @@ static void UninstallProgram(int id, DWORD button) BOOL res; LoadStringW(hInst, IDS_UNINSTALL_FAILED, sUninstallFailed, - sizeof(sUninstallFailed) / sizeof(sUninstallFailed[0])); + ARRAY_SIZE(sUninstallFailed)); LIST_FOR_EACH_ENTRY( iter, &app_list, APPINFO, entry ) { @@ -617,7 +617,7 @@ static INT_PTR CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, L /* Load our "not specified" string */ LoadStringW(hInst, IDS_NOT_SPECIFIED, notfound, - sizeof(notfound) / sizeof(notfound[0])); + ARRAY_SIZE(notfound)); /* Update the data for items already read into the structure */ SetInfoDialogText(NULL, iter->publisher, notfound, hWnd, @@ -712,7 +712,7 @@ static BOOL AddListViewColumns(HWND hWnd) lvc.mask = LVCF_FMT | LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH; /* Add the columns */ - for (i = 0; i < sizeof(columns) / sizeof(columns[0]); i++) + for (i = 0; i < ARRAY_SIZE(columns); i++) { lvc.iSubItem = i; lvc.pszText = buf; @@ -721,7 +721,7 @@ static BOOL AddListViewColumns(HWND hWnd) lvc.cx = columns[i].width; lvc.fmt = columns[i].fmt; - LoadStringW(hInst, columns[i].title, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInst, columns[i].title, buf, ARRAY_SIZE(buf)); if (ListView_InsertColumnW(hWnd, i, &lvc) == -1) return FALSE; @@ -938,10 +938,10 @@ static void StartApplet(HWND hWnd) WCHAR tab_title[MAX_STRING_LEN], app_title[MAX_STRING_LEN]; /* Load the strings we will use */ - LoadStringW(hInst, IDS_TAB1_TITLE, tab_title, sizeof(tab_title) / sizeof(tab_title[0])); - LoadStringW(hInst, IDS_CPL_TITLE, app_title, sizeof(app_title) / sizeof(app_title[0])); - LoadStringW(hInst, IDS_REMOVE, btnRemove, sizeof(btnRemove) / sizeof(btnRemove[0])); - LoadStringW(hInst, IDS_MODIFY_REMOVE, btnModifyRemove, sizeof(btnModifyRemove) / sizeof(btnModifyRemove[0])); + LoadStringW(hInst, IDS_TAB1_TITLE, tab_title, ARRAY_SIZE(tab_title)); + LoadStringW(hInst, IDS_CPL_TITLE, app_title, ARRAY_SIZE(app_title)); + LoadStringW(hInst, IDS_REMOVE, btnRemove, ARRAY_SIZE(btnRemove)); + LoadStringW(hInst, IDS_MODIFY_REMOVE, btnModifyRemove, ARRAY_SIZE(btnModifyRemove)); /* Fill out the PROPSHEETPAGE */ psp.dwSize = sizeof (PROPSHEETPAGEW); diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 2165ce11b1..d18d93aa5f 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -19,6 +19,8 @@ #include "wine/heap.h" #include "wine/unicode.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + typedef enum { ADDON_GECKO, ADDON_MONO -- 2.13.6

1 1

[PATCH] mshtml: Check if BSC is still attached to window before using it in OnRedirectVerifyCallback.
by Jacek Caban 20 Mar '18

20 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] vbscript/tests: Added named item ref count tests.
by Jacek Caban 20 Mar '18

20 Mar '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/run.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)

1 0

[PATCH] make_unicode: Implement Unicode decomposition.
by Sergio Gómez Del Real 20 Mar '18

20 Mar '18

Some notes: - The code is based on last year's GSoC project from Artur Świgoń. - Full decomposition is needed as part of the Unicode Normalization Algorithm, so this work is the first step to implement API functions such as NormalizeString(). - wine_decompose() was replaced by a more general function. Only code related to multi-byte character to wide character conversions used that function. Appropriate changes in mbtowc.c were made to call the new function, while the tests in tests/codepage.c still pass successfully. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- libs/port/mbtowc.c | 10 +- tools/make_unicode | 422 +++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 367 insertions(+), 65 deletions(-) diff --git a/libs/port/mbtowc.c b/libs/port/mbtowc.c index 4977c82d8b..d78bfe81e6 100644 --- a/libs/port/mbtowc.c +++ b/libs/port/mbtowc.c @@ -22,7 +22,7 @@ #include "wine/unicode.h" -extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) DECLSPEC_HIDDEN; +extern unsigned int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ); /* check the code whether it is in Unicode Private Use Area (PUA). */ /* MB_ERR_INVALID_CHARS raises an error converting from 1-byte character to PUA. */ @@ -107,13 +107,13 @@ static int mbstowcs_sbcs_decompose( const struct sbcs_table *table, int flags, { WCHAR dummy[4]; /* no decomposition is larger than 4 chars */ for (len = 0; srclen; srclen--, src++) - len += wine_decompose( cp2uni[*src], dummy, 4 ); + len += wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dummy, 4 ); return len; } for (len = dstlen; srclen && len; srclen--, src++) { - unsigned int res = wine_decompose( cp2uni[*src], dst, len ); + unsigned int res = wine_unicode_decompose_string( 0, &cp2uni[*src], 1, dst, len ); if (!res) break; len -= res; dst += res; @@ -219,7 +219,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - len += wine_decompose( ch, dummy, 4 ); + len += wine_unicode_decompose_string( 0, &ch, 1, dummy, 4 ); } return len; } @@ -234,7 +234,7 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, ch = cp2uni[(off << 8) + *src]; } else ch = cp2uni[*src]; - if (!(res = wine_decompose( ch, dst, len ))) break; + if (!(res = wine_unicode_decompose_string( 0, &ch, 1, dst, len ))) break; dst += res; len -= res; } diff --git a/tools/make_unicode b/tools/make_unicode index 92b0b64a94..3d224baa05 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -471,6 +471,26 @@ sub READ_DEFAULTS($) next if $decomp eq ""; # no decomposition, skip it + # store decomposition table + if ($decomp =~ /^<([a-zA-Z]+)>(\s+[0-9a-fA-F]+)+$/) + { + my @seq = (); + for my $ch (split /\s+/, (split /\s+/, $decomp, 2)[1]) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [1, \@seq]; + } + elsif ($decomp =~ /^([0-9a-fA-F]+)(\s+([0-9a-fA-F]+))*$/) + { + my @seq = (); + for my $ch (split /\s+/, $decomp) + { + push @seq, (hex $ch); + } + $decomp_table[$src] = [0, \@seq]; + } + if ($decomp =~ /^<([a-zA-Z]+)>\s+([0-9a-fA-F]+)$/) { # decomposition of the form "<foo> 1234" -> use char if type is known @@ -508,7 +528,6 @@ sub READ_DEFAULTS($) # store decomposition if it contains two chars if ($decomp =~ /^([0-9a-fA-F]+)\s+([0-9a-fA-F]+)$/) { - $decomp_table[$src] = [ hex $1, hex $2 ]; push @compose_table, [ hex $1, hex $2, $src ]; } elsif ($decomp =~ /^(<[a-z]+>\s)*([0-9a-fA-F]+)$/ && @@ -2258,6 +2277,51 @@ EOF save_file($filename); } +sub recursive_decomp +{ + my ($char, $table_ref, $compat) = @_; + + return ($char) unless defined $table_ref->[$char]; + my $data = $table_ref->[$char]; + return ($char) if $data->[0] && !$compat; + my @mapping = (); + for my $ch (@{$data->[1]}) + { + push @mapping, recursive_decomp( $ch, $table_ref, $compat ); + } + return @mapping; +} + +sub expand_pairs +{ + my @data = @_; + my @result = (); + + for my $ch (@data) + { + if ($ch <= 0xFFFF) + { + push @result, $ch; + } + elsif ($ch >= 2097152) # 2**21 + { + die sprintf "Invalid Unicode character %04x\n", $ch; + } + else + { + my $hx = $ch & 0xFFFF; + my $hu = ($ch >> 16) & ((1 << 5) - 1); + my $hw = ($hu - 1) & 0xFFFF; + my $hi = 0xD800 | ($hw << 6) | ($hx >> 10); + my $lx = $ch & 0xFFFF; + my $lo = (0xDC00 | ($lx & ((1 << 10) - 1))) & 0xFFFF; + push @result, $hi; + push @result, $lo; + } + } + return @result; +} + ################################################################ # dump the char decomposition table sub dump_decompose_table($) @@ -2266,98 +2330,336 @@ sub dump_decompose_table($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; - print OUTPUT "/* Unicode char composition */\n"; + print OUTPUT "/* Unicode char decomposition */\n"; print OUTPUT "/* generated from $UNIDATA/UnicodeData.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; - # first determine all the 16-char subsets that contain something + my $utflim = 2097152; + my %nfd_lookup = (); + my %nfkd_lookup = (); + my %decomp_lookup = (); + my @decomp_data = (0); + my $pos = 1; + my $lastchar_decomp; - my @filled = (0) x 4096; - my $pos = 16*2; # for the null subset - for (my $i = 0; $i < 65536; $i++) + for (my $i = 0; $i < $utflim; $i++) { next unless defined $decomp_table[$i]; - $filled[$i >> 4] = $pos; - $pos += 16*2; - $i |= 15; + + if (defined $decomp_table[$i]) + { + $lastchar_decomp = $i; + # fully expand input and mappings + + my @char = expand_pairs( ($i) ); + push @char, 0; + my $char = pack "n*", @char; + + my @nfd = recursive_decomp( $i, \@decomp_table, 0 ); + @nfd = expand_pairs( @nfd ); + push @nfd, 0; + my $nfd = pack "n*", @nfd; + + my @nfkd = recursive_decomp( $i, \@decomp_table, 1 ); + @nfkd = expand_pairs( @nfkd ); + push @nfkd, 0; + my $nfkd = pack "n*", @nfkd; + + # lookup or add mappings + + if ($nfd eq $char) + { + $nfd = undef; + } + elsif (exists $decomp_lookup{$nfd}) + { + $nfd_lookup{$i} = $decomp_lookup{$nfd}; + } + else + { + push @decomp_data, @nfd; + $decomp_lookup{$nfd} = $pos; + $nfd_lookup{$i} = $pos; + $pos += @nfd; + } + + if ($nfkd eq $char) + { + $nfkd = undef; + } + elsif (exists $decomp_lookup{$nfkd}) + { + $nfkd_lookup{$i} = $decomp_lookup{$nfkd}; + } + else + { + push @decomp_data, @nfkd; + $decomp_lookup{$nfkd} = $pos; + $nfkd_lookup{$i} = $pos; + $pos += @nfkd; + } + } } - my $total = $pos; - # now count the 256-char subsets that contain something + printf OUTPUT "static const UINT last_decomposable = 0x%x;\n\n", $lastchar_decomp; + + # dump decomposition data + + printf OUTPUT "static const WCHAR data_decomp[%d] =\n", $pos; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @decomp_data ); + print OUTPUT "\n};\n\n"; - my @filled_idx = (256) x 256; - $pos = 256 + 16; - for (my $i = 0; $i < 4096; $i++) + # find 256-char subsets that contain something + + my $filled_pos = 1; + my $filled_lim = ($lastchar_decomp >> 8) + 1; + my @filled = (0) x $filled_lim; + for (my $i = 0; $i < $utflim; $i++) { - next unless $filled[$i]; - $filled_idx[$i >> 4] = $pos; - $pos += 16; - $i |= 15; + last if $i > $lastchar_decomp; + next unless exists $nfd_lookup{$i} || exists $nfkd_lookup{$i}; + $filled[$i >> 8] = $filled_pos++; + $i |= 255; } - my $null_offset = $pos; # null mapping - $total += $pos; - # add the index offsets to the subsets positions + # dump index of 256-char subsets + + printf OUTPUT "static const BYTE idx1_decomp[%d] =\n", $filled_lim; + print OUTPUT "{\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%02x", 0, @filled ); + print OUTPUT "\n};\n\n"; + + # for 256-char subsets, find non-empty 16-char subsets - for (my $i = 0; $i < 4096; $i++) + my $sub_filled_pos = 1; + my %sub_filled = (); + for (my $i = 0; $i < $filled_lim; $i++) { next unless $filled[$i]; - $filled[$i] += $null_offset; + for (my $j = 0; $j < 256; $j++) + { + my $idx = ($i << 8) | $j; + next unless exists $nfd_lookup{$idx} || exists $nfkd_lookup{$idx}; + $sub_filled{$idx >> 4} = $sub_filled_pos++; + $j |= 15; + } } - # dump the main index + # dump index of 16-char subsets - printf OUTPUT "static const WCHAR table[%d] =\n", $total; - printf OUTPUT "{\n /* index */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @filled_idx ); - printf OUTPUT ",\n /* null sub-index */\n%s", DUMP_ARRAY( "0x%04x", 0, ($null_offset) x 16 ); - - # dump the second-level indexes - - for (my $i = 0; $i < 256; $i++) + printf OUTPUT "static const USHORT idx2_decomp[%d] =\n", $filled_pos * 16; + print OUTPUT "{\n"; + my @null_idx = (0) x 16; + print OUTPUT " /* null sub-index */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_idx ); + for (my $i = 0; $i < $filled_lim; $i++) { - next unless ($filled_idx[$i] > 256); - my @table = @filled[($i<<4)..($i<<4)+15]; - for (my $j = 0; $j < 16; $j++) { $table[$j] ||= $null_offset; } - printf OUTPUT ",\n /* sub-index %02x */\n", $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + next unless $filled[$i]; + printf OUTPUT ",\n /* sub-index 0x%02x */\n", $filled[$i]; + + my @sub_idx; + for (my $j = 0; $j < 16; $j++) + { + my $idx = ($i << 4) | $j; + $sub_idx[$j] = $sub_filled{$idx} || 0; + } + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_idx ); } + print OUTPUT "\n};\n\n"; # dump the 16-char subsets - printf OUTPUT ",\n /* null mapping */\n"; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, (0) x 32 ); - - for (my $i = 0; $i < 4096; $i++) + printf OUTPUT "static const USHORT offsets_decomp[%d] =\n", 32 * $sub_filled_pos; + print OUTPUT "{\n"; + print OUTPUT " /* (nfd, nfkd) x 16 */\n"; + my @null_table = (0) x 32; + print OUTPUT " /* no decomposition */\n"; + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @null_table ); + for my $key (sort {$a <=> $b} keys %sub_filled) { - next unless $filled[$i]; - my @table = (0) x 32; + printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $key, $key; + my @sub_table; for (my $j = 0; $j < 16; $j++) { - if (defined $decomp_table[($i<<4) + $j]) - { - $table[2 * $j] = ${$decomp_table[($i << 4) + $j]}[0]; - $table[2 * $j + 1] = ${$decomp_table[($i << 4) + $j]}[1]; - } + my $idx = ($key << 4) | $j; + $sub_table[2 * $j] = $nfd_lookup{$idx} || 0; + $sub_table[2 * $j + 1] = $nfkd_lookup{$idx} || 0; } - printf OUTPUT ",\n /* 0x%03x0 .. 0x%03xf */\n", $i, $i; - printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @table ); + printf OUTPUT "%s", DUMP_ARRAY( "0x%04x", 0, @sub_table ); } + print OUTPUT "\n};\n\n"; - printf OUTPUT "\n};\n\n"; print OUTPUT <<"EOF"; -unsigned int DECLSPEC_HIDDEN wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ) +static const WCHAR *unicode_table_lookup( UINT cp, int compat, const BYTE *idx1, UINT scale_idx1, + const USHORT *idx2, UINT scale_idx2, const USHORT *offsets, + UINT scale_off, const WCHAR *data ) { - const WCHAR *ptr = table + table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + 2 * (ch & 0xf); - unsigned int res; + USHORT a, b, c, d; + a = idx1[cp >> scale_idx1]; + b = idx2[(a << scale_idx2) + ((cp >> scale_idx2) & 0xf)]; + c = (b << scale_off) + ((cp & 0xf) << 1); + if (compat) ++c; + d = offsets[c]; + return &data[d]; +} - *dst = ch; - if (!*ptr) return 1; - if (dstlen <= 1) return 0; - /* apply the decomposition recursively to the first char */ - if ((res = wine_decompose( *ptr, dst, dstlen-1 ))) dst[res++] = ptr[1]; - return res; +static inline int decompose_hangul( WCHAR ch, WCHAR dst[4], int dstlen ) +{ + static const WCHAR sbase = 0xac00, lbase = 0x1100, vbase = 0x1161, tbase = 0x11a7; + static const WCHAR /*lcount = 19, vcount = 21,*/ tcount = 28, ncount = 588/*, scount = 11172*/; + WCHAR sindex, lindex, vindex, tindex; + if (ch >= 0xac00 && ch <= 0xd7af) + { + sindex = ch - sbase; + lindex = sindex / ncount; + vindex = (sindex % ncount) / tcount; + tindex = sindex % tcount; + dst[0] = lbase + lindex; + dst[1] = vbase + vindex; + dst[2] = (tindex > 0) ? (tbase + tindex) : 0; + dst[3] = 0; + } + else + { + dst[0] = ch; + dst[1] = 0; + } + + return 0; +} + +static inline UINT utf16_codepoint_to_surrogates( UINT cp ) +{ + UINT ch = cp; + + WCHAR hx, hw, lx; + UINT hu; + hx = (WCHAR)cp; + hu = (cp >> 16) & ((1 << 5) - 1); + hw = (WCHAR)hu - 1; + lx = (WCHAR)cp; + ch = 0xD800 | (hw << 6) | (hx >> 10); + ch |= (0xDC00 | (lx & ((1 << 10) - 1)))<<16; + + return ch; +} + +static inline UINT utf16_surrogates_to_codepoint( WCHAR hi, WCHAR lo ) +{ + UINT x, w, u, c; + x = ((hi & ((1 << 6) - 1)) << 10) | (lo & ((1 << 10) - 1)); + w = (hi >> 6) & ((1 << 5) - 1); + u = w + 1; + c = (u << 16) | x; + return c; +} + +static int decompose_char_recursive( int compat, UINT ch, WCHAR *dst, int dstlen ) +{ + const WCHAR *map = NULL; + int size_decomp = 0; + int total_decomp = 0; + + if (ch < 0xa0) /* fast path */ + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + else if (ch >= 0xac00 && ch <= 0xd7af) /* hangul */ + { + WCHAR dum[4]; + int len = 0, i = 0; + + decompose_hangul(ch, dum, dstlen); + while (dst[i]) + { + if (dstlen-i) dst[i] = dum[i]; + i++; + len++; + } + return len; + } + else if (ch > last_decomposable || + !*(map = unicode_table_lookup(ch, compat, idx1_decomp, 8, + idx2_decomp, 4, offsets_decomp, 5, data_decomp))) + { + if (ch > 0xffff) + { + ch = utf16_codepoint_to_surrogates(ch); + if (dstlen) *dst = (WCHAR)ch; + if (dstlen-1) *(dst+1) = (WCHAR)(ch>>16); + return 2; + } + else + { + if (dstlen) *dst = (WCHAR)ch; + return 1; + } + } + else { + while (*map) + { + size_decomp = decompose_char_recursive(compat, *map, dst, dstlen); + dstlen -= size_decomp; + if (dstlen < 0) dstlen = 0; + dst += size_decomp; + map++; + total_decomp += size_decomp; + } + return total_decomp; + } +} + +unsigned int wine_unicode_decompose_string( int compat, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +{ + UINT ch; + int srcpos = 0, dstpos = 0, r; + + if (srclen == -1) srclen = strlenW(src); + + if (dstlen < 0) dstlen = 0; + + while (srcpos < srclen) + { + ch = src[srcpos]; + + if (ch >= 0xd800 && ch <= 0xdbff) /* high surrogate */ + { + WCHAR hi, lo; + if (srcpos+1 == srclen) return srcpos; + hi = (WCHAR)ch; + lo = src[++srcpos]; + if (lo < 0xdc00 || lo > 0xdfff) return srcpos; + ch = utf16_surrogates_to_codepoint(hi, lo); + } + else if (ch >= 0xdc00 && ch <= 0xdfff) /* low surrogate */ + { + return srcpos; + } + + r = decompose_char_recursive(compat, ch, dst+dstpos, dstlen); + dstpos += r; + + if (dstlen > 0) + { + dstlen -= r; + if (dstlen <= 0) + { + while (dstlen < 0) + { + dstpos--; + dstlen++; + } + break; + } + } + + ++srcpos; + } + + return dstpos; } EOF close OUTPUT; -- 2.14.1

1 0

[PATCH 4/4] msvcp140: Add __uncaught_exceptions implementation
by Piotr Caban 20 Mar '18

20 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/exception.c | 7 +++++++ dlls/msvcp90/msvcp90.h | 4 ++++ dlls/msvcp90/msvcp_main.c | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-)

1 0

[PATCH 3/4] msvcrt: Fix __uncaught_exception implementation
by Piotr Caban 20 Mar '18

20 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/except.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 2/4] ucrtbase: Add __processing_throw implementation
by Piotr Caban 20 Mar '18

20 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/except.c | 9 +++++++++ dlls/msvcrt/except_i386.c | 6 ++++-- dlls/msvcrt/except_x86_64.c | 4 ++++ dlls/msvcrt/msvcrt.h | 1 + dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 7 files changed, 21 insertions(+), 5 deletions(-)

1 0

[PATCH 1/4] ucrtbase: Add __current_exception_context() implementation
by Piotr Caban 20 Mar '18

20 Mar '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcrt/except.c | 25 ++++++++++++++++------ dlls/msvcrt/except_i386.c | 10 ++++++--- dlls/msvcrt/except_x86_64.c | 20 ++++++++++------- dlls/msvcrt/msvcrt.h | 5 +++-- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 7 files changed, 43 insertions(+), 23 deletions(-)

1 0

[PATCH 4/5] wined3d: Merge wined3d_surface_upload_data() into texture2d_upload_data().
by Henri Verbeet 20 Mar '18

20 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 170 ++--------------------------------------- dlls/wined3d/texture.c | 149 +++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 5 -- 3 files changed, 154 insertions(+), 170 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 34f3ff3751e..3760abbff94 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -772,162 +772,11 @@ static void texture2d_download_data(struct wined3d_texture *texture, unsigned in heap_free(temporary_mem); } -/* This call just uploads data, the caller is responsible for binding the - * correct texture. */ -/* Context activation is done by the caller. */ -void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, - const struct wined3d_box *src_box, unsigned int src_pitch, unsigned int dst_x, unsigned int dst_y, - BOOL srgb, const struct wined3d_const_bo_address *data) -{ - unsigned int update_w = src_box->right - src_box->left; - unsigned int update_h = src_box->bottom - src_box->top; - unsigned int level, layer; - GLenum target; - - TRACE("texure %p, sub_resource_idx %u, gl_info %p, format %s, src_box %s, " - "src_pitch %u, dst_x %u, dst_y %u, srgb %#x, data {%#x:%p}.\n", - texture, sub_resource_idx, gl_info, debug_d3dformat(format->id), debug_box(src_box), - src_pitch, dst_x, dst_y, srgb, data->buffer_object, data->addr); - - if (texture->sub_resources[sub_resource_idx].map_count) - { - WARN("Uploading a texture that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); - texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; - } - - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_HEIGHT_SCALE) - { - update_h *= format->height_scale.numerator; - update_h /= format->height_scale.denominator; - } - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data->buffer_object)); - checkGLcall("glBindBuffer"); - } - - target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - level = sub_resource_idx % texture->level_count; - layer = sub_resource_idx / texture->level_count; - - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) - { - unsigned int dst_row_pitch, dst_slice_pitch; - const BYTE *addr = data->addr; - GLenum internal; - - addr += (src_box->top / format->block_height) * src_pitch; - addr += (src_box->left / format->block_width) * format->block_byte_count; - - if (srgb) - internal = format->glGammaInternal; - else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET - && wined3d_resource_is_offscreen(&texture->resource)) - internal = format->rtInternal; - else - internal = format->glInternal; - - wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); - - TRACE("Uploading compressed data, target %#x, level %u, layer %u, " - "x %u, y %u, w %u, h %u, format %#x, image_size %#x, addr %p.\n", - target, level, layer, dst_x, dst_y, update_w, update_h, internal, dst_slice_pitch, addr); - - if (dst_row_pitch == src_pitch) - { - if (target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, - layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); - } - else - { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, dst_y, - update_w, update_h, internal, dst_slice_pitch, addr)); - } - } - else - { - UINT row_count = (update_h + format->block_height - 1) / format->block_height; - UINT row, y; - - /* glCompressedTexSubImage2D() ignores pixel store state, so we - * can't use the unpack row length like for glTexSubImage2D. */ - for (row = 0, y = dst_y; row < row_count; ++row) - { - if (target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, - layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); - } - else - { - GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, - update_w, format->block_height, internal, dst_row_pitch, addr)); - } - - y += format->block_height; - addr += src_pitch; - } - } - checkGLcall("Upload compressed texture data"); - } - else - { - const BYTE *addr = data->addr; - - addr += src_box->top * src_pitch; - addr += src_box->left * format->byte_count; - - TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " - "format %#x, type %#x, addr %p.\n", - target, level, layer, dst_x, dst_y, - update_w, update_h, format->glFormat, format->glType, addr); - - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); - if (target == GL_TEXTURE_2D_ARRAY) - { - GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, - layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); - } - else - { - gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y, - update_w, update_h, format->glFormat, format->glType, addr); - } - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - checkGLcall("Upload texture data"); - } - - if (data->buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); - } - - if (wined3d_settings.strict_draw_ordering) - gl_info->gl_ops.gl.p_glFlush(); - - if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) - { - struct wined3d_device *device = texture->resource.device; - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - { - context_texture_update(device->contexts[i], texture); - } - } -} - static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_x, unsigned int dst_y, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) { unsigned int src_row_pitch, src_slice_pitch; - const struct wined3d_gl_info *gl_info; unsigned int src_level, dst_level; struct wined3d_context *context; struct wined3d_bo_address data; @@ -939,7 +788,6 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture src_texture, src_sub_resource_idx, debug_box(src_box)); context = context_acquire(dst_texture->resource.device, NULL, 0); - gl_info = context->gl_info; /* Only load the sub-resource for partial updates. For newly allocated * textures the texture wouldn't be the current location, and we'd upload @@ -959,8 +807,8 @@ static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture src_texture->sub_resources[src_sub_resource_idx].locations); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); - wined3d_surface_upload_data(dst_texture, dst_sub_resource_idx, gl_info, src_texture->resource.format, - src_box, src_row_pitch, dst_x, dst_y, FALSE, wined3d_const_bo_address(&data)); + wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, src_texture->resource.format, + src_box, wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, dst_x, dst_y, 0, FALSE); context_release(context); @@ -1239,7 +1087,6 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr const struct wined3d_format *src_format = src_texture->resource.format; struct wined3d_device *device = src_texture->resource.device; const struct d3dfmt_converter_desc *conv = NULL; - const struct wined3d_gl_info *gl_info = NULL; unsigned int src_row_pitch, src_slice_pitch; struct wined3d_context *context = NULL; struct wined3d_texture *dst_texture; @@ -1277,10 +1124,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr } if (device->d3d_initialized) - { context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; - } map_binding = src_texture->resource.map_binding; if (!wined3d_texture_load_location(src_texture, sub_resource_idx, context, map_binding)) @@ -1320,8 +1164,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr wined3d_texture_prepare_texture(dst_texture, context, FALSE); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - wined3d_surface_upload_data(dst_texture, 0, gl_info, src_format, - &src_box, src_row_pitch, 0, 0, FALSE, wined3d_const_bo_address(&src_data)); + wined3d_texture_upload_data(dst_texture, 0, context, src_format, &src_box, + wined3d_const_bo_address(&src_data), src_row_pitch, src_slice_pitch, 0, 0, 0, FALSE); wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, 0, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2269,6 +2113,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re format.upload(src_mem, dst_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, width, height, 1); src_row_pitch = dst_row_pitch; + src_slice_pitch = dst_slice_pitch; context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); data.buffer_object = 0; @@ -2295,14 +2140,15 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re conversion->convert(src_mem, src_row_pitch, dst_mem, dst_row_pitch, width, height, palette, &texture->async.gl_color_key); src_row_pitch = dst_row_pitch; + src_slice_pitch = dst_slice_pitch; context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); data.buffer_object = 0; data.addr = dst_mem; } - wined3d_surface_upload_data(texture, sub_resource_idx, gl_info, &format, &src_box, - src_row_pitch, 0, 0, srgb, wined3d_const_bo_address(&data)); + wined3d_texture_upload_data(texture, sub_resource_idx, context, &format, &src_box, + wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, 0, 0, 0, srgb); heap_free(dst_mem); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 29bcfb1e4df..e8f5af33635 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1753,13 +1753,156 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); } +/* This call just uploads data, the caller is responsible for binding the + * correct texture. */ +/* Context activation is done by the caller. */ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, - const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, + const struct wined3d_const_bo_address *data, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { - wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - format, src_box, row_pitch, dst_x, dst_y, srgb, data); + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int update_w = src_box->right - src_box->left; + unsigned int update_h = src_box->bottom - src_box->top; + unsigned int level, layer; + GLenum target; + + TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " + "src_row_pitch %#x, src_slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u, srgb %#x.\n", + texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), + data->buffer_object, data->addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); + + if (texture->sub_resources[sub_resource_idx].map_count) + { + WARN("Uploading a texture that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); + texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; + } + + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_HEIGHT_SCALE) + { + update_h *= format->height_scale.numerator; + update_h /= format->height_scale.denominator; + } + + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data->buffer_object)); + checkGLcall("glBindBuffer"); + } + + target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); + level = sub_resource_idx % texture->level_count; + layer = sub_resource_idx / texture->level_count; + + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + { + unsigned int dst_row_pitch, dst_slice_pitch; + const BYTE *addr = data->addr; + GLenum internal; + + addr += (src_box->top / format->block_height) * src_row_pitch; + addr += (src_box->left / format->block_width) * format->block_byte_count; + + if (srgb) + internal = format->glGammaInternal; + else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET + && wined3d_resource_is_offscreen(&texture->resource)) + internal = format->rtInternal; + else + internal = format->glInternal; + + wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + + TRACE("Uploading compressed data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " + "format %#x, image_size %#x, addr %p.\n", + target, level, layer, dst_x, dst_y, + update_w, update_h, internal, dst_slice_pitch, addr); + + if (dst_row_pitch == src_row_pitch) + { + if (target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, dst_y, + layer, update_w, update_h, 1, internal, dst_slice_pitch, addr)); + } + else + { + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, dst_y, + update_w, update_h, internal, dst_slice_pitch, addr)); + } + } + else + { + UINT row_count = (update_h + format->block_height - 1) / format->block_height; + UINT row, y; + + /* glCompressedTexSubImage2D() ignores pixel store state, so we + * can't use the unpack row length like for glTexSubImage2D. */ + for (row = 0, y = dst_y; row < row_count; ++row) + { + if (target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glCompressedTexSubImage3D(target, level, dst_x, y, + layer, update_w, format->block_height, 1, internal, dst_row_pitch, addr)); + } + else + { + GL_EXTCALL(glCompressedTexSubImage2D(target, level, dst_x, y, + update_w, format->block_height, internal, dst_row_pitch, addr)); + } + + y += format->block_height; + addr += src_row_pitch; + } + } + checkGLcall("Upload compressed texture data"); + } + else + { + const BYTE *addr = data->addr; + + addr += src_box->top * src_row_pitch; + addr += src_box->left * format->byte_count; + + TRACE("Uploading data, target %#x, level %u, layer %u, x %d, y %d, w %u, h %u, " + "format %#x, type %#x, addr %p.\n", + target, level, layer, dst_x, dst_y, + update_w, update_h, format->glFormat, format->glType, addr); + + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, src_row_pitch / format->byte_count); + if (target == GL_TEXTURE_2D_ARRAY) + { + GL_EXTCALL(glTexSubImage3D(target, level, dst_x, dst_y, + layer, update_w, update_h, 1, format->glFormat, format->glType, addr)); + } + else + { + gl_info->gl_ops.gl.p_glTexSubImage2D(target, level, dst_x, dst_y, + update_w, update_h, format->glFormat, format->glType, addr); + } + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + checkGLcall("Upload texture data"); + } + + if (data->buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } + + if (wined3d_settings.strict_draw_ordering) + gl_info->gl_ops.gl.p_glFlush(); + + if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) + { + struct wined3d_device *device = texture->resource.device; + unsigned int i; + + for (i = 0; i < device->context_count; ++i) + { + context_texture_update(device->contexts[i], texture); + } + } } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 580f35a924b..311e292d998 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3335,11 +3335,6 @@ struct fbo_entry } key; }; -void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, - const struct wined3d_box *src_box, unsigned int src_pitch, unsigned int dst_x, unsigned int dst_y, - BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; - void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Allow wined3d_texture_upload_data() to upload to WINED3D_LOCATION_TEXTURE_SRGB.
by Henri Verbeet 20 Mar '18

20 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/texture.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b08e91b1496..f7ae3be184f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2121,7 +2121,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, dst_texture->resource.format, &op->src_box, wined3d_const_bo_address(&addr), - row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front); + row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front, FALSE); wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2216,8 +2216,8 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_bind_and_dirtify(texture, context, FALSE); wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); - wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, - &src_box, &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front); + wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, &src_box, + &addr, op->data.row_pitch, op->data.slice_pitch, box->left, box->top, box->front, FALSE); wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 551d9fdfd3c..29bcfb1e4df 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1747,19 +1747,19 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { texture->texture_ops->texture_upload_data(texture, sub_resource_idx, context, - format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z); + format, src_box, data, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - format, src_box, row_pitch, dst_x, dst_y, FALSE, data); + format, src_box, row_pitch, dst_x, dst_y, srgb, data); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -2392,7 +2392,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) { unsigned int level = sub_resource_idx % texture->level_count; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2402,9 +2402,9 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int void *converted_mem = NULL; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " - "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u.\n", + "row_pitch %#x, slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u, srgb %#x.\n", texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), - data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z); + data->buffer_object, data->addr, row_pitch, slice_pitch, dst_x, dst_y, dst_z, srgb); if (src_box) { @@ -2520,7 +2520,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, - NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0); + NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); heap_free(data.addr); } @@ -2546,8 +2546,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, - texture->resource.format, NULL, &data, row_pitch, slice_pitch, 0, 0, 0); + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -2555,8 +2555,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, - texture->resource.format, NULL, &data, row_pitch, slice_pitch, 0, 0, 0); + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, + NULL, &data, row_pitch, slice_pitch, 0, 0, 0, FALSE); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e48f82ac70d..580f35a924b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3086,7 +3086,7 @@ struct wined3d_texture_ops void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, - unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z); + unsigned int slice_pitch, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); }; @@ -3287,7 +3287,7 @@ void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *tex void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *src_box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) DECLSPEC_HIDDEN; + unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; -- 2.11.0

1 0