March 2007 - Wine-commits - list.winehq.org

Jacek Caban : shdocvw: Always set hostui to NULL in SetClientsite.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 0b48542f1f647a953877797f9eda1e220b38c0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b48542f1f647a953877797f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 16:54:26 2007 +0100 shdocvw: Always set hostui to NULL in SetClientsite. --- dlls/shdocvw/oleobject.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index dc795f8..307fe0b 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -289,25 +289,26 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE This->inplace = NULL; } - if(This->doc_host.hostui) + if(This->doc_host.hostui) { IDocHostUIHandler_Release(This->doc_host.hostui); + This->doc_host.hostui = NULL; + } + if(This->client) IOleClientSite_Release(This->client); + This->client = pClientSite; + if(!pClientSite) { if(This->doc_host.document) deactivate_document(&This->doc_host); - This->client = NULL; return S_OK; } - This->client = pClientSite; IOleClientSite_AddRef(pClientSite); - hres = IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, - (void**)&This->doc_host.hostui); - if(FAILED(hres)) - This->doc_host.hostui = NULL; + IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, + (void**)&This->doc_host.hostui); hres = IOleClientSite_GetContainer(This->client, &container); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : shdocvw: Added mode dispids implementation in DocHost::Invoke .
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 72bf4a641e614674a09bad9e9ba451007e8951f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72bf4a641e614674a09bad9e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 16:50:01 2007 +0100 shdocvw: Added mode dispids implementation in DocHost::Invoke. --- dlls/shdocvw/client.c | 8 ++++++++ dlls/shdocvw/dochost.c | 5 +++++ dlls/shdocvw/oleobject.c | 3 +++ dlls/shdocvw/shdocvw.h | 4 +++- 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index c2d71cf..c74918a 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -433,6 +433,14 @@ static HRESULT WINAPI ClDispatch_Invoke(IDispatch *iface, DISPID dispIdMember, R debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); switch(dispIdMember) { + case DISPID_AMBIENT_USERMODE: + case DISPID_AMBIENT_DLCONTROL: + case DISPID_AMBIENT_USERAGENT: + case DISPID_AMBIENT_PALETTE: + if(!This->client_disp) + return E_FAIL; + return IDispatch_Invoke(This->client_disp, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); case DISPID_AMBIENT_OFFLINEIFNOTCONNECTED: V_VT(pVarResult) = VT_BOOL; V_BOOL(pVarResult) = This->offline; diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 6d51f2e..c170a4a 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -486,6 +486,8 @@ void DocHost_Init(DocHost *This, IDispatch *disp) This->disp = disp; + This->client_disp = NULL; + This->document = NULL; This->hostui = NULL; @@ -504,6 +506,9 @@ void DocHost_Init(DocHost *This, IDispatch *disp) void DocHost_Release(DocHost *This) { + if(This->client_disp) + IDispatch_Release(This->client_disp); + DocHost_ClientSite_Release(This); ConnectionPointContainer_Destroy(&This->cps); diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 307fe0b..17f740a 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -307,6 +307,9 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE IOleClientSite_AddRef(pClientSite); + IOleClientSite_QueryInterface(This->client, &IID_IDispatch, + (void**)&This->doc_host.client_disp); + IOleClientSite_QueryInterface(This->client, &IID_IDocHostUIHandler, (void**)&This->doc_host.hostui); diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 78b43d2..0f897e7 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -74,9 +74,11 @@ typedef struct { IDispatch *disp; + IDispatch *client_disp; + IDocHostUIHandler *hostui; + IUnknown *document; IOleDocumentView *view; - IDocHostUIHandler *hostui; HWND hwnd; HWND frame_hwnd;

1 0

Jacek Caban : shdocvw: Release callback and bindctx in bind_url_to_object.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 3febaa2d137af41286c49419b216fb84d85231ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3febaa2d137af41286c49419b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 16:55:07 2007 +0100 shdocvw: Release callback and bindctx in bind_url_to_object. --- dlls/shdocvw/navigate.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 3d3ff61..a7b05b5 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -413,8 +413,7 @@ static BOOL try_application_url(LPCWSTR url) return ShellExecuteExW(&exec_info); } -static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx, - IBindStatusCallback *callback) +static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx) { IOleObject *oleobj; IPersistMoniker *persist; @@ -499,9 +498,11 @@ static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, U callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers, &cancel); CreateAsyncBindCtx(0, callback, 0, &bindctx); + IBindStatusCallback_Release(callback); - hres = navigate(This, mon, bindctx, callback); + hres = navigate(This, mon, bindctx); + IBindCtx_Release(bindctx); IMoniker_Release(mon); return hres; @@ -602,7 +603,7 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, This->url = url; - return navigate(This, mon, bindctx, callback); + return navigate(This, mon, bindctx); } #define HLINKFRAME_THIS(iface) DEFINE_THIS(WebBrowser, HlinkFrame, iface)

