diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-20 09:03:20 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-20 09:03:20 +0000 |
| commit | 65461e7b4edb683cc09086fdaf49e0c2ef918bd4 (patch) | |
| tree | f30e221d6a79836b2f1426c26a5ecd24d803c172 | |
| parent | 18540e71624543fd0181b764a6913aa6bf8eb75d (diff) | |
sounds: part I
git-svn-id: http://svn.miranda-ng.org/main/trunk@499 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | include/m_skin.h | 3 | ||||
| -rw-r--r-- | plugins/UserInfoEx/svc_reminder.cpp | 2 | ||||
| -rw-r--r-- | src/modules/skin/sounds.cpp | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/m_skin.h b/include/m_skin.h index 0a5da39889..ea95e7c4b5 100644 --- a/include/m_skin.h +++ b/include/m_skin.h @@ -145,9 +145,6 @@ typedef struct { DWORD dwFlags;
} SKINSOUNDDESCEX;
-#define SKINSOUNDDESC_SIZE_V1 (offsetof(SKINSOUNDDESCEX, pszSection))
-#define SKINSOUNDDESC_SIZE_V2 (offsetof(SKINSOUNDDESCEX, dwFlags))
-
// Old struct pre 0.3.4
typedef struct {
int cbSize;
diff --git a/plugins/UserInfoEx/svc_reminder.cpp b/plugins/UserInfoEx/svc_reminder.cpp index 5b64720656..203b98faa4 100644 --- a/plugins/UserInfoEx/svc_reminder.cpp +++ b/plugins/UserInfoEx/svc_reminder.cpp @@ -1188,7 +1188,7 @@ VOID SvcReminderLoadModule(VOID) {
// init sounds
SKINSOUNDDESCEX ssd = { 0 };
- ssd.cbSize = SKINSOUNDDESC_SIZE_V1;
+ ssd.cbSize = sizeof(ssd);
ssd.pszSection = LPGEN(MODNAME);
ssd.pszName = SOUND_BIRTHDAY_TODAY;
diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp index 88c75b6d14..9dedbdf4d5 100644 --- a/src/modules/skin/sounds.cpp +++ b/src/modules/skin/sounds.cpp @@ -22,6 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "..\..\core\commonheaders.h"
+#define SKINSOUNDDESC_SIZE_V1 (offsetof(SKINSOUNDDESCEX, pszSection))
+#define SKINSOUNDDESC_SIZE_V2 (offsetof(SKINSOUNDDESCEX, dwFlags))
+
struct SoundItem
{
char* name;
|