wine-commits September 2008

wine-commits@winehq.org

3 participants
1215 discussions

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

02 Sep '08

Module: wine Branch: master Commit: 874ff81640d1b4493911512e4cd0d93b79355007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=874ff81640d1b4493911512e4… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Sat Aug 30 14:58:37 2008 +0900 comdlg32: Update Japanese translation. --- dlls/comdlg32/cdlg_Ja.rc | 142 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 139 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ja.rc b/dlls/comdlg32/cdlg_Ja.rc index a5e8a0c..0b35236 100644 --- a/dlls/comdlg32/cdlg_Ja.rc +++ b/dlls/comdlg32/cdlg_Ja.rc @@ -141,7 +141,7 @@ FONT 9, "MS UI Gothic" CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "�T��v��",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt (translate):",stc7 ,98,114,80,9 + LTEXT "��Z�b�g(&I):",stc7 ,98,114,80,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -295,6 +295,36 @@ BEGIN CONTROL "��(&A)", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�y�[�W�ݒ�" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "�p��", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "�T�C�Y(&S):", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "��@(&T):", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "��̌��", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "�c(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "��(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "�]��", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "��(&E):", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "�E(&R):", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "��(&O):", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "��(&B):", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "�L��Z��", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "�v��^(&R)...", psh3, 184, 220, 48, 14 +END + NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN CAPTION "�t�@�C��J��" @@ -338,9 +368,115 @@ STRINGTABLE DISCARDABLE IDS_FILENOTFOUND "�t�@�C��܂��B" IDS_VERIFYFILE "�t�@�C��m�F��Ă��B" IDS_CREATEFILE "��̃t�@�C��͑��݂��܂��B\n�쐬��܂��?" - IDS_OVERWRITEFILE "File already exists.\nDo you want to replace it?" + IDS_OVERWRITEFILE "�t�@�C��͊��ɑ��݂��܂��B\n�㏑��܂��?" IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path" - IDS_INVALID_FILENAME "A filename cannot contain any of the following characters:\n / : < > |" + IDS_INVALID_FILENAME "�t�@�C��ɂ͈ȉ��̕��͎g��܂��:\n / : < > |" IDS_PATHNOTEXISTING "Path does not exist" IDS_FILENOTEXISTING "File does not exist" } + +STRINGTABLE DISCARDABLE +{ + IDS_UPFOLDER "Up One Level" + IDS_NEWFOLDER "Create New Folder" + IDS_LISTVIEW "List" + IDS_REPORTVIEW "Details" + IDS_TODESKTOP "Browse to Desktop" +} + +STRINGTABLE DISCARDABLE +{ + PD32_PRINT_TITLE "Print" + + PD32_VALUE_UREADABLE "Unreadable Entry" + PD32_INVALID_PAGE_RANGE "This value does not lie within the page range.\n\ +Please enter a value between %d and %d." + PD32_FROM_NOT_ABOVE_TO "The 'from' entry cannot exceed the \ +'to' entry." + PD32_MARGINS_OVERLAP "Margins overlap or fall outside \ +Paper boundaries.\nPlease reenter margins." + PD32_NR_OF_COPIES_EMPTY "The number of 'Number of copies' \ +value cannot be empty." + PD32_TOO_LARGE_COPIES "This large number of copies is not \ +supported by your printer.\nPlease enter a value between 1 and %d." + PD32_PRINT_ERROR "A printer error occurred." + PD32_NO_DEFAULT_PRINTER "No default printer defined." + PD32_CANT_FIND_PRINTER "Cannot find the printer." + PD32_OUT_OF_MEMORY "Out of memory." + PD32_GENERIC_ERROR "An error occurred." + PD32_DRIVER_UNKNOWN "Unknown printer driver." + PD32_NO_DEVICES "Before you can perform printer-related tasks \ +such as page setup or printing a document, you need to install a printer. \ +Please install one and retry." + + PD32_DEFAULT_PRINTER "Default Printer; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "There are %d documents in the queue" + PD32_MARGINS_IN_INCHES "Margins [inches]" + PD32_MARGINS_IN_MILIMETERS "Margins [mm]" + PD32_MILIMETERS "mm" + + PD32_PRINTER_STATUS_READY "Ready" + PD32_PRINTER_STATUS_PAUSED "Paused; " + PD32_PRINTER_STATUS_ERROR "Error; " + PD32_PRINTER_STATUS_PENDING_DELETION "Pending deletion; " + PD32_PRINTER_STATUS_PAPER_JAM "Paper jam; " + PD32_PRINTER_STATUS_PAPER_OUT "Out of paper; " + PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "Paper problem; " + PD32_PRINTER_STATUS_OFFLINE "Printer offline; " + PD32_PRINTER_STATUS_IO_ACTIVE "I/O Active; " + PD32_PRINTER_STATUS_BUSY "Busy; " + PD32_PRINTER_STATUS_PRINTING "Printing; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "Not available; " + PD32_PRINTER_STATUS_WAITING "Waiting; " + PD32_PRINTER_STATUS_PROCESSING "Processing; " + PD32_PRINTER_STATUS_INITIALIZING "Initialising; " + PD32_PRINTER_STATUS_WARMING_UP "Warming up; " + PD32_PRINTER_STATUS_TONER_LOW "Toner low; " + PD32_PRINTER_STATUS_NO_TONER "No toner; " + PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; " + PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Out of memory; " + PD32_PRINTER_STATUS_DOOR_OPEN "The printer door is open; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server unknown; " + PD32_PRINTER_STATUS_POWER_SAVE "Power save mode; " +} + +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "�W��" + IDS_FONT_BOLD "��" + IDS_FONT_ITALIC "�Α�" + IDS_FONT_BOLD_ITALIC "�� Α�" +} + +STRINGTABLE DISCARDABLE /* Color names */ +{ + IDS_COLOR_BLACK "��" + IDS_COLOR_MAROON "��F" + IDS_COLOR_GREEN "��" + IDS_COLOR_OLIVE "�I��[�u" + IDS_COLOR_NAVY "��" + IDS_COLOR_PURPLE "��" + IDS_COLOR_TEAL "��" + IDS_COLOR_GRAY "�D�F" + IDS_COLOR_SILVER "��F" + IDS_COLOR_RED "��" + IDS_COLOR_LIME "��" + IDS_COLOR_YELLOW "��" + IDS_COLOR_BLUE "��" + IDS_COLOR_FUCHSIA "�Ԏ�" + IDS_COLOR_AQUA "��F" + IDS_COLOR_WHITE "��" +} + +STRINGTABLE DISCARDABLE +{ + IDS_FONT_SIZE "Select a font size between %d and %d points." + IDS_SAVE_BUTTON "&Save" + IDS_SAVE_IN "Save &in:" + IDS_SAVE "Save" + IDS_SAVE_AS "Save as" + IDS_OPEN_FILE "Open File" +}

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 : 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

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 : 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 : 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 : 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 : notepad: Remove spaces before '\n' in the Chinese resources.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: c8bafc3817abdcc32c0631044a198acd8c574d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8bafc3817abdcc32c0631044… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 1 17:06:08 2008 +0200 notepad: Remove spaces before '\n' in the Chinese resources. --- programs/notepad/Zh.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index a961d44..89de268 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -205,12 +205,12 @@ STRING_UNTITLED, "(未命名)" STRING_ALL_FILES, "所有檔案 (*.*)" STRING_TEXT_FILES_TXT, "文本檔案 (*.txt)" -STRING_TOOLARGE, "記事本不能開啟 '%s' 這麼大的檔案, \n請使用別的編輯器。" +STRING_TOOLARGE, "記事本不能開啟 '%s' 這麼大的檔案,\n請使用別的編輯器。" STRING_NOTEXT, "您沒有輸入任何文本。\n請輸入一些再試" STRING_DOESNOTEXIST, "檔案 '%s'\n不存在\n\n您想新建一個檔案嗎？" STRING_NOTSAVED, "檔案 '%s'\n正文已更改\n\n是否儲存更改？" STRING_NOTFOUND, "找不到: '%s'" -STRING_OUT_OF_MEMORY, "沒有足夠的內存來完成此項任務, \n請關閉一些程式後再試。" +STRING_OUT_OF_MEMORY, "沒有足夠的內存來完成此項任務,\n請關閉一些程式後再試。" } #pragma code_page(default)

1 0

Francois Gouget : appwiz.cpl: Remove spaces before '...' in the Norwegian resources.
by Alexandre Julliard 02 Sep '08

02 Sep '08

Module: wine Branch: master Commit: 39050cb0a8f3ce8fedadfd0563d538ba6994b0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39050cb0a8f3ce8fedadfd056… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 1 17:05:39 2008 +0200 appwiz.cpl: Remove spaces before '...' in the Norwegian resources. --- dlls/appwiz.cpl/No.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/No.rc b/dlls/appwiz.cpl/No.rc index 43f503c..5658773 100644 --- a/dlls/appwiz.cpl/No.rc +++ b/dlls/appwiz.cpl/No.rc @@ -43,13 +43,13 @@ CAPTION "Installer/Avinstaller" FONT 8, "MS Sans Serif" { CONTROL "Trykk �Installer� for � installere et program fra en diskett, CD-stasjon eller annet medium.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 - CONTROL "&Installer ...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 CONTROL "F�lgende programmer kan fjernes automatisk. Merk et program og trykk �Legg til/Fjern� for � fjerne det eller endre installerte komponenter", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "Legg til/Fje&rn ...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 - CONTROL "&St�tteinformasjon ...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 170, 198, 70, 14 + CONTROL "Legg til/Fje&rn...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "&St�tteinformasjon...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 170, 198, 70, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2008