wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Hans Leidekker : msi: Correctly [un] register progids when associated class and extensions change state.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: a547027b0199ffa96165b75012d23c4ab64f3b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a547027b0199ffa96165b7501… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 27 11:03:48 2014 +0100 msi: Correctly [un]register progids when associated class and extensions change state. --- dlls/msi/classes.c | 124 +++++++++++++++++++++++------------------------ dlls/msi/msipriv.h | 1 - dlls/msi/tests/action.c | 30 +++++++++--- 3 files changed, 86 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a547027b0199ffa96165b…

1 0

Hans Leidekker : msi: Get rid of the InstallMe field in MSIMIME.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 28ecbec88d7378be0f98439ba988bcbc252b0b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ecbec88d7378be0f98439ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 27 11:02:30 2014 +0100 msi: Get rid of the InstallMe field in MSIMIME. --- dlls/msi/classes.c | 32 ++++---------------------------- dlls/msi/msipriv.h | 2 -- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 4110ad0..3e096b3 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -737,20 +737,6 @@ static void mark_progid_for_uninstall( MSIPACKAGE *package, MSIPROGID *progid ) } } -static void mark_mime_for_install( MSIMIME *mime ) -{ - if (!mime) - return; - mime->InstallMe = TRUE; -} - -static void mark_mime_for_uninstall( MSIMIME *mime ) -{ - if (!mime) - return; - mime->InstallMe = FALSE; -} - static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) { static const WCHAR szRemoteServerName[] = @@ -1309,8 +1295,6 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) if (ext->ProgID && !list_empty( &ext->verbs ) ) mark_progid_for_install( package, ext->ProgID ); - mark_mime_for_install(ext->Mime); - extension = msi_alloc( (strlenW( ext->Extension ) + 2) * sizeof(WCHAR) ); if (extension) { @@ -1412,8 +1396,6 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) if (ext->ProgID && !list_empty( &ext->verbs )) mark_progid_for_uninstall( package, ext->ProgID ); - mark_mime_for_uninstall( ext->Mime ); - extension = msi_alloc( (strlenW( ext->Extension ) + 2) * sizeof(WCHAR) ); if (extension) { @@ -1476,11 +1458,8 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) * check if the MIME is to be installed. Either as requested by an * extension or Class */ - mt->InstallMe = (mt->InstallMe || - (mt->Class && mt->Class->action == INSTALLSTATE_LOCAL) || - (mt->Extension && mt->Extension->action == INSTALLSTATE_LOCAL)); - - if (!mt->InstallMe) + if ((!mt->Class || mt->Class->action != INSTALLSTATE_LOCAL) && + mt->Extension->action != INSTALLSTATE_LOCAL) { TRACE("MIME %s not scheduled to be installed\n", debugstr_w(mt->ContentType)); continue; @@ -1530,11 +1509,8 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) LONG res; LPWSTR mime_key; - mime->InstallMe = (mime->InstallMe || - (mime->Class && mime->Class->action == INSTALLSTATE_LOCAL) || - (mime->Extension && mime->Extension->action == INSTALLSTATE_LOCAL)); - - if (mime->InstallMe) + if ((!mime->Class || mime->Class->action != INSTALLSTATE_ABSENT) && + mime->Extension->action != INSTALLSTATE_ABSENT) { TRACE("MIME %s not scheduled to be removed\n", debugstr_w(mime->ContentType)); continue; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index cfa9bae..b664766 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -664,8 +664,6 @@ struct tagMSIMIME LPWSTR suffix; LPWSTR clsid; MSICLASS *Class; - /* not in the table, set during installation */ - BOOL InstallMe; }; enum SCRIPTS

1 0

