February 2008 - Wine-Commits

James Hawkins : msi: Set the UserLanguageID property.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: 8412a1363bafd32c75411f98242a28ea14681c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8412a1363bafd32c75411f982… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 17 14:11:07 2008 -0600 msi: Set the UserLanguageID property. --- dlls/msi/package.c | 19 +++++++++++++------ dlls/msi/tests/package.c | 9 +++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a8d33e0..685a28d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -352,6 +352,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) LONG res; SYSTEM_INFO sys_info; SYSTEMTIME systemtime; + LANGID langid; static const WCHAR cszbs[]={'\\',0}; static const WCHAR CFF[] = @@ -420,7 +421,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szScreenX[] = {'S','c','r','e','e','n','X',0}; static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; - static const WCHAR szScreenFormat[] = {'%','d',0}; + static const WCHAR szIntFormat[] = {'%','d',0}; static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; static const WCHAR szAllUsers[] = { 'A','L','L','U','S','E','R','S',0 }; static const WCHAR szCurrentVersion[] = { @@ -437,6 +438,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szCOMPANYNAME[] = {'C','O','M','P','A','N','Y','N','A','M','E',0}; static const WCHAR szDate[] = {'D','a','t','e',0}; static const WCHAR szTime[] = {'T','i','m','e',0}; + static const WCHAR szUserLangID[] = {'U','s','e','r','L','a','n','g','u','a','g','e','I','D',0}; /* * Other things that probably should be set: @@ -523,7 +525,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* Physical Memory is specified in MB. Using total amount. */ msex.dwLength = sizeof(msex); GlobalMemoryStatusEx( &msex ); - sprintfW( bufstr, szScreenFormat, (int)(msex.ullTotalPhys/1024/1024)); + sprintfW( bufstr, szIntFormat, (int)(msex.ullTotalPhys/1024/1024)); MSI_SetPropertyW(package, szPhysicalMemory, bufstr); SHGetFolderPathW(NULL,CSIDL_WINDOWS,NULL,0,pth); @@ -570,17 +572,17 @@ static VOID set_installer_properties(MSIPACKAGE *package) GetSystemInfo( &sys_info ); if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { - sprintfW( bufstr, szScreenFormat, sys_info.wProcessorLevel ); + sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); MSI_SetPropertyW( package, szIntel, bufstr ); } /* Screen properties. */ dc = GetDC(0); - sprintfW( bufstr, szScreenFormat, GetDeviceCaps( dc, HORZRES ) ); + sprintfW( bufstr, szIntFormat, GetDeviceCaps( dc, HORZRES ) ); MSI_SetPropertyW( package, szScreenX, bufstr ); - sprintfW( bufstr, szScreenFormat, GetDeviceCaps( dc, VERTRES )); + sprintfW( bufstr, szIntFormat, GetDeviceCaps( dc, VERTRES )); MSI_SetPropertyW( package, szScreenY, bufstr ); - sprintfW( bufstr, szScreenFormat, GetDeviceCaps( dc, BITSPIXEL )); + sprintfW( bufstr, szIntFormat, GetDeviceCaps( dc, BITSPIXEL )); MSI_SetPropertyW( package, szColorBits, bufstr ); ReleaseDC(0, dc); @@ -628,6 +630,11 @@ static VOID set_installer_properties(MSIPACKAGE *package) set_msi_assembly_prop( package ); + langid = GetUserDefaultLangID(); + sprintfW(bufstr, szIntFormat, langid); + + MSI_SetPropertyW( package, szUserLangID, bufstr ); + msi_free( check ); CloseHandle( hkey ); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index dc0e31e..9d1f8b8 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4697,6 +4697,7 @@ static void test_installprops(void) CHAR path[MAX_PATH]; CHAR buf[MAX_PATH]; DWORD size, type; + LANGID langid; HKEY hkey; UINT r; @@ -4762,6 +4763,14 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("PackageCode = %s\n", buf); + langid = GetUserDefaultLangID(); + sprintf(path, "%d", langid); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "UserLanguageID", buf, &size); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); + ok( !lstrcmpA(buf, path), "Expected \"%s\", got \"%s\"\n", path, buf); + CloseHandle(hkey); MsiCloseHandle(hpkg); DeleteFile(msifile);

1 0

