(none)

diff --git a/aplfw/build/win/win32/vc2008/hosaplfw.vcproj b/aplfw/build/win/win32/vc2008/hosaplfw.vcproj
index fa1a256..541bc51 100755 (executable)
--- a/aplfw/build/win/win32/vc2008/hosaplfw.vcproj
+++ b/aplfw/build/win/win32/vc2008/hosaplfw.vcproj
@@ -987,6 +987,10 @@
                                        >
                                </File>
                                <File
+                                       RelativePath="..\..\..\..\system\system\whiteboard_getinteger.c"
+                                       >
+                               </File>
+                               <File
                                        RelativePath="..\..\..\..\system\system\whiteboard_getnextkey.c"
                                        >
                                </File>
@@ -995,6 +999,10 @@
                                        >
                                </File>
                                <File
+                                       RelativePath="..\..\..\..\system\system\whiteboard_setinteger.c"
+                                       >
+                               </File>
+                               <File
                                        RelativePath="..\..\..\..\system\system\whiteboard_setstring.c"
                                        >
                                </File>

diff --git a/aplfw/library/container/assoc/assoc_set.c b/aplfw/library/container/assoc/assoc_set.c
index cf71a29..3c14af6 100755 (executable)
--- a/aplfw/library/container/assoc/assoc_set.c
+++ b/aplfw/library/container/assoc/assoc_set.c
@@ -52,7 +52,21 @@ ASSOC_ERR Assoc_Set(C_ASSOC *self, const char *pszKey, const void *pData, long l
                        pNode->pParent = pOldNode->pParent;
                        pNode->pLeft   = pOldNode->pLeft;
                        pNode->pRight  = pOldNode->pRight;
-                       if ( pNode->pParent == NULL ) { self->pRoot    = pNode; }
+                       if ( pNode->pParent != NULL )
+                       {
+                               if ( pNode->pParent->pLeft == pOldNode )
+                               {
+                                       pNode->pParent->pLeft = pNode;
+                               }
+                               else
+                               {
+                                       pNode->pParent->pRight = pNode;
+                               }
+                       }
+                       else
+                       {
+                               self->pRoot    = pNode;
+                       }
                        if ( pNode->pLeft   != NULL ) { pNode->pLeft->pParent  = pNode; }
                        if ( pNode->pRight  != NULL ) { pNode->pRight->pParent = pNode; }
                        MemHeap_Free(self->pMemHeap, pOldNode);

diff --git a/aplfw/system/file/sysvol_removedevice.c b/aplfw/system/file/sysvol_removedevice.c
index 7ff7ab2..d5cbc01 100755 (executable)
--- a/aplfw/system/file/sysvol_removedevice.c
+++ b/aplfw/system/file/sysvol_removedevice.c
@@ -15,7 +15,7 @@
 /* システムボリュームに登録されたデバイスを取り外し */
 FILE_ERR SysVol_RemoveDevice(HANDLE hSysVol, const char *pszName)
 {
-       C_SYSVOL                *self;
+       C_SYSVOL        *self;
        
        self = (C_SYSVOL *)hSysVol;