October 2012 - Wine-commits

Christian Costa : ntoskrnl.exe: Add TRACEs to IoCreateDriver and IoDelete driver.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 5ca17f6d5066ecf12cac2fb001a7ecae0587ff56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca17f6d5066ecf12cac2fb00… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Sep 29 22:28:24 2012 +0200 ntoskrnl.exe: Add TRACEs to IoCreateDriver and IoDelete driver. --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5303ce8..c66bb55 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -500,6 +500,8 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) DRIVER_EXTENSION *extension; NTSTATUS status; + TRACE("(%s, %p)\n", debugstr_us(name), init); + if (!(driver = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*driver) + sizeof(*extension) ))) return STATUS_NO_MEMORY; @@ -533,6 +535,8 @@ NTSTATUS WINAPI IoCreateDriver( UNICODE_STRING *name, PDRIVER_INITIALIZE init ) */ void WINAPI IoDeleteDriver( DRIVER_OBJECT *driver ) { + TRACE("(%p)\n", driver); + RtlFreeUnicodeString( &driver->DriverName ); RtlFreeHeap( GetProcessHeap(), 0, driver ); } @@ -685,6 +689,7 @@ NTSTATUS WINAPI IoGetDeviceInterfaces( CONST GUID *InterfaceClassGuid, NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK access, PFILE_OBJECT *file, PDEVICE_OBJECT *device ) { FIXME( "stub: %s %x %p %p\n", debugstr_us(name), access, file, device ); + return STATUS_NOT_IMPLEMENTED; }

1 0

Christian Costa : ntdll: Init retv to FALSE so in case of exception the trace shows the failure.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 49d8b4c039845a84f1995800e5977a9de3c4dbed URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d8b4c039845a84f1995800e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Sep 29 22:29:11 2012 +0200 ntdll: Init retv to FALSE so in case of exception the trace shows the failure. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5dc7911..d00397c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -994,7 +994,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved NTSTATUS status = STATUS_SUCCESS; DLLENTRYPROC entry = wm->ldr.EntryPoint; void *module = wm->ldr.BaseAddress; - BOOL retv = TRUE; + BOOL retv = FALSE; /* Skip calls for modules loaded with special load flags */

1 0

