February 2012 - Wine-commits

Frédéric Delanoy : po: Fix trailing full stops errors in the Ukrainian translation.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 47db52ced19c1c01465fdca7408a37340cba7b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47db52ced19c1c01465fdca74… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 01:29:13 2012 +0100 po: Fix trailing full stops errors in the Ukrainian translation. --- po/uk.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4ad03d4..9e0ccad 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1978,11 +1978,11 @@ msgstr "Підписання CRL" #: crypt32.rc:229 msgid "Encipher Only" -msgstr "Лише зашифр." +msgstr "Лише зашифр" #: crypt32.rc:230 msgid "Decipher Only" -msgstr "Лише розшифр." +msgstr "Лише розшифр" #: crypt32.rc:231 msgid "SSL Client Authentication" @@ -8344,7 +8344,7 @@ msgstr "Дата сертифікату недійсна." #: wininet.rc:28 msgid "The name on the certificate does not match the site." -msgstr "Ім'я сертифікату не збігається з сайтом" +msgstr "Ім'я сертифікату не збігається з сайтом." #: wininet.rc:29 msgid "" @@ -8419,7 +8419,7 @@ msgid "" msgstr "" "Вказаний формат не підтримується, або його неможливо перетворити. " "Скористайтеся функцією Capabilities, щоб одержати список форматів, які " -"підтримуються" +"підтримуються." #: winmm.rc:43 winmm.rc:49 msgid "" @@ -13048,7 +13048,7 @@ msgstr "" #: wineconsole.rc:69 msgid "Quick edit" -msgstr "Швидке редагув." +msgstr "Швидке редагув" #: wineconsole.rc:70 msgid "&enable"

1 0

Frédéric Delanoy : po: Fix trailing full stops errors in the Slovenian translation.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: fa375387625bd5a5ef1f5f4248525b8826e50110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa375387625bd5a5ef1f5f424… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 01:29:11 2012 +0100 po: Fix trailing full stops errors in the Slovenian translation. --- po/sl.po | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/po/sl.po b/po/sl.po index e05b728..c474296 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2220,7 +2220,7 @@ msgstr "Dopolnjevanje čarovnika za uvoz potrdil" #: cryptui.rc:324 msgid "You have successfully completed the Certificate Import Wizard." -msgstr "Uspešno ste dokončali čarovnika za uvoz potrdil" +msgstr "Uspešno ste dokončali čarovnika za uvoz potrdil." #: cryptui.rc:326 cryptui.rc:440 msgid "You have specified the following settings:" @@ -3243,7 +3243,7 @@ msgstr "Odpri URL" #: ieframe.rc:90 msgid "Specify the URL you wish to open in Internet Explorer" -msgstr "Vnesite internetni naslov dokumenta, ki ga bo Internet Explorer odprl." +msgstr "Vnesite internetni naslov dokumenta, ki ga bo Internet Explorer odprl" #: ieframe.rc:91 msgid "Open:" @@ -8717,7 +8717,7 @@ msgid "" "in Control Panel to install the device." msgstr "" "Naprava ni nameščena. Če želite namestiti nov gonilnik uporabite možnost " -"Gonilniki na Nadzorni plošči" +"Gonilniki na Nadzorni plošči." #: winmm.rc:102 msgid "" @@ -9304,7 +9304,7 @@ msgstr "DATE prikaže ali spremeni sistemski datum.\n" #: cmd.rc:48 msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "DEL <filename> izbriše datoteko ali več datotek\n" +msgstr "DEL <filename> izbriše datoteko ali več datotek.\n" #: cmd.rc:49 msgid "DIR lists the contents of a directory.\n" @@ -9828,7 +9828,7 @@ msgstr "" "EXIT\t\tZapre sejo CMD\n" "\n" "Uporabite HELP <ukaz> za več podrobnosti o kateremkoli od zgoraj navedenih " -"ukazov\n" +"ukazov.\n" #: cmd.rc:290 #, fuzzy @@ -10676,7 +10676,7 @@ msgstr "Preklopi med načinom prikaza izvedenca in začetnika" #: oleview.rc:118 msgid "" "Toggle the display of component categories that are not meant to be visible" -msgstr "Preklopi prikaz kategorij sestavnih delov, ki naj ne bi bile vidne." +msgstr "Preklopi prikaz kategorij sestavnih delov, ki naj ne bi bile vidne" #: oleview.rc:119 msgid "Show or hide the toolbar" @@ -13129,8 +13129,7 @@ msgstr "Napaka nastavitve" #: wineconsole.rc:39 msgid "Screen buffer size must be greater or equal to the window's one" -msgstr "" -"Velikost zaslonskega medpomnilnika mora biti večja ali enaka okenskemu." +msgstr "Velikost zaslonskega medpomnilnika mora biti večja ali enaka okenskemu" #: wineconsole.rc:34 msgid "Each character is %1!u! pixels wide on %2!u! pixels high" @@ -13193,7 +13192,7 @@ msgstr "" #: wineconsole.rc:50 msgid " <command> The Wine program to launch in the console.\n" msgstr "" -" <ukaz> Program Wine, ki ga želite izvesti v konzoli\n" +" <ukaz> Program Wine, ki ga želite izvesti v konzoli.\n" #: wineconsole.rc:51 msgid "" @@ -14176,5 +14175,5 @@ msgstr "" "[/D | /D:m-d-y] Kopiraj datoteke, ustvarjene ali spremenjene po navedenem " "datumu.\n" "\t\tČe datum ni podan, so kopirane le datoteke, katerih cilj je starejši\n" -"\t\tod izvora\n" +"\t\tod izvora.\n" "\n"

