October 2013 - Wine-commits

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: cba5984330a8f010698d9cf4c6dfc391c409ccdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba5984330a8f010698d9cf4c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 1 20:35:35 2013 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 44 ++++++++++++-------------------------------- 1 files changed, 12 insertions(+), 32 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 1894562..2e87c43 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8544,17 +8544,12 @@ msgstr "" "terminarem de ser transmitidos e tente novamente." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "A configuração atual do Mapeador MIDI refere-se a um dispositivo MIDI que " -"não está instalado no sistema. Use o Mapeador MIDI para editar a " -"configuração." +"não está instalado no sistema." #: winmm.rc:53 msgid "" @@ -9401,21 +9396,16 @@ msgstr "" "procedimento chamado são herdados pelo chamador.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <dir> é a abreviação de CHDIR. Ele altera o diretório padrão atual.\n" +"CD <diretório> é a abreviação de CHDIR. Ele altera o diretório padrão " +"atual.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <dir> altera o diretório padrão atual.\n" +msgstr "CHDIR <diretório> altera o diretório padrão atual.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -9467,11 +9457,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <nomedearquivo> exclui um arquivo ou conjunto de arquivos.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9479,10 +9464,13 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"O comando FOR é usado para executar um comando a cada vez em\n" -"um conjunto de arquivos.\n" +"O comando FOR é usado para executar um comando em cada arquivo de um " +"conjunto\n" +"de arquivos.\n" "\n" "Sintaxe: FOR %variável IN (conjunto) DO comando\n" +"\n" +"O sinal de % deve ser duplicado quando se usa o FOR em um arquivo de lotes.\n" #: cmd.rc:80 msgid "" @@ -9674,16 +9662,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <nomedearquivo> renomeia um arquivo.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "RD <dir> é a abreviação de RMDIR. Ela exclui um subdiretório.\n" +msgstr "RD <diretório> é a abreviação de RMDIR. Ela exclui um diretório.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <dir> exclui um subdiretório.\n" +msgstr "RMDIR <diretório> exclui um diretório.\n" #: cmd.rc:203 msgid "" @@ -9856,15 +9840,11 @@ msgstr "" "anteriores são restauradas.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <nomedediretório> salva o diretório atual numa pilha e então altera o\n" +"PUSHD <diretório> salva o diretório atual em uma pilha e então altera o\n" "diretório atual para o que foi fornecido.\n" #: cmd.rc:247

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: f870cc7e7ca79e2e840acb3cdd5e1cd429cb7551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f870cc7e7ca79e2e840acb3cd… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Oct 2 08:43:48 2013 +0300 po: Update Lithuanian translation. --- po/lt.po | 43 +++++++++++-------------------------------- 1 files changed, 11 insertions(+), 32 deletions(-) diff --git a/po/lt.po b/po/lt.po index ff1e375..b334193 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-06-18 22:58+0300\n" +"PO-Revision-Date: 2013-10-02 08:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2256,7 +2256,7 @@ msgstr "Liudijimai" #: cryptui.rc:337 msgid "I&ntended purpose:" -msgstr "&Numatytos paskirtys:" +msgstr "&Numatytosios paskirtys:" #: cryptui.rc:341 msgid "&Import..." @@ -2272,7 +2272,7 @@ msgstr "Išs&amiau..." #: cryptui.rc:345 msgid "Certificate intended purposes" -msgstr "Liudijimo numatytos paskirtys" +msgstr "Liudijimo numatytosios paskirtys" #: cryptui.rc:347 ieframe.rc:42 shell32.rc:40 shell32.rc:117 oleview.rc:56 #: oleview.rc:58 oleview.rc:82 regedit.rc:63 taskmgr.rc:52 winefile.rc:45 @@ -8532,16 +8532,12 @@ msgstr "" "ir mėginkite vėl." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" -"Dabartinė MIDI atvaizdžio konfigūracija kreipiasi į MIDI įrenginį, kuris " -"nėra įdiegtas sistemoje. Naudokite MIDI Mapper konfigūracijai redaguoti." +"Dabartinė MIDI atvaizdžio konfigūracija rodo į MIDI įrenginį, kuris nėra " +"įdiegtas sistemoje." #: winmm.rc:53 msgid "" @@ -9363,22 +9359,16 @@ msgstr "" "iškviestoje procedūroje paveldimi kviečiančiosios procedūros.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" "CD <katalogas> yra trumpa CHDIR versija. Pakeičia dabartinį\n" -"numatytą katalogą.\n" +"numatytąjį katalogą.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <katalogas> pakeičia dabartinį numatytą katalogą.\n" +msgstr "CHDIR <katalogas> pakeičia dabartinį numatytąjį katalogą.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -9429,11 +9419,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <failas> pašalina failą ar failų rinkinį.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9444,6 +9429,8 @@ msgstr "" "FOR komanda naudojama įvykdyti komandą kiekvienam failų aibės elementui.\n" "\n" "Sintaksė: FOR %kintamasis IN (aibė) DO komanda\n" +"\n" +"Simbolis % privalo būti dubliuotas, kai FOR naudojamas komandų faile.\n" #: cmd.rc:80 msgid "" @@ -9607,7 +9594,7 @@ msgstr "" "$q Lygybės ženklas $t Dabartinis laikas $v cmd versija\n" "\n" "Pastebėkite, kad PROMPT komandos be raginimo eilutės įvedimas atkuria\n" -"numatytą raginimo reikšmę, kuri yra dabartinis kelias (įskaitant\n" +"numatytąją raginimo reikšmę, kuri yra dabartinis kelias (įskaitant\n" "dabartinio disko raidę) ir daugiau-už (>) simbolis.\n" "(Taip pat, kaip komanda PROMPT $p$g).\n" "\n" @@ -9632,14 +9619,10 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <failas> pervadina failą.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" msgstr "RD <katalogas> yra trumpa RMDIR versija. Pašalina katalogą.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" msgstr "RMDIR <katalogas> pašalina katalogą.\n" @@ -9812,10 +9795,6 @@ msgstr "" "pasitaiko pirmiau), tada atkuriami ankstesnės aplinkos nustatymai.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" @@ -13924,7 +13903,7 @@ msgstr "Rašmenų &formatas" #: wordpad.rc:61 msgid "&Def. char format" -msgstr "&Numatytas rašmenų formatas" +msgstr "&Numatytasis rašmenų formatas" #: wordpad.rc:62 msgid "Paragrap&h format"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 020456628c4e360de2e62c1e113eca6c54a93829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020456628c4e360de2e62c1e1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 2 09:20:32 2013 +0200 po: Update French translation. --- po/fr.po | 38 ++++++++------------------------------ 1 files changed, 8 insertions(+), 30 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0b8c92b..7f851ba 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-01-03 21:13+0100\n" +"PO-Revision-Date: 2013-10-01 21:13+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -8569,17 +8569,12 @@ msgstr "" "transmission, puis essayez à nouveau." #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "La configuration actuelle du mappeur MIDI fait référence à un périphérique " -"MIDI non installé sur votre système. Utilisez le mappeur MIDI pour changer " -"la configuration." +"MIDI non installé sur votre système." #: winmm.rc:53 msgid "" @@ -9437,10 +9432,6 @@ msgstr "" "dans une procédure appelée sont transmis à l'appelant.\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -9448,8 +9439,6 @@ msgstr "" "CD <rép> est la version courte de CHDIR. Elle change le répertoire courant.\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <rép> change le répertoire courant.\n" @@ -9502,11 +9491,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <fichier> efface un ou plusieurs fichiers.\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9514,10 +9498,12 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"La commande FOR sert à exécuter une commande pour chaque fichier d'une liste " +"L1 commande FOR sert à exécuter une commande pour chaque fichier d'une liste " "de fichiers.\n" "\n" -"Syntaxe : FOR %variable IN (liste) DO commande\n" +"Usage : FOR %variable IN (liste) DO commande\n" +"\n" +"Le signe % doit être doublé quand FOR est utilisé dans un fichier batch.\n" #: cmd.rc:80 msgid "" @@ -9716,14 +9702,10 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <fichier> renomme un fichier.\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" msgstr "RD <rép> est la version courte de RMDIR. Elle efface un répertoire.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" msgstr "RMDIR <rép> efface un sous-répertoire.\n" @@ -9909,16 +9891,12 @@ msgstr "" "l'environnement sont restaurés.\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <répertoire> enregistre le répertoire courant sur\n" -"une pile et remplace le répertoire courant par le répertoire spécifié.\n" +"PUSHD <rép> enregistre le répertoire courant sur une pile et \n" +"remplace le répertoire courant par le répertoire spécifié.\n" #: cmd.rc:247 msgid "POPD changes current directory to the last one saved with PUSHD.\n"