1 0

Anatoly Lyutin : wineconsole: Update Russian resources.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 207608c73e335acd26290f1d77b59d775d0ecdf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=207608c73e335acd26290f1d7… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Sat Mar 3 14:58:44 2007 +0300 wineconsole: Update Russian resources. --- programs/wineconsole/wineconsole_Ru.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index cdd9f67..755d76c 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -108,14 +108,14 @@ FONT 8, "MS Shell Dlg" COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP } -IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 140, 60 +IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 198, 70 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "�� " FONT 8, "MS Shell Dlg" { - GROUPBOX "", -1, 10, 10, 120, 31, BS_GROUPBOX - AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 15, 110, 10, WS_TABSTOP - AUTORADIOBUTTON "�� ", IDC_SAV_SESSION, 14, 27, 110, 10, WS_TABSTOP + AUTORADIOBUTTON "�� ", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP + AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 27, 170, 10, WS_TABSTOP - PUSHBUTTON "OK", IDOK, 20, 45, 35, 12 + PUSHBUTTON "OK", IDOK, 40, 50, 50, 14 + PUSHBUTTON "��", IDCANCEL, 110, 50, 50, 14 }

1 0

Alasdair Sinclair : kernel32: Fix GetComputerNameA to not count trailing NULL, with test.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 81c922398e4c820900d48aede254818ecc5c4fe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c922398e4c820900d48aede… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Sat Mar 3 03:03:53 2007 +0000 kernel32: Fix GetComputerNameA to not count trailing NULL, with test. --- dlls/kernel32/computername.c | 11 +++++------ dlls/kernel32/tests/environ.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index db9799a..754f86c 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -371,7 +371,7 @@ out: BOOL WINAPI GetComputerNameA(LPSTR name, LPDWORD size) { WCHAR nameW[ MAX_COMPUTERNAME_LENGTH + 1 ]; - DWORD sizeW = MAX_COMPUTERNAME_LENGTH; + DWORD sizeW = MAX_COMPUTERNAME_LENGTH + 1; unsigned int len; BOOL ret; @@ -381,17 +381,16 @@ BOOL WINAPI GetComputerNameA(LPSTR name, LPDWORD size) /* for compatibility with Win9x */ __TRY { - if ( *size < len + 1 ) + if ( *size < len ) { - *size = len + 1; + *size = len; SetLastError( ERROR_MORE_DATA ); ret = FALSE; } - else + else { WideCharToMultiByte ( CP_ACP, 0, nameW, -1, name, len, NULL, 0 ); - name[len] = 0; - *size = len; + *size = len - 1; ret = TRUE; } } diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index 43a8566..aa61b8e 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -239,6 +239,7 @@ static void test_GetComputerName(void) LPSTR name; LPWSTR nameW; DWORD error; + int name_len; size = 0; ret = GetComputerNameA((LPSTR)0xdeadbeef, &size); @@ -250,6 +251,16 @@ static void test_GetComputerName(void) ok(ret, "GetComputerNameA failed with error %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, name); + size = MAX_COMPUTERNAME_LENGTH + 1; + name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); + ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); + ret = GetComputerNameA(name, &size); + ok(ret, "GetComputerNameA failed with error %d\n", GetLastError()); + trace("computer name is \"%s\"\n", name); + name_len = strlen(name); + ok(size == name_len, "size should be same as length, name_len=%d, size=%d\n", name_len, size); + HeapFree(GetProcessHeap(), 0, name); + size = 0; ret = GetComputerNameW((LPWSTR)0xdeadbeef, &size); error = GetLastError();

1 0

Anatoly Lyutin : comctl32: Update Russian and Ukrainian resourses.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 63669cc780a7095753813ba15d12393da0ffce55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63669cc780a7095753813ba15… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Sat Mar 3 14:21:49 2007 +0300 comctl32: Update Russian and Ukrainian resourses. --- dlls/comdlg32/cdlg_Ru.rc | 28 ++++++++++++++-------------- dlls/comdlg32/cdlg_Uk.rc | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ru.rc b/dlls/comdlg32/cdlg_Ru.rc index 54586ea..6e7adb8 100644 --- a/dlls/comdlg32/cdlg_Ru.rc +++ b/dlls/comdlg32/cdlg_Ru.rc @@ -232,22 +232,22 @@ FONT 8, "MS Shell Dlg" GROUPBOX "��", grp4, 8, 4, 272,84, WS_GROUP CONTROL "�� &�", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 PUSHBUTTON "&��", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&��:", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "��:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "��", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "��:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "��", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "��:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "��", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "��:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "��", stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "&��:", stc6, 16, 20, 46,8 + COMBOBOX cmb4, 64, 18, 140,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "��:", stc8, 16, 36, 46,10, SS_NOPREFIX + LTEXT "��", stc12, 64, 36, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "��:", stc7, 16, 48, 46,10, SS_NOPREFIX + LTEXT "��", stc11, 64, 48, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "��:", stc10, 16, 60, 46,10, SS_NOPREFIX + LTEXT "��", stc14, 64, 60, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "��:", stc9, 16, 72, 46,10, SS_NOPREFIX + LTEXT "��", stc13, 64, 72, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "��", grp2, 160, 92, 120,64, WS_GROUP LTEXT "�� &��:",stc5,168,108,68,8 - ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "&��", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,40,12 - EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER + ICON "", ico3, 162,124, 60,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "&��", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,42,12 + EDITTEXT edt3, 230,106, 42,12, WS_GROUP | ES_NUMBER GROUPBOX "��", grp1, 8,92, 144,64, WS_GROUP CONTROL "&��", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 @@ -278,7 +278,7 @@ BEGIN LTEXT "��:", stc7, 16, 48, 36,10, SS_NOPREFIX LTEXT "��", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "��:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "��", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "��", stc14, 52, 60, 36,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP LTEXT "��:", stc9, 16, 72, 36,10, SS_NOPREFIX LTEXT "��", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP diff --git a/dlls/comdlg32/cdlg_Uk.rc b/dlls/comdlg32/cdlg_Uk.rc index be206fb..bc5ad2b 100644 --- a/dlls/comdlg32/cdlg_Uk.rc +++ b/dlls/comdlg32/cdlg_Uk.rc @@ -232,22 +232,22 @@ FONT 8, "MS Shell Dlg" GROUPBOX "��", grp4, 8, 4, 272,84, WS_GROUP CONTROL "�� &�", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12 PUSHBUTTON "&��", psh2, 212, 17, 60,14, WS_GROUP - LTEXT "&��'�:", stc6, 16, 20, 36,8 - COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP - LTEXT "��:", stc8, 16, 36, 36,10, SS_NOPREFIX - LTEXT "��", stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "��:", stc7, 16, 48, 36,10, SS_NOPREFIX - LTEXT "��", stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "̳��:", stc10, 16, 60, 36,10, SS_NOPREFIX - LTEXT "��", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP - LTEXT "��:", stc9, 16, 72, 36,10, SS_NOPREFIX - LTEXT "��", stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "&��'�:", stc6, 16, 20, 46,8 + COMBOBOX cmb4, 64, 18, 140,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP + LTEXT "��:", stc8, 16, 36, 46,10, SS_NOPREFIX + LTEXT "��", stc12, 64, 36, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "��:", stc7, 16, 48, 46,10, SS_NOPREFIX + LTEXT "��", stc11, 64, 48, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "̳��:", stc10, 16, 60, 46,10, SS_NOPREFIX + LTEXT "��", stc14, 64, 60, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "��:", stc9, 16, 72, 46,10, SS_NOPREFIX + LTEXT "��", stc13, 64, 72, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP GROUPBOX "��ﳿ", grp2, 160, 92, 120,64, WS_GROUP LTEXT "�� &��:",stc5,168,108,68,8 - ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "&��", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,40,12 - EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER + ICON "", ico3, 162,124, 60,24, WS_GROUP | SS_CENTERIMAGE + CONTROL "&��", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,42,12 + EDITTEXT edt3, 230,106, 42,12, WS_GROUP | ES_NUMBER GROUPBOX "��", grp1, 8,92, 144,64, WS_GROUP CONTROL "&��", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 @@ -255,7 +255,7 @@ FONT 8, "MS Shell Dlg" CONTROL "&��", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 85,122, 20,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 20,12, WS_GROUP | ES_NUMBER - RTEXT "&��:", stc2, 70,124, 10,8 + RTEXT "&��:", stc2, 70,124, 12,8 RTEXT "&��:", stc3, 106,124, 10,8 }

