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

Michael Stefaniuc : comdlg32: Fix the Hungarian translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 2f24e16171efab849b7857aab738f66d20711ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f24e16171efab849b7857aab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:55:59 2008 +0200 comdlg32: Fix the Hungarian translation. --- dlls/comdlg32/cdlg_Hu.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/cdlg_Hu.rc b/dlls/comdlg32/cdlg_Hu.rc index b11b090..13ed46e 100644 --- a/dlls/comdlg32/cdlg_Hu.rc +++ b/dlls/comdlg32/cdlg_Hu.rc @@ -179,21 +179,21 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&t",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } -FINDDLGORD DIALOG 36, 24, 236, 62 +FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Keres�s" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mit keressen:", -1, 4, 8, 48, 8 - EDITTEXT 1152, 51, 7, 124, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CONTROL "Teljes &szavak keres�se", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12 - CONTROL "Kis/&nagybet� k�l�nb.", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 92, 12 - GROUPBOX "Ir�ny", 1072, 97, 26, 78, 28 - CONTROL "&Vissza", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 102, 38, 32, 12 - CONTROL "&El�re", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - CONTROL "&K�vetkez�", 1, "BUTTON", WS_GROUP | WS_TABSTOP, 182, 5, 50, 14 - CONTROL "M�gsem", 2, "BUTTON", WS_GROUP | WS_TABSTOP, 182, 23, 50, 14 - PUSHBUTTON "&Seg�ts�g", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP + EDITTEXT edt1, 51, 7, 124, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Teljes &szavak keres�se", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Kis/&nagybet� k�l�nb.", chx2, 4, 42, 92, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Ir�ny", grp1, 97, 26, 78, 28 + CONTROL "&Vissza", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 102, 38, 32, 12 + CONTROL "&El�re", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 + DEFPUSHBUTTON "&K�vetkez�", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "M�gsem", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Seg�ts�g", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP END REPLACEDLGORD DIALOG 36, 24, 230, 94

1 0

