October 2013 - Wine-commits

Frédéric Delanoy : wordpad: Use BOOL type where appropriate.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 682c89ced33d37a4c14324c9ba41c31034d04a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=682c89ced33d37a4c14324c9b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 16 23:38:32 2013 +0200 wordpad: Use BOOL type where appropriate. --- programs/wordpad/print.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index eb48e48..9021989 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -1141,7 +1141,7 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { POINT pt; RECT rc; - int bHittest = FALSE; + int bHittest = 0; DWORD messagePos = GetMessagePos(); pt.x = (short)LOWORD(messagePos); pt.y = (short)HIWORD(messagePos);

1 0

Frédéric Delanoy : winecfg: Use BOOL type where appropriate.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 87c72332bbb4b5a33201ce7802ded0b93933b807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c72332bbb4b5a33201ce780… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 16 23:38:33 2013 +0200 winecfg: Use BOOL type where appropriate. --- programs/winecfg/drivedetect.c | 2 +- programs/winecfg/main.c | 2 +- programs/winecfg/theme.c | 2 +- programs/winecfg/winecfg.c | 6 +++--- programs/winecfg/winecfg.h | 4 ++-- programs/winecfg/x11drvdlg.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index b0d827d..253c629 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -302,7 +302,7 @@ static void ensure_drive_c_is_mapped(void) HeapFree(GetProcessHeap(), 0, drive_c_dir); } -int autodetect_drives(void) +BOOL autodetect_drives(void) { #ifdef HAVE_MNTENT_H struct mntent *ent; diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 7376309..6ac5f89 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -244,7 +244,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrev, LPSTR szCmdLine, int nShow) return 0; } - if (initialize(hInstance) != 0) { + if (initialize(hInstance)) { WINE_ERR("initialization failed, aborting\n"); ExitProcess(1); } diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index be57037..0618974 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -425,7 +425,7 @@ static void do_apply_theme (int themeIndex, int colorIndex, int sizeIndex) } } -static int updating_ui; +static BOOL updating_ui; static BOOL theme_dirty; static void enable_size_and_color_controls (HWND dialog, BOOL enable) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 3fbfedf..3ed406b 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -749,18 +749,18 @@ void PRINTERROR(void) WINE_TRACE("error: '%s'\n", msg); } -int initialize(HINSTANCE hInstance) +BOOL initialize(HINSTANCE hInstance) { DWORD res = RegCreateKeyA(HKEY_CURRENT_USER, WINE_KEY_ROOT, &config_key); if (res != ERROR_SUCCESS) { WINE_ERR("RegOpenKey failed on wine config key (%d)\n", res); - return 1; + return TRUE; } /* we could probably just have the list as static data */ settings = HeapAlloc(GetProcessHeap(), 0, sizeof(struct list)); list_init(settings); - return 0; + return FALSE; } diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index b031497..110856a 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -73,7 +73,7 @@ WCHAR* load_string (UINT id); char *keypath(const char *section); WCHAR *keypathW(const WCHAR *section); -int initialize(HINSTANCE hInstance); +BOOL initialize(HINSTANCE hInstance); extern HKEY config_key; /* hack for the property sheet control */ @@ -91,7 +91,7 @@ INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara /* Drive management */ BOOL load_drives(void); -int autodetect_drives(void); +BOOL autodetect_drives(void); struct drive { diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 2bd4609..8d914ad 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -55,7 +55,7 @@ static const WCHAR x11_driverW[] = {'X','1','1',' ','D','r','i','v','e','r',0}; static const WCHAR default_resW[] = {'8','0','0','x','6','0','0',0}; -int updating_ui; +static BOOL updating_ui; /* convert the x11 desktop key to the new explorer config */ static void convert_x11_desktop_key(void)

1 0

Frédéric Delanoy : winefile: Use BOOL type where appropriate.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 0b977adc67e0e1e6277e3544b1c960fbbdf1974f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b977adc67e0e1e6277e3544b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 16 23:38:34 2013 +0200 winefile: Use BOOL type where appropriate. --- programs/winefile/winefile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 4729436..c85d1ac 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2695,7 +2695,7 @@ static void create_tree_window(HWND parent, Pane* pane, UINT id, UINT id_header, { static const WCHAR sListBox[] = {'L','i','s','t','B','o','x','\0'}; - static int s_init = 0; + static BOOL s_init = FALSE; Entry* entry = pane->root; pane->hwnd = CreateWindowW(sListBox, sEmpty, WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL| @@ -2713,7 +2713,7 @@ static void create_tree_window(HWND parent, Pane* pane, UINT id, UINT id_header, /* calculate column widths */ if (!s_init) { - s_init = 1; + s_init = TRUE; init_output(pane->hwnd); }

1 0

Dmitry Timoshkov : gdi32/tests: Fix font tests compilation with __WINESRC__ defined.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 8c22e66217acf8daea26a333659ad34208b094db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c22e66217acf8daea26a3336… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 17 08:55:20 2013 +0900 gdi32/tests: Fix font tests compilation with __WINESRC__ defined. --- dlls/gdi32/tests/font.c | 328 +++++++++++++++++++++++----------------------- 1 files changed, 164 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c22e66217acf8daea26a…

1 0

Dmitry Timoshkov : gdi32/tests: Enable gdi32 tests compilation with __WINESRC__ defined.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 87ae85f1b48fb19e6f9674df42df2d80ee6864ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ae85f1b48fb19e6f9674df4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 17 08:55:25 2013 +0900 gdi32/tests: Enable gdi32 tests compilation with __WINESRC__ defined. --- dlls/gdi32/tests/Makefile.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in index 79b38ef..dee2fa4 100644 --- a/dlls/gdi32/tests/Makefile.in +++ b/dlls/gdi32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = gdi32.dll IMPORTS = user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ bitmap.c \

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for GdipCloneBitmapArea called on an already locked bitmap.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 4e14c45b8b1b4104b4ed21da95952f117f83988a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e14c45b8b1b4104b4ed21da9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 17 10:08:53 2013 +0900 gdiplus/tests: Add a test for GdipCloneBitmapArea called on an already locked bitmap. --- dlls/gdiplus/tests/image.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9f5730e..650d12f 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4240,6 +4240,33 @@ static void test_ARGB_conversion(void) GdipDisposeImage((GpImage *)bitmap); } + +static void test_CloneBitmapArea(void) +{ + GpStatus status; + GpBitmap *bitmap, *copy; + BitmapData data, data2; + + status = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat24bppRGB, NULL, &bitmap); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead | ImageLockModeWrite, PixelFormat24bppRGB, &data); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &data2); + expect(WrongState, status); + + status = GdipCloneBitmapAreaI(0, 0, 1, 1, PixelFormat24bppRGB, bitmap, &copy); +todo_wine + expect(Ok, status); + + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + + GdipDisposeImage((GpImage *)copy); + GdipDisposeImage((GpImage *)bitmap); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4252,6 +4279,7 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_CloneBitmapArea(); test_ARGB_conversion(); test_DrawImage_scale(); test_image_format();

1 0

Jacek Caban : crypt32: Don't use links to certs in memory store.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 2601f58acb75758f6b3755da08c8571513143532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2601f58acb75758f6b3755da0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:06:44 2013 +0200 crypt32: Don't use links to certs in memory store. --- dlls/crypt32/cert.c | 158 +++++++++++++++++++++++----------------- dlls/crypt32/collectionstore.c | 12 ++-- dlls/crypt32/context.c | 4 +- dlls/crypt32/crl.c | 7 ++- dlls/crypt32/crypt32_private.h | 22 +++--- dlls/crypt32/ctl.c | 9 ++- dlls/crypt32/provstore.c | 18 ++-- dlls/crypt32/store.c | 17 ++-- 8 files changed, 140 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2601f58acb75758f6b375…

1 0

Jacek Caban : crypt32: Added more cert duplicate and link tests.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: e7eeef49ff884e41178f4c2a969dfedb2608cce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7eeef49ff884e41178f4c2a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:06:59 2013 +0200 crypt32: Added more cert duplicate and link tests. --- dlls/crypt32/tests/cert.c | 77 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index dfb6921..a96a75f 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -680,8 +680,8 @@ static void testCreateCert(void) static void testDupCert(void) { - HCERTSTORE store; - PCCERT_CONTEXT context, dupContext; + PCCERT_CONTEXT context, dupContext, storeContext, storeContext2, context2; + HCERTSTORE store, store2; BOOL ret; store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -719,11 +719,83 @@ static void testDupCert(void) } CertCloseStore(store, 0); + context = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); + ok(context != NULL, "CertCreateCertificateContext failed\n"); + + dupContext = CertDuplicateCertificateContext(context); + ok(dupContext == context, "context != dupContext\n"); + + CertFreeCertificateContext(dupContext); + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store != NULL, "CertOpenStore failed: %d\n", GetLastError()); + + ret = CertAddCertificateContextToStore(store, context, CERT_STORE_ADD_NEW, &storeContext); + ok(ret, "CertAddCertificateContextToStore failed\n"); + ok(storeContext != NULL && storeContext != context, "unexpected storeContext\n"); + ok(storeContext->hCertStore == store, "unexpected hCertStore\n"); + + ok(storeContext->pbCertEncoded != context->pbCertEncoded, "unexpected pbCertEncoded\n"); + ok(storeContext->cbCertEncoded == context->cbCertEncoded, "unexpected cbCertEncoded\n"); + ok(storeContext->pCertInfo != context->pCertInfo, "unexpected pCertInfo\n"); + + store2 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store2 != NULL, "CertOpenStore failed: %d\n", GetLastError()); + + ret = CertAddCertificateContextToStore(store2, storeContext, CERT_STORE_ADD_NEW, &storeContext2); + ok(ret, "CertAddCertificateContextToStore failed\n"); + ok(storeContext2 != NULL && storeContext2 != storeContext, "unexpected storeContext\n"); + ok(storeContext2->hCertStore == store2, "unexpected hCertStore\n"); + + ok(storeContext2->pbCertEncoded != storeContext->pbCertEncoded, "unexpected pbCertEncoded\n"); + ok(storeContext2->cbCertEncoded == storeContext->cbCertEncoded, "unexpected cbCertEncoded\n"); + ok(storeContext2->pCertInfo != storeContext->pCertInfo, "unexpected pCertInfo\n"); + + CertFreeCertificateContext(storeContext2); + CertFreeCertificateContext(storeContext); + + context2 = CertCreateCertificateContext(X509_ASN_ENCODING, certWithUsage, sizeof(certWithUsage)); + ok(context2 != NULL, "CertCreateCertificateContext failed\n"); + + ok(context2->hCertStore == context->hCertStore, "Unexpected hCertStore\n"); + + CertFreeCertificateContext(context2); + CertFreeCertificateContext(context); + + CertCloseStore(store, 0); + CertCloseStore(store2, 0); + SetLastError(0xdeadbeef); context = CertDuplicateCertificateContext(NULL); ok(context == NULL, "Expected context to be NULL\n"); } +static void testLinkCert(void) +{ + const CERT_CONTEXT *context, *link; + HCERTSTORE store; + BOOL ret; + + context = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); + ok(context != NULL, "CertCreateCertificateContext failed\n"); + + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store != NULL, "CertOpenStore failed: %d\n", GetLastError()); + + ret = CertAddCertificateLinkToStore(store, context, CERT_STORE_ADD_NEW, &link); + ok(ret, "CertAddCertificateContextToStore failed\n"); + ok(link != NULL && link != context, "unexpected storeContext\n"); + ok(link->hCertStore == store, "unexpected hCertStore\n"); + + ok(link->pbCertEncoded == context->pbCertEncoded, "unexpected pbCertEncoded\n"); + ok(link->cbCertEncoded == context->cbCertEncoded, "unexpected cbCertEncoded\n"); + ok(link->pCertInfo == context->pCertInfo, "unexpected pCertInfo\n"); + + CertFreeCertificateContext(link); + + CertCloseStore(store, 0); +} + static BYTE subjectName3[] = { 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x52, 0x6f, 0x62, 0x20, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00 }; @@ -3902,6 +3974,7 @@ START_TEST(cert) testFindCert(); testGetSubjectCert(); testGetIssuerCert(); + testLinkCert(); testCryptHashCert(); testCertSigs();

