Skip to content

Commit 34866f9

Browse files
jasonsandlinjasonsandlin
authored
Merge branch 'main' into user/scmunro/fix-curl-call-warning
2 parents d8d6b57 + 8409ab4 commit 34866f9

1 file changed

Lines changed: 79 additions & 82 deletions

File tree

‎Include/httpClient/pal.h‎

Lines changed: 79 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
#ifdef HC_UNITTEST_API
4141
#undef HC_UWP_API
4242
#define HC_UWP_API 1
43-
#endif
44-
45-
#define _HRESULTYPEDEF_(_sc) ((HRESULT)_sc)
43+
#endif
4644

4745
// Windows defines these as an inline function so they cannot be
4846
// used in a switch statement. (It would work if we required c++17 support)
@@ -72,7 +70,7 @@
7270
#endif
7371

7472
#ifndef HTTP_E_STATUS_429_TOO_MANY_REQUESTS
75-
#define HTTP_E_STATUS_429_TOO_MANY_REQUESTS _HRESULTYPEDEF_(0x801901ADL)
73+
#define HTTP_E_STATUS_429_TOO_MANY_REQUESTS _HRESULT_TYPEDEF_(0x801901ADL)
7674
#endif
7775

7876

@@ -88,14 +86,14 @@ typedef int32_t HRESULT;
8886
#define CALLBACK
8987

9088
#ifndef __cdecl
91-
#define __cdecl
89+
#define __cdecl
9290
#endif
9391

94-
#ifndef __stdcal
92+
#ifndef __stdcall
9593
#define __stdcall
9694
#endif
9795

98-
#ifndef __forceinline
96+
#ifndef __forceinline
9997
#define __forceinline inline
10098
#endif
10199

@@ -136,64 +134,63 @@ typedef void* HANDLE;
136134
#define FACILITY_HTTP 25
137135

138136
#define _HRESULT_TYPEDEF_(_sc) ((HRESULT)_sc)
139-
#define _HRESULTYPEDEF_(_sc) ((HRESULT)_sc)
140137
#define __HRESULT_FROM_WIN32(x) ((HRESULT)(x) <= 0 ? ((HRESULT)(x)) : ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)))
141138