1 0

Anatoly Lyutin : cmd: Update translation and synchronize Russian resource.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 34faf92e2d45774b011795e39eeae4ca5b025367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34faf92e2d45774b011795e39… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Sat Mar 3 16:28:08 2007 +0300 cmd: Update translation and synchronize Russian resource. --- programs/cmd/Ru.rc | 189 ++++++++++++++++++++++++++++------------------------ 1 files changed, 102 insertions(+), 87 deletions(-) diff --git a/programs/cmd/Ru.rc b/programs/cmd/Ru.rc index 8f3bdea..522a59d 100644 --- a/programs/cmd/Ru.rc +++ b/programs/cmd/Ru.rc @@ -2,6 +2,7 @@ * Wine command prompt (Russian resources) * * Copyright 2003 Igor Stepin + * Copyright 2007 Lyutin Anatoly * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,13 +25,13 @@ STRINGTABLE { WCMD_ATTRIB, "�� ATTRIB\n" WCMD_CALL, -"CALL <�� bat-��> �� bat-�� \n\ -�� bat-��. When the batch file exits, control returns to\n\ -the file which called it. The CALL command may supply parameters to the\n\ -called procedure.\n\ +"CALL <�� bat-��> �� bat-�� \n\ +bat-��. �� bat-�� \n\ +��, �� . �� CALL �� \n\ +�� bat-��.\n\ \n\ -Changes to default directory, environment variables etc made within a\n\ -called procedure are inherited by the caller.\n" +�� , �� .�., ��\n\ +�� , �� .\n" WCMD_CD, "�� CD\n" WCMD_CHDIR, "�� CHDIR\n" @@ -44,106 +45,111 @@ called procedure are inherited by the caller.\n" WCMD_DIR, "�� DIR\n" WCMD_ECHO, -"ECHO <��> �� <��> �� .\n\ +"ECHO <��> �� <��> �� .\n\ \n\ -ECHO ON causes all subsequent commands in a batch file to be displayed\n\ -on the terminal device before they are executed.\n\ +ECHO ON �� bat-��\n\ +� �� .\n\ \n\ -ECHO OFF reverses the effect of a previous ECHO ON (ECHO is OFF by\n\ -default). The ECHO OFF command can be prevented from displaying by\n\ -preceding it with an @ sign.\n" +ECHO OFF �� , �� ECHO ON (ECHO �� (OFF) ��\n\ +��). �� @, �� ECHO OFF, �� .\n" WCMD_ERASE, "�� ERASE\n" WCMD_FOR, -"The FOR command is used to execute a command for each of a set of files.\n\ +"FOR �� <��> ��\n\ +�� .\n\ \n\ -Syntax: FOR %variable IN (set) DO command\n\ +��: FOR %�� IN (��) DO ��\n\ \n\ -The requirement to double the % sign when using FOR in a batch file does\n\ -not exist in wcmd.\n" +�� % �� FOR � bat-��\n\ +�� cmd.\n" + WCMD_GOTO, -"The GOTO command transfers execution to another statement within a\n\ -batch file.\n\ +"GOTO �� , �� , �\n\ +�� bat-��.\n\ \n\ -The label which is the target of a GOTO may be up to 255 characters\n\ -long but may not include spaces (this is different from other operating\n\ -systems). If two or more identical labels exist in a batch file the\n\ -first one will always be executed. Attempting to GOTO a nonexistent\n\ -label terminates the batch file execution.\n\ +��, �� GOTO, �� 255 ��, ��\n\ +�� (�� \n\ +��). �� bat-�� ,\n\ +�� .\n\ +�� GOTO �� bat-��.\n\ \n\ -GOTO has no effect when used interactively.\n" +�� GOTO �� .\n" WCMD_HELP, "�� HELP\n" WCMD_IF, -"IF is used to conditionally execute a command.\n\ +"IF �� .\n\ \n\ -Syntax: IF [NOT] EXIST filename command\n\ - IF [NOT] string1==string2 command\n\ - IF [NOT] ERRORLEVEL number command\n\ +��: IF [NOT] EXIST �� \n\ + IF [NOT] \"��1\"==\"��2\" ��\n\ + IF [NOT] ERRORLEVEL �� \n\ \n\ -In the second form of the command, string1 and string2 must be in double\n\ -quotes. The comparison is not case-sensitive.\n" +� �� EXIST �� .\n\ +�� .\n\ +� �� ERRORLEVEL - ��, �� .\n\ +IF �� ERRORLEVEL �� >= <��>.\n" - WCMD_LABEL, "LABEL is used to set a disk volume label. \n\ + WCMD_LABEL, +"LABEL �� .\n\ \n\ -Syntax: LABEL [drive:]\n\ -The command will prompt you for the new volume label for the given drive.\n\ -You can display the disk volume label with the VOL command.\n" +��: LABEL [��:]\n\ +�� .\n\ +�� VOL.\n" + WCMD_MD, "�� MD\n" WCMD_MKDIR, "�� MKDIR\n" WCMD_MOVE, -"MOVE relocates a file or directory to a new point within the file system.\n\ +"MOVE �� .\n\ \n\ -If the item being moved is a directory then all the files and subdirectories\n\ -below the item are moved as well.\n\ +�� , �� \n\ +�� .\n\ \n\ -MOVE fails if the old and new locations are on different DOS drive letters.\n" +MOVE �� .\n" WCMD_PATH, -"PATH displays or changes the wcmd search path.\n\ +"PATH �� cmd.\n\ \n\ -Entering PATH will display the current PATH setting (initially this is\n\ -the value given in your wine.conf file). To change the setting follow the\n\ -PATH command with the new value.\n\ +�� PATH �� \n\ +(�� wine.conf ��).\n\ +�� PATH � �� .\n\ \n\ -It is also possible to modify the PATH by using the PATH environment\n\ -variable, for example:\n\ +�� PATH, �� \n\ +�� PATH, ��:\n\ PATH %PATH%;c:\\temp \n" WCMD_PAUSE, -"PAUSE displays a message on the screen 'Press Return key to continue'\n\ -and waits for the user to press the Return key. It is mainly useful in\n\ -batch files to allow the user to read the output of a previous command\n\ -before it scrolls off the screen.\n" +"PAUSE �� 'Press Return key to continue'\n\ +� �� Return. �� \n\ +� bat-�� , �� \n\ +�� .\n" WCMD_PROMPT, -"PROMPT sets the command-line prompt.\n\ +"PROMPT �� .\n\ \n\ -The string following the PROMPT command (and the space immediately after)\n\ -appears at the beginning of the line when wcmd is waiting for input.\n\ +��, �� PROMPT (� �� ),\n\ +�� , �� cmd �� .\n\ \n\ -The following character strings have the special meaning shown:\n\ +�� , �� :\n\ \n\ $$ �� $_ Linefeed $b �� Pipe (|)\n\ -$d �� $e Escape $g �� >\n\ +$d �� $e Esc-�� (27) $g �� >\n\ $l �� < $n �� $p �� \n\ -$q �� $t �� $v �� wcmd\n\ +$q �� $t �� $v �� cmd\n\ \n\ -Note that entering the PROMPT command without a prompt-string resets the\n\ -prompt to the default, which is the current drive letter followed by its\n\ -current directory and a greater-than (>) sign.\n\ -(like a command PROMPT $p$g).\n\ +�� PROMPT �� \n\ +�� (�� , �� \n\ +�� (>).\n\ +(�� PROMPT $p$g).\n\ \n\ -The prompt can also be changed by altering the PROMPT environment variable,\n\ -so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'\n" +�� PROMPT,\n\ +�� 'SET PROMPT=<��>' �� , �� 'PROMPT <text>'\n" WCMD_REM, -"�� , �� REM (� �� ) �� \n\ -�� bat-��.\n" +"�� , �� REM (� �� ) �� \n\ +�� , �� REM �� bat-��.\n" WCMD_REN, "�� REN\n" WCMD_RENAME, "�� RENAME\n" @@ -151,56 +157,63 @@ so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'\n" WCMD_RMDIR, "�� RMDIR\n" WCMD_SET, -"SET �� wcmd.\n\ +"SET �� cmd.\n\ \n\ SET �� .\n\ \n\ �� :\n\ \n\ - SET <��>=<��>\n\ + SET <��>=<��>\n\ \n\ -�� <��> � <��> �� . There must be no\n\ -spaces before the equals sign, nor can the variable name\n\ -have embedded spaces.\n\ +�� <��> � <��> �� . �� \n\ +�� , �� \n\ +��.\n\ \n\ -Under Wine, the environment of the underlying operating system is\n\ -included into the Win32 environment, there will generally therefore be\n\ -many more values than in a native Win32 implementation. Note that it is\n\ -not possible to affect the operating system environment from within wcmd.\n" +� Wine �� \n\ +� �� Win32, �� \n\ +��, �� Win32. �� ,\n\ +�� cmd.\n" WCMD_SHIFT, -"SHIFT is used in a batch file to remove one parameter from the head of\n\ -the list, so parameter 2 becomes parameter 1 and so on. It has no effect\n\ -if called from the command line.\n" +"SHIFT �� bat-�� \n\ +��, �� 2 �� 1 � �� .\n\ +SHIFT �� .\n" WCMD_TIME, "�� TIME\n" - WCMD_TITLE, "�� wcmd �� ,\n ��: TITLE [��]\n" + WCMD_TITLE, "�� cmd �� .\n ��: TITLE <��>\n" WCMD_TYPE, -"TYPE <filename> copies <filename> to the console device (or elsewhere\n\ -if redirected). No check is made that the file is readable text.\n" +"TYPE <��> �� <��> � �� (�� , �� ).\n\ +�� , �� - �� , �� , ��.\n" WCMD_VERIFY, -"VERIFY is used to set, clear or test the verify flag. Valid forms are:\n\ +"VERIFY �� , �� \n\ +�� . �� :\n\ \n\ VERIFY ON �� \n\ VERIFY OFF �� \n\ -VERIFY Displays ON or OFF as appropriate.\n\ +VERIFY �� : ON �� OFF.\n\ \n\ �� verify �� Wine.\n" WCMD_VER, -"VER �� wcmd\n" +"VER �� cmd\n" WCMD_VOL, "�� VOL\n" + WCMD_PUSHD, "PUSHD <directoryname> saves the current directory onto a\n\ +stack, and then changes the current directory to the supplied one.\n" + + WCMD_POPD, "POPD changes current directory to the last one saved with\n\ +PUSHD.\n" + WCMD_EXIT, -"EXIT �� \n\ -� �� wcmd.\n" +"EXIT �� \n\ +� �� cmd.\n" - 1000, "�� WCMD:\n\ -ATTRIB\t\t�� DOS-�� \n\ + 1000, "�� CMD:\n\ +ATTRIB\t\t�� DOS-�� \n\ CALL\t\t�� bat-�� bat-��\n\ CD (CHDIR)\t�� \n\ CLS\t\t�� \n\ @@ -214,16 +227,18 @@ HELP\t\t�� \n\ MD (MKDIR)\t�� \n\ MOVE\t\t�� , �� \n\ PATH\t\t�� \n\ +POPD\t\tRestores the directory to the last one saved with PUSHD\n\ +PUSHD\t\tChanges to a new directory, saving the current one\n\ PROMPT\t\t�� \n\ REN (RENAME)\t�� \n\ RD (RMDIR)\t�� \n\ SET\t\t�� \n\ TIME\t\t�� \n\ -TITLE\t\t�� wcmd �� \n\ +TITLE\t\t�� cmd �� \n\ TYPE\t\t�� \n\ -VER\t\t�� WCMD\n\ +VER\t\t�� CMD\n\ VOL\t\t�� \n\ -EXIT\t\t�� WCMD\n\n\ +EXIT\t\t�� CMD\n\n\ �� HELP <��> �� .\n" WCMD_CONFIRM, "Are you sure"

1 0

Rob Shearman : ole32: Fix return codes returned by IBindCtx:: RegisterObjectBound and IBindCtx:: RevokeObjectBound when used on NULL objects.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: c4727fde17c8700e4670f999eb960194034f0f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4727fde17c8700e4670f999e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Mar 9 09:48:26 2007 +0000 ole32: Fix return codes returned by IBindCtx::RegisterObjectBound and IBindCtx::RevokeObjectBound when used on NULL objects. --- dlls/ole32/bindctx.c | 5 ++++- dlls/ole32/tests/moniker.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 464d02e..1dc702d 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -158,7 +158,7 @@ BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk) TRACE("(%p,%p)\n",This,punk); if (punk==NULL) - return E_POINTER; + return S_OK; IUnknown_AddRef(punk); @@ -197,6 +197,9 @@ BindCtxImpl_RevokeObjectBound(IBindCtx* iface, IUnknown* punk) TRACE("(%p,%p)\n",This,punk); + if (!punk) + return E_INVALIDARG; + /* check if the object was registered or not */ if (BindCtxImpl_GetObjectIndex(This,punk,NULL,&index)==S_FALSE) return MK_E_NOTBOUND; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 6b8a35a..aa7c30f 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1510,11 +1510,9 @@ static void test_bind_context(void) ok(!pEnumString, "pEnumString should be NULL\n"); hr = IBindCtx_RegisterObjectBound(pBindCtx, NULL); - todo_wine ok_ole_success(hr, "IBindCtx_RegisterObjectBound(NULL)"); hr = IBindCtx_RevokeObjectBound(pBindCtx, NULL); - todo_wine ok(hr == E_INVALIDARG, "IBindCtx_RevokeObjectBound(NULL) should have return E_INVALIDARG instead of 0x%08x\n", hr); unknown2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*unknown));

