Module: wine Branch: master Commit: 6528aff97ba74fad20571acae33228a893bb4a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6528aff97ba74fad20571acae3...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Jun 6 11:33:10 2013 +0200
joy.cpl: Return the correct id for the icon.
---
dlls/joy.cpl/joy.h | 2 ++ dlls/joy.cpl/main.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h index 16d7a0b..ec7af4f 100644 --- a/dlls/joy.cpl/joy.h +++ b/dlls/joy.cpl/joy.h @@ -94,6 +94,8 @@ struct JoystickData { #define IDC_FFSELECTCOMBO 2009 #define IDC_FFEFFECTLIST 2010
+#define ICO_MAIN 100 + /* constants */ #define TEST_POLL_TIME 100
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 8cb1824..d294e35 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -1009,6 +1009,7 @@ LONG CALLBACK CPlApplet(HWND hwnd, UINT command, LPARAM lParam1, LPARAM lParam2) { CPLINFO *appletInfo = (CPLINFO *) lParam2;
+ appletInfo->idIcon = ICO_MAIN; appletInfo->idName = IDS_CPL_NAME; appletInfo->idInfo = IDS_CPL_INFO; appletInfo->lData = 0;