Hans Leidekker : msi: Use an INSTALLSTATE variable to track install state of classes and extensions.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: f0d663fb4db56a20cee43e6074c9a9e51c05d58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d663fb4db56a20cee43e607… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 27 11:01:41 2014 +0100 msi: Use an INSTALLSTATE variable to track install state of classes and extensions. --- dlls/msi/classes.c | 27 +++++++++++++-------------- dlls/msi/msipriv.h | 4 ++-- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index afc1b1c..4110ad0 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -296,7 +296,7 @@ static MSICLASS *load_class( MSIPACKAGE* package, MSIRECORD *row ) cls->Feature = msi_get_loaded_feature(package, buffer); cls->Attributes = MSI_RecordGetInteger(row,13); - + cls->action = INSTALLSTATE_UNKNOWN; return cls; } @@ -425,7 +425,7 @@ static MSIEXTENSION *load_extension( MSIPACKAGE* package, MSIRECORD *row ) buffer = MSI_RecordGetString(row,5); ext->Feature = msi_get_loaded_feature( package, buffer ); - + ext->action = INSTALLSTATE_UNKNOWN; return ext; } @@ -856,7 +856,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) } TRACE("Registering class %s (%p)\n", debugstr_w(cls->clsid), cls); - cls->Installed = TRUE; + cls->action = INSTALLSTATE_LOCAL; mark_progid_for_install( package, cls->ProgID ); RegCreateKeyW( hkey, cls->clsid, &hkey2 ); @@ -1014,7 +1014,7 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) } TRACE("Unregistering class %s (%p)\n", debugstr_w(cls->clsid), cls); - cls->Installed = FALSE; + cls->action = INSTALLSTATE_ABSENT; mark_progid_for_uninstall( package, cls->ProgID ); res = RegDeleteTreeW( hkey, cls->clsid ); @@ -1116,13 +1116,12 @@ UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( progid, &package->progids, MSIPROGID, entry ) { /* check if this progid is to be installed */ - if (progid->Class && progid->Class->Installed) + if (progid->Class && progid->Class->action == INSTALLSTATE_LOCAL) progid->InstallMe = TRUE; if (!progid->InstallMe) { - TRACE("progid %s not scheduled to be installed\n", - debugstr_w(progid->ProgID)); + TRACE("progid %s not scheduled to be installed\n", debugstr_w(progid->ProgID)); continue; } @@ -1152,7 +1151,7 @@ UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( progid, &package->progids, MSIPROGID, entry ) { /* check if this progid is to be removed */ - if (progid->Class && !progid->Class->Installed) + if (progid->Class && progid->Class->action != INSTALLSTATE_LOCAL) progid->InstallMe = FALSE; if (progid->InstallMe) @@ -1302,7 +1301,7 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) } TRACE("Registering extension %s (%p)\n", debugstr_w(ext->Extension), ext); - ext->Installed = TRUE; + ext->action = INSTALLSTATE_LOCAL; /* this is only registered if the extension has at least 1 verb * according to MSDN @@ -1408,7 +1407,7 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) } TRACE("Unregistering extension %s\n", debugstr_w(ext->Extension)); - ext->Installed = FALSE; + ext->action = INSTALLSTATE_ABSENT; if (ext->ProgID && !list_empty( &ext->verbs )) mark_progid_for_uninstall( package, ext->ProgID ); @@ -1478,8 +1477,8 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) * extension or Class */ mt->InstallMe = (mt->InstallMe || - (mt->Class && mt->Class->Installed) || - (mt->Extension && mt->Extension->Installed)); + (mt->Class && mt->Class->action == INSTALLSTATE_LOCAL) || + (mt->Extension && mt->Extension->action == INSTALLSTATE_LOCAL)); if (!mt->InstallMe) { @@ -1532,8 +1531,8 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) LPWSTR mime_key; mime->InstallMe = (mime->InstallMe || - (mime->Class && mime->Class->Installed) || - (mime->Extension && mime->Extension->Installed)); + (mime->Class && mime->Class->action == INSTALLSTATE_LOCAL) || + (mime->Extension && mime->Extension->action == INSTALLSTATE_LOCAL)); if (mime->InstallMe) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c585b43..cfa9bae 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -614,7 +614,7 @@ typedef struct tagMSICLASS MSIFEATURE *Feature; INT Attributes; /* not in the table, set during installation */ - BOOL Installed; + INSTALLSTATE action; } MSICLASS; typedef struct tagMSIMIME MSIMIME; @@ -629,7 +629,7 @@ typedef struct tagMSIEXTENSION MSIMIME *Mime; MSIFEATURE *Feature; /* not in the table, set during installation */ - BOOL Installed; + INSTALLSTATE action; struct list verbs; } MSIEXTENSION;