James Hawkins : msi: Implement the MSIMODIFY_REFRESH command of MsiViewModify.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: 40aa7df3441d1d20db4dbc4605845b997850bf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40aa7df3441d1d20db4dbc460… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 13 23:36:44 2008 -0600 msi: Implement the MSIMODIFY_REFRESH command of MsiViewModify. --- dlls/msi/table.c | 22 +++++++++++++++++++++- dlls/msi/tests/automation.c | 4 +--- dlls/msi/tests/db.c | 20 ++++---------------- dlls/msi/where.c | 12 +++++++++--- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c7fbcc2..69108ef 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1626,6 +1626,23 @@ static UINT modify_delete_row( struct tagMSIVIEW *view, MSIRECORD *rec ) return TABLE_delete_row(view, row); } +static UINT msi_refresh_record( struct tagMSIVIEW *view, MSIRECORD *rec, UINT row ) +{ + MSIRECORD *curr; + UINT r, i, count; + + r = TABLE_get_row(view, row - 1, &curr); + if (r != ERROR_SUCCESS) + return r; + + count = MSI_RecordGetFieldCount(rec); + for (i = 0; i < count; i++) + MSI_RecordCopyField(curr, i + 1, rec, i + 1); + + msiobj_release(&curr->hdr); + return ERROR_SUCCESS; +} + static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row) { @@ -1657,11 +1674,14 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, r = TABLE_insert_row( view, rec, TRUE ); break; + case MSIMODIFY_REFRESH: + r = msi_refresh_record( view, rec, row ); + break; + case MSIMODIFY_UPDATE: r = msi_table_update( view, rec, row ); break; - case MSIMODIFY_REFRESH: case MSIMODIFY_ASSIGN: case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 8cf764e..c5d44f5 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1527,10 +1527,8 @@ static void test_Database(IDispatch *pDatabase, BOOL readonly) ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); ok_exception(hr, szModifyModeRecord); - /* View::Modify with MSIMODIFY_REFRESH should undo our changes */ hr = View_Modify(pView, MSIMODIFY_REFRESH, pRecord); - /* Wine's MsiViewModify currently does not support MSIMODIFY_REFRESH */ - todo_wine ok(hr == S_OK, "View_Modify failed, hresult 0x%08x\n", hr); + ok(hr == S_OK, "View_Modify failed, hresult 0x%08x\n", hr); /* Record::StringDataGet, confirm that the record is back to its unmodified value */ memset(szString, 0, sizeof(szString)); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index d6eed20..ebcdc77 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5762,10 +5762,7 @@ static void test_viewmodify_refresh(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewModify(hview, MSIMODIFY_REFRESH, hrec); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); size = MAX_PATH; r = MsiRecordGetStringA(hrec, 1, buffer, &size); @@ -5774,10 +5771,7 @@ static void test_viewmodify_refresh(void) ok(size == 2, "Expected 2, got %d\n", size); r = MsiRecordGetInteger(hrec, 2); - todo_wine - { - ok(r == 2, "Expected 2, got %d\n", r); - } + ok(r == 2, "Expected 2, got %d\n", r); MsiCloseHandle(hrec); MsiViewClose(hview); @@ -5805,10 +5799,7 @@ static void test_viewmodify_refresh(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewModify(hview, MSIMODIFY_REFRESH, hrec); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); size = MAX_PATH; r = MsiRecordGetStringA(hrec, 1, buffer, &size); @@ -5817,10 +5808,7 @@ static void test_viewmodify_refresh(void) ok(size == 5, "Expected 5, got %d\n", size); r = MsiRecordGetInteger(hrec, 2); - todo_wine - { - ok(r == 2, "Expected 2, got %d\n", r); - } + ok(r == 2, "Expected 2, got %d\n", r); MsiCloseHandle(hrec); MsiViewClose(hview); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index e4d00c0..c12f7a4 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -503,11 +503,17 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *rec, UINT row ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; + UINT r; - TRACE("%p %d %p\n", wv, eModifyMode, rec ); + TRACE("%p %d %p\n", wv, eModifyMode, rec); - if( !wv->table ) - return ERROR_FUNCTION_FAILED; + r = WHERE_execute(view, NULL); + if (r != ERROR_SUCCESS) + return r; + + r = find_entry_in_hash(wv->reorder, row - 1, &row); + if (r != ERROR_SUCCESS) + return r; return wv->table->ops->modify( wv->table, eModifyMode, rec, row ); }

