Skip to content

W
wine-winehq
Commit de0f6dd5 authored by Andreas Mohr's avatar Andreas Mohr Committed by Alexandre Julliard
Browse files
Options

- don't initialize with pFirstLDD if pFirstLDD isn't initialized yet either

- corrected VcpClose .spec
parent 66fed8cb
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 8 deletions
dlls/setupapi/setupx.spec
View file @ de0f6dd5
...@@ -123,7 +123,7 @@ owner setupapi ...@@ -123,7 +123,7 @@ owner setupapi
170 stub SUSETMEM 170 stub SUSETMEM
171 stub WriteDMFBootData #(word ptr word) 171 stub WriteDMFBootData #(word ptr word)
200 pascal VcpOpen(ptr str) VcpOpen16 200 pascal VcpOpen(ptr str) VcpOpen16
201 pascal VcpClose(word word word) VcpClose16 201 pascal VcpClose(word str) VcpClose16
202 stub vcpDefCallbackProc #(ptr word word long long) 202 stub vcpDefCallbackProc #(ptr word word long long)
203 stub vcpEnumFiles #(ptr long) 203 stub vcpEnumFiles #(ptr long)
204 stub VcpQueueRename #(str str str str word word long) 204 stub VcpQueueRename #(str str str str word word long)
......
dlls/setupapi/setupx_main.c
View file @ de0f6dd5
...@@ -583,7 +583,7 @@ void SETUPX_CreateStandardLDDs(void) ...@@ -583,7 +583,7 @@ void SETUPX_CreateStandardLDDs(void)
*/ */
RETERR16 SETUPX_DelLdd(LOGDISKID16 ldid) RETERR16 SETUPX_DelLdd(LOGDISKID16 ldid)
{ {
LDD_LIST *pCurr = pFirstLDD, *pPrev = NULL; LDD_LIST *pCurr, *pPrev = NULL;
TRACE("(%d)\n", ldid); TRACE("(%d)\n", ldid);
...@@ -593,6 +593,7 @@ RETERR16 SETUPX_DelLdd(LOGDISKID16 ldid) ...@@ -593,6 +593,7 @@ RETERR16 SETUPX_DelLdd(LOGDISKID16 ldid)
if (ldid < LDID_ASSIGN_START) if (ldid < LDID_ASSIGN_START)
return ERR_VCP_LDDINVALID; return ERR_VCP_LDDINVALID;
pCurr = pFirstLDD;
/* search until we find the appropriate LDD or hit the end */ /* search until we find the appropriate LDD or hit the end */
while ((pCurr != NULL) && (ldid > pCurr->pldd->ldid)) while ((pCurr != NULL) && (ldid > pCurr->pldd->ldid))
{ {
...@@ -633,7 +634,7 @@ RETERR16 WINAPI CtlDelLdd16(LOGDISKID16 ldid) ...@@ -633,7 +634,7 @@ RETERR16 WINAPI CtlDelLdd16(LOGDISKID16 ldid)
*/ */
RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd) RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd)
{ {
LDD_LIST *pCurr = pFirstLDD, *pPrev = NULL; LDD_LIST *pCurr, *pPrev = NULL;
TRACE("(%p)\n", pldd); TRACE("(%p)\n", pldd);
...@@ -643,11 +644,12 @@ RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd) ...@@ -643,11 +644,12 @@ RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd)
if (pldd->cbSize != sizeof(LOGDISKDESC_S)) if (pldd->cbSize != sizeof(LOGDISKDESC_S))
return ERR_VCP_LDDINVALID; return ERR_VCP_LDDINVALID;
pCurr = pFirstLDD;
/* search until we find the appropriate LDD or hit the end */ /* search until we find the appropriate LDD or hit the end */
while ((pCurr != NULL) && (pldd->ldid > pCurr->pldd->ldid)) while ((pCurr != NULL) && (pldd->ldid > pCurr->pldd->ldid))
{ {
pPrev = pCurr; pPrev = pCurr;
pCurr = pCurr->next; pCurr = pCurr->next;
} }
if ( (pCurr == NULL) /* hit end of list */ if ( (pCurr == NULL) /* hit end of list */
|| (pldd->ldid != pCurr->pldd->ldid) ) || (pldd->ldid != pCurr->pldd->ldid) )
...@@ -670,7 +672,7 @@ RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd) ...@@ -670,7 +672,7 @@ RETERR16 WINAPI CtlFindLdd16(LPLOGDISKDESC pldd)
*/ */
RETERR16 WINAPI CtlSetLdd16(LPLOGDISKDESC pldd) RETERR16 WINAPI CtlSetLdd16(LPLOGDISKDESC pldd)
{ {
LDD_LIST *pCurr = pFirstLDD, *pPrev = NULL; LDD_LIST *pCurr, *pPrev = NULL;
LPLOGDISKDESC pCurrLDD; LPLOGDISKDESC pCurrLDD;
HANDLE heap; HANDLE heap;
BOOL is_new = FALSE; BOOL is_new = FALSE;
...@@ -684,6 +686,7 @@ RETERR16 WINAPI CtlSetLdd16(LPLOGDISKDESC pldd) ...@@ -684,6 +686,7 @@ RETERR16 WINAPI CtlSetLdd16(LPLOGDISKDESC pldd)
return ERR_VCP_LDDINVALID; return ERR_VCP_LDDINVALID;
heap = GetProcessHeap(); heap = GetProcessHeap();
pCurr = pFirstLDD;
/* search until we find the appropriate LDD or hit the end */ /* search until we find the appropriate LDD or hit the end */
while ((pCurr != NULL) && (pldd->ldid > pCurr->pldd->ldid)) while ((pCurr != NULL) && (pldd->ldid > pCurr->pldd->ldid))
{ {
...@@ -755,7 +758,7 @@ RETERR16 WINAPI CtlAddLdd16(LPLOGDISKDESC pldd) ...@@ -755,7 +758,7 @@ RETERR16 WINAPI CtlAddLdd16(LPLOGDISKDESC pldd)
*/ */
static RETERR16 SETUPX_GetLdd(LPLOGDISKDESC pldd) static RETERR16 SETUPX_GetLdd(LPLOGDISKDESC pldd)
{ {
LDD_LIST *pCurr = pFirstLDD, *pPrev = NULL; LDD_LIST *pCurr, *pPrev = NULL;
if (!std_LDDs_done) if (!std_LDDs_done)
SETUPX_CreateStandardLDDs(); SETUPX_CreateStandardLDDs();
...@@ -763,6 +766,7 @@ static RETERR16 SETUPX_GetLdd(LPLOGDISKDESC pldd) ...@@ -763,6 +766,7 @@ static RETERR16 SETUPX_GetLdd(LPLOGDISKDESC pldd)
if (pldd->cbSize != sizeof(LOGDISKDESC_S)) if (pldd->cbSize != sizeof(LOGDISKDESC_S))
return ERR_VCP_LDDINVALID; return ERR_VCP_LDDINVALID;
pCurr = pFirstLDD;
/* search until we find the appropriate LDD or hit the end */ /* search until we find the appropriate LDD or hit the end */
while ((pCurr != NULL) && (pldd->ldid > pCurr->pldd->ldid)) while ((pCurr != NULL) && (pldd->ldid > pCurr->pldd->ldid))
{ {
...@@ -1056,7 +1060,7 @@ RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef) ...@@ -1056,7 +1060,7 @@ RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef)
*/ */
RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
{ {
FIXME("(%04x, %s), stub.\n", fl, lpszBackupDest); FIXME("(%04x, '%s'), stub.\n", fl, lpszBackupDest);
return OK; return OK;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment