Changeset 38361

Timestamp:

08/26/10 23:17:05 (3 years ago)

Author:

saturday06

Message:

version

Location:

lang/c/NetworkUpdater/trunk/Build

Files:

• Common.c (modified) (1 diff)
• Common.h (modified) (2 diffs)
• MSW.c (modified) (3 diffs)

lang/c/NetworkUpdater/trunk/Build/Common.c

@@ -53 +53 @@
 
     return error;
+}
+
+NU_Error NUI_Cancel(NUI_NetworkUpdater* object)
+{
+    NU_Option option;
+    NUI_CopyOption(&option, &object->option);
+    NUI_Destroy(object);
+    NUI_Create(object, &option);
+    NUI_DestroyOption(&option);    
+    return NU_NO_ERROR;
+}
+
+NU_Error NUI_CopyOption(NU_Option* d, const NU_Option* s) {
+    NU_Error result = NU_ERROR_SYSTEM;
+    d->current_version = _tcsdup(s->current_version);
+    if (!d->current_version) {
+        result = NU_ERROR_BAD_ALLOC;
+        goto clean_up;
+    }
+    d->debug = s->debug;
+    d->url = _tcsdup(s->url);
+    if (!d->url) {
+        result = NU_ERROR_BAD_ALLOC;
+        goto clean_up;
+    }
+
+    result = NU_NO_ERROR;
+clean_up:
+    if (!result) {
+        NUI_DestroyOption(d);
+    }
+    return result;
+}
+
+void NUI_DestroyOption(NU_Option* option) {
+    /*
+    free((void*)option->current_version);
+    free((void*)option->url);
+    */
+    memset(option, 0, sizeof(*option));
 }
 

lang/c/NetworkUpdater/trunk/Build/Common.h

@@ -94 +94 @@
 
 typedef struct NUI_NetworkUpdater_ {
+    NU_Option option;
     NUI_CommonData common;
     NU_NetworkUpdater* user;
@@ -136 +137 @@
 void NUI_RemoveDownload(NUI_DownloadContext* download);
 int NUI_SearchDownload(const NUI_DownloadContext* download);
+void NUI_DestroyOption(NU_Option* option);
+NU_Error NUI_CopyOption(NU_Option* d, const NU_Option* s);
 
 typedef enum {

lang/c/NetworkUpdater/trunk/Build/MSW.c

@@ -1555 +1555 @@
         CloseHandle(object->common.start_update_event);
     }
+    NUI_DestroyOption(&object->option);
+    
 
     memset(object, 0, sizeof(*object));
@@ -2110 +2112 @@
 }
 
-
-NU_Error NUI_Cancel(NUI_NetworkUpdater* object)
-{
-    NUI_Lock(object->common.shared);
-    object->common.shared->user.pending = 1;
-    NUI_Unlock(object->common.shared);
-    SetEvent(object->common.exit_thread_event);
-    return NU_NO_ERROR;
-}
-
-
 NU_Error NUI_Create(NUI_NetworkUpdater* object, const NU_Option* option)
 {
@@ -2131 +2122 @@
             NUI_IsBadReadPointer(option->url, 2)) {
         error = NU_ERROR_INVALID_OPTION;
+        goto clean_up;
+    }
+
+    error = NUI_CopyOption(&object->option, option);
+    if (error) {
         goto clean_up;
     }