August 2008 - Wine-Commits - list.winehq.org

Piotr Caban : msxml3: Added queryresult's IDispatchEx implementation.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 3e3a5b187e289db31cca599794c157b32c6d823c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3a5b187e289db31cca59979… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Aug 21 23:37:48 2008 +0200 msxml3: Added queryresult's IDispatchEx implementation. File dispex.c is copied from mshtml.dll. Jacek helped me to write this patch. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/dispex.c | 630 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/main.c | 87 +------ dlls/msxml3/msxml_private.h | 78 +++++- dlls/msxml3/queryresult.c | 28 ++- 5 files changed, 730 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e3a5b187e289db31cca5…

1 0

Piotr Caban : msxml3: Code clean up.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 12f7e0aa3981827849fdbf09d53e8445d5903d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f7e0aa3981827849fdbf09d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Aug 21 23:36:40 2008 +0200 msxml3: Code clean up. --- dlls/msxml3/queryresult.c | 90 ++++++++++++++++++++++----------------------- 1 files changed, 44 insertions(+), 46 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index 1b2070e..6f8f3c4 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -50,8 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #include <libxml/xpath.h> -static const struct IXMLDOMNodeListVtbl queryresult_vtbl; - typedef struct _queryresult { const struct IXMLDOMNodeListVtbl *lpVtbl; @@ -66,50 +64,6 @@ static inline queryresult *impl_from_IXMLDOMNodeList( IXMLDOMNodeList *iface ) return (queryresult *)((char*)iface - FIELD_OFFSET(queryresult, lpVtbl)); } -HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **out) -{ - queryresult *This = CoTaskMemAlloc(sizeof(queryresult)); - xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); - xmlChar *str = xmlChar_from_wchar(szQuery); - HRESULT hr; - - - TRACE("(%p, %s, %p)\n", node, wine_dbgstr_w(szQuery), out); - - *out = NULL; - if (This == NULL || ctxt == NULL || str == NULL) - { - hr = E_OUTOFMEMORY; - goto cleanup; - } - - This->lpVtbl = &queryresult_vtbl; - This->ref = 1; - This->resultPos = 0; - This->node = node; - xmldoc_add_ref(This->node->doc); - - ctxt->node = node; - This->result = xmlXPathEval(str, ctxt); - if (!This->result || This->result->type != XPATH_NODESET) - { - hr = E_FAIL; - goto cleanup; - } - - *out = (IXMLDOMNodeList *)This; - hr = S_OK; - TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval)); - -cleanup: - if (This != NULL && FAILED(hr)) - IXMLDOMNodeList_Release( (IXMLDOMNodeList*) &This->lpVtbl ); - if (ctxt != NULL) - xmlXPathFreeContext(ctxt); - HeapFree(GetProcessHeap(), 0, str); - return hr; -} - static HRESULT WINAPI queryresult_QueryInterface( IXMLDOMNodeList *iface, @@ -343,4 +297,48 @@ static const struct IXMLDOMNodeListVtbl queryresult_vtbl = queryresult__newEnum, }; +HRESULT queryresult_create(xmlNodePtr node, LPWSTR szQuery, IXMLDOMNodeList **out) +{ + queryresult *This = CoTaskMemAlloc(sizeof(queryresult)); + xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); + xmlChar *str = xmlChar_from_wchar(szQuery); + HRESULT hr; + + + TRACE("(%p, %s, %p)\n", node, wine_dbgstr_w(szQuery), out); + + *out = NULL; + if (This == NULL || ctxt == NULL || str == NULL) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + + This->lpVtbl = &queryresult_vtbl; + This->ref = 1; + This->resultPos = 0; + This->node = node; + xmldoc_add_ref(This->node->doc); + + ctxt->node = node; + This->result = xmlXPathEval(str, ctxt); + if (!This->result || This->result->type != XPATH_NODESET) + { + hr = E_FAIL; + goto cleanup; + } + + *out = (IXMLDOMNodeList *)This; + hr = S_OK; + TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval)); + +cleanup: + if (This != NULL && FAILED(hr)) + IXMLDOMNodeList_Release( (IXMLDOMNodeList*) &This->lpVtbl ); + if (ctxt != NULL) + xmlXPathFreeContext(ctxt); + HeapFree(GetProcessHeap(), 0, str); + return hr; +} + #endif

1 0

