September 2008 - Wine-commits

Muneyuki Noguchi : taskmgr: Update Japanese translation.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 2e9603c4a0990eaf1b5676fd10e5388a2e370869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e9603c4a0990eaf1b5676fd1… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Aug 30 16:49:17 2008 +0900 taskmgr: Update Japanese translation. --- programs/taskmgr/Ja.rc | 80 ++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc index 2754be5..d904f3b 100644 --- a/programs/taskmgr/Ja.rc +++ b/programs/taskmgr/Ja.rc @@ -36,16 +36,16 @@ BEGIN END POPUP "�I�v�V��(&O)" BEGIN - MENUITEM "��Ɏ�O�ɕ\��(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "��Ɏ�O�ɕ\\��(&A)", ID_OPTIONS_ALWAYSONTOP , CHECKED MENUITEM "��g�p��ɍŏ��(&M)", ID_OPTIONS_MINIMIZEONUSE , CHECKED MENUITEM "�ŏ��ɉB��(&H)", ID_OPTIONS_HIDEWHENMINIMIZED , CHECKED - MENUITEM "16bit �^�X�N�̕\��(&S)", ID_OPTIONS_SHOW16BITTASKS + MENUITEM "16bit �^�X�N�̕\\��(&S)", ID_OPTIONS_SHOW16BITTASKS , CHECKED END - POPUP "�\��(&V)" + POPUP "�\\��(&V)" BEGIN MENUITEM "�ŐV�̏��ɍX�V(&R)", ID_VIEW_REFRESH POPUP "�X�V�̕p�x(&U)" @@ -69,16 +69,16 @@ BEGIN MENUITEM "CPU ��Ƃ� 1 �O��t(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU , CHECKED END - MENUITEM "�J�[�l��Ԃ�\��(&S)", ID_VIEW_SHOWKERNELTIMES + MENUITEM "�J�[�l��Ԃ�\\��(&S)", ID_VIEW_SHOWKERNELTIMES END POPUP "�E�B��h�E(&W)" BEGIN - MENUITEM "�㉺�ɕ��ׂĕ\��(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "��E�ɕ��ׂĕ\��(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "�㉺�ɕ��ׂĕ\\��(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "��E�ɕ��ׂĕ\\��(&V)", ID_WINDOWS_TILEVERTICALLY MENUITEM "�ŏ��(&M)", ID_WINDOWS_MINIMIZE MENUITEM "�ő剻(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "�d�˂ĕ\��(&C)", ID_WINDOWS_CASCADE - MENUITEM "��O�ɕ\��(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "�d�˂ĕ\\��(&C)", ID_WINDOWS_CASCADE + MENUITEM "��O�ɕ\\��(&B)", ID_WINDOWS_BRINGTOFRONT END POPUP "�w��v(&H)" BEGIN @@ -90,12 +90,12 @@ END IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "�㉺�ɕ��ׂĕ\��(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "��E�ɕ��ׂĕ\��(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "�㉺�ɕ��ׂĕ\\��(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "��E�ɕ��ׂĕ\\��(&V)", ID_WINDOWS_TILEVERTICALLY MENUITEM "�ŏ��(&M)", ID_WINDOWS_MINIMIZE MENUITEM "�ő剻(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "�d�˂ĕ\��(&C)", ID_WINDOWS_CASCADE - MENUITEM "��O�ɕ\��(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "�d�˂ĕ\\��(&C)", ID_WINDOWS_CASCADE + MENUITEM "��O�ɕ\\��(&B)", ID_WINDOWS_BRINGTOFRONT END IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE @@ -115,16 +115,16 @@ BEGIN POPUP "DUMMY" BEGIN MENUITEM "�؂�ւ�(&S)", ID_APPLICATION_PAGE_SWITCHTO - MENUITEM "��O�ɕ\��(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "��O�ɕ\\��(&B)", ID_WINDOWS_BRINGTOFRONT MENUITEM SEPARATOR - MENUITEM "�㉺�ɕ��ׂĕ\��(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "��E�ɕ��ׂĕ\��(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "�㉺�ɕ��ׂĕ\\��(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "��E�ɕ��ׂĕ\\��(&V)", ID_WINDOWS_TILEVERTICALLY MENUITEM "�ŏ��(&M)", ID_WINDOWS_MINIMIZE MENUITEM "�ő剻(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "�d�˂ĕ\��(&C)", ID_WINDOWS_CASCADE + MENUITEM "�d�˂ĕ\\��(&C)", ID_WINDOWS_CASCADE MENUITEM SEPARATOR MENUITEM "�^�X�N�̏I��(&E)", ID_APPLICATION_PAGE_ENDTASK - MENUITEM "�v��Z�X�̕\��(&G)", ID_APPLICATION_PAGE_GOTOPROCESS + MENUITEM "�v��Z�X�̕\\��(&G)", ID_APPLICATION_PAGE_GOTOPROCESS END END @@ -135,7 +135,7 @@ BEGIN MENUITEM "��̃T�C�Y�ɖ߂�(&R)", ID_RESTORE MENUITEM "��(&C)", ID_FILE_EXIT MENUITEM SEPARATOR - MENUITEM "��Ɏ�O�ɕ\��(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "��Ɏ�O�ɕ\\��(&A)", ID_OPTIONS_ALWAYSONTOP END END @@ -202,7 +202,7 @@ BEGIN LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "�v��Z�X�̏I��(&E)",IDC_ENDPROCESS,171,189,69,14 - CONTROL "��ׂẴ��[�U�[�̃v��Z�X��\��(&S)",IDC_SHOWALLPROCESSES, + CONTROL "��ׂẴ��[�U�[�̃v��Z�X��\\��(&S)",IDC_SHOWALLPROCESSES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END @@ -358,7 +358,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 PUSHBUTTON "�L��Z��",IDCANCEL,138,178,50,14 - LTEXT "�^�X�N �}�l�[�W�� [�v��Z�X] �y�[�W�ɕ\��I��܂��B", + LTEXT "�^�X�N �}�l�[�W�� [�v��Z�X] �y�[�W�ɕ\\��I��܂��B", IDC_STATIC,7,7,181,17 CONTROL "�C��[�W �p�X��(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 @@ -426,41 +426,41 @@ END STRINGTABLE DISCARDABLE BEGIN ID_FILE_NEW "�V��v��O��s��܂��B" - ID_OPTIONS_ALWAYSONTOP "�ŏ��Ȃ��A��Ƀ^�X�N �}�l�[�W��ق��̂��ׂẴE�B��h�E��O�ɕ\��܂��B" + ID_OPTIONS_ALWAYSONTOP "�ŏ��Ȃ��A��Ƀ^�X�N �}�l�[�W��ق��̂��ׂẴE�B��h�E��O�ɕ\\��܂��B" ID_OPTIONS_MINIMIZEONUSE "[�؂�ւ�] ��s��ƁA�^�X�N �}�l�[�W��ŏ��܂��B" ID_OPTIONS_HIDEWHENMINIMIZED "�ŏ��ꂽ�Ƃ��ɁA�^�X�N �}�l�[�W��B��܂��B" ID_VIEW_REFRESH "[�X�V�̕p�x] �̐ݒ�ɂ��炸�A��^�X�N �}�l�[�W��X�V��܂��B" - ID_VIEW_LARGE "�^�X�N�̕\�� A�C�R�� g�p��܂��B" - ID_VIEW_SMALL "�^�X�N�̕\�� A�C�R�� g�p��܂��B" - ID_VIEW_DETAILS "�e�^�X�N�̏��\��܂��B" - ID_VIEW_UPDATESPEED_HIGH "��b 2��\��X�V��܂��B" - ID_VIEW_UPDATESPEED_NORMAL "2�b�� 1��\��X�V��܂��B" - ID_VIEW_UPDATESPEED_LOW "4�b�� 1��\��X�V��܂��B" + ID_VIEW_LARGE "�^�X�N�̕\\�� A�C�R�� g�p��܂��B" + ID_VIEW_SMALL "�^�X�N�̕\\�� A�C�R�� g�p��܂��B" + ID_VIEW_DETAILS "�e�^�X�N�̏��\\��܂��B" + ID_VIEW_UPDATESPEED_HIGH "��b 2��\\��X�V��܂��B" + ID_VIEW_UPDATESPEED_NORMAL "2�b�� 1��\\��X�V��܂��B" + ID_VIEW_UPDATESPEED_LOW "4�b�� 1��\\��X�V��܂��B" END STRINGTABLE DISCARDABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "�\��I�ɍX�V��܂��B" + ID_VIEW_UPDATESPEED_PAUSED "�\\��I�ɍX�V��܂��B" ID_WINDOWS_TILEHORIZONTALLY - "�f�X�N�g�b�v��ŃE�B��h�E��d�Ȃ�Ȃ��悤�ɏ㉺�ɕ��ׂĕ\��܂��B" - ID_WINDOWS_TILEVERTICALLY "�f�X�N�g�b�v��ŃE�B��h�E��d�Ȃ�Ȃ��悤�ɍ��E�ɕ��ׂĕ\��܂��B" + "�f�X�N�g�b�v��ŃE�B��h�E��d�Ȃ�Ȃ��悤�ɏ㉺�ɕ��ׂĕ\\��܂��B" + ID_WINDOWS_TILEVERTICALLY "�f�X�N�g�b�v��ŃE�B��h�E��d�Ȃ�Ȃ��悤�ɍ��E�ɕ��ׂĕ\\��܂��B" ID_WINDOWS_MINIMIZE "�E�B��h�E��ŏ��܂��B" ID_WINDOWS_MAXIMIZE "�E�B��h�E��ʂ��ς��Ɋg�債�܂��B" - ID_WINDOWS_CASCADE "�f�X�N�g�b�v��ŃE�B��h�E��d�˂ĕ\��܂��B" - ID_WINDOWS_BRINGTOFRONT "�E�B��h�E��O�ɕ\��܂��A�؂�ւ��܂��B" - ID_HELP_TOPICS "�^�X�N �}�l�[�W��̃w��v �g�s�b�N��\��܂��B" - ID_HELP_ABOUT "�v��O��A�o�[�W��ԍ��A��쌠��\��܂��B" + ID_WINDOWS_CASCADE "�f�X�N�g�b�v��ŃE�B��h�E��d�˂ĕ\\��܂��B" + ID_WINDOWS_BRINGTOFRONT "�E�B��h�E��O�ɕ\\��܂��A�؂�ւ��܂��B" + ID_HELP_TOPICS "�^�X�N �}�l�[�W��̃w��v �g�s�b�N��\\��܂��B" + ID_HELP_ABOUT "�v��O��A�o�[�W��ԍ��A��쌠��\\��܂��B" ID_FILE_EXIT "�^�X�N �}�l�[�W�� A�v��P�[�V��I��܂��B" ID_OPTIONS_SHOW16BITTASKS - "16 �r�b�g Windows �^�X�N��A�֘A�t��ꂽ ntvdm.exe �̉��ɕ\��܂��B" - ID_VIEW_SELECTCOLUMNS "[�v��Z�X] �y�[�W�ɕ\��I��܂��B" - ID_VIEW_SHOWKERNELTIMES "�J�[�l��Ԃ��p�t�H�[�}��X�O��t��ɕ\��܂��B" + "16 �r�b�g Windows �^�X�N��A�֘A�t��ꂽ ntvdm.exe �̉��ɕ\\��܂��B" + ID_VIEW_SELECTCOLUMNS "[�v��Z�X] �y�[�W�ɕ\\��I��܂��B" + ID_VIEW_SHOWKERNELTIMES "�J�[�l��Ԃ��p�t�H�[�}��X�O��t��ɕ\\��܂��B" ID_VIEW_CPUHISTORY_ONEGRAPHALL - "1 �̗��O��t�� CPU �g�p��̍��v��\��܂��B" - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU �g�p��̗�� CPU ��ƂɃO��t�ŕ\��܂��B" + "1 �̗��O��t�� CPU �g�p��̍��v��\\��܂��B" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU �g�p��̗�� CPU ��ƂɃO��t�ŕ\\��܂��B" ID_APPLICATION_PAGE_SWITCHTO - "�I��^�X�N��O�ɕ\��Đ؂�ւ��܂��B" + "�I��^�X�N��O�ɕ\\��Đ؂�ւ��܂��B" END STRINGTABLE DISCARDABLE

1 0

Francois Gouget : crypt32: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 6bd4bf66e2a1d5239b31c2920f1d77143bd1ef89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd4bf66e2a1d5239b31c2920… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:02:54 2008 +0200 crypt32: Fix compilation on systems that don't support nameless unions. --- dlls/crypt32/msg.c | 77 +++++++++++++++++----------------- dlls/crypt32/tests/encode.c | 96 +++++++++++++++++++++--------------------- dlls/crypt32/tests/msg.c | 72 ++++++++++++++++---------------- 3 files changed, 123 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bd4bf66e2a1d5239b31c…

1 0

Paul Vriens : dplayx/tests: Remove a stray CoInitialize.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 7e21104bd9a88acfe758137ded970a74a58655ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e21104bd9a88acfe758137de… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Sep 1 19:19:30 2008 +0200 dplayx/tests: Remove a stray CoInitialize. --- dlls/dplayx/tests/dplayx.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 52a3f84..470f4f8 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -1223,8 +1223,6 @@ static LPDIRECTPLAY4 create_session(DPSESSIONDESC2 *lpdpsd) DPID dpid; HRESULT hr; - CoInitialize(NULL); - CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_ALL, &IID_IDirectPlay4A, (LPVOID*) &pDP );

1 0

Francois Gouget : d3dxof: Remove spaces before '\n', add '\n' in Wine traces.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 360c164e54863a48546544b86bfdd25c2669c408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=360c164e54863a48546544b86… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:02:50 2008 +0200 d3dxof: Remove spaces before '\n', add '\n' in Wine traces. --- dlls/d3dxof/d3dxof.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 9f19d5f..ade39e4 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -385,7 +385,7 @@ static BOOL is_guid(parse_buffer* buf) tmp[pos] = 0; if (pos != 38 /* <+36+> */) { - TRACE("Wrong guid %s (%d) \n", tmp, pos); + TRACE("Wrong guid %s (%d)\n", tmp, pos); return FALSE; } buf->buffer += pos; @@ -394,10 +394,10 @@ static BOOL is_guid(parse_buffer* buf) ret = sscanf(tmp, CLSIDFMT, &class_id.Data1, tab, tab+1, tab+2, tab+3, tab+4, tab+5, tab+6, tab+7, tab+8, tab+9); if (ret != 11) { - TRACE("Wrong guid %s (%d) \n", tmp, pos); + TRACE("Wrong guid %s (%d)\n", tmp, pos); return FALSE; } - TRACE("Found guid %s (%d) \n", tmp, pos); + TRACE("Found guid %s (%d)\n", tmp, pos); class_id.Data2 = tab[0]; class_id.Data3 = tab[1]; @@ -989,7 +989,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP if (token_header == XOFFILE_FORMAT_COMPRESSED) { - FIXME("Compressed formats not supported yet"); + FIXME("Compressed formats not supported yet\n"); return DXFILEERR_BADVALUE; }

1 0

Francois Gouget : winhlp32: Remove spaces before '...' in the Chinese resources.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 5a127ad570a6bfe214e14a2d3dd472cf7b46fb27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a127ad570a6bfe214e14a2d3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 1 17:06:37 2008 +0200 winhlp32: Remove spaces before '...' in the Chinese resources. --- programs/winhlp32/Zh.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/Zh.rc b/programs/winhlp32/Zh.rc index d510450..c0ed017 100644 --- a/programs/winhlp32/Zh.rc +++ b/programs/winhlp32/Zh.rc @@ -87,7 +87,7 @@ STID_BACK, "返回(&B)" STID_ALL_FILES, "所有文件 (*.*)" STID_HELP_FILES_HLP, "帮助文件 (*.hlp)" STID_FILE_NOT_FOUND_s "不能打开文件 '%s'. 你想要自己找这个文件吗?" -STID_NO_RICHEDIT "找不到 richedit ... 终止" +STID_NO_RICHEDIT "找不到 richedit... 终止" STID_PSH_INDEX, "帮助内容: " } @@ -155,7 +155,7 @@ STID_BACK, "返回(&B)" STID_ALL_FILES, "所有檔案 (*.*)" STID_HELP_FILES_HLP, "幫助檔案 (*.hlp)" STID_FILE_NOT_FOUND_s "不能開啟檔案 '%s'. 你想要自己找這個檔案嗎?" -STID_NO_RICHEDIT "找不到 richedit ... 終止" +STID_NO_RICHEDIT "找不到 richedit... 終止" STID_PSH_INDEX, "幫助內容: " }

1 0

Francois Gouget : wined3d: Add a '\n' to Wine traces.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 9c63e186c6a84bbb9736c41412c15d24896f8c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c63e186c6a84bbb9736c4141… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:01:55 2008 +0200 wined3d: Add a '\n' to Wine traces. --- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index ca21ba0..9ebb17b 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -673,7 +673,7 @@ static void nvrc_fragment_free(IWineD3DDevice *iface) {} */ static BOOL nvts_conv_supported(WINED3DFORMAT fmt) { - TRACE("Checking shader format support for format %s: [FAILED]", debug_d3dformat(fmt)); + TRACE("Checking shader format support for format %s: [FAILED]\n", debug_d3dformat(fmt)); return FALSE; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d97df5a..969b9fa 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5557,7 +5557,7 @@ static void ffp_fragment_get_caps(WINED3DDEVTYPE devtype, WineD3D_GL_Info *gl_in static HRESULT ffp_fragment_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } static void ffp_fragment_free(IWineD3DDevice *iface) {} static BOOL ffp_conv_supported(WINED3DFORMAT fmt) { - TRACE("Checking shader format support for format %s: [FAILED]", debug_d3dformat(fmt)); + TRACE("Checking shader format support for format %s: [FAILED]\n", debug_d3dformat(fmt)); return FALSE; }

1 0

Francois Gouget : gdiplus/tests: Remove unneeded casts.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: aafaec4f43ccac05b869ce0221f27e2772c27511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aafaec4f43ccac05b869ce022… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:02:32 2008 +0200 gdiplus/tests: Remove unneeded casts. --- dlls/gdiplus/tests/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b0858e1..d83f3b7 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -540,9 +540,9 @@ static void test_Get_Release_DC(void) status = GdipGetDC(NULL, &retdc); expect(InvalidParameter, status); - status = GdipReleaseDC(NULL, (HDC)0); + status = GdipReleaseDC(NULL, NULL); expect(InvalidParameter, status); - status = GdipReleaseDC(graphics, (HDC)0); + status = GdipReleaseDC(graphics, NULL); expect(InvalidParameter, status); status = GdipReleaseDC(NULL, (HDC)0xdeadbeef); expect(InvalidParameter, status);

1 0

Francois Gouget : winhttp/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: ffcb02696ccb58cdc9d3c6a760c52ac7186f584c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffcb02696ccb58cdc9d3c6a76… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:01:59 2008 +0200 winhttp/tests: Add a trailing '\n' to an ok() call. --- dlls/winhttp/tests/winhttp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1e50f36..3e963ac 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -250,7 +250,7 @@ static void test_WinHttpAddHeaders(void) len = sizeof(buffer); ret = WinHttpQueryHeaders(request, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, test_header_name, buffer, &len, &index); - ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded, found 'Warning' header."); + ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded, found 'Warning' header.\n"); ret = WinHttpAddRequestHeaders(request, test_headers[0], -1L, WINHTTP_ADDREQ_FLAG_ADD); ok(ret == TRUE, "WinHttpAddRequestHeader failed to add new header, got %d with error %u.\n", ret, GetLastError());

1 0

Francois Gouget : user32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 189ea269892f685494c97b110c0c6b56f1415af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189ea269892f685494c97b110… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:02:19 2008 +0200 user32/tests: Add a trailing '\n' to an ok() call. --- dlls/user32/tests/input.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8d60d21..2a26447 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1194,7 +1194,7 @@ static void test_ToUnicode(void) todo_wine ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); - ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)", ret); + ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)\n", ret); if(ret == 1) ok(wStr[0]=='\n', "ToUnicode for CTRL + Return was %i (expected 10)\n", wStr[0]);

1 0

Francois Gouget : dplayx/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: ec83c300755af26bc1024ef8a6d554f9f84ca2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec83c300755af26bc1024ef8a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 1 17:02:41 2008 +0200 dplayx/tests: Fix compilation on systems that don't support nameless unions. --- dlls/dplayx/tests/dplayx.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 19c42b4..52a3f84 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -3179,7 +3179,7 @@ static void test_CreateGroup(void) groupName.dwSize = sizeof(DPNAME); - groupName.lpszShortNameA = (LPSTR) lpData; + U1(groupName).lpszShortNameA = (LPSTR) lpData; hr = IDirectPlayX_CreateGroup( pDP, &idGroup, @@ -3198,14 +3198,14 @@ static void test_CreateGroup(void) hr = IDirectPlayX_Receive( pDP, &idFrom, &idTo, 0, (LPVOID) lpDataGet, &dwDataSizeGet ); checkHR( DP_OK, hr ); - if ( NULL == lpDataGet->dpnName.lpszShortNameA ) + if ( NULL == U1(lpDataGet->dpnName).lpszShortNameA ) { check( 48, dwDataSizeGet ); } else { check( 48 + dwDataSize, dwDataSizeGet ); - checkStr( lpData, lpDataGet->dpnName.lpszShortNameA ); + checkStr( lpData, U1(lpDataGet->dpnName).lpszShortNameA ); } check( DPID_SYSMSG, idFrom ); checkConv( DPSYS_CREATEPLAYERORGROUP, lpDataGet->dwType, dpMsgType2str ); @@ -5305,7 +5305,7 @@ static void test_Receive(void) check( DPPLAYERTYPE_PLAYER, lpDataCreate->dwPlayerType ); checkLP( NULL, lpDataCreate->lpData ); check( 0, lpDataCreate->dwDataSize ); - checkLP( NULL, lpDataCreate->dpnName.lpszShortNameA ); + checkLP( NULL, U1(lpDataCreate->dpnName).lpszShortNameA ); check( 0, lpDataCreate->dpIdParent ); } else /* Player destruction */ @@ -5319,7 +5319,7 @@ static void test_Receive(void) check( 0, lpDataDestroy->dwLocalDataSize ); checkLP( NULL, lpDataDestroy->lpRemoteData ); check( 0, lpDataDestroy->dwRemoteDataSize ); - checkLP( NULL, lpDataDestroy->dpnName.lpszShortNameA ); + checkLP( NULL, U1(lpDataDestroy->dpnName).lpszShortNameA ); check( 0, lpDataDestroy->dpIdParent ); }

1 0