February 2013 - Wine-commits

Piotr Caban : jscript: Don't use jsstr_t in js_NewRegExp.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 1d61b4581ab1b0daa343041f4165f1849ce948d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d61b4581ab1b0daa343041f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:44 2013 +0100 jscript: Don't use jsstr_t in js_NewRegExp. --- dlls/jscript/regexp.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index decabcc..db04e9b 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3218,7 +3218,7 @@ js_DestroyRegExp(JSRegExp *re) } static JSRegExp * -js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) +js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) { JSRegExp *re; heap_pool_t *mark; @@ -3230,10 +3230,10 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) re = NULL; mark = heap_pool_mark(&cx->tmp_heap); - len = jsstr_length(str); + len = str_len; state.context = cx; - state.cp = str->str; + state.cp = str; if (!state.cp) goto out; state.cpbegin = state.cp; @@ -3303,8 +3303,8 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) re->flags = flags; re->parenCount = state.parenCount; - re->source = str->str; - re->source_len = jsstr_length(str); + re->source = str; + re->source_len = str_len; out: heap_pool_clear(mark); @@ -3865,7 +3865,8 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->str = jsstr_addref(src); regexp->last_index_val = jsval_number(0); - regexp->jsregexp = js_NewRegExp(ctx, regexp->str, flags, FALSE); + regexp->jsregexp = js_NewRegExp(ctx, regexp->str->str, + jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("js_NewRegExp failed\n"); jsdisp_release(&regexp->dispex);

1 0

Piotr Caban : jscript: Move code operating on JSRegExp out of do_regexp_match_next function.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: deca5e1aca54e8ed3948a3c53604aa48ab176add URL: http://source.winehq.org/git/wine.git/?a=commit;h=deca5e1aca54e8ed3948a3c53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:04:59 2013 +0100 jscript: Move code operating on JSRegExp out of do_regexp_match_next function. --- dlls/jscript/regexp.c | 67 +++++++++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index db04e9b..ea25c64 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3202,6 +3202,42 @@ bad: return NULL; } +static HRESULT MatchRegExpNext(JSRegExp *jsregexp, const WCHAR *str, DWORD str_len, + const WCHAR **cp, heap_pool_t *pool, REMatchState **result, DWORD *matchlen) +{ + REMatchState *x, *res; + REGlobalData gData; + + gData.cpbegin = str; + gData.cpend = str+str_len; + gData.start = *cp-str; + gData.skipped = 0; + gData.pool = pool; + + x = InitMatch(NULL, &gData, jsregexp, gData.cpend - gData.cpbegin); + if(!x) { + WARN("InitMatch failed\n"); + return E_FAIL; + } + + x->cp = *cp; + res = MatchRegExp(&gData, x); + if(!gData.ok) { + WARN("MatchRegExp failed\n"); + return E_FAIL; + } + + *result = res; + if(!res) { + *matchlen = 0; + return S_FALSE; + } + + *matchlen = (res->cp-*cp) - gData.skipped; + *cp = res->cp; + return S_OK; +} + static void js_DestroyRegExp(JSRegExp *re) { @@ -3327,30 +3363,15 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D jsstr_t *str, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) { - REMatchState *x, *result; - REGlobalData gData; + REMatchState *result; DWORD matchlen; + HRESULT hres; - gData.cpbegin = str->str; - gData.cpend = str->str + jsstr_length(str); - gData.start = *cp-str->str; - gData.skipped = 0; - gData.pool = &ctx->tmp_heap; - - x = InitMatch(NULL, &gData, regexp->jsregexp, gData.cpend - gData.cpbegin); - if(!x) { - WARN("InitMatch failed\n"); - return E_FAIL; - } - - x->cp = *cp; - result = MatchRegExp(&gData, x); - if(!gData.ok) { - WARN("MatchRegExp failed\n"); - return E_FAIL; - } - - if(!result) { + hres = MatchRegExpNext(regexp->jsregexp, str->str, jsstr_length(str), + cp, &ctx->tmp_heap, &result, &matchlen); + if(FAILED(hres)) + return hres; + if(hres == S_FALSE) { if(rem_flags & REM_RESET_INDEX) set_last_index(regexp, 0); return S_FALSE; @@ -3410,8 +3431,6 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D memset(ctx->match_parens+n, 0, sizeof(ctx->match_parens) - n*sizeof(ctx->match_parens[0])); } - matchlen = (result->cp-*cp) - gData.skipped; - *cp = result->cp; ret->str = result->cp-matchlen; ret->len = matchlen; set_last_index(regexp, result->cp-str->str);

1 0

Piotr Caban : jscript: Make context generic in internal regular expression functions.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 5f06c6de285d78caaae497e8b573e7fe238d1343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f06c6de285d78caaae497e8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:05:15 2013 +0100 jscript: Make context generic in internal regular expression functions. --- dlls/jscript/regexp.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index ea25c64..9df7372 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -294,7 +294,7 @@ typedef struct REBackTrackData { #define INITIAL_BACKTRACK 8000 typedef struct REGlobalData { - script_ctx_t *cx; + void *cx; JSRegExp *regexp; /* the RE in execution */ BOOL ok; /* runtime error (out_of_memory only?) */ size_t start; /* offset to start at */ @@ -354,7 +354,7 @@ struct RENode { #define CLASS_CACHE_SIZE 4 typedef struct CompilerState { - script_ctx_t *context; + void *context; const WCHAR *cpbegin; const WCHAR *cpend; const WCHAR *cp; @@ -370,6 +370,9 @@ typedef struct CompilerState { size_t index; } classCache[CLASS_CACHE_SIZE]; WORD flags; + + heap_pool_t *pool; /* It's faster to use one malloc'd pool + than to malloc/free */ } CompilerState; typedef struct EmitStateStackEntry { @@ -469,7 +472,7 @@ NewRENode(CompilerState *state, REOp op) { RENode *ren; - ren = heap_pool_alloc(&state->context->tmp_heap, sizeof(*ren)); + ren = heap_pool_alloc(state->pool, sizeof(*ren)); if (!ren) { /* js_ReportOutOfScriptQuota(cx); */ return NULL; @@ -3254,7 +3257,7 @@ js_DestroyRegExp(JSRegExp *re) } static JSRegExp * -js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) +js_NewRegExp(void *cx, heap_pool_t *pool, const WCHAR *str, DWORD str_len, UINT flags, BOOL flat) { JSRegExp *re; heap_pool_t *mark; @@ -3265,10 +3268,11 @@ js_NewRegExp(script_ctx_t *cx, const WCHAR *str, DWORD str_len, UINT flags, BOOL size_t len; re = NULL; - mark = heap_pool_mark(&cx->tmp_heap); + mark = heap_pool_mark(pool); len = str_len; state.context = cx; + state.pool = pool; state.cp = str; if (!state.cp) goto out; @@ -3884,7 +3888,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->str = jsstr_addref(src); regexp->last_index_val = jsval_number(0); - regexp->jsregexp = js_NewRegExp(ctx, regexp->str->str, + regexp->jsregexp = js_NewRegExp(ctx, &ctx->tmp_heap, regexp->str->str, jsstr_length(regexp->str), flags, FALSE); if(!regexp->jsregexp) { WARN("js_NewRegExp failed\n");

1 0

Piotr Caban : jscript: Moved generic regular expressions code to separate file.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 06e8d830e21804defd06a7423ec23ee47036829f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e8d830e21804defd06a7423… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 14:05:42 2013 +0100 jscript: Moved generic regular expressions code to separate file. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jsregexp.c | 1013 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/regexp.c | 1047 +--------------------------------------------- dlls/jscript/regexp.h | 90 ++++ 4 files changed, 1108 insertions(+), 1043 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06e8d830e21804defd06a…

1 0

Piotr Caban : vbscript: Added IRegExp2 stub.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 63d27b5420f2836fbf6147546b4baf6859990d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d27b5420f2836fbf6147546… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:09:28 2013 +0100 vbscript: Added IRegExp2 stub. --- .gitignore | 1 + dlls/vbscript/Makefile.in | 4 +- dlls/vbscript/vbregexp.c | 372 +++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + dlls/vbscript/vbscript_main.c | 14 ++ 5 files changed, 391 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63d27b5420f2836fbf614…

1 0

Piotr Caban : vbscript: Added IRegExp2_QueryInterface tests.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: b0ef29595a8c3f37e2a0952e33319b99af697ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ef29595a8c3f37e2a0952e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:09:57 2013 +0100 vbscript: Added IRegExp2_QueryInterface tests. --- .gitignore | 1 + dlls/vbscript/tests/Makefile.in | 2 + dlls/vbscript/tests/vbscript.c | 37 +++++ dlls/vbscript/tests/vbscript_defs.h | 33 +++++ dlls/vbscript/tests/vbsregexp55.idl | 271 +++++++++++++++++++++++++++++++++++ 5 files changed, 344 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0ef29595a8c3f37e2a09…

1 0

Francois Gouget : winetest: Ignore the time it took to run the tests.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: tools Branch: master Commit: 36855cf5572b8c88251b896ada35d4a3578eb4c6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=36855cf5572b8c88251b896a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 15 11:18:17 2013 +0100 winetest: Ignore the time it took to run the tests. --- winetest/dissect | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 605292d..f2e18a2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -288,7 +288,7 @@ while (<IN>) { if ($failed) { $class .= " failed"; } elsif ($todo) { $class .= " todo"; } $testbox->{data} .= sprintf "<div class=\"%s\">%s</div>\n", $class, escapeHTML($_); - } elsif (/$dll:$unit done $(-?\d+)$\r?$/) { + } elsif (/$dll:$unit done $(-?\d+)$(?:\r?$| in)/) { chomp; # current test ended if ($lines==0 || $1 < 0) { $result = "failed $1 - -";

1 0

Jacek Caban : wininet: Set available bytes in InternetQueryDataAvailable even if it ends up in async call .
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 851866e22a731141da7e3cbd2550c67c59968959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851866e22a731141da7e3cbd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 14 18:05:14 2013 +0100 wininet: Set available bytes in InternetQueryDataAvailable even if it ends up in async call. --- dlls/wininet/http.c | 24 ++++++++++++++++-------- dlls/wininet/tests/http.c | 9 ++++++++- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d4c822d..81439ca 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2763,7 +2763,7 @@ static void send_request_complete(http_request_t *req, DWORD_PTR result, DWORD e sizeof(INTERNET_ASYNC_RESULT)); } -static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) +static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD *ret_size) { DWORD res, read = 0, avail = 0; read_mode_t mode; @@ -2776,6 +2776,8 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) res = refill_read_buffer(req, mode, &read); if(res == ERROR_SUCCESS && !first_notif) avail = get_avail_data(req); + if(ret_size) + *ret_size = get_avail_data(req); LeaveCriticalSection( &req->read_section ); @@ -2993,11 +2995,16 @@ static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD s return res; } -static void AsyncQueryDataAvailableProc(task_header_t *task) +typedef struct { + task_header_t hdr; + DWORD *ret_size; +} http_data_available_task_t; + +static void AsyncQueryDataAvailableProc(task_header_t *hdr) { - http_request_t *req = (http_request_t*)task->hdr; + http_data_available_task_t *task = (http_data_available_task_t*)hdr; - HTTP_ReceiveRequestData(req, FALSE); + HTTP_ReceiveRequestData((http_request_t*)task->hdr.hdr, FALSE, task->ret_size); } static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) @@ -3008,7 +3015,7 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - task_header_t *task; + http_data_available_task_t *task; /* never wait, if we can't enter the section we queue an async request right away */ if (TryEnterCriticalSection( &req->read_section )) @@ -3020,7 +3027,8 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, } task = alloc_async_task(&req->hdr, AsyncQueryDataAvailableProc, sizeof(*task)); - INTERNET_AsyncCall(task); + task->ret_size = available; + INTERNET_AsyncCall(&task->hdr); return ERROR_IO_PENDING; } @@ -4923,7 +4931,7 @@ lend: { if (res == ERROR_SUCCESS) { if(bEndRequest && request->contentLength && request->bytesWritten == request->bytesToWrite) - HTTP_ReceiveRequestData(request, TRUE); + HTTP_ReceiveRequestData(request, TRUE, NULL); else send_request_complete(request, request->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)request->hdr.hInternet : 1, 0); @@ -5034,7 +5042,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ create_cache_entry(request); if (res == ERROR_SUCCESS && request->contentLength) - HTTP_ReceiveRequestData(request, TRUE); + HTTP_ReceiveRequestData(request, TRUE, NULL); else send_request_complete(request, res == ERROR_SUCCESS, res); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ba4ec4d..6083900 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -448,7 +448,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; - DWORD length, post_len = 0; + DWORD length, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -649,12 +649,17 @@ static void InternetReadFile_test(int flags, const test_data_t *test) { if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + length = 0; res = InternetQueryDataAvailable(hor,&length,0x0,0x0); if (flags & INTERNET_FLAG_ASYNC) { if (res) { CHECK_NOT_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + if(exlen) { + ok(length >= exlen, "length %u < exlen %u\n", length, exlen); + exlen = 0; + } } else if (GetLastError() == ERROR_IO_PENDING) { @@ -663,6 +668,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if(!(test->flags & TESTF_CHUNKED)) ok(!length, "InternetQueryDataAvailable returned ERROR_IO_PENDING and %u length\n", length); WaitForSingleObject(hCompleteEvent, INFINITE); + exlen = length; + ok(exlen, "length = 0\n"); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); ok(req_error, "req_error = 0\n"); continue;

1 0

Aric Stewart : usp10: Correct error with ScriptLayout log2vis.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 9a59d81f7254cd6e4b99822e2f0cf997ae80e9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a59d81f7254cd6e4b99822e2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 14 12:10:31 2013 -0600 usp10: Correct error with ScriptLayout log2vis. Issue found and test written by Huw Davies. --- dlls/usp10/bidi.c | 6 ++++-- dlls/usp10/tests/usp10.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index a2edfa6..3b1823f 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -872,11 +872,13 @@ int BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B reverse(pIndexs, ich); } - if (newlevel > 1) + if (newlevel >= 0) { ich = 0; for (; ich < cch; ich++) - if (plevel[ich] > level) + if (plevel[ich] < level) + break; + else if (plevel[ich] > level) ich += BIDI_ReorderL2vLevel(level + 1, pIndexs + ich, plevel + ich, cch - ich, fReverse) - 1; } diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7752f2c..354bc23 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2786,6 +2786,11 @@ static void test_ScriptLayout(void) { 0, 0, 1, 1, 2, 2, 1, 1, 0, 1 }, { 1, 0, 1, 2, 2, 1, 2, 1, 0, 1 }, + + { 1, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 2, 2, 2, 0, 0, 0, 0, 0, 0, 0 }, + { 2, 2, 2, 4, 4, 4, 1, 1, 0, 0 }, + { 1, 2, 3, 0, 3, 2, 1, 0, 0, 0 } }; static const int expect_l2v[][10] = { @@ -2802,6 +2807,11 @@ static void test_ScriptLayout(void) { 0, 1, 7, 6, 4, 5, 3 ,2 ,8, 9}, /**/ { 0, 1, 7, 5, 6, 4, 3 ,2 ,8, 9}, + + { 1, 0, 2, 3, 4, 5, 6, 7, 8, 9}, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, + { 2, 3, 4, 5, 6, 7, 1, 0, 8, 9}, + { 2, 0, 1, 3, 5, 6, 4, 7, 8, 9} }; static const int expect_v2l[][10] = { @@ -2818,6 +2828,11 @@ static void test_ScriptLayout(void) { 0, 1, 7, 6, 4, 5, 3 ,2 ,8, 9}, { 0, 1, 7, 6, 5, 3, 4 ,2 ,8, 9}, + + { 1, 0, 2, 3, 4, 5, 6, 7, 8, 9}, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, + { 7, 6, 0, 1, 2, 3, 4, 5, 8, 9}, + { 1, 2, 0, 3, 6, 4, 5, 7, 8, 9} }; int i, j, vistolog[sizeof(levels[0])], logtovis[sizeof(levels[0])];

1 0

Alexandre Julliard : odbccu32: Remove an unnecessary source file.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 981f79dbf862b8d46014061f043a1992cc76842f URL: http://source.winehq.org/git/wine.git/?a=commit;h=981f79dbf862b8d46014061f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:35:21 2013 +0100 odbccu32: Remove an unnecessary source file. --- dlls/odbccu32/Makefile.in | 3 -- dlls/odbccu32/odbccu32_main.c | 42 ----------------------------------------- 2 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/odbccu32/Makefile.in b/dlls/odbccu32/Makefile.in index cc8bf71..36737ce 100644 --- a/dlls/odbccu32/Makefile.in +++ b/dlls/odbccu32/Makefile.in @@ -1,8 +1,5 @@ MODULE = odbccu32.dll -C_SRCS = \ - odbccu32_main.c - RC_SRCS = version.rc @MAKE_DLL_RULES@ diff --git a/dlls/odbccu32/odbccu32_main.c b/dlls/odbccu32/odbccu32_main.c deleted file mode 100644 index 09abf2b..0000000 --- a/dlls/odbccu32/odbccu32_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * ODBC Cursor Library - * - * Copyright 2012 Alistair Leslie-Hughes - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - - return TRUE; -}

1 0