1 0

Peter Beutner : ntdll: Testcase for handling SIMD exceptions.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: f09f9ef5e1dbdd9521fb05031693baf362dd555b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09f9ef5e1dbdd9521fb05031… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Thu Mar 8 22:47:14 2007 +0100 ntdll: Testcase for handling SIMD exceptions. --- dlls/ntdll/tests/exception.c | 78 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 07f4bc6..58306d9 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -723,6 +723,82 @@ static void test_debugger(void) return; } +static DWORD simd_fault_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) +{ + int *stage = *(int **)(frame + 1); + + got_exception++; + + if( *stage == 1) { + /* fault while executing sse instruction */ + context->Eip += 3; /* skip addps */ + return ExceptionContinueExecution; + } + + /* stage 2 - divide by zero fault */ + if( rec->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION) + skip("system doesn't support SIMD exceptions\n"); + else { + ok( rec->ExceptionCode == STATUS_FLOAT_MULTIPLE_TRAPS, + "exception code: %#x, should be %#x\n", + rec->ExceptionCode, STATUS_FLOAT_MULTIPLE_TRAPS); + ok( rec->NumberParameters == 1, "# of params: %i, should be 1\n", + rec->NumberParameters); + if( rec->NumberParameters == 1 ) + ok( rec->ExceptionInformation[0] == 0, "param #1: %lx, should be 0\n", rec->ExceptionInformation[0]); + } + + context->Eip += 3; /* skip divps */ + + return ExceptionContinueExecution; +} + +static const BYTE simd_exception_test[] = { + 0x83, 0xec, 0x4, /* sub $0x4, %esp */ + 0x0f, 0xae, 0x1c, 0x24, /* stmxcsr (%esp) */ + 0x66, 0x81, 0x24, 0x24, 0xff, 0xfd, /* andw $0xfdff,(%esp) * enable divide by */ + 0x0f, 0xae, 0x14, 0x24, /* ldmxcsr (%esp) * zero exceptions */ + 0x6a, 0x01, /* push $0x1 */ + 0x6a, 0x01, /* push $0x1 */ + 0x6a, 0x01, /* push $0x1 */ + 0x6a, 0x01, /* push $0x1 */ + 0x0f, 0x10, 0x0c, 0x24, /* movups (%esp),%xmm1 * fill dividend */ + 0x0f, 0x57, 0xc0, /* xorps %xmm0,%xmm0 * clear divisor */ + 0x0f, 0x5e, 0xc8, /* divps %xmm0,%xmm1 * generate fault */ + 0x83, 0xc4, 0x10, /* add $0x10,%esp */ + 0x66, 0x81, 0x0c, 0x24, 0x00, 0x02, /* orw $0x200,(%esp) * disable exceptions */ + 0x0f, 0xae, 0x14, 0x24, /* ldmxcsr (%esp) */ + 0x83, 0xc4, 0x04, /* add $0x4,%esp */ + 0xc3, /* ret */ +}; + +static const BYTE sse_check[] = { + 0x0f, 0x58, 0xc8, /* addps %xmm0,%xmm1 */ + 0xc3, /* ret */ +}; + +static void test_simd_exceptions(void) +{ + int stage; + + /* test if CPU & OS can do sse */ + stage = 1; + got_exception = 0; + run_exception_test(simd_fault_handler, &stage, sse_check, sizeof(sse_check)); + if(got_exception) { + skip("system doesn't support SSE\n"); + return; + } + + /* generate a SIMD exception */ + stage = 2; + got_exception = 0; + run_exception_test(simd_fault_handler, &stage, simd_exception_test, + sizeof(simd_exception_test)); + ok( got_exception == 1, "got exception: %i, should be 1\n", got_exception); +} + #endif /* __i386__ */ START_TEST(exception) @@ -787,8 +863,8 @@ START_TEST(exception) test_prot_fault(); test_exceptions(); test_rtlraiseexcpetion(); - test_debugger(); + test_simd_exceptions(); VirtualFree(code_mem, 1024, MEM_RELEASE); #endif