1 0

James Hawkins : msi: Add tests for MsiSourceListEnumSources.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: 9d0ae904d04186bb12f83ebf516737a2b13eda72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0ae904d04186bb12f83ebf5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Feb 18 00:59:38 2008 -0600 msi: Add tests for MsiSourceListEnumSources. --- dlls/msi/tests/source.c | 642 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 642 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d0ae904d04186bb12f83…

1 0

James Hawkins : msi: Convert REG_DWORD properties to strings in MsiGetProductInfo.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: bbdf79bc8cfc6ef64ad04e65c1fd411d5baa94de URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbdf79bc8cfc6ef64ad04e65c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Feb 16 23:39:16 2008 -0600 msi: Convert REG_DWORD properties to strings in MsiGetProductInfo. --- dlls/msi/msi.c | 33 ++++- dlls/msi/tests/msi.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 451 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbdf79bc8cfc6ef64ad04…

1 0

Marcus Meissner : dinput: Some debug output for BuildActionMap.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: 494dd5f1fab2d69246413a4798bab6fc2bf75343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=494dd5f1fab2d69246413a479… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Feb 17 15:20:54 2008 +0100 dinput: Some debug output for BuildActionMap. --- dlls/dinput/device.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8641803..5f927d0 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1339,6 +1339,12 @@ HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A ifa DWORD dwFlags) { FIXME("(%p)->(%p,%s,%08x): stub !\n", iface, lpdiaf, lpszUserName, dwFlags); +#define X(x) if (dwFlags & x) FIXME("\tdwFlags =|"#x"\n"); + X(DIDBAM_DEFAULT) + X(DIDBAM_PRESERVE) + X(DIDBAM_INITIALIZE) + X(DIDBAM_HWDEFAULTS) +#undef X _dump_diactionformatA(lpdiaf); return DI_OK; } @@ -1349,6 +1355,12 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa DWORD dwFlags) { FIXME("(%p)->(%p,%s,%08x): stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); +#define X(x) if (dwFlags & x) FIXME("\tdwFlags =|"#x"\n"); + X(DIDBAM_DEFAULT) + X(DIDBAM_PRESERVE) + X(DIDBAM_INITIALIZE) + X(DIDBAM_HWDEFAULTS) +#undef X return DI_OK; }

1 0

Marcus Meissner : user32: Handle error returns from ImmGetCompositionString .
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: f09f03a723d221807becd68393e90854dbc82a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09f03a723d221807becd6839… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Feb 17 15:58:06 2008 +0100 user32: Handle error returns from ImmGetCompositionString. --- dlls/user32/edit.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index a3eb1d8..b1a0007 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5347,7 +5347,7 @@ static void EDIT_UpdateText(EDITSTATE *es, const RECT *rc, BOOL bErase) static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) { - DWORD dwBufLen; + LONG buflen; LPWSTR lpCompStr = NULL; HIMC hIMC; LPSTR lpCompStrAttr = NULL; @@ -5356,15 +5356,15 @@ static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) if (!(hIMC = ImmGetContext(hwnd))) return; - dwBufLen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); + buflen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); - if (dwBufLen < 0) + if (buflen < 0) { ImmReleaseContext(hwnd, hIMC); return; } - lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen + sizeof(WCHAR)); + lpCompStr = HeapAlloc(GetProcessHeap(),0,buflen + sizeof(WCHAR)); if (!lpCompStr) { ERR("Unable to allocate IME CompositionString\n"); @@ -5372,9 +5372,9 @@ static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) return; } - if (dwBufLen) - ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); - lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; + if (buflen) + ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, buflen); + lpCompStr[buflen/sizeof(WCHAR)] = 0; if (CompFlag & GCS_COMPATTR) { @@ -5427,21 +5427,21 @@ static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) static void EDIT_GetResultStr(HWND hwnd, EDITSTATE *es) { - DWORD dwBufLen; + LONG buflen; LPWSTR lpResultStr; HIMC hIMC; if ( !(hIMC = ImmGetContext(hwnd))) return; - dwBufLen = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0); - if (dwBufLen <= 0) + buflen = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0); + if (buflen <= 0) { ImmReleaseContext(hwnd, hIMC); return; } - lpResultStr = HeapAlloc(GetProcessHeap(),0, dwBufLen+sizeof(WCHAR)); + lpResultStr = HeapAlloc(GetProcessHeap(),0, buflen+sizeof(WCHAR)); if (!lpResultStr) { ERR("Unable to alloc buffer for IME string\n"); @@ -5449,8 +5449,8 @@ static void EDIT_GetResultStr(HWND hwnd, EDITSTATE *es) return; } - ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, dwBufLen); - lpResultStr[dwBufLen/sizeof(WCHAR)] = 0; + ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, buflen); + lpResultStr[buflen/sizeof(WCHAR)] = 0; /* check for change in composition start */ if (es->selection_end < es->composition_start)