1 0

Frédéric Delanoy : po: Fix trailing full stops errors in the Portuguese (Portugal) translation.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 7ab860ef5d0386b9f8de4a68c0ea090014d6fada URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab860ef5d0386b9f8de4a68c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 01:29:09 2012 +0100 po: Fix trailing full stops errors in the Portuguese (Portugal) translation. --- po/pt_PT.po | 56 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index a85d447..da95206 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8981,7 +8981,7 @@ msgstr "" #: winmm.rc:92 msgid "A null parameter block was passed to MCI." -msgstr "Um bloco de parâmetro nulo foi passado para o MCI.." +msgstr "Um bloco de parâmetro nulo foi passado para o MCI." #: winmm.rc:93 msgid "Cannot save an unnamed file. Supply a filename." @@ -9602,7 +9602,7 @@ msgstr "Ajuda do comando CHDIR\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" -msgstr "CLS limpa a ecrã da consola\n" +msgstr "CLS limpa a ecrã da consola.\n" #: cmd.rc:45 #, fuzzy @@ -10993,7 +10993,7 @@ msgstr "Iniciar o Editor de Registo do Wine" #: oleview.rc:107 msgid "Quit the application. Prompts to save changes" -msgstr "Sair da aplicação. Pede para guardar alterações." +msgstr "Sair da aplicação. Pede para guardar alterações" #: oleview.rc:108 msgid "Create an instance of the selected object" @@ -11574,26 +11574,26 @@ msgstr "Editar Multi-frase" #: regedit.rc:134 msgid "Contains commands for working with the whole registry" -msgstr "Contém comandos para trabalhar com o Registo inteiro." +msgstr "Contém comandos para trabalhar com o Registo inteiro" #: regedit.rc:135 msgid "Contains commands for editing values or keys" -msgstr "Contém comandos para edição de valores ou chaves." +msgstr "Contém comandos para edição de valores ou chaves" #: regedit.rc:136 msgid "Contains commands for customising the registry window" -msgstr "Contém comandos para personalização da janela do Registo." +msgstr "Contém comandos para personalização da janela do Registo" #: regedit.rc:137 msgid "Contains commands for accessing frequently used keys" -msgstr "Contém comandos para aceder a chaves frequentemente usadas." +msgstr "Contém comandos para aceder a chaves frequentemente usadas" #: regedit.rc:138 msgid "" "Contains commands for displaying help and information about registry editor" msgstr "" "Contém comandos para exibição da ajuda e informações sobre o Editor do " -"Registo." +"Registo" #: regedit.rc:139 msgid "Contains commands for creating new keys or values" @@ -11643,51 +11643,51 @@ msgstr "(desconhecido %d)" #: regedit.rc:160 msgid "Quits the registry editor" -msgstr "Encerra o Editor de Registo." +msgstr "Encerra o Editor de Registo" #: regedit.rc:161 msgid "Adds keys to the favorites list" -msgstr "Adiciona chaves à lista de favoritos." +msgstr "Adiciona chaves à lista de favoritos" #: regedit.rc:162 msgid "Removes keys from the favorites list" -msgstr "Remove chaves da lista de favoritos." +msgstr "Remove chaves da lista de favoritos" #: regedit.rc:163 msgid "Shows or hides the status bar" -msgstr "Mostra ou oculta a barra de status." +msgstr "Mostra ou oculta a barra de status" #: regedit.rc:164 msgid "Change position of split between two panes" -msgstr "Altera a posição da divisão entre os painéis." +msgstr "Altera a posição da divisão entre os painéis" #: regedit.rc:165 msgid "Refreshes the window" -msgstr "Actualiza a janela." +msgstr "Actualiza a janela" #: regedit.rc:166 msgid "Deletes the selection" -msgstr "Exclui a selecção." +msgstr "Exclui a selecção" #: regedit.rc:167 msgid "Renames the selection" -msgstr "Renomeia a selecção." +msgstr "Renomeia a selecção" #: regedit.rc:168 msgid "Copies the name of the selected key to the clipboard" -msgstr "Copia o nome da chave seleccionada para a Área de transferência." +msgstr "Copia o nome da chave seleccionada para a Área de transferência" #: regedit.rc:169 msgid "Finds a text string in a key, value or data" -msgstr "Localiza um texto numa chave, valor ou dado." +msgstr "Localiza um texto numa chave, valor ou dado" #: regedit.rc:170 msgid "Finds next occurrence of text specified in previous search" -msgstr "Localiza a próxima ocorrência do texto indicado na pesquisa anterior." +msgstr "Localiza a próxima ocorrência do texto indicado na pesquisa anterior" #: regedit.rc:144 msgid "Modifies the value's data" -msgstr "Modifica os dados do valor." +msgstr "Modifica os dados do valor" #: regedit.rc:145 msgid "Adds a new key" @@ -11695,31 +11695,31 @@ msgstr "Adiciona uma nova chave" #: regedit.rc:146 msgid "Adds a new string value" -msgstr "Adiciona um novo valor texto." +msgstr "Adiciona um novo valor texto" #: regedit.rc:147 msgid "Adds a new binary value" -msgstr "Adiciona um novo valor binário." +msgstr "Adiciona um novo valor binário" #: regedit.rc:148 msgid "Adds a new double word value" -msgstr "Adiciona um novo valor DWORD." +msgstr "Adiciona um novo valor DWORD" #: regedit.rc:150 msgid "Imports a text file into the registry" -msgstr "Importa um ficheiro de texto para o registo." +msgstr "Importa um ficheiro de texto para o registo" #: regedit.rc:152 msgid "Exports all or part of the registry to a text file" -msgstr "Exporta todo ou parte do registo para um ficheiro de texto." +msgstr "Exporta todo ou parte do registo para um ficheiro de texto" #: regedit.rc:153 msgid "Prints all or part of the registry" -msgstr "Imprime todo ou parte do registo." +msgstr "Imprime todo ou parte do registo" #: regedit.rc:155 msgid "Displays program information, version number and copyright" -msgstr "Exibe informações do programa, número da versão e direitos de autor." +msgstr "Exibe informações do programa, número da versão e direitos de autor" #: regedit.rc:178 msgid "Can't query value '%s'" @@ -12447,7 +12447,7 @@ msgstr "Esconder o Gestor de Tarefas quando está minimizado" msgid "Force Task Manager to update now, regardless of Update Speed setting" msgstr "" "Forçar o Gestor de Tarefas a actualizar agora, independentemente da " -"velocidade de actualização definida." +"velocidade de actualização definida" #: taskmgr.rc:193 msgid "Displays tasks by using large icons"

