August 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: bd70b79125f77eee82f555b1a595fa35519ae0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd70b79125f77eee82f555b1a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 30 20:12:47 2011 +0200 po: Update French translation. --- po/fr.po | 51 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 40 insertions(+), 11 deletions(-) diff --git a/po/fr.po b/po/fr.po index 270622e..f2319c9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-08-24 14:25+0100\n" +"PO-Revision-Date: 2011-08-30 20:11+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -803,9 +803,8 @@ msgid "Initials" msgstr "Initiales" #: crypt32.rc:80 -#, fuzzy msgid "Surname" -msgstr "Utilisateur" +msgstr "Nom de famille" #: crypt32.rc:81 msgid "Domain Component" @@ -8252,6 +8251,16 @@ msgid "" "Specifying no file type after the equal sign removes the current " "association, if any.\n" msgstr "" +"ASSOC affiche ou modifie les associations d'extensions de fichiers\n" +"\n" +"Syntaxe : ASSOC [.ext[=[typeFichier]]]\n" +"\n" +"ASSOC sans paramètre affiche les associations d'extensions de fichiers en " +"cours.\n" +"Si utilisé uniquement avec une extension de fichier, affiche l'association " +"actuelle.\n" +"Si aucun type de fichiers n'est spécifié après le signe égal, supprimer " +"l'association courante, si elle existe.\n" #: cmd.rc:243 msgid "" @@ -8266,6 +8275,17 @@ msgid "" "Specifying no open command after the equal sign removes the command string " "associated to the specified file type.\n" msgstr "" +"FTYPE affiche ou modifie les commandes d'ouvertures associées à des types de " +"fichiers\n" +"\n" +"Syntaxe : FTYPE [typeFichier[=[commandeOuverture]]]\n" +"\n" +"Sans paramètre, affiche les types de fichiers pour lesquels des chaînes de " +"commande d'ouverture sont actuellement définies.\n" +"Si seul un type de fichier est utilisé, affiche la chaîne de commande " +"d'ouverture associée, si elle existe.\n" +"Ne spécifier aucune commande après le signe égal supprime la commande " +"d'ouverture associée au type de fichier spécifié.\n" #: cmd.rc:245 msgid "MORE displays output of files or piped input in pages.\n" @@ -8291,7 +8311,6 @@ msgstr "" "au système d'exploitation ou au shell où vous avez invoqué cmd.\n" #: cmd.rc:288 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8330,6 +8349,7 @@ msgid "" "Enter HELP <command> for further information on any of the above commands\n" msgstr "" "Les commandes intégrées de CMD sont :\n" +"ASSOC\t\tAffiche ou modifie les associations d'extensions de fichiers\n" "ATTRIB\t\tAffiche ou modifie les attributs de fichiers DOS\n" "CALL\t\tInvoque un fichier batch à l'intérieur d'un autre\n" "CD (CHDIR)\tChange le répertoire courant\n" @@ -8343,6 +8363,8 @@ msgstr "" "ECHO\t\tAffiche du texte sur la console\n" "ENDLOCAL\tMet fin aux modifications locales de l'environnement dans un\n" "\t\tfichier batch\n" +"FTYPE\t\tAffiche ou modifie les commandes d'ouvertures associées à des\n" +"\t\ttypes de fichiers\n" "HELP\t\tAffiche de brefs détails sur l'utilisation d'une commande\n" "MD (MKDIR)\tCrée un répertoire\n" "MORE\t\tAffiche du texte par pages\n" @@ -8615,7 +8637,6 @@ msgid "Default gateway" msgstr "Passerelle par défaut" #: net.rc:27 -#, fuzzy msgid "" "The syntax of this command is:\n" "\n" @@ -8627,12 +8648,11 @@ msgid "" msgstr "" "La syntaxe de cette commande est :\n" "\n" -"NET HELP commande\n" +"NET commande [arguments]\n" " -ou-\n" "NET commande /HELP\n" "\n" -" Les commandes disponibles sont :\n" -" NET HELP NET START NET STOP NET USE\n" +"où « commande » peut être HELP, START, STOP ou USE\n" #: net.rc:28 msgid "" @@ -8643,6 +8663,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" +"La syntaxe de cette commande est :\n" +"\n" +"NET START [service]\n" +"\n" +"Affiche la liste des services en cours d'exécution si « service » est omis. " +"Sinon, « service » est le nom du service à démarrer.\n" #: net.rc:29 msgid "" @@ -8652,6 +8678,11 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" +"La syntaxe de cette commande est :\n" +"\n" +"NET STOP service\n" +"\n" +"où « service » est le nom du service à arrêter.\n" #: net.rc:30 msgid "Stopping dependent service: %s\n" @@ -8736,9 +8767,8 @@ msgid "Reconnecting" msgstr "Reconnexion" #: net.rc:40 -#, fuzzy msgid "The following services are running:\n" -msgstr "Les services dépendants sont en cours d'exécution\n" +msgstr "Les services suivants sont en cours d'exécution :\n" #: notepad.rc:27 msgid "&New\tCtrl+N" @@ -10428,7 +10458,6 @@ msgid "Drives" msgstr "Lecteurs" #: winecfg.rc:41 -#, fuzzy msgid "Select the Unix target directory, please." msgstr "Veuillez sélectionner le répertoire Unix cible."

