February 2011 - Wine-commits

Jacek Caban : mshtml: Added nsIURI::SetSpec implementation.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: a1205c6adce3a4c5f17af32da7e4366e73cd13f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1205c6adce3a4c5f17af32da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 3 20:47:58 2011 +0100 mshtml: Added nsIURI::SetSpec implementation. --- dlls/mshtml/nsio.c | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index dec00aa..d08908f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1654,16 +1654,34 @@ static nsresult NSAPI nsURI_GetSpec(nsIURL *iface, nsACString *aSpec) static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) { nsWineURI *This = impl_from_nsIURL(iface); + const char *speca; + WCHAR *spec; + IUri *uri; + HRESULT hres; - TRACE("(%p)->(%p)\n", This, debugstr_nsacstr(aSpec)); + TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aSpec)); - if(This->nsuri) { - invalidate_uri(This); - return nsIURI_SetSpec(This->nsuri, aSpec); + nsACString_GetData(aSpec, &speca); + spec = heap_strdupAtoW(speca); + if(!spec) + return NS_ERROR_OUT_OF_MEMORY; + + hres = CreateUri(spec, 0, 0, &uri); + heap_free(spec); + if(FAILED(hres)) { + WARN("CreateUri failed: %08x\n", hres); + return NS_ERROR_FAILURE; } - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + invalidate_uri(This); + if(This->uri_builder) { + IUriBuilder_Release(This->uri_builder); + This->uri_builder = NULL; + } + + This->uri = uri; + sync_wine_url(This); + return NS_OK; } static nsresult NSAPI nsURI_GetPrePath(nsIURL *iface, nsACString *aPrePath)

1 0

Austin English : advapi32/tests: Make sure to use return value (LLVM/Clang) .
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 2951007d18b2337874353565e680cbc4d9f8dd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2951007d18b2337874353565e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 3 18:28:47 2011 -0800 advapi32/tests: Make sure to use return value (LLVM/Clang). --- dlls/advapi32/tests/crypt_lmhash.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 384221f..a6e812e 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -211,6 +211,7 @@ static void test_SystemFunction003(void) memset(output, 0, sizeof output); r = pSystemFunction002(data, key, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok( !memcmp(exp2, output, sizeof output), "decrypted message wrong\n"); } @@ -284,16 +285,19 @@ static void test_SystemFunction004(void) memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer, key.Buffer, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok(((unsigned int*)output)[0] == in.Length, "crypted length wrong\n"); ok(((unsigned int*)output)[1] == 1, "crypted value wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+8, key.Buffer, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); memset(output, 0, sizeof output); r = pSystemFunction002(out.Buffer+16, key.Buffer, output); + ok(r == STATUS_SUCCESS, "function failed\n"); ok(!memcmp(output, inbuf, sizeof output), "crypted data wrong\n"); } @@ -496,12 +500,6 @@ static void test_memcmpfunc(memcmpfunc fn) return; } - if (0) - { - /* crashes */ - r = fn(NULL, NULL); - } - memset(arg1, 0, sizeof arg1); memset(arg2, 0, sizeof arg2); arg1[0x10] = 1;

1 0

Austin English : wintrust/tests: Make sure return values are used (LLVM/ Clang).
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 0fed8b0fe2b54add259178186fe2c8954269f398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fed8b0fe2b54add259178186… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 4 00:46:13 2011 -0800 wintrust/tests: Make sure return values are used (LLVM/Clang). --- dlls/wintrust/tests/register.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index dd266bd..42c5de6 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -299,6 +299,7 @@ static void test_RegPolicyFlags(void) ok(ret, "WintrustSetRegPolicyFlags failed: %d\n", GetLastError()); size = sizeof(flags1); r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); + ok(!r, "RegQueryValueEx failed: %d\n", r); ok(flags1 == flags3, "Got %08x flags instead of %08x\n", flags1, flags3); pWintrustSetRegPolicyFlags(flags2);

1 0