1 0

Jacek Caban : ieframe: Added IProvideClassInfo::GetClassInfo tests.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: a6e3984c1a3847bc500a8b427ac2ca9b783eaebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e3984c1a3847bc500a8b427… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 12:37:04 2012 +0100 ieframe: Added IProvideClassInfo::GetClassInfo tests. --- dlls/ieframe/tests/webbrowser.c | 45 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index e97cf3f..945be60 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -153,6 +153,7 @@ static BOOL is_downloading, is_first_load, use_container_olecmd, test_close, is_ static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; static const char *current_url; +static int wb_version; #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 #define DWL_FROM_PUT_HREF 0x02 @@ -236,6 +237,8 @@ static HRESULT _create_WebBrowser(unsigned line, IUnknown **unk) { HRESULT hres; + wb_version = 2; + hres = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)unk); ok_(__FILE__,line)(hres == S_OK, "Creating WebBrowser object failed: %08x\n", hres); @@ -1898,6 +1901,8 @@ static void test_ClientSite(IUnknown *unk, IOleClientSite *client, BOOL stop_dow static void test_ClassInfo(IUnknown *unk) { IProvideClassInfo2 *class_info; + TYPEATTR *type_attr; + ITypeInfo *typeinfo; GUID guid; HRESULT hres; @@ -1908,7 +1913,7 @@ static void test_ClassInfo(IUnknown *unk) hres = IProvideClassInfo2_GetGUID(class_info, GUIDKIND_DEFAULT_SOURCE_DISP_IID, &guid); ok(hres == S_OK, "GetGUID failed: %08x\n", hres); - ok(IsEqualGUID(&DIID_DWebBrowserEvents2, &guid), "wrong guid\n"); + ok(IsEqualGUID(wb_version > 1 ? &DIID_DWebBrowserEvents2 : &DIID_DWebBrowserEvents, &guid), "wrong guid\n"); hres = IProvideClassInfo2_GetGUID(class_info, 0, &guid); ok(hres == E_FAIL, "GetGUID failed: %08x, expected E_FAIL\n", hres); @@ -1924,6 +1929,20 @@ static void test_ClassInfo(IUnknown *unk) hres = IProvideClassInfo2_GetGUID(class_info, 0, NULL); ok(hres == E_POINTER, "GetGUID failed: %08x, expected E_POINTER\n", hres); + typeinfo = NULL; + hres = IProvideClassInfo2_GetClassInfo(class_info, &typeinfo); + ok(hres == S_OK, "GetClassInfo failed: %08x\n", hres); + ok(typeinfo != NULL, "typeinfo == NULL\n"); + + hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr); + ok(hres == S_OK, "GetTypeAtr failed: %08x\n", hres); + + ok(IsEqualGUID(&type_attr->guid, wb_version > 1 ? &CLSID_WebBrowser : &CLSID_WebBrowser_V1), + "guid = %s\n", debugstr_guid(&type_attr->guid)); + + ITypeInfo_ReleaseTypeAttr(typeinfo, type_attr); + ITypeInfo_Release(typeinfo); + IProvideClassInfo2_Release(class_info); } @@ -3249,6 +3268,28 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) ok(ref == 0, "ref=%d, expected 0\n", ref); } +static void test_WebBrowserV1(void) +{ + IWebBrowser2 *wb; + ULONG ref; + HRESULT hres; + + wb_version = 1; + + hres = CoCreateInstance(&CLSID_WebBrowser_V1, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IWebBrowser2, (void**)&wb); + ok(hres == S_OK, "Could not get WebBrowserV1 instance: %08x\n", hres); + + test_QueryStatusWB(wb, FALSE, FALSE); + test_ExecWB(wb, FALSE, FALSE); + test_QueryInterface((IUnknown*)wb); + test_ready_state(READYSTATE_UNINITIALIZED); + test_ClassInfo((IUnknown*)wb); + + ref = IWebBrowser2_Release(wb); + ok(ref == 0, "ref=%d, expected 0\n", ref); +} + static void test_WebBrowser_NoContainerOlecmd(void) { IUnknown *unk = NULL; @@ -3325,6 +3366,8 @@ START_TEST(webbrowser) test_WebBrowser(TRUE, TRUE); trace("Testing WebBrowser w/o container-based olecmd...\n"); test_WebBrowser_NoContainerOlecmd(); + trace("Testing WebBrowserV1...\n"); + test_WebBrowserV1(); OleUninitialize(); }

