Changeset 22120 for branches


Ignore:
Timestamp:
Feb 14, 2016, 2:28:23 PM (10 years ago)
Author:
rousseau
Message:

Integrating from Wine Sources [gdiplus]

We will start with 'gdiplus.cpp' and build a minimal 'gdiplus.dll'.
While climbing up the wine-repo, more info will be obtained about the
integration process. This info is collected at the developer-site with
the goal of auto-integration in the future.

Commit: a781bbf096d9a3264fe52fa90891b5a19fca9e4d
Wine git-repo: ​git://source.winehq.org/git/wine.git

Location:
branches/swt
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • branches/swt/src/gdiplus/Makefile.kmk

    r22118 r22120  
    1515gdiplus_SOURCES     = \
    1616    initterm.cpp     \
     17    gdiplus.cpp     \
    1718    gdiplusrsrc.orc
    1819

  • branches/swt/src/gdiplus/dbglocal.cpp

    r22118 r22120  
    2323{
    2424"gdiplus",
    25 "opengl",
    26 "callback",
    27 "dibsect",
    28 "initterm",
    29 "resource",
    30 "oslibgdi",
    31 "font",
    32 "text",
    33 "palette",
    34 "line",
    35 "oslibgpi",
    36 "region",
    37 "metafile",
    38 "dibitmap",
    39 "blit",
    40 "rgbcvt",
    41 "objhandle",
    42 "transform",
    43 "printer",
    44 "icm",
    45 "trace",
    46 "fontres",
    47 "devcontext"
     25"initterm"
     26///...
    4827};
    4928//******************************************************************************

  • branches/swt/src/gdiplus/dbglocal.h

    r22118 r22120  
    1515#ifdef DEBUG
    1616//Parses environment variable for selective enabling/disabling of logging
    17 void ParseLogStatusGDI32();
     17void ParseLogStatusGDIPLUS();
    1818
    1919#define DBG_ENVNAME        "dbg_gdiplus"
    … …  
    2121
    2222#define DBG_gdiplus         0
    23 #define DBG_opengl          1
    24 #define DBG_callback        2
    25 #define DBG_dibsect         3
    26 #define DBG_initterm        4
    27 #define DBG_resource        5
    28 #define DBG_oslibgdi        6
    29 #define DBG_font            7
    30 #define DBG_text            8
    31 #define DBG_palette         9
    32 #define DBG_line            10
    33 #define DBG_oslibgpi        11
    34 #define DBG_region          12
    35 #define DBG_metafile        13
    36 #define DBG_dibitmap        14
    37 #define DBG_blit            15
    38 #define DBG_rgbcvt          16
    39 #define DBG_objhandle       17
    40 #define DBG_transform       18
    41 #define DBG_printer         19
    42 #define DBG_icm             20
    43 #define DBG_trace           21
    44 #define DBG_fontres         22
    45 #define DBG_devcontext      23
    46 #define DBG_MAXFILES        24
     23//~ #define DBG_opengl          1
     24//~ #define DBG_callback        2
     25//~ #define DBG_dibsect         3
     26#define DBG_initterm        1
     27//~ #define DBG_resource        5
     28//~ #define DBG_oslibgdi        6
     29//~ #define DBG_font            7
     30//~ #define DBG_text            8
     31//~ #define DBG_palette         9
     32//~ #define DBG_line            10
     33//~ #define DBG_oslibgpi        11
     34//~ #define DBG_region          12
     35//~ #define DBG_metafile        13
     36//~ #define DBG_dibitmap        14
     37//~ #define DBG_blit            15
     38//~ #define DBG_rgbcvt          16
     39//~ #define DBG_objhandle       17
     40//~ #define DBG_transform       18
     41//~ #define DBG_printer         19
     42//~ #define DBG_icm             20
     43//~ #define DBG_trace           21
     44//~ #define DBG_fontres         22
     45//~ #define DBG_devcontext      23
     46#define DBG_MAXFILES        2
    4747
    4848extern USHORT DbgEnabledGDIPLUS[DBG_MAXFILES];

  • branches/swt/src/gdiplus/gdiplus.def

    r22118 r22120  
    66
    77IMPORTS
    8 ;;;; Present in WGSS50
    9 ;;;;    _GpiQueryDCData            = PMGPI.665
     8
    109
    1110EXPORTS
     11    GdipAlloc                  = "_GdipAlloc@4"              @34
     12;    GdipFlush                  = "_GdipFlush@8"              @224
     13    GdipFree                   = "_GdipFree@4"               @225
     14    GdiplusShutdown            = "_GdiplusShutdown@4"        @608
     15    GdiplusStartup             = "_GdiplusStartup@12"        @609
    1216
    1317;

  • branches/swt/src/gdiplus/gdiplusdbg.def

    r22118 r22120  
    66
    77IMPORTS
    8 ;;;; Present in WGSS50
    9 ;;;;    _GpiQueryDCData            = PMGPI.665
     8
    109
    1110EXPORTS
     11    GdipAlloc                  = "_DbgGdipAlloc@4"              @34
     12;    GdipFlush                  = "_DbgGdipFlush@8"              @224
     13    GdipFree                   = "_DbgGdipFree@4"               @225
     14    GdiplusShutdown            = "_DbgGdiplusShutdown@4"        @608
     15    GdiplusStartup             = "_DbgGdiplusStartup@12"        @609
    1216
    1317;

  • branches/swt/src/gdiplus/initterm.cpp

    r22118 r22120  
    3030///#include "rgbcvt.h"
    3131
    32 ///#define DBG_LOCALLOG    DBG_initterm
    33 ///#include "dbglocal.h"
     32#define DBG_LOCALLOG    DBG_initterm
     33#include "dbglocal.h"
    3434
    3535// Win32 resource table (produced by wrc)

  • branches/swt/testapp/apitest/ApiTest.properties

    r22119 r22120  
    1 #Developer Connection Properties
    2 #The properties in this file are here to aid the developer by providing a backlink.
    3 #This kinda has to do with 'modeling' and being able to 'regenerate' a published commit.
    4 #Tue, 09 Feb 2016 19:22:30 -0500
     1###############################################################################
     2# Project Context Properties                                        [ApiTest] #
     3# --------------------------------------------------------------------------- #
     4# The properties in this file are here to aid the developer by providing a    #
     5# backlink. The 'meta-commit' refers to the developer-local meta-repository,  #
     6# from where code is generated. The 'wine*' entries refer to tracking-points  #
     7# in the Wine Git Repository.                                                 #
     8###############################################################################
    59
    6 meta-commit=8ec23efb6577b0e60d5f0e235b4e4bede1737f1c
     10#Sun, 14 Feb 2016 13:43:48 +0800
     11
     12meta-commit=none
    713wine.git.repo=git\://source.winehq.org/git/wine.git
    814wine.git.repo.usp10.tag.stub=54508df52715eaeb6414f9f474691fde548d8e15
    915wine.git.repo.usp10.branch.float=b2182f9d829cb653f5d30340ddb92b86ce83f950
    1016wine.git.repo.gdiplus.tag.stub=bed761c9e72febb3b2d681fd4e540e149af9e71a
    11 wine.git.repo.gdiplus.branch.float=bed761c9e72febb3b2d681fd4e540e149af9e71a
     17wine.git.repo.gdiplus.branch.float=a781bbf096d9a3264fe52fa90891b5a19fca9e4d
Note: See TracChangeset for help on using the changeset viewer.