1 0

Marcus Meissner : msi: Check return value of msi_string2idW (Coverity).
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: ee12b4feed8885a4c22716eade4154101ec5577f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee12b4feed8885a4c22716ead… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Aug 30 18:17:21 2011 +0200 msi: Check return value of msi_string2idW (Coverity). --- dlls/msi/streams.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 56b38e3..71616e9 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -296,10 +296,12 @@ static UINT STREAMS_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *n static UINT streams_find_row(MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row) { LPCWSTR str; - UINT i, id, data; + UINT r, i, id, data; str = MSI_RecordGetString(rec, 1); - msi_string2idW(sv->db->strings, str, &id); + r = msi_string2idW(sv->db->strings, str, &id); + if (r != ERROR_SUCCESS) + return r; for (i = 0; i < sv->num_rows; i++) {

1 0

Marcus Meissner : ntdll: Handle errno also for non ENOENT errors on lseek ( Coverity).
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 956487434d02c1911a942bed1a3949719fe54d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956487434d02c1911a942bed1… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Aug 30 16:41:29 2011 +0200 ntdll: Handle errno also for non ENOENT errors on lseek (Coverity). --- dlls/ntdll/directory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 548189c..5d6d2cc 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1547,9 +1547,9 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U else { old_pos = lseek( fd, 0, SEEK_CUR ); - if (old_pos == -1 && errno == ENOENT) + if (old_pos == -1) { - io->u.Status = STATUS_NO_MORE_FILES; + io->u.Status = (errno == ENOENT) ? STATUS_NO_MORE_FILES : FILE_GetNtStatus(); res = 0; goto done; }

1 0

Alistair Leslie-Hughes : uxtheme: Set last error on NULL pointer.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 81079ef35b0da17de0b3d75022be26f712740d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81079ef35b0da17de0b3d7502… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 23:15:25 2011 +1000 uxtheme: Set last error on NULL pointer. --- dlls/uxtheme/system.c | 6 ++++++ dlls/uxtheme/tests/system.c | 12 ++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 2d5b41e..6ee1dac 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -641,6 +641,12 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) HTHEME hTheme = NULL; TRACE("(%p,%s, %x)\n", hwnd, debugstr_w(pszClassList), flags); + if(!pszClassList) + { + SetLastError(E_POINTER); + return NULL; + } + if(flags) FIXME("unhandled flags: %x\n", flags); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 0aaadbd..8dd413b 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -192,8 +192,7 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeData(NULL, NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -232,8 +231,7 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeData(hWnd, NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -359,8 +357,7 @@ static void test_OpenThemeDataEx(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(NULL, NULL, 0); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -399,8 +396,7 @@ static void test_OpenThemeDataEx(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, NULL, 0); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError());

1 0

André Hentschel : shell32/tests: Fix checking the child strings.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 4e862b8440f4b8f15d6bc655ae5afdce2ba23d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e862b8440f4b8f15d6bc655a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 30 21:20:40 2011 +0200 shell32/tests: Fix checking the child strings. --- dlls/shell32/tests/shlexec.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 31b0930..bae0c21 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -680,6 +680,11 @@ static void _okChildString(const char* file, int line, const char* key, const ch { char* result; result=getChildString("Arguments", key); + if (!result) + { + ok_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); + return; + } ok_(file, line)(lstrcmpiA(result, expected) == 0, "%s expected '%s', got '%s'\n", key, expected, result); } @@ -688,6 +693,11 @@ static void _okChildPath(const char* file, int line, const char* key, const char { char* result; result=getChildString("Arguments", key); + if (!result) + { + ok_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); + return; + } ok_(file, line)(StrCmpPath(result, expected) == 0, "%s expected '%s', got '%s'\n", key, expected, result); }

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateTextW.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 2f1917956b9a568682822a851139821f548ac8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1917956b9a568682822a851… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 19:05:52 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateTextW. --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index d07d4bd..04ee7d0 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5344,11 +5344,11 @@ HRESULT WINAPI D3DXCreateTextW(LPDIRECT3DDEVICE9 device, if (FAILED(hr)) goto error; - hr = mesh->lpVtbl->LockVertexBuffer(mesh, D3DLOCK_DISCARD, (LPVOID *)&vertices); + hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, (LPVOID *)&vertices); if (FAILED(hr)) goto error; - hr = mesh->lpVtbl->LockIndexBuffer(mesh, D3DLOCK_DISCARD, (LPVOID *)&faces); + hr = mesh->lpVtbl->LockIndexBuffer(mesh, 0, (LPVOID *)&faces); if (FAILED(hr)) goto error;

1 0

Michael Stefaniuc : dsound: Handle primary buffers in IDirectSoundBufferImpl_SetFormat.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: a2bc634eaaf43a9e199f20d621b7b1a3fcf63752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2bc634eaaf43a9e199f20d62… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 01:17:04 2011 +0200 dsound: Handle primary buffers in IDirectSoundBufferImpl_SetFormat. --- dlls/dsound/buffer.c | 19 ++++++++++++++----- dlls/dsound/dsound_private.h | 1 + dlls/dsound/primary.c | 7 ++++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5c8fbba..7f1d005 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -187,15 +187,24 @@ static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer8(IDirectSound return CONTAINING_RECORD(iface, IDirectSoundBufferImpl, IDirectSoundBuffer8_iface); } +static inline BOOL is_primary_buffer(IDirectSoundBufferImpl *This) +{ + return This->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER ? TRUE : FALSE; +} + static HRESULT WINAPI IDirectSoundBufferImpl_SetFormat(IDirectSoundBuffer8 *iface, LPCWAVEFORMATEX wfex) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); + + TRACE("(%p,%p)\n", iface, wfex); - TRACE("(%p,%p)\n",This,wfex); - /* This method is not available on secondary buffers */ - WARN("invalid call\n"); - return DSERR_INVALIDCALL; + if (is_primary_buffer(This)) + return primarybuffer_SetFormat(This->device, wfex); + else { + WARN("not available for secondary buffers.\n"); + return DSERR_INVALIDCALL; + } } static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LONG vol) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index ed13b71..61c8b0d 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -336,6 +336,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; +HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; /* duplex.c */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index b3d1517..c726edf 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -472,12 +472,14 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) return pwfx; } -static HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, BOOL forced) +HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) { HRESULT err = DSERR_BUFFERLOST; int i; DWORD nSamplesPerSec, bpp, chans; LPWAVEFORMATEX oldpwfx; + BOOL forced = device->priolevel == DSSCL_WRITEPRIMARY; + TRACE("(%p,%p)\n", device, wfex); if (device->priolevel == DSSCL_NORMAL) { @@ -628,9 +630,8 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFormat( LPCWAVEFORMATEX wfex) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); - DirectSoundDevice *device = This->device; TRACE("(%p,%p)\n", iface, wfex); - return DSOUND_PrimarySetFormat(device, wfex, device->priolevel == DSSCL_WRITEPRIMARY); + return primarybuffer_SetFormat(This->device, wfex); } static HRESULT WINAPI PrimaryBufferImpl_SetVolume(

1 0

Michael Stefaniuc : dsound: Handle primary buffers in two more IDirectSoundBuffer methods.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: c35745d45adccc37a510dda920887affb7730ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35745d45adccc37a510dda92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 01:19:09 2011 +0200 dsound: Handle primary buffers in two more IDirectSoundBuffer methods. --- dlls/dsound/buffer.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 7f1d005..6ba6c24 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -284,6 +284,11 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i TRACE("(%p,%d)\n",This,freq); + if (is_primary_buffer(This)) { + WARN("not available for primary buffers.\n"); + return DSERR_CONTROLUNAVAIL; + } + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; @@ -397,9 +402,12 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref && !InterlockedDecrement(&This->numIfaces)) - secondarybuffer_destroy(This); - + if (!ref && !InterlockedDecrement(&This->numIfaces)) { + if (is_primary_buffer(This)) + primarybuffer_destroy(This); + else + secondarybuffer_destroy(This); + } return ref; }