1 0

Christian Costa : d3dx9_36: Detect and display message for all not yet supported file formats.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 39598b9c1e5b2bea4f248c3de6984cce4ee7ea07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39598b9c1e5b2bea4f248c3de… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Feb 10 14:18:39 2012 +0100 d3dx9_36: Detect and display message for all not yet supported file formats. --- dlls/d3dx9_36/surface.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 8049efc..ca1699b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -62,8 +62,6 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D TRACE("(%p, %d, %p)\n", data, datasize, info); - /* TODO: Add support for (or at least detect) DDS, PPM and DIB */ - if (!data || !datasize) return D3DERR_INVALIDCALL; @@ -82,6 +80,19 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D IWICImagingFactory_Release(factory); } + if (FAILED(hr)) { + if ((datasize >= 4) && !strncmp(data, "DDS ", 4)) + FIXME("File type DDS is not supported yet\n"); + else if ((datasize >= 2) && (!strncmp(data, "P3", 2) || !strncmp(data, "P6", 2))) + FIXME("File type PPM is not supported yet\n"); + else if ((datasize >= 2) && !strncmp(data, "BM", 2)) + FIXME("File type DIB is not supported yet\n"); + else if ((datasize >= 10) && !strncmp(data, "#?RADIANCE", 10)) + FIXME("File type HDR is not supported yet\n"); + else if ((datasize >= 2) && (!strncmp(data, "PF", 2) || !strncmp(data, "Pf", 2))) + FIXME("File type PFM is not supported yet\n"); + } + if (SUCCEEDED(hr)) { GUID container_format; UINT frame_count; @@ -161,8 +172,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D CoUninitialize(); if (FAILED(hr)) { - /* Missing formats are not detected yet and will fail silently without the FIXME */ - FIXME("Invalid or unsupported image file\n"); + TRACE("Invalid or unsupported image file\n"); return D3DXERR_INVALIDDATA; }

1 0

Eric Pouech : winhlp32: Added support for some keyword support in external DLL support ( RegisterRoutine parameters).
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: efc35078eae22f46578360b4235b443a13ec4a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc35078eae22f46578360b42… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Feb 10 21:38:03 2012 +0100 winhlp32: Added support for some keyword support in external DLL support (RegisterRoutine parameters). --- programs/winhlp32/macro.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index ea6ecbd..615b687 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -1029,6 +1029,32 @@ int MACRO_Lookup(const char* name, struct lexret* lr) return ret; if (MACRO_Loaded && (ret = MACRO_DoLookUp(MACRO_Loaded, name, lr, MACRO_NumLoaded)) != EMPTY) return ret; + if (!strcmp(name, "hwndApp")) + { + WINHELP_WINDOW* win; + lr->integer = 0; + for (win = Globals.win_list; win; win = win->next) + { + if (!strcmp(win->info->name, "main")) + { + lr->integer = (LONG_PTR)win->hMainWnd; + break; + } + } + return INTEGER; + } + if (!strcmp(name, "hwndContext")) + { + lr->integer = Globals.active_win ? + (LONG_PTR)Globals.active_win->hMainWnd : 0; + return INTEGER; + } + if (!strcmp(name, "qchPath") || !strcmp(name, "qError") || !strcmp(name, "lTopicNo") || + !strcmp(name, "hfs") || !strcmp(name, "coForeground") || !strcmp(name, "coBackground")) + { + WINE_FIXME("keyword %s not substituted in macro parsing\n", name); + return EMPTY; + } lr->string = name; return IDENTIFIER;

1 0

Eric Pouech : winedbg: Let the lexer accept char definitions as integral values.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 45aa67b30aafc533536d2734c3a946f078ff2e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45aa67b30aafc533536d2734c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Feb 11 11:36:21 2012 +0100 winedbg: Let the lexer accept char definitions as integral values. --- programs/winedbg/debug.l | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a12b637..30c8aea 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -113,6 +113,7 @@ static int read_input(const char* pfx, char* buf, int size) static int syntax_error; %} +OCTDIGIT [0-7] DIGIT [0-9] HEXDIGIT [0-9a-fA-F] FORMAT [ubcdgiswxa] @@ -157,6 +158,11 @@ STRING \"[^\n"]+\" "0x"{HEXDIGIT}+ { sscanf(yytext, "%lx", &dbg_lval.integer); return tNUM; } {DIGIT}+ { sscanf(yytext, "%ld", &dbg_lval.integer); return tNUM; } +"'\\''" { dbg_lval.integer = '\''; return tNUM;} +"'\\0"{OCTDIGIT}*"'" { sscanf(yytext + 3, "%lo", &dbg_lval.integer); return tNUM;} +"'\\x"{HEXDIGIT}+"'" { sscanf(yytext + 3, "%lx", &dbg_lval.integer); return tNUM;} +"'\\"[a-z]"'" { dbg_lval.integer = yytext[2] - 'a'; return tNUM;} +"'"."'" { dbg_lval.integer = yytext[1]; return tNUM;} <FORMAT_EXPECTED>"/"{DIGIT}+{FORMAT} { char* last; dbg_lval.integer = strtol(yytext+1, &last, 0) << 8;

1 0

Jörg Höhle : mmdevapi/tests: Perform renderer padding & position tests.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: fde979b8b5f5aa36e65d2ebda3987a03fdbe3596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde979b8b5f5aa36e65d2ebda… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 8 16:38:47 2012 +0100 mmdevapi/tests: Perform renderer padding & position tests. --- dlls/mmdevapi/tests/render.c | 464 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 435 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fde979b8b5f5aa36e65d2…

1 0

Frédéric Delanoy : po: Fix trailing full stops errors in the Korean translation.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 363b016f237d4ff3d617bd8713ccd0f13802ab3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=363b016f237d4ff3d617bd871… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Feb 11 01:29:06 2012 +0100 po: Fix trailing full stops errors in the Korean translation. --- po/ko.po | 74 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/po/ko.po b/po/ko.po index 7c58a75..6f8ec58 100644 --- a/po/ko.po +++ b/po/ko.po @@ -820,7 +820,7 @@ msgstr "" #: comdlg32.rc:35 msgid "Path does not exist" -msgstr "경로가 존재하지 않습니다." +msgstr "경로가 존재하지 않습니다" #: comdlg32.rc:36 msgid "File does not exist" @@ -936,7 +936,7 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "페이지 범위를 벗어나지 않아야 올바른 값입니다.\n" -"%1!d! 과 %2!d! 사이의 값을 입력하시오 " +"%1!d! 과 %2!d! 사이의 값을 입력하시오." #: comdlg32.rc:56 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -976,7 +976,7 @@ msgstr "프린터를 찾을 수 없습니다." #: comdlg32.rc:66 progman.rc:73 msgid "Out of memory." -msgstr "메모리 부족" +msgstr "메모리 부족." #: comdlg32.rc:67 msgid "An error occurred." @@ -1169,7 +1169,7 @@ msgid "" "and password are correct." msgstr "" "당신의 사용자 이름과 암호가\n" -"올바른지 확인하십시오" +"올바른지 확인하십시오." #: credui.rc:32 msgid "" @@ -2381,7 +2381,7 @@ msgid "" "altered or corrupted." msgstr "" "이 인증서는 올바르지 않은 서명을 가지고 있습니다. 이 인증서는 아마도 고쳐졌" -"거나 망가진 것같습니가" +"거나 망가진 것같습니가." #: cryptui.rc:30 msgid "" @@ -2433,7 +2433,7 @@ msgstr "이 인증서는 만료되었거나 아직 유효하지 않습니다." #: cryptui.rc:41 msgid "This certificate's validity period exceeds that of its issuer." -msgstr "이 인증서는 발행자가 정한 유효시간을 초과했습니다" +msgstr "이 인증서는 발행자가 정한 유효시간을 초과했습니다." #: cryptui.rc:42 msgid "This certificate was revoked by its issuer." @@ -2441,7 +2441,7 @@ msgstr "이 인증서는 발행자에 의하여 취소되었습니다." #: cryptui.rc:43 msgid "This certificate is OK." -msgstr "이 인증서는 올바릅니다.." +msgstr "이 인증서는 올바릅니다." #: cryptui.rc:44 msgid "Field" @@ -3249,7 +3249,7 @@ msgstr "%s 찾는 중" #: ieframe.rc:79 msgid "Start downloading %s" -msgstr "%s 다운로드 시작." +msgstr "%s 다운로드 시작" #: ieframe.rc:80 msgid "Downloading %s" @@ -5373,7 +5373,7 @@ msgstr "올바르지 않은 회원\n" #: winerror.mc:2346 msgid "Too many SIDs\n" -msgstr "너무 많은 SID이 있습니다.\n" +msgstr "너무 많은 SID이 있습니다\n" #: winerror.mc:2351 msgid "Cross-encrypted LM password required\n" @@ -5981,7 +5981,7 @@ msgstr "지원하지 않는 이름 문법\n" #: winerror.mc:3111 msgid "No network address\n" -msgstr "네트워크 주소가 없습니다.\n" +msgstr "네트워크 주소가 없습니다\n" #: winerror.mc:3116 msgid "Duplicate endpoint\n" @@ -7156,7 +7156,7 @@ msgid "" "your document." msgstr "" "당신의 문서 %s에 클립보드의 내용을 삽입합니다. 이 데이터는 원본 파일에 연결" -"되어 있어서 파일이 바뀌면 당신의 문서에 영향을 미칠 것입니다" +"되어 있어서 파일이 바뀌면 당신의 문서에 영향을 미칠 것입니다." #: oledlg.rc:38 msgid "" @@ -7174,7 +7174,7 @@ msgid "" "be reflected in your document." msgstr "" "당신의 문서에 클립보드에 있는 단축아이콘을 집어넣습니다. 이 단축아이콘은 원" -"본 파일에 연결되어 있어서 파일이 바뀌면 당신의 문서에 영향을 미칠 것입니다" +"본 파일에 연결되어 있어서 파일이 바뀌면 당신의 문서에 영향을 미칠 것입니다." #: oledlg.rc:40 msgid "Inserts the contents of the clipboard into your document." @@ -7198,7 +7198,7 @@ msgstr "스캐닝중" #: sane.rc:44 msgid "SCANNING... Please Wait" -msgstr "스캐닝중... 기다리십시오." +msgstr "스캐닝중... 기다리십시오" #: sane.rc:31 msgctxt "unit: pixels" @@ -8341,7 +8341,7 @@ msgid "" "Capabilities function to determine the supported formats." msgstr "" "지정된 형식은 지원하지 않거나 전송할 수 없습니다. 지원하는 형식을 결정하는 가" -"능한 함수를 사용하십시오" +"능한 함수를 사용하십시오." #: winmm.rc:43 winmm.rc:49 msgid "" @@ -8389,7 +8389,7 @@ msgid "" "transmitted, and then try again." msgstr "" "이 포트는 장치로 데이타를 옮기는 중입니다. 데이타가 다 옮겨질 때까지 기다리십" -"시오,그리고 다시 시도하십시오" +"시오,그리고 다시 시도하십시오." #: winmm.rc:52 msgid "" @@ -8425,7 +8425,7 @@ msgid "" "or contact the device manufacturer." msgstr "" "이것은 당신의 미디어 장치 문제입니다. 반드시 올바르게 작동한다고 확신한다면 " -"장치 제조자에게 연락하십시오" +"장치 제조자에게 연락하십시오." #: winmm.rc:60 msgid "The specified device is not open or is not recognized by MCI." @@ -8601,7 +8601,7 @@ msgstr "매개변수 값에서 닫힌 쌍 따옴표 하나가 빠졌습니다. #: winmm.rc:90 msgid "A parameter or value was specified twice. Only specify it once." -msgstr "이 값의 매개변수는 두번 지정되었습니다. 오직 하나만 지정하십시오" +msgstr "이 값의 매개변수는 두번 지정되었습니다. 오직 하나만 지정하십시오." #: winmm.rc:91 msgid "" @@ -8852,7 +8852,7 @@ msgid "" "are still connected to the network." msgstr "" "지정된 파일에 기록할 수 없습니다. 디스크 공간이 충분한지 확인하거나. 네트워크" -"에 연결중인지 확인하십시오" +"에 연결중인지 확인하십시오." #: winspool.rc:34 msgid "Print to File" @@ -9036,7 +9036,7 @@ msgstr "결과가 너무 큽니다" #: wldap32.rc:98 msgid "Affects Multiple DSAs" -msgstr "다양한 DSAs이 작용합니다." +msgstr "다양한 DSAs이 작용합니다" #: wldap32.rc:107 msgid "Other" @@ -9457,7 +9457,7 @@ msgstr "" "기호가 뒤따른다는 걸 주의하시오. (명령 PROMPT $p$g롸 같이).\n" "\n" "이 프롬프트는 PROMPT 환경 변수 값의 변경에 의해 바뀔 수 있습니다,\n" -"그래서 명령 'SET PROMPT=텍스트'는 'PROMPT 텍스트와 같은 일을 합니다\n" +"그래서 명령 'SET PROMPT=텍스트'는 'PROMPT 텍스트와 같은 일을 합니다.\n" #: cmd.rc:153 msgid "" @@ -9475,7 +9475,7 @@ msgstr "" #: cmd.rc:157 msgid "RENAME <filename> renames a file.\n" -msgstr "RENAME <파일이름> 은 파일의 이름을 바꿈\n" +msgstr "RENAME <파일이름> 은 파일의 이름을 바꿈.\n" #: cmd.rc:159 msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" @@ -9568,7 +9568,7 @@ msgstr "" #: cmd.rc:203 msgid "VER displays the version of cmd you are running.\n" -msgstr "VER 당신이 실행시킨 cmd 버젼 보여줌\n" +msgstr "VER 당신이 실행시킨 cmd 버젼 보여줌.\n" #: cmd.rc:205 msgid "VOL shows the volume label of a disk device.\n" @@ -9665,7 +9665,7 @@ msgid "" msgstr "" "CHOICE는 텍스트를 보여주고, 사용자가 선택된 목록에서\n" "허용하는 키를 누를 때까지 기다립니다.\n" -"CHOICE는 주로 배치 파일에서 메뉴 선택을 넣는 데 사용됩니다..\n" +"CHOICE는 주로 배치 파일에서 메뉴 선택을 넣는 데 사용됩니다.\n" #: cmd.rc:251 msgid "" @@ -9769,11 +9769,11 @@ msgstr "아니오" #: cmd.rc:293 msgid "File association missing for extension %1\n" -msgstr "이 파일확장자 %1에 연결된 풀그림이 없습니다.\n" +msgstr "이 파일확장자 %1에 연결된 풀그림이 없습니다\n" #: cmd.rc:294 msgid "No open command associated with file type '%1'\n" -msgstr "이 파일 형식 '%1'과 연결된 어떠한 명령도 없습니다.'\n" +msgstr "이 파일 형식 '%1'과 연결된 어떠한 명령도 없습니다'\n" #: cmd.rc:295 msgid "Overwrite %1?" @@ -9850,7 +9850,7 @@ msgstr "검증(Verify)은 %1임\n" #: cmd.rc:315 msgid "Verify must be ON or OFF\n" -msgstr "검증(Verify)은 반드시 ON 이나 OFF가 되어야 합니다.\n" +msgstr "검증(Verify)은 반드시 ON 이나 OFF가 되어야 합니다\n" #: cmd.rc:316 msgid "Parameter error\n" @@ -10015,7 +10015,7 @@ msgstr "" " -나-\n" "NET 명령어 /HELP\n" "\n" -"명령어에 들어갈 수 있는 것은 HELP, START, STOP이나 USE중의 하나임\n" +"명령어에 들어갈 수 있는 것은 HELP, START, STOP이나 USE중의 하나임.\n" #: net.rc:28 msgid "" @@ -11355,7 +11355,7 @@ msgstr "" "Start는 보증이 없이 제공됩니다; /L 옵션과 함께 실행시키면 자세한 내용을 볼 " "수 있습니다.\n" "이것은 자유 소프트웨어이고, 당신은 특정 조건하에서 재배포를 환영\n" -"합니다; 'start /L'을 실행시키면 자세한 것을 볼 수 있습니다\n" +"합니다; 'start /L'을 실행시키면 자세한 것을 볼 수 있습니다.\n" #: start.rc:64 msgid "" @@ -12715,7 +12715,7 @@ msgstr "" "당신은 더 이상 드라이브를 추가할 수 없습니다.\n" "\n" "각 드라이브는 반드시 A~Z까지의 문자를 가집니다, 그래서 당신은 26개보다 더 많" -"이 추가할 수 없습니다" +"이 추가할 수 없습니다." #: winecfg.rc:72 msgid "System drive" @@ -13022,7 +13022,7 @@ msgstr "설정 오류" #: wineconsole.rc:39 msgid "Screen buffer size must be greater or equal to the window's one" -msgstr "스크린 버퍼 크기는 반드시 창보다 같거나 커야합니다." +msgstr "스크린 버퍼 크기는 반드시 창보다 같거나 커야합니다" #: wineconsole.rc:34 msgid "Each character is %1!u! pixels wide on %2!u! pixels high" @@ -13079,11 +13079,11 @@ msgid "" msgstr "" " --backend={user|curses} 사용자가 새 창을 열 것인지,\n" " curses으로 Wine 콘솔처럼 현재 터미널에 나타낼 것" -"인지 선택\n" +"인지 선택.\n" #: wineconsole.rc:50 msgid " <command> The Wine program to launch in the console.\n" -msgstr " <명령> The Wine 프로그램은 콘솔을 통해서 시작됨\n" +msgstr " <명령> The Wine 프로그램은 콘솔을 통해서 시작됨.\n" #: wineconsole.rc:51 msgid "" @@ -13096,7 +13096,7 @@ msgstr "" "\n" "예:\n" " wineconsole cmd\n" -"Wine 콘솔에서 Wine 명령 프롬프트 시작\n" +"Wine 콘솔에서 Wine 명령 프롬프트 시작.\n" "\n" #: winedbg.rc:46 @@ -13901,11 +13901,11 @@ msgstr "" #: wordpad.rc:187 msgid "Invalid number format." -msgstr "올바르지 않은 숫자 형식" +msgstr "올바르지 않은 숫자 형식." #: wordpad.rc:188 msgid "OLE storage documents are not supported." -msgstr "OLE 저장 문서는 지원되지 않습니다" +msgstr "OLE 저장 문서는 지원되지 않습니다." #: wordpad.rc:189 msgid "Could not save the file." @@ -13925,7 +13925,7 @@ msgstr "파일을 열 권한이 없습니다." #: wordpad.rc:193 msgid "Printing not implemented." -msgstr "인쇄는 지원되지 않습니다" +msgstr "인쇄는 지원되지 않습니다." #: wordpad.rc:194 msgid "Cannot add more than 32 tab stops." @@ -14057,5 +14057,5 @@ msgstr "" "\t파일만 복사\n" "[/D | /D:m-d-y] 지정된 날짜 후에 수정되거나 새로운 파일 복사.\n" "\t\tI만약 어떠한 날짜도 지정되지 않으면,오직 원본보다\n" -"\t\t대상이 오래된 것만 복사\n" +"\t\t대상이 오래된 것만 복사.\n" "\n"

1 0

Jacek Caban : urlmon: Added empty hash URIs comparing tests.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 096eeb1a1eff3ff9f46d607a63f92102f1604dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096eeb1a1eff3ff9f46d607a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 11:12:37 2012 +0100 urlmon: Added empty hash URIs comparing tests. --- dlls/urlmon/tests/uri.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3d140ca..40c8a76 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4691,6 +4691,22 @@ static const uri_equality equality_tests[] = { "file:///c:/dir/file.txt#a", 0, "file:///c:\\dir\\file.txt#b", Uri_CREATE_FILE_USE_DOS_PATH, FALSE + }, + /* Tests of an empty hash/fragment part */ + { + "http://google.com/test",0, + "http://google.com/test#",0, + FALSE + }, + { + "ftp://ftp.winehq.org/",0, + "ftp://ftp.winehq.org/#",0, + FALSE + }, + { + "file:///c:/dir/file.txt#", 0, + "file:///c:\\dir\\file.txt", Uri_CREATE_FILE_USE_DOS_PATH, + FALSE } };

1 0