1 0

Marcus Meissner : taskmgr: Make stuff static.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: 2ef077e95ec17ff2ea410210bfcfeb8ecde911fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef077e95ec17ff2ea410210b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Feb 6 23:38:13 2008 +0100 taskmgr: Make stuff static. --- programs/taskmgr/perfdata.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 3a32fa2..cda872d 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -32,25 +32,25 @@ #include "taskmgr.h" #include "perfdata.h" -PROCNTQSI NtQuerySystemInformation = NULL; -PROCGGR pGetGuiResources = NULL; -PROCGPIC pGetProcessIoCounters = NULL; -CRITICAL_SECTION PerfDataCriticalSection; -PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ -PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ -ULONG ProcessCountOld = 0; -ULONG ProcessCount = 0; -double dbIdleTime; -double dbKernelTime; -double dbSystemTime; -LARGE_INTEGER liOldIdleTime = {{0,0}}; -double OldKernelTime = 0; -LARGE_INTEGER liOldSystemTime = {{0,0}}; -SYSTEM_PERFORMANCE_INFORMATION SystemPerfInfo; -SYSTEM_BASIC_INFORMATION SystemBasicInfo; -SYSTEM_CACHE_INFORMATION SystemCacheInfo; -SYSTEM_HANDLE_INFORMATION SystemHandleInfo; -PSYSTEM_PROCESSORTIME_INFO SystemProcessorTimeInfo = NULL; +static PROCNTQSI NtQuerySystemInformation = NULL; +static PROCGGR pGetGuiResources = NULL; +static PROCGPIC pGetProcessIoCounters = NULL; +static CRITICAL_SECTION PerfDataCriticalSection; +static PPERFDATA pPerfDataOld = NULL; /* Older perf data (saved to establish delta values) */ +static PPERFDATA pPerfData = NULL; /* Most recent copy of perf data */ +static ULONG ProcessCountOld = 0; +static ULONG ProcessCount = 0; +static double dbIdleTime; +static double dbKernelTime; +static double dbSystemTime; +static LARGE_INTEGER liOldIdleTime = {{0,0}}; +static double OldKernelTime = 0; +static LARGE_INTEGER liOldSystemTime = {{0,0}}; +static SYSTEM_PERFORMANCE_INFORMATION SystemPerfInfo; +static SYSTEM_BASIC_INFORMATION SystemBasicInfo; +static SYSTEM_CACHE_INFORMATION SystemCacheInfo; +static SYSTEM_HANDLE_INFORMATION SystemHandleInfo; +static PSYSTEM_PROCESSORTIME_INFO SystemProcessorTimeInfo = NULL; BOOL PerfDataInitialize(void) {

1 0

