July 2006 - Wine-Commits - list.winehq.org

Robert Shearman : include: Add more error codes used by newer versions of COM.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: ccf2f56851cb40ae24033654d8ea8cdc6b6865c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccf2f56851cb40ae2403365… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jul 8 11:53:32 2006 +0100 include: Add more error codes used by newer versions of COM. --- include/winerror.h | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index 7738213..21925a1 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1584,6 +1584,35 @@ #define CO_E_INIT_SCM_FILE_MAPPING_EXIST #define CO_E_INIT_SCM_MAP_VIEW_OF_FILE _HRESULT_TYPEDEF_(0x80004010L) #define CO_E_INIT_SCM_EXEC_FAILURE _HRESULT_TYPEDEF_(0x80004011L) #define CO_E_INIT_ONLY_SINGLE_THREADED _HRESULT_TYPEDEF_(0x80004012L) +#define CO_E_CANT_REMOTE _HRESULT_TYPEDEF_(0x80004013L) +#define CO_E_BAD_SERVER_NAME _HRESULT_TYPEDEF_(0x80004014L) +#define CO_E_WRONG_SERVER_IDENTITY _HRESULT_TYPEDEF_(0x80004015L) +#define CO_E_OLE1DDE_DISABLED _HRESULT_TYPEDEF_(0x80004016L) +#define CO_E_RUNAS_SYNTAX _HRESULT_TYPEDEF_(0x80004017L) +#define CO_E_CREATEPROCESS_FAILURE _HRESULT_TYPEDEF_(0x80004018L) +#define CO_E_RUNAS_CREATEPROCESS_FAILURE _HRESULT_TYPEDEF_(0x80004019L) +#define CO_E_RUNAS_LOGON_FAILURE _HRESULT_TYPEDEF_(0x8000401AL) +#define CO_E_LAUNCH_PERMISSION_DENIED _HRESULT_TYPEDEF_(0x8000401BL) +#define CO_E_START_SERVICE_FAILURE _HRESULT_TYPEDEF_(0x8000401CL) +#define CO_E_REMOTE_COMMUNICATION_FAILURE _HRESULT_TYPEDEF_(0x8000401DL) +#define CO_E_SERVER_START_TIMEOUT _HRESULT_TYPEDEF_(0x8000401EL) +#define CO_E_CLSREG_INCONSISTENT _HRESULT_TYPEDEF_(0x8000401FL) +#define CO_E_IIDREG_INCONSISTENT _HRESULT_TYPEDEF_(0x80004020L) +#define CO_E_NOT_SUPPORTED _HRESULT_TYPEDEF_(0x80004021L) +#define CO_E_RELOAD_DLL _HRESULT_TYPEDEF_(0x80004022L) +#define CO_E_MSI_ERROR _HRESULT_TYPEDEF_(0x80004023L) +#define CO_E_ATTEMPT_TO_CREATE_OUTSIDE_CLIENT_CONTEXT _HRESULT_TYPEDEF_(0x80004024L) +#define CO_E_SERVER_PAUSED _HRESULT_TYPEDEF_(0x80004025L) +#define CO_E_SERVER_NOT_PAUSED _HRESULT_TYPEDEF_(0x80004026L) +#define CO_E_CLASS_DISABLED _HRESULT_TYPEDEF_(0x80004027L) +#define CO_E_CLRNOTAVAILABLE _HRESULT_TYPEDEF_(0x80004028L) +#define CO_E_ASYNC_WORK_REJECTED _HRESULT_TYPEDEF_(0x80004029L) +#define CO_E_SERVER_INIT_TIMEOUT _HRESULT_TYPEDEF_(0x8000402AL) +#define CO_E_NO_SECCTX_IN_ACTIVATE _HRESULT_TYPEDEF_(0x8000402BL) +#define CO_E_TRACKER_CONFIG _HRESULT_TYPEDEF_(0x80004030L) +#define CO_E_THREADPOOL_CONFIG _HRESULT_TYPEDEF_(0x80004031L) +#define CO_E_SXS_CONFIG _HRESULT_TYPEDEF_(0x80004032L) +#define CO_E_MALFORMED_SPN _HRESULT_TYPEDEF_(0x80004033L) #define E_UNEXPECTED _HRESULT_TYPEDEF_(0x8000FFFFL)