1 0

Jacek Caban : vbscript: Added IActiveScript::InitNew implementation.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 7edaff43e4d70b22a7170d0fcf29b619ed3d4673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7edaff43e4d70b22a7170d0fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 11:22:05 2011 +0200 vbscript: Added IActiveScript::InitNew implementation. --- dlls/vbscript/vbscript.c | 53 +++++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/vbscript.h | 5 ++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index b04fe0c..b5cc9bf 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -50,11 +50,41 @@ struct VBScript { LONG ref; + SCRIPTSTATE state; IActiveScriptSite *site; + script_ctx_t *ctx; LONG thread_id; LCID lcid; }; +static void change_state(VBScript *This, SCRIPTSTATE state) +{ + if(This->state == state) + return; + + This->state = state; + if(This->site) + IActiveScriptSite_OnStateChange(This->site, state); +} + +static HRESULT set_ctx_site(VBScript *This) +{ + This->ctx->lcid = This->lcid; + + IActiveScriptSite_AddRef(This->site); + This->ctx->site = This->site; + + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; +} + +static void destroy_script(script_ctx_t *ctx) +{ + if(ctx->site) + IActiveScriptSite_Release(ctx->site); + heap_free(ctx); +} + static inline VBScript *impl_from_IActiveScript(IActiveScript *iface) { return CONTAINING_RECORD(iface, VBScript, IActiveScript_iface); @@ -133,7 +163,7 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(hres == S_OK) This->lcid = lcid; - return S_OK; + return This->ctx ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -271,8 +301,24 @@ static ULONG WINAPI VBScriptParse_Release(IActiveScriptParse *iface) static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) { VBScript *This = impl_from_IActiveScriptParse(iface); - FIXME("(%p)\n", This); - return S_OK; + script_ctx_t *ctx; + + TRACE("(%p)\n", This); + + if(This->ctx) + return E_UNEXPECTED; + + ctx = heap_alloc_zero(sizeof(script_ctx_t)); + if(!ctx) + return E_OUTOFMEMORY; + + ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); + if(ctx) { + destroy_script(ctx); + return E_UNEXPECTED; + } + + return This->site ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface, @@ -325,6 +371,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->IActiveScriptParse_iface.lpVtbl = &VBScriptParseVtbl; ret->ref = 1; + ret->state = SCRIPTSTATE_UNINITIALIZED; hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 30aaf1e..98a4486 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -19,6 +19,11 @@ #include "activscp.h" #include "vbscript_classes.h" +typedef struct { + IActiveScriptSite *site; + LCID lcid; +} script_ctx_t; + HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); static inline void *heap_alloc(size_t len)