1 0

Aric Stewart : imm32: ImmGetCandidateWindow should not return unset data.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: bd9e6081333240050584eb216b208728fbccf13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9e6081333240050584eb216… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 1 14:30:12 2013 -0500 imm32: ImmGetCandidateWindow should not return unset data. --- dlls/imm32/imm.c | 7 +++++++ dlls/imm32/tests/imm32.c | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 93e71af..4738103 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -636,6 +636,7 @@ HIMC WINAPI ImmCreateContext(void) InputContextData *new_context; LPGUIDELINE gl; LPCANDIDATEINFO ci; + int i; new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); @@ -663,6 +664,9 @@ HIMC WINAPI ImmCreateContext(void) gl->dwSize = sizeof(GUIDELINE); ImmUnlockIMCC(new_context->IMC.hGuideLine); + for (i = 0; i < sizeof(new_context->IMC.cfCandForm) / sizeof(CANDIDATEFORM); i++) + new_context->IMC.cfCandForm[i].dwIndex = ~0u; + /* Initialize the IME Private */ new_context->IMC.hPrivate = ImmCreateIMCC(new_context->immKbd->imeInfo.dwPrivateDataSize); @@ -1035,6 +1039,9 @@ BOOL WINAPI ImmGetCandidateWindow( if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) return FALSE; + if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex) + return FALSE; + *lpCandidate = data->IMC.cfCandForm[dwIndex]; return TRUE; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 0324304..7b81965 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -465,6 +465,7 @@ static void test_ImmThreads(void) BOOL rc; LOGFONT lf; COMPOSITIONFORM cf; + CANDIDATEFORM cdf; DWORD status, sentence; POINT pt; @@ -552,6 +553,23 @@ static void test_ImmThreads(void) rc = ImmGetStatusWindowPos(otherHimc, &pt); ok(rc != 0 || broken(rc == 0), "ImmGetStatusWindowPos failed\n"); + /* Candidate Window */ + rc = ImmGetCandidateWindow(himc, 0, &cdf); + ok (rc == 0, "ImmGetCandidateWindow should fail\n"); + cdf.dwIndex = 0; + cdf.dwStyle = CFS_CANDIDATEPOS; + cdf.ptCurrentPos.x = 0; + cdf.ptCurrentPos.y = 0; + rc = ImmSetCandidateWindow(himc, &cdf); + ok (rc == 1, "ImmSetCandidateWindow should succeed\n"); + rc = ImmGetCandidateWindow(himc, 0, &cdf); + ok (rc == 1, "ImmGetCandidateWindow should succeed\n"); + + rc = ImmGetCandidateWindow(otherHimc, 0, &cdf); + todo_wine ok (rc == 0, "ImmGetCandidateWindow should fail\n"); + rc = ImmSetCandidateWindow(otherHimc, &cdf); + todo_wine ok (rc == 0, "ImmSetCandidateWindow should fail\n"); + ImmReleaseContext(threadinfo.hwnd,otherHimc); ImmReleaseContext(hwnd,himc);

