October 2011 - Wine-Commits

Piotr Caban : msxml3: Don't use libxml namespaces stack.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 619c2dcd08654e27665713f25c767066a6bf1d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619c2dcd08654e27665713f25… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 31 12:32:59 2011 +0100 msxml3: Don't use libxml namespaces stack. --- dlls/msxml3/saxreader.c | 116 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 88 insertions(+), 28 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 2045863..35b0c04 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -115,7 +115,12 @@ typedef struct _saxlocator BOOL vbInterface; int nsStackSize; int nsStackLast; - int *nsStack; + struct nsstack + { + const xmlChar *ptr; + BSTR prefix; + BSTR uri; + } *nsStack; int attributesSize; int nb_attributes; @@ -255,27 +260,57 @@ static inline BOOL has_error_handler(const saxlocator *locator) (!locator->vbInterface && locator->saxreader->errorHandler); } -static HRESULT namespacePush(saxlocator *locator, int ns) +static HRESULT namespacePush(saxlocator *locator, const xmlChar *prefix, + const xmlChar *uri) { if(locator->nsStackLast>=locator->nsStackSize) { - int *new_stack; + struct nsstack *new_stack; new_stack = HeapReAlloc(GetProcessHeap(), 0, - locator->nsStack, sizeof(int)*locator->nsStackSize*2); + locator->nsStack, sizeof(struct nsstack)*locator->nsStackSize*2); if(!new_stack) return E_OUTOFMEMORY; locator->nsStack = new_stack; locator->nsStackSize *= 2; } - locator->nsStack[locator->nsStackLast++] = ns; + + locator->nsStack[locator->nsStackLast].ptr = uri; + if(uri) + { + locator->nsStack[locator->nsStackLast].prefix = bstr_from_xmlChar(prefix); + if(!locator->nsStack[locator->nsStackLast].prefix) + return E_OUTOFMEMORY; + locator->nsStack[locator->nsStackLast].uri = bstr_from_xmlChar(uri); + if(!locator->nsStack[locator->nsStackLast].uri) + { + SysFreeString(locator->nsStack[locator->nsStackLast].prefix); + return E_OUTOFMEMORY; + } + } + else + { + locator->nsStack[locator->nsStackLast].prefix = NULL; + locator->nsStack[locator->nsStackLast].uri = NULL; + } + + locator->nsStackLast++; return S_OK; } -static int namespacePop(saxlocator *locator) +static HRESULT namespacePop(saxlocator *locator) { - if(locator->nsStackLast == 0) return 0; - return locator->nsStack[--locator->nsStackLast]; + if(locator->nsStackLast == 0) + { + ERR("namespace stack is empty\n"); + return E_UNEXPECTED; + } + + SysFreeString(locator->nsStack[--locator->nsStackLast].prefix); + SysFreeString(locator->nsStack[locator->nsStackLast].uri); + locator->nsStack[locator->nsStackLast].prefix = NULL; + locator->nsStack[locator->nsStackLast].uri = NULL; + return S_OK; } static BOOL bstr_pool_insert(struct bstrpool *pool, BSTR pool_entry) @@ -1165,7 +1200,16 @@ static void libxmlStartElementNS( index++; update_position(This, (xmlChar*)This->pParserCtxt->input->cur+index); - hr = namespacePush(This, nb_namespaces); + hr = namespacePush(This, NULL, NULL); + for(index=0; hr==S_OK && index<nb_namespaces; index++) + hr = namespacePush(This, namespaces[2*index], namespaces[2*index+1]); + if(hr != S_OK) + { + for(; index>=0; index--) + namespacePop(This); + namespacePop(This); + } + if(hr==S_OK && has_content_handler(This)) { for(index=0; index<nb_namespaces; index++) @@ -1217,11 +1261,11 @@ static void libxmlEndElementNS( const xmlChar *prefix, const xmlChar *URI) { - BSTR NamespaceUri, LocalName, QName, Prefix; + BSTR NamespaceUri, LocalName, QName; saxlocator *This = ctx; HRESULT hr; xmlChar *end; - int nsNr, index; + struct nsstack *elem = &This->nsStack[This->nsStackLast-1]; end = (xmlChar*)This->pParserCtxt->input->cur; if(This->saxreader->version >= MSXML6) { @@ -1234,8 +1278,6 @@ static void libxmlEndElementNS( update_position(This, end); - nsNr = namespacePop(This); - if(has_content_handler(This)) { NamespaceUri = pooled_bstr_from_xmlChar(&This->saxreader->pool, URI); @@ -1263,53 +1305,69 @@ static void libxmlEndElementNS( if(This->saxreader->version >= MSXML6) { - for(index=This->pParserCtxt->nsNr-nsNr*2; - index<This->pParserCtxt->nsNr; index+=2) - { - Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); + while(elem->ptr) { + elem--; + } + elem++; + while(elem < &This->nsStack[This->nsStackLast]) { if(This->vbInterface) hr = IVBSAXContentHandler_endPrefixMapping( - This->saxreader->vbcontentHandler, &Prefix); + This->saxreader->vbcontentHandler, &elem->prefix); else hr = ISAXContentHandler_endPrefixMapping( This->saxreader->contentHandler, - Prefix, SysStringLen(Prefix)); + elem->prefix, SysStringLen(elem->prefix)); - if(FAILED(hr)) + if(hr != S_OK) { format_error_message_from_id(This, hr); return; } + + elem++; + } + + elem--; + while(elem->ptr) { + namespacePop(This); + elem--; } } else { - for(index=This->pParserCtxt->nsNr-2; - index>=This->pParserCtxt->nsNr-nsNr*2; index-=2) - { - Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); + while(1) { + if(!elem->ptr) + break; if(This->vbInterface) hr = IVBSAXContentHandler_endPrefixMapping( - This->saxreader->vbcontentHandler, &Prefix); + This->saxreader->vbcontentHandler, &elem->prefix); else hr = ISAXContentHandler_endPrefixMapping( This->saxreader->contentHandler, - Prefix, SysStringLen(Prefix)); + elem->prefix, SysStringLen(elem->prefix)); - if(hr != S_OK) + if(FAILED(hr)) { format_error_message_from_id(This, hr); return; } + + namespacePop(This); + elem--; } } } else { This->nb_attributes = 0; + while(elem->ptr) { + namespacePop(This); + elem--; + } } + namespacePop(This); update_position(This, NULL); } @@ -1806,6 +1864,8 @@ static ULONG WINAPI isaxlocator_Release( SysFreeString(This->publicId); SysFreeString(This->systemId); + while(This->nsStackLast) + namespacePop(This); heap_free(This->nsStack); for(index=0; index<This->nb_attributes; index++) @@ -1927,7 +1987,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B locator->ret = S_OK; locator->nsStackSize = 8; locator->nsStackLast = 0; - locator->nsStack = heap_alloc(sizeof(int)*locator->nsStackSize); + locator->nsStack = heap_alloc(sizeof(struct nsstack)*locator->nsStackSize); if(!locator->nsStack) { ISAXXMLReader_Release(&reader->ISAXXMLReader_iface);

1 0

Frédéric Delanoy : cmd: Avoid unnecessary null pointer checks.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 41a94504408a3042e0c0a7b52e5b9a80eaf61d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a94504408a3042e0c0a7b52… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 29 01:08:49 2011 +0200 cmd: Avoid unnecessary null pointer checks. --- programs/cmd/wcmdmain.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 56aa85f..40ed145 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -278,14 +278,12 @@ static void WCMD_output_asis_handle (DWORD std_handle, const WCHAR *message) { ptr++; }; if (*ptr == '\n') ptr++; - WCMD_output_asis_len(message, (ptr) ? ptr - message : strlenW(message), handle); - if (ptr) { - numChars = 0; - if (++line_count >= max_height - 1) { - line_count = 0; - WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), handle); - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); - } + WCMD_output_asis_len(message, ptr - message, handle); + numChars = 0; + if (++line_count >= max_height - 1) { + line_count = 0; + WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), handle); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); } } while (((message = ptr) != NULL) && (*ptr)); } else {

1 0

Piotr Caban : msxml3: Merge SAXLocator and SAXAttributes objects.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 1b46206a34e9cc5a96e9eece99432fb1261081ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b46206a34e9cc5a96e9eece9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 31 12:32:39 2011 +0100 msxml3: Merge SAXLocator and SAXAttributes objects. --- dlls/msxml3/saxreader.c | 326 +++++++++++++++++++++-------------------------- 1 files changed, 145 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b46206a34e9cc5a96e9e…

1 0

Bruno Jesus : include: Add a few defines to winscard.h.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 401f6725d526b11a315fec8f5ea527ca22d353df URL: http://source.winehq.org/git/wine.git/?a=commit;h=401f6725d526b11a315fec8f5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Oct 31 00:33:30 2011 -0200 include: Add a few defines to winscard.h. --- include/winscard.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winscard.h b/include/winscard.h index 8da8e7f..884d350 100644 --- a/include/winscard.h +++ b/include/winscard.h @@ -24,6 +24,11 @@ #include <winsmcrd.h> #include <scarderr.h> +/* Valid scopes for contexts */ +#define SCARD_SCOPE_USER 0 +#define SCARD_SCOPE_TERMINAL 1 +#define SCARD_SCOPE_SYSTEM 2 + #ifndef _LPCBYTE_DEFINED #define _LPCBYTE_DEFINED typedef const BYTE *LPCBYTE;

1 0

Alexandre Julliard : notepad: Convert dialogs to po files.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 2e2382bfdd475ea25016c4d2254727ca426fe8a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2382bfdd475ea25016c4d22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 16:45:15 2011 +0100 notepad: Convert dialogs to po files. --- po/ar.po | 54 +++++++++++++++++++---- po/bg.po | 56 +++++++++++++++++++---- po/ca.po | 59 +++++++++++++++++++++---- po/cs.po | 52 ++++++++++++++++++--- po/da.po | 52 ++++++++++++++++++--- po/de.po | 52 ++++++++++++++++++--- po/el.po | 52 ++++++++++++++++++--- po/en.po | 52 ++++++++++++++++++--- po/en_US.po | 52 ++++++++++++++++++--- po/eo.po | 54 +++++++++++++++++++---- po/es.po | 52 ++++++++++++++++++--- po/fa.po | 54 +++++++++++++++++++---- po/fi.po | 60 +++++++++++++++++++------ po/fr.po | 52 ++++++++++++++++++--- po/he.po | 52 ++++++++++++++++++--- po/hi.po | 52 ++++++++++++++++++--- po/hu.po | 56 +++++++++++++++++++---- po/it.po | 52 ++++++++++++++++++--- po/ja.po | 52 ++++++++++++++++++--- po/ko.po | 53 +++++++++++++++++++--- po/lt.po | 52 ++++++++++++++++++--- po/ml.po | 52 ++++++++++++++++++--- po/nb_NO.po | 52 ++++++++++++++++++--- po/nl.po | 54 +++++++++++++++++++---- po/or.po | 52 ++++++++++++++++++--- po/pa.po | 52 ++++++++++++++++++--- po/pl.po | 52 ++++++++++++++++++--- po/pt_BR.po | 59 +++++++++++++++++++------ po/pt_PT.po | 59 +++++++++++++++++++------ po/rm.po | 53 +++++++++++++++++++--- po/ro.po | 59 +++++++++++++++++++------ po/ru.po | 52 ++++++++++++++++++--- po/sk.po | 52 ++++++++++++++++++--- po/sl.po | 52 ++++++++++++++++++--- po/sr_RS(a)cyrillic.po | 54 +++++++++++++++++++---- po/sr_RS(a)latin.po | 54 +++++++++++++++++++---- po/sv.po | 52 ++++++++++++++++++--- po/te.po | 52 ++++++++++++++++++--- po/th.po | 54 +++++++++++++++++++---- po/tr.po | 53 +++++++++++++++++++--- po/uk.po | 52 ++++++++++++++++++--- po/wa.po | 54 +++++++++++++++++++---- po/wine.pot | 52 ++++++++++++++++++--- po/zh_CN.po | 52 ++++++++++++++++++--- po/zh_TW.po | 53 +++++++++++++++++++--- programs/notepad/Ar.rc | 62 -------------------------- programs/notepad/Bg.rc | 50 --------------------- programs/notepad/Cs.rc | 56 ----------------------- programs/notepad/Da.rc | 63 -------------------------- programs/notepad/De.rc | 62 -------------------------- programs/notepad/En.rc | 81 ---------------------------------- programs/notepad/Eo.rc | 50 --------------------- programs/notepad/Es.rc | 63 -------------------------- programs/notepad/Fa.rc | 62 -------------------------- programs/notepad/Fi.rc | 51 --------------------- programs/notepad/Fr.rc | 64 --------------------------- programs/notepad/He.rc | 62 -------------------------- programs/notepad/Hu.rc | 54 ---------------------- programs/notepad/It.rc | 66 --------------------------- programs/notepad/Ja.rc | 63 -------------------------- programs/notepad/Ko.rc | 56 ----------------------- programs/notepad/Lt.rc | 61 ------------------------- programs/notepad/Makefile.in | 35 +-------------- programs/notepad/Nl.rc | 58 ------------------------ programs/notepad/No.rc | 60 ------------------------- programs/notepad/Pl.rc | 62 -------------------------- programs/notepad/Pt.rc | 65 --------------------------- programs/notepad/Ro.rc | 60 ------------------------- programs/notepad/Ru.rc | 61 ------------------------- programs/notepad/Si.rc | 60 ------------------------- programs/notepad/Sr.rc | 100 ------------------------------------------ programs/notepad/Sv.rc | 61 ------------------------- programs/notepad/Th.rc | 50 --------------------- programs/notepad/Tr.rc | 50 --------------------- programs/notepad/Uk.rc | 64 --------------------------- programs/notepad/Wa.rc | 56 ----------------------- programs/notepad/Zh.rc | 92 -------------------------------------- programs/notepad/notepad.rc | 54 ++++++++++++++++++++++ 78 files changed, 2062 insertions(+), 2356 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e2382bfdd475ea25016c…

1 0

Frédéric Delanoy : cmd: Rename a parameter in WCMD_parameter.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 6d01f15a27fde6a9f9d34b22e227d0e01ea078b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d01f15a27fde6a9f9d34b22e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 29 13:42:05 2011 +0200 cmd: Rename a parameter in WCMD_parameter. --- programs/cmd/batch.c | 12 ++++++------ programs/cmd/wcmd.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index a276d3e..acab893 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -120,30 +120,30 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN * s [I] input string, non NULL * n [I] # of the (possibly double quotes-delimited) parameter to return * Starts at 0 - * where [O] if non NULL, pointer to the start of the nth parameter in s, + * start [O] if non NULL, pointer to the start of the nth parameter in s, * potentially a " character * end [O] if non NULL, pointer to the last char of * the nth parameter in s, potentially a " character * * RETURNS * Success: Returns the nth delimited parameter found in s. - * *where points to the start of the param, possibly a starting + * *start points to the start of the param, possibly a starting * double quotes character * Failure: Returns an empty string if the param is not found. - * *where is set to NULL + * *start is set to NULL * * NOTES * Return value is stored in static storage, hence is overwritten * after each call. * Doesn't include any potentially delimiting double quotes */ -WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { +WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end) { int curParamNb = 0; static WCHAR param[MAX_PATH]; WCHAR *p = s, *q; BOOL quotesDelimited; - if (where != NULL) *where = NULL; + if (start != NULL) *start = NULL; if (end != NULL) *end = NULL; param[0] = '\0'; while (TRUE) { @@ -152,7 +152,7 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { if (*p == '\0') return param; quotesDelimited = (*p == '"'); - if (where != NULL && curParamNb == n) *where = p; + if (start != NULL && curParamNb == n) *start = p; if (quotesDelimited) { q = ++p; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 33ae12f..962fd52 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -102,7 +102,7 @@ static inline BOOL WCMD_is_console_handle(HANDLE h) return (((DWORD_PTR)h) & 3) == 3; } WCHAR *WCMD_fgets (WCHAR *buf, int n, HANDLE stream); -WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end); +WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, WCHAR **end); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, const WCHAR *forValue, BOOL justFors);

1 0

Piotr Caban : msxml3: Fix position computation in libxmlStartElementNS.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: de91f264cbff3217e2d455f606c0b8a9b79f8147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de91f264cbff3217e2d455f60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 31 12:32:22 2011 +0100 msxml3: Fix position computation in libxmlStartElementNS. --- dlls/msxml3/saxreader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 29ab60e..7cd2318 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1229,12 +1229,12 @@ static void libxmlStartElementNS( saxattributes *attr; int index; - if(This->saxreader->version >= MSXML6) - update_position(This, NULL); - else if(*(This->pParserCtxt->input->cur) == '/') - update_position(This, (xmlChar*)This->pParserCtxt->input->cur+2); - else - update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); + index = 0; + if(*(This->pParserCtxt->input->cur) == '/') + index++; + if(This->saxreader->version < MSXML6) + index++; + update_position(This, (xmlChar*)This->pParserCtxt->input->cur+index); hr = namespacePush(This, nb_namespaces); if(hr==S_OK && has_content_handler(This))

1 0

Alexandre Julliard : wineboot: Convert dialogs to po files.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 393a125f4ac3c2ce8fa44b582e3eaf6093be910e URL: http://source.winehq.org/git/wine.git/?a=commit;h=393a125f4ac3c2ce8fa44b582… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 13:29:58 2011 +0100 wineboot: Convert dialogs to po files. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 28 ++++++++ po/bg.po | 31 ++++++++ po/ca.po | 32 +++++++++ po/cs.po | 30 ++++++++ po/da.po | 31 ++++++++ po/de.po | 32 +++++++++ po/el.po | 28 ++++++++ po/en.po | 28 ++++++++ po/en_US.po | 32 +++++++++ po/eo.po | 30 ++++++++ po/es.po | 32 +++++++++ po/fa.po | 28 ++++++++ po/fi.po | 29 ++++++++ po/fr.po | 34 +++++++++ po/he.po | 31 ++++++++ po/hi.po | 29 ++++++++ po/hu.po | 32 +++++++++ po/it.po | 33 +++++++++ po/ja.po | 34 +++++++++ po/ko.po | 34 +++++++++ po/lt.po | 31 ++++++++ po/ml.po | 29 ++++++++ po/nb_NO.po | 32 +++++++++ po/nl.po | 32 +++++++++ po/or.po | 29 ++++++++ po/pa.po | 29 ++++++++ po/pl.po | 32 +++++++++ po/pt_BR.po | 33 +++++++++ po/pt_PT.po | 33 +++++++++ po/rm.po | 29 ++++++++ po/ro.po | 31 ++++++++ po/ru.po | 34 +++++++++ po/sk.po | 30 ++++++++ po/sl.po | 32 +++++++++ po/sr_RS(a)cyrillic.po | 32 +++++++++ po/sr_RS(a)latin.po | 32 +++++++++ po/sv.po | 32 +++++++++ po/te.po | 29 ++++++++ po/th.po | 29 ++++++++ po/tr.po | 32 +++++++++ po/uk.po | 31 ++++++++ po/wa.po | 30 ++++++++ po/wine.pot | 28 ++++++++ po/zh_CN.po | 31 ++++++++ po/zh_TW.po | 31 ++++++++ programs/wineboot/Makefile.in | 24 +------ programs/wineboot/{wineboot_En.rc => wineboot.rc} | 12 ++-- programs/wineboot/wineboot_Da.rc | 48 ------------- programs/wineboot/wineboot_De.rc | 50 ------------- programs/wineboot/wineboot_Es.rc | 50 ------------- programs/wineboot/wineboot_Fr.rc | 51 -------------- programs/wineboot/wineboot_He.rc | 52 -------------- programs/wineboot/wineboot_It.rc | 50 ------------- programs/wineboot/wineboot_Ja.rc | 50 ------------- programs/wineboot/wineboot_Ko.rc | 51 -------------- programs/wineboot/wineboot_Lt.rc | 50 ------------- programs/wineboot/wineboot_Nl.rc | 49 ------------- programs/wineboot/wineboot_No.rc | 50 ------------- programs/wineboot/wineboot_Pl.rc | 49 ------------- programs/wineboot/wineboot_Pt.rc | 75 -------------------- programs/wineboot/wineboot_Ro.rc | 50 ------------- programs/wineboot/wineboot_Ru.rc | 50 ------------- programs/wineboot/wineboot_Si.rc | 49 ------------- programs/wineboot/wineboot_Sr.rc | 76 -------------------- programs/wineboot/wineboot_Sv.rc | 47 ------------- programs/wineboot/wineboot_Uk.rc | 51 -------------- programs/wineboot/wineboot_Zh.rc | 77 --------------------- 69 files changed, 1400 insertions(+), 1106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=393a125f4ac3c2ce8fa44…

1 0

Alexandre Julliard : winemine: Convert dialogs to po files.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 583622aa0f426da30ebf7ac610aaa9815d62643f URL: http://source.winehq.org/git/wine.git/?a=commit;h=583622aa0f426da30ebf7ac61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 16:12:22 2011 +0100 winemine: Convert dialogs to po files. --- po/ar.po | 44 +++++++++++++++- po/bg.po | 46 ++++++++++++++++- po/ca.po | 52 ++++++++++++++++++- po/cs.po | 48 ++++++++++++++++-- po/da.po | 47 ++++++++++++++++- po/de.po | 45 +++++++++++++++- po/el.po | 44 +++++++++++++++- po/en.po | 44 +++++++++++++++- po/en_US.po | 44 +++++++++++++++- po/eo.po | 44 +++++++++++++++- po/es.po | 47 ++++++++++++++++- po/fa.po | 44 +++++++++++++++- po/fi.po | 49 ++++++++++++++++-- po/fr.po | 45 +++++++++++++++- po/he.po | 47 ++++++++++++++++- po/hi.po | 44 +++++++++++++++- po/hu.po | 49 +++++++++++++++++- po/it.po | 45 +++++++++++++++- po/ja.po | 45 +++++++++++++++- po/ko.po | 45 +++++++++++++++- po/lt.po | 45 +++++++++++++++- po/ml.po | 44 +++++++++++++++- po/nb_NO.po | 47 ++++++++++++++++- po/nl.po | 47 ++++++++++++++++- po/or.po | 44 +++++++++++++++- po/pa.po | 44 +++++++++++++++- po/pl.po | 45 +++++++++++++++- po/pt_BR.po | 47 ++++++++++++++++- po/pt_PT.po | 47 ++++++++++++++++- po/rm.po | 44 +++++++++++++++- po/ro.po | 47 ++++++++++++++++- po/ru.po | 45 +++++++++++++++- po/sk.po | 44 +++++++++++++++- po/sl.po | 47 ++++++++++++++++- po/sr_RS(a)cyrillic.po | 47 ++++++++++++++++- po/sr_RS(a)latin.po | 48 ++++++++++++++++- po/sv.po | 47 ++++++++++++++++- po/te.po | 44 +++++++++++++++- po/th.po | 44 +++++++++++++++- po/tr.po | 50 ++++++++++++++++-- po/uk.po | 47 ++++++++++++++++- po/wa.po | 44 +++++++++++++++- po/wine.pot | 44 +++++++++++++++- po/zh_CN.po | 47 ++++++++++++++++- po/zh_TW.po | 47 ++++++++++++++++- programs/winemine/Cs.rc | 72 ------------------------- programs/winemine/Da.rc | 67 ------------------------ programs/winemine/De.rc | 69 ------------------------ programs/winemine/En.rc | 74 -------------------------- programs/winemine/Es.rc | 67 ------------------------ programs/winemine/Fi.rc | 67 ------------------------ programs/winemine/Fr.rc | 73 -------------------------- programs/winemine/He.rc | 74 -------------------------- programs/winemine/It.rc | 72 ------------------------- programs/winemine/Ja.rc | 71 ------------------------- programs/winemine/Ko.rc | 74 -------------------------- programs/winemine/Lt.rc | 70 ------------------------- programs/winemine/Makefile.in | 27 +--------- programs/winemine/Nl.rc | 66 ----------------------- programs/winemine/No.rc | 67 ------------------------ programs/winemine/Pl.rc | 69 ------------------------ programs/winemine/Pt.rc | 74 -------------------------- programs/winemine/Ro.rc | 69 ------------------------ programs/winemine/Ru.rc | 70 ------------------------- programs/winemine/Si.rc | 69 ------------------------ programs/winemine/Sv.rc | 72 ------------------------- programs/winemine/Tr.rc | 67 ------------------------ programs/winemine/Uk.rc | 72 ------------------------- programs/winemine/Zh.rc | 115 ----------------------------------------- programs/winemine/winemine.rc | 49 +++++++++++++++++ 70 files changed, 2004 insertions(+), 1796 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=583622aa0f426da30ebf7…

1 0

Alexandre Julliard : wrc: Print warnings for mismatched dialogs during po file generation.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 413f5ccba5a344a10ee8c567e713d402de027353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413f5ccba5a344a10ee8c567e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 11:04:36 2011 +0100 wrc: Print warnings for mismatched dialogs during po file generation. --- tools/wrc/po.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 82 insertions(+), 11 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 9cb2b42..f44c395 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -559,22 +559,22 @@ static po_file_t get_po_file( const language_t *lang ) return po_file->po; } -static char *get_po_file_name( const language_t *lang ) +static const char *get_language_name( const language_t *lang ) { + static char name[20]; unsigned int i; - char name[40]; - sprintf( name, "%02x-%02x", lang->id, lang->sub ); for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) - { if (languages[i].id == lang->id && languages[i].sub == lang->sub) - { - strcpy( name, languages[i].name ); - break; - } - } - strcat( name, ".po" ); - return xstrdup( name ); + return languages[i].name; + + sprintf( name, "%02x-%02x", lang->id, lang->sub ); + return name; +} + +static char *get_po_file_name( const language_t *lang ) +{ + return strmake( "%s.po", get_language_name( lang ) ); } static unsigned int flush_po_files( const char *output_name ) @@ -658,6 +658,75 @@ static void add_pot_dialog( po_file_t po, const resource_t *res ) add_pot_dialog_controls( po, dlg->controls ); } +static void compare_dialogs( const dialog_t *english_dlg, const dialog_t *dlg ) +{ + const control_t *english_ctrl, *ctrl; + unsigned int style = 0, exstyle = 0, english_style = 0, english_exstyle = 0; + char *name; + char *title = english_dlg->title ? convert_msgid_ascii( english_dlg->title, 0 ) : xstrdup("??"); + + if (english_dlg->width != dlg->width || english_dlg->height != dlg->height) + warning( "%s: dialog %s doesn't have the same size (%d,%d vs %d,%d)\n", + get_language_name( dlg->lvc.language ), title, dlg->width, dlg->height, + english_dlg->width, english_dlg->height ); + + if (dlg->gotstyle) style = dlg->style->or_mask; + if (dlg->gotexstyle) exstyle = dlg->exstyle->or_mask; + if (english_dlg->gotstyle) english_style = english_dlg->style->or_mask; + if (english_dlg->gotexstyle) english_exstyle = english_dlg->exstyle->or_mask; + if (english_style != style) + warning( "%s: dialog %s doesn't have the same style (%08x vs %08x)\n", + get_language_name( dlg->lvc.language ), title, style, english_style ); + if (english_exstyle != exstyle) + warning( "%s: dialog %s doesn't have the same exstyle (%08x vs %08x)\n", + get_language_name( dlg->lvc.language ), title, exstyle, english_exstyle ); + + if (english_dlg->font || dlg->font) + { + int size = 0, english_size = 0; + char *font = NULL, *english_font = NULL; + + if (english_dlg->font) + { + english_font = convert_msgid_ascii( english_dlg->font->name, 0 ); + english_size = english_dlg->font->size; + } + if (dlg->font) + { + font = convert_msgid_ascii( dlg->font->name, 0 ); + size = dlg->font->size; + } + + if (!english_font || !font || strcasecmp( english_font, font ) || english_size != size) + warning( "%s: dialog %s doesn't have the same font (%s %u vs %s %u)\n", + get_language_name(dlg->lvc.language), title, + english_font ? english_font : "default", english_size, + font ? font : "default", size ); + free( font ); + free( english_font ); + } + english_ctrl = english_dlg->controls; + ctrl = dlg->controls; + for ( ; english_ctrl && ctrl; ctrl = ctrl->next, english_ctrl = english_ctrl->next ) + { + if (control_has_title( english_ctrl )) + name = convert_msgid_ascii( english_ctrl->title->name.s_name, 0 ); + else + name = strmake( "%d", ctrl->id ); + + if (english_ctrl->width != ctrl->width || english_ctrl->height != ctrl->height) + warning( "%s: dialog %s control %s doesn't have the same size (%d,%d vs %d,%d)\n", + get_language_name( dlg->lvc.language ), title, name, + ctrl->width, ctrl->height, english_ctrl->width, english_ctrl->height ); + if (english_ctrl->x != ctrl->x || english_ctrl->y != ctrl->y) + warning( "%s: dialog %s control %s doesn't have the same position (%d,%d vs %d,%d)\n", + get_language_name( dlg->lvc.language ), title, name, + ctrl->x, ctrl->y, english_ctrl->x, english_ctrl->y ); + free( name ); + } + free( title ); +} + static void add_po_dialog_controls( po_file_t po, const control_t *english_ctrl, const control_t *ctrl, const language_t *lang ) { @@ -677,6 +746,8 @@ static void add_po_dialog( const resource_t *english, const resource_t *res ) const dialog_t *dlg = res->res.dlg; po_file_t po = get_po_file( dlg->lvc.language ); + compare_dialogs( english_dlg, dlg ); + if (english_dlg->title && dlg->title) add_po_string( po, english_dlg->title, dlg->title, dlg->lvc.language ); if (english_dlg->font && dlg->font)

1 0