Francois Gouget : shlwapi: Implement PathCreateFromUrlAlloc().
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 58c77f61566a3f2535fa646dc41662e0cad3e752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c77f61566a3f2535fa646dc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 1 03:29:55 2012 +0200 shlwapi: Implement PathCreateFromUrlAlloc(). --- dlls/shlwapi/path.c | 20 ++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/tests/path.c | 14 ++++++++++++++ include/shlwapi.h | 10 ++++++---- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index dc7bc4b..415ae29 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3420,6 +3420,26 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, } /************************************************************************* + * PathCreateFromUrlAlloc [SHLWAPI.@] + */ +HRESULT WINAPI PathCreateFromUrlAlloc(LPCWSTR pszUrl, LPWSTR *pszPath, + DWORD dwReserved) +{ + WCHAR pathW[MAX_PATH]; + DWORD size; + HRESULT hr; + + size = MAX_PATH; + hr = PathCreateFromUrlW(pszUrl, pathW, &size, dwReserved); + if (SUCCEEDED(hr)) + { + /* Yes, this is supposed to crash if pszPath is NULL */ + *pszPath = StrDupW(pathW); + } + return hr; +} + +/************************************************************************* * PathRelativePathToA [SHLWAPI.@] * * Create a relative path from one path to another. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index e0bdcf1..025d48a 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -586,6 +586,7 @@ @ stdcall PathCompactPathW(long wstr long) @ stdcall PathCreateFromUrlA(str ptr ptr long) @ stdcall PathCreateFromUrlW(wstr ptr ptr long) +@ stdcall PathCreateFromUrlAlloc(wstr ptr long) @ stdcall PathFileExistsA (str) @ stdcall PathFileExistsW (wstr) @ stdcall PathFindExtensionA (str) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 6417988..d9209bd 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -32,6 +32,7 @@ static HRESULT (WINAPI *pPathIsValidCharW)(WCHAR,DWORD); static LPWSTR (WINAPI *pPathCombineW)(LPWSTR, LPCWSTR, LPCWSTR); static HRESULT (WINAPI *pPathCreateFromUrlA)(LPCSTR, LPSTR, LPDWORD, DWORD); static HRESULT (WINAPI *pPathCreateFromUrlW)(LPCWSTR, LPWSTR, LPDWORD, DWORD); +static HRESULT (WINAPI *pPathCreateFromUrlAlloc)(LPCWSTR, LPWSTR*, DWORD); static BOOL (WINAPI *pPathAppendA)(LPSTR, LPCSTR); /* ################ */ @@ -326,6 +327,18 @@ static void test_PathCreateFromUrl(void) FreeWideString(pathW); } } + + if (pPathCreateFromUrlAlloc) + { + static const WCHAR fileW[] = {'f','i','l','e',':','/','/','f','o','o',0}; + static const WCHAR fooW[] = {'\\','\\','f','o','o',0}; + + pathW = NULL; + ret = pPathCreateFromUrlAlloc(fileW, &pathW, 0); + ok(ret == S_OK, "got 0x%08x expected S_OK\n", ret); + ok(lstrcmpiW(pathW, fooW) == 0, "got %s expected %s\n", wine_dbgstr_w(pathW), wine_dbgstr_w(fooW)); + HeapFree(GetProcessHeap(), 0, pathW); + } } @@ -1453,6 +1466,7 @@ START_TEST(path) pPathCreateFromUrlA = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlA"); pPathCreateFromUrlW = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlW"); + pPathCreateFromUrlAlloc = (void*)GetProcAddress(hShlwapi, "PathCreateFromUrlAlloc"); pPathCombineW = (void*)GetProcAddress(hShlwapi, "PathCombineW"); pPathIsValidCharA = (void*)GetProcAddress(hShlwapi, (LPSTR)455); pPathIsValidCharW = (void*)GetProcAddress(hShlwapi, (LPSTR)456); diff --git a/include/shlwapi.h b/include/shlwapi.h index cbfaabe..067ef7b 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -372,16 +372,18 @@ int WINAPI PathCommonPrefixA(LPCSTR,LPCSTR,LPSTR); int WINAPI PathCommonPrefixW(LPCWSTR,LPCWSTR,LPWSTR); #define PathCommonPrefix WINELIB_NAME_AW(PathCommonPrefix) -HRESULT WINAPI PathCreateFromUrlA(LPCSTR pszUrl, LPSTR pszPath, LPDWORD pcchPath, DWORD dwReserved); -HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, LPDWORD pcchPath, DWORD dwReserved); +HRESULT WINAPI PathCreateFromUrlA(LPCSTR,LPSTR,LPDWORD,DWORD); +HRESULT WINAPI PathCreateFromUrlW(LPCWSTR,LPWSTR,LPDWORD,DWORD); #define PathCreateFromUrl WINELIB_NAME_AW(PathCreateFromUrl) +HRESULT WINAPI PathCreateFromUrlAlloc(LPCWSTR,LPWSTR*,DWORD); + BOOL WINAPI PathFileExistsA(LPCSTR); BOOL WINAPI PathFileExistsW(LPCWSTR); #define PathFileExists WINELIB_NAME_AW(PathFileExists) -BOOL WINAPI PathFileExistsAndAttributesA(LPCSTR lpszPath, DWORD *dwAttr); -BOOL WINAPI PathFileExistsAndAttributesW(LPCWSTR lpszPath, DWORD *dwAttr); +BOOL WINAPI PathFileExistsAndAttributesA(LPCSTR,DWORD*); +BOOL WINAPI PathFileExistsAndAttributesW(LPCWSTR,DWORD*); #define PathFileExistsAndAttributes WINELIB_NAME_AW(PathFileExistsAndAttributes) LPSTR WINAPI PathFindExtensionA(LPCSTR);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 906127fe29a6411238639761841bdf29f1033a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=906127fe29a64112386397618… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 1 03:30:06 2012 +0200 Assorted spelling fixes. --- dlls/shell32/tests/shlexec.c | 2 +- dlls/wininet/urlcache.c | 4 ++-- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 6fdde5c..f34e569 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -996,7 +996,7 @@ static void test_lpFile_parsed(void) rc > 32 ? "success" : "failure", rc, fileA ); - /* quoted lpFile not works only on real win95 and nt4 */ + /* quoted lpFile does not work on real win95 and nt4 */ testfile = "\"%%TEMP%%\\%s\\simple.shlexec\""; sprintf(fileA, testfile, shorttmpdir); rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 13633ac..249ac46 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2351,7 +2351,7 @@ static void handle_full_cache(void) } } -/* Enumerates entires in cache, allows cache unlocking between calls. */ +/* Enumerates entries in cache, allows cache unlocking between calls. */ static BOOL urlcache_next_entry(URLCACHE_HEADER *header, DWORD *hash_table_off, DWORD *hash_table_entry, struct _HASH_ENTRY **hash_entry, CACHEFILE_ENTRY **entry) { @@ -2456,7 +2456,7 @@ static int dword_cmp(const void *p1, const void *p2) * * PARAMETERS * cache_path [I] Which volume to free up from, or NULL if you don't care. - * size [I] How much percent of cache space should be free. + * size [I] How many percents of the cache should be free. * filter [I] Which entries can't be deleted (CacheEntryType) * * RETURNS diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 82ec153..64dd21d 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1820,7 +1820,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Replace env vars if in a batch context */ if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); - /* Skip preceeding whitespace */ + /* Skip preceding whitespace */ while (*curPos == ' ' || *curPos == '\t') curPos++; /* Show prompt before batch line IF echo is on and in batch program */