Alexandre Julliard : cabinet: Use constants instead of hard-coded numbers for file open flags.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 09fbe972d8f7eba93243338fe7ea9c0dbdc30a22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09fbe972d8f7eba93243338fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 3 20:02:10 2011 +0100 cabinet: Use constants instead of hard-coded numbers for file open flags. --- dlls/cabinet/fci.c | 52 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 4166598..17401e7 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -249,8 +249,9 @@ HFCI __cdecl FCICreate( return FALSE; } - p_fci_internal->handleCFDATA1 = PFCI_OPEN(hfci, - p_fci_internal->szFileNameCFDATA1, 34050, 384, &err, pv); + p_fci_internal->handleCFDATA1 = PFCI_OPEN(hfci, p_fci_internal->szFileNameCFDATA1, + _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, pv); if(p_fci_internal->handleCFDATA1==0){ fci_set_error( FCIERR_TEMP_FILE, ERROR_OPEN_FAILED, TRUE ); return FALSE; @@ -268,8 +269,9 @@ HFCI __cdecl FCICreate( fci_set_error( FCIERR_NONE, ERROR_INVALID_DATA, TRUE ); return FALSE; } - p_fci_internal->handleCFFILE1 = PFCI_OPEN(hfci, - p_fci_internal->szFileNameCFFILE1, 34050, 384, &err, pv); + p_fci_internal->handleCFFILE1 = PFCI_OPEN(hfci, p_fci_internal->szFileNameCFFILE1, + _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, pv); if(p_fci_internal->handleCFFILE1==0){ fci_set_error( FCIERR_TEMP_FILE, ERROR_OPEN_FAILED, TRUE ); return FALSE; @@ -287,8 +289,9 @@ HFCI __cdecl FCICreate( fci_set_error( FCIERR_NONE, ERROR_INVALID_DATA, TRUE ); return FALSE; } - p_fci_internal->handleCFDATA2 = PFCI_OPEN(hfci, - p_fci_internal->szFileNameCFDATA2, 34050, 384, &err, pv); + p_fci_internal->handleCFDATA2 = PFCI_OPEN(hfci, p_fci_internal->szFileNameCFDATA2, + _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, pv); if(p_fci_internal->handleCFDATA2==0){ fci_set_error( FCIERR_TEMP_FILE, ERROR_OPEN_FAILED, TRUE ); return FALSE; @@ -306,8 +309,9 @@ HFCI __cdecl FCICreate( fci_set_error( FCIERR_NONE, ERROR_INVALID_DATA, TRUE ); return FALSE; } - p_fci_internal->handleCFFILE2 = PFCI_OPEN(hfci, - p_fci_internal->szFileNameCFFILE2, 34050, 384, &err, pv); + p_fci_internal->handleCFFILE2 = PFCI_OPEN(hfci, p_fci_internal->szFileNameCFFILE2, + _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, pv); if(p_fci_internal->handleCFFILE2==0){ fci_set_error( FCIERR_TEMP_FILE, ERROR_OPEN_FAILED, TRUE ); return FALSE; @@ -325,8 +329,9 @@ HFCI __cdecl FCICreate( fci_set_error( FCIERR_NONE, ERROR_INVALID_DATA, TRUE ); return FALSE; } - p_fci_internal->handleCFFOLDER = PFCI_OPEN(hfci, - p_fci_internal->szFileNameCFFOLDER, 34050, 384, &err, pv); + p_fci_internal->handleCFFOLDER = PFCI_OPEN(hfci, p_fci_internal->szFileNameCFFOLDER, + _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, pv); if(p_fci_internal->handleCFFOLDER==0) { fci_set_error( FCIERR_TEMP_FILE, ERROR_OPEN_FAILED, TRUE); return FALSE; @@ -1250,8 +1255,8 @@ static BOOL fci_flush_folder( fci_set_error( FCIERR_NONE, ERROR_INVALID_DATA, TRUE ); return FALSE; } - handleCFDATA1new = PFCI_OPEN(hfci,szFileNameCFDATA1new,34050,384,&err, - p_fci_internal->pv); + handleCFDATA1new = PFCI_OPEN(hfci,szFileNameCFDATA1new, _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, p_fci_internal->pv); if(handleCFDATA1new==0){ fci_set_error( FCIERR_TEMP_FILE, ERROR_OPEN_FAILED, TRUE ); return FALSE; @@ -1274,8 +1279,8 @@ static BOOL fci_flush_folder( /* TODO error handling of err */ return FALSE; } - handleCFFILE1new = PFCI_OPEN(hfci,szFileNameCFFILE1new,34050,384,&err, - p_fci_internal->pv); + handleCFFILE1new = PFCI_OPEN(hfci,szFileNameCFFILE1new, _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, p_fci_internal->pv); if(handleCFFILE1new==0){ fci_set_error( FCIERR_TEMP_FILE, ERROR_OPEN_FAILED, TRUE ); return FALSE; @@ -1679,8 +1684,8 @@ static BOOL fci_flush_cabinet( } /* create the cabinet */ - handleCABINET = PFCI_OPEN(hfci, szFileNameCABINET, - 33538, 384, &err, p_fci_internal->pv ); + handleCABINET = PFCI_OPEN(hfci, szFileNameCABINET, _O_RDWR | _O_CREAT | _O_TRUNC | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, p_fci_internal->pv ); if(handleCABINET==0){ fci_set_error( FCIERR_CAB_FILE, ERROR_OPEN_FAILED, TRUE ); return FALSE; @@ -2108,8 +2113,9 @@ static BOOL fci_flush_cabinet( fci_set_error( FCIERR_NONE, ERROR_INVALID_DATA, TRUE ); return FALSE; } - p_fci_internal->handleCFDATA2 = PFCI_OPEN(hfci, - p_fci_internal->szFileNameCFDATA2, 34050, 384, &err, p_fci_internal->pv); + p_fci_internal->handleCFDATA2 = PFCI_OPEN(hfci, p_fci_internal->szFileNameCFDATA2, + _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, p_fci_internal->pv); /* check handle */ if(p_fci_internal->handleCFDATA2==0){ fci_set_error( FCIERR_TEMP_FILE, ERROR_OPEN_FAILED, TRUE ); @@ -2130,8 +2136,9 @@ static BOOL fci_flush_cabinet( fci_set_error( FCIERR_NONE, ERROR_INVALID_DATA, TRUE ); return FALSE; } - p_fci_internal->handleCFFILE2 = PFCI_OPEN(hfci, - p_fci_internal->szFileNameCFFILE2, 34050, 384, &err, p_fci_internal->pv); + p_fci_internal->handleCFFILE2 = PFCI_OPEN(hfci, p_fci_internal->szFileNameCFFILE2, + _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, p_fci_internal->pv); /* check handle */ if(p_fci_internal->handleCFFILE2==0){ fci_set_error( FCIERR_TEMP_FILE, ERROR_OPEN_FAILED, TRUE); @@ -2151,8 +2158,9 @@ static BOOL fci_flush_cabinet( fci_set_error( FCIERR_NONE, ERROR_INVALID_DATA, TRUE ); return FALSE; } - p_fci_internal->handleCFFOLDER = PFCI_OPEN(hfci, - p_fci_internal->szFileNameCFFOLDER, 34050, 384, &err, p_fci_internal->pv); + p_fci_internal->handleCFFOLDER = PFCI_OPEN(hfci, p_fci_internal->szFileNameCFFOLDER, + _O_RDWR | _O_CREAT | _O_EXCL | _O_BINARY, + _S_IREAD | _S_IWRITE, &err, p_fci_internal->pv); /* check handle */ if(p_fci_internal->handleCFFOLDER==0){ fci_set_error( FCIERR_TEMP_FILE, ERROR_OPEN_FAILED, TRUE );

1 0

Alexandre Julliard : cabinet: Replace the fci_set_error macro by a proper function.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: e30b19f11539ce0ef569d66c682105c0389d2df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e30b19f11539ce0ef569d66c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 11:20:12 2011 +0100 cabinet: Replace the fci_set_error macro by a proper function. --- dlls/cabinet/fci.c | 265 ++++++++++++++++++++++++++-------------------------- 1 files changed, 133 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e30b19f11539ce0ef569d…

1 0

Alexandre Julliard : cabinet: Call FCI function pointers explicitly instead of hiding them inside macros .
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 9aa0e35ecc2790fc10d56cb3e7eaa69ffc2964d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa0e35ecc2790fc10d56cb3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 11:27:31 2011 +0100 cabinet: Call FCI function pointers explicitly instead of hiding them inside macros. --- dlls/cabinet/cabinet.h | 32 ++--- dlls/cabinet/fci.c | 349 ++++++++++++++++++++++++------------------------ 2 files changed, 185 insertions(+), 196 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9aa0e35ecc2790fc10d56…

1 0

Alexandre Julliard : cabinet: Pass an FCI pointer to internal functions instead of a handle.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: b18b596621d49ed3166fa39bf99cc24287606550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18b596621d49ed3166fa39bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 11:32:46 2011 +0100 cabinet: Pass an FCI pointer to internal functions instead of a handle. --- dlls/cabinet/cabinet.h | 7 --- dlls/cabinet/fci.c | 123 ++++++++++++++++++++++------------------------- 2 files changed, 58 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b18b596621d49ed3166fa…

1 0

Alexandre Julliard : cabinet: Move the internal FCI structure to fci.c.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: a71fbe16d9f395b22e222bcfdc358f16e140c373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71fbe16d9f395b22e222bcfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 11:35:18 2011 +0100 cabinet: Move the internal FCI structure to fci.c. --- dlls/cabinet/cabinet.h | 53 ----------------------------------------- dlls/cabinet/fci.c | 61 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 56 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index 035db7c..735e2ed 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -309,58 +309,6 @@ typedef struct cds_forward { /* _Int as in "Internal" fyi */ typedef struct { - unsigned int FCI_Intmagic; - PERF perf; - PFNFCIFILEPLACED fileplaced; - PFNFCIALLOC alloc; - PFNFCIFREE free; - PFNFCIOPEN open; - PFNFCIREAD read; - PFNFCIWRITE write; - PFNFCICLOSE close; - PFNFCISEEK seek; - PFNFCIDELETE delete; - PFNFCIGETTEMPFILE gettemp; - PCCAB pccab; - BOOL fPrevCab; - BOOL fNextCab; - BOOL fSplitFolder; - cab_ULONG statusFolderCopied; - cab_ULONG statusFolderTotal; - BOOL fGetNextCabInVain; - void *pv; - char szPrevCab[CB_MAX_CABINET_NAME]; /* previous cabinet name */ - char szPrevDisk[CB_MAX_DISK_NAME]; /* disk name of previous cabinet */ - CCAB oldCCAB; - char* data_in; /* uncompressed data blocks */ - cab_UWORD cdata_in; - char* data_out; /* compressed data blocks */ - ULONG cCompressedBytesInFolder; - cab_UWORD cFolders; - cab_UWORD cFiles; - cab_ULONG cDataBlocks; - cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ - /* of spanned file of a spanning folder of a spanning cabinet */ - char szFileNameCFDATA1[CB_MAX_FILENAME]; - int handleCFDATA1; - char szFileNameCFFILE1[CB_MAX_FILENAME]; - int handleCFFILE1; - char szFileNameCFDATA2[CB_MAX_FILENAME]; - int handleCFDATA2; - char szFileNameCFFILE2[CB_MAX_FILENAME]; - int handleCFFILE2; - char szFileNameCFFOLDER[CB_MAX_FILENAME]; - int handleCFFOLDER; - cab_ULONG sizeFileCFDATA1; - cab_ULONG sizeFileCFFILE1; - cab_ULONG sizeFileCFDATA2; - cab_ULONG sizeFileCFFILE2; - cab_ULONG sizeFileCFFOLDER; - BOOL fNewPrevious; - cab_ULONG estimatedCabinetSize; -} FCI_Int, *PFCI_Int; - -typedef struct { unsigned int FDI_Intmagic; PFNALLOC pfnalloc; PFNFREE pfnfree; @@ -384,7 +332,6 @@ typedef struct { #define PFDI_CLOSE(hfdi, hf) ((*PFDI_INT(hfdi)->pfnclose) (hf)) #define PFDI_SEEK(hfdi, hf, dist, type) ((*PFDI_INT(hfdi)->pfnseek) (hf, dist, type)) -#define FCI_INT_MAGIC 0xfcfcfc05 #define FDI_INT_MAGIC 0xfdfdfd05 #define REALLY_IS_FDI(hfdi) ( \ diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 0613e32..00e2fb7 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -102,6 +102,61 @@ typedef struct { } CFDATA; +typedef struct +{ + unsigned int magic; + PERF perf; + PFNFCIFILEPLACED fileplaced; + PFNFCIALLOC alloc; + PFNFCIFREE free; + PFNFCIOPEN open; + PFNFCIREAD read; + PFNFCIWRITE write; + PFNFCICLOSE close; + PFNFCISEEK seek; + PFNFCIDELETE delete; + PFNFCIGETTEMPFILE gettemp; + PCCAB pccab; + BOOL fPrevCab; + BOOL fNextCab; + BOOL fSplitFolder; + cab_ULONG statusFolderCopied; + cab_ULONG statusFolderTotal; + BOOL fGetNextCabInVain; + void *pv; + char szPrevCab[CB_MAX_CABINET_NAME]; /* previous cabinet name */ + char szPrevDisk[CB_MAX_DISK_NAME]; /* disk name of previous cabinet */ + CCAB oldCCAB; + char* data_in; /* uncompressed data blocks */ + cab_UWORD cdata_in; + char* data_out; /* compressed data blocks */ + ULONG cCompressedBytesInFolder; + cab_UWORD cFolders; + cab_UWORD cFiles; + cab_ULONG cDataBlocks; + cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ + /* of spanned file of a spanning folder of a spanning cabinet */ + char szFileNameCFDATA1[CB_MAX_FILENAME]; + int handleCFDATA1; + char szFileNameCFFILE1[CB_MAX_FILENAME]; + int handleCFFILE1; + char szFileNameCFDATA2[CB_MAX_FILENAME]; + int handleCFDATA2; + char szFileNameCFFILE2[CB_MAX_FILENAME]; + int handleCFFILE2; + char szFileNameCFFOLDER[CB_MAX_FILENAME]; + int handleCFFOLDER; + cab_ULONG sizeFileCFDATA1; + cab_ULONG sizeFileCFFILE1; + cab_ULONG sizeFileCFDATA2; + cab_ULONG sizeFileCFFILE2; + cab_ULONG sizeFileCFFOLDER; + BOOL fNewPrevious; + cab_ULONG estimatedCabinetSize; +} FCI_Int; + +#define FCI_INT_MAGIC 0xfcfcfc05 + static void set_error( FCI_Int *fci, int oper, int err ) { fci->perf->erfOper = oper; @@ -114,7 +169,7 @@ static FCI_Int *get_fci_ptr( HFCI hfci ) { FCI_Int *fci= (FCI_Int *)hfci; - if (!fci || !fci->FCI_Intmagic == FCI_INT_MAGIC) + if (!fci || !fci->magic == FCI_INT_MAGIC) { SetLastError( ERROR_INVALID_HANDLE ); return NULL; @@ -209,7 +264,7 @@ HFCI __cdecl FCICreate( return NULL; } - p_fci_internal->FCI_Intmagic = FCI_INT_MAGIC; + p_fci_internal->magic = FCI_INT_MAGIC; p_fci_internal->perf = perf; p_fci_internal->fileplaced = pfnfiledest; p_fci_internal->alloc = pfnalloc; @@ -2827,7 +2882,7 @@ BOOL __cdecl FCIDestroy(HFCI hfci) /* before hfci can be removed all temporary files must be closed */ /* and deleted */ - p_fci_internal->FCI_Intmagic = 0; + p_fci_internal->magic = 0; p_fci_internal->close( p_fci_internal->handleCFDATA1,&err,p_fci_internal->pv); /* TODO error handling of err */

1 0

Alexandre Julliard : cabinet: Add a helper function to set error code in FDI.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 826ccc168465b73f39569e0c958fe135acd0c438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=826ccc168465b73f39569e0c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 12:03:33 2011 +0100 cabinet: Add a helper function to set error code in FDI. --- dlls/cabinet/fdi.c | 161 +++++++++++++--------------------------------------- 1 files changed, 39 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=826ccc168465b73f39569…

1 0

Alexandre Julliard : cabinet: Pass an FDI pointer to internal functions instead of a handle.
by Alexandre Julliard 04 Feb '11

04 Feb '11

Module: wine Branch: master Commit: 396c9fca215291228d37982a53e0ed4dc514cbc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=396c9fca215291228d37982a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 4 12:20:17 2011 +0100 cabinet: Pass an FDI pointer to internal functions instead of a handle. --- dlls/cabinet/cabinet.h | 23 +-- dlls/cabinet/fdi.c | 334 ++++++++++++++++++++++++------------------------ 2 files changed, 177 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=396c9fca215291228d379…

1 0