1 0

Nikolay Sivov : dmime: COM cleanup of IDirectMusicSegmentState8 interface.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 347da355bac706b2b77774c16c4ce410f9624007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347da355bac706b2b77774c16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 27 09:34:27 2014 +0400 dmime: COM cleanup of IDirectMusicSegmentState8 interface. --- dlls/dmime/dmime_private.h | 12 --- dlls/dmime/segmentstate.c | 193 ++++++++++++++++++++++++-------------------- 2 files changed, 107 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=347da355bac706b2b7777…

1 0

Frédéric Delanoy : shlwapi/tests: Use BOOL type where appropriate.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: b89f92181a0f681d012fb3637f7f5044c62a9d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89f92181a0f681d012fb3637… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 27 00:21:03 2014 +0100 shlwapi/tests: Use BOOL type where appropriate. --- dlls/shlwapi/tests/clsid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index cf9be96..e664f63 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -107,7 +107,7 @@ static void test_ClassIDs(void) DWORD dwLen; BOOL bRet; int i = 0; - int is_vista = 0; + BOOL is_vista = FALSE; if (!pSHLWAPI_269 || !pSHLWAPI_23) return; @@ -115,7 +115,7 @@ static void test_ClassIDs(void) while (*guids) { dwLen = pSHLWAPI_23(*guids, szBuff, 256); - if (!i && dwLen == S_OK) is_vista = 1; /* seems to return an HRESULT on vista */ + if (!i && dwLen == S_OK) is_vista = TRUE; /* seems to return an HRESULT on vista */ ok(dwLen == (is_vista ? S_OK : 39), "wrong size %u for id %d\n", dwLen, i); bRet = pSHLWAPI_269(szBuff, &guid);

1 0

Frédéric Delanoy : dplayx: Use BOOL type where appropriate.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 7e17eec75005e0e1c16b9b56422544246d772e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e17eec75005e0e1c16b9b564… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Feb 27 00:21:02 2014 +0100 dplayx: Use BOOL type where appropriate. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplayx_global.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 0314597..36e97a6 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1660,7 +1660,7 @@ static HRESULT DP_IF_CreatePlayer( IDirectPlayImpl *This, void *lpMsgHdr, DPID * } #if 1 - if( This->dp2->bHostInterface == FALSE ) + if( !This->dp2->bHostInterface ) { /* Let the name server know about the creation of this player */ /* FIXME: Is this only to be done for the creation of a server player or diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index 64c4bc3..55a7386 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -83,7 +83,7 @@ static LPVOID lpSharedStaticData = NULL; typedef struct { - DWORD used; + BOOL used; DWORD data[dwBlockSize-sizeof(DWORD)]; } DPLAYX_MEM_SLICE; @@ -103,7 +103,7 @@ static void DPLAYX_PrivHeapFree( LPVOID addr ) lpAddrStart = (char*)addr - sizeof(DWORD); /* Find block header */ dwBlockUsed = ((BYTE*)lpAddrStart - (BYTE*)lpMemArea)/dwBlockSize; - lpMemArea[ dwBlockUsed ].used = 0; + lpMemArea[ dwBlockUsed ].used = FALSE; } static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size ) @@ -119,12 +119,12 @@ static LPVOID DPLAYX_PrivHeapAlloc( DWORD flags, DWORD size ) /* Find blank area */ uBlockUsed = 0; - while( ( lpMemArea[ uBlockUsed ].used != 0 ) && ( uBlockUsed <= dwMaxBlock ) ) { uBlockUsed++; } + while( lpMemArea[ uBlockUsed ].used && uBlockUsed <= dwMaxBlock ) { uBlockUsed++; } if( uBlockUsed <= dwMaxBlock ) { /* Set the area used */ - lpMemArea[ uBlockUsed ].used = 1; + lpMemArea[ uBlockUsed ].used = TRUE; lpvArea = lpMemArea[ uBlockUsed ].data; } else

1 0

Erich E. Hoover : hhctrl.ocx: Permit HTML start/ end tags within quoted attributes.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: ee484b3140ee7637f297ed8ed4af86dd1e626416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee484b3140ee7637f297ed8ed… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Feb 25 19:20:31 2014 -0700 hhctrl.ocx: Permit HTML start/end tags within quoted attributes. --- dlls/hhctrl.ocx/stream.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/stream.c b/dlls/hhctrl.ocx/stream.c index eb2bcc3..4dc9645 100644 --- a/dlls/hhctrl.ocx/stream.c +++ b/dlls/hhctrl.ocx/stream.c @@ -110,12 +110,52 @@ BOOL next_content(stream_t *stream, strbuf_t *buf) return TRUE; } +static BOOL find_node_end(stream_t *stream, strbuf_t *buf) +{ + int tag_count = 0, b = buf->len; + char *p; + + while(1) + { + if(!stream_chr(stream, buf, '>')) + return FALSE; + if(buf->len == 0) + break; + p = &buf->buf[b]; + while((p = memchr(p+1, '"', buf->len-(p-buf->buf))) != NULL) + tag_count++; + b = buf->len; + if(tag_count % 2 != 0) + { + if(!stream_chr(stream, buf, '"')) + return FALSE; + tag_count++; + } + else + break; + } + return TRUE; +} + BOOL next_node(stream_t *stream, strbuf_t *buf) { + strbuf_t tmpbuf; + + /* search through the end of the current node */ + strbuf_init(&tmpbuf); + if(!find_node_end(stream, &tmpbuf)) + { + strbuf_free(buf); + return FALSE; + } + strbuf_free(&tmpbuf); + + /* find the beginning of the next node */ if(!stream_chr(stream, NULL, '<')) return FALSE; - if(!stream_chr(stream, buf, '>')) + /* read out the data of the next node */ + if(!find_node_end(stream, buf)) return FALSE; strbuf_append(buf, ">", 2);

1 0

Erich E. Hoover : hhctrl.ocx: Support delimited filenames for HH_DISPLAY_TOPIC data.
by Alexandre Julliard 27 Feb '14

27 Feb '14

Module: wine Branch: master Commit: 5eb040253c90a20ed070f643e479ed32b83e49fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb040253c90a20ed070f643e… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Feb 25 19:10:58 2014 -0700 hhctrl.ocx: Support delimited filenames for HH_DISPLAY_TOPIC data. --- dlls/hhctrl.ocx/hhctrl.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 8b42569..86a31f5 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -203,7 +203,20 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: if (data) - index = (const WCHAR *)data; + { + static const WCHAR delimW[] = {':',':',0}; + const WCHAR *i = (const WCHAR *)data; + + index = strstrW(i, delimW); + if(index) + { + if(memcmp(info->pCHMInfo->szFile, i, index-i)) + FIXME("Opening a CHM file in the context of another is not supported.\n"); + index += strlenW(delimW); + } + else + index = i; + } break; }