142-
#define S_OK ((HRESULT)0L)
143-
#define E_NOTIMPL _HRESULTYPEDEF_(0x80004001L)
144-
#define E_OUTOFMEMORY _HRESULTYPEDEF_(0x8007000EL)
145-
#define E_INVALIDARG _HRESULTYPEDEF_(0x80070057L)
146-
#define E_ABORT _HRESULTYPEDEF_(0x80004004L)
147-
#define E_FAIL _HRESULTYPEDEF_(0x80004005L)
148-
#define E_ACCESSDENIED _HRESULTYPEDEF_(0x80070005L)
149-
#define E_HANDLE _HRESULTYPEDEF_(0x80070006L)
150-
#define E_PENDING _HRESULTYPEDEF_(0x8000000AL)
151-
#define E_UNEXPECTED _HRESULTYPEDEF_(0x8000FFFFL)
152-
#define E_POINTER _HRESULTYPEDEF_(0x80004003L)
153-
#define E_TIME_CRITICAL_THREAD _HRESULTYPEDEF_(0x800701A0L)
154-
#define E_NO_TASK_QUEUE _HRESULTYPEDEF_(0x800701ABL)
155-
#define E_NOT_SUPPORTED _HRESULTYPEDEF_(0x80070032L)
156-
#define E_NOT_SUFFICIENT_BUFFER _HRESULTYPEDEF_(0x8007007AL)
157-
#define E_NOINTERFACE _HRESULTYPEDEF_(0x80004002L)
158-
#define E_BOUNDS _HRESULTYPEDEF_(0x8000000BL)
159-
#define E_ILLEGAL_METHOD_CALL _HRESULTYPEDEF_(0x8000000EL)
160-
#define HTTP_E_STATUS_AMBIGUOUS _HRESULTYPEDEF_(0x8019012CL)
161-
#define HTTP_E_STATUS_BAD_GATEWAY _HRESULTYPEDEF_(0x801901F6L)
162-
#define HTTP_E_STATUS_BAD_METHOD _HRESULTYPEDEF_(0x80190195L)
163-
#define HTTP_E_STATUS_BAD_REQUEST _HRESULTYPEDEF_(0x80190190L)
164-
#define HTTP_E_STATUS_CONFLICT _HRESULTYPEDEF_(0x80190199L)
165-
#define HTTP_E_STATUS_DENIED _HRESULTYPEDEF_(0x80190191L)
166-
#define HTTP_E_STATUS_EXPECTATION_FAILED _HRESULTYPEDEF_(0x801901A1L)
167-
#define HTTP_E_STATUS_429_TOO_MANY_REQUESTS _HRESULTYPEDEF_(0x801901ADL)
168-
#define HTTP_E_STATUS_FORBIDDEN _HRESULTYPEDEF_(0x80190193L)
169-
#define HTTP_E_STATUS_GATEWAY_TIMEOUT _HRESULTYPEDEF_(0x801901F8L)
170-
#define HTTP_E_STATUS_GONE _HRESULTYPEDEF_(0x8019019AL)
171-
#define HTTP_E_STATUS_LENGTH_REQUIRED _HRESULTYPEDEF_(0x8019019BL)
172-
#define HTTP_E_STATUS_MOVED _HRESULTYPEDEF_(0x8019012DL)
173-
#define HTTP_E_STATUS_NONE_ACCEPTABLE _HRESULTYPEDEF_(0x80190196L)
174-
#define HTTP_E_STATUS_NOT_FOUND _HRESULTYPEDEF_(0x80190194L)
175-
#define HTTP_E_STATUS_NOT_MODIFIED _HRESULTYPEDEF_(0x80190130L)
176-
#define HTTP_E_STATUS_NOT_SUPPORTED _HRESULTYPEDEF_(0x801901F5L)
177-
#define HTTP_E_STATUS_PAYMENT_REQ _HRESULTYPEDEF_(0x80190192L)
178-
#define HTTP_E_STATUS_PRECOND_FAILED _HRESULTYPEDEF_(0x8019019CL)
179-
#define HTTP_E_STATUS_PROXY_AUTH_REQ _HRESULTYPEDEF_(0x80190197L)
180-
#define HTTP_E_STATUS_RANGE_NOT_SATISFIABLE _HRESULTYPEDEF_(0x801901A0L)
181-
#define HTTP_E_STATUS_REDIRECT _HRESULTYPEDEF_(0x8019012EL)
182-
#define HTTP_E_STATUS_REDIRECT_KEEP_VERB _HRESULTYPEDEF_(0x80190133L)
183-
#define HTTP_E_STATUS_REDIRECT_METHOD _HRESULTYPEDEF_(0x8019012FL)
184-
#define HTTP_E_STATUS_REQUEST_TIMEOUT _HRESULTYPEDEF_(0x80190198L)
185-
#define HTTP_E_STATUS_REQUEST_TOO_LARGE _HRESULTYPEDEF_(0x8019019DL)
186-
#define HTTP_E_STATUS_SERVER_ERROR _HRESULTYPEDEF_(0x801901F4L)
187-
#define HTTP_E_STATUS_SERVICE_UNAVAIL _HRESULTYPEDEF_(0x801901F7L)
188-
#define HTTP_E_STATUS_UNEXPECTED _HRESULTYPEDEF_(0x80190001L)
189-
#define HTTP_E_STATUS_UNEXPECTED_SERVER_ERROR _HRESULTYPEDEF_(0x80190005L)
190-
#define HTTP_E_STATUS_UNSUPPORTED_MEDIA _HRESULTYPEDEF_(0x8019019FL)
191-
#define HTTP_E_STATUS_URI_TOO_LONG _HRESULTYPEDEF_(0x8019019EL)
192-
#define HTTP_E_STATUS_USE_PROXY _HRESULTYPEDEF_(0x80190131L)
193-
#define HTTP_E_STATUS_VERSION_NOT_SUP _HRESULTYPEDEF_(0x801901F9L)
194-
#define ONL_E_ACTION_REQUIRED _HRESULTYPEDEF_(0x8086000CL)
195-
#define WEB_E_INVALID_JSON_STRING _HRESULTYPEDEF_(0x83750007L)
196-
#define WEB_E_UNEXPECTED_CONTENT _HRESULTYPEDEF_(0x83750005L)
139+
#define S_OK _HRESULT_TYPEDEF_(0x00000000L)
140+
#define E_NOTIMPL _HRESULT_TYPEDEF_(0x80004001L)
141+
#define E_OUTOFMEMORY _HRESULT_TYPEDEF_(0x8007000EL)
142+
#define E_INVALIDARG _HRESULT_TYPEDEF_(0x80070057L)
143+
#define E_ABORT _HRESULT_TYPEDEF_(0x80004004L)
144+
#define E_FAIL _HRESULT_TYPEDEF_(0x80004005L)
145+
#define E_ACCESSDENIED _HRESULT_TYPEDEF_(0x80070005L)
146+
#define E_HANDLE _HRESULT_TYPEDEF_(0x80070006L)
147+
#define E_PENDING _HRESULT_TYPEDEF_(0x8000000AL)
148+
#define E_UNEXPECTED _HRESULT_TYPEDEF_(0x8000FFFFL)
149+
#define E_POINTER _HRESULT_TYPEDEF_(0x80004003L)
150+
#define E_TIME_CRITICAL_THREAD _HRESULT_TYPEDEF_(0x800701A0L)
151+
#define E_NO_TASK_QUEUE _HRESULT_TYPEDEF_(0x800701ABL)
152+
#define E_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80070032L)
153+
#define E_NOT_SUFFICIENT_BUFFER _HRESULT_TYPEDEF_(0x8007007AL)
154+
#define E_NOINTERFACE _HRESULT_TYPEDEF_(0x80004002L)
155+
#define E_BOUNDS _HRESULT_TYPEDEF_(0x8000000BL)
156+
#define E_ILLEGAL_METHOD_CALL _HRESULT_TYPEDEF_(0x8000000EL)
157+
#define HTTP_E_STATUS_AMBIGUOUS _HRESULT_TYPEDEF_(0x8019012CL)
158+
#define HTTP_E_STATUS_BAD_GATEWAY _HRESULT_TYPEDEF_(0x801901F6L)
159+
#define HTTP_E_STATUS_BAD_METHOD _HRESULT_TYPEDEF_(0x80190195L)
160+
#define HTTP_E_STATUS_BAD_REQUEST _HRESULT_TYPEDEF_(0x80190190L)
161+
#define HTTP_E_STATUS_CONFLICT _HRESULT_TYPEDEF_(0x80190199L)
162+
#define HTTP_E_STATUS_DENIED _HRESULT_TYPEDEF_(0x80190191L)
163+
#define HTTP_E_STATUS_EXPECTATION_FAILED _HRESULT_TYPEDEF_(0x801901A1L)
164+
#define HTTP_E_STATUS_429_TOO_MANY_REQUESTS _HRESULT_TYPEDEF_(0x801901ADL)
165+
#define HTTP_E_STATUS_FORBIDDEN _HRESULT_TYPEDEF_(0x80190193L)
166+
#define HTTP_E_STATUS_GATEWAY_TIMEOUT _HRESULT_TYPEDEF_(0x801901F8L)
167+
#define HTTP_E_STATUS_GONE _HRESULT_TYPEDEF_(0x8019019AL)
168+
#define HTTP_E_STATUS_LENGTH_REQUIRED _HRESULT_TYPEDEF_(0x8019019BL)
169+
#define HTTP_E_STATUS_MOVED _HRESULT_TYPEDEF_(0x8019012DL)
170+
#define HTTP_E_STATUS_NONE_ACCEPTABLE _HRESULT_TYPEDEF_(0x80190196L)
171+
#define HTTP_E_STATUS_NOT_FOUND _HRESULT_TYPEDEF_(0x80190194L)
172+
#define HTTP_E_STATUS_NOT_MODIFIED _HRESULT_TYPEDEF_(0x80190130L)
173+
#define HTTP_E_STATUS_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x801901F5L)
174+
#define HTTP_E_STATUS_PAYMENT_REQ _HRESULT_TYPEDEF_(0x80190192L)
175+
#define HTTP_E_STATUS_PRECOND_FAILED _HRESULT_TYPEDEF_(0x8019019CL)
176+
#define HTTP_E_STATUS_PROXY_AUTH_REQ _HRESULT_TYPEDEF_(0x80190197L)
177+
#define HTTP_E_STATUS_RANGE_NOT_SATISFIABLE _HRESULT_TYPEDEF_(0x801901A0L)
178+
#define HTTP_E_STATUS_REDIRECT _HRESULT_TYPEDEF_(0x8019012EL)
179+
#define HTTP_E_STATUS_REDIRECT_KEEP_VERB _HRESULT_TYPEDEF_(0x80190133L)
180+
#define HTTP_E_STATUS_REDIRECT_METHOD _HRESULT_TYPEDEF_(0x8019012FL)
181+
#define HTTP_E_STATUS_REQUEST_TIMEOUT _HRESULT_TYPEDEF_(0x80190198L)
182+
#define HTTP_E_STATUS_REQUEST_TOO_LARGE _HRESULT_TYPEDEF_(0x8019019DL)
183+
#define HTTP_E_STATUS_SERVER_ERROR _HRESULT_TYPEDEF_(0x801901F4L)
184+
#define HTTP_E_STATUS_SERVICE_UNAVAIL _HRESULT_TYPEDEF_(0x801901F7L)
185+
#define HTTP_E_STATUS_UNEXPECTED _HRESULT_TYPEDEF_(0x80190001L)
186+
#define HTTP_E_STATUS_UNEXPECTED_SERVER_ERROR _HRESULT_TYPEDEF_(0x80190005L)
187+
#define HTTP_E_STATUS_UNSUPPORTED_MEDIA _HRESULT_TYPEDEF_(0x8019019FL)
188+
#define HTTP_E_STATUS_URI_TOO_LONG _HRESULT_TYPEDEF_(0x8019019EL)
189+
#define HTTP_E_STATUS_USE_PROXY _HRESULT_TYPEDEF_(0x80190131L)
190+
#define HTTP_E_STATUS_VERSION_NOT_SUP _HRESULT_TYPEDEF_(0x801901F9L)
191+
#define ONL_E_ACTION_REQUIRED _HRESULT_TYPEDEF_(0x8086000CL)
192+
#define WEB_E_INVALID_JSON_STRING _HRESULT_TYPEDEF_(0x83750007L)
193+
#define WEB_E_UNEXPECTED_CONTENT _HRESULT_TYPEDEF_(0x83750005L)
197194