Alistair Leslie-Hughes : msxml3: Support functions for typelib.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: 4a58bf5cff3cb8c126d890562d9c2c685dc7fd38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a58bf5cff3cb8c126d890562… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 14 20:55:33 2008 +1100 msxml3: Support functions for typelib. --- dlls/msxml3/main.c | 75 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 22 ++++++++++++ 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 62bf2b5..5cce644 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -21,11 +21,14 @@ #include "config.h" +#define COBJMACROS + #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "msxml.h" #include "msxml2.h" #include "wine/debug.h" @@ -34,6 +37,77 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_IXMLDOMAttribute, + &IID_IXMLDOMCDATASection, + &IID_IXMLDOMComment, + &IID_IXMLDOMDocument2, + &IID_IXMLDOMDocumentFragment, + &IID_IXMLDOMElement, + &IID_IXMLDOMEntityReference, + &IID_IXMLDOMNamedNodeMap, + &IID_IXMLDOMNodeList, + &IID_IXMLDOMParseError, + &IID_IXMLDOMProcessingInstruction, + &IID_IXMLDOMSchemaCollection, + &IID_IXMLDOMText, + &IID_IXMLElement, + &IID_IXMLDOMDocument +}; + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if(!typelib) { + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_MSXML2, 3, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); + } + + if(!typeinfos[tid]) { + ITypeInfo *typeinfo; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid failed: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) + ITypeInfo_Release(typeinfo); + } + + *typeinfo = typeinfos[tid]; + + ITypeInfo_AddRef(typeinfos[tid]); + return S_OK; +} + +static void process_detach(void) +{ + if(typelib) { + unsigned i; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); + } +} + HRESULT WINAPI DllCanUnloadNow(void) { FIXME("\n"); @@ -53,6 +127,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_DETACH: #ifdef HAVE_LIBXML2 xmlCleanupParser(); + process_detach(); #endif break; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 33b2c9e..96bb3de 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -90,4 +90,26 @@ extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT SchemaCache_create( IUnknown *pUnkOuter, LPVOID *ppObj ); extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +/* typelibs */ +enum tid_t { + IXMLDOMAttribute_tid, + IXMLDOMCDATASection_tid, + IXMLDOMComment_tid, + IXMLDOMDocument2_tid, + IXMLDOMDocumentFragment_tid, + IXMLDOMElement_tid, + IXMLDOMEntityReference_tid, + IXMLDOMNamedNodeMap_tid, + IXMLDOMNodeList_tid, + IXMLDOMParseError_tid, + IXMLDOMProcessingInstruction_tid, + IXMLDOMSchemaCollection_tid, + IXMLDOMText_tid, + IXMLElement_tid, + IXMLDocument_tid, + LAST_tid +}; + +extern HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); + #endif /* __MSXML_PRIVATE__ */

1 0

Frans Kool : localspl: Created Dutch translations.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: e312a428123a811829a45220fc105543bc06d24e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e312a428123a811829a45220f… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Sun Feb 17 13:44:52 2008 +0100 localspl: Created Dutch translations. --- dlls/localspl/localspl.rc | 1 + dlls/localspl/spl_Nl.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 5b209b5..2722413 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -40,6 +40,7 @@ #include "spl_De.rc" #include "spl_Fr.rc" #include "spl_Ko.rc" +#include "spl_Nl.rc" #include "spl_No.rc" #include "spl_Pl.rc" #include "spl_Sv.rc" diff --git a/dlls/localspl/spl_Nl.rc b/dlls/localspl/spl_Nl.rc new file mode 100644 index 0000000..b9d4c5c --- /dev/null +++ b/dlls/localspl/spl_Nl.rc @@ -0,0 +1,27 @@ +/* + * Dutch resources for localspl + * + * Copyright 2008 Frans Kool + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokale Poort" + IDS_LOCALMONITOR "Lokale Monitor" +}

1 0

Frans Kool : msvidc32: Created Dutch translations.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: b13e856d58f8e250eba713484b10b1852fd57d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13e856d58f8e250eba713484… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Sun Feb 17 13:42:47 2008 +0100 msvidc32: Created Dutch translations. --- dlls/msvidc32/msvidc32_Nl.rc | 25 +++++++++++++++++++++++++ dlls/msvidc32/rsrc.rc | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/msvidc32_Nl.rc b/dlls/msvidc32/msvidc32_Nl.rc new file mode 100644 index 0000000..b68d3ef --- /dev/null +++ b/dlls/msvidc32/msvidc32_Nl.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2008 Frans Kool + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "Wine Video 1 video codec" +} diff --git a/dlls/msvidc32/rsrc.rc b/dlls/msvidc32/rsrc.rc index 8618ddf..a7958e9 100644 --- a/dlls/msvidc32/rsrc.rc +++ b/dlls/msvidc32/rsrc.rc @@ -24,6 +24,7 @@ #include "msvidc32_En.rc" #include "msvidc32_Hu.rc" #include "msvidc32_Ko.rc" +#include "msvidc32_Nl.rc" #include "msvidc32_No.rc" #include "msvidc32_Pl.rc" #include "msvidc32_Sv.rc"

1 0