1 0

Jacek Caban : crypt32: Get rid of no longer used functions.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 275ac93e8db02d309f46d58af834bb5590481f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=275ac93e8db02d309f46d58af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:07:08 2013 +0200 crypt32: Get rid of no longer used functions. --- dlls/crypt32/context.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 65e9fab..02ec40d 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -76,22 +76,6 @@ void Context_AddRef(context_t *context) TRACE("(%p) ref=%d\n", context, context->ref); } -void *Context_GetExtra(const void *context, size_t contextSize) -{ - BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context); - - assert(baseContext->linked != NULL); - return (LPBYTE)CONTEXT_FROM_BASE_CONTEXT(baseContext) + contextSize; -} - -void *Context_GetLinkedContext(void *context) -{ - BASE_CONTEXT *baseContext = BASE_CONTEXT_FROM_CONTEXT(context); - - assert(baseContext->linked != NULL); - return CONTEXT_FROM_BASE_CONTEXT(baseContext->linked); -} - CONTEXT_PROPERTY_LIST *Context_GetProperties(const void *context) { BASE_CONTEXT *ptr = BASE_CONTEXT_FROM_CONTEXT(context);

1 0

Jacek Caban : crypt32: Store properties directly in link contexts and get rid of Context_GetProperties .
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: wine Branch: master Commit: 6eddbf18cad2bacab15c52dcf70d33443536d2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eddbf18cad2bacab15c52dcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 11:07:24 2013 +0200 crypt32: Store properties directly in link contexts and get rid of Context_GetProperties. --- dlls/crypt32/cert.c | 98 +++++++++++++++++++-------------------- dlls/crypt32/context.c | 15 +----- dlls/crypt32/crl.c | 50 ++++++++------------ dlls/crypt32/crypt32_private.h | 5 -- dlls/crypt32/ctl.c | 46 +++++++++---------- 5 files changed, 93 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eddbf18cad2bacab15c5…

1 0