@joebigelow / wix-1 / commits / 3afdaa29

Methods in thmtuil.h shouldn't be declared as EXTERN "C".

Sean Hall committed Jul 5, 2020 at 17:05 UTC 3afdaa298c9bd341c04472a739f2b28ac8c577ca
1 file changed +40 -40
src/dutil/inc/thmutil.h
+40 -40
@@ -299,7 +299,7 @@ struct THEME
299 ThemeInitialize - initialized theme management.
300
301 *******************************************************************/
302 -DAPI_(HRESULT) ThemeInitialize(
302 +HRESULT DAPI ThemeInitialize(
303 __in_opt HMODULE hModule
304 );
305
@@ -307,13 +307,13 @@ DAPI_(HRESULT) ThemeInitialize(
307 ThemeUninitialize - uninitialize theme management.
308
309 *******************************************************************/
310 -DAPI_(void) ThemeUninitialize();
310 +void DAPI ThemeUninitialize();
311
312 /********************************************************************
313 ThemeLoadFromFile - loads a theme from a loose file.
314
315 *******************************************************************/
316 -DAPI_(HRESULT) ThemeLoadFromFile(
316 +HRESULT DAPI ThemeLoadFromFile(
317 __in_z LPCWSTR wzThemeFile,
318 __out THEME** ppTheme
319 );
@@ -323,7 +323,7 @@ DAPI_(HRESULT) ThemeLoadFromFile(
323
324 NOTE: The resource data must be UTF-8 encoded.
325 *******************************************************************/
326 -DAPI_(HRESULT) ThemeLoadFromResource(
326 +HRESULT DAPI ThemeLoadFromResource(
327 __in_opt HMODULE hModule,
328 __in_z LPCSTR szResource,
329 __out THEME** ppTheme
@@ -333,7 +333,7 @@ DAPI_(HRESULT) ThemeLoadFromResource(
333 ThemeFree - frees any memory associated with a theme.
334
335 *******************************************************************/
336 -DAPI_(void) ThemeFree(
336 +void DAPI ThemeFree(
337 __in THEME* pTheme
338 );
339
@@ -342,7 +342,7 @@ ThemeRegisterVariableCallbacks - registers a context and callbacks
342 for working with variables.
343
344 *******************************************************************/
345 -DAPI_(HRESULT) ThemeRegisterVariableCallbacks(
345 +HRESULT DAPI ThemeRegisterVariableCallbacks(
346 __in THEME* pTheme,
347 __in_opt PFNTHM_EVALUATE_VARIABLE_CONDITION pfnEvaluateCondition,
348 __in_opt PFNTHM_FORMAT_VARIABLE_STRING pfnFormatString,
@@ -357,7 +357,7 @@ DAPI_(HRESULT) ThemeRegisterVariableCallbacks(
357 ThemeLoadControls - creates the windows for all the theme controls.
358
359 *******************************************************************/
360 -DAPI_(HRESULT) ThemeLoadControls(
360 +HRESULT DAPI ThemeLoadControls(
361 __in THEME* pTheme,
362 __in HWND hwndParent,
363 __in_ecount_opt(cAssignControlIds) const THEME_ASSIGN_CONTROL_ID* rgAssignControlIds,
@@ -369,7 +369,7 @@ DAPI_(HRESULT) ThemeLoadControls(
369 controls can be reloaded.
370
371 *******************************************************************/
372 -DAPI_(void) ThemeUnloadControls(
372 +void DAPI ThemeUnloadControls(
373 __in THEME* pTheme
374 );
375
@@ -377,12 +377,12 @@ DAPI_(void) ThemeUnloadControls(
377 ThemeLocalize - Localizes all of the strings in the theme.
378
379 *******************************************************************/
380 -DAPI_(HRESULT) ThemeLocalize(
380 +HRESULT DAPI ThemeLocalize(
381 __in THEME *pTheme,
382 __in const WIX_LOCALIZATION *pLocStringSet
383 );
384
385 -DAPI_(HRESULT) ThemeLoadStrings(
385 +HRESULT DAPI ThemeLoadStrings(
386 __in THEME* pTheme,
387 __in HMODULE hResModule
388 );
@@ -391,7 +391,7 @@ DAPI_(HRESULT) ThemeLoadStrings(
391 ThemeLoadRichEditFromFile - Attach a richedit control to a RTF file.
392
393 *******************************************************************/
394 -DAPI_(HRESULT) ThemeLoadRichEditFromFile(
394 +HRESULT DAPI ThemeLoadRichEditFromFile(
395 __in THEME* pTheme,
396 __in DWORD dwControl,
397 __in_z LPCWSTR wzFileName,
@@ -402,7 +402,7 @@ DAPI_(HRESULT) ThemeLoadRichEditFromFile(
402 ThemeLoadRichEditFromResource - Attach a richedit control to resource data.
403
404 *******************************************************************/
405 -DAPI_(HRESULT) ThemeLoadRichEditFromResource(
405 +HRESULT DAPI ThemeLoadRichEditFromResource(
406 __in THEME* pTheme,
407 __in DWORD dwControl,
408 __in_z LPCSTR szResourceName,
@@ -414,7 +414,7 @@ DAPI_(HRESULT) ThemeLoadRichEditFromResource(
414 HWND) to resource data.
415
416 *******************************************************************/
417 -DAPI_(HRESULT) ThemeLoadRichEditFromResourceToHWnd(
417 +HRESULT DAPI ThemeLoadRichEditFromResourceToHWnd(
418 __in HWND hWnd,
419 __in_z LPCSTR szResourceName,
420 __in HMODULE hModule
@@ -425,7 +425,7 @@ DAPI_(HRESULT) ThemeLoadRichEditFromResourceToHWnd(
425 accelerator table.
426
427 *******************************************************************/
428 -DAPI_(BOOL) ThemeHandleKeyboardMessage(
428 +BOOL DAPI ThemeHandleKeyboardMessage(
429 __in_opt THEME* pTheme,
430 __in HWND hWnd,
431 __in MSG* pMsg
@@ -447,7 +447,7 @@ LRESULT CALLBACK ThemeDefWindowProc(
447 ThemeGetPageIds - gets the page ids for the theme via page names.
448
449 *******************************************************************/
450 -DAPI_(void) ThemeGetPageIds(
450 +void DAPI ThemeGetPageIds(
451 __in const THEME* pTheme,
452 __in_ecount(cGetPages) LPCWSTR* rgwzFindNames,
453 __inout_ecount(cGetPages) DWORD* rgdwPageIds,
@@ -458,7 +458,7 @@ DAPI_(void) ThemeGetPageIds(
458 ThemeGetPage - gets a theme page by id.
459
460 *******************************************************************/
461 -DAPI_(THEME_PAGE*) ThemeGetPage(
461 +THEME_PAGE* DAPI ThemeGetPage(
462 __in const THEME* pTheme,
463 __in DWORD dwPage
464 );
@@ -467,7 +467,7 @@ DAPI_(THEME_PAGE*) ThemeGetPage(
467 ThemeShowPage - shows or hides all of the controls in the page at one time.
468
469 *******************************************************************/
470 -DAPI_(HRESULT) ThemeShowPage(
470 +HRESULT DAPI ThemeShowPage(
471 __in THEME* pTheme,
472 __in DWORD dwPage,
473 __in int nCmdShow
@@ -481,7 +481,7 @@ ThemeShowPageEx - shows or hides all of the controls in the page at one time.
481 showing a new page.
482
483 *******************************************************************/
484 -DAPI_(HRESULT) ThemeShowPageEx(
484 +HRESULT DAPI ThemeShowPageEx(
485 __in THEME* pTheme,
486 __in DWORD dwPage,
487 __in int nCmdShow,
@@ -493,7 +493,7 @@ DAPI_(HRESULT) ThemeShowPageEx(
493 ThemeShowChild - shows a control's specified child control, hiding the rest.
494
495 *******************************************************************/
496 -DAPI_(void) ThemeShowChild(
496 +void DAPI ThemeShowChild(
497 __in THEME* pTheme,
498 __in THEME_CONTROL* pParentControl,
499 __in DWORD dwIndex
@@ -503,7 +503,7 @@ DAPI_(void) ThemeShowChild(
503 ThemeControlExists - check if a control with the specified id exists.
504
505 *******************************************************************/
506 -DAPI_(BOOL) ThemeControlExists(
506 +BOOL DAPI ThemeControlExists(
507 __in const THEME* pTheme,
508 __in DWORD dwControl
509 );
@@ -512,7 +512,7 @@ DAPI_(BOOL) ThemeControlExists(
512 ThemeControlEnable - enables/disables a control.
513
514 *******************************************************************/
515 -DAPI_(void) ThemeControlEnable(
515 +void DAPI ThemeControlEnable(
516 __in THEME* pTheme,
517 __in DWORD dwControl,
518 __in BOOL fEnable
@@ -522,7 +522,7 @@ DAPI_(void) ThemeControlEnable(
522 ThemeControlEnabled - returns whether a control is enabled/disabled.
523
524 *******************************************************************/
525 -DAPI_(BOOL) ThemeControlEnabled(
525 +BOOL DAPI ThemeControlEnabled(
526 __in THEME* pTheme,
527 __in DWORD dwControl
528 );
@@ -531,7 +531,7 @@ DAPI_(BOOL) ThemeControlEnabled(
531 ThemeControlElevates - sets/removes the shield icon on a control.
532
533 *******************************************************************/
534 -DAPI_(void) ThemeControlElevates(
534 +void DAPI ThemeControlElevates(
535 __in THEME* pTheme,
536 __in DWORD dwControl,
537 __in BOOL fElevates
@@ -541,7 +541,7 @@ DAPI_(void) ThemeControlElevates(
541 ThemeShowControl - shows/hides a control.
542
543 *******************************************************************/
544 -DAPI_(void) ThemeShowControl(
544 +void DAPI ThemeShowControl(
545 __in THEME* pTheme,
546 __in DWORD dwControl,
547 __in int nCmdShow
@@ -552,7 +552,7 @@ ThemeShowControlEx - shows/hides a control with support for
552 conditional text and notes.
553
554 *******************************************************************/
555 -DAPI_(void) ThemeShowControlEx(
555 +void DAPI ThemeShowControlEx(
556 __in THEME* pTheme,
557 __in DWORD dwControl,
558 __in int nCmdShow
@@ -562,12 +562,12 @@ DAPI_(void) ThemeShowControlEx(
562 ThemeControlVisible - returns whether a control is visible.
563
564 *******************************************************************/
565 -DAPI_(BOOL) ThemeControlVisible(
565 +BOOL DAPI ThemeControlVisible(
566 __in THEME* pTheme,
567 __in DWORD dwControl
568 );
569
570 -DAPI_(BOOL) ThemePostControlMessage(
570 +BOOL DAPI ThemePostControlMessage(
571 __in THEME* pTheme,
572 __in DWORD dwControl,
573 __in UINT Msg,
@@ -575,7 +575,7 @@ DAPI_(BOOL) ThemePostControlMessage(
575 __in LPARAM lParam
576 );
577
578 -DAPI_(LRESULT) ThemeSendControlMessage(
578 +LRESULT DAPI ThemeSendControlMessage(
579 __in const THEME* pTheme,
580 __in DWORD dwControl,
581 __in UINT Msg,
@@ -587,7 +587,7 @@ DAPI_(LRESULT) ThemeSendControlMessage(
587 ThemeDrawBackground - draws the theme background.
588
589 *******************************************************************/
590 -DAPI_(HRESULT) ThemeDrawBackground(
590 +HRESULT DAPI ThemeDrawBackground(
591 __in THEME* pTheme,
592 __in PAINTSTRUCT* pps
593 );
@@ -596,7 +596,7 @@ DAPI_(HRESULT) ThemeDrawBackground(
596 ThemeDrawControl - draw an owner drawn control.
597
598 *******************************************************************/
599 -DAPI_(HRESULT) ThemeDrawControl(
599 +HRESULT DAPI ThemeDrawControl(
600 __in THEME* pTheme,
601 __in DRAWITEMSTRUCT* pdis
602 );
@@ -605,7 +605,7 @@ DAPI_(HRESULT) ThemeDrawControl(
605 ThemeHoverControl - mark a control as hover.
606
607 *******************************************************************/
608 -DAPI_(BOOL) ThemeHoverControl(
608 +BOOL DAPI ThemeHoverControl(
609 __in THEME* pTheme,
610 __in HWND hwndParent,
611 __in HWND hwndControl
@@ -616,7 +616,7 @@ DAPI_(BOOL) ThemeHoverControl(
616 really useful for checkbox controls.
617
618 *******************************************************************/
619 -DAPI_(BOOL) ThemeIsControlChecked(
619 +BOOL DAPI ThemeIsControlChecked(
620 __in THEME* pTheme,
621 __in DWORD dwControl
622 );
@@ -625,7 +625,7 @@ DAPI_(BOOL) ThemeIsControlChecked(
625 ThemeSetControlColor - sets the color of text for a control.
626
627 *******************************************************************/
628 -DAPI_(BOOL) ThemeSetControlColor(
628 +BOOL DAPI ThemeSetControlColor(
629 __in THEME* pTheme,
630 __in HDC hdc,
631 __in HWND hWnd,
@@ -637,7 +637,7 @@ DAPI_(BOOL) ThemeSetControlColor(
637 progress bar control.
638
639 *******************************************************************/
640 -DAPI_(HRESULT) ThemeSetProgressControl(
640 +HRESULT DAPI ThemeSetProgressControl(
641 __in THEME* pTheme,
642 __in DWORD dwControl,
643 __in DWORD dwProgressPercentage
@@ -648,7 +648,7 @@ DAPI_(HRESULT) ThemeSetProgressControl(
648 progress bar control.
649
650 *******************************************************************/
651 -DAPI_(HRESULT) ThemeSetProgressControlColor(
651 +HRESULT DAPI ThemeSetProgressControlColor(
652 __in THEME* pTheme,
653 __in DWORD dwControl,
654 __in DWORD dwColorIndex
@@ -658,7 +658,7 @@ DAPI_(HRESULT) ThemeSetProgressControlColor(
658 ThemeSetTextControl - sets the text of a control.
659
660 *******************************************************************/
661 -DAPI_(HRESULT) ThemeSetTextControl(
661 +HRESULT DAPI ThemeSetTextControl(
662 __in const THEME* pTheme,
663 __in DWORD dwControl,
664 __in_z_opt LPCWSTR wzText
@@ -669,7 +669,7 @@ ThemeSetTextControl - sets the text of a control and optionally
669 invalidates the control.
670
671 *******************************************************************/
672 -DAPI_(HRESULT) ThemeSetTextControlEx(
672 +HRESULT DAPI ThemeSetTextControlEx(
673 __in const THEME* pTheme,
674 __in DWORD dwControl,
675 __in BOOL fUpdate,
@@ -680,7 +680,7 @@ DAPI_(HRESULT) ThemeSetTextControlEx(
680 ThemeGetTextControl - gets the text of a control.
681
682 *******************************************************************/
683 -DAPI_(HRESULT) ThemeGetTextControl(
683 +HRESULT DAPI ThemeGetTextControl(
684 __in const THEME* pTheme,
685 __in DWORD dwControl,
686 __out_z LPWSTR* psczText
@@ -690,7 +690,7 @@ DAPI_(HRESULT) ThemeGetTextControl(
690 ThemeUpdateCaption - updates the caption in the theme.
691
692 *******************************************************************/
693 -DAPI_(HRESULT) ThemeUpdateCaption(
693 +HRESULT DAPI ThemeUpdateCaption(
694 __in THEME* pTheme,
695 __in_z LPCWSTR wzCaption
696 );
@@ -700,7 +700,7 @@ DAPI_(HRESULT) ThemeUpdateCaption(
700 enabled control if it is disabled.
701
702 *******************************************************************/
703 -DAPI_(void) ThemeSetFocus(
703 +void DAPI ThemeSetFocus(
704 __in THEME* pTheme,
705 __in DWORD dwControl
706 );