1 0

Sebastian Lackner : winex11: Call sync_context for DC_GL_CHILD_WIN drawables before swapping buffers.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 4e9646a7f74da5f91b164b0b0a411b4b1f3c731d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9646a7f74da5f91b164b0b0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 1 07:29:05 2013 +0200 winex11: Call sync_context for DC_GL_CHILD_WIN drawables before swapping buffers. --- dlls/winex11.drv/opengl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3e8480b..e9a0433 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3220,6 +3220,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) pglXSwapBuffers(gdi_display, gl->drawable); break; case DC_GL_CHILD_WIN: + if (ctx) sync_context( ctx ); escape.gl_drawable = gl->drawable; /* fall through */ default:

1 0

Michael Stefaniuc : comctl32/tests: comctl32.dll is already loaded.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 37caf788b56297f0e016d44ded3734cc5b164866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37caf788b56297f0e016d44de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Sep 30 23:40:14 2013 +0200 comctl32/tests: comctl32.dll is already loaded. --- dlls/comctl32/tests/rebar.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 331af28..efa6b1e 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -578,7 +578,8 @@ static void test_layout(void) check_sizes(); /* an image will increase the band height */ - himl = ImageList_LoadImage(LoadLibrary("comctl32"), MAKEINTRESOURCE(121), 24, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); + himl = ImageList_LoadImageA(GetModuleHandleA("comctl32"), MAKEINTRESOURCEA(121), 24, 2, + CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); ri.cbSize = sizeof(ri); ri.fMask = RBIM_IMAGELIST; ri.himl = himl;