Michael Stefaniuc : cmd: Fix the Japanese translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 712ae3cf2b4a3800636471f66e8f3b3ea209ef60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=712ae3cf2b4a3800636471f66… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:55:44 2008 +0200 cmd: Fix the Japanese translation. --- programs/cmd/Ja.rc | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/cmd/Ja.rc b/programs/cmd/Ja.rc index 1acc8e9..7628625 100644 --- a/programs/cmd/Ja.rc +++ b/programs/cmd/Ja.rc @@ -199,6 +199,12 @@ Wine WCMD_VOL, "VOL�̃w��v\n" + WCMD_PUSHD, "PUSHD <directoryname> saves the current directory onto a\n\ +stack, and then changes the current directory to the supplied one.\n" + + WCMD_POPD, "POPD changes current directory to the last one saved with\n\ +PUSHD.\n" + WCMD_MORE, "MORE displays output of files or piped input in pages.\n" WCMD_EXIT, @@ -220,7 +226,9 @@ MD (MKDIR)\t MORE\t\tDisplay output in pages\n\ MOVE\t\t�t�@�C��܂��̓f�B��N�g��c��[��ړ�\n\ PATH\t\t�p�X��\��͐ݒ�\n\ +POPD\t\tRestores the directory to the last one saved with PUSHD\n\ PROMPT\t\t�R�}��h�v��v�g��ύX\n\ +PUSHD\t\tChanges to a new directory, saving the current one\n\ REN (RENAME)\t�t�@�C��l�[��\n\ RD (RMDIR)\t�T�u�f�B��N�g��폜\n\ SET\t\t��ϐ��ݒ薔�͕\��\n\

1 0

Michael Stefaniuc : winecfg: Fix the placement of a checkbox in the Japanese translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: e740c01b42cc928592ca600e5b7ebf2590a37410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e740c01b42cc928592ca600e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:55:26 2008 +0200 winecfg: Fix the placement of a checkbox in the Japanese translation. --- programs/winecfg/Ja.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 22c18bc..19111ae 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -158,10 +158,10 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS UI Gothic" BEGIN GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 - LTEXT "�I�[�f�B�I�h��C�o: ",IDC_STATIC,10,20,277,30 + LTEXT "�I�[�f�B�I�h��C�o: ",IDC_STATIC,15,20,227,30 CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "�R��g��[��p�l��",IDC_AUDIO_CONTROL_PANEL,170,70,49,14 + PUSHBUTTON "�R��g��[��p�l��",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "�n�[�h�E�F�A�E�A�N�Z��[�V��: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -169,7 +169,7 @@ BEGIN COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,232,80,8 COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "�h��C�o�E�G�~��[�V��",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 + CONTROL "�h��C�o�E�G�~��[�V��",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Michael Stefaniuc : winecfg: Fix the Bulgarian translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 9412fa60a6a7f0e7d5534089abf4ed7dcfc4bb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9412fa60a6a7f0e7d5534089a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:55:05 2008 +0200 winecfg: Fix the Bulgarian translation. --- programs/winecfg/Bg.rc | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 7cf6d88..ff1aac0 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -164,12 +164,16 @@ BEGIN GROUPBOX " �� ",IDC_STATIC,8,4,244,195 LTEXT "�� . �� . �� . �� .",IDC_STATIC,15,20,227,50 CONTROL "��",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,70,140,120 - PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,50,59,14 - PUSHBUTTON "�� ",IDC_AUDIO_CONTROL_PANEL,170,70,69,14 + PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,170,70,59,14 + PUSHBUTTON "�� ",IDC_AUDIO_CONTROL_PANEL,170,90,69,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "�� : ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "�� ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 + LTEXT "Default &Sample Rate:",IDC_STATIC,15,232,70,8 + COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,232,80,8 + COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "�� ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Michael Stefaniuc : winecfg: Fix the Hungarian translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 832005d4f6f9e204c30b3b456ba2d968589aa48e URL: http://source.winehq.org/git/wine.git/?a=commit;h=832005d4f6f9e204c30b3b456… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:54:46 2008 +0200 winecfg: Fix the Hungarian translation. --- programs/winecfg/Hu.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index 84b21ce..87f52bf 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -163,6 +163,10 @@ BEGIN GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardveres gyors�t�s: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default &Sample Rate:",IDC_STATIC,15,232,70,8 + COMBOBOX IDC_DSOUND_RATES,90,230,42,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Default &Bits Per Sample:",IDC_STATIC,137,232,80,8 + COMBOBOX IDC_DSOUND_BITS,220,230,30,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Meghajt�program emul�ci�",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END

1 0

Michael Stefaniuc : regedit: Fix the Japanese translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: d647f6db08051b25d768f09dfb06de1c78be8d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d647f6db08051b25d768f09df… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:53:46 2008 +0200 regedit: Fix the Japanese translation. --- programs/regedit/Ja.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Ja.rc b/programs/regedit/Ja.rc index 9d75875..f1019ea 100644 --- a/programs/regedit/Ja.rc +++ b/programs/regedit/Ja.rc @@ -49,6 +49,7 @@ BEGIN MENUITEM "��(&S)", ID_EDIT_NEW_STRINGVALUE MENUITEM "�o�C�i��(&B)", ID_EDIT_NEW_BINARYVALUE MENUITEM "DWORD�l(&D)", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "�폜(&D)\tDel", ID_EDIT_DELETE @@ -99,11 +100,13 @@ BEGIN MENUITEM "��(&S)", ID_EDIT_NEW_STRINGVALUE MENUITEM "�o�C�i��(&B)", ID_EDIT_NEW_BINARYVALUE MENUITEM "DWORD�l(&D)", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "�폜(&D)\tDel", ID_EDIT_DELETE MENUITEM "��O�̕ύX(&R)\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Export ...", ID_EDIT_EXPORT MENUITEM "�L�[��R�s�[(&C)", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "��(&F)\tCtrl+F", ID_EDIT_FIND, GRAYED @@ -215,6 +218,7 @@ BEGIN IDS_DELETE_BOX_TEXT "�{�� '%s'��폜��܂��?" IDS_NEWKEY "�V��L�[ #%d" IDS_NEWVALUE "�V��l #%d" + IDS_NOTFOUND "Search string '%s' not found" END /*****************************************************************/

1 0

Francois Gouget : regedit: Remove extraneous spaces in '...'.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 39054f0ad05be0cc37d330501cad7456e298ee0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39054f0ad05be0cc37d330501… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 29 18:24:38 2008 +0200 regedit: Remove extraneous spaces in '...'. --- programs/regedit/En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index 385a821..14630d1 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -185,7 +185,7 @@ BEGIN MENUITEM "&Delete\tDel", ID_EDIT_DELETE MENUITEM "&Rename\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "&Export . . .", ID_EDIT_EXPORT + MENUITEM "&Export...", ID_EDIT_EXPORT MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Find\tCtrl+F", ID_EDIT_FIND, GRAYED

1 0

Michael Stefaniuc : regedit: Fix the Hungarian translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: ad8f210481278a13e481333fa6bf7fef5cc51e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad8f210481278a13e481333fa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:54:18 2008 +0200 regedit: Fix the Hungarian translation. --- programs/regedit/Hu.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Hu.rc b/programs/regedit/Hu.rc index 2b24ac1..53a0a3b 100644 --- a/programs/regedit/Hu.rc +++ b/programs/regedit/Hu.rc @@ -47,6 +47,7 @@ BEGIN MENUITEM "&Sztring �rt�k", ID_EDIT_NEW_STRINGVALUE MENUITEM "&Bin�ris �rt�k", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD �rt�k", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&T�rl�s\tDel", ID_EDIT_DELETE

1 0

Michael Stefaniuc : regedit: Fix the Bulgarian translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 8732cb7a5b8e429e8ca8c70b8b1466ee5eb76037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8732cb7a5b8e429e8ca8c70b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:53:27 2008 +0200 regedit: Fix the Bulgarian translation. --- programs/regedit/Bg.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Bg.rc b/programs/regedit/Bg.rc index be03c6a..afc9b01 100644 --- a/programs/regedit/Bg.rc +++ b/programs/regedit/Bg.rc @@ -52,6 +52,7 @@ BEGIN MENUITEM "&�� ", ID_EDIT_NEW_STRINGVALUE MENUITEM "&�� ", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD ��", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&��\tDel", ID_EDIT_DELETE @@ -102,11 +103,13 @@ BEGIN MENUITEM "&�� ", ID_EDIT_NEW_STRINGVALUE MENUITEM "&�� ", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD ��", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Multi String Value", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&��\tDel", ID_EDIT_DELETE MENUITEM "&��\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR + MENUITEM "&Export ...", ID_EDIT_EXPORT MENUITEM "&�� ", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&��\tCtrl+F", ID_EDIT_FIND, GRAYED @@ -269,6 +272,7 @@ BEGIN IDS_DELETE_BOX_TEXT "�� '%s'?" IDS_NEWKEY "�� #%d" IDS_NEWVALUE "�� #%d" + IDS_NOTFOUND "Search string '%s' not found" END /*****************************************************************/

1 0

Michael Karcher : advpack: Fix buffer sizes for possibly quoted strings.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 98778f486a43b72e1d4fe1f7cfc8d7ecfc78dad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98778f486a43b72e1d4fe1f7c… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Thu May 29 17:35:03 2008 +0200 advpack: Fix buffer sizes for possibly quoted strings. --- dlls/advpack/advpack.c | 10 +++--- dlls/advpack/tests/advpack.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 8ef1c9a..6c26e51 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -68,8 +68,8 @@ static void strip_quotes(WCHAR *buffer, DWORD *size) static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dwSize) { INFCONTEXT context; - WCHAR key[MAX_PATH], value[MAX_PATH]; - WCHAR prefix[PREFIX_LEN]; + WCHAR key[MAX_PATH + 2], value[MAX_PATH + 2]; + WCHAR prefix[PREFIX_LEN + 2]; HKEY root, subkey; DWORD size; @@ -78,11 +78,11 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw /* load the destination parameters */ SetupFindFirstLineW(hInf, pszSection, NULL, &context); - SetupGetStringFieldW(&context, 1, prefix, PREFIX_LEN, &size); + SetupGetStringFieldW(&context, 1, prefix, PREFIX_LEN + 2, &size); strip_quotes(prefix, &size); - SetupGetStringFieldW(&context, 2, key, MAX_PATH, &size); + SetupGetStringFieldW(&context, 2, key, MAX_PATH + 2, &size); strip_quotes(key, &size); - SetupGetStringFieldW(&context, 3, value, MAX_PATH, &size); + SetupGetStringFieldW(&context, 3, value, MAX_PATH + 2, &size); strip_quotes(value, &size); if (!lstrcmpW(prefix, hklm)) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index b90df2d..e761577 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -465,6 +465,63 @@ static void translateinfstringex_test(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); DeleteFileA(inf_file); + + /* Create another .inf file which is just here to trigger a wine bug */ + { + char data[1024]; + char *ptr = data; + DWORD dwNumberOfBytesWritten; + HANDLE hf = CreateFile(inf_file, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + append_str(&ptr, "[Version]\n"); + append_str(&ptr, "Signature=\"$Chicago$\"\n"); + append_str(&ptr, "[section]\n"); + append_str(&ptr, "NotACustomDestination=Version\n"); + append_str(&ptr, "CustomDestination=CustInstDestSection\n"); + append_str(&ptr, "[CustInstDestSection]\n"); + append_str(&ptr, "49010=DestA,1\n"); + append_str(&ptr, "49020=DestB\n"); + append_str(&ptr, "49030=DestC\n"); + append_str(&ptr, "49040=DestD\n"); + append_str(&ptr, "[Options.NTx86]\n"); + append_str(&ptr, "Result2=%%49030%%\n"); + append_str(&ptr, "[DestA]\n"); + append_str(&ptr, "HKLM,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%24%%'\n"); + /* The point of this test is to have HKCU just before the quoted HKLM */ + append_str(&ptr, "[DestB]\n"); + append_str(&ptr, "HKCU,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%24%%'\n"); + append_str(&ptr, "[DestC]\n"); + append_str(&ptr, "'HKLM','Software\\Microsoft\\Windows\\CurrentVersion',"); + append_str(&ptr, "'ProgramFilesDir',,\"%%24%%\"\n"); + append_str(&ptr, "[DestD]\n"); + append_str(&ptr, "HKLM,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%24%%'\n"); + + WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + CloseHandle(hf); + } + + /* open the inf with the install section */ + hr = pOpenINFEngine(inf_file, "section", 0, &hinf, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + /* Single quote test (Note size includes null on return from call) */ + memset(buffer, 'a', APP_PATH_LEN); + buffer[APP_PATH_LEN - 1] = '\0'; + size = MAX_PATH; + hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result2", + buffer, size, &size, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); + ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + lstrlenA(PROG_FILES_ROOT)+1, size); + + /* close the INF again */ + hr = pCloseINFEngine(hinf); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + DeleteFileA(inf_file); } static BOOL check_reg_str(HKEY hkey, LPCSTR name, LPCSTR value)

1 0