Piotr Caban : msxml3: Use LoadTypeLibEx to register typelib.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 379e543bbaf673f71f8551d126da76500d280d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=379e543bbaf673f71f8551d12… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Aug 21 23:36:07 2008 +0200 msxml3: Use LoadTypeLibEx to register typelib. --- dlls/msxml3/main.c | 37 ------------------------------------- dlls/msxml3/msxml_private.h | 1 - dlls/msxml3/regsvr.c | 18 ++++++++---------- 3 files changed, 8 insertions(+), 48 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 8a1496f..93f890a 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -41,7 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); -static HINSTANCE hInstance; static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; @@ -114,41 +113,6 @@ HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) return S_OK; } -static CRITICAL_SECTION MSXML3_typelib_cs; -static CRITICAL_SECTION_DEBUG MSXML3_typelib_cs_debug = -{ - 0, 0, &MSXML3_typelib_cs, - { &MSXML3_typelib_cs_debug.ProcessLocksList, - &MSXML3_typelib_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": MSXML3_typelib_cs") } -}; -static CRITICAL_SECTION MSXML3_typelib_cs = { &MSXML3_typelib_cs_debug, -1, 0, 0, 0, 0 }; - -ITypeLib *get_msxml3_typelib( LPWSTR *path ) -{ - static WCHAR msxml3_path[MAX_PATH]; - - EnterCriticalSection( &MSXML3_typelib_cs ); - - if (!typelib) - { - TRACE("loading typelib\n"); - - if (GetModuleFileNameW( hInstance, msxml3_path, MAX_PATH )) - LoadTypeLib( msxml3_path, &typelib ); - } - - LeaveCriticalSection( &MSXML3_typelib_cs ); - - if (path) - *path = msxml3_path; - - if (typelib) - ITypeLib_AddRef( typelib ); - - return typelib; -} - static void process_detach(void) { if(typelib) { @@ -187,7 +151,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) /* Set the current ident to the default */ xmlTreeIndentString = "\t"; #endif - hInstance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index d065e3b..13d35be 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -134,6 +134,5 @@ enum tid_t { }; extern HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo); -extern ITypeLib *get_msxml3_typelib( LPWSTR *path ); #endif /* __MSXML_PRIVATE__ */ diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 05bf74d..320d51e 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -663,7 +663,7 @@ HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; ITypeLib *tl; - LPWSTR path = NULL; + static const WCHAR wszMsXml3[] = {'m','s','x','m','l','3','.','d','l','l',0}; TRACE("\n"); @@ -673,14 +673,12 @@ HRESULT WINAPI DllRegisterServer(void) if (SUCCEEDED(hr)) hr = register_progids(progid_list); - tl = get_msxml3_typelib( &path ); - if (tl) - { - hr = RegisterTypeLib( tl, path, NULL ); - ITypeLib_Release( tl ); + if(SUCCEEDED(hr)) { + + hr = LoadTypeLibEx(wszMsXml3, REGKIND_REGISTER, &tl); + if(SUCCEEDED(hr)) + ITypeLib_Release(tl); } - else - hr = E_FAIL; return hr; } @@ -699,8 +697,8 @@ HRESULT WINAPI DllUnregisterServer(void) hr = unregister_interfaces(interface_list); if (SUCCEEDED(hr)) hr = unregister_progids(progid_list); - if (SUCCEEDED(hr)) - hr = UnRegisterTypeLib(&LIBID_MSXML2, 3, 0, LOCALE_SYSTEM_DEFAULT, SYS_WIN32); + if (SUCCEEDED(hr)) + hr = UnRegisterTypeLib(&LIBID_MSXML2, 3, 0, LOCALE_SYSTEM_DEFAULT, SYS_WIN32); return hr; }

1 0

Maarten Lankhorst : dsound: Tune some parameters to make pulseaudio work.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: dc224421416bd2616bfd52431388a6f9630bc860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc224421416bd2616bfd52431… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Aug 18 21:00:26 2008 +0200 dsound: Tune some parameters to make pulseaudio work. --- dlls/dsound/capture.c | 2 +- dlls/dsound/dsound_main.c | 6 +++--- dlls/dsound/primary.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index c9444a4..7cf7b83 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1140,7 +1140,7 @@ IDirectSoundCaptureBufferImpl_Start( if (device->buffer) { int c; - DWORD blocksize = DSOUND_fraglen(device->pwfx->nSamplesPerSec, device->pwfx->nBlockAlign); + DWORD blocksize = 4 * DSOUND_fraglen(device->pwfx->nSamplesPerSec, device->pwfx->nBlockAlign); device->nrofpwaves = device->buflen / blocksize + !!(device->buflen % blocksize); TRACE("nrofpwaves=%d\n", device->nrofpwaves); diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 31078cb..dddcf28 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -90,9 +90,9 @@ HRESULT mmErr(UINT err) /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_emuldriver = 0; -int ds_hel_buflen = 32768; -int ds_snd_queue_max = 10; -int ds_snd_queue_min = 6; +int ds_hel_buflen = 32768 * 2; +int ds_snd_queue_max = 20; +int ds_snd_queue_min = 14; int ds_snd_shadow_maxsize = 2; int ds_hw_accel = DS_HW_ACCEL_FULL; int ds_default_playback = 0; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 112bb39..7ad561f 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -46,13 +46,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); */ DWORD DSOUND_fraglen(DWORD nSamplesPerSec, DWORD nBlockAlign) { - DWORD fraglen = 512 * nBlockAlign; + DWORD fraglen = 256 * nBlockAlign; /* Compensate for only being roughly accurate */ if (nSamplesPerSec <= 26000) fraglen /= 2; - if (nSamplesPerSec <= 12000) + if (nSamplesPerSec <= 10000) fraglen /= 2; if (nSamplesPerSec >= 80000)

1 0

Maarten Lankhorst : winealsa.drv: Tune some parameters to make pulseaudio work.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 944cb7ea15a3e8cbdded643b91ba85acbac827c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=944cb7ea15a3e8cbdded643b9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Aug 20 21:42:46 2008 +0200 winealsa.drv: Tune some parameters to make pulseaudio work. Kudos to pulseaudio for actually respecting buffer_time and period_time. --- dlls/winealsa.drv/waveout.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6dfb088..8f18d3c 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -571,8 +571,8 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) snd_pcm_access_t access; snd_pcm_format_t format = -1; unsigned int rate; - unsigned int buffer_time = 500000; - unsigned int period_time = 10000; + unsigned int buffer_time = 120000; + unsigned int period_time = 20000; snd_pcm_uframes_t buffer_size; snd_pcm_uframes_t period_size; snd_pcm_uframes_t boundary;

1 0

Hongbo Ni : comctl32: Update simplified Chinese resource.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: a8a359ac6860f1801b7030ae427cee4c3246a7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a359ac6860f1801b7030ae4… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 14:56:47 2008 +1000 comctl32: Update simplified Chinese resource. --- dlls/comctl32/comctl_Cn.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comctl_Cn.rc b/dlls/comctl32/comctl_Cn.rc index a9fa997..ed5e616 100644 --- a/dlls/comctl32/comctl_Cn.rc +++ b/dlls/comctl32/comctl_Cn.rc @@ -34,7 +34,7 @@ END IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Wizard" +CAPTION "��" FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< ��һ��(&B)", IDC_BACK_BUTTON,71,138,50,14 @@ -73,8 +73,8 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { - IDM_TODAY "Today:" - IDM_GOTODAY "Go to today" + IDM_TODAY "��:" + IDM_GOTODAY "ת��" } STRINGTABLE DISCARDABLE @@ -84,7 +84,7 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { - HKY_NONE "None" + HKY_NONE "��" } #pragma code_page(default)

1 0

Hongbo Ni : comdlg32: Update simplified Chinese resource.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 7fe167eeae1cb4a5659cc7f8c5fdf024403f6a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe167eeae1cb4a5659cc7f8c… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 14:57:17 2008 +1000 comdlg32: Update simplified Chinese resource. --- dlls/comdlg32/cdlg_Cn.rc | 112 ++++++++++++++++++++++------------------------ 1 files changed, 54 insertions(+), 58 deletions(-) diff --git a/dlls/comdlg32/cdlg_Cn.rc b/dlls/comdlg32/cdlg_Cn.rc index 47be682..f6f067d 100644 --- a/dlls/comdlg32/cdlg_Cn.rc +++ b/dlls/comdlg32/cdlg_Cn.rc @@ -85,7 +85,7 @@ FONT 8, "MS Shell Dlg" LTEXT "��ӡ��(&Q):", 1092, 6, 100, 76, 9 COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP CHECKBOX "��ӡ��ļ�(&l):", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Condensed", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "ѹС", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -96,7 +96,7 @@ FONT 8, "MS Shell Dlg" { GROUPBOX "��ӡ��", grp1, 6, 10, 180, 65, BS_GROUPBOX RADIOBUTTON "Ĭ�ϴ�ӡ��(&D)", rad1, 16, 20, 80, 12 - LTEXT "[none]", 1088, 35, 35, 120, 9 + LTEXT "[��]", 1088, 35, 35, 120, 9 RADIOBUTTON "ָ��Ĵ�ӡ��(&P)", rad2, 16, 50, 80, 12 COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "ȷ��", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP @@ -141,7 +141,7 @@ FONT 8, "MS Shell Dlg" CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "ʾ��",grp2,98,72,120,36,WS_GROUP CTEXT "��AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7,98,114,80,9 + LTEXT "��(&i):",stc7,98,114,80,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -247,7 +247,7 @@ FONT 8, "MS Shell Dlg" GROUPBOX "��", grp2, 160, 92, 120,64, WS_GROUP LTEXT "��(&C):",stc5,168,108,68,8 ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 + CONTROL "�Զ��ҳ(&o)", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12 EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER GROUPBOX "��ӡ��Χ", grp1, 8,92, 144,64, WS_GROUP @@ -351,7 +351,7 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { - IDS_ABOUTBOX "&About FolderPicker Test" + IDS_ABOUTBOX "��ļ��ѡ��(&A)" IDS_DOCUMENTFOLDERS "�ĵ�Ŀ¼" IDS_PERSONAL "�ҵ��ĵ�" IDS_FAVORITES "�ղؼ�" @@ -388,59 +388,55 @@ STRINGTABLE DISCARDABLE { PD32_PRINT_TITLE "��ӡ" - PD32_VALUE_UREADABLE "Unreadable Entry" - PD32_INVALID_PAGE_RANGE "This value does not lie within the page range.\n\ -Please enter a value between %d and %d." - PD32_FROM_NOT_ABOVE_TO "The 'from' entry cannot exceed the \ -'to' entry." - PD32_MARGINS_OVERLAP "Margins overlap or fall outside \ -Paper boundaries.\nPlease reenter margins." - PD32_NR_OF_COPIES_EMPTY "The number of 'Number of copies' \ -value cannot be empty." - PD32_TOO_LARGE_COPIES "This large nmuber of copies is not \ -supported by your printer.\nPlease enter a value between 1 and %d." - PD32_PRINT_ERROR "A printer error occurred." - PD32_NO_DEFAULT_PRINTER "There is not default printer." - PD32_CANT_FIND_PRINTER "Cannot find the printer." - PD32_OUT_OF_MEMORY "Out of memory." - PD32_GENERIC_ERROR "Some error occurred." - PD32_DRIVER_UNKNOWN "Unknown printer driver." - PD32_NO_DEVICES "Before you can perform printer-related tasks \ -such as page setup or printing a document, you need to install a printer. \ -Please install one and retry." - - PD32_DEFAULT_PRINTER "Default Printer; " - PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in the queue" - PD32_MARGINS_IN_INCHES "Margins [inches]" - PD32_MARGINS_IN_MILIMETERS "Margins [mm]" - PD32_MILIMETERS "mm" - - PD32_PRINTER_STATUS_READY "Ready" - PD32_PRINTER_STATUS_PAUSED "Paused; " - PD32_PRINTER_STATUS_ERROR "Error; " - PD32_PRINTER_STATUS_PENDING_DELETION "Pending deletion; " - PD32_PRINTER_STATUS_PAPER_JAM "Paper jam; " - PD32_PRINTER_STATUS_PAPER_OUT "Out of paper; " - PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; " - PD32_PRINTER_STATUS_PAPER_PROBLEM "Paper problem; " - PD32_PRINTER_STATUS_OFFLINE "Printer offline; " - PD32_PRINTER_STATUS_IO_ACTIVE "I/O Active; " - PD32_PRINTER_STATUS_BUSY "Busy; " - PD32_PRINTER_STATUS_PRINTING "Printing; " - PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; " - PD32_PRINTER_STATUS_NOT_AVAILABLE "Not available; " - PD32_PRINTER_STATUS_WAITING "Waiting; " - PD32_PRINTER_STATUS_PROCESSING "Processing; " - PD32_PRINTER_STATUS_INITIALIZING "Initialising; " - PD32_PRINTER_STATUS_WARMING_UP "Warming up; " - PD32_PRINTER_STATUS_TONER_LOW "Toner low; " - PD32_PRINTER_STATUS_NO_TONER "No toner; " - PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " - PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "Out of memory; " - PD32_PRINTER_STATUS_DOOR_OPEN "The printer door is open; " - PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server unknown; " - PD32_PRINTER_STATUS_POWER_SAVE "Power safe mode; " + PD32_VALUE_UREADABLE "��ֵ��ɶ�" + PD32_INVALID_PAGE_RANGE "��ֵ��ҳ��Χ��\n \ +��һ�� %d �� %d ֮��" + PD32_FROM_NOT_ABOVE_TO "'��'��ֵ��ܴ��'��'��ֵ��" + PD32_MARGINS_OVERLAP "ҳ�߾��ص��ֽ��,\n��ҳ�߾ࡣ" + PD32_NR_OF_COPIES_EMPTY "'��' ��ܿ�." + PD32_TOO_LARGE_COPIES "��Ĵ�ӡ��֧��ô��ķ��\n \ +��һ�� 1 �� %d ֮��" + PD32_PRINT_ERROR "��ӡ��" + PD32_NO_DEFAULT_PRINTER "û��Ĭ�ϴ�ӡ��" + PD32_CANT_FIND_PRINTER "�Ҳ��ӡ��" + PD32_OUT_OF_MEMORY "�ڴ治��" + PD32_GENERIC_ERROR "��һЩ��" + PD32_DRIVER_UNKNOWN "�Ҳ��ӡ��" + PD32_NO_DEVICES "��ʹ��ӡ��йع��(ҳ��, ��ӡ�ļ�)֮ǰ, \ +��װ��ӡ��װһ��ӡ��ԡ�" + + PD32_DEFAULT_PRINTER "Ĭ�ϴ�ӡ��; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "�� %d ��ĵ��ڵȴ��ӡ" + PD32_MARGINS_IN_INCHES "ҳ�߾� [Ӣ��]" + PD32_MARGINS_IN_MILIMETERS "ҳ�߾� [��]" + PD32_MILIMETERS "��" + + PD32_PRINTER_STATUS_READY "��" + PD32_PRINTER_STATUS_PAUSED "��ͣ; " + PD32_PRINTER_STATUS_ERROR "��; " + PD32_PRINTER_STATUS_PENDING_DELETION "�ȴ�ɾ��; " + PD32_PRINTER_STATUS_PAPER_JAM "��ֽ; " + PD32_PRINTER_STATUS_PAPER_OUT "��ֽ; " + PD32_PRINTER_STATUS_MANUAL_FEED "�ֶ��ֽ; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "ֽ��; " + PD32_PRINTER_STATUS_OFFLINE "��ӡ��; " + PD32_PRINTER_STATUS_IO_ACTIVE "I/O �; " + PD32_PRINTER_STATUS_BUSY "��æ; " + PD32_PRINTER_STATUS_PRINTING "��ڴ�ӡ; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "��ֽ��; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "��; " + PD32_PRINTER_STATUS_WAITING "�ȴ�; " + PD32_PRINTER_STATUS_PROCESSING "��ڴ��; " + PD32_PRINTER_STATUS_INITIALIZING "��; " + PD32_PRINTER_STATUS_WARMING_UP "Ԥ��; " + PD32_PRINTER_STATUS_TONER_LOW "ī��; " + PD32_PRINTER_STATUS_NO_TONER "ûī; " + PD32_PRINTER_STATUS_PAGE_PUNT "ҳ�ڴ泬֧; " + PD32_PRINTER_STATUS_USER_INTERVENTION "�û��Ԥ; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "�ڴ治��; " + PD32_PRINTER_STATUS_DOOR_OPEN "��ӡ��Ǵ򿪵�; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "�Ҳ��ӡ��; " + PD32_PRINTER_STATUS_POWER_SAVE "ʡ��״̬; " } #pragma code_page(default)

1 0

Hongbo Ni : shell32: Update simplified Chinese resource.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 2a881472d548f7a8ea505bb526b148e73b815daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a881472d548f7a8ea505bb52… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 14:57:53 2008 +1000 shell32: Update simplified Chinese resource. --- dlls/shell32/shell32_Cn.rc | 52 ++++++++++++++++++++++---------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/shell32_Cn.rc b/dlls/shell32/shell32_Cn.rc index 3c65a63..2e2bbf3 100644 --- a/dlls/shell32/shell32_Cn.rc +++ b/dlls/shell32/shell32_Cn.rc @@ -26,40 +26,40 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Select" FCIDM_SHVIEW_OPEN - MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE - MENUITEM "&Open", FCIDM_SHVIEW_OPEN + MENUITEM "ѡ��(&S)" FCIDM_SHVIEW_OPEN + MENUITEM "�ļ��(&x)",FCIDM_SHVIEW_EXPLORE + MENUITEM "��(&O)", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR - MENUITEM "C&ut", FCIDM_SHVIEW_CUT - MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM "��(&u)", FCIDM_SHVIEW_CUT + MENUITEM "��(&C)", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Delete", FCIDM_SHVIEW_DELETE - MENUITEM "&Rename", FCIDM_SHVIEW_RENAME + MENUITEM "��(&L)", FCIDM_SHVIEW_CREATELINK + MENUITEM "ɾ��(&D)", FCIDM_SHVIEW_DELETE + MENUITEM "��(&R)", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR - MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES + MENUITEM "��(&P)", FCIDM_SHVIEW_PROPERTIES END END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "�ļ�(&F)" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "�˳�(&x)", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "�鿴(&V)" BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "��ͼ��(&g)", FCIDM_SHVIEW_BIGICON + MENUITEM "Сͼ��(&m)", FCIDM_SHVIEW_SMALLICON + MENUITEM "�б�(&L)", FCIDM_SHVIEW_LISTVIEW + MENUITEM "��(&D)", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "��(&H)" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "��ڿ��(&A)...", IDM_CPANEL_ABOUT END END @@ -69,13 +69,13 @@ CAPTION " FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "ȷ��", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "Wine &license...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "ʹ��(&l)...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 - LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 - LTEXT "Wine was brought to you by:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "�� %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine ��Ա:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -102,12 +102,12 @@ BEGIN IDS_SHV_COLUMN5 "��" IDS_SHV_COLUMN6 "ʹ�ÿռ�" IDS_SHV_COLUMN7 "ʣ��ռ�" - IDS_SHV_COLUMN8 "Name" /*FIXME*/ - IDS_SHV_COLUMN9 "Comments" /*FIXME*/ + IDS_SHV_COLUMN8 "��" + IDS_SHV_COLUMN9 "��ע" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Wine ��" + IDS_CPANEL_NAME "��" + IDS_CPANEL_DESCRIPTION "��" END #pragma code_page(default)

1 0

Hongbo Ni : user32: Update simplified Chinese resource.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: d24b6e424fef650747fe1b37699f4570b9c1516f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24b6e424fef650747fe1b376… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 14:58:17 2008 +1000 user32: Update simplified Chinese resource. --- dlls/user32/resources/user32_Zh.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/resources/user32_Zh.rc b/dlls/user32/resources/user32_Zh.rc index 070e45d..663df12 100644 --- a/dlls/user32/resources/user32_Zh.rc +++ b/dlls/user32/resources/user32_Zh.rc @@ -30,7 +30,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE MENUITEM SEPARATOR MENUITEM "�л��(&S)...\tCtrl-Esc", 61744 MENUITEM SEPARATOR - MENUITEM "&About Wine...", 61761 + MENUITEM "��Wine (&A)...", 61761 } EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE @@ -60,9 +60,9 @@ BEGIN PUSHBUTTON "��(&I)", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "��(&Y)", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "��(&N)", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "��(&T)", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "��(&C)", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "��", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 @@ -77,7 +77,7 @@ END STRINGTABLE DISCARDABLE { - IDS_ERROR "Error" + IDS_ERROR "��" IDS_MDI_MOREWINDOWS "��ര��(&M)..." /* defined in mdi.h */ } @@ -96,7 +96,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE MENUITEM SEPARATOR MENUITEM "�ГQ��(&S)...\tCtrl-Esc", 61744 MENUITEM SEPARATOR - MENUITEM "&About Wine...", 61761 + MENUITEM "��Wine (&A)...", 61761 } EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE

1 0

Hongbo Ni : winefile: Update simplified Chinese resource.
by Alexandre Julliard Aug. 22, 2008

Aug. 22, 2008

Module: wine Branch: master Commit: 5070763a0ea27934a350659658bdf995603de75b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5070763a0ea27934a35065965… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Fri Aug 22 14:59:23 2008 +1000 winefile: Update simplified Chinese resource. --- programs/winefile/Zh.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winefile/Zh.rc b/programs/winefile/Zh.rc index 39851c8..76fa360 100644 --- a/programs/winefile/Zh.rc +++ b/programs/winefile/Zh.rc @@ -110,8 +110,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "ȫ��&U��\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minimize on run", 504 - MENUITEM "&Save settings on exit", 511 + MENUITEM "��С��&M��", 504 + MENUITEM "�˳�ʱ��ã�&S��", 511 }

1 0