VirtualBox

Changeset 82901 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Jan 29, 2020 9:45:11 AM (5 years ago)
Author:
vboxsync
Message:

Shared Clipboard/x11: Comment formatting nits. bugref:9437

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

    r82900 r82901  
    29402940
    29412941    /*
    2942      * Run the test.
     2942     * Run the tests.
    29432943     */
    29442944    SHCLX11CTX X11Ctx;
     
    29512951    AssertRCReturn(rc, 1);
    29522952
    2953     /*** UTF-8 from X11 ***/
     2953    /* UTF-8 from X11 */
    29542954    RTTestSub(hTest, "reading UTF-8 from X11");
    29552955    /* Simple test */
     
    29832983    tstStringFromX11(hTest, &X11Ctx, "hello world", VINF_SUCCESS);
    29842984
    2985     /*** Latin1 from X11 ***/
     2985    /* Latin1 from X11 */
    29862986    RTTestSub(hTest, "reading Latin1 from X11");
    29872987    /* Simple test */
     
    30073007    tstLatin1FromX11(hTest, &X11Ctx, "Georges Dupr\xEA!", VINF_SUCCESS);
    30083008
    3009     /*** Unknown X11 format ***/
     3009    /*
     3010     * Unknown X11 format
     3011     */
    30103012    RTTestSub(hTest, "handling of an unknown X11 format");
    30113013    tstClipInvalidateFormats();
     
    30163018                     (hTest, "Failed to send a format update notification\n"));
    30173019
    3018     /*** Timeout from X11 ***/
     3020    /*
     3021     * Timeout from X11
     3022     */
    30193023    RTTestSub(hTest, "X11 timeout");
    30203024    tstClipSetSelectionValues("UTF8_STRING", XT_CONVERT_FAIL, NULL,0, 8);
    30213025    tstStringFromX11(hTest, &X11Ctx, "", VERR_NO_DATA);
    30223026
    3023     /*** No data in X11 clipboard ***/
     3027    /*
     3028     * No data in X11 clipboard
     3029     */
    30243030    RTTestSub(hTest, "a data request from an empty X11 clipboard");
    30253031    tstClipSetSelectionValues("UTF8_STRING", XA_STRING, NULL,
     
    30343040                     pReq, pReqRet));
    30353041
    3036     /*** Ensure that VBox is notified when we return the CB to X11 ***/
     3042    /*
     3043     * Ensure that VBox is notified when we return the CB to X11
     3044     */
    30373045    RTTestSub(hTest, "notification of switch to X11 clipboard");
    30383046    tstClipInvalidateFormats();
     
    30413049                     (hTest, "Failed to send a format update (release) notification\n"));
    30423050
    3043     /*** request for an invalid VBox format from X11 ***/
     3051    /*
     3052     * Request for an invalid VBox format from X11
     3053     */
    30443054    RTTestSub(hTest, "a request for an invalid VBox format from X11");
    30453055    /* Testing for 0xffff will go into handling VBOX_SHCL_FMT_UNICODETEXT, where we don't have
     
    30543064                     pReq, pReqRet));
    30553065
    3056     /*** Targets failure from X11 ***/
     3066    /*
     3067     * Targets failure from X11
     3068     */
    30573069    RTTestSub(hTest, "X11 targets conversion failure");
    30583070    tstClipSetSelectionValues("UTF8_STRING", XA_STRING, "hello world",
     
    30683080                      tstClipQueryFormats()));
    30693081
    3070     /*** X11 text format conversion ***/
     3082    /*
     3083     * X11 text format conversion
     3084     */
    30713085    RTTestSub(hTest, "handling of X11 selection targets");
    30723086    RTTEST_CHECK_MSG(hTest, tstClipTextFormatConversion(&X11Ctx),
    30733087                     (hTest, "failed to select the right X11 text formats\n"));
    30743088
    3075     /*** UTF-8 from VBox ***/
     3089    /*
     3090     * UTF-8 from VBox
     3091     */
    30763092    RTTestSub(hTest, "reading UTF-8 from VBox");
    30773093    /* Simple test */
     
    31133129                     "hello world");
    31143130
    3115     /*** Timeout from VBox ***/
     3131    /*
     3132     * Timeout from VBox
     3133     */
    31163134    RTTestSub(hTest, "reading from VBox with timeout");
    31173135    tstClipEmptyVBox(&X11Ctx, VERR_TIMEOUT);
    31183136    tstStringFromVBoxFailed(hTest, &X11Ctx, "UTF8_STRING");
    31193137
    3120     /*** No data in VBox clipboard ***/
     3138    /*
     3139     * No data in VBox clipboard
     3140     */
    31213141    RTTestSub(hTest, "an empty VBox clipboard");
    31223142    tstClipSetSelectionValues("TEXT", XA_STRING, "", sizeof(""), 8);
     
    31263146    tstStringFromVBoxFailed(hTest, &X11Ctx, "UTF8_STRING");
    31273147
    3128     /*** An unknown VBox format ***/
     3148    /*
     3149     * An unknown VBox format
     3150     */
    31293151    RTTestSub(hTest, "reading an unknown VBox format");
    31303152    tstClipSetSelectionValues("TEXT", XA_STRING, "", sizeof(""), 8);
     
    31353157    tstStringFromVBoxFailed(hTest, &X11Ctx, "UTF8_STRING");
    31363158
    3137     /*** VBox requests a bad format ***/
     3159    /*
     3160     * VBox requests a bad format
     3161     */
    31383162    RTTestSub(hTest, "recovery from a bad format request");
    31393163    tstBadFormatRequestFromHost(hTest, &X11Ctx);
     
    31433167    ShClX11Destroy(&X11Ctx);
    31443168
    3145     /*** Headless clipboard tests ***/
    3146 
     3169    /*
     3170     * Headless clipboard tests
     3171     */
    31473172    rc = ShClX11Init(&X11Ctx, NULL, true);
    31483173    AssertRCReturn(rc, 1);
    3149 
    31503174    rc = ShClX11ThreadStart(&X11Ctx, false /* fGrab */);
    31513175    AssertRCReturn(rc, 1);
    31523176
    3153     /*** Read from X11 ***/
     3177    /* Read from X11 */
    31543178    RTTestSub(hTest, "reading from X11, headless clipboard");
    31553179    /* Simple test */
     
    31603184    tstNoX11(&X11Ctx, "reading from X11, headless clipboard");
    31613185
    3162     /*** Read from VBox ***/
     3186    /* Read from VBox */
    31633187    RTTestSub(hTest, "reading from VBox, headless clipboard");
    31643188    /* Simple test */
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette