Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit19052a1

Browse files
ZackerySpytzzooba
authored andcommitted
bpo-37705: Improve the implementation of winerror_to_errno() (GH-15623)
winerror_to_errno() is no longer automatically generated.Do not rely on the old _dosmapperr() function.Add ERROR_NO_UNICODE_TRANSLATION (1113) -> EILSEQ.
1 parent5e5e951 commit19052a1

File tree

3 files changed

+138
-109
lines changed

3 files changed

+138
-109
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Improve the implementation of ``winerror_to_errno()``.

‎PC/errmap.h‎

Lines changed: 137 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,140 @@
1-
/* Generated file. Do not edit. */
2-
intwinerror_to_errno(intwinerror)
1+
int
2+
winerror_to_errno(intwinerror)
33
{
4-
switch(winerror) {
5-
case2:return2;
6-
case3:return2;
7-
case4:return24;
8-
case5:return13;
9-
case6:return9;
10-
case7:return12;
11-
case8:return12;
12-
case9:return12;
13-
case10:return7;
14-
case11:return8;
15-
case15:return2;
16-
case16:return13;
17-
case17:return18;
18-
case18:return2;
19-
case19:return13;
20-
case20:return13;
21-
case21:return13;
22-
case22:return13;
23-
case23:return13;
24-
case24:return13;
25-
case25:return13;
26-
case26:return13;
27-
case27:return13;
28-
case28:return13;
29-
case29:return13;
30-
case30:return13;
31-
case31:return13;
32-
case32:return13;
33-
case33:return13;
34-
case34:return13;
35-
case35:return13;
36-
case36:return13;
37-
case53:return2;
38-
case65:return13;
39-
case67:return2;
40-
case80:return17;
41-
case82:return13;
42-
case83:return13;
43-
case89:return11;
44-
case108:return13;
45-
case109:return32;
46-
case112:return28;
47-
case114:return9;
48-
case128:return10;
49-
case129:return10;
50-
case130:return9;
51-
case132:return13;
52-
case145:return41;
53-
case158:return13;
54-
case161:return2;
55-
case164:return11;
56-
case167:return13;
57-
case183:return17;
58-
case188:return8;
59-
case189:return8;
60-
case190:return8;
61-
case191:return8;
62-
case192:return8;
63-
case193:return8;
64-
case194:return8;
65-
case195:return8;
66-
case196:return8;
67-
case197:return8;
68-
case198:return8;
69-
case199:return8;
70-
case200:return8;
71-
case201:return8;
72-
case202:return8;
73-
case206:return2;
74-
case215:return11;
75-
case232:return32;
76-
case267:return20;
77-
case1816:return12;
78-
default:returnEINVAL;
4+
// Unwrap FACILITY_WIN32 HRESULT errors.
5+
if ((winerror&0xFFFF0000)==0x80070000) {
6+
winerror &=0x0000FFFF;
7+
}
8+
9+
// Winsock error codes (10000-11999) are errno values.
10+
if (winerror >=10000&&winerror<12000) {
11+
switch (winerror) {
12+
caseWSAEINTR:
13+
caseWSAEBADF:
14+
caseWSAEACCES:
15+
caseWSAEFAULT:
16+
caseWSAEINVAL:
17+
caseWSAEMFILE:
18+
// Winsock definitions of errno values. See WinSock2.h
19+
returnwinerror-10000;
20+
default:
21+
returnwinerror;
22+
}
23+
}
24+
25+
switch (winerror) {
26+
caseERROR_FILE_NOT_FOUND:// 2
27+
caseERROR_PATH_NOT_FOUND:// 3
28+
caseERROR_INVALID_DRIVE:// 15
29+
caseERROR_NO_MORE_FILES:// 18
30+
caseERROR_BAD_NETPATH:// 53
31+
caseERROR_BAD_NET_NAME:// 67
32+
caseERROR_BAD_PATHNAME:// 161
33+
caseERROR_FILENAME_EXCED_RANGE:// 206
34+
returnENOENT;
35+
36+
caseERROR_BAD_ENVIRONMENT:// 10
37+
returnE2BIG;
38+
39+
caseERROR_BAD_FORMAT:// 11
40+
caseERROR_INVALID_STARTING_CODESEG:// 188
41+
caseERROR_INVALID_STACKSEG:// 189
42+
caseERROR_INVALID_MODULETYPE:// 190
43+
caseERROR_INVALID_EXE_SIGNATURE:// 191
44+
caseERROR_EXE_MARKED_INVALID:// 192
45+
caseERROR_BAD_EXE_FORMAT:// 193
46+
caseERROR_ITERATED_DATA_EXCEEDS_64k:// 194
47+
caseERROR_INVALID_MINALLOCSIZE:// 195
48+
caseERROR_DYNLINK_FROM_INVALID_RING:// 196
49+
caseERROR_IOPL_NOT_ENABLED:// 197
50+
caseERROR_INVALID_SEGDPL:// 198
51+
caseERROR_AUTODATASEG_EXCEEDS_64k:// 199
52+
caseERROR_RING2SEG_MUST_BE_MOVABLE:// 200
53+
caseERROR_RELOC_CHAIN_XEEDS_SEGLIM:// 201
54+
caseERROR_INFLOOP_IN_RELOC_CHAIN:// 202
55+
returnENOEXEC;
56+
57+
caseERROR_INVALID_HANDLE:// 6
58+
caseERROR_INVALID_TARGET_HANDLE:// 114
59+
caseERROR_DIRECT_ACCESS_HANDLE:// 130
60+
returnEBADF;
61+
62+
caseERROR_WAIT_NO_CHILDREN:// 128
63+
caseERROR_CHILD_NOT_COMPLETE:// 129
64+
returnECHILD;
65+
66+
caseERROR_NO_PROC_SLOTS:// 89
67+
caseERROR_MAX_THRDS_REACHED:// 164
68+
caseERROR_NESTING_NOT_ALLOWED:// 215
69+
returnEAGAIN;
70+
71+
caseERROR_ARENA_TRASHED:// 7
72+
caseERROR_NOT_ENOUGH_MEMORY:// 8
73+
caseERROR_INVALID_BLOCK:// 9
74+
caseERROR_NOT_ENOUGH_QUOTA:// 1816
75+
returnENOMEM;
76+
77+
caseERROR_ACCESS_DENIED:// 5
78+
caseERROR_CURRENT_DIRECTORY:// 16
79+
caseERROR_WRITE_PROTECT:// 19
80+
caseERROR_BAD_UNIT:// 20
81+
caseERROR_NOT_READY:// 21
82+
caseERROR_BAD_COMMAND:// 22
83+
caseERROR_CRC:// 23
84+
caseERROR_BAD_LENGTH:// 24
85+
caseERROR_SEEK:// 25
86+
caseERROR_NOT_DOS_DISK:// 26
87+
caseERROR_SECTOR_NOT_FOUND:// 27
88+
caseERROR_OUT_OF_PAPER:// 28
89+
caseERROR_WRITE_FAULT:// 29
90+
caseERROR_READ_FAULT:// 30
91+
caseERROR_GEN_FAILURE:// 31
92+
caseERROR_SHARING_VIOLATION:// 32
93+
caseERROR_LOCK_VIOLATION:// 33
94+
caseERROR_WRONG_DISK:// 34
95+
caseERROR_SHARING_BUFFER_EXCEEDED:// 36
96+
caseERROR_NETWORK_ACCESS_DENIED:// 65
97+
caseERROR_CANNOT_MAKE:// 82
98+
caseERROR_FAIL_I24:// 83
99+
caseERROR_DRIVE_LOCKED:// 108
100+
caseERROR_SEEK_ON_DEVICE:// 132
101+
caseERROR_NOT_LOCKED:// 158
102+
caseERROR_LOCK_FAILED:// 167
103+
case35:// 35 (undefined)
104+
returnEACCES;
105+
106+
caseERROR_FILE_EXISTS:// 80
107+
caseERROR_ALREADY_EXISTS:// 183
108+
returnEEXIST;
109+
110+
caseERROR_NOT_SAME_DEVICE:// 17
111+
returnEXDEV;
112+
113+
caseERROR_DIRECTORY:// 267 (bpo-12802)
114+
returnENOTDIR;
115+
116+
caseERROR_TOO_MANY_OPEN_FILES:// 4
117+
returnEMFILE;
118+
119+
caseERROR_DISK_FULL:// 112
120+
returnENOSPC;
121+
122+
caseERROR_BROKEN_PIPE:// 109
123+
caseERROR_NO_DATA:// 232 (bpo-13063)
124+
returnEPIPE;
125+
126+
caseERROR_DIR_NOT_EMPTY:// 145
127+
returnENOTEMPTY;
128+
129+
caseERROR_NO_UNICODE_TRANSLATION:// 1113
130+
returnEILSEQ;
131+
132+
caseERROR_INVALID_FUNCTION:// 1
133+
caseERROR_INVALID_ACCESS:// 12
134+
caseERROR_INVALID_DATA:// 13
135+
caseERROR_INVALID_PARAMETER:// 87
136+
caseERROR_NEGATIVE_SEEK:// 131
137+
default:
138+
returnEINVAL;
79139
}
80140
}

‎PC/generrmap.c‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2026 Movatter.jp