1 0

Peter Beutner : ntdll: Handle SIMD exceptions.
by Alexandre Julliard 09 Mar '07

09 Mar '07

Module: wine Branch: master Commit: 4a831ec7162b76f342072a52e2a6c0c5f522a4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a831ec7162b76f342072a52e… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Thu Mar 8 22:48:14 2007 +0100 ntdll: Handle SIMD exceptions. --- dlls/ntdll/signal_i386.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 46bf9c2..75385c2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -324,7 +324,8 @@ enum i386_trap_code TRAP_x86_ARITHTRAP = 16, /* Floating point exception */ TRAP_x86_ALIGNFLT = 17, /* Alignment check exception */ TRAP_x86_MCHK = 18, /* Machine check exception */ - TRAP_x86_CACHEFLT = 19 /* Cache flush exception */ + TRAP_x86_CACHEFLT = 19 /* SIMD exception (via SIGFPE) if CPU is SSE capable + otherwise Cache flush exception (via SIGSEV) */ #endif }; @@ -1210,6 +1211,19 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case TRAP_x86_UNKNOWN: /* Unknown fault code */ rec->ExceptionCode = get_fpu_code( win_context ); break; + case TRAP_x86_CACHEFLT: /* SIMD exception */ + /* TODO: + * Behaviour only tested for divide-by-zero exceptions + * Check for other SIMD exceptions as well */ + if(siginfo->si_code != FPE_FLTDIV) + FIXME("untested SIMD exception: %#x. Might not work correctly\n", + siginfo->si_code); + + rec->ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; + rec->NumberParameters = 1; + /* no idea what meaning is actually behind this but thats what native does */ + rec->ExceptionInformation[0] = 0; + break; default: ERR( "Got unexpected trap %d\n", get_trap_code(context) ); rec->ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION;

1 0