198195
#define ERROR_ARITHMETIC_OVERFLOW 534L
199196
#define ERROR_BAD_CONFIGURATION 1610L
@@ -218,83 +215,83 @@ typedef struct _LIST_ENTRY {
218215
((type *)((char*)(address) - (uintptr_t)(&((type *)0)->field)))
219216

220217
#ifndef _Field_size_
221-
#define _Field_size_(bytes)
218+
#define _Field_size_(bytes)
222219
#endif
223220

224221
#ifndef _Field_size_bytes_
225-
#define _Field_size_bytes_(bytes)
222+
#define _Field_size_bytes_(bytes)
226223
#endif
227224

228225
#ifndef _Field_size_bytes_opt_
229-
#define _Field_size_bytes_opt_(bytes)
226+
#define _Field_size_bytes_opt_(bytes)
230227
#endif
231228

232229
#ifndef _Field_size_opt_
233230
#define _Field_size_opt_(bytes)
234231
#endif
235232

236233
#ifndef _Field_z_
237-
#define _Field_z_
234+
#define _Field_z_
238235
#endif
239236

240237
#ifndef _In_
241238
#define _In_
242239
#endif
243240

244241
#ifndef _In_opt_
245-
#define _In_opt_
242+
#define _In_opt_
246243
#endif
247244

248245
#ifndef _In_opt_z_
249-
#define _In_opt_z_
246+
#define _In_opt_z_
250247
#endif
251248

252249
#ifndef _In_reads_
253-
#define _In_reads_(size)
250+
#define _In_reads_(size)
254251
#endif
255252

256253
#ifndef _In_reads_opt_
257-
#define _In_reads_opt_(size)
254+
#define _In_reads_opt_(size)
258255
#endif
259256

260257
#ifndef _In_reads_bytes_
261-
#define _In_reads_bytes_(size)
258+
#define _In_reads_bytes_(size)
262259
#endif
263260

264261
#ifndef _In_reads_bytes_opt_
265-
#define _In_reads_bytes_opt_(size)
262+
#define _In_reads_bytes_opt_(size)
266263
#endif
267264

268265
#ifndef _In_reads_z_
269-
#define _In_reads_z_(size)
266+
#define _In_reads_z_(size)
270267
#endif
271268

272269
#ifndef _In_z_
273-
#define _In_z_
270+
#define _In_z_
274271
#endif
275272

276273
#ifndef _Inout_
277-
#define _Inout_
274+
#define _Inout_
278275
#endif
279276

280277
#ifndef _Inout_updates_bytes_
281278
#define _Inout_updates_bytes_(size)
282279
#endif
283280

284281
#ifndef _Null_terminated_
285-
#define _Null_terminated_
282+
#define _Null_terminated_
286283
#endif
287284

288285
#ifndef _Out_
289-
#define _Out_
286+
#define _Out_
290287
#endif
291288

292289
#ifndef _Out_opt_
293-
#define _Out_opt_
290+
#define _Out_opt_
294291
#endif
295292

296293
#ifndef _Out_range_
297-
#define _Out_range_(x, y)
294+
#define _Out_range_(x, y)
298295
#endif
299296

300297
#ifndef _Out_writes_
@@ -350,15 +347,15 @@ typedef struct _LIST_ENTRY {
350347
#endif
351348

352349
#ifndef _Post_invalid_
353-
#define _Post_invalid_
350+
#define _Post_invalid_
354351
#endif
355352

356353
#ifndef _Post_writable_byte_size_
357354
#define _Post_writable_byte_size_(X)
358355
#endif
359356

360357
#ifndef _Printf_format_string_
361-
#define _Printf_format_string_
358+
#define _Printf_format_string_
362359
#endif
363360

364361
#ifndef _Ret_maybenull_

0 commit comments

Comments
 (0)