1 0

Robert Shearman : oleaut32: Make ctl2_hash_guid match the same function in widl, which has likely had much wider testing.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: f774f7b79c10768ff05bf7930794a98646b5396a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f774f7b79c10768ff05bf79… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jul 8 11:54:17 2006 +0100 oleaut32: Make ctl2_hash_guid match the same function in widl, which has likely had much wider testing. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index c872d4c..cbcf8f5 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -276,7 +276,7 @@ static int ctl2_hash_guid( hash ^= ((const short *)guid)[i]; } - return (hash & 0xf) | ((hash & 0x10) & (0 - !!(hash & 0xe0))); + return hash & 0x1f; } /****************************************************************************

1 0

Robert Shearman : oleaut32: MSFT_DoFuncs: "reclength" of the function information record is stored
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: 688c6a78f1d14055917b6eef634891cdbfb21829 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=688c6a78f1d14055917b6ee… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Jul 8 11:54:40 2006 +0100 oleaut32: MSFT_DoFuncs: "reclength" of the function information record is stored in a 16 bit int and not in a 8 bit int as previously supposed, using a 0x1ff mask. Upper 16 bits contains the ordinal number of the function. Allocation of the "recbuf" must be modified, to support larger data (based on a patch by White Snake <whitesnake78(a)mail.com>). --- dlls/oleaut32/typelib.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 080e25b..ce3a1dc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1721,7 +1721,7 @@ MSFT_DoFuncs(TLBContext* pcx, int infolen, nameoffset, reclength, nrattributes, i; int recoffset = offset + sizeof(INT); - char recbuf[512]; + char *recbuf = HeapAlloc(GetProcessHeap(), 0, 0xffff); MSFT_FuncRecord * pFuncRec=(MSFT_FuncRecord *) recbuf; TLBFuncDesc *ptfd_prev = NULL; @@ -1747,7 +1747,7 @@ MSFT_DoFuncs(TLBContext* pcx, /* read the function information record */ MSFT_ReadLEDWords(&reclength, sizeof(INT), pcx, recoffset); - reclength &= 0x1ff; + reclength &= 0xffff; MSFT_ReadLEDWords(pFuncRec, reclength - sizeof(INT), pcx, DO_NOT_SEEK); @@ -1892,6 +1892,7 @@ MSFT_DoFuncs(TLBContext* pcx, pptfd = & ((*pptfd)->next); recoffset += reclength; } + HeapFree(GetProcessHeap(), 0, recbuf); } static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs,

1 0