1 0

Aric Stewart : dmime: Do not try to query a NULL direct sound buffer.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: fcae01672f2d480597a40850ff0386268b24791d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcae01672f2d480597a40850f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 26 18:03:35 2014 +0900 dmime: Do not try to query a NULL direct sound buffer. --- dlls/dmime/audiopath.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 6b7a2f0..66e218c 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -108,21 +108,22 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_GetObjectI FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); switch (dwStage) { - case DMUS_PATH_BUFFER: - { - if (IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSoundBuffer8, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else if (IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { - IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSound3DBuffer, ppObject); - TRACE("returning %p\n",*ppObject); - return S_OK; - } else { - FIXME("Bad iid\n"); - } - } - break; + case DMUS_PATH_BUFFER: + if (This->pDSBuffer) + { + if (IsEqualIID (iidInterface, &IID_IDirectSoundBuffer8)) { + IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSoundBuffer8, ppObject); + TRACE("returning %p\n",*ppObject); + return S_OK; + } else if (IsEqualIID (iidInterface, &IID_IDirectSound3DBuffer)) { + IDirectSoundBuffer8_QueryInterface (This->pDSBuffer, &IID_IDirectSound3DBuffer, ppObject); + TRACE("returning %p\n",*ppObject); + return S_OK; + } else { + FIXME("Bad iid\n"); + } + } + break; case DMUS_PATH_PRIMARY_BUFFER: { if (IsEqualIID (iidInterface, &IID_IDirectSound3DListener)) {

1 0

Francois Gouget : ddraw/tests: Fix some comma versus semi-colon mixups.
by Alexandre Julliard 26 Feb '14

26 Feb '14

Module: wine Branch: master Commit: 4f26fb0e0bde28673e5791f7b634d7dd97ee285f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f26fb0e0bde28673e5791f7b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 26 19:53:48 2014 +0100 ddraw/tests: Fix some comma versus semi-colon mixups. --- dlls/ddraw/tests/ddraw1.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++-- dlls/ddraw/tests/ddraw4.c | 4 ++-- dlls/ddraw/tests/ddraw7.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb98dad..66a2662 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3692,7 +3692,7 @@ static void test_surface_lock(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; if (!(tests[i].caps & DDSCAPS_PRIMARYSURFACE)) @@ -3711,7 +3711,7 @@ static void test_surface_lock(void) hr = IDirectDraw_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, type %s, hr %#x.\n", tests[i].name, hr); - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); hr = IDirectDrawSurface_Lock(surface, NULL, &ddsd, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, type %s, hr %#x.\n", tests[i].name, hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ea89398..2a69a2f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4374,7 +4374,7 @@ static void test_surface_lock(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; if (!(tests[i].caps & DDSCAPS_PRIMARYSURFACE)) @@ -4393,7 +4393,7 @@ static void test_surface_lock(void) hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, type %s, hr %#x.\n", tests[i].name, hr); - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); hr = IDirectDrawSurface_Lock(surface, NULL, &ddsd, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, type %s, hr %#x.\n", tests[i].name, hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 7efdfe8..c29ed40 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4972,7 +4972,7 @@ static void test_surface_lock(void) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; if (!(tests[i].caps & DDSCAPS_PRIMARYSURFACE)) @@ -4992,7 +4992,7 @@ static void test_surface_lock(void) hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, type %s, hr %#x.\n", tests[i].name, hr); - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); hr = IDirectDrawSurface4_Lock(surface, NULL, &ddsd, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, type %s, hr %#x.\n", tests[i].name, hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8210cf0..76a44fe 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4827,7 +4827,7 @@ static void test_surface_lock(void) goto done; } - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; ddsd.dwWidth = 64; @@ -4850,7 +4850,7 @@ static void test_surface_lock(void) if (!cubemap_supported && tests[i].caps2 & DDSCAPS2_CUBEMAP) continue; - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; if (!(tests[i].caps & DDSCAPS_PRIMARYSURFACE)) @@ -4870,7 +4870,7 @@ static void test_surface_lock(void) hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, type %s, hr %#x.\n", tests[i].name, hr); - memset(&ddsd, 0, sizeof(ddsd)), + memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); hr = IDirectDrawSurface7_Lock(surface, NULL, &ddsd, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, type %s, hr %#x.\n", tests[i].name, hr);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014