1 0

Francois Gouget : shell32/tests: Improve the shell_execute{_ex}() tracing.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 483b8f7608e2b4688e866d4377f39559ee946446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483b8f7608e2b4688e866d437… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 1 03:30:47 2012 +0200 shell32/tests: Improve the shell_execute{_ex}() tracing. --- dlls/shell32/tests/shlexec.c | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index f34e569..6cfb2b0 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -75,18 +75,17 @@ static void init_event(const char* child_file) hEvent=CreateEvent(NULL, FALSE, FALSE, event_name); } -static void strcat_param(char* str, const char* param) +static void strcat_param(char* str, const char* name, const char* param) { - if (param!=NULL) + if (param) { - strcat(str, "\""); + if (str[strlen(str)-1] == '"') + strcat(str, ", "); + strcat(str, name); + strcat(str, "=\""); strcat(str, param); strcat(str, "\""); } - else - { - strcat(str, "null"); - } } static char shell_call[2048]=""; @@ -99,13 +98,10 @@ static INT_PTR shell_execute(LPCSTR operation, LPCSTR file, LPCSTR parameters, L rcEmpty = shell_execute("", file, parameters, directory); strcpy(shell_call, "ShellExecute("); - strcat_param(shell_call, operation); - strcat(shell_call, ", "); - strcat_param(shell_call, file); - strcat(shell_call, ", "); - strcat_param(shell_call, parameters); - strcat(shell_call, ", "); - strcat_param(shell_call, directory); + strcat_param(shell_call, "verb", operation); + strcat_param(shell_call, "file", file); + strcat_param(shell_call, "params", parameters); + strcat_param(shell_call, "dir", directory); strcat(shell_call, ")"); if (winetest_debug > 1) trace("%s\n", shell_call); @@ -162,13 +158,16 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR operation, LPCSTR file, INT_PTR rc; strcpy(shell_call, "ShellExecuteEx("); - strcat_param(shell_call, operation); - strcat(shell_call, ", "); - strcat_param(shell_call, file); - strcat(shell_call, ", "); - strcat_param(shell_call, parameters); - strcat(shell_call, ", "); - strcat_param(shell_call, directory); + if (mask) + { + char smask[11]; + sprintf(smask, "0x%x", mask); + strcat_param(shell_call, "mask", smask); + } + strcat_param(shell_call, "verb", operation); + strcat_param(shell_call, "file", file); + strcat_param(shell_call, "params", parameters); + strcat_param(shell_call, "dir", directory); strcat(shell_call, ")"); if (winetest_debug > 1) trace("%s\n", shell_call);

1 0

Nikolay Sivov : mlang: Move CodePageToCodePages() to IMLangFontLink2 and forward to it.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 233fb7b3b59bb71f382b9ba88e01db7e9ecda025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233fb7b3b59bb71f382b9ba88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 30 09:25:50 2012 +0400 mlang: Move CodePageToCodePages() to IMLangFontLink2 and forward to it. --- dlls/mlang/mlang.c | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 325828a..bcd3b11 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1895,27 +1895,11 @@ static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages( IMLangFontLink* iface, - UINT uCodePage, - DWORD* pdwCodePages) + UINT codepage, + DWORD* codepages) { MLang_impl *This = impl_from_IMLangFontLink( iface ); - CHARSETINFO cs; - BOOL rc; - - TRACE("(%p) Seeking %u\n",This, uCodePage); - - rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)uCodePage, &cs, TCI_SRCCODEPAGE); - - if (rc) - { - *pdwCodePages = cs.fs.fsCsb[0]; - TRACE("resulting CodePages 0x%x\n",*pdwCodePages); - return S_OK; - } - - TRACE("CodePage Not Found\n"); - *pdwCodePages = 0; - return E_FAIL; + return IMLangFontLink2_CodePageToCodePages(&This->IMLangFontLink2_iface, codepage, codepages); } static HRESULT WINAPI fnIMLangFontLink_CodePagesToCodePage( @@ -3211,12 +3195,27 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This, pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); } -static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* This, - UINT uCodePage, - DWORD *pdwCodePages) +static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* iface, + UINT codepage, + DWORD *codepages) { - FIXME("(%p)->%i %p\n",This, uCodePage, pdwCodePages); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMLangFontLink2(iface); + CHARSETINFO cs; + BOOL rc; + + TRACE("(%p)->(%u %p)\n", This, codepage, codepages); + + rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)codepage, &cs, TCI_SRCCODEPAGE); + if (rc) + { + *codepages = cs.fs.fsCsb[0]; + TRACE("resulting codepages 0x%x\n", *codepages); + return S_OK; + } + + TRACE("codepage not found\n"); + *codepages = 0; + return E_FAIL; } static HRESULT WINAPI fnIMLangFontLink2_CodePagesToCodePage(IMLangFontLink2* iface,

1 0

Nikolay Sivov : mlang: Move GetCharCodePages() to IMLangFontLink2 and forward to it.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: a67b97ce56682bc4eb131394c5eb9205d96c0d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67b97ce56682bc4eb131394c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 30 09:33:39 2012 +0400 mlang: Move GetCharCodePages() to IMLangFontLink2 and forward to it. --- dlls/mlang/mlang.c | 59 ++++++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index bcd3b11..1450e72 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1828,30 +1828,11 @@ static ULONG WINAPI fnIMLangFontLink_Release( static HRESULT WINAPI fnIMLangFontLink_GetCharCodePages( IMLangFontLink* iface, - WCHAR chSrc, - DWORD* pdwCodePages) + WCHAR ch_src, + DWORD* codepages) { - int i; - CHAR buf; - BOOL used_dc; - DWORD codePages; - - *pdwCodePages = 0; - - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) - { - WideCharToMultiByte(mlang_data[i].family_codepage, WC_NO_BEST_FIT_CHARS, - &chSrc, 1, &buf, 1, NULL, &used_dc); - - /* If default char is not used, current codepage include the given symbol */ - if (!used_dc) - { - IMLangFontLink_CodePageToCodePages(iface, - mlang_data[i].family_codepage, &codePages); - *pdwCodePages |= codePages; - } - } - return S_OK; + MLang_impl *This = impl_from_IMLangFontLink( iface ); + return IMLangFontLink2_GetCharCodePages(&This->IMLangFontLink2_iface, ch_src, codepages); } static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( @@ -3180,11 +3161,35 @@ static ULONG WINAPI fnIMLangFontLink2_Release( IMLangFontLink2* iface ) return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); } -static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* This, - WCHAR chSrc, DWORD *pdwCodePages) +static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* iface, + WCHAR ch_src, DWORD *ret_codepages) { - FIXME("(%p)->%s %p\n",This, debugstr_wn(&chSrc,1),pdwCodePages); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMLangFontLink2(iface); + int i; + + TRACE("(%p)->(%s %p)\n", This, debugstr_wn(&ch_src, 1), ret_codepages); + + *ret_codepages = 0; + + for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + { + BOOL used_dc; + CHAR buf; + + WideCharToMultiByte(mlang_data[i].family_codepage, WC_NO_BEST_FIT_CHARS, + &ch_src, 1, &buf, 1, NULL, &used_dc); + + /* If default char is not used, current codepage include the given symbol */ + if (!used_dc) + { + DWORD codepages; + + IMLangFontLink2_CodePageToCodePages(iface, + mlang_data[i].family_codepage, &codepages); + *ret_codepages |= codepages; + } + } + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This,

1 0

Nikolay Sivov : mlang: Move GetStrCodePages() to IMLangFontLink2 and forward to it.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: ea2b24d861bdc8bdafcf97e7c093a54ff96d4962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2b24d861bdc8bdafcf97e7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 30 09:44:05 2012 +0400 mlang: Move GetStrCodePages() to IMLangFontLink2 and forward to it. --- dlls/mlang/mlang.c | 81 +++++++++++++++++++++++++++------------------------- 1 files changed, 42 insertions(+), 39 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1450e72..b6bf3ee 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1837,41 +1837,15 @@ static HRESULT WINAPI fnIMLangFontLink_GetCharCodePages( static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( IMLangFontLink* iface, - const WCHAR* pszSrc, - LONG cchSrc, - DWORD dwPriorityCodePages, - DWORD* pdwCodePages, - LONG* pcchCodePages) + const WCHAR* src, + LONG src_len, + DWORD priority_cp, + DWORD* codepages, + LONG* ret_len) { - LONG i; - DWORD cps = 0; - - TRACE("(%p)->%s %d %x %p %p\n", iface, debugstr_wn(pszSrc, cchSrc), cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); - - if (pdwCodePages) *pdwCodePages = 0; - if (pcchCodePages) *pcchCodePages = 0; - - if (!pszSrc || !cchSrc || cchSrc < 0) - return E_INVALIDARG; - - for (i = 0; i < cchSrc; i++) - { - DWORD cp; - HRESULT ret; - - ret = IMLangFontLink_GetCharCodePages(iface, pszSrc[i], &cp); - if (ret != S_OK) return E_FAIL; - - if (!cps) cps = cp; - else cps &= cp; - - /* FIXME: not tested */ - if (dwPriorityCodePages & cps) break; - } - - if (pdwCodePages) *pdwCodePages = cps; - if (pcchCodePages) *pcchCodePages = min( i + 1, cchSrc ); - return S_OK; + MLang_impl *This = impl_from_IMLangFontLink( iface ); + return IMLangFontLink2_GetStrCodePages(&This->IMLangFontLink2_iface, src, src_len, priority_cp, + codepages, ret_len); } static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages( @@ -3192,12 +3166,41 @@ static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* iface return S_OK; } -static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This, - const WCHAR *pszSrc, LONG cchSrc, DWORD dwPriorityCodePages, - DWORD *pdwCodePages, LONG *pcchCodePages) +static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface, + const WCHAR *src, LONG src_len, DWORD priority_cp, + DWORD *codepages, LONG *ret_len) { - return fnIMLangFontLink_GetStrCodePages((IMLangFontLink *)This, - pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); + MLang_impl *This = impl_from_IMLangFontLink2(iface); + LONG i; + DWORD cps = 0; + + TRACE("(%p)->(%s:%d %x %p %p)\n", This, debugstr_wn(src, src_len), src_len, priority_cp, + codepages, ret_len); + + if (codepages) *codepages = 0; + if (ret_len) *ret_len = 0; + + if (!src || !src_len || src_len < 0) + return E_INVALIDARG; + + for (i = 0; i < src_len; i++) + { + DWORD cp; + HRESULT ret; + + ret = IMLangFontLink2_GetCharCodePages(iface, src[i], &cp); + if (ret != S_OK) return E_FAIL; + + if (!cps) cps = cp; + else cps &= cp; + + /* FIXME: not tested */ + if (priority_cp & cps) break; + } + + if (codepages) *codepages = cps; + if (ret_len) *ret_len = min( i + 1, src_len ); + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* iface,

1 0

Nikolay Sivov : mlang: Rename IMultiLanguage3 method implementation functions to match interface name .
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 5f3e754935fa9e3d0a0863bec47f82d05a7946a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3e754935fa9e3d0a0863bec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 30 09:53:43 2012 +0400 mlang: Rename IMultiLanguage3 method implementation functions to match interface name. --- dlls/mlang/mlang.c | 120 ++++++++++++++++++++++++++-------------------------- 1 files changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f3e754935fa9e3d0a086…

1 0

Nikolay Sivov : dwrite: Stub for IDWriteRenderingParams.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 7a1746b710b8273735231619b65eef390d57fa45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1746b710b8273735231619b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 1 09:05:38 2012 +0400 dwrite: Stub for IDWriteRenderingParams. --- dlls/dwrite/main.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 115 insertions(+), 1 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 114fab9..e94abc5 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" @@ -44,6 +46,118 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) return TRUE; } +struct renderingparams { + IDWriteRenderingParams IDWriteRenderingParams_iface; + LONG ref; +}; + +static inline struct renderingparams *impl_from_IDWriteRenderingParams(IDWriteRenderingParams *iface) +{ + return CONTAINING_RECORD(iface, struct renderingparams, IDWriteRenderingParams_iface); +} + +static HRESULT WINAPI renderingparams_QueryInterface(IDWriteRenderingParams *iface, REFIID riid, void **obj) +{ + struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDWriteRenderingParams)) + { + *obj = iface; + IDWriteRenderingParams_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI renderingparams_AddRef(IDWriteRenderingParams *iface) +{ + struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI renderingparams_Release(IDWriteRenderingParams *iface) +{ + struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + heap_free(This); + + return S_OK; +} + +static FLOAT WINAPI renderingparams_GetGamma(IDWriteRenderingParams *iface) +{ + struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); + FIXME("(%p): stub\n", This); + return 128.0; +} + +static FLOAT WINAPI renderingparams_GetEnhancedContrast(IDWriteRenderingParams *iface) +{ + struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); + FIXME("(%p): stub\n", This); + return 0.0; +} + +static FLOAT WINAPI renderingparams_GetClearTypeLevel(IDWriteRenderingParams *iface) +{ + struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); + FIXME("(%p): stub\n", This); + return 0.0; +} + +static DWRITE_PIXEL_GEOMETRY WINAPI renderingparams_GetPixelGeometry(IDWriteRenderingParams *iface) +{ + struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); + FIXME("(%p): stub\n", This); + return DWRITE_PIXEL_GEOMETRY_FLAT; +} + +static DWRITE_RENDERING_MODE WINAPI renderingparams_GetRenderingMode(IDWriteRenderingParams *iface) +{ + struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); + FIXME("(%p): stub\n", This); + return DWRITE_RENDERING_MODE_DEFAULT; +} + +static const struct IDWriteRenderingParamsVtbl renderingparamsvtbl = { + renderingparams_QueryInterface, + renderingparams_AddRef, + renderingparams_Release, + renderingparams_GetGamma, + renderingparams_GetEnhancedContrast, + renderingparams_GetClearTypeLevel, + renderingparams_GetPixelGeometry, + renderingparams_GetRenderingMode +}; + +static HRESULT create_renderingparams(IDWriteRenderingParams **params) +{ + struct renderingparams *This; + + *params = NULL; + + This = heap_alloc(sizeof(struct renderingparams)); + if (!This) return E_OUTOFMEMORY; + + This->IDWriteRenderingParams_iface.lpVtbl = &renderingparamsvtbl; + This->ref = 1; + + *params = &This->IDWriteRenderingParams_iface; + + return S_OK; +} + static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) { TRACE("(%s %p)\n", debugstr_guid(riid), obj); @@ -137,7 +251,7 @@ static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory * FLOAT cleartype_level, DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, IDWriteRenderingParams **params) { FIXME("(%f %f %f %d %d %p): stub\n", gamma, enhancedContrast, cleartype_level, geometry, mode, params); - return E_NOTIMPL; + return create_renderingparams(params); } static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader)

1 0