1 0

Jacek Caban : vbscipt: Added IActiveScript::Close implementation.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 01ce1873a344bdf464a78ef83480dd1787a039d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ce1873a344bdf464a78ef83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 11:22:15 2011 +0200 vbscipt: Added IActiveScript::Close implementation. --- dlls/vbscript/vbscript.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index b5cc9bf..6160f3b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -85,6 +86,37 @@ static void destroy_script(script_ctx_t *ctx) heap_free(ctx); } +static void decrease_state(VBScript *This, SCRIPTSTATE state) +{ + switch(This->state) { + case SCRIPTSTATE_CONNECTED: + case SCRIPTSTATE_STARTED: + case SCRIPTSTATE_DISCONNECTED: + FIXME("unimplemented state %d\n", This->state); + if(state == SCRIPTSTATE_INITIALIZED) + break; + /* FALLTHROUGH */ + case SCRIPTSTATE_INITIALIZED: + destroy_script(This->ctx); + This->ctx = NULL; + This->thread_id = 0; + + change_state(This, state); + if(state == SCRIPTSTATE_UNINITIALIZED) + break; + /* FALLTHROUGH */ + case SCRIPTSTATE_UNINITIALIZED: + if(This->site) { + IActiveScriptSite_Release(This->site); + This->site = NULL; + } + + break; + default: + assert(0); + } +} + static inline VBScript *impl_from_IActiveScript(IActiveScript *iface) { return CONTAINING_RECORD(iface, VBScript, IActiveScript_iface); @@ -191,8 +223,14 @@ static HRESULT WINAPI VBScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE static HRESULT WINAPI VBScript_Close(IActiveScript *iface) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + if(This->thread_id && This->thread_id != GetCurrentThreadId()) + return E_UNEXPECTED; + + decrease_state(This, SCRIPTSTATE_CLOSED); + return S_OK; } static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstrName, DWORD dwFlags)

1 0