qingdoa daoo : oleaut32: Copying a NULL BSTR should result in an empty BSTR in VariantCopy.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: 5e09c2986705a9c421d0471a27905e0e761e09e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e09c2986705a9c421d0471… Author: qingdoa daoo <qingdao33122(a)yahoo.com> Date: Sat Jul 8 14:58:07 2006 +0800 oleaut32: Copying a NULL BSTR should result in an empty BSTR in VariantCopy. --- dlls/oleaut32/tests/vartest.c | 17 +++++++++++++++++ dlls/oleaut32/variant.c | 15 ++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 51c75e2..56322ba 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -528,6 +528,23 @@ static void test_VariantCopy(void) vt | ExtraFlags[i], V_VT(&vDst)); } } + + /* Test that copying a NULL BSTR results in an empty BSTR */ + memset(&vDst, 0, sizeof(vDst)); + V_VT(&vDst) = VT_EMPTY; + memset(&vSrc, 0, sizeof(vSrc)); + V_VT(&vSrc) = VT_BSTR; + hres = VariantCopy(&vDst, &vSrc); + ok(hres == S_OK, "Copy(NULL BSTR): Failed to copy a NULL BSTR\n"); + if (hres == S_OK) + { + ok((V_VT(&vDst) == VT_BSTR) && V_BSTR(&vDst), + "Copy(NULL BSTR): should have non-NULL result\n"); + if ((V_VT(&vDst) == VT_BSTR) && V_BSTR(&vDst)) + { + ok(*V_BSTR(&vDst) == 0, "Copy(NULL BSTR): result not empty\n"); + } + } } /* Determine if a vt is valid for VariantCopyInd() */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 5ea767f..dbaec34 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -718,15 +718,12 @@ HRESULT WINAPI VariantCopy(VARIANTARG* p } else if (V_VT(pvargSrc) == VT_BSTR) { - if (V_BSTR(pvargSrc)) - { - V_BSTR(pvargDest) = SysAllocStringByteLen((char*)V_BSTR(pvargSrc), SysStringByteLen(V_BSTR(pvargSrc))); - if (!V_BSTR(pvargDest)) - { - TRACE("!V_BSTR(pvargDest), SysAllocStringByteLen() failed to allocate %d bytes\n", SysStringByteLen(V_BSTR(pvargSrc))); - hres = E_OUTOFMEMORY; - } - } + V_BSTR(pvargDest) = SysAllocStringByteLen((char*)V_BSTR(pvargSrc), SysStringByteLen(V_BSTR(pvargSrc))); + if (!V_BSTR(pvargDest)) + { + TRACE("!V_BSTR(pvargDest), SysAllocStringByteLen() failed to allocate %d bytes\n", SysStringByteLen(V_BSTR(pvargSrc))); + hres = E_OUTOFMEMORY; + } } else if (V_VT(pvargSrc) == VT_RECORD) {

1 0

Juan Lang : crypt32: Implement revocation check in CertVerifySubjectCertificateContext.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: b0dfe4048b39696cbfefa9db1c0f61f8808864a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0dfe4048b39696cbfefa9d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Jul 7 13:19:53 2006 -0700 crypt32: Implement revocation check in CertVerifySubjectCertificateContext. --- dlls/crypt32/cert.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2bcc4f7..eabea82 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -731,12 +731,16 @@ BOOL WINAPI CertVerifySubjectCertificate } if (*pdwFlags & CERT_STORE_REVOCATION_FLAG) { - PCCRL_CONTEXT crl = CertFindCRLInStore(pSubject->hCertStore, - pSubject->dwCertEncodingType, 0, CRL_FIND_ISSUED_BY, pSubject, NULL); + DWORD flags = 0; + PCCRL_CONTEXT crl = CertGetCRLFromStore(pSubject->hCertStore, pSubject, + NULL, &flags); + /* FIXME: what if the CRL has expired? */ if (crl) { - FIXME("check CRL for subject\n"); + if (CertVerifyCRLRevocation(pSubject->dwCertEncodingType, + pSubject->pCertInfo, 1, (PCRL_INFO *)&crl->pCrlInfo)) + *pdwFlags &= CERT_STORE_REVOCATION_FLAG; } else *pdwFlags |= CERT_STORE_NO_CRL_FLAG;

1 0

Thomas Kho : winex11: Use correct multiplier for negative relative mouse movements.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: 4598c973b22bb7d7bd4436866d29e86ef3e0644d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4598c973b22bb7d7bd44368… Author: Thomas Kho <tkho(a)ucla.edu> Date: Fri Jul 7 21:05:14 2006 -0500 winex11: Use correct multiplier for negative relative mouse movements. --- dlls/winex11.drv/mouse.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 01dcc59..f4d3e6b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -255,15 +255,15 @@ void X11DRV_send_mouse_input( HWND hwnd, /* dx and dy can be negative numbers for relative movements */ SystemParametersInfoW(SPI_GETMOUSE, 0, accel, 0); - if (x > accel[0] && accel[2] != 0) + if (abs(x) > accel[0] && accel[2] != 0) { xMult = 2; - if ((x > accel[1]) && (accel[2] == 2)) xMult = 4; + if ((abs(x) > accel[1]) && (accel[2] == 2)) xMult = 4; } - if (y > accel[0] && accel[2] != 0) + if (abs(y) > accel[0] && accel[2] != 0) { yMult = 2; - if ((y > accel[1]) && (accel[2] == 2)) yMult = 4; + if ((abs(y) > accel[1]) && (accel[2] == 2)) yMult = 4; } wine_tsx11_lock();

1 0

Hwang YunSong(황윤성) : shell32: Updated Korean resource.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: 1ba6f15153607dfc183fbdd7a7e11dc0435a619a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ba6f15153607dfc183fbdd… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Sat Jul 8 09:31:19 2006 +0900 shell32: Updated Korean resource. --- dlls/shell32/shell32_Ko.rc | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index 6ba5cf3..c16e40c 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -21,8 +21,8 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT MENU_001 MENU DISCARDABLE BEGIN -MENUITEM "ū ��(&g)", FCIDM_SHVIEW_BIGICON -MENUITEM "�� (&m)", FCIDM_SHVIEW_SMALLICON +MENUITEM "ū ��(&G)", FCIDM_SHVIEW_BIGICON +MENUITEM "�� (&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "��(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "�ڼ��(&D)", FCIDM_SHVIEW_REPORTVIEW END @@ -36,8 +36,8 @@ POPUP "" BEGIN POPUP "��(&V)" BEGIN -MENUITEM "ū ��(&g)", FCIDM_SHVIEW_BIGICON -MENUITEM "�� (&m)", FCIDM_SHVIEW_SMALLICON +MENUITEM "ū ��(&G)", FCIDM_SHVIEW_BIGICON +MENUITEM "�� (&M)", FCIDM_SHVIEW_SMALLICON MENUITEM "��(&L)", FCIDM_SHVIEW_LISTVIEW MENUITEM "�ڼ��(&D)", FCIDM_SHVIEW_REPORTVIEW END @@ -76,10 +76,10 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN -MENUITEM "Ž��(&x)", FCIDM_SHVIEW_EXPLORE +MENUITEM "Ž��(&X)", FCIDM_SHVIEW_EXPLORE MENUITEM "��(&O)", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR -MENUITEM "�߶󳻱�(&u)", FCIDM_SHVIEW_CUT +MENUITEM "�߶󳻱�(&U)", FCIDM_SHVIEW_CUT MENUITEM "��(&C)", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR MENUITEM "��ũ ��(&L)", FCIDM_SHVIEW_CREATELINK @@ -152,8 +152,8 @@ IDS_DESKTOP "��ũž" IDS_MYCOMPUTER "�� ǻ��" /* context menus */ -IDS_VIEW_LARGE "ū ��(&g)" -IDS_VIEW_SMALL "�� (&m)" +IDS_VIEW_LARGE "ū ��(&G)" +IDS_VIEW_SMALL "�� (&M)" IDS_VIEW_LIST "��(&L)" IDS_VIEW_DETAILS "�ڼ��(&D)" IDS_SELECT "��" @@ -164,7 +164,8 @@ IDS_CREATEFOLDER_CAPTION "�� IDS_DELETEITEM_CAPTION "�� Ȯ��" IDS_DELETEFOLDER_CAPTION "�� Ȯ��" IDS_DELETEITEM_TEXT "�� '%1'�� ⸦ �ٶ��ϱ�?" -IDS_DELETEMULTIPLE_TEXT "�� ̰� %1 �� ⸦ �ٶ��ϱ�?" +IDS_DELETEMULTIPLE_TEXT "�� %1 ��(�̰͵�)�� ⸦ �ٶ��ϱ�?" +IDS_DELETESELECTED_TEXT "�� õ� ��(��)�� ⸦ �ٶ��ϱ�?" IDS_OVERWRITEFILE_TEXT "�� %1�� �ڽ��ϱ�?" IDS_OVERWRITEFILE_CAPTION "�� �� Ȯ��"

1 0

Andrew Talbot : winecfg: Write-strings warnings fix.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: f99d84b0c6472e87099d26c90525cfe9f82fcd0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f99d84b0c6472e87099d26c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jul 7 19:42:27 2006 +0100 winecfg: Write-strings warnings fix. --- programs/winecfg/audio.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index b68ab7f..ce3664e 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -207,6 +207,7 @@ static void initAudioDeviceTree(HWND hDl HIMAGELIST hImageList; HBITMAP hBitMap; HCURSOR old_cursor; + static TCHAR driver_typeT[] = {'S','o','u','n','d',' ','D','r','i','v','e','r','s',0}; tree = GetDlgItem(hDlg, IDC_AUDIO_TREE); @@ -227,7 +228,7 @@ static void initAudioDeviceTree(HWND hDl insert.hParent = TVI_ROOT; insert.hInsertAfter = TVI_LAST; insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = "Sound Drivers"; + insert.u.item.pszText = driver_typeT; insert.u.item.cChildren = 1; root = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM)&insert); @@ -306,9 +307,11 @@ static void initAudioDeviceTree(HWND hDl if (num_wod) { + TCHAR dev_typeT[] = {'W','a','v','e',' ','O','u','t',' ','D','e','v','i','c','e','s',0}; + insert.hParent = driver[i]; insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = "Wave Out Devices"; + insert.u.item.pszText = dev_typeT; insert.u.item.cChildren = 1; type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM)&insert); @@ -332,9 +335,11 @@ static void initAudioDeviceTree(HWND hDl if (num_wid) { + TCHAR dev_typeT[] = {'W','a','v','e',' ','I','n',' ','D','e','v','i','c','e','s',0}; + insert.hParent = driver[i]; insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = "Wave In Devices"; + insert.u.item.pszText = dev_typeT; insert.u.item.cChildren = 1; type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM)&insert); @@ -358,9 +363,11 @@ static void initAudioDeviceTree(HWND hDl if (num_mod) { + TCHAR dev_typeT[] = {'M','I','D','I',' ','O','u','t',' ','D','e','v','i','c','e','s',0}; + insert.hParent = driver[i]; insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = "MIDI Out Devices"; + insert.u.item.pszText = dev_typeT; insert.u.item.cChildren = 1; type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM)&insert); @@ -384,9 +391,11 @@ static void initAudioDeviceTree(HWND hDl if (num_mid) { + TCHAR dev_typeT[] = {'M','I','D','I',' ','I','n',' ','D','e','v','i','c','e','s',0}; + insert.hParent = driver[i]; insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = "MIDI In Devices"; + insert.u.item.pszText = dev_typeT; insert.u.item.cChildren = 1; type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM)&insert); @@ -410,9 +419,11 @@ static void initAudioDeviceTree(HWND hDl if (num_aux) { + TCHAR dev_typeT[] = {'A','u','x',' ','D','e','v','i','c','e','s',0}; + insert.hParent = driver[i]; insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = "Aux Devices"; + insert.u.item.pszText = dev_typeT; insert.u.item.cChildren = 1; type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM)&insert); @@ -436,9 +447,11 @@ static void initAudioDeviceTree(HWND hDl if (num_mxd) { + TCHAR dev_typeT[] = {'M','i','x','e','r',' ','D','e','v','i','c','e','s',0}; + insert.hParent = driver[i]; insert.u.item.mask = TVIF_TEXT | TVIF_CHILDREN; - insert.u.item.pszText = "Mixer Devices"; + insert.u.item.pszText = dev_typeT; insert.u.item.cChildren = 1; type = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM)&insert);

1 0

Jacek Caban : urlmon: Register protocol handlers in DllMain.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: 6004183e51161fab0087b613c8f09d6e3a6bd150 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6004183e51161fab0087b61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 7 20:31:59 2006 +0200 urlmon: Register protocol handlers in DllMain. --- dlls/urlmon/urlmon_main.c | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 49384e6..f35624a 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -44,6 +44,8 @@ HINSTANCE URLMON_hInstance = 0; DWORD urlmon_tls = 0; +static void init_session(BOOL); + /*********************************************************************** * DllMain (URLMON.init) */ @@ -55,11 +57,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); URLMON_hInstance = hinstDLL; + init_session(TRUE); break; case DLL_PROCESS_DETACH: if(urlmon_tls) TlsFree(urlmon_tls); + init_session(FALSE); URLMON_hInstance = 0; break; } @@ -186,17 +190,43 @@ struct object_creation_info { const CLSID *clsid; IClassFactory *cf; + LPCWSTR protocol; }; +static const WCHAR wszFile[] = {'f','i','l','e',0}; +static const WCHAR wszFtp[] = {'f','t','p',0}; +static const WCHAR wszHttp[] = {'h','t','t','p',0}; + static const struct object_creation_info object_creation[] = { - { &CLSID_FileProtocol, CLASSFACTORY(&FileProtocolCF) }, - { &CLSID_FtpProtocol, CLASSFACTORY(&FtpProtocolCF) }, - { &CLSID_HttpProtocol, CLASSFACTORY(&HttpProtocolCF) }, - { &CLSID_InternetSecurityManager, CLASSFACTORY(&SecurityManagerCF) }, - { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF) } + { &CLSID_FileProtocol, CLASSFACTORY(&FileProtocolCF), wszFile }, + { &CLSID_FtpProtocol, CLASSFACTORY(&FtpProtocolCF), wszFtp }, + { &CLSID_HttpProtocol, CLASSFACTORY(&HttpProtocolCF), wszHttp }, + { &CLSID_InternetSecurityManager, CLASSFACTORY(&SecurityManagerCF), NULL }, + { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF), NULL } }; +static void init_session(BOOL init) +{ + IInternetSession *session; + int i; + + CoInternetGetSession(0, &session, 0); + + for(i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) { + if(object_creation[i].protocol) { + if(init) + IInternetSession_RegisterNameSpace(session, object_creation[i].cf, + object_creation[i].clsid, object_creation[i].protocol, 0, NULL, 0); + else + IInternetSession_UnregisterNameSpace(session, object_creation[i].cf, + object_creation[i].protocol); + } + } + + IInternetSession_Release(session); +} + /******************************************************************************* * DllGetClassObject [URLMON.@] * Retrieves class object from a DLL object

1 0

Hwang YunSong(황윤성) : winecfg: Updated Korean resource.
by Alexandre Julliard July 10, 2006

July 10, 2006

Module: wine Branch: refs/heads/master Commit: 1b9f1e5a34fab2d61f49bb8a8eca2653a6ac8d0f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b9f1e5a34fab2d61f49bb8… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Sat Jul 8 17:07:30 2006 +0900 winecfg: Updated Korean resource. --- programs/winecfg/Ko.rc | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index ebfa0b8..278adcd 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -54,7 +54,7 @@ BEGIN IDC_STATIC,15,20,227,30 CONTROL "Applications",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,150 - PUSHBUTTON "��α׷� ��ϱ�(&A)...",IDC_APP_ADDAPP, 90,204,75,14 + PUSHBUTTON "��α׷� �߰��ϱ�(&A)...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "��α׷� ��ϱ�(&R)",IDC_APP_REMOVEAPP, 170,204,75,14 LTEXT "�� (&W):",IDC_STATIC,16,227,75,14 COMBOBOX IDC_WINVER,83,224,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -64,31 +64,31 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX " â �� ",IDC_STATIC,8,25,244,180 + GROUPBOX " â �� ",IDC_STATIC,8,4,244,180 - CONTROL "DirectX ��α׷�� 콺 Ŀ�� ׵�� â�ȿ� ��Ƶΰ� ��",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 - CONTROL "��ũž �� ۸�� ϰ� ��",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + CONTROL "DirectX ��α׷�� 콺 Ŀ�� ׵�� â�ȿ� ��Ƶΰ� ��",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,230,8 + CONTROL "��ũž �� ۸�� ϰ� ��",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,24,230,8 LTEXT "Wineâ�� â��ڿ� ��ؼ� ��ȴٸ�, Wineâ�� ǥ�� âƲ�� ̸�, �۾�� ڿ� �� ︱ ��Դϴ�. �׸�� â��Ͽ�� Ÿ�� Դϴ�.\n\n��࿡ Wineâ�� â��ڿ� �� ʴ´ٸ�, Wienâ�� â��ڿ� �� Դϴ�. �̰�� Wineâ�� ũž�� ϰ� ��յ�� ʴ´ٴ� �� ǹ��մϴ�. �� Wine�� 䳻��Ⱑ �� α׷�� ֵ�� ݴϴ�.", - IDC_STATIC,15,58,228,80 - CONTROL "â��ڰ� Wineâ�� ϵ�� ",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 + IDC_STATIC,15,37,228,80 + CONTROL "â��ڰ� Wineâ�� ϵ�� ",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,111,230,8 /* FIXME: the wording of this explanation could be a lot better */ LTEXT "Wine�� Wineâ�� ϳ�� '�� ȭ��'�� Եǵ��, �� ũž�� 䳻�� ֽ��ϴ�. �Ǵ� Wine�� Wineâ�� ǥ�� ũž �� ġ�ϵ�� ֽ��ϴ�.", - IDC_STATIC,15,146,228,28 - LTEXT "��ũžũ��:",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED + IDC_STATIC,15,121,228,28 + LTEXT "��ũž ũ��:",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED CONTROL "�� ũž �䳻��",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " ��̷�Ʈ 3D ",IDC_STATIC,8,210,244,50 + GROUPBOX " ��̷�Ʈ 3D ",IDC_STATIC,8,189,244,50 - LTEXT "��ؽ� ��̴� ��: ",IDC_STATIC,15,220,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,218,146,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "��ؽ� ��̴� ��: ",IDC_STATIC,15,199,80,30 + COMBOBOX IDC_D3D_VSHADER_MODE,100,197,146,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "�ȼ� ��̴� �� (�ϵ���� Ѵٸ�)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 + CONTROL "�ȼ� ��̴� �� (�ϵ���� Ѵٸ�)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,216,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -131,7 +131,7 @@ BEGIN LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 PUSHBUTTON "�߰�(&A)...",IDC_BUTTON_ADD,15,98,37,14 PUSHBUTTON "��(&R)",IDC_BUTTON_REMOVE,56,98,37,14 - PUSHBUTTON "�ڵ��(&D)...",IDC_BUTTON_AUTODETECT,195,98,51,14 + PUSHBUTTON "�ڵ� ã��(&D)...",IDC_BUTTON_AUTODETECT,195,98,51,14 /* editing drive details */ LTEXT "��(&P):",IDC_STATIC,15,123,30,10 @@ -168,13 +168,13 @@ BEGIN CONTROL "��ġ",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,60,160,130 PUSHBUTTON "��",IDC_AUDIO_CONTROL_PANEL,180,60,66,13 GROUPBOX " ��̷�Ʈ �� ",IDC_STATIC,8,205,244,60 - LTEXT "�ϵ�� : ",IDC_STATIC,15,215,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,146,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "�ϵ�� : ",IDC_STATIC,14,216,70,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,90,213,160,2,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "�⺻ �� :",IDC_STATIC,15,232,70,8 - COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DSOUND_RATES,90,230,42,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "��ÿ� �� ⺻ ��:",IDC_STATIC,137,232,80,8 - COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "��̹� �䳻��",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,23 + COMBOBOX IDC_DSOUND_BITS,220,230,30,13,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "��̹� �䳻��",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,245,68,18 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 @@ -192,7 +192,7 @@ BEGIN GROUPBOX " �� ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 - CONTROL "��⿡ ��:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + CONTROL "�̰�� :",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED PUSHBUTTON "ã��",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END

1 0