1 0

Jeff Klein : mmdevapi: Correct MMDevPropStore_GetAt.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 5b47e9b382d05532c3b8a5b68b63cfa4fa8408b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b47e9b382d05532c3b8a5b68… Author: Jeff Klein <jeffrey.a.klein(a)gmail.com> Date: Sun Sep 29 17:26:36 2013 -0400 mmdevapi: Correct MMDevPropStore_GetAt. --- dlls/mmdevapi/devenum.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index eebf4ed..6bb0d3f 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1343,10 +1343,10 @@ static HRESULT WINAPI MMDevPropStore_GetCount(IPropertyStore *iface, DWORD *npro *nprops = 0; do { DWORD len = sizeof(buffer)/sizeof(*buffer); - if (RegEnumKeyExW(propkey, i, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + if (RegEnumValueW(propkey, i, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; i++; - } while (0); + } while (1); RegCloseKey(propkey); TRACE("Returning %i\n", i); *nprops = i; @@ -1369,16 +1369,16 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR if (FAILED(hr)) return hr; - if (RegEnumKeyExW(propkey, prop, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS - || len <= 40) + if (RegEnumValueW(propkey, prop, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS + || len <= 39) { WARN("GetAt %u failed\n", prop); return E_INVALIDARG; } RegCloseKey(propkey); - buffer[39] = 0; + buffer[38] = 0; CLSIDFromString(buffer, &key->fmtid); - key->pid = atoiW(&buffer[40]); + key->pid = atoiW(&buffer[39]); return S_OK; }

1 0

Jeff Klein : mmdevapi/tests: Add some tests for MMDevPropStore_GetAt.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: fabffe2b94dd7e008015484c67cce59e69110e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabffe2b94dd7e008015484c6… Author: Jeff Klein <jeffrey.a.klein(a)gmail.com> Date: Sun Sep 29 17:26:35 2013 -0400 mmdevapi/tests: Add some tests for MMDevPropStore_GetAt. --- dlls/mmdevapi/tests/propstore.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 41f275d..2b5f391 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -81,6 +81,34 @@ static void test_deviceinterface(IPropertyStore *store) CoTaskMemFree(pv.u.pwszVal); } +static void test_getat(IPropertyStore *store) +{ + HRESULT hr; + DWORD propcount; + DWORD prop; + PROPERTYKEY pkey; + BOOL found_name = FALSE; + BOOL found_desc = FALSE; + char temp[128]; + temp[sizeof(temp)-1] = 0; + + hr = IPropertyStore_GetCount(store, &propcount); + + ok(hr == S_OK, "Failed with %08x\n", hr); + ok(propcount > 0, "Propcount %d should be greather than zero\n", propcount); + + for (prop = 0; prop < propcount; prop++) { + hr = IPropertyStore_GetAt(store, prop, &pkey); + ok(hr == S_OK, "Failed with %08x\n", hr); + if (IsEqualPropertyKey(pkey, DEVPKEY_Device_FriendlyName)) + found_name = TRUE; + if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) + found_desc = TRUE; + } + ok(found_name == TRUE, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); +} + START_TEST(propstore) { HRESULT hr; @@ -127,6 +155,7 @@ START_TEST(propstore) { test_propertystore(store); test_deviceinterface(store); + test_getat(store); IPropertyStore_Release(store); } IMMDevice_Release(dev);

1 0

Sebastian Lackner : wined3d: Ensure that wined3d_cs_st_require_space allocates the required space.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: af759e30c901ac72cc9c889d7637fac8395295b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af759e30c901ac72cc9c889d7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 1 19:58:54 2013 +0200 wined3d: Ensure that wined3d_cs_st_require_space allocates the required space. --- dlls/wined3d/cs.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index cdb49ce..6919e91 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -374,10 +374,11 @@ static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) { void *new_data; - if (!(new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, cs->data_size * 2))) + size = max( size, cs->data_size * 2 ); + if (!(new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, size))) return NULL; - cs->data_size *= 2; + cs->data_size = size; cs->data = new_data; }

1 0

Akihiro Sagawa : gdi32: Fix the B spacing value of empty glyph.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 042b39a82b118481325fedb529057ffd0eef5b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042b39a82b118481325fedb52… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Oct 2 20:42:35 2013 +0900 gdi32: Fix the B spacing value of empty glyph. --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 15f401a..ca9e18f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6525,7 +6525,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, lpgm->gmptGlyphOrigin.x = origin_x >> 6; lpgm->gmptGlyphOrigin.y = origin_y >> 6; abc->abcA = left >> 6; - abc->abcB = width; + abc->abcB = lpgm->gmBlackBoxX; abc->abcC = adv - abc->abcA - abc->abcB; TRACE("%u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f6e4d07..031b86a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1298,11 +1298,22 @@ static void test_GetCharABCWidths(void) DeleteObject(hfont); } - ReleaseDC(NULL, hdc); - memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; + hfont = CreateFontIndirectA(&lf); + + /* test empty glyph's metrics */ + hfont = SelectObject(hdc, hfont); + ret = pGetCharABCWidthsFloatW(hdc, ' ', ' ', abcf); + ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); + ok(abcf[0].abcfB == 1.0, "got %f\n", abcf[0].abcfB); + ret = pGetCharABCWidthsW(hdc, ' ', ' ', abcw); + ok(ret, "GetCharABCWidthsW should have succeeded\n"); + ok(abcw[0].abcB == 1, "got %u\n", abcw[0].abcB); + + DeleteObject(SelectObject(hdc, hfont)); + ReleaseDC(NULL, hdc); trace("ABC sign test for a variety of transforms:\n"); hfont = CreateFontIndirectA(&lf); @@ -1318,7 +1329,7 @@ static void test_GetCharABCWidths(void) ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); ok(ret, "GetCharABCWidthsI should have succeeded\n"); ret = pGetCharABCWidthsW(hdc, 'i', 'i', abcw); - ok(ret, "GetCharABCWidthsI should have succeeded\n"); + ok(ret, "GetCharABCWidthsW should have succeeded\n"); ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); ok(ret, "GetCharABCWidthsFloatW should have succeeded\n");

1 0