Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
42a30a69
Commit
42a30a69
authored
Feb 11, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Move l_intl.nls to a new nls directory.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
aa76bec2
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
42 additions
and
23 deletions
+42
-23
Makefile.in
Makefile.in
+1
-0
configure
configure
+3
-1
configure.ac
configure.ac
+2
-1
locale.c
dlls/ntdll/locale.c
+4
-6
Makefile.in
loader/Makefile.in
+0
-1
wine.inf.in
loader/wine.inf.in
+15
-12
Makefile.in
nls/Makefile.in
+2
-0
l_intl.nls
nls/l_intl.nls
+0
-0
make_makefiles
tools/make_makefiles
+13
-0
make_unicode
tools/make_unicode
+1
-1
makedep.c
tools/makedep.c
+1
-1
No files found.
Makefile.in
View file @
42a30a69
...
...
@@ -28,6 +28,7 @@ datadir = @datadir@
mandir
=
@mandir@
includedir
=
@includedir@
fontdir
=
${
datadir
}
/wine/fonts
nlsdir
=
${
datadir
}
/wine/nls
dlldir
=
${
libdir
}
/wine
top_srcdir
=
@top_srcdir@
top_builddir
=
@top_builddir@
...
...
configure
View file @
42a30a69
...
...
@@ -1714,6 +1714,7 @@ enable_port
enable_wine
enable_wpp
enable_loader
enable_nls
enable_po
enable_arp
enable_aspnet_regiis
...
...
@@ -21064,6 +21065,7 @@ wine_fn_config_makefile libs/port enable_port
wine_fn_config_makefile libs/wine enable_wine
wine_fn_config_makefile libs/wpp enable_wpp
wine_fn_config_makefile loader enable_loader
wine_fn_config_makefile nls enable_nls
wine_fn_config_makefile po enable_po
wine_fn_config_makefile programs/arp enable_arp
wine_fn_config_makefile programs/aspnet_regiis enable_aspnet_regiis
...
...
@@ -21250,10 +21252,10 @@ else
TOP_INSTALL_DEV
=
"
$TOP_INSTALL_DEV
include"
TOP_INSTALL_LIB
=
"
$TOP_INSTALL_LIB
\
fonts
\
loader/l_intl.nls
\
loader/wine.inf
\
loader/winebus.inf
\
loader/winehid.inf
\
nls
\
programs/msidb/msidb
\
programs/msiexec/msiexec
\
programs/notepad/notepad
\
...
...
configure.ac
View file @
42a30a69
...
...
@@ -3871,6 +3871,7 @@ WINE_CONFIG_MAKEFILE(libs/port)
WINE_CONFIG_MAKEFILE(libs/wine)
WINE_CONFIG_MAKEFILE(libs/wpp)
WINE_CONFIG_MAKEFILE(loader)
WINE_CONFIG_MAKEFILE(nls)
WINE_CONFIG_MAKEFILE(po)
WINE_CONFIG_MAKEFILE(programs/arp)
WINE_CONFIG_MAKEFILE(programs/aspnet_regiis)
...
...
@@ -4074,10 +4075,10 @@ else
TOP_INSTALL_DEV="$TOP_INSTALL_DEV include"
TOP_INSTALL_LIB="$TOP_INSTALL_LIB \
fonts \
loader/l_intl.nls \
loader/wine.inf \
loader/winebus.inf \
loader/winehid.inf \
nls \
programs/msidb/msidb \
programs/msiexec/msiexec \
programs/notepad/notepad \
...
...
dlls/ntdll/locale.c
View file @
42a30a69
...
...
@@ -316,8 +316,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file )
static
const
WCHAR
langfmtW
[]
=
{
'%'
,
'0'
,
'4'
,
'x'
,
0
};
static
const
WCHAR
winedatadirW
[]
=
{
'W'
,
'I'
,
'N'
,
'E'
,
'D'
,
'A'
,
'T'
,
'A'
,
'D'
,
'I'
,
'R'
,
0
};
static
const
WCHAR
winebuilddirW
[]
=
{
'W'
,
'I'
,
'N'
,
'E'
,
'B'
,
'U'
,
'I'
,
'L'
,
'D'
,
'D'
,
'I'
,
'R'
,
0
};
static
const
WCHAR
dataprefixW
[]
=
{
'\\'
,
0
};
static
const
WCHAR
buildprefixW
[]
=
{
'\\'
,
'l'
,
'o'
,
'a'
,
'd'
,
'e'
,
'r'
,
'\\'
,
0
};
static
const
WCHAR
dataprefixW
[]
=
{
'\\'
,
'n'
,
'l'
,
's'
,
'\\'
,
0
};
static
const
WCHAR
cpdefaultW
[]
=
{
'c'
,
'_'
,
'%'
,
'0'
,
'3'
,
'd'
,
'.'
,
'n'
,
'l'
,
's'
,
0
};
static
const
WCHAR
intlW
[]
=
{
'l'
,
'_'
,
'i'
,
'n'
,
't'
,
'l'
,
'.'
,
'n'
,
'l'
,
's'
,
0
};
static
const
WCHAR
normnfcW
[]
=
{
'n'
,
'o'
,
'r'
,
'm'
,
'n'
,
'f'
,
'c'
,
'.'
,
'n'
,
'l'
,
's'
,
0
};
...
...
@@ -332,7 +331,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file )
OBJECT_ATTRIBUTES
attr
;
UNICODE_STRING
nameW
,
valueW
;
WCHAR
buffer
[
MAX_PATH
],
value
[
10
];
const
WCHAR
*
name
=
NULL
,
*
prefix
=
buildprefixW
;
const
WCHAR
*
name
=
NULL
;
KEY_VALUE_PARTIAL_INFORMATION
*
info
;
/* get filename from registry */
...
...
@@ -413,16 +412,15 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file )
if
(
RtlQueryEnvironmentVariable_U
(
NULL
,
&
nameW
,
&
valueW
)
!=
STATUS_BUFFER_TOO_SMALL
)
{
RtlInitUnicodeString
(
&
nameW
,
winedatadirW
);
prefix
=
dataprefixW
;
if
(
RtlQueryEnvironmentVariable_U
(
NULL
,
&
nameW
,
&
valueW
)
!=
STATUS_BUFFER_TOO_SMALL
)
return
status
;
}
valueW
.
MaximumLength
=
valueW
.
Length
+
sizeof
(
build
prefixW
)
+
strlenW
(
name
)
*
sizeof
(
WCHAR
);
valueW
.
MaximumLength
=
valueW
.
Length
+
sizeof
(
data
prefixW
)
+
strlenW
(
name
)
*
sizeof
(
WCHAR
);
if
(
!
(
valueW
.
Buffer
=
RtlAllocateHeap
(
GetProcessHeap
(),
0
,
valueW
.
MaximumLength
)))
return
STATUS_NO_MEMORY
;
if
(
!
RtlQueryEnvironmentVariable_U
(
NULL
,
&
nameW
,
&
valueW
))
{
strcatW
(
valueW
.
Buffer
,
prefix
);
strcatW
(
valueW
.
Buffer
,
dataprefixW
);
strcatW
(
valueW
.
Buffer
,
name
);
valueW
.
Length
=
strlenW
(
valueW
.
Buffer
)
*
sizeof
(
WCHAR
);
InitializeObjectAttributes
(
&
attr
,
&
valueW
,
0
,
0
,
NULL
);
...
...
loader/Makefile.in
View file @
42a30a69
SOURCES
=
\
l_intl.nls
\
main.c
\
preloader.c
\
preloader_mac.c
\
...
...
loader/wine.inf.in
View file @
42a30a69
...
...
@@ -30,7 +30,7 @@ signature="$CHICAGO$"
RegisterDlls=RegisterDllsSection
WineFakeDlls=FakeDllsWin32,FakeDlls
UpdateInis=SystemIni
CopyFiles=
l_intl_section, inf_section
CopyFiles=
InfFiles,NlsFiles
AddReg=\
Classes,\
ContentIndex,\
...
...
@@ -54,7 +54,7 @@ AddReg=\
RegisterDlls=RegisterDllsSection
WineFakeDlls=FakeDllsWin32,FakeDlls
UpdateInis=SystemIni
CopyFiles=
l_intl_section, inf_section
CopyFiles=
InfFiles,NlsFiles
AddReg=\
Classes,\
ContentIndex,\
...
...
@@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection
WineFakeDlls=FakeDllsWin64,FakeDlls
WinePreInstall=Wow64
UpdateInis=SystemIni
CopyFiles=
l_intl_section, inf_section
CopyFiles=
InfFiles,NlsFiles
AddReg=\
Classes,\
ContentIndex,\
...
...
@@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection
WineFakeDlls=FakeDllsWin64,FakeDlls
WinePreInstall=Wow64
UpdateInis=SystemIni
CopyFiles=
l_intl_section, inf_section
CopyFiles=
InfFiles,NlsFiles
AddReg=\
Classes,\
ContentIndex,\
...
...
@@ -132,7 +132,7 @@ AddReg=\
[Wow64Install]
RegisterDlls=RegisterDllsSection
WineFakeDlls=FakeDllsWin32,FakeDllsWow64
CopyFiles=
l_intl_section
CopyFiles=
NlsFiles
AddReg=\
CurrentVersion,\
CurrentVersionWow64,\
...
...
@@ -3849,13 +3849,16 @@ HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x
HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001
HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001
[
DestinationDir
s]
l_intl_section = 11
inf_section = 17
[
InfFile
s]
winebus.inf
winehid.inf
[
l_intl_section
]
[
NlsFiles
]
l_intl.nls
[inf_section]
winebus.inf
winehid.inf
[WineSourceDirs]
NlsFiles=nls
[DestinationDirs]
InfFiles = 17
NlsFiles = 11
nls/Makefile.in
0 → 100644
View file @
42a30a69
SOURCES
=
\
l_intl.nls
loader
/l_intl.nls
→
nls
/l_intl.nls
View file @
42a30a69
File moved
tools/make_makefiles
View file @
42a30a69
...
...
@@ -74,6 +74,7 @@ my @source_vars = (
);
my
(
@makefiles
,
%
makefiles
);
my
@nls_files
;
sub
dirname
($)
{
...
...
@@ -389,6 +390,10 @@ sub assign_sources_to_makefiles(@)
{
next
unless
defined
$
{
$make
}{
"TESTDLL"
};
}
elsif
(
$name
=~
/\.nls$/
)
{
push
@nls_files
,
$name
if
$dir
eq
"nls"
;
}
elsif
(
$dir
ne
"loader"
)
# loader dir contains misc files
{
next
;
...
...
@@ -480,6 +485,13 @@ sub update_makefiles(@)
replace_in_file
(
"configure.ac"
,
'^WINE_CONFIG_MAKEFILE'
,
'^dnl End of auto-generated output commands\n$'
,
@lines
);
}
sub
update_wine_inf
()
{
my
@lines
;
push
@lines
,
"[NlsFiles]"
,
@nls_files
,
"\n"
;
replace_in_file
"loader/wine.inf.in"
,
'^\[NlsFiles\]'
,
'^$'
,
join
(
"\n"
,
@lines
);
}
my
$git_dir
=
$ENV
{
GIT_DIR
}
||
".git"
;
die
"needs to be run from a git checkout"
unless
-
d
$git_dir
;
...
...
@@ -496,3 +508,4 @@ foreach my $file (sort @makefiles)
assign_sources_to_makefiles
(
@all_files
);
update_makefiles
(
@makefiles
);
update_wine_inf
();
tools/make_unicode
View file @
42a30a69
...
...
@@ -2560,10 +2560,10 @@ dump_linebreak( "dlls/usp10/linebreak.c" );
dump_linebreak
(
"dlls/dwrite/linebreak.c"
);
dump_scripts
(
"dlls/dwrite/scripts"
);
dump_indic
(
"dlls/usp10/indicsyllable.c"
);
dump_intl_nls
(
"loader/l_intl.nls"
);
dump_vertical
(
"dlls/gdi32/vertical.c"
);
dump_vertical
(
"dlls/wineps.drv/vertical.c"
);
dump_nameprep
(
"dlls/kernel32/nameprep.c"
);
dump_intl_nls
(
"nls/l_intl.nls"
);
foreach
my
$file
(
@allfiles
)
{
handle_codepage_file
(
@
{
$file
}
);
}
...
...
tools/makedep.c
View file @
42a30a69
...
...
@@ -2921,7 +2921,7 @@ static void output_source_svg( struct makefile *make, struct incl_file *source,
static
void
output_source_nls
(
struct
makefile
*
make
,
struct
incl_file
*
source
,
const
char
*
obj
)
{
add_install_rule
(
make
,
source
->
name
,
source
->
name
,
strmake
(
"D$(
datadir)/wine
/%s"
,
source
->
name
));
strmake
(
"D$(
nlsdir)
/%s"
,
source
->
name
));
output_srcdir_symlink
(
make
,
strmake
(
"%s.nls"
,
obj
));
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment