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

Jason Green : wined3d: Make the number of floating point shader constants dynamic.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: 718716b77a0461402084e24927ae31b6d23a3b2f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=718716b77a0461402084e24… Author: Jason Green <jave27(a)gmail.com> Date: Wed Jul 19 00:06:07 2006 -0400 wined3d: Make the number of floating point shader constants dynamic. --- dlls/wined3d/arb_program_shader.c | 16 ++++--- dlls/wined3d/device.c | 55 ++++++++++++++--------- dlls/wined3d/directx.c | 56 +++++++++++++++++------ dlls/wined3d/glsl_shader.c | 16 ++++--- dlls/wined3d/pixelshader.c | 4 +- dlls/wined3d/stateblock.c | 90 ++++++++++++++++++++++++++++++------- dlls/wined3d/vertexdeclaration.c | 3 + dlls/wined3d/vertexshader.c | 6 +- dlls/wined3d/wined3d_private.h | 36 ++++++++------- include/wine/wined3d_gl.h | 8 +++ 10 files changed, 205 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=718716b77a046140208…

1 0

James Hawkins : msi: Add a stub implementation of MsiSourceListClearAll.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: fc56e92657ddb67c6374e51ae23b90207d44049b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc56e92657ddb67c6374e51… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 18 13:39:55 2006 -0700 msi: Add a stub implementation of MsiSourceListClearAll. --- dlls/msi/msi.spec | 4 ++-- dlls/msi/source.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index d696319..27c04c8 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -201,8 +201,8 @@ 205 stdcall MsiEnumRelatedProductsW(wstr long long ptr) 206 stub MsiSetFeatureAttributesA 207 stub MsiSetFeatureAttributesW -208 stub MsiSourceListClearAllA -209 stub MsiSourceListClearAllW +208 stdcall MsiSourceListClearAllA(str str long) +209 stdcall MsiSourceListClearAllW(wstr wstr long) 210 stdcall MsiSourceListAddSourceA(str str long str) 211 stdcall MsiSourceListAddSourceW(wstr wstr long wstr) 212 stub MsiSourceListForceResolutionA diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 4575429..ca66c1f 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -617,3 +617,21 @@ UINT WINAPI MsiSourceListAddMediaDiskW(L return ERROR_SUCCESS; } + +/****************************************************************** + * MsiSourceListAddSourceExA (MSI.@) + */ +UINT WINAPI MsiSourceListClearAllA( LPCSTR szProduct, LPCSTR szUserName, DWORD dwReserved ) +{ + FIXME("(%s %s %ld) stub\n", debugstr_a(szProduct), debugstr_a(szUserName), dwReserved); + return ERROR_SUCCESS; +} + +/****************************************************************** + * MsiSourceListAddSourceExW (MSI.@) + */ +UINT WINAPI MsiSourceListClearAllW( LPCWSTR szProduct, LPCWSTR szUserName, DWORD dwReserved ) +{ + FIXME("(%s %s %ld) stub\n", debugstr_w(szProduct), debugstr_w(szUserName), dwReserved); + return ERROR_SUCCESS; +}

1 0

Stefan Leichter : crypt32: Make tests loadable on NT4.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: b5c98f4dd6253795d7d8360b79ddffffb47d0c11 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b5c98f4dd6253795d7d8360… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jul 17 21:31:08 2006 +0200 crypt32: Make tests loadable on NT4. --- dlls/crypt32/tests/crl.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 5d0ddc6..c774618 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -76,6 +76,18 @@ static const BYTE signedCRL[] = { 0x30, 0x30, 0x5a, 0x30, 0x02, 0x06, 0x00, 0x03, 0x11, 0x00, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a, 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00 }; +static BOOL (WINAPI *pCertIsValidCRLForCertificate)(PCCERT_CONTEXT, PCCRL_CONTEXT, DWORD, void*); + +static void init_function_pointers(void) +{ + HMODULE hdll = GetModuleHandleA("crypt32.dll"); + + if(hdll) + { + pCertIsValidCRLForCertificate = (void*)GetProcAddress(hdll, "CertIsValidCRLForCertificate"); + } +} + static void testCreateCRL(void) { PCCRL_CONTEXT context; @@ -489,6 +501,8 @@ static void testIsValidCRLForCert(void) PCCRL_CONTEXT crl; HCERTSTORE store; + if(!pCertIsValidCRLForCertificate) return; + crl = CertCreateCRLContext(X509_ASN_ENCODING, v1CRLWithIssuerAndEntry, sizeof(v1CRLWithIssuerAndEntry)); ok(crl != NULL, "CertCreateCRLContext failed: %08lx\n", GetLastError()); @@ -503,11 +517,11 @@ static void testIsValidCRLForCert(void) */ /* Curiously, any CRL is valid for the NULL certificate */ - ret = CertIsValidCRLForCertificate(NULL, crl, 0, NULL); + ret = pCertIsValidCRLForCertificate(NULL, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); /* Same issuer for both cert and CRL, this CRL is valid for that cert */ - ret = CertIsValidCRLForCertificate(cert1, crl, 0, NULL); + ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); cert2 = CertCreateCertificateContext(X509_ASN_ENCODING, @@ -519,7 +533,7 @@ static void testIsValidCRLForCert(void) * that cert. According to MSDN, the relevant bit to check is whether the * CRL has a CRL_ISSUING_DIST_POINT extension. */ - ret = CertIsValidCRLForCertificate(cert2, crl, 0, NULL); + ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); CertFreeCRLContext(crl); @@ -531,9 +545,9 @@ static void testIsValidCRLForCert(void) sizeof(v2CRLWithIssuingDistPoint)); ok(crl != NULL, "CertCreateCRLContext failed: %08lx\n", GetLastError()); - ret = CertIsValidCRLForCertificate(cert1, crl, 0, NULL); + ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); - ret = CertIsValidCRLForCertificate(cert2, crl, 0, NULL); + ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); CertFreeCRLContext(crl); @@ -543,9 +557,9 @@ static void testIsValidCRLForCert(void) sizeof(verisignCRL)); ok(crl != NULL, "CertCreateCRLContext failed: %08lx\n", GetLastError()); - ret = CertIsValidCRLForCertificate(cert1, crl, 0, NULL); + ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); - ret = CertIsValidCRLForCertificate(cert2, crl, 0, NULL); + ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); CertFreeCRLContext(crl); @@ -561,9 +575,9 @@ static void testIsValidCRLForCert(void) sizeof(verisignCRL), CERT_STORE_ADD_ALWAYS, &crl); ok(ret, "CertAddEncodedCRLToStore failed: %08lx\n", GetLastError()); - ret = CertIsValidCRLForCertificate(cert1, crl, 0, NULL); + ret = pCertIsValidCRLForCertificate(cert1, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); - ret = CertIsValidCRLForCertificate(cert2, crl, 0, NULL); + ret = pCertIsValidCRLForCertificate(cert2, crl, 0, NULL); ok(ret, "CertIsValidCRLForCertificate failed: %08lx\n", GetLastError()); CertFreeCRLContext(crl); @@ -684,6 +698,8 @@ static void testVerifyCRLRevocation(void START_TEST(crl) { + init_function_pointers(); + testCreateCRL(); testAddCRL(); testFindCRL();

1 0

Mike McCormack : msi: Check the right pointers for NULL.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: 1aba0d62c676f8e3158e02e5b236ecef133eaf15 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1aba0d62c676f8e3158e02e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 18 18:43:03 2006 +0900 msi: Check the right pointers for NULL. --- dlls/msi/msi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index e075c0e..11e552a 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -471,7 +471,7 @@ UINT WINAPI MSI_GetProductInfo(LPCWSTR s * FIXME: Values seem scattered/duplicated in the registry. Is there a system? */ - if ((szValue && !pcchValueBuf) || !szProduct || !szAttribute) + if ((szValue->str.w && !pcchValueBuf) || !szProduct || !szAttribute) return ERROR_INVALID_PARAMETER; /* check for special properties */ @@ -990,11 +990,11 @@ INSTALLSTATE WINAPI MSI_GetComponentPath LPWSTR path = NULL; TRACE("%s %s %p %p\n", debugstr_w(szProduct), - debugstr_w(szComponent), lpPathBuf, pcchBuf); + debugstr_w(szComponent), lpPathBuf->str.w, pcchBuf); - if( !szComponent ) + if( !szProduct || !szComponent ) return INSTALLSTATE_INVALIDARG; - if( lpPathBuf && !pcchBuf ) + if( lpPathBuf->str.w && !pcchBuf ) return INSTALLSTATE_INVALIDARG; if (!squash_guid( szProduct, squished_pc ) ||

1 0

Huw Davies : msi: Create files with the correct file attributes.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: 045d817f4b7991c55cbec3789aa6c09ba2feb1a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=045d817f4b7991c55cbec37… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 18 12:51:31 2006 +0100 msi: Create files with the correct file attributes. --- dlls/msi/files.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 534199f..ba36a0d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -210,6 +210,7 @@ static INT_PTR cabinet_notify(FDINOTIFIC HANDLE handle; LPWSTR file; MSIFILE *f; + DWORD attrs; file = strdupAtoW(pfdin->psz1); f = get_loaded_file(data->package, file); @@ -231,8 +232,11 @@ static INT_PTR cabinet_notify(FDINOTIFIC TRACE("extracting %s\n", debugstr_w(f->TargetPath) ); + attrs = f->Attributes & (FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM); + if (!attrs) attrs = FILE_ATTRIBUTE_NORMAL; + handle = CreateFileW( f->TargetPath, GENERIC_READ | GENERIC_WRITE, 0, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + NULL, CREATE_ALWAYS, attrs, NULL ); if ( handle == INVALID_HANDLE_VALUE ) { ERR("failed to create %s (error %ld)\n",

1 0

James Hawkins : msi: Sort SelectionTree items by their Display value.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: 2396e2a59f822dd10975e82ed8224e1fe4b883c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2396e2a59f822dd10975e82… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 18 11:40:44 2006 -0700 msi: Sort SelectionTree items by their Display value. --- dlls/msi/action.c | 3 ++- dlls/msi/dialog.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6723f9f..2c0644c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1345,7 +1345,8 @@ static UINT ACTION_CostInitialize(MSIPAC UINT rc; static const WCHAR Query_all[] = {'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', - '`','F','e','a','t','u','r','e','`',0}; + '`','F','e','a','t','u','r','e','`',' ','O','R','D','E','R', + ' ','B','Y',' ','`','D','i','s','p','l','a','y','`',0}; static const WCHAR szCosting[] = {'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0 }; static const WCHAR szZero[] = { '0', 0 }; diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index d8e7cf5..0543555 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1610,7 +1610,7 @@ msi_seltree_add_child_features( MSIPACKA memset( &tvis, 0, sizeof tvis ); tvis.hParent = hParent; - tvis.hInsertAfter = TVI_SORT; + tvis.hInsertAfter = TVI_LAST; tvis.u.item.mask = TVIF_TEXT | TVIF_PARAM; tvis.u.item.pszText = feature->Title; tvis.u.item.lParam = (LPARAM) feature;

1 0

Mike McCormack : msi: Set properties, not the command line in MsiReinstallFeatureW.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: bf5791053716c6fab26e911e4370ecbf4b870f9f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf5791053716c6fab26e911… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 18 18:45:41 2006 +0900 msi: Set properties, not the command line in MsiReinstallFeatureW. --- dlls/msi/msi.c | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index a488b12..e075c0e 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1928,16 +1928,17 @@ UINT WINAPI MsiReinstallFeatureW( LPCWST { MSIPACKAGE* package = NULL; UINT r; - DWORD sz; WCHAR sourcepath[MAX_PATH]; WCHAR filename[MAX_PATH]; - static const WCHAR szInstalled[] = { - ' ','L','O','G','V','E','R','B','O','S','E','=','1',' ','I','n','s','t','a','l','l','e','d','=','1',0}; - static const WCHAR fmt[] = {'R','E','I','N','S','T','A','L','L','=','%','s',0}; - static const WCHAR REINSTALLMODE[] = {'R','E','I','N','S','T','A','L','L','M','O','D','E',0}; + static const WCHAR szLogVerbose[] = { + ' ','L','O','G','V','E','R','B','O','S','E',0 }; + static const WCHAR szInstalled[] = { 'I','n','s','t','a','l','l','e','d',0}; + static const WCHAR szReinstall[] = {'R','E','I','N','S','T','A','L','L',0}; + static const WCHAR szReinstallMode[] = {'R','E','I','N','S','T','A','L','L','M','O','D','E',0}; + static const WCHAR szOne[] = {'1',0}; WCHAR reinstallmode[11]; LPWSTR ptr; - LPWSTR commandline; + DWORD sz; FIXME("%s %s %li\n", debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode); @@ -1968,14 +1969,13 @@ UINT WINAPI MsiReinstallFeatureW( LPCWST sz = sizeof(sourcepath); MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, - &sz); + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); sz = sizeof(filename); MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); - strcatW(sourcepath,filename); + lstrcatW( sourcepath, filename ); if (dwReinstallMode & REINSTALLMODE_PACKAGE) r = MSI_OpenPackageW( sourcepath, &package ); @@ -1985,23 +1985,15 @@ UINT WINAPI MsiReinstallFeatureW( LPCWST if (r != ERROR_SUCCESS) return r; - MSI_SetPropertyW(package,REINSTALLMODE,reinstallmode); + MSI_SetPropertyW( package, szReinstallMode, reinstallmode ); + MSI_SetPropertyW( package, szInstalled, szOne ); + MSI_SetPropertyW( package, szLogVerbose, szOne ); + MSI_SetPropertyW( package, szReinstall, szFeature ); - sz = lstrlenW(szInstalled); - sz += lstrlenW(fmt); - sz += lstrlenW(szFeature); - - commandline = msi_alloc(sz * sizeof(WCHAR)); - - sprintfW(commandline,fmt,szFeature); - lstrcatW(commandline,szInstalled); - - r = MSI_InstallPackage( package, sourcepath, commandline ); + r = MSI_InstallPackage( package, sourcepath, NULL ); msiobj_release( &package->hdr ); - msi_free(commandline); - return r; }

1 0

Mike McCormack : msi: Implement MsiSetInstallLevel.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: a7e6864be1473e96b60ca999622a5915002f3a88 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7e6864be1473e96b60ca99… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jul 18 18:43:33 2006 +0900 msi: Implement MsiSetInstallLevel. --- dlls/msi/install.c | 28 ++++++++++++++++++++++++++++ dlls/msi/msi.spec | 2 +- 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 8724c95..cb43403 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -30,6 +30,7 @@ #include "msi.h" #include "msidefs.h" #include "msipriv.h" #include "action.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -760,3 +761,30 @@ LANGID WINAPI MsiGetLanguage(MSIHANDLE h msiobj_release( &package->hdr ); return langid; } + +/*********************************************************************** + * MsiGetLanguage (MSI.@) + */ +UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel) +{ + static const WCHAR szInstallLevel[] = { + 'I','N','S','T','A','L','L','L','E','V','E','L',0 }; + static const WCHAR fmt[] = { '%','d',0 }; + MSIPACKAGE* package; + WCHAR level[6]; + UINT r; + + TRACE("%ld %i\n", hInstall, iInstallLevel); + + if (iInstallLevel<1 || iInstallLevel>32767) + return ERROR_INVALID_PARAMETER; + + package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); + if ( !package ) + return ERROR_INVALID_HANDLE; + + sprintfW( level, fmt, iInstallLevel ); + r = MSI_SetPropertyW( package, szInstallLevel, level ); + msiobj_release( &package->hdr ); + return r; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 8dfade1..d696319 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -133,7 +133,7 @@ 137 stdcall MsiSetExternalUIW(ptr long ptr) 138 stdcall MsiSetFeatureStateA(long str long) 139 stdcall MsiSetFeatureStateW(long wstr long) -140 stub MsiSetInstallLevel +140 stdcall MsiSetInstallLevel(long long) 141 stdcall MsiSetInternalUI(long ptr) 142 stub MsiVerifyDiskSpace 143 stdcall MsiSetMode(long long long)

1 0

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

July 19, 2006

Module: wine Branch: refs/heads/master Commit: ad15e61e9e97f421c120d2d13888d1456f043463 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad15e61e9e97f421c120d2d… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Jul 19 08:57:56 2006 +0900 mshtml: Updated Korean resource. --- dlls/mshtml/Ko.rc | 52 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/Ko.rc b/dlls/mshtml/Ko.rc index e78d6a4..01c6071 100644 --- a/dlls/mshtml/Ko.rc +++ b/dlls/mshtml/Ko.rc @@ -24,8 +24,24 @@ STRINGTABLE DISCARDABLE { IDS_HTMLDISABLED "HTML �� ." IDS_HTMLDOCUMENT "HTML ��" + IDS_DOWNLOADING "�ٿ�ε� ��..." + IDS_INSTALLING "��ġ ��..." } +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko ��ġ Ǯ�׸�" +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� ø��̼�� HTML �� ַ�� մϴ�. Wine�� ֱ� ��ظ� " \ + "Gecko (Mozilla HTML ��)�� ġ�� Դϴ�. Wine�� ڵ�� Gecko�� ٿ�ε��ϰ� ��ġ�ϱ⸦ ��Ѵٸ� " \ + "[��ġ]��ư�� Ŭ��Ͻʽÿ�", ID_DWL_STATUS, 10, 10, 240, 30, SS_CENTER + CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + PUSHBUTTON "��", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "��ġ", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP +} + + /* FIXME: This should be in shdoclc.dll */ IDR_BROWSE_CONTEXT_MENU MENU @@ -33,23 +49,23 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "�⺻" { MENUITEM "�ڷ�(&B)", IDM_BACK - MENUITEM "��(&o)", IDM_FORWARD + MENUITEM "��(&O)", IDM_FORWARD MENUITEM SEPARATOR MENUITEM "�� (&S)...", IDM_SAVEBACKGROUNDAS - MENUITEM "�� (&g)", IDM_SETASBACKGROUND + MENUITEM "�� (&G)", IDM_SETASBACKGROUND MENUITEM "�� (&C)", IDM_COPYBACKGROUND MENUITEM "��ũž �� (&D)", IDM_SETASDESKTOPITEM MENUITEM SEPARATOR MENUITEM "�� (&A)", IDM_SELECTALL MENUITEM "�ٿ��ֱ�(&P)", IDM_PASTE MENUITEM SEPARATOR - MENUITEM "�ٷΰ�� (&t)", IDM_CREATESHORTCUT + MENUITEM "�ٷΰ�� (&T)", IDM_CREATESHORTCUT MENUITEM "��ã�⿡ ��ϱ�(&F)", IDM_ADDTOFAVOURITES MENUITEM "�ҽ� ��(&V)", IDM_VIEWSOURCE MENUITEM SEPARATOR MENUITEM "��ڵ�(&E)", IDM_ENCODING MENUITEM SEPARATOR - MENUITEM "�μ�(&i)", IDM_PRINT + MENUITEM "�μ�(&I)", IDM_PRINT MENUITEM "�ٽ� �б�(&R)", IDM_REFRESH MENUITEM SEPARATOR MENUITEM SEPARATOR @@ -63,23 +79,23 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "�ٸ� �̸�� (&A)...", IDM_SAVETARGETAS MENUITEM "Ÿ�� (&P)", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "�׸� ��(&h)", IDM_SHOWPICTURE + MENUITEM "�׸� ��(&H)", IDM_SHOWPICTURE MENUITEM "�׸� �ٸ� �̸�� (&S)...", IDM_SAVEPICTUREAS MENUITEM "�׸�� ̸��Ϸ�(&E)...", IDM_EMAILPICTURE - MENUITEM "�׸� �μ�(&i)...", IDM_PRINTPICTURE + MENUITEM "�׸� �μ�(&I)...", IDM_PRINTPICTURE MENUITEM "�� ׸�� (&G)", IDM_GOTOMYPICTURES - MENUITEM "�� (&g)", IDM_SETASBACKGROUND + MENUITEM "�� (&G)", IDM_SETASBACKGROUND MENUITEM "��ũž �� (&D)...", IDM_SETASDESKTOPITEM MENUITEM SEPARATOR MENUITEM "�߶󳻱�(&T)", IDM_CUT MENUITEM "��(&C)", IDM_COPY - MENUITEM "�ٷ� �� (&t)", IDM_COPYSHORTCUT + MENUITEM "�ٷ� �� (&T)", IDM_COPYSHORTCUT MENUITEM "�ٿ��ֱ�(&P)", IDM_PASTE MENUITEM SEPARATOR MENUITEM "�� ã�⿡ �߰�(&F)...", IDM_ADDTOFAVOURITES MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "�Ӽ�(&r)", IDM_PROPERTIES + MENUITEM "�Ӽ�(&R)", IDM_PROPERTIES } POPUP "��" @@ -112,7 +128,7 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "1DSite ��" { - MENUITEM "�߶󳻱�(&t)", IDM_CUT + MENUITEM "�߶󳻱�(&T)", IDM_CUT MENUITEM "��(&C)", IDM_COPY MENUITEM "�ٿ��ֱ�", IDM_PASTE MENUITEM "�� (&A)", IDM_SELECTALL @@ -129,13 +145,13 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "�߶󳻱�", IDM_CUT MENUITEM "��(&C)", IDM_COPY - MENUITEM "�ٷΰ�� (&t)", IDM_COPYSHORTCUT + MENUITEM "�ٷΰ�� (&T)", IDM_COPYSHORTCUT MENUITEM "�ٿ��ֱ�(&P)", IDM_PASTE MENUITEM SEPARATOR MENUITEM "��ã�⿡ ��ϱ�(&F)...", IDM_ADDTOFAVOURITES MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "�Ӽ�(&r)", IDM_PROPERTIES + MENUITEM "�Ӽ�(&R)", IDM_PROPERTIES } POPUP "�˼� �� ý�Ʈ" @@ -150,14 +166,14 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "�ٸ� �̸�� (&A)...", IDM_SAVETARGETAS MENUITEM "�� μ�(&P)", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "�׸� ��(&h)", IDM_SHOWPICTURE + MENUITEM "�׸� ��(&H)", IDM_SHOWPICTURE MENUITEM "�� ٸ� �̸�� (&S)...", IDM_SAVEPICTUREAS MENUITEM "�� (&g)", IDM_SETASBACKGROUND MENUITEM "��ũž �� (&D)...", IDM_SETASDESKTOPITEM MENUITEM SEPARATOR MENUITEM "�߶󳻱�(&T)", IDM_CUT MENUITEM "��(&C)", IDM_COPY - MENUITEM "�ٷ� �� (&t)", IDM_COPYSHORTCUT + MENUITEM "�ٷ� �� (&T)", IDM_COPYSHORTCUT MENUITEM "�ٿ��ֱ�(&P)", IDM_PASTE MENUITEM SEPARATOR MENUITEM "��ã�⿡ ��ϱ�(&F)...", IDM_ADDTOFAVOURITES @@ -165,7 +181,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "��", IDM_PLAY MENUITEM "��", IDM_STOP - MENUITEM "�Ӽ�(&r)", IDM_PROPERTIES + MENUITEM "�Ӽ�(&R)", IDM_PROPERTIES } POPUP "ART �׸�" @@ -175,14 +191,14 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "�ٸ� �̸�� (&A)...", IDM_SAVETARGETAS MENUITEM "Ÿ�� μ�(&P)", IDM_PRINTTARGET MENUITEM SEPARATOR - MENUITEM "�׸� ��(&h)", IDM_SHOWPICTURE + MENUITEM "�׸� ��(&H)", IDM_SHOWPICTURE MENUITEM "�׸� �ٸ� �̸�� (&S)...", IDM_SAVEPICTUREAS MENUITEM "�� (&g)", IDM_SETASBACKGROUND MENUITEM "��ũž �� (&D)...", IDM_SETASDESKTOPITEM MENUITEM SEPARATOR MENUITEM "�߶󳻱�(&T)", IDM_CUT MENUITEM "��(&C)", IDM_COPY - MENUITEM "�ٷΰ�� (&t)", IDM_COPYSHORTCUT + MENUITEM "�ٷΰ�� (&T)", IDM_COPYSHORTCUT MENUITEM "�ٿ��(&P)", IDM_PASTE MENUITEM SEPARATOR MENUITEM "��ã�⿡ ��ϱ�(&F)...", IDM_ADDTOFAVOURITES @@ -192,7 +208,7 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "�ٽ� ��", IDM_REWIND MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "�Ӽ�(&r)", IDM_PROPERTIES + MENUITEM "�Ӽ�(&R)", IDM_PROPERTIES } POPUP "��"

1 0

Andrew Talbot : secur32: Write-strings warnings fix.
by Alexandre Julliard July 19, 2006

July 19, 2006

Module: wine Branch: refs/heads/master Commit: b62bbe55687dafd70eeb4b6e3e9bbeb30913c317 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b62bbe55687dafd70eeb4b6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jul 17 22:41:12 2006 +0100 secur32: Write-strings warnings fix. --- dlls/secur32/ntlm.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 8d8f318..1b33ddb 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -86,14 +86,16 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac { SECURITY_STATUS ret; PNegoHelper helper = NULL; - + static CHAR ntlm_auth[] = "ntlm_auth", + helper_protocol[] = "--helper-protocol=squid-2.5-ntlmssp"; + SEC_CHAR *client_user_arg = NULL; SEC_CHAR *client_domain_arg = NULL; SEC_WCHAR *username = NULL, *domain = NULL; - + SEC_CHAR *client_argv[5]; - SEC_CHAR *server_argv[] = { "ntlm_auth", - "--helper-protocol=squid-2.5-ntlmssp", + SEC_CHAR *server_argv[] = { ntlm_auth, + helper_protocol, NULL }; TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", @@ -1216,13 +1218,15 @@ static const SecPkgInfoA infoA = { }; void SECUR32_initNTLMSP(void) -{ +{ SECURITY_STATUS ret; PNegoHelper helper; + static CHAR ntlm_auth[] = "ntlm_auth", + version[] = "--version"; SEC_CHAR *args[] = { - "ntlm_auth", - "--version", + ntlm_auth, + version, NULL }; if((ret = fork_helper(&helper, "ntlm_auth", args)) != SEC_E_OK)

1 0